zcatalyst-cli 1.20.2 → 1.22.0

package/lib/init/util/client.js

@@ -38,27 +38,27 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.addDependency = 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 index_js_1 = __importDefault(require("../../error/index.js"));
+const index_js_2 = __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 index_1 = require("../../util_modules/logger/index");
 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);
+    runtime_store_js_1.default.set('context.payload.client.source', source);
+    runtime_store_js_1.default.set('context.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 ' + (0, ansi_colors_1.underline)(dir) + ' already exists. Overwrite ?', {
+            const overwriteAns = yield index_js_2.default.ask(index_js_2.default.question('overwrite', 'Directory ' + (0, 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)] });
+                throw new index_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);
         }
@@ -67,7 +67,7 @@ function directoryOverridePrompt(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, {
+        const namePrompt = yield index_js_2.default.ask(index_js_2.default.question('name', question, {
             type: 'input',
             defaultAns,
             validate: (ans) => {
@@ -93,8 +93,8 @@ function addDependency(filePath, dep, { dev = false, depPath = [] } = {}) {
             }
         }
         catch (e) {
-            const err = error_js_1.default.getErrorInstance(e, { skipHelp: true });
-            (0, logger_js_1.debug)(`unable to write to ${filePath}: ${err.message}`);
+            const err = index_js_1.default.getErrorInstance(e, { skipHelp: true });
+            (0, index_1.debug)(`unable to write to ${filePath}: ${err.message}`);
         }
     });
 }

package/lib/init/util/common.d.ts

@@ -0,0 +1,12 @@
+import { IRuntime } from '../../fn-utils/lib/common.js';
+import { IChoice, TSeparator } from '../../prompt/index.js';
+import { REMOTE_REF } from '../../util_modules/constants/index.js';
+export declare function getRuntimeDetails(fnType?: keyof typeof REMOTE_REF.functions.type): Promise<IRuntime>;
+export declare function getRuntimeChoices({ fnType, runtimeDetails }: {
+    fnType?: keyof typeof REMOTE_REF.functions.type;
+    runtimeDetails?: IRuntime;
+}): Promise<Array<IChoice | TSeparator>>;
+export declare function getRuntimePromptAnswer(question: string, fnType?: keyof typeof REMOTE_REF.functions.type): Promise<{
+    runtime: string;
+    lang: 'node' | 'java';
+}>;

package/lib/init/util/common.js

@@ -14,14 +14,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getRuntimePromptAnswer = exports.getRuntimeChoices = exports.getRuntimeDetails = void 0;
 const catalyst_details_js_1 = __importDefault(require("../../endpoints/lib/catalyst-details.js"));
-const error_js_1 = __importDefault(require("../../error.js"));
-const index_js_1 = __importDefault(require("../../prompt/index.js"));
-const char_1 = require("../../util_modules/char");
-const index_js_2 = require("../../util_modules/constants/index.js");
-const logger_js_1 = require("../../util_modules/logger.js");
+const index_js_1 = __importDefault(require("../../error/index.js"));
+const index_js_2 = __importDefault(require("../../prompt/index.js"));
+const index_js_3 = require("../../util_modules/constants/index.js");
+const logger_1 = require("../../util_modules/logger");
+const index_1 = require("../../util_modules/logger/index");
 function getRuntimeDetails(fnType) {
     const catalystDetailsAPI = new catalyst_details_js_1.default();
-    return catalystDetailsAPI.getDetails('runtime', fnType ? index_js_2.REMOTE_REF.functions.type[fnType] : undefined);
+    return catalystDetailsAPI.getDetails('runtime', fnType ? index_js_3.REMOTE_REF.functions.type[fnType] : undefined);
 }
 exports.getRuntimeDetails = getRuntimeDetails;
 function getRuntimeChoices({ fnType, runtimeDetails }) {
@@ -32,10 +32,10 @@ function getRuntimeChoices({ fnType, runtimeDetails }) {
         const runtimeChoices = runtimeDetails.runtimes.reduce((acc, value) => {
             const langArr = value.match(/^([a-zA-Z]+)([0-9_]+)$/);
             const runtimeLang = langArr !== null
-                ? index_js_2.RUNTIME.language[langArr[1]]
+                ? index_js_3.RUNTIME.language[langArr[1]]
                 : undefined;
             if (!langArr || !runtimeLang) {
-                (0, logger_js_1.debug)('Language cannot be identified hence skipping');
+                (0, index_1.debug)('Language cannot be identified hence skipping');
                 return acc;
             }
             const langV = langArr[2].split('_');
@@ -46,18 +46,18 @@ function getRuntimeChoices({ fnType, runtimeDetails }) {
             if ((runtimeDetails === null || runtimeDetails === void 0 ? void 0 : runtimeDetails.eol_runtimes) && runtimeDetails.eol_runtimes[value]) {
                 switch (runtimeDetails.eol_runtimes[value]) {
                     case 1:
-                        displayValue += ` (${char_1.CHAR.info} This runtime has reached its EOL)`;
+                        displayValue += ` (${logger_1.CHAR.info} This runtime has reached its EOL)`;
                         break;
                     case 2:
-                        displayValue += ` (${char_1.CHAR.warning} Only updates are allowed in this runtime)`;
+                        displayValue += ` (${logger_1.CHAR.warning} Only updates are allowed in this runtime)`;
                         disabled = true;
                         break;
                     case 3:
-                        displayValue += ` (${char_1.CHAR.error} This runtime is no longer supported)`;
+                        displayValue += ` (${logger_1.CHAR.error} This runtime is no longer supported)`;
                         disabled = true;
                         break;
                     default:
-                        (0, logger_js_1.debug)('unknown eol_runtime value ' + runtimeDetails.eol_runtimes[value]);
+                        (0, index_1.debug)('unknown eol_runtime value ' + runtimeDetails.eol_runtimes[value]);
                         return acc;
                 }
             }
@@ -67,9 +67,10 @@ function getRuntimeChoices({ fnType, runtimeDetails }) {
                     java: '----Java----',
                     python: '---Python---'
                 };
-                acc[runtimeLang.value].push(index_js_1.default.separator(sep[runtimeLang.value]));
+                acc[runtimeLang.value].push(index_js_2.default.separator(sep[runtimeLang.value]));
             }
-            acc[runtimeLang.value].push(index_js_1.default.choice(displayValue, {
+            acc[runtimeLang.value].push(index_js_2.default.choice(displayValue, {
+                id: value,
                 value: { runtime: value, lang: runtimeLang.value },
                 short: displayValue,
                 disabled
@@ -87,7 +88,7 @@ exports.getRuntimeChoices = getRuntimeChoices;
 function getRuntimePromptAnswer(question, fnType) {
     return __awaiter(this, void 0, void 0, function* () {
         const runtimeChoices = yield getRuntimeChoices({ fnType });
-        const runtimeAns = yield index_js_1.default.ask(index_js_1.default.question('runtime', question, {
+        const runtimeAns = yield index_js_2.default.ask(index_js_2.default.question('runtime', question, {
             type: 'list',
             choices: runtimeChoices,
             when: () => {
@@ -95,7 +96,7 @@ function getRuntimePromptAnswer(question, fnType) {
             }
         }));
         if (runtimeAns === undefined || runtimeAns.runtime === undefined) {
-            throw new error_js_1.default('Selected runtime is invalid.', { exit: 2 });
+            throw new index_js_1.default('Selected runtime is invalid.', { exit: 2 });
         }
         return runtimeAns.runtime;
     });

package/lib/init/util/functions.d.ts

@@ -0,0 +1,7 @@
+export interface IFnInitDetails {
+    source: string;
+    name: string;
+    stack: string;
+    type: string;
+}
+export declare const fillFunctionsInitPayload: (source: string, name: string, stack: string, type: string) => void;

package/lib/init/util/functions.js

@@ -7,14 +7,14 @@ 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', []);
+    const existingFns = runtime_store_1.default.get('context.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', (0, path_1.dirname)(source));
+    runtime_store_1.default.set('context.payload.functions.targets', existingFns);
+    runtime_store_1.default.set('context.payload.functions.source', (0, path_1.dirname)(source));
 };
 exports.fillFunctionsInitPayload = fillFunctionsInitPayload;

package/lib/init/util/project.d.ts

@@ -0,0 +1,3 @@
+import { ICatalystOrgObj } from '../../endpoints/lib/org';
+import { IProjectServerObj } from '../../util_modules/project';
+export declare const fillProjectPayload: (selectedOrg: ICatalystOrgObj, selectedProject: IProjectServerObj, isNew?: boolean, isImport?: boolean) => Promise<void>;

package/lib/init/util/project.js

@@ -19,7 +19,7 @@ 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* () {
-    runtime_store_1.default.set('payload.project', selectedProject);
+    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 });
     const envArr = (yield envAPI.getEnvs((0, project_1.getProjectId)()));
@@ -27,9 +27,9 @@ const fillProjectPayload = (selectedOrg, selectedProject, isNew = false, isImpor
     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('context.payload.env', envArr);
     runtime_store_1.default.set('project.env', (0, project_1.transformEnv)(envObj));
-    runtime_store_1.default.set('payload.project.new', isNew);
-    runtime_store_1.default.set('payload.project.import', isImport);
+    runtime_store_1.default.set('context.payload.project.new', isNew);
+    runtime_store_1.default.set('context.payload.project.import', isImport);
 });
 exports.fillProjectPayload = fillProjectPayload;

package/lib/internal/api.d.ts

@@ -0,0 +1,78 @@
+/// <reference types="node" />
+/// <reference types="node" />
+/// <reference types="node" />
+import request from 'request';
+import Progress, { IProgress } from '../progress';
+import { ReadStream } from 'fs';
+export interface IAPILogOpts {
+    uploadProgress?: IProgress;
+    progress?: IProgress;
+    skipQuery?: boolean;
+    skipReqBody?: boolean;
+    skipRespBody?: boolean;
+    stream?: ReadStream;
+    awaitingSpinner?: string;
+}
+interface IAPIBaseResponse {
+    body: unknown;
+    status: number;
+    response: request.Response;
+}
+export interface IAPIJsonResponse extends IAPIBaseResponse {
+    body: Record<string, unknown>;
+}
+export interface IAPIBufferResponse extends IAPIBaseResponse {
+    body: Buffer;
+}
+export interface IAPIStringResponse extends IAPIBaseResponse {
+    body: string;
+}
+export type IAPIResponse = IAPIJsonResponse & IAPIBufferResponse & IAPIStringResponse;
+export interface IAPIOptions extends request.CoreOptions {
+    origin?: string;
+    resolveOnError?: boolean;
+    printError?: boolean;
+    maxRetry?: number;
+    authNeeded?: boolean;
+    log?: IAPILogOpts;
+    envId?: string;
+}
+declare class API {
+    requestOpts: request.CoreOptions & request.OptionsWithUrl;
+    authNeeded: boolean;
+    resolveOnHTTPError: boolean;
+    printError?: boolean;
+    logOpts: IAPILogOpts;
+    maxRetryCount: number;
+    retryCount: number;
+    uploadProgress?: Progress;
+    downloadProgress?: Progress;
+    showWarning: boolean;
+    constructor({ authNeeded, resolveOnError, maxRetry, env, log, headers, isExternal, origin, json, showWarning, envId, printError }?: IAPIOptions & {
+        env?: string;
+        isExternal?: boolean;
+        showWarning?: boolean;
+    });
+    _logReq(): void;
+    _logResp(resp: request.Response): void;
+    _logUploadProgress({ chunk, error }?: {
+        chunk?: string | Buffer;
+        error?: Error;
+    }): void;
+    _logDownloadProgress({ chunk, error }?: {
+        chunk?: string | Buffer;
+        error?: Error;
+    }): void;
+    _addAuthHeader(): Promise<void>;
+    _parseResponse(resp: request.Response, body: string | Buffer | undefined, rawResponse: Array<Buffer>): IAPIResponse;
+    _retry(err: Error): Promise<IAPIResponse>;
+    _request(retry?: boolean): Promise<IAPIResponse>;
+    fire(method: 'GET' | 'PUT' | 'POST' | 'DELETE' | 'HEAD' | 'PATCH', path: string, options?: IAPIOptions): Promise<IAPIResponse>;
+    get(path: string, options?: Omit<IAPIOptions, 'envId'>): Promise<IAPIResponse>;
+    put(path: string, options?: Omit<IAPIOptions, 'envId'>): Promise<IAPIResponse>;
+    post(path: string, options?: Omit<IAPIOptions, 'envId'>): Promise<IAPIResponse>;
+    delete(path: string, options?: Omit<IAPIOptions, 'envId'>): Promise<IAPIResponse>;
+    head(path: string): Promise<IAPIBaseResponse>;
+    patch(path: string, options?: Omit<IAPIOptions, 'envId'>): Promise<IAPIResponse>;
+}
+export default API;

package/lib/internal/api.js

@@ -37,15 +37,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = __importDefault(require("request"));
 const progress_1 = __importDefault(require("../progress"));
-const error_1 = __importDefault(require("../error"));
+const index_js_1 = __importDefault(require("../error/index.js"));
 const errorResponse_1 = __importDefault(require("../errorResponse"));
 const runtime_store_1 = __importDefault(require("../runtime-store"));
 const constants_1 = require("../util_modules/constants");
 const js_1 = require("../util_modules/js");
-const logger_1 = require("../util_modules/logger");
+const index_1 = require("../util_modules/logger/index");
 const project_1 = require("../util_modules/project");
 const fs_1 = require("fs");
 const throbber_1 = __importDefault(require("../throbber"));
+const stream_1 = require("stream");
 class API {
     constructor({ authNeeded = true, resolveOnError = false, maxRetry = 3, env = constants_1.DEFAULT.env_name, log = {}, headers = {}, isExternal = false, origin = constants_1.ORIGIN.admin, json = true, showWarning = true, envId = (0, project_1.getEnvId)(), printError = true } = {}) {
         this.requestOpts = {
@@ -64,9 +65,7 @@ class API {
                 this.requestOpts.headers['CATALYST-ORG'] = envId;
             }
         }
-        this.requestOpts.headers = Object.assign(Object.assign({}, this.requestOpts.headers), { 'User-Agent': runtime_store_1.default.get('context.cli.package.name') +
-                '/' +
-                runtime_store_1.default.get('context.cli.package.version') });
+        this.requestOpts.headers = Object.assign(Object.assign({}, this.requestOpts.headers), { 'User-Agent': runtime_store_1.default.get('cli.package.name') + '/' + runtime_store_1.default.get('cli.package.version') });
         this.authNeeded = authNeeded;
         this.resolveOnHTTPError = resolveOnError;
         this.logOpts = log;
@@ -87,7 +86,7 @@ class API {
             ? '\nRequest Form: ' + JSON.stringify(this.requestOpts.form)
             : '';
         body = this.logOpts.skipReqBody === true ? '\n<request body omitted>' : body;
-        (0, logger_1.debug)('>>>> HTTP REQUEST : ' +
+        (0, index_1.debug)('>>>> HTTP REQUEST : ' +
             this.requestOpts.method +
             ' ' +
             this.requestOpts.url +
@@ -104,15 +103,15 @@ class API {
         ];
         const logHeaders = Object.assign({}, resp.headers);
         ignoreHeaders.forEach((header) => delete logHeaders[header]);
-        (0, logger_1.debug)('<<<< HTTP RESPONSE : ' +
+        (0, index_1.debug)('<<<< HTTP RESPONSE : ' +
             resp.statusCode +
             '\n' +
             'Response Headers: ' +
             JSON.stringify(logHeaders) +
             '\n');
         if (!js_1.JS.isUndefined(resp.timings)) {
-            (0, logger_1.debug)('TOTAL TIME TAKEN : ' + Number(resp.timings.end.toFixed(3)) + ' ms\n');
-            (0, logger_1.debug)('REQUEST PHASES : ' + resp.timingPhases);
+            (0, index_1.debug)('TOTAL TIME TAKEN : ' + Number(resp.timings.end.toFixed(3)) + ' ms\n');
+            (0, index_1.debug)('REQUEST PHASES : ' + resp.timingPhases);
         }
         if (resp.statusCode >= 200 &&
             resp.statusCode < 300 &&
@@ -130,14 +129,17 @@ class API {
     }
     _logDownloadProgress({ chunk, error } = {}) {
         if (this.downloadProgress) {
-            !chunk || error
-                ? this.downloadProgress.error(error)
-                : this.downloadProgress.tick(chunk.length);
+            if (chunk) {
+                return this.downloadProgress.tick(chunk.length);
+            }
+            if (error) {
+                return this.downloadProgress.error(error);
+            }
         }
     }
     _addAuthHeader() {
         return __awaiter(this, void 0, void 0, function* () {
-            const credential = (yield Promise.resolve().then(() => __importStar(require('./credential')))).default;
+            const credential = (yield Promise.resolve().then(() => __importStar(require('../authentication/credential.js')))).default;
             const accessToken = yield credential.getAccessToken();
             js_1.JS.set(this.requestOpts, 'headers.authorization', 'Bearer ' + accessToken);
         });
@@ -149,12 +151,12 @@ class API {
                 body = JSON.parse(rawResponseData.toString());
             }
             catch (e) {
-                const err = error_1.default.getErrorInstance(e);
-                (0, logger_1.debug)('API Parsing Error: ' + err.message);
+                const err = index_js_1.default.getErrorInstance(e);
+                (0, index_1.debug)('API Parsing Error: ' + err.message);
             }
         }
         if (resp.statusCode >= 400 && !this.logOpts.skipRespBody) {
-            (0, logger_1.debug)('Response Body : ' + JSON.stringify(resp.body) + '\n');
+            (0, index_1.debug)('Response Body : ' + JSON.stringify(resp.body) + '\n');
             if (!this.resolveOnHTTPError) {
                 const errRes = (0, errorResponse_1.default)(resp, body, !this.printError);
                 this._logDownloadProgress({ error: errRes });
@@ -173,13 +175,13 @@ class API {
     _retry(err) {
         return __awaiter(this, void 0, void 0, function* () {
             if (++this.retryCount > this.maxRetryCount) {
-                throw new error_1.default('API Error after retrying : ' + err.message, {
+                throw new index_js_1.default('API Error after retrying : ' + err.message, {
                     original: err,
                     exit: 2
                 });
             }
-            (0, logger_1.debug)('API Error while firing request : ' + err.message + '\n');
-            (0, logger_1.debug)('>>>> RETRYING\n');
+            (0, index_1.debug)('API Error while firing request : ' + err.message + '\n');
+            (0, index_1.debug)('>>>> RETRYING\n');
             return this._request(true);
         });
     }
@@ -200,6 +202,7 @@ class API {
                     _stream.on('data', (chunk) => {
                         this._logUploadProgress({ chunk });
                     });
+                    _stream.on('error', (er) => this._logUploadProgress({ error: er }));
                 }
                 if (this.logOpts.awaitingSpinner) {
                     this.logOpts.stream
@@ -208,30 +211,37 @@ class API {
                 }
                 (0, request_1.default)(this.requestOpts, (err) => __awaiter(this, void 0, void 0, function* () {
                     this.logOpts.awaitingSpinner && throbber.remove('response_await');
+                    this._logUploadProgress({ error: err });
+                    this._logDownloadProgress({ error: err });
                     if (err) {
                         switch (err.code) {
                             case 'ETIMEDOUT':
                             case 'ENOTFOUND':
                             case 'ESOCKETTIMEDOUT':
                                 this.showWarning &&
-                                    (0, logger_1.warning)(err.code +
+                                    (0, index_1.warning)(err.code +
                                         ' has occured while communicating remote server. Kindly be patient while the cli retries this request.');
                                 try {
                                     resolve(yield this._retry(err));
                                 }
                                 catch (e) {
-                                    const error = error_1.default.getErrorInstance(e);
+                                    const error = index_js_1.default.getErrorInstance(e);
                                     error.exit = 2;
                                     reject(error);
                                 }
                                 break;
                         }
-                        reject(new error_1.default('API Error: ' + err.message, {
+                        reject(new index_js_1.default('API Error: ' + err.message, {
                             original: err,
                             exit: 2
                         }));
                     }
                 }))
+                    .on('request', () => {
+                    this.requestOpts.body instanceof stream_1.Readable &&
+                        this.requestOpts.body.isPaused() &&
+                        this.requestOpts.body.resume();
+                })
                     .on('response', (resp) => {
                     isJSONResponse = js_1.JS.includes(resp.headers['content-type'], 'json');
                     isErrorPage = !(resp.statusCode >= 200 && resp.statusCode < 300);

package/lib/internal/command.d.ts

@@ -0,0 +1,40 @@
+import { Command as commanderCommand, HelpConfiguration } from 'commander';
+import { Client } from '../client';
+declare class Command {
+    private readonly command;
+    private readonly cmdName;
+    private aliasName;
+    private cmdArguments;
+    private cmdDescription;
+    private cmdOptions;
+    private cmdAction;
+    private beforeRunners;
+    private optIgnores;
+    private helpText;
+    private allowUnknownOptions;
+    client: Client | null;
+    private subCommand;
+    private isSubCommand;
+    private _helpConfig?;
+    private cmdUsage?;
+    private isCICommand;
+    constructor(cmd: string);
+    private static globalOpts;
+    description(description: string): Command;
+    alias(alias: string): Command;
+    argument(name: string, description: string, defaultValue?: string): Command;
+    allowUnknownOpts(): Command;
+    option(...args: Array<string>): Command;
+    needs(fn: 'auth' | 'config' | 'rc', args?: unknown): Command;
+    help(text: string): Command;
+    addSubCommand(...commands: Array<Command>): Command;
+    ci(value: boolean): Command;
+    helpConfig(config: HelpConfiguration): Command;
+    usage(cmdUsage: string): Command;
+    action(fn: (...args: Array<any>) => Promise<unknown> | void): Command;
+    ignore(opts: Array<string>): Command;
+    register(client: Client, cli?: commanderCommand): commanderCommand;
+    private _prepare;
+    private runner;
+}
+export default Command;

package/lib/internal/command.js

@@ -37,18 +37,19 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const ansi_colors_1 = require("ansi-colors");
 const strip_ansi_1 = __importDefault(require("strip-ansi"));
-const error_1 = __importDefault(require("../error"));
+const index_js_1 = __importDefault(require("../error/index.js"));
 const errorOut_1 = __importDefault(require("../errorOut"));
 const migration_1 = __importDefault(require("../migration"));
 const runtime_store_1 = __importDefault(require("../runtime-store"));
 const track_1 = __importDefault(require("../track"));
 const js_1 = require("../util_modules/js");
-const logger_1 = require("../util_modules/logger");
+const index_1 = require("../util_modules/logger/index");
 const option_1 = require("../util_modules/option");
 const project_1 = require("../util_modules/project");
 const env_1 = require("../util_modules/env");
 class Command {
     constructor(cmd) {
+        this.cmdArguments = [];
         this.subCommand = [];
         this.isSubCommand = false;
         this.isCICommand = true;
@@ -72,6 +73,10 @@ class Command {
         this.aliasName = alias;
         return this;
     }
+    argument(name, description, defaultValue) {
+        this.cmdArguments.push([name, description, defaultValue]);
+        return this;
+    }
     allowUnknownOpts() {
         this.allowUnknownOptions = true;
         return this;
@@ -130,6 +135,9 @@ class Command {
         if (this.aliasName !== null) {
             cmd.alias(this.aliasName);
         }
+        if (this.cmdArguments.length > 0) {
+            this.cmdArguments.forEach((arg) => cmd.argument(...arg));
+        }
         if (this.cmdDescription !== null) {
             cmd.description(this.cmdDescription);
         }
@@ -138,7 +146,7 @@ class Command {
         }
         if (this.helpText !== null) {
             cmd.on('--help', () => {
-                (0, logger_1.info)(this.helpText);
+                (0, index_1.info)(this.helpText);
             });
         }
         if (this._helpConfig) {
@@ -155,7 +163,7 @@ class Command {
             const start = Date.now();
             const argCount = cmd._args.length;
             if (!this.isCICommand && env_1.isCI) {
-                return (0, errorOut_1.default)(new error_1.default('Environment not supported', {
+                return (0, errorOut_1.default)(new index_js_1.default('Environment not supported', {
                     exit: 1,
                     errorId: 'CMD-2',
                     arg: [(0, ansi_colors_1.bold)(cmd.name()), (0, ansi_colors_1.bold)('CI=true catalyst help')]
@@ -163,7 +171,7 @@ class Command {
             }
             if (programArgs.slice(-1)[0].args.length > argCount &&
                 !this.allowUnknownOptions) {
-                return (0, errorOut_1.default)(new error_1.default('Too many arguments', {
+                return (0, errorOut_1.default)(new index_js_1.default('Too many arguments', {
                     exit: 1,
                     errorId: 'CMD-1',
                     arg: [(0, ansi_colors_1.bold)(cmd.name()), (0, ansi_colors_1.bold)('catalyst help ' + cmd.name())]
@@ -181,8 +189,12 @@ class Command {
                 (0, errorOut_1.default)(err);
                 if (!env_1.isCI) {
                     const duration = Date.now() - start;
+                    if (!(err instanceof Error)) {
+                        err = new index_js_1.default('Unexpected error: ', { exit: 2 });
+                    }
                     const errorEvent = err.exit === 1 ? 'Error (User)' : 'Error (Unexpected)';
                     const preppedMessage = (0, strip_ansi_1.default)(err.message || '');
+                    runtime_store_1.default.set('context.error.command', err);
                     yield (0, track_1.default)(errorEvent, preppedMessage, duration);
                 }
             }
@@ -203,7 +215,7 @@ class Command {
                 return;
             }
             if (js_1.JS.indexOf(this.optIgnores, opts) > -1) {
-                (0, logger_1.warning)('Cannot use option ' +
+                (0, index_1.warning)('Cannot use option ' +
                     (0, ansi_colors_1.bold)(opts) +
                     ' along with ' +
                     (0, ansi_colors_1.bold)(this.command) +
@@ -212,8 +224,12 @@ class Command {
             }
             (0, option_1.setGlobalOption)(opts, optsValue);
         });
-        runtime_store_1.default.set('project.root', (0, project_1.getProjectRoot)());
-        runtime_store_1.default.set('cwd', process.cwd());
+        if (!runtime_store_1.default.get('project.root', false)) {
+            runtime_store_1.default.set('project.root', (0, project_1.getProjectRoot)());
+        }
+        if (!runtime_store_1.default.get('cwd', false)) {
+            runtime_store_1.default.set('cwd', process.cwd());
+        }
     }
     runner() {
         return (...args) => __awaiter(this, void 0, void 0, function* () {
@@ -224,13 +240,13 @@ class Command {
             const unknownOpts = this.allowUnknownOptions
                 ? command.parseOptions(process.argv).unknown
                 : undefined;
-            runtime_store_1.default.set('opts', Object.assign({ _name: command.name(), unknownOpts }, opts));
+            runtime_store_1.default.set('context.opts', Object.assign({ _name: command.name(), unknownOpts }, opts));
             this._prepare(this.isSubCommand && command.parent ? command.parent : command);
             try {
-                yield (0, migration_1.default)(runtime_store_1.default.get('context.cli.package.version'));
+                yield (0, migration_1.default)(runtime_store_1.default.get('cli.package.version'));
             }
             catch (e) {
-                (0, logger_1.debug)(e);
+                (0, index_1.debug)(e);
             }
             yield Promise.all(js_1.JS.map(this.beforeRunners, (before) => __awaiter(this, void 0, void 0, function* () {
                 var _a;

package/lib/internal/config.d.ts

@@ -0,0 +1,19 @@
+interface IConfigData {
+    [x: string]: unknown;
+}
+declare class Config {
+    configPath: string;
+    data: IConfigData;
+    private isLoaded;
+    constructor(configPath: string, src?: IConfigData);
+    get<T>(key: string, fallback?: T): T;
+    set(key: string, value: unknown): IConfigData;
+    unset(key: string): boolean;
+    has(key: string): boolean;
+    save(): Promise<void>;
+    syncSave(): void;
+    get loaded(): boolean;
+    set loaded(load: boolean);
+    static load(canIgnore: boolean): Promise<Config>;
+}
+export default Config;