@sap-ux/ui5-application-writer 0.12.3 → 0.12.6
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.
- package/dist/data/defaults.js +4 -4
- package/dist/data/defaults.js.map +1 -1
- package/dist/data/index.js +4 -4
- package/dist/data/index.js.map +1 -1
- package/dist/data/ui5Libs.js +1 -2
- package/dist/data/ui5Libs.js.map +1 -1
- package/dist/data/validators.js +3 -3
- package/dist/data/validators.js.map +1 -1
- package/dist/files.js +3 -3
- package/dist/files.js.map +1 -1
- package/dist/index.js +11 -11
- package/dist/index.js.map +1 -1
- package/package.json +2 -2
package/dist/data/defaults.js
CHANGED
|
@@ -46,7 +46,7 @@ exports.packageDefaults = packageDefaults;
|
|
|
46
46
|
*/
|
|
47
47
|
function mergePackages(packageA, packageB) {
|
|
48
48
|
var _a;
|
|
49
|
-
const mergedPackage =
|
|
49
|
+
const mergedPackage = json_merger_1.mergeObjects([packageA, packageB], {
|
|
50
50
|
defaultArrayMergeOperation: 'concat'
|
|
51
51
|
});
|
|
52
52
|
// de-dup package.ui5.dependencies
|
|
@@ -66,8 +66,8 @@ function mergeApp(app) {
|
|
|
66
66
|
var _a, _b;
|
|
67
67
|
return Object.assign({
|
|
68
68
|
version: '0.0.1',
|
|
69
|
-
title:
|
|
70
|
-
description:
|
|
69
|
+
title: i18n_1.t('text.defaultAppTitle', { id: app.id }),
|
|
70
|
+
description: i18n_1.t('text.defaultAppDescription', { id: app.id }),
|
|
71
71
|
baseComponent: 'sap/ui/core/UIComponent',
|
|
72
72
|
sourceTemplate: {
|
|
73
73
|
id: ((_a = app.sourceTemplate) === null || _a === void 0 ? void 0 : _a.id) || '',
|
|
@@ -118,7 +118,7 @@ function mergeUi5(ui5) {
|
|
|
118
118
|
merged.descriptorVersion = getManifestVersion(merged.minUI5Version, ui5.descriptorVersion);
|
|
119
119
|
merged.typesVersion = (_d = ui5.typesVersion) !== null && _d !== void 0 ? _d : typesVersion;
|
|
120
120
|
merged.ui5Theme = (_e = ui5.ui5Theme) !== null && _e !== void 0 ? _e : 'sap_fiori_3';
|
|
121
|
-
merged.ui5Libs =
|
|
121
|
+
merged.ui5Libs = ui5Libs_1.getUI5Libs(ui5.ui5Libs);
|
|
122
122
|
return Object.assign({}, ui5, merged);
|
|
123
123
|
}
|
|
124
124
|
exports.mergeUi5 = mergeUi5;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"defaults.js","sourceRoot":"","sources":["../../src/data/defaults.ts"],"names":[],"mappings":";;;;;;AACA,8GAAgF,CAAC,oEAAoE;AACrJ,uCAAuC;AACvC,oDAA4B;AAC5B,kCAA4B;AAC5B,6CAA2C;AAE3C;;;;;;GAMG;AACH,SAAgB,eAAe,CAAC,OAAgB,EAAE,WAAoB;IAClE,OAAO;QACH,OAAO,EAAE,OAAO,IAAI,OAAO;QAC3B,WAAW,EAAE,WAAW,IAAI,EAAE;QAC9B,eAAe,EAAE;YACb,UAAU,EAAE,SAAS;YACrB,qBAAqB,EAAE,GAAG;SAC7B;QACD,OAAO,EAAE;YACL,KAAK,EAAE,+CAA+C;YACtD,aAAa,EAAE,qDAAqD;YACpE,KAAK,EAAE,sDAAsD;SAChE;QACD,GAAG,EAAE;YACD,YAAY,EAAE,CAAC,qBAAqB,CAAC;SACxC;KACJ,CAAC;AACN,CAAC;AAjBD,0CAiBC;AAED;;;;;;;;GAQG;AACH,SAAgB,aAAa,CAAC,QAA0B,EAAE,QAA0B;;IAChF,MAAM,aAAa,GAAG,
|
|
1
|
+
{"version":3,"file":"defaults.js","sourceRoot":"","sources":["../../src/data/defaults.ts"],"names":[],"mappings":"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"}
|
package/dist/data/index.js
CHANGED
|
@@ -11,11 +11,11 @@ const validators_1 = require("./validators");
|
|
|
11
11
|
* @returns {Ui5App} - a new Ui5App instance with all required defaults set
|
|
12
12
|
*/
|
|
13
13
|
function mergeWithDefaults(ui5App) {
|
|
14
|
-
|
|
15
|
-
ui5App.app =
|
|
14
|
+
validators_1.validate(ui5App);
|
|
15
|
+
ui5App.app = defaults_1.mergeApp(ui5App.app);
|
|
16
16
|
ui5App.appOptions = ui5App.appOptions || {};
|
|
17
|
-
ui5App.ui5 =
|
|
18
|
-
ui5App.package =
|
|
17
|
+
ui5App.ui5 = defaults_1.mergeUi5(ui5App.ui5 || {});
|
|
18
|
+
ui5App.package = defaults_1.mergePackages(defaults_1.packageDefaults(ui5App.package.version, ui5App.app.description), ui5App.package);
|
|
19
19
|
return ui5App;
|
|
20
20
|
}
|
|
21
21
|
exports.mergeWithDefaults = mergeWithDefaults;
|
package/dist/data/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/data/index.ts"],"names":[],"mappings":";;;AACA,yCAAgF;AAChF,6CAAwC;AAExC;;;;;;GAMG;AACH,SAAgB,iBAAiB,CAAC,MAAc;IAM5C,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/data/index.ts"],"names":[],"mappings":";;;AACA,yCAAgF;AAChF,6CAAwC;AAExC;;;;;;GAMG;AACH,SAAgB,iBAAiB,CAAC,MAAc;IAM5C,qBAAQ,CAAC,MAAM,CAAC,CAAC;IACjB,MAAM,CAAC,GAAG,GAAG,mBAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAClC,MAAM,CAAC,UAAU,GAAG,MAAM,CAAC,UAAU,IAAI,EAAE,CAAC;IAC5C,MAAM,CAAC,GAAG,GAAG,mBAAQ,CAAC,MAAM,CAAC,GAAG,IAAI,EAAE,CAAC,CAAC;IACxC,MAAM,CAAC,OAAO,GAAG,wBAAa,CAAC,0BAAe,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,MAAM,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;IAEhH,OAAO,MAKN,CAAC;AACN,CAAC;AAlBD,8CAkBC"}
|
package/dist/data/ui5Libs.js
CHANGED
|
@@ -8,11 +8,10 @@ const defaults_1 = require("./defaults");
|
|
|
8
8
|
* @param ui5Libs - The ui5 libraries to be merged with the defaults
|
|
9
9
|
* @returns UI5 libs with defaults
|
|
10
10
|
*/
|
|
11
|
-
|
|
11
|
+
exports.getUI5Libs = (ui5Libs) => {
|
|
12
12
|
const libs = Array.isArray(ui5Libs) ? ui5Libs : (ui5Libs === null || ui5Libs === void 0 ? void 0 : ui5Libs.split(',')) || [];
|
|
13
13
|
return defaults_1.defaultUI5Libs.concat(libs).filter((value, index, self) => {
|
|
14
14
|
return self.indexOf(value) === index;
|
|
15
15
|
});
|
|
16
16
|
};
|
|
17
|
-
exports.getUI5Libs = getUI5Libs;
|
|
18
17
|
//# sourceMappingURL=ui5Libs.js.map
|
package/dist/data/ui5Libs.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ui5Libs.js","sourceRoot":"","sources":["../../src/data/ui5Libs.ts"],"names":[],"mappings":";;;AAAA,yCAA4C;AAE5C;;;;;GAKG;
|
|
1
|
+
{"version":3,"file":"ui5Libs.js","sourceRoot":"","sources":["../../src/data/ui5Libs.ts"],"names":[],"mappings":";;;AAAA,yCAA4C;AAE5C;;;;;GAKG;AACU,QAAA,UAAU,GAAG,CAAC,OAA2B,EAAY,EAAE;IAChE,MAAM,IAAI,GAAG,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,KAAK,CAAC,GAAG,MAAK,EAAE,CAAC;IAC1E,OAAO,yBAAc,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;QAC7D,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,KAAK,CAAC;IACzC,CAAC,CAAC,CAAC;AACP,CAAC,CAAC"}
|
package/dist/data/validators.js
CHANGED
|
@@ -15,11 +15,11 @@ const i18n_1 = require("../i18n");
|
|
|
15
15
|
*/
|
|
16
16
|
function validateAppId(appId) {
|
|
17
17
|
if (!appId) {
|
|
18
|
-
throw new Error(
|
|
18
|
+
throw new Error(i18n_1.t('error.missingRequiredProperty', { propertyName: 'app.id' }));
|
|
19
19
|
}
|
|
20
20
|
const match = appId.match(/["]/);
|
|
21
21
|
if (match) {
|
|
22
|
-
throw new Error(
|
|
22
|
+
throw new Error(i18n_1.t('error.disallowedCharacters', { propertyName: 'app.id', disallowedChars: `${match === null || match === void 0 ? void 0 : match.join()}` }));
|
|
23
23
|
}
|
|
24
24
|
return true;
|
|
25
25
|
}
|
|
@@ -34,7 +34,7 @@ exports.validateAppId = validateAppId;
|
|
|
34
34
|
*/
|
|
35
35
|
function validateUI5Version(version) {
|
|
36
36
|
if (version && semver_1.default.coerce(version) === null) {
|
|
37
|
-
throw new Error(
|
|
37
|
+
throw new Error(i18n_1.t('error.invalidUI5Version', { version }));
|
|
38
38
|
}
|
|
39
39
|
return true;
|
|
40
40
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validators.js","sourceRoot":"","sources":["../../src/data/validators.ts"],"names":[],"mappings":";;;;;;AAAA,oDAA4B;AAC5B,kCAA4B;AAG5B;;;;;;GAMG;AACH,SAAgB,aAAa,CAAC,KAAa;IACvC,IAAI,CAAC,KAAK,EAAE;QACR,MAAM,IAAI,KAAK,CAAC,
|
|
1
|
+
{"version":3,"file":"validators.js","sourceRoot":"","sources":["../../src/data/validators.ts"],"names":[],"mappings":";;;;;;AAAA,oDAA4B;AAC5B,kCAA4B;AAG5B;;;;;;GAMG;AACH,SAAgB,aAAa,CAAC,KAAa;IACvC,IAAI,CAAC,KAAK,EAAE;QACR,MAAM,IAAI,KAAK,CAAC,QAAC,CAAC,+BAA+B,EAAE,EAAE,YAAY,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC;KACnF;IACD,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IACjC,IAAI,KAAK,EAAE;QACP,MAAM,IAAI,KAAK,CACX,QAAC,CAAC,4BAA4B,EAAE,EAAE,YAAY,EAAE,QAAQ,EAAE,eAAe,EAAE,GAAG,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CACnG,CAAC;KACL;IACD,OAAO,IAAI,CAAC;AAChB,CAAC;AAXD,sCAWC;AAED;;;;;;;GAOG;AACH,SAAgB,kBAAkB,CAAC,OAA2B;IAC1D,IAAI,OAAO,IAAI,gBAAM,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,IAAI,EAAE;QAC5C,MAAM,IAAI,KAAK,CAAC,QAAC,CAAC,yBAAyB,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC;KAC9D;IACD,OAAO,IAAI,CAAC;AAChB,CAAC;AALD,gDAKC;AAED;;;;;;GAMG;AACH,SAAgB,QAAQ,CAAC,MAAc;;IACnC,OAAO,CACH,aAAa,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC;QAC5B,kBAAkB,OAAC,MAAM,CAAC,GAAG,0CAAE,OAAO,CAAC;QACvC,kBAAkB,OAAC,MAAM,CAAC,GAAG,0CAAE,YAAY,CAAC;QAC5C,kBAAkB,OAAC,MAAM,CAAC,GAAG,0CAAE,aAAa,CAAC,CAChD,CAAC;AACN,CAAC;AAPD,4BAOC"}
|
package/dist/files.js
CHANGED
|
@@ -11,9 +11,9 @@ const path_1 = require("path");
|
|
|
11
11
|
* @throws if an error occurs reading a file path
|
|
12
12
|
*/
|
|
13
13
|
function getFilePaths(dir) {
|
|
14
|
-
return
|
|
15
|
-
const entryPath =
|
|
16
|
-
const isDirectory =
|
|
14
|
+
return fs_1.readdirSync(dir).reduce((files, entry) => {
|
|
15
|
+
const entryPath = path_1.join(dir, entry);
|
|
16
|
+
const isDirectory = fs_1.statSync(entryPath).isDirectory();
|
|
17
17
|
return isDirectory ? [...files, ...getFilePaths(entryPath)] : [...files, entryPath];
|
|
18
18
|
}, []);
|
|
19
19
|
}
|
package/dist/files.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"files.js","sourceRoot":"","sources":["../src/files.ts"],"names":[],"mappings":";;;AAAA,2BAA2C;AAC3C,+BAA4B;AAE5B;;;;;;GAMG;AACH,SAAgB,YAAY,CAAC,GAAW;IACpC,OAAO,
|
|
1
|
+
{"version":3,"file":"files.js","sourceRoot":"","sources":["../src/files.ts"],"names":[],"mappings":";;;AAAA,2BAA2C;AAC3C,+BAA4B;AAE5B;;;;;;GAMG;AACH,SAAgB,YAAY,CAAC,GAAW;IACpC,OAAO,gBAAW,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,KAAe,EAAE,KAAa,EAAE,EAAE;QAC9D,MAAM,SAAS,GAAG,WAAI,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QACnC,MAAM,WAAW,GAAG,aAAQ,CAAC,SAAS,CAAC,CAAC,WAAW,EAAE,CAAC;QACtD,OAAO,WAAW,CAAC,CAAC,CAAC,CAAC,GAAG,KAAK,EAAE,GAAG,YAAY,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,KAAK,EAAE,SAAS,CAAC,CAAC;IACxF,CAAC,EAAE,EAAE,CAAC,CAAC;AACX,CAAC;AAND,oCAMC"}
|
package/dist/index.js
CHANGED
|
@@ -30,16 +30,16 @@ function generate(basePath, ui5AppConfig, fs) {
|
|
|
30
30
|
var _a;
|
|
31
31
|
return __awaiter(this, void 0, void 0, function* () {
|
|
32
32
|
if (!fs) {
|
|
33
|
-
fs =
|
|
33
|
+
fs = mem_fs_editor_1.create(mem_fs_1.create());
|
|
34
34
|
}
|
|
35
|
-
const ui5App =
|
|
36
|
-
const tmplPath =
|
|
37
|
-
fs.copyTpl(
|
|
35
|
+
const ui5App = data_1.mergeWithDefaults(ui5AppConfig);
|
|
36
|
+
const tmplPath = path_1.join(__dirname, '..', 'templates');
|
|
37
|
+
fs.copyTpl(path_1.join(tmplPath, 'core', '**/*.*'), path_1.join(basePath), ui5App, undefined, {
|
|
38
38
|
globOptions: { dot: true },
|
|
39
39
|
processDestinationPath: (filePath) => filePath.replace(/gitignore.tmpl/g, '.gitignore')
|
|
40
40
|
});
|
|
41
41
|
// ui5.yaml
|
|
42
|
-
const ui5ConfigPath =
|
|
42
|
+
const ui5ConfigPath = path_1.join(basePath, 'ui5.yaml');
|
|
43
43
|
const ui5Config = yield ui5_config_1.UI5Config.newInstance(fs.read(ui5ConfigPath));
|
|
44
44
|
ui5Config.addFioriToolsProxydMiddleware({
|
|
45
45
|
ui5: {
|
|
@@ -49,7 +49,7 @@ function generate(basePath, ui5AppConfig, fs) {
|
|
|
49
49
|
ui5Config.addFioriToolsAppReloadMiddleware();
|
|
50
50
|
fs.write(ui5ConfigPath, ui5Config.toString());
|
|
51
51
|
// ui5-local.yaml
|
|
52
|
-
const ui5LocalConfigPath =
|
|
52
|
+
const ui5LocalConfigPath = path_1.join(basePath, 'ui5-local.yaml');
|
|
53
53
|
const ui5LocalConfig = yield ui5_config_1.UI5Config.newInstance(fs.read(ui5LocalConfigPath));
|
|
54
54
|
ui5LocalConfig.addUI5Framework(ui5App.ui5.framework, ui5App.ui5.localVersion, ui5App.ui5.ui5Libs, ui5App.ui5.ui5Theme);
|
|
55
55
|
ui5LocalConfig.addFioriToolsAppReloadMiddleware();
|
|
@@ -58,11 +58,11 @@ function generate(basePath, ui5AppConfig, fs) {
|
|
|
58
58
|
if (ui5App.appOptions) {
|
|
59
59
|
Object.entries(ui5App.appOptions).forEach(([key, value]) => {
|
|
60
60
|
if (value === true) {
|
|
61
|
-
const optTmplDirPath =
|
|
62
|
-
const optTmplFilePaths =
|
|
61
|
+
const optTmplDirPath = path_1.join(tmplPath, 'optional', `${key}`);
|
|
62
|
+
const optTmplFilePaths = files_1.getFilePaths(optTmplDirPath);
|
|
63
63
|
optTmplFilePaths.forEach((optTmplFilePath) => {
|
|
64
64
|
const relPath = optTmplFilePath.replace(optTmplDirPath, '');
|
|
65
|
-
const outPath =
|
|
65
|
+
const outPath = path_1.join(basePath, relPath);
|
|
66
66
|
// Extend or add
|
|
67
67
|
if (!(fs === null || fs === void 0 ? void 0 : fs.exists(outPath))) {
|
|
68
68
|
fs === null || fs === void 0 ? void 0 : fs.copyTpl(optTmplFilePath, outPath, ui5App, undefined, {
|
|
@@ -70,9 +70,9 @@ function generate(basePath, ui5AppConfig, fs) {
|
|
|
70
70
|
});
|
|
71
71
|
}
|
|
72
72
|
else {
|
|
73
|
-
const add = JSON.parse(
|
|
73
|
+
const add = JSON.parse(ejs_1.render(fs === null || fs === void 0 ? void 0 : fs.read(optTmplFilePath), ui5App));
|
|
74
74
|
const existingFile = JSON.parse(fs === null || fs === void 0 ? void 0 : fs.read(outPath));
|
|
75
|
-
const merged =
|
|
75
|
+
const merged = json_merger_1.mergeObjects([existingFile, add], { defaultArrayMergeOperation: 'concat' });
|
|
76
76
|
fs === null || fs === void 0 ? void 0 : fs.writeJSON(outPath, merged);
|
|
77
77
|
}
|
|
78
78
|
});
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+BAA4B;AAC5B,iCAA2C;AAC3C,mCAAiD;AAEjD,iDAAuC;AACvC,6CAA2C;AAC3C,6BAA6B;AAC7B,mCAAuC;AAGvC,mDAA+C;AAE/C;;;;;;;GAOG;AACH,SAAe,QAAQ,CAAC,QAAgB,EAAE,YAAoB,EAAE,EAAW;;;QACvE,IAAI,CAAC,EAAE,EAAE;YACL,EAAE,GAAG,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
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.
|
|
12
|
+
"version": "0.12.6",
|
|
13
13
|
"license": "Apache-2.0",
|
|
14
14
|
"main": "dist/index.js",
|
|
15
15
|
"files": [
|
|
@@ -18,7 +18,7 @@
|
|
|
18
18
|
"templates"
|
|
19
19
|
],
|
|
20
20
|
"dependencies": {
|
|
21
|
-
"@sap-ux/ui5-config": "0.
|
|
21
|
+
"@sap-ux/ui5-config": "0.13.1",
|
|
22
22
|
"ejs": "3.1.6",
|
|
23
23
|
"mem-fs": "2.1.0",
|
|
24
24
|
"mem-fs-editor": "9.0.0",
|