@stll/folio-core 0.14.1 → 0.15.1

package/dist/utils/documentLoaderBehavior.d.ts

@@ -1,6 +1,5 @@
 import { document_d_exports } from "../types/document.js";
 import { DocxInput } from "./docxInput.js";
-
 //#region src/utils/documentLoaderBehavior.d.ts
 type DocumentLoadSource = {
   type: "buffer";
@@ -11,10 +10,7 @@ type DocumentLoadSource = {
 } | {
   type: "none";
 };
-declare const getDocumentLoadSource: ({
-  documentBuffer,
-  initialDocument
-}: {
+declare const getDocumentLoadSource: ({ documentBuffer, initialDocument }: {
   documentBuffer: DocxInput | null | undefined;
   initialDocument: document_d_exports.Document | null | undefined;
 }) => DocumentLoadSource;

package/dist/utils/docxInput.js

@@ -5,6 +5,7 @@
 function toArrayBuffer(input) {
 	if (input instanceof ArrayBuffer) return Promise.resolve(input);
 	if (input instanceof Uint8Array) {
+		if (input.buffer instanceof ArrayBuffer && input.byteOffset === 0 && input.byteLength === input.buffer.byteLength) return Promise.resolve(input.buffer);
 		const copy = new ArrayBuffer(input.byteLength);
 		new Uint8Array(copy).set(input);
 		return Promise.resolve(copy);

package/dist/utils/findReplace.d.ts

@@ -1,6 +1,5 @@
 import { document_d_exports } from "../types/document.js";
 import { Paragraph } from "../types/content.js";
-
 //#region src/utils/findReplace.d.ts
 type FindMatch = {
   paragraphIndex: number;

package/dist/utils/fontFamilyMerge.d.ts

@@ -1,5 +1,4 @@
 import { document_d_exports } from "../types/document.js";
-
 //#region src/utils/fontFamilyMerge.d.ts
 type FontFamily = NonNullable<document_d_exports.TextFormatting["fontFamily"]>;
 declare function mergeFontFamily(target: FontFamily | undefined, source: FontFamily): FontFamily;

package/dist/utils/fontResolver.d.ts

@@ -1,13 +1,19 @@
 import { document_d_exports } from "../types/document.js";
+import "../types/index.js";
 //#region src/utils/fontResolver.d.ts
 /**
  * Result of resolving a font family
  */
 type ResolvedFont = {
-  /** Google Font name to load (null if no mapping available) */googleFont: string | null; /** CSS font-family value with proper fallback stack */
-  cssFallback: string; /** Original font name from the DOCX */
-  originalFont: string; /** Whether this font has a Google Fonts equivalent */
-  hasGoogleEquivalent: boolean; /** Single-line height ratio (single-line height ÷ font size). See `FontLineHeight`. */
+  /** Google Font name to load (null if no mapping available) */
+  googleFont: string | null;
+  /** CSS font-family value with proper fallback stack */
+  cssFallback: string;
+  /** Original font name from the DOCX */
+  originalFont: string;
+  /** Whether this font has a Google Fonts equivalent */
+  hasGoogleEquivalent: boolean;
+  /** Single-line height ratio (single-line height ÷ font size). See `FontLineHeight`. */
   singleLineRatio: number;
 };
 /**

package/dist/utils/formatToStyle.d.ts

@@ -1,7 +1,6 @@
 import { document_d_exports } from "../types/document.js";
 import { ColorValue } from "../types/colors.js";
 import { Properties } from "csstype";
-
 //#region src/utils/formatToStyle.d.ts
 type CSSProperties = Properties<string | number>;
 /**

package/dist/utils/headerFooter.d.ts

@@ -1,5 +1,4 @@
 import { document_d_exports } from "../types/document.js";
-
 //#region src/utils/headerFooter.d.ts
 type HeaderFooterPosition = "header" | "footer";
 /**
@@ -39,8 +38,10 @@ declare const createEmptyHeaderFooter: (document: document_d_exports.Document, p
 type SaveHeaderFooterArgs = {
   document: document_d_exports.Document;
   position: HeaderFooterPosition;
-  isFirstPage: boolean; /** The relationship id the displayed slot resolves to (`pickActiveHeaderFooterRId`). */
-  activeRId: string; /** The serialised header/footer body (from the live PM doc). */
+  isFirstPage: boolean;
+  /** The relationship id the displayed slot resolves to (`pickActiveHeaderFooterRId`). */
+  activeRId: string;
+  /** The serialised header/footer body (from the live PM doc). */
   blocks: document_d_exports.BlockContent[];
 };
 /**
@@ -49,26 +50,17 @@ type SaveHeaderFooterArgs = {
  * Document untouched so undo can step back to the pre-edit state. Returns null
  * when the target header/footer cannot be found.
  */
-declare const saveHeaderFooterContent: ({
-  document,
-  position,
-  isFirstPage,
-  activeRId,
-  blocks
-}: SaveHeaderFooterArgs) => document_d_exports.Document | null;
+declare const saveHeaderFooterContent: ({ document, position, isFirstPage, activeRId, blocks }: SaveHeaderFooterArgs) => document_d_exports.Document | null;
 type RemoveHeaderFooterArgs = {
   document: document_d_exports.Document;
-  position: HeaderFooterPosition; /** The relationship id the displayed slot resolves to (`pickActiveHeaderFooterRId`). */
+  position: HeaderFooterPosition;
+  /** The relationship id the displayed slot resolves to (`pickActiveHeaderFooterRId`). */
   activeRId: string;
 };
 /**
  * Remove a header/footer and drop its reference from every section that points
  * at it, returning the new Document.
  */
-declare const removeHeaderFooter: ({
-  document,
-  position,
-  activeRId
-}: RemoveHeaderFooterArgs) => document_d_exports.Document;
+declare const removeHeaderFooter: ({ document, position, activeRId }: RemoveHeaderFooterArgs) => document_d_exports.Document;
 //#endregion
 export { HeaderFooterPosition, HeaderFooterResolution, RemoveHeaderFooterArgs, SaveHeaderFooterArgs, createEmptyHeaderFooter, pickActiveHeaderFooterRId, removeHeaderFooter, resolveEffectiveSectionProperties, resolveHeaderFooterContent, saveHeaderFooterContent };

package/dist/utils/headingCollector.d.ts

@@ -1,13 +1,16 @@
 import { Node } from "prosemirror-model";
-
 //#region src/utils/headingCollector.d.ts
 /**
  * Information about a heading found in the document.
  */
 type HeadingInfo = {
-  /** The text content of the heading */text: string; /** Outline level (0 = Heading 1, 1 = Heading 2, etc.) */
-  level: number; /** ProseMirror document position of the paragraph node */
-  pmPos: number; /** 1-indexed page number, filled in by the editor once layout is known. */
+  /** The text content of the heading */
+  text: string;
+  /** Outline level (0 = Heading 1, 1 = Heading 2, etc.) */
+  level: number;
+  /** ProseMirror document position of the paragraph node */
+  pmPos: number;
+  /** 1-indexed page number, filled in by the editor once layout is known. */
   pageNumber?: number | null;
 };
 /**

package/dist/utils/mergeDocumentContent.d.ts

@@ -0,0 +1,28 @@
+import { document_d_exports } from "../types/document.js";
+//#region src/utils/mergeDocumentContent.d.ts
+/**
+ * Append `source`'s body content onto `target`'s. Both documents keep their
+ * own identity — this returns a new `Document`; neither argument is mutated.
+ *
+ * `target` wins on everything except content and numbering: its style set,
+ * theme, font table, settings, and section/page geometry are unchanged, so
+ * merging markdown (or any other document) into a styled preset keeps that
+ * preset's look. Only `source`'s numbering — the `w:abstractNum`/`w:num`
+ * definitions its content's `numPr` references — travels with it, and every
+ * `abstractNumId`/`numId` it carries is renumbered to sit strictly above
+ * whatever `target` already uses. This is unconditional (not just on a
+ * detected collision): it is simpler to reason about, and makes repeated
+ * merges into the same target safe too (merging two sources that each mint
+ * `numId` 1 does not collide with each other either).
+ *
+ * A typical caller composes `fromMarkdown` with a styled preset:
+ *
+ * ```ts
+ * const target = createEmptyDocument({ preset: createStellaStyleDocumentPreset() });
+ * const merged = mergeDocumentContent(target, fromMarkdown(markdown));
+ * const bytes = await createDocx(merged);
+ * ```
+ */
+declare function mergeDocumentContent(target: document_d_exports.Document, source: document_d_exports.Document): document_d_exports.Document;
+//#endregion
+export { mergeDocumentContent };

package/dist/utils/mergeDocumentContent.js

@@ -0,0 +1,145 @@
+//#region src/utils/mergeDocumentContent.ts
+/**
+* Append `source`'s body content onto `target`'s. Both documents keep their
+* own identity — this returns a new `Document`; neither argument is mutated.
+*
+* `target` wins on everything except content and numbering: its style set,
+* theme, font table, settings, and section/page geometry are unchanged, so
+* merging markdown (or any other document) into a styled preset keeps that
+* preset's look. Only `source`'s numbering — the `w:abstractNum`/`w:num`
+* definitions its content's `numPr` references — travels with it, and every
+* `abstractNumId`/`numId` it carries is renumbered to sit strictly above
+* whatever `target` already uses. This is unconditional (not just on a
+* detected collision): it is simpler to reason about, and makes repeated
+* merges into the same target safe too (merging two sources that each mint
+* `numId` 1 does not collide with each other either).
+*
+* A typical caller composes `fromMarkdown` with a styled preset:
+*
+* ```ts
+* const target = createEmptyDocument({ preset: createStellaStyleDocumentPreset() });
+* const merged = mergeDocumentContent(target, fromMarkdown(markdown));
+* const bytes = await createDocx(merged);
+* ```
+*/
+function mergeDocumentContent(target, source) {
+	const targetNumbering = target.package.numbering;
+	const sourceNumbering = source.package.numbering;
+	if (sourceNumbering === void 0 || sourceNumbering.abstractNums.length === 0 && sourceNumbering.nums.length === 0) return {
+		...target,
+		package: {
+			...target.package,
+			document: {
+				...target.package.document,
+				content: [...target.package.document.content, ...source.package.document.content]
+			}
+		}
+	};
+	const remappedSource = remapContentNumbering(source.package.document.content, sourceNumbering);
+	return {
+		...target,
+		package: {
+			...target.package,
+			document: {
+				...target.package.document,
+				content: [...target.package.document.content, ...remappedSource.content]
+			},
+			numbering: {
+				abstractNums: [...targetNumbering?.abstractNums ?? [], ...remappedSource.numbering.abstractNums],
+				nums: [...targetNumbering?.nums ?? [], ...remappedSource.numbering.nums]
+			}
+		}
+	};
+	function remapContentNumbering(content, numbering) {
+		const abstractNumIdBase = Math.max(0, ...(targetNumbering?.abstractNums ?? []).map((abstractNum) => abstractNum.abstractNumId));
+		const numIdBase = Math.max(0, ...(targetNumbering?.nums ?? []).map((num) => num.numId));
+		const abstractNumIdRemap = /* @__PURE__ */ new Map();
+		const remappedAbstractNums = numbering.abstractNums.map((abstractNum, index) => {
+			const remappedAbstractNumId = abstractNumIdBase + index + 1;
+			abstractNumIdRemap.set(abstractNum.abstractNumId, remappedAbstractNumId);
+			return {
+				...abstractNum,
+				abstractNumId: remappedAbstractNumId
+			};
+		});
+		const numIdRemap = /* @__PURE__ */ new Map();
+		const remappedNums = numbering.nums.map((num, index) => {
+			const remappedNumId = numIdBase + index + 1;
+			numIdRemap.set(num.numId, remappedNumId);
+			return {
+				...num,
+				numId: remappedNumId,
+				abstractNumId: abstractNumIdRemap.get(num.abstractNumId) ?? num.abstractNumId
+			};
+		});
+		return {
+			content: content.map((block) => remapBlock(block, numIdRemap, abstractNumIdRemap)),
+			numbering: {
+				abstractNums: remappedAbstractNums,
+				nums: remappedNums
+			}
+		};
+	}
+}
+function remapBlock(block, numIdRemap, abstractNumIdRemap) {
+	if (block.type === "paragraph") return remapParagraph(block, numIdRemap, abstractNumIdRemap);
+	if (block.type === "table") return remapTable(block, numIdRemap, abstractNumIdRemap);
+	if ("content" in block && Array.isArray(block.content)) return {
+		...block,
+		content: block.content.map((child) => remapBlock(child, numIdRemap, abstractNumIdRemap))
+	};
+	return block;
+}
+function remapTable(table, numIdRemap, abstractNumIdRemap) {
+	return {
+		...table,
+		rows: table.rows.map((row) => ({
+			...row,
+			cells: row.cells.map((cell) => ({
+				...cell,
+				content: cell.content.map((item) => remapCellItem(item, numIdRemap, abstractNumIdRemap))
+			}))
+		}))
+	};
+}
+/**
+* `TableCell.content` is typed as `(Paragraph | Table)[]` — narrower than
+* `BlockContent` — because folio's own DOCX parser flattens a `w:sdt` inside
+* a cell into its `sdtContent` children (see `tableParser.ts`) rather than
+* keeping a `blockSdt` wrapper. A hand-built `Document` is not bound by that
+* invariant, so delegate to `remapBlock` (which fully handles paragraph,
+* table, and container blocks, including nested tables) and only accept its
+* result back into the cell when it is still a `Paragraph | Table` — an
+* anomalous `blockSdt` (or any other shape `remapBlock` had to pass through
+* unchanged) is left as-is rather than smuggled into a field the type system
+* says can't hold it.
+*/
+function remapCellItem(item, numIdRemap, abstractNumIdRemap) {
+	const remapped = remapBlock(item, numIdRemap, abstractNumIdRemap);
+	return remapped.type === "blockSdt" ? item : remapped;
+}
+function remapParagraph(paragraph, numIdRemap, abstractNumIdRemap) {
+	const numId = paragraph.formatting?.numPr?.numId;
+	const remappedNumId = numId === void 0 ? void 0 : numIdRemap.get(numId);
+	if (remappedNumId === void 0) return paragraph;
+	return {
+		...paragraph,
+		formatting: {
+			...paragraph.formatting,
+			numPr: {
+				...paragraph.formatting?.numPr,
+				numId: remappedNumId
+			}
+		},
+		...paragraph.listRendering && { listRendering: remapListRendering(paragraph.listRendering, remappedNumId, abstractNumIdRemap) }
+	};
+}
+function remapListRendering(rendering, remappedNumId, abstractNumIdRemap) {
+	return {
+		...rendering,
+		numId: remappedNumId,
+		...rendering.abstractNumId !== void 0 && { abstractNumId: abstractNumIdRemap.get(rendering.abstractNumId) ?? rendering.abstractNumId }
+	};
+}
+//#endregion
+export { mergeDocumentContent };

package/dist/utils/paragraphFormattingMerge.d.ts

@@ -1,5 +1,4 @@
 import { document_d_exports } from "../types/document.js";
-
 //#region src/utils/paragraphFormattingMerge.d.ts
 /**
  * Merge custom tab stops across OOXML paragraph-property layers.

package/dist/utils/replaceText.d.ts

@@ -1,5 +1,4 @@
 import { document_d_exports } from "../types/document.js";
-
 //#region src/utils/replaceText.d.ts
 type ReplaceRange = {
   start: {

package/dist/utils/rotationBoundingBox.d.ts

@@ -1,5 +1,4 @@
 import { ImageRun } from "../layout-engine/types.js";
-
 //#region src/utils/rotationBoundingBox.d.ts
 type BoundingBox = {
   width: number;

package/dist/utils/tableOperations.d.ts

@@ -1,5 +1,4 @@
 import { document_d_exports } from "../types/document.js";
-
 //#region src/utils/tableOperations.d.ts
 type TableAction = "addRowAbove" | "addRowBelow" | "addColumnLeft" | "addColumnRight" | "deleteRow" | "deleteColumn" | "mergeCells" | "splitCell" | "deleteTable" | "selectTable" | "selectRow" | "selectColumn" | "borderAll" | "borderOutside" | "borderInside" | "borderNone" | "borderTop" | "borderBottom" | "borderLeft" | "borderRight" | {
   type: "cellFillColor";

package/dist/utils/textFormattingMerge.d.ts

@@ -1,5 +1,4 @@
 import { document_d_exports } from "../types/document.js";
-
 //#region src/utils/textFormattingMerge.d.ts
 declare function mergeTextFormatting(target: document_d_exports.TextFormatting | undefined, source: document_d_exports.TextFormatting | undefined): document_d_exports.TextFormatting | undefined;
 //#endregion

package/dist/version-comparison.d.ts

@@ -2,7 +2,6 @@ import { FolioAIBlock } from "./ai-edits/types.js";
 import { FolioDocumentStoryHandle } from "./ai-edits/headless.js";
 import { WordDiffSegment } from "./ai-edits/word-diff.js";
 import { FOLIO_DOCUMENT_METADATA_PROPERTIES, FolioDocumentMetadataProperty, FolioDocumentPrivacyOptions, FolioDocumentPrivacyReport, FolioDocumentPrivacyTransform } from "./docx/metadataPrivacy.js";
-
 //#region src/version-comparison.d.ts
 /** One word-level diff segment within a `modified` block. Mirrors {@link WordDiffSegment}. */
 type FolioVersionDiffSegment = WordDiffSegment;
@@ -11,7 +10,9 @@ declare const FOLIO_VERSION_COMPARISON_SCOPES: readonly ["text", "formatting", "
 type FolioVersionComparisonScope = (typeof FOLIO_VERSION_COMPARISON_SCOPES)[number];
 declare const isFolioVersionComparisonScope: (value: unknown) => value is FolioVersionComparisonScope;
 type FolioCompareDocxVersionsOptions = {
-  /** Selected scopes; defaults to text and formatting. */include?: readonly FolioVersionComparisonScope[]; /** Optional output-only privacy transforms. Source buffers are never mutated. */
+  /** Selected scopes; defaults to text and formatting. */
+  include?: readonly FolioVersionComparisonScope[];
+  /** Optional output-only privacy transforms. Source buffers are never mutated. */
   privacy?: FolioVersionDiffPrivacyOptions;
 };
 declare const InvalidFolioVersionComparisonOptionsError_base: import("better-result").TaggedErrorClass<"InvalidFolioVersionComparisonOptionsError", {
@@ -101,10 +102,15 @@ type FolioStoryDiff = {
 };
 /** Result of {@link compareDocxVersions}. */
 type FolioVersionDiff = {
-  /** Every changed block, in revised-side document order (deletions and move sources slotted where they sat). */changes: FolioBlockDiff[]; /** Per-story results in base order followed by stories added in the revised document. */
-  stories: FolioStoryDiff[]; /** Changed package metadata fields in stable property order. */
-  metadataChanges: FolioMetadataDiff[]; /** Applied privacy policy and the fields it removed from this result. */
-  privacyReport: FolioVersionDiffPrivacyReport; /** Counts across every paired/unpaired block, including the unchanged blocks `changes` omits. `moved` counts pairs, not entries. */
+  /** Every changed block, in revised-side document order (deletions and move sources slotted where they sat). */
+  changes: FolioBlockDiff[];
+  /** Per-story results in base order followed by stories added in the revised document. */
+  stories: FolioStoryDiff[];
+  /** Changed package metadata fields in stable property order. */
+  metadataChanges: FolioMetadataDiff[];
+  /** Applied privacy policy and the fields it removed from this result. */
+  privacyReport: FolioVersionDiffPrivacyReport;
+  /** Counts across every paired/unpaired block, including the unchanged blocks `changes` omits. `moved` counts pairs, not entries. */
   summaryCounts: FolioVersionDiffSummaryCounts;
 };
 /** True when an `unpairedBaseCount * unpairedRevisedCount` LCS table would exceed {@link MAX_LCS_CELLS}. */

package/dist/watermark/index.d.ts

@@ -1,5 +1,4 @@
 import { document_d_exports } from "../types/document.js";
-
 //#region src/watermark/index.d.ts
 /**
  * Whether `target` is safe to save as a watermark picture's external image

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stll/folio-core",
-  "version": "0.14.1",
+  "version": "0.15.1",
   "description": "Headless, framework-neutral core of folio: the OOXML (.docx) parser, document model, ProseMirror integration, and page-layout engine. No React.",
   "keywords": [
     "document-model",
@@ -107,10 +107,10 @@
     "perf": "bun scripts/profile-editor.ts"
   },
   "dependencies": {
-    "@stll/docx-core": "^0.4.0",
+    "@stll/docx-core": "^0.5.1",
     "@stll/docx-utils": "^0.1.0",
     "@stll/template-conditions": "^0.1.0",
-    "better-result": "2.9.2",
+    "better-result": "2.10.0",
     "csstype": "^3.1.3",
     "dompurify": "^3.4.12",
     "fast-xml-parser": "^5.9.3",