@sap/ux-specification
Advanced tools
Comparing version 1.71.24 to 1.71.25
@@ -7,6 +7,8 @@ # Change Log | ||
## [1.71.24] - 2021-02-11 | ||
## [1.71.25] - 2021-02-25 | ||
### Added | ||
- Mark translatable properties in `schema` with `isLanguageDependent` property. | ||
### Changed | ||
@@ -20,2 +22,14 @@ | ||
- Exceptions have occurred in case of incomplete or inconsistent annotations. This was solved by a new version of the Annotation Vocabulary Tools that is delivered together with the Specification module. | ||
- Duplicate property "entitySet" for link list cards got removed. | ||
### Quality | ||
- Switch to Sonar EE | ||
## [1.71.24] - 2021-02-11 | ||
### Fixed | ||
- Overview Page: mandatory fields are clarified and reworked | ||
@@ -22,0 +36,0 @@ - Overview Page: obsolete field timeAxis eliminated |
@@ -55,2 +55,3 @@ { | ||
"description": "Lets you define title for the content area", | ||
"isLanguageDependent": true, | ||
"type": "string" | ||
@@ -327,2 +328,4 @@ }, | ||
"subTitleIfVariantMgmtHidden": { | ||
"description": "You can choose an app-specific title by setting the corresponding value for the subTitleIfVariantMgmtHidden property.", | ||
"isLanguageDependent": true, | ||
"type": "string" | ||
@@ -329,0 +332,0 @@ } |
@@ -400,2 +400,3 @@ { | ||
"description": "Lets you define title for the content area", | ||
"isLanguageDependent": true, | ||
"type": "string" | ||
@@ -563,2 +564,4 @@ }, | ||
"subTitleIfVariantMgmtHidden": { | ||
"description": "You can choose an app-specific title by setting the corresponding value for the subTitleIfVariantMgmtHidden property.", | ||
"isLanguageDependent": true, | ||
"type": "string" | ||
@@ -565,0 +568,0 @@ } |
@@ -595,2 +595,4 @@ { | ||
"title": { | ||
"description": "The label of the custom section, preferrable as an i18n key", | ||
"isLanguageDependent": true, | ||
"type": "string" | ||
@@ -651,2 +653,4 @@ } | ||
"title": { | ||
"description": "The label of the custom section, preferrable as an i18n key", | ||
"isLanguageDependent": true, | ||
"type": "string" | ||
@@ -653,0 +657,0 @@ } |
@@ -285,2 +285,3 @@ { | ||
"description": "The language-dependent title of the card, used in the card header.", | ||
"isLanguageDependent": true, | ||
"type": "string" | ||
@@ -290,2 +291,3 @@ }, | ||
"description": "The language-dependent subtitle of the card, used in the card header.", | ||
"isLanguageDependent": true, | ||
"type": "string" | ||
@@ -474,2 +476,3 @@ }, | ||
"description": "The language-dependent title of the card, used in the card header.", | ||
"isLanguageDependent": true, | ||
"type": "string" | ||
@@ -479,2 +482,3 @@ }, | ||
"description": "The language-dependent subtitle of the card, used in the card header.", | ||
"isLanguageDependent": true, | ||
"type": "string" | ||
@@ -707,2 +711,3 @@ }, | ||
"description": "The language-dependent title of the card, used in the card header.", | ||
"isLanguageDependent": true, | ||
"type": "string" | ||
@@ -712,2 +717,3 @@ }, | ||
"description": "The language-dependent subtitle of the card, used in the card header.", | ||
"isLanguageDependent": true, | ||
"type": "string" | ||
@@ -786,6 +792,2 @@ }, | ||
"properties": { | ||
"entitySet": { | ||
"description": "Represents the dominant entity set that will be displayed in the given card.", | ||
"type": "string" | ||
}, | ||
"model": { | ||
@@ -822,3 +824,2 @@ "description": "Represents the model for the Link list Card.", | ||
"required": [ | ||
"entitySet", | ||
"linkListCardSettings", | ||
@@ -837,2 +838,3 @@ "template" | ||
"description": "title represents the language-dependent title of the card, as used in the card header.", | ||
"isLanguageDependent": true, | ||
"type": "string" | ||
@@ -842,2 +844,3 @@ }, | ||
"description": "YOu can define the language-dependent subtitle of the card, as used in the card header.", | ||
"isLanguageDependent": true, | ||
"type": "string" | ||
@@ -935,2 +938,3 @@ }, | ||
"description": "The language-dependent title of the StaticContent.", | ||
"isLanguageDependent": true, | ||
"type": "string" | ||
@@ -940,2 +944,3 @@ }, | ||
"description": "The language-dependent subtitle of the StaticContent.", | ||
"isLanguageDependent": true, | ||
"type": "string" | ||
@@ -953,2 +958,3 @@ }, | ||
"description": "The alternative text for the image of the StaticContent.", | ||
"isLanguageDependent": true, | ||
"type": "string" | ||
@@ -1046,2 +1052,3 @@ }, | ||
"description": "The language-dependent title of the card, used in the card header.", | ||
"isLanguageDependent": true, | ||
"type": "string" | ||
@@ -1051,2 +1058,3 @@ }, | ||
"description": "The language-dependent subtitle of the card, used in the card header.", | ||
"isLanguageDependent": true, | ||
"type": "string" | ||
@@ -1177,2 +1185,3 @@ }, | ||
"description": "The language-dependent title of the card, used in the card header.", | ||
"isLanguageDependent": true, | ||
"type": "string" | ||
@@ -1182,2 +1191,3 @@ }, | ||
"description": "The language-dependent subtitle of the card, used in the card header.", | ||
"isLanguageDependent": true, | ||
"type": "string" | ||
@@ -1184,0 +1194,0 @@ }, |
@@ -30,3 +30,4 @@ "use strict"; | ||
noExtraProps: true, | ||
required: true // Create required array for non-optional properties. | ||
required: true, | ||
validationKeywords: ['isLanguageDependent'] | ||
}); | ||
@@ -33,0 +34,0 @@ schemas[file.replace('ts', 'json')] = generator.getSchemaForSymbol(file.replace('.ts', '')); |
@@ -82,2 +82,3 @@ /** | ||
* The language-dependent title of the card, used in the card header. | ||
* @isLanguageDependent true | ||
*/ | ||
@@ -87,2 +88,3 @@ title: string; | ||
* The language-dependent subtitle of the card, used in the card header. | ||
* @isLanguageDependent true | ||
*/ | ||
@@ -193,6 +195,2 @@ subTitle?: string; | ||
/** | ||
* Represents the dominant entity set that will be displayed in the given card. | ||
*/ | ||
entitySet: string; | ||
/** | ||
* Represents the model for the Link list Card. | ||
@@ -513,2 +511,3 @@ */ | ||
* title represents the language-dependent title of the card, as used in the card header. | ||
* @isLanguageDependent true | ||
*/ | ||
@@ -518,2 +517,3 @@ title: string; | ||
* YOu can define the language-dependent subtitle of the card, as used in the card header. | ||
* @isLanguageDependent true | ||
*/ | ||
@@ -557,2 +557,3 @@ subTitle?: string; | ||
* The language-dependent title of the StaticContent. | ||
* @isLanguageDependent true | ||
*/ | ||
@@ -562,2 +563,3 @@ title: string; | ||
* The language-dependent subtitle of the StaticContent. | ||
* @isLanguageDependent true | ||
*/ | ||
@@ -575,2 +577,3 @@ subTitle?: string; | ||
* The alternative text for the image of the StaticContent. | ||
* @isLanguageDependent true | ||
*/ | ||
@@ -577,0 +580,0 @@ imageAltText?: string; |
@@ -11,2 +11,6 @@ export interface FilterBar { | ||
variantManagementHidden?: boolean; | ||
/** | ||
* You can choose an app-specific title by setting the corresponding value for the subTitleIfVariantMgmtHidden property. | ||
* @isLanguageDependent true | ||
*/ | ||
subTitleIfVariantMgmtHidden?: string; | ||
@@ -13,0 +17,0 @@ } |
@@ -19,2 +19,6 @@ import { ObjectPageResponsiveTable, ObjectPageAnalyticalTable, ObjectPageGridTable, ObjectPageTreeTable } from './ObjectPageTable'; | ||
relativePosition: SectionPosition; | ||
/** | ||
* The label of the custom section, preferrable as an i18n key | ||
* @isLanguageDependent true | ||
*/ | ||
title: string; | ||
@@ -21,0 +25,0 @@ } |
@@ -27,2 +27,3 @@ import { SAPUI5_FRAGMENT_CLASS } from '../../common/webapp/manifest/sapUi5'; | ||
* The label of the custom column, preferrable as an i18n key | ||
* @IsLanguageDependent true | ||
*/ | ||
@@ -235,2 +236,3 @@ text?: string; | ||
* Lets you define title for the content area | ||
* @isLanguageDependent true | ||
*/ | ||
@@ -270,2 +272,3 @@ contentTitle?: string; | ||
* Lets you define title for the content area | ||
* @isLanguageDependent true | ||
*/ | ||
@@ -272,0 +275,0 @@ contentTitle?: string; |
@@ -54,3 +54,3 @@ import { FacetConfigs, FileData, FacetConfig, FacetSection, SchemaFilePath } from './types'; | ||
*/ | ||
export declare function getObjectPageFacets(entityTypeName: QualifiedName, oDataServiceAVT: ConverterOutput, oDataVersion?: FioriElementsVersion): FacetConfigs; | ||
export declare function getObjectPageFacets(entityTypeName: string, oDataServiceAVT: ConverterOutput, oDataVersion?: FioriElementsVersion): FacetConfigs; | ||
/** | ||
@@ -57,0 +57,0 @@ * Returns the version of Fiori elements (v2/v4) from a given manifest |
@@ -100,3 +100,3 @@ "use strict"; | ||
if (property && property.annotations && property.annotations.Common && property.annotations.Common.Label) { | ||
label = property.annotations.Common.Label; | ||
label = property.annotations.Common.Label.toString(); | ||
} | ||
@@ -103,0 +103,0 @@ return label; |
@@ -6,2 +6,257 @@ # Change Log | ||
## [0.3.10](https://github.wdf.sap.corp/ux-engineering/annotations-vocabularies-tools/compare/ms/0.3.9...ms/0.3.10) (2021-02-15) | ||
### Bug Fixes | ||
* string value can be undefined ([7f0c2cc](https://github.wdf.sap.corp/ux-engineering/annotations-vocabularies-tools/commit/7f0c2cc810da59ff15740e8ba0a24892cdac7f50)) | ||
## [0.3.9](https://github.wdf.sap.corp/ux-engineering/annotations-vocabularies-tools/compare/ms/0.3.8...ms/0.3.9) (2021-02-12) | ||
### Bug Fixes | ||
* converter fails sometimes when annotation target is incorrect ([063d574](https://github.wdf.sap.corp/ux-engineering/annotations-vocabularies-tools/commit/063d574cad0bf536438994fbda15266e46e694e3)) | ||
## [0.3.8](https://github.wdf.sap.corp/ux-engineering/annotations-vocabularies-tools/compare/ms/0.3.7...ms/0.3.8) (2021-02-10) | ||
### Bug Fixes | ||
* make sure that annotations object is created in all case even when non present ([9dc1470](https://github.wdf.sap.corp/ux-engineering/annotations-vocabularies-tools/commit/9dc147094a78031cf53e14341e97d02597ff8405)) | ||
## [0.3.7](https://github.wdf.sap.corp/ux-engineering/annotations-vocabularies-tools/compare/ms/0.3.6...ms/0.3.7) (2021-02-05) | ||
### Features | ||
* do not include undefined value in visited object (can change some behavior for unresolved annotations) ([b5303c6](https://github.wdf.sap.corp/ux-engineering/annotations-vocabularies-tools/commit/b5303c626ecefc8cd3cf51ea48c9d4bcaf271df1)) | ||
## [0.3.6](https://github.wdf.sap.corp/ux-engineering/annotations-vocabularies-tools/compare/ms/0.3.4...ms/0.3.6) (2021-02-05) | ||
### Features | ||
* Add missing types on terms ([64a7e8f](https://github.wdf.sap.corp/ux-engineering/annotations-vocabularies-tools/commit/64a7e8f0795e6195d38a022e36a030bc474c4af0)) | ||
## [0.3.5](https://github.wdf.sap.corp/ux-engineering/annotations-vocabularies-tools/compare/ms/0.3.4...ms/0.3.5) (2021-02-05) | ||
### Features | ||
* Add missing types on terms ([64a7e8f](https://github.wdf.sap.corp/ux-engineering/annotations-vocabularies-tools/commit/64a7e8f0795e6195d38a022e36a030bc474c4af0)) | ||
## [0.3.4](https://github.wdf.sap.corp/ux-engineering/annotations-vocabularies-tools/compare/ms/0.3.3...ms/0.3.4) (2021-02-05) | ||
### Features | ||
* Improve the resolution logic to fix some bugs and add extra tests ([ada3a26](https://github.wdf.sap.corp/ux-engineering/annotations-vocabularies-tools/commit/ada3a2682b36cb2c5104451c9c85737f17aef0be)) | ||
## [0.3.3](https://github.wdf.sap.corp/ux-engineering/annotations-vocabularies-tools/compare/ms/0.3.2...ms/0.3.3) (2021-02-01) | ||
**Note:** Version bump only for package @sap-ux/annotation-converter | ||
## [0.3.2](https://github.wdf.sap.corp/ux-engineering/annotations-vocabularies-tools/compare/ms/0.3.1...ms/0.3.2) (2021-01-27) | ||
**Note:** Version bump only for package @sap-ux/annotation-converter | ||
## [0.3.1](https://github.wdf.sap.corp/ux-engineering/annotations-vocabularies-tools/compare/ms/0.2.52...ms/0.3.1) (2020-12-28) | ||
### Features | ||
* 0.3.0 primitives are now no longer primitive... ([5bfd3d6](https://github.wdf.sap.corp/ux-engineering/annotations-vocabularies-tools/commit/5bfd3d6c8b60d09a8cbcc0b30f2ad8e5eee3feb0)) | ||
# [0.3.0](https://github.wdf.sap.corp/ux-engineering/annotations-vocabularies-tools/compare/ms/0.2.52...ms/0.3.0) (2020-12-28) | ||
**Note:** Version bump only for package @sap-ux/annotation-converter | ||
## [0.2.52](https://github.wdf.sap.corp/ux-engineering/annotations-vocabularies-tools/compare/ms/0.2.50...ms/0.2.52) (2020-12-17) | ||
### Features | ||
* add proper support for anntotation of basic annotation type (only string to avoid too much impact) ([ef26f9d](https://github.wdf.sap.corp/ux-engineering/annotations-vocabularies-tools/commit/ef26f9df83d3f7deea0e7b277e9a05d2f2762e7c)) | ||
* we need to always convert the primitive types otherwise it won't work... ([81cd08b](https://github.wdf.sap.corp/ux-engineering/annotations-vocabularies-tools/commit/81cd08b5d95e32cb87a00bec9649187c36d7fd41)) | ||
## [0.2.51](https://github.wdf.sap.corp/ux-engineering/annotations-vocabularies-tools/compare/ms/0.2.50...ms/0.2.51) (2020-12-17) | ||
### Features | ||
* add proper support for anntotation of basic annotation type (only string to avoid too much impact) ([ef26f9d](https://github.wdf.sap.corp/ux-engineering/annotations-vocabularies-tools/commit/ef26f9df83d3f7deea0e7b277e9a05d2f2762e7c)) | ||
## [0.2.50](https://github.wdf.sap.corp/ux-engineering/annotations-vocabularies-tools/compare/ms/0.2.49...ms/0.2.50) (2020-12-11) | ||
### Features | ||
* include entity container in output ([e130356](https://github.wdf.sap.corp/ux-engineering/annotations-vocabularies-tools/commit/e1303565b46e517f4a5ea7ad3016c2b99b90add1)) | ||
## [0.2.49](https://github.wdf.sap.corp/ux-engineering/annotations-vocabularies-tools/compare/ms/0.2.48...ms/0.2.49) (2020-12-11) | ||
**Note:** Version bump only for package @sap-ux/annotation-converter | ||
## [0.2.48](https://github.wdf.sap.corp/ux-engineering/annotations-vocabularies-tools/compare/ms/0.2.47...ms/0.2.48) (2020-12-02) | ||
### Bug Fixes | ||
* add missing mapping to NavigationPropertyPath ([#36](https://github.wdf.sap.corp/ux-engineering/annotations-vocabularies-tools/issues/36)) ([0d23376](https://github.wdf.sap.corp/ux-engineering/annotations-vocabularies-tools/commit/0d233764987cdbe5bdcffc7ac15dfa676c846cc9)) | ||
## [0.2.47](https://github.wdf.sap.corp/ux-engineering/annotations-vocabularies-tools/compare/ms/0.2.46...ms/0.2.47) (2020-12-01) | ||
**Note:** Version bump only for package @sap-ux/annotation-converter | ||
## [0.2.46](https://github.wdf.sap.corp/ux-engineering/annotations-vocabularies-tools/compare/ms/0.2.44...ms/0.2.46) (2020-11-17) | ||
### Bug Fixes | ||
* issue with empty string ([8eb578c](https://github.wdf.sap.corp/ux-engineering/annotations-vocabularies-tools/commit/8eb578ccd4326fa074f736e6a152e1f4219f3d1b)) | ||
## [0.2.45](https://github.wdf.sap.corp/ux-engineering/annotations-vocabularies-tools/compare/ms/0.2.44...ms/0.2.45) (2020-11-17) | ||
**Note:** Version bump only for package @sap-ux/annotation-converter | ||
## [0.2.44](https://github.wdf.sap.corp/ux-engineering/annotations-vocabularies-tools/compare/ms/0.2.43...ms/0.2.44) (2020-11-13) | ||
**Note:** Version bump only for package @sap-ux/annotation-converter | ||
## [0.2.43](https://github.wdf.sap.corp/ux-engineering/annotations-vocabularies-tools/compare/ms/0.2.42...ms/0.2.43) (2020-11-05) | ||
### Features | ||
* properly resolve properties named "name" ([d4a73f6](https://github.wdf.sap.corp/ux-engineering/annotations-vocabularies-tools/commit/d4a73f69c266f066eff23c610b6aa4d2e2526a7a)) | ||
## [0.2.42](https://github.wdf.sap.corp/ux-engineering/annotations-vocabularies-tools/compare/ms/0.2.41...ms/0.2.42) (2020-11-05) | ||
### Features | ||
* additional path resolving logic ([fb6e2ef](https://github.wdf.sap.corp/ux-engineering/annotations-vocabularies-tools/commit/fb6e2eff3c303352644e1971afa836edf1895d2f)) | ||
## [0.2.41](https://github.wdf.sap.corp/ux-engineering/annotations-vocabularies-tools/compare/ms/0.2.40...ms/0.2.41) (2020-11-05) | ||
### Features | ||
* resolve path with $Path ([3bf3cce](https://github.wdf.sap.corp/ux-engineering/annotations-vocabularies-tools/commit/3bf3ccea4ae581bd7dfd2ea08eef8d51bfa5adcd)) | ||
## [0.2.40](https://github.wdf.sap.corp/ux-engineering/annotations-vocabularies-tools/compare/ms/0.2.39...ms/0.2.40) (2020-10-18) | ||
### Features | ||
* better typing for Apply ([4f4777e](https://github.wdf.sap.corp/ux-engineering/annotations-vocabularies-tools/commit/4f4777e0f8bb2c832d1bb7a26c18cdc8d8ba84e9)) | ||
## [0.2.39](https://github.wdf.sap.corp/ux-engineering/annotations-vocabularies-tools/compare/ms/0.2.38...ms/0.2.39) (2020-10-14) | ||
### Features | ||
* do not crash when collection are of type If ([e77b102](https://github.wdf.sap.corp/ux-engineering/annotations-vocabularies-tools/commit/e77b102e67d4ade9e2e3dfde843250d5df84a168)) | ||
## [0.2.38](https://github.wdf.sap.corp/ux-engineering/annotations-vocabularies-tools/compare/ms/0.2.37...ms/0.2.38) (2020-10-13) | ||
@@ -8,0 +263,0 @@ |
@@ -8,5 +8,5 @@ import { Annotation as EdmAnnotation, AnnotationTerm, ConverterOutput, ParserOutput } from "@sap-ux/vocabularies-types"; | ||
}; | ||
export declare type CollectionType = "PropertyPath" | "Path" | "AnnotationPath" | "NavigationPropertyPath" | "Record" | "String" | "EmptyCollection"; | ||
export declare type CollectionType = "PropertyPath" | "Path" | "If" | "Apply" | "AnnotationPath" | "NavigationPropertyPath" | "Record" | "String" | "EmptyCollection"; | ||
export declare function convertTypes(parserOutput: ParserOutput): ConverterOutput; | ||
export declare function revertTermToGenericType(references: Reference[], annotation: AnnotationTerm<any>): EdmAnnotation; | ||
export {}; |
{ | ||
"name": "@sap-ux/annotation-converter", | ||
"version": "0.2.38", | ||
"version": "0.3.10", | ||
"main": "dist/index.js", | ||
@@ -21,5 +21,5 @@ "license": "Apache-2.0", | ||
"@sap-ux/babel-plugin-use-const-enum": "0.1.0", | ||
"@sap-ux/edmx-parser": "0.2.38", | ||
"@sap-ux/vocabularies-csdl-types": "0.2.38", | ||
"@sap-ux/vocabularies-types": "0.2.38", | ||
"@sap-ux/edmx-parser": "0.3.10", | ||
"@sap-ux/vocabularies-csdl-types": "0.3.10", | ||
"@sap-ux/vocabularies-types": "0.3.10", | ||
"chai": "^4.2.0", | ||
@@ -26,0 +26,0 @@ "mocha": "^6.2.2", |
@@ -6,2 +6,220 @@ # Change Log | ||
## [0.3.10](https://github.wdf.sap.corp/ux-engineering/annotations-vocabularies-tools/compare/ms/0.3.9...ms/0.3.10) (2021-02-15) | ||
**Note:** Version bump only for package @sap-ux/edmx-parser | ||
## [0.3.9](https://github.wdf.sap.corp/ux-engineering/annotations-vocabularies-tools/compare/ms/0.3.8...ms/0.3.9) (2021-02-12) | ||
### Bug Fixes | ||
* parser was unable to deal with multiple referential constraints property ([d120bac](https://github.wdf.sap.corp/ux-engineering/annotations-vocabularies-tools/commit/d120bacc4926c41443d747508bcdf02c75ab12e9)) | ||
## [0.3.8](https://github.wdf.sap.corp/ux-engineering/annotations-vocabularies-tools/compare/ms/0.3.7...ms/0.3.8) (2021-02-10) | ||
**Note:** Version bump only for package @sap-ux/edmx-parser | ||
## [0.3.7](https://github.wdf.sap.corp/ux-engineering/annotations-vocabularies-tools/compare/ms/0.3.6...ms/0.3.7) (2021-02-05) | ||
**Note:** Version bump only for package @sap-ux/edmx-parser | ||
## [0.3.6](https://github.wdf.sap.corp/ux-engineering/annotations-vocabularies-tools/compare/ms/0.3.4...ms/0.3.6) (2021-02-05) | ||
**Note:** Version bump only for package @sap-ux/edmx-parser | ||
## [0.3.5](https://github.wdf.sap.corp/ux-engineering/annotations-vocabularies-tools/compare/ms/0.3.4...ms/0.3.5) (2021-02-05) | ||
**Note:** Version bump only for package @sap-ux/edmx-parser | ||
## [0.3.4](https://github.wdf.sap.corp/ux-engineering/annotations-vocabularies-tools/compare/ms/0.3.3...ms/0.3.4) (2021-02-05) | ||
**Note:** Version bump only for package @sap-ux/edmx-parser | ||
## [0.3.3](https://github.wdf.sap.corp/ux-engineering/annotations-vocabularies-tools/compare/ms/0.3.2...ms/0.3.3) (2021-02-01) | ||
**Note:** Version bump only for package @sap-ux/edmx-parser | ||
## [0.3.2](https://github.wdf.sap.corp/ux-engineering/annotations-vocabularies-tools/compare/ms/0.3.1...ms/0.3.2) (2021-01-27) | ||
**Note:** Version bump only for package @sap-ux/edmx-parser | ||
## [0.3.1](https://github.wdf.sap.corp/ux-engineering/annotations-vocabularies-tools/compare/ms/0.2.52...ms/0.3.1) (2020-12-28) | ||
### Features | ||
* 0.3.0 primitives are now no longer primitive... ([5bfd3d6](https://github.wdf.sap.corp/ux-engineering/annotations-vocabularies-tools/commit/5bfd3d6c8b60d09a8cbcc0b30f2ad8e5eee3feb0)) | ||
# [0.3.0](https://github.wdf.sap.corp/ux-engineering/annotations-vocabularies-tools/compare/ms/0.2.52...ms/0.3.0) (2020-12-28) | ||
**Note:** Version bump only for package @sap-ux/edmx-parser | ||
## [0.2.52](https://github.wdf.sap.corp/ux-engineering/annotations-vocabularies-tools/compare/ms/0.2.50...ms/0.2.52) (2020-12-17) | ||
### Features | ||
* add proper support for anntotation of basic annotation type (only string to avoid too much impact) ([ef26f9d](https://github.wdf.sap.corp/ux-engineering/annotations-vocabularies-tools/commit/ef26f9df83d3f7deea0e7b277e9a05d2f2762e7c)) | ||
## [0.2.51](https://github.wdf.sap.corp/ux-engineering/annotations-vocabularies-tools/compare/ms/0.2.50...ms/0.2.51) (2020-12-17) | ||
### Features | ||
* add proper support for anntotation of basic annotation type (only string to avoid too much impact) ([ef26f9d](https://github.wdf.sap.corp/ux-engineering/annotations-vocabularies-tools/commit/ef26f9df83d3f7deea0e7b277e9a05d2f2762e7c)) | ||
## [0.2.50](https://github.wdf.sap.corp/ux-engineering/annotations-vocabularies-tools/compare/ms/0.2.49...ms/0.2.50) (2020-12-11) | ||
**Note:** Version bump only for package @sap-ux/edmx-parser | ||
## [0.2.49](https://github.wdf.sap.corp/ux-engineering/annotations-vocabularies-tools/compare/ms/0.2.48...ms/0.2.49) (2020-12-11) | ||
**Note:** Version bump only for package @sap-ux/edmx-parser | ||
## [0.2.48](https://github.wdf.sap.corp/ux-engineering/annotations-vocabularies-tools/compare/ms/0.2.47...ms/0.2.48) (2020-12-02) | ||
**Note:** Version bump only for package @sap-ux/edmx-parser | ||
## [0.2.47](https://github.wdf.sap.corp/ux-engineering/annotations-vocabularies-tools/compare/ms/0.2.46...ms/0.2.47) (2020-12-01) | ||
### Features | ||
* properly support v2 ref constraints ([a649881](https://github.wdf.sap.corp/ux-engineering/annotations-vocabularies-tools/commit/a649881d47cfeff95d5fd415db27d0961d5a4eef)) | ||
## [0.2.46](https://github.wdf.sap.corp/ux-engineering/annotations-vocabularies-tools/compare/ms/0.2.44...ms/0.2.46) (2020-11-17) | ||
**Note:** Version bump only for package @sap-ux/edmx-parser | ||
## [0.2.45](https://github.wdf.sap.corp/ux-engineering/annotations-vocabularies-tools/compare/ms/0.2.44...ms/0.2.45) (2020-11-17) | ||
**Note:** Version bump only for package @sap-ux/edmx-parser | ||
## [0.2.44](https://github.wdf.sap.corp/ux-engineering/annotations-vocabularies-tools/compare/ms/0.2.43...ms/0.2.44) (2020-11-13) | ||
**Note:** Version bump only for package @sap-ux/edmx-parser | ||
## [0.2.43](https://github.wdf.sap.corp/ux-engineering/annotations-vocabularies-tools/compare/ms/0.2.42...ms/0.2.43) (2020-11-05) | ||
**Note:** Version bump only for package @sap-ux/edmx-parser | ||
## [0.2.42](https://github.wdf.sap.corp/ux-engineering/annotations-vocabularies-tools/compare/ms/0.2.41...ms/0.2.42) (2020-11-05) | ||
**Note:** Version bump only for package @sap-ux/edmx-parser | ||
## [0.2.41](https://github.wdf.sap.corp/ux-engineering/annotations-vocabularies-tools/compare/ms/0.2.40...ms/0.2.41) (2020-11-05) | ||
**Note:** Version bump only for package @sap-ux/edmx-parser | ||
## [0.2.40](https://github.wdf.sap.corp/ux-engineering/annotations-vocabularies-tools/compare/ms/0.2.39...ms/0.2.40) (2020-10-18) | ||
**Note:** Version bump only for package @sap-ux/edmx-parser | ||
## [0.2.39](https://github.wdf.sap.corp/ux-engineering/annotations-vocabularies-tools/compare/ms/0.2.38...ms/0.2.39) (2020-10-14) | ||
### Features | ||
* do not crash when collection are of type If ([e77b102](https://github.wdf.sap.corp/ux-engineering/annotations-vocabularies-tools/commit/e77b102e67d4ade9e2e3dfde843250d5df84a168)) | ||
## [0.2.38](https://github.wdf.sap.corp/ux-engineering/annotations-vocabularies-tools/compare/ms/0.2.37...ms/0.2.38) (2020-10-13) | ||
@@ -8,0 +226,0 @@ |
@@ -89,2 +89,21 @@ "use strict"; | ||
} | ||
function parseV2ReferentialConstraint(referentialConstraints, associationEnds) { | ||
return referentialConstraints.reduce((outArray, refCon) => { | ||
const sourceEnd = associationEnds.find(assEnd => assEnd.role === refCon.Dependent._attributes.Role); | ||
const targetEnd = associationEnds.find(assEnd => assEnd.role === refCon.Principal._attributes.Role); | ||
if (sourceEnd && targetEnd) { | ||
const sourceProperties = utils_1.ensureArray(refCon.Dependent.PropertyRef); | ||
const targetProperties = utils_1.ensureArray(refCon.Principal.PropertyRef); | ||
sourceProperties.forEach((sourceProperty, propertyIndex) => { | ||
outArray.push({ | ||
sourceTypeName: sourceEnd.type, | ||
sourceProperty: sourceProperty._attributes.Name, | ||
targetTypeName: targetEnd.type, | ||
targetProperty: targetProperties[propertyIndex]._attributes.Name | ||
}); | ||
}); | ||
} | ||
return outArray; | ||
}, []); | ||
} | ||
function parseNavigationProperties(navigationProperties, currentEntityType, entityTypeFQN, annotationLists) { | ||
@@ -174,3 +193,4 @@ return navigationProperties.reduce((outArray, navigationProperty) => { | ||
name: association._attributes.Name, | ||
associationEnd: associationEnd | ||
associationEnd: associationEnd, | ||
referentialConstraints: parseV2ReferentialConstraint(utils_1.ensureArray(association.ReferentialConstraint), associationEnd) | ||
}; | ||
@@ -374,2 +394,7 @@ }); | ||
} | ||
else if (isCollectionOfType(collection, "If")) { | ||
const stringArray = utils_1.ensureArray(collection.If).map(stringValue => stringValue._text); | ||
stringArray.type = "String"; | ||
return stringArray; | ||
} | ||
else if (Object.keys(collection).length === 0) { | ||
@@ -575,2 +600,5 @@ return []; | ||
} | ||
else if (keys.length === 1) { | ||
outAnnotation.value = parseExpression({ [keys[0]]: annotation[keys[0]] }, currentAnnotationTarget, annotationsLists); | ||
} | ||
else if (keys.length > 1) { | ||
@@ -637,2 +665,13 @@ // TODO Full Coverage | ||
}); | ||
if (associations.length > 0) { | ||
entityTypes.forEach(entityType => { | ||
entityType.navigationProperties.forEach(navProp => { | ||
const v2NavProp = navProp; | ||
const association = associations.find(assoc => assoc.fullyQualifiedName === v2NavProp.relationship); | ||
if (association && association.referentialConstraints) { | ||
v2NavProp.referentialConstraint = association.referentialConstraints; | ||
} | ||
}); | ||
}); | ||
} | ||
parseAnnotationLists(utils_1.ensureArray(edmSchema.Annotations), annotations); | ||
@@ -639,0 +678,0 @@ var annotationMap = {}; |
{ | ||
"name": "@sap-ux/edmx-parser", | ||
"version": "0.2.38", | ||
"version": "0.3.10", | ||
"main": "dist/index.js", | ||
@@ -15,3 +15,3 @@ "license": "Apache-2.0", | ||
"@rollup/plugin-node-resolve": "^7.0.0", | ||
"@sap-ux/vocabularies-csdl-types": "0.2.38", | ||
"@sap-ux/vocabularies-csdl-types": "0.3.10", | ||
"@types/extract-zip": "^1.6.2", | ||
@@ -36,5 +36,5 @@ "@types/fs-extra": "^8.0.1", | ||
"dependencies": { | ||
"@sap-ux/vocabularies-types": "0.2.38", | ||
"@sap-ux/vocabularies-types": "0.3.10", | ||
"xml-js": "1.6.11" | ||
} | ||
} |
@@ -153,2 +153,25 @@ import { xml2js } from "xml-js"; | ||
function parseV2ReferentialConstraint( | ||
referentialConstraints: EDMX.V2ReferentialConstraint[], | ||
associationEnds: AssociationEnd[] | ||
) { | ||
return referentialConstraints.reduce((outArray: ReferentialConstraint[], refCon) => { | ||
const sourceEnd = associationEnds.find(assEnd => assEnd.role === refCon.Dependent._attributes.Role); | ||
const targetEnd = associationEnds.find(assEnd => assEnd.role === refCon.Principal._attributes.Role); | ||
if (sourceEnd && targetEnd) { | ||
const sourceProperties = ensureArray(refCon.Dependent.PropertyRef); | ||
const targetProperties = ensureArray(refCon.Principal.PropertyRef); | ||
sourceProperties.forEach((sourceProperty, propertyIndex) => { | ||
outArray.push({ | ||
sourceTypeName: sourceEnd.type, | ||
sourceProperty: sourceProperty._attributes.Name, | ||
targetTypeName: targetEnd.type, | ||
targetProperty: targetProperties[propertyIndex]._attributes.Name | ||
}); | ||
}); | ||
} | ||
return outArray; | ||
}, []); | ||
} | ||
function parseNavigationProperties( | ||
@@ -256,3 +279,7 @@ navigationProperties: EDMX.NavigationProperty[], | ||
name: association._attributes.Name, | ||
associationEnd: associationEnd | ||
associationEnd: associationEnd, | ||
referentialConstraints: parseV2ReferentialConstraint( | ||
ensureArray(association.ReferentialConstraint), | ||
associationEnd | ||
) | ||
}; | ||
@@ -545,2 +572,6 @@ }); | ||
return pathArray; | ||
} else if (isCollectionOfType<EDMX.IfCollectionWrapper>(collection, "If")) { | ||
const stringArray = ensureArray(collection.If).map(stringValue => stringValue._text); | ||
(stringArray as any).type = "String"; | ||
return stringArray; | ||
} else if (Object.keys(collection).length === 0) { | ||
@@ -772,2 +803,8 @@ return []; | ||
outAnnotation.collection = parseCollection(annotation.Collection, currentAnnotationTarget, annotationsLists); | ||
} else if (keys.length === 1) { | ||
outAnnotation.value = parseExpression( | ||
{ [keys[0]]: (annotation as any)[keys[0]] }, | ||
currentAnnotationTarget, | ||
annotationsLists | ||
); | ||
} else if (keys.length > 1) { | ||
@@ -872,2 +909,13 @@ // TODO Full Coverage | ||
}); | ||
if (associations.length > 0) { | ||
entityTypes.forEach(entityType => { | ||
entityType.navigationProperties.forEach(navProp => { | ||
const v2NavProp: V2NavigationProperty = navProp as V2NavigationProperty; | ||
const association = associations.find(assoc => assoc.fullyQualifiedName === v2NavProp.relationship); | ||
if (association && association.referentialConstraints) { | ||
v2NavProp.referentialConstraint = association.referentialConstraints; | ||
} | ||
}); | ||
}); | ||
} | ||
@@ -874,0 +922,0 @@ parseAnnotationLists(ensureArray(edmSchema.Annotations), annotations); |
@@ -6,2 +6,233 @@ # Change Log | ||
## [0.3.10](https://github.wdf.sap.corp/ux-engineering/annotations-vocabularies-tools/compare/ms/0.3.9...ms/0.3.10) (2021-02-15) | ||
**Note:** Version bump only for package @sap-ux/vocabularies-types | ||
## [0.3.9](https://github.wdf.sap.corp/ux-engineering/annotations-vocabularies-tools/compare/ms/0.3.8...ms/0.3.9) (2021-02-12) | ||
**Note:** Version bump only for package @sap-ux/vocabularies-types | ||
## [0.3.8](https://github.wdf.sap.corp/ux-engineering/annotations-vocabularies-tools/compare/ms/0.3.7...ms/0.3.8) (2021-02-10) | ||
**Note:** Version bump only for package @sap-ux/vocabularies-types | ||
## [0.3.7](https://github.wdf.sap.corp/ux-engineering/annotations-vocabularies-tools/compare/ms/0.3.6...ms/0.3.7) (2021-02-05) | ||
**Note:** Version bump only for package @sap-ux/vocabularies-types | ||
## [0.3.6](https://github.wdf.sap.corp/ux-engineering/annotations-vocabularies-tools/compare/ms/0.3.4...ms/0.3.6) (2021-02-05) | ||
### Features | ||
* Add missing types on terms ([64a7e8f](https://github.wdf.sap.corp/ux-engineering/annotations-vocabularies-tools/commit/64a7e8f0795e6195d38a022e36a030bc474c4af0)) | ||
## [0.3.5](https://github.wdf.sap.corp/ux-engineering/annotations-vocabularies-tools/compare/ms/0.3.4...ms/0.3.5) (2021-02-05) | ||
### Features | ||
* Add missing types on terms ([64a7e8f](https://github.wdf.sap.corp/ux-engineering/annotations-vocabularies-tools/commit/64a7e8f0795e6195d38a022e36a030bc474c4af0)) | ||
## [0.3.4](https://github.wdf.sap.corp/ux-engineering/annotations-vocabularies-tools/compare/ms/0.3.3...ms/0.3.4) (2021-02-05) | ||
### Features | ||
* Improve the resolution logic to fix some bugs and add extra tests ([ada3a26](https://github.wdf.sap.corp/ux-engineering/annotations-vocabularies-tools/commit/ada3a2682b36cb2c5104451c9c85737f17aef0be)) | ||
## [0.3.3](https://github.wdf.sap.corp/ux-engineering/annotations-vocabularies-tools/compare/ms/0.3.2...ms/0.3.3) (2021-02-01) | ||
**Note:** Version bump only for package @sap-ux/vocabularies-types | ||
## [0.3.2](https://github.wdf.sap.corp/ux-engineering/annotations-vocabularies-tools/compare/ms/0.3.1...ms/0.3.2) (2021-01-27) | ||
**Note:** Version bump only for package @sap-ux/vocabularies-types | ||
## [0.3.1](https://github.wdf.sap.corp/ux-engineering/annotations-vocabularies-tools/compare/ms/0.2.52...ms/0.3.1) (2020-12-28) | ||
### Features | ||
* 0.3.0 primitives are now no longer primitive... ([5bfd3d6](https://github.wdf.sap.corp/ux-engineering/annotations-vocabularies-tools/commit/5bfd3d6c8b60d09a8cbcc0b30f2ad8e5eee3feb0)) | ||
* slight type change ([4b5c1e4](https://github.wdf.sap.corp/ux-engineering/annotations-vocabularies-tools/commit/4b5c1e4e468c59fbf5e9ad47864a13e71e7cc42e)) | ||
# [0.3.0](https://github.wdf.sap.corp/ux-engineering/annotations-vocabularies-tools/compare/ms/0.2.52...ms/0.3.0) (2020-12-28) | ||
**Note:** Version bump only for package @sap-ux/vocabularies-types | ||
## [0.2.52](https://github.wdf.sap.corp/ux-engineering/annotations-vocabularies-tools/compare/ms/0.2.50...ms/0.2.52) (2020-12-17) | ||
### Features | ||
* add proper support for anntotation of basic annotation type (only string to avoid too much impact) ([ef26f9d](https://github.wdf.sap.corp/ux-engineering/annotations-vocabularies-tools/commit/ef26f9df83d3f7deea0e7b277e9a05d2f2762e7c)) | ||
## [0.2.51](https://github.wdf.sap.corp/ux-engineering/annotations-vocabularies-tools/compare/ms/0.2.50...ms/0.2.51) (2020-12-17) | ||
### Features | ||
* add proper support for anntotation of basic annotation type (only string to avoid too much impact) ([ef26f9d](https://github.wdf.sap.corp/ux-engineering/annotations-vocabularies-tools/commit/ef26f9df83d3f7deea0e7b277e9a05d2f2762e7c)) | ||
## [0.2.50](https://github.wdf.sap.corp/ux-engineering/annotations-vocabularies-tools/compare/ms/0.2.49...ms/0.2.50) (2020-12-11) | ||
### Features | ||
* include entity container in output ([e130356](https://github.wdf.sap.corp/ux-engineering/annotations-vocabularies-tools/commit/e1303565b46e517f4a5ea7ad3016c2b99b90add1)) | ||
## [0.2.49](https://github.wdf.sap.corp/ux-engineering/annotations-vocabularies-tools/compare/ms/0.2.48...ms/0.2.49) (2020-12-11) | ||
**Note:** Version bump only for package @sap-ux/vocabularies-types | ||
## [0.2.48](https://github.wdf.sap.corp/ux-engineering/annotations-vocabularies-tools/compare/ms/0.2.47...ms/0.2.48) (2020-12-02) | ||
**Note:** Version bump only for package @sap-ux/vocabularies-types | ||
## [0.2.47](https://github.wdf.sap.corp/ux-engineering/annotations-vocabularies-tools/compare/ms/0.2.46...ms/0.2.47) (2020-12-01) | ||
### Features | ||
* properly support v2 ref constraints ([a649881](https://github.wdf.sap.corp/ux-engineering/annotations-vocabularies-tools/commit/a649881d47cfeff95d5fd415db27d0961d5a4eef)) | ||
## [0.2.46](https://github.wdf.sap.corp/ux-engineering/annotations-vocabularies-tools/compare/ms/0.2.44...ms/0.2.46) (2020-11-17) | ||
**Note:** Version bump only for package @sap-ux/vocabularies-types | ||
## [0.2.45](https://github.wdf.sap.corp/ux-engineering/annotations-vocabularies-tools/compare/ms/0.2.44...ms/0.2.45) (2020-11-17) | ||
**Note:** Version bump only for package @sap-ux/vocabularies-types | ||
## [0.2.44](https://github.wdf.sap.corp/ux-engineering/annotations-vocabularies-tools/compare/ms/0.2.43...ms/0.2.44) (2020-11-13) | ||
**Note:** Version bump only for package @sap-ux/vocabularies-types | ||
## [0.2.43](https://github.wdf.sap.corp/ux-engineering/annotations-vocabularies-tools/compare/ms/0.2.42...ms/0.2.43) (2020-11-05) | ||
**Note:** Version bump only for package @sap-ux/vocabularies-types | ||
## [0.2.42](https://github.wdf.sap.corp/ux-engineering/annotations-vocabularies-tools/compare/ms/0.2.41...ms/0.2.42) (2020-11-05) | ||
**Note:** Version bump only for package @sap-ux/vocabularies-types | ||
## [0.2.41](https://github.wdf.sap.corp/ux-engineering/annotations-vocabularies-tools/compare/ms/0.2.40...ms/0.2.41) (2020-11-05) | ||
### Features | ||
* resolve path with $Path ([3bf3cce](https://github.wdf.sap.corp/ux-engineering/annotations-vocabularies-tools/commit/3bf3ccea4ae581bd7dfd2ea08eef8d51bfa5adcd)) | ||
## [0.2.40](https://github.wdf.sap.corp/ux-engineering/annotations-vocabularies-tools/compare/ms/0.2.39...ms/0.2.40) (2020-10-18) | ||
### Features | ||
* better typing for Apply ([4f4777e](https://github.wdf.sap.corp/ux-engineering/annotations-vocabularies-tools/commit/4f4777e0f8bb2c832d1bb7a26c18cdc8d8ba84e9)) | ||
## [0.2.39](https://github.wdf.sap.corp/ux-engineering/annotations-vocabularies-tools/compare/ms/0.2.38...ms/0.2.39) (2020-10-14) | ||
**Note:** Version bump only for package @sap-ux/vocabularies-types | ||
## [0.2.38](https://github.wdf.sap.corp/ux-engineering/annotations-vocabularies-tools/compare/ms/0.2.37...ms/0.2.38) (2020-10-13) | ||
@@ -8,0 +239,0 @@ |
@@ -1,2 +0,2 @@ | ||
import { Property as ParserProperty, EntityType as ParserEntityType, EntitySet as ParserEntitySet, Action as ParserAction, ComplexType as ParserComplexType, Reference, ReferentialConstraint } from "./Parser"; | ||
import { Property as ParserProperty, EntityType as ParserEntityType, EntitySet as ParserEntitySet, Action as ParserAction, ComplexType as ParserComplexType, EntityContainer as ParserEntityContainer, Reference, ReferentialConstraint } from "./Parser"; | ||
import { Annotation as EdmAnnotation, AnnotationList, FullyQualifiedName, SimpleIdentifier } from "./BaseEdm"; | ||
@@ -42,2 +42,6 @@ import { ActionAnnotations, ActionImportAnnotations, AnnotationAnnotations, ComplexTypeAnnotations, EntityContainerAnnotations, EntitySetAnnotations, EntityTypeAnnotations, EnumTypeAnnotations, FunctionAnnotations, FunctionImportAnnotations, IncludeAnnotations, NavigationPropertyAnnotations, ParameterAnnotations, PropertyAnnotations, ReferenceAnnotations, ReturnTypeAnnotations, SchemaAnnotations, SingletonAnnotations, TermAnnotations, TypeDefinitionAnnotations, PropertyValueAnnotations, RecordAnnotations } from "./generated/Edm_Types"; | ||
}; | ||
export declare type EntityContainer = ParserEntityContainer & { | ||
_type: "EntityContainer"; | ||
annotations: EntityContainerAnnotations; | ||
}; | ||
export declare type Action = ParserAction & { | ||
@@ -56,5 +60,11 @@ _type: "Action"; | ||
}; | ||
export declare type ServiceObject = EntitySet | EntityType | Property | ComplexType | NavigationProperty | Action | EntityContainer; | ||
export declare type ServiceObjectAndAnnotation = ServiceObject | AnyAnnotation; | ||
export declare type Annotation = EdmAnnotation & { | ||
fullyQualifiedName: string; | ||
}; | ||
export declare type ResolutionTarget<T> = { | ||
target: null | T; | ||
objectPath: ServiceObjectAndAnnotation[]; | ||
}; | ||
export declare type ConverterOutput = { | ||
@@ -65,2 +75,3 @@ version: string; | ||
actions: Action[]; | ||
entityContainer: EntityContainer; | ||
complexTypes: ComplexType[]; | ||
@@ -73,2 +84,3 @@ entitySets: EntitySet[]; | ||
}[]; | ||
resolvePath: <T>(path: string) => ResolutionTarget<T>; | ||
}; | ||
@@ -75,0 +87,0 @@ export declare function Decimal(value: number): { |
@@ -19,3 +19,3 @@ import { EntityType as _EntityType, Action as _Action, Property, NavigationProperty } from "./Converter"; | ||
}; | ||
declare type PrimitiveTypeCast<P, G> = (P extends boolean ? boolean | (BooleanConstructor & G) : never) | (P extends number ? number | (NumberConstructor & G) : never) | (P extends string ? string | (StringConstructor & G) : never) | (P & G); | ||
declare type PrimitiveTypeCast<P, G> = (P extends boolean ? boolean | (Boolean & G) : never) | (P extends number ? number | (Number & G) : never) | (P extends string ? string | (String & G) : never) | (P & G); | ||
export declare type AnnotationTerm<P> = PrimitiveTypeCast<P, { | ||
@@ -35,4 +35,4 @@ fullyQualifiedName: string; | ||
type: "Apply"; | ||
value: any; | ||
getValue(): P; | ||
Apply: PropertyAnnotationValue<P>[]; | ||
Function: "odata.concat"; | ||
}; | ||
@@ -78,13 +78,11 @@ export declare type EqConditionalExpression = { | ||
export declare type PropertyAnnotationValue<P> = P | PathAnnotationExpression<P> | ApplyAnnotationExpression<P> | IfAnnotationExpression<P>; | ||
export declare type String = string; | ||
export declare type InstancePath = string; | ||
export declare type Boolean = boolean; | ||
export declare type Byte = number; | ||
export declare type Int16 = number; | ||
export declare type Int32 = number; | ||
export declare type Int64 = number; | ||
export declare type Byte = Number; | ||
export declare type Int16 = Number; | ||
export declare type Int32 = Number; | ||
export declare type Int64 = Number; | ||
export declare type Time = string; | ||
export declare type Binary = string; | ||
export declare type Decimal = number; | ||
export declare type Double = number; | ||
export declare type Decimal = Number; | ||
export declare type Double = Number; | ||
export declare type Date = string; | ||
@@ -100,4 +98,6 @@ export declare type Guid = any; | ||
}; | ||
export declare type String = InstanceType<StringConstructor>; | ||
export declare type Boolean = InstanceType<BooleanConstructor>; | ||
export declare type EntityType = _EntityType; | ||
export declare type Action = _Action; | ||
export {}; |
@@ -11,4 +11,2 @@ import * as Org_OData_Aggregation_V1 from "./Aggregation"; | ||
export interface EntityTypeAnnotations_Aggregation { | ||
"ApplySupported"?: Org_OData_Aggregation_V1.ApplySupported; | ||
"CustomAggregate"?: Org_OData_Aggregation_V1.CustomAggregate; | ||
"LeveledHierarchy"?: Org_OData_Aggregation_V1.LeveledHierarchy; | ||
@@ -43,2 +41,4 @@ "RecursiveHierarchy"?: Org_OData_Aggregation_V1.RecursiveHierarchy; | ||
export interface EntitySetAnnotations_Aggregation { | ||
"ApplySupported"?: Org_OData_Aggregation_V1.ApplySupported; | ||
"CustomAggregate"?: Org_OData_Aggregation_V1.CustomAggregate; | ||
} | ||
@@ -45,0 +45,0 @@ export interface SingletonAnnotations_Aggregation { |
import * as Core from "./Core"; | ||
import * as Capabilities from "./Capabilities"; | ||
import * as Edm from "../Edm"; | ||
@@ -13,24 +14,47 @@ import AnnotationTerm = Edm.AnnotationTerm; | ||
/** | ||
Transformations that can be used in $apply | ||
Transformations that can be used in `$apply` | ||
*/ | ||
Transformations: PropertyAnnotationValue<Edm.String[]>; | ||
/** | ||
Qualified names of custom aggregation methods that can be used in aggregate(...with...) | ||
Qualified names of custom aggregation methods that can be used in `aggregate(...with...)` | ||
*/ | ||
CustomAggregationMethods: PropertyAnnotationValue<Edm.String[]>; | ||
/** | ||
The service supports rollup hierarchies in a groupby transformation | ||
The service supports rollup hierarchies in a `groupby` transformation | ||
*/ | ||
Rollup: RollupType; | ||
/** | ||
Only properties tagged as Groupable can be used in the groupby transformation, and only those tagged as Aggregatable can be used in the aggregate transformation | ||
Only properties marked as `Groupable` can be used in the `groupby` transformation, and only those marked as `Aggregatable` can be used in the `aggregate` transformation | ||
*/ | ||
PropertyRestrictions: PropertyAnnotationValue<Edm.Boolean>; | ||
/** | ||
Properties supported by the `groupby` transformation. Setting this collection implies that `PropertyRestrictions` is true | ||
*/ | ||
GroupableProperties: PropertyAnnotationValue<Edm.PropertyPath[]>; | ||
/** | ||
Properties supported by the `aggregate` transformation. Setting this collection implies that `PropertyRestrictions` is true | ||
*/ | ||
AggregatableProperties: AnnotationTerm<AggregatablePropertyTypeTypes[]>; | ||
}; | ||
export declare type AggregatablePropertyType = ComplexType & { | ||
$Type: AggregationAnnotationTypes.AggregatablePropertyType; | ||
/** | ||
Aggregatable property | ||
*/ | ||
Property: PropertyAnnotationValue<Edm.PropertyPath>; | ||
/** | ||
Standard and custom aggregation methods than can be applied to the property. If omitted, all aggregation methods can be applied | ||
*/ | ||
SupportedAggregationMethods: PropertyAnnotationValue<Edm.String[]>; | ||
/** | ||
Recommended method for aggregating values of the property | ||
*/ | ||
RecommendedAggregationMethod?: PropertyAnnotationValue<Edm.String>; | ||
}; | ||
/** | ||
The number of rollup operators allowed in a groupby transformation | ||
The number of `rollup` operators allowed in a `groupby` transformation | ||
*/ | ||
export declare const enum RollupType { | ||
/** | ||
No rollup support | ||
No `rollup` support | ||
*/ | ||
@@ -42,3 +66,3 @@ /** | ||
/** | ||
Only one rollup operator per groupby | ||
Only one `rollup` operator per `groupby` | ||
*/ | ||
@@ -50,3 +74,3 @@ /** | ||
/** | ||
Full rollup support | ||
Full `rollup` support | ||
*/ | ||
@@ -59,11 +83,11 @@ /** | ||
/** | ||
This property can be used in the groupby transformation | ||
This property can be used in the `groupby` transformation | ||
*/ | ||
export declare type Groupable = AnnotationTerm<PropertyAnnotationValue<Core.Tag>>; | ||
/** | ||
This property can be used in the aggregate transformation | ||
This property can be used in the `aggregate` transformation | ||
*/ | ||
export declare type Aggregatable = AnnotationTerm<PropertyAnnotationValue<Core.Tag>>; | ||
/** | ||
Dynamic property that can be used in the aggregate transformation | ||
Dynamic property that can be used in the `aggregate` transformation | ||
*/ | ||
@@ -123,3 +147,3 @@ export declare type CustomAggregate = AnnotationTerm<PropertyAnnotationValue<Edm.String>>; | ||
/** | ||
This action or function is available on aggregated entities if the RequiredProperties are still defined | ||
This action or function is available on aggregated entities if the `RequiredProperties` are still defined | ||
*/ | ||
@@ -134,2 +158,27 @@ export declare type AvailableOnAggregates = AnnotationTerm<AvailableOnAggregatesTypeTypes>; | ||
}; | ||
/** | ||
Aggregation capabilities on a navigation path | ||
*/ | ||
export declare type NavigationPropertyAggregationCapabilities = ComplexType & Omit<Capabilities.NavigationPropertyRestriction, "$Type"> & { | ||
$Type: AggregationAnnotationTypes.NavigationPropertyAggregationCapabilities; | ||
/** | ||
Support for `$apply` | ||
*/ | ||
ApplySupported?: AnnotationTerm<ApplySupportedTypeTypes>; | ||
/** | ||
Supported custom aggregates | ||
*/ | ||
CustomAggregates: AnnotationTerm<CustomAggregateTypeTypes[]>; | ||
}; | ||
export declare type CustomAggregateType = ComplexType & { | ||
$Type: AggregationAnnotationTypes.CustomAggregateType; | ||
/** | ||
Name of the dynamic property that can be used in the `aggregate` transformation | ||
*/ | ||
Name: PropertyAnnotationValue<Edm.String>; | ||
/** | ||
Qualified name of a primitive type. The aggregated value will be of that type | ||
*/ | ||
Type: PropertyAnnotationValue<Edm.String>; | ||
}; | ||
export declare const enum AggregationAnnotationTerms { | ||
@@ -147,7 +196,14 @@ ApplySupported = "Org.OData.Aggregation.V1.ApplySupported", | ||
ApplySupportedType = "Org.OData.Aggregation.V1.ApplySupportedType", | ||
AggregatablePropertyType = "Org.OData.Aggregation.V1.AggregatablePropertyType", | ||
RecursiveHierarchyType = "Org.OData.Aggregation.V1.RecursiveHierarchyType", | ||
AvailableOnAggregatesType = "Org.OData.Aggregation.V1.AvailableOnAggregatesType" | ||
AvailableOnAggregatesType = "Org.OData.Aggregation.V1.AvailableOnAggregatesType", | ||
NavigationPropertyAggregationCapabilities = "Org.OData.Aggregation.V1.NavigationPropertyAggregationCapabilities", | ||
CustomAggregateType = "Org.OData.Aggregation.V1.CustomAggregateType" | ||
} | ||
export declare type ApplySupportedTypeTypes = AnnotationTerm<ApplySupportedType>; | ||
export declare type AggregatablePropertyTypeTypes = AnnotationTerm<AggregatablePropertyType>; | ||
export declare type RecursiveHierarchyTypeTypes = AnnotationTerm<RecursiveHierarchyType>; | ||
export declare type AvailableOnAggregatesTypeTypes = AnnotationTerm<AvailableOnAggregatesType>; | ||
export declare type NavigationPropertyAggregationCapabilitiesTypes = AnnotationTerm<NavigationPropertyAggregationCapabilities>; | ||
export declare type NavigationPropertyRestrictionTypes = AnnotationTerm<Capabilities.NavigationPropertyRestriction | NavigationPropertyAggregationCapabilitiesTypes>; | ||
export declare type CustomAggregateTypeTypes = AnnotationTerm<CustomAggregateType>; |
@@ -44,3 +44,3 @@ import * as Core from "./Core"; | ||
*/ | ||
Name?: Common.SimpleIdentifier; | ||
Name: Common.SimpleIdentifier; | ||
/** | ||
@@ -47,0 +47,0 @@ Name of the standard or custom aggregation method to be applied. |
@@ -121,2 +121,3 @@ import * as com_sap_vocabularies_Common_v1 from "./Common"; | ||
"TextFor"?: com_sap_vocabularies_Common_v1.TextFor; | ||
"ExternalID"?: com_sap_vocabularies_Common_v1.ExternalID; | ||
"IsLanguageIdentifier"?: com_sap_vocabularies_Common_v1.IsLanguageIdentifier; | ||
@@ -123,0 +124,0 @@ "TextFormat"?: com_sap_vocabularies_Common_v1.TextFormat; |
@@ -40,2 +40,6 @@ import * as Core from "./Core"; | ||
/** | ||
A human readable identifier for values of the annotated property. Value MUST be a dynamic expression when used as metadata annotation. | ||
*/ | ||
export declare type ExternalID = AnnotationTerm<PropertyAnnotationValue<Edm.String>>; | ||
/** | ||
An identifier to distinguish multiple texts in different languages for the same entity | ||
@@ -392,6 +396,2 @@ */ | ||
/** | ||
Short text for value list that might be suitable for e.g. tool tips, fallback is the quickinfo of the property or parameter | ||
*/ | ||
QuickInfo?: PropertyAnnotationValue<Edm.String>; | ||
/** | ||
Resource path of an OData collection with possible values, relative to CollectionRoot | ||
@@ -456,6 +456,2 @@ */ | ||
/** | ||
Short text for value list that might be suitable for e.g. tool tips, fallback is the quickinfo of the property or parameter | ||
*/ | ||
QuickInfo?: PropertyAnnotationValue<Edm.String>; | ||
/** | ||
Resource path of an OData collection with possible values, relative to the document containing the value list mapping | ||
@@ -899,2 +895,3 @@ */ | ||
TextFor = "com.sap.vocabularies.Common.v1.TextFor", | ||
ExternalID = "com.sap.vocabularies.Common.v1.ExternalID", | ||
IsLanguageIdentifier = "com.sap.vocabularies.Common.v1.IsLanguageIdentifier", | ||
@@ -901,0 +898,0 @@ TextFormat = "com.sap.vocabularies.Common.v1.TextFormat", |
@@ -18,3 +18,2 @@ import * as com_sap_vocabularies_PersonalData_v1 from "./PersonalData"; | ||
"IsPotentiallySensitive"?: com_sap_vocabularies_PersonalData_v1.IsPotentiallySensitive; | ||
"IsUserID"?: com_sap_vocabularies_PersonalData_v1.IsUserID; | ||
} | ||
@@ -21,0 +20,0 @@ export interface NavigationPropertyAnnotations_PersonalData { |
@@ -37,6 +37,2 @@ import * as Core from "./Core"; | ||
export declare type IsPotentiallySensitive = AnnotationTerm<PropertyAnnotationValue<Core.Tag>>; | ||
/** | ||
Property contains a user id | ||
*/ | ||
export declare type IsUserID = AnnotationTerm<PropertyAnnotationValue<Core.Tag>>; | ||
export declare const enum PersonalDataAnnotationTerms { | ||
@@ -48,6 +44,5 @@ EntitySemantics = "com.sap.vocabularies.PersonalData.v1.EntitySemantics", | ||
IsPotentiallyPersonal = "com.sap.vocabularies.PersonalData.v1.IsPotentiallyPersonal", | ||
IsPotentiallySensitive = "com.sap.vocabularies.PersonalData.v1.IsPotentiallySensitive", | ||
IsUserID = "com.sap.vocabularies.PersonalData.v1.IsUserID" | ||
IsPotentiallySensitive = "com.sap.vocabularies.PersonalData.v1.IsPotentiallySensitive" | ||
} | ||
export declare const enum PersonalDataAnnotationTypes { | ||
} |
@@ -37,2 +37,5 @@ import * as com_sap_vocabularies_UI_v1 from "./UI"; | ||
"TextArrangement"?: com_sap_vocabularies_UI_v1.TextArrangement; | ||
"CreateHidden"?: com_sap_vocabularies_UI_v1.CreateHidden; | ||
"UpdateHidden"?: com_sap_vocabularies_UI_v1.UpdateHidden; | ||
"DeleteHidden"?: com_sap_vocabularies_UI_v1.DeleteHidden; | ||
"RecommendationState"?: com_sap_vocabularies_UI_v1.RecommendationState; | ||
@@ -76,2 +79,3 @@ } | ||
export interface ParameterAnnotations_UI { | ||
"Hidden"?: com_sap_vocabularies_UI_v1.Hidden; | ||
"ParameterDefaultValue"?: com_sap_vocabularies_UI_v1.ParameterDefaultValue; | ||
@@ -78,0 +82,0 @@ "RecommendationState"?: com_sap_vocabularies_UI_v1.RecommendationState; |
@@ -409,3 +409,3 @@ import * as Core from "./Core"; | ||
/** | ||
Very positive / blue status - above max stock - excess | ||
Very positive - above max stock - excess | ||
*/ | ||
@@ -415,3 +415,10 @@ /** | ||
*/ | ||
VeryPositive = "UI.CriticalityType/VeryPositive" | ||
VeryPositive = "UI.CriticalityType/VeryPositive", | ||
/** | ||
Information - noticable - informative | ||
*/ | ||
/** | ||
undefined | ||
*/ | ||
Information = "UI.CriticalityType/Information" | ||
} | ||
@@ -1282,3 +1289,3 @@ /** | ||
/** | ||
Code/ID and text are represented separately | ||
Code/ID and text are represented separately (code/ID will be shown and text can be visualized in a separate place) | ||
*/ | ||
@@ -1462,2 +1469,6 @@ /** | ||
/** | ||
The navigation intent is for that user with the selected context and parameters available | ||
*/ | ||
NavigationAvailable: PropertyAnnotationValue<Edm.Boolean>; | ||
/** | ||
Determines whether a context needs to be passed to the target of this navigation. | ||
@@ -1464,0 +1475,0 @@ */ |
@@ -81,2 +81,3 @@ import { AnnotationList, FullyQualifiedName, SimpleIdentifier } from "./BaseEdm"; | ||
associationEnd: AssociationEnd[]; | ||
referentialConstraints: ReferentialConstraint[]; | ||
}; | ||
@@ -83,0 +84,0 @@ export declare type AssociationSet = { |
{ | ||
"name": "@sap-ux/vocabularies-types", | ||
"version": "0.2.38", | ||
"version": "0.3.10", | ||
"main": "dist/index.js", | ||
@@ -12,4 +12,4 @@ "license": "Apache-2.0", | ||
"devDependencies": { | ||
"@sap-ux/vocabularies-csdl-types": "0.2.38", | ||
"@sap-ux/vocabularies-types-generator": "0.2.38", | ||
"@sap-ux/vocabularies-csdl-types": "0.3.10", | ||
"@sap-ux/vocabularies-types-generator": "0.3.10", | ||
"ts-node": "^8.5.0", | ||
@@ -16,0 +16,0 @@ "typescript": "^3.7.2" |
@@ -7,2 +7,3 @@ import { | ||
ComplexType as ParserComplexType, | ||
EntityContainer as ParserEntityContainer, | ||
Reference, | ||
@@ -104,2 +105,7 @@ ReferentialConstraint | ||
export type EntityContainer = ParserEntityContainer & { | ||
_type: "EntityContainer"; | ||
annotations: EntityContainerAnnotations; | ||
}; | ||
export type Action = ParserAction & { | ||
@@ -119,2 +125,12 @@ _type: "Action"; | ||
export type ServiceObject = | ||
| EntitySet | ||
| EntityType | ||
| Property | ||
| ComplexType | ||
| NavigationProperty | ||
| Action | ||
| EntityContainer; | ||
export type ServiceObjectAndAnnotation = ServiceObject | AnyAnnotation; | ||
export type Annotation = EdmAnnotation & { | ||
@@ -124,2 +140,7 @@ fullyQualifiedName: string; | ||
export type ResolutionTarget<T> = { | ||
target: null | T; | ||
objectPath: ServiceObjectAndAnnotation[]; | ||
}; | ||
export type ConverterOutput = { | ||
@@ -130,2 +151,3 @@ version: string; | ||
actions: Action[]; | ||
entityContainer: EntityContainer; | ||
complexTypes: ComplexType[]; | ||
@@ -136,2 +158,3 @@ entitySets: EntitySet[]; | ||
diagnostics: { message: string }[]; | ||
resolvePath: <T>(path: string) => ResolutionTarget<T>; | ||
}; | ||
@@ -138,0 +161,0 @@ |
@@ -26,5 +26,5 @@ // PURE EDM Types | ||
type PrimitiveTypeCast<P, G> = | ||
| (P extends boolean ? boolean | (BooleanConstructor & G) : never) | ||
| (P extends number ? number | (NumberConstructor & G) : never) | ||
| (P extends string ? string | (StringConstructor & G) : never) | ||
| (P extends boolean ? boolean | (Boolean & G) : never) | ||
| (P extends number ? number | (Number & G) : never) | ||
| (P extends string ? string | (String & G) : never) | ||
| (P & G); | ||
@@ -51,4 +51,4 @@ | ||
type: "Apply"; | ||
value: any; | ||
getValue(): P; | ||
Apply: PropertyAnnotationValue<P>[]; | ||
Function: "odata.concat"; | ||
}; | ||
@@ -125,13 +125,11 @@ | ||
export type String = string; | ||
export type InstancePath = string; | ||
export type Boolean = boolean; | ||
export type Byte = number; | ||
export type Int16 = number; | ||
export type Int32 = number; | ||
export type Int64 = number; | ||
export type Byte = Number; | ||
export type Int16 = Number; | ||
export type Int32 = Number; | ||
export type Int64 = Number; | ||
export type Time = string; | ||
export type Binary = string; | ||
export type Decimal = number; | ||
export type Double = number; | ||
export type Decimal = Number; | ||
export type Double = Number; | ||
@@ -186,3 +184,5 @@ export type Date = string; | ||
export type String = InstanceType<StringConstructor>; | ||
export type Boolean = InstanceType<BooleanConstructor>; | ||
export type EntityType = _EntityType; | ||
export type Action = _Action; |
@@ -17,4 +17,2 @@ import * as Org_OData_Aggregation_V1 from "./Aggregation"; | ||
export interface EntityTypeAnnotations_Aggregation { | ||
"ApplySupported"?: Org_OData_Aggregation_V1.ApplySupported; | ||
"CustomAggregate"?: Org_OData_Aggregation_V1.CustomAggregate; | ||
"LeveledHierarchy"?: Org_OData_Aggregation_V1.LeveledHierarchy; | ||
@@ -61,3 +59,6 @@ "RecursiveHierarchy"?: Org_OData_Aggregation_V1.RecursiveHierarchy; | ||
// Type containing all possible annotations to use for EntitySet | ||
export interface EntitySetAnnotations_Aggregation {} | ||
export interface EntitySetAnnotations_Aggregation { | ||
"ApplySupported"?: Org_OData_Aggregation_V1.ApplySupported; | ||
"CustomAggregate"?: Org_OData_Aggregation_V1.CustomAggregate; | ||
} | ||
@@ -64,0 +65,0 @@ // Type containing all possible annotations to use for Singleton |
import * as Core from "./Core"; | ||
import * as Capabilities from "./Capabilities"; | ||
import * as Edm from "../Edm"; | ||
@@ -18,26 +19,51 @@ import AnnotationTerm = Edm.AnnotationTerm; | ||
/** | ||
Transformations that can be used in $apply | ||
Transformations that can be used in `$apply` | ||
*/ | ||
Transformations: PropertyAnnotationValue<Edm.String[]>; | ||
/** | ||
Qualified names of custom aggregation methods that can be used in aggregate(...with...) | ||
Qualified names of custom aggregation methods that can be used in `aggregate(...with...)` | ||
*/ | ||
CustomAggregationMethods: PropertyAnnotationValue<Edm.String[]>; | ||
/** | ||
The service supports rollup hierarchies in a groupby transformation | ||
The service supports rollup hierarchies in a `groupby` transformation | ||
*/ | ||
Rollup: RollupType; | ||
/** | ||
Only properties tagged as Groupable can be used in the groupby transformation, and only those tagged as Aggregatable can be used in the aggregate transformation | ||
Only properties marked as `Groupable` can be used in the `groupby` transformation, and only those marked as `Aggregatable` can be used in the `aggregate` transformation | ||
*/ | ||
PropertyRestrictions: PropertyAnnotationValue<Edm.Boolean>; | ||
/** | ||
Properties supported by the `groupby` transformation. Setting this collection implies that `PropertyRestrictions` is true | ||
*/ | ||
GroupableProperties: PropertyAnnotationValue<Edm.PropertyPath[]>; | ||
/** | ||
Properties supported by the `aggregate` transformation. Setting this collection implies that `PropertyRestrictions` is true | ||
*/ | ||
AggregatableProperties: AnnotationTerm<AggregatablePropertyTypeTypes[]>; | ||
}; | ||
// ComplexType | ||
export type AggregatablePropertyType = ComplexType & { | ||
$Type: AggregationAnnotationTypes.AggregatablePropertyType; | ||
/** | ||
Aggregatable property | ||
*/ | ||
Property: PropertyAnnotationValue<Edm.PropertyPath>; | ||
/** | ||
Standard and custom aggregation methods than can be applied to the property. If omitted, all aggregation methods can be applied | ||
*/ | ||
SupportedAggregationMethods: PropertyAnnotationValue<Edm.String[]>; | ||
/** | ||
Recommended method for aggregating values of the property | ||
*/ | ||
RecommendedAggregationMethod?: PropertyAnnotationValue<Edm.String>; | ||
}; | ||
// EnumType | ||
/** | ||
The number of rollup operators allowed in a groupby transformation | ||
The number of `rollup` operators allowed in a `groupby` transformation | ||
*/ | ||
export const enum RollupType { | ||
/** | ||
No rollup support | ||
No `rollup` support | ||
*/ | ||
@@ -49,3 +75,3 @@ /** | ||
/** | ||
Only one rollup operator per groupby | ||
Only one `rollup` operator per `groupby` | ||
*/ | ||
@@ -57,3 +83,3 @@ /** | ||
/** | ||
Full rollup support | ||
Full `rollup` support | ||
*/ | ||
@@ -68,3 +94,3 @@ /** | ||
/** | ||
This property can be used in the groupby transformation | ||
This property can be used in the `groupby` transformation | ||
*/ | ||
@@ -75,3 +101,3 @@ export type Groupable = AnnotationTerm<PropertyAnnotationValue<Core.Tag>>; | ||
/** | ||
This property can be used in the aggregate transformation | ||
This property can be used in the `aggregate` transformation | ||
*/ | ||
@@ -82,3 +108,3 @@ export type Aggregatable = AnnotationTerm<PropertyAnnotationValue<Core.Tag>>; | ||
/** | ||
Dynamic property that can be used in the aggregate transformation | ||
Dynamic property that can be used in the `aggregate` transformation | ||
*/ | ||
@@ -159,3 +185,3 @@ export type CustomAggregate = AnnotationTerm<PropertyAnnotationValue<Edm.String>>; | ||
/** | ||
This action or function is available on aggregated entities if the RequiredProperties are still defined | ||
This action or function is available on aggregated entities if the `RequiredProperties` are still defined | ||
*/ | ||
@@ -173,2 +199,32 @@ export type AvailableOnAggregates = AnnotationTerm<AvailableOnAggregatesTypeTypes>; | ||
// ComplexType | ||
/** | ||
Aggregation capabilities on a navigation path | ||
*/ | ||
export type NavigationPropertyAggregationCapabilities = ComplexType & | ||
Omit<Capabilities.NavigationPropertyRestriction, "$Type"> & { | ||
$Type: AggregationAnnotationTypes.NavigationPropertyAggregationCapabilities; | ||
/** | ||
Support for `$apply` | ||
*/ | ||
ApplySupported?: AnnotationTerm<ApplySupportedTypeTypes>; | ||
/** | ||
Supported custom aggregates | ||
*/ | ||
CustomAggregates: AnnotationTerm<CustomAggregateTypeTypes[]>; | ||
}; | ||
// ComplexType | ||
export type CustomAggregateType = ComplexType & { | ||
$Type: AggregationAnnotationTypes.CustomAggregateType; | ||
/** | ||
Name of the dynamic property that can be used in the `aggregate` transformation | ||
*/ | ||
Name: PropertyAnnotationValue<Edm.String>; | ||
/** | ||
Qualified name of a primitive type. The aggregated value will be of that type | ||
*/ | ||
Type: PropertyAnnotationValue<Edm.String>; | ||
}; | ||
export const enum AggregationAnnotationTerms { | ||
@@ -186,8 +242,17 @@ ApplySupported = "Org.OData.Aggregation.V1.ApplySupported", | ||
ApplySupportedType = "Org.OData.Aggregation.V1.ApplySupportedType", | ||
AggregatablePropertyType = "Org.OData.Aggregation.V1.AggregatablePropertyType", | ||
RecursiveHierarchyType = "Org.OData.Aggregation.V1.RecursiveHierarchyType", | ||
AvailableOnAggregatesType = "Org.OData.Aggregation.V1.AvailableOnAggregatesType" | ||
AvailableOnAggregatesType = "Org.OData.Aggregation.V1.AvailableOnAggregatesType", | ||
NavigationPropertyAggregationCapabilities = "Org.OData.Aggregation.V1.NavigationPropertyAggregationCapabilities", | ||
CustomAggregateType = "Org.OData.Aggregation.V1.CustomAggregateType" | ||
} | ||
export type ApplySupportedTypeTypes = AnnotationTerm<ApplySupportedType>; | ||
export type AggregatablePropertyTypeTypes = AnnotationTerm<AggregatablePropertyType>; | ||
export type RecursiveHierarchyTypeTypes = AnnotationTerm<RecursiveHierarchyType>; | ||
export type AvailableOnAggregatesTypeTypes = AnnotationTerm<AvailableOnAggregatesType>; | ||
export type NavigationPropertyAggregationCapabilitiesTypes = AnnotationTerm<NavigationPropertyAggregationCapabilities>; | ||
export type NavigationPropertyRestrictionTypes = AnnotationTerm< | ||
Capabilities.NavigationPropertyRestriction | NavigationPropertyAggregationCapabilitiesTypes | ||
>; | ||
export type CustomAggregateTypeTypes = AnnotationTerm<CustomAggregateType>; |
@@ -63,3 +63,3 @@ import * as Core from "./Core"; | ||
*/ | ||
Name?: Common.SimpleIdentifier; | ||
Name: Common.SimpleIdentifier; | ||
/** | ||
@@ -66,0 +66,0 @@ Name of the standard or custom aggregation method to be applied. |
@@ -135,2 +135,3 @@ import * as com_sap_vocabularies_Common_v1 from "./Common"; | ||
"TextFor"?: com_sap_vocabularies_Common_v1.TextFor; | ||
"ExternalID"?: com_sap_vocabularies_Common_v1.ExternalID; | ||
"IsLanguageIdentifier"?: com_sap_vocabularies_Common_v1.IsLanguageIdentifier; | ||
@@ -137,0 +138,0 @@ "TextFormat"?: com_sap_vocabularies_Common_v1.TextFormat; |
@@ -61,2 +61,8 @@ import * as Core from "./Core"; | ||
/** | ||
A human readable identifier for values of the annotated property. Value MUST be a dynamic expression when used as metadata annotation. | ||
*/ | ||
export type ExternalID = AnnotationTerm<PropertyAnnotationValue<Edm.String>>; | ||
// Term | ||
/** | ||
An identifier to distinguish multiple texts in different languages for the same entity | ||
@@ -515,6 +521,2 @@ */ | ||
/** | ||
Short text for value list that might be suitable for e.g. tool tips, fallback is the quickinfo of the property or parameter | ||
*/ | ||
QuickInfo?: PropertyAnnotationValue<Edm.String>; | ||
/** | ||
Resource path of an OData collection with possible values, relative to CollectionRoot | ||
@@ -593,6 +595,2 @@ */ | ||
/** | ||
Short text for value list that might be suitable for e.g. tool tips, fallback is the quickinfo of the property or parameter | ||
*/ | ||
QuickInfo?: PropertyAnnotationValue<Edm.String>; | ||
/** | ||
Resource path of an OData collection with possible values, relative to the document containing the value list mapping | ||
@@ -1159,2 +1157,3 @@ */ | ||
TextFor = "com.sap.vocabularies.Common.v1.TextFor", | ||
ExternalID = "com.sap.vocabularies.Common.v1.ExternalID", | ||
IsLanguageIdentifier = "com.sap.vocabularies.Common.v1.IsLanguageIdentifier", | ||
@@ -1161,0 +1160,0 @@ TextFormat = "com.sap.vocabularies.Common.v1.TextFormat", |
@@ -26,3 +26,2 @@ import * as com_sap_vocabularies_PersonalData_v1 from "./PersonalData"; | ||
"IsPotentiallySensitive"?: com_sap_vocabularies_PersonalData_v1.IsPotentiallySensitive; | ||
"IsUserID"?: com_sap_vocabularies_PersonalData_v1.IsUserID; | ||
} | ||
@@ -29,0 +28,0 @@ |
@@ -57,8 +57,2 @@ import * as Core from "./Core"; | ||
export type IsPotentiallySensitive = AnnotationTerm<PropertyAnnotationValue<Core.Tag>>; | ||
// Term | ||
/** | ||
Property contains a user id | ||
*/ | ||
export type IsUserID = AnnotationTerm<PropertyAnnotationValue<Core.Tag>>; | ||
export const enum PersonalDataAnnotationTerms { | ||
@@ -70,5 +64,4 @@ EntitySemantics = "com.sap.vocabularies.PersonalData.v1.EntitySemantics", | ||
IsPotentiallyPersonal = "com.sap.vocabularies.PersonalData.v1.IsPotentiallyPersonal", | ||
IsPotentiallySensitive = "com.sap.vocabularies.PersonalData.v1.IsPotentiallySensitive", | ||
IsUserID = "com.sap.vocabularies.PersonalData.v1.IsUserID" | ||
IsPotentiallySensitive = "com.sap.vocabularies.PersonalData.v1.IsPotentiallySensitive" | ||
} | ||
export const enum PersonalDataAnnotationTypes {} |
@@ -45,2 +45,5 @@ import * as com_sap_vocabularies_UI_v1 from "./UI"; | ||
"TextArrangement"?: com_sap_vocabularies_UI_v1.TextArrangement; | ||
"CreateHidden"?: com_sap_vocabularies_UI_v1.CreateHidden; | ||
"UpdateHidden"?: com_sap_vocabularies_UI_v1.UpdateHidden; | ||
"DeleteHidden"?: com_sap_vocabularies_UI_v1.DeleteHidden; | ||
"RecommendationState"?: com_sap_vocabularies_UI_v1.RecommendationState; | ||
@@ -98,2 +101,3 @@ } | ||
export interface ParameterAnnotations_UI { | ||
"Hidden"?: com_sap_vocabularies_UI_v1.Hidden; | ||
"ParameterDefaultValue"?: com_sap_vocabularies_UI_v1.ParameterDefaultValue; | ||
@@ -100,0 +104,0 @@ "RecommendationState"?: com_sap_vocabularies_UI_v1.RecommendationState; |
@@ -459,3 +459,3 @@ import * as Core from "./Core"; | ||
/** | ||
Very positive / blue status - above max stock - excess | ||
Very positive - above max stock - excess | ||
*/ | ||
@@ -465,3 +465,10 @@ /** | ||
*/ | ||
VeryPositive = "UI.CriticalityType/VeryPositive" | ||
VeryPositive = "UI.CriticalityType/VeryPositive", | ||
/** | ||
Information - noticable - informative | ||
*/ | ||
/** | ||
undefined | ||
*/ | ||
Information = "UI.CriticalityType/Information" | ||
} | ||
@@ -1461,3 +1468,3 @@ | ||
/** | ||
Code/ID and text are represented separately | ||
Code/ID and text are represented separately (code/ID will be shown and text can be visualized in a separate place) | ||
*/ | ||
@@ -1676,2 +1683,6 @@ /** | ||
/** | ||
The navigation intent is for that user with the selected context and parameters available | ||
*/ | ||
NavigationAvailable: PropertyAnnotationValue<Edm.Boolean>; | ||
/** | ||
Determines whether a context needs to be passed to the target of this navigation. | ||
@@ -1678,0 +1689,0 @@ */ |
@@ -94,2 +94,3 @@ import { AnnotationList, FullyQualifiedName, SimpleIdentifier } from "./BaseEdm"; | ||
associationEnd: AssociationEnd[]; | ||
referentialConstraints: ReferentialConstraint[]; | ||
}; | ||
@@ -96,0 +97,0 @@ |
{ | ||
"name": "@sap/ux-specification", | ||
"version": "1.71.24", | ||
"version": "1.71.25", | ||
"displayName": "SAP Fiori tools - Specification", | ||
@@ -15,4 +15,4 @@ "description": "SAP Fiori tools - Specification", | ||
"engines": { | ||
"node": ">=8.11.2 || >=10.19.0 || >=12.0.0", | ||
"yarn": ">=1.22.4" | ||
"node": "8.11.2 || 10.17.0 || 10.19.0 || >=10.20.0 <11.0.0 || >=12.18.3", | ||
"yarn": ">=1.22.5" | ||
}, | ||
@@ -29,4 +29,5 @@ "scripts": { | ||
"lint:summary": "eslint . --ext .ts -f summary", | ||
"lint:fix": "eslint . --ext .ts --fix", | ||
"lint:report": "eslint . --ext .ts -o reports/lint/eslint.jslint.xml -f jslint-xml", | ||
"lint:fix": "eslint . --report-unused-disable-directives --ext .ts --fix", | ||
"lint:report": "eslint . --report-unused-disable-directives --ext .ts -f multiple", | ||
"lint:report:jslint": "eslint . --report-unused-disable-directives --ext .ts -o reports/lint/eslint.jslint.xml -f jslint-xml", | ||
"docuV2": "node dist/scripts/extractDocu.js --version=v2 format=excel", | ||
@@ -36,3 +37,3 @@ "docuV4": "node dist/scripts/extractDocu.js --version=v4 format=excel", | ||
"iXiaSoftV4": "node dist/scripts/extractDocu.js --version=v4 --format=iXiaSoft", | ||
"postpublish": "npm dist-tag add @sap/ux-specification@1.71.24 UI5-1.72 && npm dist-tag add @sap/ux-specification@1.71.24 UI5-1.73 && npm dist-tag add @sap/ux-specification@1.71.24 UI5-1.74 && npm dist-tag add @sap/ux-specification@1.71.24 UI5-1.75 && npm dist-tag add @sap/ux-specification@1.71.24 UI5-1.76 && npm dist-tag add @sap/ux-specification@1.71.24 UI5-1.77" | ||
"postpublish": "gulp postpublish --tags=UI5-1.72,UI5-1.73,UI5-1.74,UI5-1.75,UI5-1.76,UI5-1.77" | ||
}, | ||
@@ -49,2 +50,3 @@ "publisher": "SAPSE", | ||
"eslint": "7.18.0", | ||
"eslint-formatter-multiple": "1.0.0", | ||
"eslint-plugin-prettier": "3.3.1", | ||
@@ -65,11 +67,11 @@ "excel4node": "1.7.2", | ||
"dependencies": { | ||
"@sap-ux/annotation-converter": "0.2.38", | ||
"@sap-ux/edmx-parser": "0.2.38", | ||
"@sap-ux/vocabularies-types": "0.2.38", | ||
"@sap-ux/annotation-converter": "0.3.10", | ||
"@sap-ux/edmx-parser": "0.3.10", | ||
"@sap-ux/vocabularies-types": "0.3.10", | ||
"@ui5/flexibility-utils": "0.1.3", | ||
"ejs": "3.1.5", | ||
"i18next": "19.8.4", | ||
"path": "0.12.7", | ||
"reflect-metadata": "0.1.13", | ||
"xml-js": "1.6.11", | ||
"i18next": "19.8.4" | ||
"xml-js": "1.6.11" | ||
}, | ||
@@ -90,3 +92,21 @@ "bundledDependencies": [ | ||
"reportPath": "reports/test/unit" | ||
}, | ||
"eslint-formatter-multiple": { | ||
"formatters": [ | ||
{ | ||
"name": "stylish", | ||
"output": "console" | ||
}, | ||
{ | ||
"name": "json", | ||
"output": "file", | ||
"path": "reports/lint/eslint.json" | ||
}, | ||
{ | ||
"name": "checkstyle", | ||
"output": "file", | ||
"path": "reports/lint/eslint.checkstyle.xml" | ||
} | ||
] | ||
} | ||
} |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is too big to display
2471363
460
40863
21