@forge/cli 12.21.0-next.8-experimental-2e302e1 → 12.21.1-next.7-experimental-5c60439

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.
Files changed (43) hide show
  1. package/CHANGELOG.md +189 -6
  2. package/npm-shrinkwrap.json +46 -35
  3. package/out/analytics-client/analytics-client.d.ts.map +1 -1
  4. package/out/analytics-client/analytics-client.js +6 -6
  5. package/out/analytics-client/analytics-client.js.map +1 -1
  6. package/out/command-line/controller/module-controller.d.ts +8 -1
  7. package/out/command-line/controller/module-controller.d.ts.map +1 -1
  8. package/out/command-line/controller/module-controller.js +70 -19
  9. package/out/command-line/controller/module-controller.js.map +1 -1
  10. package/out/command-line/dependency-injection.d.ts.map +1 -1
  11. package/out/command-line/dependency-injection.js +3 -1
  12. package/out/command-line/dependency-injection.js.map +1 -1
  13. package/out/command-line/register-module-commands.d.ts.map +1 -1
  14. package/out/command-line/register-module-commands.js +0 -1
  15. package/out/command-line/register-module-commands.js.map +1 -1
  16. package/out/command-line/view/module-view.d.ts +8 -0
  17. package/out/command-line/view/module-view.d.ts.map +1 -1
  18. package/out/command-line/view/module-view.js +142 -0
  19. package/out/command-line/view/module-view.js.map +1 -1
  20. package/out/deploy/deployer/deployer.d.ts.map +1 -1
  21. package/out/deploy/deployer/deployer.js +6 -0
  22. package/out/deploy/deployer/deployer.js.map +1 -1
  23. package/out/module-add/dependencies-merger.d.ts +23 -0
  24. package/out/module-add/dependencies-merger.d.ts.map +1 -0
  25. package/out/module-add/dependencies-merger.js +175 -0
  26. package/out/module-add/dependencies-merger.js.map +1 -0
  27. package/out/module-add/manifest-merger.d.ts +11 -0
  28. package/out/module-add/manifest-merger.d.ts.map +1 -0
  29. package/out/module-add/manifest-merger.js +210 -0
  30. package/out/module-add/manifest-merger.js.map +1 -0
  31. package/out/module-add/vite-scaffolder.d.ts +6 -0
  32. package/out/module-add/vite-scaffolder.d.ts.map +1 -0
  33. package/out/module-add/vite-scaffolder.js +96 -0
  34. package/out/module-add/vite-scaffolder.js.map +1 -0
  35. package/out/service/module-file-service.d.ts +34 -0
  36. package/out/service/module-file-service.d.ts.map +1 -0
  37. package/out/service/module-file-service.js +162 -0
  38. package/out/service/module-file-service.js.map +1 -0
  39. package/out/service/module-service.d.ts +5 -6
  40. package/out/service/module-service.d.ts.map +1 -1
  41. package/out/service/module-service.js +117 -61
  42. package/out/service/module-service.js.map +1 -1
  43. package/package.json +8 -6
@@ -0,0 +1,175 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.planFrontendPackageJson = exports.runPackageManager = exports.writePackageChange = exports.planPackageJsonChange = exports.readPackageJson = 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 cross_spawn_1 = require("cross-spawn");
8
+ const diff_1 = require("diff");
9
+ const semver_1 = tslib_1.__importDefault(require("semver"));
10
+ const cli_shared_1 = require("@forge/cli-shared");
11
+ const manifest_merger_1 = require("./manifest-merger");
12
+ const FRONTEND_DIR_TEMPLATE = 'static/{{resourceKey}}';
13
+ const FRONTEND_PKG_SCAFFOLD = {
14
+ private: true,
15
+ scripts: {
16
+ dev: 'vite',
17
+ build: 'vite build',
18
+ preview: 'vite preview'
19
+ }
20
+ };
21
+ function readPackageJson(cwd) {
22
+ const packageJsonPath = path_1.default.join(cwd, 'package.json');
23
+ if (!fs_1.default.existsSync(packageJsonPath)) {
24
+ throw new Error(cli_shared_1.Text.module.add.errorPackageJsonNotFound(packageJsonPath));
25
+ }
26
+ try {
27
+ const raw = fs_1.default.readFileSync(packageJsonPath, 'utf8');
28
+ const parsed = JSON.parse(raw);
29
+ return { path: packageJsonPath, raw, parsed };
30
+ }
31
+ catch (err) {
32
+ throw new Error(cli_shared_1.Text.module.add.errorPackageJsonParseFailed(packageJsonPath, err.message), {
33
+ cause: err
34
+ });
35
+ }
36
+ }
37
+ exports.readPackageJson = readPackageJson;
38
+ function classifyDeps(templateDependencies, existing, force) {
39
+ const additions = [];
40
+ const conflicts = [];
41
+ const matches = [];
42
+ const merged = { ...existing };
43
+ for (const [name, version] of Object.entries(templateDependencies)) {
44
+ const current = existing[name];
45
+ if (!current) {
46
+ additions.push({ name, next: version });
47
+ merged[name] = version;
48
+ }
49
+ else if (versionsCompatible(current, version)) {
50
+ matches.push({ name, current, next: version });
51
+ }
52
+ else {
53
+ conflicts.push({ name, current, next: version });
54
+ if (force)
55
+ merged[name] = version;
56
+ }
57
+ }
58
+ return { additions, conflicts, matches, merged };
59
+ }
60
+ function versionsCompatible(current, next) {
61
+ const currentRange = semver_1.default.validRange(current, { includePrerelease: true });
62
+ const nextRange = semver_1.default.validRange(next, { includePrerelease: true });
63
+ if (!currentRange || !nextRange) {
64
+ return current === next;
65
+ }
66
+ return semver_1.default.intersects(currentRange, nextRange, { includePrerelease: true });
67
+ }
68
+ function planPackageJsonChange(packageJsonPath, rawPackageJson, parsedPackageJson, templateDependencies, templateDevDependencies, force) {
69
+ const dependencies = classifyDeps(templateDependencies, parsedPackageJson.dependencies ?? {}, force);
70
+ const devDependencies = classifyDeps(templateDevDependencies, parsedPackageJson.devDependencies ?? {}, force);
71
+ const mergedPackageJson = {
72
+ ...parsedPackageJson,
73
+ dependencies: dependencies.merged,
74
+ devDependencies: devDependencies.merged
75
+ };
76
+ const depChanges = {
77
+ additions: [...dependencies.additions, ...devDependencies.additions],
78
+ conflicts: [...dependencies.conflicts, ...devDependencies.conflicts],
79
+ matches: [...dependencies.matches, ...devDependencies.matches]
80
+ };
81
+ const before = rawPackageJson.endsWith('\n') ? rawPackageJson : `${rawPackageJson}\n`;
82
+ const after = `${JSON.stringify(mergedPackageJson, null, 2)}\n`;
83
+ if (before === after) {
84
+ return { depChanges };
85
+ }
86
+ const patch = (0, diff_1.createTwoFilesPatch)(packageJsonPath, packageJsonPath, before, after, 'before', 'after');
87
+ return { packageJsonChange: { filePath: packageJsonPath, before, after, patch }, depChanges };
88
+ }
89
+ exports.planPackageJsonChange = planPackageJsonChange;
90
+ function writePackageChange(change, createParentDir) {
91
+ if (!change)
92
+ return false;
93
+ if (createParentDir)
94
+ fs_1.default.mkdirSync(path_1.default.dirname(change.filePath), { recursive: true });
95
+ fs_1.default.writeFileSync(change.filePath, change.after, 'utf8');
96
+ return true;
97
+ }
98
+ exports.writePackageChange = writePackageChange;
99
+ function runPackageManager(cwd, args) {
100
+ const packageManager = detectPackageManager(cwd);
101
+ return new Promise((resolve) => {
102
+ const child = (0, cross_spawn_1.spawn)(packageManager, args, { cwd });
103
+ child.on('close', (code) => resolve(code === 0));
104
+ child.on('error', () => resolve(false));
105
+ });
106
+ }
107
+ exports.runPackageManager = runPackageManager;
108
+ function detectPackageManager(cwd) {
109
+ if (fs_1.default.existsSync(path_1.default.join(cwd, 'yarn.lock')))
110
+ return 'yarn';
111
+ return 'npm';
112
+ }
113
+ function planFrontendPackageJson(cwd, template, variables, force = false) {
114
+ const frontend = template.frontend;
115
+ const hasEntries = (value) => !!value && Object.keys(value).length > 0;
116
+ if (!frontend || (!hasEntries(frontend.dependencies) && !hasEntries(frontend.devDependencies))) {
117
+ return { depChanges: { additions: [], conflicts: [], matches: [] } };
118
+ }
119
+ const resourceKey = variables.resourceKey ?? template.moduleKey.replace(':', '-');
120
+ const frontendDir = (0, manifest_merger_1.substituteVars)(FRONTEND_DIR_TEMPLATE, { resourceKey });
121
+ const frontendPackageJsonPath = path_1.default.join(cwd, frontendDir, 'package.json');
122
+ const templateDependencies = frontend.dependencies ?? {};
123
+ const templateDevDependencies = frontend.devDependencies ?? {};
124
+ const exists = fs_1.default.existsSync(frontendPackageJsonPath);
125
+ const before = exists ? fs_1.default.readFileSync(frontendPackageJsonPath, 'utf8') : '';
126
+ let mergedPackageJson;
127
+ let depChanges;
128
+ if (exists) {
129
+ let existingPackageJson;
130
+ try {
131
+ existingPackageJson = JSON.parse(before);
132
+ }
133
+ catch (err) {
134
+ throw new Error(cli_shared_1.Text.module.add.errorPackageJsonParseFailed(frontendPackageJsonPath, err.message), {
135
+ cause: err
136
+ });
137
+ }
138
+ const dependencies = classifyDeps(templateDependencies, existingPackageJson.dependencies ?? {}, force);
139
+ const devDependencies = classifyDeps(templateDevDependencies, existingPackageJson.devDependencies ?? {}, force);
140
+ mergedPackageJson = {
141
+ ...existingPackageJson,
142
+ dependencies: dependencies.merged,
143
+ devDependencies: devDependencies.merged
144
+ };
145
+ depChanges = {
146
+ additions: [...dependencies.additions, ...devDependencies.additions],
147
+ conflicts: [...dependencies.conflicts, ...devDependencies.conflicts],
148
+ matches: [...dependencies.matches, ...devDependencies.matches]
149
+ };
150
+ }
151
+ else {
152
+ mergedPackageJson = {
153
+ name: `${resourceKey}-frontend`,
154
+ ...FRONTEND_PKG_SCAFFOLD,
155
+ dependencies: templateDependencies,
156
+ devDependencies: templateDevDependencies
157
+ };
158
+ const toAddition = ([name, version]) => ({ name, next: version });
159
+ depChanges = {
160
+ additions: [
161
+ ...Object.entries(templateDependencies).map(toAddition),
162
+ ...Object.entries(templateDevDependencies).map(toAddition)
163
+ ],
164
+ conflicts: [],
165
+ matches: []
166
+ };
167
+ }
168
+ const after = `${JSON.stringify(mergedPackageJson, null, 2)}\n`;
169
+ if (before === after) {
170
+ return { depChanges };
171
+ }
172
+ return { packageJsonChange: { filePath: frontendPackageJsonPath, before, after, patch: '' }, depChanges };
173
+ }
174
+ exports.planFrontendPackageJson = planFrontendPackageJson;
175
+ //# sourceMappingURL=dependencies-merger.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"dependencies-merger.js","sourceRoot":"","sources":["../../src/module-add/dependencies-merger.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,11 @@
1
+ import { ModuleTemplateMeta } from '@forge/cli-shared';
2
+ import { FileChange } from '../service/module-file-service';
3
+ export interface ManifestResource {
4
+ key: string;
5
+ path?: string;
6
+ entry?: Record<string, string>;
7
+ }
8
+ export declare function planManifestChange(cwd: string, template: ModuleTemplateMeta, variables: Record<string, string>, warnings: string[]): FileChange | undefined;
9
+ export declare function applyManifestChange(change: FileChange | undefined): boolean;
10
+ export declare function substituteVars(input: string, vars: Record<string, string>): string;
11
+ //# sourceMappingURL=manifest-merger.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"manifest-merger.d.ts","sourceRoot":"","sources":["../../src/module-add/manifest-merger.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,kBAAkB,EAAQ,MAAM,mBAAmB,CAAC;AAC7D,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAG5D,MAAM,WAAW,gBAAgB;IAC/B,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAChC;AAGD,wBAAgB,kBAAkB,CAChC,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,kBAAkB,EAC5B,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACjC,QAAQ,EAAE,MAAM,EAAE,GACjB,UAAU,GAAG,SAAS,CAoCxB;AAGD,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,UAAU,GAAG,SAAS,GAAG,OAAO,CAI3E;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM,CAElF"}
@@ -0,0 +1,210 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.substituteVars = exports.applyManifestChange = exports.planManifestChange = 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 diff_1 = require("diff");
9
+ const cli_shared_1 = require("@forge/cli-shared");
10
+ const COMPATIBILITY_PRODUCTS = new Set(['jira', 'confluence', 'compass']);
11
+ function planManifestChange(cwd, template, variables, warnings) {
12
+ if (!template.cacheDir) {
13
+ warnings.push(cli_shared_1.Text.module.add.warnNoFragment);
14
+ return undefined;
15
+ }
16
+ const fragmentPath = path_1.default.join(template.cacheDir, 'manifest-fragment.yml');
17
+ if (!fs_1.default.existsSync(fragmentPath)) {
18
+ warnings.push(cli_shared_1.Text.module.add.warnNoFragment);
19
+ return undefined;
20
+ }
21
+ const manifestPath = path_1.default.join(cwd, 'manifest.yml');
22
+ if (!fs_1.default.existsSync(manifestPath)) {
23
+ warnings.push(cli_shared_1.Text.module.add.warnNoManifest(manifestPath));
24
+ return undefined;
25
+ }
26
+ const fragmentContent = fs_1.default.readFileSync(fragmentPath, 'utf8');
27
+ const before = fs_1.default.readFileSync(manifestPath, 'utf8');
28
+ const existingManifest = (yaml_1.default.parse(before) ?? {});
29
+ const resolvedVariables = { ...computeAutoKeys(existingManifest, variables, fragmentContent), ...variables };
30
+ const substituted = substituteVars(fragmentContent, resolvedVariables);
31
+ const manifestFragment = (yaml_1.default.parse(substituted) ?? {});
32
+ applyCrossProductCompatibility(existingManifest, manifestFragment, template, warnings);
33
+ const merged = deepMergeObjects(existingManifest, manifestFragment);
34
+ const after = yaml_1.default.stringify(merged);
35
+ if (before === after) {
36
+ warnings.push(cli_shared_1.Text.module.add.warnNoManifestDelta);
37
+ return undefined;
38
+ }
39
+ const patch = (0, diff_1.createTwoFilesPatch)(manifestPath, manifestPath, before, after, 'before', 'after');
40
+ return { filePath: manifestPath, before, after, patch };
41
+ }
42
+ exports.planManifestChange = planManifestChange;
43
+ function applyManifestChange(change) {
44
+ if (!change)
45
+ return false;
46
+ fs_1.default.writeFileSync(change.filePath, change.after, 'utf8');
47
+ return true;
48
+ }
49
+ exports.applyManifestChange = applyManifestChange;
50
+ function substituteVars(input, vars) {
51
+ return input.replace(/\{\{\s*([a-zA-Z0-9_-]+)\s*\}\}/g, (_m, key) => vars[key] ?? '');
52
+ }
53
+ exports.substituteVars = substituteVars;
54
+ function computeAutoKeys(existingManifest, variables, fragmentContent) {
55
+ const result = {};
56
+ const modules = isObject(existingManifest.modules) ? existingManifest.modules : {};
57
+ const functions = Array.isArray(modules.function) ? modules.function : [];
58
+ const existingFunctionKeys = functions.filter(isObject).map((f) => (typeof f.key === 'string' ? f.key : ''));
59
+ assignAutoKeys('resolver', collectPlaceholders(fragmentContent, 'functionKey'), existingFunctionKeys, result);
60
+ const resources = Array.isArray(existingManifest.resources) ? existingManifest.resources : [];
61
+ const targetResource = resources.find((r) => isObject(r) && r.key === variables.resourceKey);
62
+ const existingEntryKeys = targetResource && isObject(targetResource.entry) ? Object.keys(targetResource.entry) : [];
63
+ assignAutoKeys('entry', collectPlaceholders(fragmentContent, 'entryKey'), existingEntryKeys, result);
64
+ return result;
65
+ }
66
+ function collectPlaceholders(content, base) {
67
+ const pattern = new RegExp(`\\{\\{\\s*(${base}\\d*)\\s*\\}\\}`, 'g');
68
+ const found = new Set();
69
+ for (const m of content.matchAll(pattern))
70
+ found.add(m[1]);
71
+ return [...found].sort((a, b) => {
72
+ const na = a === base ? 0 : parseInt(a.slice(base.length), 10);
73
+ const nb = b === base ? 0 : parseInt(b.slice(base.length), 10);
74
+ return na - nb;
75
+ });
76
+ }
77
+ function assignAutoKeys(base, placeholders, existingKeys, out) {
78
+ const pattern = new RegExp(`^${base}(?:-(\\d+))?$`);
79
+ for (const placeholder of placeholders) {
80
+ const used = existingKeys
81
+ .map((k) => pattern.exec(k))
82
+ .filter((m) => m !== null)
83
+ .map((m) => (m[1] ? parseInt(m[1], 10) : 1));
84
+ const next = used.length === 0 ? base : `${base}-${Math.max(...used) + 1}`;
85
+ out[placeholder] = next;
86
+ existingKeys.push(next);
87
+ }
88
+ }
89
+ function deepMergeObjects(target, source, key) {
90
+ if (Array.isArray(target) && Array.isArray(source)) {
91
+ return mergeArrayValues(target, source, key);
92
+ }
93
+ if (isObject(target) && isObject(source)) {
94
+ return mergeRecordValues(target, source, key);
95
+ }
96
+ return source;
97
+ }
98
+ function mergeArrayValues(target, source, key) {
99
+ if (key === 'resources') {
100
+ return mergeResourcesByKey(target, source);
101
+ }
102
+ const merged = [...target, ...source];
103
+ if (key === 'scopes') {
104
+ return [...new Set(merged)];
105
+ }
106
+ return merged;
107
+ }
108
+ function mergeRecordValues(target, source, key) {
109
+ const result = { ...target };
110
+ for (const k of Object.keys(source)) {
111
+ result[k] = k in result ? deepMergeObjects(result[k], source[k], k) : source[k];
112
+ }
113
+ if (key === 'modules') {
114
+ moveKeysToBottom(result, ['function', 'resource']);
115
+ }
116
+ if (key === undefined) {
117
+ moveKeysToBottom(result, ['resources', 'app']);
118
+ }
119
+ return result;
120
+ }
121
+ function moveKeysToBottom(result, keys) {
122
+ for (const k of keys) {
123
+ if (k in result) {
124
+ const v = result[k];
125
+ delete result[k];
126
+ result[k] = v;
127
+ }
128
+ }
129
+ }
130
+ function mergeResourcesByKey(target, source) {
131
+ const byKey = new Map();
132
+ for (const item of target) {
133
+ if (isObject(item) && typeof item.key === 'string')
134
+ byKey.set(item.key, item);
135
+ }
136
+ for (const incoming of source) {
137
+ if (!isObject(incoming) || typeof incoming.key !== 'string')
138
+ continue;
139
+ const existing = byKey.get(incoming.key);
140
+ byKey.set(incoming.key, existing ? mergeResource(existing, incoming) : incoming);
141
+ }
142
+ return [...byKey.values()];
143
+ }
144
+ function mergeResource(existing, incoming) {
145
+ const key = incoming.key;
146
+ if (typeof existing.path === 'string' && typeof incoming.path === 'string' && existing.path !== incoming.path) {
147
+ throw new Error(cli_shared_1.Text.module.add.errorResourcePathConflict(key, existing.path, incoming.path));
148
+ }
149
+ const existingEntry = isObject(existing.entry) ? existing.entry : {};
150
+ const incomingEntry = isObject(incoming.entry) ? incoming.entry : {};
151
+ const mergedEntry = { ...existingEntry };
152
+ for (const [name, value] of Object.entries(incomingEntry)) {
153
+ if (name in mergedEntry && mergedEntry[name] !== value) {
154
+ throw new Error(cli_shared_1.Text.module.add.errorResourceEntryConflict(key, name, String(mergedEntry[name]), String(value)));
155
+ }
156
+ mergedEntry[name] = value;
157
+ }
158
+ return {
159
+ ...existing,
160
+ entry: mergedEntry
161
+ };
162
+ }
163
+ function isObject(value) {
164
+ return value !== null && typeof value === 'object' && !Array.isArray(value);
165
+ }
166
+ function applyCrossProductCompatibility(existingManifest, manifestFragment, template, warnings) {
167
+ const newProduct = template.product;
168
+ if (!newProduct || !COMPATIBILITY_PRODUCTS.has(newProduct))
169
+ return;
170
+ const existingProducts = collectProductPrefixes(existingManifest.modules);
171
+ existingProducts.delete(newProduct);
172
+ const existingProduct = [...existingProducts].find((p) => COMPATIBILITY_PRODUCTS.has(p));
173
+ if (!existingProduct)
174
+ return;
175
+ const existingCompatibility = readCompatibility(existingManifest);
176
+ const fragmentApp = isObject(manifestFragment.app) ? manifestFragment.app : {};
177
+ const fragmentCompatibility = isObject(fragmentApp.compatibility)
178
+ ? fragmentApp.compatibility
179
+ : {};
180
+ const nextCompatibility = { ...fragmentCompatibility };
181
+ if (!isObject(existingCompatibility[existingProduct])) {
182
+ nextCompatibility[existingProduct] = { required: true };
183
+ }
184
+ if (!isObject(existingCompatibility[newProduct]) && !isObject(nextCompatibility[newProduct])) {
185
+ nextCompatibility[newProduct] = { required: false };
186
+ }
187
+ if (Object.keys(nextCompatibility).length === Object.keys(fragmentCompatibility).length)
188
+ return;
189
+ manifestFragment.app = { ...fragmentApp, compatibility: nextCompatibility };
190
+ warnings.push(cli_shared_1.Text.module.add.warnAddedAppCompatibility(existingProduct, newProduct));
191
+ }
192
+ function readCompatibility(manifest) {
193
+ const app = isObject(manifest.app) ? manifest.app : undefined;
194
+ const compatibility = app && isObject(app.compatibility) ? app.compatibility : undefined;
195
+ return compatibility ?? {};
196
+ }
197
+ function collectProductPrefixes(modules) {
198
+ const prefixes = new Set();
199
+ if (!isObject(modules))
200
+ return prefixes;
201
+ for (const [type, entries] of Object.entries(modules)) {
202
+ if (type === 'function' || !Array.isArray(entries) || entries.length === 0)
203
+ continue;
204
+ const colonIdx = type.indexOf(':');
205
+ if (colonIdx > 0)
206
+ prefixes.add(type.slice(0, colonIdx));
207
+ }
208
+ return prefixes;
209
+ }
210
+ //# sourceMappingURL=manifest-merger.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"manifest-merger.js","sourceRoot":"","sources":["../../src/module-add/manifest-merger.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,6 @@
1
+ import { FileChange } from '../service/module-file-service';
2
+ import { ManifestResource } from './manifest-merger';
3
+ export declare function planViteConfig(cwd: string, resourceKey: string, resource: ManifestResource | undefined, warnings: string[]): FileChange | undefined;
4
+ export declare function planCommonJsx(cwd: string, resourceKey: string): FileChange | undefined;
5
+ export declare function applyScaffoldChange(change: FileChange | undefined): boolean;
6
+ //# sourceMappingURL=vite-scaffolder.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"vite-scaffolder.d.ts","sourceRoot":"","sources":["../../src/module-add/vite-scaffolder.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAC5D,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAsDrD,wBAAgB,cAAc,CAC5B,GAAG,EAAE,MAAM,EACX,WAAW,EAAE,MAAM,EACnB,QAAQ,EAAE,gBAAgB,GAAG,SAAS,EACtC,QAAQ,EAAE,MAAM,EAAE,GACjB,UAAU,GAAG,SAAS,CAuBxB;AAGD,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,UAAU,GAAG,SAAS,CAStF;AAED,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,UAAU,GAAG,SAAS,GAAG,OAAO,CAK3E"}
@@ -0,0 +1,96 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.applyScaffoldChange = exports.planCommonJsx = exports.planViteConfig = 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 diff_1 = require("diff");
8
+ const cli_shared_1 = require("@forge/cli-shared");
9
+ function renderViteConfig(entry) {
10
+ const sortedNames = Object.keys(entry).sort();
11
+ const inputLines = sortedNames.map((name) => ` ${JSON.stringify(name)}: resolve(__dirname, ${JSON.stringify(entry[name])}),`);
12
+ return `import { defineConfig } from "vite";
13
+ import react from "@vitejs/plugin-react";
14
+ import { resolve } from "path";
15
+
16
+ export default defineConfig({
17
+ plugins: [react()],
18
+ base: "./",
19
+ build: {
20
+ outDir: "build",
21
+ emptyOutDir: true,
22
+ rolldownOptions: {
23
+ input: {
24
+ ${inputLines.join('\n')}
25
+ },
26
+ },
27
+ },
28
+ });
29
+ `;
30
+ }
31
+ const COMMON_JSX_CONTENT = `// Shared bootstrap for custom-ui entries. Replace this stub with your own mount logic
32
+ // (e.g. ReactDOM.createRoot(...).render(<App />)) when wiring up your UI.
33
+ export function mount(_App) {
34
+ // no-op placeholder
35
+ }
36
+ `;
37
+ function mergeViteConfigInputs(existing, entries) {
38
+ const inputBlockRe = /(input:\s*\{)([\s\S]*?)(\n\s*\},)/;
39
+ const match = existing.match(inputBlockRe);
40
+ if (!match)
41
+ return undefined;
42
+ if (match[2].includes('{')) {
43
+ throw new Error(cli_shared_1.Text.module.add.errorViteConfigNestedInput());
44
+ }
45
+ const inputLines = Object.keys(entries)
46
+ .sort()
47
+ .map((name) => ` ${JSON.stringify(name)}: resolve(__dirname, ${JSON.stringify(entries[name])}),`);
48
+ return existing.replace(inputBlockRe, `$1$2\n${inputLines.join('\n')}$3`);
49
+ }
50
+ function planViteConfig(cwd, resourceKey, resource, warnings) {
51
+ if (!resource || !resource.entry || Object.keys(resource.entry).length === 0) {
52
+ return undefined;
53
+ }
54
+ const configPath = path_1.default.join(cwd, 'static', resourceKey, 'vite.config.js');
55
+ const exists = fs_1.default.existsSync(configPath);
56
+ const before = exists ? fs_1.default.readFileSync(configPath, 'utf8') : '';
57
+ let after;
58
+ if (!exists) {
59
+ after = renderViteConfig(resource.entry);
60
+ }
61
+ else {
62
+ const merged = mergeViteConfigInputs(before, resource.entry);
63
+ if (!merged) {
64
+ warnings.push(cli_shared_1.Text.module.add.warnViteConfigExists(configPath));
65
+ return undefined;
66
+ }
67
+ after = merged;
68
+ }
69
+ if (before === after)
70
+ return undefined;
71
+ const patch = (0, diff_1.createTwoFilesPatch)(configPath, configPath, before, after, 'before', 'after');
72
+ return { filePath: configPath, before, after, patch };
73
+ }
74
+ exports.planViteConfig = planViteConfig;
75
+ function planCommonJsx(cwd, resourceKey) {
76
+ const filePath = path_1.default.join(cwd, 'static', resourceKey, 'src', 'common.jsx');
77
+ const exists = fs_1.default.existsSync(filePath);
78
+ if (exists)
79
+ return undefined;
80
+ const before = exists ? fs_1.default.readFileSync(filePath, 'utf8') : '';
81
+ const after = COMMON_JSX_CONTENT;
82
+ if (before === after)
83
+ return undefined;
84
+ const patch = (0, diff_1.createTwoFilesPatch)(filePath, filePath, before, after, 'before', 'after');
85
+ return { filePath, before, after, patch };
86
+ }
87
+ exports.planCommonJsx = planCommonJsx;
88
+ function applyScaffoldChange(change) {
89
+ if (!change)
90
+ return false;
91
+ fs_1.default.mkdirSync(path_1.default.dirname(change.filePath), { recursive: true });
92
+ fs_1.default.writeFileSync(change.filePath, change.after, 'utf8');
93
+ return true;
94
+ }
95
+ exports.applyScaffoldChange = applyScaffoldChange;
96
+ //# sourceMappingURL=vite-scaffolder.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"vite-scaffolder.js","sourceRoot":"","sources":["../../src/module-add/vite-scaffolder.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 ModuleAddFileService {
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,oBAAoB;IACxB,iBAAiB,CAAC,QAAQ,EAAE,kBAAkB,EAAE,KAAK,EAAE,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,SAAS,EAAE,CAAC;IAgBtF,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;CA0ChC"}