@contentstack/cli-cm-import-setup 1.0.0 → 1.1.0

package/README.md

@@ -47,7 +47,7 @@ $ npm install -g @contentstack/cli-cm-import-setup
 $ csdx COMMAND
 running command...
 $ csdx (--version)
-@contentstack/cli-cm-import-setup/1.0.0 linux-x64 node-v18.20.6
+@contentstack/cli-cm-import-setup/1.1.0 linux-x64 node-v22.14.0
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND

package/lib/config/index.js

@@ -9,6 +9,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'],

package/lib/import/import-setup.js

@@ -41,20 +41,27 @@ class ImportSetup {
      * @returns {Promise<Array<void | string>>}
      */
     async generateDependencyTree() {
-        const getAllDependencies = (module, visited = new Set()) => {
+        const visited = new Set();
+        const assignedDependencies = new Set(); // Track assigned dependencies
+        const getAllDependencies = (module) => {
             var _a;
             if (visited.has(module))
                 return [];
             visited.add(module);
-            let dependencies = ((_a = this.config.modules[module]) === null || _a === void 0 ? void 0 : _a.dependencies) || [];
+            const dependencies = ((_a = this.config.modules[module]) === null || _a === void 0 ? void 0 : _a.dependencies) || [];
+            let allDeps = [...dependencies];
             for (const dependency of dependencies) {
-                dependencies = dependencies.concat(getAllDependencies(dependency, visited));
+                allDeps.push(...getAllDependencies(dependency));
             }
-            return dependencies;
+            return allDeps;
         };
+        this.dependencyTree = {}; // Reset before building
         for (const module of this.config.selectedModules) {
-            const allDependencies = getAllDependencies(module);
-            this.dependencyTree[module] = Array.from(new Set(allDependencies));
+            let allDependencies = getAllDependencies(module);
+            allDependencies = allDependencies.filter((dep) => !assignedDependencies.has(dep)); // Remove assigned ones
+            this.dependencyTree[module] = allDependencies;
+            // Mark these dependencies as assigned so they won't be included in later modules
+            allDependencies.forEach((dep) => assignedDependencies.add(dep));
         }
     }
     /**

package/lib/import/modules/extensions.js

@@ -37,7 +37,7 @@ class ExtensionImportSetup {
                 (0, utils_1.log)(this.config, `The required setup files for extensions have been generated successfully.`, 'success');
             }
             else {
-                (0, utils_1.log)(this.config, 'No extensions found in the content folder.', 'error');
+                (0, utils_1.log)(this.config, 'No extensions found in the content folder.', 'info');
             }
         }
         catch (error) {

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

@@ -56,7 +56,12 @@ class marketplaceAppImportSetup {
     createMapper(sourceMarketplaceApps, targetMarketplaceApps) {
         sourceMarketplaceApps.forEach((sourceApp) => {
             // Find matching target item based on manifest.name
-            const targetApp = targetMarketplaceApps.find((targetApp) => (0, lodash_1.get)(targetApp, 'manifest.name') === (0, lodash_1.get)(sourceApp, 'manifest.name'));
+            // TBD: This logic is not foolproof, need to find a better way to match source and target apps
+            // Reason: While importing apps, if an app exist in the target with the same name, it will be a conflict and will not be imported
+            // So, import command gives an option to import the app with a different name by appending ◈ to the app name. Considering this we are matching the app name without the ◈ character
+            const getAppName = (app) => (0, lodash_1.get)(app, 'manifest.name', '').split('◈')[0];
+            const sourceAppName = getAppName(sourceApp);
+            const targetApp = targetMarketplaceApps.find((app) => getAppName(app) === sourceAppName);
             if (targetApp) {
                 // Map app_uid from source and target
                 this.marketplaceAppMapper.app_uid[sourceApp.manifest.uid] = targetApp.manifest.uid;
@@ -75,6 +80,9 @@ class marketplaceAppImportSetup {
                     }
                 });
             }
+            else {
+                (0, utils_1.log)(this.config, `No matching Marketplace app found in the target stack with name ${sourceAppName}`, 'info');
+            }
         });
     }
 }

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.0.0",
+  "version": "1.1.0",
   "commands": {
     "cm:stacks:import-setup": {
       "id": "cm:stacks:import-setup",

package/package.json

@@ -1,29 +1,22 @@
 {
   "name": "@contentstack/cli-cm-import-setup",
   "description": "Contentstack CLI plugin to setup the mappers and configurations for the import command",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {
-    "@contentstack/cli-command": "~1.3.2",
-    "@contentstack/cli-utilities": "~1.8.0",
+    "@contentstack/cli-command": "~1.3.3",
+    "@contentstack/cli-utilities": "~1.8.4",
     "@oclif/core": "^3.27.0",
     "big-json": "^3.2.0",
-    "bluebird": "^3.7.2",
     "chalk": "^4.1.2",
-    "debug": "^4.4.0",
     "fs-extra": "^11.1.1",
     "lodash": "^4.17.21",
-    "marked": "^4.3.0",
     "merge": "^2.1.1",
     "mkdirp": "^1.0.4",
-    "promise-limit": "^2.7.0",
-    "tslib": "^2.8.1",
-    "uuid": "^9.0.1",
     "winston": "^3.17.0"
   },
   "devDependencies": {
-    "@oclif/test": "^4.1.6",
     "@types/big-json": "^3.2.5",
     "@types/bluebird": "^3.5.42",
     "@types/chai": "^4.3.20",
@@ -31,20 +24,15 @@
     "@types/mkdirp": "^1.0.2",
     "@types/mocha": "^8.2.3",
     "@types/node": "^14.18.63",
-    "@types/sinon": "^10.0.20",
     "@types/tar": "^6.1.13",
     "@types/uuid": "^9.0.8",
     "@typescript-eslint/eslint-plugin": "^5.62.0",
     "chai": "^4.5.0",
     "eslint": "^8.57.1",
     "eslint-config-oclif": "^4.0.0",
-    "globby": "^10.0.2",
     "mocha": "^10.8.2",
     "nyc": "^15.1.0",
     "oclif": "^3.17.2",
-    "rimraf": "^2.7.1",
-    "sinon": "^11.1.2",
-    "tmp": "^0.2.3",
     "ts-node": "^10.9.2",
     "typescript": "^4.9.5"
   },