@stll/folio-core 0.64.1 → 0.66.0

package/dist/ai-edits/apply.js

@@ -26,7 +26,7 @@ import { getDocumentNumbering, getDocumentNumberingInstanceIds } from "../prosem
 import { getDocumentStyleDefinitions, getDocumentStyleResolver } from "../prosemirror/plugins/documentStyleState.js";
 import { claimRevisionIds, nextRevisionId, nextRevisionIdRange, reserveRevisionIds, seedRevisionIdsFromDoc } from "../prosemirror/plugins/revisionIds.js";
 import { rebaseParagraphRuns } from "../prosemirror/rebaseParagraphRuns.js";
-import { NON_INCLUSIVE_MARK_DISPOSITION, addCarriedMarks, annotatedReplacement, commentsAcrossBlockBoundary, commentsForTrackedInsertion, hasReplacedAnnotations, inheritedReplacementMarks, joinCommentStretches, placeTrackedInsertion, surveyReplacedAnnotations } from "../prosemirror/replacedAnnotations.js";
+import { NON_INCLUSIVE_MARK_DISPOSITION, addCarriedMarks, annotatedReplacement, commentsAcrossBlockBoundary, commentsForTrackedInsertion, hasReplacedAnnotations, inheritedReplacementMarks, joinCommentStretches, placeTrackedInsertion, surveyAcceptedReplacedAnnotations, surveyReplacedAnnotations } from "../prosemirror/replacedAnnotations.js";
 import { applyMarksToRunFormattingRepresentation, runFormattingInlineControlNodeName, selectRunFormattingCarrierRepresentations } from "../prosemirror/runFormattingInlineCarriers.js";
 import { RUN_FORMATTING_MARK_NAMES } from "../prosemirror/runFormattingMarkNames.js";
 import { readAuthoredRunFormatting, readAuthoredRunPropertySnapshot, reconcileRunFormattingMarks } from "../prosemirror/runFormattingReconciliation.js";
@@ -1395,6 +1395,17 @@ const holdsOnlyInsertedContent = (paragraph, revisions) => {
 	});
 	return whollyInserted;
 };
+/** Whether every inline of `paragraph` is an ordinary insertion one of `revisionIds` made. */
+const holdsOnlyContentInsertedBy = (paragraph, revisionIds) => {
+	let whollyInserted = true;
+	paragraph.descendants((node) => {
+		if (!whollyInserted) return false;
+		if (!node.isInline || isZeroWidthAnchor(node)) return true;
+		whollyInserted = node.marks.some((mark) => mark.type.name === "insertion" && mark.attrs["moveKind"] !== "moveTo" && revisionIds.has(mark.attrs["revisionId"]));
+		return false;
+	});
+	return whollyInserted;
+};
 /**
 * Remove the paragraph between `from` and `to`, its content with it but not
 * the range boundaries it holds: those stay where it was, as rejecting a
@@ -2072,7 +2083,7 @@ const withRotatedAddedFinalBreaks = ({ tr, batchRevisionIds, revisionSeed, autho
 				const trackedInsertion = insertedRevisionId !== null && batchRevisionIds.has(insertedRevisionId);
 				const suggestedInsertion = isSuggestedParagraphInsert(node);
 				const deletedBreakRevisionId = addedOrDeletedBreakRevisionId(deletedMark);
-				if (isPlainDeletedPPrMark(deletedMark) && deletedBreakRevisionId !== null && !batchRevisionIds.has(deletedBreakRevisionId) && !holdsOnlyDeletedContent(previous.node) && (trackedInsertion || suggestedInsertion) && holdsOnlyInsertedContent(node, "ordinary")) {
+				if (isPlainDeletedPPrMark(deletedMark) && deletedBreakRevisionId !== null && !batchRevisionIds.has(deletedBreakRevisionId) && !holdsOnlyDeletedContent(previous.node) && (trackedInsertion && holdsOnlyContentInsertedBy(node, batchRevisionIds) || suggestedInsertion && holdsOnlyInsertedContent(node, "ordinary"))) {
 					supersededDeletedBreaks.push({
 						preceding: previous.position,
 						inserted: position,
@@ -2094,6 +2105,7 @@ const withRotatedAddedFinalBreaks = ({ tr, batchRevisionIds, revisionSeed, autho
 		});
 	};
 	collectSupersededDeletedBreaks(tr.doc, 0);
+	const passedThrough = new Set(supersededDeletedBreaks.map(({ preceding }) => preceding));
 	for (const { preceding, inserted, deletedMark, precedingMark, precedingFormatting } of supersededDeletedBreaks) {
 		const insertionRevisionId = addedBreakRevisionId(precedingMark);
 		if (insertionRevisionId !== null) {
@@ -2118,6 +2130,7 @@ const withRotatedAddedFinalBreaks = ({ tr, batchRevisionIds, revisionSeed, autho
 		tr.setNodeAttribute(preceding, "pPrMark", precedingMark);
 		tr.setNodeAttribute(inserted, "pPrMark", deletedMark);
 		if (insertionRevisionId === null) continue;
+		if (passedThrough.has(inserted)) continue;
 		const source = tr.doc.nodeAt(inserted);
 		const survivor = paragraphLeftAfter({
 			doc: tr.doc,
@@ -2903,7 +2916,12 @@ const applyFolioAIEditOperationsInternal = ({ view, snapshot, operations: reques
 			}
 			const nodes = [];
 			for (const group of nodeGroups.toReversed()) for (const node of group) nodes.push(node);
-			tr = tr.insert(item.from, nodes);
+			tr = insertBlocksInsideComments({
+				tr,
+				at: item.from,
+				blocks: nodes,
+				...item.boundaryComments !== void 0 && { carriedComments: item.boundaryComments }
+			});
 			applied.push(...runApplied);
 			continue;
 		}
@@ -3288,7 +3306,8 @@ const applyFolioAIEditOperationsInternal = ({ view, snapshot, operations: reques
 				tr = insertBlocksInsideComments({
 					tr,
 					at: item.from,
-					blocks: built.nodes
+					blocks: built.nodes,
+					...item.boundaryComments !== void 0 && { carriedComments: item.boundaryComments }
 				});
 				break;
 			}
@@ -3713,7 +3732,7 @@ const applyFolioAIEditOperationsInternal = ({ view, snapshot, operations: reques
 				const carriedComments = tableAfterDeletedSplit.get(item.blockFrom);
 				const usesRetractedSplit = carriedComments !== void 0 && item.from === item.blockTo;
 				let at = usesRetractedSplit ? tr.mapping.map(item.blockFrom, -1) : item.from;
-				let insertionComments = carriedComments;
+				let insertionComments = carriedComments ?? item.boundaryComments;
 				if (!usesRetractedSplit) {
 					const boundary = tr.doc.resolve(at);
 					const before = boundary.nodeBefore;
@@ -3903,6 +3922,7 @@ const applyFolioAIEditOperationsInternal = ({ view, snapshot, operations: reques
 				if (mode === "direct") {
 					if (item.to > item.from) tr = tr.delete(item.from, item.to);
 					tr = tr.split(item.from);
+					tr = tr.setNodeAttribute(item.blockFrom, "pPrMark", null);
 					if (splitsFromItsTextBoxes) gatherTextBoxesAfterParagraph(tr, item.blockFrom);
 				} else {
 					const revisionIdMark = operationRevisionSeed++;
@@ -4754,7 +4774,7 @@ const directReplacementMarks = ({ doc, plan, replacementBackground }) => {
 			const first = pieces.at(0);
 			const last = pieces.at(-1);
 			if (first === void 0 || last === void 0) panic("A planned replacement lost the characters it removes");
-			marks = addCarriedMarks(inheritedReplacementMarks(doc, first.from, first.to), surveyReplacedAnnotations(doc, first.from, last.to).carried);
+			marks = addCarriedMarks(inheritedReplacementMarks(doc, first.from, first.to), surveyAcceptedReplacedAnnotations(doc, first.from, last.to).carried);
 		}
 		const written = clearsBackground ? withoutBackground(marks) : marks;
 		for (let offset = 0; offset < change.text.length; offset++) allocated.push(written);
@@ -5020,7 +5040,7 @@ const applyMinimalTrackedReplacement = ({ tr, item, noteReferences, replacement,
 			if (first === void 0 || last === void 0 || styleSource === null) panic("A planned replacement lost the characters it removes");
 			at = last.to;
 			removedFrom = first.from;
-			marks = addCarriedMarks(inheritedReplacementMarks(doc, styleSource.from, styleSource.to), surveyReplacedAnnotations(doc, first.from, last.to).carried);
+			marks = addCarriedMarks(inheritedReplacementMarks(doc, styleSource.from, styleSource.to), surveyAcceptedReplacedAnnotations(doc, first.from, last.to).carried);
 			for (const piece of change.pieces) {
 				addTrackedDeletionMark({
 					insertionPolicy: "preserve-pending",
@@ -5285,7 +5305,8 @@ const resolveOperationTarget = ({ snapshot, operation, liveBlocks, liveBlocksByP
 				blockFrom,
 				blockTo,
 				blockNode,
-				insertTexts
+				insertTexts,
+				boundaryComments: commentsAcrossBlockBoundary(doc, insertFrom)
 			}
 		};
 	}
@@ -5541,7 +5562,8 @@ const resolveOperationTarget = ({ snapshot, operation, liveBlocks, liveBlocksByP
 				to: insertFrom,
 				blockFrom,
 				blockTo,
-				blockNode
+				blockNode,
+				boundaryComments: commentsAcrossBlockBoundary(doc, insertFrom)
 			}
 		};
 	}

package/dist/ai-edits/headless.js

@@ -56,7 +56,7 @@ import { TaggedError, panic } from "better-result";
 import { REVIEW_CARRIERS, finalizeParagraphFormatting, numberingLevelEntries, setDocumentBodyComments } from "@stll/docx-core/model";
 import { reconcileDocumentPartRelationships } from "@stll/docx-core/ops";
 import { EditorState } from "prosemirror-state";
-import JSZip from "jszip";
+import { ZipArchive } from "@stll/docx-core/zip";
 // src/ai-edits/headless.ts
 /**
 * Headless `.docx` review path: buffer -> apply AI edits -> buffer, with
@@ -1990,8 +1990,8 @@ var FolioDocxReviewer = class FolioDocxReviewer {
 			if (xml === null) return null;
 			const extension = media.path.split(".").at(-1)?.toLowerCase();
 			if (!extension || !/^[a-z0-9]+$/u.test(extension)) return null;
-			const originalZip = await JSZip.loadAsync(this.originalBuffer);
-			const existingPaths = new Set(Object.keys(originalZip.files).map((path) => path.toLowerCase()));
+			const originalZip = await ZipArchive.read(this.originalBuffer);
+			const existingPaths = new Set(originalZip.paths().map((path) => path.toLowerCase()));
 			let suffix = 1;
 			let path = `word/media/folio-import-${suffix}.${extension}`;
 			while (existingPaths.has(path.toLowerCase()) || this.baseDocument.package.media?.has(path) || this.importedMedia.has(path)) path = `word/media/folio-import-${++suffix}.${extension}`;

package/dist/compare/reproducible-package.d.ts

@@ -1 +1,6 @@
+/**
+ * Date comparison output from the comparison's timestamp. Imported entries
+ * retain source dates, and saves can stamp `dcterms:modified` from the wall
+ * clock; restamping both makes repeated comparisons reproducible.
+ */
 export declare const withFixedPackageDates: (buffer: ArrayBuffer, date: Date) => Promise<ArrayBuffer>;

package/dist/compare/reproducible-package.js

@@ -1,13 +1,12 @@
-import { decodeText, encodeUtf8 } from "../utils/textEncoding.js";
-import JSZip from "jszip";
-import { writeZipPart } from "@stll/docx-core/zip";
+import { decodeText } from "../utils/textEncoding.js";
+import { ZipArchive } from "@stll/docx-core/zip";
 // src/compare/reproducible-package.ts
 /**
 * Date comparison output from the comparison's timestamp. Imported entries
 * retain source dates, and saves can stamp `dcterms:modified` from the wall
 * clock; restamping both makes repeated comparisons reproducible.
 */
-/** JSZip deflate level `repackDocx` writes DOCX parts at. */
+/** ZipArchive deflate level `repackDocx` writes DOCX parts at. */
 const DOCX_COMPRESSION_LEVEL = 6;
 const CORE_PROPERTIES_PATH = "docProps/core.xml";
 const MODIFIED_ELEMENT = /<dcterms:modified[^<>]*>[^<]*<\/dcterms:modified>/u;
@@ -18,24 +17,12 @@ const MODIFIED_ELEMENT = /<dcterms:modified[^<>]*>[^<]*<\/dcterms:modified>/u;
 */
 const withFixedModifiedDate = (corePropsXml, date) => corePropsXml.replace(MODIFIED_ELEMENT, `<dcterms:modified xsi:type="dcterms:W3CDTF">${date.toISOString()}</dcterms:modified>`);
 const withFixedPackageDates = async (buffer, date) => {
-	const zip = await JSZip.loadAsync(buffer);
-	const coreProps = zip.file(CORE_PROPERTIES_PATH);
-	if (coreProps) writeZipPart({
-		zip,
-		path: CORE_PROPERTIES_PATH,
-		data: encodeUtf8(withFixedModifiedDate(await coreProps.async("uint8array").then((bytes) => decodeText(bytes, { ignoreBOM: true })), date)),
-		options: {
-			compression: "DEFLATE",
-			compressionOptions: { level: DOCX_COMPRESSION_LEVEL }
-		}
-	});
-	zip.forEach((_path, file) => {
-		file.date = date;
-	});
-	return await zip.generateAsync({
-		type: "arraybuffer",
-		compression: "DEFLATE",
-		compressionOptions: { level: DOCX_COMPRESSION_LEVEL }
-	});
+	const zip = await ZipArchive.read(buffer);
+	const coreProps = zip.entry(CORE_PROPERTIES_PATH);
+	if (coreProps) zip.set(CORE_PROPERTIES_PATH, withFixedModifiedDate(decodeText(await coreProps.bytes(), { ignoreBOM: true }), date));
+	return (await zip.generate({
+		level: DOCX_COMPRESSION_LEVEL,
+		modified: date
+	})).buffer;
 };
 export { withFixedPackageDates };

package/dist/docx/archiveInflation.d.ts

@@ -1,15 +1,10 @@
-import JSZip from "jszip";
-declare module "jszip" {
-  interface JSZipObject {
-    /**
-     * Chunked read of the entry content, missing from the published typings.
-     * `nodeStream` is this stream wrapped in a Node.js `Readable`, which
-     * browsers and web workers cannot provide; the stream itself is
-     * platform-neutral.
-     */
-    internalStream(type: "uint8array"): JSZip.JSZipStreamHelper<Uint8Array>;
-  }
-}
+/**
+ * Compression bounds for DOCX packages.
+ *
+ * The archive reader (`@stll/docx-core/zip`) checks every size an archive
+ * declares before anything inflates, and stops each inflation at its entry's
+ * declared size. The values here are the DOCX policy it is given.
+ */
 /**
  * Default ceiling on inflated bytes per compressed byte.
  *
@@ -26,100 +21,10 @@ export declare const DOCX_MAX_COMPRESSION_RATIO = 200;
  * matter. The byte caps still apply below this size.
  */
 export declare const DOCX_COMPRESSION_RATIO_GRACE_BYTES: number;
-/**
- * Upper bound on the central-directory records in `bytes`, counted without
- * parsing the archive and stopping once the count passes `stopAfter`.
- *
- * Every record JSZip reads starts with the record signature, so the number of
- * signature occurrences cannot be lower than the number of entries JSZip would
- * build, whatever the end-of-central-directory record claims.
- */
-export declare const countCentralDirectoryRecords: (bytes: Uint8Array, stopAfter: number) => number;
-/** Sizes a loaded entry declares in the central directory. */
-export type ZipEntrySizes = {
-  readonly compressedBytes: number | null;
-  readonly uncompressedBytes: number | null;
-};
-/** Declared sizes of an entry JSZip loaded from an archive. */
-export declare const getZipEntrySizes: (entry: JSZip.JSZipObject) => ZipEntrySizes;
-/**
- * Whether a loaded entry is stored rather than compressed. A stored entry
- * reads back exactly the bytes the archive carries, so it cannot expand.
- */
-export declare const isStoredZipEntry: (entry: JSZip.JSZipObject) => boolean;
 /**
  * Whether the per-entry ratio cap applies to a part. Markup and text parts
  * never compress anywhere near the cap. Binary parts can: an uncompressed
  * bitmap of one colour compresses like a run of one byte. Those stay bounded
  * by the byte caps and the package-wide ratio instead.
  */
-export declare const isRatioBoundedPart: (path: string) => boolean;
-/** The per-entry ratio cap for `path`: `maxRatio`, or none for a binary part. */
-export declare const compressionRatioLimitFor: (path: string, maxRatio: number) => number;
-type CompressionRatioCheck = {
-  inflatedBytes: number;
-  compressedBytes: number | null;
-  maxRatio: number;
-};
-/**
- * Whether `inflatedBytes` produced from `compressedBytes` passes the ratio cap.
- * Sizes under {@link DOCX_COMPRESSION_RATIO_GRACE_BYTES} never do, and an
- * unknown compressed size is left to the byte caps.
- */
-export declare const exceedsCompressionRatio: ({ inflatedBytes, compressedBytes, maxRatio }: CompressionRatioCheck) => boolean;
-/**
- * Inflated bytes charged across one package. `aborted` stops every inflation
- * sharing the budget at its next chunk, once one of them has failed the
- * package.
- */
-export type InflationBudget = {
-  readonly maxTotalBytes: number;
-  inflatedBytes: number;
-  aborted: boolean;
-};
-export declare const createInflationBudget: (maxTotalBytes: number) => InflationBudget;
-/**
- * The bound an inflation stopped at.
- *
- * - `declared-size` — the entry produced more than its declared size.
- * - `compression-ratio` — the entry passed the ratio cap for its compressed size.
- * - `entry` — the entry passed the per-entry cap the caller set.
- * - `total` — the package passed its cumulative budget.
- * - `aborted` — another inflation sharing the budget already failed.
- */
-export type InflationLimit = "declared-size" | "compression-ratio" | "entry" | "total" | "aborted";
-export type InflateEntryResult = {
-  readonly ok: true;
-  readonly bytes: Uint8Array<ArrayBuffer>;
-} | {
-  readonly ok: false;
-  readonly limit: InflationLimit;
-};
-export type InflateEntryOptions = {
-  entry: JSZip.JSZipObject;
-  /** Most bytes this entry may inflate to. */
-  maxEntryBytes: number;
-  /** Ratio cap while streaming; see {@link compressionRatioLimitFor}. */
-  maxCompressionRatio: number;
-  budget: InflationBudget;
-  /**
-   * `false` inflates the entry only to prove it stays within its bounds; the
-   * chunks are dropped and the result carries no bytes. A package part that
-   * is never read here is still inflated by a later save, so the bound has
-   * to be established for it too.
-   */
-  retain?: boolean;
-};
-/**
- * Inflate one entry chunk by chunk, checking every bound before a chunk is
- * kept. Pausing the stream abandons the rest of the entry, so a limit bounds
- * memory rather than reporting an overrun afterwards.
- *
- * The budget is charged as chunks arrive, which keeps concurrent inflations
- * of one package honest, and refunded when this entry stops at a limit or
- * fails, since none of its bytes are kept. Stream errors (a corrupt entry)
- * reject; limits resolve with `ok: false` for the caller to map onto its own
- * error or skip policy.
- */
-export declare const inflateEntryWithinLimits: ({ entry, maxEntryBytes, maxCompressionRatio, budget, retain }: InflateEntryOptions) => Promise<InflateEntryResult>;
-export {};
+export declare const isRatioBoundedPart: (path: string) => boolean;

package/dist/docx/archiveInflation.js

@@ -1,5 +1,12 @@
 // src/docx/archiveInflation.ts
 /**
+* Compression bounds for DOCX packages.
+*
+* The archive reader (`@stll/docx-core/zip`) checks every size an archive
+* declares before anything inflates, and stops each inflation at its entry's
+* declared size. The values here are the DOCX policy it is given.
+*/
+/**
 * Default ceiling on inflated bytes per compressed byte.
 *
 * Document parts in the repository's fixtures stay under 75:1, and parts over a
@@ -15,57 +22,6 @@ const DOCX_MAX_COMPRESSION_RATIO = 200;
 * matter. The byte caps still apply below this size.
 */
 const DOCX_COMPRESSION_RATIO_GRACE_BYTES = 4194304;
-const CENTRAL_DIRECTORY_RECORD_SIGNATURE = [
-	80,
-	75,
-	1,
-	2
-];
-/**
-* Upper bound on the central-directory records in `bytes`, counted without
-* parsing the archive and stopping once the count passes `stopAfter`.
-*
-* Every record JSZip reads starts with the record signature, so the number of
-* signature occurrences cannot be lower than the number of entries JSZip would
-* build, whatever the end-of-central-directory record claims.
-*/
-const countCentralDirectoryRecords = (bytes, stopAfter) => {
-	const [first, second, third, fourth] = CENTRAL_DIRECTORY_RECORD_SIGNATURE;
-	let count = 0;
-	let offset = bytes.indexOf(first);
-	while (offset !== -1 && offset + 3 < bytes.length) {
-		if (bytes[offset + 1] === second && bytes[offset + 2] === third && bytes[offset + 3] === fourth) {
-			count += 1;
-			if (count > stopAfter) return count;
-		}
-		offset = bytes.indexOf(first, offset + 1);
-	}
-	return count;
-};
-const finiteSize = (value) => typeof value === "number" && Number.isFinite(value) && value >= 0 ? value : null;
-/** Declared sizes of an entry JSZip loaded from an archive. */
-const getZipEntrySizes = (entry) => {
-	const data = "_data" in entry ? entry._data : void 0;
-	if (typeof data !== "object" || data === null) return {
-		compressedBytes: null,
-		uncompressedBytes: null
-	};
-	return {
-		compressedBytes: "compressedSize" in data ? finiteSize(data.compressedSize) : null,
-		uncompressedBytes: "uncompressedSize" in data ? finiteSize(data.uncompressedSize) : null
-	};
-};
-const STORED_COMPRESSION_MAGIC = "\0\0";
-/**
-* Whether a loaded entry is stored rather than compressed. A stored entry
-* reads back exactly the bytes the archive carries, so it cannot expand.
-*/
-const isStoredZipEntry = (entry) => {
-	const data = "_data" in entry ? entry._data : void 0;
-	if (typeof data !== "object" || data === null || !("compression" in data)) return false;
-	const { compression } = data;
-	return typeof compression === "object" && compression !== null && "magic" in compression && compression.magic === STORED_COMPRESSION_MAGIC;
-};
 const RATIO_BOUNDED_EXTENSIONS = /* @__PURE__ */ new Set([
 	"xml",
 	"rels",
@@ -84,97 +40,4 @@ const RATIO_BOUNDED_EXTENSIONS = /* @__PURE__ */ new Set([
 * by the byte caps and the package-wide ratio instead.
 */
 const isRatioBoundedPart = (path) => RATIO_BOUNDED_EXTENSIONS.has(path.slice(path.lastIndexOf(".") + 1).toLowerCase());
-/** The per-entry ratio cap for `path`: `maxRatio`, or none for a binary part. */
-const compressionRatioLimitFor = (path, maxRatio) => isRatioBoundedPart(path) ? maxRatio : Number.POSITIVE_INFINITY;
-/**
-* Whether `inflatedBytes` produced from `compressedBytes` passes the ratio cap.
-* Sizes under {@link DOCX_COMPRESSION_RATIO_GRACE_BYTES} never do, and an
-* unknown compressed size is left to the byte caps.
-*/
-const exceedsCompressionRatio = ({ inflatedBytes, compressedBytes, maxRatio }) => compressedBytes !== null && inflatedBytes > 4194304 && inflatedBytes > compressedBytes * maxRatio;
-const createInflationBudget = (maxTotalBytes) => ({
-	maxTotalBytes,
-	inflatedBytes: 0,
-	aborted: false
-});
-const EMPTY_BYTES = /* @__PURE__ */ new Uint8Array(0);
-const concatChunks = (chunks, totalBytes) => {
-	const merged = new Uint8Array(totalBytes);
-	let offset = 0;
-	for (const chunk of chunks) {
-		merged.set(chunk, offset);
-		offset += chunk.length;
-	}
-	return merged;
-};
-/**
-* Inflate one entry chunk by chunk, checking every bound before a chunk is
-* kept. Pausing the stream abandons the rest of the entry, so a limit bounds
-* memory rather than reporting an overrun afterwards.
-*
-* The budget is charged as chunks arrive, which keeps concurrent inflations
-* of one package honest, and refunded when this entry stops at a limit or
-* fails, since none of its bytes are kept. Stream errors (a corrupt entry)
-* reject; limits resolve with `ok: false` for the caller to map onto its own
-* error or skip policy.
-*/
-const inflateEntryWithinLimits = async ({ entry, maxEntryBytes, maxCompressionRatio, budget, retain = true }) => {
-	const { compressedBytes, uncompressedBytes } = getZipEntrySizes(entry);
-	return await new Promise((resolve, reject) => {
-		const stream = entry.internalStream("uint8array");
-		const chunks = [];
-		let entryBytes = 0;
-		let settled = false;
-		const settle = () => {
-			if (settled) return false;
-			settled = true;
-			return true;
-		};
-		const refund = () => {
-			budget.inflatedBytes -= entryBytes;
-		};
-		const stop = (limit) => {
-			if (!settle()) return;
-			stream.pause();
-			refund();
-			resolve({
-				ok: false,
-				limit
-			});
-		};
-		const limitFor = () => {
-			if (budget.aborted) return "aborted";
-			if (uncompressedBytes !== null && entryBytes > uncompressedBytes) return "declared-size";
-			if (exceedsCompressionRatio({
-				inflatedBytes: entryBytes,
-				compressedBytes,
-				maxRatio: maxCompressionRatio
-			})) return "compression-ratio";
-			if (entryBytes > maxEntryBytes) return "entry";
-			if (budget.inflatedBytes > budget.maxTotalBytes) return "total";
-			return null;
-		};
-		stream.on("data", (chunk) => {
-			if (settled) return;
-			entryBytes += chunk.length;
-			budget.inflatedBytes += chunk.length;
-			const limit = limitFor();
-			if (limit !== null) {
-				stop(limit);
-				return;
-			}
-			if (retain) chunks.push(chunk);
-		}).on("end", () => {
-			if (!settle()) return;
-			resolve({
-				ok: true,
-				bytes: retain ? concatChunks(chunks, entryBytes) : EMPTY_BYTES
-			});
-		}).on("error", (error) => {
-			if (!settle()) return;
-			refund();
-			reject(error);
-		}).resume();
-	});
-};
-export { DOCX_COMPRESSION_RATIO_GRACE_BYTES, DOCX_MAX_COMPRESSION_RATIO, compressionRatioLimitFor, countCentralDirectoryRecords, createInflationBudget, exceedsCompressionRatio, getZipEntrySizes, inflateEntryWithinLimits, isRatioBoundedPart, isStoredZipEntry };
+export { DOCX_COMPRESSION_RATIO_GRACE_BYTES, DOCX_MAX_COMPRESSION_RATIO, isRatioBoundedPart };

package/dist/docx/attributeRemainder.js

@@ -1,9 +1,9 @@
 import { modelledAttributeNames } from "./propertyElementAttributes.js";
 import { OOXML_NAMESPACES } from "./serializer/partNamespaces.js";
-import { XML_NAMESPACE_URI } from "./xmlNamespaceContext.js";
 import { getLocalName, resolveAttributeNamespaceUri } from "./xmlParser.js";
 import { TaggedError } from "better-result";
 import { escapeXmlAttribute } from "@stll/docx-core";
+import { XML_NAMESPACE_URI } from "@stll/docx-core/xml/namespaces";
 // src/docx/attributeRemainder.ts
 /**
 * The attribute remainder: what an element carried and its parser has no field for.

package/dist/docx/canonicalStoryRepack.js

@@ -5,7 +5,7 @@ import { readDocumentSectionFacts } from "./documentSectionFacts.js";
 import { parseDocx } from "./parser.js";
 import { assertSectionCarriersMatchModel } from "./rezip.js";
 import { serializeDocument } from "./serializer/documentSerializer.js";
-import JSZip from "jszip";
+import { ZipArchive } from "@stll/docx-core/zip";
 // src/docx/canonicalStoryRepack.ts
 /** Canonical snapshots own explicit section references; the PM projection does not. */
 const referenceKey = ({ element, type, rId }) => `${element}:${type}:${rId}`;
@@ -19,7 +19,7 @@ const xmlFingerprint = async (xml) => {
 const repackWithCanonicalStoryRemovals = async ({ document, repack }) => {
 	const originalBuffer = document.originalBuffer;
 	if (!originalBuffer) return repack();
-	const xml = await (await JSZip.loadAsync(originalBuffer)).file("word/document.xml")?.async("uint8array").then((bytes) => decodeText(bytes, { ignoreBOM: true }));
+	const xml = await (await ZipArchive.read(originalBuffer)).entry("word/document.xml")?.bytes().then((bytes) => decodeText(bytes, { ignoreBOM: true }));
 	if (!xml) return repack();
 	const before = readDocumentSectionFacts(xml);
 	const serializedXml = serializeDocument(document);

package/dist/docx/documentSectionFacts.js

@@ -1,6 +1,6 @@
 import { parseHeaderFooterType } from "./headerFooterRefParser.js";
 import { OFFICE_RELATIONSHIP_NAMESPACE_URIS, WORDPROCESSINGML_NAMESPACE_URIS, getAttributeByNamespaceUri, getChildElements, getLocalName, getNamespaceUri, parseXml } from "./xmlParser.js";
-import { assertXmlResourceLimits } from "./xmlResourceLimits.js";
+import { assertXmlResourceLimits } from "@stll/docx-core/xml/limits";
 // src/docx/documentSectionFacts.ts
 const isWordprocessingElement = (element, localName) => getLocalName(element.name) === localName && WORDPROCESSINGML_NAMESPACE_URIS.has(getNamespaceUri(element) ?? "");
 /** Both facts from one walk of a parsed document tree. */

package/dist/docx/ensureParaIds.js

@@ -1,14 +1,12 @@
 import { deterministicHexId } from "../utils/hexId.js";
-import { encodeUtf8 } from "../utils/textEncoding.js";
 import { resolvePackageRelationshipTarget } from "./packageParts.js";
 import { spliceXml } from "./selectiveXmlPatch.js";
 import { loadDocxArchive } from "./server/boundedArchive.js";
-import { scanStreamingXmlElements } from "./streamingXmlParser.js";
-import { resolveNamespaceUri } from "./xmlNamespaceContext.js";
 import { OFFICE_RELATIONSHIP_NAMESPACE_URIS, WORDPROCESSINGML_NAMESPACE_URIS, getAttribute, getChildElements, getLocalName, getNamespaceUri, parseXmlDocument, resolveAttributeNamespaceUri } from "./xmlParser.js";
 import { TaggedError } from "better-result";
-import JSZip from "jszip";
-import { writeZipPart } from "@stll/docx-core/zip";
+import { scanStreamingXmlElements } from "@stll/docx-core/xml";
+import { resolveNamespaceUri } from "@stll/docx-core/xml/namespaces";
+import { ZipArchive } from "@stll/docx-core/zip";
 // src/docx/ensureParaIds.ts
 /**
 * Headless `w14:paraId` normalization for a `.docx` buffer.
@@ -321,7 +319,7 @@ const mainDocumentPart = (rels, entries) => {
 /** OPC part names are case-insensitive; compare lowercased. */
 const isTargetPart = (path) => TARGET_PART_PATTERNS.some((pattern) => pattern.test(path.toLowerCase()));
 const toUint8Array = (docx) => docx instanceof Uint8Array ? docx : new Uint8Array(docx);
-const hasDigitalSignatureParts = (zip) => Object.values(zip.files).some(({ dir, name }) => !dir && name.toLowerCase().startsWith(DIGITAL_SIGNATURE_PART_PREFIX));
+const hasDigitalSignatureParts = (zip) => zip.entries().some(({ path }) => path.toLowerCase().startsWith(DIGITAL_SIGNATURE_PART_PREFIX));
 /**
 * Backfill `w14:paraId` on every paragraph of a `.docx` buffer. See the
 * module doc for the exact contract. Throws {@link EnsureParaIdsError} when
@@ -381,31 +379,18 @@ const ensureParaIdsInternal = async (docx, options) => {
 		alreadyComplete: true,
 		mintedParaIds: []
 	};
-	const zip = await JSZip.loadAsync(docx);
+	const zip = await ZipArchive.read(docx);
 	if (hasDigitalSignatureParts(zip) && options.allowSignedPackageMutation !== true) throw new EnsureParaIdsError({
 		reason: ENSURE_PARA_IDS_REASONS.SIGNED_PACKAGE,
 		message: "Refusing to normalize a digitally signed package because rewriting OOXML invalidates its signatures. Warn the user and pass allowSignedPackageMutation only if invalidation is acceptable."
 	});
 	for (const [partPath, content] of updates) {
-		const sourceEntry = zip.file(partPath);
-		if (sourceEntry === null) throw createEnsureParaIdsError(`Package part disappeared during normalization: ${partPath}`);
-		writeZipPart({
-			zip,
-			path: partPath,
-			data: encodeUtf8(content),
-			options: {
-				compression: "DEFLATE",
-				compressionOptions: { level: 6 },
-				date: sourceEntry.date
-			}
-		});
+		const sourceEntry = zip.entry(partPath);
+		if (sourceEntry === void 0) throw createEnsureParaIdsError(`Package part disappeared during normalization: ${partPath}`);
+		zip.set(partPath, content, { modified: sourceEntry.modified });
 	}
 	return {
-		docx: await zip.generateAsync({
-			type: "uint8array",
-			compression: "DEFLATE",
-			compressionOptions: { level: 6 }
-		}),
+		docx: await zip.generate({ level: 6 }),
 		assigned,
 		deduplicated,
 		alreadyComplete: false,

package/dist/docx/importedIdCollisions.js

@@ -3,10 +3,10 @@ import { REVISION_ELEMENT_NAMES } from "./revisionIdNormalization.js";
 import { scanSelectedStreamingXmlElements } from "./selectedXmlIdentityScan.js";
 import { OOXML_NAMESPACES } from "./serializer/partNamespaces.js";
 import { toTransitionalNamespaceUri } from "./transitionalSpelling.js";
-import { resolveNamespaceUri } from "./xmlNamespaceContext.js";
 import { NAMESPACES, getLocalName, getNamespaceUri } from "./xmlParser.js";
 import { panic } from "better-result";
 import { IMPORTED_ID_COLLISION_KINDS, PARSE_WARNING_CODES } from "@stll/docx-core/model";
+import { resolveNamespaceUri } from "@stll/docx-core/xml/namespaces";
 // src/docx/importedIdCollisions.ts
 const WORD_2010_NAMESPACE = "http://schemas.microsoft.com/office/word/2010/wordml";
 const PACKAGE_RELATIONSHIP_NAMESPACE = "http://schemas.openxmlformats.org/package/2006/relationships";

package/dist/docx/mathToMathml.js

@@ -1,6 +1,6 @@
 import { WORDPROCESSINGML_NAMESPACE_URIS, findChildByLocalName, findChildByNamespaceUri, getAttributeByNamespaceUri, getLocalName, getNamespaceUri, parseXmlDocument } from "./xmlParser.js";
-import { assertXmlResourceLimits } from "./xmlResourceLimits.js";
 import { escapeXmlText } from "@stll/docx-core";
+import { assertXmlResourceLimits } from "@stll/docx-core/xml/limits";
 // src/docx/mathToMathml.ts
 /**
 * OMML → MathML conversion.