sfdx-git-delta 6.41.2 → 6.43.0

package/oclif.manifest.json

@@ -146,6 +146,14 @@
           "multiple": false,
           "type": "option"
         },
+        "changes-manifest": {
+          "char": "c",
+          "name": "changes-manifest",
+          "summary": "path to a JSON file grouping changed components by kind (add, modify, delete, rename); setting this flag also enables git rename detection",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
         "ignore-whitespace": {
           "char": "W",
           "name": "ignore-whitespace",
@@ -191,5 +199,5 @@
       ]
     }
   },
-  "version": "6.41.2"
+  "version": "6.43.0"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sfdx-git-delta",
-  "version": "6.41.2",
+  "version": "6.43.0",
   "description": "Generate the sfdx content in source format and destructive change from two git commits",
   "keywords": [
     "salesforce",
@@ -48,50 +48,51 @@
     "access": "public"
   },
   "dependencies": {
-    "@nodable/flexible-xml-parser": "^1.1.1",
-    "@oclif/core": "^4.10.5",
-    "@salesforce/core": "^8.28.3",
+    "@oclif/core": "^4.10.6",
+    "@salesforce/core": "^8.28.4",
     "@salesforce/sf-plugins-core": "^12.2.6",
-    "@salesforce/source-deploy-retrieve": "^12.32.8",
+    "@salesforce/source-deploy-retrieve": "^12.34.5",
     "async": "^3.2.6",
     "fast-equals": "^6.0.0",
-    "fast-xml-builder": "^1.1.5",
     "fs-extra": "^11.3.4",
     "ignore": "^7.0.5",
-    "lodash-es": "^4.18.1",
     "simple-git": "^3.36.0",
+    "tar-stream": "3.1.8",
     "tslib": "^2.8.1",
+    "txml": "^5.2.1",
     "zod": "^4.3.6"
   },
   "overrides": {
-    "basic-ftp": "^5.3.0"
+    "basic-ftp": "^5.3.0",
+    "@nodable/base-output-builder": "1.0.5",
+    "@nodable/compact-builder": "1.0.6",
+    "path-expression-matcher": "1.5.0",
+    "strnum": "2.2.3"
   },
   "devDependencies": {
-    "@biomejs/biome": "2.4.11",
-    "@commitlint/cli": "^20.5.0",
+    "@biomejs/biome": "2.4.13",
+    "@commitlint/cli": "^20.5.2",
     "@commitlint/config-conventional": "^20.5.0",
     "@ls-lint/ls-lint": "^2.3.1",
-    "@oclif/plugin-help": "^6.2.44",
-    "@salesforce/cli-plugins-testkit": "^5.3.52",
+    "@oclif/plugin-help": "^6.2.45",
+    "@salesforce/cli-plugins-testkit": "^5.3.54",
     "@salesforce/dev-config": "^4.3.3",
     "@stryker-mutator/core": "^9.6.1",
     "@stryker-mutator/vitest-runner": "^9.6.1",
     "@types/async": "^3.2.25",
     "@types/fs-extra": "^11.0.4",
-    "@types/lodash": "^4.17.24",
-    "@types/lodash-es": "^4.17.12",
     "@types/node": "^25.6.0",
-    "@vitest/coverage-v8": "^4.1.4",
+    "@types/tar-stream": "^3.1.4",
+    "@vitest/coverage-v8": "^4.1.5",
     "husky": "^9.1.7",
-    "knip": "^6.4.0",
+    "knip": "^6.7.0",
     "lint-staged": "^16.4.0",
-    "lodash": "^4.18.1",
     "oclif": "^4.23.0",
     "shx": "^0.4.0",
     "ts-node": "^10.9.2",
-    "typescript": "^6.0.2",
+    "typescript": "^6.0.3",
     "validate-branch-name": "^1.3.2",
-    "vitest": "^4.1.4",
+    "vitest": "^4.1.5",
     "wireit": "^0.14.12"
   },
   "scripts": {
@@ -114,6 +115,8 @@
     "prepublishOnly": "npm shrinkwrap",
     "sync:registry": "TS_NODE_COMPILER_OPTIONS='{\"rootDir\":\".\"}' node --loader ts-node/esm tooling/syncInternalRegistryWithSdr.ts",
     "test:build": "wireit",
+    "test:functional": "wireit",
+    "test:integration": "wireit",
     "test:mutation": "wireit",
     "test:mutation:incremental": "wireit",
     "test:nut": "wireit",
@@ -246,7 +249,36 @@
     "test": {
       "dependencies": [
         "test:unit",
-        "test:nut"
+        "test:integration",
+        "test:nut",
+        "test:functional"
+      ]
+    },
+    "test:functional": {
+      "command": "vitest run --config vitest.functional.config.ts",
+      "files": [
+        "src/**/*.ts",
+        "__tests__/functional/**/*.test.ts",
+        "__tests__/functional/byteEquality/fixtures/**",
+        "**/tsconfig.json",
+        "vitest.functional.config.ts"
+      ],
+      "output": [],
+      "dependencies": [
+        "lint"
+      ]
+    },
+    "test:integration": {
+      "command": "vitest run --config vitest.integration.config.ts",
+      "files": [
+        "src/**/*.ts",
+        "__tests__/integration/**/*.test.ts",
+        "**/tsconfig.json",
+        "vitest.integration.config.ts"
+      ],
+      "output": [],
+      "dependencies": [
+        "lint"
       ]
     },
     "test:build": {
@@ -307,7 +339,7 @@
       "command": "oclif manifest && vitest run --config vitest.nut.config.ts",
       "files": [
         "src/**/*.ts",
-        "__tests__/**/*.nut.ts",
+        "__tests__/nut/**/*.nut.ts",
         "messages/**",
         "**/tsconfig.json",
         "vitest.nut.config.ts"

package/lib/utils/manifestAggregator.d.ts

@@ -1,3 +0,0 @@
-import type { HandlerResult } from '../types/handlerResult.js';
-import type { Manifests } from '../types/work.js';
-export declare const aggregateManifests: (result: HandlerResult) => Manifests;

package/lib/utils/manifestAggregator.js

@@ -1,22 +0,0 @@
-'use strict';
-import { ManifestTarget } from '../types/handlerResult.js';
-const addToManifest = (store, type, member) => {
-    if (!store.has(type)) {
-        store.set(type, new Set());
-    }
-    store.get(type).add(member);
-};
-export const aggregateManifests = (result) => {
-    const manifests = {
-        package: new Map(),
-        destructiveChanges: new Map(),
-    };
-    for (const element of result.manifests) {
-        const store = element.target === ManifestTarget.Package
-            ? manifests.package
-            : manifests.destructiveChanges;
-        addToManifest(store, element.type, element.member);
-    }
-    return manifests;
-};
-//# sourceMappingURL=manifestAggregator.js.map

package/lib/utils/manifestAggregator.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"manifestAggregator.js","sourceRoot":"","sources":["../../src/utils/manifestAggregator.ts"],"names":[],"mappings":"AAAA,YAAY,CAAA;AAEZ,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAA;AAG1D,MAAM,aAAa,GAAG,CAAC,KAAe,EAAE,IAAY,EAAE,MAAc,EAAE,EAAE;IACtE,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;QACrB,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,GAAG,EAAE,CAAC,CAAA;IAC5B,CAAC;IACD,KAAK,CAAC,GAAG,CAAC,IAAI,CAAE,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;AAC9B,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,MAAqB,EAAa,EAAE;IACrE,MAAM,SAAS,GAAc;QAC3B,OAAO,EAAE,IAAI,GAAG,EAAE;QAClB,kBAAkB,EAAE,IAAI,GAAG,EAAE;KAC9B,CAAA;IAED,KAAK,MAAM,OAAO,IAAI,MAAM,CAAC,SAAS,EAAE,CAAC;QACvC,MAAM,KAAK,GACT,OAAO,CAAC,MAAM,KAAK,cAAc,CAAC,OAAO;YACvC,CAAC,CAAC,SAAS,CAAC,OAAO;YACnB,CAAC,CAAC,SAAS,CAAC,kBAAkB,CAAA;QAElC,aAAa,CAAC,KAAK,EAAE,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,MAAM,CAAC,CAAA;IACpD,CAAC;IAED,OAAO,SAAS,CAAA;AAClB,CAAC,CAAA"}

package/lib/utils/metadataDiff.d.ts

@@ -1,23 +0,0 @@
-import type { Config } from '../types/config.js';
-import type { ManifestElement } from '../types/handlerResult.js';
-import type { SharedFileMetadata } from '../types/metadata.js';
-import { type XmlContent } from './xmlHelper.js';
-type CompareEntry = Pick<ManifestElement, 'type' | 'member'>;
-interface CompareResult {
-    added: CompareEntry[];
-    deleted: CompareEntry[];
-    toContent: XmlContent;
-    fromContent: XmlContent;
-}
-export interface PrunedContent {
-    xmlContent: string;
-    isEmpty: boolean;
-}
-export default class MetadataDiff {
-    private config;
-    private extractor;
-    constructor(config: Config, attributes: Map<string, SharedFileMetadata>);
-    compare(path: string): Promise<CompareResult>;
-    prune(toContent: XmlContent, fromContent: XmlContent): PrunedContent;
-}
-export {};

package/lib/utils/metadataDiff.js

@@ -1,242 +0,0 @@
-'use strict';
-import { __decorate } from "tslib";
-import { deepEqual } from 'fast-equals';
-import { isUndefined } from 'lodash-es';
-import { log } from './LoggingDecorator.js';
-import { ATTRIBUTE_PREFIX, convertJsonToXml, parseXmlFileToJson, XML_HEADER_ATTRIBUTE_KEY, } from './xmlHelper.js';
-/**
- * Special key markers for metadata comparison strategies.
- * These are used in the internalRegistry to define how metadata elements
- * should be compared when they lack a natural unique key field.
- *
- * ARRAY_SPECIAL_KEY ('<array>'): Compare arrays as a whole.
- *   If arrays differ at all, include the entire 'to' array in the output.
- *   Used for metadata where order matters or elements can't be individually identified.
- *   Example: loginHours, loginIpRanges in Profile metadata.
- *
- * OBJECT_SPECIAL_KEY ('<object>'): Compare objects by their serialized form.
- *   Uses JSON.stringify to create a key for each element, then includes
- *   only elements from 'to' that don't exist in 'from'.
- *   Used for metadata where each element is unique but has no key field.
- *   Example: layoutAssignments in Profile metadata.
- *
- * When neither marker is used and no key field is defined, the comparison
- * falls back to deep equality of the entire array, returning 'to' if different.
- */
-const ARRAY_SPECIAL_KEY = '<array>';
-const OBJECT_SPECIAL_KEY = '<object>';
-const isEmpty = (arr) => arr.length === 0;
-export default class MetadataDiff {
-    config;
-    extractor;
-    constructor(config, attributes) {
-        this.config = config;
-        this.extractor = new MetadataExtractor(attributes);
-    }
-    async compare(path) {
-        const toContent = await parseXmlFileToJson({ path, oid: this.config.to }, this.config);
-        const fromContent = await parseXmlFileToJson({ path, oid: this.config.from }, this.config);
-        const comparator = new MetadataComparator(this.extractor, fromContent, toContent);
-        const added = comparator.getChanges();
-        const deleted = comparator.getDeletion();
-        return { added, deleted, toContent, fromContent };
-    }
-    prune(toContent, fromContent) {
-        const transformer = new JsonTransformer(this.extractor);
-        const { prunedContent, isEmpty } = transformer.generatePartialJson(fromContent, toContent);
-        return {
-            xmlContent: convertJsonToXml(prunedContent),
-            isEmpty,
-        };
-    }
-}
-__decorate([
-    log
-], MetadataDiff.prototype, "compare", null);
-__decorate([
-    log
-], MetadataDiff.prototype, "prune", null);
-class MetadataExtractor {
-    attributes;
-    keySelectorCache = new Map();
-    constructor(attributes) {
-        this.attributes = attributes;
-    }
-    getSubTypes(root) {
-        return Object.keys(root).filter(tag => this.attributes.has(tag));
-    }
-    getSubKeys(root) {
-        return Object.keys(root);
-    }
-    isTypePackageable(subType) {
-        return !this.attributes.get(subType)?.excluded;
-    }
-    getXmlName(subType) {
-        /* v8 ignore next -- callers pass subTypes present in attributes map */
-        return this.attributes.get(subType)?.xmlName ?? '';
-    }
-    getKeyValueSelector(subType) {
-        if (!this.keySelectorCache.has(subType)) {
-            const metadataKey = this.getKeyFieldDefinition(subType);
-            this.keySelectorCache.set(subType, elem => elem[metadataKey]);
-        }
-        return this.keySelectorCache.get(subType);
-    }
-    getKeyFieldDefinition(subType) {
-        return this.attributes.get(subType)?.key;
-    }
-    extractForSubType(root, subType) {
-        const content = root[subType];
-        return Array.isArray(content) ? content : content ? [content] : [];
-    }
-    extractRootElement(fileContent) {
-        const rootKey = this.extractRootKey(fileContent);
-        return fileContent[rootKey] ?? {};
-    }
-    extractRootKey(fileContent) {
-        return (Object.keys(fileContent).find(key => key !== XML_HEADER_ATTRIBUTE_KEY) ??
-            '');
-    }
-}
-class MetadataComparator {
-    extractor;
-    fromContent;
-    toContent;
-    constructor(extractor, fromContent, toContent) {
-        this.extractor = extractor;
-        this.fromContent = fromContent;
-        this.toContent = toContent;
-    }
-    getChanges() {
-        return this.compare(this.toContent, this.fromContent, this.matchAdded);
-    }
-    getDeletion() {
-        return this.compare(this.fromContent, this.toContent, this.matchDeleted);
-    }
-    compare(baseContent, targetContent, elementMatcher) {
-        const base = this.extractor.extractRootElement(baseContent);
-        const target = this.extractor.extractRootElement(targetContent);
-        const entries = [];
-        const subTypes = this.extractor.getSubTypes(base);
-        for (const subType of subTypes) {
-            if (!this.extractor.isTypePackageable(subType))
-                continue;
-            const baseMeta = this.extractor.extractForSubType(base, subType);
-            if (isEmpty(baseMeta))
-                continue;
-            const targetMeta = this.extractor.extractForSubType(target, subType);
-            const keySelector = this.extractor.getKeyValueSelector(subType);
-            const xmlName = this.extractor.getXmlName(subType);
-            // Pre-compute lookup map: O(n) instead of O(n) per element
-            const targetLookup = new Map();
-            for (const el of targetMeta) {
-                const key = keySelector(el);
-                if (key !== undefined) {
-                    targetLookup.set(key, el);
-                }
-            }
-            for (const elem of baseMeta) {
-                if (elementMatcher(targetLookup, keySelector, elem)) {
-                    entries.push({ type: xmlName, member: keySelector(elem) });
-                }
-            }
-        }
-        return entries;
-    }
-    // O(1) lookup instead of O(n) find()
-    matchAdded = (targetLookup, keySelector, elem) => {
-        const elemKey = keySelector(elem);
-        if (elemKey === undefined)
-            return true;
-        const match = targetLookup.get(elemKey);
-        return !match || !deepEqual(match, elem);
-    };
-    // O(1) lookup instead of O(n) some()
-    matchDeleted = (targetLookup, keySelector, elem) => {
-        const elemKey = keySelector(elem);
-        if (elemKey === undefined)
-            return true;
-        return !targetLookup.has(elemKey);
-    };
-}
-class JsonTransformer {
-    extractor;
-    constructor(extractor) {
-        this.extractor = extractor;
-    }
-    generatePartialJson(fromContent, toContent) {
-        const from = this.extractor.extractRootElement(fromContent);
-        const to = this.extractor.extractRootElement(toContent);
-        const base = {};
-        if (XML_HEADER_ATTRIBUTE_KEY in toContent) {
-            base[XML_HEADER_ATTRIBUTE_KEY] = toContent[XML_HEADER_ATTRIBUTE_KEY];
-        }
-        const rootKey = this.extractor.extractRootKey(toContent);
-        const root = {};
-        base[rootKey] = root;
-        const subKeys = this.extractor.getSubKeys(to);
-        let hasAnyChanges = false;
-        for (const key of subKeys) {
-            if (key.startsWith(ATTRIBUTE_PREFIX)) {
-                root[key] = to[key];
-                continue;
-            }
-            const fromMeta = this.extractor.extractForSubType(from, key);
-            const toMeta = this.extractor.extractForSubType(to, key);
-            const keyField = this.extractor.getKeyFieldDefinition(key);
-            const { content, hasChanges } = this.getPartialContent(fromMeta, toMeta, keyField);
-            if (hasChanges) {
-                hasAnyChanges = true;
-            }
-            if (!isEmpty(content)) {
-                root[key] = content;
-            }
-        }
-        return { prunedContent: base, isEmpty: !hasAnyChanges };
-    }
-    getPartialContent(fromMeta, toMeta, keyField) {
-        // Early return for empty arrays
-        if (isEmpty(toMeta)) {
-            return { content: [], hasChanges: false };
-        }
-        if (isEmpty(fromMeta)) {
-            return { content: toMeta, hasChanges: true };
-        }
-        if (isUndefined(keyField)) {
-            return this.getPartialContentWithoutKey(fromMeta, toMeta);
-        }
-        if (keyField === ARRAY_SPECIAL_KEY) {
-            return this.getPartialContentForArray(fromMeta, toMeta);
-        }
-        if (keyField === OBJECT_SPECIAL_KEY) {
-            return this.getPartialContentForObject(fromMeta, toMeta);
-        }
-        return this.getPartialContentWithKey(fromMeta, toMeta, keyField);
-    }
-    getPartialContentWithoutKey(fromMeta, toMeta) {
-        const hasChanges = !deepEqual(fromMeta, toMeta);
-        return { content: toMeta, hasChanges };
-    }
-    getPartialContentForArray(fromMeta, toMeta) {
-        const hasChanges = !deepEqual(fromMeta, toMeta);
-        const content = hasChanges ? toMeta : [];
-        return { content, hasChanges };
-    }
-    getPartialContentForObject(fromMeta, toMeta) {
-        const keySelector = (item) => JSON.stringify(item);
-        const fromSet = new Set(fromMeta.map(keySelector));
-        const content = toMeta.filter(item => !fromSet.has(keySelector(item)));
-        return { content, hasChanges: !isEmpty(content) };
-    }
-    getPartialContentWithKey(fromMeta, toMeta, keyField) {
-        const keySelector = (item) => item[keyField];
-        const fromMap = new Map(fromMeta.map(item => [keySelector(item), item]));
-        const content = toMeta.filter(item => {
-            const key = keySelector(item);
-            const fromItem = fromMap.get(key);
-            return isUndefined(fromItem) || !deepEqual(item, fromItem);
-        });
-        return { content, hasChanges: !isEmpty(content) };
-    }
-}
-//# sourceMappingURL=metadataDiff.js.map

package/lib/utils/metadataDiff.js.map

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