@constructive-io/graphql-codegen 4.15.1 → 4.15.3

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

@@ -429,7 +429,9 @@ function buildEntityProperties(table) {
         if ((0, utils_1.isRelationField)(field.name, table))
             continue;
         const fieldType = typeof field.type === 'string' ? field.type : field.type.gqlType;
-        const tsType = scalarToInputTs(fieldType);
+        const isArray = typeof field.type !== 'string' && field.type.isArray;
+        const baseTsType = scalarToInputTs(fieldType);
+        const tsType = isArray ? `${baseTsType}[]` : baseTsType;
         const isNullable = field.name !== 'id' && field.name !== 'nodeId';
         properties.push({
             name: field.name,
@@ -712,8 +714,8 @@ function generateEntitySelectTypes(tables, tableByName) {
 /**
  * Map field type to filter type
  */
-function getFilterTypeForField(fieldType) {
-    return (0, scalars_1.scalarToFilterType)(fieldType) ?? 'StringFilter';
+function getFilterTypeForField(fieldType, isArray = false) {
+    return (0, scalars_1.scalarToFilterType)(fieldType, isArray) ?? 'StringFilter';
 }
 /**
  * Build properties for a table filter interface
@@ -723,9 +725,10 @@ function buildTableFilterProperties(table) {
     const properties = [];
     for (const field of table.fields) {
         const fieldType = typeof field.type === 'string' ? field.type : field.type.gqlType;
+        const isArray = typeof field.type !== 'string' && field.type.isArray;
         if ((0, utils_1.isRelationField)(field.name, table))
             continue;
-        const filterType = getFilterTypeForField(fieldType);
+        const filterType = getFilterTypeForField(fieldType, isArray);
         properties.push({ name: field.name, type: filterType, optional: true });
     }
     // Add logical operators
@@ -822,6 +825,16 @@ function generateTableConditionTypes(tables, typeRegistry) {
  * from VectorSearchPlugin).
  */
 function buildOrderByValues(table, typeRegistry) {
+    // When the schema's orderBy enum is available, use it as the source of truth
+    // instead of naively generating values for every field.
+    if (typeRegistry) {
+        const orderByTypeName = (0, utils_1.getOrderByTypeName)(table);
+        const orderByType = typeRegistry.get(orderByTypeName);
+        if (orderByType?.kind === 'ENUM' && orderByType.enumValues) {
+            return [...orderByType.enumValues];
+        }
+    }
+    // Fallback: derive from table fields when schema enum is not available
     const values = ['PRIMARY_KEY_ASC', 'PRIMARY_KEY_DESC', 'NATURAL'];
     for (const field of table.fields) {
         if ((0, utils_1.isRelationField)(field.name, table))
@@ -830,20 +843,6 @@ function buildOrderByValues(table, typeRegistry) {
         values.push(`${upperSnake}_ASC`);
         values.push(`${upperSnake}_DESC`);
     }
-    // Merge any additional values from the schema's orderBy enum type
-    // (e.g., plugin-added values like EMBEDDING_DISTANCE_ASC/DESC)
-    if (typeRegistry) {
-        const orderByTypeName = (0, utils_1.getOrderByTypeName)(table);
-        const orderByType = typeRegistry.get(orderByTypeName);
-        if (orderByType?.kind === 'ENUM' && orderByType.enumValues) {
-            const existingValues = new Set(values);
-            for (const value of orderByType.enumValues) {
-                if (!existingValues.has(value)) {
-                    values.push(value);
-                }
-            }
-        }
-    }
     return values;
 }
 /**
@@ -877,7 +876,9 @@ function buildCreateDataFieldsFromTable(table) {
         if ((0, utils_1.isRelationField)(field.name, table))
             continue;
         const fieldType = typeof field.type === 'string' ? field.type : field.type.gqlType;
-        const tsType = scalarToInputTs(fieldType);
+        const isArray = typeof field.type !== 'string' && field.type.isArray;
+        const baseTsType = scalarToInputTs(fieldType);
+        const tsType = isArray ? `${baseTsType}[]` : baseTsType;
         const isOptional = !field.name.endsWith('Id');
         fields.push({ name: field.name, type: tsType, optional: isOptional });
     }
@@ -958,9 +959,34 @@ function buildCreateInputInterface(table, typeRegistry) {
     return t.exportNamedDeclaration(interfaceDecl);
 }
 /**
- * Build Patch type properties
+ * Build Patch type properties.
+ *
+ * Prefers reading from the GraphQL schema's Patch input type when available
+ * (via typeRegistry), which correctly excludes computed/virtual fields.
+ * Falls back to deriving from table fields if the schema type is not found.
  */
-function buildPatchProperties(table) {
+function buildPatchProperties(table, typeRegistry) {
+    // Try to read from the schema's Patch input type first
+    if (typeRegistry) {
+        const patchTypeName = (0, utils_1.getPatchTypeName)(table);
+        const patchType = typeRegistry.get(patchTypeName);
+        if (patchType?.kind === 'INPUT_OBJECT' &&
+            patchType.inputFields) {
+            const properties = [];
+            for (const field of patchType.inputFields) {
+                if (EXCLUDED_MUTATION_FIELDS.includes(field.name))
+                    continue;
+                const tsType = typeRefToTs(field.type);
+                properties.push({
+                    name: field.name,
+                    type: `${tsType} | null`,
+                    optional: true,
+                });
+            }
+            return properties;
+        }
+    }
+    // Fallback: derive from table fields
     const properties = [];
     for (const field of table.fields) {
         if (EXCLUDED_MUTATION_FIELDS.includes(field.name))
@@ -968,7 +994,9 @@ function buildPatchProperties(table) {
         if ((0, utils_1.isRelationField)(field.name, table))
             continue;
         const fieldType = typeof field.type === 'string' ? field.type : field.type.gqlType;
-        const tsType = scalarToInputTs(fieldType);
+        const isArray = typeof field.type !== 'string' && field.type.isArray;
+        const baseTsType = scalarToInputTs(fieldType);
+        const tsType = isArray ? `${baseTsType}[]` : baseTsType;
         properties.push({
             name: field.name,
             type: `${tsType} | null`,
@@ -991,7 +1019,7 @@ function generateCrudInputTypes(table, typeRegistry) {
     // Create input
     statements.push(buildCreateInputInterface(table, typeRegistry));
     // Patch interface
-    statements.push(createExportedInterface(patchName, buildPatchProperties(table)));
+    statements.push(createExportedInterface(patchName, buildPatchProperties(table, typeRegistry)));
     // Update input - v5 uses entity-specific patch field names (e.g., "userPatch")
     const patchFieldName = table.query?.patchFieldName ?? (0, utils_1.lcFirst)(typeName) + 'Patch';
     statements.push(createExportedInterface(`Update${typeName}Input`, [

package/core/generate.js

@@ -50,6 +50,7 @@ const fs = __importStar(require("node:fs"));
 const node_path_1 = __importDefault(require("node:path"));
 const graphql_1 = require("graphql");
 const core_1 = require("@pgpmjs/core");
+const pg_cache_1 = require("pg-cache");
 const pgsql_client_1 = require("pgsql-client");
 const pgsql_seed_1 = require("pgsql-seed");
 const config_1 = require("../types/config");
@@ -681,6 +682,10 @@ async function generateMulti(options) {
     finally {
         for (const shared of sharedSources.values()) {
             const keepDb = Object.values(configs).some((c) => c.db?.keepDb);
+            // Release pg-cache pool for this ephemeral database before dropping
+            // deployPgpm() caches connections that must be closed first
+            pg_cache_1.pgCache.delete(shared.ephemeralDb.config.database);
+            await pg_cache_1.pgCache.waitForDisposals();
             shared.ephemeralDb.teardown({ keepDb });
         }
     }

package/core/introspect/source/pgpm-module.js

@@ -136,6 +136,10 @@ class PgpmModuleSchemaSource {
             return { introspection };
         }
         finally {
+            // Release pg-cache pool for this ephemeral database before dropping
+            // deployPgpm() and getPgPool() cache connections that must be closed first
+            pg_cache_1.pgCache.delete(dbConfig.database);
+            await pg_cache_1.pgCache.waitForDisposals();
             // Clean up the ephemeral database
             teardown({ keepDb });
             if (keepDb) {

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

@@ -15,7 +15,7 @@ import { pluralize } from 'inflekt';
 import { addJSDocComment, addLineComment, generateCode } from '../babel-ast';
 import { SCALAR_NAMES, scalarToFilterType, scalarToTsType } from '../scalars';
 import { getTypeBaseName } from '../type-resolver';
-import { getCreateInputTypeName, getConditionTypeName, getFilterTypeName, getGeneratedFileHeader, getOrderByTypeName, getPrimaryKeyInfo, getTableNames, isRelationField, lcFirst, stripSmartComments, } from '../utils';
+import { getCreateInputTypeName, getConditionTypeName, getFilterTypeName, getGeneratedFileHeader, getOrderByTypeName, getPatchTypeName, getPrimaryKeyInfo, getTableNames, isRelationField, lcFirst, stripSmartComments, } from '../utils';
 // ============================================================================
 // Constants
 // ============================================================================
@@ -391,7 +391,9 @@ function buildEntityProperties(table) {
         if (isRelationField(field.name, table))
             continue;
         const fieldType = typeof field.type === 'string' ? field.type : field.type.gqlType;
-        const tsType = scalarToInputTs(fieldType);
+        const isArray = typeof field.type !== 'string' && field.type.isArray;
+        const baseTsType = scalarToInputTs(fieldType);
+        const tsType = isArray ? `${baseTsType}[]` : baseTsType;
         const isNullable = field.name !== 'id' && field.name !== 'nodeId';
         properties.push({
             name: field.name,
@@ -674,8 +676,8 @@ function generateEntitySelectTypes(tables, tableByName) {
 /**
  * Map field type to filter type
  */
-function getFilterTypeForField(fieldType) {
-    return scalarToFilterType(fieldType) ?? 'StringFilter';
+function getFilterTypeForField(fieldType, isArray = false) {
+    return scalarToFilterType(fieldType, isArray) ?? 'StringFilter';
 }
 /**
  * Build properties for a table filter interface
@@ -685,9 +687,10 @@ function buildTableFilterProperties(table) {
     const properties = [];
     for (const field of table.fields) {
         const fieldType = typeof field.type === 'string' ? field.type : field.type.gqlType;
+        const isArray = typeof field.type !== 'string' && field.type.isArray;
         if (isRelationField(field.name, table))
             continue;
-        const filterType = getFilterTypeForField(fieldType);
+        const filterType = getFilterTypeForField(fieldType, isArray);
         properties.push({ name: field.name, type: filterType, optional: true });
     }
     // Add logical operators
@@ -784,6 +787,16 @@ function generateTableConditionTypes(tables, typeRegistry) {
  * from VectorSearchPlugin).
  */
 function buildOrderByValues(table, typeRegistry) {
+    // When the schema's orderBy enum is available, use it as the source of truth
+    // instead of naively generating values for every field.
+    if (typeRegistry) {
+        const orderByTypeName = getOrderByTypeName(table);
+        const orderByType = typeRegistry.get(orderByTypeName);
+        if (orderByType?.kind === 'ENUM' && orderByType.enumValues) {
+            return [...orderByType.enumValues];
+        }
+    }
+    // Fallback: derive from table fields when schema enum is not available
     const values = ['PRIMARY_KEY_ASC', 'PRIMARY_KEY_DESC', 'NATURAL'];
     for (const field of table.fields) {
         if (isRelationField(field.name, table))
@@ -792,20 +805,6 @@ function buildOrderByValues(table, typeRegistry) {
         values.push(`${upperSnake}_ASC`);
         values.push(`${upperSnake}_DESC`);
     }
-    // Merge any additional values from the schema's orderBy enum type
-    // (e.g., plugin-added values like EMBEDDING_DISTANCE_ASC/DESC)
-    if (typeRegistry) {
-        const orderByTypeName = getOrderByTypeName(table);
-        const orderByType = typeRegistry.get(orderByTypeName);
-        if (orderByType?.kind === 'ENUM' && orderByType.enumValues) {
-            const existingValues = new Set(values);
-            for (const value of orderByType.enumValues) {
-                if (!existingValues.has(value)) {
-                    values.push(value);
-                }
-            }
-        }
-    }
     return values;
 }
 /**
@@ -839,7 +838,9 @@ function buildCreateDataFieldsFromTable(table) {
         if (isRelationField(field.name, table))
             continue;
         const fieldType = typeof field.type === 'string' ? field.type : field.type.gqlType;
-        const tsType = scalarToInputTs(fieldType);
+        const isArray = typeof field.type !== 'string' && field.type.isArray;
+        const baseTsType = scalarToInputTs(fieldType);
+        const tsType = isArray ? `${baseTsType}[]` : baseTsType;
         const isOptional = !field.name.endsWith('Id');
         fields.push({ name: field.name, type: tsType, optional: isOptional });
     }
@@ -920,9 +921,34 @@ function buildCreateInputInterface(table, typeRegistry) {
     return t.exportNamedDeclaration(interfaceDecl);
 }
 /**
- * Build Patch type properties
+ * Build Patch type properties.
+ *
+ * Prefers reading from the GraphQL schema's Patch input type when available
+ * (via typeRegistry), which correctly excludes computed/virtual fields.
+ * Falls back to deriving from table fields if the schema type is not found.
  */
-function buildPatchProperties(table) {
+function buildPatchProperties(table, typeRegistry) {
+    // Try to read from the schema's Patch input type first
+    if (typeRegistry) {
+        const patchTypeName = getPatchTypeName(table);
+        const patchType = typeRegistry.get(patchTypeName);
+        if (patchType?.kind === 'INPUT_OBJECT' &&
+            patchType.inputFields) {
+            const properties = [];
+            for (const field of patchType.inputFields) {
+                if (EXCLUDED_MUTATION_FIELDS.includes(field.name))
+                    continue;
+                const tsType = typeRefToTs(field.type);
+                properties.push({
+                    name: field.name,
+                    type: `${tsType} | null`,
+                    optional: true,
+                });
+            }
+            return properties;
+        }
+    }
+    // Fallback: derive from table fields
     const properties = [];
     for (const field of table.fields) {
         if (EXCLUDED_MUTATION_FIELDS.includes(field.name))
@@ -930,7 +956,9 @@ function buildPatchProperties(table) {
         if (isRelationField(field.name, table))
             continue;
         const fieldType = typeof field.type === 'string' ? field.type : field.type.gqlType;
-        const tsType = scalarToInputTs(fieldType);
+        const isArray = typeof field.type !== 'string' && field.type.isArray;
+        const baseTsType = scalarToInputTs(fieldType);
+        const tsType = isArray ? `${baseTsType}[]` : baseTsType;
         properties.push({
             name: field.name,
             type: `${tsType} | null`,
@@ -953,7 +981,7 @@ function generateCrudInputTypes(table, typeRegistry) {
     // Create input
     statements.push(buildCreateInputInterface(table, typeRegistry));
     // Patch interface
-    statements.push(createExportedInterface(patchName, buildPatchProperties(table)));
+    statements.push(createExportedInterface(patchName, buildPatchProperties(table, typeRegistry)));
     // Update input - v5 uses entity-specific patch field names (e.g., "userPatch")
     const patchFieldName = table.query?.patchFieldName ?? lcFirst(typeName) + 'Patch';
     statements.push(createExportedInterface(`Update${typeName}Input`, [

package/esm/core/generate.js

@@ -8,6 +8,7 @@ import * as fs from 'node:fs';
 import path from 'node:path';
 import { buildClientSchema, printSchema } from 'graphql';
 import { PgpmPackage } from '@pgpmjs/core';
+import { pgCache } from 'pg-cache';
 import { createEphemeralDb } from 'pgsql-client';
 import { deployPgpm } from 'pgsql-seed';
 import { getConfigOptions } from '../types/config';
@@ -639,6 +640,10 @@ export async function generateMulti(options) {
     finally {
         for (const shared of sharedSources.values()) {
             const keepDb = Object.values(configs).some((c) => c.db?.keepDb);
+            // Release pg-cache pool for this ephemeral database before dropping
+            // deployPgpm() caches connections that must be closed first
+            pgCache.delete(shared.ephemeralDb.config.database);
+            await pgCache.waitForDisposals();
             shared.ephemeralDb.teardown({ keepDb });
         }
     }

package/esm/core/introspect/source/pgpm-module.js

@@ -9,7 +9,7 @@
  */
 import { PgpmPackage } from '@pgpmjs/core';
 import { buildSchema, introspectionFromSchema } from 'graphql';
-import { getPgPool } from 'pg-cache';
+import { getPgPool, pgCache } from 'pg-cache';
 import { createEphemeralDb } from 'pgsql-client';
 import { deployPgpm } from 'pgsql-seed';
 import { buildSchemaSDL } from 'graphile-schema';
@@ -131,6 +131,10 @@ export class PgpmModuleSchemaSource {
             return { introspection };
         }
         finally {
+            // Release pg-cache pool for this ephemeral database before dropping
+            // deployPgpm() and getPgPool() cache connections that must be closed first
+            pgCache.delete(dbConfig.database);
+            await pgCache.waitForDisposals();
             // Clean up the ephemeral database
             teardown({ keepDb });
             if (keepDb) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@constructive-io/graphql-codegen",
-  "version": "4.15.1",
+  "version": "4.15.3",
   "description": "GraphQL SDK generator for Constructive databases with React Query hooks",
   "keywords": [
     "graphql",
@@ -56,15 +56,15 @@
     "@0no-co/graphql.web": "^1.1.2",
     "@babel/generator": "^7.29.1",
     "@babel/types": "^7.29.0",
-    "@constructive-io/graphql-query": "^3.6.3",
+    "@constructive-io/graphql-query": "^3.6.5",
     "@constructive-io/graphql-types": "^3.3.4",
     "@inquirerer/utils": "^3.3.4",
-    "@pgpmjs/core": "^6.6.5",
+    "@pgpmjs/core": "^6.7.1",
     "ajv": "^8.18.0",
     "deepmerge": "^4.3.1",
     "find-and-require-package-json": "^0.9.1",
     "gql-ast": "^3.3.3",
-    "graphile-schema": "^1.6.3",
+    "graphile-schema": "^1.6.5",
     "graphql": "16.13.0",
     "inflekt": "^0.3.3",
     "inquirerer": "^4.7.0",
@@ -73,8 +73,8 @@
     "oxfmt": "^0.40.0",
     "pg-cache": "^3.3.4",
     "pg-env": "^1.7.3",
-    "pgsql-client": "^3.5.5",
-    "pgsql-seed": "^2.5.5",
+    "pgsql-client": "^3.5.7",
+    "pgsql-seed": "^2.5.7",
     "undici": "^7.24.3"
   },
   "peerDependencies": {
@@ -101,5 +101,5 @@
     "tsx": "^4.21.0",
     "typescript": "^5.9.3"
   },
-  "gitHead": "9c322f47ca08b5b853fcb395fe2bfc224f8c4c27"
+  "gitHead": "c18ef8e002d958001fe69fff3758d1f89613eb2b"
 }