@stll/folio-core 0.60.0 → 0.61.0

package/dist/docx/removeHeaderFooterParts.js

@@ -1,3 +1,4 @@
+import { decodeText, encodeUtf8 } from "../utils/textEncoding.js";
 import { isUnsafePackagePath } from "./packageParts.js";
 import { parseRelationships, resolveRelativePath } from "./relsParser.js";
 import { captureVerbatimXml } from "./verbatimCapture.js";
@@ -18,7 +19,7 @@ const removeResolvedHeaderFooterParts = async ({ document, zip, removedReference
 	if (removedReferences.length === 0) return;
 	const relsFile = zip.file(DOCUMENT_RELS_PATH);
 	if (!relsFile) return panic("A resolved header/footer part has no document relationships");
-	const relsXml = await relsFile.async("text");
+	const relsXml = await relsFile.async("uint8array").then((bytes) => decodeText(bytes, { ignoreBOM: true }));
 	const relationships = parseRelationships(relsXml);
 	const removedIds = /* @__PURE__ */ new Set();
 	const candidates = /* @__PURE__ */ new Set();
@@ -39,7 +40,7 @@ const removeResolvedHeaderFooterParts = async ({ document, zip, removedReference
 	}
 	for (const file of Object.values(zip.files)) {
 		if (file.dir || !file.name.endsWith(".rels") || file.name === DOCUMENT_RELS_PATH) continue;
-		const otherRelationships = parseRelationships(await file.async("text"));
+		const otherRelationships = parseRelationships(await file.async("uint8array").then((bytes) => decodeText(bytes, { ignoreBOM: true })));
 		for (const relationship of otherRelationships.values()) if (relationship.targetMode !== "External") candidates.delete(resolveRelativePath(file.name, relationship.target));
 	}
 	const retiredMedia = /* @__PURE__ */ new Set();
@@ -48,7 +49,7 @@ const removeResolvedHeaderFooterParts = async ({ document, zip, removedReference
 		const relsPath = `${path.slice(0, slash + 1)}_rels/${path.slice(slash + 1)}.rels`;
 		const partRels = zip.file(relsPath);
 		if (!partRels) continue;
-		for (const relationship of parseRelationships(await partRels.async("text")).values()) {
+		for (const relationship of parseRelationships(await partRels.async("uint8array").then((bytes) => decodeText(bytes, { ignoreBOM: true }))).values()) {
 			if (!officeRelationshipHasType(relationship.type, "image") || relationship.targetMode === "External") continue;
 			const mediaPath = resolveRelativePath(relsPath, relationship.target);
 			if (!isUnsafePackagePath(mediaPath) && mediaPath.startsWith("word/media/")) retiredMedia.add(mediaPath);
@@ -58,7 +59,7 @@ const removeResolvedHeaderFooterParts = async ({ document, zip, removedReference
 	writeZipPart({
 		zip,
 		path: DOCUMENT_RELS_PATH,
-		data: withoutChildren(relsXml, (child) => getNamespaceUri(child) === OOXML_NS.pr && getLocalName(child.name) === "Relationship" && removedIds.has(getAttribute(child, null, "Id") ?? "")),
+		data: encodeUtf8(withoutChildren(relsXml, (child) => getNamespaceUri(child) === OOXML_NS.pr && getLocalName(child.name) === "Relationship" && removedIds.has(getAttribute(child, null, "Id") ?? ""))),
 		options: {
 			compression: "DEFLATE",
 			compressionOptions
@@ -75,7 +76,7 @@ const removeResolvedHeaderFooterParts = async ({ document, zip, removedReference
 	}
 	for (const file of Object.values(zip.files)) {
 		if (file.dir || !file.name.endsWith(".rels")) continue;
-		for (const relationship of parseRelationships(await file.async("text")).values()) if (relationship.targetMode !== "External") retiredMedia.delete(resolveRelativePath(file.name, relationship.target));
+		for (const relationship of parseRelationships(await file.async("uint8array").then((bytes) => decodeText(bytes, { ignoreBOM: true }))).values()) if (relationship.targetMode !== "External") retiredMedia.delete(resolveRelativePath(file.name, relationship.target));
 	}
 	for (const path of retiredMedia) {
 		zip.remove(path);
@@ -83,11 +84,11 @@ const removeResolvedHeaderFooterParts = async ({ document, zip, removedReference
 	}
 	const contentTypes = zip.file("[Content_Types].xml");
 	if (!contentTypes) return panic("The package has no content types");
-	const contentTypesXml = await contentTypes.async("text");
+	const contentTypesXml = await contentTypes.async("uint8array").then((bytes) => decodeText(bytes, { ignoreBOM: true }));
 	writeZipPart({
 		zip,
 		path: "[Content_Types].xml",
-		data: withoutChildren(contentTypesXml, (child) => getNamespaceUri(child) === OOXML_NS.ct && getLocalName(child.name) === "Override" && candidates.has((getAttribute(child, null, "PartName") ?? "").replace(/^\//u, ""))),
+		data: encodeUtf8(withoutChildren(contentTypesXml, (child) => getNamespaceUri(child) === OOXML_NS.ct && getLocalName(child.name) === "Override" && candidates.has((getAttribute(child, null, "PartName") ?? "").replace(/^\//u, "")))),
 		options: {
 			compression: "DEFLATE",
 			compressionOptions

package/dist/docx/replyToComment.js

@@ -1,5 +1,6 @@
 import { allocateCommentId, seedCommentIdAbove } from "../prosemirror/commentIdAllocator.js";
 import { generateHexId } from "../utils/hexId.js";
+import { commentTextParagraph } from "./commentTextParagraph.js";
 //#region src/docx/replyToComment.ts
 /**
 * Create a threaded reply to an existing comment.
@@ -41,19 +42,8 @@ const createReply = (comments, parentCommentId, input) => {
 	for (const { id } of comments) seedCommentIdAbove(id);
 	const used = usedParaIds(comments);
 	if (!rootLastParagraph.paraId) rootLastParagraph.paraId = freshParaId(used);
-	const replyParagraph = {
-		type: "paragraph",
-		formatting: {},
-		paraId: freshParaId(used),
-		content: [{
-			type: "run",
-			formatting: {},
-			content: [{
-				type: "text",
-				text: input.text
-			}]
-		}]
-	};
+	const replyParagraph = commentTextParagraph(input.text);
+	replyParagraph.paraId = freshParaId(used);
 	return {
 		id: allocateCommentId(),
 		author: input.author,