@salesforce/plugin-bre-to-cml 1.1.5 → 1.2.5

package/lib/shared/insurance/insurance-cml-merge.js

@@ -0,0 +1,569 @@
+import { CmlConstraint } from '../types/types.js';
+import { buildConstraintDeclaration, collectEmittedAttributes, sanitizeName, buildStageTransition, } from './insurance-rule-generator.js';
+import { quoteSoqlIdList } from './insurance-org.js';
+/**
+ * MERGE MODE (insurance-only): instead of building a fresh single-type CML and PATCH-replacing
+ * the org's curated "Gold Standard" ConstraintModel, this module reads the existing model text,
+ * computes each surcharge's PLATFORM-COMPATIBLE pathed rule key, and inserts/updates the
+ * `rule(...)` statement inside the correct existing leaf `type` block. The result is the full
+ * merged model, written to the same `${cmlApi}.cml` path the common import reads — so the import
+ * still does a whole-file PATCH, but the file now contains the curated model + the surcharge rules
+ * nested correctly rather than a flat overwrite.
+ *
+ * Why pathed keys: when a ProductSurcharge is persisted as ConstraintEngine the platform
+ * auto-generates `RuleKey` as `SC` + sanitize(ProductCode) of every segment in ProductPath (in
+ * order) + sanitize(apiName), joined by `__`. The Core surcharge engine matches the fired CML rule
+ * key against that auto-generated RuleKey by exact string, so the CML rule key MUST be pathed too.
+ */
+export const SURCHARGE_RULE_ACTION = 'InsuranceSurchargeRule';
+/**
+ * Builds the pathed surcharge rule key that mirrors the platform's auto-generated
+ * `ProductSurcharge.RuleKey`: prefix + every path-segment product code + apiName.
+ */
+export function buildPathedRuleKey(prefix, pathProductCodes, apiName, stageTransition) {
+    const parts = [prefix, ...pathProductCodes.map(sanitizeName)];
+    if (stageTransition)
+        parts.push(stageTransition);
+    parts.push(sanitizeName(apiName));
+    return parts.join('__');
+}
+/** Splits a `ProductPath` into its ordered Product2 ids (slash-separated). */
+export function splitProductPath(productPath) {
+    return productPath
+        .split('/')
+        .map((s) => s.trim())
+        .filter((s) => s.length > 0);
+}
+/**
+ * Reads the org's existing ConstraintModel text for the given CML API name, mirroring the lookup
+ * the common import uses (ExpressionSetDefinition.DeveloperName -> ExpressionSetDefinitionVersion).
+ * Returns undefined when no model exists yet (caller should then fall back to the build path).
+ */
+export async function fetchExistingConstraintModel(conn, cmlApiName) {
+    const def = await conn.sobject('ExpressionSetDefinition').findOne({ DeveloperName: cmlApiName }, ['Id']);
+    const defId = def?.Id;
+    if (!defId)
+        return undefined;
+    const version = await conn
+        .sobject('ExpressionSetDefinitionVersion')
+        .findOne({ ExpressionSetDefinitionId: defId }, ['Id']);
+    const versionId = version?.Id;
+    if (!versionId)
+        return undefined;
+    // ConstraintModel is a blob field: a plain row GET returns only a URL pointing at the blob, not
+    // its content. Fetch the blob endpoint directly — it streams back the raw CML text (the platform
+    // base64-decodes what the import PATCHes), so the body IS the model text and needs no decoding.
+    const blob = await conn.request(`/services/data/v${conn.getApiVersion()}/sobjects/ExpressionSetDefinitionVersion/${versionId}/ConstraintModel`);
+    const cmlText = typeof blob === 'string' ? blob : '';
+    return { versionId, cmlText };
+}
+/**
+ * Resolves Product2 id -> CML type name from the authoritative source: ExpressionSetConstraintObj
+ * rows with ConstraintModelTagType='Type' (ReferenceObjectId is the Product2 id, ConstraintModelTag
+ * is the CML type name). This is how the curated model binds products to type blocks, so it's the
+ * correct way to find which existing `type` block a surcharge's leaf product nests into.
+ */
+export async function fetchProductTypeTags(conn, productIds) {
+    const idToTag = new Map();
+    const idList = quoteSoqlIdList(productIds);
+    if (!idList)
+        return idToTag;
+    const result = await conn.query(`SELECT ReferenceObjectId, ConstraintModelTag FROM ExpressionSetConstraintObj WHERE ReferenceObjectId IN (${idList}) AND ConstraintModelTagType = 'Type'`);
+    for (const r of result.records) {
+        if (r.ReferenceObjectId && r.ConstraintModelTag)
+            idToTag.set(r.ReferenceObjectId, r.ConstraintModelTag);
+    }
+    return idToTag;
+}
+function escapeRegExp(value) {
+    return value.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+}
+/**
+ * [Fix #4] Detects the dominant line ending of a CML text by counting CRLF vs bare-LF occurrences.
+ * Returns `\r\n` when at least one CRLF appears AND CRLFs are at least as common as bare LFs (mixed
+ * CRLF-majority files still get CRLF; pure-LF and empty files get `\n`). Used by the INSERT path so
+ * a CRLF-curated model stays byte-clean after splicing. The L2 replace path preserves the line
+ * ending of the REPLACED span directly, so this only matters for new inserts.
+ */
+function detectDominantLineEnding(cml) {
+    const crlfCount = (cml.match(/\r\n/g) ?? []).length;
+    // Subtract CRLFs from the total LF count to get the BARE-LF count (an LF preceded by CR is part of a CRLF).
+    const totalLf = (cml.match(/\n/g) ?? []).length;
+    const bareLfCount = totalLf - crlfCount;
+    return crlfCount > 0 && crlfCount >= bareLfCount ? '\r\n' : '\n';
+}
+/**
+ * Brace-matches the block whose opening `{` is at `openIdx` and returns the index of its matched
+ * closing `}`. The scanner ignores `{`/`}`/`"` that appear inside double-quoted string literals,
+ * `//` line comments, and `/* *\/` block comments — a curated Gold-Standard model routinely carries
+ * comments, and a stray `}` inside one (or inside a quoted rule value) must NOT be mistaken for the
+ * structural close, which would return a too-early closeIdx and splice a new rule mid-statement.
+ */
+function matchClosingBrace(cml, openIdx) {
+    let depth = 0;
+    let inString = false;
+    let inLineComment = false;
+    let inBlockComment = false;
+    for (let i = openIdx; i < cml.length; i++) {
+        const ch = cml[i];
+        const next = cml[i + 1];
+        if (inLineComment) {
+            if (ch === '\n')
+                inLineComment = false;
+            continue;
+        }
+        if (inBlockComment) {
+            if (ch === '*' && next === '/') {
+                inBlockComment = false;
+                i++;
+            }
+            continue;
+        }
+        if (inString) {
+            if (ch === '\\') {
+                i++; // skip the escaped character
+            }
+            else if (ch === '"') {
+                inString = false;
+            }
+            continue;
+        }
+        if (ch === '/' && next === '/') {
+            inLineComment = true;
+            i++;
+        }
+        else if (ch === '/' && next === '*') {
+            inBlockComment = true;
+            i++;
+        }
+        else if (ch === '"') {
+            inString = true;
+        }
+        else if (ch === '{') {
+            depth++;
+        }
+        else if (ch === '}') {
+            depth--;
+            if (depth === 0)
+                return i;
+        }
+    }
+    return undefined;
+}
+/**
+ * Locates a `type <name> [: Parent] { ... }` block and returns the index of its opening brace and
+ * its brace-matched closing brace. Block-less forward declarations (`type X : Y;`) are skipped
+ * because the regex requires a `{` before any `;`. Word-boundary after the name keeps `Auto` from
+ * matching `AutoSilver`/`AutoDriver`.
+ *
+ * M1/M5: when more than one block declares the same type name the result is AMBIGUOUS — rather than
+ * guessing the first lexical match (which could nest the surcharge under the wrong product), the
+ * caller is told via `undefined` + a distinct ambiguity reason. A single unique match resolves
+ * normally.
+ */
+function findTypeBlock(cml, typeName, scan = blankComments(cml)) {
+    // [Fix #1] Run the anchor regex against the comment-blanked, length-preserving SCAN view rather
+    // than the raw cml. matchClosingBrace below is comment-aware; if the anchor regex ran on raw cml a
+    // commented-out `type Collision { ... }` header could be picked up as a real declaration (and then
+    // matchClosingBrace, which ignores comment braces, would either return the WRONG closeIdx or
+    // confuse a real same-name type for an "ambiguous" duplicate). The scan view zeroes the comment
+    // characters to spaces while preserving offsets, so the indices returned here still slice the
+    // real cml correctly. The default-argument pattern lets callers reuse a single hoisted scan
+    // across multiple lookups (Fix #1 hoisting site).
+    const re = new RegExp(`(^|\\n)[ \\t]*type[ \\t]+${escapeRegExp(typeName)}\\b[^{;]*\\{`, 'g');
+    const matches = [];
+    let m;
+    while ((m = re.exec(scan)) !== null) {
+        const openIdx = scan.indexOf('{', m.index);
+        if (openIdx >= 0)
+            matches.push(openIdx);
+    }
+    if (matches.length === 0)
+        return undefined;
+    if (matches.length > 1)
+        return { ambiguous: true };
+    const openIdx = matches[0];
+    const closeIdx = matchClosingBrace(cml, openIdx);
+    if (closeIdx === undefined)
+        return undefined;
+    return { openIdx, closeIdx };
+}
+/** Builds the `rule(...)` statement for a surcharge, using the same constraint generator as build mode. */
+export function buildSurchargeRuleStatement(declaration, ruleKey) {
+    return CmlConstraint.createRuleConstraint(declaration, SURCHARGE_RULE_ACTION, ruleKey, 'True').generateCml();
+}
+/**
+ * Prepares the pathed-rule descriptors for a set of parsed surcharge records.
+ * `productIdToCode` and `productIdToType` must already cover every ProductPath segment.
+ */
+export function buildPathedSurchargeRules(prefix, ruleDefs, productIdToCode, productIdToType) {
+    return ruleDefs.map(({ record, ruleDef }) => {
+        const apiName = ruleDef.apiName ?? record.Name;
+        const segments = splitProductPath(record.ProductPath);
+        const pathCodes = segments.map((id) => productIdToCode.get(id) ?? id);
+        const stageTransition = buildStageTransition(ruleDef.underwritingRuleGroup);
+        const ruleKey = buildPathedRuleKey(prefix, pathCodes, apiName, stageTransition);
+        const leafProductId = segments[segments.length - 1];
+        const typeName = leafProductId ? productIdToType.get(leafProductId) : undefined;
+        const declaration = buildConstraintDeclaration(ruleDef);
+        const statement = buildSurchargeRuleStatement(declaration, ruleKey);
+        // M7: only attributes from conditions that actually emitted CML (non-null buildConditionExpression)
+        // count as "referenced". Attributes from conditions the safe-literal guard / unknown-operator
+        // filter dropped never appear in the declaration, so warning about them would be spurious noise.
+        const referencedAttributes = Array.from(collectEmittedAttributes([{ ruleDef }]));
+        return {
+            recordId: record.Id,
+            recordName: record.Name,
+            apiName,
+            ruleKey,
+            pathProductCodes: pathCodes,
+            typeName,
+            statement,
+            referencedAttributes,
+        };
+    });
+}
+/**
+ * Merges the pathed surcharge `rule(...)` statements into the existing CML text. If the rule key is
+ * already present, the existing statement line is replaced in place (idempotent). Otherwise the
+ * statement is inserted just before the closing brace of the leaf `type` block. Rules whose leaf type
+ * block can't be found are skipped (reported, never silently dropped).
+ */
+export function mergeSurchargeRules(existingCml, rules) {
+    let cml = existingCml;
+    const placements = [];
+    const skips = [];
+    const attributeWarnings = [];
+    // Capture the curated model text BEFORE any rule statements are spliced in. The attribute-presence
+    // check must run against this baseline, not the progressively-mutated `cml`: a rule's own inserted
+    // statement always contains its referenced attribute (the declaration sanitizes attribute names the
+    // same way), so checking the mutated text would always find it and suppress every warning.
+    const baseCml = existingCml;
+    // [Fix #1] Comment-blanked, length-preserving view of the BASELINE cml — shared by every
+    // collectTypeScopeText / baseline lookup so the attribute-presence anchor regex ignores comment
+    // contents without losing offset alignment. The per-iteration scan for findTypeBlock /
+    // findSurchargeStatement is computed against the current (possibly mutated) `cml` inside the loop.
+    const baseScan = blankComments(baseCml);
+    // [Fix #4] Detect the dominant line ending ONCE so the INSERT path can splice in the model's own
+    // convention (CRLF on Windows-curated files, LF elsewhere). Before this, a hardcoded `\n` mixed
+    // bare LFs into a CRLF model and produced a byte-unclean diff. The L2 replace path already
+    // preserves the original line ending of the replaced span; this guard does the same for inserts.
+    const eol = detectDominantLineEnding(existingCml);
+    // H1: keys this run has already placed. A second rule resolving to the same pathed key must be
+    // reported as a collision skip, NOT treated as an idempotent replace of the first rule's
+    // just-inserted statement (which would silently drop the second record's distinct declaration).
+    const placedKeys = new Set();
+    for (const rule of rules) {
+        if (placedKeys.has(rule.ruleKey)) {
+            skips.push({
+                rule,
+                reason: `duplicate pathed rule key '${rule.ruleKey}' collides with another rule in this run (${rule.recordName} skipped)`,
+            });
+            continue;
+        }
+        // [Fix #3] Refuse the destructive replace path for malformed/empty-ProductPath input. An empty
+        // pathProductCodes degenerates the rule key to `SC__<apiName>`, which could COINCIDENTALLY match
+        // a curated short-keyed line and clobber it; an absent typeName means we'd have nowhere to
+        // re-insert and would also have no way to scope the replace to the correct block. Short-circuit
+        // these as skips BEFORE findSurchargeStatement runs so a malformed surcharge can never reach the
+        // replace splice. The pre-existing intra-run duplicate guard above is preserved.
+        if (rule.pathProductCodes.length === 0) {
+            skips.push({
+                rule,
+                reason: `empty ProductPath for ${rule.recordName}; refusing to merge a non-pathed surcharge`,
+            });
+            continue;
+        }
+        if (!rule.typeName) {
+            skips.push({ rule, reason: `no CML type tag found for the leaf product of ${rule.recordName}` });
+            continue;
+        }
+        // [Fix #1] One comment-blanked view of the current `cml` reused by both the replace-anchor
+        // search and the type-block search this iteration. Recomputed per-iteration because a prior
+        // rule's splice may have mutated `cml`.
+        const scan = blankComments(cml);
+        // C2/M4/L1: only a REAL surcharge `rule(...)` statement carrying this exact key in the
+        // action-scope slot counts as "present". A bare quoted-key substring inside an unrelated rule's
+        // value, a longer key, or a comment must NOT trigger a destructive line replace.
+        const stmt = findSurchargeStatement(cml, rule.ruleKey, scan);
+        if (stmt) {
+            // [Fix #2] Splice ONLY the matched statement span (`rule(...);`) rather than the entire
+            // physical line. A curated line carrying two `rule(...);` statements (rare but valid) keeps
+            // the unrelated statement intact. Block formatting is preserved as long as the matched
+            // statement is the only thing on its line (the common case): the original indent prefix lives
+            // in `cml[lineStart..stmt.start)` and is left untouched by the splice; only `cml[start..end)`
+            // is replaced. If other code shares the line, that code stays in place verbatim too.
+            cml = cml.slice(0, stmt.start) + rule.statement + cml.slice(stmt.end);
+            placements.push({ rule, status: 'replaced' });
+            placedKeys.add(rule.ruleKey);
+            collectAttributeWarning(baseCml, rule, attributeWarnings, baseScan);
+            continue;
+        }
+        const block = findTypeBlock(cml, rule.typeName, scan);
+        if (!block) {
+            skips.push({ rule, reason: `type block '${rule.typeName}' not found in existing model` });
+            continue;
+        }
+        if ('ambiguous' in block) {
+            skips.push({
+                rule,
+                reason: `type block '${rule.typeName}' is ambiguous (multiple/duplicate declarations) in existing model; skipping ${rule.recordName} rather than guessing`,
+            });
+            continue;
+        }
+        // Insert before the closing brace, indented one level (4 spaces), with a leading blank line.
+        // [Fix #4] Use the dominant line ending of the original model, not a hardcoded `\n`.
+        const insertion = `${eol}    ${rule.statement}${eol}`;
+        cml = cml.slice(0, block.closeIdx) + insertion + cml.slice(block.closeIdx);
+        placements.push({ rule, status: 'inserted' });
+        placedKeys.add(rule.ruleKey);
+        collectAttributeWarning(baseCml, rule, attributeWarnings, baseScan);
+    }
+    return { mergedCml: cml, placements, skips, attributeWarnings };
+}
+/**
+ * C2/M4/L1: finds the single-line surcharge `rule(...)` statement that carries `ruleKey` in the
+ * action-scope slot — i.e. `rule(<decl>, "InsuranceSurchargeRule", "<ruleKey>", ...`. Only such a
+ * real statement is a legitimate replace target. A bare `"<ruleKey>"` substring appearing inside an
+ * unrelated rule's VALUE, inside a `//` line comment, inside a `/* *\/` block comment, or as part of
+ * a LONGER key is deliberately NOT matched, so the caller falls through to the insert path instead of
+ * clobbering curated text.
+ *
+ * Comment-awareness: the anchor scan runs against a length-preserving COPY of `cml` in which every
+ * character inside a `//`/`/* *\/` comment is blanked to a space (newlines kept). Offsets into that
+ * copy therefore map 1:1 onto the original, so the returned line span still slices the real text —
+ * but a rule-shaped string sitting inside a (single- or multi-line) block comment can no longer match
+ * the anchor and be clobbered.
+ *
+ * Returns the start/end offsets of the matched line (lineEnd points at the newline / EOF, excluding
+ * any trailing `\r` so the caller can re-emit the original CRLF/LF).
+ */
+function findSurchargeStatement(cml, ruleKey, scan = blankComments(cml)) {
+    // [Fix #2] Match the surcharge rule statement and return the PRECISE span from the `rule(` token
+    // to just past its terminating `;`. The previous implementation returned a whole-line span which
+    // clobbered any OTHER `rule(...);` statement sharing the same physical line. The global flag is
+    // required so a coincidental earlier match (e.g. an unrelated rule whose VALUE quotes the key
+    // before the real statement) can be skipped by walking to subsequent matches via `exec`. We do
+    // NOT use a single-line anchor: a real surcharge statement is single-line by convention, but the
+    // anchor's `[^;\r\n]*` constraint already guarantees the prefix is single-line; what matters here
+    // is bounding the SPAN, not the search.
+    const anchor = new RegExp(`rule\\([^;\\r\\n]*"${escapeRegExp(SURCHARGE_RULE_ACTION)}"\\s*,\\s*"${escapeRegExp(ruleKey)}"\\s*,`, 'g');
+    let m;
+    while ((m = anchor.exec(scan)) !== null) {
+        const start = m.index;
+        // Walk forward in the SCAN view (comment chars blanked) to find the terminating `;`. Using scan
+        // keeps a `;` that lives inside a `// ...` or `/* ... */` comment from terminating the span.
+        // String-literal contents within the statement are kept intact by blankComments, so a `;` inside
+        // a quoted RHS value is also ignored — find the structural `;` by walking past string literals.
+        const semi = findStructuralSemicolon(scan, m.index + m[0].length);
+        if (semi === undefined) {
+            // Malformed unterminated rule(...) — refuse to splice rather than guessing.
+            return undefined;
+        }
+        return { start, end: semi + 1 };
+    }
+    return undefined;
+}
+/**
+ * [Fix #2] Walks forward from `from` returning the index of the structural `;` terminating the
+ * current statement. The scan is comment-blanked, so `;` inside `//` or `/* *\/` cannot terminate.
+ * Double-quoted string literals are still present in the scan (blankComments only blanks comments);
+ * skip them here so a `;` inside a quoted value is ignored.
+ */
+function findStructuralSemicolon(scan, from) {
+    let inString = false;
+    for (let i = from; i < scan.length; i++) {
+        const ch = scan[i];
+        if (inString) {
+            if (ch === '\\') {
+                i++;
+            }
+            else if (ch === '"') {
+                inString = false;
+            }
+            continue;
+        }
+        if (ch === '"') {
+            inString = true;
+        }
+        else if (ch === ';') {
+            return i;
+        }
+    }
+    return undefined;
+}
+/**
+ * Returns a copy of `cml` with identical length where every character inside a `//` line comment or
+ * a `/* *\/` block comment is replaced by a space (newlines preserved). Used so the replace-anchor
+ * scan can ignore comment contents without losing offset alignment with the original text. String
+ * literals are left intact: the anchor itself requires the literal `"InsuranceSurchargeRule"` action
+ * token, so a same-key VALUE inside another rule's string still won't satisfy the action-scope shape.
+ */
+function blankComments(cml) {
+    const out = cml.split('');
+    let inString = false;
+    let inLineComment = false;
+    let inBlockComment = false;
+    for (let i = 0; i < cml.length; i++) {
+        const ch = cml[i];
+        const next = cml[i + 1];
+        if (inLineComment) {
+            if (ch === '\n')
+                inLineComment = false;
+            else
+                out[i] = ' ';
+            continue;
+        }
+        if (inBlockComment) {
+            if (ch === '*' && next === '/') {
+                out[i] = ' ';
+                out[i + 1] = ' ';
+                i++;
+                inBlockComment = false;
+            }
+            else if (ch !== '\n') {
+                out[i] = ' ';
+            }
+            continue;
+        }
+        if (inString) {
+            if (ch === '\\') {
+                i++; // skip escaped char (left intact)
+            }
+            else if (ch === '"') {
+                inString = false;
+            }
+            continue;
+        }
+        if (ch === '/' && next === '/') {
+            inLineComment = true;
+            out[i] = ' ';
+            out[i + 1] = ' ';
+            i++;
+        }
+        else if (ch === '/' && next === '*') {
+            inBlockComment = true;
+            out[i] = ' ';
+            out[i + 1] = ' ';
+            i++;
+        }
+        else if (ch === '"') {
+            inString = true;
+        }
+    }
+    return out.join('');
+}
+/**
+ * Surfaces (does not auto-fix) rule declarations that reference an attribute not present anywhere in
+ * the curated model. In merge mode we never inject `string <attr>;` into the curated model, so an
+ * unknown attribute would fail to compile on import — better to warn the engineer than to mangle the
+ * Gold Standard. Attributes already present are trusted to be visible via the coverage type hierarchy.
+ *
+ * IMPORTANT: `baseCml` must be the ORIGINAL model text, captured before any surcharge statement was
+ * spliced in. Checking the post-insertion text would always find the attribute inside the rule's own
+ * just-inserted declaration (which sanitizes attribute names identically), suppressing every warning.
+ */
+function collectAttributeWarning(baseCml, rule, warnings, baseScan) {
+    // H5/M3: scope the presence check to the leaf type block plus its `: Parent` ancestry, with
+    // comments and string literals stripped. CML attribute visibility is hierarchy-scoped, so an
+    // unscoped whole-file `\battr\b` test gives false negatives (an attribute named only in a comment,
+    // a string value, or an unrelated SIBLING type would wrongly suppress a real absent-attribute
+    // warning).
+    //
+    // H5 (fallback facet): when the leaf scope can't be resolved — typeName is undefined, or the leaf
+    // `type` block is ambiguous/duplicate so collectTypeScopeText returns undefined — we have NO
+    // hierarchy-scoped view to prove the attribute is visible. We must NOT widen to the whole model
+    // (that re-introduces the sibling-type false negative on exactly the records that hit the replace
+    // path before type resolution). Fail VISIBLE instead: treat the scope as empty so an attribute we
+    // cannot prove visible is reported, never silently suppressed.
+    const scope = rule.typeName ? collectTypeScopeText(baseCml, rule.typeName, undefined, baseScan) ?? '' : '';
+    for (const attr of rule.referencedAttributes) {
+        const present = new RegExp(`\\b${escapeRegExp(attr)}\\b`).test(scope);
+        if (!present) {
+            warnings.push(`${rule.recordName}: declaration references '${attr}' which is absent from the model`);
+        }
+    }
+}
+/**
+ * Removes `//` line comments, `/* *\/` block comments, and double-quoted string-literal CONTENTS
+ * from CML text so that attribute-presence checks match only real declarations/expressions, never a
+ * name that merely appears in a comment or a string value. String delimiters are kept so structure
+ * is preserved; only the interior characters are blanked.
+ */
+function stripCommentsAndStrings(cml) {
+    let out = '';
+    let inString = false;
+    let inLineComment = false;
+    let inBlockComment = false;
+    for (let i = 0; i < cml.length; i++) {
+        const ch = cml[i];
+        const next = cml[i + 1];
+        if (inLineComment) {
+            if (ch === '\n') {
+                inLineComment = false;
+                out += ch;
+            }
+            continue;
+        }
+        if (inBlockComment) {
+            if (ch === '*' && next === '/') {
+                inBlockComment = false;
+                i++;
+            }
+            continue;
+        }
+        if (inString) {
+            if (ch === '\\') {
+                i++; // skip escaped char (and drop it)
+            }
+            else if (ch === '"') {
+                inString = false;
+                out += '"';
+            }
+            continue;
+        }
+        if (ch === '/' && next === '/') {
+            inLineComment = true;
+            i++;
+        }
+        else if (ch === '/' && next === '*') {
+            inBlockComment = true;
+            i++;
+        }
+        else if (ch === '"') {
+            inString = true;
+            out += '"';
+        }
+        else {
+            out += ch;
+        }
+    }
+    return out;
+}
+/**
+ * Builds the comment/string-stripped text of the leaf `type <name> { ... }` block plus every
+ * `: Parent` ancestor block reachable in the model, concatenated. Returns undefined when the leaf
+ * block can't be resolved (or is ambiguous), so the caller can fall back. Bounded against cycles by
+ * a visited set.
+ */
+function collectTypeScopeText(cml, leafType, visited = new Set(), scan = blankComments(cml)) {
+    if (visited.has(leafType))
+        return '';
+    visited.add(leafType);
+    const block = findTypeBlock(cml, leafType, scan);
+    if (!block || 'ambiguous' in block)
+        return undefined;
+    const headerStart = cml.lastIndexOf('\n', block.openIdx) + 1;
+    const header = cml.slice(headerStart, block.openIdx);
+    const body = cml.slice(block.openIdx, block.closeIdx + 1);
+    let text = stripCommentsAndStrings(body);
+    // Resolve `type Leaf : Parent {` ancestry and append parent scope(s).
+    const parentMatch = /:\s*([A-Za-z_]\w*)/.exec(header);
+    if (parentMatch) {
+        const parentText = collectTypeScopeText(cml, parentMatch[1], visited, scan);
+        if (parentText)
+            text += '\n' + parentText;
+    }
+    return text;
+}
+//# sourceMappingURL=insurance-cml-merge.js.map

package/lib/shared/insurance/insurance-cml-merge.js.map

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

package/lib/shared/insurance/insurance-org.d.ts

@@ -5,5 +5,23 @@ import { Connection } from '@salesforce/core';
  * --uw-file, so validating here prevents SOQL injection through the `IN (...)` clause.
  */
 export declare function quoteSoqlIdList(ids: Iterable<string>): string;
-export declare function fetchProductCodes(conn: Connection, productIds: Set<string>): Promise<Map<string, string>>;
+/** Optional hooks for {@link fetchProductCodes}. Additive so existing callers need no changes. */
+export type FetchProductCodesOptions = {
+    /**
+     * Invoked once per product id whose code had to be derived from a fallback (Name, then Id)
+     * because `ProductCode` was blank. The pathed rule key is built from these codes, so a fallback
+     * silently yields a key that will NOT match the platform's auto-generated RuleKey — the rule then
+     * imports cleanly but never fires. Surfacing the fallback lets the command layer warn instead of
+     * dropping the surcharge silently (M2).
+     */
+    onFallback?: (productId: string) => void;
+    /**
+     * When provided, populated with each product's Name (Id -> Name) from the same query. The common
+     * `cml import as-expression-set` resolves a Type association's Product2 by Name, so the convert
+     * layer must emit Name — not ProductCode — as the association reference value. Collected here to
+     * avoid a second round-trip. Products with a null Name are omitted (they cannot match by name).
+     */
+    collectNames?: Map<string, string>;
+};
+export declare function fetchProductCodes(conn: Connection, productIds: Set<string>, options?: FetchProductCodesOptions): Promise<Map<string, string>>;
 export declare function discoverCmlApiByProducts(conn: Connection, productIds: Set<string>): Promise<string | undefined>;

package/lib/shared/insurance/insurance-org.js

@@ -11,14 +11,22 @@ export function quoteSoqlIdList(ids) {
         .map((id) => `'${id}'`)
         .join(',');
 }
-export async function fetchProductCodes(conn, productIds) {
+export async function fetchProductCodes(conn, productIds, options = {}) {
     const idToCode = new Map();
     const idList = quoteSoqlIdList(productIds);
     if (!idList)
         return idToCode;
     const result = await conn.query(`SELECT Id, ProductCode, Name FROM Product2 WHERE Id IN (${idList})`);
     for (const p of result.records) {
+        // Keep the fallback chain (don't break callers), but make it observable: a null ProductCode
+        // means the resolved code did NOT come from the platform-authoritative field.
+        if (p.ProductCode == null) {
+            options.onFallback?.(p.Id);
+        }
         idToCode.set(p.Id, p.ProductCode ?? p.Name ?? p.Id);
+        if (p.Name != null) {
+            options.collectNames?.set(p.Id, p.Name);
+        }
     }
     return idToCode;
 }

package/lib/shared/insurance/insurance-org.js.map

@@ -1 +1 @@
-{"version":3,"file":"insurance-org.js","sourceRoot":"","sources":["../../../src/shared/insurance/insurance-org.ts"],"names":[],"mappings":"AAiBA,sEAAsE;AACtE,MAAM,qBAAqB,GAAG,sBAAsB,CAAC;AAErD;;;;GAIG;AACH,MAAM,UAAU,eAAe,CAAC,GAAqB;IACnD,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC;SACnB,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,qBAAqB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;SAC9C,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,IAAI,EAAE,GAAG,CAAC;SACtB,IAAI,CAAC,GAAG,CAAC,CAAC;AACf,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,IAAgB,EAAE,UAAuB;IAC/E,MAAM,QAAQ,GAAG,IAAI,GAAG,EAAkB,CAAC;IAC3C,MAAM,MAAM,GAAG,eAAe,CAAC,UAAU,CAAC,CAAC;IAC3C,IAAI,CAAC,MAAM;QAAE,OAAO,QAAQ,CAAC;IAE7B,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,KAAK,CAC7B,2DAA2D,MAAM,GAAG,CACrE,CAAC;IACF,KAAK,MAAM,CAAC,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;QAC/B,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,WAAW,IAAI,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC;IACtD,CAAC;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,wBAAwB,CAAC,IAAgB,EAAE,UAAuB;IACtF,MAAM,MAAM,GAAG,eAAe,CAAC,UAAU,CAAC,CAAC;IAC3C,IAAI,CAAC,MAAM;QAAE,OAAO,SAAS,CAAC;IAE9B,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,KAAK,CAClC,sFAAsF,MAAM,+CAA+C,CAC5I,CAAC;IACF,IAAI,WAAW,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,SAAS,CAAC;IAEvD,MAAM,IAAI,GAAG,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC;IACpD,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,IAAI,CAAC;QAAE,OAAO,SAAS,CAAC;IAExD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,KAAK,CAAsB,iDAAiD,IAAI,GAAG,CAAC,CAAC;IACjH,IAAI,QAAQ,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,SAAS,CAAC;IAEpD,OAAO,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;AACrC,CAAC"}
+{"version":3,"file":"insurance-org.js","sourceRoot":"","sources":["../../../src/shared/insurance/insurance-org.ts"],"names":[],"mappings":"AAiBA,sEAAsE;AACtE,MAAM,qBAAqB,GAAG,sBAAsB,CAAC;AAErD;;;;GAIG;AACH,MAAM,UAAU,eAAe,CAAC,GAAqB;IACnD,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC;SACnB,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,qBAAqB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;SAC9C,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,IAAI,EAAE,GAAG,CAAC;SACtB,IAAI,CAAC,GAAG,CAAC,CAAC;AACf,CAAC;AAqBD,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACrC,IAAgB,EAChB,UAAuB,EACvB,UAAoC,EAAE;IAEtC,MAAM,QAAQ,GAAG,IAAI,GAAG,EAAkB,CAAC;IAC3C,MAAM,MAAM,GAAG,eAAe,CAAC,UAAU,CAAC,CAAC;IAC3C,IAAI,CAAC,MAAM;QAAE,OAAO,QAAQ,CAAC;IAE7B,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,KAAK,CAC7B,2DAA2D,MAAM,GAAG,CACrE,CAAC;IACF,KAAK,MAAM,CAAC,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;QAC/B,4FAA4F;QAC5F,8EAA8E;QAC9E,IAAI,CAAC,CAAC,WAAW,IAAI,IAAI,EAAE,CAAC;YAC1B,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QAC7B,CAAC;QACD,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,WAAW,IAAI,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC;QACpD,IAAI,CAAC,CAAC,IAAI,IAAI,IAAI,EAAE,CAAC;YACnB,OAAO,CAAC,YAAY,EAAE,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC;QAC1C,CAAC;IACH,CAAC;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,wBAAwB,CAAC,IAAgB,EAAE,UAAuB;IACtF,MAAM,MAAM,GAAG,eAAe,CAAC,UAAU,CAAC,CAAC;IAC3C,IAAI,CAAC,MAAM;QAAE,OAAO,SAAS,CAAC;IAE9B,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,KAAK,CAClC,sFAAsF,MAAM,+CAA+C,CAC5I,CAAC;IACF,IAAI,WAAW,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,SAAS,CAAC;IAEvD,MAAM,IAAI,GAAG,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC;IACpD,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,IAAI,CAAC;QAAE,OAAO,SAAS,CAAC;IAExD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,KAAK,CAAsB,iDAAiD,IAAI,GAAG,CAAC,CAAC;IACjH,IAAI,QAAQ,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,SAAS,CAAC;IAEpD,OAAO,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;AACrC,CAAC"}