Merge branch 'development' of github.com:contentstack/cli into development

shafeeqd959 · shafeeqd959 · commit 390599f11bcb · 2025-02-20T13:50:17.000+05:30
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -14,7 +14,7 @@ jobs:
           version: 7
       - uses: actions/setup-node@v4
         with:
-          node-version: '18.x'
+          node-version: '22.x'
           cache: 'pnpm'
       - name: Reading Configuration
         id: release_config
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/contentstack-audit/README.md b/packages/contentstack-audit/README.md
@@ -269,7 +269,7 @@ EXAMPLES
   $ csdx plugins
 ```
 
-_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.30/src/commands/plugins/index.ts)_
+_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.31/src/commands/plugins/index.ts)_
 
 ## `csdx plugins:add PLUGIN`
 
@@ -343,7 +343,7 @@ EXAMPLES
   $ csdx plugins:inspect myplugin
 ```
 
-_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.30/src/commands/plugins/inspect.ts)_
+_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.31/src/commands/plugins/inspect.ts)_
 
 ## `csdx plugins:install PLUGIN`
 
@@ -392,7 +392,7 @@ EXAMPLES
     $ csdx plugins:install someuser/someplugin
 ```
 
-_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.30/src/commands/plugins/install.ts)_
+_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.31/src/commands/plugins/install.ts)_
 
 ## `csdx plugins:link PATH`
 
@@ -423,7 +423,7 @@ EXAMPLES
   $ csdx plugins:link myplugin
 ```
 
-_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.30/src/commands/plugins/link.ts)_
+_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.31/src/commands/plugins/link.ts)_
 
 ## `csdx plugins:remove [PLUGIN]`
 
@@ -464,7 +464,7 @@ FLAGS
   --reinstall  Reinstall all plugins after uninstalling.
 ```
 
-_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.30/src/commands/plugins/reset.ts)_
+_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.31/src/commands/plugins/reset.ts)_
 
 ## `csdx plugins:uninstall [PLUGIN]`
 
@@ -492,7 +492,7 @@ EXAMPLES
   $ csdx plugins:uninstall myplugin
 ```
 
-_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.30/src/commands/plugins/uninstall.ts)_
+_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.31/src/commands/plugins/uninstall.ts)_
 
 ## `csdx plugins:unlink [PLUGIN]`
 
@@ -536,5 +536,5 @@ DESCRIPTION
   Update installed plugins.
 ```
 
-_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.30/src/commands/plugins/update.ts)_
+_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.31/src/commands/plugins/update.ts)_
 <!-- commandsstop -->
diff --git a/packages/contentstack-bulk-publish/src/commands/cm/stacks/publish-configure.js b/packages/contentstack-bulk-publish/src/commands/cm/stacks/publish-configure.js
@@ -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');
 
diff --git a/packages/contentstack-bulk-publish/src/producer/cross-publish.js b/packages/contentstack-bulk-publish/src/producer/cross-publish.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,
diff --git a/packages/contentstack-bulk-publish/src/producer/publish-assets.js b/packages/contentstack-bulk-publish/src/producer/publish-assets.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);
     }
   }
 }
diff --git a/packages/contentstack-bulk-publish/src/producer/publish-edits.js b/packages/contentstack-bulk-publish/src/producer/publish-edits.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');
 
diff --git a/packages/contentstack-bulk-publish/src/producer/unpublish.js b/packages/contentstack-bulk-publish/src/producer/unpublish.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');
diff --git a/packages/contentstack-bulk-publish/src/util/fs.js b/packages/contentstack-bulk-publish/src/util/fs.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();
diff --git a/packages/contentstack-bulk-publish/src/util/store.js b/packages/contentstack-bulk-publish/src/util/store.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')
diff --git a/packages/contentstack-import-setup/src/import/import-setup.ts b/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));
     }
   }
 
diff --git a/packages/contentstack-import-setup/src/import/modules/extensions.ts b/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');
diff --git a/packages/contentstack-import-setup/src/import/modules/marketplace-apps.ts b/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');
       }
     });
   }
diff --git a/packages/contentstack-import/src/import/modules/marketplace-apps.ts b/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);
   }
diff --git a/packages/contentstack-import/src/utils/entries-helper.ts b/packages/contentstack-import/src/utils/entries-helper.ts
@@ -8,6 +8,7 @@ import * as _ from 'lodash';
 import config from '../config';
 import * as fileHelper from './file-helper';
 import { escapeRegExp, validateRegex } from '@contentstack/cli-utilities';
+import { log } from './log';
 
 import { EntryJsonRTEFieldDataType } from '../types/entries';
 
@@ -212,6 +213,8 @@ export const lookupEntries = function (
       if (status === 'safe') {
         entry = entry.replace(uidRegex, escapedMappedUid);
         mapped.push(uid);
+      } else {
+        log(`Skipping the entry uid ${uid} since the regex is not valid`, 'warn');
       }
     } else {
       unmapped.push(uid);
diff --git a/packages/contentstack-utilities/src/helpers.ts b/packages/contentstack-utilities/src/helpers.ts
@@ -96,7 +96,8 @@ export const formatError = function (error: any) {
   }
 
   // Determine the error message
-  let message = parsedError.errorMessage || parsedError.error_message || parsedError.message || parsedError;
+  let message =
+    parsedError.errorMessage || parsedError.error_message || parsedError?.code || parsedError.message || parsedError;
   if (typeof message === 'object') {
     message = JSON.stringify(message);
   }
diff --git a/packages/contentstack/README.md b/packages/contentstack/README.md
@@ -18,7 +18,7 @@ $ npm install -g @contentstack/cli
 $ csdx COMMAND
 running command...
 $ csdx (--version|-v)
-@contentstack/cli/1.35.0 darwin-arm64 node-v22.2.0
+@contentstack/cli/1.35.2 darwin-arm64 node-v22.2.0
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND
@@ -3897,7 +3897,7 @@ EXAMPLES
   $ csdx plugins
 ```
 
-_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.30/src/commands/plugins/index.ts)_
+_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.31/src/commands/plugins/index.ts)_
 
 ## `csdx plugins:add PLUGIN`
 
@@ -3971,7 +3971,7 @@ EXAMPLES
   $ csdx plugins:inspect myplugin
 ```
 
-_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.30/src/commands/plugins/inspect.ts)_
+_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.31/src/commands/plugins/inspect.ts)_
 
 ## `csdx plugins:install PLUGIN`
 
@@ -4020,7 +4020,7 @@ EXAMPLES
     $ csdx plugins:install someuser/someplugin
 ```
 
-_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.30/src/commands/plugins/install.ts)_
+_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.31/src/commands/plugins/install.ts)_
 
 ## `csdx plugins:link PATH`
 
@@ -4051,7 +4051,7 @@ EXAMPLES
   $ csdx plugins:link myplugin
 ```
 
-_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.30/src/commands/plugins/link.ts)_
+_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.31/src/commands/plugins/link.ts)_
 
 ## `csdx plugins:remove [PLUGIN]`
 
@@ -4092,7 +4092,7 @@ FLAGS
   --reinstall  Reinstall all plugins after uninstalling.
 ```
 
-_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.30/src/commands/plugins/reset.ts)_
+_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.31/src/commands/plugins/reset.ts)_
 
 ## `csdx plugins:uninstall [PLUGIN]`
 
@@ -4120,7 +4120,7 @@ EXAMPLES
   $ csdx plugins:uninstall myplugin
 ```
 
-_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.30/src/commands/plugins/uninstall.ts)_
+_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.31/src/commands/plugins/uninstall.ts)_
 
 ## `csdx plugins:unlink [PLUGIN]`
 
@@ -4164,7 +4164,7 @@ DESCRIPTION
   Update installed plugins.
 ```
 
-_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.30/src/commands/plugins/update.ts)_
+_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.31/src/commands/plugins/update.ts)_
 
 ## `csdx tokens`
 
diff --git a/packages/contentstack/package.json b/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.2",
   "author": "Contentstack",
   "bin": {
     "csdx": "./bin/run.js"

Original file line number	Diff line number	Diff line change
`@@ -148,8 +148,8 @@ async function start({ retryFailed, bulkPublish, environments, folderUid, locale`
`148`	`148`	`} else if (folderUid) {`
`149`	`149`	`setConfig(config, bulkPublish);`
`150`	`150`	`const bulkPublishLimit = fetchBulkPublishLimit(stack?.org_uid);`
`151`		`- for (const element of locales) {`
`152`		`- await getAssets(stack, folderUid, bulkPublish, environments, element, apiVersion, bulkPublishLimit);`
	`151`	`+ for (const locale of locales) {`
	`152`	`+ await getAssets(stack, folderUid, bulkPublish, environments, locale, apiVersion, bulkPublishLimit);`
`153`	`153`	`}`
`154`	`154`	`}`
`155`	`155`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`const fs = require('fs');`
`2`		`-const path = require('path');`
`3`	`2`	`const config = require('../config/index.js');`
`4`	`3`	`const chalk = require('chalk');`
`5`	`4`	`const {pathValidator} = require('@contentstack/cli-utilities')`