@constructive-io/graphql-codegen 4.37.2 → 4.38.0

package/core/codegen/babel-ast.js

@@ -94,9 +94,10 @@ exports.commentLine = commentLine;
  * Add a leading JSDoc comment to a node
  */
 function addJSDocComment(node, lines) {
-    const commentText = lines.length === 1
-        ? `* ${lines[0]} `
-        : `*\n${lines.map((line) => ` * ${line}`).join('\n')}\n `;
+    const sanitized = lines.map((line) => line.replace(/\*\//g, '*\\/'));
+    const commentText = sanitized.length === 1
+        ? `* ${sanitized[0]} `
+        : `*\n${sanitized.map((line) => ` * ${line}`).join('\n')}\n `;
     if (!node.leadingComments) {
         node.leadingComments = [];
     }

package/core/codegen/hooks-ast.js

@@ -392,9 +392,10 @@ function destructureParamsWithSelectionAndScope(restName) {
 // JSDoc comment helpers
 // ============================================================================
 function addJSDocComment(node, lines) {
-    const text = lines.length === 1
-        ? `* ${lines[0]} `
-        : `*\n${lines.map((line) => ` * ${line}`).join('\n')}\n `;
+    const sanitized = lines.map((line) => line.replace(/\*\//g, '*\\/'));
+    const text = sanitized.length === 1
+        ? `* ${sanitized[0]} `
+        : `*\n${sanitized.map((line) => ` * ${line}`).join('\n')}\n `;
     if (!node.leadingComments) {
         node.leadingComments = [];
     }

package/core/codegen/orm/input-types-generator.js

@@ -588,12 +588,40 @@ function generateEntityWithRelations(tables) {
  */
 function buildSelectTypeLiteral(table, tableByName) {
     const members = [];
-    // Add scalar fields
+    // Add scalar fields (and fields with arguments)
     for (const field of table.fields) {
         if (!(0, utils_1.isRelationField)(field.name, table)) {
-            const prop = t.tsPropertySignature(t.identifier(field.name), t.tsTypeAnnotation(t.tsBooleanKeyword()));
-            prop.optional = true;
-            members.push(prop);
+            if (field.args && field.args.length > 0) {
+                // Field with arguments (e.g. requestUploadUrl on bucket types)
+                const argMembers = field.args.map((arg) => {
+                    const tsType = typeRefToTs(arg.type);
+                    const argProp = t.tsPropertySignature(t.identifier(arg.name), t.tsTypeAnnotation(parseTypeString(tsType)));
+                    argProp.optional = !arg.isRequired;
+                    return argProp;
+                });
+                const prop = t.tsPropertySignature(t.identifier(field.name), t.tsTypeAnnotation(t.tsTypeLiteral([
+                    (() => {
+                        const argsProp = t.tsPropertySignature(t.identifier('args'), t.tsTypeAnnotation(t.tsTypeLiteral(argMembers)));
+                        argsProp.optional = false;
+                        return argsProp;
+                    })(),
+                    (() => {
+                        const selectProp = t.tsPropertySignature(t.identifier('select'), t.tsTypeAnnotation(t.tsTypeReference(t.identifier('Record'), t.tsTypeParameterInstantiation([
+                            t.tsStringKeyword(),
+                            t.tsBooleanKeyword(),
+                        ]))));
+                        selectProp.optional = true;
+                        return selectProp;
+                    })(),
+                ])));
+                prop.optional = true;
+                members.push(prop);
+            }
+            else {
+                const prop = t.tsPropertySignature(t.identifier(field.name), t.tsTypeAnnotation(t.tsBooleanKeyword()));
+                prop.optional = true;
+                members.push(prop);
+            }
         }
     }
     // Add belongsTo relations

package/core/codegen/orm/select-types.d.ts

@@ -37,6 +37,7 @@ export type SelectConfig<TFields extends string> = {
  */
 export interface NestedSelectConfig {
     select?: Record<string, boolean | NestedSelectConfig>;
+    args?: Record<string, unknown>;
     first?: number;
     last?: number;
     after?: string;
@@ -101,6 +102,9 @@ export type HookStrictSelect<S, Shape> = S extends DeepExact<S, Shape, 5> ? {} :
  */
 export type InferSelectResult<TEntity, TSelect> = TSelect extends undefined ? TEntity : {
     [K in keyof TSelect as TSelect[K] extends false | undefined ? never : K]: TSelect[K] extends true ? K extends keyof TEntity ? TEntity[K] : never : TSelect[K] extends {
+        args: Record<string, unknown>;
+        select: infer NestedSelect;
+    } ? K extends keyof TEntity ? NonNullable<TEntity[K]> extends ConnectionResult<infer NodeType> ? ConnectionResult<InferSelectResult<NodeType, NestedSelect>> : InferSelectResult<NonNullable<TEntity[K]>, NestedSelect> | (null extends TEntity[K] ? null : never) : never : TSelect[K] extends {
         select: infer NestedSelect;
     } ? K extends keyof TEntity ? NonNullable<TEntity[K]> extends ConnectionResult<infer NodeType> ? ConnectionResult<InferSelectResult<NodeType, NestedSelect>> : InferSelectResult<NonNullable<TEntity[K]>, NestedSelect> | (null extends TEntity[K] ? null : never) : never : K extends keyof TEntity ? TEntity[K] : never;
 };

package/core/codegen/templates/query-builder.ts

@@ -138,12 +138,44 @@ export function buildSelections(
     if (typeof value === 'object' && value !== null) {
       const nested = value as {
         select?: Record<string, unknown>;
+        args?: Record<string, unknown>;
         first?: number;
         filter?: Record<string, unknown>;
         orderBy?: string[];
         connection?: boolean;
       };
 
+      // Field with arguments (e.g. requestUploadUrl on bucket types)
+      if (nested.args && typeof nested.args === 'object') {
+        const fieldArgs = Object.entries(nested.args).map(
+          ([argName, argValue]) =>
+            t.argument({ name: argName, value: buildValueAst(argValue) }),
+        );
+        const nestedSelect = nested.select;
+        if (nestedSelect && typeof nestedSelect === 'object') {
+          const subSelections = Object.entries(nestedSelect)
+            .filter(([, v]) => v)
+            .map(([name]) => t.field({ name }));
+          fields.push(
+            t.field({
+              name: key,
+              args: fieldArgs.length ? fieldArgs : undefined,
+              selectionSet: subSelections.length
+                ? t.selectionSet({ selections: subSelections })
+                : undefined,
+            }),
+          );
+        } else {
+          fields.push(
+            t.field({
+              name: key,
+              args: fieldArgs.length ? fieldArgs : undefined,
+            }),
+          );
+        }
+        continue;
+      }
+
       if (!nested.select || typeof nested.select !== 'object') {
         throw new Error(
           `Invalid selection for field "${key}": nested selections must include a "select" object.`,

package/esm/core/codegen/babel-ast.js

@@ -45,9 +45,10 @@ export const commentLine = (value) => {
  * Add a leading JSDoc comment to a node
  */
 export function addJSDocComment(node, lines) {
-    const commentText = lines.length === 1
-        ? `* ${lines[0]} `
-        : `*\n${lines.map((line) => ` * ${line}`).join('\n')}\n `;
+    const sanitized = lines.map((line) => line.replace(/\*\//g, '*\\/'));
+    const commentText = sanitized.length === 1
+        ? `* ${sanitized[0]} `
+        : `*\n${sanitized.map((line) => ` * ${line}`).join('\n')}\n `;
     if (!node.leadingComments) {
         node.leadingComments = [];
     }

package/esm/core/codegen/hooks-ast.js

@@ -294,9 +294,10 @@ export function destructureParamsWithSelectionAndScope(restName) {
 // JSDoc comment helpers
 // ============================================================================
 export function addJSDocComment(node, lines) {
-    const text = lines.length === 1
-        ? `* ${lines[0]} `
-        : `*\n${lines.map((line) => ` * ${line}`).join('\n')}\n `;
+    const sanitized = lines.map((line) => line.replace(/\*\//g, '*\\/'));
+    const text = sanitized.length === 1
+        ? `* ${sanitized[0]} `
+        : `*\n${sanitized.map((line) => ` * ${line}`).join('\n')}\n `;
     if (!node.leadingComments) {
         node.leadingComments = [];
     }

package/esm/core/codegen/orm/input-types-generator.js

@@ -550,12 +550,40 @@ function generateEntityWithRelations(tables) {
  */
 function buildSelectTypeLiteral(table, tableByName) {
     const members = [];
-    // Add scalar fields
+    // Add scalar fields (and fields with arguments)
     for (const field of table.fields) {
         if (!isRelationField(field.name, table)) {
-            const prop = t.tsPropertySignature(t.identifier(field.name), t.tsTypeAnnotation(t.tsBooleanKeyword()));
-            prop.optional = true;
-            members.push(prop);
+            if (field.args && field.args.length > 0) {
+                // Field with arguments (e.g. requestUploadUrl on bucket types)
+                const argMembers = field.args.map((arg) => {
+                    const tsType = typeRefToTs(arg.type);
+                    const argProp = t.tsPropertySignature(t.identifier(arg.name), t.tsTypeAnnotation(parseTypeString(tsType)));
+                    argProp.optional = !arg.isRequired;
+                    return argProp;
+                });
+                const prop = t.tsPropertySignature(t.identifier(field.name), t.tsTypeAnnotation(t.tsTypeLiteral([
+                    (() => {
+                        const argsProp = t.tsPropertySignature(t.identifier('args'), t.tsTypeAnnotation(t.tsTypeLiteral(argMembers)));
+                        argsProp.optional = false;
+                        return argsProp;
+                    })(),
+                    (() => {
+                        const selectProp = t.tsPropertySignature(t.identifier('select'), t.tsTypeAnnotation(t.tsTypeReference(t.identifier('Record'), t.tsTypeParameterInstantiation([
+                            t.tsStringKeyword(),
+                            t.tsBooleanKeyword(),
+                        ]))));
+                        selectProp.optional = true;
+                        return selectProp;
+                    })(),
+                ])));
+                prop.optional = true;
+                members.push(prop);
+            }
+            else {
+                const prop = t.tsPropertySignature(t.identifier(field.name), t.tsTypeAnnotation(t.tsBooleanKeyword()));
+                prop.optional = true;
+                members.push(prop);
+            }
         }
     }
     // Add belongsTo relations

package/esm/core/codegen/orm/select-types.d.ts

@@ -37,6 +37,7 @@ export type SelectConfig<TFields extends string> = {
  */
 export interface NestedSelectConfig {
     select?: Record<string, boolean | NestedSelectConfig>;
+    args?: Record<string, unknown>;
     first?: number;
     last?: number;
     after?: string;
@@ -101,6 +102,9 @@ export type HookStrictSelect<S, Shape> = S extends DeepExact<S, Shape, 5> ? {} :
  */
 export type InferSelectResult<TEntity, TSelect> = TSelect extends undefined ? TEntity : {
     [K in keyof TSelect as TSelect[K] extends false | undefined ? never : K]: TSelect[K] extends true ? K extends keyof TEntity ? TEntity[K] : never : TSelect[K] extends {
+        args: Record<string, unknown>;
+        select: infer NestedSelect;
+    } ? K extends keyof TEntity ? NonNullable<TEntity[K]> extends ConnectionResult<infer NodeType> ? ConnectionResult<InferSelectResult<NodeType, NestedSelect>> : InferSelectResult<NonNullable<TEntity[K]>, NestedSelect> | (null extends TEntity[K] ? null : never) : never : TSelect[K] extends {
         select: infer NestedSelect;
     } ? K extends keyof TEntity ? NonNullable<TEntity[K]> extends ConnectionResult<infer NodeType> ? ConnectionResult<InferSelectResult<NodeType, NestedSelect>> : InferSelectResult<NonNullable<TEntity[K]>, NestedSelect> | (null extends TEntity[K] ? null : never) : never : K extends keyof TEntity ? TEntity[K] : never;
 };

package/esm/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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@constructive-io/graphql-codegen",
-  "version": "4.37.2",
+  "version": "4.38.0",
   "description": "GraphQL SDK generator for Constructive databases with React Query hooks",
   "keywords": [
     "graphql",
@@ -56,7 +56,7 @@
     "@0no-co/graphql.web": "^1.1.2",
     "@babel/generator": "^7.29.1",
     "@babel/types": "^7.29.0",
-    "@constructive-io/graphql-query": "^3.20.2",
+    "@constructive-io/graphql-query": "^3.21.0",
     "@constructive-io/graphql-types": "^3.8.0",
     "@inquirerer/utils": "^3.3.5",
     "@pgpmjs/core": "^6.16.0",
@@ -64,7 +64,7 @@
     "deepmerge": "^4.3.1",
     "find-and-require-package-json": "^0.9.1",
     "gql-ast": "^3.8.0",
-    "graphile-schema": "^1.18.2",
+    "graphile-schema": "^1.18.3",
     "graphql": "16.13.0",
     "inflekt": "^0.7.1",
     "inquirerer": "^4.7.0",
@@ -100,5 +100,5 @@
     "tsx": "^4.21.0",
     "typescript": "^5.9.3"
   },
-  "gitHead": "b1a89c4ab45fd22a63487cc6dc923a17772fac60"
+  "gitHead": "97ec8e14f2b0855b0ee0bc732a082e1a91301b64"
 }

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