sfdx-git-delta 6.41.0 → 6.41.1

package/README.md

@@ -1,6 +1,6 @@
 <!-- markdownlint-disable MD040 MD041 -->
 ![Actions Status](https://github.com/scolladon/sfdx-git-delta/workflows/Main/badge.svg)
-[![Performance Dashboard](https://img.shields.io/static/v1?label=Performance&message=Dashboard&color=blue)](https://scolladon.github.io/sfdx-git-delta/dev/bench/)
+[![Performance Dashboard](https://img.shields.io/badge/Performance-Dashboard-58a6ff)](https://scolladon.github.io/sfdx-git-delta/dev/bench/runtime/)
 [![npm](https://badgen.net/npm/v/sfdx-git-delta)](https://badgen.net/npm/v/sfdx-git-delta)
 [![Maintainability](https://api.codeclimate.com/v1/badges/95619399c7bb2cf60da4/maintainability)](https://codeclimate.com/github/scolladon/sfdx-git-delta/maintainability)
 [![Code Coverage](https://codecov.io/gh/scolladon/sfdx-git-delta/branch/main/graph/badge.svg?token=92T8XKKBHN)](https://codecov.io/gh/scolladon/sfdx-git-delta)
@@ -201,7 +201,7 @@ FLAG DESCRIPTIONS
     of a diff, in which case changes may still be picked up.
 ```
 
-_See code: [src/commands/sgd/source/delta.ts](https://github.com/scolladon/sfdx-git-delta/blob/v6.41.0/src/commands/sgd/source/delta.ts)_
+_See code: [src/commands/sgd/source/delta.ts](https://github.com/scolladon/sfdx-git-delta/blob/v6.41.1/src/commands/sgd/source/delta.ts)_
 <!-- commandsstop -->
 
 ### Windows users
@@ -690,12 +690,12 @@ These plugins have been designed to work with SGD:
 ## Built With
 
 - [fast-xml-parser](https://github.com/NaturalIntelligence/fast-xml-parser) - Validate XML, Parse XML to JS/JSON and vise versa, or parse XML to Nimn rapidly without C/C++ based libraries and no callback
+- [flexible-xml-parser](https://github.com/nodable/flexible-xml-parser) - Fastest XML parser in pure JS with pluggable output builders and value parsers
 - [fs-extra](https://github.com/jprichardson/node-fs-extra) - Node.js: extra methods for the fs object like copy(), remove(), mkdirs().
 - [ignore](https://github.com/kaelzhang/node-ignore#readme) - is a manager, filter and parser which implemented in pure JavaScript according to the .gitignore spec 2.22.1.
 - [lodash](https://github.com/lodash/lodash) - A modern JavaScript utility library delivering modularity, performance & extras.
 - [MegaLinter](https://megalinter.io) - Open-Source tool for CI/CD workflows that analyzes the consistency of your code, IAC, configuration, and scripts
 - [simple-git](https://github.com/steveukx/git-js) - A light weight interface for running git commands in any node.js application.
-- [xmlbuilder2](https://github.com/oozcitak/xmlbuilder2) - An XML builder for node.js.
 
 ## Used by 
 

package/lib/utils/packageHelper.js

@@ -1,31 +1,42 @@
 'use strict';
 import { __decorate } from "tslib";
-import { create } from 'xmlbuilder2';
+import { XMLBuilder } from 'fast-xml-parser';
 import { OBJECT_TYPE } from '../constant/metadataConstants.js';
 import { log } from './LoggingDecorator.js';
-const xmlConf = { indent: '    ', newline: '\n', prettyPrint: true };
+import { ATTRIBUTE_PREFIX, XML_HEADER_ATTRIBUTE_KEY } from './xmlHelper.js';
 const frLocale = 'fr';
+const xmlBuilder = new XMLBuilder({
+    ignoreAttributes: false,
+    format: true,
+    indentBy: '    ',
+    suppressEmptyNode: false,
+    suppressBooleanAttributes: false,
+    processEntities: false,
+});
 export default class PackageBuilder {
     config;
     constructor(config) {
         this.config = config;
     }
     buildPackage(strucDiffPerType) {
-        const xml = create({ version: '1.0', encoding: 'UTF-8' }).ele('Package', {
-            xmlns: 'http://soap.sforce.com/2006/04/metadata',
-        });
-        Array.from(strucDiffPerType.keys())
+        const types = Array.from(strucDiffPerType.keys())
             .sort(this._sortTypesWithMetadata)
-            .forEach(metadataType => [...strucDiffPerType.get(metadataType)]
-            .sort(Intl.Collator(frLocale).compare)
-            .reduce((type, member) => {
-            type.ele('members').txt(member);
-            return type;
-        }, xml.ele('types'))
-            .ele('name')
-            .txt(metadataType));
-        xml.ele('version').txt(`${this.config.apiVersion}.0`);
-        return xml.end(xmlConf);
+            .map(metadataType => ({
+            members: [...strucDiffPerType.get(metadataType)].sort(Intl.Collator(frLocale).compare),
+            name: metadataType,
+        }));
+        const jsonObj = {
+            [XML_HEADER_ATTRIBUTE_KEY]: {
+                [`${ATTRIBUTE_PREFIX}version`]: '1.0',
+                [`${ATTRIBUTE_PREFIX}encoding`]: 'UTF-8',
+            },
+            Package: {
+                [`${ATTRIBUTE_PREFIX}xmlns`]: 'http://soap.sforce.com/2006/04/metadata',
+                types,
+                version: `${this.config.apiVersion}.0`,
+            },
+        };
+        return xmlBuilder.build(jsonObj).trimEnd();
     }
     _sortTypesWithMetadata = (x, y) => {
         // RATIONALE: Why must CustomObject be ordered first in package.xml?

package/lib/utils/packageHelper.js.map

@@ -1 +1 @@
-{"version":3,"file":"packageHelper.js","sourceRoot":"","sources":["../../src/utils/packageHelper.ts"],"names":[],"mappings":"AAAA,YAAY,CAAA;;AACZ,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AAEpC,OAAO,EAAE,WAAW,EAAE,MAAM,kCAAkC,CAAA;AAG9D,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAA;AAE3C,MAAM,OAAO,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,CAAA;AACpE,MAAM,QAAQ,GAAG,IAAI,CAAA;AAErB,MAAM,CAAC,OAAO,OAAO,cAAc;IACF;IAA/B,YAA+B,MAAc;QAAd,WAAM,GAAN,MAAM,CAAQ;IAAG,CAAC;IAG1C,YAAY,CAAC,gBAA0B;QAC5C,MAAM,GAAG,GAAG,MAAM,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC,GAAG,CAAC,SAAS,EAAE;YACvE,KAAK,EAAE,yCAAyC;SACjD,CAAC,CAAA;QACF,KAAK,CAAC,IAAI,CAAC,gBAAgB,CAAC,IAAI,EAAE,CAAC;aAChC,IAAI,CAAC,IAAI,CAAC,sBAAsB,CAAC;aACjC,OAAO,CAAC,YAAY,CAAC,EAAE,CACtB,CAAC,GAAG,gBAAgB,CAAC,GAAG,CAAC,YAAY,CAAE,CAAC;aACrC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC;aACrC,MAAM,CAAC,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE;YACvB,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;YAC/B,OAAO,IAAI,CAAA;QACb,CAAC,EAAE,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;aACnB,GAAG,CAAC,MAAM,CAAC;aACX,GAAG,CAAC,YAAY,CAAC,CACrB,CAAA;QACH,GAAG,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,UAAU,IAAI,CAAC,CAAA;QACrD,OAAO,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;IACzB,CAAC;IAED,sBAAsB,GAAG,CAAC,CAAS,EAAE,CAAS,EAAE,EAAE;QAChD,oEAAoE;QACpE,+EAA+E;QAC/E,qGAAqG;QACrG,IAAI,CAAC,KAAK,WAAW;YAAE,OAAO,CAAC,CAAC,CAAA,CAAC,oFAAoF;QACrH,OAAO,IAAI,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;IAClD,CAAC,CAAA;CACF;AA3BQ;IADN,GAAG;kDAmBH"}
+{"version":3,"file":"packageHelper.js","sourceRoot":"","sources":["../../src/utils/packageHelper.ts"],"names":[],"mappings":"AAAA,YAAY,CAAA;;AACZ,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAE5C,OAAO,EAAE,WAAW,EAAE,MAAM,kCAAkC,CAAA;AAG9D,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAA;AAC3C,OAAO,EAAE,gBAAgB,EAAE,wBAAwB,EAAE,MAAM,gBAAgB,CAAA;AAE3E,MAAM,QAAQ,GAAG,IAAI,CAAA;AACrB,MAAM,UAAU,GAAG,IAAI,UAAU,CAAC;IAChC,gBAAgB,EAAE,KAAK;IACvB,MAAM,EAAE,IAAI;IACZ,QAAQ,EAAE,MAAM;IAChB,iBAAiB,EAAE,KAAK;IACxB,yBAAyB,EAAE,KAAK;IAChC,eAAe,EAAE,KAAK;CACvB,CAAC,CAAA;AAEF,MAAM,CAAC,OAAO,OAAO,cAAc;IACF;IAA/B,YAA+B,MAAc;QAAd,WAAM,GAAN,MAAM,CAAQ;IAAG,CAAC;IAG1C,YAAY,CAAC,gBAA0B;QAC5C,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,gBAAgB,CAAC,IAAI,EAAE,CAAC;aAC9C,IAAI,CAAC,IAAI,CAAC,sBAAsB,CAAC;aACjC,GAAG,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;YACpB,OAAO,EAAE,CAAC,GAAG,gBAAgB,CAAC,GAAG,CAAC,YAAY,CAAE,CAAC,CAAC,IAAI,CACpD,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,OAAO,CAChC;YACD,IAAI,EAAE,YAAY;SACnB,CAAC,CAAC,CAAA;QAEL,MAAM,OAAO,GAAG;YACd,CAAC,wBAAwB,CAAC,EAAE;gBAC1B,CAAC,GAAG,gBAAgB,SAAS,CAAC,EAAE,KAAK;gBACrC,CAAC,GAAG,gBAAgB,UAAU,CAAC,EAAE,OAAO;aACzC;YACD,OAAO,EAAE;gBACP,CAAC,GAAG,gBAAgB,OAAO,CAAC,EAAE,yCAAyC;gBACvE,KAAK;gBACL,OAAO,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC,UAAU,IAAI;aACvC;SACF,CAAA;QAED,OAAO,UAAU,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,CAAA;IAC5C,CAAC;IAED,sBAAsB,GAAG,CAAC,CAAS,EAAE,CAAS,EAAE,EAAE;QAChD,oEAAoE;QACpE,+EAA+E;QAC/E,qGAAqG;QACrG,IAAI,CAAC,KAAK,WAAW;YAAE,OAAO,CAAC,CAAC,CAAA,CAAC,oFAAoF;QACrH,OAAO,IAAI,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;IAClD,CAAC,CAAA;CACF;AAhCQ;IADN,GAAG;kDAwBH"}

package/lib/utils/xmlHelper.d.ts

@@ -1,9 +1,5 @@
 import type { Config } from '../types/config.js';
 import type { FileGitRef } from '../types/git.js';
-/**
- * Represents parsed XML content as a JSON object.
- * Used throughout the codebase for XML metadata manipulation.
- */
 export type XmlContent = Record<string, unknown>;
 export declare const xml2Json: (xmlContent: string) => XmlContent;
 export declare const parseXmlFileToJson: (forRef: FileGitRef, config: Config) => Promise<XmlContent>;

package/lib/utils/xmlHelper.js

@@ -1,7 +1,26 @@
 'use strict';
-import { XMLBuilder, XMLParser } from 'fast-xml-parser';
+import FlexXMLParser from '@nodable/flexible-xml-parser';
+import { XMLBuilder } from 'fast-xml-parser';
 import { readPathFromGit } from './fsHelper.js';
 const XML_PARSER_OPTION = {
+    skip: {
+        attributes: false,
+        nsPrefix: false,
+        comment: false,
+        declaration: false,
+    },
+    nameFor: {
+        comment: '#comment',
+    },
+    attributes: {
+        prefix: '@_',
+        valueParsers: [],
+    },
+    tags: {
+        valueParsers: ['trim'],
+    },
+};
+const JSON_PARSER_OPTION = {
     commentPropName: '#comment',
     ignoreAttributes: false,
     ignoreNameSpace: false,
@@ -10,21 +29,22 @@ const XML_PARSER_OPTION = {
     parseAttributeValue: false,
     trimValues: true,
     processEntities: false,
-};
-const JSON_PARSER_OPTION = {
-    ...XML_PARSER_OPTION,
     format: true,
     indentBy: '    ',
     suppressBooleanAttributes: false,
     suppressEmptyNode: false,
 };
+const xmlParser = new FlexXMLParser(XML_PARSER_OPTION);
 export const xml2Json = (xmlContent) => {
-    let jsonContent = {};
-    if (xmlContent) {
-        const xmlParser = new XMLParser(XML_PARSER_OPTION);
-        jsonContent = xmlParser.parse(xmlContent);
+    if (!xmlContent) {
+        return {};
+    }
+    try {
+        return xmlParser.parse(xmlContent);
+    }
+    catch {
+        return {};
     }
-    return jsonContent;
 };
 export const parseXmlFileToJson = async (forRef, config) => {
     const xmlContent = await readPathFromGit(forRef, config);

package/lib/utils/xmlHelper.js.map

@@ -1 +1 @@
-{"version":3,"file":"xmlHelper.js","sourceRoot":"","sources":["../../src/utils/xmlHelper.ts"],"names":[],"mappings":"AAAA,YAAY,CAAA;AAEZ,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAKvD,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAA;AAQ/C,MAAM,iBAAiB,GAAG;IACxB,eAAe,EAAE,UAAU;IAC3B,gBAAgB,EAAE,KAAK;IACvB,eAAe,EAAE,KAAK;IACtB,aAAa,EAAE,KAAK;IACpB,cAAc,EAAE,KAAK;IACrB,mBAAmB,EAAE,KAAK;IAC1B,UAAU,EAAE,IAAI;IAChB,eAAe,EAAE,KAAK;CACvB,CAAA;AACD,MAAM,kBAAkB,GAAG;IACzB,GAAG,iBAAiB;IACpB,MAAM,EAAE,IAAI;IACZ,QAAQ,EAAE,MAAM;IAChB,yBAAyB,EAAE,KAAK;IAChC,iBAAiB,EAAE,KAAK;CACzB,CAAA;AAED,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,UAAkB,EAAc,EAAE;IACzD,IAAI,WAAW,GAAe,EAAE,CAAA;IAChC,IAAI,UAAU,EAAE,CAAC;QACf,MAAM,SAAS,GAAG,IAAI,SAAS,CAAC,iBAAiB,CAAC,CAAA;QAClD,WAAW,GAAG,SAAS,CAAC,KAAK,CAAC,UAAU,CAAC,CAAA;IAC3C,CAAC;IACD,OAAO,WAAW,CAAA;AACpB,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,kBAAkB,GAAG,KAAK,EACrC,MAAkB,EAClB,MAAc,EACO,EAAE;IACvB,MAAM,UAAU,GAAG,MAAM,eAAe,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IACxD,OAAO,QAAQ,CAAC,UAAU,CAAC,CAAA;AAC7B,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,WAAiC,EAAU,EAAE;IAC5E,MAAM,UAAU,GAAG,IAAI,UAAU,CAAC,kBAAkB,CAAC,CAAA;IACrD,OAAO,UAAU,CAAC,KAAK,CAAC,WAAW,CAAC,CAAA;AACtC,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,gBAAgB,GAAG,IAAI,CAAA;AAEpC,MAAM,CAAC,MAAM,wBAAwB,GAAG,MAAM,CAAA"}
+{"version":3,"file":"xmlHelper.js","sourceRoot":"","sources":["../../src/utils/xmlHelper.ts"],"names":[],"mappings":"AAAA,YAAY,CAAA;AAEZ,OAAO,aAAkC,MAAM,8BAA8B,CAAA;AAC7E,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAK5C,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAA;AAI/C,MAAM,iBAAiB,GAAe;IACpC,IAAI,EAAE;QACJ,UAAU,EAAE,KAAK;QACjB,QAAQ,EAAE,KAAK;QACf,OAAO,EAAE,KAAK;QACd,WAAW,EAAE,KAAK;KACnB;IACD,OAAO,EAAE;QACP,OAAO,EAAE,UAAU;KACpB;IACD,UAAU,EAAE;QACV,MAAM,EAAE,IAAI;QACZ,YAAY,EAAE,EAAe;KAC9B;IACD,IAAI,EAAE;QACJ,YAAY,EAAE,CAAC,MAAM,CAAc;KACpC;CACY,CAAA;AACf,MAAM,kBAAkB,GAAG;IACzB,eAAe,EAAE,UAAU;IAC3B,gBAAgB,EAAE,KAAK;IACvB,eAAe,EAAE,KAAK;IACtB,aAAa,EAAE,KAAK;IACpB,cAAc,EAAE,KAAK;IACrB,mBAAmB,EAAE,KAAK;IAC1B,UAAU,EAAE,IAAI;IAChB,eAAe,EAAE,KAAK;IACtB,MAAM,EAAE,IAAI;IACZ,QAAQ,EAAE,MAAM;IAChB,yBAAyB,EAAE,KAAK;IAChC,iBAAiB,EAAE,KAAK;CACzB,CAAA;AAED,MAAM,SAAS,GAAG,IAAI,aAAa,CAAC,iBAAiB,CAAC,CAAA;AAEtD,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,UAAkB,EAAc,EAAE;IACzD,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,OAAO,EAAE,CAAA;IACX,CAAC;IACD,IAAI,CAAC;QACH,OAAO,SAAS,CAAC,KAAK,CAAC,UAAU,CAAe,CAAA;IAClD,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,CAAA;IACX,CAAC;AACH,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,kBAAkB,GAAG,KAAK,EACrC,MAAkB,EAClB,MAAc,EACO,EAAE;IACvB,MAAM,UAAU,GAAG,MAAM,eAAe,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IACxD,OAAO,QAAQ,CAAC,UAAU,CAAC,CAAA;AAC7B,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,WAAiC,EAAU,EAAE;IAC5E,MAAM,UAAU,GAAG,IAAI,UAAU,CAAC,kBAAkB,CAAC,CAAA;IACrD,OAAO,UAAU,CAAC,KAAK,CAAC,WAAW,CAAC,CAAA;AACtC,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,gBAAgB,GAAG,IAAI,CAAA;AAEpC,MAAM,CAAC,MAAM,wBAAwB,GAAG,MAAM,CAAA"}