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

package/out/service/module-service.js

@@ -2,12 +2,57 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ModuleService = void 0;
 const tslib_1 = require("tslib");
+const crypto_1 = tslib_1.__importDefault(require("crypto"));
 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 manifest_1 = require("@forge/manifest");
-const cli_shared_1 = require("@forge/cli-shared");
 const manifest_schema_json_1 = tslib_1.__importDefault(require("@forge/manifest/out/schema/manifest-schema.json"));
+const VALIDATION_KEYWORD_BY_VAR = {
+    moduleKey: /\bkey\b/,
+    functionKey: /\bfunction\b/,
+    resourceKey: /\bresources?\b/,
+    title: /\btitle\b/,
+    icon: /\bicon\b/,
+    description: /\bdescription\b/,
+    label: /\blabel\b/
+};
+const PROMPT_TIME_IRRELEVANT_PATTERNS = [/cannot find associated file/i];
+function collectModuleKeys(modules) {
+    const moduleKeys = new Set();
+    if (!modules)
+        return moduleKeys;
+    for (const [type, entries] of Object.entries(modules)) {
+        if (type === 'function' || !Array.isArray(entries))
+            continue;
+        for (const entry of entries) {
+            if (entry?.key)
+                moduleKeys.add(entry.key);
+        }
+    }
+    return moduleKeys;
+}
+function mergeFragmentIntoManifest(existing, fragment) {
+    const merged = { ...existing };
+    const existingModules = (existing.modules ?? {});
+    const fragmentModules = (fragment.modules ?? {});
+    const mergedModules = { ...existingModules };
+    for (const [type, entries] of Object.entries(fragmentModules)) {
+        const existingEntries = Array.isArray(mergedModules[type]) ? mergedModules[type] : [];
+        const fragmentEntries = Array.isArray(entries) ? entries : [];
+        mergedModules[type] = [...existingEntries, ...fragmentEntries];
+    }
+    if (Object.keys(mergedModules).length > 0) {
+        merged.modules = mergedModules;
+    }
+    if (Array.isArray(fragment.resources) || Array.isArray(existing.resources)) {
+        merged.resources = [
+            ...(Array.isArray(existing.resources) ? existing.resources : []),
+            ...(Array.isArray(fragment.resources) ? fragment.resources : [])
+        ];
+    }
+    return merged;
+}
 class ModuleService {
     templateServices;
     cacheDirs = [];
@@ -36,14 +81,19 @@ class ModuleService {
         }
         return moduleChoiceMap;
     }
-    async downloadSelectedTemplate(template, uiFramework) {
+    async prepareModuleMetadata(template, uiFramework) {
         if (!this.templateServices)
             return undefined;
-        const downloadedMeta = await this.templateServices.downloadModuleAssets(template, uiFramework);
-        if (downloadedMeta.cacheDir) {
-            this.cacheDirs.push(downloadedMeta.cacheDir);
+        const preparedMeta = await this.templateServices.prepareModuleMetadata(template, uiFramework);
+        if (preparedMeta.cacheDir) {
+            this.cacheDirs.push(preparedMeta.cacheDir);
         }
-        return downloadedMeta;
+        return preparedMeta;
+    }
+    async downloadModuleBundle(template, uiFramework) {
+        if (!this.templateServices)
+            return;
+        await this.templateServices.downloadModuleBundle(template, uiFramework);
     }
     cleanup() {
         if (this.templateServices) {
@@ -53,23 +103,14 @@ class ModuleService {
         }
         this.cacheDirs.length = 0;
     }
-    parseManifestAndExtractKeys(content, filePath, moduleKey) {
-        const keys = {
-            moduleKeys: new Set(),
-            functionKeys: new Set(),
-            resourceKeys: new Set()
-        };
+    parseManifestAndExtractKeys(content, filePath) {
         try {
             const parsed = new manifest_1.ManifestParserBuilder().withInterpolators().build().parseManifest({ content, filePath });
-            if (moduleKey && parsed?.modules && Object.prototype.hasOwnProperty.call(parsed.modules, moduleKey)) {
-                const moduleEntries = (parsed.modules[moduleKey] || []);
-                keys.moduleKeys = new Set(moduleEntries.map((m) => m?.key).filter((k) => Boolean(k)));
-            }
-            const funcEntries = parsed?.modules?.function || [];
-            keys.functionKeys = new Set(funcEntries.map((f) => f?.key).filter(Boolean));
-            const resourceEntries = parsed?.resources || [];
-            keys.resourceKeys = new Set(resourceEntries.map((r) => r?.key).filter(Boolean));
-            return keys;
+            return {
+                moduleKeys: collectModuleKeys(parsed?.modules),
+                functionKeys: new Set((parsed?.modules?.function || []).map((f) => f?.key).filter((k) => Boolean(k))),
+                resourceKeys: new Set((parsed?.resources || []).map((r) => r?.key).filter((k) => Boolean(k)))
+            };
         }
         catch {
             return {
@@ -88,38 +129,43 @@ class ModuleService {
             return undefined;
         }
     }
-    checkDuplicateKey(varDef, value, existingKeys, moduleKey) {
-        if (varDef.name === 'moduleKey' && existingKeys.moduleKeys.has(value)) {
-            return cli_shared_1.Text.module.errors.duplicateModuleKey(value, moduleKey);
-        }
-        if (varDef.name === 'functionKey' && existingKeys.functionKeys.has(value)) {
-            return cli_shared_1.Text.module.errors.duplicateFunctionKey(value);
-        }
-        if (varDef.name === 'resourceKey' && existingKeys.resourceKeys.has(value)) {
-            return cli_shared_1.Text.module.errors.duplicateResourceKey(value);
-        }
-        return undefined;
-    }
-    async validateFragment(substitutedFragment, manifestPath, currentValue, moduleKey) {
+    async validateFragment(substitutedFragment, manifestPath, currentValue, varName) {
         const fragment = yaml_1.default.parse(substitutedFragment);
         const existingManifest = yaml_1.default.parse(fs_1.default.readFileSync(manifestPath, 'utf8'));
-        if (!fragment.app && existingManifest.app) {
-            fragment.app = existingManifest.app;
-        }
-        const yamlString = yaml_1.default.stringify(fragment);
-        const schemaValidator = new manifest_1.SchemaValidator(manifest_schema_json_1.default);
-        const result = await schemaValidator.validate({ yamlContent: fragment, yamlContentByLine: yamlString.split('\n') });
-        if (!result.success && result.errors) {
-            const messages = [];
-            const quotedValue = `'${currentValue}'`;
-            for (const e of result.errors) {
-                if (e.level !== 'error' || !e.message.includes(quotedValue) || !e.message.includes(moduleKey))
-                    continue;
-                messages.push(e.message);
-            }
-            return messages;
-        }
-        return [];
+        const merged = mergeFragmentIntoManifest(existingManifest, fragment);
+        const yamlString = yaml_1.default.stringify(merged);
+        const validatorInput = {
+            filePath: manifestPath,
+            yamlContent: merged,
+            yamlContentByLine: yamlString.split('\n')
+        };
+        const schemaResult = await new manifest_1.SchemaValidator(manifest_schema_json_1.default).validate(validatorInput);
+        const modulesResult = await new manifest_1.ModulesValidator().validate({
+            ...validatorInput,
+            typedContent: merged
+        });
+        const allErrors = [...(schemaResult.errors ?? []), ...(modulesResult.errors ?? [])];
+        if (allErrors.length === 0)
+            return [];
+        const keyword = VALIDATION_KEYWORD_BY_VAR[varName];
+        const messages = [];
+        const seen = new Set();
+        for (const e of allErrors) {
+            if (e.level !== 'error')
+                continue;
+            if (PROMPT_TIME_IRRELEVANT_PATTERNS.some((p) => p.test(e.message)))
+                continue;
+            const quotedValue = new RegExp(`[\`'"‘“]${currentValue.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')}(?:-[^\`'"’”]*)?[\`'"’”]`);
+            if (!quotedValue.test(e.message))
+                continue;
+            if (keyword && !keyword.test(e.message))
+                continue;
+            if (seen.has(e.message))
+                continue;
+            seen.add(e.message);
+            messages.push(e.message);
+        }
+        return messages;
     }
     getVariableDefinitions(template, uiFramework) {
         if (uiFramework && template.variants?.[uiFramework]?.variables) {
@@ -130,29 +176,39 @@ class ModuleService {
         }
         return [];
     }
-    loadManifestContext(moduleKey) {
+    loadManifestContext() {
         const manifestPath = path_1.default.join(process.cwd(), 'manifest.yml');
         const manifestContent = fs_1.default.readFileSync(manifestPath, 'utf8');
-        const existingKeys = this.parseManifestAndExtractKeys(manifestContent, manifestPath, moduleKey);
+        const existingKeys = this.parseManifestAndExtractKeys(manifestContent, manifestPath);
         return { manifestPath, existingKeys };
     }
     computeEffectiveDefault(varDef, variables) {
-        if (varDef.name === 'resourceKey' && variables['moduleKey']) {
-            return `${variables['moduleKey']}-res`;
+        if (varDef.default) {
+            const resolved = varDef.default.replace(/\{\{\s*([a-zA-Z0-9_-]+)\s*\}\}/g, (match, key) => variables[key] ?? match);
+            return resolved;
         }
         return varDef.default;
     }
     async validateCandidateValue(varDef, value, existingKeys, moduleKey, fragmentContent, variables, manifestPath) {
-        const duplicateWarning = this.checkDuplicateKey(varDef, value, existingKeys, moduleKey);
-        if (duplicateWarning) {
-            return [duplicateWarning];
-        }
         if (fragmentContent) {
-            const substituted = fragmentContent.replace(/\{\{\s*([a-zA-Z0-9_-]+)\s*\}\}/g, (_m, key) => key === varDef.name ? value : variables[key] ?? '');
-            return this.validateFragment(substituted, manifestPath, value, moduleKey);
+            const substituted = fragmentContent.replace(/\{\{\s*([a-zA-Z0-9_-]+)\s*\}\}/g, (_m, key) => {
+                if (key === varDef.name)
+                    return value;
+                return variables[key] ?? generateUnfilledPlaceholder();
+            });
+            return this.validateFragment(substituted, manifestPath, value, varDef.name);
         }
         return [];
     }
 }
 exports.ModuleService = ModuleService;
+function generateUnfilledPlaceholder() {
+    const alphabet = 'abcdefghijklmnopqrstuvwxyz';
+    const bytes = crypto_1.default.randomBytes(12);
+    let out = '';
+    for (let i = 0; i < 12; i++) {
+        out += alphabet[bytes[i] % alphabet.length];
+    }
+    return out;
+}
 //# sourceMappingURL=module-service.js.map

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

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forge/cli",
-  "version": "12.21.0",
+  "version": "12.22.0-next.8-experimental-04898b4",
   "description": "A command line interface for managing Atlassian-hosted apps",
   "author": "Atlassian",
   "license": "SEE LICENSE IN LICENSE.txt",
@@ -21,14 +21,14 @@
     "generate:custom-scopes-types": "json2ts --input src/custom-scopes/validation/schema.json --output src/custom-scopes/generated-types.d.ts --style.singleQuote"
   },
   "dependencies": {
-    "@forge/bundler": "6.2.0",
-    "@forge/cli-shared": "8.23.0",
+    "@forge/bundler": "6.2.1-next.8-experimental-04898b4",
+    "@forge/cli-shared": "8.24.0-next.7-experimental-04898b4",
     "@forge/egress": "2.3.2",
-    "@forge/lint": "5.19.1",
-    "@forge/manifest": "12.8.0",
+    "@forge/lint": "5.19.2-next.8-experimental-04898b4",
+    "@forge/manifest": "12.9.0-next.5-experimental-04898b4",
     "@forge/i18n": "0.0.7",
     "@forge/runtime": "6.1.3",
-    "@forge/tunnel": "6.4.0",
+    "@forge/tunnel": "6.4.1-next.8-experimental-04898b4",
     "@forge/util": "2.0.1",
     "@sentry/node": "7.106.0",
     "ajv": "^8.18.0",
@@ -64,6 +64,7 @@
     "v8-compile-cache": "^2.4.0"
   },
   "devDependencies": {
+    "@types/adm-zip": "^0.5.5",
     "@types/archiver": "^6.0.3",
     "@types/command-exists": "^1.2.3",
     "@types/cross-spawn": "^6.0.6",
@@ -79,6 +80,7 @@
     "@types/omelette": "^0.4.5",
     "@types/semver": "^7.5.8",
     "@types/tmp": "^0.2.6",
+    "adm-zip": "^0.5.10",
     "chokidar": "^3.6.0",
     "jest": "^29.7.0",
     "jest-fixtures": "^0.6.0",