sfdx-git-delta 6.41.2 → 6.43.0

package/lib/post-processor/flowTranslationProcessor.js

@@ -1,28 +1,43 @@
 'use strict';
 import { __decorate } from "tslib";
 import { join, parse } from 'node:path/posix';
-import { castArray } from 'lodash-es';
+import { eachLimit } from 'async';
 import { FLOW_XML_NAME, META_REGEX, METAFILE_SUFFIX, TRANSLATION_EXTENSION, TRANSLATION_TYPE, } from '../constant/metadataConstants.js';
-import { CopyOperationKind, emptyResult, ManifestTarget, } from '../types/handlerResult.js';
-import { grepContent } from '../utils/fsHelper.js';
+import { ChangeKind, CopyOperationKind, emptyResult, ManifestTarget, } from '../types/handlerResult.js';
+import { getConcurrencyThreshold } from '../utils/concurrencyUtils.js';
+import { grepContent, readPathFromGit } from '../utils/fsHelper.js';
 import { isSamePath, isSubDir, pathExists, readFile } from '../utils/fsUtils.js';
 import { buildIgnoreHelper } from '../utils/ignoreHelper.js';
 import { log } from '../utils/LoggingDecorator.js';
-import { convertJsonToXml, parseXmlFileToJson, xml2Json, } from '../utils/xmlHelper.js';
+import { parseFromSideSwallowing, } from '../utils/metadataDiff/xmlEventReader.js';
+import { writeXmlDocument } from '../utils/metadataDiff/xmlWriter.js';
 import BaseProcessor from './baseProcessor.js';
+const FLOW_DEFINITIONS_KEY = 'flowDefinitions';
+const TRANSLATIONS_ROOT_KEY = 'Translations';
+const TRANSLATIONS_NAMESPACE = 'http://soap.sforce.com/2006/04/metadata';
+const DEFAULT_XML_HEADER = {
+    '?xml': { '@_version': '1.0', '@_encoding': 'UTF-8' },
+};
+const DEFAULT_ROOT_ATTRIBUTES = {
+    '@_xmlns': TRANSLATIONS_NAMESPACE,
+};
 const EXTENSION = `.${TRANSLATION_EXTENSION}`;
 const getTranslationName = (translationPath) => parse(translationPath.replace(META_REGEX, '')).name;
-const getDefaultTranslation = () => ({
-    '?xml': { '@_version': '1.0', '@_encoding': 'UTF-8' },
-    Translations: {
-        '@_xmlns': 'http://soap.sforce.com/2006/04/metadata',
-        flowDefinitions: [],
+const emptyTranslationMerge = () => ({
+    rootCapture: {
+        xmlHeader: DEFAULT_XML_HEADER,
+        rootKey: TRANSLATIONS_ROOT_KEY,
+        rootAttributes: DEFAULT_ROOT_ATTRIBUTES,
     },
+    orderedChildren: [[FLOW_DEFINITIONS_KEY, []]],
+    flowsIndex: 0,
+    seenFullNames: new Set(),
 });
 export default class FlowTranslationProcessor extends BaseProcessor {
     translations;
     ignoreHelper;
     isOutputEqualsToRepo;
+    packagedFlows = new Set();
     constructor(work, metadata) {
         super(work, metadata);
         this.translations = new Map();
@@ -42,19 +57,40 @@ export default class FlowTranslationProcessor extends BaseProcessor {
     }
     async _buildFlowDefinitionsMap() {
         this.translations.clear();
+        // Cache the package-flow set once per process() invocation — avoids
+        // re-computing the union-view of ChangeSet for every parsed flow.
+        // _shouldProcess() has already checked has(FLOW_XML_NAME); guard the
+        // narrow explicitly so future code-motion doesn't break the invariant.
+        const packaged = this.work.changes.forPackageManifest().get(FLOW_XML_NAME);
+        /* v8 ignore next -- defensive: _shouldProcess() already gates on FLOW_XML_NAME presence, so packaged is always defined here */
+        if (packaged === undefined)
+            return;
+        this.packagedFlows = packaged;
         const pathspecs = this.config.source.map(s => `${s}/*${EXTENSION}${METAFILE_SUFFIX}`);
         const translationPaths = await grepContent('flowDefinitions', pathspecs, this.work.config);
-        for (const translationPath of translationPaths) {
-            if (await this._canParse(translationPath)) {
+        // Eager-init ignoreHelper + isOutputEqualsToRepo BEFORE the parallel
+        // loop: under eachLimit multiple workers would otherwise race the
+        // `if (!this.ignoreHelper)` guard, each triggering a redundant
+        // buildIgnoreHelper and then racing to assign the result.
+        await this._initIgnoreHelper();
+        // Translation files are independent; parse them in parallel under the
+        // shared concurrency cap. this.translations.set is keyed by distinct
+        // translationPath values so per-file writes do not overlap.
+        await eachLimit(translationPaths, getConcurrencyThreshold(), async (translationPath) => {
+            if (this._canParse(translationPath)) {
                 await this._parseTranslationFile(translationPath);
             }
-        }
+        });
     }
-    async _canParse(translationPath) {
-        if (!this.ignoreHelper) {
-            this.ignoreHelper = await buildIgnoreHelper(this.config);
-            this.isOutputEqualsToRepo = isSamePath(this.config.output, this.config.repo);
-        }
+    async _initIgnoreHelper() {
+        if (this.ignoreHelper)
+            return;
+        this.ignoreHelper = await buildIgnoreHelper(this.config);
+        this.isOutputEqualsToRepo = isSamePath(this.config.output, this.config.repo);
+    }
+    _canParse(translationPath) {
+        // _initIgnoreHelper is awaited by _buildFlowDefinitionsMap before any
+        // worker runs, so the helper is guaranteed initialised here.
         return (!this.ignoreHelper.globalIgnore.ignores(translationPath) &&
             (this.isOutputEqualsToRepo ||
                 !isSubDir(this.config.output, translationPath)));
@@ -62,59 +98,118 @@ export default class FlowTranslationProcessor extends BaseProcessor {
     async _collectFlowTranslations() {
         const result = emptyResult();
         for (const translationPath of this.translations.keys()) {
-            result.manifests.push({
+            result.changes.addElement({
                 target: ManifestTarget.Package,
                 type: TRANSLATION_TYPE,
                 member: getTranslationName(translationPath),
+                changeKind: ChangeKind.Modify,
             });
             if (this.config.generateDelta) {
-                const jsonTranslation = await this._getTranslationAsJSON(translationPath);
-                this._scrapTranslationFile(jsonTranslation, this.translations.get(translationPath));
+                const merge = await this._mergeTranslationWithOutput(translationPath);
+                this._mergeActualFlows(merge, this.translations.get(translationPath));
                 result.copies.push({
-                    kind: CopyOperationKind.ComputedContent,
+                    kind: CopyOperationKind.StreamedContent,
                     path: translationPath,
-                    content: convertJsonToXml(jsonTranslation),
+                    writer: async (out) => {
+                        await writeXmlDocument(out, merge.rootCapture, merge.orderedChildren);
+                    },
                 });
             }
         }
         return result;
     }
-    _scrapTranslationFile(jsonTranslation, actualFlowDefinition) {
-        const flowDefinitions = castArray(jsonTranslation.Translations?.flowDefinitions);
-        const fullNames = new Set(flowDefinitions.map((flowDef) => flowDef?.fullName));
-        const strippedActualFlowDefinition = actualFlowDefinition.filter((flowDef) => !fullNames.has(flowDef?.fullName));
-        jsonTranslation.Translations.flowDefinitions = flowDefinitions.concat(strippedActualFlowDefinition);
+    /**
+     * Stream-parses the existing output translation file (if any), bucketing
+     * each direct-child element into an ordered-children list keyed by
+     * subType. The streaming builder drops each element from the in-progress
+     * tree on close so peak memory is bounded by the current element rather
+     * than the full translation document. Non-flowDefinitions children are
+     * retained as-is; flowDefinitions are merged downstream with the
+     * per-path actual flows we collected from the to-revision translation.
+     */
+    async _mergeTranslationWithOutput(translationPath) {
+        const outputPath = join(this.config.output, translationPath);
+        if (!(await pathExists(outputPath)))
+            return emptyTranslationMerge();
+        const xml = await readFile(outputPath);
+        const orderedChildren = [];
+        const indexByKey = new Map();
+        const seenFullNames = new Set();
+        const capture = await parseFromSideSwallowing(xml, (subType, element) => {
+            let idx = indexByKey.get(subType);
+            if (idx === undefined) {
+                idx = orderedChildren.length;
+                indexByKey.set(subType, idx);
+                orderedChildren.push([subType, []]);
+            }
+            orderedChildren[idx][1].push(element);
+            if (subType === FLOW_DEFINITIONS_KEY) {
+                seenFullNames.add(element?.fullName);
+            }
+        });
+        if (capture === null)
+            return emptyTranslationMerge();
+        let flowsIndex = indexByKey.get(FLOW_DEFINITIONS_KEY);
+        if (flowsIndex === undefined) {
+            flowsIndex = orderedChildren.length;
+            orderedChildren.push([FLOW_DEFINITIONS_KEY, []]);
+        }
+        return { rootCapture: capture, orderedChildren, flowsIndex, seenFullNames };
+    }
+    /**
+     * Appends actual flows from the to-revision translation into the merge's
+     * flowDefinitions bucket, skipping any whose fullName is already present
+     * in the output-side flows (output-wins-on-conflict — matches the
+     * legacy `_scrapTranslationFile` semantics).
+     *
+     * In-place append into `merge.orderedChildren` is intentional: the merge
+     * object is single-use, freshly built per translationPath by the caller,
+     * and the writer closure captures the same reference.
+     */
+    _mergeActualFlows(merge, actualFlowDefinitions) {
+        const bucket = merge.orderedChildren[merge.flowsIndex][1];
+        for (const flowDef of actualFlowDefinitions) {
+            if (merge.seenFullNames.has(flowDef?.fullName))
+                continue;
+            bucket.push(flowDef);
+            merge.seenFullNames.add(flowDef?.fullName);
+        }
     }
+    // Uses the streaming xmlEventReader so non-flowDefinitions direct
+    // children of the Translations root (customFieldTranslations, etc.)
+    // are discarded as they are emitted, and flowDefinitions whose
+    // fullName is not in packagedFlows never reach this.translations.
+    // The callback-level early-filter makes _addFlowPerTranslation a
+    // plain append. The underlying reader (xmlEventReader) parses one
+    // element at a time via txml's parseNode primitive, so peak memory
+    // stays bounded by the largest single subtree rather than the full
+    // document.
     async _parseTranslationFile(translationPath) {
-        const translationJSON = (await parseXmlFileToJson({ path: translationPath, oid: this.config.to }, this.config));
-        const flowDefinitions = castArray(translationJSON?.Translations?.flowDefinitions);
-        flowDefinitions.forEach(flowDefinition => this._addFlowPerTranslation({
-            translationPath,
-            flowDefinition,
-        }));
+        const source = await readPathFromGit({ path: translationPath, oid: this.config.to }, this.config);
+        await parseFromSideSwallowing(source, (subType, element) => {
+            /* v8 ignore next -- defensive: translation files only contain flowDefinitions children; non-flowDefinitions paths are filtered upstream */
+            if (subType !== FLOW_DEFINITIONS_KEY)
+                return;
+            const flowDefinition = element;
+            /* v8 ignore next -- defensive: every flowDefinition emitted by Salesforce has a fullName */
+            if (!flowDefinition.fullName)
+                return;
+            if (!this.packagedFlows.has(flowDefinition.fullName))
+                return;
+            this._addFlowPerTranslation({ translationPath, flowDefinition });
+        });
     }
+    // Caller has already filtered by packagedFlows; this is pure append.
     _addFlowPerTranslation({ translationPath, flowDefinition, }) {
-        const packagedElements = this.work.diffs.package.get(FLOW_XML_NAME);
-        const fullName = flowDefinition?.fullName;
-        if (fullName && packagedElements?.has(fullName)) {
-            if (!this.translations.has(translationPath)) {
-                this.translations.set(translationPath, []);
-            }
-            this.translations.get(translationPath).push(flowDefinition);
-        }
-    }
-    async _getTranslationAsJSON(translationPath) {
-        const translationPathInOutputFolder = join(this.config.output, translationPath);
-        const translationExist = await pathExists(translationPathInOutputFolder);
-        let jsonTranslation = getDefaultTranslation();
-        if (translationExist) {
-            const xmlTranslation = await readFile(translationPathInOutputFolder);
-            jsonTranslation = xml2Json(xmlTranslation);
+        let list = this.translations.get(translationPath);
+        if (list === undefined) {
+            list = [];
+            this.translations.set(translationPath, list);
         }
-        return jsonTranslation;
+        list.push(flowDefinition);
     }
     _shouldProcess() {
-        return this.work.diffs.package.has(FLOW_XML_NAME);
+        return this.work.changes.forPackageManifest().has(FLOW_XML_NAME);
     }
 }
 __decorate([

package/lib/post-processor/flowTranslationProcessor.js.map

@@ -1 +1 @@
-{"version":3,"file":"flowTranslationProcessor.js","sourceRoot":"","sources":["../../src/post-processor/flowTranslationProcessor.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"flowTranslationProcessor.js","sourceRoot":"","sources":["../../src/post-processor/flowTranslationProcessor.ts"],"names":[],"mappings":"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"}

package/lib/post-processor/packageGenerator.d.ts

@@ -1,6 +1,5 @@
 import BaseProcessor from './baseProcessor.js';
 export default class PackageGenerator extends BaseProcessor {
     process(): Promise<void>;
-    protected _cleanPackages(): void;
-    protected _buildPackages(): Promise<void>;
+    private _writeManifest;
 }

package/lib/post-processor/packageGenerator.js

@@ -1,7 +1,7 @@
 'use strict';
 import { __decorate } from "tslib";
-import { join } from 'node:path/posix';
-import { outputFile } from 'fs-extra';
+import { createWriteStream, promises as fsPromises } from 'node:fs';
+import { dirname, join } from 'node:path/posix';
 import { log } from '../utils/LoggingDecorator.js';
 import PackageBuilder from '../utils/packageHelper.js';
 import BaseProcessor from './baseProcessor.js';
@@ -10,51 +10,40 @@ const PACKAGE_FILE_NAME = 'package';
 const XML_FILE_EXTENSION = 'xml';
 export default class PackageGenerator extends BaseProcessor {
     async process() {
-        this._cleanPackages();
-        await this._buildPackages();
-    }
-    _cleanPackages() {
-        const additive = this.work.diffs[PACKAGE_FILE_NAME];
-        const destructive = this.work.diffs[DESTRUCTIVE_CHANGES_FILE_NAME];
-        for (const [type, members] of additive) {
-            const existing = destructive.get(type);
-            if (!existing)
-                continue;
-            const filtered = new Set();
-            for (const element of existing) {
-                if (!members.has(element)) {
-                    filtered.add(element);
-                }
-            }
-            if (filtered.size === 0) {
-                destructive.delete(type);
-            }
-            else {
-                destructive.set(type, filtered);
-            }
-        }
-    }
-    async _buildPackages() {
-        const pc = new PackageBuilder(this.config);
-        await Promise.all([
+        const builder = new PackageBuilder(this.config);
+        // ChangeSet.forDestructiveManifest() already cancels delete entries that
+        // have been re-added or re-modified in the same diff — no local cleanup
+        // needed here.
+        const destructiveManifest = this.work.changes.forDestructiveManifest();
+        const packageManifest = this.work.changes.forPackageManifest();
+        const ops = [
             {
                 filename: `${DESTRUCTIVE_CHANGES_FILE_NAME}.${XML_FILE_EXTENSION}`,
                 folder: DESTRUCTIVE_CHANGES_FILE_NAME,
-                manifest: this.work.diffs[DESTRUCTIVE_CHANGES_FILE_NAME],
+                manifest: destructiveManifest,
             },
             {
                 filename: `${PACKAGE_FILE_NAME}.${XML_FILE_EXTENSION}`,
                 folder: PACKAGE_FILE_NAME,
-                manifest: this.work.diffs[PACKAGE_FILE_NAME],
+                manifest: packageManifest,
             },
             {
                 filename: `${PACKAGE_FILE_NAME}.${XML_FILE_EXTENSION}`,
                 folder: DESTRUCTIVE_CHANGES_FILE_NAME,
                 manifest: new Map(),
             },
-        ].map(op => {
-            return outputFile(join(this.config.output, op.folder, op.filename), pc.buildPackage(op.manifest));
-        }));
+        ];
+        await Promise.all(ops.map(op => this._writeManifest(builder, op)));
+    }
+    async _writeManifest(builder, op) {
+        const dst = join(this.config.output, op.folder, op.filename);
+        await fsPromises.mkdir(dirname(dst), { recursive: true });
+        const ws = createWriteStream(dst);
+        await builder.buildPackageStream(op.manifest, ws);
+        await new Promise((resolve, reject) => {
+            /* v8 ignore next -- defensive: createWriteStream's end-callback fires with err only on synchronous fd write failure */
+            ws.end((err) => (err ? reject(err) : resolve()));
+        });
     }
 }
 __decorate([

package/lib/post-processor/packageGenerator.js.map

@@ -1 +1 @@
-{"version":3,"file":"packageGenerator.js","sourceRoot":"","sources":["../../src/post-processor/packageGenerator.ts"],"names":[],"mappings":"AAAA,YAAY,CAAA;;AAEZ,OAAO,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAA;AAEtC,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAA;AACrC,OAAO,EAAE,GAAG,EAAE,MAAM,8BAA8B,CAAA;AAClD,OAAO,cAAc,MAAM,2BAA2B,CAAA;AACtD,OAAO,aAAa,MAAM,oBAAoB,CAAA;AAE9C,MAAM,6BAA6B,GAAG,oBAAoB,CAAA;AAC1D,MAAM,iBAAiB,GAAG,SAAS,CAAA;AACnC,MAAM,kBAAkB,GAAG,KAAK,CAAA;AAEhC,MAAM,CAAC,OAAO,OAAO,gBAAiB,SAAQ,aAAa;IAEnC,AAAN,KAAK,CAAC,OAAO;QAC3B,IAAI,CAAC,cAAc,EAAE,CAAA;QACrB,MAAM,IAAI,CAAC,cAAc,EAAE,CAAA;IAC7B,CAAC;IAES,cAAc;QACtB,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAA;QACnD,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAA;QAClE,KAAK,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,QAAQ,EAAE,CAAC;YACvC,MAAM,QAAQ,GAAG,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;YACtC,IAAI,CAAC,QAAQ;gBAAE,SAAQ;YACvB,MAAM,QAAQ,GAAG,IAAI,GAAG,EAAU,CAAA;YAClC,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;gBAC/B,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC;oBAC1B,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;gBACvB,CAAC;YACH,CAAC;YACD,IAAI,QAAQ,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;gBACxB,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;YAC1B,CAAC;iBAAM,CAAC;gBACN,WAAW,CAAC,GAAG,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAA;YACjC,CAAC;QACH,CAAC;IACH,CAAC;IAES,KAAK,CAAC,cAAc;QAC5B,MAAM,EAAE,GAAG,IAAI,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QAC1C,MAAM,OAAO,CAAC,GAAG,CACf;YACE;gBACE,QAAQ,EAAE,GAAG,6BAA6B,IAAI,kBAAkB,EAAE;gBAClE,MAAM,EAAE,6BAA6B;gBACrC,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,6BAA6B,CAAC;aACzD;YACD;gBACE,QAAQ,EAAE,GAAG,iBAAiB,IAAI,kBAAkB,EAAE;gBACtD,MAAM,EAAE,iBAAiB;gBACzB,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC;aAC7C;YACD;gBACE,QAAQ,EAAE,GAAG,iBAAiB,IAAI,kBAAkB,EAAE;gBACtD,MAAM,EAAE,6BAA6B;gBACrC,QAAQ,EAAE,IAAI,GAAG,EAAE;aACpB;SACF,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE;YACT,OAAO,UAAU,CACf,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,QAAQ,CAAC,EAChD,EAAE,CAAC,YAAY,CAAC,EAAE,CAAC,QAAQ,CAAW,CACvC,CAAA;QACH,CAAC,CAAC,CACH,CAAA;IACH,CAAC;CACF;AApDuB;IADrB,GAAG;+CAIH"}
+{"version":3,"file":"packageGenerator.js","sourceRoot":"","sources":["../../src/post-processor/packageGenerator.ts"],"names":[],"mappings":"AAAA,YAAY,CAAA;;AAEZ,OAAO,EAAE,iBAAiB,EAAE,QAAQ,IAAI,UAAU,EAAE,MAAM,SAAS,CAAA;AACnE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAA;AAE/C,OAAO,EAAE,GAAG,EAAE,MAAM,8BAA8B,CAAA;AAClD,OAAO,cAAc,MAAM,2BAA2B,CAAA;AACtD,OAAO,aAAa,MAAM,oBAAoB,CAAA;AAE9C,MAAM,6BAA6B,GAAG,oBAAoB,CAAA;AAC1D,MAAM,iBAAiB,GAAG,SAAS,CAAA;AACnC,MAAM,kBAAkB,GAAG,KAAK,CAAA;AAQhC,MAAM,CAAC,OAAO,OAAO,gBAAiB,SAAQ,aAAa;IAEnC,AAAN,KAAK,CAAC,OAAO;QAC3B,MAAM,OAAO,GAAG,IAAI,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QAC/C,yEAAyE;QACzE,wEAAwE;QACxE,eAAe;QACf,MAAM,mBAAmB,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,sBAAsB,EAAE,CAAA;QACtE,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,kBAAkB,EAAE,CAAA;QAC9D,MAAM,GAAG,GAAc;YACrB;gBACE,QAAQ,EAAE,GAAG,6BAA6B,IAAI,kBAAkB,EAAE;gBAClE,MAAM,EAAE,6BAA6B;gBACrC,QAAQ,EAAE,mBAAmB;aAC9B;YACD;gBACE,QAAQ,EAAE,GAAG,iBAAiB,IAAI,kBAAkB,EAAE;gBACtD,MAAM,EAAE,iBAAiB;gBACzB,QAAQ,EAAE,eAAe;aAC1B;YACD;gBACE,QAAQ,EAAE,GAAG,iBAAiB,IAAI,kBAAkB,EAAE;gBACtD,MAAM,EAAE,6BAA6B;gBACrC,QAAQ,EAAE,IAAI,GAAG,EAAE;aACpB;SACF,CAAA;QACD,MAAM,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC,CAAA;IACpE,CAAC;IAEO,KAAK,CAAC,cAAc,CAC1B,OAAuB,EACvB,EAAW;QAEX,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,QAAQ,CAAC,CAAA;QAC5D,MAAM,UAAU,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;QACzD,MAAM,EAAE,GAAG,iBAAiB,CAAC,GAAG,CAAC,CAAA;QACjC,MAAM,OAAO,CAAC,kBAAkB,CAAC,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAA;QACjD,MAAM,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAC1C,uHAAuH;YACvH,EAAE,CAAC,GAAG,CAAC,CAAC,GAAkB,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAA;QACjE,CAAC,CAAC,CAAA;IACJ,CAAC;CACF;AAxCuB;IADrB,GAAG;+CA0BH"}

package/lib/post-processor/postProcessorManager.js

@@ -2,6 +2,7 @@
 import { emptyResult, mergeResults } from '../types/handlerResult.js';
 import { getErrorMessage, wrapError } from '../utils/errorUtils.js';
 import { Logger, lazy } from '../utils/LoggingService.js';
+import ChangesManifestProcessor from './changesManifestProcessor.js';
 import FlowTranslationProcessor from './flowTranslationProcessor.js';
 import IncludeProcessor from './includeProcessor.js';
 import PackageGenerator from './packageGenerator.js';
@@ -9,8 +10,12 @@ const registeredProcessors = [
     FlowTranslationProcessor,
     IncludeProcessor,
 ];
-// It must be done last
+// PackageGenerator must run last among legacy processors — it writes the final
+// xml manifests. ChangesManifestProcessor operates on work.changes (populated
+// by aggregateManifests before executeRemaining runs) so it is independent of
+// PackageGenerator's output.
 registeredProcessors.push(PackageGenerator);
+registeredProcessors.push(ChangesManifestProcessor);
 export default class PostProcessorManager {
     work;
     processors = [];
@@ -42,11 +47,9 @@ export default class PostProcessorManager {
             catch (error) {
                 const message = `${collector.constructor.name}: ${getErrorMessage(error)}`;
                 Logger.warn(lazy `${message}`);
-                results.push({
-                    manifests: [],
-                    copies: [],
-                    warnings: [wrapError(message, error)],
-                });
+                const failed = emptyResult();
+                failed.warnings.push(wrapError(message, error));
+                results.push(failed);
             }
         }
         return results.length > 0 ? mergeResults(...results) : emptyResult();

package/lib/post-processor/postProcessorManager.js.map

@@ -1 +1 @@
-{"version":3,"file":"postProcessorManager.js","sourceRoot":"","sources":["../../src/post-processor/postProcessorManager.ts"],"names":[],"mappings":"AAAA,YAAY,CAAA;AAGZ,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AAErE,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAA;AACnE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,4BAA4B,CAAA;AAGzD,OAAO,wBAAwB,MAAM,+BAA+B,CAAA;AACpE,OAAO,gBAAgB,MAAM,uBAAuB,CAAA;AACpD,OAAO,gBAAgB,MAAM,uBAAuB,CAAA;AAOpD,MAAM,oBAAoB,GAA2B;IACnD,wBAAwB;IACxB,gBAAgB;CACjB,CAAA;AAED,uBAAuB;AACvB,oBAAoB,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAA;AAE3C,MAAM,CAAC,OAAO,OAAO,oBAAoB;IAIR;IAHZ,UAAU,GAAoB,EAAE,CAAA;IAChC,UAAU,GAAoB,EAAE,CAAA;IAEnD,YAA+B,IAAU;QAAV,SAAI,GAAJ,IAAI,CAAM;IAAG,CAAC;IAEtC,GAAG,CAAC,aAA4B;QACrC,MAAM,MAAM,GAAG,aAAa,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAA;QAC5E,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAA;QAC1B,OAAO,IAAI,CAAA;IACb,CAAC;IAEM,KAAK,CAAC,OAAO;QAClB,KAAK,MAAM,aAAa,IAAI,CAAC,GAAG,IAAI,CAAC,UAAU,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC;YACrE,MAAM,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,CAAA;QACxC,CAAC;IACH,CAAC;IAEM,KAAK,CAAC,gBAAgB;QAC3B,KAAK,MAAM,aAAa,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;YAC5C,MAAM,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,CAAA;QACxC,CAAC;IACH,CAAC;IAEM,KAAK,CAAC,UAAU;QACrB,MAAM,OAAO,GAAoB,EAAE,CAAA;QAEnC,KAAK,MAAM,SAAS,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;YACxC,IAAI,CAAC;gBACH,OAAO,CAAC,IAAI,CAAC,MAAM,SAAS,CAAC,mBAAmB,EAAE,CAAC,CAAA;YACrD,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,MAAM,OAAO,GAAG,GAAG,SAAS,CAAC,WAAW,CAAC,IAAI,KAAK,eAAe,CAAC,KAAK,CAAC,EAAE,CAAA;gBAC1E,MAAM,CAAC,IAAI,CAAC,IAAI,CAAA,GAAG,OAAO,EAAE,CAAC,CAAA;gBAC7B,OAAO,CAAC,IAAI,CAAC;oBACX,SAAS,EAAE,EAAE;oBACb,MAAM,EAAE,EAAE;oBACV,QAAQ,EAAE,CAAC,SAAS,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;iBACtC,CAAC,CAAA;YACJ,CAAC;QACH,CAAC;QAED,OAAO,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAA;IACtE,CAAC;IAEO,KAAK,CAAC,YAAY,CAAC,aAA4B;QACrD,IAAI,CAAC;YACH,MAAM,aAAa,CAAC,OAAO,EAAE,CAAA;QAC/B,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,OAAO,GAAG,GAAG,aAAa,CAAC,WAAW,CAAC,IAAI,KAAK,eAAe,CAAC,KAAK,CAAC,EAAE,CAAA;YAC9E,MAAM,CAAC,IAAI,CAAC,IAAI,CAAA,GAAG,OAAO,EAAE,CAAC,CAAA;YAC7B,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAA;QACpD,CAAC;IACH,CAAC;CACF;AAED,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,IAAU,EAAE,QAA4B,EAAE,EAAE;IAC5E,MAAM,aAAa,GAAG,IAAI,oBAAoB,CAAC,IAAI,CAAC,CAAA;IAEpD,KAAK,MAAM,SAAS,IAAI,oBAAoB,EAAE,CAAC;QAC7C,MAAM,QAAQ,GAAG,IAAI,SAAS,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAA;QAC9C,aAAa,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;IAC7B,CAAC;IAED,OAAO,aAAa,CAAA;AACtB,CAAC,CAAA"}
+{"version":3,"file":"postProcessorManager.js","sourceRoot":"","sources":["../../src/post-processor/postProcessorManager.ts"],"names":[],"mappings":"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"}

package/lib/service/botHandler.d.ts

@@ -1,6 +1,7 @@
 import type { HandlerResult } from '../types/handlerResult.js';
+import type ChangeSet from '../utils/changeSet.js';
 import ShareFolderHandler from './sharedFolderHandler.js';
 export default class BotHandler extends ShareFolderHandler {
     protected _getElementName(): string;
-    collectAddition(): Promise<HandlerResult>;
+    collectAddition(sink?: ChangeSet): Promise<HandlerResult>;
 }

package/lib/service/botHandler.js

@@ -11,13 +11,14 @@ export default class BotHandler extends ShareFolderHandler {
         const elementName = new Set([this.element.parentFolder, fileName]);
         return [...elementName].join(DOT);
     }
-    async collectAddition() {
-        const result = await super.collectAddition();
+    async collectAddition(sink) {
+        const result = await super.collectAddition(sink);
         const botName = this.element.parentFolder.split(PATH_SEP).pop();
-        result.manifests.push({
+        result.changes.addElement({
             target: ManifestTarget.Package,
             type: BOT_TYPE,
             member: botName,
+            changeKind: this._getChangeKind(),
         });
         const botPath = `${parse(this.element.basePath).dir}${PATH_SEP}${botName}.${BOT_EXTENSION}`;
         this._collectCopyWithMetaFile(result.copies, botPath);

package/lib/service/botHandler.js.map

@@ -1 +1 @@
-{"version":3,"file":"botHandler.js","sourceRoot":"","sources":["../../src/service/botHandler.ts"],"names":[],"mappings":"AAAA,YAAY,CAAA;AACZ,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAA;AAEvC,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAA;AAE1D,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAA;AAC1D,OAAO,kBAAkB,MAAM,0BAA0B,CAAA;AAEzD,MAAM,QAAQ,GAAG,KAAK,CAAA;AACtB,MAAM,aAAa,GAAG,KAAK,CAAA;AAE3B,MAAM,CAAC,OAAO,OAAO,UAAW,SAAQ,kBAAkB;IACrC,eAAe;QAChC,MAAM,QAAQ,GAAG,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAA;QAClD,MAAM,WAAW,GAAG,IAAI,GAAG,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC,CAAA;QAClE,OAAO,CAAC,GAAG,WAAW,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IACnC,CAAC;IAEe,KAAK,CAAC,eAAe;QACnC,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,eAAe,EAAE,CAAA;QAC5C,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,GAAG,EAAY,CAAA;QACzE,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC;YACpB,MAAM,EAAE,cAAc,CAAC,OAAO;YAC9B,IAAI,EAAE,QAAQ;YACd,MAAM,EAAE,OAAO;SAChB,CAAC,CAAA;QACF,MAAM,OAAO,GAAG,GACd,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,GAC/B,GAAG,QAAQ,GAAG,OAAO,IAAI,aAAa,EAAE,CAAA;QACxC,IAAI,CAAC,wBAAwB,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;QACrD,OAAO,MAAM,CAAA;IACf,CAAC;CACF"}
+{"version":3,"file":"botHandler.js","sourceRoot":"","sources":["../../src/service/botHandler.ts"],"names":[],"mappings":"AAAA,YAAY,CAAA;AACZ,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAA;AACvC,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAA;AAE1D,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAA;AAE1D,OAAO,kBAAkB,MAAM,0BAA0B,CAAA;AAEzD,MAAM,QAAQ,GAAG,KAAK,CAAA;AACtB,MAAM,aAAa,GAAG,KAAK,CAAA;AAE3B,MAAM,CAAC,OAAO,OAAO,UAAW,SAAQ,kBAAkB;IACrC,eAAe;QAChC,MAAM,QAAQ,GAAG,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAA;QAClD,MAAM,WAAW,GAAG,IAAI,GAAG,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC,CAAA;QAClE,OAAO,CAAC,GAAG,WAAW,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IACnC,CAAC;IAEe,KAAK,CAAC,eAAe,CACnC,IAAgB;QAEhB,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,eAAe,CAAC,IAAI,CAAC,CAAA;QAChD,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,GAAG,EAAY,CAAA;QACzE,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC;YACxB,MAAM,EAAE,cAAc,CAAC,OAAO;YAC9B,IAAI,EAAE,QAAQ;YACd,MAAM,EAAE,OAAO;YACf,UAAU,EAAE,IAAI,CAAC,cAAc,EAAE;SAClC,CAAC,CAAA;QACF,MAAM,OAAO,GAAG,GACd,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,GAC/B,GAAG,QAAQ,GAAG,OAAO,IAAI,aAAa,EAAE,CAAA;QACxC,IAAI,CAAC,wBAAwB,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;QACrD,OAAO,MAAM,CAAA;IACf,CAAC;CACF"}

package/lib/service/containedDecomposedHandler.d.ts

@@ -1,13 +1,14 @@
 import { ParsedPath } from 'node:path/posix';
 import type { CopyOperation, HandlerResult } from '../types/handlerResult.js';
 import type { Work } from '../types/work.js';
+import type ChangeSet from '../utils/changeSet.js';
 import type { MetadataElement } from '../utils/metadataElement.js';
 import StandardHandler from './standardHandler.js';
 export default class ContainedDecomposedHandler extends StandardHandler {
     protected holderFolder: ParsedPath | undefined;
     constructor(changeType: string, element: MetadataElement, work: Work);
-    collectAddition(): Promise<HandlerResult>;
-    collectDeletion(): Promise<HandlerResult>;
+    collectAddition(sink?: ChangeSet): Promise<HandlerResult>;
+    collectDeletion(sink?: ChangeSet): Promise<HandlerResult>;
     protected _setholderFolder(): void;
     protected _isDecomposedFormat(): boolean;
     protected _collectDirCopy(copies: CopyOperation[], path: string): void;

package/lib/service/containedDecomposedHandler.js

@@ -15,21 +15,21 @@ export default class ContainedDecomposedHandler extends StandardHandler {
         super(changeType, element, work);
         this._setholderFolder();
     }
-    async collectAddition() {
-        const result = await super.collectAddition();
+    async collectAddition(sink) {
+        const result = await super.collectAddition(sink);
         if (this._isDecomposedFormat()) {
             this._collectDirCopy(result.copies, this._getHolderPath());
         }
         return result;
     }
-    async collectDeletion() {
+    async collectDeletion(sink) {
         if (!this._isDecomposedFormat()) {
-            return await super.collectDeletion();
+            return await super.collectDeletion(sink);
         }
         if (await this._hasRelatedContent()) {
-            return await this.collectModification();
+            return await this.collectModification(sink);
         }
-        return await super.collectDeletion();
+        return await super.collectDeletion(sink);
     }
     _setholderFolder() {
         if (!this._isDecomposedFormat()) {

package/lib/service/containedDecomposedHandler.js.map

@@ -1 +1 @@
-{"version":3,"file":"containedDecomposedHandler.js","sourceRoot":"","sources":["../../src/service/containedDecomposedHandler.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"containedDecomposedHandler.js","sourceRoot":"","sources":["../../src/service/containedDecomposedHandler.ts"],"names":[],"mappings":"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"}

package/lib/service/customFieldHandler.d.ts

@@ -1,5 +1,6 @@
 import type { HandlerResult } from '../types/handlerResult.js';
+import type ChangeSet from '../utils/changeSet.js';
 import DecomposedHandler from './decomposedHandler.js';
 export default class CustomFieldHandler extends DecomposedHandler {
-    collectAddition(): Promise<HandlerResult>;
+    collectAddition(sink?: ChangeSet): Promise<HandlerResult>;
 }

package/lib/service/customFieldHandler.js

@@ -4,8 +4,8 @@ import { contentIncludes } from '../utils/fsHelper.js';
 import DecomposedHandler from './decomposedHandler.js';
 import StandardHandler from './standardHandler.js';
 export default class CustomFieldHandler extends DecomposedHandler {
-    async collectAddition() {
-        const result = await StandardHandler.prototype.collectAddition.call(this);
+    async collectAddition(sink) {
+        const result = await StandardHandler.prototype.collectAddition.call(this, sink);
         if (!this._shouldCollectCopies())
             return result;
         // RATIONALE: Why include parent object when deploying Master Detail fields?

package/lib/service/customFieldHandler.js.map

@@ -1 +1 @@
-{"version":3,"file":"customFieldHandler.js","sourceRoot":"","sources":["../../src/service/customFieldHandler.ts"],"names":[],"mappings":"AAAA,YAAY,CAAA;AACZ,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAA;AAEpE,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAEtD,OAAO,iBAAiB,MAAM,wBAAwB,CAAA;AACtD,OAAO,eAAe,MAAM,sBAAsB,CAAA;AAElD,MAAM,CAAC,OAAO,OAAO,kBAAmB,SAAQ,iBAAiB;IAC/C,KAAK,CAAC,eAAe;QACnC,MAAM,MAAM,GAAG,MAAM,eAAe,CAAC,SAAS,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QACzE,IAAI,CAAC,IAAI,CAAC,oBAAoB,EAAE;YAAE,OAAO,MAAM,CAAA;QAC/C,4EAA4E;QAC5E,yFAAyF;QACzF,oGAAoG;QACpG,MAAM,cAAc,GAAG,MAAM,eAAe,CAC1C,iBAAiB,EACjB,IAAI,CAAC,OAAO,CAAC,QAAQ,EACrB,IAAI,CAAC,MAAM,CACZ,CAAA;QACD,IAAI,cAAc,EAAE,CAAC;YACnB,IAAI,CAAC,oBAAoB,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;QAC1C,CAAC;QACD,OAAO,MAAM,CAAA;IACf,CAAC;CACF"}
+{"version":3,"file":"customFieldHandler.js","sourceRoot":"","sources":["../../src/service/customFieldHandler.ts"],"names":[],"mappings":"AAAA,YAAY,CAAA;AACZ,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAA;AAGpE,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAEtD,OAAO,iBAAiB,MAAM,wBAAwB,CAAA;AACtD,OAAO,eAAe,MAAM,sBAAsB,CAAA;AAElD,MAAM,CAAC,OAAO,OAAO,kBAAmB,SAAQ,iBAAiB;IAC/C,KAAK,CAAC,eAAe,CACnC,IAAgB;QAEhB,MAAM,MAAM,GAAG,MAAM,eAAe,CAAC,SAAS,CAAC,eAAe,CAAC,IAAI,CACjE,IAAI,EACJ,IAAI,CACL,CAAA;QACD,IAAI,CAAC,IAAI,CAAC,oBAAoB,EAAE;YAAE,OAAO,MAAM,CAAA;QAC/C,4EAA4E;QAC5E,yFAAyF;QACzF,oGAAoG;QACpG,MAAM,cAAc,GAAG,MAAM,eAAe,CAC1C,iBAAiB,EACjB,IAAI,CAAC,OAAO,CAAC,QAAQ,EACrB,IAAI,CAAC,MAAM,CACZ,CAAA;QACD,IAAI,cAAc,EAAE,CAAC;YACnB,IAAI,CAAC,oBAAoB,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;QAC1C,CAAC;QACD,OAAO,MAAM,CAAA;IACf,CAAC;CACF"}

package/lib/service/customLabelHandler.d.ts

@@ -1,7 +1,8 @@
 import type { HandlerResult } from '../types/handlerResult.js';
+import type ChangeSet from '../utils/changeSet.js';
 import InFileHandler from './inFileHandler.js';
 export default class CustomLabelHandler extends InFileHandler {
-    collectAddition(): Promise<HandlerResult>;
+    collectAddition(sink?: ChangeSet): Promise<HandlerResult>;
     protected _shouldTreatDeletionAsDeletion(): boolean;
     protected _getQualifiedName(): string;
     protected _delegateFileCopy(): boolean;

package/lib/service/customLabelHandler.js

@@ -3,11 +3,11 @@ import { LABEL_DECOMPOSED_SUFFIX } from '../constant/metadataConstants.js';
 import InFileHandler from './inFileHandler.js';
 import StandardHandler from './standardHandler.js';
 export default class CustomLabelHandler extends InFileHandler {
-    async collectAddition() {
+    async collectAddition(sink) {
         if (this._isDecomposed()) {
-            return await StandardHandler.prototype.collectAddition.call(this);
+            return await StandardHandler.prototype.collectAddition.call(this, sink);
         }
-        return await super.collectAddition();
+        return await super.collectAddition(sink);
     }
     _shouldTreatDeletionAsDeletion() {
         return this._isDecomposed();