Merge pull request #134 from 0xcadams/0xcadams/types

fix: simplified types

Author: 0xcadams

no-config-integration/tests/utils.ts

@@ -25,12 +25,12 @@ import {
   message,
   user,
 } from "../drizzle/schema";
-import { schema } from "../schema";
+import { schema, type Schema } from "../schema";
 
 const PG_PORT = process.env.PG_VERSION === "17" ? 5732 : 5632;
 const ZERO_PORT = process.env.PG_VERSION === "17" ? 5949 : 4949;
 
-export const getNewZero = async () => {
+export const getNewZero = async (): Promise<Zero<Schema>> => {
   return new Zero({
     server: `http://localhost:${ZERO_PORT}`,
     userID: "1",

no-config-integration/zero-schema.gen.ts

@@ -19,7 +19,7 @@ import type { ZeroCustomType } from "drizzle-zero";
 import type * as drizzleSchema from "./drizzle/schema";
 import type { DrizzleToZeroSchema } from "drizzle-zero";
 
-type ZeroSchema = DrizzleToZeroSchema<typeof drizzleSchema, "snake_case">;
+type ZeroSchema = DrizzleToZeroSchema<typeof drizzleSchema>;
 
 /**
  * The Zero schema object.

package.json

@@ -1,6 +1,6 @@
 {
   "name": "drizzle-zero",
-  "version": "0.13.0",
+  "version": "0.13.1",
   "description": "Generate Zero schemas from Drizzle ORM schemas",
   "type": "module",
   "scripts": {

src/cli/shared.ts

@@ -70,7 +70,7 @@ export async function getGeneratedSchema({
     zeroSchemaGenerated.addTypeAlias({
       name: "ZeroSchema",
       isExported: false,
-      type: `DrizzleToZeroSchema<typeof drizzleSchema${result.drizzleCasing ? `, "${result.drizzleCasing}"` : ""}>`,
+      type: `DrizzleToZeroSchema<typeof drizzleSchema>`,
     });
 
     zeroSchemaSpecifier = "ZeroSchema";

src/relations.ts

@@ -17,12 +17,8 @@ import {
 import type {
   ColumnIndexKeys,
   DefaultTableColumnsConfig,
-  FindRelationsForTable,
-  FindTableByKey,
   FindTableByName,
-  FindTableKeyByTableName,
   Flatten,
-  RelationsConfig,
   TableColumnsConfig,
 } from "./types";
 import { debugLog, typedEntries } from "./util";
@@ -48,124 +44,6 @@ type ZeroCustomType<
   ? T & {}
   : unknown;
 
-/**
- * Extracts the table name from a configuration object or string.
- * @template TTableConfig - The configuration object or string
- */
-type ExtractTableConfigName<TTableConfig> = TTableConfig extends {
-  readonly destTable: string;
-}
-  ? TTableConfig["destTable"]
-  : TTableConfig extends string
-    ? TTableConfig
-    : never;
-
-/**
- * Represents the structure of a many-to-many relationship through a junction table.
- * @template TDrizzleSchema - The complete Drizzle schema
- * @template TColumnConfig - Configuration for the tables
- * @template TManyConfig - Configuration for many-to-many relationships
- * @template TTableName extends keyof TColumnConfig & keyof TManyConfig
- */
-type ManyToManyRelationship<
-  TDrizzleSchema extends { [K in string]: unknown },
-  TColumnConfig extends TableColumnsConfig<TDrizzleSchema>,
-  TManyConfig extends ManyConfig<TDrizzleSchema> | undefined,
-  TTableName extends keyof TColumnConfig & keyof TManyConfig,
-> = TManyConfig extends undefined
-  ? {}
-  : TTableName extends keyof TDrizzleSchema
-    ? TManyConfig[TTableName] extends ManyTableConfig<
-        TDrizzleSchema,
-        TTableName & string
-      >
-      ? {
-          [K in keyof TManyConfig[TTableName]]: [
-            {
-              readonly sourceField: string[];
-              readonly destField: ColumnIndexKeys<
-                FindTableByKey<
-                  TDrizzleSchema,
-                  ExtractTableConfigName<TManyConfig[TTableName][K][0]>
-                >
-              >[];
-              readonly destSchema: ExtractTableConfigName<
-                TManyConfig[TTableName][K][0]
-              >;
-              readonly cardinality: "many";
-            },
-            {
-              readonly sourceField: string[];
-              readonly destField: ColumnIndexKeys<
-                FindTableByKey<
-                  TDrizzleSchema,
-                  ExtractTableConfigName<TManyConfig[TTableName][K][1]>
-                >
-              >[];
-              readonly destSchema: ExtractTableConfigName<
-                TManyConfig[TTableName][K][1]
-              >;
-              readonly cardinality: "many";
-            },
-          ];
-        }
-      : {}
-    : {};
-
-/**
- * Gets the valid direct relation keys for a table that have corresponding table configurations.
- * @template TDrizzleSchema - The complete Drizzle schema
- * @template TColumnConfig - Configuration for the tables
- * @template TCurrentTableRelations - Relations defined for the current table
- */
-type ValidDirectRelationKeys<
-  TDrizzleSchema extends Record<string, unknown>,
-  TCurrentTableRelations extends Relations,
-> = keyof RelationsConfig<TCurrentTableRelations> &
-  {
-    [K in keyof RelationsConfig<TCurrentTableRelations>]: RelationsConfig<TCurrentTableRelations>[K]["referencedTable"] extends Table<any>
-      ? {
-          [SchemaKey in keyof TDrizzleSchema]: TDrizzleSchema[SchemaKey] extends RelationsConfig<TCurrentTableRelations>[K]["referencedTable"]
-            ? K
-            : never;
-        }[keyof TDrizzleSchema]
-      : never;
-  }[keyof RelationsConfig<TCurrentTableRelations>];
-
-/**
- * Represents a direct relationship between tables.
- * @template TDrizzleSchema - The complete Drizzle schema
- * @template TColumnConfig - Configuration for the tables
- * @template TManyConfig - Configuration for many-to-many relationships
- * @template TCurrentTable - The current table being processed
- * @template TCurrentTableRelations - Relations defined for the current table
- */
-type DirectRelationships<
-  TDrizzleSchema extends Record<string, unknown>,
-  TCurrentTableRelations extends Relations,
-> = [TCurrentTableRelations] extends [never]
-  ? {}
-  : {
-      [K in ValidDirectRelationKeys<TDrizzleSchema, TCurrentTableRelations>]: [
-        {
-          readonly sourceField: string[];
-          readonly destField: ColumnIndexKeys<
-            FindTableByName<
-              TDrizzleSchema,
-              RelationsConfig<TCurrentTableRelations>[K]["referencedTableName"]
-            >
-          >[];
-          readonly destSchema: FindTableKeyByTableName<
-            TDrizzleSchema,
-            RelationsConfig<TCurrentTableRelations>[K]["referencedTableName"]
-          >;
-          readonly cardinality: RelationsConfig<TCurrentTableRelations>[K] extends One
-            ? "one"
-            : "many";
-        },
-      ];
-    };
-
 /**
  * Configuration type for many-to-many relationships for a specific table.
  * @template TDrizzleSchema - The complete Drizzle schema
@@ -213,88 +91,26 @@ type ManyConfig<TDrizzleSchema extends Record<string, unknown>> = {
     string]?: ManyTableConfig<TDrizzleSchema, TSourceTableName>;
 };
 
-/**
- * Represents all referenced Zero schemas for a table, including both direct and many-to-many relationships.
- */
-type ReferencedZeroSchemas<
-  TDrizzleSchema extends Record<string, unknown>,
-  TColumnConfig extends TableColumnsConfig<TDrizzleSchema>,
-  TManyConfig extends ManyConfig<TDrizzleSchema> | undefined,
-  TTableName extends keyof TColumnConfig & keyof TManyConfig,
-  TTable extends Table<any>,
-> = DirectRelationships<
-  TDrizzleSchema,
-  FindRelationsForTable<TDrizzleSchema, TTable>
-> &
-  ManyToManyRelationship<
-    TDrizzleSchema,
-    TColumnConfig,
-    TManyConfig,
-    TTableName
-  >;
-
 /**
  * The mapped Zero schema from a Drizzle schema with version and tables.
- *
- * @template TDrizzleSchema - The complete Drizzle schema
- * @template TCasing - The casing to use for the table name
- * @template TColumnConfig - Configuration for the tables
- * @template TManyConfig - Configuration for many-to-many relationships
  */
 type DrizzleToZeroSchema<
   TDrizzleSchema extends { [K in string]: unknown },
-  TCasing extends ZeroTableCasing = undefined,
   TColumnConfig extends
     TableColumnsConfig<TDrizzleSchema> = DefaultTableColumnsConfig<TDrizzleSchema>,
-  TManyConfig extends ManyConfig<TDrizzleSchema> | undefined = undefined,
 > = {
   readonly tables: {
-    readonly [K in keyof TDrizzleSchema &
-      keyof TColumnConfig as TDrizzleSchema[K] extends Table<any>
+    readonly [K in keyof TDrizzleSchema as TDrizzleSchema[K] extends Table<any>
       ? K
       : never]: TDrizzleSchema[K] extends Table<any>
-      ? Flatten<
-          ZeroTableBuilderSchema<
-            K & string,
-            TDrizzleSchema[K],
-            NonNullable<TColumnConfig[K]>,
-            TCasing
-          >
-        >
-      : never;
-  };
-  readonly relationships: {
-    readonly [K in keyof TDrizzleSchema &
-      keyof TColumnConfig as TDrizzleSchema[K] extends Table<any>
-      ? [
-          ReferencedZeroSchemas<
-            TDrizzleSchema,
-            TColumnConfig,
-            TManyConfig,
-            K & keyof TManyConfig & keyof TColumnConfig,
-            TDrizzleSchema[K]
-          >,
-        ] extends [never]
-        ? never
-        : keyof ReferencedZeroSchemas<
-              TDrizzleSchema,
-              TColumnConfig,
-              TManyConfig,
-              K & keyof TManyConfig & keyof TColumnConfig,
-              TDrizzleSchema[K]
-            > extends never
-          ? never
-          : K
-      : never]: TDrizzleSchema[K] extends Table<any>
-      ? ReferencedZeroSchemas<
-          TDrizzleSchema,
-          TColumnConfig,
-          TManyConfig,
-          K & keyof TManyConfig & keyof TColumnConfig,
-          TDrizzleSchema[K]
+      ? ZeroTableBuilderSchema<
+          K & string,
+          TDrizzleSchema[K],
+          TColumnConfig[K & keyof TColumnConfig]
         >
       : never;
   };
+  readonly relationships: any;
 };
 
 /**
@@ -435,9 +251,7 @@ const drizzleZeroConfig = <
      */
     readonly debug?: boolean;
   },
-): Flatten<
-  DrizzleToZeroSchema<TDrizzleSchema, TCasing, TColumnConfig, TManyConfig>
-> => {
+): Flatten<DrizzleToZeroSchema<TDrizzleSchema, TColumnConfig>> => {
   let tables: any[] = [];
 
   const tableColumnNamesForSourceTable = new Map<string, Set<string>>();
@@ -823,12 +637,7 @@ const drizzleZeroConfig = <
       name: key,
       relationships: value,
     })),
-  } as any) as unknown as DrizzleToZeroSchema<
-    TDrizzleSchema,
-    TCasing,
-    TColumnConfig,
-    TManyConfig
-  >;
+  } as any) as unknown as DrizzleToZeroSchema<TDrizzleSchema, TColumnConfig>;
 
   debugLog(
     config?.debug,