zcatalyst-cli 1.25.2 → 1.26.0

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

@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -51,21 +61,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 };
     });
@@ -111,8 +171,8 @@ function getAppName(existingSlates, frameworkOpt) {
         return appName;
     });
 }
-function handleTemplate(appName, { templateName, frameworkName } = {}) {
-    return __awaiter(this, void 0, void 0, function* () {
+function handleTemplate(appName_1) {
+    return __awaiter(this, arguments, void 0, function* (appName, { templateName, frameworkName } = {}) {
         const projectRoot = (0, project_1.getProjectRoot)();
         const appPath = path_1.default.join(projectRoot, appName);
         const folderExists = yield fs_1.ASYNC.dirExists(appPath);
@@ -140,8 +200,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 +242,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');
         }
-        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);
+        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 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 +467,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 +478,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/init/util/client.js

@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -35,7 +45,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.addDependency = exports.clientNamePrompt = exports.directoryOverridePrompt = exports.fillClientInitPayload = void 0;
+exports.fillClientInitPayload = void 0;
+exports.directoryOverridePrompt = directoryOverridePrompt;
+exports.clientNamePrompt = clientNamePrompt;
+exports.addDependency = addDependency;
 const ansi_colors_1 = require("ansi-colors");
 const runtime_store_js_1 = __importDefault(require("../../runtime-store.js"));
 const index_js_1 = __importDefault(require("../../error/index.js"));
@@ -64,7 +77,6 @@ function directoryOverridePrompt(dir) {
         }
     });
 }
-exports.directoryOverridePrompt = directoryOverridePrompt;
 function clientNamePrompt(question, defaultAns) {
     return __awaiter(this, void 0, void 0, function* () {
         const namePrompt = yield index_js_2.default.ask(index_js_2.default.question('name', question, {
@@ -80,9 +92,8 @@ function clientNamePrompt(question, defaultAns) {
         return namePrompt.name;
     });
 }
-exports.clientNamePrompt = clientNamePrompt;
-function addDependency(filePath, dep, { dev = false, depPath = [] } = {}) {
-    return __awaiter(this, void 0, void 0, function* () {
+function addDependency(filePath_1, dep_1) {
+    return __awaiter(this, arguments, void 0, function* (filePath, dep, { dev = false, depPath = [] } = {}) {
         try {
             const packageJson = yield ASYNC.readJSONFile(filePath);
             if (packageJson) {
@@ -98,4 +109,3 @@ function addDependency(filePath, dep, { dev = false, depPath = [] } = {}) {
         }
     });
 }
-exports.addDependency = addDependency;

package/lib/init/util/common.js

@@ -12,7 +12,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getRuntimePromptAnswer = exports.getRuntimeChoices = exports.getRuntimeDetails = void 0;
+exports.getRuntimeDetails = getRuntimeDetails;
+exports.getRuntimeChoices = getRuntimeChoices;
+exports.getRuntimePromptAnswer = getRuntimePromptAnswer;
 const catalyst_details_js_1 = __importDefault(require("../../endpoints/lib/catalyst-details.js"));
 const index_js_1 = __importDefault(require("../../error/index.js"));
 const index_js_2 = __importDefault(require("../../prompt/index.js"));
@@ -23,9 +25,8 @@ function getRuntimeDetails(fnType) {
     const catalystDetailsAPI = new catalyst_details_js_1.default();
     return catalystDetailsAPI.getDetails('runtime', fnType ? index_js_3.REMOTE_REF.functions.type[fnType] : undefined);
 }
-exports.getRuntimeDetails = getRuntimeDetails;
-function getRuntimeChoices({ fnType, runtimeDetails }) {
-    return __awaiter(this, void 0, void 0, function* () {
+function getRuntimeChoices(_a) {
+    return __awaiter(this, arguments, void 0, function* ({ fnType, runtimeDetails }) {
         if (runtimeDetails === undefined) {
             runtimeDetails = yield getRuntimeDetails(fnType);
         }
@@ -84,7 +85,6 @@ function getRuntimeChoices({ fnType, runtimeDetails }) {
         return [...runtimeChoices.java, ...runtimeChoices.node, ...runtimeChoices.python];
     });
 }
-exports.getRuntimeChoices = getRuntimeChoices;
 function getRuntimePromptAnswer(question, fnType) {
     return __awaiter(this, void 0, void 0, function* () {
         const runtimeChoices = yield getRuntimeChoices({ fnType });
@@ -101,4 +101,3 @@ function getRuntimePromptAnswer(question, fnType) {
         return runtimeAns.runtime;
     });
 }
-exports.getRuntimePromptAnswer = getRuntimePromptAnswer;

package/lib/init/util/project.js

@@ -18,7 +18,7 @@ const error_1 = __importDefault(require("../../error"));
 const runtime_store_1 = __importDefault(require("../../runtime-store"));
 const constants_1 = require("../../util_modules/constants");
 const project_1 = require("../../util_modules/project");
-const fillProjectPayload = (selectedOrg, selectedProject, isNew = false, isImport = false) => __awaiter(void 0, void 0, void 0, function* () {
+const fillProjectPayload = (selectedOrg_1, selectedProject_1, ...args_1) => __awaiter(void 0, [selectedOrg_1, selectedProject_1, ...args_1], void 0, function* (selectedOrg, selectedProject, isNew = false, isImport = false) {
     runtime_store_1.default.set('context.payload.project', selectedProject);
     runtime_store_1.default.set('project', (0, project_1.transformProject)(selectedProject));
     const envAPI = yield (0, endpoints_1.envAPI)({ auth: true, org: selectedOrg.id });

package/lib/internal/api.d.ts

@@ -1,6 +1,3 @@
-/// <reference types="node" />
-/// <reference types="node" />
-/// <reference types="node" />
 import request from 'request';
 import Progress, { IProgress } from '../progress';
 import { ReadStream } from 'fs';

package/lib/internal/api.js

@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -188,8 +198,8 @@ class API {
             return this._request(true);
         });
     }
-    _request(retry = false) {
-        return __awaiter(this, void 0, void 0, function* () {
+    _request() {
+        return __awaiter(this, arguments, void 0, function* (retry = false) {
             if (!retry) {
                 this._logReq();
             }

package/lib/internal/command.js

@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -249,8 +259,7 @@ class Command {
                 (0, index_1.debug)(e);
             }
             yield Promise.all(js_1.JS.map(this.beforeRunners, (before) => __awaiter(this, void 0, void 0, function* () {
-                var _a;
-                const beforeModule = (yield (_a = '../command_needs/' + before.fn, Promise.resolve().then(() => __importStar(require(_a))))).default;
+                const beforeModule = (yield Promise.resolve(`${'../command_needs/' + before.fn}`).then(s => __importStar(require(s)))).default;
                 return beforeModule.call(this, before.args);
             })));
             return this.cmdAction.call(this, ...args);

package/lib/migration/global/1.25.0.d.ts

@@ -0,0 +1,2 @@
+export declare const isRequire: () => boolean;
+export declare const migrate: () => void;

package/lib/migration/global/1.25.0.js

@@ -0,0 +1,28 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.migrate = exports.isRequire = void 0;
+const path_1 = require("path");
+const fs_1 = require("../../util_modules/fs");
+const constants_1 = require("../../util_modules/constants");
+const logger_1 = require("../../util_modules/logger");
+const isRequire = () => {
+    return fs_1.SYNC.fileExists((0, path_1.join)(constants_1.ENVPATH.runtimes.data, 'jetty', 'start.jar'));
+};
+exports.isRequire = isRequire;
+const migrate = () => {
+    try {
+        const parent = constants_1.ENVPATH.runtimes.data;
+        const jettyDir = (0, path_1.join)(parent, 'jetty');
+        const jettyV1Dir = (0, path_1.join)(jettyDir, 'v1');
+        const tempDir = (0, path_1.join)(parent, 'v1');
+        fs_1.SYNC.renameDir(jettyDir, tempDir);
+        fs_1.SYNC.ensureDir(jettyDir);
+        fs_1.SYNC.renameDir(tempDir, jettyV1Dir);
+        (0, logger_1.debug)('jetty migration is success');
+    }
+    catch (e) {
+        (0, logger_1.error)('jetty migration failed');
+        throw e;
+    }
+};
+exports.migrate = migrate;