@usejunior/docx-core 0.23.0 → 0.24.0

package/dist/primitives/structural_validation.js

@@ -0,0 +1,301 @@
+import { getParagraphBookmarkId } from './bookmarks.js';
+import { getDirectChildrenByName } from './dom-helpers.js';
+function hierarchyLevel(node) {
+    if (!node)
+        return null;
+    if (node.heading?.level != null && (node.heading.source === 'word_style'
+        || node.heading.source === 'list_metadata'
+        || node.heading.source === 'outline_level'))
+        return node.heading.level;
+    if (node.numbering.is_auto_numbered && node.numbering.ilvl != null)
+        return node.numbering.ilvl + 1;
+    return null;
+}
+function structuralStyle(node) {
+    return node?.paragraph_style_id ?? node?.style ?? '';
+}
+const parentChildSlicing = (nodes, context) => {
+    const anchorIndex = nodes.findIndex((node) => node.id === context.anchorId);
+    const source = nodes.find((node) => node.id === (context.styleSourceId ?? context.anchorId));
+    if (anchorIndex < 0 || !source)
+        return [];
+    const intendedLevel = hierarchyLevel(source);
+    if (intendedLevel == null)
+        return [];
+    // The insertion lands in the gap between `gapIndex` and `gapIndex + 1`.
+    const gapIndex = context.position === 'AFTER' ? anchorIndex : anchorIndex - 1;
+    // The run the new paragraph would capture: every following paragraph until
+    // one at or above the intended level.
+    let firstCaptured;
+    let lastCapturedId;
+    for (let index = gapIndex + 1; index < nodes.length; index += 1) {
+        const level = hierarchyLevel(nodes[index]);
+        if (level != null && level <= intendedLevel)
+            break;
+        if (level != null && !firstCaptured)
+            firstCaptured = { id: nodes[index].id, level };
+        lastCapturedId = nodes[index].id;
+    }
+    if (!firstCaptured)
+        return [];
+    // Slicing only happens when the captured paragraph already has a parent
+    // before the gap: the insertion would steal it from that parent.
+    let hasExistingParent = false;
+    for (let index = gapIndex; index >= 0; index -= 1) {
+        const level = hierarchyLevel(nodes[index]);
+        if (level != null && level < firstCaptured.level) {
+            hasExistingParent = true;
+            break;
+        }
+    }
+    if (!hasExistingParent)
+        return [];
+    const suggestedAnchorId = lastCapturedId;
+    return [{
+            code: 'PARENT_CHILD_SLICE',
+            severity: 'error',
+            operation_id: context.operationId,
+            anchor_id: context.anchorId,
+            message: `Insertion ${context.operationId} would separate ${firstCaptured.id} from its existing parent; insert after ${suggestedAnchorId} instead.`,
+            evidence: {
+                anchor_level: hierarchyLevel(nodes[anchorIndex]),
+                intended_level: intendedLevel,
+                first_descendant_id: firstCaptured.id,
+                first_descendant_level: firstCaptured.level,
+                style_source_id: context.styleSourceId,
+            },
+            suggested_anchor_id: suggestedAnchorId,
+            suggested_position: 'AFTER',
+        }];
+};
+const listLevelMismatch = (nodes, context) => {
+    const anchor = nodes.find((node) => node.id === context.anchorId);
+    const source = nodes.find((node) => node.id === (context.styleSourceId ?? context.anchorId));
+    if (!anchor?.numbering.is_auto_numbered || !source?.numbering.is_auto_numbered)
+        return [];
+    if (anchor.numbering.ilvl == null || source.numbering.ilvl == null || anchor.numbering.ilvl === source.numbering.ilvl)
+        return [];
+    return [{
+            code: 'LIST_LEVEL_MISMATCH',
+            severity: 'warning',
+            operation_id: context.operationId,
+            anchor_id: context.anchorId,
+            message: `Insertion ${context.operationId} uses list level ${source.numbering.ilvl} beside level ${anchor.numbering.ilvl}; confirm that nesting is intentional.`,
+            evidence: {
+                anchor_level: anchor.numbering.ilvl + 1,
+                intended_level: source.numbering.ilvl + 1,
+                style_source_id: context.styleSourceId,
+                anchor_num_id: anchor.numbering.num_id ?? undefined,
+                style_source_num_id: source.numbering.num_id ?? undefined,
+            },
+        }];
+};
+const midListRenumbering = (nodes, context) => {
+    const anchorIndex = nodes.findIndex((node) => node.id === context.anchorId);
+    const source = nodes.find((node) => node.id === (context.styleSourceId ?? context.anchorId));
+    if (anchorIndex < 0 || !source?.numbering.is_auto_numbered)
+        return [];
+    const anchor = nodes[anchorIndex];
+    const neighbor = context.position === 'AFTER' ? nodes[anchorIndex + 1] : nodes[anchorIndex - 1];
+    if (!anchor.numbering.is_auto_numbered || !neighbor?.numbering.is_auto_numbered)
+        return [];
+    const sameListWindow = anchor.numbering.num_id != null
+        && anchor.numbering.num_id === neighbor.numbering.num_id
+        && anchor.numbering.ilvl === neighbor.numbering.ilvl;
+    if (!sameListWindow || source.numbering.num_id == null || source.numbering.num_id === anchor.numbering.num_id)
+        return [];
+    return [{
+            code: 'MID_LIST_RENUMBERING',
+            severity: 'error',
+            operation_id: context.operationId,
+            anchor_id: context.anchorId,
+            message: `Insertion ${context.operationId} would introduce numbering ${source.numbering.num_id} inside list ${anchor.numbering.num_id}; use a peer from the surrounding list.`,
+            evidence: {
+                anchor_level: hierarchyLevel(anchor),
+                intended_level: hierarchyLevel(source),
+                style_source_id: context.styleSourceId,
+                anchor_num_id: anchor.numbering.num_id ?? undefined,
+                style_source_num_id: source.numbering.num_id ?? undefined,
+            },
+            suggested_anchor_id: anchor.id,
+        }];
+};
+export const structuralValidators = [
+    parentChildSlicing,
+    listLevelMismatch,
+    midListRenumbering,
+];
+export function validateStructuralInsertion(nodes, context) {
+    return structuralValidators.flatMap((validator) => validator(nodes, context));
+}
+export function validateStructuralInsertions(nodes, contexts, options = {}) {
+    const diagnostics = contexts.flatMap((context) => validateStructuralInsertion(nodes, context));
+    diagnostics.push(...validateBondedPairs(nodes, contexts, options));
+    return diagnostics;
+}
+function sourceNode(nodes, context) {
+    return nodes.find((node) => node.id === (context.styleSourceId ?? context.anchorId));
+}
+/**
+ * A heading style is bonded to a follower style only when the source shows the
+ * Word run-in construction (a style-separator paragraph mark on the heading)
+ * followed by the same follower style at the same indent, at least twice.
+ * Title casing and punctuation are not structural authorities.
+ */
+function bondedTransitions(nodes, options) {
+    const runInHeadingIds = options.runInHeadingIds;
+    if (!runInHeadingIds || runInHeadingIds.size === 0)
+        return [];
+    const transitions = new Map();
+    for (let index = 0; index < nodes.length - 1; index += 1) {
+        const heading = nodes[index];
+        const body = nodes[index + 1];
+        if (!runInHeadingIds.has(heading.id))
+            continue;
+        if (hierarchyLevel(heading) == null || hierarchyLevel(body) != null)
+            continue;
+        if (Math.abs(heading.paragraph_indents_pt.left - body.paragraph_indents_pt.left) > 0.5)
+            continue;
+        const headingStyle = structuralStyle(heading);
+        const bodyStyle = structuralStyle(body);
+        if (!headingStyle || !bodyStyle || headingStyle === bodyStyle)
+            continue;
+        const key = `${headingStyle}\u0000${bodyStyle}`;
+        const current = transitions.get(key);
+        transitions.set(key, { headingStyle, bodyStyle, count: (current?.count ?? 0) + 1 });
+    }
+    return [...transitions.values()].filter((transition) => transition.count >= 2);
+}
+function validateBondedPairs(nodes, contexts, options) {
+    const bonded = bondedTransitions(nodes, options);
+    if (bonded.length === 0)
+        return [];
+    const diagnostics = [];
+    // Group operations by insertion slot. Repeated AFTER insertion lands each
+    // new paragraph directly after the anchor, so the slot's document order is
+    // the reverse of operation order; repeated BEFORE preserves operation order.
+    const slots = new Map();
+    contexts.forEach((context, index) => {
+        const key = `${context.anchorId}\u0000${context.position}`;
+        slots.set(key, [...(slots.get(key) ?? []), index]);
+    });
+    for (const operationIndexes of slots.values()) {
+        const position = contexts[operationIndexes[0]].position;
+        const documentOrder = position === 'AFTER' ? [...operationIndexes].reverse() : operationIndexes;
+        const styleOf = (operationIndex) => structuralStyle(sourceNode(nodes, contexts[operationIndex]));
+        const consumedBodies = new Set();
+        const unpaired = [];
+        documentOrder.forEach((operationIndex, slotIndex) => {
+            // Only a run-in heading source binds a body; an ordinary paragraph that
+            // happens to share the run-in style (e.g. a Heading2 with Heading3
+            // children) does not.
+            const headingSource = sourceNode(nodes, contexts[operationIndex]);
+            if (!headingSource || !options.runInHeadingIds?.has(headingSource.id))
+                return;
+            const candidatePairs = bonded.filter((transition) => transition.headingStyle === styleOf(operationIndex));
+            if (candidatePairs.length === 0)
+                return;
+            const next = documentOrder[slotIndex + 1];
+            const nextStyle = next == null ? undefined : styleOf(next);
+            const adjacentPair = candidatePairs.find((pair) => pair.bodyStyle === nextStyle);
+            if (next != null && adjacentPair && !consumedBodies.has(next)) {
+                consumedBodies.add(next);
+                return;
+            }
+            unpaired.push({ operationIndex, candidatePairs });
+        });
+        for (const { operationIndex, candidatePairs } of unpaired) {
+            const context = contexts[operationIndex];
+            const source = sourceNode(nodes, context);
+            const availableBodyStyles = new Set(operationIndexes
+                .filter((index) => !consumedBodies.has(index))
+                .map(styleOf));
+            const matchingPairs = candidatePairs.filter((pair) => availableBodyStyles.has(pair.bodyStyle));
+            const baseEvidence = {
+                anchor_level: hierarchyLevel(nodes.find((node) => node.id === context.anchorId)),
+                intended_level: hierarchyLevel(source),
+                style_source_id: context.styleSourceId,
+            };
+            if (candidatePairs.length > 1 && matchingPairs.length !== 1) {
+                const candidates = candidatePairs.map((pair) => pair.bodyStyle).sort();
+                diagnostics.push({
+                    code: 'BONDED_PARAGRAPH_PAIR_AMBIGUOUS', severity: 'error', operation_id: context.operationId,
+                    anchor_id: context.anchorId,
+                    message: `Style ${structuralStyle(source)} has multiple repeated run-in body followers (${candidates.join(', ')}); supply exactly one matching body peer immediately after the heading in this insertion slot.`,
+                    evidence: { ...baseEvidence, bonded_heading_style: structuralStyle(source), bonded_body_style_candidates: candidates },
+                });
+                continue;
+            }
+            const pair = matchingPairs[0] ?? candidatePairs[0];
+            const evidence = { ...baseEvidence, bonded_heading_style: pair.headingStyle, bonded_body_style: pair.bodyStyle };
+            if (matchingPairs.length === 0) {
+                diagnostics.push({
+                    code: 'BONDED_PARAGRAPH_PAIR_REQUIRED', severity: 'error', operation_id: context.operationId,
+                    anchor_id: context.anchorId,
+                    message: `Style ${pair.headingStyle} is a run-in heading repeatedly followed by ${pair.bodyStyle}; insert both paragraphs with distinct structural peers.`,
+                    evidence,
+                });
+                continue;
+            }
+            const requiredOrder = position === 'AFTER'
+                ? `${pair.bodyStyle} immediately before ${pair.headingStyle}`
+                : `${pair.headingStyle} immediately before ${pair.bodyStyle}`;
+            diagnostics.push({
+                code: 'RUN_IN_PAIR_ORDER', severity: 'error', operation_id: context.operationId,
+                anchor_id: context.anchorId,
+                message: `For repeated ${position} insertion, order operations ${requiredOrder} so the document yields each heading directly followed by its body.`,
+                evidence,
+            });
+        }
+    }
+    return diagnostics;
+}
+/**
+ * Paragraph ids whose paragraph mark carries `w:specVanish` (Word's style
+ * separator), i.e. headings that render run-in with the next paragraph.
+ */
+export function collectRunInHeadingIds(paragraphs) {
+    const ids = new Set();
+    for (const paragraph of paragraphs) {
+        if (!isRunInHeadingParagraph(paragraph))
+            continue;
+        const id = getParagraphBookmarkId(paragraph);
+        if (id)
+            ids.add(id);
+    }
+    return ids;
+}
+export function isRunInHeadingParagraph(paragraph) {
+    const pPr = getDirectChildrenByName(paragraph, 'pPr')[0];
+    const markRPr = pPr ? getDirectChildrenByName(pPr, 'rPr')[0] : undefined;
+    const specVanish = markRPr ? getDirectChildrenByName(markRPr, 'specVanish')[0] : undefined;
+    if (!specVanish)
+        return false;
+    const value = (specVanish.getAttribute('w:val') ?? '').trim().toLowerCase();
+    return value !== '0' && value !== 'false' && value !== 'off';
+}
+/** True only for the explicit two-operation form of a source-proven bonded pair. */
+export function isRecognizedBondedInsertionPair(nodes, contexts, options = {}) {
+    if (contexts.length !== 2)
+        return false;
+    const [first, second] = contexts;
+    if (!first || !second || first.anchorId !== second.anchorId || first.position !== second.position)
+        return false;
+    const sources = contexts.map((context) => sourceNode(nodes, context));
+    if (!sources[0] || !sources[1] || structuralStyle(sources[0]) === structuralStyle(sources[1]))
+        return false;
+    const headingIndex = sources.findIndex((source) => hierarchyLevel(source) != null);
+    const bodyIndex = sources.findIndex((source) => hierarchyLevel(source) == null);
+    if (headingIndex < 0 || bodyIndex < 0)
+        return false;
+    if (!options.runInHeadingIds?.has(sources[headingIndex].id))
+        return false;
+    const headingStyle = structuralStyle(sources[headingIndex]);
+    const bodyStyle = structuralStyle(sources[bodyIndex]);
+    const proven = bondedTransitions(nodes, options)
+        .some((transition) => transition.headingStyle === headingStyle && transition.bodyStyle === bodyStyle);
+    if (!proven)
+        return false;
+    return !validateBondedPairs(nodes, contexts, options).length;
+}
+//# sourceMappingURL=structural_validation.js.map

package/dist/primitives/structural_validation.js.map

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

package/dist/primitives/styles.d.ts

@@ -5,6 +5,14 @@ export type StyleDef = {
     basedOn: string | null;
     pPr: Element | null;
     rPr: Element | null;
+    /**
+     * Table styles only: the style's own `w:tblPr` (read for
+     * `w:tblStyleRowBandSize` / `w:tblStyleColBandSize`), and the `w:rPr` of
+     * each conditional `w:tblStylePr`, keyed by its `w:type`. Optional so
+     * hand-built models remain source-compatible.
+     */
+    tblPr?: Element | null;
+    conditionalRPrs?: Map<string, Element>;
 };
 export type StylesModel = {
     byId: Map<string, StyleDef>;
@@ -16,11 +24,18 @@ export type StylesModel = {
      * defaults.
      */
     docDefaultsRPr?: Element | null;
+    /**
+     * The `w:styleId` of the default table style (`w:type="table"` with
+     * `w:default="1"`), which applies to a table that names no `w:tblStyle`.
+     */
+    defaultTableStyleId?: string | null;
     /**
      * Every `w:rPr` carried by a table style, including the conditional
-     * `w:tblStylePr/w:rPr` blocks. A detection-only probe: the resolver does not
-     * read table styles, so a declaration here that could change a property of a
-     * run inside a table makes that property unresolved.
+     * `w:tblStylePr/w:rPr` blocks.
+     *
+     * @deprecated No longer read: {@link extractEffectiveRunFormatting} resolves
+     * table styles from the run's table context since #1159. Still populated so
+     * existing readers keep compiling.
      */
     tableStyleRPrs?: Element[];
 };
@@ -52,10 +67,6 @@ export declare function extractParagraphFormatting(pPr: Element | null, styles:
 /**
  * Effective run formatting. `null` means the resolver could not establish the
  * property, and never stands in for a rendered default. That happens when:
- * - no layer the resolver reads above `w:docDefaults` declares the property,
- *   the run is inside a table, and a table style's run properties declare a
- *   value that differs from what `w:docDefaults` (or the OOXML default) gives
- *   — table styles sit above document defaults and are not read;
  * - the nearest layer that declares it does so through a theme colour or
  *   theme font reference that cannot be resolved (no theme, or no matching
  *   theme entry, and no explicit fallback value); or
@@ -109,8 +120,9 @@ export declare function extractStyleRunFormatting(styles: StylesModel, styleId:
  * the run declares. Ordinary properties are taken from the first layer that
  * specifies them: direct `w:rPr` on the run, then the `w:rStyle`
  * character-style `basedOn` chain, then the paragraph mark's `w:rPr` inside
- * `pPr`, then the paragraph style's `basedOn` chain, and finally the
- * document defaults (`w:docDefaults/w:rPrDefault/w:rPr`).
+ * `pPr`, then the paragraph style's `basedOn` chain, then — for a run inside
+ * a table — the table style, and finally the document defaults
+ * (`w:docDefaults/w:rPrDefault/w:rPr`).
  *
  * Each property is resolved independently down the chain — a style that
  * specifies only color does not mask an ancestor's bold.
@@ -125,14 +137,21 @@ export declare function extractStyleRunFormatting(styles: StylesModel, styleId:
  * Document defaults seed toggle evaluation as an absolute base value rather
  * than acting as another parity level (see {@link resolveToggleProperty}).
  *
- * Not read: table-style run properties. For a run inside a table, when a
- * property is declared nowhere above the document defaults and a table style
- * declares a value that would change it (for a toggle: turns it on), the
- * result is `null` (unresolved) rather than a guess; when no layer declares it
- * at all, the result is the OOXML default (see {@link RunFormatting}). A
- * toggle that a direct layer sets absolutely is resolved regardless of table
- * styles. Numbering-level `rPr` formats only the list label (`w:lvlText`),
- * never the paragraph's runs, so it is out of scope.
+ * Table styles (#1159): the table context is read from the run's ancestors —
+ * the innermost `w:tbl`, its `w:tblStyle` (or the default table style), the
+ * `basedOn` chain, `w:tblLook`, and the cell's row and column. The style's
+ * `w:rPr` and every conditional `w:tblStylePr/w:rPr` that applies to the
+ * cell merge into one layer between the document defaults and the paragraph
+ * style (see {@link tableStyleLayers} for the order). For toggles the
+ * merged layer's nearest declaration resets the value rather than toggling
+ * it: the standard says a table style toggles like any other style, but Word
+ * assigns the declared value (MS-OI29500 note on § 17.7.6), and this follows
+ * Word.
+ *
+ * @see https://learn.microsoft.com/en-us/openspecs/office_standards/ms-oi29500/14452bbe-be4d-4dbb-90e6-3d23ae9361bc
+ *
+ * Numbering-level `rPr` formats only the list label (`w:lvlText`), never the
+ * paragraph's runs, so it is out of scope.
  *
  * Part of docx-core's public surface (see `src/index.ts`) so external
  * diagnostics — `scripts/check_docx_formatting_loss.mjs` today, the planned
@@ -147,11 +166,14 @@ export declare function extractStyleRunFormatting(styles: StylesModel, styleId:
  * @param params.theme the model produced by {@link parseThemeXml}; when
  *   omitted, direct font/color fallbacks retain their previous behavior
  *
+ * @conformance ECMA-376 edition 5, Part 1 § 17.7.2
  * @conformance ECMA-376 edition 5, Part 1 § 17.7.3
  * @conformance ECMA-376 edition 5, Part 1 § 17.7.5.1
+ * @conformance ECMA-376 edition 5, Part 1 § 17.7.6
  * @see https://github.com/UseJunior/safe-docx/issues/737
  * @see https://github.com/UseJunior/safe-docx/issues/752
  * @see https://github.com/UseJunior/safe-docx/issues/753
+ * @see https://github.com/UseJunior/safe-docx/issues/1159
  */
 export declare function extractEffectiveRunFormatting(params: {
     run: Element;

package/dist/primitives/styles.d.ts.map

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