@stll/docx-core 0.3.0 → 0.4.0

package/dist/{document-Qbe-wA-j.d.ts → document-CzARzXpt.d.ts}

@@ -152,7 +152,8 @@ type ParagraphFormatting = {
   spaceBefore?: number; /** Spacing after in twips (w:spacing/@w:after) */
   spaceAfter?: number; /** Line spacing value (w:spacing/@w:line) */
   lineSpacing?: number; /** Line spacing rule (w:spacing/@w:lineRule) */
-  lineSpacingRule?: LineSpacingRule; /** Auto space before (w:spacing/@w:beforeAutospacing) */
+  lineSpacingRule?: LineSpacingRule; /** Whether the paragraph participates in the section document grid (w:snapToGrid). */
+  snapToGrid?: boolean; /** Auto space before (w:spacing/@w:beforeAutospacing) */
   beforeAutospacing?: boolean; /** Auto space after (w:spacing/@w:afterAutospacing) */
   afterAutospacing?: boolean; /** Which spacing sides came from this paragraph's own pPr. */
   spacingExplicit?: SpacingExplicit; /** Left indent in twips (w:ind/@w:left) */
@@ -532,6 +533,10 @@ type SoftHyphenContent = {
 type NoBreakHyphenContent = {
   type: "noBreakHyphen";
 };
+/** Cached pagination boundary emitted by a previous layout pass. */
+type RenderedPageBreakContent = {
+  type: "renderedPageBreak";
+};
 /**
  * Drawing/image reference
  */
@@ -550,7 +555,7 @@ type ShapeContent = {
 /**
  * All possible run content types
  */
-type RunContent = TextContent | TabContent | BreakContent | SymbolContent | NoteReferenceContent | FieldCharContent | InstrTextContent | SoftHyphenContent | NoBreakHyphenContent | DrawingContent | ShapeContent;
+type RunContent = TextContent | TabContent | BreakContent | SymbolContent | NoteReferenceContent | FieldCharContent | InstrTextContent | SoftHyphenContent | NoBreakHyphenContent | RenderedPageBreakContent | DrawingContent | ShapeContent;
 /**
  * A run is a contiguous region of text with the same formatting
  */
@@ -789,8 +794,8 @@ type ShapeTextBody = {
     bottom?: number;
     left?: number;
     right?: number;
-  }; /** Paragraphs inside the shape */
-  content: Paragraph[];
+  }; /** Block content inside the shape */
+  content: (Paragraph | Table)[];
 };
 /**
  * Shape/drawing object (wps:wsp)
@@ -819,8 +824,8 @@ type TextBox = {
   position?: ImagePosition; /** Wrap settings */
   wrap?: ImageWrap; /** Fill */
   fill?: ShapeFill; /** Outline */
-  outline?: ShapeOutline; /** Text content */
-  content: Paragraph[]; /** Text fitting behavior */
+  outline?: ShapeOutline; /** Text and table content */
+  content: (Paragraph | Table)[]; /** Text fitting behavior */
   autoFit?: ShapeTextBody["autoFit"]; /** Internal margins */
   margins?: {
     top?: number;
@@ -1042,8 +1047,13 @@ type SectionPropertyChange = {
  * Table structural tracked change metadata (row/cell insert/delete/merge)
  */
 type TableStructuralChangeInfo = {
-  type: "tableRowInsertion" | "tableRowDeletion" | "tableCellInsertion" | "tableCellDeletion" | "tableCellMerge"; /** Tracked change metadata */
+  type: "tableRowInsertion" | "tableRowDeletion" | "tableCellInsertion" | "tableCellDeletion"; /** Tracked change metadata */
   info: TrackedChangeInfo;
+} | {
+  type: "tableCellMerge"; /** Tracked change metadata */
+  info: TrackedChangeInfo; /** Vertical merge state applied by the revision. */
+  verticalMerge?: "continue" | "rest"; /** Vertical merge state that existed before the revision. */
+  verticalMergeOriginal?: "continue" | "rest";
 };
 /**
  * SDT type (content control type)
@@ -1116,14 +1126,14 @@ type SdtProperties = {
  * Inline SDT (content control within a paragraph).
  *
  * OOXML allows runs, hyperlinks, simple/complex fields, nested SDTs,
- * tracked insertions/deletions, and math at this level. All of them must survive
+ * tracked insertions/deletions/moves, and math at this level. All of them must survive
  * parse → edit → save so docProps-bound fields and reviewed template
  * content do not lose their wrapper on round-trip.
  */
 type InlineSdt = {
   type: "inlineSdt"; /** SDT properties */
   properties: SdtProperties; /** Inline content held inside the control */
-  content: (Run | Hyperlink | SimpleField | ComplexField | InlineSdt | Insertion | Deletion | MathEquation)[];
+  content: (Run | Hyperlink | SimpleField | ComplexField | InlineSdt | Insertion | Deletion | MoveFrom | MoveTo | MathEquation)[];
 };
 /**
  * Block-level SDT (content control wrapping paragraphs/tables).
@@ -1621,6 +1631,11 @@ type MediaFile = {
  * Extend as more settings.xml fields enter the layout pipeline.
  */
 type DocumentSettings = {
+  /**
+   * Application compatibility generation from
+   * `w:compat/w:compatSetting[@w:name="compatibilityMode"]`.
+   */
+  compatibilityMode?: number;
   /**
    * `w:defaultTabStop` (§17.6.13) — interval in twips between default
    * tab stops applied when a paragraph has no custom `w:tabs`. Word

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { Ct as RunContent, Gt as TableRow, Ht as TableCell, M as DocumentBody, Ot as SectionProperties, St as Run, Vt as Table, Yt as TextContent, _t as ParagraphContent, a as DocxPackage, b as BlockContent, gt as Paragraph, i as DocxConformanceClass, n as Document, p as Style, t as DOCX_CONFORMANCE_CLASSES, w as BreakContent } from "./document-Qbe-wA-j.js";
+import { Ct as RunContent, Gt as TableRow, Ht as TableCell, M as DocumentBody, Ot as SectionProperties, St as Run, Vt as Table, Yt as TextContent, _t as ParagraphContent, a as DocxPackage, b as BlockContent, gt as Paragraph, i as DocxConformanceClass, n as Document, p as Style, t as DOCX_CONFORMANCE_CLASSES, w as BreakContent } from "./document-CzARzXpt.js";
 
 //#region src/legal-source/types.d.ts
 type LegalDocumentKind = "agreement" | "letter" | "memo" | "checklist" | "pleading" | "other";

package/dist/index.js

@@ -184,6 +184,7 @@ const serializeRunContent = (content) => {
 		case "text": return `<w:t${content.preserveSpace ? " xml:space=\"preserve\"" : ""}>${escapeXml(content.text)}</w:t>`;
 		case "tab": return "<w:tab/>";
 		case "break": return `<w:br${attr("w:type", content.breakType)}/>`;
+		case "renderedPageBreak": return "<w:lastRenderedPageBreak/>";
 		case "symbol": return `<w:sym w:font="${escapeXml(content.font)}" w:char="${escapeXml(content.char)}"/>`;
 		case "footnoteRef": return `<w:footnoteReference w:id="${content.id}"/>`;
 		case "endnoteRef": return `<w:endnoteReference w:id="${content.id}"/>`;
@@ -590,7 +591,7 @@ const validateImage = (image, path, ctx, options = {}) => {
 const validateShape = (shape, path, ctx) => {
 	validateNonNegativeSize(shape.size.width, `${path}.size.width`, ctx);
 	validateNonNegativeSize(shape.size.height, `${path}.size.height`, ctx);
-	if (shape.textBody) validateParagraphs(shape.textBody.content, `${path}.textBody.content`, ctx);
+	if (shape.textBody) validateBlocks(shape.textBody.content, `${path}.textBody.content`, ctx);
 };
 const validateNonNegativeSize = (value, path, ctx) => {
 	if (value < 0) {
@@ -649,7 +650,7 @@ const validateComments = (comments, ctx) => {
 		const path = `package.document.comments[${index}]`;
 		if (seen.has(comment.id)) addError(ctx, `${path}.id`, `Duplicate comment id ${comment.id}.`);
 		seen.add(comment.id);
-		if (comment.author.trim() === "") addError(ctx, `${path}.author`, "Comment author is empty.");
+		if (comment.author !== "" && comment.author.trim() === "") addError(ctx, `${path}.author`, "Comment author cannot be whitespace-only.");
 		if (comment.parentId !== void 0 && !ctx.commentIds.has(comment.parentId)) addError(ctx, `${path}.parentId`, `Parent comment ${comment.parentId} is missing.`);
 		validateParagraphs(comment.content, `${path}.content`, ctx);
 	}

package/dist/model/document.d.ts

@@ -1,2 +1,2 @@
-import { $ as ImageTransform, $t as VerticalAlign, A as ComplexField, An as BorderSpec, At as SectionStart, B as FooterReference, Bt as TabContent, C as BookmarkStart, Cn as TableLook, Ct as RunContent, D as CommentRangeEnd, Dn as TextEffect, Dt as Section, E as Comment, En as TableWidthType, Et as SdtType, F as EndnotePosition, Ft as ShapeTextBody, G as HeaderFooterType, Gt as TableRow, H as FootnotePosition, Ht as TableCell, I as EndnoteProperties, It as ShapeType, J as Image, Jt as TextBox, K as HeaderReference, Kt as TableRowPropertyChange, L as Field, Lt as SimpleField, M as DocumentBody, Mn as KnownBorderStyle, Mt as ShapeContent, N as DrawingContent, Nn as ShadingProperties, Nt as ShapeFill, O as CommentRangeStart, On as TextFormatting, Ot as SectionProperties, P as Endnote, Pn as ThemeColorSlot, Pt as ShapeOutline, Q as ImageSize, Qt as TrackedRunChange, R as FieldCharContent, Rt as SoftHyphenContent, S as BookmarkEnd, Sn as TableFormatting, St as Run, T as Column, Tn as TableRowFormatting, Tt as SdtProperties, U as FootnoteProperties, Ut as TableCellPropertyChange, V as Footnote, Vt as Table, W as HeaderFooter, Wt as TablePropertyChange, X as ImagePadding, Xt as TextWatermark, Y as ImageCrop, Yt as TextContent, Z as ImagePosition, Zt as TrackedChangeInfo, _ as ThemeColorScheme, _n as TabStop, _t as ParagraphContent, a as DocxPackage, an as NumberFormat, at as MathEquation, b as BlockContent, bn as TableCellBorders, bt as PictureWatermark, c as FontTable, cn as CellMargins, ct as MoveFromRangeStart, d as RelationshipMap, dn as FloatingTableProperties, dt as MoveToRangeStart, en as Watermark, et as ImageWrap, f as RelationshipType, fn as LineSpacingRule, ft as NoBreakHyphenContent, g as Theme, gn as TabLeader, gt as Paragraph, h as StyleType, hn as SpacingExplicit, ht as PageOrientation, i as DocxConformanceClass, in as ListRendering, it as LineNumberRestart, j as Deletion, jn as ColorValue, jt as Shape, k as CommentReference, kn as UnderlineStyle, kt as SectionPropertyChange, l as MediaFile, ln as ConditionalFormatStyle, lt as MoveTo, m as StyleDefinitions, mn as ParagraphFormatting, mt as NoteReferenceContent, n as Document, nn as LevelSuffix, nt as Insertion, o as DocDefaults, on as NumberingDefinitions, ot as MoveFrom, p as Style, pn as ParagraphAlignment, pt as NoteNumberRestart, q as Hyperlink, qt as TableStructuralChangeInfo, r as DocumentSettings, rn as ListLevel, rt as InstrTextContent, s as FontInfo, sn as NumberingInstance, st as MoveFromRangeEnd, t as DOCX_CONFORMANCE_CLASSES, tn as AbstractNumbering, tt as InlineSdt, u as Relationship, un as EmphasisMark, ut as MoveToRangeEnd, v as ThemeFont, vn as TabStopAlignment, vt as ParagraphMarkChange, w as BreakContent, wn as TableMeasurement, wt as RunPropertyChange, x as BlockSdt, xn as TableCellFormatting, xt as PropertyChangeInfo, y as ThemeFontScheme, yn as TableBorders, yt as ParagraphPropertyChange, z as FieldType, zt as SymbolContent } from "../document-Qbe-wA-j.js";
+import { $ as ImageTransform, $t as VerticalAlign, A as ComplexField, An as BorderSpec, At as SectionStart, B as FooterReference, Bt as TabContent, C as BookmarkStart, Cn as TableLook, Ct as RunContent, D as CommentRangeEnd, Dn as TextEffect, Dt as Section, E as Comment, En as TableWidthType, Et as SdtType, F as EndnotePosition, Ft as ShapeTextBody, G as HeaderFooterType, Gt as TableRow, H as FootnotePosition, Ht as TableCell, I as EndnoteProperties, It as ShapeType, J as Image, Jt as TextBox, K as HeaderReference, Kt as TableRowPropertyChange, L as Field, Lt as SimpleField, M as DocumentBody, Mn as KnownBorderStyle, Mt as ShapeContent, N as DrawingContent, Nn as ShadingProperties, Nt as ShapeFill, O as CommentRangeStart, On as TextFormatting, Ot as SectionProperties, P as Endnote, Pn as ThemeColorSlot, Pt as ShapeOutline, Q as ImageSize, Qt as TrackedRunChange, R as FieldCharContent, Rt as SoftHyphenContent, S as BookmarkEnd, Sn as TableFormatting, St as Run, T as Column, Tn as TableRowFormatting, Tt as SdtProperties, U as FootnoteProperties, Ut as TableCellPropertyChange, V as Footnote, Vt as Table, W as HeaderFooter, Wt as TablePropertyChange, X as ImagePadding, Xt as TextWatermark, Y as ImageCrop, Yt as TextContent, Z as ImagePosition, Zt as TrackedChangeInfo, _ as ThemeColorScheme, _n as TabStop, _t as ParagraphContent, a as DocxPackage, an as NumberFormat, at as MathEquation, b as BlockContent, bn as TableCellBorders, bt as PictureWatermark, c as FontTable, cn as CellMargins, ct as MoveFromRangeStart, d as RelationshipMap, dn as FloatingTableProperties, dt as MoveToRangeStart, en as Watermark, et as ImageWrap, f as RelationshipType, fn as LineSpacingRule, ft as NoBreakHyphenContent, g as Theme, gn as TabLeader, gt as Paragraph, h as StyleType, hn as SpacingExplicit, ht as PageOrientation, i as DocxConformanceClass, in as ListRendering, it as LineNumberRestart, j as Deletion, jn as ColorValue, jt as Shape, k as CommentReference, kn as UnderlineStyle, kt as SectionPropertyChange, l as MediaFile, ln as ConditionalFormatStyle, lt as MoveTo, m as StyleDefinitions, mn as ParagraphFormatting, mt as NoteReferenceContent, n as Document, nn as LevelSuffix, nt as Insertion, o as DocDefaults, on as NumberingDefinitions, ot as MoveFrom, p as Style, pn as ParagraphAlignment, pt as NoteNumberRestart, q as Hyperlink, qt as TableStructuralChangeInfo, r as DocumentSettings, rn as ListLevel, rt as InstrTextContent, s as FontInfo, sn as NumberingInstance, st as MoveFromRangeEnd, t as DOCX_CONFORMANCE_CLASSES, tn as AbstractNumbering, tt as InlineSdt, u as Relationship, un as EmphasisMark, ut as MoveToRangeEnd, v as ThemeFont, vn as TabStopAlignment, vt as ParagraphMarkChange, w as BreakContent, wn as TableMeasurement, wt as RunPropertyChange, x as BlockSdt, xn as TableCellFormatting, xt as PropertyChangeInfo, y as ThemeFontScheme, yn as TableBorders, yt as ParagraphPropertyChange, z as FieldType, zt as SymbolContent } from "../document-CzARzXpt.js";
 export { type AbstractNumbering, type BlockContent, type BlockSdt, type BookmarkEnd, type BookmarkStart, type BorderSpec, type BreakContent, type CellMargins, type ColorValue, type Column, type Comment, type CommentRangeEnd, type CommentRangeStart, type CommentReference, type ComplexField, type ConditionalFormatStyle, DOCX_CONFORMANCE_CLASSES, type Deletion, type DocDefaults, Document, type DocumentBody, DocumentSettings, DocxConformanceClass, DocxPackage, type DrawingContent, type EmphasisMark, type Endnote, type EndnotePosition, type EndnoteProperties, type Field, type FieldCharContent, type FieldType, type FloatingTableProperties, type FontInfo, type FontTable, type FooterReference, type Footnote, type FootnotePosition, type FootnoteProperties, type HeaderFooter, type HeaderFooterType, type HeaderReference, type Hyperlink, type Image, type ImageCrop, type ImagePadding, type ImagePosition, type ImageSize, type ImageTransform, type ImageWrap, type InlineSdt, type Insertion, type InstrTextContent, type KnownBorderStyle, type LevelSuffix, type LineNumberRestart, type LineSpacingRule, type ListLevel, type ListRendering, type MathEquation, type MediaFile, type MoveFrom, type MoveFromRangeEnd, type MoveFromRangeStart, type MoveTo, type MoveToRangeEnd, type MoveToRangeStart, type NoBreakHyphenContent, type NoteNumberRestart, type NoteReferenceContent, type NumberFormat, type NumberingDefinitions, type NumberingInstance, type PageOrientation, type Paragraph, type ParagraphAlignment, type ParagraphContent, type ParagraphFormatting, type ParagraphMarkChange, type ParagraphPropertyChange, type PictureWatermark, type PropertyChangeInfo, type Relationship, type RelationshipMap, type RelationshipType, type Run, type RunContent, type RunPropertyChange, type SdtProperties, type SdtType, type Section, type SectionProperties, type SectionPropertyChange, type SectionStart, type ShadingProperties, type Shape, type ShapeContent, type ShapeFill, type ShapeOutline, type ShapeTextBody, type ShapeType, type SimpleField, type SoftHyphenContent, type SpacingExplicit, type Style, type StyleDefinitions, type StyleType, type SymbolContent, type TabContent, type TabLeader, type TabStop, type TabStopAlignment, type Table, type TableBorders, type TableCell, type TableCellBorders, type TableCellFormatting, type TableCellPropertyChange, type TableFormatting, type TableLook, type TableMeasurement, type TablePropertyChange, type TableRow, type TableRowFormatting, type TableRowPropertyChange, type TableStructuralChangeInfo, type TableWidthType, type TextBox, type TextContent, type TextEffect, type TextFormatting, type TextWatermark, type Theme, type ThemeColorScheme, type ThemeColorSlot, type ThemeFont, type ThemeFontScheme, type TrackedChangeInfo, type TrackedRunChange, type UnderlineStyle, type VerticalAlign, type Watermark };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stll/docx-core",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "description": "Typed OOXML/DOCX document model with parsing, validation, and serialization, plus a legal-source compiler that produces DOCX packages.",
   "keywords": [
     "document-model",