@contentstack/cli-cm-import 2.0.0-beta.2 → 2.0.0-beta.4

package/lib/utils/import-path-resolver.js

@@ -63,7 +63,7 @@ exports.selectBranchFromDirectory = selectBranchFromDirectory;
  */
 const resolveImportPath = async (importConfig, stackAPIClient) => {
     cli_utilities_1.log.debug('Resolving import path based on directory structure');
-    const contentDir = importConfig.contentDir || importConfig.data;
+    const contentDir = importConfig.contentDir;
     cli_utilities_1.log.debug(`Content directory: ${contentDir}`);
     if (!(0, file_helper_1.fileExistsSync)(contentDir)) {
         throw new Error(`Content directory does not exist: ${contentDir}`);
@@ -83,11 +83,6 @@ const resolveImportPath = async (importConfig, stackAPIClient) => {
         cli_utilities_1.log.debug(`Branch directory not found: ${branchPath}, using contentDir as-is`);
         return contentDir;
     }
-    const exportInfoPath = path.join(contentDir, 'export-info.json');
-    if ((0, file_helper_1.fileExistsSync)(exportInfoPath)) {
-        cli_utilities_1.log.debug('Found export-info.json - using contentDir as-is (v2 export)');
-        return contentDir;
-    }
     const moduleTypes = config_1.default.modules.types;
     const hasModuleFolders = moduleTypes.some((moduleType) => (0, file_helper_1.fileExistsSync)(path.join(contentDir, moduleType)));
     if (hasModuleFolders) {
@@ -115,8 +110,7 @@ const updateImportConfigWithResolvedPath = async (importConfig, resolvedPath) =>
     }
     importConfig.branchDir = resolvedPath;
     importConfig.contentDir = resolvedPath;
-    importConfig.data = resolvedPath;
-    cli_utilities_1.log.debug(`Import config updated - contentDir: ${importConfig.contentDir}, branchDir: ${importConfig.branchDir}, data: ${importConfig.data},`);
+    cli_utilities_1.log.debug(`Import config updated - contentDir: ${importConfig.contentDir}, branchDir: ${importConfig.branchDir}`);
 };
 exports.updateImportConfigWithResolvedPath = updateImportConfigWithResolvedPath;
 /**

package/lib/utils/logger.d.ts

@@ -1,6 +1,6 @@
 /*!
  * Contentstack Export
- * Copyright (c) 2024 Contentstack LLC
+ * Copyright (c) 2026 Contentstack LLC
  * MIT Licensed
  */
 import { ImportConfig } from '../types';

package/lib/utils/logger.js

@@ -1,7 +1,7 @@
 "use strict";
 /*!
  * Contentstack Export
- * Copyright (c) 2024 Contentstack LLC
+ * Copyright (c) 2026 Contentstack LLC
  * MIT Licensed
  */
 Object.defineProperty(exports, "__esModule", { value: true });
@@ -125,7 +125,7 @@ function init(_logPath) {
     };
 }
 const log = async (config, message, type) => {
-    config.cliLogsPath = (0, cli_utilities_1.sanitizePath)(config.cliLogsPath || config.data || path.join(__dirname, 'logs'));
+    config.cliLogsPath = (0, cli_utilities_1.sanitizePath)(config.cliLogsPath || config.contentDir || path.join(__dirname, 'logs'));
     // ignoring the type argument, as we are not using it to create a logfile anymore
     if (type !== 'error') {
         // removed type argument from init method

package/lib/utils/login-handler.d.ts

@@ -1,6 +1,6 @@
 /*!
  * Contentstack Import
- * Copyright (c) 2024 Contentstack LLC
+ * Copyright (c) 2026 Contentstack LLC
  * MIT Licensed
  */
 import { ImportConfig } from '../types';

package/lib/utils/login-handler.js

@@ -4,7 +4,7 @@
 /* eslint-disable no-empty */
 /*!
  * Contentstack Import
- * Copyright (c) 2024 Contentstack LLC
+ * Copyright (c) 2026 Contentstack LLC
  * MIT Licensed
  */
 Object.defineProperty(exports, "__esModule", { value: true });
@@ -18,7 +18,7 @@ const login = async (config) => {
         if (authtoken) {
             cli_utilities_1.log.debug('Login successful, setting up headers');
             config.headers = {
-                api_key: config.source_stack,
+                api_key: config.apiKey,
                 access_token: config.access_token,
                 authtoken: config.authtoken,
                 'X-User-Agent': 'contentstack-export/v',
@@ -36,7 +36,7 @@ const login = async (config) => {
     else if ((0, cli_utilities_1.isAuthenticated)()) {
         cli_utilities_1.log.debug('Using existing authentication, validating stack access');
         const stackAPIClient = client.stack({
-            api_key: config.target_stack,
+            api_key: config.apiKey,
             management_token: config.management_token,
         });
         const stack = await stackAPIClient.fetch().catch((error) => {
@@ -44,7 +44,7 @@ const login = async (config) => {
             let errorstack_key = (_a = error === null || error === void 0 ? void 0 : error.errors) === null || _a === void 0 ? void 0 : _a.api_key;
             if (errorstack_key) {
                 const keyError = errorstack_key[0];
-                cli_utilities_1.log.error(`Invalid stack API token: ${keyError} Please enter valid stack API token.`);
+                cli_utilities_1.log.error(`Invalid stack API token: ${keyError}. Please enter a valid stack API token.`);
                 throw error;
             }
             cli_utilities_1.log.error(`Stack fetch error: ${error === null || error === void 0 ? void 0 : error.errorMessage}`);

package/lib/utils/marketplace-app-helper.js

@@ -18,9 +18,10 @@ const getAllStackSpecificApps = async (config, skip = 0, listOfApps = []) => {
     const collection = await appSdk
         .marketplace(config.org_uid)
         .installation()
-        .fetchAll({ target_uids: config.target_stack, skip })
+        .fetchAll({ target_uids: config.apiKey, skip })
         .catch((error) => {
         (0, cli_utilities_1.handleAndLogError)(error);
+        cli_utilities_1.log.error(error, config === null || config === void 0 ? void 0 : config.context);
     });
     if (collection) {
         const { items: apps, count } = collection;
@@ -53,10 +54,11 @@ const getOrgUid = async (config) => {
     cli_utilities_1.log.debug('Fetching organization UID');
     const tempAPIClient = await (0, cli_utilities_1.managementSDKClient)({ host: config.host });
     const tempStackData = await tempAPIClient
-        .stack({ api_key: config.target_stack })
+        .stack({ api_key: config.apiKey })
         .fetch()
         .catch((error) => {
-        throw error;
+        (0, cli_utilities_1.handleAndLogError)(error);
+        cli_utilities_1.log.error(error, config === null || config === void 0 ? void 0 : config.context);
     });
     const orgUid = (tempStackData === null || tempStackData === void 0 ? void 0 : tempStackData.org_uid) || '';
     cli_utilities_1.log.debug(`Organization UID: ${orgUid}`);
@@ -78,7 +80,7 @@ const getConfirmationToCreateApps = async (privateApps, config) => {
                     return Promise.resolve(true);
                 }
                 else {
-                    cli_utilities_1.log.warn('User declined to create private apps (second prompt)');
+                    cli_utilities_1.log.debug('User declined to create private apps (second prompt).');
                     return Promise.resolve(false);
                 }
             }
@@ -89,7 +91,7 @@ const getConfirmationToCreateApps = async (privateApps, config) => {
         }
     }
     else {
-        cli_utilities_1.log.info('Force prompt disabled, automatically creating private apps');
+        cli_utilities_1.log.debug('Force prompt disabled, automatically creating private apps');
         return Promise.resolve(true);
     }
 };
@@ -111,7 +113,7 @@ const makeRedirectUrlCall = async (response, appName, config) => {
             .get(response.redirect_url)
             .then(async ({ response }) => {
             if ((0, includes_1.default)([501, 403], response.status)) {
-                cli_utilities_1.log.error(`OAuth API call failed for ${appName}: ${response.statusText}`);
+                cli_utilities_1.log.error(`OAuth API call failed for ${appName}: ${response.statusText}`, config === null || config === void 0 ? void 0 : config.context);
                 await (0, exports.confirmToCloseProcess)(response.data, config);
             }
             else {
@@ -119,6 +121,7 @@ const makeRedirectUrlCall = async (response, appName, config) => {
             }
         })
             .catch((error) => {
+            cli_utilities_1.log.error(error, config === null || config === void 0 ? void 0 : config.context);
             if ((0, includes_1.default)([501, 403], error.status)) {
                 (0, cli_utilities_1.handleAndLogError)(error);
             }

package/lib/utils/taxonomies-helper.js

@@ -14,7 +14,7 @@ const cli_utilities_1 = require("@contentstack/cli-utilities");
  * @param {ImportConfig} importConfig
  */
 const lookUpTaxonomy = function (importConfig, schema, taxonomies) {
-    cli_utilities_1.log.debug(`Starting taxonomy lookup for schema with ${Object.keys(schema).length} fields`);
+    cli_utilities_1.log.debug(`Starting taxonomy lookup for schema with ${Object.keys(schema).length} fields.`);
     for (let i in schema) {
         if (schema[i].data_type === 'taxonomy') {
             cli_utilities_1.log.debug(`Processing taxonomy field: ${schema[i].uid}`);

package/messages/index.json

@@ -1 +1,10 @@
-{}
+{
+  "COMPOSABLE_STUDIO_IMPORT_START": "Starting Studio project import...",
+  "COMPOSABLE_STUDIO_NOT_FOUND": "No Studio project found in exported data",
+  "COMPOSABLE_STUDIO_SKIP_EXISTING": "Skipping Studio import - target stack already has a connected project",
+  "COMPOSABLE_STUDIO_IMPORT_COMPLETE": "Successfully imported Studio project '%s'",
+  "COMPOSABLE_STUDIO_IMPORT_FAILED": "Failed to import Studio project: %s",
+  "COMPOSABLE_STUDIO_NAME_CONFLICT": "Project name '%s' already exists. Please provide a new name:",
+  "COMPOSABLE_STUDIO_SUGGEST_NAME": "Suggested name: %s",
+  "COMPOSABLE_STUDIO_ENV_MAPPING_FAILED": "Warning: Could not map environment '%s', using empty environment"
+}

package/oclif.manifest.json

@@ -1,9 +1,7 @@
 {
   "commands": {
     "cm:stacks:import": {
-      "aliases": [
-        "cm:import"
-      ],
+      "aliases": [],
       "args": {},
       "description": "Import content from a stack",
       "examples": [
@@ -25,15 +23,6 @@
           "multiple": false,
           "type": "option"
         },
-        "stack-uid": {
-          "char": "s",
-          "description": "API key of the target stack.",
-          "hidden": true,
-          "name": "stack-uid",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
         "stack-api-key": {
           "char": "k",
           "description": "API Key of the target stack",
@@ -42,14 +31,6 @@
           "multiple": false,
           "type": "option"
         },
-        "data": {
-          "description": "path and location where data is stored",
-          "hidden": true,
-          "name": "data",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
         "data-dir": {
           "char": "d",
           "description": "The path or the location in your file system where the content, you intend to import, is stored. For example, -d \"C:\\Users\\Name\\Desktop\\cli\\content\". If the export folder has branches involved, then the path should point till the particular branch. For example, “-d \"C:\\Users\\Name\\Desktop\\cli\\content\\branch_name\"",
@@ -66,25 +47,8 @@
           "multiple": false,
           "type": "option"
         },
-        "management-token-alias": {
-          "description": "alias of the management token",
-          "hidden": true,
-          "name": "management-token-alias",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "auth-token": {
-          "char": "A",
-          "description": "to use auth token",
-          "hidden": true,
-          "name": "auth-token",
-          "allowNo": false,
-          "type": "boolean"
-        },
         "module": {
-          "char": "m",
-          "description": "[optional] Specify the module to import into the target stack. If not specified, the import command will import all the modules into the stack. The available modules are assets, content-types, entries, environments, extensions, marketplace-apps, global-fields, labels, locales, webhooks, workflows, custom-roles, personalize projects, and taxonomies.",
+          "description": "[optional] Specify the module to import into the target stack. If not specified, the import command will import all the modules into the stack. The available modules are assets, content-types, entries, environments, extensions, marketplace-apps, global-fields, labels, locales, webhooks, workflows, custom-roles, personalize projects, taxonomies, and composable-studio.",
           "name": "module",
           "required": false,
           "hasDynamicHelp": false,
@@ -92,7 +56,6 @@
           "type": "option"
         },
         "backup-dir": {
-          "char": "b",
           "description": "[optional] Backup directory name when using specific module.",
           "name": "backup-dir",
           "hasDynamicHelp": false,
@@ -100,7 +63,6 @@
           "type": "option"
         },
         "branch": {
-          "char": "B",
           "description": "The name of the branch where you want to import your content. If you don't mention the branch name, then by default the content will be imported to the main branch.",
           "exclusive": [
             "branch-alias"
@@ -141,12 +103,6 @@
           "allowNo": false,
           "type": "boolean"
         },
-        "skip-app-recreation": {
-          "description": "(optional) Skips the recreation of private apps if they already exist.",
-          "name": "skip-app-recreation",
-          "allowNo": false,
-          "type": "boolean"
-        },
         "replace-existing": {
           "description": "Replaces the existing module in the target stack.",
           "name": "replace-existing",
@@ -201,7 +157,7 @@
       "pluginName": "@contentstack/cli-cm-import",
       "pluginType": "core",
       "strict": true,
-      "usage": "cm:stacks:import [-c <value>] [-k <value>] [-d <value>] [-a <value>] [--module <value>] [--backup-dir <value>] [--branch <value>] [--import-webhook-status disable|current]",
+      "usage": "cm:stacks:import [--config <value>] [--stack-api-key <value>] [--data-dir <value>] [--alias <value>] [--module <value>] [--backup-dir <value>] [--branch <value>] [--import-webhook-status disable|current]",
       "isESM": false,
       "relativePath": [
         "lib",
@@ -212,5 +168,5 @@
       ]
     }
   },
-  "version": "2.0.0-beta.2"
+  "version": "2.0.0-beta.4"
 }

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@contentstack/cli-cm-import",
   "description": "Contentstack CLI plugin to import content into stack",
-  "version": "2.0.0-beta.2",
+  "version": "2.0.0-beta.4",
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {
-    "@contentstack/cli-audit": "~1.16.0",
-    "@contentstack/cli-command": "~1.6.1",
-    "@contentstack/cli-utilities": "~1.15.0",
-    "@contentstack/management": "~1.22.0",
-    "@contentstack/cli-variants": "~2.0.0-beta.2",
+    "@contentstack/cli-audit": "~2.0.0-beta.1",
+    "@contentstack/cli-command": "~1.7.0",
+    "@contentstack/cli-utilities": "~1.17.0",
+    "@contentstack/management": "~1.27.3",
+    "@contentstack/cli-variants": "~2.0.0-beta.4",
     "@oclif/core": "^4.3.0",
     "big-json": "^3.2.0",
     "bluebird": "^3.7.2",
@@ -60,7 +60,7 @@
     "format": "eslint src/**/*.ts --fix",
     "test:integration": "mocha --forbid-only \"test/run.test.js\" --integration-test --timeout 60000",
     "test:unit:report": "nyc --extension .ts mocha --forbid-only \"test/unit/**/*.test.ts\"",
-    "test:unit": "mocha --forbid-only \"test/**/*.test.ts\""
+    "test:unit": "mocha --forbid-only \"test/**/*.test.ts\" --exit"
   },
   "engines": {
     "node": ">=14.0.0"
@@ -86,13 +86,9 @@
     "repositoryPrefix": "<%- repo %>/blob/main/packages/contentstack-import/<%- commandPath %>"
   },
   "csdxConfig": {
-    "expiredCommands": {
-      "cm:import": "csdx cm:stacks:import"
-    },
     "shortCommandName": {
-      "cm:stacks:import": "IMPRT",
-      "cm:import": "O-IMPRT"
+      "cm:stacks:import": "IMPRT"
     }
   },
   "repository": "https://github.com/contentstack/cli"
-}
+}