zcatalyst-cli 1.21.0 → 1.22.0

package/lib/commands/codelib/install.js

@@ -18,20 +18,20 @@ const iac_1 = __importDefault(require("../../endpoints/lib/iac"));
 const command_1 = __importDefault(require("../../internal/command"));
 const prompt_1 = __importDefault(require("../../prompt"));
 const runtime_store_1 = __importDefault(require("../../runtime-store"));
-const constants_1 = require("../../util_modules/constants");
 const env_1 = require("../../util_modules/env");
 const fs_1 = require("../../util_modules/fs");
-const logger_1 = require("../../util_modules/logger");
+const index_1 = require("../../util_modules/logger/index");
 const project_1 = require("../../util_modules/project");
 const functions_1 = __importDefault(require("../../pull/features/functions"));
 const features_1 = require("../../init/features");
 const error_1 = __importDefault(require("../../error"));
 const code_deck_1 = require("../../code-deck");
 const option_1 = require("../../util_modules/option");
+const scopes_1 = __importDefault(require("../../authentication/constants/scopes"));
 exports.default = new command_1.default('codelib:install [git-url]')
     .description('Install the code library functionalities into your project')
     .option('-c, --continue <install-id>', 'Continue CodeLib install')
-    .needs('auth', [constants_1.SCOPE.project_import_create])
+    .needs('auth', [scopes_1.default.project_import_create])
     .needs('config', { optional: true })
     .needs('rc')
     .action((gitUrl) => __awaiter(void 0, void 0, void 0, function* () {
@@ -54,7 +54,7 @@ exports.default = new command_1.default('codelib:install [git-url]')
     if (gitUrl) {
         const headRes = yield _gitHubAPI.validateUrl(gitUrl);
         if (headRes !== 200) {
-            (0, logger_1.error)('Invalid GitHub URL: ' + ansi_colors_1.italic.red(`"${gitUrl}"`));
+            (0, index_1.error)('Invalid GitHub URL: ' + ansi_colors_1.italic.red(`"${gitUrl}"`));
             const listAns = yield prompt_1.default.ask(prompt_1.default.question('list', 'Do you wish to select from a list of available Code Library installations from GitHub?', { type: 'confirm', defaultAns: true }));
             if (!listAns.list) {
                 return;
@@ -65,8 +65,8 @@ exports.default = new command_1.default('codelib:install [git-url]')
     const code = gitUrl
         ? { github: { url: gitUrl } }
         : yield (0, code_deck_1.getDeckFromGit)();
-    (0, logger_1.info)();
-    !continueOpt && (0, logger_1.info)((0, ansi_colors_1.white)('==> ') + 'Downloading CodeLib');
+    (0, index_1.info)();
+    !continueOpt && (0, index_1.info)((0, ansi_colors_1.white)('==> ') + 'Downloading CodeLib');
     let deckZip = yield _gitHubAPI.download(code.github.url, continueOpt ? null : code.title);
     if (!deckZip) {
         if (!gitUrl) {
@@ -106,19 +106,19 @@ exports.default = new command_1.default('codelib:install [git-url]')
         return compRed;
     }, {});
     if (!continueOpt) {
-        (0, logger_1.info)();
-        (0, logger_1.info)(`The following components will be installed with ${code.title ? (0, ansi_colors_1.bold)(code.title) : 'this'} CodeLib`);
-        (0, logger_1.info)();
-        (0, logger_1.info)(Object.entries(templateComponents)
+        (0, index_1.info)();
+        (0, index_1.info)(`The following components will be installed with ${code.title ? (0, ansi_colors_1.bold)(code.title) : 'this'} CodeLib`);
+        (0, index_1.info)();
+        (0, index_1.info)(Object.entries(templateComponents)
             .map(([name, comp]) => (0, ansi_colors_1.bold)('\t' + name + ':') + '\n' + (0, ansi_colors_1.yellow)('\t\t' + comp))
             .join('\n'));
-        (0, logger_1.info)();
+        (0, index_1.info)();
         const install = yield prompt_1.default.ask(prompt_1.default.question('consent', 'Do you wish to continue? ', {
             type: 'confirm',
             default: true
         }));
         if (!install.consent) {
-            (0, logger_1.message)('Aborted by user');
+            (0, index_1.message)('Aborted by user');
             return;
         }
         const projectId = (0, project_1.getProjectId)();
@@ -129,8 +129,8 @@ exports.default = new command_1.default('codelib:install [git-url]')
     if (!env_1.isPrimaryShell || !_importId) {
         return;
     }
-    (0, logger_1.info)();
-    (0, logger_1.info)((0, ansi_colors_1.white)('==> ') + 'Installing CodeLib');
+    (0, index_1.info)();
+    (0, index_1.info)((0, ansi_colors_1.white)('==> ') + 'Installing CodeLib');
     const importRes = yield (0, code_deck_1.listenDeploy)(_importId, code.github.url);
     if (!importRes) {
         return;
@@ -143,5 +143,5 @@ exports.default = new command_1.default('codelib:install [git-url]')
         const config = runtime_store_1.default.get('config');
         yield config.save();
     }
-    (0, logger_1.success)('CodeLib successfully installed');
+    (0, index_1.success)('CodeLib successfully installed');
 }));

package/lib/commands/config/delete.d.ts

@@ -0,0 +1,3 @@
+import command from '../../internal/command';
+declare const _default: command;
+export default _default;

package/lib/commands/config/delete.js

@@ -14,10 +14,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const command_1 = __importDefault(require("../../internal/command"));
 const userConfig_1 = __importDefault(require("../../userConfig"));
-const logger_1 = require("../../util_modules/logger");
+const index_1 = require("../../util_modules/logger/index");
 exports.default = new command_1.default('config:delete <key>')
     .description('Delete a key from catalyst config')
     .action((key) => __awaiter(void 0, void 0, void 0, function* () {
     const value = userConfig_1.default.delete(key);
-    value ? (0, logger_1.success)('key deleted successfully') : (0, logger_1.error)('key not found');
+    value ? (0, index_1.success)('key deleted successfully') : (0, index_1.error)('key not found');
 }));

package/lib/commands/config/get.d.ts

@@ -0,0 +1,3 @@
+import command from '../../internal/command';
+declare const _default: command;
+export default _default;

package/lib/commands/config/get.js

@@ -14,10 +14,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const command_1 = __importDefault(require("../../internal/command"));
 const userConfig_1 = __importDefault(require("../../userConfig"));
-const logger_1 = require("../../util_modules/logger");
+const index_1 = require("../../util_modules/logger/index");
 exports.default = new command_1.default('config:get <key>')
     .description('Get catalyst config value for the specified key')
     .action((key) => __awaiter(void 0, void 0, void 0, function* () {
     const value = userConfig_1.default.get(key);
-    value ? (0, logger_1.info)(value) : (0, logger_1.error)('key not found');
+    value ? (0, index_1.info)(value) : (0, index_1.error)('key not found');
 }));

package/lib/commands/config/list.d.ts

@@ -0,0 +1,3 @@
+import command from '../../internal/command';
+declare const _default: command;
+export default _default;

package/lib/commands/config/list.js

@@ -14,10 +14,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const command_1 = __importDefault(require("../../internal/command"));
 const userConfig_1 = __importDefault(require("../../userConfig"));
-const logger_1 = require("../../util_modules/logger");
+const index_1 = require("../../util_modules/logger/index");
 exports.default = new command_1.default('config:list')
     .description('List all your catalyst configurations')
     .action(() => __awaiter(void 0, void 0, void 0, function* () {
     const list = userConfig_1.default.list();
-    (0, logger_1.info)(list);
+    (0, index_1.info)(list);
 }));

package/lib/commands/config/set.d.ts

@@ -0,0 +1,3 @@
+import command from '../../internal/command';
+declare const _default: command;
+export default _default;

package/lib/commands/config/set.js

@@ -15,7 +15,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const error_1 = __importDefault(require("../../error"));
 const command_1 = __importDefault(require("../../internal/command"));
 const userConfig_1 = __importDefault(require("../../userConfig"));
-const logger_1 = require("../../util_modules/logger");
+const index_1 = require("../../util_modules/logger/index");
 exports.default = new command_1.default('config:set <key=value>')
     .description('Set catalyst configuration as a key value pair')
     .action((details) => __awaiter(void 0, void 0, void 0, function* () {
@@ -25,5 +25,5 @@ exports.default = new command_1.default('config:set <key=value>')
             `\nplease give the key value pairs splitted by '=' (eg. orgname=zoho) `);
     }
     userConfig_1.default.set(args[0], args[1]);
-    (0, logger_1.success)('config updated successfully');
+    (0, index_1.success)('config updated successfully');
 }));

package/lib/commands/deploy/appsail.d.ts

@@ -0,0 +1,3 @@
+import command from '../../internal/command';
+declare const _default: command;
+export default _default;

package/lib/commands/deploy/appsail.js

@@ -35,28 +35,30 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const scopes_1 = __importDefault(require("../../authentication/constants/scopes"));
 const utils_1 = require("../../deploy/features/appsail/utils");
 const command_1 = __importDefault(require("../../internal/command"));
-const constants_1 = require("../../util_modules/constants");
-const logger_1 = require("../../util_modules/logger");
+const index_1 = require("../../util_modules/logger/index");
 exports.default = new command_1.default('appsail')
-    .description('Deploy your Catalyst AppSail service to Catalyst Development environment')
+    .description('Deploy your Catalyst AppSail to Catalyst Development environment')
     .option('--name <name>', 'Please specify a name for your AppSail')
     .option('--build-path <path>', 'Specify the AppSail build path')
     .option('--stack <stack>', 'Specify the AppSail stack')
     .option('--platform <javase|war>', 'Specify the AppSail platform for java stack')
-    .option('--command <command>', 'Specify the AppSail startup command')
-    .needs('auth', [constants_1.SCOPE.appsail_update])
+    .option('--command <command>', 'Specify the AppSail startup command. For both Catalyst and custom runtimes')
+    .option('--source <image>', 'Source of the docker image to be used (only applicable for custom runtime)')
+    .option('--port <port>', 'Specify the port for the AppSail (only applicable for custom runtime)')
+    .needs('auth', [scopes_1.default.appsail_update])
     .needs('config', { optional: true })
     .needs('rc', { optional: true })
     .action(() => __awaiter(void 0, void 0, void 0, function* () {
-    yield (yield Promise.resolve().then(() => __importStar(require('../../deploy')))).default('appsail');
+    yield (yield Promise.resolve().then(() => __importStar(require('../../deploy')))).default({ feature: 'appsail' });
     const deployTargets = (0, utils_1.urlLogger)();
-    (0, logger_1.info)();
+    (0, index_1.info)();
     if (deployTargets.length === 0) {
-        (0, logger_1.error)('AppSail Deploy failed');
+        (0, index_1.error)('AppSail Deploy failed');
     }
     else {
-        (0, logger_1.success)('Catalyst AppSail Deploy completed successfully');
+        (0, index_1.success)('Catalyst AppSail Deploy completed successfully');
     }
 }));

package/lib/commands/deploy/index.d.ts

@@ -0,0 +1,3 @@
+import command from '../../internal/command';
+declare const _default: command;
+export default _default;

package/lib/commands/deploy/index.js

@@ -39,9 +39,12 @@ const utils_1 = require("../../deploy/features/appsail/utils");
 const slate_1 = require("../../deploy/features/slate");
 const command_1 = __importDefault(require("../../internal/command"));
 const runtime_store_1 = __importDefault(require("../../runtime-store"));
-const constants_1 = require("../../util_modules/constants");
-const logger_1 = require("../../util_modules/logger");
+const scopes_1 = __importDefault(require("../../authentication/constants/scopes"));
+const index_1 = require("../../util_modules/logger/index");
 const appsail_1 = __importDefault(require("./appsail"));
+const error_1 = __importDefault(require("../../error"));
+const ansi_colors_1 = require("ansi-colors");
+const utils_2 = require("../../deploy/features/functions/utils");
 const slate_2 = __importDefault(require("./slate"));
 exports.default = new command_1.default('deploy')
     .description('Deploy the Catalyst project and project resources to the Catalyst development environment from the local directory')
@@ -50,59 +53,74 @@ exports.default = new command_1.default('deploy')
     ' (e.g. "--only functions:<function_name>,appsail:<appsail_name>"). ')
     .option('--except <targets>', 'deploy all targets except specified (e.g. "client")')
     .option('--ignore-scripts', 'ignore the pre and post lifecycle scripts')
-    .needs('auth', [constants_1.SCOPE.functions, constants_1.SCOPE.webapp, constants_1.SCOPE.appsail_update])
+    .needs('auth', [scopes_1.default.functions, scopes_1.default.webapp, scopes_1.default.appsail_update])
     .needs('config')
     .needs('rc', { optional: true })
     .addSubCommand(appsail_1.default, slate_2.default)
     .action(() => __awaiter(void 0, void 0, void 0, function* () {
     const optionFilter = yield Promise.resolve().then(() => __importStar(require('../../option-filter')));
     optionFilter.filterTargets();
-    yield (yield Promise.resolve().then(() => __importStar(require('../../deploy')))).default();
+    const deployRes = yield (yield Promise.resolve().then(() => __importStar(require('../../deploy')))).default();
     const deployTargets = runtime_store_1.default
-        .get('payload.targets', [])
+        .get('context.payload.targets', [])
         .filter((deploytarget) => {
-        if (!runtime_store_1.default.get('payload.' + deploytarget + '.deploy', false)) {
-            (0, logger_1.info)();
-            (0, logger_1.labeled)(deploytarget, 'deploy skipped').ERROR();
+        if (!runtime_store_1.default.get('context.payload.' + deploytarget + '.deploy', false)) {
+            (0, index_1.info)();
+            (0, index_1.labeled)(deploytarget, 'deploy skipped').ERROR();
             return false;
         }
         return true;
     });
-    (0, logger_1.info)();
+    (0, index_1.info)();
     deployTargets.forEach((deploytarget) => {
         switch (deploytarget) {
             case 'client':
-                (0, logger_1.labeled)(deploytarget, 'deploy successful').SUCCESS();
-                (0, logger_1.labeled)(deploytarget, 'URL => ' + runtime_store_1.default.get('payload.client.url')).MESSAGE();
-                (0, logger_1.info)();
+                (0, index_1.info)();
+                (0, index_1.info)((0, ansi_colors_1.bold)(' >>>>>>>>>>>>> Web Client <<<<<<<<<<<<'));
+                (0, index_1.info)();
+                const clientTarget = runtime_store_1.default.get('context.payload.client');
+                (0, index_1.labeled)('DEPLOYMENT SUCCESSFUL', clientTarget.name).SUCCESS();
+                (0, index_1.labeled)('ACCESS URL           ', clientTarget.url).MESSAGE();
+                (0, index_1.info)();
                 break;
             case 'slate':
+                (0, index_1.info)((0, ansi_colors_1.bold)(' >>>>>>>>>>>>>>> Slate <<<<<<<<<<<<<<<'));
                 (0, slate_1.slateLogger)();
+                (0, index_1.info)();
                 break;
             case 'apig':
-                (0, logger_1.labeled)(deploytarget, 'deploy scheduled successfully').SUCCESS();
-                (0, logger_1.info)();
+                (0, index_1.info)();
+                (0, index_1.info)((0, ansi_colors_1.bold)(' >>>>>>>>>>>>> API Gateway <<<<<<<<<<<'));
+                (0, index_1.info)();
+                (0, index_1.labeled)('DEPLOYMENT SUCCESSFUL', 'API Gateway').SUCCESS();
+                (0, index_1.info)();
                 break;
             case 'functions':
-                runtime_store_1.default
-                    .get('payload.' + deploytarget + '.targets', [])
-                    .forEach((target) => {
-                    if (target.url !== undefined) {
-                        (0, logger_1.labeled)(`${deploytarget}(${target.name})`, 'URL => ' + target.url).MESSAGE();
-                    }
-                    (0, logger_1.labeled)(`${deploytarget}(${target.name})`, 'deploy successful').SUCCESS();
-                });
-                (0, logger_1.info)();
+                (0, index_1.info)();
+                (0, index_1.info)((0, ansi_colors_1.bold)(' >>>>>>>>>>>>>> Functions <<<<<<<<<<<<'));
+                (0, index_1.info)();
+                (0, utils_2.fnLogger)();
                 break;
             case 'appsail':
+                (0, index_1.info)();
+                (0, index_1.info)((0, ansi_colors_1.bold)(' >>>>>>>>>>>>>>> AppSail <<<<<<<<<<<<<'));
+                (0, index_1.info)();
                 (0, utils_1.urlLogger)();
                 break;
         }
     });
     if (deployTargets.length > 0) {
-        (0, logger_1.success)('Catalyst deploy complete!');
+        (0, index_1.success)('Catalyst deploy complete!');
+        (0, index_1.info)();
     }
     else {
-        (0, logger_1.error)('No components deployed!');
+        (0, index_1.error)('No components deployed!');
+        (0, index_1.info)();
+    }
+    if (deployRes.length > 0) {
+        throw new error_1.default('Error deploy Catalyst components to remote', {
+            original: deployRes,
+            skipHelp: true
+        });
     }
 }));

package/lib/commands/deploy/slate.d.ts

@@ -0,0 +1,3 @@
+import command from '../../internal/command';
+declare const _default: command;
+export default _default;

package/lib/commands/deploy/slate.js

@@ -46,7 +46,7 @@ exports.default = new command_1.default('slate')
     .needs('config', { optional: true })
     .needs('rc', { optional: true })
     .action(() => __awaiter(void 0, void 0, void 0, function* () {
-    yield (yield Promise.resolve().then(() => __importStar(require('../../deploy')))).default('slate');
+    yield (yield Promise.resolve().then(() => __importStar(require('../../deploy')))).default({ feature: 'slate' });
     (0, logger_1.info)();
     const deployTargets = (0, slate_1.slateLogger)();
     if (deployTargets.length === 0) {

package/lib/commands/ds/export.d.ts

@@ -0,0 +1,3 @@
+import command from '../../internal/command';
+declare const _default: command;
+export default _default;

package/lib/commands/ds/export.js

@@ -14,12 +14,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const path_1 = require("path");
 const endpoints_1 = require("../../endpoints");
-const error_1 = __importDefault(require("../../error"));
+const index_js_1 = __importDefault(require("../../error/index.js"));
 const command_1 = __importDefault(require("../../internal/command"));
 const runtime_store_1 = __importDefault(require("../../runtime-store"));
-const constants_1 = require("../../util_modules/constants");
+const scopes_js_1 = __importDefault(require("../../authentication/constants/scopes.js"));
 const env_1 = require("../../util_modules/env");
-const logger_1 = require("../../util_modules/logger");
+const index_1 = require("../../util_modules/logger/index");
 const option_1 = require("../../util_modules/option");
 const shell_1 = require("../../util_modules/shell");
 const fs_1 = require("../../util_modules/fs");
@@ -29,7 +29,7 @@ const getReadConfigFromPath = (pth) => __awaiter(void 0, void 0, void 0, functio
         throws: false
     });
     if (!configJSON || Object.keys(configJSON).length === 0) {
-        (0, logger_1.debug)('No parsable export config given');
+        (0, index_1.debug)('No parsable export config given');
         return {};
     }
     return configJSON;
@@ -40,7 +40,7 @@ exports.default = new command_1.default('ds:export [table]')
     .option('--config <path>', 'Path of the configuration json file to be used for export.')
     .option('--page <page>', 'Number which denotes the range of rows to be fetched (eg. "1")')
     .option('--production', 'flag for pointing to production environment')
-    .needs('auth', [constants_1.SCOPE.projects, constants_1.SCOPE.datastore, constants_1.SCOPE.row])
+    .needs('auth', [scopes_js_1.default.projects, scopes_js_1.default.datastore, scopes_js_1.default.row])
     .needs('config', { optional: true })
     .needs('rc', { optional: true })
     .action((optTable) => __awaiter(void 0, void 0, void 0, function* () {
@@ -50,7 +50,7 @@ exports.default = new command_1.default('ds:export [table]')
     const tableOptId = (0, option_1.getOptionValue)('table', exportConfig.table_identifier + '');
     const tableId = optTable ? optTable : tableOptId;
     if (!tableId) {
-        throw new error_1.default('table identifier missing', { exit: 0, errorId: 'EXP-1' });
+        throw new index_js_1.default('table identifier missing', { exit: 0, errorId: 'EXP-1' });
     }
     const page = (0, option_1.getOptionValue)('page', undefined);
     if (page !== undefined) {
@@ -61,12 +61,12 @@ exports.default = new command_1.default('ds:export [table]')
     }
     const bulkAPI = yield (0, endpoints_1.bulkDSAPI)({ env });
     const readResponse = (yield bulkAPI.read(tableId, exportConfig));
-    (0, logger_1.info)();
-    (0, logger_1.success)(`Successfully scheduled export job for table "${tableId}" with jobid "${readResponse.job_id}"`);
+    (0, index_1.info)();
+    (0, index_1.success)(`Successfully scheduled export job for table "${tableId}" with jobid "${readResponse.job_id}"`);
     if ((0, env_1.isPrimaryShell)()) {
         const exitListeners = process.listeners('exit');
         process.removeAllListeners('exit');
-        const allGlobalOpts = runtime_store_1.default.get('opts.globalOpts', {});
+        const allGlobalOpts = runtime_store_1.default.get('context.opts.globalOpts', {});
         const optsArr = Object.keys(allGlobalOpts).reduce((arr, key) => {
             arr.push('--' + key);
             if (allGlobalOpts[key]) {

package/lib/commands/ds/import.d.ts

@@ -0,0 +1,3 @@
+import command from '../../internal/command';
+declare const _default: command;
+export default _default;

package/lib/commands/ds/import.js

@@ -15,14 +15,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const ansi_colors_1 = require("ansi-colors");
 const path_1 = require("path");
 const endpoints_1 = require("../../endpoints");
-const error_1 = __importDefault(require("../../error"));
+const index_js_1 = __importDefault(require("../../error/index.js"));
 const command_1 = __importDefault(require("../../internal/command"));
 const prompt_1 = __importDefault(require("../../prompt"));
 const runtime_store_1 = __importDefault(require("../../runtime-store"));
-const constants_1 = require("../../util_modules/constants");
+const scopes_js_1 = __importDefault(require("../../authentication/constants/scopes.js"));
 const env_1 = require("../../util_modules/env");
 const fs_1 = require("../../util_modules/fs");
-const logger_1 = require("../../util_modules/logger");
+const index_1 = require("../../util_modules/logger/index");
 const option_1 = require("../../util_modules/option");
 const shell_1 = require("../../util_modules/shell");
 const getWriteConfigFromPath = (pth) => __awaiter(void 0, void 0, void 0, function* () {
@@ -31,7 +31,7 @@ const getWriteConfigFromPath = (pth) => __awaiter(void 0, void 0, void 0, functi
         throws: false
     });
     if (!configJSON || Object.keys(configJSON).length === 0) {
-        (0, logger_1.debug)('No parsable import config given');
+        (0, index_1.debug)('No parsable import config given');
         return {};
     }
     return configJSON;
@@ -41,7 +41,7 @@ exports.default = new command_1.default('ds:import [file]')
     .option('--table <name|id>', 'Name or ID of the table to which data to be written (e.g. "UserDetails")')
     .option('--config <path>', 'Path of the configuration json file to be used for import.')
     .option('--production', 'flag for pointing to production environment')
-    .needs('auth', [constants_1.SCOPE.projects, constants_1.SCOPE.datastore, constants_1.SCOPE.row])
+    .needs('auth', [scopes_js_1.default.projects, scopes_js_1.default.datastore, scopes_js_1.default.row])
     .needs('config', { optional: true })
     .needs('rc', { optional: true })
     .action((uploadFile) => __awaiter(void 0, void 0, void 0, function* () {
@@ -51,11 +51,11 @@ exports.default = new command_1.default('ds:import [file]')
     const importConfig = configPath ? yield getWriteConfigFromPath(configPath) : {};
     const tableId = (0, option_1.getOptionValue)('table', importConfig.table_identifier);
     if (!tableId) {
-        throw new error_1.default('Table identifier missing', { exit: 0, errorId: 'IMP-1' });
+        throw new index_js_1.default('Table identifier missing', { exit: 0, errorId: 'IMP-1' });
     }
     if (!importConfig.file_id && !((_a = importConfig.object_details) === null || _a === void 0 ? void 0 : _a.object_key)) {
         if (!uploadFile) {
-            throw new error_1.default('No CSV file provided', { exit: 0, errorId: 'IMP-2' });
+            throw new index_js_1.default('No CSV file provided', { exit: 0, errorId: 'IMP-2' });
         }
         const bucketAPI = yield (0, endpoints_1.stratusAPI)({ env });
         const allBuckets = (yield bucketAPI.getAllBuckets());
@@ -77,7 +77,7 @@ exports.default = new command_1.default('ds:import [file]')
                 })
                 : bucket.bucket_name;
             if (!bucketName) {
-                throw new error_1.default('Bucket not present', {
+                throw new index_js_1.default('Bucket not present', {
                     exit: 1,
                     errorId: 'IMP-4',
                     arg: [
@@ -94,7 +94,7 @@ exports.default = new command_1.default('ds:import [file]')
                 yield bucketAPI.uploadObject(bucketName, fileName, fs_1.SYNC.getReadStream((0, path_1.resolve)(uploadFile)));
             }
             catch (err) {
-                throw new error_1.default('Error while uploading the object to the stratus. Use --verbose for error details', {
+                throw new index_js_1.default('Error while uploading the object to the stratus. Use --verbose for error details', {
                     exit: 1,
                     original: err
                 });
@@ -106,17 +106,17 @@ exports.default = new command_1.default('ds:import [file]')
             importConfig.object_details = objDetail;
         }
         else {
-            throw new error_1.default('bucket needed', { exit: 0, errorId: 'IMP-3' });
+            throw new index_js_1.default('bucket needed', { exit: 0, errorId: 'IMP-3' });
         }
     }
     const bulkAPI = yield (0, endpoints_1.bulkDSAPI)({ env });
     const writeResponse = (yield bulkAPI.write(tableId + '', importConfig));
-    (0, logger_1.info)();
-    (0, logger_1.success)(`Successfully scheduled import job for table "${tableId}" with jobid "${writeResponse.job_id}"`);
+    (0, index_1.info)();
+    (0, index_1.success)(`Successfully scheduled import job for table "${tableId}" with jobid "${writeResponse.job_id}"`);
     if ((0, env_1.isPrimaryShell)()) {
         const exitListeners = process.listeners('exit');
         process.removeAllListeners('exit');
-        const allGlobalOpts = runtime_store_1.default.get('opts.globalOpts', {});
+        const allGlobalOpts = runtime_store_1.default.get('context.opts.globalOpts', {});
         const optsArr = Object.keys(allGlobalOpts).reduce((arr, key) => {
             arr.push('--' + key);
             if (allGlobalOpts[key]) {

package/lib/commands/ds/status.d.ts

@@ -0,0 +1,23 @@
+import command from '../../internal/command';
+interface IBulkDSStatus {
+    rows_processed?: number;
+    fail_count?: number;
+}
+export interface IBulkDBReport {
+    job_id: string;
+    status: string;
+    results?: {
+        download_url?: string;
+        description: string;
+    };
+}
+export interface ICumulativeReport {
+    [x: string]: {
+        read?: IBulkDSStatus | null;
+        insert?: IBulkDSStatus | null;
+        update?: IBulkDSStatus | null;
+        upsert?: IBulkDSStatus | null;
+    };
+}
+declare const _default: command;
+export default _default;

package/lib/commands/ds/status.js

@@ -16,13 +16,14 @@ const ansi_colors_1 = require("ansi-colors");
 const path_1 = require("path");
 const cli_table_1 = __importDefault(require("../../cli_table"));
 const endpoints_1 = require("../../endpoints");
-const error_1 = __importDefault(require("../../error"));
+const index_js_1 = __importDefault(require("../../error/index.js"));
 const command_1 = __importDefault(require("../../internal/command"));
 const prompt_1 = __importDefault(require("../../prompt"));
+const runtime_store_1 = __importDefault(require("../../runtime-store"));
 const throbber_1 = __importDefault(require("../../throbber"));
-const constants_1 = require("../../util_modules/constants");
+const scopes_js_1 = __importDefault(require("../../authentication/constants/scopes.js"));
 const fs_1 = require("../../util_modules/fs");
-const logger_1 = require("../../util_modules/logger");
+const index_1 = require("../../util_modules/logger/index");
 const option_1 = require("../../util_modules/option");
 const getSpinnerTxt = (mainTable, finalReport) => {
     var _a, _b, _c, _d;
@@ -141,7 +142,7 @@ const spinnerFn = (jobId, dsReport, cumulativeStatus, throbber, spinner, bulkApi
             break;
         default:
             needIteration = false;
-            reject(new error_1.default('unknown state received', { exit: 2 }));
+            reject(new index_js_1.default('unknown state received', { exit: 2 }));
             break;
     }
     if (dsReport.status === 'In-Progress') {
@@ -170,7 +171,7 @@ const spinnerFn = (jobId, dsReport, cumulativeStatus, throbber, spinner, bulkApi
 exports.default = new command_1.default('ds:status <operation> [jobid]')
     .description('Display the job status of a Data Store import or export operation')
     .option('--production', 'flag for pointing to production environment.')
-    .needs('auth', [constants_1.SCOPE.projects, constants_1.SCOPE.datastore, constants_1.SCOPE.row])
+    .needs('auth', [scopes_js_1.default.projects, scopes_js_1.default.datastore, scopes_js_1.default.row])
     .needs('config', { optional: true })
     .needs('rc', { optional: true })
     .action((operation, jobId) => __awaiter(void 0, void 0, void 0, function* () {
@@ -181,7 +182,7 @@ exports.default = new command_1.default('ds:status <operation> [jobid]')
     if (jobId === undefined) {
         const jobsList = (yield bulkApi.getAllJobs(action));
         if (jobsList === undefined || jobsList.length === 0) {
-            throw new error_1.default('No jobs available', {
+            throw new index_js_1.default('No jobs available', {
                 exit: 0,
                 errorId: 'STAT-1',
                 arg: [(0, ansi_colors_1.bold)('ds:import or ds:export')]
@@ -202,8 +203,8 @@ exports.default = new command_1.default('ds:status <operation> [jobid]')
                 value: jobDetails.job_id
             });
         });
-        (0, logger_1.info)('List of ' + displayOpr + ' Jobs :');
-        (0, logger_1.info)(listTable.toString());
+        (0, index_1.info)('List of ' + displayOpr + ' Jobs :');
+        (0, index_1.info)(listTable.toString());
         const jobAns = yield prompt_1.default.ask(prompt_1.default.question('job', `Select an ${operation} job id, to view detailed status : `, {
             type: 'list',
             choices
@@ -211,11 +212,11 @@ exports.default = new command_1.default('ds:status <operation> [jobid]')
         jobId = jobAns.job;
     }
     if (jobId === undefined) {
-        throw new error_1.default('Job ID is empty!', { exit: 2 });
+        throw new index_js_1.default('Job ID is empty!', { exit: 2 });
     }
     const dsReport = (yield bulkApi.getReport(action, jobId).catch((err) => {
         if (err.status === 404) {
-            throw new error_1.default('No jobs found for the given id', {
+            throw new index_js_1.default('No jobs found for the given id', {
                 exit: 1,
                 errorId: 'STAT-2',
                 arg: [(0, ansi_colors_1.bold)(jobId), (0, ansi_colors_1.bold)('catalyst ds:status ' + operation)]
@@ -238,7 +239,7 @@ exports.default = new command_1.default('ds:status <operation> [jobid]')
             const hrTime = process.hrtime();
             const fileName = `${displayOpr}_${jobId}_${hrTime[0] * 1000000000 + hrTime[1]}.zip`;
             const bulkReport = (yield bulkApi.downloadReport(finalDsReport.results.download_url, fileName));
-            return fs_1.ASYNC.writeFile((0, path_1.join)(process.cwd(), fileName), bulkReport);
+            return fs_1.ASYNC.writeFile((0, path_1.join)(runtime_store_1.default.get('cwd'), fileName), bulkReport);
         }
     }
 }));

package/lib/commands/event/generate/index.d.ts

@@ -0,0 +1,3 @@
+import command from '../../../internal/command';
+declare const _default: command;
+export default _default;