cogsbox-shape 0.5.16 → 0.5.18

package/dist/schema.d.ts

@@ -1416,9 +1416,24 @@ export declare function reference<TTargetField extends SchemaField, TField exten
     type: "reference";
     to: () => TTargetField;
 };
+export declare function createMixedValidationSchema<T extends Schema<any>>(schema: T): z.ZodObject<any>;
+type InferMixedSchema<T extends Schema<any>> = {
+    [K in keyof T as K extends "_tableName" | "__schemaId" ? never : K]: T[K] extends {
+        zodClientSchema: infer C;
+        zodDbSchema: infer D;
+    } ? C extends z.ZodTypeAny ? D extends z.ZodTypeAny ? z.ZodUnion<[C, D]> : C : D extends z.ZodTypeAny ? D : never : T[K] extends () => {
+        type: "hasMany";
+        schema: infer S extends Schema<any>;
+    } ? z.ZodArray<z.ZodObject<InferMixedSchema<S>>> : T[K] extends () => {
+        type: "hasOne" | "belongsTo";
+        schema: infer S extends Schema<any>;
+    } ? z.ZodObject<InferMixedSchema<S>> : never;
+};
+type ConversionType<T extends Schema<any>> = SchemaTypes<T>["client"] & SchemaTypes<T>["db"];
 export declare function createSchema<T extends Schema<any>>(schema: T): {
     dbSchema: z.ZodObject<Prettify<InferDBSchema<T>>>;
     clientSchema: z.ZodObject<Prettify<OmitNever<InferSchema<T>>>>;
+    mixedSchema: z.ZodObject<Prettify<InferMixedSchema<T>>>;
     defaultValues: Prettify<OmitNever<ConfigWithOptionalProps<T>>>;
     initialValues: () => Prettify<OmitNever<ConfigWithOptionalProps<T>>>;
     serialized: Prettify<InferSerializedSchema<T>> & {
@@ -1426,10 +1441,6 @@ export declare function createSchema<T extends Schema<any>>(schema: T): {
         __schemaId: string;
     };
 };
-type DeepConversionType<ClientType, DbType> = ClientType extends Date | string | number | boolean | null | undefined ? ClientType | DbType : DbType extends Date | string | number | boolean | null | undefined ? ClientType | DbType : ClientType extends Array<infer ClientItem> ? DbType extends Array<infer DbItem> ? Array<DeepConversionType<ClientItem, DbItem>> : ClientType | DbType : ClientType extends object ? DbType extends object ? {
-    [K in keyof ClientType | keyof DbType]: K extends keyof ClientType ? K extends keyof DbType ? DeepConversionType<ClientType[K], DbType[K]> : ClientType[K] : K extends keyof DbType ? DbType[K] : never;
-} : ClientType | DbType : ClientType | DbType;
-type ConversionType<T extends Schema<any>> = DeepConversionType<SchemaTypes<T>["client"], SchemaTypes<T>["db"]>;
 type OmitNever<T> = {
     [K in keyof T as T[K] extends never ? never : K]: T[K];
 };

package/dist/schema.js

@@ -391,6 +391,29 @@ function createSerializableSchema(schema) {
     }
     return serializableSchema;
 }
+export function createMixedValidationSchema(schema) {
+    const { clientSchema, dbSchema } = createSchema(schema);
+    // Create a schema that accepts either client or db format for each field
+    const mixedFields = {};
+    // Get all unique keys from both schemas
+    const allKeys = new Set([
+        ...Object.keys(clientSchema.shape),
+        ...Object.keys(dbSchema.shape),
+    ]);
+    for (const key of allKeys) {
+        const clientField = clientSchema.shape[key];
+        const dbField = dbSchema.shape[key];
+        if (clientField && dbField) {
+            // If field exists in both, allow either type
+            mixedFields[key] = z.union([clientField, dbField]);
+        }
+        else {
+            // If field only exists in one, use that type
+            mixedFields[key] = clientField || dbField;
+        }
+    }
+    return z.object(mixedFields);
+}
 export function createSchema(schema) {
     const serialized = createSerializableSchema(schema);
     const dbFields = {};
@@ -444,9 +467,11 @@ export function createSchema(schema) {
         defaultValues[key] =
             value.defaultValue ?? inferDefaultFromZod(value.zodClientSchema);
     }
+    const mixedSchema = createMixedValidationSchema(schema);
     return {
         dbSchema: z.object(dbFields),
         clientSchema: z.object(clientFields),
+        mixedSchema: mixedSchema,
         defaultValues: defaultValues,
         initialValues: () => defaultValues,
         serialized: serialized,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "cogsbox-shape",
-    "version": "0.5.16",
+    "version": "0.5.18",
     "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",