@contentstack/cli-cm-import 1.15.4 → 1.15.6

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.15.4 linux-x64 node-v18.20.2
+@contentstack/cli-cm-import/1.15.6 linux-x64 node-v18.20.3
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND

package/bin/dev.js

@@ -0,0 +1,6 @@
+#!/usr/bin/env node_modules/.bin/ts-node
+// eslint-disable-next-line node/shebang, unicorn/prefer-top-level-await
+(async () => {
+  const oclif = await import('@oclif/core');
+  await oclif.execute({ development: true, dir: __dirname });
+})();

package/bin/run.js

@@ -0,0 +1,7 @@
+#!/usr/bin/env node
+
+// eslint-disable-next-line unicorn/prefer-top-level-await
+(async () => {
+  const oclif = await import('@oclif/core');
+  await oclif.execute({ development: false, dir: __dirname });
+})();

package/lib/import/modules/content-types.d.ts

@@ -1,6 +1,6 @@
 /*!
  * Contentstack Import
- * Copyright (c) 2019 Contentstack LLC
+ * Copyright (c) 2024 Contentstack LLC
  * MIT Licensed
  */
 import { ModuleClassParams } from '../../types';

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

@@ -2,7 +2,7 @@
 /* eslint-disable no-prototype-builtins */
 /*!
  * Contentstack Import
- * Copyright (c) 2019 Contentstack LLC
+ * Copyright (c) 2024 Contentstack LLC
  * MIT Licensed
  */
 Object.defineProperty(exports, "__esModule", { value: true });
@@ -12,6 +12,7 @@ const lodash_1 = require("lodash");
 const utils_1 = require("../../utils");
 const base_class_1 = tslib_1.__importDefault(require("./base-class"));
 const content_type_helper_1 = require("../../utils/content-type-helper");
+const cli_utilities_1 = require("@contentstack/cli-utilities");
 class ContentTypesImport extends base_class_1.default {
     constructor({ importConfig, stackAPIClient }) {
         super({ importConfig, stackAPIClient });
@@ -19,13 +20,13 @@ class ContentTypesImport extends base_class_1.default {
         this.cTsConfig = importConfig.modules['content-types'];
         this.gFsConfig = importConfig.modules['global-fields'];
         this.reqConcurrency = this.cTsConfig.writeConcurrency || this.importConfig.writeConcurrency;
-        this.cTsFolderPath = path.join(this.importConfig.data, this.cTsConfig.dirName);
-        this.cTsMapperPath = path.join(this.importConfig.data, 'mapper', 'content_types');
-        this.cTsSuccessPath = path.join(this.cTsMapperPath, 'success.json');
-        this.gFsFolderPath = path.resolve(this.importConfig.data, this.gFsConfig.dirName);
-        this.gFsMapperFolderPath = path.join(importConfig.data, 'mapper', 'global_fields', 'success.json');
-        this.gFsPendingPath = path.join(importConfig.data, 'mapper', 'global_fields', 'pending_global_fields.js');
-        this.marketplaceAppMapperPath = path.join(this.importConfig.data, 'mapper', 'marketplace_apps', 'uid-mapping.json');
+        this.cTsFolderPath = path.join((0, cli_utilities_1.sanitizePath)(this.importConfig.data), (0, cli_utilities_1.sanitizePath)(this.cTsConfig.dirName));
+        this.cTsMapperPath = path.join((0, cli_utilities_1.sanitizePath)(this.importConfig.data), 'mapper', 'content_types');
+        this.cTsSuccessPath = path.join((0, cli_utilities_1.sanitizePath)(this.cTsMapperPath), 'success.json');
+        this.gFsFolderPath = path.resolve((0, cli_utilities_1.sanitizePath)(this.importConfig.data), (0, cli_utilities_1.sanitizePath)(this.gFsConfig.dirName));
+        this.gFsMapperFolderPath = path.join((0, cli_utilities_1.sanitizePath)(importConfig.data), 'mapper', 'global_fields', 'success.json');
+        this.gFsPendingPath = path.join((0, cli_utilities_1.sanitizePath)(importConfig.data), 'mapper', 'global_fields', 'pending_global_fields.js');
+        this.marketplaceAppMapperPath = path.join((0, cli_utilities_1.sanitizePath)(this.importConfig.data), 'mapper', 'marketplace_apps', 'uid-mapping.json');
         this.ignoredFilesInContentTypesFolder = new Map([
             ['__master.json', 'true'],
             ['__priority.json', 'true'],
@@ -39,8 +40,8 @@ class ContentTypesImport extends base_class_1.default {
         this.gFs = [];
         this.createdGFs = [];
         this.pendingGFs = [];
-        this.taxonomiesPath = path.join(importConfig.data, 'mapper/taxonomies', 'success.json');
-        this.extPendingPath = path.join(importConfig.data, 'mapper', 'extensions', 'pending_extensions.js');
+        this.taxonomiesPath = path.join((0, cli_utilities_1.sanitizePath)(importConfig.data), 'mapper/taxonomies', 'success.json');
+        this.extPendingPath = path.join((0, cli_utilities_1.sanitizePath)(importConfig.data), 'mapper', 'extensions', 'pending_extensions.js');
     }
     async start() {
         /**

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

@@ -1,6 +1,6 @@
 /*!
  * Contentstack Import
- * Copyright (c) 2019 Contentstack LLC
+ * Copyright (c) 2024 Contentstack LLC
  * MIT Licensed
  */
 import { ModuleClassParams } from '../../types';

package/lib/import/modules/entries.js

@@ -2,7 +2,7 @@
 /* eslint-disable no-prototype-builtins */
 /*!
  * Contentstack Import
- * Copyright (c) 2019 Contentstack LLC
+ * Copyright (c) 2024 Contentstack LLC
  * MIT Licensed
  */
 Object.defineProperty(exports, "__esModule", { value: true });
@@ -15,19 +15,19 @@ const base_class_1 = tslib_1.__importDefault(require("./base-class"));
 class EntriesImport extends base_class_1.default {
     constructor({ importConfig, stackAPIClient }) {
         super({ importConfig, stackAPIClient });
-        this.assetUidMapperPath = path.resolve(importConfig.data, 'mapper', 'assets', 'uid-mapping.json');
-        this.assetUrlMapperPath = path.resolve(importConfig.data, 'mapper', 'assets', 'url-mapping.json');
-        this.entriesMapperPath = path.resolve(importConfig.data, 'mapper', 'entries');
-        this.envPath = path.resolve(importConfig.data, 'environments', 'environments.json');
-        this.entriesUIDMapperPath = path.join(this.entriesMapperPath, 'uid-mapping.json');
-        this.uniqueUidMapperPath = path.join(this.entriesMapperPath, 'unique-mapping.json');
-        this.modifiedCTsPath = path.join(this.entriesMapperPath, 'modified-schemas.json');
-        this.marketplaceAppMapperPath = path.join(this.importConfig.data, 'mapper', 'marketplace_apps', 'uid-mapping.json');
-        this.taxonomiesPath = path.join(this.importConfig.data, 'mapper', 'taxonomies', 'terms', 'success.json');
+        this.assetUidMapperPath = path.resolve((0, cli_utilities_1.sanitizePath)(importConfig.data), 'mapper', 'assets', 'uid-mapping.json');
+        this.assetUrlMapperPath = path.resolve((0, cli_utilities_1.sanitizePath)(importConfig.data), 'mapper', 'assets', 'url-mapping.json');
+        this.entriesMapperPath = path.resolve((0, cli_utilities_1.sanitizePath)(importConfig.data), 'mapper', 'entries');
+        this.envPath = path.resolve((0, cli_utilities_1.sanitizePath)(importConfig.data), 'environments', 'environments.json');
+        this.entriesUIDMapperPath = path.join((0, cli_utilities_1.sanitizePath)(this.entriesMapperPath), 'uid-mapping.json');
+        this.uniqueUidMapperPath = path.join((0, cli_utilities_1.sanitizePath)(this.entriesMapperPath), 'unique-mapping.json');
+        this.modifiedCTsPath = path.join((0, cli_utilities_1.sanitizePath)(this.entriesMapperPath), 'modified-schemas.json');
+        this.marketplaceAppMapperPath = path.join((0, cli_utilities_1.sanitizePath)(this.importConfig.data), 'mapper', 'marketplace_apps', 'uid-mapping.json');
+        this.taxonomiesPath = path.join((0, cli_utilities_1.sanitizePath)(this.importConfig.data), 'mapper', 'taxonomies', 'terms', 'success.json');
         this.entriesConfig = importConfig.modules.entries;
-        this.entriesPath = path.resolve(importConfig.data, this.entriesConfig.dirName);
-        this.cTsPath = path.resolve(importConfig.data, importConfig.modules['content-types'].dirName);
-        this.localesPath = path.resolve(importConfig.data, importConfig.modules.locales.dirName, importConfig.modules.locales.fileName);
+        this.entriesPath = path.resolve((0, cli_utilities_1.sanitizePath)(importConfig.data), (0, cli_utilities_1.sanitizePath)(this.entriesConfig.dirName));
+        this.cTsPath = path.resolve((0, cli_utilities_1.sanitizePath)(importConfig.data), (0, cli_utilities_1.sanitizePath)(importConfig.modules['content-types'].dirName));
+        this.localesPath = path.resolve((0, cli_utilities_1.sanitizePath)(importConfig.data), (0, cli_utilities_1.sanitizePath)(importConfig.modules.locales.dirName), (0, cli_utilities_1.sanitizePath)(importConfig.modules.locales.fileName));
         this.importConcurrency = this.entriesConfig.importConcurrency || importConfig.importConcurrency;
         this.entriesUidMapper = {};
         this.modifiedCTs = [];
@@ -243,7 +243,7 @@ class EntriesImport extends base_class_1.default {
                 (0, utils_1.log)(this.importConfig, `Localized entry: '${entry.title}' of content type ${cTUid} in locale ${locale}`, 'info');
                 entry.uid = oldUid;
                 entry.entryOldUid = oldUid;
-                entry.sourceEntryFilePath = path.join(basePath, additionalInfo.entryFileName); // stores source file path temporarily
+                entry.sourceEntryFilePath = path.join((0, cli_utilities_1.sanitizePath)(basePath), (0, cli_utilities_1.sanitizePath)(additionalInfo.entryFileName)); // stores source file path temporarily
                 entriesCreateFileHelper.writeIntoFile({ [oldUid]: entry }, { mapKeyVal: true });
             }
             else {
@@ -256,7 +256,7 @@ class EntriesImport extends base_class_1.default {
                     this.autoCreatedEntries.push({ cTUid, locale, entryUid: response.uid });
                 }
                 this.entriesUidMapper[entry.uid] = response.uid;
-                entry.sourceEntryFilePath = path.join(basePath, additionalInfo.entryFileName); // stores source file path temporarily
+                entry.sourceEntryFilePath = path.join((0, cli_utilities_1.sanitizePath)(basePath), (0, cli_utilities_1.sanitizePath)(additionalInfo.entryFileName)); // stores source file path temporarily
                 entry.entryOldUid = entry.uid; // stores old uid temporarily
                 entriesCreateFileHelper.writeIntoFile({ [entry.uid]: entry }, { mapKeyVal: true });
             }
@@ -269,7 +269,7 @@ class EntriesImport extends base_class_1.default {
                 if (((_a = error === null || error === void 0 ? void 0 : error.errors) === null || _a === void 0 ? void 0 : _a.title) || ((_b = error === null || error === void 0 ? void 0 : error.errors) === null || _b === void 0 ? void 0 : _b.uid)) {
                     if (this.importConfig.replaceExisting) {
                         entry.entryOldUid = uid;
-                        entry.sourceEntryFilePath = path.join(basePath, additionalInfo.entryFileName); // stores source file path temporarily
+                        entry.sourceEntryFilePath = path.join((0, cli_utilities_1.sanitizePath)(basePath), (0, cli_utilities_1.sanitizePath)(additionalInfo.entryFileName)); // stores source file path temporarily
                         existingEntriesFileHelper.writeIntoFile({ [uid]: entry }, { mapKeyVal: true });
                     }
                     if (!this.importConfig.skipExisting) {

package/lib/import/modules/global-fields.d.ts

@@ -1,6 +1,6 @@
 /*!
  * Contentstack Import
- * Copyright (c) 2019 Contentstack LLC
+ * Copyright (c) 2024 Contentstack LLC
  * MIT Licensed
  */
 import { ModuleClassParams } from '../../types';

package/lib/import/modules/global-fields.js

@@ -2,13 +2,14 @@
 /* eslint-disable no-prototype-builtins */
 /*!
  * Contentstack Import
- * Copyright (c) 2019 Contentstack LLC
+ * Copyright (c) 2024 Contentstack LLC
  * MIT Licensed
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const path = tslib_1.__importStar(require("path"));
 const lodash_1 = require("lodash");
+const cli_utilities_1 = require("@contentstack/cli-utilities");
 const utils_1 = require("../../utils");
 const base_class_1 = tslib_1.__importDefault(require("./base-class"));
 class ImportGlobalFields extends base_class_1.default {
@@ -23,13 +24,13 @@ class ImportGlobalFields extends base_class_1.default {
         this.pendingGFs = [];
         this.existingGFs = [];
         this.reqConcurrency = this.gFsConfig.writeConcurrency || this.config.writeConcurrency;
-        this.gFsMapperPath = path.resolve(this.config.data, 'mapper', 'global_fields');
-        this.gFsFolderPath = path.resolve(this.config.data, this.gFsConfig.dirName);
-        this.gFsFailsPath = path.resolve(this.config.data, 'mapper', 'global_fields', 'fails.json');
-        this.gFsSuccessPath = path.resolve(this.config.data, 'mapper', 'global_fields', 'success.json');
-        this.gFsUidMapperPath = path.resolve(this.config.data, 'mapper', 'global_fields', 'uid-mapping.json');
-        this.gFsPendingPath = path.resolve(this.config.data, 'mapper', 'global_fields', 'pending_global_fields.js');
-        this.marketplaceAppMapperPath = path.join(this.config.data, 'mapper', 'marketplace_apps', 'uid-mapping.json');
+        this.gFsMapperPath = path.resolve((0, cli_utilities_1.sanitizePath)(this.config.data), 'mapper', 'global_fields');
+        this.gFsFolderPath = path.resolve((0, cli_utilities_1.sanitizePath)(this.config.data), (0, cli_utilities_1.sanitizePath)(this.gFsConfig.dirName));
+        this.gFsFailsPath = path.resolve((0, cli_utilities_1.sanitizePath)(this.config.data), 'mapper', 'global_fields', 'fails.json');
+        this.gFsSuccessPath = path.resolve((0, cli_utilities_1.sanitizePath)(this.config.data), 'mapper', 'global_fields', 'success.json');
+        this.gFsUidMapperPath = path.resolve((0, cli_utilities_1.sanitizePath)(this.config.data), 'mapper', 'global_fields', 'uid-mapping.json');
+        this.gFsPendingPath = path.resolve((0, cli_utilities_1.sanitizePath)(this.config.data), 'mapper', 'global_fields', 'pending_global_fields.js');
+        this.marketplaceAppMapperPath = path.join((0, cli_utilities_1.sanitizePath)(this.config.data), 'mapper', 'marketplace_apps', 'uid-mapping.json');
     }
     async start() {
         this.gFs = utils_1.fsUtil.readFile(path.join(this.gFsFolderPath, this.gFsConfig.fileName));

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

@@ -1,6 +1,6 @@
 /*!
  * Contentstack Import
- * Copyright (c) 2019 Contentstack LLC
+ * Copyright (c) 2024 Contentstack LLC
  * MIT Licensed
  */
 import { ModuleClassParams } from '../../types';

package/lib/import/modules/locales.js

@@ -2,7 +2,7 @@
 /* eslint-disable no-prototype-builtins */
 /*!
  * Contentstack Import
- * Copyright (c) 2019 Contentstack LLC
+ * Copyright (c) 2024 Contentstack LLC
  * MIT Licensed
  */
 Object.defineProperty(exports, "__esModule", { value: true });
@@ -25,11 +25,11 @@ class ImportLocales extends base_class_1.default {
         this.createdLocales = [];
         this.failedLocales = [];
         this.reqConcurrency = this.localeConfig.writeConcurrency || this.config.writeConcurrency;
-        this.langMapperPath = path.resolve(this.config.data, 'mapper', 'languages');
-        this.langFolderPath = path.resolve(this.config.data, this.localeConfig.dirName);
-        this.langFailsPath = path.resolve(this.config.data, 'mapper', 'languages', 'fails.json');
-        this.langSuccessPath = path.resolve(this.config.data, 'mapper', 'languages', 'success.json');
-        this.langUidMapperPath = path.resolve(this.config.data, 'mapper', 'languages', 'uid-mapper.json');
+        this.langMapperPath = path.resolve((0, cli_utilities_1.sanitizePath)(this.config.data), 'mapper', 'languages');
+        this.langFolderPath = path.resolve((0, cli_utilities_1.sanitizePath)(this.config.data), (0, cli_utilities_1.sanitizePath)(this.localeConfig.dirName));
+        this.langFailsPath = path.resolve((0, cli_utilities_1.sanitizePath)(this.config.data), 'mapper', 'languages', 'fails.json');
+        this.langSuccessPath = path.resolve((0, cli_utilities_1.sanitizePath)(this.config.data), 'mapper', 'languages', 'success.json');
+        this.langUidMapperPath = path.resolve((0, cli_utilities_1.sanitizePath)(this.config.data), 'mapper', 'languages', 'uid-mapper.json');
     }
     async start() {
         this.languages = utils_1.fsUtil.readFile(path.join(this.langFolderPath, this.localeConfig.fileName));

package/lib/import/modules-js/assets.js

@@ -1,6 +1,6 @@
 /*!
  * Contentstack Import
- * Copyright (c) 2019 Contentstack LLC
+ * Copyright (c) 2024 Contentstack LLC
  * MIT Licensed
  */
 const fs = require('fs');
@@ -11,6 +11,7 @@ const mkdirp = require('mkdirp');
 const Promise = require('bluebird');
 let { default: config } = require('../../config');
 const { fileHelper, log, uploadAssetHelper } = require('../../utils');
+const { sanitizePath, validateUids, validateFileName } = require('@contentstack/cli-utilities');
 module.exports = class ImportAssets {
     constructor(importConfig, stackAPIClient) {
         this.fails = [];
@@ -66,7 +67,10 @@ module.exports = class ImportAssets {
                             // the asset has been already imported
                             return void 0;
                         }
-                        let currentAssetFolderPath = path.join(self.assetsFolderPath, assetUid);
+                        if (!validateUids(assetUid)) {
+                            reject(`UID Not Valid`);
+                        }
+                        let currentAssetFolderPath = path.join(sanitizePath(self.assetsFolderPath), sanitizePath(assetUid));
                         if (fs.existsSync(currentAssetFolderPath)) {
                             // if this is true, means, the exported asset data is versioned
                             // hence, upload each asset with its version
@@ -77,7 +81,10 @@ module.exports = class ImportAssets {
                             }
                             let uidContainer = {};
                             let urlContainer = {};
-                            let assetPath = path.resolve(currentAssetFolderPath, self.assets[assetUid].filename);
+                            if (!validateFileName(self.assets[assetUid].filename)) {
+                                reject(`File Name Not Valid`);
+                            }
+                            let assetPath = path.resolve(sanitizePath(currentAssetFolderPath), sanitizePath(self.assets[assetUid].filename));
                             if (self.assets[assetUid].parent_uid && typeof self.assets[assetUid].parent_uid === 'string') {
                                 if (self.mappedFolderUids.hasOwnProperty(self.assets[assetUid].parent_uid)) {
                                     self.assets[assetUid].parent_uid = self.mappedFolderUids[self.assets[assetUid].parent_uid];
@@ -142,7 +149,10 @@ module.exports = class ImportAssets {
     uploadVersionedAssets(uid, assetFolderPath) {
         let self = this;
         return new Promise(function (resolve, reject) {
-            let versionedAssetMetadata = fileHelper.readFileSync(path.join(assetFolderPath, '_contentstack_' + uid + '.json'));
+            if (!validateUids(uid)) {
+                reject(`UID not valid`);
+            }
+            let versionedAssetMetadata = fileHelper.readFileSync(path.join(sanitizePath(assetFolderPath), '_contentstack_' + sanitizePath(uid) + '.json'));
             // using last version, find asset's parent
             let lastVersion = versionedAssetMetadata[versionedAssetMetadata.length - 1];
             if (typeof lastVersion.parent_uid === 'string') {
@@ -165,7 +175,10 @@ module.exports = class ImportAssets {
             let filesStreamed = [];
             return Promise.map(versionedAssetMetadata, function () {
                 let assetMetadata = versionedAssetMetadata[counter];
-                let assetPath = path.join(assetFolderPath, assetMetadata.filename);
+                if (!validateFileName(assetMetadata.filename)) {
+                    reject(`File Name not valid`);
+                }
+                let assetPath = path.join(sanitizePath(assetFolderPath), sanitizePath(assetMetadata.filename));
                 if (++counter === 1) {
                     return self
                         .uploadAsset(assetPath, assetMetadata, uidContainer, urlContainer)

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

@@ -3,6 +3,7 @@ const path = require('path');
 const chalk = require('chalk');
 const { cloneDeep, find, findIndex } = require('lodash');
 const { fileHelper, log, executeTask, formatError, schemaTemplate, lookupExtension } = require('../../utils');
+const { sanitizePath } = require('@contentstack/cli-utilities');
 class ContentTypesImport {
     constructor(importConfig, stackAPIClient) {
         this.stackAPIClient = stackAPIClient;
@@ -11,12 +12,12 @@ class ContentTypesImport {
         this.globalFieldConfig = importConfig.modules.globalfields;
         this.importConcurrency = this.contentTypeConfig.importConcurrency || this.importConfig.importConcurrency;
         this.writeConcurrency = this.contentTypeConfig.writeConcurrency || this.importConfig.writeConcurrency;
-        this.contentTypesFolderPath = path.join(this.importConfig.data, this.contentTypeConfig.dirName);
-        this.mapperFolderPath = path.join(this.importConfig.data, 'mapper', 'content_types');
-        this.existingContentTypesPath = path.join(this.mapperFolderPath, 'success.json');
-        this.globalFieldsFolderPath = path.resolve(this.importConfig.data, this.globalFieldConfig.dirName);
-        this.globalFieldMapperFolderPath = path.join(importConfig.data, 'mapper', 'global_fields', 'success.json');
-        this.globalFieldPendingPath = path.join(importConfig.data, 'mapper', 'global_fields', 'pending_global_fields.js');
+        this.contentTypesFolderPath = path.join(sanitizePath(this.importConfig.data), sanitizePath(this.contentTypeConfig.dirName));
+        this.mapperFolderPath = path.join(sanitizePath(this.importConfig.data), 'mapper', 'content_types');
+        this.existingContentTypesPath = path.join(sanitizePath(this.mapperFolderPath), 'success.json');
+        this.globalFieldsFolderPath = path.resolve(sanitizePath(this.importConfig.data), sanitizePath(this.globalFieldConfig.dirName));
+        this.globalFieldMapperFolderPath = path.join(sanitizePath(importConfig.data), 'mapper', 'global_fields', 'success.json');
+        this.globalFieldPendingPath = path.join(sanitizePath(importConfig.data), 'mapper', 'global_fields', 'pending_global_fields.js');
         this.ignoredFilesInContentTypesFolder = new Map([
             ['__master.json', 'true'],
             ['__priority.json', 'true'],

package/lib/import/modules-js/entries.js

@@ -1,6 +1,6 @@
 /*!
  * Contentstack Import
- * Copyright (c) 2019 Contentstack LLC
+ * Copyright (c) 2024 Contentstack LLC
  * MIT Licensed
  */
 const Promise = require('bluebird');
@@ -11,6 +11,7 @@ const mkdirp = require('mkdirp');
 const chalk = require('chalk');
 const { fileHelper, log, formatError, lookupExtension, suppressSchemaReference, lookupAssets, lookupEntries, } = require('../../utils');
 const { default: config } = require('../../config');
+const { sanitizePath } = require('@contentstack/cli-utilities');
 const addlogs = log;
 module.exports = class ImportEntries {
     constructor(importConfig, stackAPIClient) {
@@ -665,7 +666,7 @@ module.exports = class ImportEntries {
                     return resolve();
                 }
                 self.mappedUids[query.entry.uid] = response.body.entries[0].uid;
-                let _ePath = path.join(this.entryMapperPath, query.locale, query.content_type, 'success.json');
+                let _ePath = path.join(sanitizePath(this.entryMapperPath), sanitizePath(query.locale), sanitizePath(query.content_type), 'success.json');
                 let entries = fileHelper.readFileSync(_ePath);
                 entries.push(query.entry);
                 fileHelper.writeFileSync(_ePath, entries);

package/lib/import/modules-js/environments.js

@@ -1,6 +1,6 @@
 /*!
  * Contentstack Import
- * Copyright (c) 2019 Contentstack LLC
+ * Copyright (c) 2024 Contentstack LLC
  * MIT Licensed
  */
 const fs = require('fs');

package/lib/import/modules-js/extensions.js

@@ -1,6 +1,6 @@
 /*!
  * Contentstack Import
- * Copyright (c) 2019 Contentstack LLC
+ * Copyright (c) 2024 Contentstack LLC
  * MIT Licensed
  */
 const mkdirp = require('mkdirp');

package/lib/import/modules-js/global-fields.js

@@ -1,6 +1,6 @@
 /*!
  * Contentstack Import
- * Copyright (c) 2019 Contentstack LLC
+ * Copyright (c) 2024 Contentstack LLC
  * MIT Licensed
  */
 let fs = require('fs');

package/lib/import/modules-js/labels.js

@@ -1,6 +1,6 @@
 /*!
  * Contentstack Import
- * Copyright (c) 2019 Contentstack LLC
+ * Copyright (c) 2024 Contentstack LLC
  * MIT Licensed
  */
 const path = require('path');

package/lib/import/modules-js/locales.js

@@ -1,7 +1,7 @@
 /* eslint-disable no-prototype-builtins */
 /*!
  * Contentstack Import
- * Copyright (c) 2019 Contentstack LLC
+ * Copyright (c) 2024 Contentstack LLC
  * MIT Licensed
  */
 let fs = require('fs');

package/lib/import/modules-js/marketplace-apps.js

@@ -1,6 +1,6 @@
 /*!
  * Contentstack Export
- * Copyright (c) 2019 Contentstack LLC
+ * Copyright (c) 2024 Contentstack LLC
  * MIT Licensed
  */
 const fs = require('fs');

package/lib/import/modules-js/webhooks.js

@@ -1,6 +1,6 @@
 /*!
  * Contentstack Import
- * Copyright (c) 2019 Contentstack LLC
+ * Copyright (c) 2024 Contentstack LLC
  * MIT Licensed
  */
 const mkdirp = require('mkdirp');

package/lib/import/modules-js/workflows.js

@@ -1,6 +1,6 @@
 /*!
  * Contentstack Import
- * Copyright (c) 2019 Contentstack LLC
+ * Copyright (c) 2024 Contentstack LLC
  * MIT Licensed
  */
 const fs = require('fs');

package/lib/utils/asset-helper.js

@@ -250,8 +250,12 @@ const lookupAssets = function (data, mappedAssetUids, mappedAssetUrls, assetUidM
         let uid = mappedAssetUids[assetUid];
         if (typeof uid !== 'undefined') {
             const escapedAssetUid = assetUid.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
-            entry = entry.replace(new RegExp(escapedAssetUid, 'img'), uid);
-            matchedUids.push(assetUid);
+            const regex = new RegExp(`\\b${escapedAssetUid}\\b`, 'img');
+            let { status } = (0, cli_utilities_1.validateRegex)(new RegExp(regex, 'img'));
+            if (status === 'safe') {
+                entry = entry.replace(regex, uid);
+                matchedUids.push(assetUid);
+            }
         }
         else {
             unmatchedUids.push(assetUid);
@@ -350,24 +354,24 @@ function findFileUrls(schema, _entry, assetUrls) {
         }
     }
 }
-function updateFileFields(objekt, parent, pos, mappedAssetUids, matchedUids, unmatchedUids, mappedAssetUrls) {
-    if (_.isPlainObject(objekt) && _.has(objekt, 'filename') && _.has(objekt, 'uid')) {
+function updateFileFields(object, parent, pos, mappedAssetUids, matchedUids, unmatchedUids, mappedAssetUrls) {
+    if (_.isPlainObject(object) && _.has(object, 'filename') && _.has(object, 'uid')) {
         if (typeof pos !== 'undefined') {
             if (typeof pos === 'number' || typeof pos === 'string') {
                 const replacer = () => {
-                    if (mappedAssetUids.hasOwnProperty(objekt.uid)) {
-                        parent[pos] = mappedAssetUids[objekt.uid];
-                        matchedUids.push(objekt.uid);
+                    if (mappedAssetUids.hasOwnProperty(object.uid)) {
+                        parent[pos] = mappedAssetUids[object.uid];
+                        matchedUids.push(object.uid);
                     }
                     else {
                         parent[pos] = '';
-                        unmatchedUids.push(objekt.uid);
+                        unmatchedUids.push(object.uid);
                     }
                 };
                 if (parent.uid && mappedAssetUids[parent.uid]) {
                     parent.uid = mappedAssetUids[parent.uid];
                 }
-                if (objekt &&
+                if (object &&
                     _.isObject(parent[pos]) &&
                     parent[pos].uid &&
                     parent[pos].url &&
@@ -379,11 +383,11 @@ function updateFileFields(objekt, parent, pos, mappedAssetUids, matchedUids, unm
                         parent._content_type_uid === 'sys_assets') {
                         parent = _.omit(parent, ['asset']);
                     }
-                    if (objekt.uid && mappedAssetUids && mappedAssetUids[objekt.uid]) {
-                        objekt.uid = mappedAssetUids[objekt.uid];
+                    if (object.uid && mappedAssetUids && mappedAssetUids[object.uid]) {
+                        object.uid = mappedAssetUids[object.uid];
                     }
-                    if (objekt.url && mappedAssetUrls && mappedAssetUrls[objekt.url]) {
-                        objekt.url = mappedAssetUrls[objekt.url];
+                    if (object.url && mappedAssetUrls && mappedAssetUrls[object.url]) {
+                        object.url = mappedAssetUrls[object.url];
                     }
                 }
                 else {
@@ -392,13 +396,14 @@ function updateFileFields(objekt, parent, pos, mappedAssetUids, matchedUids, unm
             }
         }
     }
-    else if (_.isPlainObject(objekt)) {
-        for (let key in objekt)
-            updateFileFields(objekt[key], objekt, key, mappedAssetUids, matchedUids, unmatchedUids);
+    else if (_.isPlainObject(object)) {
+        for (let key in object)
+            updateFileFields(object[key], object, key, mappedAssetUids, matchedUids, unmatchedUids);
     }
-    else if (_.isArray(objekt) && objekt.length) {
-        for (let i = 0; i <= objekt.length; i++)
-            updateFileFields(objekt[i], objekt, i, mappedAssetUids, matchedUids, unmatchedUids);
-        parent[pos] = _.compact(objekt);
+    else if (_.isArray(object) && object.length) {
+        for (let i = 0; i <= object.length; i++)
+            updateFileFields(object[i], object, i, mappedAssetUids, matchedUids, unmatchedUids);
+        // No need for _.compact() since you want to keep zero values
+        parent[pos] = _.filter(object, (value) => value !== undefined && value !== null);
     }
 }

package/lib/utils/backup-handler.js

@@ -12,7 +12,7 @@ async function backupHandler(importConfig) {
     let backupDirPath;
     const subDir = isSubDirectory(importConfig);
     if (subDir) {
-        backupDirPath = path.resolve(importConfig.contentDir, '..', '_backup_' + Math.floor(Math.random() * 1000));
+        backupDirPath = path.resolve((0, cli_utilities_1.sanitizePath)(importConfig.contentDir), '..', '_backup_' + Math.floor(Math.random() * 1000));
         if (importConfig.createBackupDir) {
             cli_utilities_1.cliux.print(`Warning!!! Provided backup directory path is a sub directory of the content directory, Cannot copy to a sub directory. Hence new backup directory created - ${backupDirPath}`, {
                 color: 'yellow',

package/lib/utils/common-helper.d.ts

@@ -1,6 +1,6 @@
 /*!
  * Contentstack Import
- * Copyright (c) 2019 Contentstack LLC
+ * Copyright (c) 2024 Contentstack LLC
  * MIT Licensed
  */
 import { ImportConfig } from '../types';

package/lib/utils/common-helper.js

@@ -2,7 +2,7 @@
 /* eslint-disable no-console */
 /*!
  * Contentstack Import
- * Copyright (c) 2019 Contentstack LLC
+ * Copyright (c) 2024 Contentstack LLC
  * MIT Licensed
  */
 Object.defineProperty(exports, "__esModule", { value: true });
@@ -65,7 +65,7 @@ const sanitizeStack = (importConfig) => {
             if (stackDetails.data && stackDetails.data.stack && stackDetails.data.stack.settings) {
                 const newStackVersion = stackDetails.data.stack.settings.version;
                 const newStackDate = new Date(newStackVersion).toString();
-                const stackFilePath = path.join(importConfig.data, importConfig.modules.stack.dirName, importConfig.modules.stack.fileName);
+                const stackFilePath = path.join((0, cli_utilities_1.sanitizePath)(importConfig.data), (0, cli_utilities_1.sanitizePath)(importConfig.modules.stack.dirName), (0, cli_utilities_1.sanitizePath)(importConfig.modules.stack.fileName));
                 const oldStackDetails = (0, file_helper_1.readFileSync)(stackFilePath);
                 if (!oldStackDetails || !oldStackDetails.settings || !oldStackDetails.settings.hasOwnProperty('version')) {
                     throw new Error(`${JSON.stringify(oldStackDetails)} is invalid!`);

package/lib/utils/content-type-helper.d.ts

@@ -42,7 +42,7 @@ export declare const schemaTemplate: {
 };
 /*!
  * Contentstack Import
- * Copyright (c) 2019 Contentstack LLC
+ * Copyright (c) 2024 Contentstack LLC
  * MIT Licensed
  */
 export declare const suppressSchemaReference: (schema: any, flag: any) => void;

package/lib/utils/content-type-helper.js

@@ -47,7 +47,7 @@ exports.schemaTemplate = {
 };
 /*!
  * Contentstack Import
- * Copyright (c) 2019 Contentstack LLC
+ * Copyright (c) 2024 Contentstack LLC
  * MIT Licensed
  */
 const suppressSchemaReference = function (schema, flag) {

package/lib/utils/entries-helper.js

@@ -84,15 +84,18 @@ const lookupEntries = function (data, mappedUids, uidMapperPath) {
                     }
                 }
                 else {
-                    _entry = _entry[_parent[j]];
-                    let _keys = _.clone(_parent).splice(j + 1, len);
-                    if (Array.isArray(_entry)) {
-                        for (let i = 0, _i = _entry === null || _entry === void 0 ? void 0 : _entry.length; i < _i; i++) {
-                            update(_keys, form_id, _entry[i]);
+                    const key = _parent[j];
+                    if (Object.prototype.hasOwnProperty.call(_entry, key)) {
+                        _entry = _entry[key];
+                        let _keys = _.clone(_parent).splice(j + 1, len);
+                        if (Array.isArray(_entry)) {
+                            for (let i = 0, _i = _entry === null || _entry === void 0 ? void 0 : _entry.length; i < _i; i++) {
+                                update(_keys, form_id, _entry[i]);
+                            }
+                        }
+                        else if (!(_entry instanceof Object)) {
+                            break;
                         }
-                    }
-                    else if (!(_entry instanceof Object)) {
-                        break;
                     }
                 }
             }
@@ -201,8 +204,12 @@ const lookupEntries = function (data, mappedUids, uidMapperPath) {
         if (mappedUids.hasOwnProperty(uid)) {
             const sanitizedUid = (0, cli_utilities_1.escapeRegExp)(uid);
             const escapedMappedUid = (0, cli_utilities_1.escapeRegExp)(mappedUids[uid]);
-            entry = entry.replace(new RegExp(sanitizedUid, 'img'), escapedMappedUid);
-            mapped.push(uid);
+            const uidRegex = new RegExp(`\\b${sanitizedUid}\\b`, 'img');
+            let { status } = (0, cli_utilities_1.validateRegex)(uidRegex);
+            if (status === 'safe') {
+                entry = entry.replace(uidRegex, escapedMappedUid);
+                mapped.push(uid);
+            }
         }
         else {
             unmapped.push(uid);
@@ -566,7 +573,11 @@ const restoreJsonRteEntryRefs = (entry, sourceStackEntry, ctSchema = [], { uidMa
 };
 exports.restoreJsonRteEntryRefs = restoreJsonRteEntryRefs;
 function updateUids(str, match, uidMapper) {
-    return str.replace(new RegExp(match, 'g'), (match) => uidMapper[match]);
+    const sanitizedMatch = (0, cli_utilities_1.escapeRegExp)(match);
+    const regex = new RegExp(`\\b${sanitizedMatch}\\b`, 'g');
+    let { status } = (0, cli_utilities_1.validateRegex)(regex);
+    if (status === 'safe')
+        return str.replace(regex, (matchedString) => uidMapper[matchedString]);
 }
 function setDirtyTrue(jsonRteChild) {
     // also removing uids in this function

package/lib/utils/extension-helper.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.lookupExtension = void 0;
 /*!
  * Contentstack Import
- * Copyright (c) 2019 Contentstack LLC
+ * Copyright (c) 2024 Contentstack LLC
  * MIT Licensed
  */
 const node_path_1 = require("node:path");

package/lib/utils/file-helper.js

@@ -9,7 +9,7 @@ const bigJSON = tslib_1.__importStar(require("big-json"));
 const cli_utilities_1 = require("@contentstack/cli-utilities");
 const readFileSync = function (filePath, parse = true) {
     let data;
-    filePath = path.resolve(filePath);
+    filePath = path.resolve((0, cli_utilities_1.sanitizePath)(filePath));
     if (fs.existsSync(filePath)) {
         try {
             data = parse ? JSON.parse(fs.readFileSync(filePath, 'utf-8')) : data;
@@ -24,7 +24,7 @@ exports.readFileSync = readFileSync;
 // by default file type is json
 const readFile = async (filePath, options = { type: 'json' }) => {
     return new Promise((resolve, reject) => {
-        filePath = path.resolve(filePath);
+        filePath = path.resolve((0, cli_utilities_1.sanitizePath)(filePath));
         fs.readFile(filePath, 'utf-8', (error, data) => {
             if (error) {
                 if (error.code === 'ENOENT') {
@@ -46,7 +46,7 @@ const readLargeFile = function (filePath, opts) {
     if (typeof filePath !== 'string') {
         return;
     }
-    filePath = path.resolve(filePath);
+    filePath = path.resolve((0, cli_utilities_1.sanitizePath)(filePath));
     if (fs.existsSync(filePath)) {
         return new Promise((resolve, reject) => {
             const readStream = fs.createReadStream(filePath, { encoding: 'utf-8' });
@@ -87,7 +87,7 @@ const writeLargeFile = function (filePath, data) {
     if (typeof filePath !== 'string' || typeof data !== 'object') {
         return;
     }
-    filePath = path.resolve(filePath);
+    filePath = path.resolve((0, cli_utilities_1.sanitizePath)(filePath));
     return new Promise((resolve, reject) => {
         const stringifyStream = bigJSON.createStringifyStream({
             body: data,
@@ -123,7 +123,7 @@ const readdirSync = function (dirPath) {
 exports.readdirSync = readdirSync;
 const isFolderExist = async (folderPath) => {
     return new Promise((resolve, reject) => {
-        folderPath = path.resolve(folderPath);
+        folderPath = path.resolve((0, cli_utilities_1.sanitizePath)(folderPath));
         fs.access(folderPath, (error) => {
             if (error) {
                 return resolve(false);

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

@@ -75,7 +75,7 @@ const setupConfig = async (importCmdFlags) => {
     config.skipPrivateAppRecreationIfExist = importCmdFlags['skip-app-recreation'];
     if (importCmdFlags['branch']) {
         config.branchName = importCmdFlags['branch'];
-        config.branchDir = path.join(config.contentDir, config.branchName);
+        config.branchDir = path.join((0, cli_utilities_1.sanitizePath)(config.contentDir), (0, cli_utilities_1.sanitizePath)(config.branchName));
     }
     if (importCmdFlags['module']) {
         config.moduleName = importCmdFlags['module'];

package/lib/utils/log.js

@@ -22,7 +22,7 @@ exports.log = log;
 function initLogger(config) {
     var _a;
     if (!logger) {
-        const basePath = (0, cli_utilities_1.pathValidator)((0, path_1.join)((_a = config === null || config === void 0 ? void 0 : config.cliLogsPath) !== null && _a !== void 0 ? _a : process.cwd(), 'logs', 'import'));
+        const basePath = (0, cli_utilities_1.pathValidator)((0, path_1.join)((0, cli_utilities_1.sanitizePath)((_a = config === null || config === void 0 ? void 0 : config.cliLogsPath) !== null && _a !== void 0 ? _a : process.cwd()), 'logs', 'import'));
         exports.logger = logger = new cli_utilities_1.Logger(Object.assign(config !== null && config !== void 0 ? config : {}, { basePath }));
     }
     return logger;

package/lib/utils/logger.d.ts

@@ -1,6 +1,6 @@
 /*!
  * Contentstack Export
- * Copyright (c) 2019 Contentstack LLC
+ * Copyright (c) 2024 Contentstack LLC
  * MIT Licensed
  */
 import { ImportConfig } from '../types';

package/lib/utils/logger.js

@@ -1,7 +1,7 @@
 "use strict";
 /*!
  * Contentstack Export
- * Copyright (c) 2019 Contentstack LLC
+ * Copyright (c) 2024 Contentstack LLC
  * MIT Licensed
  */
 Object.defineProperty(exports, "__esModule", { value: true });
@@ -9,6 +9,7 @@ exports.unlinkFileLogger = exports.log = void 0;
 const tslib_1 = require("tslib");
 const winston = tslib_1.__importStar(require("winston"));
 const path = tslib_1.__importStar(require("path"));
+const cli_utilities_1 = require("@contentstack/cli-utilities");
 const slice = Array.prototype.slice;
 const ansiRegexPattern = [
     '[\\u001B\\u009B][[\\]()#;?]*(?:(?:(?:(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]+)*|[a-zA-Z\\d]+(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]*)*)?\\u0007)',
@@ -54,16 +55,16 @@ let successTransport;
 let errorTransport;
 function init(_logPath) {
     if (!logger || !errorLogger) {
-        const logsDir = path.resolve(_logPath, 'logs', 'import');
+        const logsDir = path.resolve((0, cli_utilities_1.sanitizePath)(_logPath), 'logs', 'import');
         successTransport = {
-            filename: path.join(logsDir, 'success.log'),
+            filename: path.join((0, cli_utilities_1.sanitizePath)(logsDir), 'success.log'),
             maxFiles: 20,
             maxsize: 1000000,
             tailable: true,
             level: 'info',
         };
         errorTransport = {
-            filename: path.join(logsDir, 'error.log'),
+            filename: path.join((0, cli_utilities_1.sanitizePath)(logsDir), 'error.log'),
             maxFiles: 20,
             maxsize: 1000000,
             tailable: true,

package/lib/utils/login-handler.d.ts

@@ -1,6 +1,6 @@
 /*!
  * Contentstack Import
- * Copyright (c) 2019 Contentstack LLC
+ * Copyright (c) 2024 Contentstack LLC
  * MIT Licensed
  */
 import { ImportConfig } from '../types';

package/lib/utils/login-handler.js

@@ -4,7 +4,7 @@
 /* eslint-disable no-empty */
 /*!
  * Contentstack Import
- * Copyright (c) 2019 Contentstack LLC
+ * Copyright (c) 2024 Contentstack LLC
  * MIT Licensed
  */
 Object.defineProperty(exports, "__esModule", { value: true });

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.15.4",
+  "version": "1.15.6",
   "commands": {
     "cm:stacks:import": {
       "id": "cm:stacks:import",

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@contentstack/cli-cm-import",
   "description": "Contentstack CLI plugin to import content into stack",
-  "version": "1.15.4",
+  "version": "1.15.6",
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {
-    "@contentstack/cli-audit": "~1.6.0",
-    "@contentstack/cli-command": "~1.2.16",
-    "@contentstack/cli-utilities": "~1.6.0",
+    "@contentstack/cli-audit": "~1.6.2",
+    "@contentstack/cli-command": "~1.2.18",
+    "@contentstack/cli-utilities": "~1.6.2",
     "@contentstack/management": "~1.15.3",
-    "@oclif/core": "^2.9.3",
+    "@oclif/core": "^3.26.5",
     "big-json": "^3.2.0",
     "bluebird": "^3.7.2",
     "chalk": "^4.1.2",

package/bin/dev

@@ -1,6 +0,0 @@
-#!/usr/bin/env node
-
-(async () => {
-  const oclif = require('@oclif/core');
-  await oclif.execute({ type: 'cjs', development: true, dir: __dirname });
-})();

package/bin/run

@@ -1,6 +0,0 @@
-#!/usr/bin/env node
-
-(async () => {
-  const { execute } = require('@contentstack/cli-utilities');
-  await execute({ type: 'cjs', dir: __dirname });
-})();