🚧 wip

Author: m1212e

lib/context.ts

@@ -2,15 +2,16 @@ import type {
   AbilityBuilderType,
   createAbilityBuilder,
 } from "./abilityBuilder";
-import type { InternalDrizzleInstance } from "./types/drizzleInstanceType";
+import { lazy } from "./helpers/lazy";
+import type { DrizzleInstance } from "./types/drizzleInstanceType";
 import type {
   CustomRumblePothosConfig,
   RumbleInput,
 } from "./types/rumbleInput";
 
 export type ContextFunctionType<
   UserContext extends Record<string, any>,
-  DB extends InternalDrizzleInstance,
+  DB extends DrizzleInstance,
   RequestEvent extends Record<string, any>,
   Action extends string,
   PothosConfig extends CustomRumblePothosConfig,
@@ -27,7 +28,7 @@ export type ContextFunctionType<
 
 export type ContextType<
   UserContext extends Record<string, any>,
-  DB extends InternalDrizzleInstance,
+  DB extends DrizzleInstance,
   RequestEvent extends Record<string, any>,
   Action extends string,
   PothosConfig extends CustomRumblePothosConfig,
@@ -39,7 +40,7 @@ export type ContextType<
 
 export const createContextFunction = <
   UserContext extends Record<string, any>,
-  DB extends InternalDrizzleInstance,
+  DB extends DrizzleInstance,
   RequestEvent extends Record<string, any>,
   Action extends string,
   PothosConfig extends CustomRumblePothosConfig,
@@ -58,13 +59,16 @@ export const createContextFunction = <
 }: RumbleInput<UserContext, DB, RequestEvent, Action, PothosConfig> & {
   abilityBuilder: AbilityBuilder;
 }) => {
+  const builtAbilityBuilder = lazy(() => abilityBuilder._.build());
+
   return async (req: RequestEvent) => {
     const userContext = makeUserContext
       ? await makeUserContext(req)
       : ({} as UserContext);
+
     return {
       ...userContext,
-      abilities: abilityBuilder._.buildWithUserContext(userContext),
+      abilities: builtAbilityBuilder(),
     };
   };
 };

lib/enum.ts

@@ -2,7 +2,7 @@ import { toCamelCase } from "drizzle-orm/casing";
 import { type PgEnum, PgEnumColumn } from "drizzle-orm/pg-core";
 import { capitalize } from "es-toolkit";
 import type { SchemaBuilderType } from "./schemaBuilder";
-import type { InternalDrizzleInstance } from "./types/drizzleInstanceType";
+import type { DrizzleInstance } from "./types/drizzleInstanceType";
 import { RumbleError } from "./types/rumbleError";
 import type {
   CustomRumblePothosConfig,
@@ -30,7 +30,7 @@ export type NonEnumFields<T> = {
 
 export type EnumImplementerType<
   UserContext extends Record<string, any>,
-  DB extends InternalDrizzleInstance,
+  DB extends DrizzleInstance,
   RequestEvent extends Record<string, any>,
   Action extends string,
   PothosConfig extends CustomRumblePothosConfig,
@@ -47,7 +47,7 @@ export type EnumImplementerType<
 
 export const createEnumImplementer = <
   UserContext extends Record<string, any>,
-  DB extends InternalDrizzleInstance,
+  DB extends DrizzleInstance,
   RequestEvent extends Record<string, any>,
   Action extends string,
   PothosConfig extends CustomRumblePothosConfig,
@@ -95,13 +95,13 @@ export const createEnumImplementer = <
     let enumValues: any[] | undefined;
 
     if (tsName) {
-      const schemaEnum = db._.schema[tsName as string];
+      const schemaEnum = db._.schema![tsName as string];
 
       enumSchemaName = tsName.toString();
 
-      const enumCol = Object.values(db._.schema)
+      const enumCol = Object.values(db._.schema!)
         .filter((s) => typeof s === "object")
-        .map((s) => Object.values(s[Symbol.for("drizzle:Columns")]))
+        .map((s) => Object.values(s.columns))
         .flat(2)
         .find((s: any) => s.config?.enum === schemaEnum);
 
@@ -112,7 +112,7 @@ Please ensure that you use the enum at least once as a column of a table!`);
 
       enumValues = (enumCol as any).enumValues;
     } else if (enumColumn) {
-      const schemaEnumEntry = Object.entries(db._.schema).find(
+      const schemaEnumEntry = Object.entries(db._.schema!).find(
         ([, value]) => value === (enumColumn as any).config.enum,
       );
 

lib/object.ts

@@ -7,15 +7,15 @@ import type { AbilityBuilderType } from "./abilityBuilder";
 import { type EnumImplementerType, isEnumSchema } from "./enum";
 import { mapSQLTypeToGraphQLType } from "./helpers/sqlTypes/mapSQLTypeToTSType";
 import type { PossibleSQLType } from "./helpers/sqlTypes/types";
-import {
-  type TableIdentifierTSName,
-  tableHelper,
-} from "./helpers/tableHelpers";
+import { tableHelper } from "./helpers/tableHelpers";
 import type { OrderArgImplementerType } from "./orderArg";
 import type { MakePubSubInstanceType } from "./pubsub";
 import type { SchemaBuilderType } from "./schemaBuilder";
 import { adjustQueryForSearch } from "./search";
-import type { InternalDrizzleInstance } from "./types/drizzleInstanceType";
+import type {
+  DrizzleInstance,
+  DrizzleQueryFunction,
+} from "./types/drizzleInstanceType";
 import { RumbleError } from "./types/rumbleError";
 import type {
   CustomRumblePothosConfig,
@@ -49,7 +49,7 @@ const isProbablyAConfigObject = (t: any) => {
 
 export const createObjectImplementer = <
   UserContext extends Record<string, any>,
-  DB extends InternalDrizzleInstance,
+  DB extends DrizzleInstance,
   RequestEvent extends Record<string, any>,
   Action extends string,
   PothosConfig extends CustomRumblePothosConfig,
@@ -113,7 +113,7 @@ export const createObjectImplementer = <
   abilityBuilder: AbilityBuilderInstance;
 }) => {
   return <
-    ExplicitTableName extends TableIdentifierTSName<DB>,
+    ExplicitTableName extends keyof DrizzleQueryFunction<DB>,
     RefName extends string,
   >({
     table,
@@ -187,8 +187,10 @@ export const createObjectImplementer = <
           primaryKeyValue: primaryKeyValue,
         });
       },
-      applyFilters:
-        abilityBuilder?._.registeredFilters?.[table as any]?.[readAction],
+      applyFilters: abilityBuilder?._.registeredFilters({
+        table,
+        action: readAction,
+      }),
       fields: (t) => {
         const columns = tableSchema.columns;
         const mapSQLTypeStringToExposedPothosType = <

lib/rumble.ts

@@ -6,6 +6,7 @@ import {
   type YogaServerOptions,
 } from "graphql-yoga";
 import { useSofa } from "sofa-api";
+import { RumbleError } from "../out";
 import { createAbilityBuilder } from "./abilityBuilder";
 import { clientCreatorImplementer } from "./client/client";
 import { createContextFunction } from "./context";
@@ -34,6 +35,38 @@ export const rumble = <
 >(
   rumbleInput: RumbleInput<UserContext, DB, RequestEvent, Action, PothosConfig>,
 ) => {
+  if (!rumbleInput.db._.schema) {
+    throw new RumbleError(`
+rumble could not find any schema in the provided drizzle instance.
+Make sure you import the schema and pass it to the drizzle instance:
+
+export const db = drizzle(
+  "postgres://postgres:postgres@localhost:5432/postgres",
+  {
+    relations,
+    schema,    // <--- add this line
+  },
+);
+
+`);
+  }
+
+  if (!rumbleInput.db._.relations) {
+    throw new RumbleError(`
+rumble could not find any relations in the provided drizzle instance.
+Make sure you import the relations and pass them to the drizzle instance:
+
+export const db = drizzle(
+  "postgres://postgres:postgres@localhost:5432/postgres",
+  {
+    relations, // <--- add this line
+    schema,   
+  },
+);
+
+`);
+  }
+
   // to be able to iterate over the actions, we populate the actions array in case the user does not
   if (!rumbleInput.actions) {
     rumbleInput.actions = ["read", "update", "delete"] as Action[];
@@ -84,6 +117,7 @@ export const rumble = <
     Action,
     PothosConfig
   >({ ...rumbleInput, pubsub });
+
   const enum_ = createEnumImplementer<
     UserContext,
     DB,
@@ -95,6 +129,7 @@ export const rumble = <
     ...rumbleInput,
     schemaBuilder,
   });
+
   const whereArg = createWhereArgImplementer<
     UserContext,
     DB,
@@ -108,6 +143,7 @@ export const rumble = <
     schemaBuilder,
     enumImplementer: enum_,
   });
+
   const orderArg = createOrderArgImplementer<
     UserContext,
     DB,
@@ -119,6 +155,7 @@ export const rumble = <
     ...rumbleInput,
     schemaBuilder,
   });
+
   const object = createObjectImplementer<
     UserContext,
     DB,
@@ -140,6 +177,7 @@ export const rumble = <
     enumImplementer: enum_,
     abilityBuilder,
   });
+
   const query = createQueryImplementer<
     UserContext,
     DB,