Merge branch 'development' into feat/DX-71

Author: naman-contentstack

package-lock.json

@@ -1,7 +1,7 @@
 const fs = require('fs');
 const path = require('path');
 const { Command } = require('@contentstack/cli-command');
-const { cliux, flags } = require('@contentstack/cli-utilities');
+const { flags } = require('@contentstack/cli-utilities');
 
 let config = require('../../../config/index.js');
 

packages/contentstack-bulk-publish/src/commands/cm/stacks/publish-configure.js

@@ -5,7 +5,6 @@
 /* eslint-disable max-params */
 const { configHandler } = require('@contentstack/cli-utilities');
 const { getQueue } = require('../util/queue');
-const defaults = require('../config/defaults.json');
 const { performBulkPublish, publishEntry, publishAsset, initializeLogger } = require('../consumer/publish');
 const retryFailedLogs = require('../util/retryfailed');
 const { validateFile } = require('../util/fs');
@@ -313,7 +312,6 @@ async function start(
   {
     retryFailed,
     bulkPublish,
-    _filter,
     deliveryToken,
     contentTypes,
     environment,

packages/contentstack-bulk-publish/src/producer/cross-publish.js

@@ -148,8 +148,8 @@ async function start({ retryFailed, bulkPublish, environments, folderUid, locale
   } else if (folderUid) {
     setConfig(config, bulkPublish);
     const bulkPublishLimit = fetchBulkPublishLimit(stack?.org_uid);
-    for (const element of locales) {
-      await getAssets(stack, folderUid, bulkPublish, environments, element, apiVersion, bulkPublishLimit);
+    for (const locale of locales) {
+      await getAssets(stack, folderUid, bulkPublish, environments, locale, apiVersion, bulkPublishLimit);
     }
   }
 }

packages/contentstack-bulk-publish/src/producer/publish-assets.js

@@ -8,7 +8,6 @@ const { getQueue } = require('../util/queue');
 const { performBulkPublish, publishEntry, initializeLogger } = require('../consumer/publish');
 const retryFailedLogs = require('../util/retryfailed');
 const { validateFile } = require('../util/fs');
-const { setDelayForBulkPublish } = require('../util');
 const { isEmpty } = require('../util');
 const { fetchBulkPublishLimit } = require('../util/common-utility');
 

packages/contentstack-bulk-publish/src/producer/publish-edits.js

@@ -5,7 +5,6 @@
 /* eslint-disable camelcase */
 const { configHandler } = require('@contentstack/cli-utilities');
 const { getQueue } = require('../util/queue');
-const defaults = require('../config/defaults.json');
 const { performBulkUnPublish, UnpublishEntry, UnpublishAsset, initializeLogger } = require('../consumer/publish');
 const retryFailedLogs = require('../util/retryfailed');
 const { validateFile } = require('../util/fs');

packages/contentstack-bulk-publish/src/producer/unpublish.js

@@ -1,6 +1,4 @@
 const fs = require('fs');
-const chalk = require('chalk');
-const path = require('path');
 const { getLogsDirPath } = require('../util/logger.js');
 
 const logsDir = getLogsDirPath();

packages/contentstack-bulk-publish/src/util/fs.js

@@ -1,5 +1,4 @@
 const fs = require('fs');
-const path = require('path');
 const config = require('../config/index.js');
 const chalk = require('chalk');
 const {pathValidator} = require('@contentstack/cli-utilities')

packages/contentstack-bulk-publish/src/util/store.js

@@ -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/import-setup.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');