cogsbox-shape 0.5.132 → 0.5.134

package/dist/schema.d.ts

@@ -36,11 +36,10 @@ type SQLToZodType<T extends SQLType, TDefault extends boolean> = T["pk"] extends
     default: "CURRENT_TIMESTAMP";
 } ? TDefault extends true ? never : z.ZodDate : z.ZodDate : never;
 type ZodTypeFromPrimitive<T> = T extends string ? z.ZodString : T extends number ? z.ZodNumber : T extends boolean ? z.ZodBoolean : T extends Date ? z.ZodDate : z.ZodAny;
-type NonLiteral<T> = T extends string ? string : T extends number ? number : T extends boolean ? boolean : T;
 type CollapsedUnion<A extends z.ZodTypeAny, B extends z.ZodTypeAny> = A extends B ? (B extends A ? A : z.ZodUnion<[A, B]>) : z.ZodUnion<[A, B]>;
 export interface IBuilderMethods<T extends SQLType | RelationConfig<any>, TSql extends z.ZodTypeAny, TNew extends z.ZodTypeAny, TInitialValue, TClient extends z.ZodTypeAny, TValidation extends z.ZodTypeAny> {
     initialState: {
-        <TValue>(value: TValue extends (...args: any[]) => void | undefined ? never : TValue): TValue extends (...args: any[]) => infer R ? R extends void | undefined ? never : TValue extends z.ZodTypeAny ? Prettify<Builder<"new", T, TSql, TValue, z.infer<TValue>, CollapsedUnion<TSql, TValue>, CollapsedUnion<TSql, TValue>>> : Prettify<Builder<"new", T, TSql, ZodTypeFromPrimitive<R>, NonLiteral<R>, CollapsedUnion<TSql, ZodTypeFromPrimitive<R>>, CollapsedUnion<TSql, ZodTypeFromPrimitive<R>>>> : TValue extends z.ZodTypeAny ? Prettify<Builder<"new", T, TSql, TValue, z.infer<TValue>, CollapsedUnion<TSql, TValue>, CollapsedUnion<TSql, TValue>>> : Prettify<Builder<"new", T, TSql, ZodTypeFromPrimitive<TValue>, NonLiteral<TValue>, CollapsedUnion<TSql, ZodTypeFromPrimitive<TValue>>, CollapsedUnion<TSql, ZodTypeFromPrimitive<TValue>>>>;
+        <const TValue>(value: TValue extends (...args: any[]) => void | undefined ? never : TValue): TValue extends (...args: any[]) => infer R ? R extends void | undefined ? never : TValue extends z.ZodTypeAny ? Prettify<Builder<"new", T, TSql, TValue, z.infer<TValue>, CollapsedUnion<TSql, TValue>, CollapsedUnion<TSql, TValue>>> : R extends string | number | boolean ? Prettify<Builder<"new", T, TSql, ZodTypeFromPrimitive<R>, R, CollapsedUnion<TSql, ZodTypeFromPrimitive<R>>, CollapsedUnion<TSql, ZodTypeFromPrimitive<R>>>> : Prettify<Builder<"new", T, TSql, ZodTypeFromPrimitive<R>, R, CollapsedUnion<TSql, ZodTypeFromPrimitive<R>>, CollapsedUnion<TSql, ZodTypeFromPrimitive<R>>>> : TValue extends z.ZodTypeAny ? Prettify<Builder<"new", T, TSql, TValue, z.infer<TValue>, CollapsedUnion<TSql, TValue>, CollapsedUnion<TSql, TValue>>> : TValue extends string | number | boolean ? Prettify<Builder<"new", T, TSql, ZodTypeFromPrimitive<TValue>, TValue, CollapsedUnion<TSql, ZodTypeFromPrimitive<TValue>>, CollapsedUnion<TSql, ZodTypeFromPrimitive<TValue>>>> : Prettify<Builder<"new", T, TSql, ZodTypeFromPrimitive<TValue>, TValue, CollapsedUnion<TSql, ZodTypeFromPrimitive<TValue>>, CollapsedUnion<TSql, ZodTypeFromPrimitive<TValue>>>>;
         <const TValue, TSchema extends z.ZodTypeAny>(value: TValue extends (...args: any[]) => void | undefined ? never : TValue, schema: TSchema): Prettify<Builder<"new", T, TSql, TSchema, TValue extends () => infer R ? R : TValue, CollapsedUnion<TSql, TSchema>, CollapsedUnion<TSql, TSchema>>>;
         <const TValue, TSchema extends z.ZodTypeAny>(value: TValue extends (...args: any[]) => void | undefined ? never : TValue, schemaModifier: (baseSchema: TValue extends () => infer R ? R extends string | number | boolean ? z.ZodLiteral<R> : ZodTypeFromPrimitive<R> : TValue extends string | number | boolean ? z.ZodLiteral<TValue> : ZodTypeFromPrimitive<TValue>) => TSchema): Prettify<Builder<"new", T, TSql, TSchema, TValue extends () => infer R ? R : TValue, CollapsedUnion<TSql, TSchema>, CollapsedUnion<TSql, TSchema>>>;
     };
@@ -289,15 +288,8 @@ type _DeriveViewShape<TTableName extends keyof TRegistry, TSelection, TRegistry
         1
     ]>>> : never : never : never;
 }> : OmitRelationFields<BaseShape, TRegistry[TTableName]["rawSchema"]> : never;
-type SQLTypeToTS<T extends SQLType> = T["pk"] extends true ? number : T["type"] extends "varchar" | "char" | "text" | "longtext" ? string : T["type"] extends "int" ? number : T["type"] extends "boolean" ? boolean : T["type"] extends "date" | "datetime" | "timestamp" ? Date : never;
-type DeriveViewDefaults<TTableName extends keyof TRegistry, TSelection, TRegistry extends RegistryShape, Depth extends any[] = []> = Prettify<{
-    [K in keyof TRegistry[TTableName]["rawSchema"] as K extends "_tableName" ? never : K]: TRegistry[TTableName]["rawSchema"][K] extends {
-        config: {
-            sql: infer TSql extends SQLType;
-        };
-    } ? TSql["nullable"] extends true ? SQLTypeToTS<TSql> | null : SQLTypeToTS<TSql> : never;
-} & (TSelection extends Record<string, any> ? {
-    [K in keyof TSelection & keyof TRegistry[TTableName]["rawSchema"]]?: TRegistry[TTableName]["rawSchema"][K] extends {
+type DeriveViewDefaults<TTableName extends keyof TRegistry, TSelection, TRegistry extends RegistryShape, Depth extends any[] = []> = Prettify<TRegistry[TTableName]["zodSchemas"]["defaultValues"] & (TSelection extends Record<string, any> ? {
+    -readonly [K in keyof TSelection & keyof TRegistry[TTableName]["rawSchema"]]?: TRegistry[TTableName]["rawSchema"][K] extends {
         config: {
             sql: {
                 type: infer RelType;

package/dist/schema.js

@@ -135,11 +135,13 @@ function createBuilder(config) {
             let finalSchema;
             // Check if value is a Zod schema (single argument case)
             if (value && typeof value === "object" && "_def" in value) {
+                // It's a Zod schema - infer the default value
                 baseSchema = value;
                 actualValue = inferDefaultFromZod(baseSchema, config.sqlConfig);
                 finalSchema = baseSchema;
             }
             else {
+                // Get the actual value
                 actualValue = isFunction(value) ? value() : value;
                 // If second parameter is provided and is a Zod schema, use it directly
                 if (schemaOrModifier &&
@@ -148,13 +150,56 @@ function createBuilder(config) {
                     finalSchema = schemaOrModifier;
                 }
                 else if (isFunction(schemaOrModifier)) {
-                    // Create base Zod schema from SQLType instead of value type
-                    baseSchema = config.sqlZod;
+                    // It's a schema modifier function
+                    // Create base Zod schema from the value type
+                    if (typeof actualValue === "string") {
+                        baseSchema = z.string();
+                    }
+                    else if (typeof actualValue === "number") {
+                        baseSchema = z.number();
+                    }
+                    else if (typeof actualValue === "boolean") {
+                        baseSchema = z.boolean();
+                    }
+                    else if (actualValue instanceof Date) {
+                        baseSchema = z.date();
+                    }
+                    else if (actualValue === null) {
+                        baseSchema = z.null();
+                    }
+                    else if (actualValue === undefined) {
+                        baseSchema = z.undefined();
+                    }
+                    else {
+                        baseSchema = z.any();
+                    }
+                    // Apply the modifier
                     finalSchema = schemaOrModifier(baseSchema);
                 }
                 else {
-                    // No schema provided, use the SQL type's schema
-                    finalSchema = config.sqlZod;
+                    // No schema provided, create from value type
+                    if (typeof actualValue === "string") {
+                        baseSchema = z.string();
+                    }
+                    else if (typeof actualValue === "number") {
+                        baseSchema = z.number();
+                    }
+                    else if (typeof actualValue === "boolean") {
+                        baseSchema = z.boolean();
+                    }
+                    else if (actualValue instanceof Date) {
+                        baseSchema = z.date();
+                    }
+                    else if (actualValue === null) {
+                        baseSchema = z.null();
+                    }
+                    else if (actualValue === undefined) {
+                        baseSchema = z.undefined();
+                    }
+                    else {
+                        baseSchema = z.any();
+                    }
+                    finalSchema = baseSchema;
                 }
             }
             const newCompletedStages = new Set(completedStages);

package/package.json

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