document-model.js 4.1.0 → 4.2.0

package/dist/schema-io.cjs

@@ -7,7 +7,7 @@ const SCHEMA_FILE_NAMES = {
 	ContentDocument: "content-document.schema.json"
 };
 function schemaUriFor(kind) {
-	return `https://cdn.jsdelivr.net/npm/document-schema.js@4.1.0/schemas/${SCHEMA_FILE_NAMES[kind]}`;
+	return `https://cdn.jsdelivr.net/npm/document-schema.js@4.2.0/schemas/${SCHEMA_FILE_NAMES[kind]}`;
 }
 const SCHEMA_URI_PATTERN = /^https:\/\/cdn\.jsdelivr\.net\/npm\/document-schema\.js@([^/]+)\/schemas\/(document-package|content-document|layout-document)\.schema\.json$/;
 function parseSchemaUri(uri) {
@@ -93,7 +93,7 @@ function documentFromJson(value) {
 	if (parts.stem === "layout-document") throw new LayoutSchemaDemotedError(value.$schema);
 	const kind = kindForFileStem(parts.stem);
 	if (kind === void 0) throw new UnrecognizedDocumentSchemaError(value.$schema);
-	if (majorVersionOf(parts.version) !== majorVersionOf("4.1.0")) throw new SchemaVersionMismatchError(value.$schema, parts.version, "4.1.0");
+	if (majorVersionOf(parts.version) !== majorVersionOf("4.2.0")) throw new SchemaVersionMismatchError(value.$schema, parts.version, "4.2.0");
 	switch (kind) {
 		case "DocumentPackage": return {
 			kind,

package/dist/schema-io.d.cts

@@ -1,4 +1,4 @@
-import { l as ContentDocument } from "./content-BN0PWqpt.cjs";
+import { m as ContentDocument } from "./content-BmqzegMG.cjs";
 import { DocumentPackage } from "./package.cjs";
 //#region src/schema-io.d.ts
 type DocumentSchemaKind = 'DocumentPackage' | 'ContentDocument';

package/dist/schema-io.d.ts

@@ -1,4 +1,4 @@
-import { l as ContentDocument } from "./content-CiZf6Fqn.js";
+import { m as ContentDocument } from "./content-CIwPb_yh.js";
 import { DocumentPackage } from "./package.js";
 //#region src/schema-io.d.ts
 type DocumentSchemaKind = 'DocumentPackage' | 'ContentDocument';

package/dist/schema-io.js

@@ -6,7 +6,7 @@ const SCHEMA_FILE_NAMES = {
 	ContentDocument: "content-document.schema.json"
 };
 function schemaUriFor(kind) {
-	return `https://cdn.jsdelivr.net/npm/document-schema.js@4.1.0/schemas/${SCHEMA_FILE_NAMES[kind]}`;
+	return `https://cdn.jsdelivr.net/npm/document-schema.js@4.2.0/schemas/${SCHEMA_FILE_NAMES[kind]}`;
 }
 const SCHEMA_URI_PATTERN = /^https:\/\/cdn\.jsdelivr\.net\/npm\/document-schema\.js@([^/]+)\/schemas\/(document-package|content-document|layout-document)\.schema\.json$/;
 function parseSchemaUri(uri) {
@@ -92,7 +92,7 @@ function documentFromJson(value) {
 	if (parts.stem === "layout-document") throw new LayoutSchemaDemotedError(value.$schema);
 	const kind = kindForFileStem(parts.stem);
 	if (kind === void 0) throw new UnrecognizedDocumentSchemaError(value.$schema);
-	if (majorVersionOf(parts.version) !== majorVersionOf("4.1.0")) throw new SchemaVersionMismatchError(value.$schema, parts.version, "4.1.0");
+	if (majorVersionOf(parts.version) !== majorVersionOf("4.2.0")) throw new SchemaVersionMismatchError(value.$schema, parts.version, "4.2.0");
 	switch (kind) {
 		case "DocumentPackage": return {
 			kind,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "document-model.js",
-  "version": "4.1.0",
+  "version": "4.2.0",
   "description": "The canonical, format-agnostic content and document-package schemas shared by ooxml.js, odf.js, documents.js, pdf-codec, and markdown-codec -- pure Zod schemas, no behaviour.",
   "type": "module",
   "repository": {

package/schemas/content-document.schema.json

@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://cdn.jsdelivr.net/npm/document-schema.js@4.1.0/schemas/content-document.schema.json",
+  "$id": "https://cdn.jsdelivr.net/npm/document-schema.js@4.2.0/schemas/content-document.schema.json",
   "oneOf": [
     {
       "type": "object",
@@ -2857,7 +2857,7 @@
           ]
         },
         "document": {
-          "$ref": "https://cdn.jsdelivr.net/npm/document-schema.js@4.1.0/schemas/content-document.schema.json"
+          "$ref": "https://cdn.jsdelivr.net/npm/document-schema.js@4.2.0/schemas/content-document.schema.json"
         },
         "frame": {
           "$ref": "#/$defs/Box"
@@ -2896,7 +2896,62 @@
       ],
       "additionalProperties": false
     },
+    "ContentConstructStart": {
+      "type": "object",
+      "properties": {
+        "kind": {
+          "type": "string",
+          "const": "constructStart"
+        },
+        "descriptor": {
+          "$ref": "#/$defs/ConstructDescriptor"
+        }
+      },
+      "required": [
+        "kind",
+        "descriptor"
+      ],
+      "additionalProperties": false
+    },
+    "ContentConstructEnd": {
+      "type": "object",
+      "properties": {
+        "kind": {
+          "type": "string",
+          "const": "constructEnd"
+        }
+      },
+      "required": [
+        "kind"
+      ],
+      "additionalProperties": false
+    },
     "ContentBlock": {
+      "oneOf": [
+        {
+          "$ref": "#/$defs/ContentParagraph"
+        },
+        {
+          "$ref": "#/$defs/ContentTable"
+        },
+        {
+          "$ref": "#/$defs/ContentImageBlock"
+        },
+        {
+          "$ref": "#/$defs/ContentPageBreak"
+        },
+        {
+          "$ref": "#/$defs/ContentEmbeddedObjectBlock"
+        },
+        {
+          "$ref": "#/$defs/ContentConstructStart"
+        },
+        {
+          "$ref": "#/$defs/ContentConstructEnd"
+        }
+      ]
+    },
+    "PackageBlockLeaf": {
       "oneOf": [
         {
           "$ref": "#/$defs/ContentParagraph"
@@ -4077,7 +4132,7 @@
           ]
         },
         "document": {
-          "$ref": "https://cdn.jsdelivr.net/npm/document-schema.js@4.1.0/schemas/content-document.schema.json"
+          "$ref": "https://cdn.jsdelivr.net/npm/document-schema.js@4.2.0/schemas/content-document.schema.json"
         },
         "frame": {
           "$ref": "#/$defs/Box"
@@ -4129,7 +4184,7 @@
                 "$ref": "#/$defs/SectionConstructGroup"
               },
               {
-                "$ref": "#/$defs/ContentBlock"
+                "$ref": "#/$defs/PackageBlockLeaf"
               }
             ]
           }
@@ -4164,7 +4219,7 @@
                 "$ref": "#/$defs/SectionConstructGroup"
               },
               {
-                "$ref": "#/$defs/ContentBlock"
+                "$ref": "#/$defs/PackageBlockLeaf"
               }
             ]
           }
@@ -4196,7 +4251,7 @@
                 "$ref": "#/$defs/ShapeConstructGroup"
               },
               {
-                "$ref": "#/$defs/ContentBlock"
+                "$ref": "#/$defs/PackageBlockLeaf"
               }
             ]
           }
@@ -4250,7 +4305,7 @@
                 "$ref": "#/$defs/ShapeConstructGroup"
               },
               {
-                "$ref": "#/$defs/ContentBlock"
+                "$ref": "#/$defs/PackageBlockLeaf"
               }
             ]
           }
@@ -4343,7 +4398,7 @@
                 "$ref": "#/$defs/SectionConstructGroup"
               },
               {
-                "$ref": "#/$defs/ContentBlock"
+                "$ref": "#/$defs/PackageBlockLeaf"
               }
             ]
           }
@@ -4375,7 +4430,7 @@
                 "$ref": "#/$defs/ShapeConstructGroup"
               },
               {
-                "$ref": "#/$defs/ContentBlock"
+                "$ref": "#/$defs/PackageBlockLeaf"
               }
             ]
           }

package/schemas/document-package.schema.json

@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://cdn.jsdelivr.net/npm/document-schema.js@4.1.0/schemas/document-package.schema.json",
+  "$id": "https://cdn.jsdelivr.net/npm/document-schema.js@4.2.0/schemas/document-package.schema.json",
   "oneOf": [
     {
       "type": "object",
@@ -1066,7 +1066,7 @@
           ]
         },
         "document": {
-          "$ref": "https://cdn.jsdelivr.net/npm/document-schema.js@4.1.0/schemas/content-document.schema.json"
+          "$ref": "https://cdn.jsdelivr.net/npm/document-schema.js@4.2.0/schemas/content-document.schema.json"
         },
         "frame": {
           "$ref": "#/$defs/Box"
@@ -1105,7 +1105,62 @@
       ],
       "additionalProperties": false
     },
+    "ContentConstructStart": {
+      "type": "object",
+      "properties": {
+        "kind": {
+          "type": "string",
+          "const": "constructStart"
+        },
+        "descriptor": {
+          "$ref": "#/$defs/ConstructDescriptor"
+        }
+      },
+      "required": [
+        "kind",
+        "descriptor"
+      ],
+      "additionalProperties": false
+    },
+    "ContentConstructEnd": {
+      "type": "object",
+      "properties": {
+        "kind": {
+          "type": "string",
+          "const": "constructEnd"
+        }
+      },
+      "required": [
+        "kind"
+      ],
+      "additionalProperties": false
+    },
     "ContentBlock": {
+      "oneOf": [
+        {
+          "$ref": "#/$defs/ContentParagraph"
+        },
+        {
+          "$ref": "#/$defs/ContentTable"
+        },
+        {
+          "$ref": "#/$defs/ContentImageBlock"
+        },
+        {
+          "$ref": "#/$defs/ContentPageBreak"
+        },
+        {
+          "$ref": "#/$defs/ContentEmbeddedObjectBlock"
+        },
+        {
+          "$ref": "#/$defs/ContentConstructStart"
+        },
+        {
+          "$ref": "#/$defs/ContentConstructEnd"
+        }
+      ]
+    },
+    "PackageBlockLeaf": {
       "oneOf": [
         {
           "$ref": "#/$defs/ContentParagraph"
@@ -2286,7 +2341,7 @@
           ]
         },
         "document": {
-          "$ref": "https://cdn.jsdelivr.net/npm/document-schema.js@4.1.0/schemas/content-document.schema.json"
+          "$ref": "https://cdn.jsdelivr.net/npm/document-schema.js@4.2.0/schemas/content-document.schema.json"
         },
         "frame": {
           "$ref": "#/$defs/Box"
@@ -2338,7 +2393,7 @@
                 "$ref": "#/$defs/SectionConstructGroup"
               },
               {
-                "$ref": "#/$defs/ContentBlock"
+                "$ref": "#/$defs/PackageBlockLeaf"
               }
             ]
           }
@@ -2373,7 +2428,7 @@
                 "$ref": "#/$defs/SectionConstructGroup"
               },
               {
-                "$ref": "#/$defs/ContentBlock"
+                "$ref": "#/$defs/PackageBlockLeaf"
               }
             ]
           }
@@ -2405,7 +2460,7 @@
                 "$ref": "#/$defs/ShapeConstructGroup"
               },
               {
-                "$ref": "#/$defs/ContentBlock"
+                "$ref": "#/$defs/PackageBlockLeaf"
               }
             ]
           }
@@ -2459,7 +2514,7 @@
                 "$ref": "#/$defs/ShapeConstructGroup"
               },
               {
-                "$ref": "#/$defs/ContentBlock"
+                "$ref": "#/$defs/PackageBlockLeaf"
               }
             ]
           }
@@ -2552,7 +2607,7 @@
                 "$ref": "#/$defs/SectionConstructGroup"
               },
               {
-                "$ref": "#/$defs/ContentBlock"
+                "$ref": "#/$defs/PackageBlockLeaf"
               }
             ]
           }
@@ -2584,7 +2639,7 @@
                 "$ref": "#/$defs/ShapeConstructGroup"
               },
               {
-                "$ref": "#/$defs/ContentBlock"
+                "$ref": "#/$defs/PackageBlockLeaf"
               }
             ]
           }