cogsbox-shape 0.5.194 → 0.5.195

package/dist/schema.js

@@ -723,9 +723,10 @@ export function createSchema(schema, relations) {
         });
     }
     let refinedClientInputSchema = finalClientInputSchema;
+    let refinedClientSchema = finalClientSchema;
     if (refinements?.client) {
         const clientRefine = refinements.client;
-        refinedClientInputSchema = finalClientInputSchema.superRefine((data, ctx) => {
+        const refineFn = (data, ctx) => {
             const result = clientRefine(data);
             if (!result)
                 return;
@@ -737,6 +738,25 @@ export function createSchema(schema, relations) {
                     path: err.path,
                 });
             }
+        };
+        refinedClientInputSchema = finalClientInputSchema.superRefine(refineFn);
+        refinedClientSchema = finalClientSchema.superRefine(refineFn);
+    }
+    let refinedSqlSchema = finalSqlSchema;
+    if (refinements?.server) {
+        const serverRefine = refinements.server;
+        refinedSqlSchema = finalSqlSchema.superRefine((data, ctx) => {
+            const result = serverRefine(data);
+            if (!result)
+                return;
+            const errors = Array.isArray(result) ? result : [result];
+            for (const err of errors) {
+                ctx.addIssue({
+                    code: z.ZodIssueCode.custom,
+                    message: err.message,
+                    path: err.path,
+                });
+            }
         });
     }
     return {
@@ -745,9 +765,9 @@ export function createSchema(schema, relations) {
         deriveDependencies,
         refineDependencies,
         isClientRecord,
-        sqlSchema: finalSqlSchema,
+        sqlSchema: refinedSqlSchema,
         clientInputSchema: refinedClientInputSchema,
-        clientSchema: finalClientSchema,
+        clientSchema: refinedClientSchema,
         serverSchema: refinedValidationSchema,
         defaultValues: defaultValues,
         stateType: {},
@@ -763,7 +783,7 @@ export function createSchema(schema, relations) {
             return toDb(validPatch);
         },
         parseFromDb: (dbData) => {
-            const parsed = finalSqlSchema.parse(dbData);
+            const parsed = refinedSqlSchema.parse(dbData);
             return toClient(parsed);
         },
     };

package/dist/vitest/refineRuntime.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/vitest/refineRuntime.test.js

@@ -0,0 +1,88 @@
+import { describe, it, expect } from "vitest";
+import z from "zod";
+import { s, schema, createSchemaBox } from "../schema.js";
+describe("refine runtime behavior", () => {
+    function makeRefinedBox() {
+        const rules = schema({
+            _tableName: "rules",
+            id: s.sqlite({ type: "int", pk: true }),
+            min: s.sqlite({ type: "int", nullable: true }).clientInput({ value: null, schema: z.number().nullable() }),
+            max: s.sqlite({ type: "int", nullable: true }).clientInput({ value: null, schema: z.number().nullable() }),
+            label: s.sqlite({ type: "varchar" }).clientInput({ value: "" }),
+        }).refine({
+            client: (row) => {
+                if (row.min !== null && row.max !== null && row.min >= row.max) {
+                    return { path: ["max"], message: "Max must be > min" };
+                }
+                return undefined;
+            },
+            server: (row) => {
+                if (row.min !== null && row.max !== null && row.min >= row.max) {
+                    return { path: ["max"], message: "Max must be > min" };
+                }
+                if (!row.label) {
+                    return { path: ["label"], message: "Label required" };
+                }
+                return undefined;
+            },
+        });
+        return createSchemaBox({ rules }, { rules: {} });
+    }
+    it("schemas.clientInput catches client refine", () => {
+        const box = makeRefinedBox();
+        const good = box.rules.schemas.clientInput.safeParse({ id: 1, min: 1, max: 10, label: "x" });
+        expect(good.success).toBe(true);
+        const bad = box.rules.schemas.clientInput.safeParse({ id: 1, min: 10, max: 1, label: "x" });
+        expect(bad.success).toBe(false);
+        if (!bad.success) {
+            expect(bad.error.issues[0].message).toBe("Max must be > min");
+        }
+    });
+    it("schemas.client catches client refine", () => {
+        const box = makeRefinedBox();
+        const bad = box.rules.schemas.client.safeParse({ id: 1, min: 10, max: 1, label: "x" });
+        expect(bad.success).toBe(false);
+        if (!bad.success) {
+            expect(bad.error.issues[0].message).toBe("Max must be > min");
+        }
+    });
+    it("schemas.server catches server refine", () => {
+        const box = makeRefinedBox();
+        const bad = box.rules.schemas.server.safeParse({ id: 1, min: 1, max: 10, label: "" });
+        expect(bad.success).toBe(false);
+        if (!bad.success) {
+            expect(bad.error.issues[0].message).toBe("Label required");
+        }
+    });
+    it("schemas.sql catches server refine", () => {
+        const box = makeRefinedBox();
+        const bad = box.rules.schemas.sql.safeParse({ id: 1, min: 1, max: 10, label: "" });
+        expect(bad.success).toBe(false);
+        if (!bad.success) {
+            expect(bad.error.issues[0].message).toBe("Label required");
+        }
+    });
+    it("parseForDb rejects invalid data via server refine", () => {
+        const box = makeRefinedBox();
+        expect(() => box.rules.transforms.parseForDb({ id: 1, min: 10, max: 1, label: "" })).toThrow();
+    });
+    it("parseFromDb rejects invalid DB data via server refine", () => {
+        const box = makeRefinedBox();
+        expect(() => box.rules.transforms.parseFromDb({ id: 1, min: 1, max: 10, label: "" })).toThrow("Label required");
+    });
+    it("parsePatchForDb does NOT run refine (uses partial base)", () => {
+        const box = makeRefinedBox();
+        expect(() => box.rules.transforms.parsePatchForDb({ min: 10, max: 1 })).not.toThrow();
+    });
+    it("unrefined box has no refine on any schema", () => {
+        const rules = schema({
+            _tableName: "rules",
+            id: s.sqlite({ type: "int", pk: true }),
+            min: s.sqlite({ type: "int", nullable: true }).clientInput({ value: null, schema: z.number().nullable() }),
+            max: s.sqlite({ type: "int", nullable: true }).clientInput({ value: null, schema: z.number().nullable() }),
+        });
+        const box = createSchemaBox({ rules }, { rules: {} });
+        const good = box.rules.schemas.clientInput.safeParse({ id: 1, min: 10, max: 1 });
+        expect(good.success).toBe(true);
+    });
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cogsbox-shape",
-  "version": "0.5.194",
+  "version": "0.5.195",
   "description": "A TypeScript library for creating type-safe database schemas with Zod validation, SQL type definitions, and automatic client/server transformations. Unifies client, server, and database types through a single schema definition, with built-in support for relationships and serialization.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",