drizzle-graphql-plus 0.8.12 → 0.8.14

package/index.js

@@ -319,13 +319,13 @@ var extractSelectedColumnsFromTree = (tree, table) => {
       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]);
-            }
+        for (const [subFieldName, subFieldData] of Object.entries(typeFields)) {
+          console.log(
+            `    Checking subField: ${subFieldName}, name: ${subFieldData.name}`
+          );
+          if (tableColumns[subFieldData.name]) {
+            selectedColumns.push([subFieldData.name, true]);
+          } else {
           }
         }
       }
@@ -353,16 +353,12 @@ var extractSelectedColumnsFromTreeSQLFormat = (tree, table) => {
       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]
-              ]);
-            }
+        for (const [subFieldName, subFieldData] of Object.entries(typeFields)) {
+          if (tableColumns[subFieldData.name]) {
+            selectedColumns.push([
+              subFieldData.name,
+              tableColumns[subFieldData.name]
+            ]);
           }
         }
       }
@@ -879,20 +875,25 @@ var extractRelationsParamsInner = (relationMap, tables, tableName, typeName, ori
     relations
   )) {
     const relTypeName = `${isInitial ? capitalize(tableName) : typeName}${capitalize(relName)}Relation`;
-    const relFieldSelection = Object.values(baseField).find(
+    const relationField = Object.values(baseField).find(
       (field) => field.name === relName
-    )?.fieldsByTypeName[relTypeName];
-    if (!relFieldSelection)
+    );
+    if (!relationField)
       continue;
+    const allFields = {};
+    if (relationField.fieldsByTypeName) {
+      for (const [typeName2, typeFields] of Object.entries(
+        relationField.fieldsByTypeName
+      )) {
+        Object.assign(allFields, typeFields);
+      }
+    }
     const columns = extractSelectedColumnsFromTree(
-      relFieldSelection,
+      allFields,
       tables[targetTableName]
     );
     const thisRecord = {};
     thisRecord.columns = columns;
-    const relationField = Object.values(baseField).find(
-      (e) => e.name === relName
-    );
     const relationArgs = relationField?.args;
     const orderBy = relationArgs?.orderBy ? extractOrderBy(tables[targetTableName], relationArgs.orderBy) : void 0;
     const where = relationArgs?.where ? extractFilters(tables[targetTableName], relName, relationArgs?.where) : void 0;
@@ -961,11 +962,14 @@ var generateSelectArray = (db, tableName, tables, relationMap, orderArgs, filter
         const parsedInfo = parseResolveInfo(info, {
           deep: true
         });
+        const allFields = {};
+        if (parsedInfo.fieldsByTypeName) {
+          for (const fields of Object.values(parsedInfo.fieldsByTypeName)) {
+            Object.assign(allFields, fields);
+          }
+        }
         const query = queryBase.findMany({
-          columns: extractSelectedColumnsFromTree(
-            parsedInfo.fieldsByTypeName[typeName],
-            table
-          ),
+          columns: extractSelectedColumnsFromTree(allFields, table),
           offset,
           limit,
           orderBy: orderBy ? extractOrderBy(table, orderBy) : void 0,
@@ -1019,11 +1023,14 @@ var generateSelectSingle = (db, tableName, tables, relationMap, orderArgs, filte
         const parsedInfo = parseResolveInfo(info, {
           deep: true
         });
+        const allFields = {};
+        if (parsedInfo.fieldsByTypeName) {
+          for (const fields of Object.values(parsedInfo.fieldsByTypeName)) {
+            Object.assign(allFields, fields);
+          }
+        }
         const query = queryBase.findFirst({
-          columns: extractSelectedColumnsFromTree(
-            parsedInfo.fieldsByTypeName[typeName],
-            table
-          ),
+          columns: extractSelectedColumnsFromTree(allFields, table),
           offset,
           orderBy: orderBy ? extractOrderBy(table, orderBy) : void 0,
           where: where ? extractFilters(table, tableName, where) : void 0,
@@ -1419,11 +1426,14 @@ var generateSelectSingle2 = (db, tableName, tables, relationMap, orderArgs, filt
         const parsedInfo = parseResolveInfo2(info, {
           deep: true
         });
+        const allFields = {};
+        if (parsedInfo.fieldsByTypeName) {
+          for (const fields of Object.values(parsedInfo.fieldsByTypeName)) {
+            Object.assign(allFields, fields);
+          }
+        }
         const query = queryBase.findFirst({
-          columns: extractSelectedColumnsFromTree(
-            parsedInfo.fieldsByTypeName[typeName],
-            table
-          ),
+          columns: extractSelectedColumnsFromTree(allFields, table),
           offset,
           orderBy: orderBy ? extractOrderBy(table, orderBy) : void 0,
           where: where ? extractFilters(table, tableName, where) : void 0,
@@ -1796,11 +1806,14 @@ var generateSelectArray3 = (db, tableName, tables, relationMap, orderArgs, filte
         const parsedInfo = parseResolveInfo3(info, {
           deep: true
         });
+        const allFields = {};
+        if (parsedInfo.fieldsByTypeName) {
+          for (const fields of Object.values(parsedInfo.fieldsByTypeName)) {
+            Object.assign(allFields, fields);
+          }
+        }
         const query = queryBase.findMany({
-          columns: extractSelectedColumnsFromTree(
-            parsedInfo.fieldsByTypeName[typeName],
-            table
-          ),
+          columns: extractSelectedColumnsFromTree(allFields, table),
           offset,
           limit,
           orderBy: orderBy ? extractOrderBy(table, orderBy) : void 0,
@@ -1854,11 +1867,14 @@ var generateSelectSingle3 = (db, tableName, tables, relationMap, orderArgs, filt
         const parsedInfo = parseResolveInfo3(info, {
           deep: true
         });
+        const allFields = {};
+        if (parsedInfo.fieldsByTypeName) {
+          for (const fields of Object.values(parsedInfo.fieldsByTypeName)) {
+            Object.assign(allFields, fields);
+          }
+        }
         const query = queryBase.findFirst({
-          columns: extractSelectedColumnsFromTree(
-            parsedInfo.fieldsByTypeName[typeName],
-            table
-          ),
+          columns: extractSelectedColumnsFromTree(allFields, table),
           offset,
           orderBy: orderBy ? extractOrderBy(table, orderBy) : void 0,
           where: where ? extractFilters(table, tableName, where) : void 0,