@forge/cli 12.21.0 → 12.22.0-next.8-experimental-04898b4

package/out/module-add/manifest-merger.js

@@ -0,0 +1,210 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.substituteVars = exports.applyManifestChange = exports.planManifestChange = void 0;
+const tslib_1 = require("tslib");
+const fs_1 = tslib_1.__importDefault(require("fs"));
+const path_1 = tslib_1.__importDefault(require("path"));
+const yaml_1 = tslib_1.__importDefault(require("yaml"));
+const diff_1 = require("diff");
+const cli_shared_1 = require("@forge/cli-shared");
+const COMPATIBILITY_PRODUCTS = new Set(['jira', 'confluence', 'compass']);
+function planManifestChange(cwd, template, variables, warnings) {
+    if (!template.cacheDir) {
+        warnings.push(cli_shared_1.Text.module.add.warnNoFragment);
+        return undefined;
+    }
+    const fragmentPath = path_1.default.join(template.cacheDir, 'manifest-fragment.yml');
+    if (!fs_1.default.existsSync(fragmentPath)) {
+        warnings.push(cli_shared_1.Text.module.add.warnNoFragment);
+        return undefined;
+    }
+    const manifestPath = path_1.default.join(cwd, 'manifest.yml');
+    if (!fs_1.default.existsSync(manifestPath)) {
+        warnings.push(cli_shared_1.Text.module.add.warnNoManifest(manifestPath));
+        return undefined;
+    }
+    const fragmentContent = fs_1.default.readFileSync(fragmentPath, 'utf8');
+    const before = fs_1.default.readFileSync(manifestPath, 'utf8');
+    const existingManifest = (yaml_1.default.parse(before) ?? {});
+    const resolvedVariables = { ...computeAutoKeys(existingManifest, variables, fragmentContent), ...variables };
+    const substituted = substituteVars(fragmentContent, resolvedVariables);
+    const manifestFragment = (yaml_1.default.parse(substituted) ?? {});
+    applyCrossProductCompatibility(existingManifest, manifestFragment, template, warnings);
+    const merged = deepMergeObjects(existingManifest, manifestFragment);
+    const after = yaml_1.default.stringify(merged);
+    if (before === after) {
+        warnings.push(cli_shared_1.Text.module.add.warnNoManifestDelta);
+        return undefined;
+    }
+    const patch = (0, diff_1.createTwoFilesPatch)(manifestPath, manifestPath, before, after, 'before', 'after');
+    return { filePath: manifestPath, before, after, patch };
+}
+exports.planManifestChange = planManifestChange;
+function applyManifestChange(change) {
+    if (!change)
+        return false;
+    fs_1.default.writeFileSync(change.filePath, change.after, 'utf8');
+    return true;
+}
+exports.applyManifestChange = applyManifestChange;
+function substituteVars(input, vars) {
+    return input.replace(/\{\{\s*([a-zA-Z0-9_-]+)\s*\}\}/g, (_m, key) => vars[key] ?? '');
+}
+exports.substituteVars = substituteVars;
+function computeAutoKeys(existingManifest, variables, fragmentContent) {
+    const result = {};
+    const modules = isObject(existingManifest.modules) ? existingManifest.modules : {};
+    const functions = Array.isArray(modules.function) ? modules.function : [];
+    const existingFunctionKeys = functions.filter(isObject).map((f) => (typeof f.key === 'string' ? f.key : ''));
+    assignAutoKeys('resolver', collectPlaceholders(fragmentContent, 'functionKey'), existingFunctionKeys, result);
+    const resources = Array.isArray(existingManifest.resources) ? existingManifest.resources : [];
+    const targetResource = resources.find((r) => isObject(r) && r.key === variables.resourceKey);
+    const existingEntryKeys = targetResource && isObject(targetResource.entry) ? Object.keys(targetResource.entry) : [];
+    assignAutoKeys('entry', collectPlaceholders(fragmentContent, 'entryKey'), existingEntryKeys, result);
+    return result;
+}
+function collectPlaceholders(content, base) {
+    const pattern = new RegExp(`\\{\\{\\s*(${base}\\d*)\\s*\\}\\}`, 'g');
+    const found = new Set();
+    for (const m of content.matchAll(pattern))
+        found.add(m[1]);
+    return [...found].sort((a, b) => {
+        const na = a === base ? 0 : parseInt(a.slice(base.length), 10);
+        const nb = b === base ? 0 : parseInt(b.slice(base.length), 10);
+        return na - nb;
+    });
+}
+function assignAutoKeys(base, placeholders, existingKeys, out) {
+    const pattern = new RegExp(`^${base}(?:-(\\d+))?$`);
+    for (const placeholder of placeholders) {
+        const used = existingKeys
+            .map((k) => pattern.exec(k))
+            .filter((m) => m !== null)
+            .map((m) => (m[1] ? parseInt(m[1], 10) : 1));
+        const next = used.length === 0 ? base : `${base}-${Math.max(...used) + 1}`;
+        out[placeholder] = next;
+        existingKeys.push(next);
+    }
+}
+function deepMergeObjects(target, source, key) {
+    if (Array.isArray(target) && Array.isArray(source)) {
+        return mergeArrayValues(target, source, key);
+    }
+    if (isObject(target) && isObject(source)) {
+        return mergeRecordValues(target, source, key);
+    }
+    return source;
+}
+function mergeArrayValues(target, source, key) {
+    if (key === 'resources') {
+        return mergeResourcesByKey(target, source);
+    }
+    const merged = [...target, ...source];
+    if (key === 'scopes') {
+        return [...new Set(merged)];
+    }
+    return merged;
+}
+function mergeRecordValues(target, source, key) {
+    const result = { ...target };
+    for (const k of Object.keys(source)) {
+        result[k] = k in result ? deepMergeObjects(result[k], source[k], k) : source[k];
+    }
+    if (key === 'modules') {
+        moveKeysToBottom(result, ['function', 'resource']);
+    }
+    if (key === undefined) {
+        moveKeysToBottom(result, ['resources', 'app']);
+    }
+    return result;
+}
+function moveKeysToBottom(result, keys) {
+    for (const k of keys) {
+        if (k in result) {
+            const v = result[k];
+            delete result[k];
+            result[k] = v;
+        }
+    }
+}
+function mergeResourcesByKey(target, source) {
+    const byKey = new Map();
+    for (const item of target) {
+        if (isObject(item) && typeof item.key === 'string')
+            byKey.set(item.key, item);
+    }
+    for (const incoming of source) {
+        if (!isObject(incoming) || typeof incoming.key !== 'string')
+            continue;
+        const existing = byKey.get(incoming.key);
+        byKey.set(incoming.key, existing ? mergeResource(existing, incoming) : incoming);
+    }
+    return [...byKey.values()];
+}
+function mergeResource(existing, incoming) {
+    const key = incoming.key;
+    if (typeof existing.path === 'string' && typeof incoming.path === 'string' && existing.path !== incoming.path) {
+        throw new Error(cli_shared_1.Text.module.add.errorResourcePathConflict(key, existing.path, incoming.path));
+    }
+    const existingEntry = isObject(existing.entry) ? existing.entry : {};
+    const incomingEntry = isObject(incoming.entry) ? incoming.entry : {};
+    const mergedEntry = { ...existingEntry };
+    for (const [name, value] of Object.entries(incomingEntry)) {
+        if (name in mergedEntry && mergedEntry[name] !== value) {
+            throw new Error(cli_shared_1.Text.module.add.errorResourceEntryConflict(key, name, String(mergedEntry[name]), String(value)));
+        }
+        mergedEntry[name] = value;
+    }
+    return {
+        ...existing,
+        entry: mergedEntry
+    };
+}
+function isObject(value) {
+    return value !== null && typeof value === 'object' && !Array.isArray(value);
+}
+function applyCrossProductCompatibility(existingManifest, manifestFragment, template, warnings) {
+    const newProduct = template.product;
+    if (!newProduct || !COMPATIBILITY_PRODUCTS.has(newProduct))
+        return;
+    const existingProducts = collectProductPrefixes(existingManifest.modules);
+    existingProducts.delete(newProduct);
+    const existingProduct = [...existingProducts].find((p) => COMPATIBILITY_PRODUCTS.has(p));
+    if (!existingProduct)
+        return;
+    const existingCompatibility = readCompatibility(existingManifest);
+    const fragmentApp = isObject(manifestFragment.app) ? manifestFragment.app : {};
+    const fragmentCompatibility = isObject(fragmentApp.compatibility)
+        ? fragmentApp.compatibility
+        : {};
+    const nextCompatibility = { ...fragmentCompatibility };
+    if (!isObject(existingCompatibility[existingProduct])) {
+        nextCompatibility[existingProduct] = { required: true };
+    }
+    if (!isObject(existingCompatibility[newProduct]) && !isObject(nextCompatibility[newProduct])) {
+        nextCompatibility[newProduct] = { required: false };
+    }
+    if (Object.keys(nextCompatibility).length === Object.keys(fragmentCompatibility).length)
+        return;
+    manifestFragment.app = { ...fragmentApp, compatibility: nextCompatibility };
+    warnings.push(cli_shared_1.Text.module.add.warnAddedAppCompatibility(existingProduct, newProduct));
+}
+function readCompatibility(manifest) {
+    const app = isObject(manifest.app) ? manifest.app : undefined;
+    const compatibility = app && isObject(app.compatibility) ? app.compatibility : undefined;
+    return compatibility ?? {};
+}
+function collectProductPrefixes(modules) {
+    const prefixes = new Set();
+    if (!isObject(modules))
+        return prefixes;
+    for (const [type, entries] of Object.entries(modules)) {
+        if (type === 'function' || !Array.isArray(entries) || entries.length === 0)
+            continue;
+        const colonIdx = type.indexOf(':');
+        if (colonIdx > 0)
+            prefixes.add(type.slice(0, colonIdx));
+    }
+    return prefixes;
+}
+//# sourceMappingURL=manifest-merger.js.map

package/out/module-add/manifest-merger.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"manifest-merger.js","sourceRoot":"","sources":["../../src/module-add/manifest-merger.ts"],"names":[],"mappings":"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"}

package/out/module-add/vite-scaffolder.d.ts

@@ -0,0 +1,6 @@
+import { FileChange } from '../service/module-file-service';
+import { ManifestResource } from './manifest-merger';
+export declare function planViteConfig(cwd: string, resourceKey: string, resource: ManifestResource | undefined, warnings: string[]): FileChange | undefined;
+export declare function planCommonJsx(cwd: string, resourceKey: string): FileChange | undefined;
+export declare function applyScaffoldChange(change: FileChange | undefined): boolean;
+//# sourceMappingURL=vite-scaffolder.d.ts.map

package/out/module-add/vite-scaffolder.d.ts.map

@@ -0,0 +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"}

package/out/module-add/vite-scaffolder.js

@@ -0,0 +1,96 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.applyScaffoldChange = exports.planCommonJsx = exports.planViteConfig = void 0;
+const tslib_1 = require("tslib");
+const fs_1 = tslib_1.__importDefault(require("fs"));
+const path_1 = tslib_1.__importDefault(require("path"));
+const diff_1 = require("diff");
+const cli_shared_1 = require("@forge/cli-shared");
+function renderViteConfig(entry) {
+    const sortedNames = Object.keys(entry).sort();
+    const inputLines = sortedNames.map((name) => `        ${JSON.stringify(name)}: resolve(__dirname, ${JSON.stringify(entry[name])}),`);
+    return `import { defineConfig } from "vite";
+import react from "@vitejs/plugin-react";
+import { resolve } from "path";
+
+export default defineConfig({
+  plugins: [react()],
+  base: "./",
+  build: {
+    outDir: "build",
+    emptyOutDir: true,
+    rolldownOptions: {
+      input: {
+${inputLines.join('\n')}
+      },
+    },
+  },
+});
+`;
+}
+const COMMON_JSX_CONTENT = `// Shared bootstrap for custom-ui entries. Replace this stub with your own mount logic
+// (e.g. ReactDOM.createRoot(...).render(<App />)) when wiring up your UI.
+export function mount(_App) {
+  // no-op placeholder
+}
+`;
+function mergeViteConfigInputs(existing, entries) {
+    const inputBlockRe = /(input:\s*\{)([\s\S]*?)(\n\s*\},)/;
+    const match = existing.match(inputBlockRe);
+    if (!match)
+        return undefined;
+    if (match[2].includes('{')) {
+        throw new Error(cli_shared_1.Text.module.add.errorViteConfigNestedInput());
+    }
+    const inputLines = Object.keys(entries)
+        .sort()
+        .map((name) => `        ${JSON.stringify(name)}: resolve(__dirname, ${JSON.stringify(entries[name])}),`);
+    return existing.replace(inputBlockRe, `$1$2\n${inputLines.join('\n')}$3`);
+}
+function planViteConfig(cwd, resourceKey, resource, warnings) {
+    if (!resource || !resource.entry || Object.keys(resource.entry).length === 0) {
+        return undefined;
+    }
+    const configPath = path_1.default.join(cwd, 'static', resourceKey, 'vite.config.js');
+    const exists = fs_1.default.existsSync(configPath);
+    const before = exists ? fs_1.default.readFileSync(configPath, 'utf8') : '';
+    let after;
+    if (!exists) {
+        after = renderViteConfig(resource.entry);
+    }
+    else {
+        const merged = mergeViteConfigInputs(before, resource.entry);
+        if (!merged) {
+            warnings.push(cli_shared_1.Text.module.add.warnViteConfigExists(configPath));
+            return undefined;
+        }
+        after = merged;
+    }
+    if (before === after)
+        return undefined;
+    const patch = (0, diff_1.createTwoFilesPatch)(configPath, configPath, before, after, 'before', 'after');
+    return { filePath: configPath, before, after, patch };
+}
+exports.planViteConfig = planViteConfig;
+function planCommonJsx(cwd, resourceKey) {
+    const filePath = path_1.default.join(cwd, 'static', resourceKey, 'src', 'common.jsx');
+    const exists = fs_1.default.existsSync(filePath);
+    if (exists)
+        return undefined;
+    const before = exists ? fs_1.default.readFileSync(filePath, 'utf8') : '';
+    const after = COMMON_JSX_CONTENT;
+    if (before === after)
+        return undefined;
+    const patch = (0, diff_1.createTwoFilesPatch)(filePath, filePath, before, after, 'before', 'after');
+    return { filePath, before, after, patch };
+}
+exports.planCommonJsx = planCommonJsx;
+function applyScaffoldChange(change) {
+    if (!change)
+        return false;
+    fs_1.default.mkdirSync(path_1.default.dirname(change.filePath), { recursive: true });
+    fs_1.default.writeFileSync(change.filePath, change.after, 'utf8');
+    return true;
+}
+exports.applyScaffoldChange = applyScaffoldChange;
+//# sourceMappingURL=vite-scaffolder.js.map

package/out/module-add/vite-scaffolder.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"vite-scaffolder.js","sourceRoot":"","sources":["../../src/module-add/vite-scaffolder.ts"],"names":[],"mappings":"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"}

package/out/service/module-file-service.d.ts

@@ -0,0 +1,34 @@
+import { ModuleTemplateMeta } from '@forge/cli-shared';
+import { AddModuleOptions } from './module-service';
+export interface DepChange {
+    name: string;
+    current?: string;
+    next: string;
+}
+export interface FileChange {
+    filePath: string;
+    before: string;
+    after: string;
+    patch: string;
+}
+export interface AddTemplateMeta {
+    template: ModuleTemplateMeta;
+    variables: Record<string, string>;
+    plannedFiles: string[];
+    manifestChange?: FileChange;
+    packageJsonChange?: FileChange;
+    frontendPackageJsonChange?: FileChange;
+    frontendDepChanges?: Record<string, DepChange[]>;
+    scaffoldChanges?: FileChange[];
+    warnings: string[];
+}
+export declare class ModuleAddFileService {
+    checkDependencies(template: ModuleTemplateMeta, force: boolean): Record<string, DepChange[]>;
+    templateMerge(template: ModuleTemplateMeta, variables: Record<string, string>, options?: AddModuleOptions): Promise<AddTemplateMeta>;
+    private collectUnsupportedOpWarnings;
+    private collectScaffoldChanges;
+    private assertNoTargetConflicts;
+    private runInstalls;
+    private copyTemplateFiles;
+}
+//# sourceMappingURL=module-file-service.d.ts.map

package/out/service/module-file-service.d.ts.map

@@ -0,0 +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"}

package/out/service/module-file-service.js

@@ -0,0 +1,162 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ModuleAddFileService = void 0;
+const tslib_1 = require("tslib");
+const fs_1 = tslib_1.__importDefault(require("fs"));
+const path_1 = tslib_1.__importDefault(require("path"));
+const yaml_1 = tslib_1.__importDefault(require("yaml"));
+const cli_shared_1 = require("@forge/cli-shared");
+const manifest_merger_1 = require("../module-add/manifest-merger");
+const dependencies_merger_1 = require("../module-add/dependencies-merger");
+const vite_scaffolder_1 = require("../module-add/vite-scaffolder");
+const TEMPLATE_FILES_DIR = 'files';
+class ModuleAddFileService {
+    checkDependencies(template, force) {
+        const cwd = process.cwd();
+        const templateDependencies = template.dependencies ?? {};
+        const templateDevDependencies = template.devDependencies ?? {};
+        const { raw: rawPackageJson, parsed: parsedPackageJson, path: packageJsonPath } = (0, dependencies_merger_1.readPackageJson)(cwd);
+        const { depChanges } = (0, dependencies_merger_1.planPackageJsonChange)(packageJsonPath, rawPackageJson, parsedPackageJson, templateDependencies, templateDevDependencies, force);
+        return depChanges;
+    }
+    async templateMerge(template, variables, options = {}) {
+        const cwd = process.cwd();
+        const warnings = [];
+        const operations = template.fileOperations ?? [];
+        const plannedFiles = operations
+            .filter((op) => op.type === 'create')
+            .map((op) => (0, manifest_merger_1.substituteVars)(op.target, variables));
+        this.collectUnsupportedOpWarnings(operations, warnings);
+        const manifestChange = (0, manifest_merger_1.planManifestChange)(cwd, template, variables, warnings);
+        const scaffoldChanges = [];
+        const templateDependencies = template.dependencies ?? {};
+        const templateDevDependencies = template.devDependencies ?? {};
+        const { raw: rawPackageJson, parsed: parsedPackageJson, path: packageJsonPath } = (0, dependencies_merger_1.readPackageJson)(cwd);
+        const { packageJsonChange } = (0, dependencies_merger_1.planPackageJsonChange)(packageJsonPath, rawPackageJson, parsedPackageJson, templateDependencies, templateDevDependencies, options.force === true);
+        const frontendPlan = (0, dependencies_merger_1.planFrontendPackageJson)(cwd, template, variables);
+        const frontendPackageJsonChange = frontendPlan?.packageJsonChange;
+        const frontendDepChanges = frontendPlan?.depChanges;
+        if (options.install === false) {
+            warnings.push(cli_shared_1.Text.module.add.warnInstallSkipped);
+        }
+        if (options.dryRun) {
+            return {
+                template,
+                variables,
+                plannedFiles,
+                manifestChange,
+                packageJsonChange,
+                frontendPackageJsonChange,
+                frontendDepChanges,
+                scaffoldChanges,
+                warnings
+            };
+        }
+        this.collectScaffoldChanges(cwd, template, manifestChange, options, scaffoldChanges, warnings);
+        this.assertNoTargetConflicts(cwd, plannedFiles, options);
+        await this.copyTemplateFiles(cwd, template, variables, warnings);
+        (0, manifest_merger_1.applyManifestChange)(manifestChange);
+        for (const change of scaffoldChanges)
+            (0, vite_scaffolder_1.applyScaffoldChange)(change);
+        (0, dependencies_merger_1.writePackageChange)(packageJsonChange, false);
+        (0, dependencies_merger_1.writePackageChange)(frontendPackageJsonChange, true);
+        await this.runInstalls(cwd, frontendPackageJsonChange, scaffoldChanges, options);
+        return {
+            template,
+            variables,
+            plannedFiles,
+            manifestChange,
+            packageJsonChange,
+            frontendPackageJsonChange,
+            frontendDepChanges,
+            scaffoldChanges,
+            warnings
+        };
+    }
+    collectUnsupportedOpWarnings(operations, warnings) {
+        const unsupportedOps = operations.filter((op) => op.type !== 'create');
+        if (unsupportedOps.length) {
+            warnings.push(cli_shared_1.Text.module.add.warnUnsupportedFileOperations(unsupportedOps.map((op) => `${op.type} ${op.target}`)));
+        }
+    }
+    collectScaffoldChanges(cwd, template, manifestChange, options, scaffoldChanges, warnings) {
+        if (!manifestChange || template.uiFramework !== 'custom-ui')
+            return;
+        const beforeResources = (yaml_1.default.parse(manifestChange.before)?.resources ?? []);
+        const afterResources = (yaml_1.default.parse(manifestChange.after)?.resources ?? []);
+        const beforeEntriesByKey = new Map(beforeResources.map((r) => [r.key, new Set(Object.keys(r.entry ?? {}))]));
+        for (const resource of afterResources) {
+            const beforeEntries = beforeEntriesByKey.get(resource.key) ?? new Set();
+            const newEntries = Object.entries(resource.entry ?? {}).filter(([name]) => !beforeEntries.has(name));
+            if (newEntries.length === 0)
+                continue;
+            const viteChange = (0, vite_scaffolder_1.planViteConfig)(cwd, resource.key, { ...resource, entry: Object.fromEntries(newEntries) }, warnings);
+            if (viteChange)
+                scaffoldChanges.push(viteChange);
+            const commonChange = (0, vite_scaffolder_1.planCommonJsx)(cwd, resource.key);
+            if (commonChange)
+                scaffoldChanges.push(commonChange);
+        }
+    }
+    assertNoTargetConflicts(cwd, plannedFiles, options) {
+        const conflicts = plannedFiles.map((p) => path_1.default.normalize(path_1.default.join(cwd, p))).filter((p) => fs_1.default.existsSync(p));
+        if (conflicts.length && !options.force) {
+            const list = conflicts.map((p) => path_1.default.relative(cwd, p));
+            throw new Error(cli_shared_1.Text.module.add.errorTargetConflict(list));
+        }
+    }
+    async runInstalls(cwd, frontendPackageJsonChange, scaffoldChanges, options) {
+        if (options.install === false)
+            return;
+        await (0, dependencies_merger_1.runPackageManager)(cwd, ['install']);
+        const frontendDirs = new Set();
+        if (frontendPackageJsonChange) {
+            frontendDirs.add(path_1.default.dirname(frontendPackageJsonChange.filePath));
+        }
+        for (const change of scaffoldChanges) {
+            if (change.filePath.endsWith('vite.config.js')) {
+                frontendDirs.add(path_1.default.dirname(change.filePath));
+            }
+        }
+        for (const frontendDir of frontendDirs) {
+            await (0, dependencies_merger_1.runPackageManager)(frontendDir, ['install']);
+            await (0, dependencies_merger_1.runPackageManager)(frontendDir, ['run', 'build']);
+        }
+    }
+    async copyTemplateFiles(cwd, template, variables, warnings) {
+        const allOps = template.fileOperations ?? [];
+        const operations = allOps.filter((op) => op.type === 'create' && op.source);
+        if (!operations.length) {
+            warnings.push(cli_shared_1.Text.module.add.errorNoFileOperations(template.moduleKey, template.uiFramework));
+            return [];
+        }
+        if (!template.cacheDir) {
+            throw new Error(cli_shared_1.Text.module.add.warnNoBundle);
+        }
+        const variantDir = path_1.default.join(template.cacheDir, TEMPLATE_FILES_DIR);
+        if (!fs_1.default.existsSync(variantDir)) {
+            throw new Error(cli_shared_1.Text.module.add.errorNoBundle(template.moduleKey, [variantDir]));
+        }
+        const written = [];
+        for (const op of operations) {
+            const sourcePath = path_1.default.join(variantDir, op.source);
+            if (!fs_1.default.existsSync(sourcePath)) {
+                throw new Error(cli_shared_1.Text.module.add.errorMissingTemplateSource(sourcePath));
+            }
+            const targetRel = (0, manifest_merger_1.substituteVars)(op.target, variables);
+            const targetAbs = path_1.default.join(cwd, targetRel);
+            fs_1.default.mkdirSync(path_1.default.dirname(targetAbs), { recursive: true });
+            if (op.template) {
+                const raw = fs_1.default.readFileSync(sourcePath, 'utf8');
+                fs_1.default.writeFileSync(targetAbs, (0, manifest_merger_1.substituteVars)(raw, variables), 'utf8');
+            }
+            else {
+                fs_1.default.copyFileSync(sourcePath, targetAbs);
+            }
+            written.push(targetRel);
+        }
+        return written;
+    }
+}
+exports.ModuleAddFileService = ModuleAddFileService;
+//# sourceMappingURL=module-file-service.js.map

package/out/service/module-file-service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"module-file-service.js","sourceRoot":"","sources":["../../src/service/module-file-service.ts"],"names":[],"mappings":"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"}

package/out/service/module-service.d.ts

@@ -7,7 +7,6 @@ export interface AddModuleOptions {
     force?: boolean;
     variables?: Record<string, string>;
     install?: boolean;
-    upgradeDeps?: boolean;
 }
 export interface ManifestKeys {
     moduleKeys: Set<string>;
@@ -20,14 +19,14 @@ export declare class ModuleService {
     constructor(templateServices: TemplateModuleServices);
     getAvailableModules(product: string): Promise<Map<string, ModuleTemplateMeta>>;
     getModuleChoice(moduleMap: Map<string, ModuleTemplateMeta>): Map<string, ModuleTemplateMeta>;
-    downloadSelectedTemplate(template: ModuleTemplateMeta, uiFramework?: UIFramework): Promise<ModuleTemplateMeta | undefined>;
+    prepareModuleMetadata(template: ModuleTemplateMeta, uiFramework?: UIFramework): Promise<ModuleTemplateMeta | undefined>;
+    downloadModuleBundle(template: ModuleTemplateMeta, uiFramework?: UIFramework): Promise<void>;
     cleanup(): void;
-    parseManifestAndExtractKeys(content: string, filePath: string, moduleKey?: string): ManifestKeys;
+    parseManifestAndExtractKeys(content: string, filePath: string): ManifestKeys;
     readManifestFragment(templateCacheDir: string): string | undefined;
-    checkDuplicateKey(varDef: TemplateVariableDef, value: string, existingKeys: ManifestKeys, moduleKey: string): string | undefined;
-    validateFragment(substitutedFragment: string, manifestPath: string, currentValue: string, moduleKey: string): Promise<string[]>;
+    validateFragment(substitutedFragment: string, manifestPath: string, currentValue: string, varName: string): Promise<string[]>;
     getVariableDefinitions(template: ModuleTemplateMeta, uiFramework?: UIFramework): TemplateVariableDef[];
-    loadManifestContext(moduleKey: string): {
+    loadManifestContext(): {
         manifestPath: string;
         existingKeys: ManifestKeys;
     };

package/out/service/module-service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"module-service.d.ts","sourceRoot":"","sources":["../../src/service/module-service.ts"],"names":[],"mappings":"AAIA,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;IAClB,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;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;AAED,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,wBAAwB,CACnC,QAAQ,EAAE,kBAAkB,EAC5B,WAAW,CAAC,EAAE,WAAW,GACxB,OAAO,CAAC,kBAAkB,GAAG,SAAS,CAAC;IAWnC,OAAO,IAAI,IAAI;IASf,2BAA2B,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,YAAY;IA+BhG,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,GAChB,MAAM,GAAG,SAAS;IAaR,gBAAgB,CAC3B,mBAAmB,EAAE,MAAM,EAC3B,YAAY,EAAE,MAAM,EACpB,YAAY,EAAE,MAAM,EACpB,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,MAAM,EAAE,CAAC;IAyBb,sBAAsB,CAAC,QAAQ,EAAE,kBAAkB,EAAE,WAAW,CAAC,EAAE,WAAW;IAY9E,mBAAmB,CAAC,SAAS,EAAE,MAAM,GAAG;QAAE,YAAY,EAAE,MAAM,CAAC;QAAC,YAAY,EAAE,YAAY,CAAA;KAAE;IAO5F,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;CAerB"}
+{"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,EAAE,MAAM,mBAAmB,CAAC;AAGjH,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;AAwDD,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;IAsB5E,oBAAoB,CAAC,gBAAgB,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAS5D,gBAAgB,CAC3B,mBAAmB,EAAE,MAAM,EAC3B,YAAY,EAAE,MAAM,EACpB,YAAY,EAAE,MAAM,EACpB,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,MAAM,EAAE,CAAC;IA2Cb,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;IAWrG,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;CAYrB"}