Merge branch 'v2-dev' into fix/publishing-rules

Author: naman-contentstack

.talismanrc

@@ -1,4 +1,34 @@
 fileignoreconfig:
-  - filename: packages/contentstack-export/src/export/modules/publishing-rules.ts
-    checksum: 8826b77d5917edee7ec808c5270512378b458993945b3c5fbaf40a5979113f64
+  - filename: pnpm-lock.yaml
+    checksum: 0942b9ee7e4b284bfd9f0a2258ca8281cf8569b60dd293e08abf64373db12d59
+  - filename: packages/contentstack-import/src/types/index.ts
+    checksum: d61bcc581f6d7f684caa75a5880fb740af12404d271d4e8429610f856154089f
+  - filename: packages/contentstack-import/test/unit/utils/extension-helper.test.ts
+    checksum: c61c823716710a29248bba5fdae199af949876f06308b878e3cf8f3d89e13b48
+  - filename: packages/contentstack-import/test/unit/import/modules/locales.test.ts
+    checksum: bd7f0036cb0a853848876a3664c599f8538a1d84a02fe50fb6bdbdad8d70b49e
+  - filename: packages/contentstack-import/src/config/index.ts
+    checksum: 53e460b7ff7f7c9dae29d0b551352f3f89da0c5b08f753865ce73165a06259e5
+  - filename: packages/contentstack-variants/src/types/export-config.ts
+    checksum: e6df2394b6acb1f1ff30ed18baca686ba5b36c9de03b529f9980acbec4c8c8fc
+  - filename: packages/contentstack-export/src/config/index.ts
+    checksum: 5dddd4e482975bdb65f3d94383438f09c43fcc8a8d50753d9be4af73b5a171aa
+  - filename: packages/contentstack-import/src/import/modules/publishing-rules.ts
+    checksum: 429a803bc18e691db93bae3df1714071d0face6441b82cb938a83e8bf94ae14c
+  - filename: packages/contentstack-import/src/types/default-config.ts
+    checksum: c117d060d6979540a1bb6ae20ad6ad6d43e9b15a6909291f76ed60b11e5f793d
+  - filename: packages/contentstack-import/test/unit/import/modules/publishing-rules.test.ts
+    checksum: 0fcbff5dab2f9e594fe2a316c3c96e8d86bcd5d72e7c1f9eb35c0e3458f87817
+  - filename: packages/contentstack-export/src/types/default-config.ts
+    checksum: 70c9ca7400c447f2b54f48a07965c7ba34706deee97d68951d6229d523c7e4b0
+  - filename: packages/contentstack-export/src/types/index.ts
+    checksum: 71f02ac11507c61222a661caf228dfd54ffdc6c57e4cc631f66598ecd617852b
+  - filename: packages/contentstack-import/test/unit/utils/build-import-spaces-options.test.ts
+    checksum: ecc39327ca93ca4ea749937ec853f5a4c9a609a96c4e4e15df1b596fb4f32c74
+  - filename: packages/contentstack-asset-management/test/unit/import/workspaces.test.ts
+    checksum: a0a17ff803fcf8f20538c8e158909d06705fc801f0bd3356b1eac1d92f006d83
+  - filename: packages/contentstack-asset-management/test/unit/import/spaces.test.ts
+    checksum: 163c7e519561f2c1f473f6f0c5303a2a47c9f5c231b638cd90782c37eaa4859e
+  - filename: packages/contentstack-branches/README.md
+    checksum: 2978e9a9c151cbbafb5dd542edf6815ccec12172ae4ca114a6c4e5e73a85a2b5
 version: '1.0'

packages/contentstack-asset-management/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@contentstack/cli-asset-management",
   "version": "1.0.0-beta.0",
-  "description": "Asset Management 2.0 API adapter for export and import",
+  "description": "Contentstack Assets API adapter for export and import",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "files": [
@@ -24,7 +24,8 @@
   },
   "keywords": [
     "contentstack",
-    "asset-management",
+    "cs-assets",
+    "contentstack-assets",
     "cli"
   ],
   "license": "MIT",
@@ -37,7 +38,7 @@
     "devPlugins": [
       "@oclif/plugin-help"
     ],
-    "repositoryPrefix": "<%- repo %>/blob/main/packages/contentstack-asset-management/<%- commandPath %>"
+    "repositoryPrefix": "<%- repo %>/blob/main/packages/contentstack-cs-assets/<%- commandPath %>"
   },
   "devDependencies": {
     "@types/chai": "^4.3.11",
@@ -55,4 +56,4 @@
     "ts-node": "^10.9.2",
     "typescript": "^5.8.3"
   }
-}
+}

packages/contentstack-asset-management/src/constants/index.ts

@@ -29,13 +29,15 @@ export const FALLBACK_ASSET_TYPES_IMPORT_INVALID_KEYS = [
 export const CHUNK_FILE_SIZE_MB = FALLBACK_AM_CHUNK_FILE_SIZE_MB;
 
 /**
- * Main process name for Asset Management 2.0 export (single progress bar).
+ * Main process name for Contentstack Assets export (single progress bar).
  * Use this when adding/starting the process and for all ticks.
  */
-export const AM_MAIN_PROCESS_NAME = 'Asset Management 2.0';
+export const CS_ASSETS_MAIN_PROCESS_NAME = 'Contentstack Assets';
+/** @deprecated Use CS_ASSETS_MAIN_PROCESS_NAME */
+export const AM_MAIN_PROCESS_NAME = CS_ASSETS_MAIN_PROCESS_NAME;
 
 /**
- * Process names for Asset Management 2.0 export/import progress.
+ * Process names for Contentstack Assets export/import progress.
  *
  * In the new per-space layout each entry below corresponds to a single row in
  * the multibar:
@@ -70,7 +72,7 @@ const SPACE_PROCESS_NAME_PREFIX = 'Space ';
 const SPACE_PROCESS_NAME_MAX_UID_LEN = 14;
 
 /**
- * Returns the multibar row label for a single AM 2.0 space.
+ * Returns the multibar row label for a single CS Assets space.
  * The label is bounded so CLIProgressManager.formatProcessName doesn't truncate
  * it mid-string; the full uid is still used for tick item labels and structured
  * logs, only the row label itself is shortened for display.

packages/contentstack-asset-management/src/export/asset-types.ts

@@ -1,15 +1,15 @@
 import { log } from '@contentstack/cli-utilities';
 
-import type { AssetManagementAPIConfig } from '../types/asset-management-api';
+import type { CSAssetsAPIConfig } from '../types/cs-assets-api';
 import type { ExportContext } from '../types/export-types';
-import { AssetManagementExportAdapter } from './base';
+import { CSAssetsExportAdapter } from './base';
 import { getArrayFromResponse } from '../utils/export-helpers';
 import { PROCESS_NAMES } from '../constants/index';
 
-export default class ExportAssetTypes extends AssetManagementExportAdapter {
+export default class ExportAssetTypes extends CSAssetsExportAdapter {
   protected processName: string = PROCESS_NAMES.AM_ASSET_TYPES;
 
-  constructor(apiConfig: AssetManagementAPIConfig, exportContext: ExportContext) {
+  constructor(apiConfig: CSAssetsAPIConfig, exportContext: ExportContext) {
     super(apiConfig, exportContext);
   }
 

packages/contentstack-asset-management/src/export/assets.ts

@@ -3,15 +3,15 @@ import { Readable } from 'node:stream';
 import { mkdir, writeFile } from 'node:fs/promises';
 import { configHandler, log } from '@contentstack/cli-utilities';
 
-import type { AssetManagementAPIConfig, LinkedWorkspace } from '../types/asset-management-api';
+import type { CSAssetsAPIConfig, LinkedWorkspace } from '../types/cs-assets-api';
 import type { ExportContext } from '../types/export-types';
-import { AssetManagementExportAdapter } from './base';
+import { CSAssetsExportAdapter } from './base';
 import { getAssetItems, writeStreamToFile } from '../utils/export-helpers';
 import { runInBatches } from '../utils/concurrent-batch';
 import { PROCESS_NAMES, PROCESS_STATUS } from '../constants/index';
 
-export default class ExportAssets extends AssetManagementExportAdapter {
-  constructor(apiConfig: AssetManagementAPIConfig, exportContext: ExportContext) {
+export default class ExportAssets extends CSAssetsExportAdapter {
+  constructor(apiConfig: CSAssetsAPIConfig, exportContext: ExportContext) {
     super(apiConfig, exportContext);
   }
 

packages/contentstack-asset-management/src/export/base.ts

@@ -2,25 +2,25 @@ import { resolve as pResolve } from 'node:path';
 import { writeFile } from 'node:fs/promises';
 import { FsUtility, log, CLIProgressManager, configHandler } from '@contentstack/cli-utilities';
 
-import type { AssetManagementAPIConfig } from '../types/asset-management-api';
+import type { CSAssetsAPIConfig } from '../types/cs-assets-api';
 import type { ExportContext } from '../types/export-types';
-import { AssetManagementAdapter } from '../utils/asset-management-api-adapter';
-import { AM_MAIN_PROCESS_NAME, FALLBACK_AM_API_CONCURRENCY, FALLBACK_AM_CHUNK_FILE_SIZE_MB } from '../constants/index';
+import { CSAssetsAdapter } from '../utils/cs-assets-api-adapter';
+import { CS_ASSETS_MAIN_PROCESS_NAME, FALLBACK_AM_API_CONCURRENCY, FALLBACK_AM_CHUNK_FILE_SIZE_MB } from '../constants/index';
 
 export type { ExportContext };
 
 /**
  * Base class for export modules. Extends the API adapter and adds export context,
  * internal progress management, and shared write helpers.
  */
-export class AssetManagementExportAdapter extends AssetManagementAdapter {
-  protected readonly apiConfig: AssetManagementAPIConfig;
+export class CSAssetsExportAdapter extends CSAssetsAdapter {
+  protected readonly apiConfig: CSAssetsAPIConfig;
   protected readonly exportContext: ExportContext;
   protected progressManager: CLIProgressManager | null = null;
   protected parentProgressManager: CLIProgressManager | null = null;
-  protected processName: string = AM_MAIN_PROCESS_NAME;
+  protected processName: string = CS_ASSETS_MAIN_PROCESS_NAME;
 
-  constructor(apiConfig: AssetManagementAPIConfig, exportContext: ExportContext) {
+  constructor(apiConfig: CSAssetsAPIConfig, exportContext: ExportContext) {
     super(apiConfig);
     this.apiConfig = apiConfig;
     this.exportContext = exportContext;

packages/contentstack-asset-management/src/export/fields.ts

@@ -1,15 +1,15 @@
 import { log } from '@contentstack/cli-utilities';
 
-import type { AssetManagementAPIConfig } from '../types/asset-management-api';
+import type { CSAssetsAPIConfig } from '../types/cs-assets-api';
 import type { ExportContext } from '../types/export-types';
-import { AssetManagementExportAdapter } from './base';
+import { CSAssetsExportAdapter } from './base';
 import { getArrayFromResponse } from '../utils/export-helpers';
 import { PROCESS_NAMES } from '../constants/index';
 
-export default class ExportFields extends AssetManagementExportAdapter {
+export default class ExportFields extends CSAssetsExportAdapter {
   protected processName: string = PROCESS_NAMES.AM_FIELDS;
 
-  constructor(apiConfig: AssetManagementAPIConfig, exportContext: ExportContext) {
+  constructor(apiConfig: CSAssetsAPIConfig, exportContext: ExportContext) {
     super(apiConfig, exportContext);
   }
 

packages/contentstack-asset-management/src/export/index.ts

@@ -3,5 +3,5 @@ export { default as ExportAssetTypes } from './asset-types';
 export { default as ExportFields } from './fields';
 export { default as ExportAssets } from './assets';
 export { default as ExportWorkspace } from './workspaces';
-export { AssetManagementExportAdapter } from './base';
+export { CSAssetsExportAdapter } from './base';
 export type { ExportContext } from './base';

packages/contentstack-asset-management/src/export/spaces.ts

@@ -2,15 +2,15 @@ import { resolve as pResolve } from 'node:path';
 import { mkdir } from 'node:fs/promises';
 import { log, CLIProgressManager, configHandler, handleAndLogError } from '@contentstack/cli-utilities';
 
-import type { AssetManagementExportOptions, AssetManagementAPIConfig } from '../types/asset-management-api';
+import type { AssetManagementExportOptions, CSAssetsAPIConfig } from '../types/cs-assets-api';
 import type { ExportContext } from '../types/export-types';
-import { AM_MAIN_PROCESS_NAME, PROCESS_NAMES, getSpaceProcessName } from '../constants/index';
+import { CS_ASSETS_MAIN_PROCESS_NAME, PROCESS_NAMES, getSpaceProcessName } from '../constants/index';
 import ExportAssetTypes from './asset-types';
 import ExportFields from './fields';
 import ExportWorkspace from './workspaces';
 
 /**
- * Orchestrates the full Asset Management 2.0 export: shared asset types and fields,
+ * Orchestrates the full Contentstack Assets export: shared asset types and fields,
  * then per-workspace metadata and assets (including internal download).
  * Progress and download are fully owned by this package.
  */
@@ -32,7 +32,7 @@ export class ExportSpaces {
       linkedWorkspaces,
       exportDir,
       branchName,
-      assetManagementUrl,
+      csAssetsUrl,
       org_uid,
       apiKey,
       context,
@@ -45,9 +45,9 @@ export class ExportSpaces {
       return;
     }
 
-    log.debug('Starting Asset Management export process...', context);
-    log.info('Started Asset Management export', context);
-    log.debug(`Exporting Asset Management 2.0 (${linkedWorkspaces.length} space(s))`, context);
+    log.debug('Starting Contentstack Assets export process...', context);
+    log.info('Started Contentstack Assets export', context);
+    log.debug(`Exporting Contentstack Assets (${linkedWorkspaces.length} space(s))`, context);
     log.debug(`Spaces: ${linkedWorkspaces.map((ws) => ws.space_uid).join(', ')}`, context);
 
     const spacesRootPath = pResolve(exportDir, 'spaces');
@@ -67,8 +67,8 @@ export class ExportSpaces {
       progress.addProcess(spaceProcess, 1);
     }
 
-    const apiConfig: AssetManagementAPIConfig = {
-      baseURL: assetManagementUrl,
+    const apiConfig: CSAssetsAPIConfig = {
+      baseURL: csAssetsUrl,
       headers: { organization_uid: org_uid },
       context,
     };
@@ -135,11 +135,11 @@ export class ExportSpaces {
 
       log.info(
         anySpaceFailed
-          ? 'Asset Management export completed with errors in one or more spaces'
-          : 'Asset Management export completed successfully',
+          ? 'Contentstack Assets export completed with errors in one or more spaces'
+          : 'Contentstack Assets export completed successfully',
         context,
       );
-      log.debug('Asset Management 2.0 export completed', context);
+      log.debug('Contentstack Assets export completed', context);
     } catch (err) {
       if (!bootstrapFailed) {
         // Mark any spaces that hadn't been processed as failed so the multibar
@@ -148,7 +148,7 @@ export class ExportSpaces {
           progress.completeProcess(spaceProcess, false);
         }
       }
-      handleAndLogError(err, { ...(context as Record<string, unknown>) }, 'Asset Management export failed');
+      handleAndLogError(err, { ...(context as Record<string, unknown>) }, 'Contentstack Assets export failed');
       throw err;
     }
   }
@@ -160,7 +160,7 @@ export class ExportSpaces {
     }
     const logConfig = configHandler.get('log') || {};
     const showConsoleLogs = logConfig.showConsoleLogs ?? false;
-    this.progressManager = CLIProgressManager.createNested(AM_MAIN_PROCESS_NAME, showConsoleLogs);
+    this.progressManager = CLIProgressManager.createNested(CS_ASSETS_MAIN_PROCESS_NAME, showConsoleLogs);
     return this.progressManager;
   }
 }

packages/contentstack-asset-management/src/export/workspaces.ts

@@ -2,13 +2,13 @@ import { resolve as pResolve } from 'node:path';
 import { mkdir, writeFile } from 'node:fs/promises';
 import { log } from '@contentstack/cli-utilities';
 
-import type { AssetManagementAPIConfig, LinkedWorkspace } from '../types/asset-management-api';
+import type { CSAssetsAPIConfig, LinkedWorkspace } from '../types/cs-assets-api';
 import type { ExportContext } from '../types/export-types';
-import { AssetManagementExportAdapter } from './base';
+import { CSAssetsExportAdapter } from './base';
 import ExportAssets from './assets';
 
-export default class ExportWorkspace extends AssetManagementExportAdapter {
-  constructor(apiConfig: AssetManagementAPIConfig, exportContext: ExportContext) {
+export default class ExportWorkspace extends CSAssetsExportAdapter {
+  constructor(apiConfig: CSAssetsAPIConfig, exportContext: ExportContext) {
     super(apiConfig, exportContext);
   }