merged changes

Author: shafeeqd959

.talismanrc

@@ -2,5 +2,5 @@ fileignoreconfig:
   - filename: packages/contentstack-import/src/utils/import-config-handler.ts
     checksum: 3194f537cee8041f07a7ea91cdc6351c84e400766696d9c3cf80b98f99961f76
   - filename: pnpm-lock.yaml
-    checksum: f4bc99d0e633845924cbe8079c5dbb3c200022c13af6854ec38190c28d254813
+    checksum: cea25dedde40bf962d825a088e505113c997ae666a4385d3eec0ae3f9f5d1404
 version: '1.0'

packages/contentstack-audit/README.md

@@ -19,7 +19,7 @@ $ npm install -g @contentstack/cli-audit
 $ csdx COMMAND
 running command...
 $ csdx (--version|-v)
-@contentstack/cli-audit/2.0.0-beta.6 darwin-arm64 node-v24.13.0
+@contentstack/cli-audit/2.0.0-beta.10 darwin-arm64 node-v22.13.1
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND
@@ -157,5 +157,5 @@ DESCRIPTION
   Display help for csdx.
 ```
 
-_See code: [@oclif/plugin-help](https://github.com/oclif/plugin-help/blob/v6.2.37/src/commands/help.ts)_
+_See code: [@oclif/plugin-help](https://github.com/oclif/plugin-help/blob/6.2.44/src/commands/help.ts)_
 <!-- commandsstop -->

packages/contentstack-audit/src/config/index.ts

@@ -110,6 +110,7 @@ const config = {
     'publish_locale',
     'publish_environment',
     'asset_uid',
+    'space_id',
     'selectedValue',
     'ct_uid',
     'action',

packages/contentstack-audit/src/messages/index.ts

@@ -44,6 +44,7 @@ const auditMsg = {
   ENTRY_PUBLISH_DETAILS: `Removing the publish details for entry '{uid}' of ct '{ctuid}' in locale '{locale}' as locale '{publocale}' or environment '{environment}' does not exist`,
   CT_REFERENCE_FIELD: `The mentioned Reference field is not Array field reference is '{reference_to}' having display name '{display_name}''`,
   ASSET_NOT_EXIST: `The publish_details either does not exist or is not an array for asset uid '{uid}'`,
+  AUDITING_SPACE: `Auditing assets for space: '{spaceId}'`,
   ENTRY_PUBLISH_DETAILS_NOT_EXIST: `The publish_details either does not exist or is not an array for entry uid '{uid}'`,
   FIELD_RULE_CONDITION_ABSENT: `The operand field '{condition_field}' is not present in the schema of the content-type {ctUid}`,
   FIELD_RULE_TARGET_ABSENT: `The target field '{target_field}' is not present in the schema of the content-type {ctUid}`,

packages/contentstack-audit/src/modules/assets.ts

@@ -1,5 +1,5 @@
 import { join, resolve } from 'path';
-import { existsSync, readFileSync } from 'fs';
+import { existsSync, readFileSync, readdirSync } from 'fs';
 import { FsUtility, sanitizePath, log } from '@contentstack/cli-utilities';
 import { ConfigType, ContentTypeStruct, CtConstructorParam, ModuleConstructorParam } from '../types';
 import { keys, values } from 'lodash';
@@ -46,10 +46,25 @@ export default class ModuleDataReader {
         break;
       case 'assets': {
         log.debug(`Counting assets`, this.config.auditContext);
-        const assetsPath = join(this.folderPath, 'assets');
-        log.debug(`Assets path: ${assetsPath}`, this.config.auditContext);
-        count = (await this.readEntryAssetsModule(assetsPath, 'assets')) || 0;
-        log.debug(`Assets count: ${count}`, this.config.auditContext);
+        const spacesDir = join(this.folderPath, 'spaces');
+        if (existsSync(spacesDir)) {
+          log.debug(`Multi-space structure detected at: ${spacesDir}`, this.config.auditContext);
+          const spaceDirs = readdirSync(spacesDir, { withFileTypes: true }).filter(
+            (entry) => entry.isDirectory() && existsSync(join(spacesDir, entry.name, 'assets')),
+          );
+          for (const spaceDir of spaceDirs) {
+            const spaceAssetsPath = join(spacesDir, spaceDir.name, 'assets');
+            log.debug(`Counting assets in space: ${spaceDir.name} at ${spaceAssetsPath}`, this.config.auditContext);
+            const spaceCount = (await this.readEntryAssetsModule(spaceAssetsPath, 'assets')) || 0;
+            log.debug(`Space ${spaceDir.name} asset count: ${spaceCount}`, this.config.auditContext);
+            count += spaceCount;
+          }
+        } else {
+          const assetsPath = join(this.folderPath, 'assets');
+          log.debug(`Flat structure detected, assets path: ${assetsPath}`, this.config.auditContext);
+          count = (await this.readEntryAssetsModule(assetsPath, 'assets')) || 0;
+        }
+        log.debug(`Total assets count: ${count}`, this.config.auditContext);
         break;
       }
       case 'entries':

packages/contentstack-audit/src/modules/modulesData.ts

@@ -162,6 +162,7 @@ enum OutputColumn {
   'publish_locale' = 'publish_locale',
   'publish_environment' = 'publish_environment',
   'asset_uid' = 'asset_uid',
+  'space_id' = 'space_id',
   'selectedValue' = 'selectedValue',
   'fixStatus' = 'fixStatus',
   'Content_type_uid' = 'ct_uid',

packages/contentstack-audit/src/types/content-types.ts

@@ -47,7 +47,7 @@ $ npm install -g @contentstack/cli-cm-import-setup
 $ csdx COMMAND
 running command...
 $ csdx (--version)
-@contentstack/cli-cm-import-setup/2.0.0-beta.6 darwin-arm64 node-v24.13.0
+@contentstack/cli-cm-import-setup/2.0.0-beta.10 darwin-arm64 node-v22.13.1
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND

packages/contentstack-import-setup/README.md

@@ -47,7 +47,7 @@ $ npm install -g @contentstack/cli-cm-import
 $ csdx COMMAND
 running command...
 $ csdx (--version)
-@contentstack/cli-cm-import/2.0.0-beta.11 darwin-arm64 node-v24.13.0
+@contentstack/cli-cm-import/2.0.0-beta.15 darwin-arm64 node-v22.13.1
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND

packages/contentstack-import/README.md

@@ -21,7 +21,7 @@ $ npm install -g @contentstack/cli-migration
 $ csdx COMMAND
 running command...
 $ csdx (--version)
-@contentstack/cli-migration/2.0.0-beta.10 darwin-arm64 node-v23.11.0
+@contentstack/cli-migration/2.0.0-beta.11 darwin-arm64 node-v22.13.1
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND