drizzle-graphql-plus 0.8.39 → 0.8.41

package/index.cjs

@@ -1932,7 +1932,12 @@ var useSerialDirective = () => {
             });
             let result;
             if (originalResolver) {
-              result = await originalResolver(source, fieldArgs, fieldContext, info);
+              result = await originalResolver(
+                source,
+                fieldArgs,
+                fieldContext,
+                info
+              );
             } else {
               const fieldName = info.fieldName;
               result = source?.[fieldName];
@@ -2438,6 +2443,17 @@ var useExportDirective = () => {
         );
       }
       const createWrappedResolver = (originalResolver) => {
+        const valueNodeHasVariable = (node) => {
+          if (node.kind === import_graphql7.Kind.VARIABLE)
+            return true;
+          if (node.kind === import_graphql7.Kind.LIST) {
+            return node.values.some((v) => valueNodeHasVariable(v));
+          }
+          if (node.kind === import_graphql7.Kind.OBJECT) {
+            return node.fields.some((f) => valueNodeHasVariable(f.value));
+          }
+          return false;
+        };
         return async (source, fieldArgs, fieldContext, info) => {
           const ctx = fieldContext;
           const store = ctx.exportStore;
@@ -2449,55 +2465,9 @@ var useExportDirective = () => {
               variables: JSON.stringify(ctx._graphqlVariables)
             });
           }
+          const fieldNode = info.fieldNodes[0];
           let currentArgs = fieldArgs;
-          if (ctx._graphqlVariables && info.parentType instanceof import_graphql7.GraphQLObjectType) {
-            const fieldNode2 = info.fieldNodes[0];
-            if (!fieldNode2) {
-              if (isComments) {
-                logExportExecution("DEBUG fieldNode NOT FOUND");
-              }
-            } else {
-              const fieldName = fieldNode2.name.value;
-              const fieldDef = info.parentType.getFields()[fieldName];
-              if (isComments && !fieldDef) {
-                logExportExecution("DEBUG fieldDef NOT FOUND");
-              }
-              if (fieldDef) {
-                try {
-                  if (isComments) {
-                    logExportExecution("DEBUG calling getArgumentValues", {
-                      fieldNodeName: fieldNode2.name.value,
-                      fieldDefName: fieldDef.name,
-                      variablesKeys: Object.keys(
-                        ctx._graphqlVariables || {}
-                      )
-                    });
-                  }
-                  const freshArgs = (0, import_graphql7.getArgumentValues)(
-                    fieldDef,
-                    fieldNode2,
-                    ctx._graphqlVariables
-                  );
-                  if (isComments) {
-                    logExportExecution("DEBUG getArgumentValues result", {
-                      freshArgsKeys: Object.keys(freshArgs || {}),
-                      freshArgs: JSON.stringify(freshArgs)
-                    });
-                  }
-                  if (freshArgs) {
-                    currentArgs = freshArgs;
-                  }
-                } catch (e) {
-                  logExportExecution(
-                    "Failed to re-resolve args for " + info.fieldName,
-                    e
-                  );
-                }
-              }
-            }
-          }
           let resolvedArgs = currentArgs;
-          const fieldNode = info.fieldNodes[0];
           if (currentArgs && typeof currentArgs === "object") {
             if (fieldNode) {
               try {
@@ -2526,6 +2496,47 @@ var useExportDirective = () => {
               }
             }
           }
+          if (ctx._graphqlVariables && info.parentType instanceof import_graphql7.GraphQLObjectType && info.fieldName === "userFindMany" && fieldNode && fieldNode.arguments && fieldNode.arguments.some((arg) => valueNodeHasVariable(arg.value))) {
+            const fieldName = fieldNode.name.value;
+            const fieldDef = info.parentType.getFields()[fieldName];
+            if (isComments && !fieldDef) {
+              logExportExecution("DEBUG fieldDef NOT FOUND (post-exports)");
+            }
+            if (fieldDef) {
+              try {
+                if (isComments) {
+                  logExportExecution("DEBUG re-calling getArgumentValues", {
+                    fieldNodeName: fieldNode.name.value,
+                    fieldDefName: fieldDef.name,
+                    variablesKeys: Object.keys(ctx._graphqlVariables || {})
+                  });
+                }
+                const freshArgsAfterExports = (0, import_graphql7.getArgumentValues)(
+                  fieldDef,
+                  fieldNode,
+                  ctx._graphqlVariables
+                );
+                if (freshArgsAfterExports) {
+                  resolvedArgs = freshArgsAfterExports;
+                  normalizeFilterOperators(resolvedArgs);
+                  if (isComments) {
+                    logExportExecution(
+                      "DEBUG getArgumentValues result (post-exports)",
+                      {
+                        freshArgsKeys: Object.keys(freshArgsAfterExports || {}),
+                        freshArgs: JSON.stringify(freshArgsAfterExports)
+                      }
+                    );
+                  }
+                }
+              } catch (e) {
+                logExportExecution(
+                  "Failed to re-resolve args after exports for " + info.fieldName,
+                  e
+                );
+              }
+            }
+          }
           let result;
           if (originalResolver) {
             result = await originalResolver(