fix: add validation, make layout optional, and add tests for HTML layout and watermark fields

Author: jdrhyne

src/schemas.ts

@@ -156,18 +156,18 @@ export const HTMLLayoutSchema = z
       .union([
         PageSizePresetSchema,
         z.object({
-          width: z.number().describe('Page width in millimeters.'),
-          height: z.number().describe('Page height in millimeters.'),
+          width: z.number().positive().describe('Page width in millimeters.'),
+          height: z.number().positive().describe('Page height in millimeters.'),
         }),
       ])
       .optional()
       .describe('Page size as a preset name (e.g. "A4", "Letter") or custom dimensions in millimeters.'),
     margin: z
       .object({
-        left: z.number().describe('Left margin in millimeters.'),
-        top: z.number().describe('Top margin in millimeters.'),
-        right: z.number().describe('Right margin in millimeters.'),
-        bottom: z.number().describe('Bottom margin in millimeters.'),
+        left: z.number().min(0).describe('Left margin in millimeters.'),
+        top: z.number().min(0).describe('Top margin in millimeters.'),
+        right: z.number().min(0).describe('Right margin in millimeters.'),
+        bottom: z.number().min(0).describe('Bottom margin in millimeters.'),
       })
       .optional()
       .describe('Page margins in millimeters.'),
@@ -186,7 +186,7 @@ export const FilePartSchema = z.object({
     .string()
     .optional()
     .describe("Used to determine the file type when the file content type is not available and can't be inferred."),
-  layout: HTMLLayoutSchema.describe(
+  layout: HTMLLayoutSchema.optional().describe(
     'Page layout options for HTML-to-PDF conversion. Only applies when the input is an HTML file. ' +
       'Supports orientation, page size, and margins.',
   ),
@@ -269,7 +269,7 @@ export const BaseWatermarkPropertiesSchema = z.object({
   bottom: WatermarkDimensionSchema.optional().describe('Offset of the watermark from the bottom edge of a page.'),
   left: WatermarkDimensionSchema.optional().describe('Offset of the watermark from the left edge of a page.'),
   fontFamily: z.string().optional().describe('The font family to use for text watermarks.'),
-  fontSize: z.number().optional().describe('Font size in points for text watermarks.'),
+  fontSize: z.number().positive().optional().describe('Font size in points for text watermarks.'),
   fontStyle: z
     .array(z.enum(['bold', 'italic']))
     .optional()

tests/unit.test.ts

@@ -1,7 +1,8 @@
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import fs, { Stats } from 'fs'
 import { Readable } from 'stream'
-import { Instructions, SignatureOptions } from '../src/schemas.js'
+import type { Instructions, SignatureOptions } from '../src/schemas.js'
+import { BaseWatermarkPropertiesSchema, FilePartSchema } from '../src/schemas.js'
 import { config as dotenvConfig } from 'dotenv'
 import { performBuildCall } from '../src/dws/build.js'
 import { performSignCall } from '../src/dws/sign.js'
@@ -39,6 +40,121 @@ function createMockStream(content: string | Buffer): Readable {
   return readable
 }
 
+describe('Schema validation', () => {
+  describe('HTMLLayoutSchema / FilePartSchema', () => {
+    it('accepts a valid layout with orientation, size, and margin', () => {
+      const result = FilePartSchema.safeParse({
+        file: '/test.html',
+        layout: {
+          orientation: 'portrait',
+          size: {
+            width: 210,
+            height: 297,
+          },
+          margin: {
+            left: 10,
+            top: 10,
+            right: 10,
+            bottom: 10,
+          },
+        },
+      })
+
+      expect(result.success).toBe(true)
+    })
+
+    it('allows omitting layout entirely', () => {
+      const result = FilePartSchema.safeParse({ file: '/test.html' })
+      expect(result.success).toBe(true)
+    })
+
+    it('rejects negative margins', () => {
+      const result = FilePartSchema.safeParse({
+        file: '/test.html',
+        layout: {
+          margin: {
+            left: -1,
+            top: 0,
+            right: 0,
+            bottom: 0,
+          },
+        },
+      })
+
+      expect(result.success).toBe(false)
+    })
+
+    it('rejects zero or negative custom page sizes', () => {
+      const zeroWidth = FilePartSchema.safeParse({
+        file: '/test.html',
+        layout: {
+          size: {
+            width: 0,
+            height: 100,
+          },
+        },
+      })
+
+      const negativeHeight = FilePartSchema.safeParse({
+        file: '/test.html',
+        layout: {
+          size: {
+            width: 100,
+            height: -1,
+          },
+        },
+      })
+
+      expect(zeroWidth.success).toBe(false)
+      expect(negativeHeight.success).toBe(false)
+    })
+  })
+
+  describe('Watermark positioning and font fields', () => {
+    it('accepts valid positioning and font fields', () => {
+      const result = BaseWatermarkPropertiesSchema.safeParse({
+        type: 'watermark',
+        watermarkType: 'text',
+        width: 100,
+        height: 50,
+        top: 10,
+        right: '5%',
+        bottom: 12,
+        left: 8,
+        text: 'DRAFT',
+        fontFamily: 'Helvetica',
+        fontSize: 12,
+        fontStyle: ['bold', 'italic'],
+      })
+
+      expect(result.success).toBe(true)
+    })
+
+    it('rejects invalid fontSize values (0 or negative)', () => {
+      const zero = BaseWatermarkPropertiesSchema.safeParse({
+        type: 'watermark',
+        watermarkType: 'text',
+        width: 100,
+        height: 50,
+        text: 'DRAFT',
+        fontSize: 0,
+      })
+
+      const negative = BaseWatermarkPropertiesSchema.safeParse({
+        type: 'watermark',
+        watermarkType: 'text',
+        width: 100,
+        height: 50,
+        text: 'DRAFT',
+        fontSize: -1,
+      })
+
+      expect(zero.success).toBe(false)
+      expect(negative.success).toBe(false)
+    })
+  })
+})
+
 describe('API Functions', () => {
   const originalEnv = process.env