@@ -273,6 +273,48 @@ export default class ImportAssets extends BaseClass {
273273 ) ;
274274 }
275275
276+ /**
277+ * Groups already-filtered `publish_details` into publish payloads that preserve the source
278+ * env↔locale pairing. Entries are grouped by environment, then environments sharing an
279+ * identical locale set are coalesced into one payload. Each returned group is a rectangle
280+ * (its environments × its locales), so the CMA env×locale cross-product reproduces exactly
281+ * the source pairs — never a phantom combination (the DX-9772 over-publish).
282+ *
283+ * A fully-rectangular input (every env published to the same locales) collapses to a single
284+ * group, so behavior is unchanged for the common case; a ragged input fans out into one group
285+ * per distinct locale set. Only environments present in `this.environments` are kept, so the
286+ * env-name lookup is always safe — this preserves the DX-1656 invalid-environment guard.
287+ * Callers apply any further scoping (e.g. AM's `api_key`) before calling.
288+ */
289+ private buildPublishGroups (
290+ publishDetails : Record < string , any > [ ] ,
291+ ) : { environments : string [ ] ; locales : string [ ] } [ ] {
292+ const localesByEnv = new Map < string , Set < string > > ( ) ;
293+ for ( const { environment, locale } of publishDetails || [ ] ) {
294+ if ( ! locale || ! this . environments ?. hasOwnProperty ( environment ) ) continue ;
295+ let set = localesByEnv . get ( environment ) ;
296+ if ( ! set ) {
297+ set = new Set < string > ( ) ;
298+ localesByEnv . set ( environment , set ) ;
299+ }
300+ set . add ( locale ) ;
301+ }
302+
303+ // Coalesce environments with an identical locale set into a single payload.
304+ const groups = new Map < string , { environments : string [ ] ; locales : string [ ] } > ( ) ;
305+ for ( const [ envUid , localeSet ] of localesByEnv ) {
306+ const locales = [ ...localeSet ] . sort ( ) ;
307+ const signature = locales . join ( ' ' ) ;
308+ const existing = groups . get ( signature ) ;
309+ if ( existing ) {
310+ existing . environments . push ( this . environments [ envUid ] . name ) ;
311+ } else {
312+ groups . set ( signature , { environments : [ this . environments [ envUid ] . name ] , locales } ) ;
313+ }
314+ }
315+ return [ ...groups . values ( ) ] ;
316+ }
317+
276318 /**
277319 * Publishes imported AM (Contentstack Assets / spaces) assets, mirroring the legacy `publish()`
278320 * but re-pointed at each space's chunk store under `spaces/{oldSpaceUid}/assets`.
@@ -330,9 +372,13 @@ export default class ImportAssets extends BaseClass {
330372 const fsUtil = new FsUtility ( { basePath : assetsDir , indexFileName : assetsFileName } ) ;
331373 for ( const _ of values ( fsUtil . indexFileContent ) ) {
332374 const chunkData = await fsUtil . readChunkFiles . next ( ) . catch ( ( ) => ( { } ) ) ;
333- publishableCount += filter ( values ( chunkData as Record < string , any > [ ] ) , ( asset ) =>
334- this . isAmAssetPublishable ( asset , sourceStack ) ,
335- ) . length ;
375+ for ( const asset of values ( chunkData as Record < string , any > [ ] ) ) {
376+ if ( ! this . isAmAssetPublishable ( asset , sourceStack ) ) continue ;
377+ // Count publish calls (one per env-locale-set group), not assets, so ticks stay 1:1.
378+ publishableCount += this . buildPublishGroups (
379+ filter ( asset . publish_details , ( pd : any ) => pd ?. api_key === sourceStack ) ,
380+ ) . length ;
381+ }
336382 }
337383 }
338384
@@ -362,37 +408,15 @@ export default class ImportAssets extends BaseClass {
362408 handleAndLogError ( error , { ...this . importConfig . context , uid, title } ) ;
363409 } ;
364410
411+ // apiData is a pre-expanded sub-item ({ uid, title, publishDetails }); one per env-locale-set
412+ // group (see Pass 2). Pairing is already preserved, so this only resolves the destination UID.
365413 const serializeData = ( apiOptions : ApiOptions ) => {
366- const { apiData : asset } = apiOptions ;
367- const publishDetails = filter (
368- asset . publish_details ,
369- ( pd : any ) => pd ?. api_key === sourceStack && this . environments ?. hasOwnProperty ( pd ?. environment ) ,
370- ) ;
371-
372- if ( ! publishDetails . length ) {
373- apiOptions . entity = undefined ;
374- return apiOptions ;
375- }
376-
377- const environments = uniq ( map ( publishDetails , ( { environment } ) => this . environments [ environment ] . name ) ) ;
378- const locales = uniq ( map ( publishDetails , 'locale' ) ) ;
379-
380- if ( environments . length === 0 || locales . length === 0 ) {
381- log . debug ( `Skipping publish for asset ${ asset . uid } , this . importConfig . context ) ;
382- apiOptions . entity = undefined ;
383- return apiOptions ;
384- }
385-
386- asset . locales = locales ;
387- asset . environments = environments ;
388- apiOptions . apiData . publishDetails = { locales, environments } ;
389-
390- apiOptions . uid = this . assetsUidMap [ asset . uid ] as string ;
414+ const { apiData } = apiOptions ;
415+ apiOptions . uid = this . assetsUidMap [ apiData . uid ] as string ;
391416 if ( ! apiOptions . uid ) {
392- log . debug ( `Skipping publish for asset ${ asset . uid } , this . importConfig . context ) ;
417+ log . debug ( `Skipping publish for asset ${ apiData . uid } , this . importConfig . context ) ;
393418 apiOptions . entity = undefined ;
394419 }
395-
396420 return apiOptions ;
397421 } ;
398422
@@ -404,10 +428,15 @@ export default class ImportAssets extends BaseClass {
404428 const indexerCount = values ( indexer ) . length ;
405429
406430 for ( const index in indexer ) {
407- const apiContent = filter ( values ( await fsUtil . readChunkFiles . next ( ) ) , ( asset ) =>
408- this . isAmAssetPublishable ( asset , sourceStack ) ,
409- ) ;
410- log . debug ( `Found ${ apiContent . length } ${ index } , this . importConfig . context ) ;
431+ // Expand each publishable asset into one sub-item per env-locale-set group, so each
432+ // makeConcurrentCall item is a single-rectangle publish (preserves env↔locale pairing).
433+ const apiContent = values ( await fsUtil . readChunkFiles . next ( ) ) . flatMap ( ( asset : Record < string , any > ) => {
434+ if ( ! this . isAmAssetPublishable ( asset , sourceStack ) ) return [ ] ;
435+ return this . buildPublishGroups (
436+ filter ( asset . publish_details , ( pd : any ) => pd ?. api_key === sourceStack ) ,
437+ ) . map ( ( publishDetails ) => ( { uid : asset . uid , title : asset . title , publishDetails } ) ) ;
438+ } ) ;
439+ log . debug ( `Found ${ apiContent . length } ${ index } , this . importConfig . context ) ;
411440
412441 await this . makeConcurrentCall ( {
413442 apiContent,
0 commit comments