@constructive-io/graphql-query 3.20.1 → 3.21.0

package/esm/generators/select.js

@@ -252,8 +252,9 @@ function convertFieldSelectionToSelectionOptions(table, allTables, options) {
  */
 function generateSelectQueryAST(table, allTables, selection, options, relationFieldMap) {
     const pluralName = toCamelCasePlural(table.name, table);
-    // Generate field selections
-    const fieldSelections = generateFieldSelectionsFromOptions(table, allTables, selection, relationFieldMap);
+    // Generate field selections, collecting any variable definitions from field args
+    const fieldArgVarDefs = [];
+    const fieldSelections = generateFieldSelectionsFromOptions(table, allTables, selection, relationFieldMap, fieldArgVarDefs);
     // Build the query AST
     const variableDefinitions = [];
     const queryArgs = [];
@@ -358,7 +359,7 @@ function generateSelectQueryAST(table, allTables, selection, options, relationFi
             t.operationDefinition({
                 operation: OperationTypeNode.QUERY,
                 name: `${pluralName}Query`,
-                variableDefinitions,
+                variableDefinitions: [...variableDefinitions, ...fieldArgVarDefs],
                 selectionSet: t.selectionSet({
                     selections: [
                         t.field({
@@ -375,10 +376,23 @@ function generateSelectQueryAST(table, allTables, selection, options, relationFi
     });
     return print(ast);
 }
+/**
+ * Convert a TypeRef to a GraphQL AST type node for variable definitions
+ */
+function typeRefToGqlAstType(ref) {
+    if (ref.kind === 'NON_NULL' && ref.ofType) {
+        const inner = typeRefToGqlAstType(ref.ofType);
+        return t.nonNullType({ type: inner });
+    }
+    if (ref.kind === 'LIST' && ref.ofType) {
+        return t.listType({ type: typeRefToGqlAstType(ref.ofType) });
+    }
+    return t.namedType({ type: ref.name ?? 'String' });
+}
 /**
  * Generate field selections from SelectionOptions
  */
-function generateFieldSelectionsFromOptions(table, allTables, selection, relationFieldMap) {
+function generateFieldSelectionsFromOptions(table, allTables, selection, relationFieldMap, collectedVarDefs) {
     const DEFAULT_NESTED_RELATION_FIRST = 20;
     if (!selection) {
         // Default to all non-relational fields (includes complex fields like JSON, geometry, etc.)
@@ -413,6 +427,34 @@ function generateFieldSelectionsFromOptions(table, allTables, selection, relatio
                 fieldSelections.push(createFieldSelectionNode(resolvedField.name, resolvedField.alias));
             }
         }
+        else if (typeof fieldOptions === 'object' && fieldOptions.args) {
+            // Field with arguments (e.g. requestUploadUrl on bucket types)
+            const fieldDef = table.fields.find((f) => f.name === fieldName);
+            const fieldArgDefs = fieldDef?.args ?? [];
+            const fieldArgNodes = [];
+            for (const [argName, _argValue] of Object.entries(fieldOptions.args)) {
+                const varName = `${fieldName}_${argName}`;
+                const argDef = fieldArgDefs.find((a) => a.name === argName);
+                const gqlType = argDef
+                    ? typeRefToGqlAstType(argDef.type)
+                    : t.namedType({ type: 'String' });
+                collectedVarDefs?.push(t.variableDefinition({
+                    variable: t.variable({ name: varName }),
+                    type: gqlType,
+                }));
+                fieldArgNodes.push(t.argument({
+                    name: argName,
+                    value: t.variable({ name: varName }),
+                }));
+            }
+            const nestedSelectObj = fieldOptions.select;
+            const nestedFields = Object.entries(nestedSelectObj)
+                .filter(([, include]) => include)
+                .map(([nestedField]) => t.field({ name: nestedField }));
+            fieldSelections.push(createFieldSelectionNode(resolvedField.name, resolvedField.alias, fieldArgNodes, nestedFields.length > 0
+                ? t.selectionSet({ selections: nestedFields })
+                : undefined));
+        }
         else if (typeof fieldOptions === 'object' && fieldOptions.select) {
             // Nested field selection (for relation fields)
             const nestedSelections = [];

package/esm/introspect/infer-tables.js

@@ -260,12 +260,14 @@ function extractEntityFields(entityType, typeMap, entityToConnection, commentsEn
         }
         // Include scalar, enum, and other non-relation fields
         const fieldDescription = commentsEnabled ? stripSmartComments(field.description) : undefined;
+        const fieldArgs = extractFieldArguments(field);
         fields.push({
             name: field.name,
             ...(fieldDescription ? { description: fieldDescription } : {}),
             type: convertToCleanFieldType(field.type),
             isNotNull: fieldIsNotNull,
             hasDefault: fieldHasDefault,
+            ...(fieldArgs.length > 0 ? { args: fieldArgs } : {}),
         });
     }
     return fields;
@@ -312,6 +314,43 @@ function convertToCleanFieldType(typeRef) {
         // They were optional anyway and not used by generators
     };
 }
+/**
+ * Convert an IntrospectionTypeRef to a clean TypeRef
+ */
+function introspectionTypeRefToTypeRef(typeRef) {
+    if (typeRef.kind === 'NON_NULL' && typeRef.ofType) {
+        return {
+            kind: 'NON_NULL',
+            name: null,
+            ofType: introspectionTypeRefToTypeRef(typeRef.ofType),
+        };
+    }
+    if (typeRef.kind === 'LIST' && typeRef.ofType) {
+        return {
+            kind: 'LIST',
+            name: null,
+            ofType: introspectionTypeRefToTypeRef(typeRef.ofType),
+        };
+    }
+    return {
+        kind: typeRef.kind,
+        name: typeRef.name ?? null,
+    };
+}
+/**
+ * Extract arguments from a field that has them (computed fields with args)
+ */
+function extractFieldArguments(field) {
+    if (!field.args || field.args.length === 0)
+        return [];
+    return field.args.map((arg) => ({
+        name: arg.name,
+        type: introspectionTypeRefToTypeRef(arg.type),
+        isRequired: isNonNull(arg.type),
+        ...(arg.description ? { description: arg.description } : {}),
+        ...(arg.defaultValue != null ? { defaultValue: arg.defaultValue } : {}),
+    }));
+}
 // ============================================================================
 // Relation Inference
 // ============================================================================

package/generators/select.js

@@ -293,8 +293,9 @@ function convertFieldSelectionToSelectionOptions(table, allTables, options) {
  */
 function generateSelectQueryAST(table, allTables, selection, options, relationFieldMap) {
     const pluralName = (0, naming_helpers_1.toCamelCasePlural)(table.name, table);
-    // Generate field selections
-    const fieldSelections = generateFieldSelectionsFromOptions(table, allTables, selection, relationFieldMap);
+    // Generate field selections, collecting any variable definitions from field args
+    const fieldArgVarDefs = [];
+    const fieldSelections = generateFieldSelectionsFromOptions(table, allTables, selection, relationFieldMap, fieldArgVarDefs);
     // Build the query AST
     const variableDefinitions = [];
     const queryArgs = [];
@@ -399,7 +400,7 @@ function generateSelectQueryAST(table, allTables, selection, options, relationFi
             t.operationDefinition({
                 operation: graphql_1.OperationTypeNode.QUERY,
                 name: `${pluralName}Query`,
-                variableDefinitions,
+                variableDefinitions: [...variableDefinitions, ...fieldArgVarDefs],
                 selectionSet: t.selectionSet({
                     selections: [
                         t.field({
@@ -416,10 +417,23 @@ function generateSelectQueryAST(table, allTables, selection, options, relationFi
     });
     return (0, graphql_1.print)(ast);
 }
+/**
+ * Convert a TypeRef to a GraphQL AST type node for variable definitions
+ */
+function typeRefToGqlAstType(ref) {
+    if (ref.kind === 'NON_NULL' && ref.ofType) {
+        const inner = typeRefToGqlAstType(ref.ofType);
+        return t.nonNullType({ type: inner });
+    }
+    if (ref.kind === 'LIST' && ref.ofType) {
+        return t.listType({ type: typeRefToGqlAstType(ref.ofType) });
+    }
+    return t.namedType({ type: ref.name ?? 'String' });
+}
 /**
  * Generate field selections from SelectionOptions
  */
-function generateFieldSelectionsFromOptions(table, allTables, selection, relationFieldMap) {
+function generateFieldSelectionsFromOptions(table, allTables, selection, relationFieldMap, collectedVarDefs) {
     const DEFAULT_NESTED_RELATION_FIRST = 20;
     if (!selection) {
         // Default to all non-relational fields (includes complex fields like JSON, geometry, etc.)
@@ -454,6 +468,34 @@ function generateFieldSelectionsFromOptions(table, allTables, selection, relatio
                 fieldSelections.push(createFieldSelectionNode(resolvedField.name, resolvedField.alias));
             }
         }
+        else if (typeof fieldOptions === 'object' && fieldOptions.args) {
+            // Field with arguments (e.g. requestUploadUrl on bucket types)
+            const fieldDef = table.fields.find((f) => f.name === fieldName);
+            const fieldArgDefs = fieldDef?.args ?? [];
+            const fieldArgNodes = [];
+            for (const [argName, _argValue] of Object.entries(fieldOptions.args)) {
+                const varName = `${fieldName}_${argName}`;
+                const argDef = fieldArgDefs.find((a) => a.name === argName);
+                const gqlType = argDef
+                    ? typeRefToGqlAstType(argDef.type)
+                    : t.namedType({ type: 'String' });
+                collectedVarDefs?.push(t.variableDefinition({
+                    variable: t.variable({ name: varName }),
+                    type: gqlType,
+                }));
+                fieldArgNodes.push(t.argument({
+                    name: argName,
+                    value: t.variable({ name: varName }),
+                }));
+            }
+            const nestedSelectObj = fieldOptions.select;
+            const nestedFields = Object.entries(nestedSelectObj)
+                .filter(([, include]) => include)
+                .map(([nestedField]) => t.field({ name: nestedField }));
+            fieldSelections.push(createFieldSelectionNode(resolvedField.name, resolvedField.alias, fieldArgNodes, nestedFields.length > 0
+                ? t.selectionSet({ selections: nestedFields })
+                : undefined));
+        }
         else if (typeof fieldOptions === 'object' && fieldOptions.select) {
             // Nested field selection (for relation fields)
             const nestedSelections = [];

package/introspect/infer-tables.js

@@ -263,12 +263,14 @@ function extractEntityFields(entityType, typeMap, entityToConnection, commentsEn
         }
         // Include scalar, enum, and other non-relation fields
         const fieldDescription = commentsEnabled ? (0, utils_1.stripSmartComments)(field.description) : undefined;
+        const fieldArgs = extractFieldArguments(field);
         fields.push({
             name: field.name,
             ...(fieldDescription ? { description: fieldDescription } : {}),
             type: convertToCleanFieldType(field.type),
             isNotNull: fieldIsNotNull,
             hasDefault: fieldHasDefault,
+            ...(fieldArgs.length > 0 ? { args: fieldArgs } : {}),
         });
     }
     return fields;
@@ -315,6 +317,43 @@ function convertToCleanFieldType(typeRef) {
         // They were optional anyway and not used by generators
     };
 }
+/**
+ * Convert an IntrospectionTypeRef to a clean TypeRef
+ */
+function introspectionTypeRefToTypeRef(typeRef) {
+    if (typeRef.kind === 'NON_NULL' && typeRef.ofType) {
+        return {
+            kind: 'NON_NULL',
+            name: null,
+            ofType: introspectionTypeRefToTypeRef(typeRef.ofType),
+        };
+    }
+    if (typeRef.kind === 'LIST' && typeRef.ofType) {
+        return {
+            kind: 'LIST',
+            name: null,
+            ofType: introspectionTypeRefToTypeRef(typeRef.ofType),
+        };
+    }
+    return {
+        kind: typeRef.kind,
+        name: typeRef.name ?? null,
+    };
+}
+/**
+ * Extract arguments from a field that has them (computed fields with args)
+ */
+function extractFieldArguments(field) {
+    if (!field.args || field.args.length === 0)
+        return [];
+    return field.args.map((arg) => ({
+        name: arg.name,
+        type: introspectionTypeRefToTypeRef(arg.type),
+        isRequired: (0, introspection_1.isNonNull)(arg.type),
+        ...(arg.description ? { description: arg.description } : {}),
+        ...(arg.defaultValue != null ? { defaultValue: arg.defaultValue } : {}),
+    }));
+}
 // ============================================================================
 // Relation Inference
 // ============================================================================

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@constructive-io/graphql-query",
-  "version": "3.20.1",
+  "version": "3.21.0",
   "description": "Constructive GraphQL Query",
   "author": "Constructive <developers@constructive.io>",
   "main": "index.js",
@@ -36,7 +36,7 @@
     "grafast": "1.0.0",
     "graphile-build-pg": "5.0.0",
     "graphile-config": "1.0.0",
-    "graphile-settings": "^4.29.1",
+    "graphile-settings": "^4.30.1",
     "graphql": "16.13.0",
     "inflection": "^3.0.0",
     "inflekt": "^0.7.1",
@@ -53,5 +53,5 @@
   "devDependencies": {
     "makage": "^0.3.0"
   },
-  "gitHead": "44e6712bd8a37e2089418a69d801d67651c89350"
+  "gitHead": "97ec8e14f2b0855b0ee0bc732a082e1a91301b64"
 }

package/types/core.d.ts

@@ -78,8 +78,9 @@ export interface QueryFieldSelection {
 }
 export interface QuerySelectionOptions {
     [fieldName: string]: boolean | {
-        select: Record<string, boolean>;
+        select: Record<string, boolean | QuerySelectionOptions>;
         variables?: GraphQLVariables;
+        args?: Record<string, unknown>;
     };
 }
 export interface QueryBuilderInstance {

package/types/schema.d.ts

@@ -112,6 +112,22 @@ export interface Field {
     isNotNull?: boolean | null;
     /** Whether the column has a DEFAULT value (inferred by comparing entity vs CreateInput field nullability) */
     hasDefault?: boolean | null;
+    /** Arguments for computed fields (e.g. requestUploadUrl on bucket types) */
+    args?: FieldArgument[];
+}
+/**
+ * Argument on a computed field (not a root operation)
+ */
+export interface FieldArgument {
+    name: string;
+    /** GraphQL type reference */
+    type: TypeRef;
+    /** Whether this argument is required (NON_NULL) */
+    isRequired: boolean;
+    /** Description from schema */
+    description?: string;
+    /** Default value (as string) */
+    defaultValue?: string;
 }
 /**
  * Field type information from PostGraphile introspection