@contentstack/cli-cm-import 2.0.0-beta.14 → 2.0.0-beta.16

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.14 linux-x64 node-v22.22.1
+@contentstack/cli-cm-import/2.0.0-beta.16 linux-x64 node-v22.22.2
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND

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

@@ -16,7 +16,7 @@ class ImportCommand extends cli_command_1.Command {
             const { flags } = await this.parse(ImportCommand);
             importConfig = await (0, utils_1.setupImportConfig)(flags);
             // Prepare the context object
-            (0, cli_utilities_1.createLogContext)(((_b = (_a = this.context) === null || _a === void 0 ? void 0 : _a.info) === null || _b === void 0 ? void 0 : _b.command) || 'cm:stacks:export', importConfig.apiKey, importConfig.authenticationMethod);
+            (0, cli_utilities_1.createLogContext)(((_b = (_a = this.context) === null || _a === void 0 ? void 0 : _a.info) === null || _b === void 0 ? void 0 : _b.command) || 'cm:stacks:import', importConfig.apiKey, importConfig.authenticationMethod);
             const context = this.createImportContext(importConfig.apiKey, importConfig.authenticationMethod);
             importConfig.context = Object.assign({}, context);
             //log.info(`Using Cli Version: ${this.context?.cliVersion}`, importConfig.context);
@@ -37,7 +37,7 @@ class ImportCommand extends cli_command_1.Command {
                 cli_utilities_1.CLIProgressManager.initializeGlobalSummary(`IMPORT`, flags.branch, 'Importing content...');
             }
             const moduleImporter = new import_1.ModuleImporter(managementAPIClient, importConfig);
-            const result = await moduleImporter.start();
+            await moduleImporter.start();
             backupDir = importConfig.backupDir;
             //Note: Final summary is now handled by summary manager
             cli_utilities_1.CLIProgressManager.printGlobalSummary();

package/lib/config/index.js

@@ -101,6 +101,40 @@ const config = {
             folderValidKeys: ['name', 'parent_uid'],
             validKeys: ['title', 'parent_uid', 'description', 'tags'],
         },
+        'asset-management': {
+            dirName: 'spaces',
+            fieldsDir: 'fields',
+            assetTypesDir: 'asset_types',
+            fieldsFileName: 'fields.json',
+            assetTypesFileName: 'asset-types.json',
+            foldersFileName: 'folders.json',
+            assetsFileName: 'assets.json',
+            fieldsImportInvalidKeys: [
+                'created_at',
+                'created_by',
+                'updated_at',
+                'updated_by',
+                'is_system',
+                'asset_types_count',
+            ],
+            assetTypesImportInvalidKeys: [
+                'created_at',
+                'created_by',
+                'updated_at',
+                'updated_by',
+                'is_system',
+                'category',
+                'preview_image_url',
+                'category_detail',
+            ],
+            mapperRootDir: 'mapper',
+            mapperAssetsModuleDir: 'assets',
+            mapperUidFileName: 'uid-mapping.json',
+            mapperUrlFileName: 'url-mapping.json',
+            mapperSpaceUidFileName: 'space-uid-mapping.json',
+            uploadAssetsConcurrency: 2,
+            importFoldersConcurrency: 1,
+        },
         'assets-old': {
             dirName: 'assets',
             fileName: 'assets.json',

package/lib/constants/index.d.ts

@@ -19,6 +19,7 @@ export declare const PATH_CONSTANTS: {
         readonly INDEX: "index.json";
         readonly FOLDER_MAPPING: "folder-mapping.json";
         readonly VERSIONED_ASSETS: "versioned-assets.json";
+        readonly SPACE_UID_MAPPING: "space-uid-mapping.json";
     };
     /** Module subdirectory names within mapper */
     readonly MAPPER_MODULES: {

package/lib/constants/index.js

@@ -22,6 +22,7 @@ exports.PATH_CONSTANTS = {
         INDEX: 'index.json',
         FOLDER_MAPPING: 'folder-mapping.json',
         VERSIONED_ASSETS: 'versioned-assets.json',
+        SPACE_UID_MAPPING: 'space-uid-mapping.json',
     },
     /** Module subdirectory names within mapper */
     MAPPER_MODULES: {

package/lib/import/modules/assets.d.ts

@@ -32,6 +32,11 @@ export default class ImportAssets extends BaseClass {
      * @returns {Promise<void>} Promise<any>
      */
     start(): Promise<void>;
+    /**
+     * Merges imported AM spaces into the target stack branch's `am_v2.linked_workspaces`.
+     * Errors are logged and swallowed so a successful import still completes; import failures are handled separately.
+     */
+    private linkImportedAmSpacesToBranch;
     /**
      * @method importFolders
      * @returns {Promise<any>} Promise<any>

package/lib/import/modules/assets.js

@@ -13,6 +13,7 @@ const includes_1 = tslib_1.__importDefault(require("lodash/includes"));
 const uuid_1 = require("uuid");
 const node_path_1 = require("node:path");
 const cli_utilities_1 = require("@contentstack/cli-utilities");
+const cli_asset_management_1 = require("@contentstack/cli-asset-management");
 const constants_1 = require("../../constants");
 const config_1 = tslib_1.__importDefault(require("../../config"));
 const utils_1 = require("../../utils");
@@ -41,8 +42,31 @@ class ImportAssets extends base_class_1.default {
      * @returns {Promise<void>} Promise<any>
      */
     async start() {
+        var _a;
         try {
             cli_utilities_1.log.debug('Starting assets import process...', this.importConfig.context);
+            // AM 2.0: assetManagementEnabled is set in the config handler when spaces/ + am_v2 are detected.
+            if (this.importConfig.assetManagementEnabled) {
+                if (!this.importConfig.assetManagementUrl) {
+                    cli_utilities_1.log.info('AM 2.0 export detected but assetManagementUrl is not configured in the region settings. Skipping AM 2.0 asset import.', this.importConfig.context);
+                    return;
+                }
+                const progress = this.createNestedProgress(this.currentModuleName);
+                let spaceMappings = [];
+                try {
+                    const importer = new cli_asset_management_1.ImportSpaces((0, utils_1.buildImportSpacesOptions)(this.importConfig, this.importConfig.assetManagementUrl));
+                    importer.setParentProgressManager(progress);
+                    ({ spaceMappings } = await importer.start());
+                }
+                catch (error) {
+                    this.completeProgress(false, (_a = error === null || error === void 0 ? void 0 : error.message) !== null && _a !== void 0 ? _a : 'AM 2.0 asset import failed');
+                    throw error;
+                }
+                await this.linkImportedAmSpacesToBranch(spaceMappings);
+                this.completeProgressWithMessage();
+                return;
+            }
+            // Legacy flow continues below
             // Step 1: Analyze import data
             const [foldersCount, assetsCount, versionedAssetsCount, publishableAssetsCount] = await this.withLoadingSpinner('ASSETS: Analyzing import data...', () => this.analyzeImportData());
             // Step 2: Initialize progress tracking
@@ -74,6 +98,35 @@ class ImportAssets extends base_class_1.default {
             (0, cli_utilities_1.handleAndLogError)(error, Object.assign({}, this.importConfig.context));
         }
     }
+    /**
+     * Merges imported AM spaces into the target stack branch's `am_v2.linked_workspaces`.
+     * Errors are logged and swallowed so a successful import still completes; import failures are handled separately.
+     */
+    async linkImportedAmSpacesToBranch(spaceMappings) {
+        var _a, _b, _c, _d;
+        if (spaceMappings.length === 0) {
+            return;
+        }
+        try {
+            const branchUid = (_a = this.importConfig.branchName) !== null && _a !== void 0 ? _a : 'main';
+            const branchData = (await this.stack.branch(branchUid).fetch({ include_settings: true }));
+            const currentLinked = ((_d = (_c = (_b = branchData === null || branchData === void 0 ? void 0 : branchData.settings) === null || _b === void 0 ? void 0 : _b.am_v2) === null || _c === void 0 ? void 0 : _c.linked_workspaces) !== null && _d !== void 0 ? _d : []);
+            const newWorkspaces = spaceMappings.map(({ newSpaceUid, workspaceUid }) => ({
+                uid: workspaceUid,
+                space_uid: newSpaceUid,
+                is_default: false,
+                operation: 'LINK',
+            }));
+            const combinedWorkspaces = [...currentLinked, ...newWorkspaces];
+            await this.stack.branch(branchUid).updateSettings({
+                branch: { settings: { am_v2: { linked_workspaces: combinedWorkspaces } } },
+            });
+            cli_utilities_1.log.success(`Linked ${newWorkspaces.length} space(s) to branch "${branchUid}"`, this.importConfig.context);
+        }
+        catch (linkErr) {
+            (0, cli_utilities_1.handleAndLogError)(linkErr, Object.assign(Object.assign({}, this.importConfig.context), { phase: 'AM 2.0 branch linking (linked_workspaces)' }));
+        }
+    }
     /**
      * @method importFolders
      * @returns {Promise<any>} Promise<any>
@@ -142,9 +195,7 @@ class ImportAssets extends base_class_1.default {
      */
     async importAssets(isVersion = false) {
         const processName = isVersion ? 'import versioned assets' : 'import assets';
-        const indexFileName = isVersion
-            ? constants_1.PATH_CONSTANTS.FILES.VERSIONED_ASSETS
-            : this.assetConfig.fileName;
+        const indexFileName = isVersion ? constants_1.PATH_CONSTANTS.FILES.VERSIONED_ASSETS : this.assetConfig.fileName;
         const basePath = isVersion ? (0, node_path_1.join)(this.assetsPath, 'versions') : this.assetsPath;
         const progressProcessName = isVersion ? utils_1.PROCESS_NAMES.ASSET_VERSIONS : utils_1.PROCESS_NAMES.ASSET_UPLOAD;
         cli_utilities_1.log.debug(`Importing ${processName} from ${basePath}`, this.importConfig.context);

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

@@ -109,7 +109,7 @@ class BaseClass {
      * @returns {Promise} Promise<void>
      */
     makeConcurrentCall(env, promisifyHandler, logBatchCompletionMsg = true) {
-        const { apiParams, apiContent, processName, indexerCount, currentIndexer, concurrencyLimit = this.importConfig.modules.apiConcurrency, } = env;
+        const { apiParams, apiContent, processName, indexerCount, currentIndexer, concurrencyLimit = this.importConfig.fetchConcurrency, } = env;
         /* eslint-disable no-async-promise-executor */
         return new Promise(async (resolve) => {
             let batchNo = 0;

package/lib/import/modules/content-types.js

@@ -53,8 +53,8 @@ class ContentTypesImport extends base_class_1.default {
         this.createdGFs = [];
         this.pendingGFs = [];
         this.pendingExts = [];
-        this.taxonomiesPath = path.join((0, cli_utilities_1.sanitizePath)(importConfig.contentDir), constants_1.PATH_CONSTANTS.MAPPER, constants_1.PATH_CONSTANTS.MAPPER_MODULES.TAXONOMIES, constants_1.PATH_CONSTANTS.FILES.SUCCESS);
-        this.extPendingPath = path.join((0, cli_utilities_1.sanitizePath)(importConfig.contentDir), constants_1.PATH_CONSTANTS.MAPPER, constants_1.PATH_CONSTANTS.MAPPER_MODULES.EXTENSIONS, constants_1.PATH_CONSTANTS.FILES.PENDING_EXTENSIONS);
+        this.taxonomiesPath = path.join((0, cli_utilities_1.sanitizePath)(importConfig.backupDir), constants_1.PATH_CONSTANTS.MAPPER, constants_1.PATH_CONSTANTS.MAPPER_MODULES.TAXONOMIES, constants_1.PATH_CONSTANTS.FILES.SUCCESS);
+        this.extPendingPath = path.join((0, cli_utilities_1.sanitizePath)(importConfig.backupDir), constants_1.PATH_CONSTANTS.MAPPER, constants_1.PATH_CONSTANTS.MAPPER_MODULES.EXTENSIONS, constants_1.PATH_CONSTANTS.FILES.PENDING_EXTENSIONS);
     }
     async start() {
         var _a;

package/lib/import/modules/stack.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const node_path_1 = require("node:path");
+const node_fs_1 = require("node:fs");
 const cli_utilities_1 = require("@contentstack/cli-utilities");
 const constants_1 = require("../../constants");
 const base_class_1 = tslib_1.__importDefault(require("./base-class"));
@@ -46,6 +47,13 @@ class ImportStack extends base_class_1.default {
     async importStackSettings() {
         var _a, _b, _c;
         cli_utilities_1.log.debug('Processing stack settings for import', this.importConfig.context);
+        // Old source-org space UIDs must not be written to the target stack —
+        // the asset-management module will apply the correct am_v2.linked_workspaces.
+        if ((0, node_fs_1.existsSync)((0, node_path_1.join)(this.importConfig.contentDir, 'spaces'))) {
+            const _d = this.stackSettings, { am_v2 } = _d, settingsWithoutAm = tslib_1.__rest(_d, ["am_v2"]);
+            this.stackSettings = settingsWithoutAm;
+            cli_utilities_1.log.debug('Stripped am_v2 from stack settings; asset-management module will apply it after space creation', 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']) !== undefined) {
             const oldEnvUid = this.stackSettings.live_preview['default-env'];

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

@@ -70,6 +70,24 @@ export default interface DefaultConfig {
             uploadAssetsConcurrency: number;
             importFoldersConcurrency: number;
         };
+        'asset-management': {
+            dirName: string;
+            fieldsDir: string;
+            assetTypesDir: string;
+            fieldsFileName: string;
+            assetTypesFileName: string;
+            foldersFileName: string;
+            assetsFileName: string;
+            fieldsImportInvalidKeys: string[];
+            assetTypesImportInvalidKeys: string[];
+            mapperRootDir: string;
+            mapperAssetsModuleDir: string;
+            mapperUidFileName: string;
+            mapperUrlFileName: string;
+            mapperSpaceUidFileName: string;
+            uploadAssetsConcurrency: number;
+            importFoldersConcurrency: number;
+        };
         content_types: {
             dirName: string;
             fileName: string;

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

@@ -26,7 +26,6 @@ export default interface ImportConfig extends DefaultConfig, ExternalConfig {
     contentTypes?: string[];
     branches?: branch[];
     branchEnabled?: boolean;
-    branchDir?: string;
     branchAlias?: string;
     moduleName?: Modules;
     master_locale: masterLocale;
@@ -56,6 +55,8 @@ export default interface ImportConfig extends DefaultConfig, ExternalConfig {
     personalizeProjectName?: string;
     'exclude-global-modules': false;
     context: Context;
+    assetManagementUrl?: string;
+    assetManagementEnabled?: boolean;
 }
 type branch = {
     uid: string;

package/lib/types/index.d.ts

@@ -14,6 +14,7 @@ export interface Region {
     cma: string;
     cda: string;
     uiHost: string;
+    assetManagementUrl?: string;
 }
 export interface InquirePayload {
     type: string;

package/lib/utils/backup-handler.js

@@ -11,8 +11,8 @@ 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})`);
+    const sourceDir = importConfig.contentDir;
+    cli_utilities_1.log.debug(`Using source directory for backup: ${sourceDir}, contentDir: ${importConfig.contentDir})`);
     let backupDirPath;
     const subDir = isSubDirectory(importConfig, sourceDir);
     if (subDir) {

package/lib/utils/build-import-spaces-options.d.ts

@@ -0,0 +1,7 @@
+import type { ImportSpacesOptions } from '@contentstack/cli-asset-management';
+import type ImportConfig from '../types/import-config';
+/**
+ * Maps stack `ImportConfig` and AM base URL into a single `ImportSpacesOptions` for the AM package
+ * (variants-style: one flat object; `ImportSpaces` splits API vs context internally).
+ */
+export declare function buildImportSpacesOptions(importConfig: ImportConfig, assetManagementUrl: string): ImportSpacesOptions;

package/lib/utils/build-import-spaces-options.js

@@ -0,0 +1,41 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.buildImportSpacesOptions = void 0;
+const constants_1 = require("../constants");
+/**
+ * Maps stack `ImportConfig` and AM base URL into a single `ImportSpacesOptions` for the AM package
+ * (variants-style: one flat object; `ImportSpaces` splits API vs context internally).
+ */
+function buildImportSpacesOptions(importConfig, assetManagementUrl) {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+    const am = importConfig.modules['asset-management'];
+    const org_uid = (_a = importConfig.org_uid) !== null && _a !== void 0 ? _a : '';
+    return {
+        contentDir: importConfig.contentDir,
+        assetManagementUrl,
+        org_uid,
+        apiKey: importConfig.apiKey,
+        host: (_d = (_c = (_b = importConfig.region) === null || _b === void 0 ? void 0 : _b.cma) !== null && _c !== void 0 ? _c : importConfig.host) !== null && _d !== void 0 ? _d : '',
+        sourceApiKey: importConfig.source_stack,
+        context: importConfig.context,
+        backupDir: importConfig.backupDir,
+        apiConcurrency: importConfig.fetchConcurrency,
+        uploadAssetsConcurrency: am === null || am === void 0 ? void 0 : am.uploadAssetsConcurrency,
+        importFoldersConcurrency: am === null || am === void 0 ? void 0 : am.importFoldersConcurrency,
+        spacesDirName: am === null || am === void 0 ? void 0 : am.dirName,
+        fieldsDir: am === null || am === void 0 ? void 0 : am.fieldsDir,
+        assetTypesDir: am === null || am === void 0 ? void 0 : am.assetTypesDir,
+        fieldsFileName: am === null || am === void 0 ? void 0 : am.fieldsFileName,
+        assetTypesFileName: am === null || am === void 0 ? void 0 : am.assetTypesFileName,
+        foldersFileName: am === null || am === void 0 ? void 0 : am.foldersFileName,
+        assetsFileName: am === null || am === void 0 ? void 0 : am.assetsFileName,
+        fieldsImportInvalidKeys: am === null || am === void 0 ? void 0 : am.fieldsImportInvalidKeys,
+        assetTypesImportInvalidKeys: am === null || am === void 0 ? void 0 : am.assetTypesImportInvalidKeys,
+        mapperRootDir: (_e = am === null || am === void 0 ? void 0 : am.mapperRootDir) !== null && _e !== void 0 ? _e : constants_1.PATH_CONSTANTS.MAPPER,
+        mapperAssetsModuleDir: (_f = am === null || am === void 0 ? void 0 : am.mapperAssetsModuleDir) !== null && _f !== void 0 ? _f : constants_1.PATH_CONSTANTS.MAPPER_MODULES.ASSETS,
+        mapperUidFileName: (_g = am === null || am === void 0 ? void 0 : am.mapperUidFileName) !== null && _g !== void 0 ? _g : constants_1.PATH_CONSTANTS.FILES.UID_MAPPING,
+        mapperUrlFileName: (_h = am === null || am === void 0 ? void 0 : am.mapperUrlFileName) !== null && _h !== void 0 ? _h : constants_1.PATH_CONSTANTS.FILES.URL_MAPPING,
+        mapperSpaceUidFileName: (_j = am === null || am === void 0 ? void 0 : am.mapperSpaceUidFileName) !== null && _j !== void 0 ? _j : constants_1.PATH_CONSTANTS.FILES.SPACE_UID_MAPPING,
+    };
+}
+exports.buildImportSpacesOptions = buildImportSpacesOptions;

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

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const merge_1 = tslib_1.__importDefault(require("merge"));
 const path = tslib_1.__importStar(require("path"));
+const node_fs_1 = require("node:fs");
 const lodash_1 = require("lodash");
 const cli_utilities_1 = require("@contentstack/cli-utilities");
 const config_1 = tslib_1.__importDefault(require("../config"));
@@ -10,7 +11,7 @@ const file_helper_1 = require("./file-helper");
 const interactive_1 = require("./interactive");
 const login_handler_1 = tslib_1.__importDefault(require("./login-handler"));
 const setupConfig = async (importCmdFlags) => {
-    var _a;
+    var _a, _b, _c;
     // Set progress supported module FIRST, before any log calls
     // This ensures the logger respects the showConsoleLogs setting correctly
     cli_utilities_1.configHandler.set('log.progressSupportedModule', 'import');
@@ -88,7 +89,6 @@ const setupConfig = async (importCmdFlags) => {
     }
     if (importCmdFlags['branch']) {
         config.branchName = importCmdFlags['branch'];
-        config.branchDir = config.contentDir;
     }
     if (importCmdFlags['module']) {
         config.moduleName = importCmdFlags['module'];
@@ -109,6 +109,33 @@ const setupConfig = async (importCmdFlags) => {
     if (importCmdFlags['exclude-global-modules']) {
         config['exclude-global-modules'] = importCmdFlags['exclude-global-modules'];
     }
+    const spacesDir = path.join(config.contentDir, 'spaces');
+    const stackSettingsPath = path.join(config.contentDir, 'stack', 'settings.json');
+    const stackJsonPath = path.join(config.contentDir, 'stack', 'stack.json');
+    if ((0, node_fs_1.existsSync)(spacesDir) && (0, node_fs_1.existsSync)(stackSettingsPath)) {
+        try {
+            const stackSettings = JSON.parse((0, node_fs_1.readFileSync)(stackSettingsPath, 'utf8'));
+            if (stackSettings === null || stackSettings === void 0 ? void 0 : stackSettings.am_v2) {
+                config.assetManagementEnabled = true;
+                config.assetManagementUrl = (_b = cli_utilities_1.configHandler.get('region')) === null || _b === void 0 ? void 0 : _b.assetManagementUrl;
+                if ((0, node_fs_1.existsSync)(stackJsonPath)) {
+                    try {
+                        const stackData = JSON.parse((0, node_fs_1.readFileSync)(stackJsonPath, 'utf8'));
+                        const apiKey = (stackData === null || stackData === void 0 ? void 0 : stackData.api_key) || ((_c = stackData === null || stackData === void 0 ? void 0 : stackData.stackHeaders) === null || _c === void 0 ? void 0 : _c.api_key);
+                        if (apiKey) {
+                            config.source_stack = apiKey;
+                        }
+                    }
+                    catch (_d) {
+                        // stack.json unreadable — source stack API key will not be set
+                    }
+                }
+            }
+        }
+        catch (_e) {
+            // stack settings unreadable — not an AM 2.0 export we can process
+        }
+    }
     // Add authentication details to config for context tracking
     config.authenticationMethod = authenticationMethod;
     cli_utilities_1.log.debug('Import configuration setup completed.', Object.assign({}, config));

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

@@ -1,12 +1,4 @@
 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

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

@@ -1,60 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.executeImportPathLogic = exports.updateImportConfigWithResolvedPath = exports.resolveImportPath = exports.selectBranchFromDirectory = void 0;
+exports.executeImportPathLogic = exports.updateImportConfigWithResolvedPath = exports.resolveImportPath = void 0;
 const tslib_1 = require("tslib");
-const path = tslib_1.__importStar(require("path"));
+const path = tslib_1.__importStar(require("node:path"));
 const cli_utilities_1 = require("@contentstack/cli-utilities");
 const config_1 = tslib_1.__importDefault(require("../config"));
-const interactive_1 = require("./interactive");
 const file_helper_1 = require("./file-helper");
-/**
- * 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
@@ -68,31 +19,12 @@ const resolveImportPath = async (importConfig, stackAPIClient) => {
     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 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 ');
+        cli_utilities_1.log.debug('Found module folders at export root');
         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;
 };
@@ -108,9 +40,8 @@ const updateImportConfigWithResolvedPath = async (importConfig, resolvedPath) =>
         cli_utilities_1.log.warn(`Resolved path does not exist: ${resolvedPath}, skipping config update`);
         return;
     }
-    importConfig.branchDir = resolvedPath;
     importConfig.contentDir = resolvedPath;
-    cli_utilities_1.log.debug(`Import config updated - contentDir: ${importConfig.contentDir}, branchDir: ${importConfig.branchDir}`);
+    cli_utilities_1.log.debug(`Import config updated - contentDir: ${importConfig.contentDir}`);
 };
 exports.updateImportConfigWithResolvedPath = updateImportConfigWithResolvedPath;
 /**

package/lib/utils/index.d.ts

@@ -1,5 +1,5 @@
 export { setupBranchConfig } from './setup-branch';
-export { selectBranchFromDirectory, resolveImportPath, updateImportConfigWithResolvedPath, executeImportPathLogic } from './import-path-resolver';
+export { 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';
@@ -14,3 +14,4 @@ export { lookupEntries, removeUidsFromJsonRteFields, removeEntryRefsFromJSONRTE,
 export * from './common-helper';
 export { lookUpTaxonomy, lookUpTerms } from './taxonomies-helper';
 export { MODULE_CONTEXTS, MODULE_NAMES, PROCESS_NAMES, PROCESS_STATUS } from './constants';
+export { buildImportSpacesOptions } from './build-import-spaces-options';

package/lib/utils/index.js

@@ -1,11 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PROCESS_STATUS = exports.PROCESS_NAMES = exports.MODULE_NAMES = exports.MODULE_CONTEXTS = 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;
+exports.buildImportSpacesOptions = exports.PROCESS_STATUS = exports.PROCESS_NAMES = exports.MODULE_NAMES = exports.MODULE_CONTEXTS = 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.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; } });
@@ -52,3 +51,5 @@ Object.defineProperty(exports, "MODULE_CONTEXTS", { enumerable: true, get: funct
 Object.defineProperty(exports, "MODULE_NAMES", { enumerable: true, get: function () { return constants_1.MODULE_NAMES; } });
 Object.defineProperty(exports, "PROCESS_NAMES", { enumerable: true, get: function () { return constants_1.PROCESS_NAMES; } });
 Object.defineProperty(exports, "PROCESS_STATUS", { enumerable: true, get: function () { return constants_1.PROCESS_STATUS; } });
+var build_import_spaces_options_1 = require("./build-import-spaces-options");
+Object.defineProperty(exports, "buildImportSpacesOptions", { enumerable: true, get: function () { return build_import_spaces_options_1.buildImportSpacesOptions; } });

package/oclif.manifest.json

@@ -168,5 +168,5 @@
       ]
     }
   },
-  "version": "2.0.0-beta.14"
+  "version": "2.0.0-beta.16"
 }

package/package.json

@@ -1,30 +1,31 @@
 {
   "name": "@contentstack/cli-cm-import",
   "description": "Contentstack CLI plugin to import content into stack",
-  "version": "2.0.0-beta.14",
+  "version": "2.0.0-beta.16",
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {
-    "@contentstack/cli-audit": "~2.0.0-beta.9",
-    "@contentstack/cli-command": "~2.0.0-beta.5",
-    "@contentstack/cli-utilities": "~2.0.0-beta.5",
-    "@contentstack/cli-variants": "~2.0.0-beta.11",
+    "@contentstack/cli-audit": "~2.0.0-beta.11",
+    "@contentstack/cli-command": "~2.0.0-beta.6",
+    "@contentstack/cli-utilities": "~2.0.0-beta.7",
+    "@contentstack/cli-variants": "~2.0.0-beta.12",
+    "@contentstack/cli-asset-management": "~1.0.0-beta.0",
     "@oclif/core": "^4.3.0",
     "big-json": "^3.2.0",
     "bluebird": "^3.7.2",
     "chalk": "^5.6.2",
     "debug": "^4.4.3",
     "fs-extra": "^11.3.3",
-    "lodash": "^4.17.23",
+    "lodash": "^4.18.1",
     "marked": "^4.3.0",
     "merge": "^2.1.1",
     "mkdirp": "^1.0.4",
     "promise-limit": "^2.7.0",
     "uuid": "^9.0.1",
-    "winston": "^3.17.0"
+    "winston": "^3.19.0"
   },
   "devDependencies": {
-    "@oclif/test": "^4.1.16",
+    "@oclif/test": "^4.1.18",
     "@types/big-json": "^3.2.5",
     "@types/bluebird": "^3.5.42",
     "@types/fs-extra": "^11.0.4",
@@ -90,4 +91,4 @@
     }
   },
   "repository": "https://github.com/contentstack/cli"
-}
+}