cogsbox-shape 0.5.160 → 0.5.162

package/dist/schema.d.ts

@@ -218,6 +218,7 @@ export declare function createSchema<T extends {
     clientSchema: z.ZodObject<Prettify<DeriveSchemaByKey<TActualSchema, "zodClientSchema">>>;
     validationSchema: z.ZodObject<Prettify<DeriveSchemaByKey<TActualSchema, "zodValidationSchema">>>;
     defaultValues: Prettify<DeriveDefaults<TActualSchema>>;
+    stateType: Prettify<DeriveStateType<TActualSchema>>;
     generateDefaults: () => Prettify<DeriveDefaults<TActualSchema>>;
     toClient: (dbObject: z.infer<z.ZodObject<Prettify<DeriveSchemaByKey<TActualSchema, "zodSqlSchema">>>>) => z.infer<z.ZodObject<Prettify<DeriveSchemaByKey<TActualSchema, "zodClientSchema">>>>;
     toDb: (clientObject: z.infer<z.ZodObject<Prettify<DeriveSchemaByKey<TActualSchema, "zodClientSchema">>>>) => z.infer<z.ZodObject<Prettify<DeriveSchemaByKey<TActualSchema, "zodSqlSchema">>>>;
@@ -285,6 +286,7 @@ type ResolvedRegistryWithSchemas<S extends Record<string, SchemaWithPlaceholders
             clientSchema: z.ZodObject<Prettify<DeriveSchemaByKey<ResolveSchema<S[K], K extends keyof R ? (R[K] extends object ? R[K] : {}) : {}>, "zodClientSchema">>>;
             validationSchema: z.ZodObject<Prettify<DeriveSchemaByKey<ResolveSchema<S[K], K extends keyof R ? (R[K] extends object ? R[K] : {}) : {}>, "zodValidationSchema">>>;
             defaultValues: Prettify<DeriveDefaults<ResolveSchema<S[K], K extends keyof R ? (R[K] extends object ? R[K] : {}) : {}>>>;
+            stateType: Prettify<DeriveStateType<ResolveSchema<S[K], K extends keyof R ? (R[K] extends object ? R[K] : {}) : {}>>>;
             toClient: (dbObject: any) => any;
             toDb: (clientObject: any) => any;
         };
@@ -390,6 +392,7 @@ type RegistryShape = Record<string, {
         clientSchema: z.ZodObject<any>;
         validationSchema: z.ZodObject<any>;
         defaultValues: any;
+        stateType: any;
         toClient: (dbObject: any) => any;
         toDb: (clientObject: any) => any;
     };
@@ -408,6 +411,7 @@ type CreateSchemaBoxReturn<S extends Record<string, SchemaWithPlaceholders>, R e
             toDb: Resolved[K]["zodSchemas"]["toDb"];
         };
         defaults: Resolved[K]["zodSchemas"]["defaultValues"];
+        stateType: Resolved[K]["zodSchemas"]["stateType"];
         nav: NavigationProxy<K & string, Resolved>;
         RelationSelection: NavigationToSelection<NavigationProxy<K & string, Resolved>>;
         createView: <const TSelection extends NavigationToSelection<NavigationProxy<K & string, Resolved>>>(selection: TSelection) => DeriveViewResult<K & string, TSelection, Resolved>;
@@ -468,4 +472,21 @@ type DeriveDefaults<T, Depth extends any[] = []> = Prettify<Depth["length"] exte
         };
     } ? TNew extends TSql ? z.infer<TClient> : D extends () => infer R ? R : D : never;
 }>;
+type DeriveStateType<T, Depth extends any[] = []> = Prettify<Depth["length"] extends 10 ? any : {
+    [K in keyof T as K extends "_tableName" | typeof SchemaWrapperBrand | "__primaryKeySQL" | "__isClientChecker" | "primaryKeySQL" | "isClient" ? never : K extends keyof T ? T[K] extends Reference<any> ? K : T[K] extends {
+        config: {
+            sql: {
+                type: "hasMany" | "manyToMany" | "hasOne" | "belongsTo";
+            };
+        };
+    } ? never : K : never]: T[K] extends Reference<infer TGetter> ? ReturnType<TGetter> extends {
+        config: {
+            zodClientSchema: infer TClient extends z.ZodTypeAny;
+        };
+    } ? z.infer<TClient> : never : T[K] extends {
+        config: {
+            zodClientSchema: infer TClient extends z.ZodTypeAny;
+        };
+    } ? z.infer<TClient> : never;
+}>;
 export {};

package/dist/schema.js

@@ -171,16 +171,25 @@ function createBuilder(config) {
             }
             const newCompletedStages = new Set(completedStages);
             newCompletedStages.add("new");
-            // Create union of the SQL type and the new client type
-            const hasProvidedSchema = !!schemaOrModifier;
-            const clientAndServerSchema = hasProvidedSchema
-                ? finalSchema
-                : z.union([config.sqlZod, finalSchema]);
             const newConfig = { ...config.sqlConfig };
             if (clientPk) {
-                // Add our metadata flag to the config
                 newConfig.isClientPk = true;
             }
+            // When clientPk is true, ALWAYS union the SQL type with the client type
+            // because records can be either DB-sourced (number) or client-created (string)
+            let clientAndServerSchema;
+            if (clientPk) {
+                // Always union for clientPk fields
+                clientAndServerSchema = z.union([config.sqlZod, finalSchema]);
+            }
+            else if (schemaOrModifier) {
+                // Schema provided without clientPk — use as-is
+                clientAndServerSchema = finalSchema;
+            }
+            else {
+                // No schema provided — union with SQL type
+                clientAndServerSchema = z.union([config.sqlZod, finalSchema]);
+            }
             return createBuilder({
                 ...config,
                 stage: "new",
@@ -188,7 +197,7 @@ function createBuilder(config) {
                 newZod: finalSchema,
                 initialValue: actualValue,
                 clientZod: clientAndServerSchema,
-                validationZod: clientAndServerSchema, // Our internal name
+                validationZod: clientAndServerSchema,
                 completedStages: newCompletedStages,
             });
         },
@@ -587,6 +596,7 @@ export function createSchema(schema, relations) {
         clientSchema: z.object(clientFields),
         validationSchema: z.object(serverFields),
         defaultValues: defaultValues,
+        stateType: {},
         generateDefaults,
         toClient,
         toDb,
@@ -792,6 +802,7 @@ export function createSchemaBox(schemas, resolver) {
                 toDb: entry.zodSchemas.toDb,
             },
             defaults: entry.zodSchemas.defaultValues,
+            stateType: entry.zodSchemas.stateType,
             generateDefaults: entry.zodSchemas.generateDefaults,
             // ADD: Expose PK info and resolver
             pk: entry.zodSchemas.pk,

package/package.json

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