piral-cli 0.15.0-alpha.3740 → 0.15.0-alpha.3784
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/lib/common/scaffold.js
CHANGED
|
@@ -25,7 +25,7 @@ function getTemplatePackage(templatePackageName) {
|
|
|
25
25
|
(0, log_1.fail)('generalError_0002', `Could not find the given template "${templatePackageName}". Package "${normalizedName}" could not be resolved.`);
|
|
26
26
|
}
|
|
27
27
|
}
|
|
28
|
-
function getTemplateFiles(templatePackageName, registry, root, data) {
|
|
28
|
+
function getTemplateFiles(templatePackageName, registry, root, data, forceOverwrite) {
|
|
29
29
|
return __awaiter(this, void 0, void 0, function* () {
|
|
30
30
|
// debug in monorepo such as "../templates/pilet-template-react/lib/index.js"
|
|
31
31
|
if (templatePackageName.startsWith('.')) {
|
|
@@ -36,10 +36,10 @@ function getTemplateFiles(templatePackageName, registry, root, data) {
|
|
|
36
36
|
}
|
|
37
37
|
const templateRunner = getTemplatePackage(templatePackageName);
|
|
38
38
|
if (typeof templateRunner === 'function') {
|
|
39
|
-
return yield templateRunner(root, data);
|
|
39
|
+
return yield templateRunner(root, data, forceOverwrite);
|
|
40
40
|
}
|
|
41
41
|
else if ('default' in templateRunner && typeof templateRunner.default === 'function') {
|
|
42
|
-
return yield templateRunner.default(root, data);
|
|
42
|
+
return yield templateRunner.default(root, data, forceOverwrite);
|
|
43
43
|
}
|
|
44
44
|
else {
|
|
45
45
|
(0, log_1.fail)('generalError_0002', `The provided template package "${templatePackageName}" does not export a template factory function.`);
|
|
@@ -73,7 +73,7 @@ function writeFiles(root, files, forceOverwrite) {
|
|
|
73
73
|
}));
|
|
74
74
|
}
|
|
75
75
|
function getTemplatePackageName(type, template) {
|
|
76
|
-
if (template.indexOf('/') === -1) {
|
|
76
|
+
if (template.indexOf('/') === -1 && !template.startsWith('.')) {
|
|
77
77
|
return `@smapiot/${type}-template-${template}`;
|
|
78
78
|
}
|
|
79
79
|
return template;
|
|
@@ -98,7 +98,7 @@ function scaffoldPiralSourceFiles(template, registry, data, forceOverwrite) {
|
|
|
98
98
|
const { src, root } = data;
|
|
99
99
|
const templatePackageName = getTemplatePackageName('piral', template);
|
|
100
100
|
yield (0, io_1.createDirectory)(src);
|
|
101
|
-
const files = yield getTemplateFiles(templatePackageName, registry, root, data);
|
|
101
|
+
const files = yield getTemplateFiles(templatePackageName, registry, root, data, forceOverwrite);
|
|
102
102
|
yield writeFiles(root, files, forceOverwrite);
|
|
103
103
|
});
|
|
104
104
|
}
|
|
@@ -114,7 +114,7 @@ function scaffoldPiletSourceFiles(template, registry, data, forceOverwrite) {
|
|
|
114
114
|
const { src, root } = data;
|
|
115
115
|
const templatePackageName = getTemplatePackageName('pilet', template);
|
|
116
116
|
yield (0, io_1.createDirectory)(src);
|
|
117
|
-
const files = yield getTemplateFiles(templatePackageName, registry, root, data);
|
|
117
|
+
const files = yield getTemplateFiles(templatePackageName, registry, root, data, forceOverwrite);
|
|
118
118
|
yield writeFiles(root, files, forceOverwrite);
|
|
119
119
|
});
|
|
120
120
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scaffold.js","sourceRoot":"","sources":["../../src/common/scaffold.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+BAAoE;AACpE,uCAA+C;AAC/C,mCAAyD;AACzD,6BAAkF;AAClF,+BAAkC;AAQlC,SAAS,kBAAkB,CAAC,mBAA2B;IACrD,MAAM,GAAG,GAAG,mBAAmB,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;IAChD,MAAM,cAAc,GAClB,GAAG,GAAG,CAAC,IAAI,CAAC,IAAA,iBAAU,EAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC,mBAAmB,CAAC,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,mBAAmB,CAAC;IAE5G,IAAI;QACF,OAAO,OAAO,CAAC,cAAc,CAAC,CAAC;KAChC;IAAC,WAAM;QACN,IAAA,UAAI,EACF,mBAAmB,EACnB,sCAAsC,mBAAmB,eAAe,cAAc,0BAA0B,CACjH,CAAC;KACH;AACH,CAAC;AAED,SAAe,gBAAgB,CAC7B,mBAA2B,EAC3B,QAAgB,EAChB,IAAY,EACZ,IAAyB;;
|
|
1
|
+
{"version":3,"file":"scaffold.js","sourceRoot":"","sources":["../../src/common/scaffold.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+BAAoE;AACpE,uCAA+C;AAC/C,mCAAyD;AACzD,6BAAkF;AAClF,+BAAkC;AAQlC,SAAS,kBAAkB,CAAC,mBAA2B;IACrD,MAAM,GAAG,GAAG,mBAAmB,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;IAChD,MAAM,cAAc,GAClB,GAAG,GAAG,CAAC,IAAI,CAAC,IAAA,iBAAU,EAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC,mBAAmB,CAAC,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,mBAAmB,CAAC;IAE5G,IAAI;QACF,OAAO,OAAO,CAAC,cAAc,CAAC,CAAC;KAChC;IAAC,WAAM;QACN,IAAA,UAAI,EACF,mBAAmB,EACnB,sCAAsC,mBAAmB,eAAe,cAAc,0BAA0B,CACjH,CAAC;KACH;AACH,CAAC;AAED,SAAe,gBAAgB,CAC7B,mBAA2B,EAC3B,QAAgB,EAChB,IAAY,EACZ,IAAyB,EACzB,cAA8B;;QAE9B,6EAA6E;QAC7E,IAAI,mBAAmB,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;YACvC,mBAAmB,GAAG,IAAA,cAAO,EAAC,OAAO,CAAC,GAAG,EAAE,EAAE,mBAAmB,CAAC,CAAC;SACnE;aAAM;YACL,MAAM,IAAA,oBAAc,EAAC,mBAAmB,EAAE,SAAS,EAAE,YAAY,EAAE,QAAQ,CAAC,CAAC;SAC9E;QACD,MAAM,cAAc,GAAG,kBAAkB,CAAC,mBAAmB,CAAC,CAAC;QAE/D,IAAI,OAAO,cAAc,KAAK,UAAU,EAAE;YACxC,OAAO,MAAM,cAAc,CAAC,IAAI,EAAE,IAAI,EAAE,cAAc,CAAC,CAAC;SACzD;aAAM,IAAI,SAAS,IAAI,cAAc,IAAI,OAAO,cAAc,CAAC,OAAO,KAAK,UAAU,EAAE;YACtF,OAAO,MAAM,cAAc,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,EAAE,cAAc,CAAC,CAAC;SACjE;aAAM;YACL,IAAA,UAAI,EACF,mBAAmB,EACnB,kCAAkC,mBAAmB,gDAAgD,CACtG,CAAC;SACH;IACH,CAAC;CAAA;AAED,SAAS,UAAU,CAAC,IAAY,EAAE,KAA0B,EAAE,cAA8B;IAC1F,MAAM,WAAW,GAAG,IAAA,cAAO,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;IAElD,OAAO,OAAO,CAAC,GAAG,CAChB,KAAK;SACF,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE;QACf,IAAI,OAAO,IAAI,CAAC,IAAI,KAAK,QAAQ,EAAE;YACjC,IAAA,SAAG,EAAC,qBAAqB,EAAE,4BAA4B,IAAI,CAAC,IAAI,+BAA+B,CAAC,CAAC;YACjG,OAAO,KAAK,CAAC;SACd;aAAM,IAAI,OAAO,IAAI,CAAC,OAAO,KAAK,WAAW,EAAE;YAC9C,IAAA,SAAG,EAAC,qBAAqB,EAAE,aAAa,IAAI,CAAC,IAAI,0CAA0C,CAAC,CAAC;YAC7F,OAAO,KAAK,CAAC;SACd;QAED,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;SACD,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;QACZ,MAAM,MAAM,GAAG,IAAA,cAAO,EAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;QACxC,MAAM,IAAI,GAAG,IAAA,eAAQ,EAAC,MAAM,CAAC,CAAC;QAC9B,MAAM,GAAG,GAAG,IAAA,cAAO,EAAC,MAAM,CAAC,CAAC;QAE5B,IAAI,MAAM,KAAK,WAAW,EAAE;YAC1B,OAAO,IAAA,0BAAqB,EAAC,GAAG,EAAE,IAAI,EAAE,IAAI,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC;SACvE;aAAM;YACL,OAAO,IAAA,uBAAkB,EAAC,GAAG,EAAE,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;SACjF;IACH,CAAC,CAAC,CACL,CAAC;AACJ,CAAC;AAED,SAAS,sBAAsB,CAAC,IAAuB,EAAE,QAAgB;IACvE,IAAI,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;QAC7D,OAAO,YAAY,IAAI,aAAa,QAAQ,EAAE,CAAC;KAChD;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,SAAS,eAAe,CAAC,QAAwB;IAC/C,QAAQ,QAAQ,EAAE;QAChB,KAAK,sBAAc,CAAC,EAAE;YACpB,OAAO,IAAI,CAAC;QACd,KAAK,sBAAc,CAAC,EAAE,CAAC;QACvB;YACE,OAAO,IAAI,CAAC;KACf;AACH,CAAC;AAED,SAAgB,oBAAoB,CAClC,QAAwB,EACxB,IAAY,EACZ,GAAW,EACX,WAAsB,EACtB,SAAiC;IAEjC,MAAM,GAAG,GAAG,IAAA,cAAO,EAAC,IAAA,WAAI,EAAC,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC;IACrC,uCACK,SAAS,KACZ,IAAI;QACJ,GAAG,EACH,QAAQ,EAAE,eAAe,CAAC,QAAQ,CAAC,EACnC,WAAW,IACX;AACJ,CAAC;AAfD,oDAeC;AAED,SAAsB,wBAAwB,CAC5C,QAAgB,EAChB,QAAgB,EAChB,IAA6C,EAC7C,cAA8B;;QAE9B,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC;QAC3B,MAAM,mBAAmB,GAAG,sBAAsB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;QAEtE,MAAM,IAAA,oBAAe,EAAC,GAAG,CAAC,CAAC;QAE3B,MAAM,KAAK,GAAG,MAAM,gBAAgB,CAAC,mBAAmB,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,cAAc,CAAC,CAAC;QAEhG,MAAM,UAAU,CAAC,IAAI,EAAE,KAAK,EAAE,cAAc,CAAC,CAAC;IAChD,CAAC;CAAA;AAdD,4DAcC;AAED,SAAgB,oBAAoB,CAClC,QAAwB,EACxB,IAAY,EACZ,UAAkB,EAClB,SAAiC;IAEjC,MAAM,GAAG,GAAG,IAAA,WAAI,EAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IAC9B,uCACK,SAAS,KACZ,IAAI;QACJ,GAAG,EACH,QAAQ,EAAE,eAAe,CAAC,QAAQ,CAAC,EACnC,UAAU,IACV;AACJ,CAAC;AAdD,oDAcC;AAED,SAAsB,wBAAwB,CAC5C,QAAgB,EAChB,QAAgB,EAChB,IAA6C,EAC7C,cAA8B;;QAE9B,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC;QAC3B,MAAM,mBAAmB,GAAG,sBAAsB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;QAEtE,MAAM,IAAA,oBAAe,EAAC,GAAG,CAAC,CAAC;QAE3B,MAAM,KAAK,GAAG,MAAM,gBAAgB,CAAC,mBAAmB,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,cAAc,CAAC,CAAC;QAEhG,MAAM,UAAU,CAAC,IAAI,EAAE,KAAK,EAAE,cAAc,CAAC,CAAC;IAChD,CAAC;CAAA;AAdD,4DAcC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "piral-cli",
|
|
3
|
-
"version": "0.15.0-alpha.
|
|
3
|
+
"version": "0.15.0-alpha.3784",
|
|
4
4
|
"description": "The standard CLI for creating and building a Piral instance or a Pilet.",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"portal",
|
|
@@ -78,5 +78,5 @@
|
|
|
78
78
|
"typescript": "^4.0.2",
|
|
79
79
|
"yargs": "^15.4.1"
|
|
80
80
|
},
|
|
81
|
-
"gitHead": "
|
|
81
|
+
"gitHead": "e2dc030bd7e656d349caf5353740e45329e471f1"
|
|
82
82
|
}
|
package/src/common/scaffold.ts
CHANGED
|
@@ -30,6 +30,7 @@ async function getTemplateFiles(
|
|
|
30
30
|
registry: string,
|
|
31
31
|
root: string,
|
|
32
32
|
data: Record<string, any>,
|
|
33
|
+
forceOverwrite: ForceOverwrite,
|
|
33
34
|
): Promise<Array<TemplateFile>> {
|
|
34
35
|
// debug in monorepo such as "../templates/pilet-template-react/lib/index.js"
|
|
35
36
|
if (templatePackageName.startsWith('.')) {
|
|
@@ -40,9 +41,9 @@ async function getTemplateFiles(
|
|
|
40
41
|
const templateRunner = getTemplatePackage(templatePackageName);
|
|
41
42
|
|
|
42
43
|
if (typeof templateRunner === 'function') {
|
|
43
|
-
return await templateRunner(root, data);
|
|
44
|
+
return await templateRunner(root, data, forceOverwrite);
|
|
44
45
|
} else if ('default' in templateRunner && typeof templateRunner.default === 'function') {
|
|
45
|
-
return await templateRunner.default(root, data);
|
|
46
|
+
return await templateRunner.default(root, data, forceOverwrite);
|
|
46
47
|
} else {
|
|
47
48
|
fail(
|
|
48
49
|
'generalError_0002',
|
|
@@ -82,7 +83,7 @@ function writeFiles(root: string, files: Array<TemplateFile>, forceOverwrite: Fo
|
|
|
82
83
|
}
|
|
83
84
|
|
|
84
85
|
function getTemplatePackageName(type: 'piral' | 'pilet', template: string) {
|
|
85
|
-
if (template.indexOf('/') === -1) {
|
|
86
|
+
if (template.indexOf('/') === -1 && !template.startsWith('.')) {
|
|
86
87
|
return `@smapiot/${type}-template-${template}`;
|
|
87
88
|
}
|
|
88
89
|
|
|
@@ -127,7 +128,7 @@ export async function scaffoldPiralSourceFiles(
|
|
|
127
128
|
|
|
128
129
|
await createDirectory(src);
|
|
129
130
|
|
|
130
|
-
const files = await getTemplateFiles(templatePackageName, registry, root, data);
|
|
131
|
+
const files = await getTemplateFiles(templatePackageName, registry, root, data, forceOverwrite);
|
|
131
132
|
|
|
132
133
|
await writeFiles(root, files, forceOverwrite);
|
|
133
134
|
}
|
|
@@ -159,7 +160,7 @@ export async function scaffoldPiletSourceFiles(
|
|
|
159
160
|
|
|
160
161
|
await createDirectory(src);
|
|
161
162
|
|
|
162
|
-
const files = await getTemplateFiles(templatePackageName, registry, root, data);
|
|
163
|
+
const files = await getTemplateFiles(templatePackageName, registry, root, data, forceOverwrite);
|
|
163
164
|
|
|
164
165
|
await writeFiles(root, files, forceOverwrite);
|
|
165
166
|
}
|