cogsbox-shape 0.5.142 → 0.5.144

package/dist/schema.d.ts

@@ -348,10 +348,22 @@ export type DeriveViewResultFromBox<TBox extends CreateSchemaBoxReturn<any, any>
     }>;
 };
 export type DeriveViewResult<TTableName extends keyof TRegistry, TSelection, TRegistry extends RegistryShape> = {
-    sql: TRegistry[TTableName]["zodSchemas"]["sqlSchema"];
-    client: z.ZodObject<_DeriveViewShape<TTableName, TSelection, TRegistry, "clientSchema">>;
-    validation: z.ZodObject<_DeriveViewShape<TTableName, TSelection, TRegistry, "validationSchema">>;
+    definition: TRegistry[TTableName]["rawSchema"];
+    schemaKey: TTableName;
+    schemas: {
+        sql: TRegistry[TTableName]["zodSchemas"]["sqlSchema"];
+        client: z.ZodObject<_DeriveViewShape<TTableName, TSelection, TRegistry, "clientSchema">>;
+        validation: z.ZodObject<_DeriveViewShape<TTableName, TSelection, TRegistry, "validationSchema">>;
+    };
+    transforms: {
+        toClient: TRegistry[TTableName]["zodSchemas"]["toClient"];
+        toDb: TRegistry[TTableName]["zodSchemas"]["toDb"];
+    };
     defaults: DeriveViewDefaults<TTableName, TSelection, TRegistry>;
+    isView: true;
+    viewSelection: TSelection;
+    baseTable: TTableName;
+    __registry: TRegistry;
 };
 export type DeriveViewFromSchema<TSchema extends {
     schemaKey: string;
@@ -361,10 +373,14 @@ export type DeriveViewFromSchema<TSchema extends {
     schemaKey: infer TKey;
     __registry: infer TRegistry;
 } ? TKey extends keyof TRegistry ? TRegistry extends RegistryShape ? DeriveViewResult<TKey, TSelection, TRegistry> : never : never : never;
-type NavigationProxy<CurrentTable extends string, Registry extends RegistryShape> = CurrentTable extends keyof Registry ? {
-    [K in keyof Registry[CurrentTable]["rawSchema"] as IsRelationField<Registry[CurrentTable]["rawSchema"][K]> extends true ? K : never]: GetRelationRegistryKey<Registry[CurrentTable]["rawSchema"][K], Registry> extends infer TargetKey ? TargetKey extends keyof Registry ? NavigationProxy<TargetKey & string, Registry> : never : never;
+type RelationKeysOf<Cur extends string, Reg extends RegistryShape> = Cur extends keyof Reg ? {
+    [K in keyof Reg[Cur]["rawSchema"]]: IsRelationField<Reg[Cur]["rawSchema"][K]> extends true ? K : never;
+}[keyof Reg[Cur]["rawSchema"]] : never;
+type NavigationProxy<CurrentTable extends string, Registry extends RegistryShape> = CurrentTable extends keyof Registry ? RelationKeysOf<CurrentTable, Registry> extends never ? never : {
+    [K in RelationKeysOf<CurrentTable, Registry>]: GetRelationRegistryKey<Registry[CurrentTable]["rawSchema"][K], Registry> extends infer TargetKey ? TargetKey extends keyof Registry ? NavigationProxy<TargetKey & string, Registry> : never : never;
 } : never;
-type NavigationToSelection<T> = [keyof T] extends [never] ? never : {
+type IsEffectivelyEmpty<T> = [T] extends [never] ? true : [keyof T] extends [never] ? true : string extends keyof T ? true : number extends keyof T ? true : symbol extends keyof T ? true : false;
+type NavigationToSelection<T> = IsEffectivelyEmpty<T> extends true ? never : {
     [K in keyof T]?: boolean | NavigationToSelection<T[K]>;
 };
 export type OmitRelations<Shape, RawSchema> = Omit<Shape, {

package/dist/schema.js

@@ -7,48 +7,7 @@ export function currentTimeStamp() {
         defaultValue: new Date(),
     };
 }
-// Now define the shape object with the explicit type annotation
 export const s = {
-    // int: (config: IntConfig = {}) =>
-    //   s.sql({
-    //     type: "int",
-    //     ...config,
-    //   }),
-    // varchar: (config: Omit<StringConfig, "type"> = {}) =>
-    //   s.sql({
-    //     type: "varchar",
-    //     ...config,
-    //   }),
-    // char: (config: Omit<StringConfig, "type"> = {}) =>
-    //   s.sql({
-    //     type: "char",
-    //     ...config,
-    //   }),
-    // text: (config: Omit<StringConfig, "type" | "length"> = {}) =>
-    //   s.sql({
-    //     type: "text",
-    //     ...config,
-    //   }),
-    // longtext: (config: Omit<StringConfig, "type" | "length"> = {}) =>
-    //   s.sql({
-    //     type: "longtext",
-    //     ...config,
-    //   }),
-    // boolean: (config: BooleanConfig = {}) =>
-    //   s.sql({
-    //     type: "boolean",
-    //     ...config,
-    //   }),
-    // date: (config: Omit<DateConfig, "type"> = {}) =>
-    //   s.sql({
-    //     type: "date",
-    //     ...config,
-    //   }),
-    // datetime: (config: Omit<DateConfig, "type"> = {}) =>
-    //   s.sql({
-    //     type: "datetime",
-    //     ...config,
-    //   }),
     reference: (getter) => ({
         __type: "reference",
         getter: getter,
@@ -753,10 +712,28 @@ export function createSchemaBox(schemas, resolver) {
             createView: (selection) => {
                 const view = createViewObject(tableName, selection, finalRegistry, tableNameToRegistryKeyMap);
                 const defaults = computeViewDefaults(tableName, selection, finalRegistry, tableNameToRegistryKeyMap);
-                console.log("View defaults:", defaults); // ADD THIS
+                // Return the same shape as regular entries, but with isView marker
                 return {
-                    ...view,
+                    definition: entry.rawSchema, // Could be enhanced with selection info
+                    schemaKey: tableName,
+                    schemas: {
+                        sql: view.sql,
+                        client: view.client,
+                        validation: view.validation,
+                    },
+                    transforms: {
+                        toClient: entry.zodSchemas.toClient, // May need composition for nested
+                        toDb: entry.zodSchemas.toDb,
+                    },
                     defaults: defaults,
+                    isView: true, // Discriminator
+                    viewSelection: selection, // Store what was selected
+                    baseTable: tableName,
+                    // Optionally exclude these for views:
+                    // nav: undefined,
+                    // createView: undefined,
+                    // RelationSelection: undefined,
+                    __registry: finalRegistry,
                 };
             },
             RelationSelection: {},

package/package.json

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