@contentstack/cli-cm-import 1.26.3 → 1.28.0

package/README.md

@@ -47,7 +47,7 @@ $ npm install -g @contentstack/cli-cm-import
 $ csdx COMMAND
 running command...
 $ csdx (--version)
-@contentstack/cli-cm-import/1.26.3 linux-x64 node-v22.18.0
+@contentstack/cli-cm-import/1.28.0 linux-x64 node-v22.19.0
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND
@@ -91,6 +91,9 @@ FLAGS
                                           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>              The alias of the branch where you want to import your content. If you don't
+                                          mention the branch alias, then by default the content will be imported to the
+                                          main branch.
       --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>
@@ -157,6 +160,9 @@ FLAGS
                                           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>              The alias of the branch where you want to import your content. If you don't
+                                          mention the branch alias, then by default the content will be imported to the
+                                          main branch.
       --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>

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

@@ -26,26 +26,6 @@ class ImportCommand extends cli_command_1.Command {
             if (this.personalizeUrl)
                 importConfig.modules.personalize.baseURL[importConfig.region.name] = this.personalizeUrl;
             const managementAPIClient = await (0, cli_utilities_1.managementSDKClient)(importConfig);
-            if (!flags.branch) {
-                try {
-                    // Use stack configuration to check for branch availability
-                    // false positive - no hardcoded secret here
-                    // @ts-ignore-next-line secret-detection
-                    const keyProp = 'api_key';
-                    const branches = await managementAPIClient
-                        .stack({ [keyProp]: importConfig.apiKey })
-                        .branch()
-                        .query()
-                        .find()
-                        .then(({ items }) => items);
-                    if (branches.length) {
-                        flags.branch = 'main';
-                    }
-                }
-                catch (error) {
-                    // Branch not enabled, just the let flow continue
-                }
-            }
             const moduleImporter = new import_1.ModuleImporter(managementAPIClient, importConfig);
             const result = await moduleImporter.start();
             backupDir = importConfig.backupDir;
@@ -150,6 +130,11 @@ ImportCommand.flags = {
         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.",
         parse: (0, cli_utilities_1.printFlagDeprecation)(['-B'], ['--branch']),
+        exclusive: ['branch-alias'],
+    }),
+    'branch-alias': cli_utilities_1.flags.string({
+        description: "The alias of the branch where you want to import your content. If you don't mention the branch alias, then by default the content will be imported to the main branch.",
+        exclusive: ['branch'],
     }),
     'import-webhook-status': cli_utilities_1.flags.string({
         description: '[default: disable] (optional) This webhook state keeps the same state of webhooks as the source stack. <options: disable|current>',

package/lib/import/module-importer.d.ts

@@ -9,6 +9,11 @@ declare class ModuleImporter {
     import(): Promise<any>;
     importByModuleByName(moduleName: Modules): Promise<any>;
     importAllModules(): Promise<any>;
+    /**
+     * Resolves the import path based on directory structure and user configuration
+     * @returns Promise<void>
+     */
+    private resolveImportPath;
     /**
      * The `auditImportData` function performs an audit process on imported data, using a specified
      * configuration, and returns a boolean indicating whether a fix is needed.

package/lib/import/module-importer.js

@@ -23,8 +23,14 @@ class ModuleImporter {
             this.importConfig.stackName = stackDetails.name;
             this.importConfig.org_uid = stackDetails.org_uid;
         }
-        if (this.importConfig.branchName) {
-            await (0, utils_1.validateBranch)(this.stackAPIClient, this.importConfig, this.importConfig.branchName);
+        await this.resolveImportPath();
+        await (0, utils_1.setupBranchConfig)(this.importConfig, this.stackAPIClient);
+        if (this.importConfig.branchAlias && this.importConfig.branchName) {
+            this.stackAPIClient = this.managementAPIClient.stack({
+                api_key: this.importConfig.apiKey,
+                management_token: this.importConfig.management_token,
+                branch_uid: this.importConfig.branchName,
+            });
         }
         if (this.importConfig.management_token) {
             await (0, cli_utilities_1.addLocale)(this.importConfig.apiKey, this.importConfig.management_token, this.importConfig.host);
@@ -40,15 +46,7 @@ class ModuleImporter {
         // NOTE audit and fix the import content.
         if (!this.importConfig.skipAudit &&
             (!this.importConfig.moduleName ||
-                [
-                    'content-types',
-                    'global-fields',
-                    'entries',
-                    'extensions',
-                    'workflows',
-                    'custom-roles',
-                    'assets'
-                ].includes(this.importConfig.moduleName))) {
+                ['content-types', 'global-fields', 'entries', 'extensions', 'workflows', 'custom-roles', 'assets'].includes(this.importConfig.moduleName))) {
             if (!(await this.auditImportData(logger))) {
                 return { noSuccessMsg: true };
             }
@@ -62,7 +60,7 @@ class ModuleImporter {
         return this.import();
     }
     async import() {
-        (0, utils_1.log)(this.importConfig, `Starting to import content version ${this.importConfig.contentVersion}`, 'info');
+        cli_utilities_1.log.info(`Starting to import content version ${this.importConfig.contentVersion}`, this.importConfig.context);
         // checks for single module or all modules
         if (this.importConfig.singleModuleImport) {
             return this.importByModuleByName(this.importConfig.moduleName);
@@ -70,7 +68,7 @@ class ModuleImporter {
         return this.importAllModules();
     }
     async importByModuleByName(moduleName) {
-        (0, utils_1.log)(this.importConfig, `Starting import of ${moduleName} module`, 'info');
+        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
         // NOTE: Implement a mechanism to determine whether module is new or old
@@ -96,12 +94,26 @@ class ModuleImporter {
         // use the algorithm to determine the parallel and sequential execution of modules
         for (let moduleName of this.importConfig.modules.types) {
             if (this.importConfig.globalModules.includes(moduleName) && this.importConfig['exclude-global-modules']) {
-                (0, utils_1.log)(this.importConfig, `Skipping the import of the global module '${moduleName}', as it already exists in the stack.`, 'warn');
+                cli_utilities_1.log.warn(`Skipping the import of the global module '${moduleName}', as it already exists in the stack.`, this.importConfig.context);
                 continue;
             }
             await this.importByModuleByName(moduleName);
         }
     }
+    /**
+     * Resolves the import path based on directory structure and user configuration
+     * @returns Promise<void>
+     */
+    async resolveImportPath() {
+        try {
+            const resolvedPath = await (0, utils_1.executeImportPathLogic)(this.importConfig, this.stackAPIClient);
+            cli_utilities_1.log.debug(`Import path resolved to: ${resolvedPath}`);
+        }
+        catch (error) {
+            cli_utilities_1.log.error(`Failed to resolve import path: ${error}`);
+            // Continue with original path if resolution fails
+        }
+    }
     /**
      * The `auditImportData` function performs an audit process on imported data, using a specified
      * configuration, and returns a boolean indicating whether a fix is needed.
@@ -127,23 +139,15 @@ class ModuleImporter {
             }
             else if (this.importConfig.modules.types.length) {
                 this.importConfig.modules.types
-                    .filter((val) => [
-                    'content-types',
-                    'global-fields',
-                    'entries',
-                    'extensions',
-                    'workflows',
-                    'custom-roles',
-                    'assets'
-                ].includes(val))
+                    .filter((val) => ['content-types', 'global-fields', 'entries', 'extensions', 'workflows', 'custom-roles', 'assets'].includes(val))
                     .forEach((val) => {
                     args.push('--modules', val);
                 });
             }
             args.push('--modules', 'field-rules');
-            (0, utils_1.log)(this.importConfig, 'Starting audit process', 'info');
+            cli_utilities_1.log.info('Starting audit process', this.importConfig.context);
             const result = await cli_audit_1.AuditFix.run(args);
-            (0, utils_1.log)(this.importConfig, 'Audit process completed', 'info');
+            cli_utilities_1.log.info('Audit process completed', this.importConfig.context);
             if (result) {
                 const { hasFix, config } = result;
                 if (hasFix) {
@@ -162,7 +166,7 @@ class ModuleImporter {
             return true;
         }
         catch (error) {
-            (0, utils_1.log)(this.importConfig, `Audit failed with following error. ${error}`, 'error');
+            cli_utilities_1.log.error(`Audit failed with following error. ${error}`, this.importConfig.context);
         }
     }
 }

package/lib/import/modules/base-class.js

@@ -8,7 +8,7 @@ const isEmpty_1 = tslib_1.__importDefault(require("lodash/isEmpty"));
 const entries_1 = tslib_1.__importDefault(require("lodash/entries"));
 const isEqual_1 = tslib_1.__importDefault(require("lodash/isEqual"));
 const omit_1 = tslib_1.__importDefault(require("lodash/omit"));
-const utils_1 = require("../../utils");
+const cli_utilities_1 = require("@contentstack/cli-utilities");
 const cloneDeep_1 = tslib_1.__importDefault(require("lodash/cloneDeep"));
 class BaseClass {
     constructor({ importConfig, stackAPIClient }) {
@@ -84,6 +84,7 @@ class BaseClass {
      * @returns {Promise} Promise<void>
      */
     async logMsgAndWaitIfRequired(processName, start, totelBatches, batchNo, logBatchCompletionMsg = true, indexerCount, currentIndexer) {
+        var _a;
         const end = Date.now();
         const exeTime = end - start;
         if (logBatchCompletionMsg) {
@@ -91,7 +92,7 @@ class BaseClass {
             // info: Batch No. 20 of import assets is complete
             if (currentIndexer)
                 batchMsg += `Current chunk processing is (${currentIndexer}/${indexerCount})`;
-            (0, utils_1.log)(this.importConfig, `Batch No. (${batchNo}/${totelBatches}) of ${processName} is complete`, 'success');
+            cli_utilities_1.log.debug(`Batch No. (${batchNo}/${totelBatches}) of ${processName} is complete`, (_a = this.importConfig) === null || _a === void 0 ? void 0 : _a.context);
         }
         if (this.importConfig.modules.assets.displayExecutionTime) {
             console.log(`Time taken to execute: ${exeTime} milliseconds; wait time: ${exeTime < 1000 ? 1000 - exeTime : 0} milliseconds`);

package/lib/import/modules/entries.js

@@ -158,11 +158,11 @@ class EntriesImport extends base_class_1.default {
     async disableMandatoryCTReferences() {
         cli_utilities_1.log.debug(`Starting to disable mandatory CT references for ${this.cTs.length} content types`, this.importConfig.context);
         const onSuccess = ({ response: contentType, apiData: { uid } }) => {
-            cli_utilities_1.log.success(`${uid} content type references removed temporarily`, this.importConfig.context);
-            cli_utilities_1.log.debug(`Successfully processed content type: ${uid}`, this.importConfig.context);
+            cli_utilities_1.log.success(`'${uid}' content type references removed temporarily`, this.importConfig.context);
+            cli_utilities_1.log.debug(`Successfully processed content type: '${uid}'`, this.importConfig.context);
         };
         const onReject = ({ error, apiData: { uid } }) => {
-            (0, cli_utilities_1.handleAndLogError)(error, Object.assign(Object.assign({}, this.importConfig.context), { uid }), `${uid} content type references removal failed`);
+            (0, cli_utilities_1.handleAndLogError)(error, Object.assign(Object.assign({}, this.importConfig.context), { uid }), `'${uid}' content type references removal failed`);
         };
         return await this.makeConcurrentCall({
             processName: 'Update content types (removing mandatory references temporarily)',

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

@@ -27,6 +27,7 @@ export default interface ImportConfig extends DefaultConfig, ExternalConfig {
     branches?: branch[];
     branchEnabled?: boolean;
     branchDir?: string;
+    branchAlias?: string;
     moduleName?: Modules;
     master_locale: masterLocale;
     headers?: {

package/lib/utils/backup-handler.js

@@ -11,10 +11,12 @@ async function backupHandler(importConfig) {
         cli_utilities_1.log.debug(`Using existing backup directory: ${importConfig.useBackedupDir}`);
         return importConfig.useBackedupDir;
     }
+    const sourceDir = importConfig.branchDir || importConfig.contentDir;
+    cli_utilities_1.log.debug(`Using source directory for backup: ${sourceDir} (branchDir: ${importConfig.branchDir}, contentDir: ${importConfig.contentDir})`);
     let backupDirPath;
-    const subDir = isSubDirectory(importConfig);
+    const subDir = isSubDirectory(importConfig, sourceDir);
     if (subDir) {
-        backupDirPath = path.resolve((0, cli_utilities_1.sanitizePath)(importConfig.contentDir), '..', '_backup_' + Math.floor(Math.random() * 1000));
+        backupDirPath = path.resolve((0, cli_utilities_1.sanitizePath)(sourceDir), '..', '_backup_' + Math.floor(Math.random() * 1000));
         cli_utilities_1.log.debug(`Detected subdirectory configuration, creating backup at: ${backupDirPath}`);
         if (importConfig.createBackupDir) {
             cli_utilities_1.cliux.print(`Warning!!! Provided backup directory path is a sub directory of the content directory, Cannot copy to a sub directory. Hence new backup directory created - ${backupDirPath}`, {
@@ -41,7 +43,7 @@ async function backupHandler(importConfig) {
         cli_utilities_1.log.debug(`Starting content copy to backup directory: ${backupDirPath}`);
         cli_utilities_1.cliux.print('Copying content to the backup directory...');
         return new Promise((resolve, reject) => {
-            return (0, fs_extra_1.copy)(importConfig.contentDir, backupDirPath, (error) => {
+            return (0, fs_extra_1.copy)(sourceDir, backupDirPath, (error) => {
                 if (error) {
                     (0, index_1.trace)(error, 'error', true);
                     return reject(error);
@@ -58,9 +60,9 @@ exports.default = backupHandler;
  * @param importConfig
  * @returns
  */
-function isSubDirectory(importConfig) {
+function isSubDirectory(importConfig, sourceDir) {
     cli_utilities_1.log.debug('Checking if backup directory is a subdirectory');
-    const parent = importConfig.contentDir;
+    const parent = sourceDir;
     const child = importConfig.createBackupDir ? importConfig.createBackupDir : process.cwd();
     const relative = path.relative(parent, child);
     cli_utilities_1.log.debug(`Parent directory: ${parent}, Child directory: ${child}, Relative path: ${relative}`);

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

@@ -92,6 +92,9 @@ const setupConfig = async (importCmdFlags) => {
     config.forceStopMarketplaceAppsPrompt = importCmdFlags.yes;
     config.importWebhookStatus = importCmdFlags['import-webhook-status'];
     config.skipPrivateAppRecreationIfExist = !importCmdFlags['skip-app-recreation'];
+    if (importCmdFlags['branch-alias']) {
+        config.branchAlias = importCmdFlags['branch-alias'];
+    }
     if (importCmdFlags['branch']) {
         config.branchName = importCmdFlags['branch'];
         config.branchDir = config.contentDir;

package/lib/utils/import-path-resolver.d.ts

@@ -0,0 +1,29 @@
+import { ImportConfig } from '../types';
+/**
+ * Selects a branch from directory structure when multiple branches are found
+ * @param contentDir - The content directory path
+ * @returns Promise<{ branchPath: string } | null>
+ */
+export declare const selectBranchFromDirectory: (contentDir: string) => Promise<{
+    branchPath: string;
+} | null>;
+/**
+ * Resolves the import path based on directory structure and user configuration
+ * @param importConfig - The import configuration object
+ * @param stackAPIClient - The Contentstack API client
+ * @returns Promise<string> - The resolved path
+ */
+export declare const resolveImportPath: (importConfig: ImportConfig, stackAPIClient: any) => Promise<string>;
+/**
+ * Updates the import configuration with the resolved path
+ * @param importConfig - The import configuration object
+ * @param resolvedPath - The resolved path
+ */
+export declare const updateImportConfigWithResolvedPath: (importConfig: ImportConfig, resolvedPath: string) => void;
+/**
+ * Executes the complete import path resolution logic
+ * @param importConfig - The import configuration object
+ * @param stackAPIClient - The Contentstack API client
+ * @returns Promise<string> - The resolved path
+ */
+export declare const executeImportPathLogic: (importConfig: ImportConfig, stackAPIClient: any) => Promise<string>;

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

@@ -0,0 +1,134 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.executeImportPathLogic = exports.updateImportConfigWithResolvedPath = exports.resolveImportPath = exports.selectBranchFromDirectory = void 0;
+const tslib_1 = require("tslib");
+const path = tslib_1.__importStar(require("path"));
+const cli_utilities_1 = require("@contentstack/cli-utilities");
+const file_helper_1 = require("./file-helper");
+const interactive_1 = require("./interactive");
+const config_1 = tslib_1.__importDefault(require("../config"));
+/**
+ * Selects a branch from directory structure when multiple branches are found
+ * @param contentDir - The content directory path
+ * @returns Promise<{ branchPath: string } | null>
+ */
+const selectBranchFromDirectory = async (contentDir) => {
+    cli_utilities_1.log.debug('Selecting branch directory from directory structure');
+    const branchesJsonPath = path.join(contentDir, 'branches.json');
+    if (!(0, file_helper_1.fileExistsSync)(branchesJsonPath)) {
+        cli_utilities_1.log.debug('No branches.json found - not a branch-enabled export');
+        return null;
+    }
+    try {
+        const branchesData = await (0, file_helper_1.readFile)(branchesJsonPath);
+        const branches = branchesData || [];
+        if (!branches || !Array.isArray(branches) || branches.length === 0) {
+            cli_utilities_1.log.debug('No branches found in branches.json - not a branch-enabled export');
+            return null;
+        }
+        if (branches.length === 1) {
+            const singleBranch = branches[0];
+            const branchPath = path.join(contentDir, singleBranch.uid);
+            if (!(0, file_helper_1.fileExistsSync)(branchPath)) {
+                cli_utilities_1.log.warn(`Branch path does not exist: ${branchPath}, not a valid branch export`);
+                return null;
+            }
+            cli_utilities_1.log.debug(`Single branch detected: ${singleBranch.uid} - auto-resolving to: ${branchPath}`);
+            return { branchPath };
+        }
+        else {
+            cli_utilities_1.log.debug(`Multiple branches detected: ${branches.map((b) => b.uid).join(', ')}`);
+            const branchNames = branches.map((b) => b.uid);
+            const selectedBranch = await (0, interactive_1.askBranchSelection)(branchNames);
+            const selectedBranchPath = path.join(contentDir, selectedBranch);
+            if (!(0, file_helper_1.fileExistsSync)(selectedBranchPath)) {
+                cli_utilities_1.log.warn(`Selected branch path does not exist: ${selectedBranchPath}, not a valid branch export`);
+                return null;
+            }
+            cli_utilities_1.log.debug(`User selected branch directory: ${selectedBranch} - using path: ${selectedBranchPath}`);
+            return { branchPath: selectedBranchPath };
+        }
+    }
+    catch (error) {
+        cli_utilities_1.log.error(`Error selecting branch directory from directory structure: ${error}`);
+        throw error;
+    }
+};
+exports.selectBranchFromDirectory = selectBranchFromDirectory;
+/**
+ * Resolves the import path based on directory structure and user configuration
+ * @param importConfig - The import configuration object
+ * @param stackAPIClient - The Contentstack API client
+ * @returns Promise<string> - The resolved path
+ */
+const resolveImportPath = async (importConfig, stackAPIClient) => {
+    cli_utilities_1.log.debug('Resolving import path based on directory structure');
+    const contentDir = importConfig.contentDir || importConfig.data;
+    cli_utilities_1.log.debug(`Content directory: ${contentDir}`);
+    if (!(0, file_helper_1.fileExistsSync)(contentDir)) {
+        throw new Error(`Content directory does not exist: ${contentDir}`);
+    }
+    if (importConfig.branchName) {
+        cli_utilities_1.log.debug(`User specified branch: ${importConfig.branchName}`);
+        const currentDirName = path.basename(contentDir);
+        if (currentDirName === importConfig.branchName) {
+            cli_utilities_1.log.debug(`Already in correct branch directory: ${contentDir}`);
+            return contentDir;
+        }
+        const branchPath = path.join(contentDir, importConfig.branchName);
+        if ((0, file_helper_1.fileExistsSync)(branchPath)) {
+            cli_utilities_1.log.debug(`Navigating to specified branch directory: ${branchPath}`);
+            return branchPath;
+        }
+        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) {
+        cli_utilities_1.log.debug('Found module folders ');
+        return contentDir;
+    }
+    const branchSelection = await (0, exports.selectBranchFromDirectory)(contentDir);
+    if (branchSelection) {
+        return branchSelection.branchPath;
+    }
+    cli_utilities_1.log.debug('No specific structure detected - using contentDir as-is');
+    return contentDir;
+};
+exports.resolveImportPath = resolveImportPath;
+/**
+ * Updates the import configuration with the resolved path
+ * @param importConfig - The import configuration object
+ * @param resolvedPath - The resolved path
+ */
+const updateImportConfigWithResolvedPath = (importConfig, resolvedPath) => {
+    cli_utilities_1.log.debug(`Updating import config with resolved path: ${resolvedPath}`);
+    if (!(0, file_helper_1.fileExistsSync)(resolvedPath)) {
+        cli_utilities_1.log.warn(`Resolved path does not exist: ${resolvedPath}, skipping config update`);
+        return;
+    }
+    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}`);
+};
+exports.updateImportConfigWithResolvedPath = updateImportConfigWithResolvedPath;
+/**
+ * Executes the complete import path resolution logic
+ * @param importConfig - The import configuration object
+ * @param stackAPIClient - The Contentstack API client
+ * @returns Promise<string> - The resolved path
+ */
+const executeImportPathLogic = async (importConfig, stackAPIClient) => {
+    cli_utilities_1.log.debug('Executing import path resolution logic');
+    const resolvedPath = await (0, exports.resolveImportPath)(importConfig, stackAPIClient);
+    (0, exports.updateImportConfigWithResolvedPath)(importConfig, resolvedPath);
+    return resolvedPath;
+};
+exports.executeImportPathLogic = executeImportPathLogic;

package/lib/utils/index.d.ts

@@ -1,3 +1,5 @@
+export { setupBranchConfig } from './setup-branch';
+export { selectBranchFromDirectory, resolveImportPath, updateImportConfigWithResolvedPath, executeImportPathLogic } from './import-path-resolver';
 export * as interactive from './interactive';
 export { default as setupImportConfig } from './import-config-handler';
 export * as fileHelper from './file-helper';

package/lib/utils/index.js

@@ -1,7 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.lookUpTerms = exports.lookUpTaxonomy = exports.restoreJsonRteEntryRefs = exports.removeEntryRefsFromJSONRTE = exports.removeUidsFromJsonRteFields = exports.lookupEntries = exports.lookupExtension = exports.removeReferenceFields = exports.suppressSchemaReference = exports.schemaTemplate = exports.ifAppAlreadyExist = exports.getAllStackSpecificApps = exports.confirmToCloseProcess = exports.makeRedirectUrlCall = exports.handleNameConflict = exports.getConfirmationToCreateApps = exports.getOrgUid = exports.getDeveloperHubUrl = exports.lookupAssets = exports.uploadAssetHelper = exports.unlinkFileLogger = exports.log = exports.backupHandler = exports.fsUtil = exports.fileHelper = exports.setupImportConfig = exports.interactive = void 0;
+exports.lookUpTerms = exports.lookUpTaxonomy = exports.restoreJsonRteEntryRefs = exports.removeEntryRefsFromJSONRTE = exports.removeUidsFromJsonRteFields = exports.lookupEntries = exports.lookupExtension = exports.removeReferenceFields = exports.suppressSchemaReference = exports.schemaTemplate = exports.ifAppAlreadyExist = exports.getAllStackSpecificApps = exports.confirmToCloseProcess = exports.makeRedirectUrlCall = exports.handleNameConflict = exports.getConfirmationToCreateApps = exports.getOrgUid = exports.getDeveloperHubUrl = exports.lookupAssets = exports.uploadAssetHelper = exports.unlinkFileLogger = exports.log = exports.backupHandler = exports.fsUtil = exports.fileHelper = exports.setupImportConfig = exports.interactive = exports.executeImportPathLogic = exports.updateImportConfigWithResolvedPath = exports.resolveImportPath = exports.selectBranchFromDirectory = exports.setupBranchConfig = void 0;
 const tslib_1 = require("tslib");
+var setup_branch_1 = require("./setup-branch");
+Object.defineProperty(exports, "setupBranchConfig", { enumerable: true, get: function () { return setup_branch_1.setupBranchConfig; } });
+var import_path_resolver_1 = require("./import-path-resolver");
+Object.defineProperty(exports, "selectBranchFromDirectory", { enumerable: true, get: function () { return import_path_resolver_1.selectBranchFromDirectory; } });
+Object.defineProperty(exports, "resolveImportPath", { enumerable: true, get: function () { return import_path_resolver_1.resolveImportPath; } });
+Object.defineProperty(exports, "updateImportConfigWithResolvedPath", { enumerable: true, get: function () { return import_path_resolver_1.updateImportConfigWithResolvedPath; } });
+Object.defineProperty(exports, "executeImportPathLogic", { enumerable: true, get: function () { return import_path_resolver_1.executeImportPathLogic; } });
 exports.interactive = tslib_1.__importStar(require("./interactive"));
 var import_config_handler_1 = require("./import-config-handler");
 Object.defineProperty(exports, "setupImportConfig", { enumerable: true, get: function () { return tslib_1.__importDefault(import_config_handler_1).default; } });

package/lib/utils/interactive.d.ts

@@ -5,3 +5,4 @@ export declare const askAppName: (app: any, appSuffix: number) => Promise<string
 export declare const getAppName: (name: string, appSuffix?: number) => string;
 export declare const getLocationName: (name: string, appSuffix: number, existingNames: Set<string>) => string;
 export declare const selectConfiguration: () => Promise<string>;
+export declare const askBranchSelection: (branchNames: string[]) => Promise<string>;

package/lib/utils/interactive.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.selectConfiguration = exports.getLocationName = exports.getAppName = exports.askAppName = exports.askEncryptionKey = exports.askAPIKey = exports.askContentDir = void 0;
+exports.askBranchSelection = exports.selectConfiguration = exports.getLocationName = exports.getAppName = exports.askAppName = exports.askEncryptionKey = exports.askAPIKey = exports.askContentDir = void 0;
 const tslib_1 = require("tslib");
 const cli_utilities_1 = require("@contentstack/cli-utilities");
 const path = tslib_1.__importStar(require("path"));
@@ -93,3 +93,12 @@ const selectConfiguration = async () => {
     });
 };
 exports.selectConfiguration = selectConfiguration;
+const askBranchSelection = async (branchNames) => {
+    return await cli_utilities_1.cliux.inquire({
+        type: 'list',
+        name: 'branch',
+        message: 'Found multiple branches in your export path. Please select one to import:',
+        choices: branchNames,
+    });
+};
+exports.askBranchSelection = askBranchSelection;

package/lib/utils/setup-branch.d.ts

@@ -0,0 +1,3 @@
+import { ContentstackClient } from '@contentstack/cli-utilities';
+import { ImportConfig } from 'src/types';
+export declare const setupBranchConfig: (config: ImportConfig, stackAPIClient: ReturnType<ContentstackClient['stack']>) => Promise<void>;

package/lib/utils/setup-branch.js

@@ -0,0 +1,31 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.setupBranchConfig = void 0;
+const cli_utilities_1 = require("@contentstack/cli-utilities");
+const common_helper_1 = require("./common-helper");
+const setupBranchConfig = async (config, stackAPIClient) => {
+    if (config.branchName) {
+        await (0, common_helper_1.validateBranch)(stackAPIClient, config, config.branchName);
+        return;
+    }
+    if (config.branchAlias) {
+        config.branchName = await (0, cli_utilities_1.getBranchFromAlias)(stackAPIClient, config.branchAlias);
+        return;
+    }
+    try {
+        const branches = await stackAPIClient
+            .branch()
+            .query()
+            .find()
+            .then(({ items }) => items);
+        if (branches.length) {
+            cli_utilities_1.log.info(`Stack is branch enabled and branches exist. Default import will be done in main branch.`);
+            config.branchName = 'main';
+            cli_utilities_1.log.debug(`Setting default target branch to 'main'`);
+        }
+    }
+    catch (error) {
+        cli_utilities_1.log.debug('Failed to fetch branches', { error });
+    }
+};
+exports.setupBranchConfig = setupBranchConfig;

package/oclif.manifest.json

@@ -102,11 +102,24 @@
         "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"
+          ],
           "name": "branch",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
         },
+        "branch-alias": {
+          "description": "The alias of the branch where you want to import your content. If you don't mention the branch alias, then by default the content will be imported to the main branch.",
+          "exclusive": [
+            "branch"
+          ],
+          "name": "branch-alias",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
         "import-webhook-status": {
           "description": "[default: disable] (optional) This webhook state keeps the same state of webhooks as the source stack. <options: disable|current>",
           "name": "import-webhook-status",
@@ -199,5 +212,5 @@
       ]
     }
   },
-  "version": "1.26.3"
+  "version": "1.28.0"
 }

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@contentstack/cli-cm-import",
   "description": "Contentstack CLI plugin to import content into stack",
-  "version": "1.26.3",
+  "version": "1.28.0",
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {
-    "@contentstack/cli-audit": "~1.14.0",
-    "@contentstack/cli-command": "~1.6.0",
-    "@contentstack/cli-utilities": "~1.13.2",
+    "@contentstack/cli-audit": "~1.14.1",
+    "@contentstack/cli-command": "~1.6.1",
+    "@contentstack/cli-utilities": "~1.14.1",
     "@contentstack/management": "~1.22.0",
-    "@contentstack/cli-variants": "~1.3.0",
+    "@contentstack/cli-variants": "~1.3.3",
     "@oclif/core": "^4.3.0",
     "big-json": "^3.2.0",
     "bluebird": "^3.7.2",