sfdx-git-delta 6.41.2 → 6.43.0

package/lib/service/customLabelHandler.js.map

@@ -1 +1 @@
-{"version":3,"file":"customLabelHandler.js","sourceRoot":"","sources":["../../src/service/customLabelHandler.ts"],"names":[],"mappings":"AAAA,YAAY,CAAA;AACZ,OAAO,EAAE,uBAAuB,EAAE,MAAM,kCAAkC,CAAA;AAE1E,OAAO,aAAa,MAAM,oBAAoB,CAAA;AAC9C,OAAO,eAAe,MAAM,sBAAsB,CAAA;AAElD,MAAM,CAAC,OAAO,OAAO,kBAAmB,SAAQ,aAAa;IAC3C,KAAK,CAAC,eAAe;QACnC,IAAI,IAAI,CAAC,aAAa,EAAE,EAAE,CAAC;YACzB,OAAO,MAAM,eAAe,CAAC,SAAS,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QACnE,CAAC;QACD,OAAO,MAAM,KAAK,CAAC,eAAe,EAAE,CAAA;IACtC,CAAC;IAEkB,8BAA8B;QAC/C,OAAO,IAAI,CAAC,aAAa,EAAE,CAAA;IAC7B,CAAC;IAEkB,iBAAiB;QAClC,OAAO,EAAE,CAAA;IACX,CAAC;IAEkB,iBAAiB;QAClC,OAAO,IAAI,CAAC,aAAa,EAAE,CAAA;IAC7B,CAAC;IAEkB,cAAc;QAC/B,OAAO,IAAI,CAAA;IACb,CAAC;IAEkB,yBAAyB;QAC1C,OAAO,KAAK,CAAA;IACd,CAAC;IAES,aAAa;QACrB,OAAO,IAAI,CAAC,OAAO,CAAC,SAAS,KAAK,uBAAuB,CAAA;IAC3D,CAAC;CACF"}
+{"version":3,"file":"customLabelHandler.js","sourceRoot":"","sources":["../../src/service/customLabelHandler.ts"],"names":[],"mappings":"AAAA,YAAY,CAAA;AACZ,OAAO,EAAE,uBAAuB,EAAE,MAAM,kCAAkC,CAAA;AAG1E,OAAO,aAAa,MAAM,oBAAoB,CAAA;AAC9C,OAAO,eAAe,MAAM,sBAAsB,CAAA;AAElD,MAAM,CAAC,OAAO,OAAO,kBAAmB,SAAQ,aAAa;IAC3C,KAAK,CAAC,eAAe,CACnC,IAAgB;QAEhB,IAAI,IAAI,CAAC,aAAa,EAAE,EAAE,CAAC;YACzB,OAAO,MAAM,eAAe,CAAC,SAAS,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;QACzE,CAAC;QACD,OAAO,MAAM,KAAK,CAAC,eAAe,CAAC,IAAI,CAAC,CAAA;IAC1C,CAAC;IAEkB,8BAA8B;QAC/C,OAAO,IAAI,CAAC,aAAa,EAAE,CAAA;IAC7B,CAAC;IAEkB,iBAAiB;QAClC,OAAO,EAAE,CAAA;IACX,CAAC;IAEkB,iBAAiB;QAClC,OAAO,IAAI,CAAC,aAAa,EAAE,CAAA;IAC7B,CAAC;IAEkB,cAAc;QAC/B,OAAO,IAAI,CAAA;IACb,CAAC;IAEkB,yBAAyB;QAC1C,OAAO,KAAK,CAAA;IACd,CAAC;IAES,aAAa;QACrB,OAAO,IAAI,CAAC,OAAO,CAAC,SAAS,KAAK,uBAAuB,CAAA;IAC3D,CAAC;CACF"}

package/lib/service/customObjectHandler.d.ts

@@ -1,6 +1,7 @@
 import type { HandlerResult } from '../types/handlerResult.js';
+import type ChangeSet from '../utils/changeSet.js';
 import StandardHandler from './standardHandler.js';
 export default class CustomObjectHandler extends StandardHandler {
-    collectAddition(): Promise<HandlerResult>;
+    collectAddition(sink?: ChangeSet): Promise<HandlerResult>;
     protected _collectMasterDetailCopies(result: HandlerResult): Promise<void>;
 }

package/lib/service/customObjectHandler.js

@@ -4,8 +4,8 @@ import { FIELD_DIRECTORY_NAME, MASTER_DETAIL_TAG, OBJECT_TYPE, } from '../consta
 import { grepContent, pathExists } from '../utils/fsHelper.js';
 import StandardHandler from './standardHandler.js';
 export default class CustomObjectHandler extends StandardHandler {
-    async collectAddition() {
-        const result = await super.collectAddition();
+    async collectAddition(sink) {
+        const result = await super.collectAddition(sink);
         await this._collectMasterDetailCopies(result);
         return result;
     }

package/lib/service/customObjectHandler.js.map

@@ -1 +1 @@
-{"version":3,"file":"customObjectHandler.js","sourceRoot":"","sources":["../../src/service/customObjectHandler.ts"],"names":[],"mappings":"AAAA,YAAY,CAAA;AACZ,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAA;AAE7C,OAAO,EACL,oBAAoB,EACpB,iBAAiB,EACjB,WAAW,GACZ,MAAM,kCAAkC,CAAA;AAEzC,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAC9D,OAAO,eAAe,MAAM,sBAAsB,CAAA;AAElD,MAAM,CAAC,OAAO,OAAO,mBAAoB,SAAQ,eAAe;IAC9C,KAAK,CAAC,eAAe;QACnC,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,eAAe,EAAE,CAAA;QAC5C,MAAM,IAAI,CAAC,0BAA0B,CAAC,MAAM,CAAC,CAAA;QAC7C,OAAO,MAAM,CAAA;IACf,CAAC;IAED,wEAAwE;IACxE,4FAA4F;IAC5F,oGAAoG;IAC1F,KAAK,CAAC,0BAA0B,CACxC,MAAqB;QAErB,IAAI,CAAC,IAAI,CAAC,oBAAoB,EAAE;YAAE,OAAM;QACxC,IAAI,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,KAAK,WAAW;YAAE,OAAM;QAErD,MAAM,YAAY,GAAG,IAAI,CACvB,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,GAAG,EAChC,oBAAoB,CACrB,CAAA;QACD,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,YAAY,EAAE,IAAI,CAAC,MAAM,CAAC,CAAA;QAC1D,IAAI,CAAC,MAAM;YAAE,OAAM;QAEnB,MAAM,mBAAmB,GAAG,MAAM,WAAW,CAC3C,iBAAiB,EACjB,YAAY,EACZ,IAAI,CAAC,MAAM,CACZ,CAAA;QACD,KAAK,MAAM,iBAAiB,IAAI,mBAAmB,EAAE,CAAC;YACpD,IAAI,CAAC,wBAAwB,CAAC,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAA;QACjE,CAAC;IACH,CAAC;CACF"}
+{"version":3,"file":"customObjectHandler.js","sourceRoot":"","sources":["../../src/service/customObjectHandler.ts"],"names":[],"mappings":"AAAA,YAAY,CAAA;AACZ,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAA;AAC7C,OAAO,EACL,oBAAoB,EACpB,iBAAiB,EACjB,WAAW,GACZ,MAAM,kCAAkC,CAAA;AAGzC,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAC9D,OAAO,eAAe,MAAM,sBAAsB,CAAA;AAElD,MAAM,CAAC,OAAO,OAAO,mBAAoB,SAAQ,eAAe;IAC9C,KAAK,CAAC,eAAe,CACnC,IAAgB;QAEhB,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,eAAe,CAAC,IAAI,CAAC,CAAA;QAChD,MAAM,IAAI,CAAC,0BAA0B,CAAC,MAAM,CAAC,CAAA;QAC7C,OAAO,MAAM,CAAA;IACf,CAAC;IAED,wEAAwE;IACxE,4FAA4F;IAC5F,oGAAoG;IAC1F,KAAK,CAAC,0BAA0B,CACxC,MAAqB;QAErB,IAAI,CAAC,IAAI,CAAC,oBAAoB,EAAE;YAAE,OAAM;QACxC,IAAI,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,KAAK,WAAW;YAAE,OAAM;QAErD,MAAM,YAAY,GAAG,IAAI,CACvB,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,GAAG,EAChC,oBAAoB,CACrB,CAAA;QACD,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,YAAY,EAAE,IAAI,CAAC,MAAM,CAAC,CAAA;QAC1D,IAAI,CAAC,MAAM;YAAE,OAAM;QAEnB,MAAM,mBAAmB,GAAG,MAAM,WAAW,CAC3C,iBAAiB,EACjB,YAAY,EACZ,IAAI,CAAC,MAAM,CACZ,CAAA;QACD,KAAK,MAAM,iBAAiB,IAAI,mBAAmB,EAAE,CAAC;YACpD,IAAI,CAAC,wBAAwB,CAAC,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAA;QACjE,CAAC;IACH,CAAC;CACF"}

package/lib/service/decomposedHandler.d.ts

@@ -1,7 +1,8 @@
 import type { HandlerResult } from '../types/handlerResult.js';
+import type ChangeSet from '../utils/changeSet.js';
 import StandardHandler from './standardHandler.js';
 export default class DecomposedHandler extends StandardHandler {
-    collectAddition(): Promise<HandlerResult>;
+    collectAddition(sink?: ChangeSet): Promise<HandlerResult>;
     protected _collectParentCopies(copies: import('../types/handlerResult.js').CopyOperation[]): void;
     protected _getElementName(): string;
     protected getParentName(): string;

package/lib/service/decomposedHandler.js

@@ -3,8 +3,8 @@ import { dirname, join } from 'node:path/posix';
 import { METAFILE_SUFFIX } from '../constant/metadataConstants.js';
 import StandardHandler from './standardHandler.js';
 export default class DecomposedHandler extends StandardHandler {
-    async collectAddition() {
-        const result = await super.collectAddition();
+    async collectAddition(sink) {
+        const result = await super.collectAddition(sink);
         this._collectParentCopies(result.copies);
         return result;
     }

package/lib/service/decomposedHandler.js.map

@@ -1 +1 @@
-{"version":3,"file":"decomposedHandler.js","sourceRoot":"","sources":["../../src/service/decomposedHandler.ts"],"names":[],"mappings":"AAAA,YAAY,CAAA;AACZ,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAA;AAE/C,OAAO,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAA;AAElE,OAAO,eAAe,MAAM,sBAAsB,CAAA;AAElD,MAAM,CAAC,OAAO,OAAO,iBAAkB,SAAQ,eAAe;IAC5C,KAAK,CAAC,eAAe;QACnC,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,eAAe,EAAE,CAAA;QAC5C,IAAI,CAAC,oBAAoB,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;QACxC,OAAO,MAAM,CAAA;IACf,CAAC;IAES,oBAAoB,CAC5B,MAA2D;QAE3D,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,CAAA;QAC/C,IAAI,CAAC,UAAU,EAAE,MAAM;YAAE,OAAM;QAE/B,MAAM,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAA;QAC7D,MAAM,cAAc,GAAG,IAAI,CAAC,aAAa,EAAE,CAAA;QAC3C,MAAM,gBAAgB,GAAG,UAAU,CAAC,MAAM,CAAA;QAC1C,MAAM,UAAU,GAAG,IAAI,CACrB,aAAa,EACb,GAAG,cAAc,IAAI,gBAAgB,GAAG,eAAe,EAAE,CAC1D,CAAA;QACD,IAAI,CAAC,wBAAwB,CAAC,MAAM,EAAE,UAAU,CAAC,CAAA;IACnD,CAAC;IAEkB,eAAe;QAChC,MAAM,gBAAgB,GAAG,IAAI,CAAC,aAAa,EAAE,CAAA;QAC7C,MAAM,WAAW,GAAG,KAAK,CAAC,eAAe,EAAE,CAAA;QAC3C,OAAO,GAAG,gBAAgB,IAAI,WAAW,EAAE,CAAA;IAC7C,CAAC;IAES,aAAa;QACrB,OAAO,IAAI,CAAC,OAAO,CAAC,UAAU,CAAA;IAChC,CAAC;CACF"}
+{"version":3,"file":"decomposedHandler.js","sourceRoot":"","sources":["../../src/service/decomposedHandler.ts"],"names":[],"mappings":"AAAA,YAAY,CAAA;AACZ,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAA;AAC/C,OAAO,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAA;AAGlE,OAAO,eAAe,MAAM,sBAAsB,CAAA;AAElD,MAAM,CAAC,OAAO,OAAO,iBAAkB,SAAQ,eAAe;IAC5C,KAAK,CAAC,eAAe,CACnC,IAAgB;QAEhB,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,eAAe,CAAC,IAAI,CAAC,CAAA;QAChD,IAAI,CAAC,oBAAoB,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;QACxC,OAAO,MAAM,CAAA;IACf,CAAC;IAES,oBAAoB,CAC5B,MAA2D;QAE3D,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,CAAA;QAC/C,IAAI,CAAC,UAAU,EAAE,MAAM;YAAE,OAAM;QAE/B,MAAM,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAA;QAC7D,MAAM,cAAc,GAAG,IAAI,CAAC,aAAa,EAAE,CAAA;QAC3C,MAAM,gBAAgB,GAAG,UAAU,CAAC,MAAM,CAAA;QAC1C,MAAM,UAAU,GAAG,IAAI,CACrB,aAAa,EACb,GAAG,cAAc,IAAI,gBAAgB,GAAG,eAAe,EAAE,CAC1D,CAAA;QACD,IAAI,CAAC,wBAAwB,CAAC,MAAM,EAAE,UAAU,CAAC,CAAA;IACnD,CAAC;IAEkB,eAAe;QAChC,MAAM,gBAAgB,GAAG,IAAI,CAAC,aAAa,EAAE,CAAA;QAC7C,MAAM,WAAW,GAAG,KAAK,CAAC,eAAe,EAAE,CAAA;QAC3C,OAAO,GAAG,gBAAgB,IAAI,WAAW,EAAE,CAAA;IAC7C,CAAC;IAES,aAAa;QACrB,OAAO,IAAI,CAAC,OAAO,CAAC,UAAU,CAAA;IAChC,CAAC;CACF"}

package/lib/service/diffLineInterpreter.d.ts

@@ -5,7 +5,7 @@ export default class DiffLineInterpreter {
     protected readonly work: Work;
     protected readonly metadata: MetadataRepository;
     constructor(work: Work, metadata: MetadataRepository);
-    process(lines: string[], revisions?: {
+    process(lines: Iterable<string> | AsyncIterable<string>, revisions?: {
         from: string;
         to: string;
     }): Promise<HandlerResult>;

package/lib/service/diffLineInterpreter.js

@@ -1,7 +1,8 @@
 'use strict';
 import { __decorate } from "tslib";
 import { queue } from 'async';
-import { emptyResult, mergeResults } from '../types/handlerResult.js';
+import { pushAll } from '../utils/arrayUtils.js';
+import ChangeSet from '../utils/changeSet.js';
 import { getConcurrencyThreshold } from '../utils/concurrencyUtils.js';
 import { log } from '../utils/LoggingDecorator.js';
 import TypeHandlerFactory from './typeHandlerFactory.js';
@@ -17,20 +18,29 @@ export default class DiffLineInterpreter {
             ? { ...this.work, config: { ...this.work.config, ...revisions } }
             : this.work;
         const typeHandlerFactory = new TypeHandlerFactory(effectiveWork, this.metadata);
-        const results = [];
+        // Single ChangeSet shared by every handler in this pass — eliminates the
+        // per-handler ChangeSet allocation and the merge step that used to fold
+        // ~N small ChangeSets together at the end.
+        const sink = new ChangeSet();
+        const copies = [];
+        const warnings = [];
         const MAX_PARALLELISM = getConcurrencyThreshold();
         const processor = queue(async (handler) => {
-            const result = await handler.collect();
-            results.push(result);
+            const result = await handler.collect(sink);
+            pushAll(copies, result.copies);
+            pushAll(warnings, result.warnings);
         }, MAX_PARALLELISM);
-        for (const line of lines) {
+        // `for await…of` iterates both Iterable and AsyncIterable so handlers
+        // start executing as soon as the first line lands — no need to
+        // materialize the whole diff first.
+        for await (const line of lines) {
             const handler = await typeHandlerFactory.getTypeHandler(line);
             processor.push(handler);
         }
         if (!processor.idle()) {
             await processor.drain();
         }
-        return results.length > 0 ? mergeResults(...results) : emptyResult();
+        return { changes: sink, copies, warnings };
     }
 }
 __decorate([

package/lib/service/diffLineInterpreter.js.map

@@ -1 +1 @@
-{"version":3,"file":"diffLineInterpreter.js","sourceRoot":"","sources":["../../src/service/diffLineInterpreter.ts"],"names":[],"mappings":"AAAA,YAAY,CAAA;;AACZ,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAA;AAI7B,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AAErE,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAA;AACtE,OAAO,EAAE,GAAG,EAAE,MAAM,8BAA8B,CAAA;AAElD,OAAO,kBAAkB,MAAM,yBAAyB,CAAA;AAExD,MAAM,CAAC,OAAO,OAAO,mBAAmB;IAEjB;IACA;IAFrB,YACqB,IAAU,EACV,QAA4B;QAD5B,SAAI,GAAJ,IAAI,CAAM;QACV,aAAQ,GAAR,QAAQ,CAAoB;IAC9C,CAAC;IAGS,AAAN,KAAK,CAAC,OAAO,CAClB,KAAe,EACf,SAAwC;QAExC,MAAM,aAAa,GAAG,SAAS;YAC7B,CAAC,CAAC,EAAE,GAAG,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,SAAS,EAAE,EAAE;YACjE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAA;QAEb,MAAM,kBAAkB,GAAG,IAAI,kBAAkB,CAC/C,aAAa,EACb,IAAI,CAAC,QAAQ,CACd,CAAA;QACD,MAAM,OAAO,GAAoB,EAAE,CAAA;QACnC,MAAM,eAAe,GAAG,uBAAuB,EAAE,CAAA;QAEjD,MAAM,SAAS,GAAG,KAAK,CAAC,KAAK,EAAE,OAAwB,EAAE,EAAE;YACzD,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,OAAO,EAAE,CAAA;YACtC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QACtB,CAAC,EAAE,eAAe,CAAC,CAAA;QAEnB,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YACzB,MAAM,OAAO,GAAG,MAAM,kBAAkB,CAAC,cAAc,CAAC,IAAI,CAAC,CAAA;YAC7D,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;QACzB,CAAC;QAED,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,EAAE,CAAC;YACtB,MAAM,SAAS,CAAC,KAAK,EAAE,CAAA;QACzB,CAAC;QAED,OAAO,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAA;IACtE,CAAC;CACF;AA/Bc;IADZ,GAAG;kDA+BH"}
+{"version":3,"file":"diffLineInterpreter.js","sourceRoot":"","sources":["../../src/service/diffLineInterpreter.ts"],"names":[],"mappings":"AAAA,YAAY,CAAA;;AACZ,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAA;AAK7B,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAA;AAChD,OAAO,SAAS,MAAM,uBAAuB,CAAA;AAC7C,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAA;AACtE,OAAO,EAAE,GAAG,EAAE,MAAM,8BAA8B,CAAA;AAElD,OAAO,kBAAkB,MAAM,yBAAyB,CAAA;AAExD,MAAM,CAAC,OAAO,OAAO,mBAAmB;IAEjB;IACA;IAFrB,YACqB,IAAU,EACV,QAA4B;QAD5B,SAAI,GAAJ,IAAI,CAAM;QACV,aAAQ,GAAR,QAAQ,CAAoB;IAC9C,CAAC;IAGS,AAAN,KAAK,CAAC,OAAO,CAClB,KAA+C,EAC/C,SAAwC;QAExC,MAAM,aAAa,GAAG,SAAS;YAC7B,CAAC,CAAC,EAAE,GAAG,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,SAAS,EAAE,EAAE;YACjE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAA;QAEb,MAAM,kBAAkB,GAAG,IAAI,kBAAkB,CAC/C,aAAa,EACb,IAAI,CAAC,QAAQ,CACd,CAAA;QACD,yEAAyE;QACzE,wEAAwE;QACxE,2CAA2C;QAC3C,MAAM,IAAI,GAAG,IAAI,SAAS,EAAE,CAAA;QAC5B,MAAM,MAAM,GAAoB,EAAE,CAAA;QAClC,MAAM,QAAQ,GAAY,EAAE,CAAA;QAC5B,MAAM,eAAe,GAAG,uBAAuB,EAAE,CAAA;QAEjD,MAAM,SAAS,GAAG,KAAK,CAAC,KAAK,EAAE,OAAwB,EAAE,EAAE;YACzD,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;YAC1C,OAAO,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,CAAA;YAC9B,OAAO,CAAC,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAA;QACpC,CAAC,EAAE,eAAe,CAAC,CAAA;QAEnB,sEAAsE;QACtE,+DAA+D;QAC/D,oCAAoC;QACpC,IAAI,KAAK,EAAE,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YAC/B,MAAM,OAAO,GAAG,MAAM,kBAAkB,CAAC,cAAc,CAAC,IAAI,CAAC,CAAA;YAC7D,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;QACzB,CAAC;QAED,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,EAAE,CAAC;YACtB,MAAM,SAAS,CAAC,KAAK,EAAE,CAAA;QACzB,CAAC;QAED,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAA;IAC5C,CAAC;CACF;AAxCc;IADZ,GAAG;kDAwCH"}

package/lib/service/flowHandler.d.ts

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

package/lib/service/flowHandler.js

@@ -2,8 +2,8 @@
 import { MessageService } from '../utils/MessageService.js';
 import StandardHandler from './standardHandler.js';
 export default class FlowHandler extends StandardHandler {
-    async collectDeletion() {
-        const result = await super.collectDeletion();
+    async collectDeletion(sink) {
+        const result = await super.collectDeletion(sink);
         const message = new MessageService();
         result.warnings.push(new Error(message.getMessage('warning.FlowDeleted', [this._getElementName()])));
         return result;

package/lib/service/flowHandler.js.map

@@ -1 +1 @@
-{"version":3,"file":"flowHandler.js","sourceRoot":"","sources":["../../src/service/flowHandler.ts"],"names":[],"mappings":"AAAA,YAAY,CAAA;AAGZ,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAA;AAC3D,OAAO,eAAe,MAAM,sBAAsB,CAAA;AAElD,MAAM,CAAC,OAAO,OAAO,WAAY,SAAQ,eAAe;IACtC,KAAK,CAAC,eAAe;QACnC,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,eAAe,EAAE,CAAA;QAC5C,MAAM,OAAO,GAAG,IAAI,cAAc,EAAE,CAAA;QACpC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAClB,IAAI,KAAK,CACP,OAAO,CAAC,UAAU,CAAC,qBAAqB,EAAE,CAAC,IAAI,CAAC,eAAe,EAAE,CAAC,CAAC,CACpE,CACF,CAAA;QACD,OAAO,MAAM,CAAA;IACf,CAAC;CACF"}
+{"version":3,"file":"flowHandler.js","sourceRoot":"","sources":["../../src/service/flowHandler.ts"],"names":[],"mappings":"AAAA,YAAY,CAAA;AAIZ,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAA;AAC3D,OAAO,eAAe,MAAM,sBAAsB,CAAA;AAElD,MAAM,CAAC,OAAO,OAAO,WAAY,SAAQ,eAAe;IACtC,KAAK,CAAC,eAAe,CACnC,IAAgB;QAEhB,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,eAAe,CAAC,IAAI,CAAC,CAAA;QAChD,MAAM,OAAO,GAAG,IAAI,cAAc,EAAE,CAAA;QACpC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAClB,IAAI,KAAK,CACP,OAAO,CAAC,UAAU,CAAC,qBAAqB,EAAE,CAAC,IAAI,CAAC,eAAe,EAAE,CAAC,CAAC,CACpE,CACF,CAAA;QACD,OAAO,MAAM,CAAA;IACf,CAAC;CACF"}

package/lib/service/inFileHandler.d.ts

@@ -1,17 +1,18 @@
-import type { HandlerResult, ManifestElement } from '../types/handlerResult.js';
+import type { AddKind, HandlerResult } from '../types/handlerResult.js';
 import { ManifestTarget } from '../types/handlerResult.js';
 import type { Work } from '../types/work.js';
-import MetadataDiff from '../utils/metadataDiff.js';
+import type ChangeSet from '../utils/changeSet.js';
+import MetadataDiff from '../utils/metadataDiff/index.js';
 import type { MetadataElement } from '../utils/metadataElement.js';
 import StandardHandler from './standardHandler.js';
 export default class InFileHandler extends StandardHandler {
     protected readonly metadataDiff: MetadataDiff;
     constructor(changeType: string, element: MetadataElement, work: Work);
-    collectAddition(): Promise<HandlerResult>;
-    collectDeletion(): Promise<HandlerResult>;
-    collectModification(): Promise<HandlerResult>;
-    protected _collectCompareResult(): Promise<HandlerResult>;
-    protected _collectManifestFromComparison(manifests: ManifestElement[], target: ManifestTarget, entries: {
+    collectAddition(sink?: ChangeSet): Promise<HandlerResult>;
+    collectDeletion(sink?: ChangeSet): Promise<HandlerResult>;
+    collectModification(sink?: ChangeSet): Promise<HandlerResult>;
+    protected _collectCompareResult(sink?: ChangeSet): Promise<HandlerResult>;
+    protected _collectManifestFromComparison(changes: ChangeSet, target: ManifestTarget, changeKind: AddKind, entries: {
         type: string;
         member: string;
     }[]): void;

package/lib/service/inFileHandler.js

@@ -2,12 +2,11 @@
 import { basename } from 'node:path/posix';
 import { DOT } from '../constant/fsConstants.js';
 import { isPackable } from '../metadata/metadataManager.js';
-import { emptyResult, ManifestTarget } from '../types/handlerResult.js';
-import { pushAll } from '../utils/arrayUtils.js';
+import { ChangeKind, CopyOperationKind, emptyResult, ManifestTarget, } from '../types/handlerResult.js';
 import { wrapError } from '../utils/errorUtils.js';
 import { Logger, lazy } from '../utils/LoggingService.js';
 import { MessageService } from '../utils/MessageService.js';
-import MetadataDiff from '../utils/metadataDiff.js';
+import MetadataDiff from '../utils/metadataDiff/index.js';
 import StandardHandler from './standardHandler.js';
 const getRootType = (line) => basename(line).split(DOT)[0];
 export default class InFileHandler extends StandardHandler {
@@ -17,36 +16,45 @@ export default class InFileHandler extends StandardHandler {
         const inFileMetadata = element.getInFileAttributes();
         this.metadataDiff = new MetadataDiff(this.config, inFileMetadata);
     }
-    async collectAddition() {
-        return await this._collectCompareResult();
+    async collectAddition(sink) {
+        return await this._collectCompareResult(sink);
     }
-    async collectDeletion() {
+    async collectDeletion(sink) {
         if (this._shouldTreatDeletionAsDeletion()) {
-            return await super.collectDeletion();
+            return await super.collectDeletion(sink);
         }
-        return await this.collectAddition();
+        return await this.collectAddition(sink);
     }
-    async collectModification() {
-        return await this.collectAddition();
+    async collectModification(sink) {
+        return await this.collectAddition(sink);
     }
-    async _collectCompareResult() {
+    async _collectCompareResult(sink) {
         try {
-            const result = emptyResult();
-            const { added, deleted, toContent, fromContent } = await this.metadataDiff.compare(this.element.basePath);
-            this._collectManifestFromComparison(result.manifests, ManifestTarget.DestructiveChanges, deleted);
-            this._collectManifestFromComparison(result.manifests, ManifestTarget.Package, added);
-            const { xmlContent, isEmpty } = this.metadataDiff.prune(toContent, fromContent);
+            const result = this._emptyResultFor(sink);
+            const outcome = await this.metadataDiff.run(this.element.basePath);
+            this._collectManifestFromComparison(result.changes, ManifestTarget.DestructiveChanges, ChangeKind.Delete, outcome.manifests.deleted);
+            this._collectManifestFromComparison(result.changes, ManifestTarget.Package, ChangeKind.Add, outcome.manifests.added);
+            this._collectManifestFromComparison(result.changes, ManifestTarget.Package, ChangeKind.Modify, outcome.manifests.modified);
             // RATIONALE: Why include root component in package.xml for InFile sub-elements?
             // InFile elements are not independently deployable; the root component must be listed.
+            // The container is added only when there are surviving children to deploy (i.e.
+            // adds or modifications). Delete-only changes go to destructiveChanges.xml; their
+            // parent must NOT be re-listed in package.xml because there is nothing to deploy.
             // See: https://github.com/scolladon/sfdx-git-delta/wiki/Metadata-Specificities#infile-elements
-            if (this._shouldTreatContainerType(isEmpty)) {
-                const containerResult = await StandardHandler.prototype.collectAddition.call(this);
-                pushAll(result.manifests, containerResult.manifests);
+            const fileIsEmpty = outcome.isEmpty ?? !outcome.hasAnyChanges;
+            if (this._shouldTreatContainerType(fileIsEmpty)) {
+                const containerResult = await StandardHandler.prototype.collectAddition.call(this, sink);
+                result.changes.merge(containerResult.changes);
             }
-            // Separate from _shouldTreatContainerType: subclasses (e.g. CustomLabelHandler)
-            // may disable container manifests while still needing computed content
-            if (!isEmpty) {
-                this._collectComputedContent(result.copies, this.element.basePath, xmlContent);
+            // run() already gated the writer on generateDelta + hasAnyChanges.
+            // Subclasses like CustomLabelHandler may still veto via
+            // _shouldCollectCopies.
+            if (outcome.writer && this._shouldCollectCopies()) {
+                result.copies.push({
+                    kind: CopyOperationKind.StreamedContent,
+                    path: this.element.basePath,
+                    writer: outcome.writer,
+                });
             }
             return result;
         }
@@ -58,20 +66,19 @@ export default class InFileHandler extends StandardHandler {
                 this.config.to,
             ]);
             Logger.warn(lazy `${message}`);
-            return {
-                manifests: [],
-                copies: [],
-                warnings: [wrapError(message, error)],
-            };
+            const failed = emptyResult();
+            failed.warnings.push(wrapError(message, error));
+            return failed;
         }
     }
-    _collectManifestFromComparison(manifests, target, entries) {
+    _collectManifestFromComparison(changes, target, changeKind, entries) {
         for (const { type, member } of entries) {
             if (isPackable(type)) {
-                manifests.push({
+                changes.addElement({
                     target,
                     type,
                     member: `${this._getQualifiedName()}${member}`,
+                    changeKind,
                 });
             }
         }

package/lib/service/inFileHandler.js.map

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

package/lib/service/inFolderHandler.d.ts

@@ -1,7 +1,8 @@
 import type { HandlerResult } from '../types/handlerResult.js';
+import type ChangeSet from '../utils/changeSet.js';
 import StandardHandler from './standardHandler.js';
 export default class InFolderHandler extends StandardHandler {
-    collectAddition(): Promise<HandlerResult>;
+    collectAddition(sink?: ChangeSet): Promise<HandlerResult>;
     protected _collectFolderMetaCopies(copies: import('../types/handlerResult.js').CopyOperation[]): void;
     protected _collectSpecialExtensionCopies(copies: import('../types/handlerResult.js').CopyOperation[]): Promise<void>;
     protected _getElementName(): string;

package/lib/service/inFolderHandler.js

@@ -6,8 +6,8 @@ import { readDirs } from '../utils/fsHelper.js';
 import StandardHandler from './standardHandler.js';
 const INFOLDER_SUFFIX_REGEX = new RegExp(`${INFOLDER_SUFFIX}$`);
 export default class InFolderHandler extends StandardHandler {
-    async collectAddition() {
-        const result = await super.collectAddition();
+    async collectAddition(sink) {
+        const result = await super.collectAddition(sink);
         this._collectFolderMetaCopies(result.copies);
         await this._collectSpecialExtensionCopies(result.copies);
         return result;

package/lib/service/inFolderHandler.js.map

@@ -1 +1 @@
-{"version":3,"file":"inFolderHandler.js","sourceRoot":"","sources":["../../src/service/inFolderHandler.ts"],"names":[],"mappings":"AAAA,YAAY,CAAA;AACZ,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAA;AAE7C,OAAO,EAAE,sBAAsB,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAA;AAC7E,OAAO,EACL,eAAe,EACf,UAAU,EACV,eAAe,GAChB,MAAM,kCAAkC,CAAA;AAEzC,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAA;AAC/C,OAAO,eAAe,MAAM,sBAAsB,CAAA;AAElD,MAAM,qBAAqB,GAAG,IAAI,MAAM,CAAC,GAAG,eAAe,GAAG,CAAC,CAAA;AAC/D,MAAM,CAAC,OAAO,OAAO,eAAgB,SAAQ,eAAe;IAC1C,KAAK,CAAC,eAAe;QACnC,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,eAAe,EAAE,CAAA;QAC5C,IAAI,CAAC,wBAAwB,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;QAC5C,MAAM,IAAI,CAAC,8BAA8B,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;QACxD,OAAO,MAAM,CAAA;IACf,CAAC;IAES,wBAAwB,CAChC,MAA2D;QAE3D,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAA;QACjD,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAA;QAEhD,MAAM,MAAM,GAAG,UAAU,CAAC,QAAQ,CAAC,eAAe,CAAC;YACjD,CAAC,CAAC,EAAE;YACJ,CAAC,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAO,CAAC,WAAW,EAAE,EAAE,CAAA;QAEjD,MAAM,cAAc,GAAG,GAAG,UAAU,GAAG,MAAM,GAAG,eAAe,EAAE,CAAA;QACjE,IAAI,CAAC,wBAAwB,CAAC,MAAM,EAAE,IAAI,CAAC,UAAU,EAAE,cAAc,CAAC,CAAC,CAAA;IACzE,CAAC;IAES,KAAK,CAAC,8BAA8B,CAC5C,MAA2D;QAE3D,IAAI,CAAC,IAAI,CAAC,oBAAoB,EAAE;YAAE,OAAM;QACxC,MAAM,UAAU,GAAG,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;QAC/C,MAAM,UAAU,GAAG,MAAM,QAAQ,CAAC,UAAU,CAAC,GAAG,EAAE,IAAI,CAAC,MAAM,CAAC,CAAA;QAE9D,KAAK,MAAM,IAAI,IAAI,UAAU,EAAE,CAAC;YAC9B,IAAI,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;gBACnC,IAAI,CAAC,wBAAwB,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;YAC7C,CAAC;QACH,CAAC;IACH,CAAC;IAEkB,eAAe;QAChC,OAAO,IAAI,CAAC,OAAO,CAAC,aAAa;aAC9B,IAAI,CAAC,QAAQ,CAAC;aACd,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC;aACvB,OAAO,CAAC,qBAAqB,EAAE,EAAE,CAAC;aAClC,OAAO,CAAC,sBAAsB,EAAE,EAAE,CAAC,CAAA;IACxC,CAAC;IAEkB,cAAc;QAC/B,OAAO,CACL,KAAK,CAAC,cAAc,EAAE;YACtB,IAAI,CAAC,yBAAyB,EAAE;YAChC,IAAI,CAAC,OAAO,CAAC,SAAU,CAAC,QAAQ,CAAC,eAAe,CAAC,CAClD,CAAA;IACH,CAAC;CACF"}
+{"version":3,"file":"inFolderHandler.js","sourceRoot":"","sources":["../../src/service/inFolderHandler.ts"],"names":[],"mappings":"AAAA,YAAY,CAAA;AACZ,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAA;AAC7C,OAAO,EAAE,sBAAsB,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAA;AAC7E,OAAO,EACL,eAAe,EACf,UAAU,EACV,eAAe,GAChB,MAAM,kCAAkC,CAAA;AAGzC,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAA;AAC/C,OAAO,eAAe,MAAM,sBAAsB,CAAA;AAElD,MAAM,qBAAqB,GAAG,IAAI,MAAM,CAAC,GAAG,eAAe,GAAG,CAAC,CAAA;AAC/D,MAAM,CAAC,OAAO,OAAO,eAAgB,SAAQ,eAAe;IAC1C,KAAK,CAAC,eAAe,CACnC,IAAgB;QAEhB,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,eAAe,CAAC,IAAI,CAAC,CAAA;QAChD,IAAI,CAAC,wBAAwB,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;QAC5C,MAAM,IAAI,CAAC,8BAA8B,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;QACxD,OAAO,MAAM,CAAA;IACf,CAAC;IAES,wBAAwB,CAChC,MAA2D;QAE3D,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAA;QACjD,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAA;QAEhD,MAAM,MAAM,GAAG,UAAU,CAAC,QAAQ,CAAC,eAAe,CAAC;YACjD,CAAC,CAAC,EAAE;YACJ,CAAC,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAO,CAAC,WAAW,EAAE,EAAE,CAAA;QAEjD,MAAM,cAAc,GAAG,GAAG,UAAU,GAAG,MAAM,GAAG,eAAe,EAAE,CAAA;QACjE,IAAI,CAAC,wBAAwB,CAAC,MAAM,EAAE,IAAI,CAAC,UAAU,EAAE,cAAc,CAAC,CAAC,CAAA;IACzE,CAAC;IAES,KAAK,CAAC,8BAA8B,CAC5C,MAA2D;QAE3D,IAAI,CAAC,IAAI,CAAC,oBAAoB,EAAE;YAAE,OAAM;QACxC,MAAM,UAAU,GAAG,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;QAC/C,MAAM,UAAU,GAAG,MAAM,QAAQ,CAAC,UAAU,CAAC,GAAG,EAAE,IAAI,CAAC,MAAM,CAAC,CAAA;QAE9D,KAAK,MAAM,IAAI,IAAI,UAAU,EAAE,CAAC;YAC9B,IAAI,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;gBACnC,IAAI,CAAC,wBAAwB,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;YAC7C,CAAC;QACH,CAAC;IACH,CAAC;IAEkB,eAAe;QAChC,OAAO,IAAI,CAAC,OAAO,CAAC,aAAa;aAC9B,IAAI,CAAC,QAAQ,CAAC;aACd,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC;aACvB,OAAO,CAAC,qBAAqB,EAAE,EAAE,CAAC;aAClC,OAAO,CAAC,sBAAsB,EAAE,EAAE,CAAC,CAAA;IACxC,CAAC;IAEkB,cAAc;QAC/B,OAAO,CACL,KAAK,CAAC,cAAc,EAAE;YACtB,IAAI,CAAC,yBAAyB,EAAE;YAChC,IAAI,CAAC,OAAO,CAAC,SAAU,CAAC,QAAQ,CAAC,eAAe,CAAC,CAClD,CAAA;IACH,CAAC;CACF"}

package/lib/service/inResourceHandler.d.ts

@@ -1,9 +1,10 @@
 import type { HandlerResult } from '../types/handlerResult.js';
+import type ChangeSet from '../utils/changeSet.js';
 import StandardHandler from './standardHandler.js';
 export default class ResourceHandler extends StandardHandler {
     protected metadataName: string | undefined;
-    collectAddition(): Promise<HandlerResult>;
-    collectDeletion(): Promise<HandlerResult>;
+    collectAddition(sink?: ChangeSet): Promise<HandlerResult>;
+    collectDeletion(sink?: ChangeSet): Promise<HandlerResult>;
     protected _collectResourceCopies(copies: import('../types/handlerResult.js').CopyOperation[]): Promise<void>;
     protected _getElementName(): string;
     protected _isProcessable(): boolean;

package/lib/service/inResourceHandler.js

@@ -8,20 +8,20 @@ const escapeRegex = (value) => value.replace(REGEX_SPECIAL_CHARS, '\\$&');
 const resourceRegexCache = new Map();
 export default class ResourceHandler extends StandardHandler {
     metadataName;
-    async collectAddition() {
+    async collectAddition(sink) {
         this.metadataName = this._getMetadataName();
-        const result = await super.collectAddition();
+        const result = await super.collectAddition(sink);
         await this._collectResourceCopies(result.copies);
         return result;
     }
-    async collectDeletion() {
+    async collectDeletion(sink) {
         this.metadataName = this._getMetadataName();
         const componentPath = this.metadataName;
         const exists = await pathExists(componentPath, this.config);
         if (exists) {
-            return await this.collectModification();
+            return await this.collectModification(sink);
         }
-        return await super.collectDeletion();
+        return await super.collectDeletion(sink);
     }
     async _collectResourceCopies(copies) {
         if (!this._shouldCollectCopies())

package/lib/service/inResourceHandler.js.map

@@ -1 +1 @@
-{"version":3,"file":"inResourceHandler.js","sourceRoot":"","sources":["../../src/service/inResourceHandler.ts"],"names":[],"mappings":"AAAA,YAAY,CAAA;AAEZ,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAA;AAC1D,OAAO,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAA;AAElE,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAA;AAC3D,OAAO,eAAe,MAAM,sBAAsB,CAAA;AAElD,MAAM,mBAAmB,GAAG,qBAAqB,CAAA;AACjD,MAAM,WAAW,GAAG,CAAC,KAAa,EAAU,EAAE,CAC5C,KAAK,CAAC,OAAO,CAAC,mBAAmB,EAAE,MAAM,CAAC,CAAA;AAC5C,MAAM,kBAAkB,GAAG,IAAI,GAAG,EAAkB,CAAA;AAEpD,MAAM,CAAC,OAAO,OAAO,eAAgB,SAAQ,eAAe;IAChD,YAAY,CAAoB;IAE1B,KAAK,CAAC,eAAe;QACnC,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,gBAAgB,EAAE,CAAA;QAC3C,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,eAAe,EAAE,CAAA;QAC5C,MAAM,IAAI,CAAC,sBAAsB,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;QAChD,OAAO,MAAM,CAAA;IACf,CAAC;IAEe,KAAK,CAAC,eAAe;QACnC,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,gBAAgB,EAAE,CAAA;QAC3C,MAAM,aAAa,GAAG,IAAI,CAAC,YAAa,CAAA;QACxC,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,aAAa,EAAE,IAAI,CAAC,MAAM,CAAC,CAAA;QAC3D,IAAI,MAAM,EAAE,CAAC;YACX,OAAO,MAAM,IAAI,CAAC,mBAAmB,EAAE,CAAA;QACzC,CAAC;QACD,OAAO,MAAM,KAAK,CAAC,eAAe,EAAE,CAAA;IACtC,CAAC;IAES,KAAK,CAAC,sBAAsB,CACpC,MAA2D;QAE3D,IAAI,CAAC,IAAI,CAAC,oBAAoB,EAAE;YAAE,OAAM;QAExC,MAAM,kBAAkB,GAAG,IAAI,CAAC,YAAa,CAAC,SAAS,CACrD,CAAC,EACD,IAAI,CAAC,YAAa,CAAC,WAAW,CAAC,QAAQ,CAAC,CACzC,CAAA;QACD,MAAM,kBAAkB,GAAG,MAAM,QAAQ,CAAC,kBAAkB,EAAE,IAAI,CAAC,MAAM,CAAC,CAAA;QAE1E,MAAM,QAAQ,GAAG,IAAI,CAAC,YAAa,CAAA;QACnC,IAAI,sBAAsB,GAAG,kBAAkB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;QAC7D,IAAI,CAAC,sBAAsB,EAAE,CAAC;YAC5B,sBAAsB,GAAG,IAAI,MAAM,CACjC,GAAG,WAAW,CAAC,QAAQ,CAAC,IAAI,QAAQ,GAAG,GAAG,GAAG,CAC9C,CAAA;YACD,kBAAkB,CAAC,GAAG,CAAC,QAAQ,EAAE,sBAAsB,CAAC,CAAA;QAC1D,CAAC;QACD,MAAM,aAAa,GAAG,kBAAkB,CAAC,MAAM,CAAC,CAAC,IAAY,EAAE,EAAE,CAC/D,sBAAuB,CAAC,IAAI,CAAC,IAAI,CAAC,CACnC,CAAA;QACD,KAAK,MAAM,YAAY,IAAI,aAAa,EAAE,CAAC;YACzC,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,YAAY,CAAC,CAAA;QACzC,CAAC;IACH,CAAC;IAEkB,eAAe;QAChC,OAAO,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,MAAM,GAAG,CAAC;YAC1C,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC;YAC/B,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,aAAa,CAAA;IAChC,CAAC;IAEkB,cAAc;QAC/B,OAAO,IAAI,CAAA;IACb,CAAC;IAES,gBAAgB;QACxB,OAAO,IAAI,CAAC,OAAO,CAAC,aAAa,CAAA;IACnC,CAAC;IAEkB,oBAAoB;QACrC,OAAO,GAAG,IAAI,CAAC,YAAY,IAAI,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,GAAG,eAAe,EAAE,CAAA;IAC7E,CAAC;IAEkB,mBAAmB;QACpC,OAAO,IAAI,CAAA;IACb,CAAC;CACF"}
+{"version":3,"file":"inResourceHandler.js","sourceRoot":"","sources":["../../src/service/inResourceHandler.ts"],"names":[],"mappings":"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"}

package/lib/service/objectTranslationHandler.d.ts

@@ -1,9 +1,9 @@
 import type { HandlerResult } from '../types/handlerResult.js';
-import { type PrunedContent } from '../utils/metadataDiff.js';
+import type ChangeSet from '../utils/changeSet.js';
 import ResourceHandler from './inResourceHandler.js';
 export default class ObjectTranslationHandler extends ResourceHandler {
-    collectAddition(): Promise<HandlerResult>;
-    protected _getObjectTranslationContent(path: string): Promise<PrunedContent>;
+    collectAddition(sink?: ChangeSet): Promise<HandlerResult>;
+    protected _getObjectTranslationWriter(path: string): Promise<((out: import("node:stream").Writable) => Promise<void>) | undefined>;
     protected _getObjectTranslationPath(): string;
     protected _delegateFileCopy(): boolean;
     protected _getElementName(): string;

package/lib/service/objectTranslationHandler.js

@@ -2,27 +2,34 @@
 import { parse } from 'node:path/posix';
 import { PATH_SEP } from '../constant/fsConstants.js';
 import { OBJECT_TRANSLATION_META_XML_SUFFIX } from '../constant/metadataConstants.js';
-import MetadataDiff from '../utils/metadataDiff.js';
+import { CopyOperationKind } from '../types/handlerResult.js';
+import MetadataDiff from '../utils/metadataDiff/index.js';
 import ResourceHandler from './inResourceHandler.js';
 import StandardHandler from './standardHandler.js';
 export default class ObjectTranslationHandler extends ResourceHandler {
-    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 objectTranslation file even when pruned content is empty?
         // fieldTranslation elements are not deployable without their parent objectTranslation.
         // See: https://github.com/scolladon/sfdx-git-delta/wiki/Metadata-Specificities#object-translations
         const objectTranslationPath = this._getObjectTranslationPath();
-        const { xmlContent } = await this._getObjectTranslationContent(objectTranslationPath);
-        this._collectComputedContent(result.copies, objectTranslationPath, xmlContent);
+        const writer = await this._getObjectTranslationWriter(objectTranslationPath);
+        if (writer) {
+            result.copies.push({
+                kind: CopyOperationKind.StreamedContent,
+                path: objectTranslationPath,
+                writer,
+            });
+        }
         return result;
     }
-    async _getObjectTranslationContent(path) {
+    async _getObjectTranslationWriter(path) {
         const inFileMetadata = this.element.getInFileAttributes();
         const metadataDiff = new MetadataDiff(this.config, inFileMetadata);
-        const { toContent, fromContent } = await metadataDiff.compare(path);
-        return metadataDiff.prune(toContent, fromContent);
+        const outcome = await metadataDiff.run(path);
+        return outcome.writer;
     }
     _getObjectTranslationPath() {
         return `${parse(this.element.basePath).dir}${PATH_SEP}${this.element.parts[this.element.parts.length - 2]}.${OBJECT_TRANSLATION_META_XML_SUFFIX}`;

package/lib/service/objectTranslationHandler.js.map

@@ -1 +1 @@
-{"version":3,"file":"objectTranslationHandler.js","sourceRoot":"","sources":["../../src/service/objectTranslationHandler.ts"],"names":[],"mappings":"AAAA,YAAY,CAAA;AACZ,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAA;AAEvC,OAAO,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAA;AACrD,OAAO,EAAE,kCAAkC,EAAE,MAAM,kCAAkC,CAAA;AAErF,OAAO,YAAoC,MAAM,0BAA0B,CAAA;AAC3E,OAAO,eAAe,MAAM,wBAAwB,CAAA;AACpD,OAAO,eAAe,MAAM,sBAAsB,CAAA;AAElD,MAAM,CAAC,OAAO,OAAO,wBAAyB,SAAQ,eAAe;IACnD,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;QAE/C,mFAAmF;QACnF,uFAAuF;QACvF,mGAAmG;QACnG,MAAM,qBAAqB,GAAG,IAAI,CAAC,yBAAyB,EAAE,CAAA;QAC9D,MAAM,EAAE,UAAU,EAAE,GAAG,MAAM,IAAI,CAAC,4BAA4B,CAC5D,qBAAqB,CACtB,CAAA;QACD,IAAI,CAAC,uBAAuB,CAC1B,MAAM,CAAC,MAAM,EACb,qBAAqB,EACrB,UAAU,CACX,CAAA;QACD,OAAO,MAAM,CAAA;IACf,CAAC;IAES,KAAK,CAAC,4BAA4B,CAC1C,IAAY;QAEZ,MAAM,cAAc,GAAG,IAAI,CAAC,OAAO,CAAC,mBAAmB,EAAE,CAAA;QACzD,MAAM,YAAY,GAAG,IAAI,YAAY,CAAC,IAAI,CAAC,MAAM,EAAE,cAAc,CAAC,CAAA;QAClE,MAAM,EAAE,SAAS,EAAE,WAAW,EAAE,GAAG,MAAM,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;QACnE,OAAO,YAAY,CAAC,KAAK,CAAC,SAAS,EAAE,WAAW,CAAC,CAAA;IACnD,CAAC;IAES,yBAAyB;QACjC,OAAO,GAAG,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,GAAG,GAAG,QAAQ,GACnD,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAClD,IAAI,kCAAkC,EAAE,CAAA;IAC1C,CAAC;IAEkB,iBAAiB;QAClC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,kCAAkC,CAAC,CAAA;IAC5E,CAAC;IAEkB,eAAe;QAChC,OAAO,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAA;IACtC,CAAC;CACF"}
+{"version":3,"file":"objectTranslationHandler.js","sourceRoot":"","sources":["../../src/service/objectTranslationHandler.ts"],"names":[],"mappings":"AAAA,YAAY,CAAA;AACZ,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAA;AACvC,OAAO,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAA;AACrD,OAAO,EAAE,kCAAkC,EAAE,MAAM,kCAAkC,CAAA;AAErF,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAA;AAE7D,OAAO,YAAY,MAAM,gCAAgC,CAAA;AACzD,OAAO,eAAe,MAAM,wBAAwB,CAAA;AACpD,OAAO,eAAe,MAAM,sBAAsB,CAAA;AAElD,MAAM,CAAC,OAAO,OAAO,wBAAyB,SAAQ,eAAe;IACnD,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;QAE/C,mFAAmF;QACnF,uFAAuF;QACvF,mGAAmG;QACnG,MAAM,qBAAqB,GAAG,IAAI,CAAC,yBAAyB,EAAE,CAAA;QAC9D,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,2BAA2B,CAAC,qBAAqB,CAAC,CAAA;QAC5E,IAAI,MAAM,EAAE,CAAC;YACX,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC;gBACjB,IAAI,EAAE,iBAAiB,CAAC,eAAe;gBACvC,IAAI,EAAE,qBAAqB;gBAC3B,MAAM;aACP,CAAC,CAAA;QACJ,CAAC;QACD,OAAO,MAAM,CAAA;IACf,CAAC;IAES,KAAK,CAAC,2BAA2B,CAAC,IAAY;QACtD,MAAM,cAAc,GAAG,IAAI,CAAC,OAAO,CAAC,mBAAmB,EAAE,CAAA;QACzD,MAAM,YAAY,GAAG,IAAI,YAAY,CAAC,IAAI,CAAC,MAAM,EAAE,cAAc,CAAC,CAAA;QAClE,MAAM,OAAO,GAAG,MAAM,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;QAC5C,OAAO,OAAO,CAAC,MAAM,CAAA;IACvB,CAAC;IAES,yBAAyB;QACjC,OAAO,GAAG,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,GAAG,GAAG,QAAQ,GACnD,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAClD,IAAI,kCAAkC,EAAE,CAAA;IAC1C,CAAC;IAEkB,iBAAiB;QAClC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,kCAAkC,CAAC,CAAA;IAC5E,CAAC;IAEkB,eAAe;QAChC,OAAO,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAA;IACtC,CAAC;CACF"}

package/lib/service/reportingFolderHandler.d.ts

@@ -1,12 +1,16 @@
-import type { HandlerResult, ManifestElement, ManifestTarget } from '../types/handlerResult.js';
+import type { 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 InFolderHandler from './inFolderHandler.js';
 export default class ReportingFolderHandler extends InFolderHandler {
     protected readonly resolvedType: string | 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 _collectFolderMetaCopies(copies: import('../types/handlerResult.js').CopyOperation[]): void;
-    protected _collectManifestElement(target: ManifestTarget): ManifestElement;
+    getElementDescriptor(): {
+        type: string;
+        member: string;
+    };
 }

package/lib/service/reportingFolderHandler.js

@@ -10,15 +10,15 @@ export default class ReportingFolderHandler extends InFolderHandler {
         this.resolvedType = element.getSharedFolderMetadata().get(element.extension);
     }
     /* jscpd:ignore-start */
-    async collectAddition() {
+    async collectAddition(sink) {
         if (!this.resolvedType)
             return emptyResult();
-        return await super.collectAddition();
+        return await super.collectAddition(sink);
     }
-    async collectDeletion() {
+    async collectDeletion(sink) {
         if (!this.resolvedType)
             return emptyResult();
-        return await super.collectDeletion();
+        return await super.collectDeletion(sink);
     }
     /* jscpd:ignore-end */
     _collectFolderMetaCopies(copies) {
@@ -27,13 +27,12 @@ export default class ReportingFolderHandler extends InFolderHandler {
         const folderFileName = `${folderName}${METAFILE_SUFFIX}`;
         this._collectCopyWithMetaFile(copies, join(folderPath, folderFileName));
     }
-    _collectManifestElement(target) {
+    getElementDescriptor() {
         /* v8 ignore next 5 -- collectAddition/Deletion guard ensures resolvedType is set */
         if (!this.resolvedType) {
             throw new Error(`ReportingFolderHandler: resolvedType is missing for ${this.element.fullPath}`);
         }
         return {
-            target,
             type: this.resolvedType,
             member: this._getElementName(),
         };

package/lib/service/reportingFolderHandler.js.map

@@ -1 +1 @@
-{"version":3,"file":"reportingFolderHandler.js","sourceRoot":"","sources":["../../src/service/reportingFolderHandler.ts"],"names":[],"mappings":"AAAA,YAAY,CAAA;AAEZ,OAAO,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAA;AACtC,OAAO,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAA;AAMlE,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAA;AAGvD,OAAO,eAAe,MAAM,sBAAsB,CAAA;AAElD,MAAM,CAAC,OAAO,OAAO,sBAAuB,SAAQ,eAAe;IAC9C,YAAY,CAAoB;IAEnD,YAAY,UAAkB,EAAE,OAAwB,EAAE,IAAU;QAClE,KAAK,CAAC,UAAU,EAAE,OAAO,EAAE,IAAI,CAAC,CAAA;QAChC,IAAI,CAAC,YAAY,GAAG,OAAO,CAAC,uBAAuB,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,SAAS,CAAC,CAAA;IAC9E,CAAC;IAED,wBAAwB;IACR,KAAK,CAAC,eAAe;QACnC,IAAI,CAAC,IAAI,CAAC,YAAY;YAAE,OAAO,WAAW,EAAE,CAAA;QAC5C,OAAO,MAAM,KAAK,CAAC,eAAe,EAAE,CAAA;IACtC,CAAC;IAEe,KAAK,CAAC,eAAe;QACnC,IAAI,CAAC,IAAI,CAAC,YAAY;YAAE,OAAO,WAAW,EAAE,CAAA;QAC5C,OAAO,MAAM,KAAK,CAAC,eAAe,EAAE,CAAA;IACtC,CAAC;IACD,sBAAsB;IAEH,wBAAwB,CACzC,MAA2D;QAE3D,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAA;QACjD,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAA;QAChD,MAAM,cAAc,GAAG,GAAG,UAAU,GAAG,eAAe,EAAE,CAAA;QACxD,IAAI,CAAC,wBAAwB,CAAC,MAAM,EAAE,IAAI,CAAC,UAAU,EAAE,cAAc,CAAC,CAAC,CAAA;IACzE,CAAC;IAEkB,uBAAuB,CACxC,MAAsB;QAEtB,oFAAoF;QACpF,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC;YACvB,MAAM,IAAI,KAAK,CACb,uDAAuD,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,CAC/E,CAAA;QACH,CAAC;QACD,OAAO;YACL,MAAM;YACN,IAAI,EAAE,IAAI,CAAC,YAAY;YACvB,MAAM,EAAE,IAAI,CAAC,eAAe,EAAE;SAC/B,CAAA;IACH,CAAC;CACF"}
+{"version":3,"file":"reportingFolderHandler.js","sourceRoot":"","sources":["../../src/service/reportingFolderHandler.ts"],"names":[],"mappings":"AAAA,YAAY,CAAA;AAEZ,OAAO,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAA;AACtC,OAAO,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAA;AAElE,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAA;AAIvD,OAAO,eAAe,MAAM,sBAAsB,CAAA;AAElD,MAAM,CAAC,OAAO,OAAO,sBAAuB,SAAQ,eAAe;IAC9C,YAAY,CAAoB;IAEnD,YAAY,UAAkB,EAAE,OAAwB,EAAE,IAAU;QAClE,KAAK,CAAC,UAAU,EAAE,OAAO,EAAE,IAAI,CAAC,CAAA;QAChC,IAAI,CAAC,YAAY,GAAG,OAAO,CAAC,uBAAuB,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,SAAS,CAAC,CAAA;IAC9E,CAAC;IAED,wBAAwB;IACR,KAAK,CAAC,eAAe,CACnC,IAAgB;QAEhB,IAAI,CAAC,IAAI,CAAC,YAAY;YAAE,OAAO,WAAW,EAAE,CAAA;QAC5C,OAAO,MAAM,KAAK,CAAC,eAAe,CAAC,IAAI,CAAC,CAAA;IAC1C,CAAC;IAEe,KAAK,CAAC,eAAe,CACnC,IAAgB;QAEhB,IAAI,CAAC,IAAI,CAAC,YAAY;YAAE,OAAO,WAAW,EAAE,CAAA;QAC5C,OAAO,MAAM,KAAK,CAAC,eAAe,CAAC,IAAI,CAAC,CAAA;IAC1C,CAAC;IACD,sBAAsB;IAEH,wBAAwB,CACzC,MAA2D;QAE3D,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAA;QACjD,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAA;QAChD,MAAM,cAAc,GAAG,GAAG,UAAU,GAAG,eAAe,EAAE,CAAA;QACxD,IAAI,CAAC,wBAAwB,CAAC,MAAM,EAAE,IAAI,CAAC,UAAU,EAAE,cAAc,CAAC,CAAC,CAAA;IACzE,CAAC;IAEe,oBAAoB;QAClC,oFAAoF;QACpF,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC;YACvB,MAAM,IAAI,KAAK,CACb,uDAAuD,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,CAC/E,CAAA;QACH,CAAC;QACD,OAAO;YACL,IAAI,EAAE,IAAI,CAAC,YAAY;YACvB,MAAM,EAAE,IAAI,CAAC,eAAe,EAAE;SAC/B,CAAA;IACH,CAAC;CACF"}

package/lib/service/sharedFolderHandler.d.ts

@@ -1,13 +1,17 @@
-import type { HandlerResult, ManifestElement, ManifestTarget } from '../types/handlerResult.js';
+import type { 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 SharedFolderHandler extends StandardHandler {
     protected readonly resolvedType: string | undefined;
     constructor(changeType: string, element: MetadataElement, work: Work);
-    protected _collectManifestElement(target: ManifestTarget): ManifestElement;
-    collectAddition(): Promise<HandlerResult>;
-    collectDeletion(): Promise<HandlerResult>;
+    getElementDescriptor(): {
+        type: string;
+        member: string;
+    };
+    collectAddition(sink?: ChangeSet): Promise<HandlerResult>;
+    collectDeletion(sink?: ChangeSet): Promise<HandlerResult>;
     protected _isProcessable(): boolean;
     protected _getMetaTypeFilePath(path: string): string;
 }