reamkit 1.15.4 → 1.17.0

package/dist/esm/core/opc/xml-entities.d.ts

@@ -0,0 +1,12 @@
+/**
+ * Resolve the entities an internal DTD subset declares and remove the subset,
+ * so what reaches the XML parser is a well-formed part with no `&name;` left
+ * to leak. Markup inside an entity value is escaped to text rather than
+ * spliced in — an entity that opens a tag is a document we will not build.
+ *
+ * Text with no `<!DOCTYPE` is returned unchanged, which is every real file.
+ *
+ * @param xml The decoded part, as read from the package.
+ * @returns The part with its internal subset resolved and stripped.
+ */
+export declare function resolveInternalEntities(xml: string): string;

package/dist/esm/core/opc/xml-entities.js

@@ -0,0 +1,91 @@
+//#region src/core/opc/xml-entities.ts
+/** Longest text any one declared entity may expand to. */
+var MAX_EXPANSION = 65536;
+/** Longest total the substitutions may add to one part. */
+var MAX_TOTAL = 1048576;
+var DOCTYPE = /<!DOCTYPE\s[^[>]*(?:\[[\s\S]*?\]\s*)?>/;
+var ENTITY_DECL = /<!ENTITY\s+([^\s%<>&;]+)\s+(?:"([^"]*)"|'([^']*)')\s*>/g;
+var REFERENCE = /&([^\s;&<>]+);/g;
+/** The five entities XML predefines; a declaration never overrides them. */
+var PREDEFINED = new Set([
+	"lt",
+	"gt",
+	"amp",
+	"apos",
+	"quot"
+]);
+/** Escape resolved text so it re-enters the document as characters, not markup. */
+function escape(text) {
+	return text.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
+}
+/**
+* Substitute every entity reference in `text` using `valueOf`, leaving the
+* predefined and numeric references for the XML parser. Returns undefined once
+* the result passes `cap` — the caller drops what it was building.
+*/
+function substitute(text, cap, valueOf) {
+	if (!text.includes("&")) return text.length > cap ? void 0 : text;
+	let out = "";
+	let last = 0;
+	for (const m of text.matchAll(REFERENCE)) {
+		const name = m[1] ?? "";
+		out += text.slice(last, m.index);
+		last = m.index + m[0].length;
+		out += PREDEFINED.has(name) || name.startsWith("#") ? m[0] : valueOf(name);
+		if (out.length > cap) return void 0;
+	}
+	out += text.slice(last);
+	return out.length > cap ? void 0 : out;
+}
+/**
+* Expand each declaration once, so a name referenced ten thousand times costs
+* one expansion rather than ten thousand. A cycle, an undeclared name and a
+* value that outgrows MAX_EXPANSION all resolve to the empty string: XML says
+* such a document is in error, and drawing the reference's own spelling is the
+* one answer that is certainly wrong.
+*/
+function expander(declared) {
+	const done = /* @__PURE__ */ new Map();
+	const active = /* @__PURE__ */ new Set();
+	const valueOf = (name) => {
+		const memo = done.get(name);
+		if (memo !== void 0) return memo;
+		if (active.has(name)) return "";
+		const raw = declared.get(name);
+		if (raw === void 0) return "";
+		active.add(name);
+		const out = substitute(raw, MAX_EXPANSION, valueOf) ?? "";
+		active.delete(name);
+		done.set(name, out);
+		return out;
+	};
+	return valueOf;
+}
+/**
+* Resolve the entities an internal DTD subset declares and remove the subset,
+* so what reaches the XML parser is a well-formed part with no `&name;` left
+* to leak. Markup inside an entity value is escaped to text rather than
+* spliced in — an entity that opens a tag is a document we will not build.
+*
+* Text with no `<!DOCTYPE` is returned unchanged, which is every real file.
+*
+* @param xml The decoded part, as read from the package.
+* @returns The part with its internal subset resolved and stripped.
+*/
+function resolveInternalEntities(xml) {
+	if (!xml.includes("<!DOCTYPE")) return xml;
+	const doctype = DOCTYPE.exec(xml);
+	if (!doctype) return xml;
+	const declared = /* @__PURE__ */ new Map();
+	for (const decl of doctype[0].matchAll(ENTITY_DECL)) {
+		const name = decl[1];
+		if (name === void 0 || name.startsWith("%") || PREDEFINED.has(name)) continue;
+		if (!declared.has(name)) declared.set(name, decl[2] ?? decl[3] ?? "");
+	}
+	const body = xml.slice(0, doctype.index) + xml.slice(doctype.index + doctype[0].length);
+	if (!body.includes("&")) return body;
+	const valueOf = expander(declared);
+	return substitute(body, MAX_TOTAL, (name) => escape(valueOf(name))) ?? substitute(body, MAX_TOTAL, () => "") ?? body;
+}
+//#endregion
+export { resolveInternalEntities };

package/dist/esm/core/po-helpers.js

@@ -65,7 +65,22 @@ function poIntAttr(node, name) {
 	const v = poAttr(node, name);
 	if (v === void 0) return void 0;
 	const n = Number(v);
-	return Number.isFinite(n) ? n : void 0;
+	if (Number.isFinite(n)) return n;
+	return universalMeasureTwips(v);
+}
+var MEASURE_TWIPS = new Map([
+	["pt", 20],
+	["pc", 240],
+	["pi", 240],
+	["in", 1440],
+	["cm", 1440 / 2.54],
+	["mm", 144 / 2.54]
+]);
+function universalMeasureTwips(raw) {
+	const m = /^\s*(-?[0-9]+(?:\.[0-9]+)?)(pt|pc|pi|in|cm|mm)\s*$/iu.exec(raw);
+	if (!m) return void 0;
+	const per = MEASURE_TWIPS.get(m[2].toLowerCase());
+	return per === void 0 ? void 0 : Number(m[1]) * per;
 }
 /** Shorthand for the `val` attribute (`@w:val`/…). */
 function poVal(node) {

package/dist/esm/core/spreadsheet-model/index.d.ts

@@ -1 +1 @@
-export type { CellType, WorksheetCell, ColumnWidth, MergedRange, RowHeight, XlsxPageMargins, XlsxPageSetup, XlsxPrintOptions, ParsedWorksheet, XlsxFont, XlsxFill, XlsxBorderStyleName, XlsxBorderEdge, XlsxBorder, XlsxHorizontalAlign, XlsxVerticalAlign, XlsxCellAlignment, XlsxCellXf, XlsxStyles, DefinedName, Dxf, CfOperator, CfRuleCellIs, CfvoType, Cfvo, CfRuleColorScale, CfRuleDataBar, CfRuleIconSet, CfRuleTop10, CfRuleAboveAverage, CfRuleDupUnique, CfRuleText, CfRuleExpression, CfRuleTimePeriod, TimePeriodKind, CfRule, ConditionalFormat, DataValidationType, DataValidation, HyperlinkRef, HeaderFooter, FormControlRef, OleObjectRef, SheetRichRun, SparklineKind, ParsedSparkline, ExcelTable, PivotTable, SheetPane, } from './types.js';
+export type { CellType, WorksheetCell, ColumnStyle, ColumnWidth, MergedRange, RowHeight, RowStyle, XlsxPageMargins, XlsxPageSetup, XlsxPrintOptions, ParsedWorksheet, XlsxFont, XlsxFill, XlsxBorderStyleName, XlsxBorderEdge, XlsxBorder, XlsxHorizontalAlign, XlsxVerticalAlign, XlsxCellAlignment, XlsxCellXf, XlsxStyles, DefinedName, Dxf, CfOperator, CfRuleCellIs, CfvoType, Cfvo, CfRuleColorScale, CfRuleDataBar, CfRuleIconSet, CfRuleTop10, CfRuleAboveAverage, CfRuleDupUnique, CfRuleText, CfRuleExpression, CfRuleTimePeriod, TimePeriodKind, CfRule, ConditionalFormat, DataValidationType, DataValidation, HyperlinkRef, HeaderFooter, FormControlRef, OleObjectRef, SheetRichRun, SparklineKind, ParsedSparkline, ExcelTable, PivotTable, SheetPane, } from './types.js';

package/dist/esm/core/spreadsheet-model/types.d.ts

@@ -11,12 +11,40 @@ export interface WorksheetCell {
     readonly inlineText?: string;
     /** Index into the workbook's `cellXfs` (`xl/styles.xml`). 0 means default style. */
     readonly styleIndex?: number;
+    /**
+     * §18.3.1.4 `vm` — 1-based index into `xl/metadata.xml`'s `<valueMetadata>`.
+     * A cell whose value is a rich value stores a legacy error in `<v>` for
+     * readers that predate the feature, and points here for the real one.
+     */
+    readonly valueMetadataIndex?: number;
 }
 /** §18.3.1.13 `<col>` — a width (in character units) for the column span `min..max`. */
 export interface ColumnWidth {
     readonly min: number;
     readonly max: number;
     readonly widthChars: number;
+    /** §18.3.1.13 `hidden` — Excel and LibreOffice print neither the column nor its cells. */
+    readonly hidden?: boolean;
+}
+/**
+ * §18.3.1.13 `<col style>` / §18.3.1.73 `<row s customFormat>` — the style a
+ * cell takes when the file gives it none of its own.
+ *
+ * A spreadsheet formats whole columns and whole rows without writing a `<c>`
+ * for each one: 51710.xlsx paints its column A grey with a single `<col
+ * min="1" max="1" style="1"/>`, and 588 of its rows carry no A cell at all.
+ * The band is on the page in Excel and in LibreOffice, so the default has to
+ * reach the paint even where there is nothing to paint it on.
+ */
+export interface ColumnStyle {
+    readonly min: number;
+    readonly max: number;
+    readonly styleIndex: number;
+}
+/** §18.3.1.73 — the style a row hands to its unwritten cells. */
+export interface RowStyle {
+    readonly row: number;
+    readonly styleIndex: number;
 }
 /** §18.3.1.55 `<mergeCell>` — a merged cell rectangle (0-indexed, inclusive bounds). */
 export interface MergedRange {
@@ -34,6 +62,8 @@ export interface RowHeight {
     readonly row: number;
     readonly heightPt: number;
     readonly customHeight: boolean;
+    /** §18.3.1.73 `hidden` — the row is not printed at all. */
+    readonly hidden?: boolean;
 }
 /** ECMA-376 Part 1 §18.3.1.62 — `<pageMargins>`. All attributes are in inches. */
 export interface XlsxPageMargins {
@@ -59,6 +89,18 @@ export interface XlsxPageSetup {
     readonly fitToWidth?: number;
     /** Number of pages tall to fit to; default 1. */
     readonly fitToHeight?: number;
+    /**
+     * `r:id` of the sheet's `printerSettings` part. When `paperSize` is absent the
+     * paper is whatever that part's DEVMODE says, which is how Excel records the
+     * choice made in the print dialog rather than in the sheet.
+     */
+    readonly printerSettingsRelId?: string;
+    /**
+     * §18.3.1.63 `cellComments` — where the sheet's notes are printed:
+     * `none` (the default) prints none of them, `asDisplayed` prints them where
+     * they float, `atEnd` gathers them after the grid.
+     */
+    readonly cellComments?: 'none' | 'asDisplayed' | 'atEnd';
 }
 /**
  * ECMA-376 Part 1 §18.3.1.70 — `<printOptions>`. Controls what is rendered when
@@ -68,6 +110,11 @@ export interface XlsxPageSetup {
  */
 export interface XlsxPrintOptions {
     readonly gridLines?: boolean;
+    /**
+     * §18.3.1.70 `headings` — print the column letters across the top and the row
+     * numbers down the left, the way the sheet looks on screen. Off by default.
+     */
+    readonly headings?: boolean;
     readonly horizontalCentered?: boolean;
     readonly verticalCentered?: boolean;
 }
@@ -83,6 +130,10 @@ export interface ParsedWorksheet {
     readonly columns: ReadonlyArray<ColumnWidth>;
     readonly merges: ReadonlyArray<MergedRange>;
     readonly rowHeights: ReadonlyArray<RowHeight>;
+    /** §18.3.1.13 `<col style>` — the default style of a whole column span. */
+    readonly columnStyles?: ReadonlyArray<ColumnStyle>;
+    /** §18.3.1.73 `<row s customFormat="1">` — the default style of a whole row. */
+    readonly rowStyles?: ReadonlyArray<RowStyle>;
     /**
      * ECMA-376 §18.3.1.81 `<sheetFormatPr defaultRowHeight>` — the height, in
      * points, of every row that carries no `ht` of its own. A row in a
@@ -120,6 +171,12 @@ export interface ParsedWorksheet {
     readonly colBreaks?: ReadonlyArray<number>;
     /** §18.3.1.36 `<drawing r:id>` — the sheet's drawing part (charts/shapes). */
     readonly drawingRelId?: string;
+    /**
+     * §18.3.1.36 `<legacyDrawing r:id>` — the relationship to the sheet's VML
+     * drawing part. A form control put on the sheet by Excel's Forms toolbar is
+     * declared there and nowhere else.
+     */
+    readonly legacyDrawingRelId?: string;
     /** §18.3.1.18 `<conditionalFormatting>` — value-driven cell formats (E-SHEET SC1). */
     readonly conditionalFormats?: ReadonlyArray<ConditionalFormat>;
     /**
@@ -254,6 +311,8 @@ export interface XlsxFont {
     readonly bold?: boolean;
     readonly italic?: boolean;
     readonly underline?: boolean;
+    /** §18.8.37 `<strike/>` — the font is struck through. */
+    readonly strike?: boolean;
     readonly colorHex?: string;
     readonly name?: string;
 }
@@ -341,6 +400,18 @@ export interface XlsxStyles {
 export interface Dxf {
     readonly font?: XlsxFont;
     readonly fill?: XlsxFill;
+    /**
+     * §18.8.9 `<border>` inside a dxf — a rule may format a cell with nothing but
+     * an edge, and half the differential formats in a real workbook do exactly
+     * that (a rule under every year boundary, a box around a total).
+     */
+    readonly border?: XlsxBorder;
+    /**
+     * §18.8.9 `<numFmt formatCode>` — a rule may change how the VALUE reads, not
+     * just how the cell looks: two decimals where a threshold is crossed. Every
+     * dxf in new_cond_format_test.xlsx is one of these and nothing else.
+     */
+    readonly numberFormat?: string;
 }
 /**
  * ECMA-376 Part 1 §18.2.5 — `<definedName>`. A workbook-scoped (or sheet-scoped,
@@ -364,6 +435,12 @@ export interface CfRuleCellIs {
     readonly operator: CfOperator;
     readonly formulas: ReadonlyArray<string>;
     readonly dxfId: number;
+    /**
+     * The format itself, when the rule carries it instead of pointing at the
+     * workbook's table — the 2009 extension (`<x14:cfRule><x14:dxf>`) writes it
+     * inline, and `dxfId` names nothing there. Takes precedence when present.
+     */
+    readonly dxf?: Dxf;
 }
 /**
  * §18.3.1.11 ST_CfvoType — how a `<cfvo>` stop's threshold is derived.
@@ -406,6 +483,12 @@ export interface CfRuleDataBar {
     readonly colorHex: string;
     readonly minLength?: number;
     readonly maxLength?: number;
+    /**
+     * §18.3.1.28 `showValue` — false means the cell shows the BAR ONLY, with its
+     * number hidden. Excel's "Show Bar Only" checkbox; a dashboard uses it so the
+     * figure does not sit on top of its own gauge.
+     */
+    readonly showValue?: boolean;
 }
 /**
  * §18.3.1.49 `<cfRule type="iconSet">` — picks one glyph per cell from a named
@@ -432,6 +515,12 @@ export interface CfRuleTop10 {
     readonly percent: boolean;
     readonly bottom: boolean;
     readonly dxfId: number;
+    /**
+     * The format itself, when the rule carries it instead of pointing at the
+     * workbook's table — the 2009 extension (`<x14:cfRule><x14:dxf>`) writes it
+     * inline, and `dxfId` names nothing there. Takes precedence when present.
+     */
+    readonly dxf?: Dxf;
 }
 /**
  * §18.3.1.10 `<cfRule type="aboveAverage">` — cells above (default) or below the
@@ -445,6 +534,12 @@ export interface CfRuleAboveAverage {
     readonly equalAverage: boolean;
     readonly stdDev?: number;
     readonly dxfId: number;
+    /**
+     * The format itself, when the rule carries it instead of pointing at the
+     * workbook's table — the 2009 extension (`<x14:cfRule><x14:dxf>`) writes it
+     * inline, and `dxfId` names nothing there. Takes precedence when present.
+     */
+    readonly dxf?: Dxf;
 }
 /**
  * §18.3.1.10 `<cfRule type="duplicateValues" | "uniqueValues">` — cells whose
@@ -456,6 +551,12 @@ export interface CfRuleDupUnique {
     readonly type: 'duplicateValues' | 'uniqueValues';
     readonly priority: number;
     readonly dxfId: number;
+    /**
+     * The format itself, when the rule carries it instead of pointing at the
+     * workbook's table — the 2009 extension (`<x14:cfRule><x14:dxf>`) writes it
+     * inline, and `dxfId` names nothing there. Takes precedence when present.
+     */
+    readonly dxf?: Dxf;
 }
 /**
  * §18.3.1.10 `<cfRule type="containsText" | "notContainsText" | "beginsWith" |
@@ -468,6 +569,12 @@ export interface CfRuleText {
     readonly priority: number;
     readonly text: string;
     readonly dxfId: number;
+    /**
+     * The format itself, when the rule carries it instead of pointing at the
+     * workbook's table — the 2009 extension (`<x14:cfRule><x14:dxf>`) writes it
+     * inline, and `dxfId` names nothing there. Takes precedence when present.
+     */
+    readonly dxf?: Dxf;
     readonly formula?: string;
 }
 /**
@@ -483,6 +590,12 @@ export interface CfRuleExpression {
     readonly priority: number;
     readonly formula: string;
     readonly dxfId: number;
+    /**
+     * The format itself, when the rule carries it instead of pointing at the
+     * workbook's table — the 2009 extension (`<x14:cfRule><x14:dxf>`) writes it
+     * inline, and `dxfId` names nothing there. Takes precedence when present.
+     */
+    readonly dxf?: Dxf;
 }
 /** §18.18.82 ST_TimePeriod — the clock-relative window a `timePeriod` rule tests. */
 export type TimePeriodKind = 'today' | 'yesterday' | 'tomorrow' | 'last7Days' | 'thisWeek' | 'lastWeek' | 'nextWeek' | 'thisMonth' | 'lastMonth' | 'nextMonth';
@@ -499,6 +612,12 @@ export interface CfRuleTimePeriod {
     readonly priority: number;
     readonly timePeriod: TimePeriodKind;
     readonly dxfId: number;
+    /**
+     * The format itself, when the rule carries it instead of pointing at the
+     * workbook's table — the 2009 extension (`<x14:cfRule><x14:dxf>`) writes it
+     * inline, and `dxfId` names nothing there. Takes precedence when present.
+     */
+    readonly dxf?: Dxf;
     readonly formula?: string;
 }
 /** One conditional-format rule (`<cfRule>`): the union over the supported `type`s. */
@@ -542,6 +661,18 @@ export interface HeaderFooter {
 export interface FormControlRef {
     readonly name?: string;
     readonly relId: string;
+    /**
+     * §18.3.1.19 `@shapeId` — the id of this control's shape in the sheet's legacy
+     * VML drawing. It is what tells an ActiveX control's VML shape apart from a
+     * Forms-toolbar control that has no `<control>` entry at all.
+     */
+    readonly shapeId?: string;
+    /**
+     * §18.3.1.20 `<controlPr print>` — Excel's "Print object" checkbox. It
+     * defaults to true, and a control that clears it is on screen only: neither
+     * Excel nor Calc puts it on the page.
+     */
+    readonly print?: boolean;
 }
 /**
  * §18.3.* `<oleObjects><oleObject progId r:id>` — an embedded OLE / ActiveX
@@ -567,6 +698,12 @@ export interface SheetRichRun {
     readonly bold?: boolean;
     readonly italic?: boolean;
     readonly underline?: boolean;
+    /**
+     * §18.8.37 `<strike/>` on the run — struck-through text inside a cell that is
+     * otherwise not. 58315.xlsx crosses out the middle of "320-338 350", which is
+     * the whole point of the cell.
+     */
+    readonly strike?: boolean;
     readonly colorHex?: string;
     readonly sizePt?: number;
     /** §18.4.2 `<vertAlign>` — superscript / subscript within the cell text. */

package/dist/esm/core/style-cascade/resolver.js

@@ -38,8 +38,10 @@ function resolveRunProperties(runDirect, paragraphDirect, sheet) {
 }
 function computeRunProperties(runDirect, paragraphDirect, sheet) {
 	let acc = mergeRun(DEFAULT_RESOLVED_RUN, sheet.defaultRunProperties);
-	if (paragraphDirect.styleId) {
-		const chain = resolveStyleChain(paragraphDirect.styleId, sheet);
+	if (paragraphDirect.inheritedRun) acc = mergeRun(acc, paragraphDirect.inheritedRun);
+	const styleId = paragraphDirect.styleId ?? defaultParagraphStyleId(sheet);
+	if (styleId) {
+		const chain = resolveStyleChain(styleId, sheet);
 		acc = mergeRun(acc, chain.rPr);
 	}
 	if (runDirect.styleId) {
@@ -71,12 +73,27 @@ function resolveParagraphProperties(paragraphDirect, sheet) {
 }
 function computeParagraphProperties(paragraphDirect, sheet) {
 	let acc = mergePar(DEFAULT_RESOLVED_PARAGRAPH, sheet.defaultParagraphProperties);
-	if (paragraphDirect.styleId) {
-		const chain = resolveStyleChain(paragraphDirect.styleId, sheet);
+	if (paragraphDirect.tableStyle ?? paragraphDirect.inheritedRun) acc = mergePar(acc, {
+		...paragraphDirect.tableStyle,
+		...paragraphDirect.inheritedRun ? { runProperties: paragraphDirect.inheritedRun } : {}
+	});
+	const styleId = paragraphDirect.styleId ?? defaultParagraphStyleId(sheet);
+	if (styleId) {
+		const chain = resolveStyleChain(styleId, sheet);
 		acc = mergePar(acc, chain.pPr);
 	}
 	return mergePar(acc, paragraphDirect);
 }
+/** The id of the `w:default="1"` paragraph style, cached per sheet. */
+var defaultParagraphStyleCache = /* @__PURE__ */ new WeakMap();
+function defaultParagraphStyleId(sheet) {
+	const hit = defaultParagraphStyleCache.get(sheet);
+	if (hit !== void 0) return hit ?? void 0;
+	let found = null;
+	for (const style of sheet.styles.values()) if (style.type === "paragraph" && style.isDefault) found = style.id;
+	defaultParagraphStyleCache.set(sheet, found);
+	return found ?? void 0;
+}
 function resolveStyleChain(styleId, sheet) {
 	const chain = [];
 	const visited = /* @__PURE__ */ new Set();
@@ -108,40 +125,72 @@ function mergeRun(base, override) {
 		bold: override.bold ?? base.bold,
 		italic: override.italic ?? base.italic,
 		underline: override.underline ?? base.underline,
+		...override.underlineColorHex ?? base.underlineColorHex ? { underlineColorHex: override.underlineColorHex ?? base.underlineColorHex } : {},
 		strike: override.strike ?? base.strike,
+		caps: override.caps ?? base.caps,
+		smallCaps: override.smallCaps ?? base.smallCaps,
 		fontSizePt: override.fontSizePt ?? base.fontSizePt,
 		colorHex: override.colorHex ?? base.colorHex,
 		fontFamily: override.fontFamily ?? base.fontFamily,
 		verticalAlign: override.verticalAlign ?? base.verticalAlign,
 		rtl: override.rtl ?? base.rtl,
-		...lang !== void 0 ? { lang } : {}
+		...lang !== void 0 ? { lang } : {},
+		...(override.shadingColorHex ?? base.shadingColorHex) !== void 0 ? { shadingColorHex: override.shadingColorHex ?? base.shadingColorHex } : {},
+		...(override.letterSpacingPt ?? base.letterSpacingPt) !== void 0 ? { letterSpacingPt: override.letterSpacingPt ?? base.letterSpacingPt } : {}
 	};
 }
 function mergePar(base, override) {
 	const outlineLevel = override.outlineLevel ?? base.outlineLevel;
 	const styleId = override.styleId ?? base.styleId;
-	const numbering = override.numbering ?? base.numbering;
+	const numbering = override.numbering ?? (override.numberingLevel !== void 0 && base.numbering !== void 0 ? {
+		...base.numbering,
+		ilvl: override.numberingLevel
+	} : base.numbering);
+	const runProperties = override.runProperties ?? base.runProperties;
+	const frame = override.frame ?? base.frame;
+	const sectionBreak = override.sectionBreak ?? base.sectionBreak;
+	const textDirection = override.textDirection ?? base.textDirection;
+	const snapToGrid = override.snapToGrid ?? base.snapToGrid;
 	return {
 		alignment: override.alignment ?? base.alignment,
-		spacingBefore: override.spacingBefore ?? base.spacingBefore,
-		spacingAfter: override.spacingAfter ?? base.spacingAfter,
+		spacingBefore: override.spacingBeforeAuto ?? override.spacingBefore ?? base.spacingBefore,
+		spacingAfter: override.spacingAfterAuto ?? override.spacingAfter ?? base.spacingAfter,
 		spacingLine: override.spacingLine ?? base.spacingLine,
 		spacingLineRule: override.spacingLineRule ?? base.spacingLineRule,
 		indentLeft: override.indentLeft ?? base.indentLeft,
 		indentRight: override.indentRight ?? base.indentRight,
 		indentFirstLine: override.indentFirstLine ?? base.indentFirstLine,
 		pageBreakBefore: override.pageBreakBefore ?? base.pageBreakBefore,
+		contextualSpacing: override.contextualSpacing ?? base.contextualSpacing,
+		tabs: override.tabs ?? base.tabs,
 		bidi: override.bidi ?? base.bidi,
+		...override.borders ?? base.borders ? { borders: override.borders ?? base.borders } : {},
+		...override.shading ?? base.shading ? { shading: override.shading ?? base.shading } : {},
 		...outlineLevel !== void 0 ? { outlineLevel } : {},
 		...styleId !== void 0 ? { styleId } : {},
-		...numbering !== void 0 ? { numbering } : {}
+		...numbering !== void 0 ? { numbering } : {},
+		...runProperties !== void 0 ? { runProperties } : {},
+		...frame !== void 0 ? { frame } : {},
+		...sectionBreak !== void 0 ? { sectionBreak } : {},
+		...textDirection !== void 0 ? { textDirection } : {},
+		...snapToGrid !== void 0 ? { snapToGrid } : {}
 	};
 }
 function mergeRunPartial(base, override) {
 	return copyDefined(base, override);
 }
 function mergeParPartial(base, override) {
-	return copyDefined(base, override);
+	const out = copyDefined(base, override);
+	if (override.numbering === void 0 && override.numberingLevel !== void 0) {
+		if (base.numbering !== void 0) return {
+			...out,
+			numbering: {
+				...base.numbering,
+				ilvl: override.numberingLevel
+			}
+		};
+	}
+	return out;
 }
 function copyDefined(base, override) {
 	const out = { ...base };
@@ -188,7 +237,13 @@ function resolveBodyStyles(body, sheet) {
 	const visit = (el) => {
 		if (el.kind === "paragraph") visitParagraph(el.paragraph);
 		else if (el.kind === "table") for (const row of el.table.rows) for (const cell of row.cells) for (const child of cell.content) visit(child);
-		else if (el.kind === "shape" && el.shape.text) for (const child of el.shape.text.content) visit(child);
+		else if (el.kind === "shape") {
+			const shapeText = (sh) => {
+				for (const child of sh.text?.content ?? []) visit(child);
+				for (const member of sh.children ?? []) shapeText(member.shape);
+			};
+			shapeText(el.shape);
+		}
 	};
 	for (const el of body) visit(el);
 	return body;

package/dist/esm/core/style-cascade/table.js

@@ -22,8 +22,10 @@ function applyTableStyle(table, sheet) {
 	const folded = foldTableStyleChain(styleId, sheet);
 	if (!folded) return;
 	const tp = table.properties;
+	const directBorders = tp.borders;
 	if (!tp.borders && folded.base.borders) tp.borders = folded.base.borders;
 	if (!tp.defaultCellMargins && folded.base.cellMargins) tp.defaultCellMargins = folded.base.cellMargins;
+	if (tp.indentPt === void 0 && folded.base.indentPt !== void 0) tp.indentPt = folded.base.indentPt;
 	const look = table.properties.look ?? {};
 	const rows = table.rows;
 	const colCount = Math.max(table.grid.length, ...rows.map((r) => r.cells.reduce((s, c) => s + (c.properties.colSpan ?? 1), 0)));
@@ -33,8 +35,8 @@ function applyTableStyle(table, sheet) {
 		for (const cell of row.cells) {
 			const span = cell.properties.colSpan ?? 1;
 			const layer = cellLayer(folded, look, {
-				firstRow: r === 0,
-				lastRow: r === rows.length - 1,
+				firstRow: r === 0 || row.properties.conditional?.firstRow === true,
+				lastRow: r === rows.length - 1 || row.properties.conditional?.lastRow === true,
 				firstCol: colStart === 0,
 				lastCol: colStart + span >= colCount,
 				rowBand: bandIndex(r, look.firstRow === true, folded.rowBandSize),
@@ -42,20 +44,34 @@ function applyTableStyle(table, sheet) {
 				noHBand: look.noHBand === true,
 				noVBand: look.noVBand === true
 			});
+			const pos = {
+				firstRow: r === 0 || row.properties.conditional?.firstRow === true,
+				lastRow: r === rows.length - 1 || row.properties.conditional?.lastRow === true,
+				firstCol: colStart === 0,
+				lastCol: colStart + span >= colCount
+			};
 			colStart += span;
 			if (!layer) continue;
-			applyLayerToCell(cell, layer);
+			applyLayerToCell(cell, layer, directBorders, pos);
 		}
 	}
 }
-function applyLayerToCell(tableCell, layer) {
+function applyLayerToCell(tableCell, layer, directBorders, pos) {
 	const cell = tableCell;
 	if (layer.shading && !cell.properties.shading) cell.properties.shading = layer.shading;
 	if (layer.cellMargins && !cell.properties.margins) cell.properties.margins = layer.cellMargins;
 	if (layer.borders) {
 		const own = cell.properties.borders ?? {};
+		const fromStyle = { ...layer.borders };
+		if (directBorders) {
+			const stated = (side, outer) => (outer ? directBorders[side] : directBorders[side === "top" || side === "bottom" ? "insideH" : "insideV"]) !== void 0;
+			if (stated("top", pos.firstRow)) delete fromStyle.top;
+			if (stated("bottom", pos.lastRow)) delete fromStyle.bottom;
+			if (stated("left", pos.firstCol)) delete fromStyle.left;
+			if (stated("right", pos.lastCol)) delete fromStyle.right;
+		}
 		const merged = {
-			...layer.borders,
+			...fromStyle,
 			...definedOnly(own)
 		};
 		cell.properties.borders = merged;
@@ -64,12 +80,18 @@ function applyLayerToCell(tableCell, layer) {
 		if (el.kind !== "paragraph") continue;
 		const p = el.paragraph;
 		if (layer.paragraphProperties) p.properties = {
-			...layer.paragraphProperties,
-			...definedOnly(p.properties)
+			...p.properties,
+			tableStyle: {
+				...p.properties.tableStyle,
+				...layer.paragraphProperties
+			}
 		};
-		if (layer.runProperties) for (const run of p.runs) run.properties = {
-			...layer.runProperties,
-			...definedOnly(run.properties)
+		if (layer.runProperties) p.properties = {
+			...p.properties,
+			inheritedRun: {
+				...p.properties.inheritedRun,
+				...layer.runProperties
+			}
 		};
 	}
 }
@@ -79,7 +101,8 @@ function bandIndex(index, skipFirst, bandSize) {
 	return Math.floor(adjusted / Math.max(1, bandSize));
 }
 function cellLayer(folded, look, pos) {
-	const layers = [folded.base];
+	const { borders: _tableWide, ...withoutBorders } = folded.base;
+	const layers = [withoutBorders];
 	const cond = (t) => folded.conditions.get(t);
 	if (!pos.noVBand && pos.colBand >= 0) layers.push(pos.colBand % 2 === 0 ? cond("band1Vert") : cond("band2Vert"));
 	if (!pos.noHBand && pos.rowBand >= 0) layers.push(pos.rowBand % 2 === 0 ? cond("band1Horz") : cond("band2Horz"));
@@ -145,6 +168,7 @@ function mergeLayer(base, override) {
 			...base.cellMargins,
 			...definedOnly(override.cellMargins ?? {})
 		} } : {},
+		...(override.indentPt ?? base.indentPt) !== void 0 ? { indentPt: override.indentPt ?? base.indentPt } : {},
 		...override.shading ?? base.shading ? { shading: override.shading ?? base.shading } : {},
 		...override.runProperties ?? base.runProperties ? { runProperties: {
 			...base.runProperties,