document-schema 4.1.0 → 4.2.0

package/dist/package-node.js

@@ -1,5 +1,5 @@
 import { ConstructDescriptorSchema } from "./construct.js";
-import { ContentBlockSchema, ContentDrawPageSchema, ContentEmbeddedObjectSchema, ContentFormulaSchema, ContentListMembershipSchema, ContentParagraphSchema, ContentSectionSchema, ContentShapeSchema, ContentSheetImageSchema, ContentSheetSchema, ContentSlideSchema, ContentVectorSchema } from "./content.js";
+import { ContentDrawPageSchema, ContentEmbeddedObjectSchema, ContentFormulaSchema, ContentListMembershipSchema, ContentParagraphSchema, ContentSectionSchema, ContentShapeSchema, ContentSheetImageSchema, ContentSheetSchema, ContentSlideSchema, ContentVectorSchema, isContentBlock, isContentConstructEnd, isContentConstructStart } from "./content.js";
 import { z } from "zod";
 //#region src/package-node.ts
 const SectionDescriptorSchema = ContentSectionSchema.omit({ blocks: true }).extend({ kind: z.literal("section") }).strict();
@@ -28,14 +28,19 @@ function isLeafChild(schema, value) {
 	if (isRecord(value) && "style" in value) return false;
 	return schema.safeParse(value).success;
 }
+function isPackageBlockLeaf(value) {
+	if (isContentConstructStart(value) || isContentConstructEnd(value)) return false;
+	return isContentBlock(value);
+}
+const PackageBlockLeafSchema = z.custom(isPackageBlockLeaf);
 function isSectionChild(value) {
-	return isHeadingGroupNode(value) || isListGroupNode(value) || isSectionConstructGroupNode(value) || isLeafChild(ContentBlockSchema, value);
+	return isHeadingGroupNode(value) || isListGroupNode(value) || isSectionConstructGroupNode(value) || isLeafChild(PackageBlockLeafSchema, value);
 }
 function isShapeChild(value) {
-	return isListGroupNode(value) || isShapeConstructGroupNode(value) || isLeafChild(ContentBlockSchema, value);
+	return isListGroupNode(value) || isShapeConstructGroupNode(value) || isLeafChild(PackageBlockLeafSchema, value);
 }
 function isListChild(value) {
-	return isListGroupNode(value) || isShapeConstructGroupNode(value) || isLeafChild(ContentBlockSchema, value);
+	return isListGroupNode(value) || isShapeConstructGroupNode(value) || isLeafChild(PackageBlockLeafSchema, value);
 }
 function isSheetChild(value) {
 	return isLeafChild(ContentSheetImageSchema, value) || isLeafChild(ContentEmbeddedObjectSchema, value);
@@ -71,7 +76,7 @@ function isShapeConstructGroupNode(value) {
 	return isRecord(value) && ConstructDescriptorSchema.safeParse(value.node).success && isGroupWrapper(value, isShapeChild);
 }
 const packageLeafUnion = z.union([
-	ContentBlockSchema,
+	PackageBlockLeafSchema,
 	ContentSheetImageSchema,
 	ContentEmbeddedObjectSchema,
 	ContentVectorSchema,
@@ -99,4 +104,4 @@ const PackageGroupSchema = z.custom(isPackageGroup);
 const PackageLeafSchema = z.custom(isPackageLeaf);
 const PackageNodeSchema = z.custom(isPackageNode);
 //#endregion
-export { DrawPageDescriptorSchema, DrawPageGroupSchema, HeadingGroupSchema, HeadingParagraphSchema, ListGroupSchema, ListParagraphSchema, PackageGroupSchema, PackageLeafSchema, PackageNodeSchema, SectionConstructGroupSchema, SectionDescriptorSchema, SectionGroupSchema, ShapeConstructGroupSchema, ShapeDescriptorSchema, ShapeGroupSchema, SheetDescriptorSchema, SheetGroupSchema, SlideDescriptorSchema, SlideGroupSchema, isDrawPageGroupNode, isHeadingGroupNode, isListGroupNode, isPackageGroup, isPackageLeaf, isPackageNode, isSectionConstructGroupNode, isSectionGroupNode, isShapeConstructGroupNode, isShapeGroupNode, isSheetGroupNode, isSlideGroupNode };
+export { DrawPageDescriptorSchema, DrawPageGroupSchema, HeadingGroupSchema, HeadingParagraphSchema, ListGroupSchema, ListParagraphSchema, PackageBlockLeafSchema, PackageGroupSchema, PackageLeafSchema, PackageNodeSchema, SectionConstructGroupSchema, SectionDescriptorSchema, SectionGroupSchema, ShapeConstructGroupSchema, ShapeDescriptorSchema, ShapeGroupSchema, SheetDescriptorSchema, SheetGroupSchema, SlideDescriptorSchema, SlideGroupSchema, isDrawPageGroupNode, isHeadingGroupNode, isListGroupNode, isPackageBlockLeaf, isPackageGroup, isPackageLeaf, isPackageNode, isSectionConstructGroupNode, isSectionGroupNode, isShapeConstructGroupNode, isShapeGroupNode, isSheetGroupNode, isSlideGroupNode };

package/dist/package.d.cts

@@ -1,6 +1,6 @@
 import { d as MathMlNode } from "./mathml-B1oTCtzc.cjs";
-import { s as MathExpression } from "./math-B7gZJeND.cjs";
-import { E as SectionGroupNode, H as SlideGroupNode, R as SheetGroupNode, i as DrawPageGroupNode } from "./package-node-BiUEzIzl.cjs";
+import { s as MathExpression } from "./math-BlG8Tjk-.cjs";
+import { B as SheetGroupNode, O as SectionGroupNode, W as SlideGroupNode, i as DrawPageGroupNode } from "./package-node-DUKZHgAg.cjs";
 import { z } from "zod";
 //#region src/package.d.ts
 declare const DocumentPackageSchema: z.ZodDiscriminatedUnion<[z.ZodObject<{
@@ -67,9 +67,9 @@ declare const DocumentPackageSchema: z.ZodDiscriminatedUnion<[z.ZodObject<{
       symbol: z.ZodString;
       name: z.ZodOptional<z.ZodString>;
       dimension: z.ZodRecord<z.ZodEnum<{
-        time: "time";
         length: "length";
         mass: "mass";
+        time: "time";
         electricCurrent: "electricCurrent";
         thermodynamicTemperature: "thermodynamicTemperature";
         amountOfSubstance: "amountOfSubstance";
@@ -171,9 +171,9 @@ declare const DocumentPackageSchema: z.ZodDiscriminatedUnion<[z.ZodObject<{
       symbol: z.ZodString;
       name: z.ZodOptional<z.ZodString>;
       dimension: z.ZodRecord<z.ZodEnum<{
-        time: "time";
         length: "length";
         mass: "mass";
+        time: "time";
         electricCurrent: "electricCurrent";
         thermodynamicTemperature: "thermodynamicTemperature";
         amountOfSubstance: "amountOfSubstance";
@@ -275,9 +275,9 @@ declare const DocumentPackageSchema: z.ZodDiscriminatedUnion<[z.ZodObject<{
       symbol: z.ZodString;
       name: z.ZodOptional<z.ZodString>;
       dimension: z.ZodRecord<z.ZodEnum<{
-        time: "time";
         length: "length";
         mass: "mass";
+        time: "time";
         electricCurrent: "electricCurrent";
         thermodynamicTemperature: "thermodynamicTemperature";
         amountOfSubstance: "amountOfSubstance";
@@ -379,9 +379,9 @@ declare const DocumentPackageSchema: z.ZodDiscriminatedUnion<[z.ZodObject<{
       symbol: z.ZodString;
       name: z.ZodOptional<z.ZodString>;
       dimension: z.ZodRecord<z.ZodEnum<{
-        time: "time";
         length: "length";
         mass: "mass";
+        time: "time";
         electricCurrent: "electricCurrent";
         thermodynamicTemperature: "thermodynamicTemperature";
         amountOfSubstance: "amountOfSubstance";
@@ -495,9 +495,9 @@ declare const DocumentPackageSchema: z.ZodDiscriminatedUnion<[z.ZodObject<{
       symbol: z.ZodString;
       name: z.ZodOptional<z.ZodString>;
       dimension: z.ZodRecord<z.ZodEnum<{
-        time: "time";
         length: "length";
         mass: "mass";
+        time: "time";
         electricCurrent: "electricCurrent";
         thermodynamicTemperature: "thermodynamicTemperature";
         amountOfSubstance: "amountOfSubstance";

package/dist/package.d.ts

@@ -1,6 +1,6 @@
 import { d as MathMlNode } from "./mathml-B1oTCtzc.js";
-import { s as MathExpression } from "./math-B7gZJeND.js";
-import { E as SectionGroupNode, H as SlideGroupNode, R as SheetGroupNode, i as DrawPageGroupNode } from "./package-node-DLUobcDQ.js";
+import { s as MathExpression } from "./math-BlG8Tjk-.js";
+import { B as SheetGroupNode, O as SectionGroupNode, W as SlideGroupNode, i as DrawPageGroupNode } from "./package-node-B9qLyhk5.js";
 import { z } from "zod";
 //#region src/package.d.ts
 declare const DocumentPackageSchema: z.ZodDiscriminatedUnion<[z.ZodObject<{
@@ -67,9 +67,9 @@ declare const DocumentPackageSchema: z.ZodDiscriminatedUnion<[z.ZodObject<{
       symbol: z.ZodString;
       name: z.ZodOptional<z.ZodString>;
       dimension: z.ZodRecord<z.ZodEnum<{
-        time: "time";
         length: "length";
         mass: "mass";
+        time: "time";
         electricCurrent: "electricCurrent";
         thermodynamicTemperature: "thermodynamicTemperature";
         amountOfSubstance: "amountOfSubstance";
@@ -171,9 +171,9 @@ declare const DocumentPackageSchema: z.ZodDiscriminatedUnion<[z.ZodObject<{
       symbol: z.ZodString;
       name: z.ZodOptional<z.ZodString>;
       dimension: z.ZodRecord<z.ZodEnum<{
-        time: "time";
         length: "length";
         mass: "mass";
+        time: "time";
         electricCurrent: "electricCurrent";
         thermodynamicTemperature: "thermodynamicTemperature";
         amountOfSubstance: "amountOfSubstance";
@@ -275,9 +275,9 @@ declare const DocumentPackageSchema: z.ZodDiscriminatedUnion<[z.ZodObject<{
       symbol: z.ZodString;
       name: z.ZodOptional<z.ZodString>;
       dimension: z.ZodRecord<z.ZodEnum<{
-        time: "time";
         length: "length";
         mass: "mass";
+        time: "time";
         electricCurrent: "electricCurrent";
         thermodynamicTemperature: "thermodynamicTemperature";
         amountOfSubstance: "amountOfSubstance";
@@ -379,9 +379,9 @@ declare const DocumentPackageSchema: z.ZodDiscriminatedUnion<[z.ZodObject<{
       symbol: z.ZodString;
       name: z.ZodOptional<z.ZodString>;
       dimension: z.ZodRecord<z.ZodEnum<{
-        time: "time";
         length: "length";
         mass: "mass";
+        time: "time";
         electricCurrent: "electricCurrent";
         thermodynamicTemperature: "thermodynamicTemperature";
         amountOfSubstance: "amountOfSubstance";
@@ -495,9 +495,9 @@ declare const DocumentPackageSchema: z.ZodDiscriminatedUnion<[z.ZodObject<{
       symbol: z.ZodString;
       name: z.ZodOptional<z.ZodString>;
       dimension: z.ZodRecord<z.ZodEnum<{
-        time: "time";
         length: "length";
         mass: "mass";
+        time: "time";
         electricCurrent: "electricCurrent";
         thermodynamicTemperature: "thermodynamicTemperature";
         amountOfSubstance: "amountOfSubstance";

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-oSmH1_zP.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-D3C14yyb.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/dist/style.d.cts

@@ -10,12 +10,12 @@ type Alignment = z.infer<typeof AlignmentSchema>;
 declare const LayoutFontSchema: z.ZodObject<{
   family: z.ZodString;
   weight: z.ZodEnum<{
-    bold: "bold";
     normal: "normal";
+    bold: "bold";
   }>;
   style: z.ZodEnum<{
-    italic: "italic";
     normal: "normal";
+    italic: "italic";
   }>;
 }, z.core.$strip>;
 type LayoutFont = z.infer<typeof LayoutFontSchema>;

package/dist/style.d.ts

@@ -10,12 +10,12 @@ type Alignment = z.infer<typeof AlignmentSchema>;
 declare const LayoutFontSchema: z.ZodObject<{
   family: z.ZodString;
   weight: z.ZodEnum<{
-    bold: "bold";
     normal: "normal";
+    bold: "bold";
   }>;
   style: z.ZodEnum<{
-    italic: "italic";
     normal: "normal";
+    italic: "italic";
   }>;
 }, z.core.$strip>;
 type LayoutFont = z.infer<typeof LayoutFontSchema>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "document-schema",
-  "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"
               }
             ]
           }