@forge/cli 12.20.1-next.3 → 12.21.0-experimental-4a332af

package/out/deploy/package-upload-deploy.js.map

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

package/out/installations/installation-helper.d.ts

@@ -1,5 +1,6 @@
 import { Installation } from '../service/installation-service';
 import { UI } from '@forge/cli-shared';
 export declare function validateInstallationId(installationId?: string): string;
+export declare function buildInstallationContextFromId(installationId: string): string;
 export declare function selectSingleInstallation(ui: UI, installations: Installation[], installationTablePrompt: string, installationTableOverview: string): Promise<Installation>;
 //# sourceMappingURL=installation-helper.d.ts.map

package/out/installations/installation-helper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"installation-helper.d.ts","sourceRoot":"","sources":["../../src/installations/installation-helper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAE/D,OAAO,EAAkD,EAAE,EAAmB,MAAM,mBAAmB,CAAC;AAExG,wBAAgB,sBAAsB,CAAC,cAAc,CAAC,EAAE,MAAM,GAAG,MAAM,CAWtE;AAED,wBAAsB,wBAAwB,CAC5C,EAAE,EAAE,EAAE,EACN,aAAa,EAAE,YAAY,EAAE,EAC7B,uBAAuB,EAAE,MAAM,EAC/B,yBAAyB,EAAE,MAAM,GAChC,OAAO,CAAC,YAAY,CAAC,CAkBvB"}
+{"version":3,"file":"installation-helper.d.ts","sourceRoot":"","sources":["../../src/installations/installation-helper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAE/D,OAAO,EAAkD,EAAE,EAAmB,MAAM,mBAAmB,CAAC;AAGxG,wBAAgB,sBAAsB,CAAC,cAAc,CAAC,EAAE,MAAM,GAAG,MAAM,CAWtE;AAED,wBAAgB,8BAA8B,CAAC,cAAc,EAAE,MAAM,GAAG,MAAM,CAM7E;AAED,wBAAsB,wBAAwB,CAC5C,EAAE,EAAE,EAAE,EACN,aAAa,EAAE,YAAY,EAAE,EAC7B,uBAAuB,EAAE,MAAM,EAC/B,yBAAyB,EAAE,MAAM,GAChC,OAAO,CAAC,YAAY,CAAC,CAkBvB"}

package/out/installations/installation-helper.js

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.selectSingleInstallation = exports.validateInstallationId = void 0;
+exports.selectSingleInstallation = exports.buildInstallationContextFromId = exports.validateInstallationId = void 0;
 const semver_1 = require("semver");
 const cli_shared_1 = require("@forge/cli-shared");
+const ari_1 = require("@forge/util/packages/ari");
 function validateInstallationId(installationId) {
     if (!installationId) {
         throw new cli_shared_1.ValidationError(cli_shared_1.Text.installationId.errors.invalid);
@@ -14,6 +15,14 @@ function validateInstallationId(installationId) {
     return trimmedId;
 }
 exports.validateInstallationId = validateInstallationId;
+function buildInstallationContextFromId(installationId) {
+    return ari_1.AnyAri.create({
+        resourceOwner: 'ecosystem',
+        resourceType: 'installation',
+        resourceId: installationId
+    }).toString();
+}
+exports.buildInstallationContextFromId = buildInstallationContextFromId;
 async function selectSingleInstallation(ui, installations, installationTablePrompt, installationTableOverview) {
     const installationIndex = await ui.promptForSingleChoiceTable(installationTablePrompt, installationTableOverview, ['Environment', 'Site', 'Atlassian apps', 'Major Version'], installations.map(({ id, environmentKey, product, secondaryProducts, site, version }) => ({
         names: [

package/out/installations/installation-helper.js.map

@@ -1 +1 @@
-{"version":3,"file":"installation-helper.js","sourceRoot":"","sources":["../../src/installations/installation-helper.ts"],"names":[],"mappings":";;;AACA,mCAA+B;AAC/B,kDAAwG;AAExG,SAAgB,sBAAsB,CAAC,cAAuB;IAC5D,IAAI,CAAC,cAAc,EAAE;QACnB,MAAM,IAAI,4BAAe,CAAC,iBAAI,CAAC,cAAc,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;KAC/D;IAED,MAAM,SAAS,GAAG,cAAc,CAAC,IAAI,EAAE,CAAC;IACxC,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE;QAC1B,MAAM,IAAI,4BAAe,CAAC,iBAAI,CAAC,cAAc,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;KAC/D;IAED,OAAO,SAAS,CAAC;AACnB,CAAC;AAXD,wDAWC;AAEM,KAAK,UAAU,wBAAwB,CAC5C,EAAM,EACN,aAA6B,EAC7B,uBAA+B,EAC/B,yBAAiC;IAEjC,MAAM,iBAAiB,GAAG,MAAM,EAAE,CAAC,0BAA0B,CAC3D,uBAAuB,EACvB,yBAAyB,EACzB,CAAC,aAAa,EAAE,MAAM,EAAE,gBAAgB,EAAE,eAAe,CAAC,EAC1D,aAAa,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,cAAc,EAAE,OAAO,EAAE,iBAAiB,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,CAAC;QACxF,KAAK,EAAE;YACL,IAAA,gCAAmB,EAAC,cAAc,CAAC;YACnC,IAAI;YACJ,IAAA,gCAAmB,EAAC,OAAO,EAAE,iBAAiB,CAAC;YAC/C,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,IAAI,iBAAI,CAAC,OAAO,CAAC,cAAc,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;SACxF;QACD,KAAK,EAAE,EAAE;QACT,OAAO,EAAE,IAAI;KACd,CAAC,CAAC,CACJ,CAAC;IAEF,OAAO,aAAa,CAAC,iBAAiB,CAAC,CAAC;AAC1C,CAAC;AAvBD,4DAuBC"}
+{"version":3,"file":"installation-helper.js","sourceRoot":"","sources":["../../src/installations/installation-helper.ts"],"names":[],"mappings":";;;AACA,mCAA+B;AAC/B,kDAAwG;AACxG,kDAAkD;AAElD,SAAgB,sBAAsB,CAAC,cAAuB;IAC5D,IAAI,CAAC,cAAc,EAAE;QACnB,MAAM,IAAI,4BAAe,CAAC,iBAAI,CAAC,cAAc,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;KAC/D;IAED,MAAM,SAAS,GAAG,cAAc,CAAC,IAAI,EAAE,CAAC;IACxC,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE;QAC1B,MAAM,IAAI,4BAAe,CAAC,iBAAI,CAAC,cAAc,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;KAC/D;IAED,OAAO,SAAS,CAAC;AACnB,CAAC;AAXD,wDAWC;AAED,SAAgB,8BAA8B,CAAC,cAAsB;IACnE,OAAO,YAAM,CAAC,MAAM,CAAC;QACnB,aAAa,EAAE,WAAW;QAC1B,YAAY,EAAE,cAAc;QAC5B,UAAU,EAAE,cAAc;KAC3B,CAAC,CAAC,QAAQ,EAAE,CAAC;AAChB,CAAC;AAND,wEAMC;AAEM,KAAK,UAAU,wBAAwB,CAC5C,EAAM,EACN,aAA6B,EAC7B,uBAA+B,EAC/B,yBAAiC;IAEjC,MAAM,iBAAiB,GAAG,MAAM,EAAE,CAAC,0BAA0B,CAC3D,uBAAuB,EACvB,yBAAyB,EACzB,CAAC,aAAa,EAAE,MAAM,EAAE,gBAAgB,EAAE,eAAe,CAAC,EAC1D,aAAa,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,cAAc,EAAE,OAAO,EAAE,iBAAiB,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,CAAC;QACxF,KAAK,EAAE;YACL,IAAA,gCAAmB,EAAC,cAAc,CAAC;YACnC,IAAI;YACJ,IAAA,gCAAmB,EAAC,OAAO,EAAE,iBAAiB,CAAC;YAC/C,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,IAAI,iBAAI,CAAC,OAAO,CAAC,cAAc,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;SACxF;QACD,KAAK,EAAE,EAAE;QACT,OAAO,EAAE,IAAI;KACd,CAAC,CAAC,CACJ,CAAC;IAEF,OAAO,aAAa,CAAC,iBAAiB,CAAC,CAAC;AAC1C,CAAC;AAvBD,4DAuBC"}

package/out/module-add/dependencies-merger.d.ts

@@ -0,0 +1,23 @@
+import { ModuleTemplateMeta } from '@forge/cli-shared';
+import { DepChange, FileChange } from '../service/module-file-service';
+export interface PackageJsonShape {
+    dependencies?: Record<string, string>;
+    devDependencies?: Record<string, string>;
+}
+export interface ReadPackageJsonResult {
+    path: string;
+    raw: string;
+    parsed: PackageJsonShape;
+}
+export declare function readPackageJson(cwd: string): ReadPackageJsonResult;
+export declare function planPackageJsonChange(pkgPath: string, raw: string, pkgObj: PackageJsonShape, tmplDeps: Record<string, string>, tmplDev: Record<string, string>, force: boolean): {
+    packageJsonChange?: FileChange;
+    depChanges: Record<string, DepChange[]>;
+};
+export declare function writePackageChange(change: FileChange | undefined, createParentDir: boolean): boolean;
+export declare function runPackageManager(cwd: string, args: string[]): Promise<boolean>;
+export declare function planFrontendPackageJson(cwd: string, template: ModuleTemplateMeta, variables: Record<string, string>, force?: boolean): {
+    packageJsonChange?: FileChange;
+    depChanges: Record<string, DepChange[]>;
+};
+//# sourceMappingURL=dependencies-merger.d.ts.map

package/out/module-add/dependencies-merger.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"dependencies-merger.d.ts","sourceRoot":"","sources":["../../src/module-add/dependencies-merger.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,kBAAkB,EAAQ,MAAM,mBAAmB,CAAC;AAC7D,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAYvE,MAAM,WAAW,gBAAgB;IAC/B,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,eAAe,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC1C;AACD,MAAM,WAAW,qBAAqB;IACpC,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,gBAAgB,CAAC;CAC1B;AAED,wBAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,qBAAqB,CAYlE;AAoCD,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,MAAM,EACf,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,gBAAgB,EACxB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAChC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC/B,KAAK,EAAE,OAAO,GACb;IACD,iBAAiB,CAAC,EAAE,UAAU,CAAC;IAC/B,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC;CACzC,CAmBA;AAGD,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,UAAU,GAAG,SAAS,EAAE,eAAe,EAAE,OAAO,GAAG,OAAO,CAKpG;AAGD,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC,CAQ/E;AAQD,wBAAgB,uBAAuB,CACrC,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,kBAAkB,EAC5B,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACjC,KAAK,UAAQ,GACZ;IAAE,iBAAiB,CAAC,EAAE,UAAU,CAAC;IAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,EAAE,CAAC,CAAA;CAAE,CA2D7E"}

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

@@ -0,0 +1,162 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.planFrontendPackageJson = exports.runPackageManager = exports.writePackageChange = exports.planPackageJsonChange = exports.readPackageJson = void 0;
+const tslib_1 = require("tslib");
+const fs_1 = tslib_1.__importDefault(require("fs"));
+const path_1 = tslib_1.__importDefault(require("path"));
+const cross_spawn_1 = require("cross-spawn");
+const diff_1 = require("diff");
+const semver_1 = tslib_1.__importDefault(require("semver"));
+const cli_shared_1 = require("@forge/cli-shared");
+const manifest_merger_1 = require("./manifest-merger");
+const FRONTEND_DIR_TEMPLATE = 'static/{{resourceKey}}';
+const FRONTEND_PKG_SCAFFOLD = {
+    private: true,
+    scripts: {
+        dev: 'vite',
+        build: 'vite build',
+        preview: 'vite preview'
+    }
+};
+function readPackageJson(cwd) {
+    const pkgPath = path_1.default.join(cwd, 'package.json');
+    if (!fs_1.default.existsSync(pkgPath)) {
+        throw new Error(cli_shared_1.Text.module.add.errorPackageJsonNotFound(pkgPath));
+    }
+    try {
+        const raw = fs_1.default.readFileSync(pkgPath, 'utf8');
+        const parsed = JSON.parse(raw);
+        return { path: pkgPath, raw, parsed };
+    }
+    catch (err) {
+        throw new Error(cli_shared_1.Text.module.add.errorPackageJsonParseFailed(pkgPath, err.message), { cause: err });
+    }
+}
+exports.readPackageJson = readPackageJson;
+function classifyDeps(tmpl, existing, force) {
+    const additions = [];
+    const conflicts = [];
+    const matches = [];
+    const merged = { ...existing };
+    for (const [name, version] of Object.entries(tmpl)) {
+        const current = existing[name];
+        if (!current) {
+            additions.push({ name, next: version });
+            merged[name] = version;
+        }
+        else if (versionsCompatible(current, version)) {
+            matches.push({ name, current, next: version });
+        }
+        else {
+            conflicts.push({ name, current, next: version });
+            if (force)
+                merged[name] = version;
+        }
+    }
+    return { additions, conflicts, matches, merged };
+}
+function versionsCompatible(current, next) {
+    const currentRange = semver_1.default.validRange(current, { includePrerelease: true });
+    const nextRange = semver_1.default.validRange(next, { includePrerelease: true });
+    if (!currentRange || !nextRange) {
+        return current === next;
+    }
+    return semver_1.default.intersects(currentRange, nextRange, { includePrerelease: true });
+}
+function planPackageJsonChange(pkgPath, raw, pkgObj, tmplDeps, tmplDev, force) {
+    const deps = classifyDeps(tmplDeps, pkgObj.dependencies ?? {}, force);
+    const devDeps = classifyDeps(tmplDev, pkgObj.devDependencies ?? {}, force);
+    const next = { ...pkgObj, dependencies: deps.merged, devDependencies: devDeps.merged };
+    const depChanges = {
+        additions: [...deps.additions, ...devDeps.additions],
+        conflicts: [...deps.conflicts, ...devDeps.conflicts],
+        matches: [...deps.matches, ...devDeps.matches]
+    };
+    const before = raw.endsWith('\n') ? raw : `${raw}\n`;
+    const after = `${JSON.stringify(next, null, 2)}\n`;
+    if (before === after) {
+        return { depChanges };
+    }
+    const patch = (0, diff_1.createTwoFilesPatch)(pkgPath, pkgPath, before, after, 'before', 'after');
+    return { packageJsonChange: { filePath: pkgPath, before, after, patch }, depChanges };
+}
+exports.planPackageJsonChange = planPackageJsonChange;
+function writePackageChange(change, createParentDir) {
+    if (!change)
+        return false;
+    if (createParentDir)
+        fs_1.default.mkdirSync(path_1.default.dirname(change.filePath), { recursive: true });
+    fs_1.default.writeFileSync(change.filePath, change.after, 'utf8');
+    return true;
+}
+exports.writePackageChange = writePackageChange;
+function runPackageManager(cwd, args) {
+    const pm = detectPackageManager(cwd);
+    return new Promise((resolve) => {
+        const child = (0, cross_spawn_1.spawn)(pm, args, { cwd });
+        child.on('close', (code) => resolve(code === 0));
+        child.on('error', () => resolve(false));
+    });
+}
+exports.runPackageManager = runPackageManager;
+function detectPackageManager(cwd) {
+    if (fs_1.default.existsSync(path_1.default.join(cwd, 'yarn.lock')))
+        return 'yarn';
+    return 'npm';
+}
+function planFrontendPackageJson(cwd, template, variables, force = false) {
+    const fe = template.frontend;
+    const hasEntries = (v) => !!v && Object.keys(v).length > 0;
+    if (!fe || (!hasEntries(fe.dependencies) && !hasEntries(fe.devDependencies))) {
+        return { depChanges: { additions: [], conflicts: [], matches: [] } };
+    }
+    const resourceKey = variables.resourceKey ?? template.moduleKey.replace(':', '-');
+    const frontendDir = (0, manifest_merger_1.substituteVars)(FRONTEND_DIR_TEMPLATE, { resourceKey });
+    const frontendPkgPath = path_1.default.join(cwd, frontendDir, 'package.json');
+    const tmplDeps = fe.dependencies ?? {};
+    const tmplDev = fe.devDependencies ?? {};
+    const exists = fs_1.default.existsSync(frontendPkgPath);
+    const before = exists ? fs_1.default.readFileSync(frontendPkgPath, 'utf8') : '';
+    let next;
+    let depChanges;
+    if (exists) {
+        let existingPkg;
+        try {
+            existingPkg = JSON.parse(before);
+        }
+        catch (err) {
+            throw new Error(cli_shared_1.Text.module.add.errorPackageJsonParseFailed(frontendPkgPath, err.message), {
+                cause: err
+            });
+        }
+        const deps = classifyDeps(tmplDeps, existingPkg.dependencies ?? {}, force);
+        const devDeps = classifyDeps(tmplDev, existingPkg.devDependencies ?? {}, force);
+        next = { ...existingPkg, dependencies: deps.merged, devDependencies: devDeps.merged };
+        depChanges = {
+            additions: [...deps.additions, ...devDeps.additions],
+            conflicts: [...deps.conflicts, ...devDeps.conflicts],
+            matches: [...deps.matches, ...devDeps.matches]
+        };
+    }
+    else {
+        next = {
+            name: `${resourceKey}-frontend`,
+            ...FRONTEND_PKG_SCAFFOLD,
+            dependencies: tmplDeps,
+            devDependencies: tmplDev
+        };
+        const toAddition = ([name, version]) => ({ name, next: version });
+        depChanges = {
+            additions: [...Object.entries(tmplDeps).map(toAddition), ...Object.entries(tmplDev).map(toAddition)],
+            conflicts: [],
+            matches: []
+        };
+    }
+    const after = `${JSON.stringify(next, null, 2)}\n`;
+    if (before === after) {
+        return { depChanges };
+    }
+    return { packageJsonChange: { filePath: frontendPkgPath, before, after, patch: '' }, depChanges };
+}
+exports.planFrontendPackageJson = planFrontendPackageJson;
+//# sourceMappingURL=dependencies-merger.js.map

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

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

package/out/module-add/manifest-merger.d.ts

@@ -0,0 +1,11 @@
+import { ModuleTemplateMeta } from '@forge/cli-shared';
+import { FileChange } from '../service/module-file-service';
+export interface ManifestResource {
+    key: string;
+    path?: string;
+    entry?: Record<string, string>;
+}
+export declare function planManifestChange(cwd: string, template: ModuleTemplateMeta, variables: Record<string, string>, warnings: string[]): FileChange | undefined;
+export declare function applyManifestChange(change: FileChange | undefined): boolean;
+export declare function substituteVars(input: string, vars: Record<string, string>): string;
+//# sourceMappingURL=manifest-merger.d.ts.map

package/out/module-add/manifest-merger.d.ts.map

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

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

@@ -0,0 +1,174 @@
+"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 substituted = substituteVars(fragmentContent, variables);
+    const before = fs_1.default.readFileSync(manifestPath, 'utf8');
+    const beforeObj = (yaml_1.default.parse(before) ?? {});
+    const fragObj = (yaml_1.default.parse(substituted) ?? {});
+    applyCrossProductCompatibility(beforeObj, fragObj, template, warnings);
+    const merged = deepMergeObjects(beforeObj, fragObj);
+    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 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(beforeObj, fragObj, template, warnings) {
+    const newProduct = template.product;
+    if (!newProduct || !COMPATIBILITY_PRODUCTS.has(newProduct))
+        return;
+    const existingProducts = collectProductPrefixes(beforeObj.modules);
+    existingProducts.delete(newProduct);
+    const existingProduct = [...existingProducts].find((p) => COMPATIBILITY_PRODUCTS.has(p));
+    if (!existingProduct)
+        return;
+    const existingCompatibility = readCompatibility(beforeObj);
+    const fragmentApp = isObject(fragObj.app) ? fragObj.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;
+    fragObj.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/installation-service.d.ts.map

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

package/out/service/installation-service.js

@@ -41,15 +41,16 @@ class InstallationService {
         }
         return this.comparePossibleInstallations(filterSite.host, installationSite);
     }
-    filterInstallations(installations, { site: filterSite, product: filterProduct, environment: filterEnvironment }) {
-        return installations.filter(({ product, secondaryProducts, site, environmentKey }) => {
+    filterInstallations(installations, { site: filterSite, product: filterProduct, environment: filterEnvironment, installationId: filterInstallationId }) {
+        return installations.filter(({ id, product, secondaryProducts, site, environmentKey }) => {
             const matchRequired = filterProduct === (0, cli_shared_1.productDisplayName)(product);
             const matchOptional = secondaryProducts &&
                 secondaryProducts.some((secondaryProduct) => filterProduct === (0, cli_shared_1.productDisplayName)(secondaryProduct));
             const matchProduct = !filterProduct || matchRequired || matchOptional;
             const matchSite = !filterSite || this.matchSiteForProduct(filterSite, site, product);
             const matchEnvironment = !filterEnvironment || filterEnvironment === (0, cli_shared_1.optionToEnvironment)(environmentKey);
-            return matchProduct && matchSite && matchEnvironment;
+            const matchInstallationId = !filterInstallationId || filterInstallationId === id;
+            return matchProduct && matchSite && matchEnvironment && matchInstallationId;
         });
     }
     async listAppInstallations(filter) {