Merge pull request #1759 from contentstack/fix/dev-back-merge

Fix/dev back merge

Author: cs-raj

packages/contentstack-import-setup/src/import/import-setup.ts

@@ -27,23 +27,34 @@ export default class ImportSetup {
    */
   protected async generateDependencyTree() {
     type ModulesKey = keyof typeof this.config.modules;
+    const visited: Set<string> = new Set();
+    const assignedDependencies: Set<string> = new Set(); // Track assigned dependencies
 
-    const getAllDependencies = (module: ModulesKey, visited: Set<string> = new Set()): Modules[] => {
+    const getAllDependencies = (module: ModulesKey): Modules[] => {
       if (visited.has(module)) return [];
 
       visited.add(module);
-      let dependencies: Modules[] = this.config.modules[module as ModulesKey]?.dependencies || [];
+      const dependencies: Modules[] = this.config.modules[module]?.dependencies || [];
+
+      let allDeps: Modules[] = [...dependencies];
 
       for (const dependency of dependencies) {
-        dependencies = dependencies.concat(getAllDependencies(dependency as ModulesKey, visited));
+        allDeps.push(...getAllDependencies(dependency as ModulesKey));
       }
 
-      return dependencies;
+      return allDeps;
     };
 
+    this.dependencyTree = {}; // Reset before building
+
     for (const module of this.config.selectedModules) {
-      const allDependencies = getAllDependencies(module as ModulesKey);
-      this.dependencyTree[module] = Array.from(new Set(allDependencies));
+      let allDependencies = getAllDependencies(module as ModulesKey);
+      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));
     }
   }
 

packages/contentstack-import-setup/src/import/modules/extensions.ts

@@ -51,7 +51,7 @@ export default class ExtensionImportSetup {
 
         log(this.config, `The required setup files for extensions have been generated successfully.`, 'success');
       } else {
-        log(this.config, 'No extensions found in the content folder.', 'error');
+        log(this.config, 'No extensions found in the content folder.', 'info');
       }
     } catch (error) {
       log(this.config, `Error occurred while generating the extension mapper: ${formatError(error)}.`, 'error');

packages/contentstack-import-setup/src/import/modules/marketplace-apps.ts

@@ -85,9 +85,14 @@ export default class marketplaceAppImportSetup {
   createMapper(sourceMarketplaceApps: any, targetMarketplaceApps: any) {
     sourceMarketplaceApps.forEach((sourceApp: any) => {
       // Find matching target item based on manifest.name
-      const targetApp = targetMarketplaceApps.find(
-        (targetApp: any) => get(targetApp, 'manifest.name') === 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: any) => get(app, 'manifest.name', '').split('◈')[0];
+
+      const sourceAppName = getAppName(sourceApp);
+
+      const targetApp = targetMarketplaceApps.find((app: any) => getAppName(app) === sourceAppName);
 
       if (targetApp) {
         // Map app_uid from source and target
@@ -114,6 +119,8 @@ export default class marketplaceAppImportSetup {
             });
           }
         });
+      } else {
+        log(this.config, `No matching Marketplace app found in the target stack with name ${sourceAppName}`, 'info');
       }
     });
   }

packages/contentstack-import/src/import/modules/marketplace-apps.ts

@@ -94,7 +94,7 @@ export default class ImportMarketplaceApps {
       return Promise.resolve();
     }
     await fsUtil.makeDirectory(this.mapperDirPath);
-    this.developerHubBaseUrl = this.importConfig.developerHubBaseUrl || (await getDeveloperHubUrl(this.importConfig))
+    this.developerHubBaseUrl = this.importConfig.developerHubBaseUrl || (await getDeveloperHubUrl(this.importConfig));
     this.importConfig.developerHubBaseUrl = this.developerHubBaseUrl;
 
     // NOTE init marketplace app sdk
@@ -282,7 +282,8 @@ export default class ImportMarketplaceApps {
       .marketplace(this.importConfig.org_uid)
       .installation(app.uid)
       .fetch()
-      .catch(() => {}); // NOTE Keeping this to avoid Unhandled exception
+      .catch(() => {}); // NOTE Keeping this to avoid Unhandled exce
+    // ption
 
     return !isEmpty(installation);
   }

packages/contentstack-import/src/utils/entries-helper.ts

@@ -214,7 +214,7 @@ export const lookupEntries = function (
         entry = entry.replace(uidRegex, escapedMappedUid);
         mapped.push(uid);
       } else {
-        log(`Skipping the entry uid ${uid} since the regex is not valid`,'error');
+        log(`Skipping the entry uid ${uid} since the regex is not valid`, 'warn');
       }
     } else {
       unmapped.push(uid);

packages/contentstack/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@contentstack/cli",
   "description": "Command-line tool (CLI) to interact with Contentstack",
-  "version": "1.35.0",
+  "version": "1.35.1",
   "author": "Contentstack",
   "bin": {
     "csdx": "./bin/run.js"