zcatalyst-cli 1.9.1 → 1.11.1

package/lib/init/features/index.js

@@ -75,7 +75,7 @@ function setFnConfig(featureName, add) {
     const config = runtime_store_1.default.get('config');
     featureContextArr.forEach((context) => {
         var _a, _b;
-        const targetSourceDir = featureName === 'functions' ? path_1.dirname(context.source) : path_1.basename(context.source);
+        const targetSourceDir = featureName === 'functions' ? path_1.dirname(context.source) : context.source;
         const targetSource = path_1.relative(project_1.getProjectRoot(), targetSourceDir);
         switch (featureName) {
             case 'functions':
@@ -98,6 +98,13 @@ function setFnConfig(featureName, add) {
                 break;
             case 'client':
                 config.set('client.source', targetSource);
+                const plugin = runtime_store_1.default.get('payload.client.plugin', false);
+                if (plugin) {
+                    config.set('client.plugin', plugin);
+                }
+                else {
+                    config.unset('client.plugin');
+                }
                 break;
             case 'apig':
                 config.set('apig.rules', targetSource);
@@ -109,23 +116,23 @@ function setFnConfig(featureName, add) {
 exports.setFnConfig = setFnConfig;
 function functions(add = false) {
     return __awaiter(this, void 0, void 0, function* () {
-        yield (yield Promise.resolve().then(() => __importStar(require('./functions')))).default();
+        yield (yield Promise.resolve().then(() => __importStar(require('./functions/index.js')))).default();
         setFnConfig('functions', add);
     });
 }
 exports.functions = functions;
 function client() {
     return __awaiter(this, void 0, void 0, function* () {
-        yield (yield Promise.resolve().then(() => __importStar(require('./client')))).default();
+        yield (yield Promise.resolve().then(() => __importStar(require('./client/index.js')))).default();
         setFnConfig('client', false);
     });
 }
 exports.client = client;
 function project() {
     return __awaiter(this, void 0, void 0, function* () {
-        yield (yield Promise.resolve().then(() => __importStar(require('./project')))).default();
+        yield (yield Promise.resolve().then(() => __importStar(require('./project.js')))).default();
         const projectPayload = runtime_store_1.default.get('payload.project', null);
-        if (projectPayload === null) {
+        if (!projectPayload) {
             return;
         }
         yield project_1.upsertProject(projectPayload, {
@@ -133,10 +140,15 @@ function project() {
             active: true
         });
         yield upsertEnvArr(runtime_store_1.default.get('payload.env', null));
-        if (runtime_store_1.default.get('project.new', false)) {
+        if (runtime_store_1.default.get('payload.project.new', false)) {
             logger_1.message('New Project has been successfully created and associated with this directory.');
         }
         logger_1.message(ansi_colors_1.bold(constants_1.FILENAME.rc) + ' file has be successfully created with project details.');
+        const isImport = runtime_store_1.default.get('payload.project.import', false);
+        if (isImport) {
+            setFnConfig('functions', true);
+            setFnConfig('client', false);
+        }
     });
 }
 exports.project = project;

package/lib/init/features/project.js

@@ -13,6 +13,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const ansi_colors_1 = require("ansi-colors");
+const import_1 = require("../../commands/iac/import");
 const endpoints_1 = require("../../endpoints");
 const error_1 = __importDefault(require("../../error"));
 const prompt_1 = __importDefault(require("../../prompt"));
@@ -21,43 +22,53 @@ const constants_1 = require("../../util_modules/constants");
 const js_1 = require("../../util_modules/js");
 const logger_1 = require("../../util_modules/logger");
 const option_1 = require("../../util_modules/option");
+const yaml_1 = __importDefault(require("yaml"));
 const project_1 = require("../../util_modules/project");
+const path_1 = require("path");
+const functions_1 = require("../util/functions");
+const project_2 = require("../util/project");
+const client_1 = require("../util/client");
+const runtime_1 = __importDefault(require("../../util_modules/constants/lib/runtime"));
+const fn_utils_1 = require("../../fn-utils");
+const client_utils_1 = require("../../client-utils");
 exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
+    var _a, _b;
     const projectAPI = yield endpoints_1.projectAPI();
     const defaultRCProjectName = project_1.getDefaultProjectName(null);
     const defaultRCProjectId = project_1.getDefaultProjectId(null);
     if (defaultRCProjectName !== null &&
         defaultRCProjectId !== null &&
         !option_1.getOptionValue('force', false)) {
-        logger_1.message(constants_1.FILENAME.rc +
-            ' already has ' +
-            ansi_colors_1.bold(defaultRCProjectName) +
-            ' as a default project. To overwrite use ' +
-            ansi_colors_1.bold('--force') +
-            ' option');
+        logger_1.message(constants_1.FILENAME.rc + ' already has ' + ansi_colors_1.bold(defaultRCProjectName) + ' as a default project.');
         try {
             yield projectAPI.getProject(defaultRCProjectId);
-            logger_1.warning('skipping project setup. since project directory contains a default project. To overwrite use --force option');
-            return;
+            throw new error_1.default('Skipping project setup, since project directory contains a default project. To overwrite use --force option');
         }
         catch (err) {
-            if (js_1.JS.get(err, 'context.response.statusCode') === 404) {
-                logger_1.error('default project not found');
+            if (js_1.JS.get(err, 'context.response.statusCode') !== 404) {
+                throw err;
             }
-            throw err;
+            logger_1.warning('cleaning up ' +
+                constants_1.FILENAME.rc +
+                ' since the current default project for this folder is not found in remote');
+            yield project_1.removeProject(defaultRCProjectId + '');
         }
     }
-    logger_1.message('Setting up a default project for this folder\n');
+    logger_1.message('Setting up a new default project for this folder\n');
     const allProjects = (yield projectAPI.getAllProjects());
     if (allProjects.length === 0) {
         throw new error_1.default('Visit ' +
-            ansi_colors_1.underline(constants_1.ORIGIN.admin) +
+            ansi_colors_1.underline(constants_1.ORIGIN.console) +
             ' for creation of your first project before you continue.', { exit: 1 });
     }
     const projectChoices = [
         prompt_1.default.choice('[create a new project]', {
-            value: null,
+            value: 0,
             short: 'New-Project'
+        }),
+        prompt_1.default.choice('[import a existing project]', {
+            value: 1,
+            short: 'Import-project'
         })
     ];
     allProjects.forEach((project) => {
@@ -66,32 +77,59 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
             short: project.project_name
         }));
     });
-    const projectAns = yield prompt_1.default.ask(prompt_1.default.question('project', 'Note: This process cannot be undone!\n ' +
-        'Select a default Catalyst project for this directory: ', {
+    const projectAns = yield prompt_1.default.ask(prompt_1.default.question('project', 'Select a default Catalyst project for this directory: ', {
         type: 'list',
         choices: js_1.JS.reverse(projectChoices)
     }));
     let selectedProject = projectAns.project;
-    if (selectedProject === null) {
-        const projectNameAns = yield prompt_1.default.ask(prompt_1.default.question('projectName', 'Provide a name for your new project?', {
-            validate: (ans) => {
-                if (ans.match(constants_1.REGEX.project.name)) {
-                    return true;
-                }
-                return 'Invalid project name';
-            }
+    if (typeof selectedProject !== 'number') {
+        return project_2.fillProjectPayload(selectedProject);
+    }
+    if (selectedProject === 0) {
+        const projectNameAns = yield prompt_1.default.ask(prompt_1.default.question('projectName', 'Provide a name for your new project:', {
+            validate: (ans) => (ans.match(constants_1.REGEX.project.name) ? true : 'Invalid project name')
         }));
         selectedProject = yield projectAPI.createProject(projectNameAns.projectName);
-        runtime_store_1.default.set('payload.project.new', true);
+        return project_2.fillProjectPayload(selectedProject, true);
     }
-    runtime_store_1.default.set('payload.project', selectedProject);
-    runtime_store_1.default.set('project', project_1.transformProject(selectedProject));
-    const envAPI = yield endpoints_1.envAPI();
-    const envArr = (yield envAPI.getEnvs(project_1.getProjectId()));
-    const envObj = js_1.JS.find(envArr, { env_name: constants_1.DEFAULT.env_name });
-    if (envObj === undefined) {
-        throw new error_1.default('There is no development environment found for this project. kindly contact support.');
+    const [zipArchive, template, importRes] = yield import_1.iacImport();
+    yield zipArchive
+        .extract(runtime_store_1.default.get('cwd'), '/', { recursive: true, ignoreInitial: false })
+        .finalize();
+    const parsedJSON = js_1.JS.parseJSON(template);
+    const templateJson = parsedJSON ? parsedJSON : yaml_1.default.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* () {
+        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([source], false);
+        const fnUtil = stack.startsWith(runtime_1.default.language.nodejs)
+            ? fn_utils_1.fnUtils.node
+            : stack.startsWith(runtime_1.default.language.java)
+                ? fn_utils_1.fnUtils.java
+                : null;
+        if (fnUtil === null) {
+            logger_1.warning(`skipping setup of function(${refinedTargets[0].name}) since provided stack ${stack} is not supported.`);
+            return;
+        }
+        yield fnUtil.validate(refinedTargets, 0);
+        if (!refinedTargets[0].valid) {
+            logger_1.debug('Invalid target : ' +
+                refinedTargets[0].name +
+                ' reason : ' +
+                refinedTargets[0].failure_reason);
+            logger_1.warning(`skipping setup of function(${refinedTargets[0].name}) since the package is invalid. \nContact catalyst support with debug log.`);
+            return;
+        }
+        functions_1.fillFunctionsInitPayload(source, properties.name, properties.stack, properties.type);
+    })));
+    if (client.length > 0) {
+        const { properties } = client[0];
+        const source = properties.code.path.replace('/', path_1.sep).replace('.zip', '');
+        yield client_utils_1.clientUtils.validate(source);
+        client_1.fillClientInitPayload(source, properties.app_name);
     }
-    runtime_store_1.default.set('payload.env', envArr);
-    runtime_store_1.default.set('project.env', project_1.transformEnv(envObj));
+    const projectDetails = yield projectAPI.getProject(importRes.project_details.id);
+    return project_2.fillProjectPayload(projectDetails, true, true);
 });

package/lib/init/util/client.js

@@ -0,0 +1,96 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : 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 __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) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        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 });
+exports.addDevDep = exports.clientNamePrompt = exports.directoryOverridePrompt = exports.fillClientInitPayload = void 0;
+const ansi_colors_1 = require("ansi-colors");
+const runtime_store_js_1 = __importDefault(require("../../runtime-store.js"));
+const error_js_1 = __importDefault(require("../../error.js"));
+const index_js_1 = __importDefault(require("../../prompt/index.js"));
+const regex_js_1 = __importDefault(require("../../util_modules/constants/lib/regex.js"));
+const ASYNC = __importStar(require("../../util_modules/fs/lib/async.js"));
+const logger_js_1 = require("../../util_modules/logger.js");
+const js_js_1 = require("../../util_modules/js.js");
+const fillClientInitPayload = (source, name) => {
+    runtime_store_js_1.default.set('payload.client.source', source);
+    runtime_store_js_1.default.set('payload.client.name', name);
+};
+exports.fillClientInitPayload = fillClientInitPayload;
+function directoryOverridePrompt(dir) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const foldeExists = yield ASYNC.dirExists(dir);
+        if (foldeExists) {
+            const overwriteAns = yield index_js_1.default.ask(index_js_1.default.question('overwrite', 'Directory ' + ansi_colors_1.underline(dir) + ' already exists. Overwrite ?', {
+                type: 'confirm',
+                defaultAns: false
+            }));
+            if (!overwriteAns.overwrite) {
+                throw new error_js_1.default('Skipping client setup since unable to override the already existing client', { exit: 0, errorId: 'CLIENT-UTILS-6', arg: [ansi_colors_1.italic.red(dir)] });
+            }
+            yield ASYNC.deleteDir(dir);
+        }
+    });
+}
+exports.directoryOverridePrompt = directoryOverridePrompt;
+function clientNamePrompt(question, defaultAns) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const namePrompt = yield index_js_1.default.ask(index_js_1.default.question('name', question, {
+            type: 'input',
+            defaultAns,
+            validate: (ans) => {
+                if (ans.match(regex_js_1.default.client.package_name)) {
+                    return true;
+                }
+                return 'Invalid client name';
+            }
+        }));
+        return namePrompt.name;
+    });
+}
+exports.clientNamePrompt = clientNamePrompt;
+function addDevDep(filePath, dep, depPath = []) {
+    return __awaiter(this, void 0, void 0, function* () {
+        try {
+            const packageJson = yield ASYNC.readJSONFile(filePath);
+            if (packageJson) {
+                depPath.push('devDependencies');
+                js_js_1.JS.set(packageJson, depPath, dep);
+                yield ASYNC.writeJSONFile(filePath, packageJson);
+            }
+        }
+        catch (e) {
+            const err = error_js_1.default.getErrorInstance(e, { skipHelp: true });
+            logger_js_1.debug(`unable to write to ${filePath}: ${err.message}`);
+        }
+    });
+}
+exports.addDevDep = addDevDep;

package/lib/init/util/functions.js

@@ -0,0 +1,20 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.fillFunctionsInitPayload = void 0;
+const path_1 = require("path");
+const runtime_store_1 = __importDefault(require("../../runtime-store"));
+const fillFunctionsInitPayload = (source, name, stack, type) => {
+    const existingFns = runtime_store_1.default.get('payload.functions.targets', []);
+    existingFns.push({
+        source,
+        name,
+        stack,
+        type
+    });
+    runtime_store_1.default.set('payload.functions.targets', existingFns);
+    runtime_store_1.default.set('payload.functions.source', path_1.dirname(source));
+};
+exports.fillFunctionsInitPayload = fillFunctionsInitPayload;

package/lib/init/util/project.js

@@ -0,0 +1,35 @@
+"use strict";
+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) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        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 });
+exports.fillProjectPayload = void 0;
+const endpoints_1 = require("../../endpoints");
+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 = (selectedProject, isNew = false, isImport = false) => __awaiter(void 0, void 0, void 0, function* () {
+    runtime_store_1.default.set('payload.project', selectedProject);
+    runtime_store_1.default.set('project', project_1.transformProject(selectedProject));
+    const envAPI = yield endpoints_1.envAPI();
+    const envArr = (yield envAPI.getEnvs(project_1.getProjectId()));
+    const envObj = envArr.find((env) => env.env_name === constants_1.DEFAULT.env_name);
+    if (envObj === undefined) {
+        throw new error_1.default('There is no development environment found for this project. Kindly contact support.', { exit: 2 });
+    }
+    runtime_store_1.default.set('payload.env', envArr);
+    runtime_store_1.default.set('project.env', project_1.transformEnv(envObj));
+    runtime_store_1.default.set('payload.project.new', isNew);
+    runtime_store_1.default.set('payload.project.import', isImport);
+});
+exports.fillProjectPayload = fillProjectPayload;

package/lib/internal/api.js

@@ -116,7 +116,8 @@ class API {
                 body = JSON.parse(rawResponseData.toString());
             }
             catch (e) {
-                logger_1.debug('API Parsing Error: ' + e.message);
+                const err = error_1.default.getErrorInstance(e);
+                logger_1.debug('API Parsing Error: ' + err.message);
             }
         }
         if (resp.statusCode >= 400 && !this.logOpts.skipRespBody) {
@@ -165,14 +166,10 @@ class API {
                                 try {
                                     resolve(yield this._retry(err));
                                 }
-                                catch (error) {
-                                    if (error instanceof error_1.default) {
-                                        reject(error);
-                                    }
-                                    reject(new error_1.default('API Error: ' + err.message, {
-                                        original: error,
-                                        exit: 2
-                                    }));
+                                catch (e) {
+                                    const error = error_1.default.getErrorInstance(e);
+                                    error.exit = 2;
+                                    reject(error);
                                 }
                                 break;
                         }

package/lib/internal/command.js

@@ -127,15 +127,15 @@ class Command {
             try {
                 yield runner.apply(this, programArgs);
                 const duration = Date.now() - start;
+                errorOut_1.default();
                 yield track_1.default(this.cmdName, 'success', duration);
-                process.exitCode = 0;
             }
             catch (err) {
                 const duration = Date.now() - start;
                 const errorEvent = err.exit === 1 ? 'Error (User)' : 'Error (Unexpected)';
                 const preppedMessage = strip_ansi_1.default(err.message || '');
+                errorOut_1.default(err);
                 yield track_1.default(errorEvent, preppedMessage, duration);
-                return errorOut_1.default(err);
             }
         }));
         return cmd;
@@ -167,7 +167,10 @@ class Command {
                 args.push({});
             }
             const [opts, command] = args.slice(-2);
-            runtime_store_1.default.set('opts', Object.assign({ _name: command.name() }, opts));
+            const unknownOpts = this.allowUnknownOptions
+                ? command.parseOptions(process.argv).unknown
+                : undefined;
+            runtime_store_1.default.set('opts', Object.assign({ _name: command.name(), unknownOpts }, opts));
             this._prepare(command);
             try {
                 yield migration_1.default(runtime_store_1.default.get('context.cli.package.version'));

package/lib/internal/config.js

@@ -68,11 +68,14 @@ class Config {
                 }
             }
             catch (e) {
-                throw new error_1.default('There was an error loading a file', {
-                    exit: 1,
-                    errorId: 'CONFIG-1',
-                    arg: [ansi_colors_1.bold(constants_1.FILENAME.config), e.message]
+                const err = error_1.default.getErrorInstance(e, {
+                    message: 'There was an error loading a file',
+                    skipHelp: false,
+                    fileName: __filename
                 });
+                err.errorId = 'CONFIG-1';
+                err.arg = [ansi_colors_1.bold(constants_1.FILENAME.config), err.message];
+                throw err;
             }
             if (canIgnore) {
                 return new Config(path_1.join(pd, constants_1.FILENAME.config));

package/lib/migration/index.js

@@ -63,10 +63,12 @@ const runMigration = (rc, migFiles, idx = 0) => __awaiter(void 0, void 0, void 0
             completed: false
         });
         rc.syncSave();
-        throw new error_1.default('Unable to run migration file ' + migFile, {
-            original: e,
-            exit: 2
+        const err = error_1.default.getErrorInstance(e, {
+            message: 'Unable to run migration file ' + migFile,
+            skipHelp: false
         });
+        err.exit = 2;
+        throw err;
     }
     rc.set(['migration', currentMigFileVersion], {
         completed: true
@@ -102,10 +104,12 @@ const runGlobalMigration = (migFiles) => __awaiter(void 0, void 0, void 0, funct
             error: util_1.inspect(e),
             completed: false
         });
-        throw new error_1.default('Unable to run migration file ' + migFile, {
-            original: e,
-            exit: 2
+        const err = error_1.default.getErrorInstance(e, {
+            message: 'Unable to run migration file ' + migFile,
+            skipHelp: false
         });
+        err.exit = 2;
+        throw err;
     }
     config_store_1.default.set('migration.' + currentMigFileVersion.replace(new RegExp('\\.', 'g'), '\\.'), {
         completed: true

package/lib/option-filter.js

@@ -175,7 +175,7 @@ function filterPorts() {
     });
 }
 exports.filterPorts = filterPorts;
-function filterTargets() {
+function filterTargets(pathSense = true) {
     const validTargetResultants = validateTargets();
     const config = runtime_store_1.default.get('config');
     let targets = validGlobalTargets.filter((t) => config.has(t));
@@ -185,6 +185,9 @@ function filterTargets() {
                 if (target === 'apig' && option_1.getCurrentCommand() === 'serve') {
                     return true;
                 }
+                if (!pathSense) {
+                    return true;
+                }
                 const targetRoot = project_1.resolveProjectPath(CONFIG[(target + 'Config')].source());
                 return (fs_1.SYNC.isPathInside(targetRoot, runtime_store_1.default.get('cwd')) ||
                     runtime_store_1.default.get('cwd') === targetRoot);

package/lib/optional-import.js

@@ -31,34 +31,20 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const path_1 = __importDefault(require("path"));
 const app_module_path_1 = __importDefault(require("app-module-path"));
-const logger_1 = require("./util_modules/logger");
 const project_1 = require("./util_modules/project");
-const global_dirs_1 = __importDefault(require("global-dirs"));
+const global_space_1 = __importDefault(require("./util_modules/global-space"));
+const path_1 = require("path");
 exports.default = (name) => __awaiter(void 0, void 0, void 0, function* () {
-    try {
-        if (name.startsWith('./')) {
-            const projectModulePath = project_1.resolveProjectPath(name);
-            app_module_path_1.default.addPath(projectModulePath);
-            return Promise.resolve().then(() => __importStar(require(projectModulePath)));
-        }
-        else {
-            for (const manager of ['npm', 'yarn']) {
-                try {
-                    const packageName = path_1.default.join(global_dirs_1.default[manager].packages, name);
-                    app_module_path_1.default.addPath(packageName);
-                    return Promise.resolve().then(() => __importStar(require(packageName)));
-                }
-                catch (e) {
-                    logger_1.debug(e);
-                }
-            }
-            return;
-        }
+    if (name !== path_1.basename(name)) {
+        const projectModulePath = project_1.resolveProjectPath(name);
+        app_module_path_1.default.addPath(projectModulePath);
+        return Promise.resolve().then(() => __importStar(require(projectModulePath)));
     }
-    catch (err) {
-        logger_1.debug(err);
-        return;
+    const packageName = yield global_space_1.default(name);
+    if (typeof packageName === 'string') {
+        app_module_path_1.default.addPath(packageName);
+        return Promise.resolve().then(() => __importStar(require(packageName)));
     }
+    return;
 });

package/lib/plugin-loader.js

@@ -31,6 +31,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const ansi_colors_1 = require("ansi-colors");
+const error_1 = __importDefault(require("./error"));
 const optional_import_1 = __importDefault(require("./optional-import"));
 const runtime_store_1 = __importDefault(require("./runtime-store"));
 const config = __importStar(require("./util_modules/config"));
@@ -57,10 +59,14 @@ function pluginLoader(feature, name, source) {
             pluginMod = loadedPlugins[specificPlugin];
         }
         else {
-            pluginMod = (yield optional_import_1.default(specificPlugin));
+            pluginMod = yield optional_import_1.default(specificPlugin);
         }
         if (pluginMod === undefined) {
-            return;
+            throw new error_1.default(`Configured plugin could not be found for [${feature}:${name}] - ${specificPlugin}`, {
+                exit: 1,
+                errorId: 'PLG-LDR-1',
+                arg: [ansi_colors_1.italic.red(specificPlugin), ansi_colors_1.bold(name), ansi_colors_1.bold(feature)]
+            });
         }
         loadedPlugins[specificPlugin] = pluginMod;
         if (typeof pluginMod === 'function') {

package/lib/port-resolver.js

@@ -68,25 +68,29 @@ class PortResolver {
             }
             catch (e) {
                 if (searchSpan === 0) {
-                    throw new error_1.default(`Provided port '${port}' is not available`, {
-                        exit: 1,
-                        original: e,
-                        errorId: 'PORT-RESOLVER-1',
-                        arg: [
-                            ansi_colors_1.bold.red(port + ''),
-                            type === 'debug' ? 'debugging' : 'serving',
-                            ansi_colors_1.bold(feature),
-                            name,
-                            type
-                        ]
+                    const err = error_1.default.getErrorInstance(e, {
+                        message: `Provided port '${port}' is not available`,
+                        skipHelp: false,
+                        fileName: __filename
                     });
+                    err.errorId = 'PORT-RESOLVER-1';
+                    err.arg = [
+                        ansi_colors_1.bold.red(port + ''),
+                        type === 'debug' ? 'debugging' : 'serving',
+                        ansi_colors_1.bold(feature),
+                        name,
+                        type
+                    ];
+                    throw err;
                 }
-                throw new error_1.default(`No ports from '${port}' to ${port + searchSpan} is free to use as a ${type} port.`, {
-                    exit: 1,
-                    original: e,
-                    errorId: 'PORT-RESOLVER-2',
-                    arg: [ansi_colors_1.bold(port + ''), ansi_colors_1.bold(port + searchSpan + ''), ansi_colors_1.bold('--' + type)]
+                const cerr = error_1.default.getErrorInstance(e, {
+                    message: `No ports from '${port}' to ${port + searchSpan} is free to use as a ${type} port.`,
+                    skipHelp: false,
+                    fileName: __filename
                 });
+                cerr.errorId = 'PORT-RESOLVER-2';
+                cerr.arg = [ansi_colors_1.bold(port + ''), ansi_colors_1.bold(port + searchSpan + ''), ansi_colors_1.bold('--' + type)];
+                throw cerr;
             }
             if (finalPort !== port) {
                 logger_1.debug(`${type} port : '${port}' is not available. Hence port '${finalPort}' will be used instead.`);