@lenne.tech/nest-server 10.8.3 → 10.8.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lenne.tech/nest-server",
-  "version": "10.8.3",
+  "version": "10.8.4",
   "description": "Modern, fast, powerful Node.js web framework in TypeScript based on Nest with a GraphQL API and a connection to MongoDB (or other databases).",
   "keywords": [
     "node",

package/src/core/common/helpers/db.helper.ts

@@ -332,6 +332,21 @@ export function getPopulateOptions(info: GraphQLResolveInfo, dotSeparatedSelect?
   return result;
 }
 
+/**
+ * Get next field nodes
+ */
+export function getNextFieldNodes(nodes: readonly SelectionNode[]): FieldNode[] {
+  const result = [];
+  for (const node of nodes as FieldNode[]) {
+    if (node.name?.value) {
+      result.push(node);
+    } else if (node.selectionSet?.selections) {
+      result.push(...getNextFieldNodes(node.selectionSet.selections));
+    }
+  }
+  return result;
+}
+
 /**
  * Get populate options from selections
  */
@@ -342,10 +357,19 @@ export function getPopulatOptionsFromSelections(selectionNodes: readonly Selecti
     return populateOptions;
   }
 
+  const nodes: FieldNode[] = [];
   for (const node of selectionNodes as FieldNode[]) {
+    if (node.name?.value) {
+      nodes.push(node);
+    } else if (node.selectionSet?.selections) {
+      nodes.push(...getNextFieldNodes(node.selectionSet.selections));
+    }
+  }
+
+  for (const node of nodes) {
     // Set main path
     const option: PopulateOptions = {
-      path: node.name.value,
+      path: node.name?.value || '',
     };
 
     // Check for subfields