@contentstack/cli 2.0.0-beta.2 → 2.0.0-beta.21

package/lib/hooks/init/context-init.js

@@ -1,10 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const utils_1 = require("../../utils");
+const cli_utilities_1 = require("@contentstack/cli-utilities");
 /**
  * Set the cli context
  */
 function default_1(opts) {
+    // Store command ID for session-based log organization
+    if (opts.id) {
+        cli_utilities_1.configHandler.set('currentCommandId', opts.id);
+    }
     this.config.context = new utils_1.CsdxContext(opts, this.config);
 }
 exports.default = default_1;

package/lib/hooks/init/utils-init.d.ts

@@ -1,4 +1,4 @@
 /**
  * Initialize the utilities
  */
-export default function (_opts: any): void;
+export default function (_opts: any): Promise<void>;

package/lib/hooks/init/utils-init.js

@@ -4,7 +4,8 @@ const cli_utilities_1 = require("@contentstack/cli-utilities");
 /**
  * Initialize the utilities
  */
-function default_1(_opts) {
+async function default_1(_opts) {
+    await (0, cli_utilities_1.loadChalk)();
     const { context } = this.config;
     cli_utilities_1.messageHandler.init(context);
     cli_utilities_1.cliux.init(context);

package/lib/hooks/prerun/auth-guard.js

@@ -1,10 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const cli_utilities_1 = require("@contentstack/cli-utilities");
-const cli_utilities_2 = require("@contentstack/cli-utilities");
 // TBD: run region command if region is not there
 async function default_1(opts) {
-    const newLogger = new cli_utilities_2.LoggerService(process.cwd(), 'cli-log');
     const { context: { plugin: { config: { protectedCommands = {} } = {} } = {}, region = null } = {} } = this.config;
     if (opts.Command.id !== 'config:set:region') {
         if (!region) {
@@ -12,28 +10,28 @@ async function default_1(opts) {
             this.exit();
             return;
         }
-        cli_utilities_1.cliux.print(`\n Currently using ${region.name} region \n`, { color: 'grey' });
+        cli_utilities_1.cliux.print(`Currently using region: ${region.name}`, { color: 'grey' });
     }
     // Auth guard
     if (protectedCommands[opts.Command.id]) {
         if (!(0, cli_utilities_1.isAuthenticated)()) {
-            newLogger.error('No auth token found for command', opts.Command.id);
-            cli_utilities_1.cliux.error('Please login to execute the command');
+            (0, cli_utilities_1.handleAndLogError)(new Error('Authentication required for this command'), { module: 'auth-guard', commandId: opts.Command.id });
+            cli_utilities_1.cliux.error('Please log in to execute the command');
             this.exit();
         }
         const client = await (0, cli_utilities_1.managementSDKClient)({ host: region.cma });
         try {
             const result = await client.getUser();
             if (!result) {
-                newLogger.error('error in auth validation');
-                cli_utilities_1.cliux.error('Please login to execute the command');
+                (0, cli_utilities_1.handleAndLogError)(new Error('Error in auth validation'), { module: 'auth-guard' });
+                cli_utilities_1.cliux.error('Please log in to execute the command');
                 this.exit();
             }
-            newLogger.debug('logged in user', result.data);
+            cli_utilities_1.log.debug('Logged-in user', { module: 'auth-guard', userData: result.data });
         }
         catch (error) {
-            newLogger.error('error in auth validation', error);
-            cli_utilities_1.cliux.error('Please login to execute the command');
+            (0, cli_utilities_1.handleAndLogError)(error, { module: 'auth-guard' }, 'Error in auth validation');
+            cli_utilities_1.cliux.error('Please log in to execute the command');
             process.exit();
         }
     }

package/lib/hooks/prerun/init-context-for-command.d.ts

@@ -0,0 +1,11 @@
+/**
+ * When an invalid command is corrected (e.g. loginasda → login), init ran with the invalid
+ * command so context.messageFilePath was never set. Re-build context and re-init utilities
+ * for the actual command so i18n prompts show human-readable text.
+ */
+export default function (opts: {
+    Command?: {
+        id?: string;
+    };
+    config?: any;
+}): Promise<void>;

package/lib/hooks/prerun/init-context-for-command.js

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const cli_utilities_1 = require("@contentstack/cli-utilities");
+const utils_1 = require("../../utils");
+/**
+ * When an invalid command is corrected (e.g. loginasda → login), init ran with the invalid
+ * command so context.messageFilePath was never set. Re-build context and re-init utilities
+ * for the actual command so i18n prompts show human-readable text.
+ */
+async function default_1(opts) {
+    var _a, _b, _c;
+    const config = (_a = opts === null || opts === void 0 ? void 0 : opts.config) !== null && _a !== void 0 ? _a : this.config;
+    const commandId = (_b = opts === null || opts === void 0 ? void 0 : opts.Command) === null || _b === void 0 ? void 0 : _b.id;
+    if (!((_c = config === null || config === void 0 ? void 0 : config.context) === null || _c === void 0 ? void 0 : _c.messageFilePath) && commandId) {
+        config.context = new utils_1.CsdxContext({ id: commandId }, config);
+        cli_utilities_1.messageHandler.init(config.context);
+        cli_utilities_1.cliux.init(config.context);
+        cli_utilities_1.managementSDKInitiator.init(config.context);
+        cli_utilities_1.marketplaceSDKInitiator.init(config.context);
+    }
+}
+exports.default = default_1;

package/lib/hooks/prerun/latest-version-warning.js

@@ -4,14 +4,17 @@ const tslib_1 = require("tslib");
 const cli_utilities_1 = require("@contentstack/cli-utilities");
 const semver = tslib_1.__importStar(require("semver"));
 const versionUpgradeWarningFrequency = {
-    versionSyncDuration: 3 * 24 * 60 * 60 * 1000,
+    versionSyncDuration: 3 * 24 * 60 * 60 * 1000, // 3 days
 };
 async function default_1(_opts) {
     var _a, _b;
     const now = Date.now();
     const today = new Date().toISOString().split('T')[0];
-    const logger = new cli_utilities_1.LoggerService(process.env.CS_CLI_LOG_PATH || process.cwd(), 'cli-log');
     let cache = { lastChecked: 0, lastWarnedDate: '', latestVersion: '' };
+    // if CLI_VERSION is not set or is not the same as the current version, set it
+    if (!cli_utilities_1.configHandler.get('CLI_VERSION') || cli_utilities_1.configHandler.get('CLI_VERSION') !== this.config.version) {
+        cli_utilities_1.configHandler.set('CLI_VERSION', this.config.version); // set current version in configHandler
+    }
     if (!cli_utilities_1.configHandler.get('versionUpgradeWarningFrequency')) {
         cli_utilities_1.configHandler.set('versionUpgradeWarningFrequency', versionUpgradeWarningFrequency);
     }
@@ -26,7 +29,7 @@ async function default_1(_opts) {
         try {
             const latestVersion = (_b = (_a = (await httpClient.get(`https://registry.npmjs.org/@contentstack/cli/latest`))) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.version;
             if (!latestVersion) {
-                logger.error('Failed to retrieve the latest version from the registry.');
+                (0, cli_utilities_1.handleAndLogError)(new Error('Failed to retrieve the latest version from the registry.'), { module: 'latest-version-warning' });
                 return;
             }
             cache.latestVersion = latestVersion;
@@ -35,7 +38,7 @@ async function default_1(_opts) {
             cli_utilities_1.configHandler.set('versionUpgradeWarningCache', cache);
         }
         catch (error) {
-            logger.error('Failed to check the latest version', error);
+            (0, cli_utilities_1.handleAndLogError)(error, { module: 'latest-version-warning' }, 'Failed to check the latest version');
             return;
         }
     }

package/lib/interfaces/index.d.ts

@@ -7,7 +7,7 @@ export interface InquirePayload {
     name: string;
     message: string;
     choices?: Array<any>;
-    transformer?: Function;
+    transformer?: (value: any) => any;
 }
 export interface Region {
     name: string;

package/oclif.manifest.json

@@ -1,4 +1,4 @@
 {
   "commands": {},
-  "version": "2.0.0-beta.2"
+  "version": "2.0.0-beta.21"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@contentstack/cli",
   "description": "Command-line tool (CLI) to interact with Contentstack",
-  "version": "2.0.0-beta.2",
+  "version": "2.0.0-beta.21",
   "author": "Contentstack",
   "bin": {
     "csdx": "./bin/run.js"
@@ -9,77 +9,79 @@
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "scripts": {
-    "build": "npm run clean && npm run compile",
-    "clean": "rm -rf ./lib ./node_modules tsconfig.build.tsbuildinfo",
+    "build": "pnpm compile && oclif manifest && oclif readme",
+    "clean": "rm -rf ./lib ./node_modules tsconfig.tsbuildinfo",
     "compile": "tsc -b tsconfig.json",
     "postpack": "rm -f oclif.manifest.json",
     "version": "oclif readme  && git add README.md",
-    "test:report": "tsc -p test && nyc --reporter=lcov --extension .ts mocha --forbid-only \"test/**/*.test.ts\"",
-    "pretest": "tsc -p test",
-    "test": "nyc --extension .ts mocha --forbid-only \"test/**/*.test.ts\"",
-    "posttest": "npm run lint",
+    "test": "mocha \"test/unit/**/*.test.ts\"",
     "lint": "eslint src/**/*.ts",
     "prepack": "pnpm compile && oclif manifest && oclif readme"
   },
   "dependencies": {
-    "@contentstack/cli-audit": "~1.16.0",
-    "@contentstack/cli-auth": "~1.6.2",
-    "@contentstack/cli-cm-bootstrap": "~2.0.0-beta.2",
-    "@contentstack/cli-cm-branches": "~1.6.1",
-    "@contentstack/cli-cm-bulk-publish": "~1.10.1",
-    "@contentstack/cli-cm-clone": "~2.0.0-beta.2",
-    "@contentstack/cli-cm-export": "~2.0.0-beta.2",
-    "@contentstack/cli-cm-export-to-csv": "~1.10.0",
-    "@contentstack/cli-cm-import": "~2.0.0-beta.2",
-    "@contentstack/cli-cm-import-setup": "1.7.0",
-    "@contentstack/cli-cm-migrate-rte": "~1.6.2",
-    "@contentstack/cli-cm-seed": "~2.0.0-beta.2",
-    "@contentstack/cli-command": "~1.6.2",
-    "@contentstack/cli-config": "~1.15.3",
-    "@contentstack/cli-launch": "^1.9.2",
-    "@contentstack/cli-migration": "~1.8.2",
-    "@contentstack/cli-utilities": "~1.15.0",
-    "@contentstack/cli-variants": "~2.0.0-beta.2",
-    "@contentstack/management": "~1.22.0",
-    "@oclif/core": "^4.3.0",
-    "@oclif/plugin-help": "^6.2.28",
-    "@oclif/plugin-not-found": "^3.2.53",
-    "@oclif/plugin-plugins": "^5.4.38",
-    "chalk": "^4.1.2",
+    "@contentstack/cli-audit": "~2.0.0-beta.11",
+    "@contentstack/cli-cm-export": "~2.0.0-beta.16",
+    "@contentstack/cli-cm-import": "~2.0.0-beta.16",
+    "@contentstack/cli-auth": "~2.0.0-beta.11",
+    "@contentstack/cli-bulk-operations": "^1.0.1",
+    "@contentstack/cli-cm-bootstrap": "~2.0.0-beta.16",
+    "@contentstack/cli-cm-branches": "~2.0.0-beta.6",
+    "@contentstack/cli-cm-clone": "~2.0.0-beta.17",
+    "@contentstack/cli-cm-export-to-csv": "~2.0.0-beta.6",
+    "@contentstack/cli-cm-import-setup": "~2.0.0-beta.10",
+    "@contentstack/cli-cm-seed": "~2.0.0-beta.16",
+    "@contentstack/cli-command": "~2.0.0-beta.6",
+    "@contentstack/cli-config": "~2.0.0-beta.8",
+    "@contentstack/cli-launch": "^1.9.7",
+    "@contentstack/cli-migration": "~2.0.0-beta.11",
+    "@contentstack/cli-utilities": "~2.0.0-beta.7",
+    "@contentstack/cli-variants": "~2.0.0-beta.12",
+    "@contentstack/management": "~1.30.1",
+    "@contentstack/utils": "~1.9.1",
+    "@oclif/core": "^4.10.5",
+    "@oclif/plugin-help": "^6.2.44",
+    "@oclif/plugin-not-found": "^3.2.80",
+    "@oclif/plugin-plugins": "^5.4.61",
+    "chalk": "^5.6.2",
     "cli-progress": "^3.12.0",
-    "debug": "^4.4.1",
-    "figlet": "1.8.1",
-    "inquirer": "8.2.7",
+    "debug": "^4.4.3",
+    "figlet": "1.11.0",
+    "inquirer": "^12.11.1",
     "node-machine-id": "^1.1.12",
     "open": "^8.4.2",
     "ora": "^8.2.0",
-    "semver": "^7.7.2",
+    "semver": "^7.7.4",
     "short-uuid": "^4.2.2",
     "uuid": "^9.0.1",
-    "winston": "^3.17.0"
+    "winston": "^3.19.0"
+  },
+  "overrides": {
+    "@oclif/core": {
+      "picomatch": "^4.0.4"
+    }
   },
   "devDependencies": {
-    "@oclif/test": "^4.1.13",
+    "@oclif/test": "^4.1.18",
     "@types/chai": "^4.3.20",
-    "@types/inquirer": "^9.0.8",
+    "@types/inquirer": "^9.0.9",
     "@types/mkdirp": "^1.0.2",
     "@types/mocha": "^8.2.3",
-    "@types/node": "^14.18.63",
-    "@types/semver": "^7.7.0",
+    "@types/node": "^18.19.130",
+    "@types/semver": "^7.7.1",
     "@types/sinon": "^10.0.20",
     "chai": "^4.5.0",
     "eslint": "^8.57.1",
-    "eslint-config-oclif": "^6.0.62",
+    "eslint-config-oclif": "^6.0.157",
     "eslint-config-oclif-typescript": "^3.1.14",
     "globby": "^10.0.2",
     "mocha": "10.8.2",
     "nock": "^13.5.6",
     "nyc": "^15.1.0",
-    "oclif": "^4.17.46",
+    "oclif": "^4.23.0",
     "rimraf": "^5.0.10",
     "shelljs": "^0.10.0",
-    "sinon": "^19.0.5",
-    "tmp": "^0.2.3",
+    "sinon": "^21.1.2",
+    "tmp": "^0.2.5",
     "ts-node": "^10.9.2",
     "tslib": "^2.8.1",
     "typescript": "^4.9.5"
@@ -148,17 +150,16 @@
       "@contentstack/cli-cm-bootstrap",
       "@contentstack/cli-cm-export-to-csv",
       "@contentstack/cli-cm-clone",
-      "@contentstack/cli-cm-migrate-rte",
       "@contentstack/cli-migration",
-      "@contentstack/cli-cm-bulk-publish",
       "@contentstack/cli-cm-branches",
       "@contentstack/cli-audit",
       "@contentstack/cli-cm-import-setup",
-      "@contentstack/cli-launch"
+      "@contentstack/cli-launch",
+      "@contentstack/cli-bulk-operations"
     ],
     "hooks": {
       "prerun": [
-        "./lib/hooks/prerun/command-deprecation-check",
+        "./lib/hooks/prerun/init-context-for-command",
         "./lib/hooks/prerun/default-rate-limit-check",
         "./lib/hooks/prerun/latest-version-warning"
       ],

package/lib/hooks/prerun/command-deprecation-check.d.ts

@@ -1 +0,0 @@
-export default function (_opts: any): Promise<void>;

package/lib/hooks/prerun/command-deprecation-check.js

@@ -1,10 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const cli_utilities_1 = require("@contentstack/cli-utilities");
-async function default_1(_opts) {
-    const { context: { plugin: { config: { expiredCommands = {} } = {} } = {}, info: { command = null } = {} } = {} } = this.config;
-    if (expiredCommands.hasOwnProperty(command)) {
-        cli_utilities_1.cliux.print(`WARNING!!! You're using the old (soon to be deprecated) Contentstack CLI command. We recommend you to use the latest ${expiredCommands[command]} command.`, { color: 'yellow' });
-    }
-}
-exports.default = default_1;