@contentstack/cli-cm-import 1.25.1 → 1.26.1

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.25.1 linux-x64 node-v22.17.0
+@contentstack/cli-cm-import/1.26.1 linux-x64 node-v22.17.1
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND
@@ -89,7 +89,7 @@ FLAGS
                                           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, and taxonomies.
+                                          workflows, custom-roles, personalize projects, and taxonomies.
   -y, --yes                               [optional] Force override all Marketplace prompts.
       --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
@@ -155,7 +155,7 @@ FLAGS
                                           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, and taxonomies.
+                                          workflows, custom-roles, personalize projects, and taxonomies.
   -y, --yes                               [optional] Force override all Marketplace prompts.
       --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

package/lib/commands/cm/stacks/import.d.ts

@@ -7,4 +7,5 @@ export default class ImportCommand extends Command {
     static aliases: string[];
     static usage: string;
     run(): Promise<void>;
+    private createImportContext;
 }

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

@@ -1,7 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
-const node_path_1 = tslib_1.__importDefault(require("node:path"));
 const cli_command_1 = require("@contentstack/cli-command");
 const cli_utilities_1 = require("@contentstack/cli-utilities");
 const import_1 = require("../../../import");
@@ -15,6 +13,10 @@ class ImportCommand extends cli_command_1.Command {
         try {
             const { flags } = await this.parse(ImportCommand);
             let importConfig = await (0, utils_1.setupImportConfig)(flags);
+            // 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);
             // Note setting host to create cma client
             importConfig.host = this.cmaHost;
             importConfig.region = this.region;
@@ -22,12 +24,15 @@ class ImportCommand extends cli_command_1.Command {
                 importConfig.developerHubBaseUrl = this.developerHubUrl;
             if (this.personalizeUrl)
                 importConfig.modules.personalize.baseURL[importConfig.region.name] = this.personalizeUrl;
-            backupDir = importConfig.cliLogsPath || importConfig.backupDir;
             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({ api_key: importConfig.apiKey })
+                        .stack({ [keyProp]: importConfig.apiKey })
                         .branch()
                         .query()
                         .find()
@@ -40,22 +45,44 @@ class ImportCommand extends cli_command_1.Command {
                     // Branch not enabled, just the let flow continue
                 }
             }
+            // Set backupDir early so it's available in error handling
+            backupDir = importConfig.backupDir;
             const moduleImporter = new import_1.ModuleImporter(managementAPIClient, importConfig);
             const result = await moduleImporter.start();
             if (!(result === null || result === void 0 ? void 0 : result.noSuccessMsg)) {
-                (0, utils_1.log)(importConfig, importConfig.stackName
+                const successMessage = importConfig.stackName
                     ? `Successfully imported the content to the stack named ${importConfig.stackName} with the API key ${importConfig.apiKey} .`
-                    : `The content has been imported to the stack ${importConfig.apiKey} successfully!`, 'success');
+                    : `The content has been imported to the stack ${importConfig.apiKey} successfully!`;
+                cli_utilities_1.log.success(successMessage, importConfig.context);
             }
-            (0, utils_1.log)(importConfig, `The log has been stored at '${(0, cli_utilities_1.pathValidator)(node_path_1.default.join(importConfig.cliLogsPath || importConfig.backupDir, 'logs', 'import'))}'`, 'success');
+            cli_utilities_1.log.success(`The log has been stored at '${(0, cli_utilities_1.getLogPath)()}'`, importConfig.context);
+            cli_utilities_1.log.info(`The backup content has been stored at '${backupDir}'`, importConfig.context);
         }
         catch (error) {
-            (0, utils_1.log)({ data: backupDir !== null && backupDir !== void 0 ? backupDir : (0, cli_utilities_1.pathValidator)(node_path_1.default.join(backupDir || __dirname, 'logs', 'import')) }, `Failed to import stack content - ${(0, utils_1.formatError)(error)}`, 'error');
-            (0, utils_1.log)({ data: backupDir }, `The log has been stored at ${{ data: backupDir }
-                ? (0, cli_utilities_1.pathValidator)(node_path_1.default.join(backupDir || __dirname, 'logs', 'import'))
-                : (0, cli_utilities_1.pathValidator)(node_path_1.default.join(__dirname, 'logs'))}`, 'info');
+            (0, cli_utilities_1.handleAndLogError)(error);
+            cli_utilities_1.log.info(`The log has been stored at '${(0, cli_utilities_1.getLogPath)()}'`);
+            if (backupDir) {
+                cli_utilities_1.log.info(`The backup content has been stored at '${backupDir}'`);
+            }
+            else {
+                cli_utilities_1.log.info('No backup directory was created due to early termination');
+            }
         }
     }
+    // Create export context object
+    createImportContext(apiKey, authenticationMethod) {
+        var _a, _b, _c;
+        return {
+            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') || '',
+            authenticationMethod: authenticationMethod || 'Basic Auth',
+        };
+    }
 }
 exports.default = ImportCommand;
 ImportCommand.description = cli_utilities_1.messageHandler.parse('Import content from a stack');
@@ -111,7 +138,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, 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, and taxonomies.',
         parse: (0, cli_utilities_1.printFlagDeprecation)(['-m'], ['--module']),
     }),
     'backup-dir': cli_utilities_1.flags.string({

package/lib/import/module-importer.js

@@ -40,7 +40,15 @@ 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'].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 };
             }
@@ -50,7 +58,7 @@ class ModuleImporter {
             this.importConfig['master_locale'] = { code: masterLocalResponse.code };
             this.importConfig.masterLocale = { code: masterLocalResponse.code };
         }
-        await (0, utils_1.sanitizeStack)(this.stackAPIClient);
+        await (0, utils_1.sanitizeStack)(this.importConfig);
         return this.import();
     }
     async import() {
@@ -119,11 +127,20 @@ class ModuleImporter {
             }
             else if (this.importConfig.modules.types.length) {
                 this.importConfig.modules.types
-                    .filter((val) => ['content-types', 'global-fields', 'entries', 'extensions', 'workflows', 'custom-roles'].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');
             const result = await cli_audit_1.AuditFix.run(args);
             (0, utils_1.log)(this.importConfig, 'Audit process completed', 'info');

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

@@ -1,5 +1,5 @@
-import BaseClass, { ApiOptions } from './base-class';
 import { ModuleClassParams } from '../../types';
+import BaseClass, { ApiOptions } from './base-class';
 export default class ImportAssets extends BaseClass {
     private fs;
     private assetsPath;

package/lib/import/modules/assets.js

@@ -24,6 +24,7 @@ class ImportAssets extends base_class_1.default {
         this.assetsUidMap = {};
         this.assetsUrlMap = {};
         this.assetsFolderMap = {};
+        this.importConfig.context.module = 'assets';
         this.assetsPath = (0, node_path_1.join)(this.importConfig.backupDir, 'assets');
         this.mapperDirPath = (0, node_path_1.join)(this.importConfig.backupDir, 'mapper', 'assets');
         this.assetUidMapperPath = (0, node_path_1.join)(this.mapperDirPath, 'uid-mapping.json');
@@ -38,52 +39,76 @@ class ImportAssets extends base_class_1.default {
      * @returns {Promise<void>} Promise<any>
      */
     async start() {
-        // NOTE Step 1: Import folders and create uid mapping file
-        await this.importFolders();
-        // NOTE Step 2: Import versioned assets and create it mapping files (uid, url)
-        if (this.assetConfig.includeVersionedAssets) {
-            if ((0, node_fs_1.existsSync)(`${this.assetsPath}/versions`))
-                await this.importAssets(true);
-            else
-                (0, utils_1.log)(this.importConfig, 'No Versioned assets found to import', 'info');
+        try {
+            // NOTE Step 1: Import folders and create uid mapping file
+            cli_utilities_1.log.debug('Starting folder import process', this.importConfig.context);
+            await this.importFolders();
+            // NOTE Step 2: Import versioned assets and create it mapping files (uid, url)
+            if (this.assetConfig.includeVersionedAssets) {
+                const versionsPath = `${this.assetsPath}/versions`;
+                if ((0, node_fs_1.existsSync)(versionsPath)) {
+                    cli_utilities_1.log.debug('Starting versioned assets import', this.importConfig.context);
+                    await this.importAssets(true);
+                }
+                else {
+                    cli_utilities_1.log.info('No Versioned assets found to import', this.importConfig.context);
+                }
+            }
+            // NOTE Step 3: Import Assets and create it mapping files (uid, url)
+            cli_utilities_1.log.debug('Starting assets import', this.importConfig.context);
+            await this.importAssets();
+            // NOTE Step 4: Publish assets
+            if (!this.importConfig.skipAssetsPublish) {
+                cli_utilities_1.log.debug('Starting assets publishing', this.importConfig.context);
+                await this.publish();
+            }
+            cli_utilities_1.log.success('Assets imported successfully!', this.importConfig.context);
+        }
+        catch (error) {
+            (0, cli_utilities_1.handleAndLogError)(error, Object.assign({}, this.importConfig.context));
         }
-        // NOTE Step 3: Import Assets and create it mapping files (uid, url)
-        await this.importAssets();
-        // NOTE Step 4: Publish assets
-        if (!this.importConfig.skipAssetsPublish)
-            await this.publish();
     }
     /**
      * @method importFolders
      * @returns {Promise<any>} Promise<any>
      */
     async importFolders() {
-        const folders = this.fs.readFile((0, node_path_1.resolve)(this.assetsRootPath, 'folders.json'));
+        const foldersPath = (0, node_path_1.resolve)(this.assetsRootPath, 'folders.json');
+        cli_utilities_1.log.debug(`Reading folders from: ${foldersPath}`, this.importConfig.context);
+        const folders = this.fs.readFile(foldersPath);
         if ((0, isEmpty_1.default)(folders)) {
-            (0, utils_1.log)(this.importConfig, 'No folders found to import', 'info');
+            cli_utilities_1.log.info('No folders found to import', this.importConfig.context);
             return;
         }
+        cli_utilities_1.log.debug(`Found ${folders.length} folders to import`, this.importConfig.context);
         const batches = this.constructFolderImportOrder(folders);
+        cli_utilities_1.log.debug(`Organized folders into ${batches.length} batches for import`, this.importConfig.context);
         const onSuccess = ({ response, apiData: { uid, name } = { uid: null, name: '' } }) => {
             this.assetsFolderMap[uid] = response.uid;
-            (0, utils_1.log)(this.importConfig, `Created folder: '${name}'`, 'success');
+            cli_utilities_1.log.debug(`Created folder: ${name} (Mapped ${uid} → ${response.uid})`, this.importConfig.context);
+            cli_utilities_1.log.success(`Created folder: '${name}'`, this.importConfig.context);
         };
         const onReject = ({ error, apiData: { name } = { name: '' } }) => {
-            (0, utils_1.log)(this.importConfig, `${name} folder creation failed.!`, 'error');
-            (0, utils_1.log)(this.importConfig, (0, utils_1.formatError)(error), 'error');
+            cli_utilities_1.log.error(`${name} folder creation failed.!`, this.importConfig.context);
+            (0, cli_utilities_1.handleAndLogError)(error, Object.assign(Object.assign({}, this.importConfig.context), { name }));
         };
         const serializeData = (apiOptions) => {
             if (apiOptions.apiData.parent_uid) {
+                const originalParent = apiOptions.apiData.parent_uid;
                 apiOptions.apiData.parent_uid = this.assetsFolderMap[apiOptions.apiData.parent_uid];
+                cli_utilities_1.log.debug(`Mapped parent folder: ${originalParent} → ${apiOptions.apiData.parent_uid}`, this.importConfig.context);
             }
             return apiOptions;
         };
         const batch = (0, map_1.default)((0, unionBy_1.default)(batches, 'parent_uid'), 'parent_uid');
+        cli_utilities_1.log.debug(`Processing ${batch.length} folder batches`, this.importConfig.context);
         for (const parent_uid of batch) {
+            const currentBatch = (0, filter_1.default)(batches, { parent_uid });
+            cli_utilities_1.log.debug(`Processing batch with parent_uid: ${parent_uid} (${currentBatch.length} folders)`, this.importConfig.context);
             // NOTE create parent folders
             /* eslint-disable no-await-in-loop */
             await this.makeConcurrentCall({
-                apiContent: (0, orderBy_1.default)((0, filter_1.default)(batches, { parent_uid }), 'created_at'),
+                apiContent: (0, orderBy_1.default)(currentBatch, 'created_at'),
                 processName: 'import assets folders',
                 apiParams: {
                     serializeData,
@@ -96,6 +121,7 @@ class ImportAssets extends base_class_1.default {
             }, undefined, false);
         }
         if (!(0, isEmpty_1.default)(this.assetsFolderMap)) {
+            cli_utilities_1.log.debug(`Writing folder mappings to ${this.assetFolderUidMapperPath}`, this.importConfig.context);
             this.fs.writeFile(this.assetFolderUidMapperPath, this.assetsFolderMap);
         }
     }
@@ -108,32 +134,38 @@ class ImportAssets extends base_class_1.default {
         const processName = isVersion ? 'import versioned assets' : 'import assets';
         const indexFileName = isVersion ? 'versioned-assets.json' : 'assets.json';
         const basePath = isVersion ? (0, node_path_1.join)(this.assetsPath, 'versions') : this.assetsPath;
+        cli_utilities_1.log.debug(`Importing ${processName} from ${basePath}`, this.importConfig.context);
         const fs = new cli_utilities_1.FsUtility({ basePath, indexFileName });
         const indexer = fs.indexFileContent;
         const indexerCount = (0, values_1.default)(indexer).length;
+        cli_utilities_1.log.debug(`Found ${indexerCount} asset chunks to process`, this.importConfig.context);
         const onSuccess = ({ response = {}, apiData: { uid, url, title } = undefined }) => {
             this.assetsUidMap[uid] = response.uid;
             this.assetsUrlMap[url] = response.url;
-            (0, utils_1.log)(this.importConfig, `Created asset: '${title}'`, 'info');
+            cli_utilities_1.log.debug(`Created asset: ${title} (Mapped ${uid} → ${response.uid})`, this.importConfig.context);
+            cli_utilities_1.log.success(`Created asset: '${title}'`, this.importConfig.context);
         };
         const onReject = ({ error, apiData: { title } = undefined }) => {
-            (0, utils_1.log)(this.importConfig, `${title} asset upload failed.!`, 'error');
-            (0, utils_1.log)(this.importConfig, (0, utils_1.formatError)(error), 'error');
+            cli_utilities_1.log.error(`${title} asset upload failed.!`, this.importConfig.context);
+            (0, cli_utilities_1.handleAndLogError)(error, Object.assign(Object.assign({}, this.importConfig.context), { title }));
         };
         /* eslint-disable @typescript-eslint/no-unused-vars, guard-for-in */
         for (const index in indexer) {
+            cli_utilities_1.log.debug(`Processing chunk ${index} of ${indexerCount}`, this.importConfig.context);
             const chunk = await fs.readChunkFiles.next().catch((error) => {
-                (0, utils_1.log)(this.importConfig, error, 'error');
+                (0, cli_utilities_1.handleAndLogError)(error, Object.assign({}, this.importConfig.context));
             });
             if (chunk) {
                 let apiContent = (0, orderBy_1.default)((0, values_1.default)(chunk), '_version');
+                cli_utilities_1.log.debug(`Processing ${apiContent.length} assets in chunk`, this.importConfig.context);
                 if (isVersion && this.assetConfig.importSameStructure) {
-                    // NOTE to create same structure it must have seed assets/version 1 asset to be created first
+                    cli_utilities_1.log.debug('Processing version 1 assets first', this.importConfig.context);
+                    const versionOneAssets = (0, filter_1.default)(apiContent, ({ _version }) => _version === 1);
                     await this.makeConcurrentCall({
                         processName,
                         indexerCount,
                         currentIndexer: +index,
-                        apiContent: (0, filter_1.default)(apiContent, ({ _version }) => _version === 1),
+                        apiContent: versionOneAssets,
                         apiParams: {
                             reject: onReject,
                             resolve: onSuccess,
@@ -144,6 +176,7 @@ class ImportAssets extends base_class_1.default {
                         concurrencyLimit: this.assetConfig.uploadAssetsConcurrency,
                     });
                     apiContent = (0, filter_1.default)(apiContent, ({ _version }) => _version > 1);
+                    cli_utilities_1.log.debug(`Processing ${apiContent.length} versioned assets after version 1`, this.importConfig.context);
                 }
                 await this.makeConcurrentCall({
                     apiContent,
@@ -161,9 +194,17 @@ class ImportAssets extends base_class_1.default {
                 }, undefined, !isVersion);
             }
         }
-        if (!isVersion && (!(0, isEmpty_1.default)(this.assetsUidMap) || !(0, isEmpty_1.default)(this.assetsUrlMap))) {
-            this.fs.writeFile(this.assetUidMapperPath, this.assetsUidMap);
-            this.fs.writeFile(this.assetUrlMapperPath, this.assetsUrlMap);
+        if (!isVersion) {
+            if (!(0, isEmpty_1.default)(this.assetsUidMap)) {
+                const uidMappingCount = Object.keys(this.assetsUidMap).length;
+                cli_utilities_1.log.debug(`Writing ${uidMappingCount} UID mappings`, this.importConfig.context);
+                this.fs.writeFile(this.assetUidMapperPath, this.assetsUidMap);
+            }
+            if (!(0, isEmpty_1.default)(this.assetsUrlMap)) {
+                const urlMappingCount = Object.keys(this.assetsUrlMap).length;
+                cli_utilities_1.log.debug(`Writing ${urlMappingCount} URL mappings`, this.importConfig.context);
+                this.fs.writeFile(this.assetUrlMapperPath, this.assetsUrlMap);
+            }
         }
     }
     /**
@@ -175,24 +216,27 @@ class ImportAssets extends base_class_1.default {
         const { apiData: asset } = apiOptions;
         if (!this.assetConfig.importSameStructure &&
             !this.assetConfig.includeVersionedAssets &&
-            /* eslint-disable @typescript-eslint/no-unused-vars, no-prototype-builtins */
             this.assetsUidMap.hasOwnProperty(asset.uid)) {
-            (0, utils_1.log)(this.importConfig, `Skipping upload of asset: ${asset.uid}. Its mapped to: ${this.assetsUidMap[asset.uid]}`, 'success');
+            cli_utilities_1.log.info(`Skipping existing asset: ${asset.uid} (${asset.title})`, this.importConfig.context);
             apiOptions.entity = undefined;
             return apiOptions;
         }
         asset.upload = (0, node_path_1.join)(this.assetsPath, 'files', asset.uid, asset.filename);
+        cli_utilities_1.log.debug(`Asset file path resolved to: ${asset.upload}`, this.importConfig.context);
         if (asset.parent_uid) {
+            const originalParent = asset.parent_uid;
             asset.parent_uid = this.assetsFolderMap[asset.parent_uid];
+            cli_utilities_1.log.debug(`Mapped parent UID: ${originalParent} → ${asset.parent_uid}`, this.importConfig.context);
         }
         else if (this.importConfig.replaceExisting) {
-            // adds the root folder as parent for all assets in the root level
             asset.parent_uid = this.assetsFolderMap[this.rootFolder.uid];
+            cli_utilities_1.log.debug(`Assigned root folder as parent: ${asset.parent_uid}`, this.importConfig.context);
         }
         apiOptions.apiData = asset;
         if (this.assetsUidMap[asset.uid] && this.assetConfig.importSameStructure) {
             apiOptions.entity = 'replace-assets';
             apiOptions.uid = this.assetsUidMap[asset.uid];
+            cli_utilities_1.log.debug(`Preparing to replace asset: ${asset.uid} → ${apiOptions.uid}`, this.importConfig.context);
         }
         return apiOptions;
     }
@@ -203,16 +247,18 @@ class ImportAssets extends base_class_1.default {
     async publish() {
         const fs = new cli_utilities_1.FsUtility({ basePath: this.assetsPath, indexFileName: 'assets.json' });
         if ((0, isEmpty_1.default)(this.assetsUidMap)) {
+            cli_utilities_1.log.debug('Loading asset UID mappings from file', this.importConfig.context);
             this.assetsUidMap = fs.readFile(this.assetUidMapperPath, true);
         }
         const indexer = fs.indexFileContent;
         const indexerCount = (0, values_1.default)(indexer).length;
+        cli_utilities_1.log.debug(`Found ${indexerCount} asset chunks to publish`, this.importConfig.context);
         const onSuccess = ({ apiData: { uid, title } = undefined }) => {
-            (0, utils_1.log)(this.importConfig, `Asset '${uid}: ${title}' published successfully`, 'success');
+            cli_utilities_1.log.success(`Asset '${uid}: ${title}' published successfully`, this.importConfig.context);
         };
         const onReject = ({ error, apiData: { uid, title } = undefined }) => {
-            (0, utils_1.log)(this.importConfig, `Asset '${uid}: ${title}' not published`, 'error');
-            (0, utils_1.log)(this.importConfig, (0, utils_1.formatError)(error), 'error');
+            cli_utilities_1.log.error(`Asset '${uid}: ${title}' not published`, this.importConfig.context);
+            (0, cli_utilities_1.handleAndLogError)(error, Object.assign(Object.assign({}, this.importConfig.context), { uid, title }));
         };
         const serializeData = (apiOptions) => {
             const { apiData: asset } = apiOptions;
@@ -224,21 +270,26 @@ class ImportAssets extends base_class_1.default {
                 const environments = (0, uniq_1.default)((0, map_1.default)(publishDetails, ({ environment }) => this.environments[environment].name));
                 const locales = (0, uniq_1.default)((0, map_1.default)(publishDetails, 'locale'));
                 if (environments.length === 0 || locales.length === 0) {
+                    cli_utilities_1.log.debug(`Skipping publish for asset ${asset.uid} - no valid environments/locales`, this.importConfig.context);
                     apiOptions.entity = undefined;
                     return apiOptions;
                 }
                 asset.locales = locales;
                 asset.environments = environments;
                 apiOptions.apiData.publishDetails = { locales, environments };
+                cli_utilities_1.log.debug(`Prepared publish details for asset ${asset.uid}`, this.importConfig.context);
             }
             apiOptions.uid = this.assetsUidMap[asset.uid];
-            if (!apiOptions.uid)
+            if (!apiOptions.uid) {
+                cli_utilities_1.log.debug(`Skipping publish for asset ${asset.uid} - no UID mapping found`, this.importConfig.context);
                 apiOptions.entity = undefined;
+            }
             return apiOptions;
         };
-        /* eslint-disable @typescript-eslint/no-unused-vars */
         for (const index in indexer) {
+            cli_utilities_1.log.debug(`Processing publish chunk ${index} of ${indexerCount}`, this.importConfig.context);
             const apiContent = (0, filter_1.default)((0, values_1.default)(await fs.readChunkFiles.next()), ({ publish_details }) => !(0, isEmpty_1.default)(publish_details));
+            cli_utilities_1.log.debug(`Found ${apiContent.length} publishable assets in chunk`, this.importConfig.context);
             await this.makeConcurrentCall({
                 apiContent,
                 indexerCount,
@@ -262,19 +313,22 @@ class ImportAssets extends base_class_1.default {
      */
     constructFolderImportOrder(folders) {
         let parentUIds = [];
-        // NOTE: Read root folder
         const importOrder = (0, filter_1.default)(folders, { parent_uid: null }).map(({ uid, name, parent_uid, created_at }) => {
             parentUIds.push(uid);
             return { uid, name, parent_uid, created_at };
         });
+        cli_utilities_1.log.debug(`Found ${importOrder.length} root folders`, this.importConfig.context);
         while (!(0, isEmpty_1.default)(parentUIds)) {
             // NOTE: Read nested folders every iteration until we find empty folders
-            parentUIds = (0, filter_1.default)(folders, ({ parent_uid }) => (0, includes_1.default)(parentUIds, parent_uid)).map(({ uid, name, parent_uid, created_at }) => {
+            const nestedFolders = (0, filter_1.default)(folders, ({ parent_uid }) => (0, includes_1.default)(parentUIds, parent_uid));
+            cli_utilities_1.log.debug(`Processing ${nestedFolders.length} nested folders`, this.importConfig.context);
+            parentUIds = nestedFolders.map(({ uid, name, parent_uid, created_at }) => {
                 importOrder.push({ uid, name, parent_uid, created_at });
                 return uid;
             });
         }
         if (this.importConfig.replaceExisting) {
+            cli_utilities_1.log.debug('Setting up root folder for import', this.importConfig.context);
             // Note: adds a root folder to distinguish latest asset uploads
             // Todo: This temporary approach should be updated with asset and folder overwrite strategy, which follows
             // folder overwrite
@@ -295,8 +349,8 @@ class ImportAssets extends base_class_1.default {
                     importOrder.splice(index, 1, Object.assign(Object.assign({}, folder), { parent_uid: this.rootFolder.uid }));
                 }
             });
-            // NOTE: Adds root folder
             importOrder.unshift(this.rootFolder);
+            cli_utilities_1.log.debug('Added root folder to import order', this.importConfig.context);
         }
         return importOrder;
     }