@constructive-io/graphql-codegen 4.6.0 → 4.6.1

package/core/introspect/infer-tables.js

@@ -230,6 +230,10 @@ function extractEntityFields(entityType, typeMap, entityToConnection, commentsEn
     const fields = [];
     if (!entityType.fields)
         return fields;
+    // Build a lookup of CreateXxxInput fields to infer hasDefault.
+    // If a field is NOT NULL on the entity but NOT required in CreateXxxInput,
+    // then it likely has a server-side default (serial, uuid_generate_v4, now(), etc.).
+    const createInputRequiredFields = buildCreateInputRequiredFieldSet(entityType.name, typeMap);
     for (const field of entityType.fields) {
         const baseTypeName = (0, introspection_1.getBaseTypeName)(field.type);
         if (!baseTypeName)
@@ -243,16 +247,55 @@ function extractEntityFields(entityType, typeMap, entityToConnection, commentsEn
                 continue; // Skip relation fields
             }
         }
+        // Infer isNotNull from the NON_NULL wrapper on the entity type field
+        const fieldIsNotNull = (0, introspection_1.isNonNull)(field.type);
+        // Infer hasDefault: if a field is NOT NULL on the entity but NOT required
+        // in CreateXxxInput, it likely has a default value.
+        // Also: if it's absent from CreateInput entirely, it's likely computed/generated.
+        let fieldHasDefault = null;
+        if (createInputRequiredFields !== null) {
+            if (fieldIsNotNull && !createInputRequiredFields.has(field.name)) {
+                fieldHasDefault = true;
+            }
+            else {
+                fieldHasDefault = false;
+            }
+        }
         // Include scalar, enum, and other non-relation fields
         const fieldDescription = commentsEnabled ? (0, utils_1.stripSmartComments)(field.description) : undefined;
         fields.push({
             name: field.name,
             ...(fieldDescription ? { description: fieldDescription } : {}),
             type: convertToCleanFieldType(field.type),
+            isNotNull: fieldIsNotNull,
+            hasDefault: fieldHasDefault,
         });
     }
     return fields;
 }
+/**
+ * Build a set of field names that are required (NON_NULL) in the CreateXxxInput type.
+ * Returns null if the CreateXxxInput type doesn't exist (no create mutation).
+ */
+function buildCreateInputRequiredFieldSet(entityName, typeMap) {
+    const createInputName = `Create${entityName}Input`;
+    const createInput = typeMap.get(createInputName);
+    if (!createInput?.inputFields)
+        return null;
+    // The CreateXxxInput typically has a single field like { user: UserInput! }
+    // We need to look inside the actual entity input type (e.g., UserInput)
+    const entityInputName = `${entityName}Input`;
+    const entityInput = typeMap.get(entityInputName);
+    if (!entityInput?.inputFields)
+        return null;
+    const requiredFields = new Set();
+    for (const inputField of entityInput.inputFields) {
+        if ((0, introspection_1.isNonNull)(inputField.type)) {
+            requiredFields.add(inputField.name);
+        }
+    }
+    return requiredFields;
+}
 /**
  * Check if a type name is an entity type (has a corresponding Connection)
  */

package/esm/core/introspect/infer-tables.js

@@ -14,7 +14,7 @@
  */
 import { lcFirst, pluralize, singularize, ucFirst } from 'inflekt';
 import { stripSmartComments } from '../codegen/utils';
-import { getBaseTypeName, isList, unwrapType } from '../../types/introspection';
+import { getBaseTypeName, isList, isNonNull, unwrapType } from '../../types/introspection';
 // ============================================================================
 // Pattern Matching Constants
 // ============================================================================
@@ -227,6 +227,10 @@ function extractEntityFields(entityType, typeMap, entityToConnection, commentsEn
     const fields = [];
     if (!entityType.fields)
         return fields;
+    // Build a lookup of CreateXxxInput fields to infer hasDefault.
+    // If a field is NOT NULL on the entity but NOT required in CreateXxxInput,
+    // then it likely has a server-side default (serial, uuid_generate_v4, now(), etc.).
+    const createInputRequiredFields = buildCreateInputRequiredFieldSet(entityType.name, typeMap);
     for (const field of entityType.fields) {
         const baseTypeName = getBaseTypeName(field.type);
         if (!baseTypeName)
@@ -240,16 +244,55 @@ function extractEntityFields(entityType, typeMap, entityToConnection, commentsEn
                 continue; // Skip relation fields
             }
         }
+        // Infer isNotNull from the NON_NULL wrapper on the entity type field
+        const fieldIsNotNull = isNonNull(field.type);
+        // Infer hasDefault: if a field is NOT NULL on the entity but NOT required
+        // in CreateXxxInput, it likely has a default value.
+        // Also: if it's absent from CreateInput entirely, it's likely computed/generated.
+        let fieldHasDefault = null;
+        if (createInputRequiredFields !== null) {
+            if (fieldIsNotNull && !createInputRequiredFields.has(field.name)) {
+                fieldHasDefault = true;
+            }
+            else {
+                fieldHasDefault = false;
+            }
+        }
         // Include scalar, enum, and other non-relation fields
         const fieldDescription = commentsEnabled ? stripSmartComments(field.description) : undefined;
         fields.push({
             name: field.name,
             ...(fieldDescription ? { description: fieldDescription } : {}),
             type: convertToCleanFieldType(field.type),
+            isNotNull: fieldIsNotNull,
+            hasDefault: fieldHasDefault,
         });
     }
     return fields;
 }
+/**
+ * Build a set of field names that are required (NON_NULL) in the CreateXxxInput type.
+ * Returns null if the CreateXxxInput type doesn't exist (no create mutation).
+ */
+function buildCreateInputRequiredFieldSet(entityName, typeMap) {
+    const createInputName = `Create${entityName}Input`;
+    const createInput = typeMap.get(createInputName);
+    if (!createInput?.inputFields)
+        return null;
+    // The CreateXxxInput typically has a single field like { user: UserInput! }
+    // We need to look inside the actual entity input type (e.g., UserInput)
+    const entityInputName = `${entityName}Input`;
+    const entityInput = typeMap.get(entityInputName);
+    if (!entityInput?.inputFields)
+        return null;
+    const requiredFields = new Set();
+    for (const inputField of entityInput.inputFields) {
+        if (isNonNull(inputField.type)) {
+            requiredFields.add(inputField.name);
+        }
+    }
+    return requiredFields;
+}
 /**
  * Check if a type name is an entity type (has a corresponding Connection)
  */

package/esm/generators/field-selector.js

@@ -1,3 +1,28 @@
+const relationalFieldSetCache = new WeakMap();
+function getRelationalFieldSet(table) {
+    const cached = relationalFieldSetCache.get(table);
+    if (cached)
+        return cached;
+    const set = new Set();
+    for (const rel of table.relations.belongsTo) {
+        if (rel.fieldName)
+            set.add(rel.fieldName);
+    }
+    for (const rel of table.relations.hasOne) {
+        if (rel.fieldName)
+            set.add(rel.fieldName);
+    }
+    for (const rel of table.relations.hasMany) {
+        if (rel.fieldName)
+            set.add(rel.fieldName);
+    }
+    for (const rel of table.relations.manyToMany) {
+        if (rel.fieldName)
+            set.add(rel.fieldName);
+    }
+    relationalFieldSetCache.set(table, set);
+    return set;
+}
 /**
  * Convert simplified field selection to QueryBuilder SelectionOptions
  */
@@ -154,11 +179,7 @@ function getNonRelationalFields(table) {
  * Check if a field is relational using table metadata
  */
 export function isRelationalField(fieldName, table) {
-    const { belongsTo, hasOne, hasMany, manyToMany } = table.relations;
-    return (belongsTo.some((rel) => rel.fieldName === fieldName) ||
-        hasOne.some((rel) => rel.fieldName === fieldName) ||
-        hasMany.some((rel) => rel.fieldName === fieldName) ||
-        manyToMany.some((rel) => rel.fieldName === fieldName));
+    return getRelationalFieldSet(table).has(fieldName);
 }
 /**
  * Get scalar fields for a related table to include in relation queries
@@ -227,16 +248,20 @@ function getRelatedTableScalarFields(relationField, table, allTables) {
         'createdAt',
         'updatedAt',
     ];
+    const scalarFieldSet = new Set(scalarFields);
+    // Use Set for O(1) duplicate checking
+    const includedSet = new Set();
     const included = [];
     const push = (fieldName) => {
         if (!fieldName)
             return;
-        if (!scalarFields.includes(fieldName))
+        if (!scalarFieldSet.has(fieldName))
             return;
-        if (included.includes(fieldName))
+        if (includedSet.has(fieldName))
             return;
         if (included.length >= MAX_RELATED_FIELDS)
             return;
+        includedSet.add(fieldName);
         included.push(fieldName);
     };
     // Always try to include stable identifiers first.

package/esm/generators/mutations.d.ts

@@ -17,8 +17,7 @@ export declare function buildPostGraphileCreate(table: CleanTable, _allTables: C
 export declare function buildPostGraphileUpdate(table: CleanTable, _allTables: CleanTable[], _options?: MutationOptions): TypedDocumentString<Record<string, unknown>, {
     input: {
         id: string | number;
-        patch: Record<string, unknown>;
-    };
+    } & Record<string, unknown>;
 }>;
 /**
  * Build PostGraphile-style DELETE mutation

package/esm/generators/mutations.js

@@ -4,10 +4,10 @@
  */
 import * as t from 'gql-ast';
 import { OperationTypeNode, print } from 'graphql';
-import { camelize } from 'inflekt';
 import { TypedDocumentString } from '../client/typed-document';
 import { getCustomAstForCleanField, requiresSubfieldSelection, } from '../core/custom-ast';
 import { isRelationalField } from './field-selector';
+import { toCamelCaseSingular, toCreateInputTypeName, toCreateMutationName, toDeleteInputTypeName, toDeleteMutationName, toUpdateInputTypeName, toUpdateMutationName, } from './naming-helpers';
 /**
  * Generate field selections for PostGraphile mutations using custom AST logic
  * This handles both scalar fields and complex types that require subfield selections
@@ -31,14 +31,15 @@ function generateFieldSelections(table) {
  * PostGraphile expects: mutation { createTableName(input: { tableName: TableNameInput! }) { tableName { ... } } }
  */
 export function buildPostGraphileCreate(table, _allTables, _options = {}) {
-    const mutationName = `create${table.name}`;
-    const singularName = camelize(table.name, true);
+    const mutationName = toCreateMutationName(table.name, table);
+    const singularName = toCamelCaseSingular(table.name, table);
+    const inputTypeName = toCreateInputTypeName(table.name, table);
     // Create the variable definition for $input
     const variableDefinitions = [
         t.variableDefinition({
             variable: t.variable({ name: 'input' }),
             type: t.nonNullType({
-                type: t.namedType({ type: `Create${table.name}Input` }),
+                type: t.namedType({ type: inputTypeName }),
             }),
         }),
     ];
@@ -90,14 +91,15 @@ export function buildPostGraphileCreate(table, _allTables, _options = {}) {
  * PostGraphile expects: mutation { updateTableName(input: { id: UUID!, patch: TableNamePatch! }) { tableName { ... } } }
  */
 export function buildPostGraphileUpdate(table, _allTables, _options = {}) {
-    const mutationName = `update${table.name}`;
-    const singularName = camelize(table.name, true);
+    const mutationName = toUpdateMutationName(table.name, table);
+    const singularName = toCamelCaseSingular(table.name, table);
+    const inputTypeName = toUpdateInputTypeName(table.name);
     // Create the variable definition for $input
     const variableDefinitions = [
         t.variableDefinition({
             variable: t.variable({ name: 'input' }),
             type: t.nonNullType({
-                type: t.namedType({ type: `Update${table.name}Input` }),
+                type: t.namedType({ type: inputTypeName }),
             }),
         }),
     ];
@@ -149,13 +151,14 @@ export function buildPostGraphileUpdate(table, _allTables, _options = {}) {
  * PostGraphile expects: mutation { deleteTableName(input: { id: UUID! }) { clientMutationId } }
  */
 export function buildPostGraphileDelete(table, _allTables, _options = {}) {
-    const mutationName = `delete${table.name}`;
+    const mutationName = toDeleteMutationName(table.name, table);
+    const inputTypeName = toDeleteInputTypeName(table.name);
     // Create the variable definition for $input
     const variableDefinitions = [
         t.variableDefinition({
             variable: t.variable({ name: 'input' }),
             type: t.nonNullType({
-                type: t.namedType({ type: `Delete${table.name}Input` }),
+                type: t.namedType({ type: inputTypeName }),
             }),
         }),
     ];

package/esm/generators/naming-helpers.d.ts

@@ -0,0 +1,48 @@
+import type { CleanTable } from '../types/schema';
+/**
+ * Safely normalise a server-provided inflection value.
+ * Returns `null` for null, undefined, or whitespace-only strings.
+ */
+export declare function normalizeInflectionValue(value: string | null | undefined): string | null;
+/**
+ * Convert PascalCase table name to camelCase plural for GraphQL queries.
+ * Prefers server-provided `table.query.all` / `table.inflection.allRows`
+ * when available, with guards against naive pluralisation drift and
+ * missing camelCase boundaries.
+ *
+ * Example: "ActionGoal" -> "actionGoals", "User" -> "users", "Person" -> "people"
+ */
+export declare function toCamelCasePlural(tableName: string, table?: CleanTable | null): string;
+/**
+ * Convert PascalCase table name to camelCase singular field name.
+ * Prefers server-provided names when available.
+ */
+export declare function toCamelCaseSingular(tableName: string, table?: CleanTable | null): string;
+export declare function toCreateMutationName(tableName: string, table?: CleanTable | null): string;
+export declare function toUpdateMutationName(tableName: string, table?: CleanTable | null): string;
+export declare function toDeleteMutationName(tableName: string, table?: CleanTable | null): string;
+export declare function toCreateInputTypeName(tableName: string, table?: CleanTable | null): string;
+export declare function toUpdateInputTypeName(tableName: string): string;
+export declare function toDeleteInputTypeName(tableName: string): string;
+export declare function toFilterTypeName(tableName: string, table?: CleanTable | null): string;
+/**
+ * Resolve PostGraphile patch field name.
+ * In v5 this is typically entity-specific: e.g. "userPatch", "contactPatch".
+ * Prefers the value discovered from the schema (`table.query.patchFieldName`
+ * or `table.inflection.patchField`), falls back to `${singularName}Patch`.
+ */
+export declare function toPatchFieldName(tableName: string, table?: CleanTable | null): string;
+/**
+ * Convert camelCase field name to SCREAMING_SNAKE_CASE for PostGraphile
+ * orderBy enums.
+ *
+ * "displayName" -> "DISPLAY_NAME_ASC"
+ * "createdAt"   -> "CREATED_AT_DESC"
+ * "id"          -> "ID_ASC"
+ */
+export declare function toOrderByEnumValue(fieldName: string, direction: 'asc' | 'desc'): string;
+/**
+ * Generate the PostGraphile OrderBy enum type name for a table.
+ * Prefers server-provided `table.inflection.orderByType` when available.
+ */
+export declare function toOrderByTypeName(tableName: string, table?: CleanTable | null): string;

package/esm/generators/naming-helpers.js

@@ -0,0 +1,154 @@
+/**
+ * Server-aware naming helpers for GraphQL query/mutation generation.
+ *
+ * These functions prefer names already discovered from the GraphQL schema
+ * (stored on `table.query` and `table.inflection` by `infer-tables.ts`)
+ * and fall back to local inflection when introspection data is unavailable.
+ *
+ * Back-ported from Dashboard's `packages/data/src/query-generator.ts`.
+ */
+import { camelize, pluralize } from 'inflekt';
+// ---------------------------------------------------------------------------
+// Internal helpers
+// ---------------------------------------------------------------------------
+/**
+ * Safely normalise a server-provided inflection value.
+ * Returns `null` for null, undefined, or whitespace-only strings.
+ */
+export function normalizeInflectionValue(value) {
+    if (typeof value !== 'string')
+        return null;
+    const trimmed = value.trim();
+    return trimmed.length > 0 ? trimmed : null;
+}
+// ---------------------------------------------------------------------------
+// Plural / Singular
+// ---------------------------------------------------------------------------
+/**
+ * Convert PascalCase table name to camelCase plural for GraphQL queries.
+ * Prefers server-provided `table.query.all` / `table.inflection.allRows`
+ * when available, with guards against naive pluralisation drift and
+ * missing camelCase boundaries.
+ *
+ * Example: "ActionGoal" -> "actionGoals", "User" -> "users", "Person" -> "people"
+ */
+export function toCamelCasePlural(tableName, table) {
+    const singular = camelize(tableName, true);
+    const inflectedPlural = pluralize(singular);
+    const serverPluralCandidates = [
+        table?.query?.all,
+        table?.inflection?.allRows,
+    ];
+    for (const candidateRaw of serverPluralCandidates) {
+        const candidate = normalizeInflectionValue(candidateRaw);
+        if (!candidate)
+            continue;
+        // Guard against known fallback drift:
+        // 1. Naive pluralisation: "activitys" instead of "activities"
+        const isNaivePlural = candidate === `${singular}s` && candidate !== inflectedPlural;
+        // 2. Missing camelCase boundaries: "deliveryzones" instead of "deliveryZones"
+        const isMiscased = candidate !== inflectedPlural &&
+            candidate.toLowerCase() === inflectedPlural.toLowerCase();
+        if (isNaivePlural || isMiscased)
+            continue;
+        return candidate;
+    }
+    return inflectedPlural;
+}
+/**
+ * Convert PascalCase table name to camelCase singular field name.
+ * Prefers server-provided names when available.
+ */
+export function toCamelCaseSingular(tableName, table) {
+    const localSingular = camelize(tableName, true);
+    for (const candidateRaw of [
+        table?.query?.one,
+        table?.inflection?.tableFieldName,
+    ]) {
+        const candidate = normalizeInflectionValue(candidateRaw);
+        if (!candidate)
+            continue;
+        // Reject miscased versions: "deliveryzone" vs "deliveryZone"
+        if (candidate !== localSingular &&
+            candidate.toLowerCase() === localSingular.toLowerCase())
+            continue;
+        return candidate;
+    }
+    return localSingular;
+}
+// ---------------------------------------------------------------------------
+// Mutation names
+// ---------------------------------------------------------------------------
+export function toCreateMutationName(tableName, table) {
+    return (normalizeInflectionValue(table?.query?.create) ?? `create${tableName}`);
+}
+export function toUpdateMutationName(tableName, table) {
+    return (normalizeInflectionValue(table?.query?.update) ?? `update${tableName}`);
+}
+export function toDeleteMutationName(tableName, table) {
+    return (normalizeInflectionValue(table?.query?.delete) ?? `delete${tableName}`);
+}
+// ---------------------------------------------------------------------------
+// Input / type names
+// ---------------------------------------------------------------------------
+export function toCreateInputTypeName(tableName, table) {
+    return (normalizeInflectionValue(table?.inflection?.createInputType) ??
+        `Create${tableName}Input`);
+}
+export function toUpdateInputTypeName(tableName) {
+    return `Update${tableName}Input`;
+}
+export function toDeleteInputTypeName(tableName) {
+    return `Delete${tableName}Input`;
+}
+export function toFilterTypeName(tableName, table) {
+    return (normalizeInflectionValue(table?.inflection?.filterType) ??
+        `${tableName}Filter`);
+}
+// ---------------------------------------------------------------------------
+// Patch field name
+// ---------------------------------------------------------------------------
+/**
+ * Resolve PostGraphile patch field name.
+ * In v5 this is typically entity-specific: e.g. "userPatch", "contactPatch".
+ * Prefers the value discovered from the schema (`table.query.patchFieldName`
+ * or `table.inflection.patchField`), falls back to `${singularName}Patch`.
+ */
+export function toPatchFieldName(tableName, table) {
+    // First check the patch field name discovered from UpdateXxxInput
+    const introspectedPatch = normalizeInflectionValue(table?.query?.patchFieldName);
+    if (introspectedPatch)
+        return introspectedPatch;
+    // Then check the inflection table
+    const explicitPatchField = normalizeInflectionValue(table?.inflection?.patchField);
+    if (explicitPatchField)
+        return explicitPatchField;
+    return `${toCamelCaseSingular(tableName, table)}Patch`;
+}
+// ---------------------------------------------------------------------------
+// OrderBy helpers
+// ---------------------------------------------------------------------------
+/**
+ * Convert camelCase field name to SCREAMING_SNAKE_CASE for PostGraphile
+ * orderBy enums.
+ *
+ * "displayName" -> "DISPLAY_NAME_ASC"
+ * "createdAt"   -> "CREATED_AT_DESC"
+ * "id"          -> "ID_ASC"
+ */
+export function toOrderByEnumValue(fieldName, direction) {
+    const screaming = fieldName
+        .replace(/([a-z0-9])([A-Z])/g, '$1_$2')
+        .toUpperCase();
+    return `${screaming}_${direction.toUpperCase()}`;
+}
+/**
+ * Generate the PostGraphile OrderBy enum type name for a table.
+ * Prefers server-provided `table.inflection.orderByType` when available.
+ */
+export function toOrderByTypeName(tableName, table) {
+    if (table?.inflection?.orderByType)
+        return table.inflection.orderByType;
+    const plural = toCamelCasePlural(tableName, table);
+    return `${plural.charAt(0).toUpperCase() + plural.slice(1)}OrderBy`;
+}

package/esm/generators/select.d.ts

@@ -3,18 +3,7 @@ import { QueryBuilder } from '../core/query-builder';
 import type { IntrospectionSchema, MetaObject } from '../core/types';
 import type { QueryOptions } from '../types/query';
 import type { CleanTable } from '../types/schema';
-/**
- * Convert PascalCase table name to camelCase plural for GraphQL queries
- * Uses the inflection library for proper pluralization
- * Example: "ActionGoal" -> "actionGoals", "User" -> "users", "Person" -> "people"
- */
-export declare function toCamelCasePlural(tableName: string): string;
-/**
- * Generate the PostGraphile OrderBy enum type name for a table
- * PostGraphile uses pluralized PascalCase: "Product" -> "ProductsOrderBy"
- * Example: "Product" -> "ProductsOrderBy", "Person" -> "PeopleOrderBy"
- */
-export declare function toOrderByTypeName(tableName: string): string;
+export { toCamelCasePlural, toOrderByTypeName } from './naming-helpers';
 /**
  * Convert CleanTable to MetaObject format for QueryBuilder
  */