document-content-model 1.1.0 → 1.2.0

package/dist/index.js

@@ -152,6 +152,15 @@ function isContentTableCell(value) {
 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";
+}
+function isContentEmbeddedObject(value) {
+	return isRecord(value) && isContentEmbeddedObjectKind(value.objectKind) && BoxSchema.safeParse(value.frame).success && ContentDocumentSchema.safeParse(value.document).success;
+}
+function isContentEmbeddedObjectBlock(value) {
+	return isRecord(value) && value.kind === "embeddedObject" && isContentEmbeddedObject(value);
+}
 function isContentBlock(value) {
 	if (!isRecord(value)) return false;
 	const kind = value.kind;
@@ -159,9 +168,12 @@ function isContentBlock(value) {
 	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");
+	if (kind === "embeddedObject") return isContentEmbeddedObject(value);
 	return false;
 }
 const ContentBlockSchema = z.custom(isContentBlock);
+const ContentEmbeddedObjectSchema = z.custom(isContentEmbeddedObject);
+const ContentEmbeddedObjectBlockSchema = z.custom(isContentEmbeddedObjectBlock);
 const ContentTableCellSchema = z.object({
 	blocks: z.array(ContentBlockSchema),
 	colSpan: z.number().int().positive().optional(),
@@ -201,18 +213,192 @@ const ContentSlideSchema = z.object({
 	shapes: z.array(ContentShapeSchema),
 	notes: z.string()
 });
-const CONTENT_FORMAT_VERSION = 1;
-const ContentDocumentSchema = z.discriminatedUnion("kind", [z.object({
-	kind: z.literal("wordprocessing"),
-	formatVersion: z.literal(1),
-	metadata: LayoutMetadataSchema,
-	sections: z.array(ContentSectionSchema)
+const ContentCellValueSchema = z.discriminatedUnion("kind", [
+	z.object({
+		kind: z.literal("number"),
+		value: z.number()
+	}),
+	z.object({
+		kind: z.literal("percentage"),
+		value: z.number()
+	}),
+	z.object({
+		kind: z.literal("currency"),
+		value: z.number(),
+		currency: z.string().optional()
+	}),
+	z.object({
+		kind: z.literal("boolean"),
+		value: z.boolean()
+	}),
+	z.object({
+		kind: z.literal("date"),
+		value: z.string()
+	}),
+	z.object({
+		kind: z.literal("time"),
+		value: z.string()
+	}),
+	z.object({
+		kind: z.literal("string"),
+		value: z.string()
+	}),
+	z.object({
+		kind: z.literal("error"),
+		value: z.string()
+	}),
+	z.object({ kind: z.literal("empty") })
+]);
+const ContentSheetCellSchema = z.object({
+	row: z.number().int().nonnegative(),
+	column: z.number().int().nonnegative(),
+	value: ContentCellValueSchema,
+	formula: z.string().optional(),
+	displayText: z.string(),
+	runs: z.array(ContentRunSchema).optional(),
+	colSpan: z.number().int().positive().optional(),
+	rowSpan: z.number().int().positive().optional()
+});
+const ContentSheetColumnSchema = z.object({
+	index: z.number().int().nonnegative(),
+	widthPt: z.number().nonnegative(),
+	hidden: z.boolean().optional()
+});
+const ContentSheetRowSchema = z.object({
+	index: z.number().int().nonnegative(),
+	heightPt: z.number().nonnegative(),
+	hidden: z.boolean().optional()
+});
+const ContentSheetPrintRangeSchema = z.object({
+	startRow: z.number().int().nonnegative(),
+	startColumn: z.number().int().nonnegative(),
+	endRow: z.number().int().nonnegative(),
+	endColumn: z.number().int().nonnegative()
+});
+const ContentSheetRepeatRangeSchema = z.object({
+	start: z.number().int().nonnegative(),
+	end: z.number().int().nonnegative()
+});
+const ContentSheetPrintSettingsSchema = z.object({
+	pageSize: PageSizeSchema,
+	margins: MarginsSchema,
+	printRange: ContentSheetPrintRangeSchema.optional(),
+	scale: z.number().positive().optional(),
+	fitToPages: z.object({
+		width: z.number().int().positive(),
+		height: z.number().int().positive()
+	}).optional(),
+	repeatRows: ContentSheetRepeatRangeSchema.optional(),
+	repeatColumns: ContentSheetRepeatRangeSchema.optional(),
+	gridlines: z.boolean(),
+	headers: z.boolean(),
+	pageOrder: z.enum(["downThenOver", "overThenDown"]),
+	manualBreaks: z.object({
+		rows: z.array(z.number().int().nonnegative()),
+		columns: z.array(z.number().int().nonnegative())
+	}).optional()
+});
+const ContentSheetImageSchema = ContentImageBlockSchema.extend({
+	anchorRow: z.number().int().nonnegative(),
+	anchorColumn: z.number().int().nonnegative(),
+	offsetXPt: z.number(),
+	offsetYPt: z.number()
+});
+const ContentSheetSchema = z.object({
+	name: z.string(),
+	cells: z.array(ContentSheetCellSchema),
+	columns: z.array(ContentSheetColumnSchema),
+	rows: z.array(ContentSheetRowSchema),
+	images: z.array(ContentSheetImageSchema),
+	printSettings: ContentSheetPrintSettingsSchema,
+	embeddedObjects: z.array(ContentEmbeddedObjectSchema).optional()
+});
+const ContentStrokeSchema = z.object({
+	color: ColorSchema,
+	widthPt: z.number().positive()
+});
+const ContentPathPointSchema = z.object({
+	xPt: z.number(),
+	yPt: z.number()
+});
+const ContentPathSegmentSchema = z.discriminatedUnion("kind", [z.object({
+	kind: z.literal("line"),
+	to: ContentPathPointSchema
 }), z.object({
-	kind: z.literal("presentation"),
-	formatVersion: z.literal(1),
-	metadata: LayoutMetadataSchema,
-	slides: z.array(ContentSlideSchema)
+	kind: z.literal("cubic"),
+	control1: ContentPathPointSchema,
+	control2: ContentPathPointSchema,
+	to: ContentPathPointSchema
 })]);
+const ContentSubpathSchema = z.object({
+	start: ContentPathPointSchema,
+	segments: z.array(ContentPathSegmentSchema),
+	closed: z.boolean()
+});
+const ContentVectorSchema = z.discriminatedUnion("kind", [
+	z.object({
+		kind: z.literal("rect"),
+		frame: BoxSchema,
+		fill: ColorSchema.optional(),
+		stroke: ContentStrokeSchema.optional(),
+		sourcePath: z.string().optional()
+	}),
+	z.object({
+		kind: z.literal("ellipse"),
+		frame: BoxSchema,
+		fill: ColorSchema.optional(),
+		stroke: ContentStrokeSchema.optional(),
+		sourcePath: z.string().optional()
+	}),
+	z.object({
+		kind: z.literal("line"),
+		from: ContentPathPointSchema,
+		to: ContentPathPointSchema,
+		stroke: ContentStrokeSchema,
+		sourcePath: z.string().optional()
+	}),
+	z.object({
+		kind: z.literal("path"),
+		frame: BoxSchema,
+		subpaths: z.array(ContentSubpathSchema),
+		fill: ColorSchema.optional(),
+		fillRule: z.enum(["nonzero", "evenodd"]).optional(),
+		stroke: ContentStrokeSchema.optional(),
+		sourcePath: z.string().optional()
+	})
+]);
+const ContentDrawPageSchema = z.object({
+	size: PageSizeSchema,
+	shapes: z.array(ContentShapeSchema),
+	vectors: z.array(ContentVectorSchema)
+});
+const CONTENT_FORMAT_VERSION = 1;
+const ContentDocumentSchema = z.discriminatedUnion("kind", [
+	z.object({
+		kind: z.literal("wordprocessing"),
+		formatVersion: z.literal(1),
+		metadata: LayoutMetadataSchema,
+		sections: z.array(ContentSectionSchema)
+	}),
+	z.object({
+		kind: z.literal("presentation"),
+		formatVersion: z.literal(1),
+		metadata: LayoutMetadataSchema,
+		slides: z.array(ContentSlideSchema)
+	}),
+	z.object({
+		kind: z.literal("spreadsheet"),
+		formatVersion: z.literal(1),
+		metadata: LayoutMetadataSchema,
+		sheets: z.array(ContentSheetSchema)
+	}),
+	z.object({
+		kind: z.literal("drawing"),
+		formatVersion: z.literal(1),
+		metadata: LayoutMetadataSchema,
+		pages: z.array(ContentDrawPageSchema)
+	})
+]);
 //#endregion
 //#region src/layout.ts
 const LAYOUT_FORMAT_VERSION = 1;
@@ -311,4 +497,4 @@ const LayoutDocumentSchema = z.object({
 	images: z.record(z.string(), LayoutImageAssetSchema)
 });
 //#endregion
-export { AlignmentSchema, BoxSchema, COLOR_BLACK, CONTENT_FORMAT_VERSION, ColorSchema, ContentBlockSchema, ContentDocumentSchema, ContentImageBlockSchema, ContentListMembershipSchema, ContentPageBreakSchema, ContentParagraphSchema, ContentRunSchema, ContentSectionSchema, ContentShapeSchema, ContentSlideSchema, ContentTableCellSchema, ContentTableRowSchema, ContentTableSchema, DEFAULT_LAYOUT_FONT, LAYOUT_FORMAT_VERSION, LayoutDocumentSchema, LayoutEllipseSchema, LayoutFontSchema, LayoutImageAssetSchema, LayoutImageSchema, LayoutItemSchema, LayoutLineSchema, LayoutLinkSchema, LayoutMetadataSchema, LayoutPageSchema, LayoutRectSchema, LayoutTextSchema, MarginsSchema, PAGE_SIZE_A4, PAGE_SIZE_LETTER, PageSizeSchema, SLIDE_SIZE_STANDARD, SLIDE_SIZE_WIDESCREEN, colorToRgbHex, isContentBlock, rgbHexToColor };
+export { AlignmentSchema, BoxSchema, COLOR_BLACK, CONTENT_FORMAT_VERSION, ColorSchema, ContentBlockSchema, ContentCellValueSchema, ContentDocumentSchema, ContentDrawPageSchema, ContentEmbeddedObjectBlockSchema, ContentEmbeddedObjectSchema, ContentImageBlockSchema, ContentListMembershipSchema, ContentPageBreakSchema, ContentParagraphSchema, ContentPathPointSchema, ContentPathSegmentSchema, ContentRunSchema, ContentSectionSchema, ContentShapeSchema, ContentSheetCellSchema, ContentSheetColumnSchema, ContentSheetImageSchema, ContentSheetPrintRangeSchema, ContentSheetPrintSettingsSchema, ContentSheetRepeatRangeSchema, ContentSheetRowSchema, ContentSheetSchema, ContentSlideSchema, ContentStrokeSchema, ContentSubpathSchema, ContentTableCellSchema, ContentTableRowSchema, ContentTableSchema, ContentVectorSchema, DEFAULT_LAYOUT_FONT, LAYOUT_FORMAT_VERSION, LayoutDocumentSchema, LayoutEllipseSchema, LayoutFontSchema, LayoutImageAssetSchema, LayoutImageSchema, LayoutItemSchema, LayoutLineSchema, LayoutLinkSchema, LayoutMetadataSchema, LayoutPageSchema, LayoutRectSchema, LayoutTextSchema, MarginsSchema, PAGE_SIZE_A4, PAGE_SIZE_LETTER, PageSizeSchema, SLIDE_SIZE_STANDARD, SLIDE_SIZE_WIDESCREEN, colorToRgbHex, isContentBlock, rgbHexToColor };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "document-content-model",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "The canonical, format-agnostic content and layout schemas shared by ooxml.js, odf.js, and documents.js -- pure Zod schemas, no behaviour.",
   "type": "module",
   "repository": {