fix: fixed types for integration

.npmignore

@@ -1,10 +1,12 @@
 integration/
 tests/
+coverage/
 .gitignore
 .github/
 .prettierrc
 .vscode/
 vitest.config.ts
 tsconfig.json
+tsconfig.build.json
 pnpm-lock.yaml
 pnpm-workspace.yaml

README.md

@@ -54,10 +54,10 @@ import * as drizzleSchema from "./drizzle-schema";
 export const schema = createSchema(
   createZeroSchema(drizzleSchema, {
     version: 1,
-    // Specify which columns to include in the Zero schema
+    // Specify which tables and columns to include in the Zero schema
     // this allows for the "expand/migrate/contract" pattern recommended in the Zero docs
     // e.g. when a column is first added, it should be set to false, and then changed to true
-    // once the migration has been run.
+    // once the migration has been run
     tables: {
       user: {
         id: true,

integration/tests/integration.test.ts

@@ -54,14 +54,22 @@ test("can query messages with relationships", async () => {
 
   const preloadedMessages = await zero.query.message
     .related("medium")
+    .related("sender")
     .preload();
   await preloadedMessages.complete;
 
-  const messages = await zero.query.message.related("medium").one().run();
+  const messages = await zero.query.message
+    .related("sender")
+    .related("medium")
+    .one()
+    .run();
 
   expect(messages?.medium).toHaveLength(1);
   expect(messages?.medium[0]?.name).toBe("email");
 
+  expect(messages?.sender).toHaveLength(1);
+  expect(messages?.sender[0]?.name).toBe("James");
+
   preloadedMessages.cleanup();
 });
 

integration/vitest.config.ts

@@ -6,6 +6,5 @@ export default defineConfig({
     include: ["tests/**/*.test.ts"],
     testTimeout: 60000,
   },
-
   plugins: [tsconfigPaths()],
 });

package.json

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

src/index.ts

@@ -1,13 +1,12 @@
 import { createZeroSchema, type CreateZeroSchema } from "./relations";
 import { createZeroTableSchema, type CreateZeroTableSchema } from "./tables";
-import type { ColumnsConfig, RelationsForTable, ZeroColumns } from "./types";
+import type { ColumnsConfig, ZeroColumns } from "./types";
 
 export {
   createZeroSchema,
   createZeroTableSchema,
   type ColumnsConfig,
   type CreateZeroSchema,
   type CreateZeroTableSchema,
-  type RelationsForTable,
   type ZeroColumns,
 };

src/relations.ts

@@ -10,7 +10,7 @@ import { getTableConfig } from "drizzle-orm/pg-core";
 import { createZeroTableSchema, type CreateZeroTableSchema } from "./tables";
 import type {
   AtLeastOne,
-  ColumnNames,
+  ColumnName,
   Columns,
   ColumnsConfig,
   FindPrimaryKeyFromTable,
@@ -55,6 +55,14 @@ type TableColumnsConfig<TSchema extends Record<string, unknown>> = {
 
 type RelationsConfig<T extends Relations> = ReturnType<T["config"]>;
 
+type ColumnIndexKeys<T extends Table> = {
+  [K in keyof Columns<T>]: Columns<T>[K] extends {
+    dataType: "string" | "number";
+  }
+    ? ColumnName<Columns<T>[K]>
+    : never;
+}[keyof Columns<T>];
+
 type ReferencedZeroSchemas<
   TSchema extends Record<string, unknown>,
   TColumns extends TableColumnsConfig<TSchema>,
@@ -94,7 +102,7 @@ type ReferencedZeroSchemas<
                         };
                       }
                         ? TSchema[P] extends Table<any>
-                          ? ColumnNames<TSchema[P]>
+                          ? ColumnIndexKeys<TSchema[P]>
                           : never
                         : never;
                     }[keyof TSchema]
@@ -106,7 +114,7 @@ type ReferencedZeroSchemas<
                       >[ColumnName]["_"] extends {
                         name: string;
                       }
-                        ? ColumnNames<TSchema[P]>
+                        ? ColumnIndexKeys<TSchema[P]>
                         : never;
                     }[keyof Columns<TSchema[P]>]
                   >;

src/types.ts

@@ -1,5 +1,5 @@
 import type { JSONValue } from "@rocicorp/zero";
-import type { Column, Relations, Table } from "drizzle-orm";
+import type { Column, Table } from "drizzle-orm";
 import type {
   DrizzleColumnTypeToZeroType,
   DrizzleDataTypeToZeroType,
@@ -18,8 +18,6 @@ type ColumnDefinition<T extends Table, K extends ColumnNames<T>> = {
     : never;
 }[keyof Columns<T>];
 
-export type RelationsForTable<T extends Table> = Relations<TableName<T>>;
-
 export type FindPrimaryKeyFromTable<TTable extends Table> = {
   [K in keyof Columns<TTable>]: Columns<TTable>[K]["_"]["isPrimaryKey"] extends true
     ? ColumnName<Columns<TTable>[K]>

tests/relationships.test.ts

@@ -151,7 +151,7 @@ describe.concurrent("relationships", () => {
       relationships: {
         profileInfo: {
           sourceField: ["id"] as AtLeastOne<"id" | "name">,
-          destField: ["user_id"] as AtLeastOne<"id" | "user_id" | "metadata">,
+          destField: ["user_id"] as AtLeastOne<"id" | "user_id">,
           destSchema: () => expectedProfileInfo,
         },
       },
@@ -179,7 +179,7 @@ describe.concurrent("relationships", () => {
       primaryKey: ["id"],
       relationships: {
         user: {
-          sourceField: ["user_id"] as AtLeastOne<"id" | "user_id" | "metadata">,
+          sourceField: ["user_id"] as AtLeastOne<"id" | "user_id">,
           destField: ["id"] as AtLeastOne<"id" | "name">,
           destSchema: () => expectedUsers,
         },
@@ -328,7 +328,7 @@ describe.concurrent("relationships", () => {
       primaryKey: ["id"],
       relationships: {
         messages: {
-          sourceField: ["id"] as AtLeastOne<"id" | "name" | "partner">,
+          sourceField: ["id"] as AtLeastOne<"id" | "name">,
           destField: ["senderId"] as AtLeastOne<
             "id" | "senderId" | "mediumId" | "body"
           >,
@@ -400,7 +400,7 @@ describe.concurrent("relationships", () => {
           sourceField: ["senderId"] as AtLeastOne<
             "id" | "senderId" | "mediumId" | "body"
           >,
-          destField: ["id"] as AtLeastOne<"id" | "name" | "partner">,
+          destField: ["id"] as AtLeastOne<"id" | "name">,
           destSchema: () => expectedUsers,
         },
       },

tsconfig.build.json

@@ -0,0 +1,7 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "noEmit": false,
+    "emitDeclarationOnly": true
+  }
+}