@sap-ux/ui5-application-writer 0.12.6 → 0.13.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -18,7 +18,7 @@ export declare function packageDefaults(version?: string, description?: string):
18
18
  */
19
19
  export declare function mergePackages(packageA: Partial<Package>, packageB: Partial<Package>): Package;
20
20
  /**
21
- * Returns an app instance with default properties. Every property must have a value for templating to succeed.
21
+ * Returns an app instance merged with default properties.
22
22
  *
23
23
  * @param {App} app - specifies the application properties
24
24
  * @returns {Partial<App>} the App instance
@@ -1 +1 @@
1
- {"version":3,"file":"defaults.d.ts","sourceRoot":"","sources":["../../src/data/defaults.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,EAAgB,MAAM,UAAU,CAAC;AAOhE;;;;;;GAMG;AACH,wBAAgB,eAAe,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAiBxF;AAED;;;;;;;;GAQG;AACH,wBAAgB,aAAa,CAAC,QAAQ,EAAE,OAAO,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,CAS7F;AACD;;;;;GAKG;AACH,wBAAgB,QAAQ,CAAC,GAAG,EAAE,GAAG,GAAG,GAAG,CActC;AAED,oBAAY,WAAW;IACnB,mBAAmB,KAAK;IACxB,yBAAyB,WAAW;IACpC,eAAe,WAAW;IAC1B,wBAAwB,WAAW;IACnC,yBAAyB,WAAW;IACpC,UAAU,wBAAwB;IAClC,WAAW,sCAAsC;IACjD,mBAAmB,WAAW;IAC9B,sBAAsB,YAAY;IAClC,gBAAgB,WAAW;CAC9B;AAGD,eAAO,MAAM,cAAc,UAA2B,CAAC;AAEvD;;;;;;GAMG;AACH,wBAAgB,QAAQ,CAAC,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,GAAG,GAAG,CAuB/C"}
1
+ {"version":3,"file":"defaults.d.ts","sourceRoot":"","sources":["../../src/data/defaults.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,EAAgB,MAAM,UAAU,CAAC;AAQhE;;;;;;GAMG;AACH,wBAAgB,eAAe,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAiBxF;AAED;;;;;;;;GAQG;AACH,wBAAgB,aAAa,CAAC,QAAQ,EAAE,OAAO,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,CAS7F;AACD;;;;;GAKG;AACH,wBAAgB,QAAQ,CAAC,GAAG,EAAE,GAAG,GAAG,GAAG,CAetC;AAED,oBAAY,WAAW;IACnB,mBAAmB,KAAK;IACxB,yBAAyB,WAAW;IACpC,eAAe,WAAW;IAC1B,wBAAwB,WAAW;IACnC,yBAAyB,WAAW;IACpC,UAAU,wBAAwB;IAClC,WAAW,sCAAsC;IACjD,mBAAmB,WAAW;IAC9B,sBAAsB,YAAY;IAClC,gBAAgB,WAAW;CAC9B;AAGD,eAAO,MAAM,cAAc,UAA2B,CAAC;AAEvD;;;;;;GAMG;AACH,wBAAgB,QAAQ,CAAC,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,GAAG,GAAG,CAuB/C"}
@@ -57,23 +57,27 @@ function mergePackages(packageA, packageB) {
57
57
  }
58
58
  exports.mergePackages = mergePackages;
59
59
  /**
60
- * Returns an app instance with default properties. Every property must have a value for templating to succeed.
60
+ * Returns an app instance merged with default properties.
61
61
  *
62
62
  * @param {App} app - specifies the application properties
63
63
  * @returns {Partial<App>} the App instance
64
64
  */
65
65
  function mergeApp(app) {
66
- var _a, _b;
67
- return Object.assign({
68
- version: '0.0.1',
69
- title: i18n_1.t('text.defaultAppTitle', { id: app.id }),
70
- description: i18n_1.t('text.defaultAppDescription', { id: app.id }),
71
- baseComponent: 'sap/ui/core/UIComponent',
72
- sourceTemplate: {
73
- id: ((_a = app.sourceTemplate) === null || _a === void 0 ? void 0 : _a.id) || '',
74
- version: ((_b = app.sourceTemplate) === null || _b === void 0 ? void 0 : _b.version) || ''
75
- }
76
- }, app);
66
+ var _a, _b, _c, _d, _e;
67
+ return json_merger_1.mergeObjects([
68
+ {
69
+ version: '0.0.1',
70
+ title: i18n_1.t('text.defaultAppTitle', { id: app.id }),
71
+ description: i18n_1.t('text.defaultAppDescription', { id: app.id }),
72
+ baseComponent: 'sap/ui/core/UIComponent',
73
+ sourceTemplate: {
74
+ id: (_b = (_a = app.sourceTemplate) === null || _a === void 0 ? void 0 : _a.id) !== null && _b !== void 0 ? _b : '',
75
+ version: (_d = (_c = app.sourceTemplate) === null || _c === void 0 ? void 0 : _c.version) !== null && _d !== void 0 ? _d : '',
76
+ toolsId: (_e = app.sourceTemplate) === null || _e === void 0 ? void 0 : _e.toolsId
77
+ }
78
+ },
79
+ app
80
+ ]);
77
81
  }
78
82
  exports.mergeApp = mergeApp;
79
83
  var UI5_DEFAULT;
@@ -133,18 +137,58 @@ function getMinUI5Version(ui5Version, minUI5Version) {
133
137
  return minUI5Version !== null && minUI5Version !== void 0 ? minUI5Version : (ui5Version ? ui5Version : UI5_DEFAULT.MIN_UI5_VERSION);
134
138
  }
135
139
  /**
136
- * Get the manifest descriptor version from the specified miminum UI5 version.
137
- * Snapshots are handled by coercion to proper versions.
140
+ * Get the manifest descriptor version from the specified UI5 version.
141
+ * Snapshots are handled by coercion to proper versions. If the version does not exist as an exact match
142
+ * the nearest version lower will be used.
138
143
  *
139
- * @param minUI5Version - the ui5 version to be used to map to the manifest descriptor version
144
+ * @param ui5Version - the ui5 version to be used to map to the manifest descriptor version
140
145
  * @param manifestVersion - optional manifest descriptor version to be used if provided
141
146
  * @returns - the manifest descriptor version
142
147
  */
143
- function getManifestVersion(minUI5Version, manifestVersion) {
148
+ function getManifestVersion(ui5Version, manifestVersion) {
144
149
  var _a;
145
- const minUI5SemVer = semver_1.default.coerce(minUI5Version);
146
- return ((_a = manifestVersion !== null && manifestVersion !== void 0 ? manifestVersion : (minUI5Version &&
147
- version_to_descriptor_mapping_json_1.default[`${semver_1.default.major(minUI5SemVer)}.${semver_1.default.minor(minUI5SemVer)}`])) !== null && _a !== void 0 ? _a : UI5_DEFAULT.MANIFEST_VERSION);
150
+ const ui5SemVer = semver_1.default.coerce(ui5Version);
151
+ /**
152
+ * Finds the closest manifest version for the specified ui5 version. This is determined
153
+ * by finding the closest lower ui5 version and returning its corresponding manifest version.
154
+ *
155
+ * @example For a version to manifest json containing :
156
+ * ```
157
+ * ...
158
+ * "1.90": "1.33.0",
159
+ * "1.88": "1.32.0"
160
+ * ...
161
+ * ```
162
+ * Specifiying version as `1.89.0` will return manifest version `1.32.0`
163
+ * @param version the ui5 version used to determine the closest manifest version
164
+ * @returns closest matching manifest version or undefined, if none found (below lowest value)
165
+ */
166
+ const getClosestManifestVersion = (version) => {
167
+ const verToManifestVer = version_to_descriptor_mapping_json_1.default;
168
+ let matchVersion = verToManifestVer[`${semver_1.default.major(version)}.${semver_1.default.minor(version)}`];
169
+ if (!matchVersion) {
170
+ const sortedSemVers = Object.keys(verToManifestVer)
171
+ .filter((ver) => ver !== 'latest')
172
+ .map((verStr) => semver_1.default.coerce(verStr))
173
+ .sort((a, b) => semver_1.default.rcompare(a, b));
174
+ const latestUI5SemVer = sortedSemVers[0];
175
+ // ui5 version is greater than the latest use the latest
176
+ if (semver_1.default.gt(version, latestUI5SemVer)) {
177
+ matchVersion = verToManifestVer[`${latestUI5SemVer.major}.${latestUI5SemVer.minor}`];
178
+ }
179
+ else {
180
+ // Find the nearest lower
181
+ const nearest = sortedSemVers.find((mapVer) => {
182
+ return semver_1.default.gt(version, mapVer);
183
+ });
184
+ if (nearest) {
185
+ matchVersion = verToManifestVer[`${nearest.major}.${nearest.minor}`];
186
+ }
187
+ }
188
+ }
189
+ return matchVersion;
190
+ };
191
+ return (_a = manifestVersion !== null && manifestVersion !== void 0 ? manifestVersion : (ui5SemVer && getClosestManifestVersion(ui5SemVer))) !== null && _a !== void 0 ? _a : UI5_DEFAULT.MANIFEST_VERSION;
148
192
  }
149
193
  /**
150
194
  * If a specific local version is provided, use it, otherwise, sync with version but keep minimum versions in mind.
@@ -1 +1 @@
1
- {"version":3,"file":"defaults.js","sourceRoot":"","sources":["../../src/data/defaults.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"defaults.js","sourceRoot":"","sources":["../../src/data/defaults.ts"],"names":[],"mappings":"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"}
@@ -1,5 +1,7 @@
1
1
  {
2
- "latest": "1.38.0",
2
+ "latest": "1.40.0",
3
+ "1.100": "1.40.0",
4
+ "1.99": "1.39.0",
3
5
  "1.98": "1.38.0",
4
6
  "1.96": "1.37.0",
5
7
  "1.95": "1.36.0",
package/dist/types.d.ts CHANGED
@@ -17,9 +17,22 @@ export interface App {
17
17
  baseComponent?: string;
18
18
  startFile?: string;
19
19
  localStartFile?: string;
20
+ /**
21
+ * Defines the template used by the generation tool
22
+ */
20
23
  sourceTemplate?: {
24
+ /**
25
+ * Identifies the source template used to generate the application. Set to empty string if not provided.
26
+ */
21
27
  id?: string;
28
+ /**
29
+ * Source template version. Set to empty string if not provided.
30
+ */
22
31
  version?: string;
32
+ /**
33
+ * Source template tools id. Optional property. Will not be written to manifest.json if not provided
34
+ */
35
+ toolsId?: string;
23
36
  };
24
37
  }
25
38
  export declare type UI5Framework = 'SAPUI5' | 'OpenUI5';
@@ -1 +1 @@
1
- {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,OAAO;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,eAAe,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACzC,GAAG,CAAC,EAAE;QACF,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;KAC3B,CAAC;CACL;AAED,MAAM,WAAW,GAAG;IAChB,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,cAAc,CAAC,EAAE;QACb,EAAE,CAAC,EAAE,MAAM,CAAC;QACZ,OAAO,CAAC,EAAE,MAAM,CAAC;KACpB,CAAC;CACL;AAED,oBAAY,YAAY,GAAG,QAAQ,GAAG,SAAS,CAAC;AAEhD,MAAM,WAAW,GAAG;IAChB,SAAS,EAAE,YAAY,CAAC;IACxB,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;IACrB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,OAAO,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAC3B,QAAQ,EAAE,MAAM,CAAC;CACpB;AAGD,MAAM,WAAW,UAAU;IACvB,UAAU,EAAE,OAAO,CAAC;IACpB,MAAM,EAAE,OAAO,CAAC;IAChB,KAAK,EAAE,OAAO,CAAC;IACf,aAAa,EAAE,OAAO,CAAC;CAC1B;AAED,MAAM,WAAW,MAAM;IACnB,GAAG,EAAE,GAAG,CAAC;IACT,UAAU,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC;IACjC,GAAG,CAAC,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC;IACnB,OAAO,EAAE,OAAO,CAAC;CACpB"}
1
+ {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,OAAO;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,eAAe,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACzC,GAAG,CAAC,EAAE;QACF,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;KAC3B,CAAC;CACL;AAED,MAAM,WAAW,GAAG;IAChB,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB;;OAEG;IACH,cAAc,CAAC,EAAE;QACb;;WAEG;QACH,EAAE,CAAC,EAAE,MAAM,CAAC;QACZ;;WAEG;QACH,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB;;WAEG;QACH,OAAO,CAAC,EAAE,MAAM,CAAC;KACpB,CAAC;CACL;AAED,oBAAY,YAAY,GAAG,QAAQ,GAAG,SAAS,CAAC;AAEhD,MAAM,WAAW,GAAG;IAChB,SAAS,EAAE,YAAY,CAAC;IACxB,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;IACrB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,OAAO,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAC3B,QAAQ,EAAE,MAAM,CAAC;CACpB;AAGD,MAAM,WAAW,UAAU;IACvB,UAAU,EAAE,OAAO,CAAC;IACpB,MAAM,EAAE,OAAO,CAAC;IAChB,KAAK,EAAE,OAAO,CAAC;IACf,aAAa,EAAE,OAAO,CAAC;CAC1B;AAED,MAAM,WAAW,MAAM;IACnB,GAAG,EAAE,GAAG,CAAC;IACT,UAAU,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC;IACjC,GAAG,CAAC,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC;IACnB,OAAO,EAAE,OAAO,CAAC;CACpB"}
package/package.json CHANGED
@@ -9,7 +9,7 @@
9
9
  "bugs": {
10
10
  "url": "https://github.com/SAP/open-ux-tools/issues?q=is%3Aopen+is%3Aissue+label%3Abug+label%3Aui5-application-writer"
11
11
  },
12
- "version": "0.12.6",
12
+ "version": "0.13.0",
13
13
  "license": "Apache-2.0",
14
14
  "main": "dist/index.js",
15
15
  "files": [
@@ -18,10 +18,10 @@
18
18
  "templates"
19
19
  ],
20
20
  "dependencies": {
21
- "@sap-ux/ui5-config": "0.13.1",
22
- "ejs": "3.1.6",
21
+ "@sap-ux/ui5-config": "0.13.2",
22
+ "ejs": "3.1.7",
23
23
  "mem-fs": "2.1.0",
24
- "mem-fs-editor": "9.0.0",
24
+ "mem-fs-editor": "9.4.0",
25
25
  "json-merger": "1.1.7",
26
26
  "semver": "7.3.5",
27
27
  "i18next": "21.6.11"
@@ -12,7 +12,8 @@
12
12
  "resources": "resources.json",
13
13
  "sourceTemplate": {
14
14
  "id": "<%= app.sourceTemplate.id %>",
15
- "version": "<%= app.sourceTemplate.version %>"
15
+ "version": "<%= app.sourceTemplate.version %>"<% if (app.sourceTemplate.toolsId) { %>,
16
+ "toolsId": "<%= app.sourceTemplate.toolsId %>"<% } %>
16
17
  }
17
18
  },
18
19
  "sap.ui": {