@pothos/plugin-drizzle 0.11.2 → 0.12.0

package/lib/schema-builder.js

@@ -63,7 +63,7 @@ schemaBuilderProto.drizzleObject = function drizzleObject(table, { select, field
         extensions: {
             ...options.extensions,
             pothosDrizzleModel: table,
-            pothosDrizzleTable: (0, _config.getSchemaConfig)(this).relations.tablesConfig[table],
+            pothosDrizzleTable: (0, _config.getSchemaConfig)(this).relations[table],
             pothosDrizzleSelect: typeof select === 'object' ? {
                 columns: {},
                 ...select
@@ -85,7 +85,7 @@ schemaBuilderProto.drizzleInterface = function drizzleInterface(table, { select,
         extensions: {
             ...options.extensions,
             pothosDrizzleModel: table,
-            pothosDrizzleTable: (0, _config.getSchemaConfig)(this).relations.tablesConfig[table],
+            pothosDrizzleTable: (0, _config.getSchemaConfig)(this).relations[table],
             pothosDrizzleSelect: typeof select === 'object' ? {
                 columns: {},
                 ...select
@@ -100,8 +100,8 @@ schemaBuilderProto.drizzleInterface = function drizzleInterface(table, { select,
 schemaBuilderProto.drizzleNode = function drizzleNode(table, { id: { column, ...idOptions }, name, variant, ...options }) {
     var _this_nodeInterfaceRef, _this;
     const schemaConfig = (0, _config.getSchemaConfig)(this);
-    const tableConfig = schemaConfig.relations.tablesConfig[table];
-    const idColumn = typeof column === 'function' ? column(tableConfig.columns) : column;
+    const tableConfig = schemaConfig.relations[table];
+    const idColumn = typeof column === 'function' ? column(tableConfig.table) : column;
     const idColumns = Array.isArray(idColumn) ? idColumn : [
         idColumn
     ];
@@ -209,7 +209,7 @@ schemaBuilderProto.drizzleInterfaceFields = function drizzleInterfaceFields(type
  //       drizzleGraphQL: {
  //         inputType: 'orderBy',
  //         table,
- //         tableConfig: getSchemaConfig(this).relations.tablesConfig[table],
+ //         tableConfig: getSchemaConfig(this).relations[table],
  //       } satisfies DrizzleGraphQLInputExtensions,
  //     },
  //   });
@@ -234,7 +234,7 @@ schemaBuilderProto.drizzleInterfaceFields = function drizzleInterfaceFields(type
  //       drizzleGraphQL: {
  //         inputType: 'filters',
  //         table,
- //         tableConfig: getSchemaConfig(this).relations.tablesConfig[table],
+ //         tableConfig: getSchemaConfig(this).relations[table],
  //       } satisfies DrizzleGraphQLInputExtensions,
  //     },
  //   });
@@ -259,7 +259,7 @@ schemaBuilderProto.drizzleInterfaceFields = function drizzleInterfaceFields(type
  //       drizzleGraphQL: {
  //         inputType: 'insert',
  //         table,
- //         tableConfig: getSchemaConfig(this).relations.tablesConfig[table],
+ //         tableConfig: getSchemaConfig(this).relations[table],
  //       } satisfies DrizzleGraphQLInputExtensions,
  //     },
  //   });
@@ -284,7 +284,7 @@ schemaBuilderProto.drizzleInterfaceFields = function drizzleInterfaceFields(type
  //       drizzleGraphQL: {
  //         inputType: 'update',
  //         table,
- //         tableConfig: getSchemaConfig(this).relations.tablesConfig[table],
+ //         tableConfig: getSchemaConfig(this).relations[table],
  //       } satisfies DrizzleGraphQLInputExtensions,
  //     },
  //   });

package/lib/schema-builder.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/schema-builder.ts"],"names":["schemaBuilderProto","SchemaBuilder","prototype","drizzleObject","table","select","fields","options","name","variant","ref","DrizzleObjectRef","getRefFromModel","objectType","extensions","pothosDrizzleModel","pothosDrizzleTable","getSchemaConfig","relations","tablesConfig","pothosDrizzleSelect","columns","pothosDrizzleLoader","ModelLoader","forModel","DrizzleObjectFieldBuilder","undefined","drizzleInterface","DrizzleInterfaceRef","interfaceType","drizzleNode","id","column","idOptions","schemaConfig","tableConfig","idColumn","idColumns","Array","isArray","interfaceRef","nodeInterfaceRef","resolve","getIDSerializer","idParser","getIDParser","typeName","nodeRef","DrizzleNodeRef","parseId","parsed","columnToTsName","modelLoader","PothosError","extendedOptions","interfaces","loadWithoutCache","context","info","record","loadSelectionForField","brandWithType","addInterfaces","configStore","onTypeConfig","nodeConfig","objectField","relay","idFieldName","t","globalID","idFieldOptions","nullable","args","parent","completeValue","type","associateParamWithRef","drizzleObjectField","fieldName","field","addFields","tableName","drizzleInterfaceField","drizzleObjectFields","drizzleInterfaceFields"],"mappings":"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"}
+{"version":3,"sources":["../src/schema-builder.ts"],"names":["schemaBuilderProto","SchemaBuilder","prototype","drizzleObject","table","select","fields","options","name","variant","ref","DrizzleObjectRef","getRefFromModel","objectType","extensions","pothosDrizzleModel","pothosDrizzleTable","getSchemaConfig","relations","pothosDrizzleSelect","columns","pothosDrizzleLoader","ModelLoader","forModel","DrizzleObjectFieldBuilder","undefined","drizzleInterface","DrizzleInterfaceRef","interfaceType","drizzleNode","id","column","idOptions","schemaConfig","tableConfig","idColumn","idColumns","Array","isArray","interfaceRef","nodeInterfaceRef","resolve","getIDSerializer","idParser","getIDParser","typeName","nodeRef","DrizzleNodeRef","parseId","parsed","columnToTsName","modelLoader","PothosError","extendedOptions","interfaces","loadWithoutCache","context","info","record","loadSelectionForField","brandWithType","addInterfaces","configStore","onTypeConfig","nodeConfig","objectField","relay","idFieldName","t","globalID","idFieldOptions","nullable","args","parent","completeValue","type","associateParamWithRef","drizzleObjectField","fieldName","field","addFields","tableName","drizzleInterfaceField","drizzleObjectFields","drizzleInterfaceFields"],"mappings":";;;;8DASO;qCAGmC;8BACN;6BACR;yBACG;2BACE;wBAED;yBACa;sBACb;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEhC,MAAMA,qBAAqBC,aAAa,CAACC,SAAS;AAElDF,mBAAmBG,aAAa,GAAG,SAASA,cAAcC,KAAK,EAAE,EAAEC,MAAM,EAAEC,MAAM,EAAE,GAAGC,SAAS;QAChFA,kBAAAA;IAAb,MAAMC,OAAOD,CAAAA,OAAAA,CAAAA,mBAAAA,QAAQE,OAAO,cAAfF,8BAAAA,mBAAmBA,QAAQC,IAAI,cAA/BD,kBAAAA,OAAmCH;IAEhD,MAAMM,MAAMH,QAAQE,OAAO,GACvB,IAAIE,2BAAgB,CAACJ,QAAQE,OAAO,EAAEL,SACrCQ,IAAAA,qBAAe,EAACR,OAAO,IAAI,EAAE;IAElCM,IAAIF,IAAI,GAAGA;IAEX,IAAI,CAACK,UAAU,CAACH,KAAK;QACnB,GAAIH,OAAO;QACXO,YAAY;YACV,GAAGP,QAAQO,UAAU;YACrBC,oBAAoBX;YACpBY,oBAAoBC,IAAAA,uBAAe,EAAC,IAAI,EAAEC,SAAS,CAACd,MAAM;YAC1De,qBACE,OAAOd,WAAW,WAAW;gBAAEe,SAAS,CAAC;gBAAG,GAAGf,MAAM;YAAC,IAAKA,mBAAAA,oBAAAA,SAAU;YACvEgB,qBAAqBC,wBAAW,CAACC,QAAQ,CAACnB,OAAO,IAAI;QACvD;QACAI;QACAF,QAAQA,SAAS,IAAMA,OAAO,IAAIkB,8CAAyB,CAACd,IAAIF,IAAI,EAAE,IAAI,EAAEJ,UAAUqB;IACxF;IAEA,OAAOf;AACT;AAEAV,mBAAmB0B,gBAAgB,GAAG,SAASA,iBAC7CtB,KAAK,EACL,EAAEC,MAAM,EAAEC,MAAM,EAAE,GAAGC,SAAS;QAEjBA,kBAAAA;IAAb,MAAMC,OAAOD,CAAAA,OAAAA,CAAAA,mBAAAA,QAAQE,OAAO,cAAfF,8BAAAA,mBAAmBA,QAAQC,IAAI,cAA/BD,kBAAAA,OAAmCH;IAEhD,MAAMM,MAAMH,QAAQE,OAAO,GACvB,IAAIkB,iCAAmB,CAACpB,QAAQE,OAAO,EAAEL,SACxCQ,IAAAA,qBAAe,EAACR,OAAO,IAAI,EAAE;IAElCM,IAAIF,IAAI,GAAGA;IAEX,IAAI,CAACoB,aAAa,CAAClB,KAAK;QACtB,GAAIH,OAAO;QACXO,YAAY;YACV,GAAGP,QAAQO,UAAU;YACrBC,oBAAoBX;YACpBY,oBAAoBC,IAAAA,uBAAe,EAAC,IAAI,EAAEC,SAAS,CAACd,MAAM;YAC1De,qBACE,OAAOd,WAAW,WAAW;gBAAEe,SAAS,CAAC;gBAAG,GAAGf,MAAM;YAAC,IAAKA,mBAAAA,oBAAAA,SAAU;YACvEgB,qBAAqBC,wBAAW,CAACC,QAAQ,CAACnB,OAAO,IAAI;QACvD;QACAI;QACAF,QAAQA,SACJ,IAAMA,OAAO,IAAIkB,8CAAyB,CAACd,IAAIF,IAAI,EAAE,IAAI,EAAEJ,OAAO,gBAClEqB;IACN;IAEA,OAAOf;AACT;AAEAV,mBAAmB6B,WAAW,GAAG,SAASA,YAIxCzB,KAAsD,EACtD,EACE0B,IAAI,EAAEC,MAAM,EAAE,GAAGC,WAAW,EAC5BxB,IAAI,EACJC,OAAO,EACP,GAAGF,SAQJ;QAMoB,wBAAA;IAJrB,MAAM0B,eAAehB,IAAAA,uBAAe,EAAC,IAAI;IACzC,MAAMiB,cAAcD,aAAaf,SAAS,CAACd,MAAM;IACjD,MAAM+B,WAAW,OAAOJ,WAAW,aAAaA,OAAOG,YAAY9B,KAAK,IAAI2B;IAC5E,MAAMK,YAAYC,MAAMC,OAAO,CAACH,YAAYA,WAAW;QAACA;KAAS;IACjE,MAAMI,gBAAe,yBAAA,CAAA,QAAA,IAAI,EAACC,gBAAgB,cAArB,6CAAA,4BAAA;IACrB,MAAMC,UAAUC,IAAAA,wBAAe,EAACN,WAAWH;IAC3C,MAAMU,WAAWC,IAAAA,oBAAW,EAACR;QACZ3B;IAAjB,MAAMoC,WAAWpC,CAAAA,OAAAA,oBAAAA,qBAAAA,UAAWD,kBAAXC,kBAAAA,OAAmBL;IACpC,MAAM0C,UAAU,IAAIC,uBAAc,CAACF,UAAUzC,OAAO;QAClD4C,SAAS,CAAClB;YACR,MAAMmB,SAASN,SAASb;YACxB,IAAIO,MAAMC,OAAO,CAACH,WAAW;gBAC3B,OAAOc;YACT;YAEA,OAAOA,MAAM,CAAChB,aAAaiB,cAAc,CAACf,UAAU;QACtD;IACF;IACA,MAAMgB,cAAc7B,wBAAW,CAACC,QAAQ,CAACnB,OAAO,IAAI,EAAEgC;IAEtD,IAAI,CAACG,cAAc;QACjB,MAAM,IAAIa,iBAAW,CAAC;IACxB;IAEA,MAAMC,kBAAkB;QACtB,GAAG9C,OAAO;QACVC;QACAC;QACA6C,YAAY;YAACf;SAAa;QAC1BgB,kBAAkB,OAChBzB,IACA0B,SACAC;YAEA,MAAMC,SAAS,MAAMP,YAAYK,SAASG,qBAAqB,CAACF,MAAMd,SAASb,KAAKe;YAEpF,IAAIa,QAAQ;gBACVE,IAAAA,mBAAa,EAACF,QAAQb;YACxB;YAEA,OAAOa;QACT;IACF;IAEA,MAAMhD,MAAM,IAAI,CAACP,aAAa,CAACC,OAAOiD;IAEtC,IAAI9C,QAAQ+C,UAAU,EAAE;QACtB5C,IAAImD,aAAa,CAACtD,QAAQ+C,UAAU;IACtC;IAEA,IAAI,CAACQ,WAAW,CAACC,YAAY,CAACrD,KAAK,CAACsD;YAGhC;YAAA;QAFF,IAAI,CAACC,WAAW,CACdvD,KACA,CAAA,mCAAA,sBAAA,AAAC,IAAI,CAACH,OAAO,CAA0C2D,KAAK,cAA5D,0CAAA,oBAA8DC,WAAW,cAAzE,6CAAA,kCAA6E,MAC7E,CAACC;gBAMM;mBALL,AACEA,EAGAC,QAAQ,CAAC;oBACN,sBAAA,AAAC,IAAI,CAAC9D,OAAO,CAA6C2D,KAAK,cAA/D,0CAAA,oBAAiEI,cAAc,AAAlF;gBACA,GAAGtC,SAAS;gBACZuC,UAAU;gBACVC,MAAM,CAAC;gBACP/B,SAAS,CAACgC,SACRC,IAAAA,mBAAa,EAACjC,QAAQgC,SAAS,CAAC3C,KAAQ,CAAA;4BACtC6C,MAAMX,WAAWxD,IAAI;4BACrBsB;wBACF,CAAA;YACJ;;IAEN;IAEA,IAAI,CAACgC,WAAW,CAACc,qBAAqB,CAAC9B,SAASpC;IAEhD,OAAOoC;AACT;AAEA9C,mBAAmB6E,kBAAkB,GAAG,SAASA,mBAAmBF,IAAI,EAAEG,SAAS,EAAEC,KAAK;IACxF,MAAMrE,MAAM,OAAOiE,SAAS,WAAW/D,IAAAA,qBAAe,EAAC+D,MAAM,IAAI,IAAKA;IACtE,IAAI,CAACb,WAAW,CAACC,YAAY,CAACrD,KAAK,CAAC,EAAEF,IAAI,EAAE;QAC1C,IAAI,CAACsD,WAAW,CAACkB,SAAS,CAACtE,KAAK,IAAO,CAAA;gBACrC,CAACoE,UAAU,EAAEC,MAAM,IAAIvD,8CAAyB,CAAChB,MAAM,IAAI,EAAEE,IAAIuE,SAAS;YAC5E,CAAA;IACF;AACF;AAEAjF,mBAAmBkF,qBAAqB,GAAG,SAASA,sBAAsBP,IAAI,EAAEG,SAAS,EAAEC,KAAK;IAC9F,MAAMrE,MAAM,OAAOiE,SAAS,WAAW/D,IAAAA,qBAAe,EAAC+D,MAAM,IAAI,IAAKA;IACtE,IAAI,CAACb,WAAW,CAACC,YAAY,CAACrD,KAAK,CAAC,EAAEF,IAAI,EAAE;QAC1C,IAAI,CAACsD,WAAW,CAACkB,SAAS,CAACtE,KAAK,IAAO,CAAA;gBACrC,CAACoE,UAAU,EAAEC,MAAM,IAAIvD,8CAAyB,CAAChB,MAAM,IAAI,EAAEE,IAAIuE,SAAS,EAAE;YAC9E,CAAA;IACF;AACF;AAEAjF,mBAAmBmF,mBAAmB,GAAG,SAASA,oBAAoBR,IAAI,EAAErE,MAAM;IAChF,MAAMI,MAAM,OAAOiE,SAAS,WAAW/D,IAAAA,qBAAe,EAAC+D,MAAM,IAAI,IAAKA;IACtE,IAAI,CAACb,WAAW,CAACC,YAAY,CAACrD,KAAK,CAAC,EAAEF,IAAI,EAAE;QAC1C,IAAI,CAACsD,WAAW,CAACkB,SAAS,CAACtE,KAAK,IAC9BJ,OAAO,IAAIkB,8CAAyB,CAAChB,MAAM,IAAI,EAAEE,IAAIuE,SAAS;IAElE;AACF;AAEAjF,mBAAmBoF,sBAAsB,GAAG,SAASA,uBAAuBT,IAAI,EAAErE,MAAM;IACtF,MAAMI,MAAM,OAAOiE,SAAS,WAAW/D,IAAAA,qBAAe,EAAC+D,MAAM,IAAI,IAAKA;IACtE,IAAI,CAACb,WAAW,CAACC,YAAY,CAACrD,KAAK,CAAC,EAAEF,IAAI,EAAE;QAC1C,IAAI,CAACsD,WAAW,CAACkB,SAAS,CAACtE,KAAK,IAC9BJ,OAAO,IAAIkB,8CAAyB,CAAChB,MAAM,IAAI,EAAEE,IAAIuE,SAAS,EAAE;IAEpE;AACF,GAEA,6EAA6E;CAC7E,wDAAwD;CACxD,mBAAmB;CACnB,kCAAkC;CAClC,uCAAuC;CACvC,MAAM;CACN,aAAa;CACb,8BAA8B;CAC9B,2BAA2B;CAC3B,wCAAwC;CACxC,4CAA4C;CAC5C,8CAA8C;CAC9C,QAAQ;CACR,8BAA8B;CAC9B,kBAAkB;CAClB,oBAAoB;CACpB,gCAAgC;CAChC,0BAA0B;CAC1B,gCAAgC;CAChC,iBAAiB;CACjB,+DAA+D;CAC/D,mDAAmD;CACnD,SAAS;CACT,QAAQ;CACR,cAAc;CAEd,6EAA6E;CAC7E,wDAAwD;CACxD,mBAAmB;CACnB,kCAAkC;CAClC,uCAAuC;CACvC,MAAM;CACN,aAAa;CACb,8BAA8B;CAC9B,2BAA2B;CAC3B,wCAAwC;CACxC,4CAA4C;CAC5C,8CAA8C;CAC9C,QAAQ;CACR,8BAA8B;CAC9B,kBAAkB;CAClB,oBAAoB;CACpB,gCAAgC;CAChC,0BAA0B;CAC1B,gCAAgC;CAChC,iBAAiB;CACjB,+DAA+D;CAC/D,mDAAmD;CACnD,SAAS;CACT,QAAQ;CACR,cAAc;CAEd,2EAA2E;CAC3E,wDAAwD;CACxD,mBAAmB;CACnB,kCAAkC;CAClC,uCAAuC;CACvC,MAAM;CACN,aAAa;CACb,8BAA8B;CAC9B,2BAA2B;CAC3B,wCAAwC;CACxC,4CAA4C;CAC5C,8CAA8C;CAC9C,QAAQ;CACR,8BAA8B;CAC9B,kBAAkB;CAClB,oBAAoB;CACpB,gCAAgC;CAChC,0BAA0B;CAC1B,+BAA+B;CAC/B,iBAAiB;CACjB,+DAA+D;CAC/D,mDAAmD;CACnD,SAAS;CACT,QAAQ;CACR,cAAc;CAEd,2EAA2E;CAC3E,wDAAwD;CACxD,mBAAmB;CACnB,kCAAkC;CAClC,uCAAuC;CACvC,MAAM;CACN,aAAa;CACb,8BAA8B;CAC9B,2BAA2B;CAC3B,wCAAwC;CACxC,4CAA4C;CAC5C,8CAA8C;CAC9C,QAAQ;CACR,8BAA8B;CAC9B,kBAAkB;CAClB,oBAAoB;CACpB,gCAAgC;CAChC,0BAA0B;CAC1B,+BAA+B;CAC/B,iBAAiB;CACjB,+DAA+D;CAC/D,mDAAmD;CACnD,SAAS;CACT,QAAQ;CACR,cAAc"}

package/lib/types.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/types.ts"],"names":["DrizzleObjectRef","drizzleTableName","Symbol","for"],"mappings":";;;;;;;;;;;QAyqBSA;eAAAA,2BAAgB;;QAxlBZC;eAAAA;;;2BAwlBoB;AAxlB1B,MAAMA,mBAAmBC,OAAOC,GAAG,CAAC"}
+{"version":3,"sources":["../src/types.ts"],"names":["DrizzleObjectRef","drizzleTableName","Symbol","for"],"mappings":";;;;;;;;;;;QAqqBSA;eAAAA,2BAAgB;;QAplBZC;eAAAA;;;2BAolBoB;AAplB1B,MAAMA,mBAAmBC,OAAOC,GAAG,CAAC"}

package/lib/utils/config.js

@@ -28,34 +28,30 @@ const configCache = (0, _core.createContextCache)((builder)=>{
     } else {
         relations = builder.options.drizzle.client._.relations;
     }
-    const dbToSchema = Object.values(relations.tables).reduce((acc, table)=>{
-        const tableName = (0, _drizzleorm.getTableName)(table);
-        if (tableName) {
-            acc[tableName] = table;
+    const columnNameMappings = {};
+    Object.values(relations).forEach(({ table })=>{
+        if ((0, _drizzleorm.isTable)(table)) {
+            Object.entries((0, _drizzleorm.getTableColumns)(table)).forEach(([tsName, col])=>{
+                if (col.uniqueName) {
+                    columnNameMappings[col.uniqueName] = tsName;
+                }
+            });
         }
-        return acc;
-    }, {});
-    const columnMappings = Object.values(dbToSchema).reduce((acc, table)=>{
-        acc[(0, _drizzleorm.getTableName)(table)] = Object.entries(table).reduce((acc, [name, column])=>{
-            acc[column.name] = name;
-            return acc;
-        }, {});
-        return acc;
-    }, {});
+    });
     var _builder_options_drizzle_skipDeferredFragments;
     return {
         skipDeferredFragments: (_builder_options_drizzle_skipDeferredFragments = builder.options.drizzle.skipDeferredFragments) !== null && _builder_options_drizzle_skipDeferredFragments !== void 0 ? _builder_options_drizzle_skipDeferredFragments : true,
         columnToTsName: (column)=>{
-            const tableName = (0, _drizzleorm.getTableName)(column.table);
-            const table = columnMappings[tableName];
-            const columnName = table === null || table === void 0 ? void 0 : table[column.name];
-            if (!columnName) {
-                throw new Error(`Could not find column mapping for ${tableName}.${column.name}`);
+            if (!column.uniqueName) {
+                throw new Error(`Column ${String(column.name)} has no uniqueName`);
+            }
+            if (!(column.uniqueName in columnNameMappings)) {
+                throw new Error(`Typescript name not found for ${column.uniqueName}`);
             }
-            return columnName;
+            return columnNameMappings[column.uniqueName];
         },
         getPrimaryKey: (tableName)=>{
-            const tableConfig = builder.options.drizzle.getTableConfig(relations.tables[tableName]);
+            const tableConfig = builder.options.drizzle.getTableConfig(relations[tableName].table);
             const primaryKey = tableConfig.columns.find((column)=>column.primary);
             if (primaryKey) {
                 return [

package/lib/utils/config.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/utils/config.ts"],"names":["drizzleClientCache","getClient","getSchemaConfig","configCache","createContextCache","builder","relations","options","drizzle","client","_","dbToSchema","Object","values","tables","reduce","acc","table","tableName","getTableName","columnMappings","entries","name","column","skipDeferredFragments","columnToTsName","columnName","Error","getPrimaryKey","tableConfig","getTableConfig","primaryKey","columns","find","primary","primaryKeys","key","length","uniqueColumn","isUnique","clientConfig","ctx","_ctx","context"],"mappings":"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"}
+{"version":3,"sources":["../../src/utils/config.ts"],"names":["drizzleClientCache","getClient","getSchemaConfig","configCache","createContextCache","builder","relations","options","drizzle","client","_","columnNameMappings","Object","values","forEach","table","isTable","entries","getTableColumns","tsName","col","uniqueName","skipDeferredFragments","columnToTsName","column","Error","String","name","getPrimaryKey","tableName","tableConfig","getTableConfig","primaryKey","columns","find","primary","primaryKeys","key","length","uniqueColumn","isUnique","clientConfig","ctx","_ctx","context"],"mappings":";;;;;;;;;;;QA0EaA;eAAAA;;QAsBGC;eAAAA;;QANAC;eAAAA;;;sBA1FqC;4BACgC;AASrF,MAAMC,cAAcC,IAAAA,wBAAkB,EACpC,CAACC;IACC,IAAIC;IACJ,IAAID,QAAQE,OAAO,CAACC,OAAO,CAACF,SAAS,EAAE;QACrCA,YAAYD,QAAQE,OAAO,CAACC,OAAO,CAACF,SAAS;IAC/C,OAAO;QACLA,YAAY,AAACD,QAAQE,OAAO,CAACC,OAAO,CAACC,MAAM,CAAmBC,CAAC,CAACJ,SAAS;IAC3E;IAEA,MAAMK,qBAA6C,CAAC;IAEpDC,OAAOC,MAAM,CAACP,WAAWQ,OAAO,CAAC,CAAC,EAAEC,KAAK,EAAE;QACzC,IAAIC,IAAAA,mBAAO,EAACD,QAAQ;YAClBH,OAAOK,OAAO,CAACC,IAAAA,2BAAe,EAACH,QAAQD,OAAO,CAAC,CAAC,CAACK,QAAQC,IAAI;gBAC3D,IAAIA,IAAIC,UAAU,EAAE;oBAClBV,kBAAkB,CAACS,IAAIC,UAAU,CAAC,GAAGF;gBACvC;YACF;QACF;IACF;QAGyBd;IADzB,OAAO;QACLiB,uBAAuBjB,CAAAA,iDAAAA,QAAQE,OAAO,CAACC,OAAO,CAACc,qBAAqB,cAA7CjB,4DAAAA,iDAAiD;QACxEkB,gBAAgB,CAACC;YACf,IAAI,CAACA,OAAOH,UAAU,EAAE;gBACtB,MAAM,IAAII,MAAM,CAAC,OAAO,EAAEC,OAAOF,OAAOG,IAAI,EAAE,kBAAkB,CAAC;YACnE;YAEA,IAAI,CAAEH,CAAAA,OAAOH,UAAU,IAAIV,kBAAiB,GAAI;gBAC9C,MAAM,IAAIc,MAAM,CAAC,8BAA8B,EAAED,OAAOH,UAAU,EAAE;YACtE;YAEA,OAAOV,kBAAkB,CAACa,OAAOH,UAAU,CAAC;QAC9C;QACAO,eAAe,CAACC;YACd,MAAMC,cAAczB,QAAQE,OAAO,CAACC,OAAO,CAACuB,cAAc,CACxDzB,SAAS,CAACuB,UAAU,CAACd,KAAK;YAG5B,MAAMiB,aAAaF,YAAYG,OAAO,CAACC,IAAI,CAAC,CAACV,SAAWA,OAAOW,OAAO;YAEtE,IAAIH,YAAY;gBACd,OAAO;oBAACA;iBAAW;YACrB;YAEA,MAAMI,cAAcN,YAAYM,WAAW,CAACF,IAAI,CAAC,CAACG,MAAQA,IAAIJ,OAAO,CAACK,MAAM,GAAG;YAE/E,IAAIF,aAAa;gBACf,OAAOA,YAAYH,OAAO;YAC5B;YAEA,MAAMM,eAAeT,YAAYG,OAAO,CAACC,IAAI,CAAC,CAACV,SAAWA,OAAOgB,QAAQ;YAEzE,IAAID,cAAc;gBAChB,OAAO;oBAACA;iBAAa;YACvB;YAEA,MAAM,IAAId,MAAM,CAAC,qCAAqC,EAAEI,WAAW;QACrE;QACAvB;IACF;AACF;AAGK,MAAMN,qBAAqBI,IAAAA,wBAAkB,EAClD,CAACC;IACC,MAAMoC,eAAepC,QAAQE,OAAO,CAACC,OAAO,CAACC,MAAM;IACnD,MAAMR,YACJ,OAAOwC,iBAAiB,aACpBrC,IAAAA,wBAAkB,EAAC,CAACsC,MAAQD,aAAaC,QACzC,CAACC,OAAiBF;IAExB,OAAOrC,IAAAA,wBAAkB,EAAC,CAACwC;QACzB,MAAMnC,SAASR,UAAU2C;QAEzB,OAAOnC;IACT;AACF;AAGK,SAASP,gBACdG,OAA+C;IAE/C,OAAOF,YAAYE;AACrB;AAEO,SAASJ,UACdI,OAA+C,EAC/CuC,OAAe;IAEf,OAAO5C,mBAAmBK,SAAkBuC;AAC9C"}

package/lib/utils/cursors.js

@@ -56,6 +56,7 @@ _export(exports, {
     }
 });
 const _core = require("@pothos/core");
+const _drizzleorm = require("drizzle-orm");
 const _mapquery = require("./map-query");
 const DEFAULT_MAX_SIZE = 100;
 const DEFAULT_SIZE = 20;
@@ -168,18 +169,19 @@ function parseSerializedIDColumn(id, field) {
         return id;
     }
     try {
-        switch(field.dataType){
-            case 'date':
-                return new Date(id);
-            case 'string':
-                return id;
-            case 'number':
-                return Number.parseInt(id, 10);
-            case 'bigint':
-                return BigInt(id);
-            default:
-                throw new _core.PothosValidationError(`Unsupported ID type ${field.dataType}`);
+        if (field.dataType.startsWith('number')) {
+            return Number.parseInt(id, 10);
+        }
+        if (field.dataType.startsWith('bigint')) {
+            return BigInt(id);
+        }
+        if (field.dataType.startsWith('string')) {
+            return id;
+        }
+        if (field.dataType === 'object date') {
+            return new Date(id);
         }
+        throw new _core.PothosValidationError(`Unsupported ID type ${field.dataType}`);
     } catch (error) {
         if (error instanceof _core.PothosValidationError) {
             throw error;
@@ -292,9 +294,10 @@ function parseOrderBy(config, table, orderBy, invert) {
             });
         }
     } else {
+        const tableColumns = (0, _drizzleorm.getTableColumns)(table.table);
         Object.entries(orderBy).forEach(([name, direction])=>{
             if (direction) {
-                const column = table.columns[name];
+                const column = tableColumns[name];
                 columns.push(column);
                 entries.push([
                     name,
@@ -450,7 +453,7 @@ function wrapConnectionResult(results, args, limit, cursor, resolveNode, parent)
     return connection;
 }
 async function resolveDrizzleCursorConnection(tableName, info, typeName, config, options, resolve, parent) {
-    const table = config.relations.tablesConfig[tableName];
+    const table = config.relations[tableName];
     let query;
     let formatter;
     const results = await resolve((q = {})=>{
@@ -458,7 +461,7 @@ async function resolveDrizzleCursorConnection(tableName, info, typeName, config,
         const { cursorColumns, ...connectionQuery } = drizzleCursorConnectionQuery({
             ...options,
             config,
-            orderBy: (_ref = typeof q.orderBy === 'function' ? q.orderBy(table.columns) : q.orderBy) !== null && _ref !== void 0 ? _ref : config.getPrimaryKey(table.tsName),
+            orderBy: (_ref = typeof q.orderBy === 'function' ? q.orderBy(table.table) : q.orderBy) !== null && _ref !== void 0 ? _ref : config.getPrimaryKey(table.name),
             table
         });
         formatter = getCursorFormatter(cursorColumns, config);

package/lib/utils/cursors.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/utils/cursors.ts"],"names":["drizzleCursorConnectionQuery","formatCursorChunk","formatDrizzleCursor","formatIDChunk","getColumnParser","getColumnSerializer","getCursorFormatter","getCursorParser","getIDParser","getIDSerializer","parseDrizzleCursor","parseSerializedDrizzleColumn","parseSerializedIDColumn","resolveDrizzleCursorConnection","wrapConnectionResult","DEFAULT_MAX_SIZE","DEFAULT_SIZE","value","Date","String","Number","PothosValidationError","record","fields","config","length","map","field","keyAsName","JSON","stringify","col","columnToTsName","serializer","encodeBase64","cursor","decoded","decodeBase64","startsWith","slice","type","rawValue","match","parseInt","parse","BigInt","id","dataType","error","name","parsed","Array","isArray","forEach","i","parseOrderBy","table","orderBy","invert","entries","columns","normalized","asc","desc","push","direction","column","Object","fromEntries","args","ctx","maxSize","defaultSize","where","before","after","first","last","maxSizeForConnection","defaultSizeForConnection","limit","Math","min","inverted","parsedOrderBy","whereClauses","cursorParser","parsedCursor","parts","index","columnName","compare","gt","lt","AND","c","OR","cursorColumns","results","resolveNode","parent","edges","gotFullResults","abs","hasNextPage","hasPreviousPage","nodes","connection","pageInfo","startCursor","endCursor","node","reverse","tableName","info","typeName","options","resolve","relations","tablesConfig","query","formatter","q","connectionQuery","getPrimaryKey","tsName","queryFromInfo","context","select","paths","undefined"],"mappings":"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"}
+{"version":3,"sources":["../../src/utils/cursors.ts"],"names":["drizzleCursorConnectionQuery","formatCursorChunk","formatDrizzleCursor","formatIDChunk","getColumnParser","getColumnSerializer","getCursorFormatter","getCursorParser","getIDParser","getIDSerializer","parseDrizzleCursor","parseSerializedDrizzleColumn","parseSerializedIDColumn","resolveDrizzleCursorConnection","wrapConnectionResult","DEFAULT_MAX_SIZE","DEFAULT_SIZE","value","Date","String","Number","PothosValidationError","record","fields","config","length","map","field","keyAsName","JSON","stringify","col","columnToTsName","serializer","encodeBase64","cursor","decoded","decodeBase64","startsWith","slice","type","rawValue","match","parseInt","parse","BigInt","id","dataType","error","name","parsed","Array","isArray","forEach","i","parseOrderBy","table","orderBy","invert","entries","columns","normalized","asc","desc","push","direction","column","tableColumns","getTableColumns","Object","fromEntries","args","ctx","maxSize","defaultSize","where","before","after","first","last","maxSizeForConnection","defaultSizeForConnection","limit","Math","min","inverted","parsedOrderBy","whereClauses","cursorParser","parsedCursor","parts","index","columnName","compare","gt","lt","AND","c","OR","cursorColumns","results","resolveNode","parent","edges","gotFullResults","abs","hasNextPage","hasPreviousPage","nodes","connection","pageInfo","startCursor","endCursor","node","reverse","tableName","info","typeName","options","resolve","relations","query","formatter","q","connectionQuery","getPrimaryKey","queryFromInfo","context","select","paths","undefined"],"mappings":"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"}

package/lib/utils/selections.js

@@ -29,7 +29,6 @@ _export(exports, {
     }
 });
 const _core = require("@pothos/core");
-const _drizzleorm = require("drizzle-orm");
 const _deepequal = require("./deep-equal");
 function selectionCompatible(state, selectionMap, ignoreQuery = false) {
     if (typeof selectionMap === 'boolean') {
@@ -97,11 +96,9 @@ function mergeSelection(config, state, selection) {
         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.dbName}`);
+                throw new _core.PothosValidationError(`Relation ${key} does not exist on ${state.table.name}`);
             }
-            const tableUniqueName = (0, _drizzleorm.getTableUniqueName)(relation.targetTable);
-            const tableName = config.relations.tableNamesMap[tableUniqueName];
-            merge(config.relations.tablesConfig[tableName], key, value);
+            merge(config.relations[relation.targetTableName], key, value);
         }
     }
     if (Object.keys(query).length > 0) {
@@ -138,19 +135,16 @@ function mergeSelection(config, state, selection) {
 function selectionToQuery(config, state) {
     const query = {
         ...state.query,
+        columns: undefined,
         with: {},
-        columns: {},
         extras: {}
     };
-    if (state.allColumns) {
-        for (const key of Object.keys(state.table.columns)){
-            query.columns[key] = true;
-        }
-    } else {
+    if (!state.allColumns) {
+        query.columns = {};
         for (const key of state.columns){
             query.columns[key] = true;
         }
-        for (const column of config.getPrimaryKey(state.table.tsName)){
+        for (const column of config.getPrimaryKey(state.table.name)){
             const tsName = config.columnToTsName(column);
             query.columns[tsName] = true;
         }

package/lib/utils/selections.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/utils/selections.ts"],"names":["createState","mergeSelection","mergeState","selectionCompatible","selectionToQuery","stateCompatible","state","selectionMap","ignoreQuery","Object","keys","query","length","with","withSelection","extras","columns","_","entries","some","key","value","has","get","existing","deepEqual","newState","name","relationState","allColumns","add","set","table","skipDeferredFragments","parent","Set","Map","mappings","depth","config","selection","relation","relations","PothosValidationError","dbName","tableUniqueName","getTableUniqueName","targetTable","tableName","tableNamesMap","merge","tablesConfig","relatedState","column","getPrimaryKey","tsName","columnToTsName","forEach","sel"],"mappings":"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"}
+{"version":3,"sources":["../../src/utils/selections.ts"],"names":["createState","mergeSelection","mergeState","selectionCompatible","selectionToQuery","stateCompatible","state","selectionMap","ignoreQuery","Object","keys","query","length","with","withSelection","extras","columns","_","entries","some","key","value","has","get","existing","deepEqual","newState","name","relationState","allColumns","add","set","table","skipDeferredFragments","parent","Set","Map","mappings","depth","config","selection","relation","relations","PothosValidationError","merge","targetTableName","relatedState","undefined","column","getPrimaryKey","tsName","columnToTsName","forEach","sel"],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pothos/plugin-drizzle",
-  "version": "0.11.2",
+  "version": "0.12.0",
   "description": "A Pothos plugin for drizzle",
   "main": "./lib/index.js",
   "types": "./dts/index.d.ts",
@@ -35,22 +35,22 @@
   },
   "peerDependencies": {
     "@pothos/core": "*",
-    "drizzle-orm": "^1.0.0",
+    "drizzle-orm": ">=1.0.0-beta.1",
     "graphql": "^16.10.0"
   },
   "devDependencies": {
     "@libsql/client": "^0.15.10",
     "drizzle-graphql": "^0.8.5",
-    "drizzle-kit": "1.0.0-beta.1-c0277c0",
-    "drizzle-orm": "1.0.0-beta.1-c0277c0",
+    "drizzle-kit": "1.0.0-beta.1-2acab7f",
+    "drizzle-orm": "1.0.0-beta.1-2acab7f",
     "graphql-scalars": "^1.24.2",
     "graphql-tag": "^2.12.6",
     "postgres": "^3.4.7",
-    "@pothos/core": "4.8.1",
     "@pothos/plugin-add-graphql": "4.2.4",
-    "@pothos/plugin-scope-auth": "4.1.5",
-    "@pothos/plugin-errors": "4.4.2",
     "@pothos/plugin-relay": "4.6.2",
+    "@pothos/plugin-errors": "4.4.2",
+    "@pothos/plugin-scope-auth": "4.1.5",
+    "@pothos/core": "4.9.0",
     "@pothos/plugin-with-input": "4.1.3",
     "@pothos/test-utils": "2.1.2"
   },

package/src/connection-helpers.ts

@@ -2,7 +2,6 @@ import type { InputFieldMap, InputShapeFromFields, SchemaTypes } from '@pothos/c
 import type {
   BuildQueryResult,
   DBQueryConfig,
-  ExtractTablesWithRelations,
   RelationsFilter,
   TableRelationalConfig,
 } from 'drizzle-orm';
@@ -21,9 +20,9 @@ import { createState, mergeSelection, selectionToQuery } from './utils/selection
 
 export function drizzleConnectionHelpers<
   Types extends SchemaTypes,
-  Type extends DrizzleRef<Types> | keyof Types['DrizzleRelationsConfig'],
-  Selection extends DBQueryConfig<'one', Types['DrizzleRelationsConfig'], Table> | true,
-  Table extends TableRelationalConfig = Types['DrizzleRelationsConfig'][Type extends DrizzleRef<
+  Type extends DrizzleRef<Types> | keyof Types['DrizzleRelations'],
+  Selection extends DBQueryConfig<'one', Types['DrizzleRelations'], TableConfig> | true,
+  TableConfig extends TableRelationalConfig = Types['DrizzleRelations'][Type extends DrizzleRef<
     Types,
     infer T
   >
@@ -32,14 +31,14 @@ export function drizzleConnectionHelpers<
   Shape = Type extends DrizzleRef<
     // biome-ignore lint/suspicious/noExplicitAny: this is fine
     any,
-    keyof Types['DrizzleRelationsConfig'],
+    keyof Types['DrizzleRelations'],
     infer S
   >
     ? S
-    : BuildQueryResult<Types['DrizzleRelationsConfig'], Table, true>,
+    : BuildQueryResult<Types['DrizzleRelations'], TableConfig, true>,
   EdgeShape = true extends Selection
     ? Shape
-    : BuildQueryResult<Types['DrizzleRelationsConfig'], Table, Selection>,
+    : BuildQueryResult<Types['DrizzleRelations'], TableConfig, Selection>,
   NodeShape = EdgeShape,
   ExtraArgs extends InputFieldMap = {},
 >(
@@ -59,7 +58,7 @@ export function drizzleConnectionHelpers<
       args: InputShapeFromFields<ExtraArgs> & PothosSchemaTypes.DefaultConnectionArguments,
       ctx: Types['Context'],
     ) => Selection;
-    query?: QueryForDrizzleConnection<Types, Table> extends infer QueryConfig
+    query?: QueryForDrizzleConnection<Types, TableConfig> extends infer QueryConfig
       ?
           | QueryConfig
           | ((args: InputShapeFromFields<ExtraArgs>, context: Types['Context']) => QueryConfig)
@@ -116,7 +115,7 @@ export function drizzleConnectionHelpers<
   ) => {
     const { limit, orderBy, where, ...fieldQuery } =
       (typeof query === 'function' ? query(args, ctx) : query) ?? {};
-    const table = config.relations.tablesConfig[tableName] as Table;
+    const table = config.relations[tableName];
 
     const { cursorColumns, columns, ...connectionQuery } = drizzleCursorConnectionQuery({
       ctx,
@@ -169,7 +168,7 @@ export function drizzleConnectionHelpers<
     const queryArgs = getQueryArgs(args, ctx);
 
     const selectState = createState(
-      config.relations.tablesConfig[tableName],
+      config.relations[tableName],
       builder.options.drizzle?.skipDeferredFragments ?? true,
     );
 
@@ -187,9 +186,11 @@ export function drizzleConnectionHelpers<
       ...queryResult,
     } as unknown as Omit<Selection, 'orderBy'> & {
       orderBy: {
-        [K in keyof Table['columns']]?: 'asc' | 'desc' | undefined;
+        [K in TableConfig['table']['_'] extends { columns: infer Columns }
+          ? keyof Columns
+          : never]?: 'asc' | 'desc' | undefined;
       };
-      where: RelationsFilter<Table, ExtractTablesWithRelations<Types['DrizzleRelations']>>;
+      where: RelationsFilter<TableConfig, Types['DrizzleRelations']>;
     };
   }
 

package/src/drizzle-field-builder.ts

@@ -18,7 +18,7 @@ import {
   type TypeParam,
 } from '@pothos/core';
 import {
-  getTableUniqueName,
+  getTableName,
   type InferSelectModel,
   Many,
   type Table,
@@ -197,13 +197,11 @@ export class DrizzleObjectFieldBuilder<
     edgeOptions = {},
   ) {
     const schemaConfig = getSchemaConfig(this.builder);
-    const relationField =
-      schemaConfig.relations.tablesConfig?.[this.table].relations[name as string];
-    const tableUniqueName = getTableUniqueName(relationField.targetTable as Table);
-    const tableName = schemaConfig.relations.tableNamesMap[tableUniqueName];
-    const relatedModel = schemaConfig.relations.tables[tableName] as Table;
+    const relationField = schemaConfig.relations?.[this.table].relations[name as string];
+    const tableName = getTableName(relationField.targetTable as Table);
+    const relatedTable = schemaConfig.relations[tableName];
 
-    if (!relatedModel) {
+    if (!relatedTable) {
       throw new PothosSchemaError(
         `Could not find relation ${name as string} on table ${this.table}`,
       );
@@ -216,20 +214,17 @@ export class DrizzleObjectFieldBuilder<
       const { limit, orderBy, where, ...fieldQuery } =
         (typeof query === 'function' ? query(args, ctx) : query) ?? {};
 
-      const tableUniqueName = getTableUniqueName(relatedModel as Table);
-      const tableName = schemaConfig.relations.tableNamesMap[tableUniqueName];
-
       const { cursorColumns, columns, ...connectionQuery } = drizzleCursorConnectionQuery({
         ctx,
         maxSize,
         defaultSize,
         args,
         orderBy:
-          (typeof orderBy === 'function' ? orderBy(relatedModel) : orderBy) ??
+          (typeof orderBy === 'function' ? orderBy(relatedTable.table) : orderBy) ??
           getSchemaConfig(this.builder).getPrimaryKey(tableName),
         where,
         config: schemaConfig,
-        table: schemaConfig.relations.tablesConfig[tableName],
+        table: relatedTable,
       });
 
       return {
@@ -315,7 +310,7 @@ export class DrizzleObjectFieldBuilder<
   }
 
   variant<
-    Variant extends DrizzleRef<Types, TableConfig['tsName']> | TableConfig['tsName'],
+    Variant extends DrizzleRef<Types, TableConfig['name']> | TableConfig['name'],
     Args extends InputFieldMap,
     Nullable,
     ResolveShape,
@@ -326,7 +321,7 @@ export class DrizzleObjectFieldBuilder<
       [
         options: VariantFieldOptions<
           Types,
-          TableConfig['tsName'] & keyof Types['DrizzleRelationsConfig'],
+          TableConfig['name'] & keyof Types['DrizzleRelations'],
           Variant,
           Args,
           Nullable,
@@ -393,19 +388,16 @@ export class DrizzleObjectFieldBuilder<
   ): FieldRef<Types, TypesForRelation<Types, TableConfig['relations'][Field]>, 'Object'> {
     const [options = {} as never] = allArgs;
     const schemaConfig = getSchemaConfig(this.builder);
-    const relationField =
-      schemaConfig.relations.tablesConfig?.[this.table].relations[name as string];
-
-    const tableUniqueName = getTableUniqueName(relationField.targetTable as Table);
-    const tableName = schemaConfig.relations.tableNamesMap[tableUniqueName];
-    const relatedModel = schemaConfig.relations.tables[tableName];
+    const relationField = schemaConfig.relations?.[this.table].relations[name as string];
+    const tableName = getTableName(relationField.targetTable as Table);
+    const relatedTable = schemaConfig.relations[tableName];
 
-    if (!relatedModel) {
+    if (!relatedTable) {
       throw new PothosSchemaError(
         `Could not find relation ${name as string} on table ${this.table}`,
       );
     }
-    const ref = options.type ?? getRefFromModel(tableName, this.builder);
+    const ref = options.type ?? getRefFromModel(relatedTable.name, this.builder);
 
     const { query = {}, extensions, ...rest } = options;