Merge branch 'feat/AM2.0' into feat/DX-5836

Author: naman-contentstack

.talismanrc

@@ -1,4 +1,4 @@
 fileignoreconfig:
   - filename: pnpm-lock.yaml
-    checksum: fa2ccdf09da9561c5c359d68e1886ebe31542fb1b601c0806cd597e8dc807a0a
+    checksum: ad02b19a546d5d90424fed77f1342dd63b7d55b027a173db0046063e727929ba
 version: '1.0'

packages/contentstack-clone/test/lib/util/clone-handler.commands.test.ts

@@ -1,6 +1,7 @@
 import { expect } from 'chai';
 import { CloneHandler } from '../../../src/core/util/clone-handler';
 import { CloneConfig } from '../../../src/types/clone-config';
+import { STRUCTURE_LIST } from '../../../src/utils/constants';
 import sinon from 'sinon';
 import inquirer from 'inquirer';
 
@@ -137,6 +138,94 @@ describe('CloneHandler - Commands', () => {
       expect(cmdArgs).to.include('-a');
       expect(cmdArgs).to.include('source-alias');
     });
+
+    it('should set filteredModules for structure-only export without assets (AM 2.0 needs full export)', async () => {
+      const exportCmdStub = {
+        run: sandbox.stub().returns(Promise.resolve()),
+      };
+      sandbox.stub(require('@contentstack/cli-cm-export'), 'default').value(exportCmdStub);
+
+      await handler.cmdExport();
+
+      expect(fsStub.writeFileSync.calledOnce).to.be.true;
+      const written = JSON.parse(fsStub.writeFileSync.firstCall.args[1] as string);
+      expect(written.filteredModules).to.deep.equal(['stack', ...STRUCTURE_LIST]);
+      expect(written.filteredModules).to.not.include('assets');
+      expect(written.filteredModules).to.not.include('entries');
+    });
+
+    it('should not set filteredModules for full clone so default export includes assets', async () => {
+      const config: CloneConfig = {
+        cloneContext: {
+          command: 'test',
+          module: 'clone',
+          email: 'test@example.com',
+        },
+        source_stack: 'test-key',
+        cloneType: 'b',
+      };
+      handler = new CloneHandler(config);
+      const exportCmdStub = {
+        run: sandbox.stub().returns(Promise.resolve()),
+      };
+      sandbox.stub(require('@contentstack/cli-cm-export'), 'default').value(exportCmdStub);
+
+      await handler.cmdExport();
+
+      expect(fsStub.writeFileSync.calledOnce).to.be.true;
+      const written = JSON.parse(fsStub.writeFileSync.firstCall.args[1] as string);
+      expect(written).to.not.have.property('filteredModules');
+    });
+
+    it('should preserve region.assetManagementUrl in serialized export config for AM 2.0 export', async () => {
+      const amUrl = 'https://asset-management.example.com';
+      const config: CloneConfig = {
+        cloneContext: {
+          command: 'test',
+          module: 'clone',
+          email: 'test@example.com',
+        },
+        source_stack: 'test-key',
+        cloneType: 'b',
+        region: { assetManagementUrl: amUrl },
+      };
+      handler = new CloneHandler(config);
+      const exportCmdStub = {
+        run: sandbox.stub().returns(Promise.resolve()),
+      };
+      sandbox.stub(require('@contentstack/cli-cm-export'), 'default').value(exportCmdStub);
+
+      await handler.cmdExport();
+
+      const written = JSON.parse(fsStub.writeFileSync.firstCall.args[1] as string);
+      expect(written.region).to.be.an('object');
+      expect(written.region.assetManagementUrl).to.equal(amUrl);
+    });
+
+    it('should merge export.region.assetManagementUrl from external export config', async () => {
+      const amUrl = 'https://asset-management-merged.example.com';
+      const config: CloneConfig = {
+        cloneContext: {
+          command: 'test',
+          module: 'clone',
+          email: 'test@example.com',
+        },
+        source_stack: 'test-key',
+        cloneType: 'b',
+        export: { region: { assetManagementUrl: amUrl } },
+      };
+      handler = new CloneHandler(config);
+      const exportCmdStub = {
+        run: sandbox.stub().returns(Promise.resolve()),
+      };
+      sandbox.stub(require('@contentstack/cli-cm-export'), 'default').value(exportCmdStub);
+
+      await handler.cmdExport();
+
+      const written = JSON.parse(fsStub.writeFileSync.firstCall.args[1] as string);
+      expect(written.region.assetManagementUrl).to.equal(amUrl);
+      expect(written).to.not.have.property('export');
+    });
   });
 
   describe('cmdImport', () => {
@@ -398,7 +487,7 @@ describe('CloneHandler - Commands', () => {
       // Mock configHandler FIRST before creating handler - following import plugin pattern
       const configHandler = require('@contentstack/cli-utilities').configHandler;
       configHandlerGetStub = sandbox.stub(configHandler, 'get').returns(undefined);
-      
+
       // Stub ora spinner - following import plugin pattern
       const oraModule = require('ora');
       const mockSpinner = {
@@ -412,7 +501,7 @@ describe('CloneHandler - Commands', () => {
         writable: true,
         configurable: true,
       });
-      
+
       const config: CloneConfig = {
         cloneContext: {
           command: 'test',

packages/contentstack-export/test/unit/export/modules/assets.test.ts

@@ -139,8 +139,11 @@ describe('ExportAssets', () => {
         },
         'asset-management': {
           chunkFileSizeMb: 1,
+<<<<<<< HEAD
           apiConcurrency: 5,
           downloadAssetsConcurrency: 5,
+=======
+>>>>>>> feat/AM2.0
         },
         content_types: {
           dirName: 'content_types',

packages/contentstack-export/test/unit/export/modules/base-class.test.ts

@@ -154,6 +154,9 @@ describe('BaseClass', () => {
           enableDownloadStatus: false,
           includeVersionedAssets: false,
         },
+        'asset-management': {
+          chunkFileSizeMb: 1,
+        },
         content_types: {
           dirName: 'content_types',
           fileName: 'content_types.json',

packages/contentstack-import/src/import/modules/base-class.ts

@@ -218,7 +218,7 @@ export default abstract class BaseClass {
       processName,
       indexerCount,
       currentIndexer,
-      concurrencyLimit = this.importConfig.modules.apiConcurrency,
+      concurrencyLimit = this.importConfig.fetchConcurrency,
     } = env;
 
     /* eslint-disable no-async-promise-executor */

packages/contentstack-import/src/utils/build-import-spaces-options.ts

@@ -23,7 +23,7 @@ export function buildImportSpacesOptions(
     sourceApiKey: importConfig.source_stack,
     context: importConfig.context as unknown as Record<string, unknown>,
     backupDir: importConfig.backupDir,
-    apiConcurrency: importConfig.modules?.apiConcurrency ?? importConfig.fetchConcurrency,
+    apiConcurrency: importConfig.fetchConcurrency,
     uploadAssetsConcurrency: am?.uploadAssetsConcurrency,
     importFoldersConcurrency: am?.importFoldersConcurrency,
     spacesDirName: am?.dirName,

packages/contentstack-import/test/unit/import/modules/assets.test.ts

@@ -39,6 +39,8 @@ describe('ImportAssets', () => {
       region: 'us',
       master_locale: { code: 'en-us' },
       masterLocale: { code: 'en-us' },
+      fetchConcurrency: 5,
+      writeConcurrency: 1,
       context: {
         command: 'cm:stacks:import',
         module: 'assets',
@@ -55,7 +57,6 @@ describe('ImportAssets', () => {
           dirName: 'assets',
           validKeys: ['title', 'filename', 'content_type', 'parent_uid', 'description', 'tags'],
           folderValidKeys: ['name', 'parent_uid'],
-          apiConcurrency: 5,
           importFoldersConcurrency: 3,
           uploadAssetsConcurrency: 5,
           includeVersionedAssets: true,

packages/contentstack-import/test/unit/import/modules/base-class.test.ts

@@ -101,9 +101,10 @@ describe('BaseClass', () => {
         orgId: 'org-123',
         authenticationMethod: 'Management Token',
       },
+      fetchConcurrency: 5,
+      writeConcurrency: 1,
       modules: {
         types: ['assets', 'content-types'],
-        apiConcurrency: 5,
         assets: {
           dirName: 'assets',
           fileName: 'assets.json',
@@ -120,7 +121,6 @@ describe('BaseClass', () => {
           dirName: 'content_types',
           fileName: 'content_types.json',
           validKeys: ['title', 'uid', 'schema'],
-          apiConcurrency: 1,
         },
       } as any,
       backupDir: '/test/backup',

packages/contentstack-import/test/unit/import/modules/content-types.test.ts

@@ -131,6 +131,7 @@ describe('ImportContentTypes', () => {
       master_locale: { code: 'en-us' },
       masterLocale: { code: 'en-us' },
       writeConcurrency: 2,
+      fetchConcurrency: 5,
       context: {
         command: 'cm:stacks:import',
         module: 'content-types',
@@ -146,15 +147,13 @@ describe('ImportContentTypes', () => {
         'content-types': {
           dirName: 'content_types',
           validKeys: ['title', 'uid', 'schema'],
-          apiConcurrency: 5,
           writeConcurrency: 3,
           fileName: 'content_types.json',
           limit: 100,
         },
         'global-fields': {
           dirName: 'global_fields',
           validKeys: ['title', 'uid', 'schema'],
-          apiConcurrency: 5,
           writeConcurrency: 1,
           fileName: 'globalfields.json',
           limit: 100,

packages/contentstack-import/test/unit/import/modules/global-fields.test.ts

@@ -52,6 +52,7 @@ describe('ImportGlobalFields', () => {
       master_locale: { code: 'en-us' },
       masterLocale: { code: 'en-us' },
       writeConcurrency: 2,
+      fetchConcurrency: 5,
       context: {
         command: 'cm:stacks:import',
         module: 'global-fields',
@@ -67,7 +68,6 @@ describe('ImportGlobalFields', () => {
         'global-fields': {
           dirName: 'global_fields',
           validKeys: ['title', 'uid', 'schema'],
-          apiConcurrency: 5,
           writeConcurrency: 3,
           fileName: 'globalfields.json',
           limit: 100,