Fixed fields not being selected properly from fragments

Author: Sukairo-02

.gitignore

@@ -10,8 +10,9 @@ server
 runMysql.ts
 runMysql-old.ts
 runPg.ts
-Tests/.temp
-Tests/Migrations
+tests/.temp
+tests/Migrations
 .DS_Store
 drizzle.test-heavy.ts
-changes.md
+changes.md
+tests/isolated.test.ts

package.json

@@ -2,7 +2,7 @@
 	"name": "drizzle-graphql",
 	"type": "module",
 	"author": "Drizzle Team",
-	"version": "0.8.4",
+	"version": "0.8.5",
 	"description": "Automatically generate GraphQL schema or customizable schema config fields from Drizzle ORM schema",
 	"scripts": {
 		"build": "pnpm tsx scripts/build.ts",
@@ -44,15 +44,15 @@
 		"cpy": "^11.0.1",
 		"dockerode": "^4.0.2",
 		"dprint": "^0.45.1",
-		"drizzle-kit": "^0.22.8",
-		"drizzle-orm": "0.31.2",
+		"drizzle-kit": "^0.24.0",
+		"drizzle-orm": "0.33.0",
 		"get-port": "^7.0.0",
 		"glob": "^10.3.10",
 		"graphql": "^16.3.0",
 		"graphql-yoga": "^5.1.1",
 		"mysql2": "^3.9.2",
 		"node-pg": "^1.0.1",
-		"pg": "^8.11.5",
+		"pg": "^8.12.0",
 		"postgres": "^3.4.3",
 		"recast": "^0.23.6",
 		"resolve-tspaths": "^0.8.18",

pnpm-lock.yaml

@@ -32,9 +32,7 @@ import {
 	GraphQLNonNull,
 	GraphQLObjectType,
 	GraphQLString,
-	Kind,
 } from 'graphql';
-import { parseResolveInfo } from 'graphql-parse-resolve-info';
 
 import { capitalize } from '@/util/case-ops';
 import { remapFromGraphQLCore } from '@/util/data-mappers';
@@ -46,7 +44,6 @@ import {
 } from '@/util/type-converter';
 
 import type { Column, Table } from 'drizzle-orm';
-import type { FieldNode, GraphQLResolveInfo } from 'graphql';
 import type { ResolveTree } from 'graphql-parse-resolve-info';
 import type {
 	FilterColumnOperators,
@@ -70,35 +67,6 @@ const rqbCrashTypes = [
 	'SQLiteBlobBuffer',
 ];
 
-export const extractSelectedColumnsFromNode = (info: FieldNode, table: Table): Record<string, true> => {
-	const tableColumns = getTableColumns(table);
-
-	if (!info.selectionSet) {
-		const columnKeys = Object.entries(tableColumns);
-		const columnName = columnKeys.find((e) => rqbCrashTypes.find((haram) => e[1].columnType !== haram))?.[0]
-			?? columnKeys[0]![0];
-
-		return Object.fromEntries([[columnName, true]]);
-	}
-
-	const selectedColumns: SelectedColumnsRaw = [];
-	for (const columnSelection of info.selectionSet.selections) {
-		if (columnSelection.kind !== Kind.FIELD || !tableColumns[columnSelection.name.value]) continue;
-
-		selectedColumns.push([columnSelection.name.value, true]);
-	}
-
-	if (!selectedColumns.length) {
-		const columnKeys = Object.entries(tableColumns);
-		const columnName = columnKeys.find((e) => rqbCrashTypes.find((haram) => e[1].columnType !== haram))?.[0]
-			?? columnKeys[0]![0];
-
-		selectedColumns.push([columnName, true]);
-	}
-
-	return Object.fromEntries(selectedColumns);
-};
-
 export const extractSelectedColumnsFromTree = (
 	tree: Record<string, ResolveTree>,
 	table: Table,
@@ -125,32 +93,34 @@ export const extractSelectedColumnsFromTree = (
 	return Object.fromEntries(selectedColumns);
 };
 
-export const extractSelectedColumnsSQLFormat = <TTable extends Table>(
-	info: GraphQLResolveInfo,
-	queryName: string,
-	table: TTable,
-): Record<string, Column> => {
-	const tableSelection = info.operation.selectionSet.selections.find(
-		(e) => e.kind === Kind.FIELD && e.name.value === queryName,
-	) as FieldNode | undefined;
+/**
+ * Can't automatically determine column type on type level
+ * Since drizzle table types extend eachother
+ */
+export const extractSelectedColumnsFromTreeSQLFormat = <TColType extends Column = Column>(
+	tree: Record<string, ResolveTree>,
+	table: Table,
+): Record<string, TColType> => {
+	const tableColumns = getTableColumns(table);
 
+	const treeEntries = Object.entries(tree);
 	const selectedColumns: SelectedSQLColumns = [];
 
-	if (!tableSelection || !tableSelection.selectionSet) throw new GraphQLError('Received empty column selection!');
-
-	for (const columnSelection of tableSelection.selectionSet.selections) {
-		if (columnSelection.kind !== Kind.FIELD || columnSelection.name.value === '__typename') continue;
+	for (const [fieldName, fieldData] of treeEntries) {
+		if (!tableColumns[fieldData.name]) continue;
 
-		selectedColumns.push([columnSelection.name.value, table[columnSelection.name.value as keyof Table] as Column]);
+		selectedColumns.push([fieldData.name, tableColumns[fieldData.name]!]);
 	}
 
 	if (!selectedColumns.length) {
-		const columnKeys = Object.entries(getTableColumns(table));
+		const columnKeys = Object.entries(tableColumns);
+		const columnName = columnKeys.find((e) => rqbCrashTypes.find((haram) => e[1].columnType !== haram))?.[0]
+			?? columnKeys[0]![0];
 
-		selectedColumns.push([columnKeys[0]![0], columnKeys[0]![1]]);
+		selectedColumns.push([columnName, tableColumns[columnName]!]);
 	}
 
-	return Object.fromEntries(selectedColumns) as any;
+	return Object.fromEntries(selectedColumns) as Record<string, TColType>;
 };
 
 export const innerOrder = new GraphQLInputObjectType({
@@ -222,7 +192,7 @@ const generateColumnFilterValues = (column: Column, tableName: string, columnNam
 };
 
 const orderMap = new WeakMap<Object, Record<string, ConvertedInputColumn>>();
-const generateTableOrderCached = (table: Table, tableName: string) => {
+const generateTableOrderCached = (table: Table) => {
 	if (orderMap.has(table)) return orderMap.get(table)!;
 
 	const columns = getTableColumns(table);
@@ -281,7 +251,7 @@ const orderTypeMap = new WeakMap<Object, GraphQLInputObjectType>();
 const generateTableOrderTypeCached = (table: Table, tableName: string) => {
 	if (orderTypeMap.has(table)) return orderTypeMap.get(table)!;
 
-	const orderColumns = generateTableOrderCached(table, tableName);
+	const orderColumns = generateTableOrderCached(table);
 	const order = new GraphQLInputObjectType({
 		name: `${capitalize(tableName)}OrderBy`,
 		fields: orderColumns,
@@ -716,13 +686,10 @@ export const extractRelationsParams = (
 	relationMap: Record<string, Record<string, TableNamedRelations>>,
 	tables: Record<string, Table>,
 	tableName: string,
-	info: GraphQLResolveInfo,
+	info: ResolveTree | undefined,
 	typeName: string,
 ): Record<string, Partial<ProcessedTableSelectArgs>> | undefined => {
-	const parsedInfo = parseResolveInfo(info, {
-		deep: true,
-	}) as ResolveTree | undefined;
-	if (!parsedInfo) return undefined;
+	if (!info) return undefined;
 
-	return extractRelationsParamsInner(relationMap, tables, tableName, typeName, parsedInfo, true);
+	return extractRelationsParamsInner(relationMap, tables, tableName, typeName, info, true);
 };