js.documents 7.3.0 → 7.4.0

package/dist/metadata/write.d.cts

@@ -1,12 +1,7 @@
 import { DocumentFormat } from "../convert/port.cjs";
+import { MetadataOverrides } from "./core-patch.cjs";
 import { MarkdownImageResolver } from "markdown-codec";
 //#region src/metadata/write.d.ts
-interface MetadataOverrides {
-  readonly title?: string;
-  readonly author?: string;
-  readonly subject?: string;
-  readonly keywords?: string[];
-}
 interface PatchDocxMetadataOptions {
   readonly signal?: AbortSignal;
 }
@@ -17,4 +12,4 @@ interface SetDocumentMetadataOptions {
 }
 declare function setDocumentMetadata(sourceFormat: DocumentFormat, targetFormat: DocumentFormat, bytes: Uint8Array<ArrayBuffer>, overrides: MetadataOverrides, options?: SetDocumentMetadataOptions): Uint8Array<ArrayBuffer>;
 //#endregion
-export { MetadataOverrides, PatchDocxMetadataOptions, SetDocumentMetadataOptions, patchDocxMetadata, setDocumentMetadata };
+export { PatchDocxMetadataOptions, SetDocumentMetadataOptions, patchDocxMetadata, setDocumentMetadata };

package/dist/metadata/write.d.ts

@@ -1,12 +1,7 @@
 import { DocumentFormat } from "../convert/port.js";
+import { MetadataOverrides } from "./core-patch.js";
 import { MarkdownImageResolver } from "markdown-codec";
 //#region src/metadata/write.d.ts
-interface MetadataOverrides {
-  readonly title?: string;
-  readonly author?: string;
-  readonly subject?: string;
-  readonly keywords?: string[];
-}
 interface PatchDocxMetadataOptions {
   readonly signal?: AbortSignal;
 }
@@ -17,4 +12,4 @@ interface SetDocumentMetadataOptions {
 }
 declare function setDocumentMetadata(sourceFormat: DocumentFormat, targetFormat: DocumentFormat, bytes: Uint8Array<ArrayBuffer>, overrides: MetadataOverrides, options?: SetDocumentMetadataOptions): Uint8Array<ArrayBuffer>;
 //#endregion
-export { MetadataOverrides, PatchDocxMetadataOptions, SetDocumentMetadataOptions, patchDocxMetadata, setDocumentMetadata };
+export { PatchDocxMetadataOptions, SetDocumentMetadataOptions, patchDocxMetadata, setDocumentMetadata };

package/dist/metadata/write.js

@@ -1,8 +1,8 @@
 import { requireArrayBufferBytes } from "../model/bytes.js";
-import { addCoreProperties } from "../opc/core-properties.js";
+import { mergeMetadata, patchOoxmlCorePropertiesOnPackage } from "./core-patch.js";
 import { throwIfAborted } from "../ports/abort.js";
 import { DOCUMENT_FORMAT_CODECS } from "../codecs/registry.js";
-import { decodePackage, encodePackage, hasCoreProperties, patchCoreProperties } from "ooxml.js";
+import { decodePackage, encodePackage } from "ooxml.js";
 import { readPdf, writePdf } from "pdf-codec";
 //#region src/metadata/write.ts
 const REBUILD_FORMATS = {
@@ -28,23 +28,10 @@ function buildBytesForRebuildFormat(format, content) {
 	if (!codec?.write) throw new Error(`RebuildFormat '${format}' has no content.write codec in DOCUMENT_FORMAT_CODECS -- this is an internal invariant violation, not a caller error`);
 	return requireArrayBufferBytes(codec.write(content));
 }
-function mergeMetadata(current, overrides) {
-	return {
-		...current,
-		...overrides.title !== void 0 ? { title: overrides.title } : {},
-		...overrides.author !== void 0 ? { author: overrides.author } : {},
-		...overrides.subject !== void 0 ? { subject: overrides.subject } : {},
-		...overrides.keywords !== void 0 ? { keywords: overrides.keywords } : {}
-	};
-}
-function hasWritableMetadataOverride(overrides) {
-	return overrides.title !== void 0 || overrides.author !== void 0 || overrides.subject !== void 0 || overrides.keywords !== void 0 && overrides.keywords.length > 0;
-}
 function patchDocxMetadata(bytes, overrides, options) {
 	throwIfAborted(options?.signal);
 	const pkg = decodePackage(bytes);
-	if (hasCoreProperties(pkg)) patchCoreProperties(pkg, overrides);
-	else if (hasWritableMetadataOverride(overrides)) addCoreProperties(pkg, mergeMetadata({}, overrides));
+	patchOoxmlCorePropertiesOnPackage(pkg, overrides);
 	return encodePackage(pkg);
 }
 function classifyWritePath(source, target) {

package/dist/odf-package/formula.cjs

@@ -1,6 +1,6 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_xml_fragment = require("../xml/fragment.cjs");
 const require_xml_entities = require("../xml/entities.cjs");
+const require_xml_fragment = require("../xml/fragment.cjs");
 const require_odf_package_manifest = require("./manifest.cjs");
 //#region src/odf-package/formula.ts
 const OBJECT_PREFIX = "Object ";

package/dist/odf-package/formula.js

@@ -1,5 +1,5 @@
-import { el, txt } from "../xml/fragment.js";
 import { encodeXmlText } from "../xml/entities.js";
+import { el, txt } from "../xml/fragment.js";
 import { syncOdfManifest } from "./manifest.js";
 //#region src/odf-package/formula.ts
 const OBJECT_PREFIX = "Object ";

package/dist/omml/write.cjs

@@ -1,10 +1,10 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const require_xml_entities = require("../xml/entities.cjs");
 const require_xml_fragment = require("../xml/fragment.cjs");
 const require_mathml_length = require("../mathml/length.cjs");
 const require_mathml_nodes = require("../mathml/nodes.cjs");
 const require_mathml_operators = require("../mathml/operators.cjs");
 const require_mathml_variant = require("../mathml/variant.cjs");
-const require_xml_entities = require("../xml/entities.cjs");
 const require_omml_shared = require("./shared.cjs");
 //#region src/omml/write.ts
 const OMML_NS = "http://schemas.openxmlformats.org/officeDocument/2006/math";

package/dist/omml/write.js

@@ -1,9 +1,9 @@
+import { encodeXmlText, needsSpacePreserve } from "../xml/entities.js";
 import { el, txt } from "../xml/fragment.js";
 import { parseMathLength } from "../mathml/length.js";
 import { attrValue, elementChildren, elementLocalName, isMathMlElement, textContent } from "../mathml/nodes.js";
 import { operatorProperties } from "../mathml/operators.js";
 import { isMathVariant } from "../mathml/variant.js";
-import { encodeXmlText, needsSpacePreserve } from "../xml/entities.js";
 import { VARIANT_RUN_PROPERTIES, miIntrinsicDefault } from "./shared.js";
 //#region src/omml/write.ts
 const OMML_NS = "http://schemas.openxmlformats.org/officeDocument/2006/math";

package/dist/opc/core-properties.cjs

@@ -1,8 +1,8 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_xml_fragment = require("../xml/fragment.cjs");
-const require_opc_rels = require("./rels.cjs");
 const require_xml_entities = require("../xml/entities.cjs");
+const require_xml_fragment = require("../xml/fragment.cjs");
 const require_opc_content_types = require("./content-types.cjs");
+const require_opc_rels = require("./rels.cjs");
 //#region src/opc/core-properties.ts
 const CORE_PROPERTIES_PART_PATH = "docProps/core.xml";
 const CORE_PROPERTIES_CONTENT_TYPE = "application/vnd.openxmlformats-package.core-properties+xml";

package/dist/opc/core-properties.js

@@ -1,7 +1,7 @@
-import { el, txt } from "../xml/fragment.js";
-import { addRootRelationship } from "./rels.js";
 import { encodeXmlText } from "../xml/entities.js";
+import { el, txt } from "../xml/fragment.js";
 import { ensureContentTypeOverride } from "./content-types.js";
+import { addRootRelationship } from "./rels.js";
 //#region src/opc/core-properties.ts
 const CORE_PROPERTIES_PART_PATH = "docProps/core.xml";
 const CORE_PROPERTIES_CONTENT_TYPE = "application/vnd.openxmlformats-package.core-properties+xml";

package/dist/opc/media.cjs

@@ -1,7 +1,7 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const require_opc_content_types = require("./content-types.cjs");
 const require_opc_paths = require("./paths.cjs");
 const require_opc_rels = require("./rels.cjs");
-const require_opc_content_types = require("./content-types.cjs");
 let ooxml_js = require("ooxml.js");
 //#region src/opc/media.ts
 const IMAGE_RELATIONSHIP_TYPE = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/image";

package/dist/opc/media.js

@@ -1,6 +1,6 @@
+import { defaultContentTypeForExtension, ensureDefaultContentType } from "./content-types.js";
 import { buildRelativeTarget } from "./paths.js";
 import { addRelationship } from "./rels.js";
-import { defaultContentTypeForExtension, ensureDefaultContentType } from "./content-types.js";
 import { bytesToBase64 } from "ooxml.js";
 //#region src/opc/media.ts
 const IMAGE_RELATIONSHIP_TYPE = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/image";

package/dist/xml/odf-text.cjs

@@ -1,6 +1,6 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_xml_fragment = require("./fragment.cjs");
 const require_xml_entities = require("./entities.cjs");
+const require_xml_fragment = require("./fragment.cjs");
 let odf_js = require("odf.js");
 //#region src/xml/odf-text.ts
 const MIN_SPACE_RUN_FOR_TEXT_S = 2;

package/dist/xml/odf-text.js

@@ -1,5 +1,5 @@
-import { el, txt } from "./fragment.js";
 import { encodeXmlText as encodeXmlText$1 } from "./entities.js";
+import { el, txt } from "./fragment.js";
 import { decodeOdfText as decodeOdfText$1 } from "odf.js";
 //#region src/xml/odf-text.ts
 const MIN_SPACE_RUN_FOR_TEXT_S = 2;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "js.documents",
-  "version": "7.3.0",
+  "version": "7.4.0",
   "description": "Bidirectional docx/pptx <-> PDF conversion and a read+write editable OOXML document model, built on ooxml.js and Zod 4 codecs.",
   "type": "module",
   "repository": {
@@ -83,8 +83,8 @@
     "document-schema.js": "^7.0.0",
     "fflate": "^0.8.3",
     "markdown-codec": "^6.3.6",
-    "odf.js": "^7.3.0",
-    "ooxml.js": "^8.2.0",
+    "odf.js": "^7.4.0",
+    "ooxml.js": "^8.3.0",
     "pdf-codec": "^4.0.5",
     "ppt-codec": "^1.2.6",
     "rtf-codec": "^4.0.1",