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

package/README.md

@@ -47,7 +47,7 @@ $ npm install -g @contentstack/cli-cm-import
 $ csdx COMMAND
 running command...
 $ csdx (--version)
-@contentstack/cli-cm-import/2.0.0-beta.2 linux-x64 node-v22.21.1
+@contentstack/cli-cm-import/2.0.0-beta.3 linux-x64 node-v22.21.1
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND
@@ -71,39 +71,68 @@ USAGE
     [--backup-dir <value>] [--branch <value>] [--import-webhook-status disable|current]
 
 FLAGS
-  -B, --branch=<value>                    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.
-  -a, --alias=<value>                     The management token of the destination stack where you will import the
-                                          content.
-  -b, --backup-dir=<value>                [optional] Backup directory name when using specific module.
-  -c, --config=<value>                    [optional] The path of the configuration JSON file containing all the options
-                                          for a single run.
-  -d, --data-dir=<value>                  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"
-  -k, --stack-api-key=<value>             API Key of the target stack
-  -m, --module=<value>                    [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.
-  -y, --yes                               [optional] Force override all Marketplace prompts.
-      --branch-alias=<value>              Specify the branch alias where you want to import your content. If not
-                                          specified, the content is imported into the main branch by default.
-      --exclude-global-modules            Excludes the branch-independent module from the import operation.
-      --import-webhook-status=<option>    [default: disable] [default: disable] (optional) This webhook state keeps the
-                                          same state of webhooks as the source stack. <options: disable|current>
-                                          <options: disable|current>
-      --personalize-project-name=<value>  (optional) Provide a unique name for the Personalize project.
-      --replace-existing                  Replaces the existing module in the target stack.
-      --skip-app-recreation               (optional) Skips the recreation of private apps if they already exist.
-      --skip-assets-publish               Skips asset publishing during the import process.
-      --skip-audit                        Skips the audit fix that occurs during an import operation.
-      --skip-entries-publish              Skips entry publishing during the import process
-      --skip-existing                     Skips the module exists warning messages.
+  -B, --branch=<value>
+      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.
+
+  -a, --alias=<value>
+      The management token of the destination stack where you will import the content.
+
+  -b, --backup-dir=<value>
+      [optional] Backup directory name when using specific module.
+
+  -c, --config=<value>
+      [optional] The path of the configuration JSON file containing all the options for a single run.
+
+  -d, --data-dir=<value>
+      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"
+
+  -k, --stack-api-key=<value>
+      API Key of the target stack
+
+  -m, --module=<value>
+      [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.
+
+  -y, --yes
+      [optional] Force override all Marketplace prompts.
+
+  --branch-alias=<value>
+      Specify the branch alias where you want to import your content. If not specified, the content is imported into the
+      main branch by default.
+
+  --exclude-global-modules
+      Excludes the branch-independent module from the import operation.
+
+  --import-webhook-status=<option>
+      [default: disable] [default: disable] (optional) This webhook state keeps the same state of webhooks as the source
+      stack. <options: disable|current>
+      <options: disable|current>
+
+  --personalize-project-name=<value>
+      (optional) Provide a unique name for the Personalize project.
+
+  --replace-existing
+      Replaces the existing module in the target stack.
+
+  --skip-app-recreation
+      (optional) Skips the recreation of private apps if they already exist.
+
+  --skip-assets-publish
+      Skips asset publishing during the import process.
+
+  --skip-audit
+      Skips the audit fix that occurs during an import operation.
+
+  --skip-entries-publish
+      Skips entry publishing during the import process
+
+  --skip-existing
+      Skips the module exists warning messages.
 
 DESCRIPTION
   Import content from a stack
@@ -139,39 +168,68 @@ USAGE
     <value>] [--branch <value>] [--import-webhook-status disable|current]
 
 FLAGS
-  -B, --branch=<value>                    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.
-  -a, --alias=<value>                     The management token of the destination stack where you will import the
-                                          content.
-  -b, --backup-dir=<value>                [optional] Backup directory name when using specific module.
-  -c, --config=<value>                    [optional] The path of the configuration JSON file containing all the options
-                                          for a single run.
-  -d, --data-dir=<value>                  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"
-  -k, --stack-api-key=<value>             API Key of the target stack
-  -m, --module=<value>                    [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.
-  -y, --yes                               [optional] Force override all Marketplace prompts.
-      --branch-alias=<value>              Specify the branch alias where you want to import your content. If not
-                                          specified, the content is imported into the main branch by default.
-      --exclude-global-modules            Excludes the branch-independent module from the import operation.
-      --import-webhook-status=<option>    [default: disable] [default: disable] (optional) This webhook state keeps the
-                                          same state of webhooks as the source stack. <options: disable|current>
-                                          <options: disable|current>
-      --personalize-project-name=<value>  (optional) Provide a unique name for the Personalize project.
-      --replace-existing                  Replaces the existing module in the target stack.
-      --skip-app-recreation               (optional) Skips the recreation of private apps if they already exist.
-      --skip-assets-publish               Skips asset publishing during the import process.
-      --skip-audit                        Skips the audit fix that occurs during an import operation.
-      --skip-entries-publish              Skips entry publishing during the import process
-      --skip-existing                     Skips the module exists warning messages.
+  -B, --branch=<value>
+      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.
+
+  -a, --alias=<value>
+      The management token of the destination stack where you will import the content.
+
+  -b, --backup-dir=<value>
+      [optional] Backup directory name when using specific module.
+
+  -c, --config=<value>
+      [optional] The path of the configuration JSON file containing all the options for a single run.
+
+  -d, --data-dir=<value>
+      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"
+
+  -k, --stack-api-key=<value>
+      API Key of the target stack
+
+  -m, --module=<value>
+      [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.
+
+  -y, --yes
+      [optional] Force override all Marketplace prompts.
+
+  --branch-alias=<value>
+      Specify the branch alias where you want to import your content. If not specified, the content is imported into the
+      main branch by default.
+
+  --exclude-global-modules
+      Excludes the branch-independent module from the import operation.
+
+  --import-webhook-status=<option>
+      [default: disable] [default: disable] (optional) This webhook state keeps the same state of webhooks as the source
+      stack. <options: disable|current>
+      <options: disable|current>
+
+  --personalize-project-name=<value>
+      (optional) Provide a unique name for the Personalize project.
+
+  --replace-existing
+      Replaces the existing module in the target stack.
+
+  --skip-app-recreation
+      (optional) Skips the recreation of private apps if they already exist.
+
+  --skip-assets-publish
+      Skips asset publishing during the import process.
+
+  --skip-audit
+      Skips the audit fix that occurs during an import operation.
+
+  --skip-entries-publish
+      Skips entry publishing during the import process
+
+  --skip-existing
+      Skips the module exists warning messages.
 
 DESCRIPTION
   Import content from a stack

package/lib/commands/cm/stacks/import.js

@@ -17,7 +17,7 @@ class ImportCommand extends cli_command_1.Command {
             // Prepare the context object
             const context = this.createImportContext(importConfig.apiKey, importConfig.authenticationMethod);
             importConfig.context = Object.assign({}, context);
-            //log.info(`Using Cli Version: ${this.context?.cliVersion}`, importConfig.context);
+            // log.info(`Using CLI version: ${this.context?.cliVersion}`, importConfig.context);
             // Note setting host to create cma client
             importConfig.host = this.cmaHost;
             importConfig.region = this.region;
@@ -25,6 +25,8 @@ class ImportCommand extends cli_command_1.Command {
                 importConfig.developerHubBaseUrl = this.developerHubUrl;
             if (this.personalizeUrl)
                 importConfig.modules.personalize.baseURL[importConfig.region.name] = this.personalizeUrl;
+            if (this.composableStudioUrl)
+                importConfig.modules['composable-studio'].apiBaseUrl = this.composableStudioUrl;
             const managementAPIClient = await (0, cli_utilities_1.managementSDKClient)(importConfig);
             if (flags.branch) {
                 cli_utilities_1.CLIProgressManager.initializeGlobalSummary(`IMPORT-${flags.branch}`, flags.branch, `Importing content into "${flags.branch}" branch...`);
@@ -92,6 +94,7 @@ class ImportCommand extends cli_command_1.Command {
             command: ((_b = (_a = this.context) === null || _a === void 0 ? void 0 : _a.info) === null || _b === void 0 ? void 0 : _b.command) || 'cm:stacks:import',
             module: '',
             userId: cli_utilities_1.configHandler.get('userUid') || '',
+            email: cli_utilities_1.configHandler.get('email') || '',
             sessionId: (_c = this.context) === null || _c === void 0 ? void 0 : _c.sessionId,
             apiKey: apiKey || '',
             orgId: cli_utilities_1.configHandler.get('oauthOrgUid') || '',
@@ -153,7 +156,7 @@ ImportCommand.flags = {
     module: cli_utilities_1.flags.string({
         required: false,
         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.',
         parse: (0, cli_utilities_1.printFlagDeprecation)(['-m'], ['--module']),
     }),
     'backup-dir': cli_utilities_1.flags.string({
@@ -168,7 +171,7 @@ ImportCommand.flags = {
         exclusive: ['branch-alias'],
     }),
     'branch-alias': cli_utilities_1.flags.string({
-        description: "Specify the branch alias where you want to import your content. If not specified, the content is imported into the main branch by default.",
+        description: 'Specify the branch alias where you want to import your content. If not specified, the content is imported into the main branch by default.',
         exclusive: ['branch'],
     }),
     'import-webhook-status': cli_utilities_1.flags.string({

package/lib/config/index.js

@@ -44,6 +44,7 @@ const config = {
             'variant-entries',
             'labels',
             'webhooks',
+            'composable-studio',
         ],
         locales: {
             dirName: 'locales',
@@ -199,6 +200,12 @@ const config = {
                 locale: 'en-us',
             },
         },
+        'composable-studio': {
+            dirName: 'composable_studio',
+            fileName: 'composable_studio.json',
+            apiBaseUrl: 'https://composable-studio-api.contentstack.com',
+            apiVersion: 'v1',
+        },
     },
     languagesCode: [
         'af-za',

package/lib/import/module-importer.js

@@ -66,8 +66,15 @@ class ModuleImporter {
     }
     async importByModuleByName(moduleName) {
         cli_utilities_1.log.info(`Starting import of ${moduleName} module`, this.importConfig.context);
-        // import the modules by name
-        // calls the module runner which inturn calls the module itself
+        // Check if module should be skipped for legacy contentVersion
+        if (this.importConfig.contentVersion !== 2) {
+            const onlyTSModules = this.importConfig.onlyTSModules || [];
+            if (onlyTSModules.includes(moduleName)) {
+                // Module is in onlyTSModules list, skip import for legacy contentVersion
+                return undefined;
+            }
+        }
+        // Use module import (same for both contentVersion 1 and 2)
         return (0, modules_1.default)({
             stackAPIClient: this.stackAPIClient,
             importConfig: this.importConfig,

package/lib/import/modules/composable-studio.d.ts

@@ -0,0 +1,43 @@
+import { ModuleClassParams, ComposableStudioProject } from '../../types';
+export default class ImportComposableStudio {
+    private importConfig;
+    private composableStudioConfig;
+    private composableStudioPath;
+    private composableStudioFilePath;
+    private apiClient;
+    private envUidMapperPath;
+    private envUidMapper;
+    constructor({ importConfig }: ModuleClassParams);
+    /**
+     * Entry point for Studio import
+     */
+    start(): Promise<void>;
+    /**
+     * Initialize authentication headers for API calls
+     */
+    addAuthHeaders(): Promise<boolean>;
+    /**
+     * Load environment UID mapper from backup directory
+     */
+    loadEnvironmentMapper(): Promise<void>;
+    /**
+     * Read exported project from file system
+     */
+    readExportedProject(): Promise<ComposableStudioProject | null>;
+    /**
+     * Check if target stack already has a connected project
+     */
+    getExistingProject(): Promise<ComposableStudioProject | null>;
+    /**
+     * Import project with name conflict handling
+     */
+    importProject(exportedProject: ComposableStudioProject): Promise<void>;
+    /**
+     * Map environment UID from source to target
+     */
+    mapEnvironmentUid(sourceEnvUid: string): string;
+    /**
+     * Prompt user for a new project name when conflict occurs
+     */
+    promptForNewProjectName(currentName: string): Promise<string>;
+}

package/lib/import/modules/composable-studio.js

@@ -0,0 +1,227 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const node_path_1 = require("node:path");
+const cli_utilities_1 = require("@contentstack/cli-utilities");
+const isEmpty_1 = tslib_1.__importDefault(require("lodash/isEmpty"));
+const utils_1 = require("../../utils");
+class ImportComposableStudio {
+    constructor({ importConfig }) {
+        this.importConfig = importConfig;
+        this.importConfig.context.module = 'composable-studio';
+        this.composableStudioConfig = importConfig.modules['composable-studio'];
+        // Setup paths
+        this.composableStudioPath = (0, node_path_1.join)(this.importConfig.backupDir, this.composableStudioConfig.dirName);
+        this.composableStudioFilePath = (0, node_path_1.join)(this.composableStudioPath, this.composableStudioConfig.fileName);
+        this.envUidMapperPath = (0, node_path_1.join)(this.importConfig.backupDir, 'mapper', 'environments', 'uid-mapping.json');
+        this.envUidMapper = {};
+        // Initialize HttpClient with Studio API base URL
+        this.apiClient = new cli_utilities_1.HttpClient();
+        this.apiClient.baseUrl(`${this.composableStudioConfig.apiBaseUrl}/${this.composableStudioConfig.apiVersion}`);
+    }
+    /**
+     * Entry point for Studio import
+     */
+    async start() {
+        if (this.importConfig.management_token) {
+            cli_utilities_1.log.warn('Skipping Studio project import when using management token', this.importConfig.context);
+            return;
+        }
+        cli_utilities_1.log.debug('Starting Studio project import process...', this.importConfig.context);
+        try {
+            // Initialize authentication
+            const authInitialized = await this.addAuthHeaders();
+            if (!authInitialized) {
+                cli_utilities_1.log.warn('Skipping Studio project import when using OAuth authentication', this.importConfig.context);
+                return;
+            }
+            // Load environment UID mapper
+            await this.loadEnvironmentMapper();
+            // Read exported project data
+            const exportedProject = await this.readExportedProject();
+            if (!exportedProject) {
+                cli_utilities_1.log.warn(cli_utilities_1.messageHandler.parse('COMPOSABLE_STUDIO_NOT_FOUND'), this.importConfig.context);
+                return;
+            }
+            cli_utilities_1.log.debug(`Exported project found: ${exportedProject.name}`, this.importConfig.context);
+            // Check if target stack already has a connected project
+            const existingProject = await this.getExistingProject();
+            if (existingProject) {
+                cli_utilities_1.log.warn(cli_utilities_1.messageHandler.parse('COMPOSABLE_STUDIO_SKIP_EXISTING'), this.importConfig.context);
+                return;
+            }
+            // Import the project with name conflict handling
+            await this.importProject(exportedProject);
+            cli_utilities_1.log.success(cli_utilities_1.messageHandler.parse('COMPOSABLE_STUDIO_IMPORT_COMPLETE', exportedProject.name), this.importConfig.context);
+        }
+        catch (error) {
+            (0, cli_utilities_1.handleAndLogError)(error, Object.assign({}, this.importConfig.context));
+        }
+    }
+    /**
+     * Initialize authentication headers for API calls
+     */
+    async addAuthHeaders() {
+        cli_utilities_1.log.debug('Initializing Studio API authentication...', this.importConfig.context);
+        // Get authentication details - following personalization-api-adapter pattern
+        await cli_utilities_1.authenticationHandler.getAuthDetails();
+        const token = cli_utilities_1.authenticationHandler.accessToken;
+        cli_utilities_1.log.debug(`Authentication type: ${cli_utilities_1.authenticationHandler.isOauthEnabled ? 'OAuth' : 'Token'}`, this.importConfig.context);
+        // Set authentication headers based on auth type
+        if (cli_utilities_1.authenticationHandler.isOauthEnabled) {
+            cli_utilities_1.log.debug('Skipping setting OAuth authorization header when using OAuth authentication', this.importConfig.context);
+            return false;
+        }
+        else {
+            // TODO: Currenlty assuming if auth type is not OAuth, it is Basic Auth and we are setting authtoken header
+            cli_utilities_1.log.debug('Setting authtoken header', this.importConfig.context);
+            this.apiClient.headers({ authtoken: token });
+        }
+        // Set organization_uid header
+        this.apiClient.headers({
+            organization_uid: this.importConfig.org_uid,
+            'Content-Type': 'application/json',
+            Accept: 'application/json',
+        });
+        cli_utilities_1.log.debug('Studio API authentication initialized', this.importConfig.context);
+        return true;
+    }
+    /**
+     * Load environment UID mapper from backup directory
+     */
+    async loadEnvironmentMapper() {
+        cli_utilities_1.log.debug('Loading environment UID mapper...', this.importConfig.context);
+        if (utils_1.fileHelper.fileExistsSync(this.envUidMapperPath)) {
+            this.envUidMapper = utils_1.fileHelper.readFileSync(this.envUidMapperPath);
+            cli_utilities_1.log.debug(`Environment mapper loaded with ${Object.keys(this.envUidMapper).length} mappings`, this.importConfig.context);
+        }
+        else {
+            cli_utilities_1.log.debug('No environment UID mapper found', this.importConfig.context);
+        }
+    }
+    /**
+     * Read exported project from file system
+     */
+    async readExportedProject() {
+        cli_utilities_1.log.debug(`Reading exported project from: ${this.composableStudioFilePath}`, this.importConfig.context);
+        if (!utils_1.fileHelper.fileExistsSync(this.composableStudioFilePath)) {
+            cli_utilities_1.log.debug('Studio project file does not exist', this.importConfig.context);
+            return null;
+        }
+        const projectData = utils_1.fileHelper.readFileSync(this.composableStudioFilePath);
+        if (!projectData || (0, isEmpty_1.default)(projectData)) {
+            cli_utilities_1.log.debug('Studio project file is empty', this.importConfig.context);
+            return null;
+        }
+        return projectData;
+    }
+    /**
+     * Check if target stack already has a connected project
+     */
+    async getExistingProject() {
+        var _a;
+        cli_utilities_1.log.debug('Checking if target stack already has a connected project...', this.importConfig.context);
+        try {
+            const apiUrl = '/projects';
+            cli_utilities_1.log.debug(`Fetching projects from: ${this.composableStudioConfig.apiBaseUrl}${apiUrl}`, this.importConfig.context);
+            const response = await this.apiClient.get(apiUrl);
+            if (response.status < 200 || response.status >= 300) {
+                throw new Error(`API call failed with status ${response.status}: ${JSON.stringify(response.data)}`);
+            }
+            const projects = ((_a = response.data) === null || _a === void 0 ? void 0 : _a.projects) || [];
+            cli_utilities_1.log.debug(`Found ${projects.length} projects in organization`, this.importConfig.context);
+            // Filter projects by connected stack API key
+            const connectedProject = projects.find((project) => project.connectedStackApiKey === this.importConfig.apiKey);
+            if (connectedProject) {
+                cli_utilities_1.log.debug(`Target stack already has connected project: ${connectedProject.name}`, this.importConfig.context);
+                return connectedProject;
+            }
+            cli_utilities_1.log.debug('Target stack does not have a connected project', this.importConfig.context);
+            return null;
+        }
+        catch (error) {
+            cli_utilities_1.log.debug(`Error checking for existing project: ${error.message}`, this.importConfig.context);
+            throw error;
+        }
+    }
+    /**
+     * Import project with name conflict handling
+     */
+    async importProject(exportedProject) {
+        var _a, _b, _c;
+        cli_utilities_1.log.debug('Starting project import...', this.importConfig.context);
+        // Map environment UID
+        const mappedEnvironmentUid = this.mapEnvironmentUid(exportedProject.settings.configuration.environment);
+        // Prepare project data for import
+        const projectData = {
+            name: exportedProject.name,
+            connectedStackApiKey: this.importConfig.apiKey,
+            contentTypeUid: exportedProject.contentTypeUid,
+            description: exportedProject.description || '',
+            canvasUrl: exportedProject.canvasUrl || '/',
+            settings: {
+                configuration: {
+                    environment: mappedEnvironmentUid,
+                    locale: ((_b = (_a = exportedProject === null || exportedProject === void 0 ? void 0 : exportedProject.settings) === null || _a === void 0 ? void 0 : _a.configuration) === null || _b === void 0 ? void 0 : _b.locale) || '',
+                },
+            },
+        };
+        cli_utilities_1.log.debug(`Project data prepared: ${JSON.stringify(projectData, null, 2)}`, this.importConfig.context);
+        // Try to create project with name conflict retry loop
+        let projectCreated = false;
+        let currentName = projectData.name;
+        let attemptCount = 0;
+        while (!projectCreated) {
+            attemptCount++;
+            cli_utilities_1.log.debug(`Attempt ${attemptCount} to create project with name: ${currentName}`, this.importConfig.context);
+            projectData.name = currentName;
+            const response = await this.apiClient.post('/projects', projectData);
+            if (response.status >= 200 && response.status < 300) {
+                projectCreated = true;
+                cli_utilities_1.log.debug(`Project created successfully with UID: ${(_c = response.data) === null || _c === void 0 ? void 0 : _c.uid}`, this.importConfig.context);
+            }
+            else {
+                throw new Error(`API call failed with status ${response.status}: ${JSON.stringify(response.data)}`);
+            }
+        }
+    }
+    /**
+     * Map environment UID from source to target
+     */
+    mapEnvironmentUid(sourceEnvUid) {
+        if (!sourceEnvUid) {
+            cli_utilities_1.log.debug('Source environment UID is empty', this.importConfig.context);
+            return '';
+        }
+        cli_utilities_1.log.debug(`Mapping source environment UID: ${sourceEnvUid}`, this.importConfig.context);
+        if ((0, isEmpty_1.default)(this.envUidMapper)) {
+            cli_utilities_1.log.warn(cli_utilities_1.messageHandler.parse('COMPOSABLE_STUDIO_ENV_MAPPING_FAILED', sourceEnvUid), this.importConfig.context);
+            return '';
+        }
+        const mappedUid = this.envUidMapper[sourceEnvUid];
+        if (!mappedUid) {
+            cli_utilities_1.log.warn(cli_utilities_1.messageHandler.parse('COMPOSABLE_STUDIO_ENV_MAPPING_FAILED', sourceEnvUid), this.importConfig.context);
+            return '';
+        }
+        cli_utilities_1.log.debug(`Mapped environment UID: ${sourceEnvUid} → ${mappedUid}`, this.importConfig.context);
+        return mappedUid;
+    }
+    /**
+     * Prompt user for a new project name when conflict occurs
+     */
+    async promptForNewProjectName(currentName) {
+        const suggestedName = `Copy of ${currentName}`;
+        cli_utilities_1.log.warn(cli_utilities_1.messageHandler.parse('COMPOSABLE_STUDIO_NAME_CONFLICT', currentName), this.importConfig.context);
+        cli_utilities_1.log.info(cli_utilities_1.messageHandler.parse('COMPOSABLE_STUDIO_SUGGEST_NAME', suggestedName), this.importConfig.context);
+        const response = await cli_utilities_1.cliux.inquire({
+            type: 'input',
+            name: 'projectName',
+            message: 'Enter new project name:',
+            default: suggestedName,
+        });
+        const newName = response.projectName || suggestedName;
+        cli_utilities_1.log.debug(`User provided new project name: ${newName}`, this.importConfig.context);
+        return newName;
+    }
+}
+exports.default = ImportComposableStudio;

package/lib/import/modules/stack.js

@@ -47,7 +47,7 @@ class ImportStack extends base_class_1.default {
         var _a, _b, _c;
         cli_utilities_1.log.debug('Processing stack settings for import', this.importConfig.context);
         // Update environment UID mapping if live preview is configured
-        if (((_a = this.stackSettings) === null || _a === void 0 ? void 0 : _a.live_preview) && ((_b = this.stackSettings) === null || _b === void 0 ? void 0 : _b.live_preview['default-env'])) {
+        if (((_a = this.stackSettings) === null || _a === void 0 ? void 0 : _a.live_preview) && ((_b = this.stackSettings) === null || _b === void 0 ? void 0 : _b.live_preview['default-env']) !== undefined) {
             const oldEnvUid = this.stackSettings.live_preview['default-env'];
             const mappedEnvUid = this.envUidMapper[oldEnvUid];
             if (mappedEnvUid) {

package/lib/import/modules/workflows.js

@@ -142,7 +142,7 @@ class ImportWorkflows extends base_class_1.default {
             else {
                 this.failedWebhooks.push(apiData);
                 (_d = this.progressManager) === null || _d === void 0 ? void 0 : _d.tick(false, `workflow: ${name || uid}`, (error === null || error === void 0 ? void 0 : error.message) || 'Failed to import workflow', utils_1.PROCESS_NAMES.WORKFLOWS_CREATE);
-                if (error.errors['workflow_stages.0.users']) {
+                if ((error === null || error === void 0 ? void 0 : error.errors) && error.errors['workflow_stages.0.users']) {
                     cli_utilities_1.log.error("Failed to import Workflows as you've specified certain roles in the Stage transition and access rules section. We currently don't import roles to the stack.", this.importConfig.context);
                 }
                 else {

package/lib/types/default-config.d.ts

@@ -156,6 +156,12 @@ export default interface DefaultConfig {
                 locale: string;
             } & AnyProperty;
         } & AnyProperty;
+        'composable-studio': {
+            dirName: string;
+            fileName: string;
+            apiBaseUrl: string;
+            apiVersion: string;
+        };
     };
     languagesCode: string[];
     apis: {

package/lib/types/import-config.d.ts

@@ -57,6 +57,7 @@ export default interface ImportConfig extends DefaultConfig, ExternalConfig {
     personalizeProjectName?: string;
     'exclude-global-modules': false;
     context: Context;
+    onlyTSModules?: Modules[];
 }
 type branch = {
     uid: string;

package/lib/types/index.d.ts

@@ -26,7 +26,7 @@ export interface User {
     email: string;
     authtoken: string;
 }
-export type Modules = 'stack' | 'assets' | 'locales' | 'environments' | 'extensions' | 'webhooks' | 'global-fields' | 'entries' | 'content-types' | 'custom-roles' | 'workflows' | 'labels' | 'marketplace-apps' | 'taxonomies' | 'personalize' | 'variant-entries';
+export type Modules = 'stack' | 'assets' | 'locales' | 'environments' | 'extensions' | 'webhooks' | 'global-fields' | 'entries' | 'content-types' | 'custom-roles' | 'workflows' | 'labels' | 'marketplace-apps' | 'taxonomies' | 'personalize' | 'variant-entries' | 'composable-studio';
 export type ModuleClassParams = {
     stackAPIClient: ReturnType<ContentstackClient['stack']>;
     importConfig: ImportConfig;
@@ -71,23 +71,49 @@ export interface TaxonomiesConfig {
     fileName: string;
     dependencies?: Modules[];
 }
-export { default as DefaultConfig } from './default-config';
-export { default as ImportConfig } from './import-config';
-export * from './entries';
-export * from './marketplace-app';
-export type ExtensionType = {
-    uid: string;
-    scope: Record<string, unknown>;
-    title: string;
-};
+export interface ComposableStudioConfig {
+    dirName: string;
+    fileName: string;
+    apiBaseUrl: string;
+    apiVersion: string;
+}
+export interface ComposableStudioProject {
+    name: string;
+    description: string;
+    canvasUrl: string;
+    connectedStackApiKey: string;
+    contentTypeUid: string;
+    organizationUid: string;
+    settings: {
+        configuration: {
+            environment: string;
+            locale: string;
+        };
+    };
+    uid?: string;
+    createdBy?: string;
+    updatedBy?: string;
+    deletedAt?: boolean;
+    createdAt?: string;
+    updatedAt?: string;
+}
 export interface Context {
     command: string;
     module: string;
     userId: string | undefined;
-    email?: string | undefined;
+    email: string | undefined;
     sessionId: string | undefined;
     clientId?: string | undefined;
     apiKey: string;
     orgId: string;
     authenticationMethod?: string;
 }
+export { default as DefaultConfig } from './default-config';
+export { default as ImportConfig } from './import-config';
+export * from './entries';
+export * from './marketplace-app';
+export type ExtensionType = {
+    uid: string;
+    scope: Record<string, unknown>;
+    title: string;
+};

package/lib/utils/content-type-helper.js

@@ -128,7 +128,7 @@ const removeReferenceFields = async function (schema, flag = { supressed: false
                     catch (error) {
                         // Else warn and modify the schema object.
                         isContentTypeError = true;
-                        cli_utilities_1.log.warn(`Content-type ${schema[i].reference_to[j]} does not exist. Removing the field from schema`);
+                        cli_utilities_1.log.warn(`Content type ${schema[i].reference_to[j]} does not exist. Removing the field from schema...`);
                     }
                 }
                 if (isContentTypeError) {
@@ -200,7 +200,7 @@ const updateFieldRules = function (contentType) {
         const field = contentType.schema[i];
         fieldDataTypeMap[field.uid] = field.data_type;
     }
-    cli_utilities_1.log.debug(`Created field data type mapping for ${Object.keys(fieldDataTypeMap).length} fields`);
+    cli_utilities_1.log.debug(`Created field data type mapping for ${Object.keys(fieldDataTypeMap).length} fields.`);
     const fieldRules = [...contentType.field_rules];
     let len = fieldRules.length;
     let removedRules = 0;

package/lib/utils/file-helper.js

@@ -58,7 +58,7 @@ const readLargeFile = function (filePath, opts) {
                 resolve(data);
             });
             parseStream.on('error', function (error) {
-                console.log('error', error);
+                console.log('Error', error);
                 reject(error);
             });
             readStream.pipe(parseStream);

package/lib/utils/import-config-handler.js

@@ -26,7 +26,7 @@ const setupConfig = async (importCmdFlags) => {
     config.contentDir = (0, cli_utilities_1.sanitizePath)(importCmdFlags['data'] || importCmdFlags['data-dir'] || config.data || (await (0, interactive_1.askContentDir)()));
     const pattern = /[*$%#<>{}!&?]/g;
     if (pattern.test(config.contentDir)) {
-        cli_utilities_1.cliux.print(`\nPlease add a directory path without any of the special characters: (*,&,{,},[,],$,%,<,>,?,!)`, {
+        cli_utilities_1.cliux.print(`\nPlease enter a directory path without any special characters: (*,&,{,},[,],$,%,<,>,?,!)`, {
             color: 'yellow',
         });
         config.contentDir = (0, cli_utilities_1.sanitizePath)(await (0, interactive_1.askContentDir)());
@@ -117,7 +117,7 @@ const setupConfig = async (importCmdFlags) => {
     cli_utilities_1.configHandler.set('log.progressSupportedModule', 'import');
     // Add authentication details to config for context tracking
     config.authenticationMethod = authenticationMethod;
-    cli_utilities_1.log.debug('Import configuration setup completed', Object.assign({}, config));
+    cli_utilities_1.log.debug('Import configuration setup completed.', Object.assign({}, config));
     return config;
 };
 exports.default = setupConfig;

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

@@ -116,7 +116,30 @@ 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},`);
+    // Check if export-info.json exists to determine contentVersion
+    const exportInfoPath = path.join(resolvedPath, 'export-info.json');
+    if ((0, file_helper_1.fileExistsSync)(exportInfoPath)) {
+        try {
+            const exportInfo = await (0, file_helper_1.readFile)(exportInfoPath);
+            // If export-info.json exists, set contentVersion to 2 (or use value from file if present)
+            if (exportInfo && exportInfo.contentVersion) {
+                importConfig.contentVersion = exportInfo.contentVersion;
+            }
+            else {
+                // If export-info.json exists but contentVersion is missing, default to 2
+                importConfig.contentVersion = 2;
+            }
+        }
+        catch (error) {
+            // If export-info.json exists but is null or can't be read, default to 2
+            importConfig.contentVersion = 2;
+        }
+    }
+    else {
+        // If export-info.json doesn't exist, default to 1 (legacy format)
+        importConfig.contentVersion = 1;
+    }
+    cli_utilities_1.log.debug(`Import config updated - contentDir: ${importConfig.contentDir}, branchDir: ${importConfig.branchDir}, data: ${importConfig.data}, contentVersion: ${importConfig.contentVersion}`);
 };
 exports.updateImportConfigWithResolvedPath = updateImportConfigWithResolvedPath;
 /**

package/lib/utils/login-handler.js

@@ -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

@@ -21,6 +21,7 @@ const getAllStackSpecificApps = async (config, skip = 0, listOfApps = []) => {
         .fetchAll({ target_uids: config.target_stack, 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;
@@ -56,7 +57,8 @@ const getOrgUid = async (config) => {
         .stack({ api_key: config.target_stack })
         .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

@@ -84,7 +84,7 @@
         },
         "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,
@@ -212,5 +212,5 @@
       ]
     }
   },
-  "version": "2.0.0-beta.2"
+  "version": "2.0.0-beta.3"
 }

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.3",
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {
-    "@contentstack/cli-audit": "~1.16.0",
-    "@contentstack/cli-command": "~1.6.1",
+    "@contentstack/cli-audit": "2.0.0-beta",
+    "@contentstack/cli-command": "~1.7.0",
     "@contentstack/cli-utilities": "~1.15.0",
     "@contentstack/management": "~1.22.0",
-    "@contentstack/cli-variants": "~2.0.0-beta.2",
+    "@contentstack/cli-variants": "~2.0.0-beta.3",
     "@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"