zcatalyst-cli 1.25.3 → 1.26.1

package/lib/init/dependencies/python/pip-install.js

@@ -12,9 +12,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.installPkgs = exports.installRequirements = exports.pypiRes = exports.ensurePyRuntime = void 0;
+exports.pypiRes = void 0;
+exports.ensurePyRuntime = ensurePyRuntime;
+exports.installRequirements = installRequirements;
+exports.installPkgs = installPkgs;
 const error_1 = __importDefault(require("../../../error"));
-const prompt_1 = __importDefault(require("../../../prompt"));
 const shell_1 = require("../../../util_modules/shell");
 const constants_1 = require("../../../util_modules/constants");
 const path_1 = require("path");
@@ -22,48 +24,10 @@ const fs_1 = require("../../../util_modules/fs");
 const https_1 = __importDefault(require("https"));
 const runtime_1 = __importDefault(require("../../../util_modules/constants/lib/runtime"));
 const env_1 = require("../../../util_modules/env");
-const ensure_python_1 = require("./ensure-python");
-const userConfig_1 = __importDefault(require("../../../userConfig"));
 const index_1 = require("../../../util_modules/logger/index");
-const sdkPipOpts = (0, env_1.envOverride)('CATALYST_SDK_PIP_OPTS', 'zcatalyst-sdk');
-const cliqSdkPipOpts = (0, env_1.envOverride)('CATALYST_CLIQ_SDK_PIP_OPTS', 'zcatalyst-cliq');
 const testPypi = (0, env_1.envOverride)('CATALYST_TEST_PYPI', 'false');
-exports.default = (pth, stack, isIntegFn = false, integService = false) => __awaiter(void 0, void 0, void 0, function* () {
-    const stackVersion = stack.replace('python_', '');
-    const ans = yield prompt_1.default.ask(prompt_1.default.question('pipInstall', 'Do you wish to install all dependency libraries now ? ', {
-        type: 'confirm',
-        defaultAns: true,
-        when: () => !isIntegFn
-    }));
-    if (ans.pipInstall && !isIntegFn) {
-        yield (0, ensure_python_1.ensurePythonWithPip)(stackVersion.replace('_', '.'), true);
-        const spawnOpts = ['-m', 'pip', 'install', ...sdkPipOpts.split(' '), '-t', '.'];
-        return (0, shell_1.spawn)(userConfig_1.default.get(`python${stackVersion}.bin`), spawnOpts, {
-            cwd: pth
-        })
-            .ASYNC()
-            .catch((err) => {
-            throw new error_1.default('Failure while installing zcatalyst SDk', {
-                exit: 2,
-                original: err
-            });
-        });
-    }
-    else if ((isIntegFn || ans.pipInstall === undefined) &&
-        integService === constants_1.INTEG.services.cliq) {
-        yield (0, ensure_python_1.ensurePythonWithPip)(stackVersion.replace('_', '.'), true);
-        const spawnOpts = ['-m', 'pip', 'install', ...cliqSdkPipOpts.split(' '), '-t', '.'];
-        return (0, shell_1.spawn)(userConfig_1.default.get(`python${stackVersion}.bin`), spawnOpts, { cwd: pth })
-            .ASYNC()
-            .catch((err) => {
-            throw error_1.default.getErrorInstance(err, {
-                message: 'Failure while installing zcatalyst cliq SDK.'
-            });
-        });
-    }
-});
-function ensurePyRuntime(pth, stack) {
-    return __awaiter(this, void 0, void 0, function* () {
+function ensurePyRuntime(pth_1, stack_1) {
+    return __awaiter(this, arguments, void 0, function* (pth, stack, spawnCommand = 'python') {
         const stackVersion = stack.replace('python_', '');
         const runtimePkgName = 'zcatalyst-runtime-' + stackVersion.replace('_', '');
         yield fs_1.ASYNC.ensureDir(pth);
@@ -82,7 +46,7 @@ function ensurePyRuntime(pth, stack) {
             if (testPypi === 'true') {
                 spawnOpts.push('-i', 'https://test.pypi.org/simple/', '--extra-index-url', 'https://pypi.org/simple/');
             }
-            const child = (0, shell_1.spawn)(userConfig_1.default.get(`python${stackVersion}.bin`), spawnOpts, {
+            const child = (0, shell_1.spawn)(spawnCommand, spawnOpts, {
                 cwd: pth,
                 stdio: 'pipe'
             }).RAW();
@@ -110,7 +74,7 @@ function ensurePyRuntime(pth, stack) {
         try {
             const runtimeReqFile = (0, path_1.join)(runtimeDir, constants_1.FILENAME.functions.python_requirements);
             if (yield fs_1.ASYNC.fileExists(runtimeReqFile)) {
-                yield installRequirements(runtimeReqFile, runtimeDir, stackVersion);
+                yield installRequirements(runtimeReqFile, runtimeDir, spawnCommand);
             }
         }
         catch (err) {
@@ -119,7 +83,6 @@ function ensurePyRuntime(pth, stack) {
         }
     });
 }
-exports.ensurePyRuntime = ensurePyRuntime;
 const pypiRes = (pkg) => __awaiter(void 0, void 0, void 0, function* () {
     const url = testPypi === 'true'
         ? `https://test.pypi.org/pypi/${pkg}/json`
@@ -144,8 +107,8 @@ const pypiRes = (pkg) => __awaiter(void 0, void 0, void 0, function* () {
     });
 });
 exports.pypiRes = pypiRes;
-function installRequirements(reqFile, pth, stackVersion, linuxMode = false) {
-    return __awaiter(this, void 0, void 0, function* () {
+function installRequirements(reqFile_1, pth_1) {
+    return __awaiter(this, arguments, void 0, function* (reqFile, pth, spawnCommand = 'python', linuxMode = false) {
         const spawnOpts = ['-m', 'pip', 'install', '-r', reqFile, '-t', '.', '--upgrade'];
         if (linuxMode) {
             spawnOpts.push(...[
@@ -161,7 +124,7 @@ function installRequirements(reqFile, pth, stackVersion, linuxMode = false) {
         }
         return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
             var _a;
-            const child = (0, shell_1.spawn)(userConfig_1.default.get(`python${stackVersion}.bin`), spawnOpts, {
+            const child = (0, shell_1.spawn)(spawnCommand, spawnOpts, {
                 cwd: pth,
                 stdio: 'pipe'
             }).RAW();
@@ -189,14 +152,13 @@ function installRequirements(reqFile, pth, stackVersion, linuxMode = false) {
         }));
     });
 }
-exports.installRequirements = installRequirements;
-function installPkgs(pkgs, stackVersion, pth = undefined) {
-    return __awaiter(this, void 0, void 0, function* () {
+function installPkgs(pkgs_1) {
+    return __awaiter(this, arguments, void 0, function* (pkgs, spawnCommand = 'python', pth = undefined) {
         const spawnOpts = ['-m', 'pip', 'install', ...pkgs, '--upgrade'];
         if (pth) {
             spawnOpts.push(...['-t', pth]);
         }
-        return (0, shell_1.spawn)(userConfig_1.default.get(`python${stackVersion}.bin`), spawnOpts, {
+        return (0, shell_1.spawn)(spawnCommand, spawnOpts, {
             cwd: pth,
             stdio: 'ignore'
         })
@@ -209,4 +171,3 @@ function installPkgs(pkgs, stackVersion, pth = undefined) {
         });
     });
 }
-exports.installPkgs = installPkgs;

package/lib/init/features/appsail/utils.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.getCustomAppSailSource = exports.getContainerImageTag = exports.getAppSailName = exports.getAppSailZip = void 0;
+exports.getAppSailZip = getAppSailZip;
+exports.getAppSailName = getAppSailName;
+exports.getContainerImageTag = getContainerImageTag;
+exports.getCustomAppSailSource = getCustomAppSailSource;
 const image_1 = require("@zcatalyst/container-plugin/out/endpoints/image");
 const ansi_colors_1 = require("ansi-colors");
 const inquirer = __importStar(require("inquirer"));
@@ -138,7 +151,6 @@ function getAppSailZip() {
         };
     });
 }
-exports.getAppSailZip = getAppSailZip;
 function getAppSailName() {
     return __awaiter(this, void 0, void 0, function* () {
         const existingSails = config_1.appSailConfig.raw() || [];
@@ -162,7 +174,6 @@ function getAppSailName() {
         return appName.name;
     });
 }
-exports.getAppSailName = getAppSailName;
 function getContainerImageTag() {
     return __awaiter(this, void 0, void 0, function* () {
         yield (0, container_1.isSocketAccessible)();
@@ -214,7 +225,6 @@ function getContainerImageTag() {
         return `docker://${image.name}`;
     });
 }
-exports.getContainerImageTag = getContainerImageTag;
 function getCustomAppSailSource() {
     return __awaiter(this, void 0, void 0, function* () {
         const dockerProtocol = yield prompt_1.default.ask(prompt_1.default.question('type', 'Please choose one of the supported protocols:', {
@@ -261,4 +271,3 @@ function getCustomAppSailSource() {
         }
     });
 }
-exports.getCustomAppSailSource = getCustomAppSailSource;

package/lib/init/features/client/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) {
@@ -38,7 +48,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const index_js_1 = __importDefault(require("../../../prompt/index.js"));
 const index_js_2 = require("../../../util_modules/constants/index.js");
 exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
-    var _a;
     const clientInitAnswer = yield index_js_1.default.ask(index_js_1.default.question('clientFlavour', 'Choose the type of client to initialise: ', {
         type: 'list',
         choices: index_js_2.PLUGIN.client.map((plugin) => {
@@ -49,5 +58,5 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
             });
         })
     }));
-    return (yield (_a = './initializers/' + clientInitAnswer.clientFlavour, Promise.resolve().then(() => __importStar(require(_a))))).default();
+    return (yield Promise.resolve(`${'./initializers/' + clientInitAnswer.clientFlavour}`).then(s => __importStar(require(s)))).default();
 });

package/lib/init/features/client/initializers/angular.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) {

package/lib/init/features/client/initializers/basic.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) {

package/lib/init/features/client/initializers/lyte.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) {

package/lib/init/features/client/initializers/react.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) {

package/lib/init/features/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) {
@@ -35,7 +45,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.appsail = exports.project = exports.slate = exports.client = exports.functions = exports.setCatalystConfig = void 0;
+exports.setCatalystConfig = setCatalystConfig;
+exports.functions = functions;
+exports.client = client;
+exports.slate = slate;
+exports.project = project;
+exports.appsail = appsail;
 const ansi_colors_1 = require("ansi-colors");
 const path_1 = require("path");
 const index_js_1 = __importDefault(require("../../error/index.js"));
@@ -45,8 +60,8 @@ const runtime_1 = __importDefault(require("../../util_modules/constants/lib/runt
 const js_1 = require("../../util_modules/js");
 const index_1 = require("../../util_modules/logger/index");
 const project_1 = require("../../util_modules/project");
-function upsertEnvArr(envArr, idx = 0) {
-    return __awaiter(this, void 0, void 0, function* () {
+function upsertEnvArr(envArr_1) {
+    return __awaiter(this, arguments, void 0, function* (envArr, idx = 0) {
         if (envArr === null) {
             return upsertEnvArr(envArr, idx + 1);
         }
@@ -130,28 +145,24 @@ function setCatalystConfig(featureName, add) {
         }
     });
 }
-exports.setCatalystConfig = setCatalystConfig;
-function functions(add = false) {
-    return __awaiter(this, void 0, void 0, function* () {
+function functions() {
+    return __awaiter(this, arguments, void 0, function* (add = false) {
         yield (yield Promise.resolve().then(() => __importStar(require('./functions/index.js')))).default();
         setCatalystConfig('functions', add);
     });
 }
-exports.functions = functions;
 function client() {
     return __awaiter(this, void 0, void 0, function* () {
         yield (yield Promise.resolve().then(() => __importStar(require('./client/index.js')))).default();
         setCatalystConfig('client', false);
     });
 }
-exports.client = client;
-function slate(add = false) {
-    return __awaiter(this, void 0, void 0, function* () {
+function slate() {
+    return __awaiter(this, arguments, void 0, function* (add = false) {
         yield (yield Promise.resolve().then(() => __importStar(require('./slate/index.js')))).default(add);
         setCatalystConfig('slate', false);
     });
 }
-exports.slate = slate;
 function project() {
     return __awaiter(this, void 0, void 0, function* () {
         yield (yield Promise.resolve().then(() => __importStar(require('./project.js')))).default();
@@ -175,14 +186,12 @@ function project() {
         }
     });
 }
-exports.project = project;
 function appsail() {
     return __awaiter(this, void 0, void 0, function* () {
         yield (yield Promise.resolve().then(() => __importStar(require('./appsail/index.js')))).default();
         setCatalystConfig('appsail');
     });
 }
-exports.appsail = appsail;
 exports.default = {
     functions,
     client,

package/lib/init/features/project.js

@@ -88,7 +88,7 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
     ];
     allProjects.forEach((project) => {
         projectChoices.push(prompt_1.default.choice(project.project_name + ' (' + project.id + ')', {
-            id: project.project_name,
+            id: project.id,
             value: project,
             short: project.project_name
         }));
@@ -107,15 +107,15 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
             const callbackPort = yield port_resolver_1.default.getFreePort(3000, 10, false);
             const accessUrl = new URL(`${constants_1.ORIGIN.console}/baas/${(0, project_1.getEnvId)()}/index#/?port=${callbackPort}&type=cli`);
             const server = (0, http_1.createServer)((req, resp) => __awaiter(void 0, void 0, void 0, function* () {
-                var _c, _d;
+                var _a, _b;
                 try {
-                    if (!((_c = req.url) === null || _c === void 0 ? void 0 : _c.includes('/success'))) {
+                    if (!((_a = req.url) === null || _a === void 0 ? void 0 : _a.includes('/success'))) {
                         resp.writeHead(404);
                         resp.end();
                         return;
                     }
                     const htmlFile = yield fs_1.ASYNC.readFile((0, path_1.join)(__dirname, '../../../templates/projectSuccess.html'));
-                    projectId = (_d = req.url) === null || _d === void 0 ? void 0 : _d.split('?')[1].split('=')[1];
+                    projectId = (_b = req.url) === null || _b === void 0 ? void 0 : _b.split('?')[1].split('=')[1];
                     resp.setHeader('Content-Type', 'text/html');
                     resp.writeHead(200);
                     resp.end(htmlFile, () => __awaiter(void 0, void 0, void 0, function* () {
@@ -162,7 +162,7 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
     const templateJson = parsedJSON ? parsedJSON : (0, yaml_1.parse)(template);
     const functions = ((_a = templateJson.components) === null || _a === void 0 ? void 0 : _a.Functions) || [];
     const client = ((_b = templateJson.components) === null || _b === void 0 ? void 0 : _b.WebClient) || [];
-    yield Promise.all(functions.map(({ properties }) => __awaiter(void 0, void 0, void 0, function* () {
+    yield Promise.all(functions.map((_a) => __awaiter(void 0, [_a], void 0, function* ({ properties }) {
         const source = properties.code.path.replace('/', path_1.sep).replace('.zip', '');
         const stack = properties.stack.toLowerCase();
         const refinedTargets = yield fn_utils_1.fnUtils.common.refineTargets([(0, project_1.resolveProjectPath)(source)], false);

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) {
@@ -161,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);
@@ -192,9 +202,11 @@ function addExistingSlate(existingSlates) {
     return __awaiter(this, void 0, void 0, function* () {
         const projectRoot = (0, project_1.getProjectRoot)();
         const sourceOpt = (0, option_1.getOptionValue)('source');
+        const isDuplicate = (candidateAbs) => existingSlates.findIndex((targ) => (0, path_1.resolve)(projectRoot, targ.source) === candidateAbs) !==
+            -1;
         if (sourceOpt) {
             const buildPath = (0, path_1.resolve)(projectRoot, sourceOpt);
-            if (existingSlates.findIndex((targ) => targ.source === buildPath) !== -1) {
+            if (isDuplicate(buildPath)) {
                 throw new error_1.default(`Path ${(0, ansi_colors_1.bold)(buildPath)} is already linked to a Slate app.`, {
                     exit: 1
                 });
@@ -211,7 +223,7 @@ function addExistingSlate(existingSlates) {
             type: 'file-path',
             validate: (pth) => __awaiter(this, void 0, void 0, function* () {
                 const buildPath = (0, path_1.resolve)(projectRoot, pth.value);
-                if (existingSlates.findIndex((targ) => targ.source === buildPath) !== -1)
+                if (isDuplicate(buildPath))
                     return 'Path is already linked.';
                 if (yield fs_1.ASYNC.dirExists(buildPath)) {
                     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;