document-content-model 4.3.2 → 7.6.0

package/dist/content.js

@@ -1,10 +1,11 @@
 import { ColorSchema } from "./color.js";
+import { SourceResidueSchema } from "./source.js";
 import { ConstructDescriptorSchema } from "./construct.js";
 import { MathExpressionSchema, MathPresentationSchema, MathProvenanceSchema, SymbolTableSchema } from "./math.js";
-import { BoxSchema, LayoutFrameSchema, MarginsSchema, PageSizeSchema } from "./geometry.js";
 import { MathMlNodeSchema } from "./mathml.js";
+import { BoxSchema, LayoutFrameSchema, MarginsSchema, PageSizeSchema } from "./geometry.js";
+import { AlignmentSchema, TextDirectionSchema } from "./style.js";
 import { LayoutMetadataSchema } from "./metadata.js";
-import { AlignmentSchema } from "./style.js";
 import { z } from "zod";
 //#region src/content.ts
 const ContentRunSchema = z.object({
@@ -17,17 +18,55 @@ const ContentRunSchema = z.object({
 	sizePt: z.number().positive().optional(),
 	color: ColorSchema.optional(),
 	hyperlink: z.string().optional(),
+	verticalAlign: z.enum(["superscript", "subscript"]).optional(),
+	direction: TextDirectionSchema.optional(),
 	sourcePath: z.string().optional(),
+	source: SourceResidueSchema.optional(),
 	frames: z.array(LayoutFrameSchema).optional()
 });
 const ContentListMembershipSchema = z.object({
 	numId: z.string().optional(),
-	level: z.number().int().nonnegative()
+	level: z.number().int().nonnegative(),
+	checked: z.boolean().optional(),
+	itemId: z.string().optional(),
+	format: z.enum([
+		"bullet",
+		"decimal",
+		"lowerLetter",
+		"upperLetter",
+		"lowerRoman",
+		"upperRoman"
+	]).optional()
+});
+const RunConstructExtentSchema = z.object({
+	descriptor: ConstructDescriptorSchema,
+	startRun: z.number().int().nonnegative(),
+	endRun: z.number().int().nonnegative()
+});
+const ContentStrokeStyleSchema = z.enum([
+	"solid",
+	"dashed",
+	"dotted",
+	"double"
+]);
+const ContentBorderSchema = z.object({
+	color: ColorSchema,
+	widthPt: z.number().positive(),
+	style: ContentStrokeStyleSchema.optional()
+});
+const ContentParagraphBordersSchema = z.object({
+	left: ContentBorderSchema.optional(),
+	right: ContentBorderSchema.optional(),
+	top: ContentBorderSchema.optional(),
+	bottom: ContentBorderSchema.optional()
 });
 const ContentParagraphSchema = z.object({
 	kind: z.literal("paragraph"),
 	runs: z.array(ContentRunSchema),
+	constructs: z.array(RunConstructExtentSchema).optional(),
 	styleId: z.string().optional(),
+	codeLanguage: z.string().optional(),
+	preformatted: z.boolean().optional(),
 	headingLevel: z.number().int().positive().optional(),
 	alignment: AlignmentSchema.optional(),
 	list: ContentListMembershipSchema.optional(),
@@ -35,26 +74,75 @@ const ContentParagraphSchema = z.object({
 	spacingAfterPt: z.number().optional(),
 	lineSpacing: z.number().positive().optional(),
 	indentLeftPt: z.number().optional(),
+	indentRightPt: z.number().optional(),
 	indentFirstLinePt: z.number().optional(),
+	direction: TextDirectionSchema.optional(),
+	pageBreakBefore: z.boolean().optional(),
+	pageBreakAfter: z.boolean().optional(),
+	borders: ContentParagraphBordersSchema.optional(),
 	sourcePath: z.string().optional(),
+	source: SourceResidueSchema.optional(),
 	frames: z.array(LayoutFrameSchema).optional()
 });
 function clampHeadingLevel(level) {
 	return Math.min(6, Math.max(1, Math.round(level)));
 }
+const ContentFloatOriginSchema = z.enum([
+	"page",
+	"margin",
+	"leftMargin",
+	"rightMargin",
+	"topMargin",
+	"bottomMargin",
+	"insideMargin",
+	"outsideMargin",
+	"column",
+	"character",
+	"paragraph",
+	"line",
+	"frame"
+]);
+const ContentFloatAlignSchema = z.enum([
+	"left",
+	"right",
+	"top",
+	"bottom",
+	"center",
+	"inside",
+	"outside"
+]);
+const ContentFloatAxisSchema = z.union([z.strictObject({
+	relativeTo: ContentFloatOriginSchema,
+	offsetPt: z.number()
+}), z.strictObject({
+	relativeTo: ContentFloatOriginSchema,
+	align: ContentFloatAlignSchema
+})]);
+const ContentFloatPositionSchema = z.object({
+	horizontal: ContentFloatAxisSchema,
+	vertical: ContentFloatAxisSchema
+});
 const ContentImageBlockSchema = z.object({
 	kind: z.literal("image"),
-	format: z.enum(["png", "jpeg"]),
+	format: z.enum([
+		"png",
+		"jpeg",
+		"svg",
+		"gif"
+	]),
 	base64: z.string(),
 	widthPt: z.number().positive(),
 	heightPt: z.number().positive(),
 	altText: z.string().optional(),
+	floatPosition: ContentFloatPositionSchema.optional(),
 	sourcePath: z.string().optional(),
+	source: SourceResidueSchema.optional(),
 	frames: z.array(LayoutFrameSchema).optional()
 });
 const ContentPageBreakSchema = z.object({
 	kind: z.literal("pageBreak"),
 	sourcePath: z.string().optional(),
+	source: SourceResidueSchema.optional(),
 	frames: z.array(LayoutFrameSchema).optional()
 });
 const ContentConstructStartSchema = z.object({
@@ -75,24 +163,29 @@ function isContentTableRow(value) {
 	return isRecord(value) && Array.isArray(value.cells) && value.cells.every(isContentTableCell) && (value.heightPt === void 0 || typeof value.heightPt === "number");
 }
 function isContentEmbeddedObjectKind(value) {
-	return value === "formula" || value === "wordprocessing" || value === "presentation" || value === "spreadsheet" || value === "drawing";
+	return value === "formula" || value === "wordprocessing" || value === "presentation" || value === "spreadsheet" || value === "drawing" || value === "chart";
 }
 function isContentEmbeddedObject(value) {
 	return isRecord(value) && isContentEmbeddedObjectKind(value.objectKind) && BoxSchema.safeParse(value.frame).success && ContentDocumentSchema.safeParse(value.document).success && (value.anchorRow === void 0 || typeof value.anchorRow === "number" && Number.isInteger(value.anchorRow) && value.anchorRow >= 0) && (value.anchorColumn === void 0 || typeof value.anchorColumn === "number" && Number.isInteger(value.anchorColumn) && value.anchorColumn >= 0) && (value.offsetXPt === void 0 || typeof value.offsetXPt === "number") && (value.offsetYPt === void 0 || typeof value.offsetYPt === "number");
 }
-function isContentEmbeddedObjectBlock(value) {
-	return isRecord(value) && value.kind === "embeddedObject" && isContentEmbeddedObject(value);
-}
 function isContentConstructStart(value) {
 	return isRecord(value) && value.kind === "constructStart" && ConstructDescriptorSchema.safeParse(value.descriptor).success;
 }
 function isContentConstructEnd(value) {
 	return isRecord(value) && value.kind === "constructEnd";
 }
+function isRunConstructExtent(value) {
+	if (!isRecord(value)) return false;
+	if (!ConstructDescriptorSchema.safeParse(value.descriptor).success) return false;
+	return isValidRunBound(value.startRun) && isValidRunBound(value.endRun);
+}
+function isValidRunBound(value) {
+	return typeof value === "number" && Number.isInteger(value) && value >= 0;
+}
 function isContentBlock(value) {
 	if (!isRecord(value)) return false;
 	const kind = value.kind;
-	if (kind === "paragraph") return Array.isArray(value.runs) && value.runs.every(isContentRun);
+	if (kind === "paragraph") return Array.isArray(value.runs) && value.runs.every(isContentRun) && (value.constructs === void 0 || Array.isArray(value.constructs) && value.constructs.every(isRunConstructExtent));
 	if (kind === "image") return (value.format === "png" || value.format === "jpeg") && typeof value.base64 === "string" && typeof value.widthPt === "number" && typeof value.heightPt === "number";
 	if (kind === "pageBreak") return true;
 	if (kind === "table") return Array.isArray(value.rows) && value.rows.every(isContentTableRow) && Array.isArray(value.columnWidthsPt) && value.columnWidthsPt.every((w) => typeof w === "number");
@@ -101,9 +194,30 @@ function isContentBlock(value) {
 	if (kind === "constructEnd") return true;
 	return false;
 }
-const ContentBlockSchema = z.custom(isContentBlock);
-const ContentEmbeddedObjectSchema = z.custom(isContentEmbeddedObject);
-const ContentEmbeddedObjectBlockSchema = z.custom(isContentEmbeddedObjectBlock);
+const CONTENT_EMBEDDED_OBJECT_FIELDS = {
+	objectKind: z.enum([
+		"formula",
+		"wordprocessing",
+		"presentation",
+		"spreadsheet",
+		"drawing",
+		"chart"
+	]),
+	document: z.lazy(() => ContentDocumentSchema),
+	frame: BoxSchema,
+	anchorRow: z.number().int().nonnegative().optional(),
+	anchorColumn: z.number().int().nonnegative().optional(),
+	offsetXPt: z.number().optional(),
+	offsetYPt: z.number().optional(),
+	source: SourceResidueSchema.optional()
+};
+const ContentEmbeddedObjectSchema = z.object(CONTENT_EMBEDDED_OBJECT_FIELDS);
+const ContentEmbeddedObjectBlockSchema = z.object({
+	kind: z.literal("embeddedObject"),
+	...CONTENT_EMBEDDED_OBJECT_FIELDS,
+	sourcePath: z.string().optional(),
+	frames: z.array(LayoutFrameSchema).optional()
+});
 function findConstructMarkerImbalance(blocks) {
 	const openStartIndices = [];
 	for (const [index, block] of blocks.entries()) if (isContentConstructStart(block)) openStartIndices.push(index);
@@ -117,47 +231,153 @@ function findConstructMarkerImbalance(blocks) {
 		index: outermostUnclosed
 	};
 }
-const ContentStrokeStyleSchema = z.enum([
-	"solid",
-	"dashed",
-	"dotted",
-	"double"
-]);
-const ContentBorderSchema = z.object({
-	color: ColorSchema,
-	widthPt: z.number().positive(),
-	style: ContentStrokeStyleSchema.optional()
-});
+function findRunConstructFault(paragraph) {
+	const constructs = paragraph.constructs;
+	if (constructs === void 0) return void 0;
+	for (const [index, extent] of constructs.entries()) {
+		if (extent.startRun > extent.endRun) return {
+			kind: "invertedRange",
+			index
+		};
+		if (extent.startRun < 0 || extent.endRun > paragraph.runs.length) return {
+			kind: "beyondRuns",
+			index
+		};
+	}
+}
 const ContentCellBordersSchema = z.object({
 	left: ContentBorderSchema.optional(),
 	right: ContentBorderSchema.optional(),
 	top: ContentBorderSchema.optional(),
-	bottom: ContentBorderSchema.optional()
+	bottom: ContentBorderSchema.optional(),
+	diagonalUp: ContentBorderSchema.optional(),
+	diagonalDown: ContentBorderSchema.optional()
 });
+const ContentCellPatternTypeSchema = z.enum([
+	"percent5",
+	"percent10",
+	"percent12",
+	"percent15",
+	"percent20",
+	"percent25",
+	"percent30",
+	"percent35",
+	"percent37",
+	"percent40",
+	"percent45",
+	"percent50",
+	"percent55",
+	"percent60",
+	"percent62",
+	"percent65",
+	"percent70",
+	"percent75",
+	"percent80",
+	"percent85",
+	"percent87",
+	"percent90",
+	"percent95",
+	"horizontalStripe",
+	"verticalStripe",
+	"diagonalStripe",
+	"reverseDiagonalStripe",
+	"horizontalCross",
+	"diagonalCross",
+	"thinHorizontalStripe",
+	"thinVerticalStripe",
+	"thinDiagonalStripe",
+	"thinReverseDiagonalStripe",
+	"thinHorizontalCross",
+	"thinDiagonalCross",
+	"mediumGray",
+	"darkGray",
+	"lightGray",
+	"darkHorizontal",
+	"darkVertical",
+	"darkDown",
+	"darkUp",
+	"darkGrid",
+	"darkTrellis",
+	"lightHorizontal",
+	"lightVertical",
+	"lightDown",
+	"lightUp",
+	"lightGrid",
+	"lightTrellis",
+	"gray125",
+	"gray0625"
+]);
+const ContentCellFillSchema = z.discriminatedUnion("kind", [z.object({
+	kind: z.literal("solid"),
+	color: ColorSchema
+}), z.object({
+	kind: z.literal("pattern"),
+	patternType: ContentCellPatternTypeSchema,
+	foregroundColor: ColorSchema.optional(),
+	backgroundColor: ColorSchema.optional()
+})]);
+function resolveCellFillColor(fill) {
+	return fill.kind === "solid" ? fill.color : fill.foregroundColor ?? fill.backgroundColor;
+}
+function unrecognizedFillKind(fill) {
+	return String(fill.kind);
+}
 const ContentTableCellSchema = z.object({
-	blocks: z.array(ContentBlockSchema),
+	blocks: z.lazy(() => z.array(ContentBlockSchema)),
 	colSpan: z.number().int().positive().optional(),
 	rowSpan: z.number().int().positive().optional(),
-	background: ColorSchema.optional(),
+	background: ContentCellFillSchema.optional(),
 	borders: ContentCellBordersSchema.optional(),
+	verticalAlign: z.enum([
+		"top",
+		"center",
+		"bottom"
+	]).optional(),
+	formula: z.string().optional(),
 	sourcePath: z.string().optional(),
+	source: SourceResidueSchema.optional(),
 	frames: z.array(LayoutFrameSchema).optional()
 });
 const ContentTableRowSchema = z.object({
 	cells: z.array(ContentTableCellSchema),
-	heightPt: z.number().positive().optional()
+	heightPt: z.number().positive().optional(),
+	direction: TextDirectionSchema.optional()
 });
 const ContentTableSchema = z.object({
 	kind: z.literal("table"),
 	rows: z.array(ContentTableRowSchema),
-	columnWidthsPt: z.array(z.number().positive()),
+	columnWidthsPt: z.array(z.number().nonnegative()),
 	sourcePath: z.string().optional(),
+	source: SourceResidueSchema.optional(),
 	frames: z.array(LayoutFrameSchema).optional()
 });
+const ContentBlockSchema = z.discriminatedUnion("kind", [
+	ContentParagraphSchema,
+	ContentTableSchema,
+	ContentImageBlockSchema,
+	ContentPageBreakSchema,
+	ContentEmbeddedObjectBlockSchema,
+	ContentConstructStartSchema,
+	ContentConstructEndSchema
+]);
+const ContentPageFurnitureSchema = z.object({
+	default: z.lazy(() => z.array(ContentBlockSchema)).optional(),
+	even: z.lazy(() => z.array(ContentBlockSchema)).optional(),
+	first: z.lazy(() => z.array(ContentBlockSchema)).optional()
+});
 const ContentSectionSchema = z.object({
 	pageSize: PageSizeSchema,
 	margins: MarginsSchema,
-	blocks: z.array(ContentBlockSchema)
+	blocks: z.lazy(() => z.array(ContentBlockSchema)),
+	breakType: z.enum([
+		"nextPage",
+		"continuous",
+		"evenPage",
+		"oddPage"
+	]).optional(),
+	headers: ContentPageFurnitureSchema.optional(),
+	footers: ContentPageFurnitureSchema.optional(),
+	source: SourceResidueSchema.optional()
 });
 const ContentShapeSchema = z.object({
 	name: z.string().optional(),
@@ -171,13 +391,15 @@ const ContentShapeSchema = z.object({
 	lineSpacingReduction: z.number().nonnegative().optional(),
 	paintOrder: z.number().optional(),
 	sourcePath: z.string().optional(),
+	source: SourceResidueSchema.optional(),
 	frames: z.array(LayoutFrameSchema).optional(),
-	blocks: z.array(ContentBlockSchema)
+	blocks: z.lazy(() => z.array(ContentBlockSchema))
 });
 const ContentSlideSchema = z.object({
 	size: PageSizeSchema,
 	shapes: z.array(ContentShapeSchema),
-	notes: z.string()
+	notes: z.string(),
+	source: SourceResidueSchema.optional()
 });
 const DecimalStringSchema = z.string().regex(/^-?(0|[1-9]\d*)(\.\d+)?$/);
 const ContentCellValueSchema = z.discriminatedUnion("kind", [
@@ -238,10 +460,11 @@ const ContentSheetCellSchema = z.object({
 	value: ContentCellValueSchema,
 	formula: z.string().optional(),
 	displayText: z.string(),
+	numberFormatCode: z.string().optional(),
 	runs: z.array(ContentRunSchema).optional(),
 	colSpan: z.number().int().positive().optional(),
 	rowSpan: z.number().int().positive().optional(),
-	background: ColorSchema.optional(),
+	background: ContentCellFillSchema.optional(),
 	borders: ContentCellBordersSchema.optional(),
 	alignment: AlignmentSchema.optional(),
 	verticalAlignment: z.enum([
@@ -251,6 +474,7 @@ const ContentSheetCellSchema = z.object({
 	]).optional(),
 	comment: ContentSheetCellCommentSchema.optional(),
 	sourcePath: z.string().optional(),
+	source: SourceResidueSchema.optional(),
 	frames: z.array(LayoutFrameSchema).optional()
 });
 const ContentSheetColumnSchema = z.object({
@@ -292,6 +516,167 @@ const ContentSheetPrintSettingsSchema = z.object({
 		columns: z.array(z.number().int().nonnegative())
 	}).optional()
 });
+const ContentSheetRangeSchema = z.object({
+	startRow: z.number().int().nonnegative(),
+	startColumn: z.number().int().nonnegative(),
+	endRow: z.number().int().nonnegative(),
+	endColumn: z.number().int().nonnegative()
+});
+const SheetRuleOperatorSchema = z.enum([
+	"between",
+	"notBetween",
+	"equal",
+	"notEqual",
+	"greaterThan",
+	"greaterThanOrEqual",
+	"lessThan",
+	"lessThanOrEqual"
+]);
+const ContentSheetDataValidationTypeSchema = z.enum([
+	"whole",
+	"decimal",
+	"list",
+	"date",
+	"time",
+	"textLength",
+	"custom"
+]);
+const ContentSheetDataValidationSchema = z.object({
+	ranges: z.array(ContentSheetRangeSchema),
+	type: ContentSheetDataValidationTypeSchema,
+	operator: SheetRuleOperatorSchema.optional(),
+	formula1: z.string().optional(),
+	formula2: z.string().optional(),
+	allowBlank: z.boolean().optional(),
+	showInputMessage: z.boolean().optional(),
+	promptTitle: z.string().optional(),
+	prompt: z.string().optional(),
+	showErrorMessage: z.boolean().optional(),
+	errorStyle: z.enum([
+		"stop",
+		"warning",
+		"information"
+	]).optional(),
+	errorTitle: z.string().optional(),
+	error: z.string().optional(),
+	source: SourceResidueSchema.optional()
+});
+const ContentSheetConditionalFormatStyleSchema = z.object({
+	textColor: ColorSchema.optional(),
+	background: ColorSchema.optional(),
+	source: SourceResidueSchema.optional()
+});
+const cfvoTypeSchema = z.enum([
+	"num",
+	"percent",
+	"max",
+	"min",
+	"formula",
+	"percentile"
+]);
+const ContentSheetConditionalFormatValueSchema = z.object({
+	type: cfvoTypeSchema,
+	value: z.string().optional()
+});
+const conditionalFormatCommonFields = {
+	ranges: z.array(ContentSheetRangeSchema),
+	priority: z.number().int().optional(),
+	stopIfTrue: z.boolean().optional(),
+	source: SourceResidueSchema.optional()
+};
+const ContentSheetConditionalFormatSchema = z.discriminatedUnion("type", [
+	z.object({
+		type: z.literal("cellIs"),
+		...conditionalFormatCommonFields,
+		operator: SheetRuleOperatorSchema,
+		formula1: z.string(),
+		formula2: z.string().optional(),
+		style: ContentSheetConditionalFormatStyleSchema.optional()
+	}),
+	z.object({
+		type: z.enum([
+			"containsText",
+			"notContainsText",
+			"beginsWith",
+			"endsWith"
+		]),
+		...conditionalFormatCommonFields,
+		text: z.string(),
+		style: ContentSheetConditionalFormatStyleSchema.optional()
+	}),
+	z.object({
+		type: z.enum([
+			"containsBlanks",
+			"notContainsBlanks",
+			"containsErrors",
+			"notContainsErrors",
+			"uniqueValues",
+			"duplicateValues"
+		]),
+		...conditionalFormatCommonFields,
+		style: ContentSheetConditionalFormatStyleSchema.optional()
+	}),
+	z.object({
+		type: z.literal("top10"),
+		...conditionalFormatCommonFields,
+		rank: z.number().positive(),
+		percent: z.boolean().optional(),
+		bottom: z.boolean().optional(),
+		style: ContentSheetConditionalFormatStyleSchema.optional()
+	}),
+	z.object({
+		type: z.literal("aboveAverage"),
+		...conditionalFormatCommonFields,
+		aboveAverage: z.boolean().optional(),
+		equalAverage: z.boolean().optional(),
+		stdDev: z.number().int().positive().optional(),
+		style: ContentSheetConditionalFormatStyleSchema.optional()
+	}),
+	z.object({
+		type: z.literal("timePeriod"),
+		...conditionalFormatCommonFields,
+		timePeriod: z.enum([
+			"yesterday",
+			"today",
+			"tomorrow",
+			"last7Days",
+			"thisMonth",
+			"lastMonth",
+			"nextMonth",
+			"thisWeek",
+			"lastWeek",
+			"nextWeek",
+			"thisYear",
+			"lastYear",
+			"nextYear"
+		]),
+		style: ContentSheetConditionalFormatStyleSchema.optional()
+	}),
+	z.object({
+		type: z.literal("colorScale"),
+		...conditionalFormatCommonFields,
+		stops: z.array(z.object({
+			value: ContentSheetConditionalFormatValueSchema,
+			color: ColorSchema
+		})).min(2).max(3)
+	}),
+	z.object({
+		type: z.literal("dataBar"),
+		...conditionalFormatCommonFields,
+		min: ContentSheetConditionalFormatValueSchema,
+		max: ContentSheetConditionalFormatValueSchema,
+		color: ColorSchema,
+		showValue: z.boolean().optional()
+	}),
+	z.object({
+		type: z.literal("iconSet"),
+		...conditionalFormatCommonFields,
+		iconSetType: z.string(),
+		thresholds: z.array(ContentSheetConditionalFormatValueSchema),
+		reverse: z.boolean().optional(),
+		showValue: z.boolean().optional()
+	})
+]);
 const ContentSheetImageSchema = ContentImageBlockSchema.extend({
 	anchorRow: z.number().int().nonnegative(),
 	anchorColumn: z.number().int().nonnegative(),
@@ -305,13 +690,67 @@ const ContentSheetSchema = z.object({
 	rows: z.array(ContentSheetRowSchema),
 	images: z.array(ContentSheetImageSchema),
 	printSettings: ContentSheetPrintSettingsSchema,
-	embeddedObjects: z.array(ContentEmbeddedObjectSchema).optional()
+	embeddedObjects: z.array(ContentEmbeddedObjectSchema).optional(),
+	dataValidations: z.array(ContentSheetDataValidationSchema).optional(),
+	conditionalFormats: z.array(ContentSheetConditionalFormatSchema).optional(),
+	source: SourceResidueSchema.optional()
+});
+const ContentStrokeDashSchema = z.object({
+	dots1: z.number().int().positive(),
+	dots1LengthPt: z.number().positive(),
+	dots2: z.number().int().positive().optional(),
+	dots2LengthPt: z.number().positive().optional(),
+	distancePt: z.number().nonnegative()
 });
 const ContentStrokeSchema = z.object({
 	color: ColorSchema,
 	widthPt: z.number().positive(),
-	style: ContentStrokeStyleSchema.optional()
+	style: ContentStrokeStyleSchema.optional(),
+	opacity: z.number().min(0).max(1).optional(),
+	dashPattern: ContentStrokeDashSchema.optional()
+});
+const ContentGradientStyleSchema = z.enum([
+	"linear",
+	"axial",
+	"radial",
+	"ellipsoid",
+	"square",
+	"rectangular"
+]);
+const ContentGradientFillSchema = z.object({
+	kind: z.literal("gradient"),
+	style: ContentGradientStyleSchema,
+	startColor: ColorSchema,
+	endColor: ColorSchema,
+	angleDeg: z.number().optional()
+});
+const ContentHatchStyleSchema = z.enum([
+	"single",
+	"double",
+	"triple"
+]);
+const ContentHatchFillSchema = z.object({
+	kind: z.literal("hatch"),
+	style: ContentHatchStyleSchema,
+	color: ColorSchema,
+	distancePt: z.number().nonnegative(),
+	rotationDeg: z.number().optional()
+});
+const ContentBitmapFillSchema = z.object({
+	kind: z.literal("bitmap"),
+	format: z.enum([
+		"png",
+		"jpeg",
+		"svg",
+		"gif"
+	]),
+	base64: z.string()
 });
+const ContentFillPatternSchema = z.discriminatedUnion("kind", [
+	ContentGradientFillSchema,
+	ContentHatchFillSchema,
+	ContentBitmapFillSchema
+]);
 const ContentPathPointSchema = z.object({
 	xPt: z.number(),
 	yPt: z.number()
@@ -336,9 +775,12 @@ const ContentVectorSchema = z.discriminatedUnion("kind", [
 		frame: BoxSchema,
 		rotationDeg: z.number().optional(),
 		fill: ColorSchema.optional(),
+		fillPattern: ContentFillPatternSchema.optional(),
+		fillOpacity: z.number().min(0).max(1).optional(),
 		stroke: ContentStrokeSchema.optional(),
 		paintOrder: z.number().optional(),
 		sourcePath: z.string().optional(),
+		source: SourceResidueSchema.optional(),
 		frames: z.array(LayoutFrameSchema).optional()
 	}),
 	z.object({
@@ -346,9 +788,12 @@ const ContentVectorSchema = z.discriminatedUnion("kind", [
 		frame: BoxSchema,
 		rotationDeg: z.number().optional(),
 		fill: ColorSchema.optional(),
+		fillPattern: ContentFillPatternSchema.optional(),
+		fillOpacity: z.number().min(0).max(1).optional(),
 		stroke: ContentStrokeSchema.optional(),
 		paintOrder: z.number().optional(),
 		sourcePath: z.string().optional(),
+		source: SourceResidueSchema.optional(),
 		frames: z.array(LayoutFrameSchema).optional()
 	}),
 	z.object({
@@ -358,6 +803,7 @@ const ContentVectorSchema = z.discriminatedUnion("kind", [
 		stroke: ContentStrokeSchema,
 		paintOrder: z.number().optional(),
 		sourcePath: z.string().optional(),
+		source: SourceResidueSchema.optional(),
 		frames: z.array(LayoutFrameSchema).optional()
 	}),
 	z.object({
@@ -366,24 +812,29 @@ const ContentVectorSchema = z.discriminatedUnion("kind", [
 		rotationDeg: z.number().optional(),
 		subpaths: z.array(ContentSubpathSchema),
 		fill: ColorSchema.optional(),
+		fillPattern: ContentFillPatternSchema.optional(),
+		fillOpacity: z.number().min(0).max(1).optional(),
 		fillRule: z.enum(["nonzero", "evenodd"]).optional(),
 		stroke: ContentStrokeSchema.optional(),
 		paintOrder: z.number().optional(),
 		sourcePath: z.string().optional(),
+		source: SourceResidueSchema.optional(),
 		frames: z.array(LayoutFrameSchema).optional()
 	})
 ]);
 const ContentDrawPageSchema = z.object({
 	size: PageSizeSchema,
 	shapes: z.array(ContentShapeSchema),
-	vectors: z.array(ContentVectorSchema)
+	vectors: z.array(ContentVectorSchema),
+	source: SourceResidueSchema.optional()
 });
 const ContentFormulaSchema = z.object({
 	mathml: z.array(MathMlNodeSchema),
 	starMath: z.string().optional(),
 	presentation: MathPresentationSchema.optional(),
 	content: MathExpressionSchema.optional(),
-	provenance: MathProvenanceSchema.optional()
+	provenance: MathProvenanceSchema.optional(),
+	source: SourceResidueSchema.optional()
 });
 const contentDocumentSharedFields = { symbolTable: SymbolTableSchema.optional() };
 const ContentDocumentSchema = z.discriminatedUnion("kind", [
@@ -419,4 +870,4 @@ const ContentDocumentSchema = z.discriminatedUnion("kind", [
 	})
 ]);
 //#endregion
-export { ContentBlockSchema, ContentBorderSchema, ContentCellBordersSchema, ContentCellValueSchema, ContentConstructEndSchema, ContentConstructStartSchema, ContentDocumentSchema, ContentDrawPageSchema, ContentEmbeddedObjectBlockSchema, ContentEmbeddedObjectSchema, ContentFormulaSchema, ContentImageBlockSchema, ContentListMembershipSchema, ContentPageBreakSchema, ContentParagraphSchema, ContentPathPointSchema, ContentPathSegmentSchema, ContentRunSchema, ContentSectionSchema, ContentShapeSchema, ContentSheetCellCommentSchema, ContentSheetCellSchema, ContentSheetColumnSchema, ContentSheetImageSchema, ContentSheetPrintRangeSchema, ContentSheetPrintSettingsSchema, ContentSheetRepeatRangeSchema, ContentSheetRowSchema, ContentSheetSchema, ContentSlideSchema, ContentStrokeSchema, ContentStrokeStyleSchema, ContentSubpathSchema, ContentTableCellSchema, ContentTableRowSchema, ContentTableSchema, ContentVectorSchema, DecimalStringSchema, clampHeadingLevel, contentDocumentSharedFields, findConstructMarkerImbalance, isContentBlock, isContentConstructEnd, isContentConstructStart };
+export { ContentBitmapFillSchema, ContentBlockSchema, ContentBorderSchema, ContentCellBordersSchema, ContentCellFillSchema, ContentCellPatternTypeSchema, ContentCellValueSchema, ContentConstructEndSchema, ContentConstructStartSchema, ContentDocumentSchema, ContentDrawPageSchema, ContentEmbeddedObjectBlockSchema, ContentEmbeddedObjectSchema, ContentFillPatternSchema, ContentFloatAlignSchema, ContentFloatAxisSchema, ContentFloatOriginSchema, ContentFloatPositionSchema, ContentFormulaSchema, ContentGradientFillSchema, ContentGradientStyleSchema, ContentHatchFillSchema, ContentHatchStyleSchema, ContentImageBlockSchema, ContentListMembershipSchema, ContentPageBreakSchema, ContentPageFurnitureSchema, ContentParagraphBordersSchema, ContentParagraphSchema, ContentPathPointSchema, ContentPathSegmentSchema, ContentRunSchema, ContentSectionSchema, ContentShapeSchema, ContentSheetCellCommentSchema, ContentSheetCellSchema, ContentSheetColumnSchema, ContentSheetConditionalFormatSchema, ContentSheetConditionalFormatStyleSchema, ContentSheetConditionalFormatValueSchema, ContentSheetDataValidationSchema, ContentSheetDataValidationTypeSchema, ContentSheetImageSchema, ContentSheetPrintRangeSchema, ContentSheetPrintSettingsSchema, ContentSheetRangeSchema, ContentSheetRepeatRangeSchema, ContentSheetRowSchema, ContentSheetSchema, ContentSlideSchema, ContentStrokeDashSchema, ContentStrokeSchema, ContentStrokeStyleSchema, ContentSubpathSchema, ContentTableCellSchema, ContentTableRowSchema, ContentTableSchema, ContentVectorSchema, DecimalStringSchema, RunConstructExtentSchema, SheetRuleOperatorSchema, clampHeadingLevel, contentDocumentSharedFields, findConstructMarkerImbalance, findRunConstructFault, isContentBlock, isContentConstructEnd, isContentConstructStart, isRunConstructExtent, resolveCellFillColor, unrecognizedFillKind };