@contentstack/cli-cm-import 1.25.0 → 1.26.0

package/lib/utils/entries-helper.js

@@ -11,9 +11,10 @@ const _ = tslib_1.__importStar(require("lodash"));
 const config_1 = tslib_1.__importDefault(require("../config"));
 const fileHelper = tslib_1.__importStar(require("./file-helper"));
 const cli_utilities_1 = require("@contentstack/cli-utilities");
-const log_1 = require("./log");
 // update references in entry object
 const lookupEntries = function (data, mappedUids, uidMapperPath) {
+    var _a, _b, _c;
+    cli_utilities_1.log.debug(`Starting entry lookup for entry: ${(_a = data.entry) === null || _a === void 0 ? void 0 : _a.uid}, content type: ${(_b = data.content_type) === null || _b === void 0 ? void 0 : _b.uid}`);
     let parent = [];
     let uids = [];
     let unmapped = [];
@@ -35,6 +36,7 @@ const lookupEntries = function (data, mappedUids, uidMapperPath) {
                     case 'reference': {
                         if (((_a = Object.keys(element.attrs)) === null || _a === void 0 ? void 0 : _a.length) > 0 && ((_b = element.attrs) === null || _b === void 0 ? void 0 : _b.type) === 'entry') {
                             if (uids.indexOf(element.attrs['entry-uid']) === -1) {
+                                cli_utilities_1.log.debug(`Found entry reference in JSON RTE: ${element.attrs['entry-uid']}`);
                                 uids.push(element.attrs['entry-uid']);
                             }
                         }
@@ -58,12 +60,15 @@ const lookupEntries = function (data, mappedUids, uidMapperPath) {
                         if (((_a = _entry[_parent[j]]) === null || _a === void 0 ? void 0 : _a.length) && Object.keys(_entry).includes(_parent[j])) {
                             (_b = _entry[_parent[j]]) === null || _b === void 0 ? void 0 : _b.forEach((item, idx) => {
                                 if (typeof item.uid === 'string' && item._content_type_uid) {
+                                    cli_utilities_1.log.debug(`Found structured reference: ${item.uid}`);
                                     uids.push(item.uid);
                                 }
                                 else if (typeof item === 'string' && preserveStackVersion === true) {
+                                    cli_utilities_1.log.debug(`Found string reference (preserve version): ${item}`);
                                     uids.push(item);
                                 }
                                 else {
+                                    cli_utilities_1.log.debug(`Converting reference to structured format: ${item}`);
                                     uids.push(item);
                                     _entry[_parent[j]][idx] = {
                                         uid: item,
@@ -76,11 +81,13 @@ const lookupEntries = function (data, mappedUids, uidMapperPath) {
                     else if (Array.isArray(_entry[_parent[j]])) {
                         for (const element of _entry[_parent[j]]) {
                             if ((_c = element.uid) === null || _c === void 0 ? void 0 : _c.length) {
+                                cli_utilities_1.log.debug(`Found asset reference: ${element.uid}`);
                                 uids.push(element.uid);
                             }
                         }
                     }
                     else if ((_d = _entry[_parent[j]].uid) === null || _d === void 0 ? void 0 : _d.length) {
+                        cli_utilities_1.log.debug(`Found single asset reference: ${_entry[_parent[j]].uid}`);
                         uids.push(_entry[_parent[j]].uid);
                     }
                 }
@@ -110,6 +117,7 @@ const lookupEntries = function (data, mappedUids, uidMapperPath) {
             switch (schema[i].data_type) {
                 case 'reference':
                     if (Array.isArray(schema[i].reference_to)) {
+                        cli_utilities_1.log.debug(`Processing multi-reference field: ${schema[i].uid}`);
                         isNewRefFields = true;
                         (_b = (_a = schema[i]) === null || _a === void 0 ? void 0 : _a.reference_to) === null || _b === void 0 ? void 0 : _b.forEach((reference) => {
                             parent.push(schema[i].uid);
@@ -118,6 +126,7 @@ const lookupEntries = function (data, mappedUids, uidMapperPath) {
                         });
                     }
                     else {
+                        cli_utilities_1.log.debug(`Processing single reference field: ${schema[i].uid}`);
                         parent.push(schema[i].uid);
                         update(parent, schema[i].reference_to, _entry);
                         parent.pop();
@@ -125,11 +134,13 @@ const lookupEntries = function (data, mappedUids, uidMapperPath) {
                     break;
                 case 'global_field':
                 case 'group':
+                    cli_utilities_1.log.debug(`Processing ${schema[i].data_type} field: ${schema[i].uid}`);
                     parent.push(schema[i].uid);
                     find(schema[i].schema, _entry);
                     parent.pop();
                     break;
                 case 'blocks':
+                    cli_utilities_1.log.debug(`Processing blocks field: ${schema[i].uid}`);
                     for (let j = 0, _j = (_c = schema[i].blocks) === null || _c === void 0 ? void 0 : _c.length; j < _j; j++) {
                         parent.push(schema[i].uid);
                         parent.push(schema[i].blocks[j].uid);
@@ -140,6 +151,7 @@ const lookupEntries = function (data, mappedUids, uidMapperPath) {
                     break;
                 case 'json':
                     if ((_e = (_d = schema[i]) === null || _d === void 0 ? void 0 : _d.field_metadata) === null || _e === void 0 ? void 0 : _e.rich_text_type) {
+                        cli_utilities_1.log.debug(`Processing JSON RTE field: ${schema[i].uid}`);
                         findEntryIdsFromJsonRte(data.entry, data.content_type.schema);
                     }
                     break;
@@ -148,6 +160,7 @@ const lookupEntries = function (data, mappedUids, uidMapperPath) {
     };
     function findEntryIdsFromJsonRte(entry, ctSchema = []) {
         var _a, _b, _c, _d;
+        cli_utilities_1.log.debug('Processing JSON RTE fields for entry references');
         for (const element of ctSchema) {
             switch (element.data_type) {
                 case 'blocks': {
@@ -194,14 +207,17 @@ const lookupEntries = function (data, mappedUids, uidMapperPath) {
     }
     find(data.content_type.schema, data.entry);
     if (isNewRefFields) {
+        cli_utilities_1.log.debug('Processing new reference field format');
         findUidsInNewRefFields(data.entry, uids);
     }
     uids = _.flattenDeep(uids);
     // if no references are found, return
     if (uids.length === 0) {
+        cli_utilities_1.log.debug('No entry references found');
         return data.entry;
     }
     uids = _.uniq(uids);
+    cli_utilities_1.log.debug(`Found ${uids.length} unique entry references`);
     let entry = JSON.stringify(data.entry);
     uids === null || uids === void 0 ? void 0 : uids.forEach(function (uid) {
         if (mappedUids.hasOwnProperty(uid)) {
@@ -214,7 +230,7 @@ const lookupEntries = function (data, mappedUids, uidMapperPath) {
                 mapped.push(uid);
             }
             else {
-                (0, log_1.log)(`Skipping the entry uid ${uid} since the regex is not valid`, 'warn');
+                cli_utilities_1.log.warn(`Skipping entry UID ${uid} due to invalid regex`);
             }
         }
         else {
@@ -222,6 +238,7 @@ const lookupEntries = function (data, mappedUids, uidMapperPath) {
         }
     });
     if (unmapped.length > 0) {
+        cli_utilities_1.log.warn(`Found ${unmapped.length} unmapped entry references`);
         let unmappedUids = fileHelper.readFileSync(path.join(uidMapperPath, 'unmapped-uids.json'));
         unmappedUids = unmappedUids || {};
         if (unmappedUids.hasOwnProperty(data.content_type.uid)) {
@@ -236,6 +253,7 @@ const lookupEntries = function (data, mappedUids, uidMapperPath) {
         fileHelper.writeFile(path.join(uidMapperPath, 'unmapped-uids.json'), unmappedUids);
     }
     if (mapped.length > 0) {
+        cli_utilities_1.log.debug(`Successfully mapped ${mapped.length} entry references`);
         let _mappedUids = fileHelper.readFileSync(path.join(uidMapperPath, 'mapped-uids.json'));
         _mappedUids = _mappedUids || {};
         if (_mappedUids.hasOwnProperty(data.content_type.uid)) {
@@ -249,6 +267,7 @@ const lookupEntries = function (data, mappedUids, uidMapperPath) {
         // write the mapped contents to ./mapper/language/mapped-uids.json
         fileHelper.writeFile(path.join(uidMapperPath, 'mapped-uids.json'), _mappedUids);
     }
+    cli_utilities_1.log.debug(`Entry lookup completed for entry: ${(_c = data.entry) === null || _c === void 0 ? void 0 : _c.uid}`);
     return JSON.parse(entry);
 };
 exports.lookupEntries = lookupEntries;
@@ -273,6 +292,7 @@ function findUidsInNewRefFields(entry, uids) {
 }
 const removeUidsFromJsonRteFields = (entry, ctSchema = []) => {
     var _a;
+    cli_utilities_1.log.debug('Removing UIDs from JSON RTE fields');
     for (const element of ctSchema) {
         switch (element.data_type) {
             case 'blocks': {
@@ -306,6 +326,7 @@ const removeUidsFromJsonRteFields = (entry, ctSchema = []) => {
             }
             case 'json': {
                 if (entry[element.uid] && ((_a = element === null || element === void 0 ? void 0 : element.field_metadata) === null || _a === void 0 ? void 0 : _a.rich_text_type)) {
+                    cli_utilities_1.log.debug(`Processing JSON RTE field for UID removal: ${element.uid}`);
                     if (element.multiple) {
                         entry[element.uid] = entry[element.uid].map((jsonRteData) => {
                             delete jsonRteData.uid; // remove uid
@@ -332,6 +353,7 @@ const removeUidsFromJsonRteFields = (entry, ctSchema = []) => {
             }
         }
     }
+    cli_utilities_1.log.debug('Completed removing UIDs from JSON RTE fields');
     return entry;
 };
 exports.removeUidsFromJsonRteFields = removeUidsFromJsonRteFields;

package/lib/utils/extension-helper.js

@@ -13,17 +13,22 @@ const node_path_1 = require("node:path");
 const cli_utilities_1 = require("@contentstack/cli-utilities");
 // eslint-disable-next-line camelcase
 const lookupExtension = function (config, schema, preserveStackVersion, installedExtensions) {
+    cli_utilities_1.log.debug('Starting extension lookup process...');
     const fs = new cli_utilities_1.FsUtility({ basePath: config.backupDir });
     const extensionPath = (0, node_path_1.join)(config.backupDir, 'mapper/extensions', 'uid-mapping.json');
     const globalfieldsPath = (0, node_path_1.join)(config.backupDir, 'mapper/globalfields', 'uid-mapping.json');
     const marketPlaceAppsPath = (0, node_path_1.join)(config.backupDir, 'mapper/marketplace_apps', 'uid-mapping.json');
+    cli_utilities_1.log.debug(`Extension mapping paths - Extensions: ${extensionPath}, Global fields: ${globalfieldsPath}, Marketplace apps: ${marketPlaceAppsPath}`);
     for (let i in schema) {
         if (schema[i].data_type === 'group') {
+            cli_utilities_1.log.debug(`Processing group field: ${schema[i].uid}`);
             (0, exports.lookupExtension)(config, schema[i].schema, preserveStackVersion, installedExtensions);
         }
         else if (schema[i].data_type === 'blocks') {
+            cli_utilities_1.log.debug(`Processing blocks field: ${schema[i].uid}`);
             for (let block in schema[i].blocks) {
                 if (schema[i].blocks[block].hasOwnProperty('reference_to')) {
+                    cli_utilities_1.log.debug(`Removing schema from block with reference_to: ${schema[i].blocks[block].uid}`);
                     delete schema[i].blocks[block].schema;
                 }
                 else {
@@ -34,9 +39,11 @@ const lookupExtension = function (config, schema, preserveStackVersion, installe
         else if (schema[i].data_type === 'reference' &&
             !schema[i].field_metadata.hasOwnProperty('ref_multiple_content_types')) {
             if (preserveStackVersion) {
+                cli_utilities_1.log.debug(`Preserving stack version for reference field: ${schema[i].uid}`);
                 // do nothing
             }
             else {
+                cli_utilities_1.log.debug(`Converting reference field to multi-reference format: ${schema[i].uid}`);
                 schema[i].reference_to = [schema[i].reference_to];
                 schema[i].field_metadata.ref_multiple_content_types = true;
             }
@@ -45,45 +52,72 @@ const lookupExtension = function (config, schema, preserveStackVersion, installe
             schema[i].field_metadata.hasOwnProperty('ref_multiple_content_types') &&
             installedExtensions &&
             installedExtensions[schema[i].extension_uid]) {
+            cli_utilities_1.log.debug(`Updating extension UID for reference field: ${schema[i].uid}`);
             schema[i].extension_uid = installedExtensions[schema[i].extension_uid];
         }
         else if (schema[i].data_type === 'text' && installedExtensions && installedExtensions[schema[i].extension_uid]) {
+            cli_utilities_1.log.debug(`Updating extension UID for text field: ${schema[i].uid}`);
             schema[i].extension_uid = installedExtensions[schema[i].extension_uid];
         }
         else if (schema[i].data_type === 'global_field') {
+            cli_utilities_1.log.debug(`Processing global field: ${schema[i].uid}`);
             const global_fields_key_value = schema[i].reference_to;
             const global_fields_data = fs.readFile(globalfieldsPath);
             if (global_fields_data && global_fields_data.hasOwnProperty(global_fields_key_value)) {
+                const mappedValue = global_fields_data[global_fields_key_value];
+                cli_utilities_1.log.debug(`Mapping global field reference: ${global_fields_key_value} -> ${mappedValue}`);
                 schema[i].reference_to = global_fields_data[global_fields_key_value];
             }
+            else {
+                cli_utilities_1.log.warn(`No mapping found for global field: ${global_fields_key_value}`);
+            }
         }
         else if (schema[i].hasOwnProperty('extension_uid')) {
+            cli_utilities_1.log.debug(`Processing field with extension UID: ${schema[i].uid}`);
             const extension_key_value = schema[i].extension_uid;
             const data = fs.readFile(extensionPath);
             if (data && data.hasOwnProperty(extension_key_value)) {
+                const mappedExtension = data[extension_key_value];
+                cli_utilities_1.log.debug(`Mapping extension UID: ${extension_key_value} -> ${mappedExtension}`);
                 // eslint-disable-next-line camelcase
                 schema[i].extension_uid = data[extension_key_value];
             }
             else if (schema[i].field_metadata && schema[i].field_metadata.extension) {
                 if (installedExtensions && installedExtensions[schema[i].extension_uid]) {
+                    cli_utilities_1.log.debug(`Using installed extension mapping: ${schema[i].extension_uid}`);
                     schema[i].extension_uid = installedExtensions[schema[i].extension_uid];
                 }
+                else {
+                    cli_utilities_1.log.warn(`No mapping found for extension: ${extension_key_value}`);
+                }
             }
         }
         else if (schema[i].data_type === 'json' && schema[i].hasOwnProperty('plugins') && schema[i].plugins.length > 0) {
+            cli_utilities_1.log.debug(`Processing JSON field with plugins: ${schema[i].uid}`);
             const newPluginUidsArray = [];
             const data = fs.readFile(extensionPath);
             const marketPlaceAppsData = fs.readFile(marketPlaceAppsPath);
             schema[i].plugins.forEach((extension_key_value) => {
                 if (data && data.hasOwnProperty(extension_key_value)) {
+                    const mappedPlugin = data[extension_key_value];
+                    cli_utilities_1.log.debug(`Mapping plugin extension: ${extension_key_value} -> ${mappedPlugin}`);
                     newPluginUidsArray.push(data[extension_key_value]);
                 }
-                else if (marketPlaceAppsData && marketPlaceAppsData.extension_uid && marketPlaceAppsData.extension_uid.hasOwnProperty(extension_key_value)) {
+                else if (marketPlaceAppsData &&
+                    marketPlaceAppsData.extension_uid &&
+                    marketPlaceAppsData.extension_uid.hasOwnProperty(extension_key_value)) {
+                    const mappedMarketplaceExt = marketPlaceAppsData.extension_uid[extension_key_value];
+                    cli_utilities_1.log.debug(`Mapping marketplace app extension: ${extension_key_value} -> ${mappedMarketplaceExt}`);
                     newPluginUidsArray.push(marketPlaceAppsData.extension_uid[extension_key_value]);
                 }
+                else {
+                    cli_utilities_1.log.warn(`No mapping found for plugin extension: ${extension_key_value}`);
+                }
             });
+            cli_utilities_1.log.debug(`Updated plugins array with ${newPluginUidsArray.length} mapped extensions`);
             schema[i].plugins = newPluginUidsArray;
         }
     }
+    cli_utilities_1.log.debug('Extension lookup process completed');
 };
 exports.lookupExtension = lookupExtension;

package/lib/utils/global-field-helper.js

@@ -24,6 +24,6 @@ exports.gfSchemaTemplate = {
                 "multiple": false
             }
         ],
-        "description": "Seed "
+        "description": ""
     }
 };

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

@@ -12,6 +12,8 @@ const login_handler_1 = tslib_1.__importDefault(require("./login-handler"));
 const setupConfig = async (importCmdFlags) => {
     var _a;
     let config = (0, merge_1.default)({}, config_1.default);
+    // Track authentication method
+    let authenticationMethod = 'unknown';
     // setup the config
     if (importCmdFlags['config']) {
         let externalConfig = await (0, file_helper_1.readFile)(importCmdFlags['config']);
@@ -45,20 +47,36 @@ const setupConfig = async (importCmdFlags) => {
         const { token, apiKey } = (_a = cli_utilities_1.configHandler.get(`tokens.${managementTokenAlias}`)) !== null && _a !== void 0 ? _a : {};
         config.management_token = token;
         config.apiKey = apiKey;
+        authenticationMethod = 'Management Token';
         if (!config.management_token) {
             throw new Error(`No management token found on given alias ${managementTokenAlias}`);
         }
     }
     if (!config.management_token) {
         if (!(0, cli_utilities_1.isAuthenticated)()) {
+            cli_utilities_1.log.debug('User not authenticated, checking for basic auth credentials');
             if (config.email && config.password) {
+                cli_utilities_1.log.debug('Using basic authentication with username/password');
                 await (0, login_handler_1.default)(config);
+                authenticationMethod = 'Basic Auth';
+                cli_utilities_1.log.debug('Basic authentication successful');
             }
             else {
+                cli_utilities_1.log.debug('No authentication method available');
                 throw new Error('Please login or provide an alias for the management token');
             }
         }
         else {
+            // Check if user is authenticated via OAuth
+            const isOAuthUser = cli_utilities_1.configHandler.get('authorisationType') === 'OAUTH' || false;
+            if (isOAuthUser) {
+                authenticationMethod = 'OAuth';
+                cli_utilities_1.log.debug('User authenticated via OAuth');
+            }
+            else {
+                authenticationMethod = 'Basic Auth';
+                cli_utilities_1.log.debug('User authenticated via auth token');
+            }
             config.apiKey =
                 importCmdFlags['stack-uid'] || importCmdFlags['stack-api-key'] || config.target_stack || (await (0, interactive_1.askAPIKey)());
             if (typeof config.apiKey !== 'string') {
@@ -99,6 +117,9 @@ const setupConfig = async (importCmdFlags) => {
     if (importCmdFlags['exclude-global-modules']) {
         config['exclude-global-modules'] = importCmdFlags['exclude-global-modules'];
     }
+    // Add authentication details to config for context tracking
+    config.authenticationMethod = authenticationMethod;
+    cli_utilities_1.log.debug('Import configuration setup completed', Object.assign({}, config));
     return config;
 };
 exports.default = setupConfig;

package/lib/utils/login-handler.js

@@ -8,20 +8,21 @@
  * MIT Licensed
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-const logger_1 = require("./logger");
 const cli_utilities_1 = require("@contentstack/cli-utilities");
 const login = async (config) => {
+    cli_utilities_1.log.debug('Starting login process');
     const client = await (0, cli_utilities_1.managementSDKClient)(config);
     if (config.email && config.password) {
+        cli_utilities_1.log.debug('Attempting login with email and password');
         const { user: { authtoken = null } = {} } = await client.login({ email: config.email, password: config.password });
         if (authtoken) {
+            cli_utilities_1.log.debug('Login successful, setting up headers');
             config.headers = {
                 api_key: config.source_stack,
                 access_token: config.access_token,
                 authtoken: config.authtoken,
                 'X-User-Agent': 'contentstack-export/v',
             };
-            (0, logger_1.log)(config, 'Contentstack account authenticated successfully!', 'success');
             return config;
         }
         else {
@@ -29,9 +30,11 @@ const login = async (config) => {
         }
     }
     else if (config.management_token) {
+        cli_utilities_1.log.debug('Using management token for authentication');
         return config;
     }
     else if ((0, cli_utilities_1.isAuthenticated)()) {
+        cli_utilities_1.log.debug('Using existing authentication, validating stack access');
         const stackAPIClient = client.stack({
             api_key: config.target_stack,
             management_token: config.management_token,
@@ -40,10 +43,11 @@ const login = async (config) => {
             var _a;
             let errorstack_key = (_a = error === null || error === void 0 ? void 0 : error.errors) === null || _a === void 0 ? void 0 : _a.api_key;
             if (errorstack_key) {
-                (0, logger_1.log)(config, 'Stack Api key ' + errorstack_key[0] + 'Please enter valid Key', 'error');
+                const keyError = errorstack_key[0];
+                cli_utilities_1.log.error(`Invalid stack API token: ${keyError} Please enter valid stack API token.`);
                 throw error;
             }
-            (0, logger_1.log)(config, error === null || error === void 0 ? void 0 : error.errorMessage, 'error');
+            cli_utilities_1.log.error(`Stack fetch error: ${error === null || error === void 0 ? void 0 : error.errorMessage}`);
             throw error;
         });
         config.destinationStackName = stack.name;

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

@@ -8,11 +8,11 @@ const omitBy_1 = tslib_1.__importDefault(require("lodash/omitBy"));
 const isEmpty_1 = tslib_1.__importDefault(require("lodash/isEmpty"));
 const includes_1 = tslib_1.__importDefault(require("lodash/includes"));
 const cli_utilities_1 = require("@contentstack/cli-utilities");
-const logger_1 = require("./logger");
 const log_1 = require("../utils/log");
 const utils_1 = require("../utils");
 const interactive_1 = require("../utils/interactive");
 const getAllStackSpecificApps = async (config, skip = 0, listOfApps = []) => {
+    cli_utilities_1.log.debug(`Fetching stack-specific apps with skip: ${skip}, current list size: ${listOfApps.length}`);
     const appSdk = await (0, cli_utilities_1.marketplaceSDKClient)({
         host: config.developerHubBaseUrl.split('://').pop(),
     });
@@ -21,11 +21,12 @@ const getAllStackSpecificApps = async (config, skip = 0, listOfApps = []) => {
         .installation()
         .fetchAll({ target_uids: config.target_stack, skip })
         .catch((error) => {
+        (0, cli_utilities_1.handleAndLogError)(error);
         (0, log_1.trace)(error, 'error', true);
-        (0, logger_1.log)(config, `Failed to export marketplace-apps ${(0, utils_1.formatError)(error)}`, 'error');
     });
     if (collection) {
         const { items: apps, count } = collection;
+        cli_utilities_1.log.debug(`Retrieved ${apps.length} apps from API, total count: ${count}`);
         // NOTE Remove all the chain functions
         const installation = (0, map_1.default)(apps, (app) => (0, omitBy_1.default)(app, (val, _key) => {
             if (val instanceof Function)
@@ -33,109 +34,147 @@ const getAllStackSpecificApps = async (config, skip = 0, listOfApps = []) => {
             return false;
         }));
         listOfApps = listOfApps.concat(installation);
+        cli_utilities_1.log.debug(`Updated list size: ${listOfApps.length}`);
         if (count - (skip + 50) > 0) {
+            cli_utilities_1.log.debug(`Fetching more apps, remaining: ${count - (skip + 50)}`);
             return await (0, exports.getAllStackSpecificApps)(config, skip + 50, listOfApps);
         }
     }
+    cli_utilities_1.log.info(`Successfully retrieved ${listOfApps.length} stack-specific apps`);
     return listOfApps;
 };
 exports.getAllStackSpecificApps = getAllStackSpecificApps;
 const getDeveloperHubUrl = async (config) => {
-    return (0, cli_utilities_1.createDeveloperHubUrl)(config.host);
+    cli_utilities_1.log.debug('Creating developer hub URL');
+    const url = (0, cli_utilities_1.createDeveloperHubUrl)(config.host);
+    cli_utilities_1.log.debug(`Developer hub URL: ${url}`);
+    return url;
 };
 exports.getDeveloperHubUrl = getDeveloperHubUrl;
 const getOrgUid = async (config) => {
+    cli_utilities_1.log.debug('Fetching organization UID');
     const tempAPIClient = await (0, cli_utilities_1.managementSDKClient)({ host: config.host });
     const tempStackData = await tempAPIClient
         .stack({ api_key: config.target_stack })
         .fetch()
         .catch((error) => {
+        (0, cli_utilities_1.handleAndLogError)(error);
         (0, log_1.trace)(error, 'error', true);
-        (0, logger_1.log)(config, (0, utils_1.formatError)(error), 'error');
     });
-    return (tempStackData === null || tempStackData === void 0 ? void 0 : tempStackData.org_uid) || '';
+    const orgUid = (tempStackData === null || tempStackData === void 0 ? void 0 : tempStackData.org_uid) || '';
+    cli_utilities_1.log.debug(`Organization UID: ${orgUid}`);
+    return orgUid;
 };
 exports.getOrgUid = getOrgUid;
 const getConfirmationToCreateApps = async (privateApps, config) => {
+    cli_utilities_1.log.debug(`Requesting confirmation to create ${privateApps === null || privateApps === void 0 ? void 0 : privateApps.length} private apps`);
     if (!config.forceStopMarketplaceAppsPrompt) {
         if (!(await cli_utilities_1.cliux.confirm(chalk_1.default.yellow(`WARNING!!! The listed apps are private apps that are not available in the destination stack: \n\n${(0, map_1.default)(privateApps, ({ manifest: { name } }, index) => `${String(index + 1)}) ${name}`).join('\n')}\n\nWould you like to re-create the private app and then proceed with the installation? (y/n)`)))) {
+            cli_utilities_1.log.debug('User declined to create private apps');
             if (await cli_utilities_1.cliux.confirm(chalk_1.default.yellow(`\nWARNING!!! Canceling the app re-creation may break the content type and entry import. Would you like to proceed without re-create the private app? (y/n)`))) {
+                cli_utilities_1.log.warn('User confirmed to proceed without creating private apps');
                 return Promise.resolve(false);
             }
             else {
                 if (await cli_utilities_1.cliux.confirm(chalk_1.default.yellow('\nWould you like to re-create the private app and then proceed with the installation? (y/n)'))) {
+                    cli_utilities_1.log.info('User confirmed to create private apps');
                     return Promise.resolve(true);
                 }
                 else {
+                    cli_utilities_1.log.debug('User declined to create private apps (second prompt)');
                     return Promise.resolve(false);
                 }
             }
         }
         else {
+            cli_utilities_1.log.info('User confirmed to create private apps');
             return Promise.resolve(true);
         }
     }
     else {
+        cli_utilities_1.log.debug('Force prompt disabled, automatically creating private apps');
         return Promise.resolve(true);
     }
 };
 exports.getConfirmationToCreateApps = getConfirmationToCreateApps;
 const handleNameConflict = async (app, appSuffix, config) => {
+    cli_utilities_1.log.debug(`Handling name conflict for app: ${app === null || app === void 0 ? void 0 : app.name}, suffix: ${appSuffix}`);
     const appName = config.forceStopMarketplaceAppsPrompt
         ? (0, interactive_1.getAppName)(app.name, appSuffix)
         : await (0, interactive_1.askAppName)(app, appSuffix);
     app.name = appName;
+    cli_utilities_1.log.debug(`Updated app name to: ${appName}`);
     return app;
 };
 exports.handleNameConflict = handleNameConflict;
 const makeRedirectUrlCall = async (response, appName, config) => {
     if (response.redirect_url) {
-        (0, logger_1.log)(config, `${appName} - OAuth api call started.!`, 'info');
+        cli_utilities_1.log.info(`Starting OAuth API call for app: ${appName}`);
         await new cli_utilities_1.HttpClient({ maxRedirects: 20, maxBodyLength: Infinity })
             .get(response.redirect_url)
             .then(async ({ response }) => {
             if ((0, includes_1.default)([501, 403], response.status)) {
+                cli_utilities_1.log.error(`OAuth API call failed for ${appName}: ${response.statusText}`);
                 (0, log_1.trace)(response, 'error', true);
-                (0, logger_1.log)(config, `${appName} - ${response.statusText}, OAuth api call failed.!`, 'error');
-                (0, logger_1.log)(config, (0, utils_1.formatError)(response), 'error');
                 await (0, exports.confirmToCloseProcess)(response.data, config);
             }
             else {
-                (0, logger_1.log)(config, `${appName} - OAuth api call completed.!`, 'success');
+                cli_utilities_1.log.success(`OAuth API call completed successfully for app: ${appName}`);
             }
         })
             .catch((error) => {
             (0, log_1.trace)(error, 'error', true);
             if ((0, includes_1.default)([501, 403], error.status)) {
-                (0, logger_1.log)(config, (0, utils_1.formatError)(error), 'error');
+                (0, cli_utilities_1.handleAndLogError)(error);
             }
         });
     }
+    else {
+        cli_utilities_1.log.debug(`No redirect URL found for app: ${appName}`);
+    }
 };
 exports.makeRedirectUrlCall = makeRedirectUrlCall;
 const confirmToCloseProcess = async (installation, config) => {
-    cli_utilities_1.cliux.print(`\nWARNING!!! ${(0, utils_1.formatError)(installation.message)}\n`, { color: 'yellow' });
+    cli_utilities_1.log.warn(`Installation error occurred: ${(0, utils_1.formatError)(installation === null || installation === void 0 ? void 0 : installation.message)}`);
     if (!config.forceStopMarketplaceAppsPrompt) {
         if (!(await cli_utilities_1.cliux.confirm(chalk_1.default.yellow('WARNING!!! The above error may have an impact if the failed app is referenced in entries/content type. Would you like to proceed? (y/n)')))) {
+            cli_utilities_1.log.debug('User chose to exit due to installation error');
             process.exit();
         }
+        else {
+            cli_utilities_1.log.warn('User chose to proceed despite installation error');
+        }
+    }
+    else {
+        cli_utilities_1.log.debug('Force prompt disabled, continuing despite installation error');
     }
 };
 exports.confirmToCloseProcess = confirmToCloseProcess;
 const ifAppAlreadyExist = async (app, currentStackApp, config) => {
+    var _a;
+    cli_utilities_1.log.debug(`Checking if app already exists: ${(_a = app === null || app === void 0 ? void 0 : app.manifest) === null || _a === void 0 ? void 0 : _a.name}`);
     let updateParam = {};
     const { manifest: { name }, configuration, server_configuration, } = app;
     if (!(0, isEmpty_1.default)(configuration) || !(0, isEmpty_1.default)(server_configuration)) {
+        cli_utilities_1.log.warn(`App ${name} already exists with existing configuration`);
         cli_utilities_1.cliux.print(`\nWARNING!!! The ${name} app already exists and it may have its own configuration. But the current app you install has its own configuration which is used internally to manage content.\n`, { color: 'yellow' });
         const configOption = config.forceStopMarketplaceAppsPrompt
             ? 'Update it with the new configuration.'
             : await (0, interactive_1.selectConfiguration)();
         if (configOption === 'Exit') {
+            cli_utilities_1.log.debug('User chose to exit due to configuration conflict');
             process.exit();
         }
         else if (configOption === 'Update it with the new configuration.') {
+            cli_utilities_1.log.info(`Updating app configuration for: ${name}`);
             updateParam = Object.assign(Object.assign({ manifest: app.manifest }, currentStackApp), { configuration, server_configuration });
         }
+        else {
+            cli_utilities_1.log.debug(`User chose to keep existing configuration for: ${name}`);
+        }
+    }
+    else {
+        cli_utilities_1.log.debug(`App ${name} has no configuration conflicts`);
     }
     return updateParam;
 };