drizzle-graphql-plus 0.8.10 → 0.8.12

package/index.js

@@ -311,9 +311,25 @@ var extractSelectedColumnsFromTree = (tree, table) => {
   const treeEntries = Object.entries(tree);
   const selectedColumns = [];
   for (const [fieldName, fieldData] of treeEntries) {
-    if (!tableColumns[fieldData.name])
+    if (tableColumns[fieldData.name]) {
+      selectedColumns.push([fieldData.name, true]);
       continue;
-    selectedColumns.push([fieldData.name, true]);
+    }
+    if (fieldData.fieldsByTypeName) {
+      for (const [typeName, typeFields] of Object.entries(
+        fieldData.fieldsByTypeName
+      )) {
+        if (typeName.endsWith("Fields")) {
+          for (const [subFieldName, subFieldData] of Object.entries(
+            typeFields
+          )) {
+            if (tableColumns[subFieldData.name]) {
+              selectedColumns.push([subFieldData.name, true]);
+            }
+          }
+        }
+      }
+    }
   }
   if (!selectedColumns.length) {
     const columnKeys = Object.entries(tableColumns);
@@ -329,9 +345,28 @@ var extractSelectedColumnsFromTreeSQLFormat = (tree, table) => {
   const treeEntries = Object.entries(tree);
   const selectedColumns = [];
   for (const [fieldName, fieldData] of treeEntries) {
-    if (!tableColumns[fieldData.name])
+    if (tableColumns[fieldData.name]) {
+      selectedColumns.push([fieldData.name, tableColumns[fieldData.name]]);
       continue;
-    selectedColumns.push([fieldData.name, tableColumns[fieldData.name]]);
+    }
+    if (fieldData.fieldsByTypeName) {
+      for (const [typeName, typeFields] of Object.entries(
+        fieldData.fieldsByTypeName
+      )) {
+        if (typeName.endsWith("Fields")) {
+          for (const [subFieldName, subFieldData] of Object.entries(
+            typeFields
+          )) {
+            if (tableColumns[subFieldData.name]) {
+              selectedColumns.push([
+                subFieldData.name,
+                tableColumns[subFieldData.name]
+              ]);
+            }
+          }
+        }
+      }
+    }
   }
   if (!selectedColumns.length) {
     const columnKeys = Object.entries(tableColumns);
@@ -528,6 +563,24 @@ var generateTableFilterTypeCached = (table, tableName) => {
   filterTypeMap.set(table, filters);
   return filters;
 };
+var interfaceTypeMap = /* @__PURE__ */ new WeakMap();
+var generateTableInterfaceTypeCached = (table, tableName) => {
+  if (interfaceTypeMap.has(table))
+    return interfaceTypeMap.get(table);
+  const tableFields = generateTableSelectTypeFieldsCached(table, tableName);
+  const interfaceType = new GraphQLInterfaceType({
+    name: `${capitalize(tableName)}Fields`,
+    fields: tableFields,
+    resolveType(obj) {
+      if (obj.__typename) {
+        return obj.__typename;
+      }
+      return null;
+    }
+  });
+  interfaceTypeMap.set(table, interfaceType);
+  return interfaceType;
+};
 var generateSelectFields = (tables, tableName, relationMap, typeName, withOrder, relationsDepthLimit, currentDepth = 0, usedTables = /* @__PURE__ */ new Set()) => {
   const relations = relationMap[tableName];
   const relationEntries = relations ? Object.entries(relations) : [];
@@ -559,9 +612,15 @@ var generateSelectFields = (tables, tableName, relationMap, typeName, withOrder,
       newDepth,
       updatedUsedTables
     );
+    const targetTable = tables[targetTableName];
+    const targetInterface = generateTableInterfaceTypeCached(
+      targetTable,
+      targetTableName
+    );
     const relType = new GraphQLObjectType2({
       name: relTypeName,
-      fields: { ...relData.tableFields, ...relData.relationFields }
+      fields: { ...relData.tableFields, ...relData.relationFields },
+      interfaces: [targetInterface]
     });
     if (isOne) {
       rawRelationFields.push([
@@ -639,10 +698,10 @@ var generateTableTypes = (tableName, tables, relationMap, withReturning, relatio
     name: `${stylizedName}InsertInput`,
     fields: insertFields
   });
-  const tableFieldsInterface = new GraphQLInterfaceType({
-    name: `${stylizedName}Fields`,
-    fields: tableFields
-  });
+  const tableFieldsInterface = generateTableInterfaceTypeCached(
+    table,
+    tableName
+  );
   const selectSingleOutput = new GraphQLObjectType2({
     name: `${stylizedName}SelectItem`,
     fields: { ...tableFields, ...relationFields },