sf-git-merge-driver 1.7.0 → 1.8.0

package/lib/adapter/TxmlXmlParser.js

@@ -0,0 +1,315 @@
+// txml has no first-party types — declare a narrow ambient signature
+// here instead of casting the import to `any`. The cast at the call
+// site (line "const top = parsedToTNodes(...)") then narrows from
+// `unknown`, not from `any`, so a future txml release that changes
+// the return shape surfaces as a tsc error rather than silent runtime
+// breakage. The @ts-expect-error covers only the missing-types
+// resolution; the runtime contract is asserted in `parsedToTNodes`.
+// @ts-expect-error: txml ships no .d.ts, declare-module is not picked
+// up across .mjs subpath imports under our nodenext module resolution.
+import { parse as txmlParseUntyped } from 'txml/dist/txml.mjs';
+import { CDATA_PROP_NAME, XML_COMMENT_PROP_NAME, } from '../constant/parserConstant.js';
+const txmlParse = txmlParseUntyped;
+const ATTR_PREFIX = '@_';
+const TEXT_KEY = '#text';
+const XMLNS_RE = /^xmlns(?::.+)?$/;
+// Matches a raw comment string emitted by tXml when keepComments=true.
+// Body (the `[\s\S]*?` capture) is what we store under #xml__comment.
+const COMMENT_RE = /^<!--([\s\S]*?)-->$/;
+// Sentinel tag we substitute for CDATA pre-tXml so the boundary
+// survives. Per the XML 1.0 spec, an element name's NameStartChar
+// disallows ASCII control bytes — so `\x00` cannot appear in a real
+// document's tag and the sentinel is collision-proof against
+// adversarial inputs (a hand-authored profile containing
+// `<__cdata_sentinel__>...` would otherwise have been silently
+// converted into a fabricated CDATA node).
+const CDATA_SENTINEL = '\x00cdata\x00';
+const CDATA_RE = /<!\[CDATA\[([\s\S]*?)\]\]>/g;
+// tXml unconditionally collapses CDATA content into the surrounding
+// children as a plain text string — so by the time we see the parsed
+// tree we can no longer tell `<v><![CDATA[<&>]]></v>` from `<v>&lt;&amp;&gt;</v>`.
+// The writer DOES need to know the difference (it re-emits CDATA verbatim).
+//
+// Workaround: rewrite each CDATA region to a synthetic element BEFORE
+// tXml sees the input. Inside, we entity-escape `<` and `&` so tXml
+// accepts the wrapped content as valid PCDATA. The adapter (below)
+// recognises the sentinel tag, undoes the escape, and emits the
+// original content under the canonical CDATA key.
+//
+// `&` MUST be escaped first — otherwise `<` → `&lt;` would be
+// re-escaped to `&amp;lt;` in a second pass.
+const preprocessCdata = (xml) => xml.replace(CDATA_RE, (_, raw) => {
+    const escaped = raw.replace(/&/g, '&amp;').replace(/</g, '&lt;');
+    return `<${CDATA_SENTINEL}>${escaped}</${CDATA_SENTINEL}>`;
+});
+// Decode pairs the encode in preprocessCdata. The two patterns
+// (`&lt;` and `&amp;`) are disjoint, so order is not load-bearing
+// for the current set — BUT if a third escape is ever added it MUST
+// be decoded last-encoded-first to avoid double-decoding (e.g. an
+// `>` → `&gt;` extension would have to decode `&gt;` BEFORE `&amp;`).
+const decodeCdataEscape = (s) => s.replace(/&lt;/g, '<').replace(/&amp;/g, '&');
+// Quote-aware scan for the next unescaped `>` that closes a tag
+// starting at `from` (the position of the `<`). Walks past `>` chars
+// that appear inside `"..."` or `'...'` attribute values. Without this
+// guard, `<el attr="a>b">` would be split mid-attribute by a naive
+// `indexOf('>')` and the resulting `tagBody` would falsely trigger
+// the unbalanced-tags check on otherwise valid XML.
+const findTagEnd = (xml, from) => {
+    let inQuote = null;
+    for (let i = from; i < xml.length; i++) {
+        const ch = xml[i];
+        if (inQuote !== null) {
+            if (ch === inQuote)
+                inQuote = null;
+            continue;
+        }
+        if (ch === '"' || ch === "'") {
+            inQuote = ch;
+            continue;
+        }
+        if (ch === '>')
+            return i;
+    }
+    return -1;
+};
+// tXml is permissive on malformed input: an unclosed tag like
+// `<Profile><broken>` parses without complaint. The previous parser
+// threw on the same input, and MergeDriver relies on the throw to
+// surface a parse failure as a merge conflict.
+//
+// Restore that behaviour with a minimal well-formedness pass: walk the
+// preprocessed XML once, track open-vs-close tag depth, throw on
+// mismatch. CDATA sections have already been replaced by sentinel
+// elements at this point so we don't need to skip them here.
+const assertBalancedTags = (xml) => {
+    let depth = 0;
+    let i = 0;
+    while (i < xml.length) {
+        const next = xml.indexOf('<', i);
+        if (next < 0)
+            break;
+        // <!-- comment -->
+        if (xml.startsWith('<!--', next)) {
+            const end = xml.indexOf('-->', next + 4);
+            if (end < 0)
+                throw new Error('XML parse error: unterminated comment');
+            i = end + 3;
+            continue;
+        }
+        // <!DOCTYPE …>, <![CDATA[…]]> (already preprocessed away),
+        // <!ENTITY …>, etc. None contribute to element nesting; skip the
+        // whole declaration. Salesforce metadata never emits these but
+        // defensive handling costs two lines and prevents a false
+        // unbalanced-tags throw on any document with a DOCTYPE prologue.
+        if (xml.startsWith('<!', next)) {
+            const end = findTagEnd(xml, next + 2);
+            if (end < 0)
+                throw new Error('XML parse error: unterminated <! ... >');
+            i = end + 1;
+            continue;
+        }
+        // <?xml ... ?> declaration / processing instruction
+        if (xml.startsWith('<?', next)) {
+            const end = xml.indexOf('?>', next + 2);
+            if (end < 0)
+                throw new Error('XML parse error: unterminated <? ?>');
+            i = end + 2;
+            continue;
+        }
+        const tagEnd = findTagEnd(xml, next + 1);
+        if (tagEnd < 0)
+            throw new Error('XML parse error: unterminated tag');
+        const tagBody = xml.slice(next + 1, tagEnd);
+        if (tagBody.startsWith('/')) {
+            depth--;
+        }
+        else if (!tagBody.endsWith('/')) {
+            depth++;
+        }
+        // self-closing `<x/>` does not change depth
+        i = tagEnd + 1;
+    }
+    if (depth !== 0) {
+        throw new Error(`XML parse error: tags unbalanced (final depth ${depth.toString()})`);
+    }
+};
+// Walk a TNode's children once, separating text (concatenated) from
+// element children (grouped by tagName). CDATA sentinels and comment
+// strings are rewritten into their canonical compact-tree keys here.
+const classifyChildren = (children) => {
+    let textBuf = '';
+    const grouped = new Map();
+    const push = (tag, value) => {
+        const existing = grouped.get(tag);
+        if (existing) {
+            existing.push(value);
+        }
+        else {
+            grouped.set(tag, [value]);
+        }
+    };
+    for (const child of children) {
+        if (typeof child === 'string') {
+            const commentMatch = child.match(COMMENT_RE);
+            if (commentMatch !== null) {
+                // commentMatch[1] is the [\s\S]*? capture — always defined here
+                // (even an empty `<!---->` matches with body = '').
+                push(XML_COMMENT_PROP_NAME, commentMatch[1]);
+                continue;
+            }
+            textBuf += child;
+            continue;
+        }
+        if (child.tagName === CDATA_SENTINEL) {
+            push(CDATA_PROP_NAME, decodeCdataEscape(sentinelTextOf(child)));
+            continue;
+        }
+        push(child.tagName, toCompact(child));
+    }
+    return { textBuf, grouped };
+};
+// Extract the text payload of a CDATA-sentinel TNode. Filtered for
+// `string` so a future txml release that introduces nested TNodes
+// inside the sentinel (e.g. via entity expansion) does not silently
+// stringify `[object Object]` into the CDATA content — the previous
+// `as string[]` cast erased the discriminated-union check.
+//
+// Exported only so the defensive non-string branch can be exercised
+// from a unit test (txml's real output for our preprocessed input
+// always satisfies the all-strings precondition, so the guard is
+// otherwise unreachable through a black-box parseString call).
+export const sentinelTextOf = (node) => {
+    let out = '';
+    for (const c of node.children) {
+        if (typeof c === 'string')
+            out += c;
+    }
+    return out;
+};
+// Single-text-child unbox: <v>1</v> serialises as the scalar "1", not
+// `{ '#text': '1' }`. The previous parser's compact shape preferred
+// the scalar form; the writer relies on it.
+const unboxScalar = (out) => {
+    const keys = Object.keys(out);
+    if (keys.length === 1 && keys[0] === TEXT_KEY)
+        return out[TEXT_KEY];
+    return out;
+};
+// Convert a TNode subtree into the compact JsonObject shape.
+//
+// Rules (each one anchored by a specific spike-probed case):
+// - element with no children + no attrs   → ''                  (empty)
+// - element with single text child        → unbox to scalar     (scalar)
+// - element with attrs + no body          → { '@_a': v, '#text': '' }
+// - element with attrs + text             → { '@_a': v, '#text': t }
+// - repeated same-name siblings           → array under one key
+// - mixed text + elements                 → text concatenated under '#text'
+// - comments (when keepComments=true)     → '#xml__comment'
+// - CDATA (via the synthetic sentinel)    → '__cdata' key, multi-segment as array
+// - root-element xmlns attributes         → extracted by the caller, NOT here
+const toCompact = (node) => {
+    const noChildren = node.children.length === 0;
+    const noAttrs = Object.keys(node.attributes).length === 0;
+    if (noChildren && noAttrs)
+        return '';
+    const { textBuf, grouped } = classifyChildren(node.children);
+    // Attributes first matches the previous parser's emission order,
+    // which the writer relies on for stable byte output.
+    const out = {};
+    for (const [k, v] of Object.entries(node.attributes)) {
+        out[`${ATTR_PREFIX}${k}`] = v;
+    }
+    for (const [tag, arr] of grouped) {
+        out[tag] = arr.length === 1 ? arr[0] : arr;
+    }
+    // Whitespace-only text between elements is dropped (the previous
+    // parser's behaviour); meaningful text is preserved.
+    if (textBuf.trim().length > 0)
+        out[TEXT_KEY] = textBuf;
+    // Attr-only element with empty body — emit explicit empty #text to
+    // match the previous parser's shape ({ '@_a': v, '#text': '' }).
+    if (noChildren && !noAttrs)
+        out[TEXT_KEY] = '';
+    return unboxScalar(out);
+};
+// Strip the `<?xml ?>` declaration TNode (if present) and pick the root
+// element. tXml emits at most one `?xml` TNode and exactly one root
+// element for any well-formed document.
+const findRootElement = (topLevel) => {
+    for (const n of topLevel) {
+        if (typeof n === 'string')
+            continue;
+        if (n.tagName === '?xml')
+            continue;
+        return n;
+    }
+    return undefined;
+};
+// Split root attributes into (xmlns* → namespaces bucket) and (rest →
+// stays on the element). Mirrors the previous parser's namespace
+// extraction.
+const splitRootAttrs = (root) => {
+    const rootAttrs = {};
+    const namespaces = {};
+    for (const [k, v] of Object.entries(root.attributes)) {
+        if (XMLNS_RE.test(k)) {
+            namespaces[`${ATTR_PREFIX}${k}`] = v;
+        }
+        else {
+            rootAttrs[k] = v;
+        }
+    }
+    return { rootAttrs, namespaces };
+};
+// Narrow txml's `unknown` return into the TNode shape we actually use.
+// A future txml major release that breaks the shape contract surfaces
+// here as a descriptive throw instead of a downstream undefined-access.
+//
+// Exported only so the throw branch can be exercised from a unit test;
+// real txml output is always an array, so the guard is otherwise
+// unreachable through a black-box parseString call.
+export const parsedToTNodes = (raw) => {
+    if (!Array.isArray(raw)) {
+        throw new Error(`txml.parse: expected an array of nodes, got ${typeof raw}`);
+    }
+    return raw;
+};
+const adapt = (xml) => {
+    const preprocessed = preprocessCdata(xml);
+    assertBalancedTags(preprocessed);
+    const top = parsedToTNodes(txmlParse(preprocessed, { keepComments: true }));
+    const root = findRootElement(top);
+    if (root === undefined) {
+        return { content: {}, namespaces: {} };
+    }
+    const { rootAttrs, namespaces } = splitRootAttrs(root);
+    const stripped = {
+        tagName: root.tagName,
+        attributes: rootAttrs,
+        children: root.children,
+    };
+    return {
+        content: { [root.tagName]: toCompact(stripped) },
+        namespaces,
+    };
+};
+// Drain a Readable into a single UTF-8 string. The deliberate
+// full-buffer approach matches the writer's: SF metadata files are
+// KB-MB, and txml's parse API is synchronous, so chunked feeding would
+// add no value while complicating error paths.
+const readStreamAsUtf8 = async (source) => {
+    const chunks = [];
+    for await (const c of source) {
+        chunks.push(typeof c === 'string' ? Buffer.from(c, 'utf8') : c);
+    }
+    return Buffer.concat(chunks).toString('utf8');
+};
+export class TxmlXmlParser {
+    parseString(xml) {
+        return adapt(xml);
+    }
+    async parseStream(source) {
+        return adapt(await readStreamAsUtf8(source));
+    }
+}
+//# sourceMappingURL=TxmlXmlParser.js.map

package/lib/adapter/TxmlXmlParser.js.map

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

package/lib/adapter/XmlParser.d.ts

@@ -1,8 +1,10 @@
+import type { Readable } from 'node:stream';
 import type { JsonObject } from '../types/jsonTypes.js';
-export interface ParsedXml {
+export interface NormalisedParseResult {
     readonly content: JsonObject;
     readonly namespaces: JsonObject;
 }
 export interface XmlParser {
-    parse(xml: string): ParsedXml;
+    parseString(xml: string): NormalisedParseResult;
+    parseStream(source: Readable): Promise<NormalisedParseResult>;
 }

package/lib/adapter/XmlSerializer.d.ts

@@ -1,4 +1,5 @@
+import type { Writable } from 'node:stream';
 import type { JsonArray, JsonObject } from '../types/jsonTypes.js';
 export interface XmlSerializer {
-    serialize(mergedOutput: JsonArray, namespaces: JsonObject): string;
+    writeTo(out: Writable, ordered: JsonArray, namespaces: JsonObject, eol?: '\n' | '\r\n', hasConflict?: boolean): Promise<void>;
 }

package/lib/adapter/writer/XmlStreamWriter.d.ts

@@ -0,0 +1,9 @@
+import type { Writable } from 'node:stream';
+import type { MergeConfig } from '../../types/conflictTypes.js';
+import type { JsonArray, JsonObject } from '../../types/jsonTypes.js';
+import type { XmlSerializer } from '../XmlSerializer.js';
+export declare class XmlStreamWriter implements XmlSerializer {
+    private readonly config;
+    constructor(config: MergeConfig);
+    writeTo(out: Writable, ordered: JsonArray, namespaces: JsonObject, eol?: '\n' | '\r\n', hasConflict?: boolean): Promise<void>;
+}