cogsbox-shape 0.5.111 → 0.5.113

package/dist/schema.d.ts

@@ -274,7 +274,16 @@ type NavigationProxy<CurrentTable extends string, Registry extends RegistryShape
 type NavigationToSelection<Nav> = Nav extends object ? {
     [K in keyof Nav]?: boolean | NavigationToSelection<Nav[K]>;
 } : never;
-type BuildZodShape<TTableName extends keyof TRegistry, TSelection, TKey extends "clientSchema" | "validationSchema", TRegistry extends RegistryShape> = TRegistry[TTableName]["zodSchemas"][TKey] extends z.ZodObject<infer Base> ? TSelection extends Record<string, any> ? Omit<Base, keyof TSelection> & {
+type BuildZodShape<TTableName extends keyof TRegistry, TSelection, TKey extends "clientSchema" | "validationSchema", TRegistry extends RegistryShape> = TRegistry[TTableName]["zodSchemas"][TKey] extends z.ZodObject<infer Base> ? TSelection extends Record<string, any> ? // First get the base fields without relations
+{
+    [K in keyof Base as K extends keyof TRegistry[TTableName]["rawSchema"] ? TRegistry[TTableName]["rawSchema"][K] extends {
+        config: {
+            sql: {
+                schema: any;
+            };
+        };
+    } ? never : K : K]: Base[K];
+} & {
     [K in keyof TSelection & keyof TRegistry[TTableName]["rawSchema"]]: TRegistry[TTableName]["rawSchema"][K] extends {
         config: {
             sql: {
@@ -306,6 +315,25 @@ type RegistryShape = Record<string, {
         toDb: (clientObject: any) => any;
     };
 }>;
+type DeriveViewDefaults<TTableName extends keyof TRegistry, TSelection, TRegistry extends RegistryShape, Depth extends any[] = []> = Depth["length"] extends 10 ? any : // 1. Start with the base defaults for the table (id, name, etc.)
+DeriveDefaults<TRegistry[TTableName]["rawSchema"]> & (TSelection extends Record<string, any> ? {
+    -readonly [K in keyof TSelection & keyof TRegistry[TTableName]["rawSchema"]]?: TRegistry[TTableName]["rawSchema"][K] extends {
+        config: {
+            sql: {
+                type: infer RelType;
+                schema: () => infer S;
+            };
+        };
+    } ? S extends {
+        _tableName: infer Target;
+    } ? Target extends keyof TRegistry ? RelType extends "hasMany" | "manyToMany" ? DeriveViewDefaults<Target, TSelection[K], TRegistry, [
+        ...Depth,
+        1
+    ]>[] : DeriveViewDefaults<Target, TSelection[K], TRegistry, [
+        ...Depth,
+        1
+    ]> | null | undefined : never : never : never;
+} : {});
 type CreateSchemaBoxReturn<S extends Record<string, SchemaWithPlaceholders>, R extends ResolutionMap<S>, Resolved extends RegistryShape = ResolvedRegistryWithSchemas<S, R> extends RegistryShape ? ResolvedRegistryWithSchemas<S, R> : RegistryShape> = {
     [K in keyof Resolved]: {
         definition: Resolved[K]["rawSchema"];
@@ -325,7 +353,7 @@ type CreateSchemaBoxReturn<S extends Record<string, SchemaWithPlaceholders>, R e
             sql: Resolved[K]["zodSchemas"]["sqlSchema"];
             client: z.ZodObject<BuildZodShape<K, TSelection, "clientSchema", Resolved>>;
             validation: z.ZodObject<BuildZodShape<K, TSelection, "validationSchema", Resolved>>;
-            defaults: any;
+            defaults: Prettify<DeriveViewDefaults<K & string, TSelection, Resolved>>;
         };
     };
 };
@@ -380,15 +408,4 @@ type DeriveDefaults<T, Depth extends any[] = []> = Prettify<Depth["length"] exte
         };
     } ? D extends () => infer R ? R : D : never;
 }>;
-export type InferFromSchema<T extends {
-    _tableName: string;
-}> = Prettify<{
-    SqlSchema: z.ZodObject<Prettify<DeriveSchemaByKey<T, "zodSqlSchema">>>;
-    ClientSchema: z.ZodObject<Prettify<DeriveSchemaByKey<T, "zodClientSchema">>>;
-    ValidationSchema: z.ZodObject<Prettify<DeriveSchemaByKey<T, "zodValidationSchema">>>;
-    Sql: z.infer<z.ZodObject<Prettify<DeriveSchemaByKey<T, "zodSqlSchema">>>>;
-    Client: z.infer<z.ZodObject<Prettify<DeriveSchemaByKey<T, "zodClientSchema">>>>;
-    Validation: z.infer<z.ZodObject<Prettify<DeriveSchemaByKey<T, "zodValidationSchema">>>>;
-    Defaults: DeriveDefaults<T>;
-}>;
 export {};

package/package.json

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