cogsbox-shape 0.5.158 → 0.5.159

package/dist/schema.d.ts

@@ -40,7 +40,9 @@ type ZodTypeFromPrimitive<T> = T extends string ? z.ZodString : T extends number
 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 DbConfig, TSql extends z.ZodTypeAny, TNew extends z.ZodTypeAny, TInitialValue, TClient extends z.ZodTypeAny, TValidation extends z.ZodTypeAny> {
     initialState<const TValue>(options: {
-        value: TValue | (() => TValue);
+        value: TValue | ((tools: {
+            uuid: () => string;
+        }) => TValue);
         schema?: never;
         clientPk?: boolean;
     }): Prettify<Builder<"new", T, TSql, ZodTypeFromPrimitive<TValue extends () => infer R ? R : TValue>, TValue extends () => infer R ? R : TValue, CollapsedUnion<TSql, ZodTypeFromPrimitive<TValue extends () => infer R ? R : TValue>>, CollapsedUnion<TSql, ZodTypeFromPrimitive<TValue extends () => infer R ? R : TValue>>>>;
@@ -50,7 +52,9 @@ export interface IBuilderMethods<T extends DbConfig, TSql extends z.ZodTypeAny,
         clientPk?: boolean;
     }): Prettify<Builder<"new", T, TSql, TSchema, z.infer<TSchema>, CollapsedUnion<TSql, TSchema>, CollapsedUnion<TSql, TSchema>>>;
     initialState<const TValue, const TSchema extends z.ZodTypeAny>(options: {
-        value: TValue | (() => TValue);
+        value: TValue | ((tools: {
+            uuid: () => string;
+        }) => TValue);
         schema: TSchema | ((base: ZodTypeFromPrimitive<TValue extends () => infer R ? R : TValue>) => TSchema);
         clientPk?: boolean;
     }): Prettify<Builder<"new", T, TSql, TSchema, z.infer<TSchema>, // <-- THIS IS THE FIX: Use schema's type, not literal value
@@ -131,7 +135,9 @@ export type Reference<TGetter extends () => any> = {
     getter: TGetter;
 };
 interface ShapeAPI {
-    initialState: <const TValue>(value: TValue | (() => TValue)) => Builder<"new", null, z.ZodUndefined, // No SQL schema
+    initialState: <const TValue>(value: TValue | ((tools: {
+        uuid: () => string;
+    }) => TValue)) => Builder<"new", null, z.ZodUndefined, // No SQL schema
     ZodTypeFromPrimitive<TValue extends () => infer R ? R : TValue>, TValue extends () => infer R ? R : TValue, ZodTypeFromPrimitive<TValue extends () => infer R ? R : TValue>, ZodTypeFromPrimitive<TValue extends () => infer R ? R : TValue>>;
     sql: <T extends SQLType>(sqlConfig: T) => Builder<"sql", T, SQLToZodType<T, false>, SQLToZodType<T, false>, z.infer<SQLToZodType<T, false>>, SQLToZodType<T, false>, SQLToZodType<T, false>>;
     reference: <TGetter extends () => any>(getter: TGetter) => Reference<TGetter>;
@@ -454,13 +460,11 @@ type DeriveDefaults<T, Depth extends any[] = []> = Prettify<Depth["length"] exte
         };
     } ? D extends () => infer R ? R : D : never : T[K] extends {
         config: {
-            transforms: any;
+            zodNewSchema: infer TNew;
+            zodSqlSchema: infer TSql;
             zodClientSchema: infer TClient extends z.ZodTypeAny;
-        };
-    } ? z.infer<TClient> : T[K] extends {
-        config: {
             initialValue: infer D;
         };
-    } ? D extends () => infer R ? R : D : never;
+    } ? TNew extends TSql ? z.infer<TClient> : D extends () => infer R ? R : D : never;
 }>;
 export {};

package/dist/schema.js

@@ -1,4 +1,5 @@
 import { z } from "zod";
+import { v4 as uuid } from "uuid";
 export const isFunction = (fn) => typeof fn === "function";
 // Function to create a properly typed current timestamp config
 export function currentTimeStamp() {
@@ -9,7 +10,7 @@ export function currentTimeStamp() {
 }
 export const s = {
     initialState: (value) => {
-        const actualValue = isFunction(value) ? value() : value;
+        const actualValue = isFunction(value) ? value({ uuid }) : value;
         // Infer the Zod type from the primitive value
         let inferredZodType;
         if (typeof actualValue === "string") {
@@ -129,7 +130,7 @@ function createBuilder(config) {
             let finalSchema;
             // 1. Determine the actual value
             if (value !== undefined) {
-                actualValue = isFunction(value) ? value() : value;
+                actualValue = isFunction(value) ? value({ uuid }) : value;
             }
             else if (schemaOrModifier &&
                 typeof schemaOrModifier === "object" &&
@@ -521,11 +522,6 @@ export function createSchema(schema, relations) {
                     : initialValueOrFn;
             }
         }
-    } // Apply transforms to default values so they match client schema
-    for (const key in fieldTransforms) {
-        if (key in defaultValues && defaultValues[key] !== undefined) {
-            defaultValues[key] = fieldTransforms[key].toClient(defaultValues[key]);
-        }
     }
     const generateDefaults = () => {
         const freshDefaults = {};
@@ -535,11 +531,6 @@ export function createSchema(schema, relations) {
                 ? generatorOrValue() // Call the function to get a fresh value
                 : generatorOrValue; // Use the static value
         }
-        for (const key in fieldTransforms) {
-            if (key in freshDefaults && freshDefaults[key] !== undefined) {
-                freshDefaults[key] = fieldTransforms[key].toClient(freshDefaults[key]);
-            }
-        }
         return freshDefaults;
     };
     const toClient = (dbObject) => {

package/package.json

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