@contentstack/cli-cm-import 1.19.5 → 1.20.2

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.19.5 linux-x64 node-v22.14.0
+@contentstack/cli-cm-import/1.20.2 linux-x64 node-v22.14.0
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND
@@ -96,7 +96,9 @@ FLAGS
   --personalize-project-name=<value>  (optional) Provide a unique name for the Personalize project.
   --replace-existing                  Replaces the existing module in the target stack.
   --skip-app-recreation               (optional) Skips the recreation of private apps if they already exist.
+  --skip-assets-publish               Skips asset publishing during the import process.
   --skip-audit                        Skips the audit fix that occurs during an import operation.
+  --skip-entries-publish              Skips entry publishing during the import process
   --skip-existing                     Skips the module exists warning messages.
 
 DESCRIPTION
@@ -158,7 +160,9 @@ FLAGS
   --personalize-project-name=<value>  (optional) Provide a unique name for the Personalize project.
   --replace-existing                  Replaces the existing module in the target stack.
   --skip-app-recreation               (optional) Skips the recreation of private apps if they already exist.
+  --skip-assets-publish               Skips asset publishing during the import process.
   --skip-audit                        Skips the audit fix that occurs during an import operation.
+  --skip-entries-publish              Skips entry publishing during the import process
   --skip-existing                     Skips the module exists warning messages.
 
 DESCRIPTION

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

@@ -23,6 +23,22 @@ class ImportCommand extends cli_command_1.Command {
                 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 {
+                    const branches = await managementAPIClient
+                        .stack({ api_key: importConfig.apiKey })
+                        .branch()
+                        .query()
+                        .find()
+                        .then(({ items }) => items);
+                    if (branches.length) {
+                        flags.branch = 'main';
+                    }
+                }
+                catch (error) {
+                    // Branch not enabled, just the let flow continue
+                }
+            }
             const moduleImporter = new import_1.ModuleImporter(managementAPIClient, importConfig);
             const result = await moduleImporter.start();
             if (!(result === null || result === void 0 ? void 0 : result.noSuccessMsg)) {
@@ -141,6 +157,14 @@ ImportCommand.flags = {
         description: 'Excludes the branch-independent module from the import operation.',
         default: false,
     }),
+    'skip-assets-publish': cli_utilities_1.flags.boolean({
+        description: 'Skips asset publishing during the import process.',
+        default: false,
+    }),
+    'skip-entries-publish': cli_utilities_1.flags.boolean({
+        description: 'Skips entry publishing during the import process',
+        default: false,
+    }),
 };
 ImportCommand.aliases = ['cm:import'];
 ImportCommand.usage = 'cm:stacks:import [-c <value>] [-k <value>] [-d <value>] [-a <value>] [--module <value>] [--backup-dir <value>] [--branch <value>] [--import-webhook-status disable|current]';

package/lib/config/index.js

@@ -10,6 +10,8 @@ const config = {
     // host:'https://azure-eu-api.contentstack.com/v3',
     // use below hosts for gcp-na region
     // host:'https://gcp-na-api.contentstack.com',
+    // use below hosts for gcp-eu region
+    // host:'https://gcp-eu-api.contentstack.com',
     // pass locale, only to migrate entries from that locale
     // not passing `locale` will migrate all the locales present
     // locales: ['fr-fr'],
@@ -21,6 +23,7 @@ const config = {
         'https://azure-na-api.contentstack.com': 'https://azure-na-developerhub-api.contentstack.com',
         'https://azure-eu-api.contentstack.com': 'https://azure-eu-developerhub-api.contentstack.com',
         'https://gcp-na-api.contentstack.com': 'https://gcp-na-developerhub-api.contentstack.com',
+        'https://gcp-eu-api.contentstack.com': 'https://gcp-eu-developerhub-api.contentstack.com',
     },
     modules: {
         apiConcurrency: 5,
@@ -86,7 +89,6 @@ const config = {
         assets: {
             dirName: 'assets',
             assetBatchLimit: 1,
-            publishAssets: true,
             fileName: 'assets.json',
             importSameStructure: true,
             uploadAssetsConcurrency: 2,
@@ -418,7 +420,6 @@ const config = {
     overwriteSupportedModules: ['extensions', 'global-fields', 'content-types'],
     rateLimit: 5,
     preserveStackVersion: false,
-    entriesPublish: true,
     concurrency: 1,
     importConcurrency: 5,
     fetchConcurrency: 5,

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

@@ -11,7 +11,6 @@ export default class ImportAssets extends BaseClass {
     assetConfig: {
         dirName: string;
         assetBatchLimit: number;
-        publishAssets: boolean;
         fileName: string;
         importSameStructure: boolean;
         uploadAssetsConcurrency: number;

package/lib/import/modules/assets.js

@@ -50,7 +50,7 @@ class ImportAssets extends base_class_1.default {
         // NOTE Step 3: Import Assets and create it mapping files (uid, url)
         await this.importAssets();
         // NOTE Step 4: Publish assets
-        if (this.assetConfig.publishAssets)
+        if (!this.importConfig.skipAssetsPublish)
             await this.publish();
     }
     /**

package/lib/import/modules/entries.js

@@ -99,7 +99,7 @@ class EntriesImport extends base_class_1.default {
             });
             (0, utils_1.log)(this.importConfig, 'Entries imported successfully', 'success');
             // Publishing entries
-            if (this.importConfig.entriesPublish) {
+            if (!this.importConfig.skipEntriesPublish) {
                 (0, utils_1.log)(this.importConfig, 'Publishing entries', 'info');
                 this.envs = utils_1.fileHelper.readFileSync(this.envPath);
                 for (let entryRequestOption of entryRequestOptions) {

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

@@ -50,7 +50,6 @@ export default interface DefaultConfig {
         assets: {
             dirName: string;
             assetBatchLimit: number;
-            publishAssets: boolean;
             fileName: string;
             importSameStructure: boolean;
             uploadAssetsConcurrency: number;
@@ -175,7 +174,6 @@ export default interface DefaultConfig {
     };
     rateLimit: number;
     preserveStackVersion: boolean;
-    entriesPublish: boolean;
     concurrency: number;
     importConcurrency: number;
     fetchConcurrency: number;
@@ -197,4 +195,6 @@ export default interface DefaultConfig {
         } & Record<string, any>;
     };
     globalModules: string[];
+    skipAssetsPublish?: boolean;
+    skipEntriesPublish?: boolean;
 }

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

@@ -9,6 +9,8 @@ export interface ExternalConfig {
     password?: string;
 }
 export default interface ImportConfig extends DefaultConfig, ExternalConfig {
+    skipAssetsPublish?: boolean;
+    skipEntriesPublish?: boolean;
     cliLogsPath: string;
     canCreatePrivateApp: boolean;
     contentDir: string;

package/lib/utils/asset-helper.js

@@ -340,7 +340,7 @@ function findFileUrls(schema, _entry, assetUrls) {
     else {
         text = JSON.stringify(_entry);
     }
-    markdownRegEx = new RegExp('(https://(assets|(eu-|azure-na-|azure-eu-|gcp-na-)?images).contentstack.(io|com)/v3/assets/(.*?)/(.*?)/(.*?)/(.*?)(?="))', 'g');
+    markdownRegEx = new RegExp('(https://(assets|(eu-|azure-na-|azure-eu-|gcp-na-|gcp-eu-)?images).contentstack.(io|com)/v3/assets/(.*?)/(.*?)/(.*?)/(.*?)(?="))', 'g');
     while ((markdownMatch = markdownRegEx.exec(text)) !== null) {
         if (markdownMatch && typeof markdownMatch[0] === 'string') {
             let assetUrl = markdownMatch[0].replace(/\\/g, '');

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

@@ -21,13 +21,13 @@ const setupConfig = async (importCmdFlags) => {
         }
         config = merge_1.default.recursive(config, externalConfig);
     }
-    config.contentDir = importCmdFlags['data'] || importCmdFlags['data-dir'] || config.data || (await (0, interactive_1.askContentDir)());
+    config.contentDir = (0, cli_utilities_1.sanitizePath)(importCmdFlags['data'] || importCmdFlags['data-dir'] || config.data || (await (0, interactive_1.askContentDir)()));
     const pattern = /[*$%#<>{}!&?]/g;
     if (pattern.test(config.contentDir)) {
         cli_utilities_1.cliux.print(`\nPlease add a directory path without any of the special characters: (*,&,{,},[,],$,%,<,>,?,!)`, {
             color: 'yellow',
         });
-        config.contentDir = await (0, interactive_1.askContentDir)();
+        config.contentDir = (0, cli_utilities_1.sanitizePath)(await (0, interactive_1.askContentDir)());
     }
     config.contentDir = config.contentDir.replace(/['"]/g, '');
     config.contentDir = path.resolve(config.contentDir);
@@ -85,6 +85,12 @@ const setupConfig = async (importCmdFlags) => {
     if (importCmdFlags['backup-dir']) {
         config.useBackedupDir = importCmdFlags['backup-dir'];
     }
+    if (importCmdFlags['skip-assets-publish']) {
+        config.skipAssetsPublish = importCmdFlags['skip-assets-publish'];
+    }
+    if (importCmdFlags['skip-entries-publish']) {
+        config.skipEntriesPublish = importCmdFlags['skip-entries-publish'];
+    }
     // Note to support old modules
     config.target_stack = config.apiKey;
     config.replaceExisting = importCmdFlags['replace-existing'];

package/lib/utils/logger.js

@@ -22,7 +22,10 @@ function returnString(args) {
             .map(function (item) {
             if (item && typeof item === 'object') {
                 try {
-                    return JSON.stringify(item).replace(/authtoken\":\d"blt................/g, 'authtoken":"blt....');
+                    const redactedObject = (0, cli_utilities_1.redactObject)(item);
+                    if (redactedObject && typeof redactedObject === 'object') {
+                        return JSON.stringify(redactedObject);
+                    }
                 }
                 catch (error) { }
                 return item;
@@ -122,7 +125,7 @@ function init(_logPath) {
     };
 }
 const log = async (config, message, type) => {
-    config.cliLogsPath = config.cliLogsPath || config.data || path.join(__dirname, 'logs');
+    config.cliLogsPath = (0, cli_utilities_1.sanitizePath)(config.cliLogsPath || config.data || path.join(__dirname, 'logs'));
     // ignoring the type argument, as we are not using it to create a logfile anymore
     if (type !== 'error') {
         // removed type argument from init method

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.19.5",
+  "version": "1.20.2",
   "commands": {
     "cm:stacks:import": {
       "id": "cm:stacks:import",
@@ -162,6 +162,18 @@
           "type": "boolean",
           "description": "Excludes the branch-independent module from the import operation.",
           "allowNo": false
+        },
+        "skip-assets-publish": {
+          "name": "skip-assets-publish",
+          "type": "boolean",
+          "description": "Skips asset publishing during the import process.",
+          "allowNo": false
+        },
+        "skip-entries-publish": {
+          "name": "skip-entries-publish",
+          "type": "boolean",
+          "description": "Skips entry publishing during the import process",
+          "allowNo": false
         }
       },
       "args": {}

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@contentstack/cli-cm-import",
   "description": "Contentstack CLI plugin to import content into stack",
-  "version": "1.19.5",
+  "version": "1.20.2",
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {
-    "@contentstack/cli-audit": "~1.7.5",
+    "@contentstack/cli-audit": "~1.10.0",
     "@contentstack/cli-command": "~1.3.3",
-    "@contentstack/cli-utilities": "~1.8.2",
+    "@contentstack/cli-utilities": "~1.9.0",
     "@contentstack/management": "~1.18.4",
-    "@contentstack/cli-variants": "~1.1.5",
+    "@contentstack/cli-variants": "~1.1.6",
     "@oclif/core": "^3.27.0",
     "big-json": "^3.2.0",
     "bluebird": "^3.7.2",