@contentstack/cli-cm-import 1.16.1 → 1.16.3

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.16.1 linux-x64 node-v18.20.4
+@contentstack/cli-cm-import/1.16.3 linux-x64 node-v18.20.4
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND

package/lib/import/modules/marketplace-apps.d.ts

@@ -15,6 +15,7 @@ export default class ImportMarketplaceApps {
     developerHubBaseUrl: string;
     nodeCrypto: NodeCrypto;
     appSdk: ContentstackMarketplaceClient;
+    existingNames: Set<string>;
     constructor({ importConfig }: ModuleClassParams);
     /**
      * This function starts the process of importing marketplace apps.

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

@@ -28,6 +28,7 @@ class ImportMarketplaceApps {
         this.appOriginalName = undefined;
         this.installedApps = [];
         this.installationUidMapping = {};
+        this.existingNames = new Set();
     }
     /**
      * This function starts the process of importing marketplace apps.
@@ -269,14 +270,14 @@ class ImportMarketplaceApps {
             if (location.meta) {
                 location.meta = (0, map_1.default)(location.meta, (meta) => {
                     if (meta.name && this.appOriginalName == meta.name) {
-                        const name = (0, interactive_1.getAppName)((0, first_1.default)((0, split_1.default)(meta.name, '◈')), appSuffix);
+                        const name = (0, interactive_1.getLocationName)((0, first_1.default)((0, split_1.default)(meta.name, '◈')), appSuffix, this.existingNames);
                         if (!this.appNameMapping[this.appOriginalName]) {
                             this.appNameMapping[this.appOriginalName] = name;
                         }
                         meta.name = name;
                     }
                     else if (meta.name) {
-                        meta.name = (0, interactive_1.getAppName)((0, first_1.default)((0, split_1.default)(meta.name, '◈')), appSuffix + (+index + 1));
+                        meta.name = (0, interactive_1.getLocationName)((0, first_1.default)((0, split_1.default)(meta.name, '◈')), appSuffix + (+index + 1), this.existingNames);
                     }
                     return meta;
                 });

package/lib/utils/interactive.d.ts

@@ -3,4 +3,5 @@ export declare const askAPIKey: () => Promise<string>;
 export declare const askEncryptionKey: (defaultValue: unknown) => Promise<string>;
 export declare const askAppName: (app: any, appSuffix: number) => Promise<string>;
 export declare const getAppName: (name: string, appSuffix?: number) => string;
+export declare const getLocationName: (name: string, appSuffix: number, existingNames: Set<string>) => string;
 export declare const selectConfiguration: () => Promise<string>;

package/lib/utils/interactive.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.selectConfiguration = exports.getAppName = exports.askAppName = exports.askEncryptionKey = exports.askAPIKey = exports.askContentDir = void 0;
+exports.selectConfiguration = exports.getLocationName = exports.getAppName = exports.askAppName = exports.askEncryptionKey = exports.askAPIKey = exports.askContentDir = void 0;
 const tslib_1 = require("tslib");
 const cli_utilities_1 = require("@contentstack/cli-utilities");
 const path = tslib_1.__importStar(require("path"));
@@ -56,6 +56,24 @@ const getAppName = (name, appSuffix = 1) => {
     return name;
 };
 exports.getAppName = getAppName;
+const getLocationName = (name, appSuffix = 1, existingNames) => {
+    const maxLength = 50;
+    const suffixLength = appSuffix.toString().length + 1; // +1 for the '◈' character
+    let truncatedName = name;
+    if (name.length + suffixLength > maxLength) {
+        truncatedName = name.slice(0, maxLength - suffixLength);
+    }
+    let newName = `${(0, first_1.default)((0, split_1.default)(truncatedName, '◈'))}◈${appSuffix}`;
+    // Ensure uniqueness
+    while (existingNames.has(newName)) {
+        appSuffix++;
+        newName = `${(0, first_1.default)((0, split_1.default)(truncatedName, '◈'))}◈${appSuffix}`;
+    }
+    // Add the new name to the set of existing names
+    existingNames.add(newName);
+    return newName;
+};
+exports.getLocationName = getLocationName;
 const validateAppName = (name) => {
     if (name.length < 3 || name.length > 20) {
         return 'The app name should be within 3-20 characters long.';

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.16.1",
+  "version": "1.16.3",
   "commands": {
     "cm:stacks:import": {
       "id": "cm:stacks:import",

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@contentstack/cli-cm-import",
   "description": "Contentstack CLI plugin to import content into stack",
-  "version": "1.16.1",
+  "version": "1.16.3",
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {
     "@contentstack/cli-audit": "~1.6.3",
-    "@contentstack/cli-command": "~1.2.18",
-    "@contentstack/cli-utilities": "~1.6.3",
+    "@contentstack/cli-command": "~1.2.19",
+    "@contentstack/cli-utilities": "~1.7.0",
     "@contentstack/management": "~1.15.3",
     "@oclif/core": "^3.26.5",
     "big-json": "^3.2.0",
@@ -21,7 +21,7 @@
     "mkdirp": "^1.0.4",
     "promise-limit": "^2.7.0",
     "tslib": "^2.4.1",
-    "uuid": "^9.0.0",
+    "uuid": "^9.0.1",
     "winston": "^3.7.2"
   },
   "devDependencies": {