@pothos/plugin-drizzle 0.18.0 → 0.19.0

package/esm/utils/selections.d.ts

@@ -1,24 +1,5 @@
-import type { DBQueryConfig, TableRelationalConfig } from 'drizzle-orm';
-import type { PothosDrizzleSchemaConfig } from './config.js';
-import type { LoaderMappings } from './loader-map.js';
-export interface SelectionState {
-    table: TableRelationalConfig;
-    query: object;
-    allColumns: boolean;
-    columns: Set<string>;
-    with: Map<string, SelectionState>;
-    extras: Map<string, NonNullable<SelectionMap['extras']>[string]>;
-    mappings: LoaderMappings;
-    parent?: SelectionState;
-    depth: number;
-    skipDeferredFragments: boolean;
-}
+import type { DBQueryConfig } from 'drizzle-orm';
 export type SelectionMap = DBQueryConfig<'one'>;
+/** Drops keys holding `undefined`, so `{ where: cond ? filter : undefined }` reads as `{}`. */
 export declare function omitUndefinedKeys<T extends object>(query: T): T;
-export declare function selectionCompatible(state: SelectionState, selectionMap: SelectionMap | boolean, ignoreQuery?: boolean): boolean;
-export declare function stateCompatible(state: SelectionState, newState: SelectionState, ignoreQuery?: boolean): boolean;
-export declare function mergeState(state: SelectionState, newState: SelectionState): void;
-export declare function createState(table: TableRelationalConfig, skipDeferredFragments: boolean, parent?: SelectionState): SelectionState;
-export declare function mergeSelection(config: PothosDrizzleSchemaConfig, state: SelectionState, selection: SelectionMap | boolean): void;
-export declare function selectionToQuery(config: PothosDrizzleSchemaConfig, state: SelectionState): SelectionMap;
 //# sourceMappingURL=selections.d.ts.map

package/esm/utils/selections.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"selections.d.ts","sourceRoot":"","sources":["../../src/utils/selections.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AACxE,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,aAAa,CAAC;AAE7D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAEtD,MAAM,WAAW,cAAc;IAC7B,KAAK,EAAE,qBAAqB,CAAC;IAC7B,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,OAAO,CAAC;IACpB,OAAO,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IACrB,IAAI,EAAE,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;IAClC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;IACjE,QAAQ,EAAE,cAAc,CAAC;IACzB,MAAM,CAAC,EAAE,cAAc,CAAC;IACxB,KAAK,EAAE,MAAM,CAAC;IACd,qBAAqB,EAAE,OAAO,CAAC;CAChC;AAED,MAAM,MAAM,YAAY,GAAG,aAAa,CAAC,KAAK,CAAC,CAAC;AAEhD,wBAAgB,iBAAiB,CAAC,CAAC,SAAS,MAAM,EAAE,KAAK,EAAE,CAAC,GAAG,CAAC,CAK/D;AAED,wBAAgB,mBAAmB,CACjC,KAAK,EAAE,cAAc,EACrB,YAAY,EAAE,YAAY,GAAG,OAAO,EACpC,WAAW,UAAQ,GAClB,OAAO,CA+BT;AAED,wBAAgB,eAAe,CAC7B,KAAK,EAAE,cAAc,EACrB,QAAQ,EAAE,cAAc,EACxB,WAAW,UAAQ,GAClB,OAAO,CAQT;AAED,wBAAgB,UAAU,CAAC,KAAK,EAAE,cAAc,EAAE,QAAQ,EAAE,cAAc,QAoBzE;AAED,wBAAgB,WAAW,CACzB,KAAK,EAAE,qBAAqB,EAC5B,qBAAqB,EAAE,OAAO,EAC9B,MAAM,CAAC,EAAE,cAAc,GACtB,cAAc,CAahB;AAED,wBAAgB,cAAc,CAC5B,MAAM,EAAE,yBAAyB,EACjC,KAAK,EAAE,cAAc,EACrB,SAAS,EAAE,YAAY,GAAG,OAAO,QA0DlC;AAED,wBAAgB,gBAAgB,CAC9B,MAAM,EAAE,yBAAyB,EACjC,KAAK,EAAE,cAAc,GACpB,YAAY,CA6Bd"}
+{"version":3,"file":"selections.d.ts","sourceRoot":"","sources":["../../src/utils/selections.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAEjD,MAAM,MAAM,YAAY,GAAG,aAAa,CAAC,KAAK,CAAC,CAAC;AAEhD,+FAA+F;AAC/F,wBAAgB,iBAAiB,CAAC,CAAC,SAAS,MAAM,EAAE,KAAK,EAAE,CAAC,GAAG,CAAC,CAK/D"}

package/esm/utils/selections.js

@@ -1,139 +1,7 @@
-import { PothosValidationError } from '@pothos/core';
-import { deepEqual } from './deep-equal.js';
-export function omitUndefinedKeys(query) {
+/** Drops keys holding `undefined`, so `{ where: cond ? filter : undefined }` reads as `{}`. */ export function omitUndefinedKeys(query) {
     const entries = Object.entries(query);
     const defined = entries.filter(([, value])=>value !== undefined);
     return defined.length === entries.length ? query : Object.fromEntries(defined);
 }
-export 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 || deepEqual(state.query, omitUndefinedKeys(query));
-}
-export 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 || deepEqual(state.query, newState.query);
-}
-export 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);
-    }
-}
-export 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
-    };
-}
-export 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 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);
-        }
-    }
-}
-export 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/esm/utils/selections.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/utils/selections.ts"],"names":["PothosValidationError","deepEqual","omitUndefinedKeys","query","entries","Object","defined","filter","value","undefined","length","fromEntries","selectionCompatible","state","selectionMap","ignoreQuery","keys","with","withSelection","extras","columns","_","some","key","has","get","existing","stateCompatible","newState","name","relationState","mergeState","allColumns","add","set","createState","table","skipDeferredFragments","parent","Set","Map","mappings","depth","mergeSelection","config","selection","relation","relations","merge","targetTableName","normalizedQuery","relatedState","selectionToQuery","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":"AAIA,6FAA6F,GAC7F,OAAO,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/lib/connection-helpers.js

@@ -8,30 +8,40 @@ Object.defineProperty(exports, "drizzleConnectionHelpers", {
         return drizzleConnectionHelpers;
     }
 });
+const _core = require("@pothos/core");
+const _adapter = require("./utils/adapter.js");
+const _awaitselections = require("./utils/await-selections.js");
 const _config = require("./utils/config.js");
 const _cursors = require("./utils/cursors.js");
 const _mapquery = require("./utils/map-query.js");
 const _refs = require("./utils/refs.js");
 const _selections = require("./utils/selections.js");
 var _builder_options_drizzle, _builder_options_drizzle1;
-function drizzleConnectionHelpers(builder, refOrType, { select, resolveNode, query, args: createArgs, maxSize = (_builder_options_drizzle = builder.options.drizzle) === null || _builder_options_drizzle === void 0 ? void 0 : _builder_options_drizzle.maxConnectionSize, defaultSize = (_builder_options_drizzle1 = builder.options.drizzle) === null || _builder_options_drizzle1 === void 0 ? void 0 : _builder_options_drizzle1.defaultConnectionSize }) {
+function drizzleConnectionHelpers(builder, refOrType, { select, resolveNode, query, args: createArgs, maxSize = (_builder_options_drizzle = builder.options.drizzle) === null || _builder_options_drizzle === void 0 ? void 0 : _builder_options_drizzle.maxConnectionSize, defaultSize = (_builder_options_drizzle1 = builder.options.drizzle) === null || _builder_options_drizzle1 === void 0 ? void 0 : _builder_options_drizzle1.defaultConnectionSize } = {}) {
     const config = (0, _config.getSchemaConfig)(builder);
+    const adapter = (0, _adapter.drizzleAdapter)(config);
     const tableName = typeof refOrType === 'string' ? refOrType : refOrType.tableName;
-    function resolve(list, args, ctx, parent) {
-        const { select, cursorFields } = getQueryArgs(args, ctx);
+    /** The user's `query`, a promise when its callback is async, which the caller awaits. */ const baseQueryFor = (args, ctx)=>(0, _core.completeValue)(typeof query === 'function' ? query(args, ctx) : query, orEmpty);
+    // Built once per helper, so a synchronous `resolve` allocates nothing beyond the connection.
+    const resolveList = (baseQuery, list, args, ctx, parent)=>{
+        const { select, cursorFields } = getQueryArgs(args, ctx, baseQuery);
         const formatCursor = (0, _cursors.getCursorFormatter)(cursorFields, config);
         return (0, _cursors.wrapConnectionResult)(list, args, select.limit, formatCursor, resolveNode !== null && resolveNode !== void 0 ? resolveNode : (edge)=>edge, parent);
+    };
+    function resolve(list, args, ctx, parent) {
+        const baseQuery = baseQueryFor(args, ctx);
+        return (0, _core.isThenable)(baseQuery) ? baseQuery.then((resolved)=>resolveList(resolved, list, args, ctx, parent)) : resolveList(baseQuery, list, args, ctx, parent);
     }
-    const getQueryArgs = (args, ctx)=>{
-        var _ref, _ref1;
-        const { limit, orderBy, where, ...fieldQuery } = (_ref = typeof query === 'function' ? query(args, ctx) : query) !== null && _ref !== void 0 ? _ref : {};
+    const getQueryArgs = (args, ctx, baseQuery)=>{
+        var _ref;
+        const { limit, orderBy, where, ...fieldQuery } = baseQuery;
         const table = config.relations[tableName];
         const { cursorFields, columns, ...connectionQuery } = (0, _cursors.drizzleCursorConnectionQuery)({
             ctx,
             maxSize,
             defaultSize: typeof defaultSize === 'function' ? defaultSize(args, ctx) : defaultSize,
             args,
-            orderBy: (_ref1 = typeof orderBy === 'function' ? orderBy(table) : orderBy) !== null && _ref1 !== void 0 ? _ref1 : (0, _config.getSchemaConfig)(builder).getPrimaryKey(tableName),
+            orderBy: (_ref = typeof orderBy === 'function' ? orderBy(table) : orderBy) !== null && _ref !== void 0 ? _ref : (0, _config.getSchemaConfig)(builder).getPrimaryKey(tableName),
             extras: fieldQuery.extras,
             where,
             config,
@@ -50,16 +60,20 @@ function drizzleConnectionHelpers(builder, refOrType, { select, resolveNode, que
             cursorFields
         };
     };
-    function getQuery(args, ctx, nestedSelectionOrInfo) {
-        var _ref;
-        var _builder_options_drizzle;
+    /**
+   * 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(args, ctx, nestedSelectionOrInfo, options) {
         const nestedSelection = typeof nestedSelectionOrInfo === 'function' ? nestedSelectionOrInfo : (select, path)=>(0, _mapquery.queryFromInfo)({
                 info: nestedSelectionOrInfo,
                 context: ctx,
                 config,
-                select,
+                select: select,
                 path
             });
+        // Both callbacks start now; the query waits for whichever of them is async.
         const nestedSelect = select ? select((sel)=>nestedSelection(sel, [
                 'edges',
                 'node'
@@ -67,20 +81,39 @@ function drizzleConnectionHelpers(builder, refOrType, { select, resolveNode, que
             'edges',
             'node'
         ]);
-        const queryArgs = getQueryArgs(args, ctx);
-        const selectState = (0, _selections.createState)(config.relations[tableName], (_ref = (_builder_options_drizzle = builder.options.drizzle) === null || _builder_options_drizzle === void 0 ? void 0 : _builder_options_drizzle.skipDeferredFragments) !== null && _ref !== void 0 ? _ref : true);
-        (0, _selections.mergeSelection)(config, selectState, queryArgs.select);
+        let baseQuery;
+        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 ((0, _core.isThenable)(nestedSelect)) {
+                nestedSelect.then(()=>{}, ()=>{});
+            }
+            throw error;
+        }
+        const built = (0, _core.isThenable)(nestedSelect) || (0, _core.isThenable)(baseQuery) ? Promise.all([
+            nestedSelect,
+            baseQuery
+        ]).then(([nested, base])=>buildQuery(nested, base, args, ctx)) : buildQuery(nestedSelect, baseQuery, args, ctx);
+        return (0, _awaitselections.checkAwaitSelections)(built, options === null || options === void 0 ? void 0 : options.awaitSelections, 'getQuery', `the ${String(tableName)} connection`);
+    }
+    // Built once per helper, so a synchronous `getQuery` allocates nothing beyond the query.
+    function buildQuery(nestedSelect, baseQuery, args, ctx) {
+        const node = adapter.createNode(config.relations[tableName]);
+        adapter.mergeQuery(node, getQueryArgs(args, ctx, baseQuery).select);
         if (typeof nestedSelect === 'object' && nestedSelect) {
-            (0, _selections.mergeSelection)(config, selectState, nestedSelect);
+            adapter.mergeQuery(node, nestedSelect);
         }
-        const baseQuery = typeof query === 'function' ? query(args, ctx) : query !== null && query !== void 0 ? query : {};
-        const queryResult = (0, _selections.selectionToQuery)(config, selectState);
         return (0, _selections.omitUndefinedKeys)({
             ...baseQuery,
-            ...queryResult
+            ...adapter.toQuery(node)
         });
     }
     const getArgs = ()=>createArgs ? builder.args(createArgs) : {};
+    function orEmpty(baseQuery) {
+        return baseQuery !== null && baseQuery !== void 0 ? baseQuery : {};
+    }
     return {
         ref: typeof refOrType === 'string' ? (0, _refs.getRefFromModel)(refOrType, builder) : refOrType,
         resolve,

package/lib/connection-helpers.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/connection-helpers.ts"],"names":["drizzleConnectionHelpers","builder","refOrType","select","resolveNode","query","args","createArgs","maxSize","options","drizzle","maxConnectionSize","defaultSize","defaultConnectionSize","config","getSchemaConfig","tableName","resolve","list","ctx","parent","cursorFields","getQueryArgs","formatCursor","getCursorFormatter","wrapConnectionResult","limit","edge","orderBy","where","fieldQuery","table","relations","columns","connectionQuery","drizzleCursorConnectionQuery","getPrimaryKey","extras","Math","abs","getQuery","nestedSelectionOrInfo","nestedSelection","path","queryFromInfo","info","context","nestedSelect","sel","queryArgs","selectState","createState","skipDeferredFragments","mergeSelection","baseQuery","queryResult","selectionToQuery","omitUndefinedKeys","getArgs","ref","getRefFromModel"],"mappings":"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"}
+{"version":3,"sources":["../src/connection-helpers.ts"],"names":["drizzleConnectionHelpers","builder","refOrType","select","resolveNode","query","args","createArgs","maxSize","options","drizzle","maxConnectionSize","defaultSize","defaultConnectionSize","config","getSchemaConfig","adapter","drizzleAdapter","tableName","baseQueryFor","ctx","completeValue","orEmpty","resolveList","baseQuery","list","parent","cursorFields","getQueryArgs","formatCursor","getCursorFormatter","wrapConnectionResult","limit","edge","resolve","isThenable","then","resolved","orderBy","where","fieldQuery","table","relations","columns","connectionQuery","drizzleCursorConnectionQuery","getPrimaryKey","extras","Math","abs","getQuery","nestedSelectionOrInfo","nestedSelection","path","queryFromInfo","info","context","nestedSelect","sel","error","built","Promise","all","nested","base","buildQuery","checkAwaitSelections","awaitSelections","String","node","createNode","mergeQuery","omitUndefinedKeys","toQuery","getArgs","ref","getRefFromModel"],"mappings":"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"}