@forge/cli 12.20.1 → 12.21.0-experimental-4a332af
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/CHANGELOG.md +247 -0
- package/README.md +31 -11
- package/npm-shrinkwrap.json +51 -40
- package/out/analytics-client/analytics-client.d.ts +1 -0
- package/out/analytics-client/analytics-client.d.ts.map +1 -1
- package/out/analytics-client/analytics-client.js +12 -5
- package/out/analytics-client/analytics-client.js.map +1 -1
- package/out/autocomplete/autocomplete-config.json +85 -79
- package/out/command-line/command.d.ts +5 -0
- package/out/command-line/command.d.ts.map +1 -1
- package/out/command-line/command.js +21 -1
- package/out/command-line/command.js.map +1 -1
- package/out/command-line/controller/deploy-controller.d.ts +2 -1
- package/out/command-line/controller/deploy-controller.d.ts.map +1 -1
- package/out/command-line/controller/deploy-controller.js +3 -2
- package/out/command-line/controller/deploy-controller.js.map +1 -1
- package/out/command-line/controller/module-controller.d.ts +8 -1
- package/out/command-line/controller/module-controller.d.ts.map +1 -1
- package/out/command-line/controller/module-controller.js +70 -19
- package/out/command-line/controller/module-controller.js.map +1 -1
- package/out/command-line/controller/version-controller.d.ts +4 -1
- package/out/command-line/controller/version-controller.d.ts.map +1 -1
- package/out/command-line/controller/version-controller.js +47 -9
- package/out/command-line/controller/version-controller.js.map +1 -1
- package/out/command-line/dependency-injection.d.ts.map +1 -1
- package/out/command-line/dependency-injection.js +3 -1
- package/out/command-line/dependency-injection.js.map +1 -1
- package/out/command-line/index.d.ts.map +1 -1
- package/out/command-line/index.js +29 -0
- package/out/command-line/index.js.map +1 -1
- package/out/command-line/register-app-commands.d.ts +1 -0
- package/out/command-line/register-app-commands.d.ts.map +1 -1
- package/out/command-line/register-app-commands.js +70 -46
- package/out/command-line/register-app-commands.js.map +1 -1
- package/out/command-line/register-deployment-commands.d.ts.map +1 -1
- package/out/command-line/register-deployment-commands.js +3 -2
- package/out/command-line/register-deployment-commands.js.map +1 -1
- package/out/command-line/register-installation-commands.d.ts.map +1 -1
- package/out/command-line/register-installation-commands.js +10 -2
- package/out/command-line/register-installation-commands.js.map +1 -1
- package/out/command-line/register-module-commands.d.ts.map +1 -1
- package/out/command-line/register-module-commands.js +0 -1
- package/out/command-line/register-module-commands.js.map +1 -1
- package/out/command-line/register-version-commands.d.ts +1 -0
- package/out/command-line/register-version-commands.d.ts.map +1 -1
- package/out/command-line/register-version-commands.js +23 -3
- package/out/command-line/register-version-commands.js.map +1 -1
- package/out/command-line/view/module-view.d.ts +8 -0
- package/out/command-line/view/module-view.d.ts.map +1 -1
- package/out/command-line/view/module-view.js +142 -0
- package/out/command-line/view/module-view.js.map +1 -1
- package/out/command-line/view/version-view.d.ts +2 -1
- package/out/command-line/view/version-view.d.ts.map +1 -1
- package/out/command-line/view/version-view.js +20 -2
- package/out/command-line/view/version-view.js.map +1 -1
- package/out/deploy/deployer/deploy-monitor-graphql-client.d.ts +2 -2
- package/out/deploy/deployer/deploy-monitor-graphql-client.d.ts.map +1 -1
- package/out/deploy/deployer/deploy-monitor-graphql-client.js +3 -0
- package/out/deploy/deployer/deploy-monitor-graphql-client.js.map +1 -1
- package/out/deploy/deployer/deployer.d.ts +3 -2
- package/out/deploy/deployer/deployer.d.ts.map +1 -1
- package/out/deploy/deployer/deployer.js +36 -5
- package/out/deploy/deployer/deployer.js.map +1 -1
- package/out/deploy/deployer/trigger-deploy-graphql-client.d.ts +1 -0
- package/out/deploy/deployer/trigger-deploy-graphql-client.d.ts.map +1 -1
- package/out/deploy/deployer/trigger-deploy-graphql-client.js.map +1 -1
- package/out/deploy/package-upload-deploy.d.ts +1 -0
- package/out/deploy/package-upload-deploy.d.ts.map +1 -1
- package/out/deploy/package-upload-deploy.js +1 -1
- package/out/deploy/package-upload-deploy.js.map +1 -1
- package/out/installations/installation-helper.d.ts +1 -0
- package/out/installations/installation-helper.d.ts.map +1 -1
- package/out/installations/installation-helper.js +10 -1
- package/out/installations/installation-helper.js.map +1 -1
- package/out/module-add/dependencies-merger.d.ts +23 -0
- package/out/module-add/dependencies-merger.d.ts.map +1 -0
- package/out/module-add/dependencies-merger.js +162 -0
- package/out/module-add/dependencies-merger.js.map +1 -0
- package/out/module-add/manifest-merger.d.ts +11 -0
- package/out/module-add/manifest-merger.d.ts.map +1 -0
- package/out/module-add/manifest-merger.js +174 -0
- package/out/module-add/manifest-merger.js.map +1 -0
- package/out/module-add/vite-scaffolder.d.ts +6 -0
- package/out/module-add/vite-scaffolder.d.ts.map +1 -0
- package/out/module-add/vite-scaffolder.js +96 -0
- package/out/module-add/vite-scaffolder.js.map +1 -0
- package/out/service/installation-service.d.ts.map +1 -1
- package/out/service/installation-service.js +4 -3
- package/out/service/installation-service.js.map +1 -1
- package/out/service/module-file-service.d.ts +34 -0
- package/out/service/module-file-service.d.ts.map +1 -0
- package/out/service/module-file-service.js +169 -0
- package/out/service/module-file-service.js.map +1 -0
- package/out/service/module-service.d.ts +6 -6
- package/out/service/module-service.d.ts.map +1 -1
- package/out/service/module-service.js +130 -54
- package/out/service/module-service.js.map +1 -1
- package/out/service/resource-packaging-service.d.ts +5 -0
- package/out/service/resource-packaging-service.d.ts.map +1 -1
- package/out/service/resource-packaging-service.js +38 -9
- package/out/service/resource-packaging-service.js.map +1 -1
- package/out/service/version-service.d.ts +13 -2
- package/out/service/version-service.d.ts.map +1 -1
- package/out/service/version-service.js +4 -4
- package/out/service/version-service.js.map +1 -1
- package/out/version/graphql-client.d.ts +12 -1
- package/out/version/graphql-client.d.ts.map +1 -1
- package/out/version/graphql-client.js +21 -6
- package/out/version/graphql-client.js.map +1 -1
- package/package.json +9 -7
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"installation-service.js","sourceRoot":"","sources":["../../src/service/installation-service.ts"],"names":[],"mappings":";;;AAAA,kDAc2B;AAC3B,0CAAsE;AACtE,mCAAoC;AAGpC,oEAAwE;AAMxE,MAAM,sBAAsB,GAAG,OAAO,CAAC;AA8FvC,MAAM,qBAAqB,GAAG,UAAU,CAAC;AACzC,MAAM,sBAAsB,GAAG,WAAW,CAAC;AAC3C,MAAM,8BAA8B,GAAG,kBAAkB,CAAC;AAE1D,MAAa,kCAAmC,SAAQ,sBAAS;IAC/D;QACE,KAAK,CAAC,iBAAI,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAC;IAClD,CAAC;CACF;AAJD,gFAIC;AAED,MAAa,mBAAmB;IAEX;IACA;IACA;IACA;IACA;IACA;IANnB,YACmB,YAA+B,EAC/B,uBAAmD,EACnD,6BAA4D,EAC5D,iCAAoE,EACpE,sBAA8C,EAC9C,gCAAkE;QALlE,iBAAY,GAAZ,YAAY,CAAmB;QAC/B,4BAAuB,GAAvB,uBAAuB,CAA4B;QACnD,kCAA6B,GAA7B,6BAA6B,CAA+B;QAC5D,sCAAiC,GAAjC,iCAAiC,CAAmC;QACpE,2BAAsB,GAAtB,sBAAsB,CAAwB;QAC9C,qCAAgC,GAAhC,gCAAgC,CAAkC;IAClF,CAAC;IAEI,4BAA4B,CAAC,IAAY,EAAE,IAAY;QAE7D,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;QAC7C,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;QAC7C,OAAO,WAAW,KAAK,WAAW,CAAC;IACrC,CAAC;IAEO,mBAAmB,CAAC,UAAe,EAAE,gBAAwB,EAAE,mBAA2B;QAEhG,IAAI,mBAAmB,KAAK,sBAAsB,EAAE;YAClD,OAAO,IAAI,CAAC,4BAA4B,CAAC,UAAU,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;SAC7E;QAED,OAAO,IAAI,CAAC,4BAA4B,CAAC,UAAU,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;IAC9E,CAAC;IAEO,mBAAmB,CACzB,aAA6B,EAC7B,
|
|
1
|
+
{"version":3,"file":"installation-service.js","sourceRoot":"","sources":["../../src/service/installation-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
import { ModuleTemplateMeta } from '@forge/cli-shared';
|
|
2
|
+
import { AddModuleOptions } from './module-service';
|
|
3
|
+
export interface DepChange {
|
|
4
|
+
name: string;
|
|
5
|
+
current?: string;
|
|
6
|
+
next: string;
|
|
7
|
+
}
|
|
8
|
+
export interface FileChange {
|
|
9
|
+
filePath: string;
|
|
10
|
+
before: string;
|
|
11
|
+
after: string;
|
|
12
|
+
patch: string;
|
|
13
|
+
}
|
|
14
|
+
export interface AddTemplateMeta {
|
|
15
|
+
template: ModuleTemplateMeta;
|
|
16
|
+
variables: Record<string, string>;
|
|
17
|
+
plannedFiles: string[];
|
|
18
|
+
manifestChange?: FileChange;
|
|
19
|
+
packageJsonChange?: FileChange;
|
|
20
|
+
frontendPackageJsonChange?: FileChange;
|
|
21
|
+
frontendDepChanges?: Record<string, DepChange[]>;
|
|
22
|
+
scaffoldChanges?: FileChange[];
|
|
23
|
+
warnings: string[];
|
|
24
|
+
}
|
|
25
|
+
export declare class FileService {
|
|
26
|
+
checkDependencies(template: ModuleTemplateMeta, force: boolean): Record<string, DepChange[]>;
|
|
27
|
+
templateMerge(template: ModuleTemplateMeta, variables: Record<string, string>, options?: AddModuleOptions): Promise<AddTemplateMeta>;
|
|
28
|
+
private collectUnsupportedOpWarnings;
|
|
29
|
+
private collectScaffoldChanges;
|
|
30
|
+
private assertNoTargetConflicts;
|
|
31
|
+
private runInstalls;
|
|
32
|
+
private copyTemplateFiles;
|
|
33
|
+
}
|
|
34
|
+
//# sourceMappingURL=module-file-service.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"module-file-service.d.ts","sourceRoot":"","sources":["../../src/service/module-file-service.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,kBAAkB,EAAQ,MAAM,mBAAmB,CAAC;AAC7D,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAiBpD,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;CACd;AACD,MAAM,WAAW,UAAU;IACzB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;CACf;AACD,MAAM,WAAW,eAAe;IAC9B,QAAQ,EAAE,kBAAkB,CAAC;IAC7B,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAClC,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,cAAc,CAAC,EAAE,UAAU,CAAC;IAC5B,iBAAiB,CAAC,EAAE,UAAU,CAAC;IAC/B,yBAAyB,CAAC,EAAE,UAAU,CAAC;IACvC,kBAAkB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC;IACjD,eAAe,CAAC,EAAE,UAAU,EAAE,CAAC;IAC/B,QAAQ,EAAE,MAAM,EAAE,CAAC;CACpB;AAGD,qBAAa,WAAW;IACf,iBAAiB,CAAC,QAAQ,EAAE,kBAAkB,EAAE,KAAK,EAAE,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,SAAS,EAAE,CAAC;IAStF,aAAa,CACxB,QAAQ,EAAE,kBAAkB,EAC5B,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACjC,OAAO,GAAE,gBAAqB,GAC7B,OAAO,CAAC,eAAe,CAAC;IA2E3B,OAAO,CAAC,4BAA4B;IAYpC,OAAO,CAAC,sBAAsB;IA+B9B,OAAO,CAAC,uBAAuB;YAQjB,WAAW;YA2BX,iBAAiB;CAmDhC"}
|
|
@@ -0,0 +1,169 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.FileService = void 0;
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
5
|
+
const fs_1 = tslib_1.__importDefault(require("fs"));
|
|
6
|
+
const path_1 = tslib_1.__importDefault(require("path"));
|
|
7
|
+
const yaml_1 = tslib_1.__importDefault(require("yaml"));
|
|
8
|
+
const cli_shared_1 = require("@forge/cli-shared");
|
|
9
|
+
const manifest_merger_1 = require("../module-add/manifest-merger");
|
|
10
|
+
const dependencies_merger_1 = require("../module-add/dependencies-merger");
|
|
11
|
+
const vite_scaffolder_1 = require("../module-add/vite-scaffolder");
|
|
12
|
+
const SRC = 'files';
|
|
13
|
+
class FileService {
|
|
14
|
+
checkDependencies(template, force) {
|
|
15
|
+
const cwd = process.cwd();
|
|
16
|
+
const tmplDeps = template.dependencies ?? {};
|
|
17
|
+
const tmplDev = template.devDependencies ?? {};
|
|
18
|
+
const { raw: pkgRaw, parsed: pkgObj, path: pkgPath } = (0, dependencies_merger_1.readPackageJson)(cwd);
|
|
19
|
+
const { depChanges } = (0, dependencies_merger_1.planPackageJsonChange)(pkgPath, pkgRaw, pkgObj, tmplDeps, tmplDev, force);
|
|
20
|
+
return depChanges;
|
|
21
|
+
}
|
|
22
|
+
async templateMerge(template, variables, options = {}) {
|
|
23
|
+
const cwd = process.cwd();
|
|
24
|
+
const warnings = [];
|
|
25
|
+
const operations = template.fileOperations ?? [];
|
|
26
|
+
const plannedFiles = operations
|
|
27
|
+
.filter((op) => op.type === 'create')
|
|
28
|
+
.map((op) => (0, manifest_merger_1.substituteVars)(op.target, variables));
|
|
29
|
+
this.collectUnsupportedOpWarnings(operations, warnings);
|
|
30
|
+
const manifestChange = (0, manifest_merger_1.planManifestChange)(cwd, template, variables, warnings);
|
|
31
|
+
const scaffoldChanges = [];
|
|
32
|
+
const tmplDeps = template.dependencies ?? {};
|
|
33
|
+
const tmplDev = template.devDependencies ?? {};
|
|
34
|
+
const { raw: pkgRaw, parsed: pkgObj, path: pkgPath } = (0, dependencies_merger_1.readPackageJson)(cwd);
|
|
35
|
+
const { packageJsonChange } = (0, dependencies_merger_1.planPackageJsonChange)(pkgPath, pkgRaw, pkgObj, tmplDeps, tmplDev, options.force === true);
|
|
36
|
+
const frontendPlan = (0, dependencies_merger_1.planFrontendPackageJson)(cwd, template, variables);
|
|
37
|
+
const frontendPackageJsonChange = frontendPlan?.packageJsonChange;
|
|
38
|
+
const frontendDepChanges = frontendPlan?.depChanges;
|
|
39
|
+
if (options.install === false) {
|
|
40
|
+
warnings.push(cli_shared_1.Text.module.add.warnInstallSkipped);
|
|
41
|
+
}
|
|
42
|
+
if (options.dryRun) {
|
|
43
|
+
return {
|
|
44
|
+
template,
|
|
45
|
+
variables,
|
|
46
|
+
plannedFiles,
|
|
47
|
+
manifestChange,
|
|
48
|
+
packageJsonChange,
|
|
49
|
+
frontendPackageJsonChange,
|
|
50
|
+
frontendDepChanges,
|
|
51
|
+
scaffoldChanges,
|
|
52
|
+
warnings
|
|
53
|
+
};
|
|
54
|
+
}
|
|
55
|
+
this.collectScaffoldChanges(cwd, template, manifestChange, options, scaffoldChanges, warnings);
|
|
56
|
+
this.assertNoTargetConflicts(cwd, plannedFiles, options);
|
|
57
|
+
await this.copyTemplateFiles(cwd, template, variables, warnings);
|
|
58
|
+
(0, manifest_merger_1.applyManifestChange)(manifestChange);
|
|
59
|
+
for (const change of scaffoldChanges)
|
|
60
|
+
(0, vite_scaffolder_1.applyScaffoldChange)(change);
|
|
61
|
+
(0, dependencies_merger_1.writePackageChange)(packageJsonChange, false);
|
|
62
|
+
(0, dependencies_merger_1.writePackageChange)(frontendPackageJsonChange, true);
|
|
63
|
+
await this.runInstalls(cwd, frontendPackageJsonChange, scaffoldChanges, options);
|
|
64
|
+
return {
|
|
65
|
+
template,
|
|
66
|
+
variables,
|
|
67
|
+
plannedFiles,
|
|
68
|
+
manifestChange,
|
|
69
|
+
packageJsonChange,
|
|
70
|
+
frontendPackageJsonChange,
|
|
71
|
+
frontendDepChanges,
|
|
72
|
+
scaffoldChanges,
|
|
73
|
+
warnings
|
|
74
|
+
};
|
|
75
|
+
}
|
|
76
|
+
collectUnsupportedOpWarnings(operations, warnings) {
|
|
77
|
+
const unsupportedOps = operations.filter((op) => op.type !== 'create');
|
|
78
|
+
if (unsupportedOps.length) {
|
|
79
|
+
warnings.push(cli_shared_1.Text.module.add.warnUnsupportedFileOperations(unsupportedOps.map((op) => `${op.type} ${op.target}`)));
|
|
80
|
+
}
|
|
81
|
+
}
|
|
82
|
+
collectScaffoldChanges(cwd, template, manifestChange, options, scaffoldChanges, warnings) {
|
|
83
|
+
if (!manifestChange || template.uiFramework !== 'custom-ui')
|
|
84
|
+
return;
|
|
85
|
+
const beforeResources = (yaml_1.default.parse(manifestChange.before)?.resources ?? []);
|
|
86
|
+
const afterResources = (yaml_1.default.parse(manifestChange.after)?.resources ?? []);
|
|
87
|
+
const beforeEntriesByKey = new Map(beforeResources.map((r) => [r.key, new Set(Object.keys(r.entry ?? {}))]));
|
|
88
|
+
for (const resource of afterResources) {
|
|
89
|
+
const beforeEntries = beforeEntriesByKey.get(resource.key) ?? new Set();
|
|
90
|
+
const newEntries = Object.entries(resource.entry ?? {}).filter(([name]) => !beforeEntries.has(name));
|
|
91
|
+
if (newEntries.length === 0)
|
|
92
|
+
continue;
|
|
93
|
+
const viteChange = (0, vite_scaffolder_1.planViteConfig)(cwd, resource.key, { ...resource, entry: Object.fromEntries(newEntries) }, warnings);
|
|
94
|
+
if (viteChange)
|
|
95
|
+
scaffoldChanges.push(viteChange);
|
|
96
|
+
const commonChange = (0, vite_scaffolder_1.planCommonJsx)(cwd, resource.key);
|
|
97
|
+
if (commonChange)
|
|
98
|
+
scaffoldChanges.push(commonChange);
|
|
99
|
+
}
|
|
100
|
+
}
|
|
101
|
+
assertNoTargetConflicts(cwd, plannedFiles, options) {
|
|
102
|
+
const conflicts = plannedFiles.map((p) => path_1.default.normalize(path_1.default.join(cwd, p))).filter((p) => fs_1.default.existsSync(p));
|
|
103
|
+
if (conflicts.length && !options.force) {
|
|
104
|
+
const list = conflicts.map((p) => path_1.default.relative(cwd, p));
|
|
105
|
+
throw new Error(cli_shared_1.Text.module.add.errorTargetConflict(list));
|
|
106
|
+
}
|
|
107
|
+
}
|
|
108
|
+
async runInstalls(cwd, frontendPackageJsonChange, scaffoldChanges, options) {
|
|
109
|
+
if (options.install === false)
|
|
110
|
+
return;
|
|
111
|
+
await (0, dependencies_merger_1.runPackageManager)(cwd, ['install']);
|
|
112
|
+
const frontendDirs = new Set();
|
|
113
|
+
if (frontendPackageJsonChange) {
|
|
114
|
+
frontendDirs.add(path_1.default.dirname(frontendPackageJsonChange.filePath));
|
|
115
|
+
}
|
|
116
|
+
for (const change of scaffoldChanges) {
|
|
117
|
+
if (change.filePath.endsWith('vite.config.js')) {
|
|
118
|
+
frontendDirs.add(path_1.default.dirname(change.filePath));
|
|
119
|
+
}
|
|
120
|
+
}
|
|
121
|
+
for (const frontendDir of frontendDirs) {
|
|
122
|
+
await (0, dependencies_merger_1.runPackageManager)(frontendDir, ['install']);
|
|
123
|
+
await (0, dependencies_merger_1.runPackageManager)(frontendDir, ['run', 'build']);
|
|
124
|
+
}
|
|
125
|
+
}
|
|
126
|
+
async copyTemplateFiles(cwd, template, variables, warnings) {
|
|
127
|
+
const allOps = template.fileOperations ?? [];
|
|
128
|
+
const operations = allOps.filter((op) => op.type === 'create' && op.source);
|
|
129
|
+
if (!operations.length) {
|
|
130
|
+
warnings.push(cli_shared_1.Text.module.add.errorNoFileOperations(template.moduleKey, template.uiFramework));
|
|
131
|
+
return [];
|
|
132
|
+
}
|
|
133
|
+
if (!template.cacheDir) {
|
|
134
|
+
throw new Error(cli_shared_1.Text.module.add.warnNoBundle);
|
|
135
|
+
}
|
|
136
|
+
const candidateFilesDirs = [path_1.default.join(template.cacheDir, SRC)];
|
|
137
|
+
const moduleRoot = path_1.default.join(template.cacheDir, template.moduleKey);
|
|
138
|
+
const variantBase = template.uiFramework ? path_1.default.join(moduleRoot, template.uiFramework) : moduleRoot;
|
|
139
|
+
candidateFilesDirs.push(path_1.default.join(variantBase, SRC));
|
|
140
|
+
if (template.uiFramework) {
|
|
141
|
+
candidateFilesDirs.push(path_1.default.join(template.cacheDir, template.uiFramework, SRC));
|
|
142
|
+
}
|
|
143
|
+
const variantDir = candidateFilesDirs.find((d) => fs_1.default.existsSync(d));
|
|
144
|
+
if (!variantDir) {
|
|
145
|
+
throw new Error(cli_shared_1.Text.module.add.errorNoBundle(template.moduleKey, candidateFilesDirs));
|
|
146
|
+
}
|
|
147
|
+
const written = [];
|
|
148
|
+
for (const op of operations) {
|
|
149
|
+
const sourcePath = path_1.default.join(variantDir, op.source);
|
|
150
|
+
if (!fs_1.default.existsSync(sourcePath)) {
|
|
151
|
+
throw new Error(cli_shared_1.Text.module.add.errorMissingTemplateSource(sourcePath));
|
|
152
|
+
}
|
|
153
|
+
const targetRel = (0, manifest_merger_1.substituteVars)(op.target, variables);
|
|
154
|
+
const targetAbs = path_1.default.join(cwd, targetRel);
|
|
155
|
+
fs_1.default.mkdirSync(path_1.default.dirname(targetAbs), { recursive: true });
|
|
156
|
+
if (op.template) {
|
|
157
|
+
const raw = fs_1.default.readFileSync(sourcePath, 'utf8');
|
|
158
|
+
fs_1.default.writeFileSync(targetAbs, (0, manifest_merger_1.substituteVars)(raw, variables), 'utf8');
|
|
159
|
+
}
|
|
160
|
+
else {
|
|
161
|
+
fs_1.default.copyFileSync(sourcePath, targetAbs);
|
|
162
|
+
}
|
|
163
|
+
written.push(targetRel);
|
|
164
|
+
}
|
|
165
|
+
return written;
|
|
166
|
+
}
|
|
167
|
+
}
|
|
168
|
+
exports.FileService = FileService;
|
|
169
|
+
//# sourceMappingURL=module-file-service.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"module-file-service.js","sourceRoot":"","sources":["../../src/service/module-file-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,7 +7,6 @@ export interface AddModuleOptions {
|
|
|
7
7
|
force?: boolean;
|
|
8
8
|
variables?: Record<string, string>;
|
|
9
9
|
install?: boolean;
|
|
10
|
-
upgradeDeps?: boolean;
|
|
11
10
|
}
|
|
12
11
|
export interface ManifestKeys {
|
|
13
12
|
moduleKeys: Set<string>;
|
|
@@ -20,14 +19,15 @@ export declare class ModuleService {
|
|
|
20
19
|
constructor(templateServices: TemplateModuleServices);
|
|
21
20
|
getAvailableModules(product: string): Promise<Map<string, ModuleTemplateMeta>>;
|
|
22
21
|
getModuleChoice(moduleMap: Map<string, ModuleTemplateMeta>): Map<string, ModuleTemplateMeta>;
|
|
23
|
-
|
|
22
|
+
prepareModuleMetadata(template: ModuleTemplateMeta, uiFramework?: UIFramework): Promise<ModuleTemplateMeta | undefined>;
|
|
23
|
+
downloadModuleBundle(template: ModuleTemplateMeta, uiFramework?: UIFramework): Promise<void>;
|
|
24
24
|
cleanup(): void;
|
|
25
|
-
parseManifestAndExtractKeys(content: string, filePath: string
|
|
25
|
+
parseManifestAndExtractKeys(content: string, filePath: string): ManifestKeys;
|
|
26
26
|
readManifestFragment(templateCacheDir: string): string | undefined;
|
|
27
|
-
checkDuplicateKey(varDef: TemplateVariableDef, value: string, existingKeys: ManifestKeys, moduleKey: string): string | undefined;
|
|
28
|
-
validateFragment(substitutedFragment: string, manifestPath: string, currentValue: string,
|
|
27
|
+
checkDuplicateKey(varDef: TemplateVariableDef, value: string, existingKeys: ManifestKeys, moduleKey: string, variables?: Record<string, string>): string | undefined;
|
|
28
|
+
validateFragment(substitutedFragment: string, manifestPath: string, currentValue: string, varName: string): Promise<string[]>;
|
|
29
29
|
getVariableDefinitions(template: ModuleTemplateMeta, uiFramework?: UIFramework): TemplateVariableDef[];
|
|
30
|
-
loadManifestContext(
|
|
30
|
+
loadManifestContext(): {
|
|
31
31
|
manifestPath: string;
|
|
32
32
|
existingKeys: ManifestKeys;
|
|
33
33
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"module-service.d.ts","sourceRoot":"","sources":["../../src/service/module-service.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"module-service.d.ts","sourceRoot":"","sources":["../../src/service/module-service.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,sBAAsB,EAAE,kBAAkB,EAAE,WAAW,EAAE,mBAAmB,EAAQ,MAAM,mBAAmB,CAAC;AAGvH,MAAM,WAAW,gBAAgB;IAC/B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACnC,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,MAAM,WAAW,YAAY;IAC3B,UAAU,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IACxB,YAAY,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC1B,YAAY,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;CAC3B;AAmDD,qBAAa,aAAa;IACxB,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAyB;IAC1D,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAgB;gBAE9B,gBAAgB,EAAE,sBAAsB;IAIvC,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC;IAcpF,eAAe,CAAC,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,kBAAkB,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE,kBAAkB,CAAC;IActF,qBAAqB,CAChC,QAAQ,EAAE,kBAAkB,EAC5B,WAAW,CAAC,EAAE,WAAW,GACxB,OAAO,CAAC,kBAAkB,GAAG,SAAS,CAAC;IAW7B,oBAAoB,CAAC,QAAQ,EAAE,kBAAkB,EAAE,WAAW,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAMlG,OAAO,IAAI,IAAI;IASf,2BAA2B,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,YAAY;IAkB5E,oBAAoB,CAAC,gBAAgB,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IASlE,iBAAiB,CACtB,MAAM,EAAE,mBAAmB,EAC3B,KAAK,EAAE,MAAM,EACb,YAAY,EAAE,YAAY,EAC1B,SAAS,EAAE,MAAM,EACjB,SAAS,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAM,GACrC,MAAM,GAAG,SAAS;IAkBR,gBAAgB,CAC3B,mBAAmB,EAAE,MAAM,EAC3B,YAAY,EAAE,MAAM,EACpB,YAAY,EAAE,MAAM,EACpB,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,MAAM,EAAE,CAAC;IAwCb,sBAAsB,CAAC,QAAQ,EAAE,kBAAkB,EAAE,WAAW,CAAC,EAAE,WAAW;IAY9E,mBAAmB,IAAI;QAAE,YAAY,EAAE,MAAM,CAAC;QAAC,YAAY,EAAE,YAAY,CAAA;KAAE;IAO3E,uBAAuB,CAAC,MAAM,EAAE,mBAAmB,EAAE,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM,GAAG,SAAS;IAOrG,sBAAsB,CACjC,MAAM,EAAE,mBAAmB,EAC3B,KAAK,EAAE,MAAM,EACb,YAAY,EAAE,YAAY,EAC1B,SAAS,EAAE,MAAM,EACjB,eAAe,EAAE,MAAM,GAAG,SAAS,EACnC,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACjC,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC,MAAM,EAAE,CAAC;CAiBrB"}
|
|
@@ -2,12 +2,54 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.ModuleService = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
|
+
const crypto_1 = tslib_1.__importDefault(require("crypto"));
|
|
5
6
|
const fs_1 = tslib_1.__importDefault(require("fs"));
|
|
6
7
|
const path_1 = tslib_1.__importDefault(require("path"));
|
|
7
8
|
const yaml_1 = tslib_1.__importDefault(require("yaml"));
|
|
8
9
|
const manifest_1 = require("@forge/manifest");
|
|
9
10
|
const cli_shared_1 = require("@forge/cli-shared");
|
|
10
11
|
const manifest_schema_json_1 = tslib_1.__importDefault(require("@forge/manifest/out/schema/manifest-schema.json"));
|
|
12
|
+
const VALIDATION_KEYWORD_BY_VAR = {
|
|
13
|
+
moduleKey: 'key',
|
|
14
|
+
functionKey: 'function',
|
|
15
|
+
resourceKey: 'resource'
|
|
16
|
+
};
|
|
17
|
+
const PROMPT_TIME_IRRELEVANT_PATTERNS = [/cannot find associated file/i];
|
|
18
|
+
function collectModuleKeys(modules) {
|
|
19
|
+
const moduleKeys = new Set();
|
|
20
|
+
if (!modules)
|
|
21
|
+
return moduleKeys;
|
|
22
|
+
for (const [type, entries] of Object.entries(modules)) {
|
|
23
|
+
if (type === 'function' || !Array.isArray(entries))
|
|
24
|
+
continue;
|
|
25
|
+
for (const entry of entries) {
|
|
26
|
+
if (entry?.key)
|
|
27
|
+
moduleKeys.add(entry.key);
|
|
28
|
+
}
|
|
29
|
+
}
|
|
30
|
+
return moduleKeys;
|
|
31
|
+
}
|
|
32
|
+
function mergeFragmentIntoManifest(existing, fragment) {
|
|
33
|
+
const merged = { ...existing };
|
|
34
|
+
const existingModules = (existing.modules ?? {});
|
|
35
|
+
const fragmentModules = (fragment.modules ?? {});
|
|
36
|
+
const mergedModules = { ...existingModules };
|
|
37
|
+
for (const [type, entries] of Object.entries(fragmentModules)) {
|
|
38
|
+
const existingEntries = Array.isArray(mergedModules[type]) ? mergedModules[type] : [];
|
|
39
|
+
const fragmentEntries = Array.isArray(entries) ? entries : [];
|
|
40
|
+
mergedModules[type] = [...existingEntries, ...fragmentEntries];
|
|
41
|
+
}
|
|
42
|
+
if (Object.keys(mergedModules).length > 0) {
|
|
43
|
+
merged.modules = mergedModules;
|
|
44
|
+
}
|
|
45
|
+
if (Array.isArray(fragment.resources) || Array.isArray(existing.resources)) {
|
|
46
|
+
merged.resources = [
|
|
47
|
+
...(Array.isArray(existing.resources) ? existing.resources : []),
|
|
48
|
+
...(Array.isArray(fragment.resources) ? fragment.resources : [])
|
|
49
|
+
];
|
|
50
|
+
}
|
|
51
|
+
return merged;
|
|
52
|
+
}
|
|
11
53
|
class ModuleService {
|
|
12
54
|
templateServices;
|
|
13
55
|
cacheDirs = [];
|
|
@@ -36,14 +78,19 @@ class ModuleService {
|
|
|
36
78
|
}
|
|
37
79
|
return moduleChoiceMap;
|
|
38
80
|
}
|
|
39
|
-
async
|
|
81
|
+
async prepareModuleMetadata(template, uiFramework) {
|
|
40
82
|
if (!this.templateServices)
|
|
41
83
|
return undefined;
|
|
42
|
-
const
|
|
43
|
-
if (
|
|
44
|
-
this.cacheDirs.push(
|
|
84
|
+
const preparedMeta = await this.templateServices.prepareModuleMetadata(template, uiFramework);
|
|
85
|
+
if (preparedMeta.cacheDir) {
|
|
86
|
+
this.cacheDirs.push(preparedMeta.cacheDir);
|
|
45
87
|
}
|
|
46
|
-
return
|
|
88
|
+
return preparedMeta;
|
|
89
|
+
}
|
|
90
|
+
async downloadModuleBundle(template, uiFramework) {
|
|
91
|
+
if (!this.templateServices)
|
|
92
|
+
return;
|
|
93
|
+
await this.templateServices.downloadModuleBundle(template, uiFramework);
|
|
47
94
|
}
|
|
48
95
|
cleanup() {
|
|
49
96
|
if (this.templateServices) {
|
|
@@ -53,23 +100,14 @@ class ModuleService {
|
|
|
53
100
|
}
|
|
54
101
|
this.cacheDirs.length = 0;
|
|
55
102
|
}
|
|
56
|
-
parseManifestAndExtractKeys(content, filePath
|
|
57
|
-
const keys = {
|
|
58
|
-
moduleKeys: new Set(),
|
|
59
|
-
functionKeys: new Set(),
|
|
60
|
-
resourceKeys: new Set()
|
|
61
|
-
};
|
|
103
|
+
parseManifestAndExtractKeys(content, filePath) {
|
|
62
104
|
try {
|
|
63
105
|
const parsed = new manifest_1.ManifestParserBuilder().withInterpolators().build().parseManifest({ content, filePath });
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
keys.functionKeys = new Set(funcEntries.map((f) => f?.key).filter(Boolean));
|
|
70
|
-
const resourceEntries = parsed?.resources || [];
|
|
71
|
-
keys.resourceKeys = new Set(resourceEntries.map((r) => r?.key).filter(Boolean));
|
|
72
|
-
return keys;
|
|
106
|
+
return {
|
|
107
|
+
moduleKeys: collectModuleKeys(parsed?.modules),
|
|
108
|
+
functionKeys: new Set((parsed?.modules?.function || []).map((f) => f?.key).filter(Boolean)),
|
|
109
|
+
resourceKeys: new Set((parsed?.resources || []).map((r) => r?.key).filter(Boolean))
|
|
110
|
+
};
|
|
73
111
|
}
|
|
74
112
|
catch {
|
|
75
113
|
return {
|
|
@@ -88,38 +126,63 @@ class ModuleService {
|
|
|
88
126
|
return undefined;
|
|
89
127
|
}
|
|
90
128
|
}
|
|
91
|
-
checkDuplicateKey(varDef, value, existingKeys, moduleKey) {
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
129
|
+
checkDuplicateKey(varDef, value, existingKeys, moduleKey, variables = {}) {
|
|
130
|
+
const allModuleAndFunctionKeys = new Set([...existingKeys.moduleKeys, ...existingKeys.functionKeys]);
|
|
131
|
+
const previouslyChosenValues = new Set(Object.values(variables));
|
|
132
|
+
if (varDef.name === 'moduleKey') {
|
|
133
|
+
if (previouslyChosenValues.has(value))
|
|
134
|
+
return cli_shared_1.Text.module.errors.duplicateKey(value);
|
|
135
|
+
if (allModuleAndFunctionKeys.has(value))
|
|
136
|
+
return cli_shared_1.Text.module.errors.duplicateModuleKey(value);
|
|
137
|
+
}
|
|
138
|
+
if (varDef.name === 'functionKey') {
|
|
139
|
+
if (previouslyChosenValues.has(value))
|
|
140
|
+
return cli_shared_1.Text.module.errors.duplicateKey(value);
|
|
141
|
+
if (allModuleAndFunctionKeys.has(value))
|
|
142
|
+
return cli_shared_1.Text.module.errors.duplicateFunctionKey(value);
|
|
143
|
+
}
|
|
144
|
+
if (varDef.name === 'resourceKey') {
|
|
145
|
+
if (previouslyChosenValues.has(value))
|
|
146
|
+
return cli_shared_1.Text.module.errors.duplicateKey(value);
|
|
100
147
|
}
|
|
101
148
|
return undefined;
|
|
102
149
|
}
|
|
103
|
-
async validateFragment(substitutedFragment, manifestPath, currentValue,
|
|
150
|
+
async validateFragment(substitutedFragment, manifestPath, currentValue, varName) {
|
|
104
151
|
const fragment = yaml_1.default.parse(substitutedFragment);
|
|
105
152
|
const existingManifest = yaml_1.default.parse(fs_1.default.readFileSync(manifestPath, 'utf8'));
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
return
|
|
121
|
-
|
|
122
|
-
|
|
153
|
+
const merged = mergeFragmentIntoManifest(existingManifest, fragment);
|
|
154
|
+
const yamlString = yaml_1.default.stringify(merged);
|
|
155
|
+
const validatorInput = {
|
|
156
|
+
filePath: manifestPath,
|
|
157
|
+
yamlContent: merged,
|
|
158
|
+
yamlContentByLine: yamlString.split('\n')
|
|
159
|
+
};
|
|
160
|
+
const schemaResult = await new manifest_1.SchemaValidator(manifest_schema_json_1.default).validate(validatorInput);
|
|
161
|
+
const modulesResult = await new manifest_1.ModulesValidator().validate({
|
|
162
|
+
...validatorInput,
|
|
163
|
+
typedContent: merged
|
|
164
|
+
});
|
|
165
|
+
const allErrors = [...(schemaResult.errors ?? []), ...(modulesResult.errors ?? [])];
|
|
166
|
+
if (allErrors.length === 0)
|
|
167
|
+
return [];
|
|
168
|
+
const keyword = VALIDATION_KEYWORD_BY_VAR[varName];
|
|
169
|
+
const messages = [];
|
|
170
|
+
const seen = new Set();
|
|
171
|
+
for (const e of allErrors) {
|
|
172
|
+
if (e.level !== 'error')
|
|
173
|
+
continue;
|
|
174
|
+
if (PROMPT_TIME_IRRELEVANT_PATTERNS.some((p) => p.test(e.message)))
|
|
175
|
+
continue;
|
|
176
|
+
if (!e.message.includes(currentValue))
|
|
177
|
+
continue;
|
|
178
|
+
if (keyword && !e.message.includes(keyword))
|
|
179
|
+
continue;
|
|
180
|
+
if (seen.has(e.message))
|
|
181
|
+
continue;
|
|
182
|
+
seen.add(e.message);
|
|
183
|
+
messages.push(e.message);
|
|
184
|
+
}
|
|
185
|
+
return messages;
|
|
123
186
|
}
|
|
124
187
|
getVariableDefinitions(template, uiFramework) {
|
|
125
188
|
if (uiFramework && template.variants?.[uiFramework]?.variables) {
|
|
@@ -130,29 +193,42 @@ class ModuleService {
|
|
|
130
193
|
}
|
|
131
194
|
return [];
|
|
132
195
|
}
|
|
133
|
-
loadManifestContext(
|
|
196
|
+
loadManifestContext() {
|
|
134
197
|
const manifestPath = path_1.default.join(process.cwd(), 'manifest.yml');
|
|
135
198
|
const manifestContent = fs_1.default.readFileSync(manifestPath, 'utf8');
|
|
136
|
-
const existingKeys = this.parseManifestAndExtractKeys(manifestContent, manifestPath
|
|
199
|
+
const existingKeys = this.parseManifestAndExtractKeys(manifestContent, manifestPath);
|
|
137
200
|
return { manifestPath, existingKeys };
|
|
138
201
|
}
|
|
139
202
|
computeEffectiveDefault(varDef, variables) {
|
|
140
|
-
if (varDef.
|
|
141
|
-
return
|
|
203
|
+
if (varDef.default) {
|
|
204
|
+
return varDef.default.replace(/\{\{\s*([a-zA-Z0-9_-]+)\s*\}\}/g, (match, key) => variables[key] ?? match);
|
|
142
205
|
}
|
|
143
206
|
return varDef.default;
|
|
144
207
|
}
|
|
145
208
|
async validateCandidateValue(varDef, value, existingKeys, moduleKey, fragmentContent, variables, manifestPath) {
|
|
146
|
-
const duplicateWarning = this.checkDuplicateKey(varDef, value, existingKeys, moduleKey);
|
|
209
|
+
const duplicateWarning = this.checkDuplicateKey(varDef, value, existingKeys, moduleKey, variables);
|
|
147
210
|
if (duplicateWarning) {
|
|
148
211
|
return [duplicateWarning];
|
|
149
212
|
}
|
|
150
213
|
if (fragmentContent) {
|
|
151
|
-
const substituted = fragmentContent.replace(/\{\{\s*([a-zA-Z0-9_-]+)\s*\}\}/g, (_m, key) =>
|
|
152
|
-
|
|
214
|
+
const substituted = fragmentContent.replace(/\{\{\s*([a-zA-Z0-9_-]+)\s*\}\}/g, (_m, key) => {
|
|
215
|
+
if (key === varDef.name)
|
|
216
|
+
return value;
|
|
217
|
+
return variables[key] ?? generateUnfilledPlaceholder();
|
|
218
|
+
});
|
|
219
|
+
return this.validateFragment(substituted, manifestPath, value, varDef.name);
|
|
153
220
|
}
|
|
154
221
|
return [];
|
|
155
222
|
}
|
|
156
223
|
}
|
|
157
224
|
exports.ModuleService = ModuleService;
|
|
225
|
+
function generateUnfilledPlaceholder() {
|
|
226
|
+
const alphabet = 'abcdefghijklmnopqrstuvwxyz';
|
|
227
|
+
const bytes = crypto_1.default.randomBytes(12);
|
|
228
|
+
let out = '';
|
|
229
|
+
for (let i = 0; i < 12; i++) {
|
|
230
|
+
out += alphabet[bytes[i] % alphabet.length];
|
|
231
|
+
}
|
|
232
|
+
return out;
|
|
233
|
+
}
|
|
158
234
|
//# sourceMappingURL=module-service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"module-service.js","sourceRoot":"","sources":["../../src/service/module-service.ts"],"names":[],"mappings":";;;;AAAA,oDAAoB;AACpB,wDAAwB;AACxB,wDAAwB;AACxB,
|
|
1
|
+
{"version":3,"file":"module-service.js","sourceRoot":"","sources":["../../src/service/module-service.ts"],"names":[],"mappings":";;;;AAAA,4DAA4B;AAC5B,oDAAoB;AACpB,wDAAwB;AACxB,wDAAwB;AACxB,8CAA2G;AAC3G,kDAAuH;AACvH,mHAA0E;AAkB1E,MAAM,yBAAyB,GAA2B;IACxD,SAAS,EAAE,KAAK;IAChB,WAAW,EAAE,UAAU;IACvB,WAAW,EAAE,UAAU;CACxB,CAAC;AAGF,MAAM,+BAA+B,GAAa,CAAC,8BAA8B,CAAC,CAAC;AAEnF,SAAS,iBAAiB,CAAC,OAA4C;IACrE,MAAM,UAAU,GAAG,IAAI,GAAG,EAAU,CAAC;IACrC,IAAI,CAAC,OAAO;QAAE,OAAO,UAAU,CAAC;IAChC,KAAK,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;QACrD,IAAI,IAAI,KAAK,UAAU,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC;YAAE,SAAS;QAC7D,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE;YAC3B,IAAI,KAAK,EAAE,GAAG;gBAAE,UAAU,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;SAC3C;KACF;IACD,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,SAAS,yBAAyB,CAChC,QAAiC,EACjC,QAAiC;IAEjC,MAAM,MAAM,GAA4B,EAAE,GAAG,QAAQ,EAAE,CAAC;IAExD,MAAM,eAAe,GAAG,CAAC,QAAQ,CAAC,OAAO,IAAI,EAAE,CAA4B,CAAC;IAC5E,MAAM,eAAe,GAAG,CAAC,QAAQ,CAAC,OAAO,IAAI,EAAE,CAA4B,CAAC;IAC5E,MAAM,aAAa,GAA4B,EAAE,GAAG,eAAe,EAAE,CAAC;IACtE,KAAK,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,eAAe,CAAC,EAAE;QAC7D,MAAM,eAAe,GAAG,KAAK,CAAC,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAE,aAAa,CAAC,IAAI,CAAe,CAAC,CAAC,CAAC,EAAE,CAAC;QACrG,MAAM,eAAe,GAAG,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;QAC9D,aAAa,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,eAAe,EAAE,GAAG,eAAe,CAAC,CAAC;KAChE;IACD,IAAI,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE;QACzC,MAAM,CAAC,OAAO,GAAG,aAAa,CAAC;KAChC;IAED,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;QAC1E,MAAM,CAAC,SAAS,GAAG;YACjB,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC;YAChE,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC;SACjE,CAAC;KACH;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,MAAa,aAAa;IACP,gBAAgB,CAAyB;IACzC,SAAS,GAAa,EAAE,CAAC;IAE1C,YAAY,gBAAwC;QAClD,IAAI,CAAC,gBAAgB,GAAG,gBAAgB,CAAC;IAC3C,CAAC;IAEM,KAAK,CAAC,mBAAmB,CAAC,OAAe;QAC9C,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC;QAClF,MAAM,SAAS,GAAG,IAAI,GAAG,EAA8B,CAAC;QAExD,KAAK,MAAM,CAAC,IAAI,gBAAgB,EAAE;YAChC,MAAM,GAAG,GAAG,CAAC,CAAC,SAAS,CAAC;YACxB,MAAM,QAAQ,GAAG,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YACpC,IAAI,CAAC,QAAQ,EAAE;gBACb,SAAS,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;aACvB;SACF;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;IAEM,eAAe,CAAC,SAA0C;QAC/D,MAAM,eAAe,GAAG,IAAI,GAAG,EAA8B,CAAC;QAE9D,KAAK,MAAM,IAAI,IAAI,SAAS,CAAC,MAAM,EAAE,EAAE;YACrC,MAAM,YAAY,GAAG,IAAI,CAAC,WAAW;gBACnC,CAAC,CAAC,GAAG,IAAI,CAAC,IAAI,MAAM,IAAI,CAAC,WAAW,KAAK,IAAI,CAAC,WAAW,EAAE;gBAC3D,CAAC,CAAC,GAAG,IAAI,CAAC,IAAI,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;YAEzC,eAAe,CAAC,GAAG,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC;SACzC;QAED,OAAO,eAAe,CAAC;IACzB,CAAC;IAEM,KAAK,CAAC,qBAAqB,CAChC,QAA4B,EAC5B,WAAyB;QAEzB,IAAI,CAAC,IAAI,CAAC,gBAAgB;YAAE,OAAO,SAAS,CAAC;QAE7C,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,qBAAqB,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;QAC9F,IAAI,YAAY,CAAC,QAAQ,EAAE;YACzB,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;SAC5C;QAED,OAAO,YAAY,CAAC;IACtB,CAAC;IAEM,KAAK,CAAC,oBAAoB,CAAC,QAA4B,EAAE,WAAyB;QACvF,IAAI,CAAC,IAAI,CAAC,gBAAgB;YAAE,OAAO;QAEnC,MAAM,IAAI,CAAC,gBAAgB,CAAC,oBAAoB,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;IAC1E,CAAC;IAEM,OAAO;QACZ,IAAI,IAAI,CAAC,gBAAgB,EAAE;YACzB,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,SAAS,EAAE;gBAChC,IAAI,CAAC,gBAAgB,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;aACzC;SACF;QACD,IAAI,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC;IAC5B,CAAC;IAEM,2BAA2B,CAAC,OAAe,EAAE,QAAgB;QAClE,IAAI;YACF,MAAM,MAAM,GAAG,IAAI,gCAAqB,EAAE,CAAC,iBAAiB,EAAE,CAAC,KAAK,EAAE,CAAC,aAAa,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC,CAAC;YAE5G,OAAO;gBACL,UAAU,EAAE,iBAAiB,CAAC,MAAM,EAAE,OAAO,CAAC;gBAC9C,YAAY,EAAE,IAAI,GAAG,CAAC,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;gBAChG,YAAY,EAAE,IAAI,GAAG,CAAC,CAAC,MAAM,EAAE,SAAS,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;aACzF,CAAC;SACH;QAAC,MAAM;YACN,OAAO;gBACL,UAAU,EAAE,IAAI,GAAG,EAAE;gBACrB,YAAY,EAAE,IAAI,GAAG,EAAE;gBACvB,YAAY,EAAE,IAAI,GAAG,EAAE;aACxB,CAAC;SACH;IACH,CAAC;IAEM,oBAAoB,CAAC,gBAAwB;QAClD,MAAM,YAAY,GAAG,cAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,uBAAuB,CAAC,CAAC;QAC1E,IAAI;YACF,OAAO,YAAE,CAAC,YAAY,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;SAC9C;QAAC,MAAM;YACN,OAAO,SAAS,CAAC;SAClB;IACH,CAAC;IAEM,iBAAiB,CACtB,MAA2B,EAC3B,KAAa,EACb,YAA0B,EAC1B,SAAiB,EACjB,YAAoC,EAAE;QAEtC,MAAM,wBAAwB,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,YAAY,CAAC,UAAU,EAAE,GAAG,YAAY,CAAC,YAAY,CAAC,CAAC,CAAC;QACrG,MAAM,sBAAsB,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC;QAEjE,IAAI,MAAM,CAAC,IAAI,KAAK,WAAW,EAAE;YAC/B,IAAI,sBAAsB,CAAC,GAAG,CAAC,KAAK,CAAC;gBAAE,OAAO,iBAAI,CAAC,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;YACrF,IAAI,wBAAwB,CAAC,GAAG,CAAC,KAAK,CAAC;gBAAE,OAAO,iBAAI,CAAC,MAAM,CAAC,MAAM,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC;SAC9F;QACD,IAAI,MAAM,CAAC,IAAI,KAAK,aAAa,EAAE;YACjC,IAAI,sBAAsB,CAAC,GAAG,CAAC,KAAK,CAAC;gBAAE,OAAO,iBAAI,CAAC,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;YACrF,IAAI,wBAAwB,CAAC,GAAG,CAAC,KAAK,CAAC;gBAAE,OAAO,iBAAI,CAAC,MAAM,CAAC,MAAM,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAC;SAChG;QACD,IAAI,MAAM,CAAC,IAAI,KAAK,aAAa,EAAE;YACjC,IAAI,sBAAsB,CAAC,GAAG,CAAC,KAAK,CAAC;gBAAE,OAAO,iBAAI,CAAC,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;SACtF;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;IAEM,KAAK,CAAC,gBAAgB,CAC3B,mBAA2B,EAC3B,YAAoB,EACpB,YAAoB,EACpB,OAAe;QAEf,MAAM,QAAQ,GAAG,cAAI,CAAC,KAAK,CAAC,mBAAmB,CAA4B,CAAC;QAC5E,MAAM,gBAAgB,GAAG,cAAI,CAAC,KAAK,CAAC,YAAE,CAAC,YAAY,CAAC,YAAY,EAAE,MAAM,CAAC,CAA4B,CAAC;QAEtG,MAAM,MAAM,GAAG,yBAAyB,CAAC,gBAAgB,EAAE,QAAQ,CAAC,CAAC;QACrE,MAAM,UAAU,GAAG,cAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QAE1C,MAAM,cAAc,GAAG;YACrB,QAAQ,EAAE,YAAY;YACtB,WAAW,EAAE,MAAM;YACnB,iBAAiB,EAAE,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC;SAC1C,CAAC;QAEF,MAAM,YAAY,GAAG,MAAM,IAAI,0BAAe,CAAiB,8BAAW,CAAC,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;QAErG,MAAM,aAAa,GAAG,MAAM,IAAI,2BAAgB,EAAE,CAAC,QAAQ,CAAC;YAC1D,GAAG,cAAc;YACjB,YAAY,EAAE,MAAmC;SAClD,CAAC,CAAC;QAEH,MAAM,SAAS,GAAG,CAAC,GAAG,CAAC,YAAY,CAAC,MAAM,IAAI,EAAE,CAAC,EAAE,GAAG,CAAC,aAAa,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,CAAC;QACpF,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,EAAE,CAAC;QAEtC,MAAM,OAAO,GAAG,yBAAyB,CAAC,OAAO,CAAC,CAAC;QACnD,MAAM,QAAQ,GAAa,EAAE,CAAC;QAC9B,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAC;QAG/B,KAAK,MAAM,CAAC,IAAI,SAAS,EAAE;YACzB,IAAI,CAAC,CAAC,KAAK,KAAK,OAAO;gBAAE,SAAS;YAClC,IAAI,+BAA+B,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;gBAAE,SAAS;YAC7E,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAC;gBAAE,SAAS;YAChD,IAAI,OAAO,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC;gBAAE,SAAS;YACtD,IAAI,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC;gBAAE,SAAS;YAClC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;YACpB,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;SAC1B;QACD,OAAO,QAAQ,CAAC;IAClB,CAAC;IAEM,sBAAsB,CAAC,QAA4B,EAAE,WAAyB;QACnF,IAAI,WAAW,IAAI,QAAQ,CAAC,QAAQ,EAAE,CAAC,WAAW,CAAC,EAAE,SAAS,EAAE;YAC9D,OAAO,QAAQ,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,SAAS,IAAI,EAAE,CAAC;SACvD;QAED,IAAI,QAAQ,CAAC,SAAS,IAAI,QAAQ,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE;YACvD,OAAO,QAAQ,CAAC,SAAS,CAAC;SAC3B;QAED,OAAO,EAAE,CAAC;IACZ,CAAC;IAEM,mBAAmB;QACxB,MAAM,YAAY,GAAG,cAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,cAAc,CAAC,CAAC;QAC9D,MAAM,eAAe,GAAG,YAAE,CAAC,YAAY,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;QAC9D,MAAM,YAAY,GAAG,IAAI,CAAC,2BAA2B,CAAC,eAAe,EAAE,YAAY,CAAC,CAAC;QACrF,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,CAAC;IACxC,CAAC;IAEM,uBAAuB,CAAC,MAA2B,EAAE,SAAiC;QAC3F,IAAI,MAAM,CAAC,OAAO,EAAE;YAClB,OAAO,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,iCAAiC,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,KAAK,CAAC,CAAC;SAC3G;QACD,OAAO,MAAM,CAAC,OAAO,CAAC;IACxB,CAAC;IAEM,KAAK,CAAC,sBAAsB,CACjC,MAA2B,EAC3B,KAAa,EACb,YAA0B,EAC1B,SAAiB,EACjB,eAAmC,EACnC,SAAiC,EACjC,YAAoB;QAEpB,MAAM,gBAAgB,GAAG,IAAI,CAAC,iBAAiB,CAAC,MAAM,EAAE,KAAK,EAAE,YAAY,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC;QACnG,IAAI,gBAAgB,EAAE;YACpB,OAAO,CAAC,gBAAgB,CAAC,CAAC;SAC3B;QAED,IAAI,eAAe,EAAE;YAEnB,MAAM,WAAW,GAAG,eAAe,CAAC,OAAO,CAAC,iCAAiC,EAAE,CAAC,EAAU,EAAE,GAAW,EAAE,EAAE;gBACzG,IAAI,GAAG,KAAK,MAAM,CAAC,IAAI;oBAAE,OAAO,KAAK,CAAC;gBACtC,OAAO,SAAS,CAAC,GAAG,CAAC,IAAI,2BAA2B,EAAE,CAAC;YACzD,CAAC,CAAC,CAAC;YACH,OAAO,IAAI,CAAC,gBAAgB,CAAC,WAAW,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;SAC7E;QAED,OAAO,EAAE,CAAC;IACZ,CAAC;CACF;AApND,sCAoNC;AAED,SAAS,2BAA2B;IAClC,MAAM,QAAQ,GAAG,4BAA4B,CAAC;IAC9C,MAAM,KAAK,GAAG,gBAAM,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;IACrC,IAAI,GAAG,GAAG,EAAE,CAAC;IACb,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,EAAE,EAAE;QAC3B,GAAG,IAAI,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC;KAC7C;IACD,OAAO,GAAG,CAAC;AACb,CAAC"}
|
|
@@ -28,6 +28,9 @@ export declare class DetailedMissingHtmlEntrypointError extends UserError {
|
|
|
28
28
|
export declare class DetailedMalformedHtmlEntrypointError extends UserError {
|
|
29
29
|
constructor(resourceKey: string);
|
|
30
30
|
}
|
|
31
|
+
export declare class MissingMultiEntryFilesError extends UserError {
|
|
32
|
+
constructor(key: string, missingEntries: string[]);
|
|
33
|
+
}
|
|
31
34
|
export declare class ResourcePackagingService {
|
|
32
35
|
private readonly archiverFactory;
|
|
33
36
|
private readonly fileSystemReader;
|
|
@@ -40,6 +43,8 @@ export declare class ResourcePackagingService {
|
|
|
40
43
|
private processFile;
|
|
41
44
|
private validateResourceContents;
|
|
42
45
|
private assertDirectoryIncludesEntrypoint;
|
|
46
|
+
private getExpectedEntryFile;
|
|
47
|
+
private assertEntryFilesExist;
|
|
43
48
|
private createResourceArchive;
|
|
44
49
|
private packageI18nResources;
|
|
45
50
|
zipResources(resources: ResourceDetails[], i18nResourceBundle: I18nResourceBundle, modules?: Modules): Promise<ResourceArchives>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resource-packaging-service.d.ts","sourceRoot":"","sources":["../../src/service/resource-packaging-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAC1C,OAAO,EACL,gBAAgB,EAChB,eAAe,EAEf,mBAAmB,EACnB,0BAA0B,EAE1B,SAAS,EAET,KAAK,kBAAkB,EACxB,MAAM,mBAAmB,CAAC;AAE3B,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAKrC,qBAAa,6BAA8B,SAAQ,SAAS;gBAC9C,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM;CAGrC;AAED,qBAAa,2BAA4B,SAAQ,SAAS;gBAC5C,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM;CAGrC;
|
|
1
|
+
{"version":3,"file":"resource-packaging-service.d.ts","sourceRoot":"","sources":["../../src/service/resource-packaging-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAC1C,OAAO,EACL,gBAAgB,EAChB,eAAe,EAEf,mBAAmB,EACnB,0BAA0B,EAE1B,SAAS,EAET,KAAK,kBAAkB,EACxB,MAAM,mBAAmB,CAAC;AAE3B,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAKrC,qBAAa,6BAA8B,SAAQ,SAAS;gBAC9C,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM;CAGrC;AAED,qBAAa,2BAA4B,SAAQ,SAAS;gBAC5C,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM;CAGrC;AAiBD,MAAM,WAAW,gBAAgB;IAC/B,CAAC,GAAG,EAAE,MAAM,GAAG;QACb,OAAO,EAAE,MAAM,CAAC;QAChB,UAAU,EAAE,MAAM,EAAE,CAAC;QACrB,OAAO,EAAE,MAAM,CAAC;QAChB,OAAO,EAAE,MAAM,CAAC;QAChB,SAAS,EAAE,MAAM,CAAC;KACnB,CAAC;CACH;AAED,qBAAa,4BAA6B,SAAQ,SAAS;;CAI1D;AAED,qBAAa,0BAA2B,SAAQ,SAAS;;CAIxD;AAED,qBAAa,kCAAmC,SAAQ,SAAS;gBACnD,WAAW,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM;CAGnD;AAED,qBAAa,oCAAqC,SAAQ,SAAS;gBACrD,WAAW,EAAE,MAAM;CAGhC;AAED,qBAAa,2BAA4B,SAAQ,SAAS;gBAC5C,GAAG,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE;CAGlD;AAED,qBAAa,wBAAwB;IAEjC,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,mBAAmB;IACpC,OAAO,CAAC,QAAQ,CAAC,0BAA0B;gBAJ1B,eAAe,EAAE,MAAM,QAAQ,EAC/B,gBAAgB,EAAE,gBAAgB,EAClC,MAAM,EAAE,MAAM,EACd,mBAAmB,EAAE,mBAAmB,EACxC,0BAA0B,EAAE,0BAA0B;YAG3D,uBAAuB;IAerC,OAAO,CAAC,wCAAwC;IAchD,OAAO,CAAC,WAAW;IAYnB,OAAO,CAAC,wBAAwB;IAYhC,OAAO,CAAC,iCAAiC;IAMzC,OAAO,CAAC,oBAAoB;IAM5B,OAAO,CAAC,qBAAqB;YAuBf,qBAAqB;IAanC,OAAO,CAAC,oBAAoB;IAMf,YAAY,CACvB,SAAS,EAAE,eAAe,EAAE,EAC5B,kBAAkB,EAAE,kBAAkB,EACtC,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,gBAAgB,CAAC;CAoC7B"}
|