@pothos/plugin-drizzle 0.18.1 → 0.19.0

package/lib/utils/selections.js

@@ -2,171 +2,16 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-function _export(target, all) {
-    for(var name in all)Object.defineProperty(target, name, {
-        enumerable: true,
-        get: Object.getOwnPropertyDescriptor(all, name).get
-    });
-}
-_export(exports, {
-    get createState () {
-        return createState;
-    },
-    get mergeSelection () {
-        return mergeSelection;
-    },
-    get mergeState () {
-        return mergeState;
-    },
-    get omitUndefinedKeys () {
+Object.defineProperty(exports, "omitUndefinedKeys", {
+    enumerable: true,
+    get: function() {
         return omitUndefinedKeys;
-    },
-    get selectionCompatible () {
-        return selectionCompatible;
-    },
-    get selectionToQuery () {
-        return selectionToQuery;
-    },
-    get stateCompatible () {
-        return stateCompatible;
     }
 });
-const _core = require("@pothos/core");
-const _deepequal = require("./deep-equal.js");
 function omitUndefinedKeys(query) {
     const entries = Object.entries(query);
     const defined = entries.filter(([, value])=>value !== undefined);
     return defined.length === entries.length ? query : Object.fromEntries(defined);
 }
-function selectionCompatible(state, selectionMap, ignoreQuery = false) {
-    if (typeof selectionMap === 'boolean') {
-        return ignoreQuery || !selectionMap || Object.keys(state.query).length === 0;
-    }
-    const { with: withSelection, extras, columns: _, ...query } = selectionMap;
-    if (withSelection && Object.entries(withSelection).some(([key, value])=>value && state.with.has(key) && // TODO: make sure nested extras are normalized
-        !selectionCompatible(state.with.get(key), value))) {
-        return false;
-    }
-    if (extras && Object.entries(extras).some(([key, value])=>{
-        const existing = state.extras.get(key);
-        return existing && existing !== value;
-    })) {
-        return false;
-    }
-    return ignoreQuery || (0, _deepequal.deepEqual)(state.query, omitUndefinedKeys(query));
-}
-function stateCompatible(state, newState, ignoreQuery = false) {
-    for (const [name, relationState] of newState.with){
-        if (state.with.has(name) && !stateCompatible(state.with.get(name), relationState)) {
-            return false;
-        }
-    }
-    return ignoreQuery || (0, _deepequal.deepEqual)(state.query, newState.query);
-}
-function mergeState(state, newState) {
-    for (const [name, relationState] of newState.with){
-        if (state.with.has(name)) {
-            mergeState(state.with.get(name), relationState);
-        }
-    }
-    if (!state.allColumns) {
-        if (newState.allColumns) {
-            state.allColumns = true;
-        } else {
-            for (const name of newState.columns){
-                state.columns.add(name);
-            }
-        }
-    }
-    for (const [name, value] of newState.extras){
-        state.extras.set(name, value);
-    }
-}
-function createState(table, skipDeferredFragments, parent) {
-    return {
-        table,
-        skipDeferredFragments,
-        parent,
-        query: {},
-        columns: new Set(),
-        with: new Map(),
-        extras: new Map(),
-        mappings: {},
-        allColumns: false,
-        depth: parent ? parent.depth + 1 : 0
-    };
-}
-function mergeSelection(config, state, selection) {
-    const { with: withSelection, extras, columns, ...query } = typeof selection === 'boolean' ? selection === true ? {} : {
-        columns: {}
-    } : selection;
-    if (withSelection) {
-        for (const [key, value] of Object.entries(withSelection)){
-            const relation = state.table.relations[key];
-            if (!relation) {
-                throw new _core.PothosValidationError(`Relation ${key} does not exist on ${state.table.name}`);
-            }
-            merge(config.relations[relation.targetTableName], key, value);
-        }
-    }
-    const normalizedQuery = omitUndefinedKeys(query);
-    if (Object.keys(normalizedQuery).length > 0) {
-        state.query = normalizedQuery;
-    }
-    if (extras) {
-        for (const [key, value] of Object.entries(extras)){
-            state.extras.set(key, value);
-        }
-    }
-    if (state.allColumns) {
-        return;
-    }
-    if (columns && !state.allColumns) {
-        for (const [key, value] of Object.entries(columns)){
-            if (value) {
-                state.columns.add(key);
-            }
-        }
-    } else {
-        state.allColumns = true;
-    }
-    function merge(table, key, value) {
-        if (!value) {
-            return;
-        }
-        if (state.with.has(key)) {
-            mergeSelection(config, state.with.get(key), value);
-        } else {
-            const relatedState = createState(table, state.skipDeferredFragments, state);
-            mergeSelection(config, relatedState, value);
-            state.with.set(key, relatedState);
-        }
-    }
-}
-function selectionToQuery(config, state) {
-    const query = {
-        ...omitUndefinedKeys(state.query),
-        columns: undefined,
-        with: {},
-        extras: {}
-    };
-    if (!state.allColumns) {
-        query.columns = {};
-        for (const key of state.columns){
-            query.columns[key] = true;
-        }
-        for (const column of config.getPrimaryKey(state.table.name)){
-            const tsName = config.columnToTsName(column);
-            query.columns[tsName] = true;
-        }
-    }
-    for (const [key, value] of state.extras){
-        query.extras[key] = value;
-    }
-    state.with.forEach((sel, relation)=>{
-        query.with[relation] = selectionToQuery(config, sel);
-    });
-    return query;
-}
 
 //# sourceMappingURL=selections.js.map

package/lib/utils/selections.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/utils/selections.ts"],"names":["createState","mergeSelection","mergeState","omitUndefinedKeys","selectionCompatible","selectionToQuery","stateCompatible","query","entries","Object","defined","filter","value","undefined","length","fromEntries","state","selectionMap","ignoreQuery","keys","with","withSelection","extras","columns","_","some","key","has","get","existing","deepEqual","newState","name","relationState","allColumns","add","set","table","skipDeferredFragments","parent","Set","Map","mappings","depth","config","selection","relation","relations","PothosValidationError","merge","targetTableName","normalizedQuery","relatedState","column","getPrimaryKey","tsName","columnToTsName","forEach","sel"],"mappings":"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"}
+{"version":3,"sources":["../../src/utils/selections.ts"],"names":["omitUndefinedKeys","query","entries","Object","defined","filter","value","undefined","length","fromEntries"],"mappings":";;;;+BAKgBA;;;eAAAA;;;AAAT,SAASA,kBAAoCC,KAAQ;IAC1D,MAAMC,UAAUC,OAAOD,OAAO,CAACD;IAC/B,MAAMG,UAAUF,QAAQG,MAAM,CAAC,CAAC,GAAGC,MAAM,GAAKA,UAAUC;IAExD,OAAOH,QAAQI,MAAM,KAAKN,QAAQM,MAAM,GAAGP,QAASE,OAAOM,WAAW,CAACL;AACzE"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pothos/plugin-drizzle",
-  "version": "0.18.1",
+  "version": "0.19.0",
   "description": "A Pothos plugin for drizzle",
   "main": "./lib/index.js",
   "types": "./dts/index.d.ts",
@@ -33,23 +33,25 @@
     "access": "public",
     "provenance": true
   },
+  "dependencies": {
+    "@pothos/selection-mapper": "0.1.0"
+  },
   "peerDependencies": {
     "@pothos/core": "*",
-    "drizzle-orm": ">=1.0.0-beta.2",
+    "drizzle-orm": ">=1.0.0-rc.2",
     "graphql": "^16.10.0 || ^17.0.0"
   },
   "devDependencies": {
     "@libsql/client": "^0.17.2",
-    "drizzle-graphql": "^0.8.5",
     "drizzle-kit": "1.0.0-rc.2",
     "drizzle-orm": "1.0.0-rc.2",
     "graphql-scalars": "^1.25.0",
     "graphql-tag": "^2.12.6",
     "postgres": "^3.4.9",
-    "@pothos/core": "4.13.1",
-    "@pothos/plugin-errors": "4.9.1",
-    "@pothos/plugin-relay": "4.7.1",
+    "@pothos/core": "4.14.0",
     "@pothos/plugin-add-graphql": "4.3.1",
+    "@pothos/plugin-errors": "4.9.1",
+    "@pothos/plugin-relay": "4.7.2",
     "@pothos/plugin-scope-auth": "4.1.7",
     "@pothos/plugin-with-input": "4.1.5",
     "@pothos/test-utils": "2.2.1"

package/src/connection-helpers.ts

@@ -1,13 +1,25 @@
-import type { InputFieldMap, InputShapeFromFields, SchemaTypes } from '@pothos/core';
+import {
+  completeValue,
+  type InputFieldMap,
+  type InputShapeFromFields,
+  isThenable,
+  type MaybeAsyncSelection,
+  type MaybePromise,
+  type SchemaTypes,
+} from '@pothos/core';
+import type { PathSegment } from '@pothos/selection-mapper';
 import type {
   BuildQueryResult,
   DBQueryConfig,
   RelationsFilter,
+  SQL,
   TableRelationalConfig,
 } from 'drizzle-orm';
 import type { GraphQLResolveInfo } from 'graphql';
 import type { DrizzleRef } from './interface-ref.js';
 import type { QueryForDrizzleConnection } from './types.js';
+import { drizzleAdapter } from './utils/adapter.js';
+import { checkAwaitSelections } from './utils/await-selections.js';
 import { getSchemaConfig } from './utils/config.js';
 import {
   type DrizzleCursorConnectionQueryOptions,
@@ -17,12 +29,7 @@ import {
 } from './utils/cursors.js';
 import { queryFromInfo } from './utils/map-query.js';
 import { getRefFromModel } from './utils/refs.js';
-import {
-  createState,
-  mergeSelection,
-  omitUndefinedKeys,
-  selectionToQuery,
-} from './utils/selections.js';
+import { omitUndefinedKeys, type SelectionMap } from './utils/selections.js';
 
 export function drizzleConnectionHelpers<
   Types extends SchemaTypes,
@@ -60,14 +67,18 @@ export function drizzleConnectionHelpers<
   }: {
     args?: (t: PothosSchemaTypes.InputFieldBuilder<Types, 'Arg'>) => ExtraArgs;
     select?: (
+      // The node's selection: its table is the connection field's, which the helper does not know.
       nestedSelection: <T extends true | {}>(selection?: T) => T,
       args: InputShapeFromFields<ExtraArgs> & PothosSchemaTypes.DefaultConnectionArguments,
       ctx: Types['Context'],
-    ) => Selection;
+    ) => MaybeAsyncSelection<Types, Selection>;
     query?: QueryForDrizzleConnection<Types, TableConfig> extends infer QueryConfig
       ?
           | QueryConfig
-          | ((args: InputShapeFromFields<ExtraArgs>, context: Types['Context']) => QueryConfig)
+          | ((
+              args: InputShapeFromFields<ExtraArgs>,
+              context: Types['Context'],
+            ) => MaybeAsyncSelection<Types, QueryConfig>)
       : never;
     defaultSize?:
       | number
@@ -79,23 +90,47 @@ export function drizzleConnectionHelpers<
       | number
       | ((args: PothosSchemaTypes.DefaultConnectionArguments, ctx: Types['Context']) => number);
     resolveNode?: (edge: EdgeShape) => NodeShape;
-  },
+  } = {},
 ) {
   const config = getSchemaConfig(builder);
+  const adapter = drizzleAdapter(config);
   const tableName =
     typeof refOrType === 'string'
       ? refOrType
       : (refOrType as DrizzleRef<Types, Type extends DrizzleRef<Types, infer T> ? T : Type>)
           .tableName;
 
-  function resolve<Parent = undefined>(
+  interface BaseQuery {
+    limit?: number;
+    orderBy?: unknown;
+    where?: SQL;
+    columns?: Record<string, boolean>;
+    extras?: DrizzleCursorConnectionQueryOptions['extras'];
+  }
+
+  /** The user's `query`, a promise when its callback is async, which the caller awaits. */
+  const baseQueryFor = (
+    args: InputShapeFromFields<ExtraArgs> & PothosSchemaTypes.DefaultConnectionArguments,
+    ctx: Types['Context'],
+  ): MaybePromise<BaseQuery> =>
+    completeValue(
+      (typeof query === 'function' ? query(args, ctx) : query) as MaybePromise<
+        BaseQuery | null | undefined
+      >,
+      orEmpty,
+    );
+
+  // Built once per helper, so a synchronous `resolve` allocates nothing beyond the connection.
+  const resolveList = (
+    baseQuery: BaseQuery,
     list: (EdgeShape & {})[],
     args: InputShapeFromFields<ExtraArgs> & PothosSchemaTypes.DefaultConnectionArguments,
     ctx: Types['Context'],
-    parent?: Parent,
-  ) {
-    const { select, cursorFields } = getQueryArgs(args, ctx);
+    parent: unknown,
+  ) => {
+    const { select, cursorFields } = getQueryArgs(args, ctx, baseQuery);
     const formatCursor = getCursorFormatter(cursorFields, config);
+
     return wrapConnectionResult(
       list,
       args,
@@ -103,24 +138,42 @@ export function drizzleConnectionHelpers<
       formatCursor,
       (resolveNode as never) ?? ((edge: unknown) => edge),
       parent,
-    ) as unknown as {
-      parent: Parent;
-      edges: (Omit<EdgeShape, 'cursor' | 'node'> & { node: NodeShape; cursor: string })[];
-      pageInfo: {
-        startCursor: string | null;
-        endCursor: string | null;
-        hasPreviousPage: boolean;
-        hasNextPage: boolean;
-      };
-    };
+    );
+  };
+
+  function resolve<Parent = undefined>(
+    list: (EdgeShape & {})[],
+    args: InputShapeFromFields<ExtraArgs> & PothosSchemaTypes.DefaultConnectionArguments,
+    ctx: Types['Context'],
+    parent?: Parent,
+  ) {
+    const baseQuery = baseQueryFor(args, ctx);
+
+    return (
+      isThenable(baseQuery)
+        ? baseQuery.then((resolved) => resolveList(resolved, list, args, ctx, parent))
+        : resolveList(baseQuery, list, args, ctx, parent)
+    ) as MaybeAsyncSelection<
+      Types,
+      {
+        parent: Parent;
+        edges: (Omit<EdgeShape, 'cursor' | 'node'> & { node: NodeShape; cursor: string })[];
+        pageInfo: {
+          startCursor: string | null;
+          endCursor: string | null;
+          hasPreviousPage: boolean;
+          hasNextPage: boolean;
+        };
+      }
+    >;
   }
 
   const getQueryArgs = (
     args: InputShapeFromFields<ExtraArgs> & PothosSchemaTypes.DefaultConnectionArguments,
     ctx: {},
+    baseQuery: BaseQuery,
   ) => {
-    const { limit, orderBy, where, ...fieldQuery } =
-      (typeof query === 'function' ? query(args, ctx) : query) ?? {};
+    const { limit, orderBy, where, ...fieldQuery } = baseQuery;
     const table = config.relations[tableName];
 
     const { cursorFields, columns, ...connectionQuery } = drizzleCursorConnectionQuery({
@@ -151,13 +204,45 @@ export function drizzleConnectionHelpers<
     };
   };
 
-  type NestedSelection = <T extends true | {}>(selection?: T, path?: string[]) => T;
+  // The `nestedSelection` of the field's `select`, whatever table its type names.
+  type NestedSelection = (selection?: SelectionMap | true, path?: PathSegment[]) => unknown;
+
+  /** The drizzle query `getQuery` builds: the node selection, with the connection's own arguments. */
+  type ConnectionQuery = Omit<Selection, 'orderBy'> & {
+    orderBy: {
+      [K in TableConfig['table']['_'] extends { columns: infer Columns } ? keyof Columns : never]?:
+        | 'asc'
+        | 'desc'
+        | undefined;
+    };
+    where: RelationsFilter<TableConfig, Types['DrizzleRelations']>;
+  };
+
+  /**
+   * What `getQuery` returns for a given `awaitSelections`. `[Await] extends [false]` rather than
+   * `Await extends true`, so a caller passing a `boolean` variable — which infers `Await` as
+   * `boolean`, neither literal — is handed the promise to deal with, rather than a synchronous
+   * type it cannot rely on.
+   */
+  type ConnectionQueryReturn<Await extends boolean> = [Await] extends [false]
+    ? ConnectionQuery
+    : MaybePromise<ConnectionQuery>;
 
-  function getQuery(
+  /**
+   * The connection's query, built from the helper's own `select` and `query` and the selection
+   * beneath the field. Synchronous unless `awaitSelections` says otherwise: an async `select` or
+   * `query`, or an async selection beneath the connection, throws rather than returning a promise
+   * the declared type denies.
+   */
+  function getQuery<Await extends boolean = false>(
     args: InputShapeFromFields<ExtraArgs> & PothosSchemaTypes.DefaultConnectionArguments,
     ctx: Types['Context'],
     nestedSelectionOrInfo: NestedSelection | GraphQLResolveInfo,
-  ) {
+    options?: {
+      /** Whether the caller will await the query. */
+      awaitSelections?: Await;
+    },
+  ): ConnectionQueryReturn<Await> {
     const nestedSelection: NestedSelection =
       typeof nestedSelectionOrInfo === 'function'
         ? nestedSelectionOrInfo
@@ -166,43 +251,72 @@ export function drizzleConnectionHelpers<
               info: nestedSelectionOrInfo,
               context: ctx,
               config,
-              select,
+              select: select as SelectionMap,
               path,
             });
-    const nestedSelect: Record<string, unknown> | true = select
-      ? select((sel) => nestedSelection(sel, ['edges', 'node']), args, ctx)
-      : nestedSelection(true, ['edges', 'node']);
-    const queryArgs = getQueryArgs(args, ctx);
-
-    const selectState = createState(
-      config.relations[tableName],
-      builder.options.drizzle?.skipDeferredFragments ?? true,
-    );
+    // Both callbacks start now; the query waits for whichever of them is async.
+    const nestedSelect: MaybePromise<Record<string, unknown> | true> = select
+      ? select((sel) => nestedSelection(sel as SelectionMap, ['edges', 'node']) as never, args, ctx)
+      : (nestedSelection(true, ['edges', 'node']) as never);
+    let baseQuery: MaybePromise<object>;
 
-    mergeSelection(config, selectState, queryArgs.select);
+    try {
+      baseQuery = baseQueryFor(args, ctx);
+    } catch (error) {
+      // The selection has already started. Preserve the query error while handling any
+      // later rejection from the selection that this invocation can no longer consume.
+      if (isThenable(nestedSelect)) {
+        nestedSelect.then(
+          () => {},
+          () => {},
+        );
+      }
 
-    if (typeof nestedSelect === 'object' && nestedSelect) {
-      mergeSelection(config, selectState, nestedSelect);
+      throw error;
     }
 
-    const baseQuery = typeof query === 'function' ? query(args, ctx) : (query ?? {});
-    const queryResult = selectionToQuery(config, selectState);
+    const built: MaybePromise<object> =
+      isThenable(nestedSelect) || isThenable(baseQuery)
+        ? Promise.all([nestedSelect, baseQuery]).then(([nested, base]) =>
+            buildQuery(nested, base, args, ctx),
+          )
+        : buildQuery(nestedSelect, baseQuery, args, ctx);
+
+    return checkAwaitSelections(
+      built,
+      options?.awaitSelections,
+      'getQuery',
+      `the ${String(tableName)} connection`,
+    ) as ConnectionQueryReturn<Await>;
+  }
+
+  // Built once per helper, so a synchronous `getQuery` allocates nothing beyond the query.
+  function buildQuery(
+    nestedSelect: Record<string, unknown> | true,
+    baseQuery: BaseQuery,
+    args: InputShapeFromFields<ExtraArgs> & PothosSchemaTypes.DefaultConnectionArguments,
+    ctx: Types['Context'],
+  ) {
+    const node = adapter.createNode(config.relations[tableName]);
+
+    adapter.mergeQuery(node, getQueryArgs(args, ctx, baseQuery).select as SelectionMap);
+
+    if (typeof nestedSelect === 'object' && nestedSelect) {
+      adapter.mergeQuery(node, nestedSelect);
+    }
 
     return omitUndefinedKeys({
       ...baseQuery,
-      ...queryResult,
-    }) as unknown as Omit<Selection, 'orderBy'> & {
-      orderBy: {
-        [K in TableConfig['table']['_'] extends { columns: infer Columns }
-          ? keyof Columns
-          : never]?: 'asc' | 'desc' | undefined;
-      };
-      where: RelationsFilter<TableConfig, Types['DrizzleRelations']>;
-    };
+      ...adapter.toQuery(node),
+    });
   }
 
   const getArgs = () => (createArgs ? builder.args(createArgs) : {}) as ExtraArgs;
 
+  function orEmpty(baseQuery: BaseQuery | null | undefined): BaseQuery {
+    return baseQuery ?? ({} as BaseQuery);
+  }
+
   return {
     ref: (typeof refOrType === 'string'
       ? getRefFromModel(refOrType, builder)