zcatalyst-cli 1.25.1 → 1.25.3

package/lib/appsail-utils.js

@@ -23,6 +23,21 @@ const container_1 = require("./util_modules/container");
 const image_1 = require("@zcatalyst/container-plugin/out/endpoints/image");
 const fs_1 = require("./util_modules/fs");
 const util_1 = require("util");
+const OCI_IMAGE_INDEX_MEDIA_TYPES = [
+    'application/vnd.oci.image.index.v1+json',
+    'application/vnd.docker.distribution.manifest.list.v2+json'
+];
+const OCI_IMAGE_MANIFEST_MEDIA_TYPES = [
+    'application/vnd.oci.image.manifest.v1+json',
+    'application/vnd.docker.distribution.manifest.v2+json'
+];
+function getBlobPathFromDigest(digest, sourceFile) {
+    const [algorithm, hash] = digest.split(':');
+    if (!algorithm || !hash) {
+        throw new error_1.default(`Corrupted image tar :: invalid digest ${digest} found in ${sourceFile}`, { exit: 1 });
+    }
+    return `blobs/${algorithm}/${hash}`;
+}
 function getAppSailFilters(targetStr) {
     return targetStr.split(',').reduce((filterArr, target) => {
         const opts = target.split(':');
@@ -102,17 +117,70 @@ function validateAppSail(targDetails) {
                         var _a;
                         try {
                             const manifestJsonStream = yield (0, image_1.getTarEntry)(imgTar, 'manifest.json');
-                            if (!manifestJsonStream) {
-                                throw new error_1.default('Corrupted image tar :: manifest.json not found in the tar', { exit: 1 });
+                            const repositoriesStream = yield (0, image_1.getTarEntry)(imgTar, 'repositories');
+                            const indexJsonStream = yield (0, image_1.getTarEntry)(imgTar, 'index.json');
+                            if (!indexJsonStream) {
+                                if (manifestJsonStream || repositoriesStream) {
+                                    throw new error_1.default('Legacy docker-archive format is not supported. Only OCI-compliant docker-archive formats (pure OCI or hybrid OCI) are supported.', { exit: 1 });
+                                }
+                                throw new error_1.default('Corrupted image tar :: required OCI metadata index.json not found in the tar', { exit: 1 });
+                            }
+                            const indexJson = yield fs_1.ASYNC.readStreamAsJSON(indexJsonStream);
+                            if (indexJson.schemaVersion !== 2) {
+                                throw new error_1.default('Corrupted image tar :: invalid index.json file. Unsupported schemaVersion', { exit: 1 });
+                            }
+                            const traversedDigests = new Set();
+                            const resolveImageManifestPath = (manifestIndex, sourceFile) => __awaiter(this, void 0, void 0, function* () {
+                                var _b;
+                                const imageDescriptor = (_b = manifestIndex.manifests) === null || _b === void 0 ? void 0 : _b.find((manifest) => {
+                                    if (!(manifest === null || manifest === void 0 ? void 0 : manifest.digest)) {
+                                        return false;
+                                    }
+                                    if (!manifest.mediaType) {
+                                        return true;
+                                    }
+                                    return (OCI_IMAGE_MANIFEST_MEDIA_TYPES.includes(manifest.mediaType) ||
+                                        OCI_IMAGE_INDEX_MEDIA_TYPES.includes(manifest.mediaType));
+                                });
+                                if (!(imageDescriptor === null || imageDescriptor === void 0 ? void 0 : imageDescriptor.digest)) {
+                                    throw new error_1.default(`Corrupted image tar :: invalid ${sourceFile} file. Unable to identify image manifest`, { exit: 1 });
+                                }
+                                if (traversedDigests.has(imageDescriptor.digest)) {
+                                    throw new error_1.default(`Corrupted image tar :: circular descriptor reference found for digest ${imageDescriptor.digest}`, { exit: 1 });
+                                }
+                                if (!imageDescriptor.mediaType ||
+                                    OCI_IMAGE_MANIFEST_MEDIA_TYPES.includes(imageDescriptor.mediaType)) {
+                                    return getBlobPathFromDigest(imageDescriptor.digest, sourceFile);
+                                }
+                                traversedDigests.add(imageDescriptor.digest);
+                                const nestedIndexPath = getBlobPathFromDigest(imageDescriptor.digest, sourceFile);
+                                const nestedIndexStream = yield (0, image_1.getTarEntry)(imgTar, nestedIndexPath);
+                                if (!nestedIndexStream) {
+                                    throw new error_1.default(`Corrupted image tar :: nested image index ${nestedIndexPath} not found in the tar`, { exit: 1 });
+                                }
+                                const nestedIndex = yield fs_1.ASYNC.readStreamAsJSON(nestedIndexStream);
+                                if (nestedIndex.schemaVersion !== 2) {
+                                    throw new error_1.default(`Corrupted image tar :: invalid nested image index ${nestedIndexPath}. Unsupported schemaVersion`, { exit: 1 });
+                                }
+                                return resolveImageManifestPath(nestedIndex, nestedIndexPath);
+                            });
+                            const imageManifestPath = yield resolveImageManifestPath(indexJson, 'index.json');
+                            const imageManifestStream = yield (0, image_1.getTarEntry)(imgTar, imageManifestPath);
+                            if (!imageManifestStream) {
+                                throw new error_1.default(`Corrupted image tar :: image manifest ${imageManifestPath} not found in the tar`, { exit: 1 });
+                            }
+                            const imageManifest = yield fs_1.ASYNC.readStreamAsJSON(imageManifestStream);
+                            if (imageManifest.schemaVersion !== 2) {
+                                throw new error_1.default('Corrupted image tar :: invalid image manifest file. Unsupported schemaVersion', { exit: 1 });
                             }
-                            const manifestJson = yield fs_1.ASYNC.readStreamAsJSON(manifestJsonStream);
-                            const config = (_a = manifestJson.at(0)) === null || _a === void 0 ? void 0 : _a.Config;
-                            if (!config) {
-                                throw new error_1.default('Corrupted image tar :: invalid manifest.json file. Unable to identify the config file', { exit: 1 });
+                            const configDigest = (_a = imageManifest.config) === null || _a === void 0 ? void 0 : _a.digest;
+                            if (!configDigest) {
+                                throw new error_1.default('Corrupted image tar :: invalid image manifest file. Unable to identify the config blob', { exit: 1 });
                             }
-                            const configFileStream = yield (0, image_1.getTarEntry)(imgTar, config);
+                            const configBlobPath = getBlobPathFromDigest(configDigest, imageManifestPath);
+                            const configFileStream = yield (0, image_1.getTarEntry)(imgTar, configBlobPath);
                             if (!configFileStream) {
-                                throw new error_1.default(`Corrupted image tar :: config file ${config} not found in the tar`, { exit: 1 });
+                                throw new error_1.default(`Corrupted image tar :: config blob ${configBlobPath} not found in the tar`, { exit: 1 });
                             }
                             const configFile = yield fs_1.ASYNC.readStreamAsJSON(configFileStream);
                             resolve(configFile);
@@ -130,7 +198,7 @@ function validateAppSail(targDetails) {
             }
         });
         const _details = targDetails.map((targ) => __awaiter(this, void 0, void 0, function* () {
-            var _b, _c;
+            var _c, _d;
             if (targ.validity.valid) {
                 if (targ.runtime === 'custom') {
                     if (isSocket === undefined) {
@@ -172,7 +240,7 @@ function validateAppSail(targDetails) {
                     }
                     return targ;
                 }
-                if (((_b = targ.config) === null || _b === void 0 ? void 0 : _b.platform) !== 'war' && !((_c = targ.config) === null || _c === void 0 ? void 0 : _c.command)) {
+                if (((_c = targ.config) === null || _c === void 0 ? void 0 : _c.platform) !== 'war' && !((_d = targ.config) === null || _d === void 0 ? void 0 : _d.command)) {
                     targ.validity = {
                         valid: false,
                         reason: 'Start-up command missing'

package/lib/commands/slate/link.js

@@ -44,6 +44,7 @@ exports.default = new command_1.default('slate:link')
     .description('Links an existing local application to the Catalyst Slate service for web hosting')
     .option('--name <app_name>', 'Specify the name for your Slate application')
     .option('--framework <framework_name>', 'Specify the frontend framework used (e.g., React, Angular, Vue)')
+    .option('--source <path>', 'Path to the existing slate app directory')
     .option('--template <template_url>', 'Provide a template URL to initialize your Slate application')
     .option('--default', 'Use default application configurations without prompting')
     .needs('auth')

package/lib/commands/slate/unlink.js

@@ -23,15 +23,18 @@ const config_1 = require("../../util_modules/config");
 const fs_1 = require("../../util_modules/fs");
 const error_1 = __importDefault(require("../../error"));
 const path_1 = require("path");
+const env_1 = require("../../util_modules/env");
 exports.default = new command_1.default('slate:unlink')
     .description('Removes the linked Slate configuration from the local app')
     .option('--name <app_name>', 'Please provide name for your slate app')
+    .option('--remove-source', 'Delete the slate app source directory without prompting')
     .needs('auth')
     .needs('config')
     .needs('rc')
     .action(() => __awaiter(void 0, void 0, void 0, function* () {
     const config = runtime_store_1.default.get('config');
     let appName = (0, option_1.getOptionValue)('name', undefined);
+    const removeSourceFlag = (0, option_1.getOptionValue)('removeSource', false);
     const slateServices = config_1.slateConfig.raw();
     if ((slateServices === null || slateServices === void 0 ? void 0 : slateServices.length) === 0 || !slateServices) {
         throw new error_1.default('No slates found.', {
@@ -55,10 +58,19 @@ exports.default = new command_1.default('slate:unlink')
             arg: [(0, ansi_colors_1.bold)('catalyst slate:unlink')]
         });
     }
-    const { removeSource } = yield prompt_1.default.ask(prompt_1.default.question('removeSource', `Do you want to delete the source?`, {
-        type: 'confirm',
-        default: false
-    }));
+    let removeSource;
+    if (removeSourceFlag) {
+        removeSource = true;
+    }
+    else if (env_1.isCI) {
+        removeSource = false;
+    }
+    else {
+        ({ removeSource } = yield prompt_1.default.ask(prompt_1.default.question('removeSource', `Do you want to delete the source?`, {
+            type: 'confirm',
+            default: false
+        })));
+    }
     yield fs_1.ASYNC.deleteDir((0, path_1.join)(slateDetails.source, constants_1.FILENAME.cli_config));
     if (removeSource) {
         yield fs_1.ASYNC.deleteDir(slateDetails.source);

package/lib/deploy/features/slate.js

@@ -25,89 +25,72 @@ const option_1 = require("../../util_modules/option");
 const urls_1 = __importDefault(require("../../util_modules/constants/lib/urls"));
 const project_1 = require("../../util_modules/project");
 exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
-    const dId = process.env.ZC_APP_DEPLOYMENT_BUILD_ID;
     const env = getEnvironmentType();
-    if (!dId) {
-        const targets = yield config_1.slateConfig.getAllTargetDetails(false);
-        if (!targets || targets.length === 0) {
-            throw new error_1.default('No targets found');
-        }
-        const filtered = slate_utils_1.slateUtils.filterTargets(targets);
-        const validTargets = filtered.filter((targ) => {
-            var _a, _b;
-            if ((_a = targ.validity) === null || _a === void 0 ? void 0 : _a.valid) {
-                return targ;
-            }
-            (0, logger_1.labeled)('Slate: ', 'Invalid Slate service ' + (0, ansi_colors_1.bold)(targ.name || 'Unknown')).ERROR();
-            (0, logger_1.error)('Reason: ' + ((_b = targ.validity) === null || _b === void 0 ? void 0 : _b.reason));
-            (0, logger_1.info)();
-            return false;
-        });
-        if (validTargets.length === 0) {
-            throw new error_1.default('No valid Slate services found to deploy', {
-                skipHelp: true
-            });
+    const targets = yield config_1.slateConfig.getAllTargetDetails(false);
+    if (!targets || targets.length === 0) {
+        throw new error_1.default('No targets found');
+    }
+    const filtered = slate_utils_1.slateUtils.filterTargets(targets);
+    const validTargets = filtered.filter((targ) => {
+        var _a, _b;
+        if ((_a = targ.validity) === null || _a === void 0 ? void 0 : _a.valid) {
+            return targ;
         }
-        const slateAppConfigs = yield (yield (0, endpoints_1.slateAPI)({ env })).getAllApps();
-        const throbber = throbber_1.default.getInstance();
-        const deployRes = yield validTargets.reduce((result, _targ) => __awaiter(void 0, void 0, void 0, function* () {
-            var _a;
-            const targ = _targ;
-            const prevRes = yield result;
-            try {
-                const throbberName = `prepare_slate_${targ.name}`;
-                throbber.add(throbberName, {
-                    text: `Preparing Slate[${targ.name}]`
-                });
-                const isAppExists = slateAppConfigs.find((app) => app.name === targ.name && app.app_type === 'cli');
-                const configDetails = !isAppExists
-                    ? (_a = (yield config_1.slateConfig.getTargetDetails(targ))) === null || _a === void 0 ? void 0 : _a.config
-                    : undefined;
-                const deploymentName = configDetails === null || configDetails === void 0 ? void 0 : configDetails.deployment_name;
-                deploymentName ? configDetails === null || configDetails === void 0 ? true : delete configDetails.deployment_name : null;
-                const readStream = yield slate_utils_1.slateUtils.pack(targ.source);
-                throbber.remove(throbberName);
-                const response = yield (yield (0, endpoints_1.slateAPI)({ env })).deploy(readStream.stream, readStream.length, targ.name, '', deploymentName ? deploymentName : '', isAppExists === null || isAppExists === void 0 ? void 0 : isAppExists.id, configDetails ? JSON.stringify(configDetails) : '', (0, option_1.getOptionValue)('m') || '');
-                targ.details = response;
-            }
-            catch (err) {
-                (0, logger_1.debug)(err);
-                _targ.validity = {
-                    valid: false,
-                    reason: error_1.default.getErrorInstance(err).message
-                };
-            }
-            prevRes.push(_targ);
-            return Promise.resolve(prevRes);
-        }), Promise.resolve([]));
-        const deployedValidTargets = deployRes.filter((targ) => {
-            var _a, _b, _c;
-            if (!((_a = targ.validity) === null || _a === void 0 ? void 0 : _a.valid)) {
-                (0, logger_1.warning)('Deploy of Slate [' +
-                    targ.name +
-                    '] was unsuccessful since ' +
-                    ((_b = targ.validity) === null || _b === void 0 ? void 0 : _b.reason));
-            }
-            return (_c = targ.validity) === null || _c === void 0 ? void 0 : _c.valid;
+        (0, logger_1.labeled)('Slate: ', 'Invalid Slate service ' + (0, ansi_colors_1.bold)(targ.name || 'Unknown')).ERROR();
+        (0, logger_1.error)('Reason: ' + ((_b = targ.validity) === null || _b === void 0 ? void 0 : _b.reason));
+        (0, logger_1.info)();
+        return false;
+    });
+    if (validTargets.length === 0) {
+        throw new error_1.default('No valid Slate services found to deploy', {
+            skipHelp: true
         });
-        runtime_store_1.default.set('context.payload.slate.targets', deployedValidTargets);
-        if (deployedValidTargets.length > 0) {
-            runtime_store_1.default.set('context.payload.slate.deploy', true);
-        }
     }
-    else {
-        const source = runtime_store_1.default.get('cwd');
-        yield slate_utils_1.slateUtils.validate(source);
-        const readStream = yield slate_utils_1.slateUtils.pack();
+    const slateAppConfigs = yield (yield (0, endpoints_1.slateAPI)({ env })).getAllApps();
+    const throbber = throbber_1.default.getInstance();
+    const deployRes = yield validTargets.reduce((result, _targ) => __awaiter(void 0, void 0, void 0, function* () {
+        var _a;
+        const targ = _targ;
+        const prevRes = yield result;
         try {
-            const deployRes = yield (yield (0, endpoints_1.slateAPI)({ env })).deploy(readStream.stream, readStream.length, process.env.ZC_APP_NAME, dId);
-            deployRes.name = process.env.ZC_APP_NAME;
-            runtime_store_1.default.set('context.payload.slate.targets', [deployRes]);
-            runtime_store_1.default.set('context.payload.slate.deploy', true);
+            const throbberName = `prepare_slate_${targ.name}`;
+            throbber.add(throbberName, {
+                text: `Preparing Slate[${targ.name}]`
+            });
+            const isAppExists = slateAppConfigs.find((app) => app.name === targ.name && app.app_type === 'cli');
+            const configDetails = !isAppExists
+                ? (_a = (yield config_1.slateConfig.getTargetDetails(targ))) === null || _a === void 0 ? void 0 : _a.config
+                : undefined;
+            const deploymentName = configDetails === null || configDetails === void 0 ? void 0 : configDetails.deployment_name;
+            deploymentName ? configDetails === null || configDetails === void 0 ? true : delete configDetails.deployment_name : null;
+            const readStream = yield slate_utils_1.slateUtils.pack(targ.source);
+            throbber.remove(throbberName);
+            const response = yield (yield (0, endpoints_1.slateAPI)({ env })).deploy(readStream.stream, readStream.length, targ.name, deploymentName ? deploymentName : '', isAppExists === null || isAppExists === void 0 ? void 0 : isAppExists.id, configDetails ? JSON.stringify(configDetails) : '', (0, option_1.getOptionValue)('m') || '');
+            targ.details = response;
         }
         catch (err) {
-            throw err;
+            (0, logger_1.debug)(err);
+            _targ.validity = {
+                valid: false,
+                reason: error_1.default.getErrorInstance(err).message
+            };
         }
+        prevRes.push(_targ);
+        return Promise.resolve(prevRes);
+    }), Promise.resolve([]));
+    const deployedValidTargets = deployRes.filter((targ) => {
+        var _a, _b, _c;
+        if (!((_a = targ.validity) === null || _a === void 0 ? void 0 : _a.valid)) {
+            (0, logger_1.warning)('Deploy of Slate [' +
+                targ.name +
+                '] was unsuccessful since ' +
+                ((_b = targ.validity) === null || _b === void 0 ? void 0 : _b.reason));
+        }
+        return (_c = targ.validity) === null || _c === void 0 ? void 0 : _c.valid;
+    });
+    runtime_store_1.default.set('context.payload.slate.targets', deployedValidTargets);
+    if (deployedValidTargets.length > 0) {
+        runtime_store_1.default.set('context.payload.slate.deploy', true);
     }
 });
 function getEnvironmentType() {

package/lib/endpoints/lib/slate.d.ts

@@ -11,6 +11,6 @@ declare class Slate {
     getFrameworks(): Promise<Array<FrameworkType>>;
     getAllApps(): Promise<Array<ISlateAppInfo>>;
     downloadTemplate(): Promise<unknown>;
-    deploy(sourceStream: ReadStream, contentLength: number, appName: string, deployId: string, deploymentName?: string, appId?: string, config?: string, msg?: string): Promise<unknown>;
+    deploy(sourceStream: ReadStream, contentLength: number, appName: string, deploymentName?: string, appId?: string, config?: string, msg?: string): Promise<unknown>;
 }
 export default Slate;

package/lib/endpoints/lib/slate.js

@@ -62,9 +62,9 @@ class Slate {
             throw new error_1.default('Error while downloading the template', { exit: 2 });
         });
     }
-    deploy(sourceStream, contentLength, appName, deployId, deploymentName, appId, config, msg) {
+    deploy(sourceStream, contentLength, appName, deploymentName, appId, config, msg) {
         return __awaiter(this, void 0, void 0, function* () {
-            const formData = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ file: sourceStream }, (appId && { app_id: appId })), (deployId && { build_id: deployId })), (deploymentName && { deployment_name: deploymentName })), (appId || deployId ? {} : { name: appName })), (config && { configuration: config })), (msg && { message: msg }));
+            const formData = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ file: sourceStream }, (appId && { app_id: appId })), (deploymentName && { deployment_name: deploymentName })), (appId ? {} : { name: appName })), (config && { configuration: config })), (msg && { message: msg }));
             const res = yield new api_1.default(this.opts).post(`/slate/v1/project/${this.projectId}/app/upload`, {
                 formData,
                 json: false,

package/lib/init/features/slate/index.js

@@ -51,21 +51,71 @@ const constants_1 = require("../../../util_modules/constants");
 const project_1 = require("../../../util_modules/project");
 const toml_1 = require("../../../util_modules/toml");
 const async_1 = require("../../../util_modules/fs/lib/async");
+const DEFAULT_DEV_COMMANDS = {
+    cra: 'PORT=$ZC_SLATE_PORT npm start',
+    'create-react-app': 'PORT=$ZC_SLATE_PORT npm start',
+    react: 'PORT=$ZC_SLATE_PORT npm start',
+    'react-vite': 'npm run dev -- --port $ZC_SLATE_PORT',
+    'react-vitejs': 'npm run dev -- --port $ZC_SLATE_PORT',
+    nextjs: 'npm run dev -- --port $ZC_SLATE_PORT',
+    next: 'npm run dev -- --port $ZC_SLATE_PORT',
+    angular: 'npm start -- --port $ZC_SLATE_PORT',
+    'vue-vite': 'npm run dev -- --port $ZC_SLATE_PORT',
+    vue: 'npm run dev -- --port $ZC_SLATE_PORT',
+    solidjs: 'npm run dev -- --port $ZC_SLATE_PORT',
+    'solid-js': 'npm run dev -- --port $ZC_SLATE_PORT',
+    solid: 'npm run dev -- --port $ZC_SLATE_PORT',
+    astro: 'npm run dev -- --port $ZC_SLATE_PORT',
+    preact: 'npm run dev -- --port $ZC_SLATE_PORT',
+    svelte: 'npm run dev -- --port $ZC_SLATE_PORT',
+    sveltekit: 'npm run dev -- --port $ZC_SLATE_PORT',
+    nuxt: 'npm run dev -- --port $ZC_SLATE_PORT',
+    gatsby: 'npm run develop -- --port $ZC_SLATE_PORT',
+    remix: 'npm run dev -- --port $ZC_SLATE_PORT'
+};
+const GENERIC_DEV_COMMAND = 'npm run dev -- --port $ZC_SLATE_PORT';
+function hasPortReference(cmd) {
+    if (!cmd)
+        return false;
+    return /\$\{?ZC_SLATE_PORT\}?|%ZC_SLATE_PORT%/.test(cmd);
+}
+function resolveDevCommand(frameworkName, frameworks) {
+    var _a, _b;
+    const fw = frameworks.find((f) => f.name === frameworkName);
+    const apiCmd = (_b = (_a = fw === null || fw === void 0 ? void 0 : fw.settings) === null || _a === void 0 ? void 0 : _a.dev_command) === null || _b === void 0 ? void 0 : _b.value;
+    if (apiCmd && hasPortReference(apiCmd)) {
+        return apiCmd;
+    }
+    const mapped = DEFAULT_DEV_COMMANDS[frameworkName.toLowerCase()];
+    if (mapped)
+        return mapped;
+    return GENERIC_DEV_COMMAND;
+}
+function promptFramework(frameworks, defaultName) {
+    return __awaiter(this, void 0, void 0, function* () {
+        let ordered = frameworks;
+        if (defaultName) {
+            const idx = frameworks.findIndex((f) => f.name === defaultName);
+            if (idx > 0) {
+                ordered = [frameworks[idx], ...frameworks.slice(0, idx), ...frameworks.slice(idx + 1)];
+            }
+        }
+        const choices = ordered.map(({ label, name }) => prompt_1.default.choice(label, { value: name, short: label }));
+        const defaultIdx = defaultName ? ordered.findIndex((f) => f.name === defaultName) : -1;
+        const { selectedFramework } = yield prompt_1.default.ask(prompt_1.default.question('selectedFramework', 'Select a framework to start with: ', Object.assign({ type: 'list', choices }, (defaultIdx >= 0 ? { default: defaultIdx } : {}))));
+        return selectedFramework;
+    });
+}
 function getFrameworkOption(frameworks, source) {
     return __awaiter(this, void 0, void 0, function* () {
         let frameworkOpt = (0, option_1.getOptionValue)('framework');
         if (frameworkOpt &&
             frameworks.findIndex((framework) => framework.name === frameworkOpt) === -1) {
-            (0, logger_1.warning)('Given framework is not supported in Slate.');
+            (0, logger_1.warning)(`Given framework "${frameworkOpt}" is not supported in Slate.`);
             frameworkOpt = '';
         }
         if (!frameworkOpt) {
-            const filteredFrameworks = frameworks.filter((framework) => framework.name !== 'other');
-            const { selectedFramework } = yield prompt_1.default.ask(prompt_1.default.question('selectedFramework', 'Select a framework to start with: ', {
-                type: 'list',
-                choices: filteredFrameworks.map(({ label, name }) => prompt_1.default.choice(label, { value: name, short: label }))
-            }));
-            frameworkOpt = selectedFramework;
+            frameworkOpt = yield promptFramework(frameworks.filter((f) => f.name !== 'other'));
         }
         return { name: frameworkOpt, source };
     });
@@ -140,8 +190,23 @@ function handleTemplate(appName, { templateName, frameworkName } = {}) {
 }
 function addExistingSlate(existingSlates) {
     return __awaiter(this, void 0, void 0, function* () {
-        yield prompt_1.default.register('file-path');
         const projectRoot = (0, project_1.getProjectRoot)();
+        const sourceOpt = (0, option_1.getOptionValue)('source');
+        if (sourceOpt) {
+            const buildPath = (0, path_1.resolve)(projectRoot, sourceOpt);
+            if (existingSlates.findIndex((targ) => targ.source === buildPath) !== -1) {
+                throw new error_1.default(`Path ${(0, ansi_colors_1.bold)(buildPath)} is already linked to a Slate app.`, {
+                    exit: 1
+                });
+            }
+            if (!(yield fs_1.ASYNC.dirExists(buildPath))) {
+                throw new error_1.default(`Source path ${(0, ansi_colors_1.bold)(buildPath)} does not exist.`, {
+                    exit: 1
+                });
+            }
+            return buildPath;
+        }
+        yield prompt_1.default.register('file-path');
         const { sourcePath } = yield prompt_1.default.ask(prompt_1.default.question('sourcePath', 'Please provide the source path of your slate service: ', {
             type: 'file-path',
             validate: (pth) => __awaiter(this, void 0, void 0, function* () {
@@ -167,89 +232,132 @@ function addExistingSlate(existingSlates) {
 function detectFramework(source, frameworkList) {
     return __awaiter(this, void 0, void 0, function* () {
         const frameworkOpt = (0, option_1.getOptionValue)('framework');
-        if (frameworkOpt &&
-            frameworkList.findIndex((framework) => framework.name === frameworkOpt) === -1) {
-            return { name: frameworkOpt, source };
+        if (frameworkOpt) {
+            if (frameworkList.findIndex((framework) => framework.name === frameworkOpt) !== -1) {
+                return { name: frameworkOpt, source };
+            }
+            (0, logger_1.warning)(`Given framework "${frameworkOpt}" is not supported in Slate. Auto-detecting...`);
         }
+        const fallback = (reason) => __awaiter(this, void 0, void 0, function* () {
+            (0, logger_1.warning)(reason);
+            const name = yield promptFramework(frameworkList.filter((f) => f.name !== 'other'));
+            return { name, source };
+        });
         const packageJsonPath = (0, path_1.join)(source, constants_1.FILENAME.package_json);
-        const packageJsonExists = yield fs_1.ASYNC.fileExists(packageJsonPath);
-        if (!packageJsonExists) {
-            (0, logger_1.warning)('Unable to find the package.json file at the given source path');
-            return getFrameworkOption(frameworkList, source);
+        if (!(yield fs_1.ASYNC.fileExists(packageJsonPath))) {
+            return fallback('Unable to find the package.json file at the given source path');
+        }
+        let data;
+        try {
+            data = yield fs_1.ASYNC.readJSONFile(packageJsonPath);
+        }
+        catch (err) {
+            return fallback(`Could not parse package.json (${err instanceof Error ? err.message : String(err)})`);
         }
-        const data = yield fs_1.ASYNC.readJSONFile(packageJsonPath);
-        const dependencies = Object.assign(Object.assign({}, data === null || data === void 0 ? void 0 : data.dependencies), data === null || data === void 0 ? void 0 : data.devDependencies);
-        if (!dependencies) {
-            (0, logger_1.warning)('The package.json file does not contain dependencies');
-            return getFrameworkOption(frameworkList, source);
+        const dependencies = Object.assign(Object.assign({}, ((data === null || data === void 0 ? void 0 : data.dependencies) || {})), ((data === null || data === void 0 ? void 0 : data.devDependencies) || {}));
+        if (Object.keys(dependencies).length === 0) {
+            return fallback('The package.json file does not contain dependencies');
         }
         const dependencyNames = Object.keys(dependencies);
+        const scripts = ((data === null || data === void 0 ? void 0 : data.scripts) || {});
+        const scriptCommands = [scripts.dev, scripts.start, scripts.build, scripts.serve]
+            .filter((s) => typeof s === 'string')
+            .join(' ');
+        const scriptTokens = new Set(scriptCommands
+            .toLowerCase()
+            .replace(/[a-z_][a-z0-9_]*=\S+/gi, ' ')
+            .split(/[\s&|;]+/)
+            .filter(Boolean));
+        const normalize = (s) => s.toLowerCase().replace(/[^a-z0-9]/g, '');
         const matchesKeywordPattern = (dep, keyword) => {
             if (!keyword)
                 return false;
-            const normalizedKeyword = keyword.toLowerCase().replace(/[^a-z0-9]/g, '');
-            const normalizedDep = dep.toLowerCase().replace(/[^a-z0-9]/g, '');
-            if (normalizedDep === normalizedKeyword) {
+            const k = normalize(keyword);
+            if (!k)
+                return false;
+            const lowerDep = dep.toLowerCase();
+            const normDep = normalize(dep);
+            if (normDep === k)
                 return true;
-            }
-            if (normalizedDep.startsWith(`${normalizedKeyword}-`) ||
-                normalizedDep.endsWith(`-${normalizedKeyword}`) ||
-                normalizedDep.startsWith(`@${normalizedKeyword}/`) ||
-                normalizedDep.endsWith(`/${normalizedKeyword}`) ||
-                normalizedDep === `@${normalizedKeyword}`) {
+            if (lowerDep.startsWith(`@${keyword.toLowerCase()}/`))
                 return true;
-            }
-            const segments = dep.split(/[-/@]/).map((s) => s.toLowerCase());
-            if (segments.includes(normalizedKeyword)) {
+            if (lowerDep === `@${keyword.toLowerCase()}`)
+                return true;
+            if (normDep === `${k}js` || normDep === `${k}dom` || normDep === `${k}native`)
                 return true;
-            }
             return false;
         };
-        let bestMatch = null;
-        let maxMatches = 0;
+        const scriptKeywordHit = (keyword) => {
+            if (!keyword)
+                return false;
+            const k = keyword.toLowerCase();
+            return scriptTokens.has(k) || scriptTokens.has(normalize(keyword));
+        };
         const frameworkScores = [];
+        let bestMatch = null;
+        let maxScore = 0;
         for (const framework of frameworkList) {
             if (!framework.keywords || framework.keywords.length === 0 || framework.name === 'other') {
                 continue;
             }
-            const matchingKeywords = framework.keywords.filter((keyword) => {
-                if (!keyword || keyword.trim() === '')
-                    return false;
-                return dependencyNames.some((dep) => matchesKeywordPattern(dep, keyword));
-            });
+            const matchingKeywords = framework.keywords.filter((keyword) => !!keyword &&
+                keyword.trim() !== '' &&
+                dependencyNames.some((dep) => matchesKeywordPattern(dep, keyword)));
+            const scriptHits = framework.keywords.filter((keyword) => scriptKeywordHit(keyword));
             const matchCount = matchingKeywords.length;
-            let score = matchCount;
-            const priorityKeywords = ['next', 'nuxt', 'gatsby', 'angular', 'vue', 'solid-js'];
-            const hasPriorityKeyword = matchingKeywords.some((keyword) => priorityKeywords.includes(keyword.toLowerCase()));
-            if (hasPriorityKeyword) {
-                score += 10;
-            }
+            let score = matchCount + scriptHits.length * 50;
             if (matchCount > 1) {
                 score += matchCount * 2;
             }
-            if (matchCount > 0) {
-                frameworkScores.push({ framework, score, matches: matchingKeywords });
+            if (score > 0) {
+                frameworkScores.push({ framework, score, matches: matchingKeywords, scriptHits });
             }
-            if (score > maxMatches) {
-                maxMatches = score;
+            if (score > maxScore) {
+                maxScore = score;
                 bestMatch = framework;
             }
         }
         const perfectMatches = frameworkScores.filter(({ framework }) => framework.keywords.length > 0 &&
             framework.keywords.every((keyword) => dependencyNames.some((dep) => matchesKeywordPattern(dep, keyword))));
+        let pick = null;
+        let highConfidence = false;
         if (perfectMatches.length > 0) {
             const filteredPerfectMatches = perfectMatches.filter((a) => !perfectMatches.some((b) => b !== a &&
                 b.framework.keywords.length > a.framework.keywords.length &&
                 a.framework.keywords.every((k) => b.framework.keywords.includes(k))));
-            filteredPerfectMatches.sort((a, b) => b.framework.keywords.length - a.framework.keywords.length);
-            const best = filteredPerfectMatches[0];
-            return { name: best.framework.name, source };
+            filteredPerfectMatches.sort((a, b) => {
+                if (a.scriptHits.length !== b.scriptHits.length) {
+                    return b.scriptHits.length - a.scriptHits.length;
+                }
+                if (a.framework.keywords.length !== b.framework.keywords.length) {
+                    return b.framework.keywords.length - a.framework.keywords.length;
+                }
+                return b.score - a.score;
+            });
+            pick = filteredPerfectMatches[0];
+            highConfidence =
+                pick.scriptHits.length > 0 ||
+                    (pick.framework.keywords.length > 1 && filteredPerfectMatches.length === 1);
         }
-        if (!bestMatch) {
-            (0, logger_1.warning)('No matching framework found in package.json dependencies');
-            return getFrameworkOption(frameworkList, source);
+        else if (bestMatch) {
+            const best = frameworkScores.find((s) => s.framework === bestMatch);
+            pick = best ? { framework: best.framework, scriptHits: best.scriptHits } : null;
+            highConfidence = !!best && best.scriptHits.length > 0;
         }
-        return { name: bestMatch.name, source };
+        if (!pick) {
+            return fallback('No matching framework found in package.json dependencies');
+        }
+        const pickedLabel = pick.framework.label || pick.framework.name;
+        if (highConfidence) {
+            (0, console_1.log)((0, ansi_colors_1.grey)(`Auto-detected framework: ${(0, ansi_colors_1.bold)(pickedLabel)}`));
+            return { name: pick.framework.name, source };
+        }
+        (0, logger_1.warning)(`Framework detection is uncertain. Best guess: ${(0, ansi_colors_1.bold)(pickedLabel)}.`);
+        if ((0, option_1.getOptionValue)('default')) {
+            return { name: pick.framework.name, source };
+        }
+        const name = yield promptFramework(frameworkList.filter((f) => f.name !== 'other'), pick.framework.name);
+        return { name, source };
     });
 }
 function getConfigDetails(frameworkOpt, frameworks) {
@@ -349,6 +457,9 @@ exports.default = (add) => __awaiter(void 0, void 0, void 0, function* () {
     const frameworkOpt = add
         ? yield detectFramework(yield addExistingSlate(config_1.slateConfig.raw() || []), frameworks)
         : yield getFrameworkOption(frameworks);
+    if (add && templateName) {
+        (0, logger_1.warning)('--template is ignored when linking an existing Slate app.');
+    }
     const appName = yield getAppName(config_1.slateConfig.raw() || [], frameworkOpt.name);
     const payload = {
         name: appName,
@@ -357,17 +468,25 @@ exports.default = (add) => __awaiter(void 0, void 0, void 0, function* () {
     };
     const slateConfigDetails = yield getConfigDetails(frameworkOpt.name, frameworks);
     if (frameworkOpt.name !== 'static') {
+        const defaultDevCommand = resolveDevCommand(frameworkOpt.name, frameworks);
         const slateRunConfig = (0, option_1.getOptionValue)('default')
-            ? { devCommand: 'npm start' }
+            ? { devCommand: defaultDevCommand }
             : yield prompt_1.default.ask(prompt_1.default.question('devCommand', 'Please provide your Development Command:', {
                 type: 'input',
-                default: 'npm start',
+                default: defaultDevCommand,
                 validate: (value) => __awaiter(void 0, void 0, void 0, function* () {
                     value = value.trim();
                     if (value === '')
                         return 'Please provide a valid development command';
-                    else if (value.length > 50)
+                    if (value.length > 50)
                         return 'Cannot exceed 50 characters.';
+                    if (!hasPortReference(value)) {
+                        return (0, ansi_colors_1.grey)('Command must reference ' +
+                            (0, ansi_colors_1.bold)('$ZC_SLATE_PORT') +
+                            ' so Catalyst can bind the dev server to a free port (e.g. ' +
+                            (0, ansi_colors_1.bold)(defaultDevCommand) +
+                            ').');
+                    }
                     return true;
                 })
             }));

package/lib/serve/features/apig.js

@@ -8,13 +8,25 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 const apig_utils_1 = require("../../apig-utils");
+const runtime_store_1 = __importDefault(require("../../runtime-store"));
 const config_1 = require("../../util_modules/config");
 const index_1 = require("../../util_modules/logger/index");
 exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
+    const compiledRules = runtime_store_1.default.get('context.apig.local.config');
+    if (compiledRules === null)
+        return;
+    if (typeof compiledRules === 'object')
+        return compiledRules;
     if (!config_1.apigConfig.enabled()) {
-        (0, index_1.info)('Skipping API Gateway rules');
+        runtime_store_1.default.set('context.apig.local.config', null);
+        (0, index_1.info)();
+        (0, index_1.info)('Skipping API Gateway rules as API Gateway is disabled in local');
+        (0, index_1.info)();
         return;
     }
     yield apig_utils_1.apigUtils.executeHook({ prefix: 'pre', command: 'serve' });

package/lib/serve/index.js

@@ -168,6 +168,9 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
                 serveTargets.splice(serveTargets.indexOf('client'), 1);
             }
         }
+        if (serveTargets.includes('apig')) {
+            yield features.apig();
+        }
         if (serveTargets.length === 0 ||
             (serveTargets.length === 1 && serveTargets[0] === 'apig')) {
             throw new index_js_1.default('No components to serve', { exit: 0, errorId: 'SERVE-1' });

package/lib/serve/server/lib/appsail/index.js

@@ -88,18 +88,19 @@ function startAppSailWithContainer(serverDetails) {
                 const tarStream = fs_1.SYNC.getReadStream(tarPath);
                 const imgName = `${serverDetails.target.name}-tar`;
                 const imageInfo = yield (0, image_1.loadTempImageTar)(imgName, tarStream);
-                serverDetails.target.source = 'docker://' + ((_d = imageInfo.RepoTags) === null || _d === void 0 ? void 0 : _d.at(0));
+                const loadedImage = (_d = imageInfo.RepoTags) === null || _d === void 0 ? void 0 : _d.at(0);
+                serverDetails.target.source = `docker://${loadedImage}`;
                 child = yield (0, container_plugin_1.start)({
                     details: serverDetails,
                     projectId: (0, project_1.getProjectId)(),
                     ruok: container_plugin_1.RUOK.SKIP
                 });
                 child.once('exit', () => {
-                    (0, image_1.removeImages)(imgName).catch((er) => (0, index_1.debug)('Error removing the temp images on exit: ', er));
+                    (0, image_1.removeImages)(loadedImage || imgName).catch((er) => (0, index_1.debug)('Error removing the temp images on exit: ', er));
                 });
                 child.once('error', (err) => {
                     (0, index_1.debug)('Error with the AppSail container: ', err);
-                    (0, image_1.removeImages)(imgName).catch((er) => (0, index_1.debug)('Error removing the temp images on error: ', er));
+                    (0, image_1.removeImages)(loadedImage || imgName).catch((er) => (0, index_1.debug)('Error removing the temp images on error: ', er));
                 });
                 break;
             }

package/lib/slate-utils.js

@@ -14,7 +14,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateServeCommand = exports.slateUtils = void 0;
 const ansi_colors_1 = require("ansi-colors");
-const fs_extra_1 = require("fs-extra");
 const path_1 = require("path");
 const archiver_1 = __importDefault(require("./archiver"));
 const error_1 = __importDefault(require("./error"));
@@ -24,8 +23,6 @@ const option_1 = require("./util_modules/option");
 const constants_1 = require("./util_modules/constants");
 const logger_1 = require("./util_modules/logger");
 const minimatch_1 = __importDefault(require("minimatch"));
-const env_1 = require("./util_modules/env");
-const async_1 = require("./util_modules/fs/lib/async");
 exports.slateUtils = {
     validate: (source) => __awaiter(void 0, void 0, void 0, function* () {
         const sourceDirExists = yield fs_1.ASYNC.dirExists(source);
@@ -101,68 +98,6 @@ exports.slateUtils = {
         return refinedTargets;
     },
     pack: (source) => __awaiter(void 0, void 0, void 0, function* () {
-        if (env_1.isCI) {
-            source = source !== null && source !== void 0 ? source : runtime_store_1.default.get('cwd');
-            const tempDir = (0, path_1.resolve)(constants_1.FOLDERNAME.slate);
-            if (!(yield (0, async_1.dirExists)(tempDir))) {
-                (0, fs_extra_1.mkdir)(tempDir);
-                const excludePatterns = [
-                    '**/.catalyst',
-                    `**/${constants_1.FILENAME.log}`,
-                    `**/${constants_1.FILENAME.config}`,
-                    `**/${constants_1.FILENAME.rc}`,
-                    `**/${constants_1.FILENAME.app_config}`,
-                    `**/${constants_1.FILENAME.catalyst_ignore}`
-                ];
-                const files = yield fs_1.ASYNC.walk(source, {
-                    filter: {
-                        exclude: (path) => __awaiter(void 0, void 0, void 0, function* () {
-                            return !!excludePatterns.find((glob) => (0, minimatch_1.default)(path.replace(source + path_1.sep, ''), glob, {
-                                dot: true
-                            }));
-                        }),
-                        excludeDir: true
-                    }
-                });
-                const zip = new archiver_1.default('static');
-                const fileArr = [];
-                files.forEach((file) => {
-                    fileArr.push({
-                        path: (0, path_1.relative)(source, file.path),
-                        type: (0, path_1.extname)(file.path).replace('.', '').toUpperCase() || '',
-                        size: file.stats.size
-                    });
-                    zip.add(file.path.replace(source + path_1.sep, ''), file.stats.isSymbolicLink()
-                        ? fs_1.SYNC.readSymLink(file.path)
-                        : fs_1.SYNC.getReadStream(file.path), {
-                        mode: file.stats.mode
-                    });
-                });
-                const zipFinalizer = yield zip.finalize();
-                const staticZip = (0, path_1.join)(tempDir, constants_1.FILENAME.slate.static_zip);
-                yield zipFinalizer.writeZip(staticZip);
-                const content = {
-                    version: '',
-                    framework: process.env.ZC_FRAMEWORK,
-                    runtime: '',
-                    static: fileArr
-                };
-                const configJson = (0, path_1.join)(tempDir, constants_1.FILENAME.slate.config_json);
-                fs_1.SYNC.writeFile(configJson, JSON.stringify(content, null, 2) + '\n');
-            }
-            const slateZip = yield fs_1.ASYNC.walk(tempDir, { includeDirPaths: false });
-            const zipWithJson = new archiver_1.default();
-            slateZip.forEach((file) => {
-                zipWithJson.add(file.path.replace(tempDir + path_1.sep, ''), file.stats.isSymbolicLink()
-                    ? fs_1.SYNC.readSymLink(file.path)
-                    : fs_1.SYNC.getReadStream(file.path), {
-                    mode: file.stats.mode
-                });
-            });
-            const zipFinalizerWithJson = yield zipWithJson.finalize();
-            yield fs_1.ASYNC.deleteDir(tempDir);
-            return yield zipFinalizerWithJson.fsStream();
-        }
         const excludePatterns = [
             '**/.DS_Store',
             '**/.catalyst',
@@ -172,7 +107,8 @@ exports.slateUtils = {
             `**/${constants_1.FILENAME.config}`,
             `**/${constants_1.FILENAME.rc}`,
             `**/${constants_1.FILENAME.app_config}`,
-            `**/${constants_1.FILENAME.catalyst_ignore}`
+            `**/${constants_1.FILENAME.catalyst_ignore}`,
+            `**/${constants_1.FILENAME.cli_config}`
         ];
         const slateZip = yield fs_1.ASYNC.walk(source, {
             filter: {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "zcatalyst-cli",
-	"version": "1.25.1",
+	"version": "1.25.3",
 	"description": "Command Line Tool for CATALYST",
 	"main": "./lib/index.js",
 	"bin": {