Merge pull request #2344 from contentstack/fix/merge-development-to-beta

Fix/merge development to beta

Author: harshithad0703

.talismanrc

@@ -1,6 +1,24 @@
 fileignoreconfig:
   - filename: pnpm-lock.yaml
-    checksum: 41bc1d60449ab0682d9267172e54a5802c837869a1728b0560eea8052336c2fe
+    checksum: 9188a8a814516e4f0633c2c8bfaa79ad7e1ada621bd2926c9b5b2c6a61763c06
   - filename: package-lock.json
-    checksum: 134104853f260380025e0d7e2b49ec32f15a1832b20756676819ce0bc4277c44
+    checksum: 48485ed945783136e50845498e99aa3ce101e0fb1cbd70f5df18227e646316c0
+  - filename: packages/contentstack-audit/test/unit/mock/contents/composable_studio/environments/environments.json
+    checksum: 0402604e5919a7e38ecb5ff0916d6ae5ab7d98fe78ff6ac9eba8a9b8130af34d
+  - filename: packages/contentstack-utilities/src/helpers.ts
+    checksum: 6a741bb972f59c56d2c0f3a9f96e2963392361db2e401948c9c1796829478e13
+  - filename: packages/contentstack-audit/test/unit/mock/contents/composable_studio/composable_studio.json
+    checksum: 6912e5ea32b4456ad04d1645750c72bbb29ab1895368c3a242ab39e9350ec531
+  - filename: packages/contentstack-utilities/src/logger/session-path.ts
+    checksum: 4c66980a857bc12012a45e50790c0eaab06883db5e1476d84fb142a08b70b2e7
+  - filename: packages/contentstack-import/test/unit/commands/cm/stacks/import.test.ts
+    checksum: a9e24596e7ae54b71cc28a41cf9d65bbdbf6754446e08958288e90a579cc351d
+  - filename: packages/contentstack-audit/src/modules/modulesData.ts
+    checksum: 1e6c1fba1172512401038d5454c8d218201ec62262449c5c878609592e0124c4
+  - filename: packages/contentstack-audit/test/unit/mock/contents/composable_studio/invalid_composable_studio.json
+    checksum: e6465aa0011d1565a2de848d9cca74395d11419e6ac840e7dfb52e1d255b1c4f
+  - filename: packages/contentstack-audit/src/modules/composable-studio.ts
+    checksum: 4fc97ff582d6dff9a54b3a50dfa3cbb5febd38a55aeb8737034b97188ad543ba
+  - filename: packages/contentstack-utilities/test/unit/logger.test.ts
+    checksum: a1939dea16166b1893a248179524a76f2ed20b04b99c83bd1a5a13fcf6f0dadc
 version: "1.0"

CHANGELOG.md

@@ -2,6 +2,12 @@
 
 Please refer to the Contentstack Command-line Interface release notes [here](https://www.contentstack.com/docs/developers/cli/cli-changelog).
 
+## @contentstack/cli-cm-clone
+### Version: 1.8.2
+#### Date:  June-30-2025
+##### Fix:
+ - resolve stack-clone auth failure for non-NA regions
+
 ## @contentstack/cli-config
 ### Version: 1.13.1
 #### Date:  July-21-2025

package-lock.json

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2024 Contentstack
+Copyright (c) 2026 Contentstack
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

packages/contentstack-audit/LICENSE

@@ -18,7 +18,7 @@
     "/oclif.manifest.json"
   ],
   "dependencies": {
-    "@contentstack/cli-command": "~1.6.1",
+    "@contentstack/cli-command": "~1.7.2",
     "@contentstack/cli-utilities": "~1.15.0",
     "@oclif/core": "^4.3.0",
     "@oclif/plugin-help": "^6.2.28",
@@ -44,7 +44,7 @@
     "nyc": "^15.1.0",
     "oclif": "^4.17.46",
     "shx": "^0.4.0",
-    "sinon": "^19.0.5",
+    "sinon": "^21.0.1",
     "ts-node": "^10.9.2",
     "typescript": "^5.8.3"
   },

packages/contentstack-audit/package.json

@@ -21,6 +21,7 @@ import {
   FieldRule,
   ModuleDataReader,
   CustomRoles,
+  ComposableStudio,
 } from './modules';
 
 import {
@@ -50,19 +51,6 @@ export abstract class AuditBaseCommand extends BaseCommand<typeof AuditBaseComma
     };
   }
 
-  /**
-   * Create audit context object similar to export command
-   */
-  private createAuditContext(moduleName?: string): AuditContext {
-    return {
-      command: this.context?.info?.command || 'cm:stacks:audit',
-      module: moduleName || 'audit',
-      email: configHandler.get('email') || '',
-      sessionId: this.context?.sessionId || '',
-      authenticationMethod: configHandler.get('authenticationMethod') || '',
-    };
-  }
-
   /**
    * The `start` function performs an audit on content types, global fields, entries, and workflows and displays
    * any missing references.
@@ -81,11 +69,6 @@ export abstract class AuditBaseCommand extends BaseCommand<typeof AuditBaseComma
     }
     configHandler.set('log.progressSupportedModule', 'audit');
 
-    // Initialize audit context
-    this.auditContext = this.createAuditContext();
-    log.debug(`Starting audit command: ${command}`, this.auditContext);
-    log.info(`Starting audit command: ${command}`, this.auditContext);
-    
     // Initialize global summary for progress tracking
     CLIProgressManager.initializeGlobalSummary('AUDIT', '', 'Auditing content...');
 
@@ -109,6 +92,7 @@ export abstract class AuditBaseCommand extends BaseCommand<typeof AuditBaseComma
       missingEnvLocalesInEntries,
       missingFieldRules,
       missingMultipleFields,
+      missingRefsInComposableStudio,
     } = await this.scanAndFix();
 
     if (this.flags['show-console-output']) {
@@ -139,6 +123,7 @@ export abstract class AuditBaseCommand extends BaseCommand<typeof AuditBaseComma
       this.showOutputOnScreenWorkflowsAndExtension([
         { module: 'Entries Changed Multiple Fields', missingRefs: missingMultipleFields },
       ]);
+      this.showOutputOnScreenWorkflowsAndExtension([{ module: 'Studio', missingRefs: missingRefsInComposableStudio }]);
     }
     this.showOutputOnScreenWorkflowsAndExtension([{ module: 'Summary', missingRefs: this.summaryDataToPrint }]);
 
@@ -154,12 +139,16 @@ export abstract class AuditBaseCommand extends BaseCommand<typeof AuditBaseComma
       !isEmpty(missingEnvLocalesInAssets) ||
       !isEmpty(missingEnvLocalesInEntries) ||
       !isEmpty(missingFieldRules) ||
-      !isEmpty(missingMultipleFields)
+      !isEmpty(missingMultipleFields) ||
+      !isEmpty(missingRefsInComposableStudio)
     ) {
       if (this.currentCommand === 'cm:stacks:audit') {
         log.warn(this.$t(auditMsg.FINAL_REPORT_PATH, { path: this.sharedConfig.reportPath }), this.auditContext);
       } else {
-        log.warn(this.$t(this.messages.FIXED_CONTENT_PATH_MAG, { path: this.sharedConfig.basePath }), this.auditContext);
+        log.warn(
+          this.$t(this.messages.FIXED_CONTENT_PATH_MAG, { path: this.sharedConfig.basePath }),
+          this.auditContext,
+        );
       }
     } else {
       log.info(this.messages.NO_MISSING_REF_FOUND, this.auditContext);
@@ -191,7 +180,8 @@ export abstract class AuditBaseCommand extends BaseCommand<typeof AuditBaseComma
       !isEmpty(missingRefInCustomRoles) ||
       !isEmpty(missingEnvLocalesInAssets) ||
       !isEmpty(missingEnvLocalesInEntries) ||
-      !isEmpty(missingFieldRules)
+      !isEmpty(missingFieldRules) ||
+      !isEmpty(missingRefsInComposableStudio)
     );
   }
 
@@ -204,8 +194,11 @@ export abstract class AuditBaseCommand extends BaseCommand<typeof AuditBaseComma
   async scanAndFix() {
     log.debug('Starting scan and fix process', this.auditContext);
     let { ctSchema, gfSchema } = this.getCtAndGfSchema();
-    log.info(`Retrieved ${ctSchema?.length || 0} content types and ${gfSchema?.length || 0} global fields`, this.auditContext);
-    
+    log.info(
+      `Retrieved ${ctSchema?.length || 0} content types and ${gfSchema?.length || 0} global fields`,
+      this.auditContext,
+    );
+
     let missingCtRefs,
       missingGfRefs,
       missingEntryRefs,
@@ -226,7 +219,8 @@ export abstract class AuditBaseCommand extends BaseCommand<typeof AuditBaseComma
       missingEnvLocalesInAssets,
       missingEnvLocalesInEntries,
       missingFieldRules,
-      missingMultipleFields;
+      missingMultipleFields,
+      missingRefsInComposableStudio;
 
     const constructorParam: ModuleConstructorParam & CtConstructorParam = {
       ctSchema,
@@ -247,7 +241,7 @@ export abstract class AuditBaseCommand extends BaseCommand<typeof AuditBaseComma
 
     for (const module of this.sharedConfig.flags.modules || this.sharedConfig.modules) {
       // Update audit context with current module
-      this.auditContext = this.createAuditContext(module);
+      this.auditContext = { module: module };
       log.debug(`Starting audit for module: ${module}`, this.auditContext);
       log.info(`Starting audit for module: ${module}`, this.auditContext);
 
@@ -271,23 +265,32 @@ export abstract class AuditBaseCommand extends BaseCommand<typeof AuditBaseComma
           missingEnvLocalesInAssets = await new Assets(cloneDeep(constructorParam)).run(false, assetsTotalCount);
           await this.prepareReport(module, missingEnvLocalesInAssets);
           this.getAffectedData('assets', dataModuleWise['assets'], missingEnvLocalesInAssets);
-          log.success(`Assets audit completed. Found ${Object.keys(missingEnvLocalesInAssets || {}).length} issues`, this.auditContext);
+          log.success(
+            `Assets audit completed. Found ${Object.keys(missingEnvLocalesInAssets || {}).length} issues`,
+            this.auditContext,
+          );
           break;
         case 'content-types':
           log.info('Executing content-types audit', this.auditContext);
           const contentTypesTotalCount = dataModuleWise['content-types']?.Total || 0;
           missingCtRefs = await new ContentType(cloneDeep(constructorParam)).run(false, contentTypesTotalCount);
           await this.prepareReport(module, missingCtRefs);
           this.getAffectedData('content-types', dataModuleWise['content-types'], missingCtRefs);
-          log.success(`Content-types audit completed. Found ${Object.keys(missingCtRefs || {}).length} issues`, this.auditContext);
+          log.success(
+            `Content-types audit completed. Found ${Object.keys(missingCtRefs || {}).length} issues`,
+            this.auditContext,
+          );
           break;
         case 'global-fields':
           log.info('Executing global-fields audit', this.auditContext);
           const globalFieldsTotalCount = dataModuleWise['global-fields']?.Total || 0;
           missingGfRefs = await new GlobalField(cloneDeep(constructorParam)).run(false, globalFieldsTotalCount);
           await this.prepareReport(module, missingGfRefs);
           this.getAffectedData('global-fields', dataModuleWise['global-fields'], missingGfRefs);
-          log.success(`Global-fields audit completed. Found ${Object.keys(missingGfRefs || {}).length} issues`, this.auditContext);
+          log.success(
+            `Global-fields audit completed. Found ${Object.keys(missingGfRefs || {}).length} issues`,
+            this.auditContext,
+          );
           break;
         case 'entries':
           log.info('Executing entries audit', this.auditContext);
@@ -311,7 +314,10 @@ export abstract class AuditBaseCommand extends BaseCommand<typeof AuditBaseComma
 
           await this.prepareReport('Entry_Multiple_Fields', missingMultipleFields);
           this.getAffectedData('entries', dataModuleWise['entries'], missingEntry);
-          log.success(`Entries audit completed. Found ${Object.keys(missingEntryRefs || {}).length} reference issues`, this.auditContext);
+          log.success(
+            `Entries audit completed. Found ${Object.keys(missingEntryRefs || {}).length} reference issues`,
+            this.auditContext,
+          );
 
           break;
         case 'workflows':
@@ -325,7 +331,10 @@ export abstract class AuditBaseCommand extends BaseCommand<typeof AuditBaseComma
           }).run(workflowsTotalCount);
           await this.prepareReport(module, missingCtRefsInWorkflow);
           this.getAffectedData('workflows', dataModuleWise['workflows'], missingCtRefsInWorkflow);
-          log.success(`Workflows audit completed. Found ${Object.keys(missingCtRefsInWorkflow || {}).length} issues`, this.auditContext);
+          log.success(
+            `Workflows audit completed. Found ${Object.keys(missingCtRefsInWorkflow || {}).length} issues`,
+            this.auditContext,
+          );
 
           break;
         case 'extensions':
@@ -334,28 +343,53 @@ export abstract class AuditBaseCommand extends BaseCommand<typeof AuditBaseComma
           missingCtRefsInExtensions = await new Extensions(cloneDeep(constructorParam)).run(extensionsTotalCount);
           await this.prepareReport(module, missingCtRefsInExtensions);
           this.getAffectedData('extensions', dataModuleWise['extensions'], missingCtRefsInExtensions);
-          log.success(`Extensions audit completed. Found ${Object.keys(missingCtRefsInExtensions || {}).length} issues`, this.auditContext);
+          log.success(
+            `Extensions audit completed. Found ${Object.keys(missingCtRefsInExtensions || {}).length} issues`,
+            this.auditContext,
+          );
           break;
         case 'custom-roles':
           log.info('Executing custom-roles audit', this.auditContext);
           const customRolesTotalCount = dataModuleWise['custom-roles']?.Total || 0;
           missingRefInCustomRoles = await new CustomRoles(cloneDeep(constructorParam)).run(customRolesTotalCount);
           await this.prepareReport(module, missingRefInCustomRoles);
           this.getAffectedData('custom-roles', dataModuleWise['custom-roles'], missingRefInCustomRoles);
-          log.success(`Custom-roles audit completed. Found ${Object.keys(missingRefInCustomRoles || {}).length} issues`, this.auditContext);
+          log.success(
+            `Custom-roles audit completed. Found ${Object.keys(missingRefInCustomRoles || {}).length} issues`,
+            this.auditContext,
+          );
 
           break;
         case 'field-rules':
           log.info('Executing field-rules audit', this.auditContext);
           // NOTE: We are using the fixed content-type for validation of field rules
-          const data =  this.getCtAndGfSchema();
+          const data = this.getCtAndGfSchema();
           constructorParam.ctSchema = data.ctSchema;
           constructorParam.gfSchema = data.gfSchema;
           const fieldRulesTotalCount = dataModuleWise['content-types']?.Total || 0;
           missingFieldRules = await new FieldRule(cloneDeep(constructorParam)).run(fieldRulesTotalCount);
           await this.prepareReport(module, missingFieldRules);
           this.getAffectedData('field-rules', dataModuleWise['content-types'], missingFieldRules);
-          log.success(`Field-rules audit completed. Found ${Object.keys(missingFieldRules || {}).length} issues`, this.auditContext);
+          log.success(
+            `Field-rules audit completed. Found ${Object.keys(missingFieldRules || {}).length} issues`,
+            this.auditContext,
+          );
+          break;
+        case 'composable-studio':
+          log.info('Executing composable-studio audit', this.auditContext);
+          missingRefsInComposableStudio = await new ComposableStudio(cloneDeep(constructorParam)).run();
+          await this.prepareReport(module, missingRefsInComposableStudio);
+          this.getAffectedData(
+            'composable-studio',
+            dataModuleWise['composable-studio'] || { Total: Object.keys(missingRefsInComposableStudio || {}).length },
+            missingRefsInComposableStudio,
+          );
+          log.success(
+            `Composable-studio audit completed. Found ${
+              Object.keys(missingRefsInComposableStudio || {}).length
+            } issues`,
+            this.auditContext,
+          );
           break;
       }
 
@@ -393,6 +427,7 @@ export abstract class AuditBaseCommand extends BaseCommand<typeof AuditBaseComma
       missingEnvLocalesInEntries,
       missingFieldRules,
       missingMultipleFields,
+      missingRefsInComposableStudio,
     };
   }
 
@@ -536,7 +571,7 @@ export abstract class AuditBaseCommand extends BaseCommand<typeof AuditBaseComma
       }
 
       print([{ bold: true, color: 'cyan', message: ` ${module}` }]);
-      
+
       const tableValues = Object.values(missingRefs).flat();
       missingRefs = Object.values(missingRefs).flat();
       const tableKeys = Object.keys(missingRefs[0]);
@@ -590,7 +625,7 @@ export abstract class AuditBaseCommand extends BaseCommand<typeof AuditBaseComma
     log.debug(`Preparing report for module: ${moduleName}`, this.auditContext);
     log.debug(`Report path: ${this.sharedConfig.reportPath}`, this.auditContext);
     log.info(`Missing references count: ${Object.keys(listOfMissingRefs).length}`, this.auditContext);
-    
+
     if (isEmpty(listOfMissingRefs)) {
       log.debug(`No missing references found for ${moduleName}, skipping report generation`, this.auditContext);
       return Promise.resolve(void 0);

packages/contentstack-audit/src/audit-base-command.ts

@@ -11,9 +11,10 @@ const config = {
     'custom-roles',
     'assets',
     'field-rules',
+    'composable-studio',
   ],
   'fix-fields': ['reference', 'global_field', 'json:rte', 'json:extension', 'blocks', 'group', 'content_types'],
-  'schema-fields-data-type': ['blocks','group','global_field'],
+  'schema-fields-data-type': ['blocks', 'group', 'global_field'],
   moduleConfig: {
     'content-types': {
       name: 'content type',
@@ -60,6 +61,11 @@ const config = {
       dirName: 'environments',
       fileName: 'environments.json',
     },
+    'composable-studio': {
+      name: 'composable-studio',
+      dirName: 'composable_studio',
+      fileName: 'composable_studio.json',
+    },
   },
   entries: {
     systemKeys: [
@@ -107,21 +113,22 @@ const config = {
     'selectedValue',
     'ct_uid',
     'action',
-    "Module",
-    "Total",
-    "Fixable",
-    "Non-Fixable",
-    "Fixed",
-    "Not-Fixed",
-    "Passed",
+    'Module',
+    'Total',
+    'Fixable',
+    'Non-Fixable',
+    'Fixed',
+    'Not-Fixed',
+    'Passed',
+    'issues',
   ],
   ReportTitleForEntries: {
     Entries_Select_field: 'Entries_Select_field',
     Entries_Mandatory_field: 'Entries_Mandatory_field',
     Entries_Title_field: 'Entries_Title_field',
     Entry_Missing_Locale_and_Env: 'Entry_Missing_Locale_and_Env',
     Entry_Missing_Locale_and_Env_in_Publish_Details: 'Entry_Missing_Locale_and_Env_in_Publish_Details',
-    Entry_Multiple_Fields:"Entry_Multiple_Fields"
+    Entry_Multiple_Fields: 'Entry_Multiple_Fields',
   },
   feild_level_modules: [
     'Entries_Title_field',
@@ -130,7 +137,7 @@ const config = {
     'Entry_Missing_Locale_and_Env_in_Publish_Details',
     'field-rules',
     'Entry_Multiple_Fields',
-    'Summary'
+    'Summary',
   ],
   fixSelectField: false,
 };