@yuuvis/client-cli 19.1.0 → 19.2.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.
- package/cli/commands/generate/app.js +22 -0
- package/cli/commands/generate/app.js.map +1 -1
- package/cli/options/options-generate-app.json +9 -1
- package/cli/utils.js +5 -2
- package/cli/utils.js.map +1 -1
- package/package.json +1 -1
- package/schematics/app-manifest.d.ts +33 -0
- package/schematics/app-manifest.js +6 -0
- package/schematics/app-manifest.js.map +1 -1
- package/schematics/factories/add-app/index.js +1 -1
- package/schematics/factories/add-app/index.js.map +1 -1
- package/schematics/factories/generate-app/index.js +7 -3
- package/schematics/factories/generate-app/index.js.map +1 -1
- package/schematics/factories/generate-app/schema.json +10 -0
- package/schematics/factories/new/index.js +55 -33
- package/schematics/factories/new/index.js.map +1 -1
- package/schematics/tasks/update-app-config.d.ts +1 -1
- package/schematics/tasks/update-app-config.js +13 -5
- package/schematics/tasks/update-app-config.js.map +1 -1
- package/schematics/tasks/update-app-routes.js +6 -2
- package/schematics/tasks/update-app-routes.js.map +1 -1
|
@@ -60,6 +60,28 @@ const handler = (argv) => __awaiter(void 0, void 0, void 0, function* () {
|
|
|
60
60
|
]);
|
|
61
61
|
argv.prefix = response.prefix;
|
|
62
62
|
}
|
|
63
|
+
if (argv.appHeader === undefined) {
|
|
64
|
+
const { appHeader } = yield inquirer_1.default.prompt([
|
|
65
|
+
{
|
|
66
|
+
type: "confirm",
|
|
67
|
+
name: "appHeader",
|
|
68
|
+
default: false,
|
|
69
|
+
message: "Should the app use shell's app header?",
|
|
70
|
+
},
|
|
71
|
+
]);
|
|
72
|
+
argv.appHeader = argv['app-header'] = appHeader;
|
|
73
|
+
}
|
|
74
|
+
if (argv.hideFromNav === undefined) {
|
|
75
|
+
const { hideFromNav } = yield inquirer_1.default.prompt([
|
|
76
|
+
{
|
|
77
|
+
type: "confirm",
|
|
78
|
+
name: "hideFromNav",
|
|
79
|
+
default: false,
|
|
80
|
+
message: "Should the app be hidden from navigation bar?",
|
|
81
|
+
},
|
|
82
|
+
]);
|
|
83
|
+
argv.hideFromNav = argv['hide-from-nav'] = hideFromNav;
|
|
84
|
+
}
|
|
63
85
|
(0, child_process_1.execSync)(`${(0, utils_1.getSchematicsBin)()} @yuuvis/client-cli:generate-app ${(0, utils_1.serializeOptions)(argv)}`, {
|
|
64
86
|
cwd: process.cwd(),
|
|
65
87
|
stdio: "inherit",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app.js","sourceRoot":"","sources":["../../../../src/cli/commands/generate/app.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,wDAAgC;AAChC,iDAAyC;AACzC,uCAAiE;AACjE,wGAA8D;AAC9D,qDAA6D;AAEhD,QAAA,OAAO,GAAW,YAAY,CAAC;AAC/B,QAAA,OAAO,GAAa,CAAC,GAAG,CAAC,CAAC;AAC1B,QAAA,IAAI,GAAW,mCAAmC,CAAC;AAEzD,MAAM,OAAO,GAA4B,CAAC,KAAU,EAAE,EAAE;IAC7D,OAAO,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,mCAAO,CAAC,CAAC;AAC7D,CAAC,CAAC;AAFW,QAAA,OAAO,WAElB;AAEK,MAAM,OAAO,GAAG,CAAO,IAAS,EAAE,EAAE;IACzC,MAAM,iBAAiB,GAAG,IAAA,wBAAgB,EAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAEtD,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;QAChB,MAAM,QAAQ,GAAG,MAAM,kBAAQ,CAAC,MAAM,CAAC;YACrC;gBACE,IAAI,EAAE,OAAO;gBACb,IAAI,EAAE,OAAO;gBACb,OAAO,EAAE,eAAe,iBAAiB,CAAC,SAAS,EAAE;gBACrD,OAAO,EAAE,qBAAqB;aAC/B;SACF,CAAC,CAAC;QACH,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC;IAC/C,CAAC;IAED,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;QAChB,MAAM,aAAa,GAAG,MAAM,kBAAQ,CAAC,MAAM,CAAC;YAC1C;gBACE,IAAI,EAAE,OAAO;gBACb,IAAI,EAAE,OAAO;gBACb,OAAO,EAAE,iBAAiB,CAAC,QAAQ;gBACnC,OAAO,EAAE,oEAAoE;aAC9E;SACF,CAAC,CAAC;QACH,IAAI,CAAC,KAAK,GAAG,aAAa,CAAC,KAAK,CAAC;IACnC,CAAC;IAED,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;QACjB,MAAM,QAAQ,GAAG,MAAM,kBAAQ,CAAC,MAAM,CAAC;YACrC;gBACE,IAAI,EAAE,OAAO;gBACb,IAAI,EAAE,QAAQ;gBACd,OAAO,EAAE,KAAK;gBACd,OAAO,EAAE,qDAAqD;aAC/D;SACF,CAAC,CAAC;QACH,IAAI,CAAC,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC;IAChC,CAAC;IAED,IAAA,wBAAQ,EAAC,GAAG,IAAA,wBAAgB,GAAE,oCAAoC,IAAA,wBAAgB,EAAC,IAAI,CAAC,EAAE,EAAE;QAC1F,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE;QAClB,KAAK,EAAE,SAAS;KACjB,CAAC,CAAC;IAEH,OAAO,CAAC,GAAG,CAAC,QAAQ,IAAI,CAAC,IAAI,yBAAyB,CAAC,CAAC;AAC1D,CAAC,CAAA,CAAC;
|
|
1
|
+
{"version":3,"file":"app.js","sourceRoot":"","sources":["../../../../src/cli/commands/generate/app.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,5 +14,13 @@
|
|
|
14
14
|
"prefix": {
|
|
15
15
|
"describe": "A prefix to apply to generated selectors.",
|
|
16
16
|
"type": "string"
|
|
17
|
+
},
|
|
18
|
+
"app-header": {
|
|
19
|
+
"describe": "Use shell's app header layout.",
|
|
20
|
+
"type": "boolean"
|
|
21
|
+
},
|
|
22
|
+
"hide-from-nav": {
|
|
23
|
+
"describe": "Hide the app from the navigation bar.",
|
|
24
|
+
"type": "boolean"
|
|
17
25
|
}
|
|
18
|
-
}
|
|
26
|
+
}
|
package/cli/utils.js
CHANGED
|
@@ -16,8 +16,11 @@ function serializeOptions(options) {
|
|
|
16
16
|
.filter(([key]) => key !== '_' && key !== '$0') // delete yargs internal keys
|
|
17
17
|
.filter(([key]) => key === key.toLowerCase()) // keep only lowercase keys
|
|
18
18
|
.map(([key, value]) => {
|
|
19
|
-
if (typeof value === 'boolean')
|
|
20
|
-
|
|
19
|
+
if (typeof value === 'boolean') {
|
|
20
|
+
if (value)
|
|
21
|
+
return `--${key}`; // boolean properties are just flags
|
|
22
|
+
return ''; // skip false boolean properties
|
|
23
|
+
}
|
|
21
24
|
return `--${key}="${value}"`; // string properties strait forward
|
|
22
25
|
})
|
|
23
26
|
.join(' ');
|
package/cli/utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/cli/utils.ts"],"names":[],"mappings":";;AAEA,4CAEC;AAOD,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/cli/utils.ts"],"names":[],"mappings":";;AAEA,4CAEC;AAOD,4CAYC;AAvBD,+BAA4B;AAE5B,SAAgB,gBAAgB;IAC9B,OAAO,IAAA,WAAI,EAAC,SAAS,EAAE,iCAAiC,CAAC,CAAC;AAC5D,CAAC;AAED;;;;GAIG;AACH,SAAgB,gBAAgB,CAAC,OAAY;IAC3C,OAAO,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC;SAC7B,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,GAAG,KAAK,GAAG,IAAI,GAAG,KAAK,IAAI,CAAC,CAAC,6BAA6B;SAC1E,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,GAAG,KAAK,GAAG,CAAC,WAAW,EAAE,CAAC,CAAE,2BAA2B;SACzE,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;QAClB,IAAI,OAAO,KAAK,KAAK,SAAS,EAAE,CAAC;YAC/B,IAAI,KAAK;gBAAE,OAAO,KAAK,GAAG,EAAE,CAAC,CAAC,oCAAoC;YAClE,OAAO,EAAE,CAAC,CAAC,gCAAgC;QAC7C,CAAC;QACD,OAAO,KAAK,GAAG,KAAK,KAAK,GAAG,CAAC,CAAC,mCAAmC;IACrE,CAAC,CAAC;SACD,IAAI,CAAC,GAAG,CAAC,CAAC;AACf,CAAC"}
|
package/package.json
CHANGED
|
@@ -7,14 +7,37 @@ declare const ManifestSchema: z.ZodObject<{
|
|
|
7
7
|
svgIcon: z.ZodOptional<z.ZodString>;
|
|
8
8
|
iconName: z.ZodOptional<z.ZodString>;
|
|
9
9
|
routes: z.ZodString;
|
|
10
|
+
options: z.ZodOptional<z.ZodObject<{
|
|
11
|
+
appClaim: z.ZodOptional<z.ZodString>;
|
|
12
|
+
appHeader: z.ZodOptional<z.ZodBoolean>;
|
|
13
|
+
hideFromNav: z.ZodOptional<z.ZodBoolean>;
|
|
14
|
+
}, "strip", z.ZodTypeAny, {
|
|
15
|
+
appHeader?: boolean | undefined;
|
|
16
|
+
hideFromNav?: boolean | undefined;
|
|
17
|
+
appClaim?: string | undefined;
|
|
18
|
+
}, {
|
|
19
|
+
appHeader?: boolean | undefined;
|
|
20
|
+
hideFromNav?: boolean | undefined;
|
|
21
|
+
appClaim?: string | undefined;
|
|
22
|
+
}>>;
|
|
10
23
|
}, "strip", z.ZodTypeAny, {
|
|
11
24
|
path: string;
|
|
12
25
|
routes: string;
|
|
26
|
+
options?: {
|
|
27
|
+
appHeader?: boolean | undefined;
|
|
28
|
+
hideFromNav?: boolean | undefined;
|
|
29
|
+
appClaim?: string | undefined;
|
|
30
|
+
} | undefined;
|
|
13
31
|
svgIcon?: string | undefined;
|
|
14
32
|
iconName?: string | undefined;
|
|
15
33
|
}, {
|
|
16
34
|
path: string;
|
|
17
35
|
routes: string;
|
|
36
|
+
options?: {
|
|
37
|
+
appHeader?: boolean | undefined;
|
|
38
|
+
hideFromNav?: boolean | undefined;
|
|
39
|
+
appClaim?: string | undefined;
|
|
40
|
+
} | undefined;
|
|
18
41
|
svgIcon?: string | undefined;
|
|
19
42
|
iconName?: string | undefined;
|
|
20
43
|
}>>;
|
|
@@ -25,6 +48,11 @@ declare const ManifestSchema: z.ZodObject<{
|
|
|
25
48
|
ui?: {
|
|
26
49
|
path: string;
|
|
27
50
|
routes: string;
|
|
51
|
+
options?: {
|
|
52
|
+
appHeader?: boolean | undefined;
|
|
53
|
+
hideFromNav?: boolean | undefined;
|
|
54
|
+
appClaim?: string | undefined;
|
|
55
|
+
} | undefined;
|
|
28
56
|
svgIcon?: string | undefined;
|
|
29
57
|
iconName?: string | undefined;
|
|
30
58
|
} | undefined;
|
|
@@ -35,6 +63,11 @@ declare const ManifestSchema: z.ZodObject<{
|
|
|
35
63
|
ui?: {
|
|
36
64
|
path: string;
|
|
37
65
|
routes: string;
|
|
66
|
+
options?: {
|
|
67
|
+
appHeader?: boolean | undefined;
|
|
68
|
+
hideFromNav?: boolean | undefined;
|
|
69
|
+
appClaim?: string | undefined;
|
|
70
|
+
} | undefined;
|
|
38
71
|
svgIcon?: string | undefined;
|
|
39
72
|
iconName?: string | undefined;
|
|
40
73
|
} | undefined;
|
|
@@ -7,11 +7,17 @@ exports.parseManifest = parseManifest;
|
|
|
7
7
|
exports.writeManifest = writeManifest;
|
|
8
8
|
const fs_1 = __importDefault(require("fs"));
|
|
9
9
|
const zod_1 = require("zod");
|
|
10
|
+
const UiOptions = zod_1.z.object({
|
|
11
|
+
appClaim: zod_1.z.string().optional(),
|
|
12
|
+
appHeader: zod_1.z.boolean().optional(),
|
|
13
|
+
hideFromNav: zod_1.z.boolean().optional()
|
|
14
|
+
});
|
|
10
15
|
const UiData = zod_1.z.object({
|
|
11
16
|
path: zod_1.z.string(),
|
|
12
17
|
svgIcon: zod_1.z.string().optional(),
|
|
13
18
|
iconName: zod_1.z.string().optional(),
|
|
14
19
|
routes: zod_1.z.string(),
|
|
20
|
+
options: UiOptions.optional()
|
|
15
21
|
});
|
|
16
22
|
const ManifestSchema = zod_1.z.object({
|
|
17
23
|
id: zod_1.z.string(),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app-manifest.js","sourceRoot":"","sources":["../../src/schematics/app-manifest.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"app-manifest.js","sourceRoot":"","sources":["../../src/schematics/app-manifest.ts"],"names":[],"mappings":";;;;;AA0BA,sCAGC;AAED,sCAMC;AArCD,4CAAoB;AACpB,6BAAwB;AAExB,MAAM,SAAS,GAAG,OAAC,CAAC,MAAM,CAAC;IACzB,QAAQ,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC/B,SAAS,EAAE,OAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE;IACjC,WAAW,EAAE,OAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE;CACpC,CAAC,CAAC;AAEH,MAAM,MAAM,GAAG,OAAC,CAAC,MAAM,CAAC;IACtB,IAAI,EAAE,OAAC,CAAC,MAAM,EAAE;IAChB,OAAO,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC9B,QAAQ,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC/B,MAAM,EAAE,OAAC,CAAC,MAAM,EAAE;IAClB,OAAO,EAAE,SAAS,CAAC,QAAQ,EAAE;CAC9B,CAAC,CAAC;AAEH,MAAM,cAAc,GAAG,OAAC,CAAC,MAAM,CAAC;IAC9B,EAAE,EAAE,OAAC,CAAC,MAAM,EAAE;IACd,KAAK,EAAE,OAAC,CAAC,MAAM,EAAE;IACjB,EAAE,EAAE,MAAM,CAAC,QAAQ,EAAE;IACrB,SAAS,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;CACjC,CAAC,CAAC;AAIH,SAAgB,aAAa,CAAC,OAAe;IAC3C,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IACrC,OAAO,cAAc,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;AACxC,CAAC;AAED,SAAgB,aAAa,CAAC,QAAgB,EAAE,QAAqB;IACnE,IAAI,CAAC;QACH,YAAE,CAAC,aAAa,CAAC,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC;IACzE,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,IAAI,KAAK,CAAC,kCAAkC,KAAK,EAAE,CAAC,CAAC;IAC7D,CAAC;AACH,CAAC"}
|
|
@@ -34,7 +34,7 @@ function addApp(options) {
|
|
|
34
34
|
rules.push((0, update_app_routes_1.updateAppRoutes)(parsedPackageName.libraryFullName, appManifest));
|
|
35
35
|
}
|
|
36
36
|
if (!!appManifest.extension) {
|
|
37
|
-
rules.push((0, update_app_config_1.updateAppConfig)(appManifest.extension, `${parsedPackageName.libraryFullName}/extensions`));
|
|
37
|
+
rules.push((0, update_app_config_1.updateAppConfig)(appManifest.id, appManifest.extension, `${parsedPackageName.libraryFullName}/extensions`));
|
|
38
38
|
}
|
|
39
39
|
rules.push((0, npm_install_1.default)('./', options.name));
|
|
40
40
|
return (0, schematics_1.chain)(rules);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/schematics/factories/add-app/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAQA,wBA6BC;AArCD,2DAA8E;AAC9E,2DAAsD;AACtD,uCAA+C;AAC/C,qEAAgE;AAChE,qEAAgE;AAChE,0EAAiD;AACjD,6DAAyD;AAEzD,SAAgB,MAAM,CAAC,OAAY;IACjC,OAAO,CAAO,IAAS,EAAE,OAAY,EAAE,EAAE;QACvC,MAAM,OAAO,GAAG,MAAM,kCAAe,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAErD,IAAI,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;YACrC,MAAM,IAAI,gCAAmB,CAAC,WAAW,OAAO,CAAC,IAAI,6DAA6D,CAAC,CAAC;QACtH,CAAC;QAED,MAAM,iBAAiB,GAAG,IAAA,wBAAgB,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAEzD,MAAM,WAAW,GAAG,MAAM,IAAA,+BAAa,EAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC/D,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,mCAAmC,OAAO,CAAC,IAAI,GAAG,CAAC,CAAC;QAExE,MAAM,KAAK,GAAW,EAAE,CAAC;QAEzB,IAAI,CAAC,CAAC,WAAW,CAAC,EAAE,EAAE,CAAC;YACrB,KAAK,CAAC,IAAI,CAAC,IAAA,mCAAe,EAAC,iBAAiB,CAAC,eAAe,EAAE,WAAW,CAAC,CAAC,CAAC;QAC9E,CAAC;QAED,IAAI,CAAC,CAAC,WAAW,CAAC,SAAS,EAAE,CAAC;YAC5B,KAAK,CAAC,IAAI,CAAC,IAAA,mCAAe,EAAC,WAAW,CAAC,SAAS,EAAE,GAAG,iBAAiB,CAAC,eAAe,aAAa,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/schematics/factories/add-app/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAQA,wBA6BC;AArCD,2DAA8E;AAC9E,2DAAsD;AACtD,uCAA+C;AAC/C,qEAAgE;AAChE,qEAAgE;AAChE,0EAAiD;AACjD,6DAAyD;AAEzD,SAAgB,MAAM,CAAC,OAAY;IACjC,OAAO,CAAO,IAAS,EAAE,OAAY,EAAE,EAAE;QACvC,MAAM,OAAO,GAAG,MAAM,kCAAe,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAErD,IAAI,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;YACrC,MAAM,IAAI,gCAAmB,CAAC,WAAW,OAAO,CAAC,IAAI,6DAA6D,CAAC,CAAC;QACtH,CAAC;QAED,MAAM,iBAAiB,GAAG,IAAA,wBAAgB,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAEzD,MAAM,WAAW,GAAG,MAAM,IAAA,+BAAa,EAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC/D,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,mCAAmC,OAAO,CAAC,IAAI,GAAG,CAAC,CAAC;QAExE,MAAM,KAAK,GAAW,EAAE,CAAC;QAEzB,IAAI,CAAC,CAAC,WAAW,CAAC,EAAE,EAAE,CAAC;YACrB,KAAK,CAAC,IAAI,CAAC,IAAA,mCAAe,EAAC,iBAAiB,CAAC,eAAe,EAAE,WAAW,CAAC,CAAC,CAAC;QAC9E,CAAC;QAED,IAAI,CAAC,CAAC,WAAW,CAAC,SAAS,EAAE,CAAC;YAC5B,KAAK,CAAC,IAAI,CAAC,IAAA,mCAAe,EAAC,WAAW,CAAC,EAAE,EAAE,WAAW,CAAC,SAAS,EAAE,GAAG,iBAAiB,CAAC,eAAe,aAAa,CAAC,CAAC,CAAC;QACxH,CAAC;QAED,KAAK,CAAC,IAAI,CAAC,IAAA,qBAAU,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;QAE3C,OAAO,IAAA,kBAAK,EAAC,KAAK,CAAC,CAAC;IACtB,CAAC,CAAA,CAAC;AAGJ,CAAC"}
|
|
@@ -31,7 +31,7 @@ function generateApp(options) {
|
|
|
31
31
|
options.namespace = parsedPackageName.namespace;
|
|
32
32
|
options.componentName = parsedPackageName.libraryName;
|
|
33
33
|
options.shortName = parsedPackageName.shortName;
|
|
34
|
-
const appManifest = createAppManifest(options.componentName, options.skipExtension, options.
|
|
34
|
+
const appManifest = createAppManifest(options.componentName, options.route, options.appId, options.skipExtension, options.appHeader, options.hideFromNav);
|
|
35
35
|
const libraryMetadata = yield inspectLibrary(tree, options.name);
|
|
36
36
|
options.libraryRoot = !!libraryMetadata.libraryRoot ? libraryMetadata.libraryRoot : (0, utils_1.getLibraryPathFromName)(options.name);
|
|
37
37
|
const rules = [
|
|
@@ -48,7 +48,7 @@ function generateApp(options) {
|
|
|
48
48
|
if (!options.skipExtension) {
|
|
49
49
|
const importPath = `../../${options.libraryRoot}/extensions/src/lib/services/extensions.service`;
|
|
50
50
|
rules.push((0, copy_extensions_files_1.copyExtensionsFiles)(options));
|
|
51
|
-
rules.push((0, update_app_config_1.updateAppConfig)(appManifest.extension, importPath));
|
|
51
|
+
rules.push((0, update_app_config_1.updateAppConfig)(appManifest.id, appManifest.extension, importPath));
|
|
52
52
|
}
|
|
53
53
|
return (0, schematics_1.chain)(rules);
|
|
54
54
|
});
|
|
@@ -91,7 +91,7 @@ function inspectLibrary(tree, libraryName) {
|
|
|
91
91
|
return libMetadata;
|
|
92
92
|
});
|
|
93
93
|
}
|
|
94
|
-
function createAppManifest(componentName, skipExtension,
|
|
94
|
+
function createAppManifest(componentName, route, appId, skipExtension, appHeader, hideFromNav) {
|
|
95
95
|
const manifest = {
|
|
96
96
|
id: `${appId}`,
|
|
97
97
|
title: `${schematics_1.strings.capitalize(componentName)} Title`,
|
|
@@ -100,6 +100,10 @@ function createAppManifest(componentName, skipExtension, route, appId) {
|
|
|
100
100
|
path: `${route}`,
|
|
101
101
|
iconName: 'logo_dev',
|
|
102
102
|
routes: `${schematics_1.strings.classify(componentName)}Routes`,
|
|
103
|
+
options: {
|
|
104
|
+
appHeader: appHeader,
|
|
105
|
+
hideFromNav: hideFromNav
|
|
106
|
+
}
|
|
103
107
|
};
|
|
104
108
|
if (!skipExtension) {
|
|
105
109
|
manifest.extension = `${schematics_1.strings.classify(componentName)}Extension`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/schematics/factories/generate-app/index.ts"],"names":[],"mappings":";;;;;;;;;;;AAuBA,kCAkCC;AAzDD,2DAA0F;AAC1F,uCAAuE;AACvE,yDAA4D;AAC5D,mEAA+D;AAC/D,6DAAwD;AACxD,mFAA8E;AAC9E,qFAA+E;AAE/E,+EAA4E;AAC5E,iFAA4E;AAC5E,qEAAgE;AAChE,6EAAwE;AACxE,qEAAgE;AAChE,yEAA+E;AAC/E,uFAAsF;AAStF,SAAgB,WAAW,CAAC,OAAY;IACtC,OAAO,CAAO,IAAU,EAAE,OAAyB,EAAE,EAAE;QACrD,eAAe,CAAC,OAAO,CAAC,CAAC;QAEzB,MAAM,iBAAiB,GAAG,IAAA,wBAAgB,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QACzD,OAAO,CAAC,SAAS,GAAG,iBAAiB,CAAC,SAAS,CAAC;QAChD,OAAO,CAAC,aAAa,GAAG,iBAAiB,CAAC,WAAW,CAAC;QACtD,OAAO,CAAC,SAAS,GAAG,iBAAiB,CAAC,SAAS,CAAC;QAEhD,MAAM,WAAW,GAAG,iBAAiB,CAAC,OAAO,CAAC,aAAa,EAAE,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/schematics/factories/generate-app/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -32,6 +32,16 @@
|
|
|
32
32
|
"type": "string",
|
|
33
33
|
"description": "A prefix to apply to generated selectors.",
|
|
34
34
|
"pattern": "^[a-z0-9]+$"
|
|
35
|
+
},
|
|
36
|
+
"appHeader": {
|
|
37
|
+
"type": "boolean",
|
|
38
|
+
"description": "Use the shell's app header layout.",
|
|
39
|
+
"default": false
|
|
40
|
+
},
|
|
41
|
+
"hideFromNav": {
|
|
42
|
+
"type": "boolean",
|
|
43
|
+
"description": "Hide the app from the navigation bar.",
|
|
44
|
+
"default": false
|
|
35
45
|
}
|
|
36
46
|
},
|
|
37
47
|
"required": ["name"]
|
|
@@ -1,4 +1,13 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
+
});
|
|
10
|
+
};
|
|
2
11
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
12
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
13
|
};
|
|
@@ -12,40 +21,53 @@ const update_angular_json_1 = require("../../tasks/update-angular-json");
|
|
|
12
21
|
const clean_up_ng_app_1 = __importDefault(require("../../tasks/clean-up-ng-app"));
|
|
13
22
|
const copy_files_1 = require("../../tasks/copy-files");
|
|
14
23
|
const constants_1 = require("../../constants");
|
|
24
|
+
const schematics_util_1 = require("../../schematics-util");
|
|
15
25
|
function newProject(options) {
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
options.shellVersion
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
'@
|
|
24
|
-
'
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
26
|
+
return (tree, context) => __awaiter(this, void 0, void 0, function* () {
|
|
27
|
+
options.schematicsVersion = constants_1.NG_SCHEMATICS_VERSION;
|
|
28
|
+
const projectName = options.name;
|
|
29
|
+
if (!options.shellVersion) {
|
|
30
|
+
options.shellVersion = constants_1.DEFAULT_SHELL_VERSION;
|
|
31
|
+
}
|
|
32
|
+
if (constants_1.VALID_SHELL_TAGS.includes(options.shellVersion)) {
|
|
33
|
+
const shellPackageInfo = yield (0, schematics_util_1.fetchPackageInfo)('@yuuvis/client-shell', context);
|
|
34
|
+
const calculatedVersion = shellPackageInfo['dist-tags'][options.shellVersion];
|
|
35
|
+
if (!calculatedVersion) {
|
|
36
|
+
context.logger.error(`Invalid shell version tag: ${options.shellVersion}. Available tags: ${Object.keys(shellPackageInfo['dist-tags']).join(', ')}`);
|
|
37
|
+
throw new schematics_1.SchematicsException(`Invalid shell version tag: ${options.shellVersion}`);
|
|
38
|
+
}
|
|
39
|
+
context.logger.info(`Version tagged as '${options.shellVersion}' is: ${calculatedVersion}`);
|
|
40
|
+
options.shellVersion = calculatedVersion;
|
|
41
|
+
}
|
|
42
|
+
const packageJsonExt = {
|
|
43
|
+
dependencies: {
|
|
44
|
+
'@angular/animations': '^19.2.0',
|
|
45
|
+
'@yuuvis/client-shell': `^${options.shellVersion}`
|
|
46
|
+
},
|
|
47
|
+
devDependencies: {
|
|
48
|
+
'@colsen1991/ngx-translate-extract-marker': `^3`,
|
|
49
|
+
'@vendure/ngx-translate-extract': `^9.4.0`
|
|
50
|
+
},
|
|
51
|
+
scripts: {
|
|
52
|
+
'prestart': 'npm run i18n:collect',
|
|
53
|
+
'start': 'ng serve --configuration development --proxy-config proxy.config.js',
|
|
54
|
+
'prebuild': 'node ./scripts/extract-client-version.js && node ./scripts/extract-component-data.js',
|
|
55
|
+
'i18n:collect': 'node ./scripts/i18n-collect.js',
|
|
56
|
+
'i18n:extract': 'node ./scripts/i18n-extract.js'
|
|
57
|
+
}
|
|
58
|
+
};
|
|
59
|
+
const rules = [
|
|
60
|
+
(0, ng_new_1.default)(options),
|
|
61
|
+
(0, update_package_json_1.default)(`${projectName}/package.json`, packageJsonExt),
|
|
62
|
+
(0, update_angular_json_1.updateAssetsAndBudgets)(projectName, `/${projectName}/angular.json`),
|
|
63
|
+
(0, update_angular_json_1.updateFileReplacementsForDevelopment)(projectName, `/${projectName}/angular.json`),
|
|
64
|
+
(0, copy_files_1.copyFiles)(options),
|
|
65
|
+
(0, clean_up_ng_app_1.default)(options)
|
|
66
|
+
];
|
|
67
|
+
if (!options.skipInstall) {
|
|
68
|
+
rules.push((0, npm_install_1.default)(projectName));
|
|
36
69
|
}
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
(0, ng_new_1.default)(options),
|
|
40
|
-
(0, update_package_json_1.default)(`${projectName}/package.json`, packageJsonExt),
|
|
41
|
-
(0, update_angular_json_1.updateAssetsAndBudgets)(projectName, `/${projectName}/angular.json`),
|
|
42
|
-
(0, update_angular_json_1.updateFileReplacementsForDevelopment)(projectName, `/${projectName}/angular.json`),
|
|
43
|
-
(0, copy_files_1.copyFiles)(options),
|
|
44
|
-
(0, clean_up_ng_app_1.default)(options)
|
|
45
|
-
];
|
|
46
|
-
if (!options.skipInstall) {
|
|
47
|
-
rules.push((0, npm_install_1.default)(projectName));
|
|
48
|
-
}
|
|
49
|
-
return (0, schematics_1.chain)(rules);
|
|
70
|
+
return (0, schematics_1.chain)(rules);
|
|
71
|
+
});
|
|
50
72
|
}
|
|
51
73
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/schematics/factories/new/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/schematics/factories/new/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAWA,gCAqDC;AAhED,2DAA8E;AAC9E,gEAAuC;AACvC,0EAAiD;AACjD,0FAAgE;AAChE,yEAA+G;AAC/G,kFAAuD;AACvD,uDAAmD;AACnD,+CAAiG;AACjG,2DAAyD;AAGzD,SAAgB,UAAU,CAAC,OAAY;IACrC,OAAO,CAAO,IAAS,EAAE,OAAY,EAAE,EAAE;QACvC,OAAO,CAAC,iBAAiB,GAAG,iCAAqB,CAAC;QAClD,MAAM,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;QAEjC,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,CAAC;YAC1B,OAAO,CAAC,YAAY,GAAG,iCAAqB,CAAC;QAC/C,CAAC;QAED,IAAI,4BAAgB,CAAC,QAAQ,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,CAAC;YACpD,MAAM,gBAAgB,GAAG,MAAM,IAAA,kCAAgB,EAAC,sBAAsB,EAAE,OAAO,CAAC,CAAC;YACjF,MAAM,iBAAiB,GAAG,gBAAgB,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;YAC9E,IAAI,CAAC,iBAAiB,EAAE,CAAC;gBACvB,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,8BAA8B,OAAO,CAAC,YAAY,qBAAqB,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;gBACrJ,MAAM,IAAI,gCAAmB,CAAC,8BAA8B,OAAO,CAAC,YAAY,EAAE,CAAC,CAAC;YACtF,CAAC;YACD,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,sBAAsB,OAAO,CAAC,YAAY,SAAS,iBAAiB,EAAE,CAAC,CAAC;YAC5F,OAAO,CAAC,YAAY,GAAG,iBAAiB,CAAC;QAC3C,CAAC;QAED,MAAM,cAAc,GAAG;YACrB,YAAY,EAAE;gBACZ,qBAAqB,EAAE,SAAS;gBAChC,sBAAsB,EAAE,IAAI,OAAO,CAAC,YAAY,EAAE;aACnD;YACD,eAAe,EAAE;gBACf,0CAA0C,EAAE,IAAI;gBAChD,gCAAgC,EAAE,QAAQ;aAC3C;YACD,OAAO,EAAE;gBACP,UAAU,EAAE,sBAAsB;gBAClC,OAAO,EAAE,qEAAqE;gBAC9E,UAAU,EAAE,sFAAsF;gBAClG,cAAc,EAAE,gCAAgC;gBAChD,cAAc,EAAE,gCAAgC;aACjD;SACF,CAAC;QAEF,MAAM,KAAK,GAAW;YACpB,IAAA,gBAAK,EAAC,OAAO,CAAC;YACd,IAAA,6BAAiB,EAAC,GAAG,WAAW,eAAe,EAAE,cAAc,CAAC;YAChE,IAAA,4CAAsB,EAAC,WAAW,EAAE,IAAI,WAAW,eAAe,CAAC;YACnE,IAAA,0DAAoC,EAAC,WAAW,EAAE,IAAI,WAAW,eAAe,CAAC;YACjF,IAAA,sBAAS,EAAC,OAAO,CAAC;YAClB,IAAA,yBAAY,EAAC,OAAO,CAAC;SACtB,CAAC;QAEF,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC;YACzB,KAAK,CAAC,IAAI,CAAC,IAAA,qBAAU,EAAC,WAAW,CAAC,CAAC,CAAC;QACtC,CAAC;QAED,OAAO,IAAA,kBAAK,EAAC,KAAK,CAAC,CAAC;IACtB,CAAC,CAAA,CAAC;AACJ,CAAC"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
import { Rule } from "@angular-devkit/schematics";
|
|
2
|
-
export declare function updateAppConfig(extensionsFileName: string, importPath: string): Rule;
|
|
2
|
+
export declare function updateAppConfig(appId: string, extensionsFileName: string, importPath: string): Rule;
|
|
@@ -19,7 +19,7 @@ const change_1 = require("@schematics/angular/utility/change");
|
|
|
19
19
|
const typescript_1 = __importDefault(require("typescript"));
|
|
20
20
|
const project_metadata_1 = require("../project-metadata");
|
|
21
21
|
const utils_1 = require("../utils");
|
|
22
|
-
function updateAppConfig(extensionsFileName, importPath) {
|
|
22
|
+
function updateAppConfig(appId, extensionsFileName, importPath) {
|
|
23
23
|
return (tree) => __awaiter(this, void 0, void 0, function* () {
|
|
24
24
|
var _a;
|
|
25
25
|
const project = yield project_metadata_1.ProjectMetadata.fromTree(tree);
|
|
@@ -41,13 +41,21 @@ function updateAppConfig(extensionsFileName, importPath) {
|
|
|
41
41
|
if (!typescript_1.default.isArrayLiteralExpression(argumentArray)) {
|
|
42
42
|
throw new schematics_1.SchematicsException(`importShellExtensions([...]) does not contain a valid array.`);
|
|
43
43
|
}
|
|
44
|
-
// check if the
|
|
45
|
-
if (argumentArray.elements.some(
|
|
44
|
+
// check if the entry already exists
|
|
45
|
+
if (argumentArray.elements.some(el => typescript_1.default.isObjectLiteralExpression(el) &&
|
|
46
|
+
el.properties.some(p => typescript_1.default.isPropertyAssignment(p) &&
|
|
47
|
+
p.name.getText() === 'id' &&
|
|
48
|
+
p.initializer.getText().replace(/['"]/g, '') === appId) &&
|
|
49
|
+
el.properties.some(p => typescript_1.default.isPropertyAssignment(p) &&
|
|
50
|
+
p.name.getText() === 'extension' &&
|
|
51
|
+
p.initializer.getText() === extensionsFileName))) {
|
|
46
52
|
return tree;
|
|
47
53
|
}
|
|
48
54
|
const recorder = tree.beginUpdate(filePath);
|
|
49
|
-
const
|
|
50
|
-
const
|
|
55
|
+
const insertPosition = argumentArray.elements.end;
|
|
56
|
+
const prefix = argumentArray.elements.length > 0 ? ',\n' : '\n';
|
|
57
|
+
const newObject = `{ id: '${appId}.extension', extension: ${extensionsFileName} }`;
|
|
58
|
+
const insertChange = new change_1.InsertChange(filePath, insertPosition, `${prefix}${newObject}`);
|
|
51
59
|
(0, change_1.applyToUpdateRecorder)(recorder, [insertChange]);
|
|
52
60
|
// add import statement
|
|
53
61
|
const importChange = (0, ast_utils_1.insertImport)(sourceFile, filePath, schematics_1.strings.classify(extensionsFileName), importPath);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-app-config.js","sourceRoot":"","sources":["../../../src/schematics/tasks/update-app-config.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAOA,
|
|
1
|
+
{"version":3,"file":"update-app-config.js","sourceRoot":"","sources":["../../../src/schematics/tasks/update-app-config.ts"],"names":[],"mappings":"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"}
|
|
@@ -21,6 +21,7 @@ const project_metadata_1 = require("../project-metadata");
|
|
|
21
21
|
const utils_1 = require("../utils");
|
|
22
22
|
function updateAppRoutes(appName, appManifest) {
|
|
23
23
|
return (tree, context) => __awaiter(this, void 0, void 0, function* () {
|
|
24
|
+
var _a, _b;
|
|
24
25
|
const project = yield project_metadata_1.ProjectMetadata.fromTree(tree);
|
|
25
26
|
const filePath = (0, utils_1.buildPath)(project.sourceRoot, 'app', 'app.routes.ts');
|
|
26
27
|
if (!appManifest.ui) {
|
|
@@ -34,9 +35,12 @@ function updateAppRoutes(appName, appManifest) {
|
|
|
34
35
|
title: '${appManifest.title}',
|
|
35
36
|
path: '${appManifest.ui.path}',${svgIcon}
|
|
36
37
|
iconName: '${appManifest.ui.iconName}',
|
|
38
|
+
options: {
|
|
39
|
+
appHeader: ${((_a = appManifest.ui.options) === null || _a === void 0 ? void 0 : _a.appHeader) || false},
|
|
40
|
+
hideFromNav: ${((_b = appManifest.ui.options) === null || _b === void 0 ? void 0 : _b.hideFromNav) || false}
|
|
41
|
+
},
|
|
37
42
|
loadChildren: () => import('${appName}').then((m) => m.${appManifest.ui.routes})
|
|
38
|
-
}
|
|
39
|
-
`;
|
|
43
|
+
}`;
|
|
40
44
|
if (!tree.exists(filePath)) {
|
|
41
45
|
throw new schematics_1.SchematicsException(`Cannot find ${filePath} to register the app ${appName}.`);
|
|
42
46
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-app-routes.js","sourceRoot":"","sources":["../../../src/schematics/tasks/update-app-routes.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAQA,
|
|
1
|
+
{"version":3,"file":"update-app-routes.js","sourceRoot":"","sources":["../../../src/schematics/tasks/update-app-routes.ts"],"names":[],"mappings":"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"}
|