@constructive-io/graphql-codegen 4.20.0 → 4.21.1

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

@@ -718,10 +718,33 @@ function getFilterTypeForField(fieldType, isArray = false) {
     return (0, scalars_1.scalarToFilterType)(fieldType, isArray) ?? 'StringFilter';
 }
 /**
- * Build properties for a table filter interface
+ * Build properties for a table filter interface.
+ *
+ * When typeRegistry is available, uses the schema's filter input type as
+ * the sole source of truth — this captures plugin-injected filter fields
+ * (e.g., bm25Body, tsvTsv, trgmName, vectorEmbedding, geom) that are not
+ * present on the entity type itself. Same pattern as buildOrderByValues().
  */
-function buildTableFilterProperties(table) {
+function buildTableFilterProperties(table, typeRegistry) {
     const filterName = (0, utils_1.getFilterTypeName)(table);
+    // When the schema's filter type is available, use it as the source of truth
+    if (typeRegistry) {
+        const filterType = typeRegistry.get(filterName);
+        if (filterType?.kind === 'INPUT_OBJECT' && filterType.inputFields) {
+            const properties = [];
+            for (const field of filterType.inputFields) {
+                const tsType = typeRefToTs(field.type);
+                properties.push({
+                    name: field.name,
+                    type: tsType,
+                    optional: true,
+                    description: (0, utils_1.stripSmartComments)(field.description, true),
+                });
+            }
+            return properties;
+        }
+    }
+    // Fallback: derive from table fields when schema filter type is not available
     const properties = [];
     for (const field of table.fields) {
         const fieldType = typeof field.type === 'string' ? field.type : field.type.gqlType;
@@ -740,11 +763,11 @@ function buildTableFilterProperties(table) {
 /**
  * Generate table filter type statements
  */
-function generateTableFilterTypes(tables) {
+function generateTableFilterTypes(tables, typeRegistry) {
     const statements = [];
     for (const table of tables) {
         const filterName = (0, utils_1.getFilterTypeName)(table);
-        statements.push(createExportedInterface(filterName, buildTableFilterProperties(table)));
+        statements.push(createExportedInterface(filterName, buildTableFilterProperties(table, typeRegistry)));
     }
     if (statements.length > 0) {
         addSectionComment(statements, 'Table Filter Types');
@@ -1323,6 +1346,40 @@ function generateConnectionFieldsMap(tables, tableByName) {
 // ============================================================================
 // Plugin-Injected Type Collector
 // ============================================================================
+/**
+ * Collect extra input type names referenced by plugin-injected filter fields.
+ *
+ * When the schema's filter type is used as source of truth, plugin-injected
+ * fields reference custom filter types (e.g., Bm25BodyFilter, TsvectorFilter,
+ * GeometryFilter) that also need to be generated. This function discovers
+ * those types by comparing the schema's filter type fields against the
+ * standard scalar filter types.
+ */
+function collectFilterExtraInputTypes(tables, typeRegistry) {
+    const extraTypes = new Set();
+    for (const table of tables) {
+        const filterTypeName = (0, utils_1.getFilterTypeName)(table);
+        const filterType = typeRegistry.get(filterTypeName);
+        if (!filterType ||
+            filterType.kind !== 'INPUT_OBJECT' ||
+            !filterType.inputFields) {
+            continue;
+        }
+        for (const field of filterType.inputFields) {
+            // Skip logical operators (and/or/not reference the table's own filter type)
+            if (['and', 'or', 'not'].includes(field.name))
+                continue;
+            // Collect any filter type that isn't already generated as a base scalar filter
+            // This catches both plugin-injected fields (bm25Body, tsvTsv) AND regular columns
+            // whose custom scalar types have their own filter types (e.g., ConstructiveInternalTypeEmailFilter)
+            const baseName = (0, type_resolver_1.getTypeBaseName)(field.type);
+            if (baseName && !scalars_1.SCALAR_NAMES.has(baseName) && !scalars_1.BASE_FILTER_TYPE_NAMES.has(baseName)) {
+                extraTypes.add(baseName);
+            }
+        }
+    }
+    return extraTypes;
+}
 /**
  * Collect extra input type names referenced by plugin-injected condition fields.
  *
@@ -1386,7 +1443,9 @@ function generateInputTypesFile(typeRegistry, usedInputTypes, tables, usedPayloa
         statements.push(...generateEntityWithRelations(tablesList));
         statements.push(...generateEntitySelectTypes(tablesList, tableByName));
         // 4. Table filter types
-        statements.push(...generateTableFilterTypes(tablesList));
+        // Pass typeRegistry to use schema's filter type as source of truth,
+        // capturing plugin-injected filter fields (e.g., bm25, tsvector, trgm, vector, geom)
+        statements.push(...generateTableFilterTypes(tablesList, typeRegistry));
         // 4b. Table condition types (simple equality filter)
         // Pass typeRegistry to merge plugin-injected condition fields
         // (e.g., vectorEmbedding from VectorSearchPlugin)
@@ -1404,8 +1463,14 @@ function generateInputTypesFile(typeRegistry, usedInputTypes, tables, usedPayloa
     // Always emit this export so generated model/custom-op imports stay valid.
     statements.push(...generateConnectionFieldsMap(tablesList, tableByName));
     // 7. Custom input types from TypeRegistry
-    // Also include any extra types referenced by plugin-injected condition fields
+    // Also include any extra types referenced by plugin-injected filter/condition fields
     const mergedUsedInputTypes = new Set(usedInputTypes);
+    if (hasTables) {
+        const filterExtraTypes = collectFilterExtraInputTypes(tablesList, typeRegistry);
+        for (const typeName of filterExtraTypes) {
+            mergedUsedInputTypes.add(typeName);
+        }
+    }
     if (hasTables && conditionEnabled) {
         const conditionExtraTypes = collectConditionExtraInputTypes(tablesList, typeRegistry);
         for (const typeName of conditionExtraTypes) {

package/core/codegen/orm/model-generator.d.ts

@@ -7,7 +7,7 @@ export interface GeneratedModelFile {
 }
 export declare function generateModelFile(table: Table, _useSharedTypes: boolean, options?: {
     condition?: boolean;
-}): GeneratedModelFile;
+}, allTables?: Table[]): GeneratedModelFile;
 export declare function generateAllModelFiles(tables: Table[], useSharedTypes: boolean, options?: {
     condition?: boolean;
 }): GeneratedModelFile[];

package/core/codegen/orm/model-generator.js

@@ -42,6 +42,7 @@ exports.generateAllModelFiles = generateAllModelFiles;
  * Each method uses function overloads for IDE autocompletion of select objects.
  */
 const t = __importStar(require("@babel/types"));
+const inflekt_1 = require("inflekt");
 const babel_ast_1 = require("../babel-ast");
 const utils_1 = require("../utils");
 function createImportDeclaration(moduleSpecifier, namedImports, typeOnly = false) {
@@ -102,7 +103,7 @@ function strictSelectGuard(selectTypeName) {
         t.tsTypeReference(t.identifier(selectTypeName)),
     ]));
 }
-function generateModelFile(table, _useSharedTypes, options) {
+function generateModelFile(table, _useSharedTypes, options, allTables) {
     const conditionEnabled = options?.condition !== false;
     const { typeName, singularName, pluralName } = (0, utils_1.getTableNames)(table);
     const modelName = `${typeName}Model`;
@@ -116,7 +117,6 @@ function generateModelFile(table, _useSharedTypes, options) {
     const orderByTypeName = (0, utils_1.getOrderByTypeName)(table);
     const createInputTypeName = `Create${typeName}Input`;
     const updateInputTypeName = `Update${typeName}Input`;
-    const deleteInputTypeName = `Delete${typeName}Input`;
     const patchTypeName = `${typeName}Patch`;
     const pkFields = (0, utils_1.getPrimaryKeyInfo)(table);
     const pkField = pkFields[0];
@@ -126,9 +126,16 @@ function generateModelFile(table, _useSharedTypes, options) {
     const createMutationName = table.query?.create ?? `create${typeName}`;
     const updateMutationName = table.query?.update;
     const deleteMutationName = table.query?.delete;
+    const deleteInputTypeName = (0, utils_1.getDeleteInputTypeName)(table);
     const statements = [];
     statements.push(createImportDeclaration('../client', ['OrmClient']));
-    statements.push(createImportDeclaration('../query-builder', [
+    const m2nRels = table.relations.manyToMany.filter((r) => r.junctionLeftKeyFields?.length && r.junctionRightKeyFields?.length);
+    // Check if any remove methods will actually be generated (need junction table with delete mutation)
+    const needsJunctionRemove = m2nRels.some((r) => {
+        const jt = allTables?.find((tb) => tb.name === r.junctionTable);
+        return jt?.query?.delete != null;
+    });
+    const queryBuilderImports = [
         'QueryBuilder',
         'buildFindManyDocument',
         'buildFindFirstDocument',
@@ -136,7 +143,9 @@ function generateModelFile(table, _useSharedTypes, options) {
         'buildCreateDocument',
         'buildUpdateByPkDocument',
         'buildDeleteByPkDocument',
-    ]));
+        ...(needsJunctionRemove ? ['buildJunctionRemoveDocument'] : []),
+    ];
+    statements.push(createImportDeclaration('../query-builder', queryBuilderImports));
     statements.push(createImportDeclaration('../select-types', [
         'ConnectionResult',
         'FindManyArgs',
@@ -429,13 +438,12 @@ function generateModelFile(table, _useSharedTypes, options) {
     }
     // ── delete ─────────────────────────────────────────────────────────────
     if (deleteMutationName) {
-        const whereLiteral = () => t.tsTypeLiteral([
-            (() => {
-                const prop = t.tsPropertySignature(t.identifier(pkField.name), t.tsTypeAnnotation(pkTsType()));
-                prop.optional = false;
-                return prop;
-            })(),
-        ]);
+        // Build where type with ALL PK fields (supports composite PKs)
+        const whereLiteral = () => t.tsTypeLiteral(pkFields.map((pk) => {
+            const prop = t.tsPropertySignature(t.identifier(pk.name), t.tsTypeAnnotation(tsTypeFromPrimitive(pk.tsType ?? 'string')));
+            prop.optional = false;
+            return prop;
+        }));
         const argsType = (sel) => t.tsTypeReference(t.identifier('DeleteArgs'), t.tsTypeParameterInstantiation([whereLiteral(), sel]));
         const retType = (sel) => t.tsTypeAnnotation(t.tsTypeReference(t.identifier('QueryBuilder'), t.tsTypeParameterInstantiation([
             t.tsTypeLiteral([
@@ -454,18 +462,144 @@ function generateModelFile(table, _useSharedTypes, options) {
             strictSelectGuard(selectTypeName),
         ]));
         const selectExpr = t.memberExpression(t.identifier('args'), t.identifier('select'));
+        // Build keys object: { field1: args.where.field1, field2: args.where.field2, ... }
+        const keysObj = t.objectExpression(pkFields.map((pk) => t.objectProperty(t.identifier(pk.name), t.memberExpression(t.memberExpression(t.identifier('args'), t.identifier('where')), t.identifier(pk.name)))));
         const bodyArgs = [
             t.stringLiteral(typeName),
             t.stringLiteral(deleteMutationName),
             t.stringLiteral(entityLower),
-            t.memberExpression(t.memberExpression(t.identifier('args'), t.identifier('where')), t.identifier(pkField.name)),
+            keysObj,
             t.stringLiteral(deleteInputTypeName),
-            t.stringLiteral(pkField.name),
             selectExpr,
             t.identifier('connectionFieldsMap'),
         ];
         classBody.push(createClassMethod('delete', createTypeParam(selectTypeName), [implParam], retType(sRef()), buildMethodBody('buildDeleteByPkDocument', bodyArgs, 'mutation', typeName, deleteMutationName)));
     }
+    // ── M:N add/remove methods ────────────────────────────────────────────
+    for (const rel of m2nRels) {
+        if (!rel.fieldName)
+            continue;
+        const junctionTable = allTables?.find((tb) => tb.name === rel.junctionTable);
+        if (!junctionTable)
+            continue;
+        const junctionNames = (0, utils_1.getTableNames)(junctionTable);
+        const junctionCreateMutation = (0, utils_1.getCreateMutationName)(junctionTable);
+        const junctionCreateInputType = (0, utils_1.getCreateInputTypeName)(junctionTable);
+        const junctionDeleteMutation = junctionTable.query?.delete ?? (0, utils_1.getDeleteMutationName)(junctionTable);
+        const junctionDeleteInputType = (0, utils_1.getDeleteInputTypeName)(junctionTable);
+        const junctionSingular = junctionNames.singularName;
+        // Derive a friendly singular name from the fieldName (e.g., "tags" → "Tag", "categories" → "Category")
+        const relSingular = (0, utils_1.ucFirst)((0, inflekt_1.singularize)(rel.fieldName));
+        const leftKeys = rel.junctionLeftKeyFields;
+        const rightKeys = rel.junctionRightKeyFields;
+        const leftPkFields = rel.leftKeyFields ?? ['id'];
+        const rightPkFields = rel.rightKeyFields ?? ['id'];
+        // Resolve actual PK types from left (current) and right tables
+        const leftPkInfo = (0, utils_1.getPrimaryKeyInfo)(table);
+        const rightTable = allTables?.find((tb) => tb.name === rel.rightTable);
+        const rightPkInfo = rightTable ? (0, utils_1.getPrimaryKeyInfo)(rightTable) : [];
+        // ── add<Relation> ───────────────────────────────────────────────
+        {
+            // Parameters: one param per left PK + one param per right PK, with actual types
+            const params = [];
+            for (let i = 0; i < leftPkFields.length; i++) {
+                const p = t.identifier(leftPkFields[i]);
+                const pkInfo = leftPkInfo.find((pk) => pk.name === leftPkFields[i]);
+                p.typeAnnotation = t.tsTypeAnnotation(tsTypeFromPrimitive(pkInfo?.tsType ?? 'string'));
+                params.push(p);
+            }
+            for (let i = 0; i < rightPkFields.length; i++) {
+                const rk = rightPkFields[i];
+                const p = t.identifier(rk === leftPkFields[0] ? `right${(0, utils_1.ucFirst)(rk)}` : rk);
+                const pkInfo = rightPkInfo.find((pk) => pk.name === rk);
+                p.typeAnnotation = t.tsTypeAnnotation(tsTypeFromPrimitive(pkInfo?.tsType ?? 'string'));
+                params.push(p);
+            }
+            // Build the junction row data object: { junctionLeftKey: leftPk, junctionRightKey: rightPk }
+            const dataProps = [];
+            for (let i = 0; i < leftKeys.length; i++) {
+                dataProps.push(t.objectProperty(t.identifier(leftKeys[i]), t.identifier(params[i].name)));
+            }
+            for (let i = 0; i < rightKeys.length; i++) {
+                dataProps.push(t.objectProperty(t.identifier(rightKeys[i]), t.identifier(params[leftPkFields.length + i].name)));
+            }
+            const body = [
+                t.variableDeclaration('const', [
+                    t.variableDeclarator(t.objectPattern([
+                        t.objectProperty(t.identifier('document'), t.identifier('document'), false, true),
+                        t.objectProperty(t.identifier('variables'), t.identifier('variables'), false, true),
+                    ]), t.callExpression(t.identifier('buildCreateDocument'), [
+                        t.stringLiteral(junctionNames.typeName),
+                        t.stringLiteral(junctionCreateMutation),
+                        t.stringLiteral(junctionSingular),
+                        t.objectExpression([t.objectProperty(t.identifier('id'), t.booleanLiteral(true))]),
+                        t.objectExpression(dataProps),
+                        t.stringLiteral(junctionCreateInputType),
+                    ])),
+                ]),
+                t.returnStatement(t.newExpression(t.identifier('QueryBuilder'), [
+                    t.objectExpression([
+                        t.objectProperty(t.identifier('client'), t.memberExpression(t.thisExpression(), t.identifier('client'))),
+                        t.objectProperty(t.identifier('operation'), t.stringLiteral('mutation')),
+                        t.objectProperty(t.identifier('operationName'), t.stringLiteral(junctionNames.typeName)),
+                        t.objectProperty(t.identifier('fieldName'), t.stringLiteral(junctionCreateMutation)),
+                        t.objectProperty(t.identifier('document'), t.identifier('document'), false, true),
+                        t.objectProperty(t.identifier('variables'), t.identifier('variables'), false, true),
+                    ]),
+                ])),
+            ];
+            classBody.push(t.classMethod('method', t.identifier(`add${relSingular}`), params, t.blockStatement(body)));
+        }
+        // ── remove<Relation> ────────────────────────────────────────────
+        if (junctionTable.query?.delete) {
+            const params = [];
+            for (let i = 0; i < leftPkFields.length; i++) {
+                const p = t.identifier(leftPkFields[i]);
+                const pkInfo = leftPkInfo.find((pk) => pk.name === leftPkFields[i]);
+                p.typeAnnotation = t.tsTypeAnnotation(tsTypeFromPrimitive(pkInfo?.tsType ?? 'string'));
+                params.push(p);
+            }
+            for (let i = 0; i < rightPkFields.length; i++) {
+                const rk = rightPkFields[i];
+                const p = t.identifier(rk === leftPkFields[0] ? `right${(0, utils_1.ucFirst)(rk)}` : rk);
+                const pkInfo = rightPkInfo.find((pk) => pk.name === rk);
+                p.typeAnnotation = t.tsTypeAnnotation(tsTypeFromPrimitive(pkInfo?.tsType ?? 'string'));
+                params.push(p);
+            }
+            // Build the keys object for junction delete
+            const keysProps = [];
+            for (let i = 0; i < leftKeys.length; i++) {
+                keysProps.push(t.objectProperty(t.identifier(leftKeys[i]), t.identifier(params[i].name)));
+            }
+            for (let i = 0; i < rightKeys.length; i++) {
+                keysProps.push(t.objectProperty(t.identifier(rightKeys[i]), t.identifier(params[leftPkFields.length + i].name)));
+            }
+            const body = [
+                t.variableDeclaration('const', [
+                    t.variableDeclarator(t.objectPattern([
+                        t.objectProperty(t.identifier('document'), t.identifier('document'), false, true),
+                        t.objectProperty(t.identifier('variables'), t.identifier('variables'), false, true),
+                    ]), t.callExpression(t.identifier('buildJunctionRemoveDocument'), [
+                        t.stringLiteral(junctionNames.typeName),
+                        t.stringLiteral(junctionDeleteMutation),
+                        t.objectExpression(keysProps),
+                        t.stringLiteral(junctionDeleteInputType),
+                    ])),
+                ]),
+                t.returnStatement(t.newExpression(t.identifier('QueryBuilder'), [
+                    t.objectExpression([
+                        t.objectProperty(t.identifier('client'), t.memberExpression(t.thisExpression(), t.identifier('client'))),
+                        t.objectProperty(t.identifier('operation'), t.stringLiteral('mutation')),
+                        t.objectProperty(t.identifier('operationName'), t.stringLiteral(junctionNames.typeName)),
+                        t.objectProperty(t.identifier('fieldName'), t.stringLiteral(junctionDeleteMutation)),
+                        t.objectProperty(t.identifier('document'), t.identifier('document'), false, true),
+                        t.objectProperty(t.identifier('variables'), t.identifier('variables'), false, true),
+                    ]),
+                ])),
+            ];
+            classBody.push(t.classMethod('method', t.identifier(`remove${relSingular}`), params, t.blockStatement(body)));
+        }
+    }
     const classDecl = t.classDeclaration(t.identifier(modelName), null, t.classBody(classBody));
     statements.push(t.exportNamedDeclaration(classDecl));
     const header = (0, utils_1.getGeneratedFileHeader)(`${typeName} model for ORM client`);
@@ -478,5 +612,5 @@ function generateModelFile(table, _useSharedTypes, options) {
     };
 }
 function generateAllModelFiles(tables, useSharedTypes, options) {
-    return tables.map((table) => generateModelFile(table, useSharedTypes, options));
+    return tables.map((table) => generateModelFile(table, useSharedTypes, options, tables));
 }

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

@@ -621,9 +621,8 @@ export function buildDeleteByPkDocument<TSelect = undefined>(
   operationName: string,
   mutationField: string,
   entityField: string,
-  id: string | number,
+  keys: Record<string, unknown>,
   inputTypeName: string,
-  idFieldName: string,
   select?: TSelect,
   connectionFieldsMap?: Record<string, Record<string, string>>,
 ): { document: string; variables: Record<string, unknown> } {
@@ -648,9 +647,26 @@ export function buildDeleteByPkDocument<TSelect = undefined>(
       ],
     }),
     variables: {
-      input: {
-        [idFieldName]: id,
-      },
+      input: keys,
+    },
+  };
+}
+
+export function buildJunctionRemoveDocument(
+  operationName: string,
+  mutationField: string,
+  keys: Record<string, unknown>,
+  inputTypeName: string,
+): { document: string; variables: Record<string, unknown> } {
+  return {
+    document: buildInputMutationDocument({
+      operationName,
+      mutationField,
+      inputTypeName,
+      resultSelections: [t.field({ name: 'clientMutationId' })],
+    }),
+    variables: {
+      input: keys,
     },
   };
 }

package/core/codegen/utils.d.ts

@@ -118,12 +118,14 @@ export declare function getCreateInputTypeName(table: Table): string;
 export declare function getPatchTypeName(table: Table): string;
 /**
  * Get PostGraphile update input type name
- * e.g., "UpdateCarInput"
+ * Derives from actual mutation name when available (handles composite PK naming
+ * like UpdatePostTagByPostIdAndTagIdInput), falls back to Update${Entity}Input.
  */
 export declare function getUpdateInputTypeName(table: Table): string;
 /**
  * Get PostGraphile delete input type name
- * e.g., "DeleteCarInput"
+ * Derives from actual mutation name when available (handles composite PK naming
+ * like DeletePostTagByPostIdAndTagIdInput), falls back to Delete${Entity}Input.
  */
 export declare function getDeleteInputTypeName(table: Table): string;
 /**

package/core/codegen/utils.js

@@ -244,17 +244,21 @@ function getPatchTypeName(table) {
 }
 /**
  * Get PostGraphile update input type name
- * e.g., "UpdateCarInput"
+ * Derives from actual mutation name when available (handles composite PK naming
+ * like UpdatePostTagByPostIdAndTagIdInput), falls back to Update${Entity}Input.
  */
 function getUpdateInputTypeName(table) {
-    return `Update${table.name}Input`;
+    const mutationName = table.query?.update;
+    return mutationName ? ucFirst(mutationName) + 'Input' : `Update${table.name}Input`;
 }
 /**
  * Get PostGraphile delete input type name
- * e.g., "DeleteCarInput"
+ * Derives from actual mutation name when available (handles composite PK naming
+ * like DeletePostTagByPostIdAndTagIdInput), falls back to Delete${Entity}Input.
  */
 function getDeleteInputTypeName(table) {
-    return `Delete${table.name}Input`;
+    const mutationName = table.query?.delete;
+    return mutationName ? ucFirst(mutationName) + 'Input' : `Delete${table.name}Input`;
 }
 // ============================================================================
 // Type mapping: GraphQL → TypeScript

package/core/introspect/enrich-relations.d.ts

@@ -0,0 +1,13 @@
+/**
+ * M:N Relation Enrichment
+ *
+ * After table inference from introspection, enriches ManyToManyRelation objects
+ * with junction key field metadata from _cachedTablesMeta (MetaSchemaPlugin).
+ */
+import type { Table } from '../../types/schema';
+import type { MetaTableInfo } from './source/types';
+/**
+ * Enrich M:N relations with junction key field metadata from _meta.
+ * Mutates the tables array in-place.
+ */
+export declare function enrichManyToManyRelations(tables: Table[], tablesMeta?: MetaTableInfo[]): void;

package/core/introspect/enrich-relations.js

@@ -0,0 +1,26 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.enrichManyToManyRelations = enrichManyToManyRelations;
+/**
+ * Enrich M:N relations with junction key field metadata from _meta.
+ * Mutates the tables array in-place.
+ */
+function enrichManyToManyRelations(tables, tablesMeta) {
+    if (!tablesMeta?.length)
+        return;
+    const metaByName = new Map(tablesMeta.map((m) => [m.name, m]));
+    for (const table of tables) {
+        const meta = metaByName.get(table.name);
+        if (!meta?.relations.manyToMany.length)
+            continue;
+        for (const rel of table.relations.manyToMany) {
+            const metaRel = meta.relations.manyToMany.find((m) => m.fieldName === rel.fieldName);
+            if (!metaRel)
+                continue;
+            rel.junctionLeftKeyFields = metaRel.junctionLeftKeyAttributes.map((a) => a.name);
+            rel.junctionRightKeyFields = metaRel.junctionRightKeyAttributes.map((a) => a.name);
+            rel.leftKeyFields = metaRel.leftKeyAttributes.map((a) => a.name);
+            rel.rightKeyFields = metaRel.rightKeyAttributes.map((a) => a.name);
+        }
+    }
+}

package/core/pipeline/index.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateSourceOptions = exports.createSchemaSource = void 0;
 exports.runCodegenPipeline = runCodegenPipeline;
 exports.validateTablesFound = validateTablesFound;
+const enrich_relations_1 = require("../introspect/enrich-relations");
 const infer_tables_1 = require("../introspect/infer-tables");
 const transform_1 = require("../introspect/transform");
 const transform_schema_1 = require("../introspect/transform-schema");
@@ -27,13 +28,18 @@ async function runCodegenPipeline(options) {
     const log = verbose ? console.log : () => { };
     // 1. Fetch introspection from source
     log(`Fetching schema from ${source.describe()}...`);
-    const { introspection } = await source.fetch();
+    const { introspection, tablesMeta } = await source.fetch();
     // 2. Infer tables from introspection (replaces _meta)
     log('Inferring table metadata from schema...');
     const commentsEnabled = config.codegen?.comments !== false;
     let tables = (0, infer_tables_1.inferTablesFromIntrospection)(introspection, { comments: commentsEnabled });
     const totalTables = tables.length;
     log(`  Found ${totalTables} tables`);
+    // 2a. Enrich M:N relations with junction key metadata from _meta
+    if (tablesMeta?.length) {
+        (0, enrich_relations_1.enrichManyToManyRelations)(tables, tablesMeta);
+        log(`  Enriched M:N relations from _meta (${tablesMeta.length} tables)`);
+    }
     // 3. Filter tables by config (combine exclude and systemExclude)
     tables = (0, transform_1.filterTables)(tables, config.tables.include, [
         ...config.tables.exclude,

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

@@ -13,7 +13,7 @@
 import * as t from '@babel/types';
 import { pluralize } from 'inflekt';
 import { addJSDocComment, addLineComment, generateCode } from '../babel-ast';
-import { SCALAR_NAMES, scalarToFilterType, scalarToTsType } from '../scalars';
+import { BASE_FILTER_TYPE_NAMES, SCALAR_NAMES, scalarToFilterType, scalarToTsType } from '../scalars';
 import { getTypeBaseName } from '../type-resolver';
 import { getCreateInputTypeName, getConditionTypeName, getFilterTypeName, getGeneratedFileHeader, getOrderByTypeName, getPatchTypeName, getPrimaryKeyInfo, getTableNames, isRelationField, lcFirst, stripSmartComments, } from '../utils';
 // ============================================================================
@@ -680,10 +680,33 @@ function getFilterTypeForField(fieldType, isArray = false) {
     return scalarToFilterType(fieldType, isArray) ?? 'StringFilter';
 }
 /**
- * Build properties for a table filter interface
+ * Build properties for a table filter interface.
+ *
+ * When typeRegistry is available, uses the schema's filter input type as
+ * the sole source of truth — this captures plugin-injected filter fields
+ * (e.g., bm25Body, tsvTsv, trgmName, vectorEmbedding, geom) that are not
+ * present on the entity type itself. Same pattern as buildOrderByValues().
  */
-function buildTableFilterProperties(table) {
+function buildTableFilterProperties(table, typeRegistry) {
     const filterName = getFilterTypeName(table);
+    // When the schema's filter type is available, use it as the source of truth
+    if (typeRegistry) {
+        const filterType = typeRegistry.get(filterName);
+        if (filterType?.kind === 'INPUT_OBJECT' && filterType.inputFields) {
+            const properties = [];
+            for (const field of filterType.inputFields) {
+                const tsType = typeRefToTs(field.type);
+                properties.push({
+                    name: field.name,
+                    type: tsType,
+                    optional: true,
+                    description: stripSmartComments(field.description, true),
+                });
+            }
+            return properties;
+        }
+    }
+    // Fallback: derive from table fields when schema filter type is not available
     const properties = [];
     for (const field of table.fields) {
         const fieldType = typeof field.type === 'string' ? field.type : field.type.gqlType;
@@ -702,11 +725,11 @@ function buildTableFilterProperties(table) {
 /**
  * Generate table filter type statements
  */
-function generateTableFilterTypes(tables) {
+function generateTableFilterTypes(tables, typeRegistry) {
     const statements = [];
     for (const table of tables) {
         const filterName = getFilterTypeName(table);
-        statements.push(createExportedInterface(filterName, buildTableFilterProperties(table)));
+        statements.push(createExportedInterface(filterName, buildTableFilterProperties(table, typeRegistry)));
     }
     if (statements.length > 0) {
         addSectionComment(statements, 'Table Filter Types');
@@ -1285,6 +1308,40 @@ function generateConnectionFieldsMap(tables, tableByName) {
 // ============================================================================
 // Plugin-Injected Type Collector
 // ============================================================================
+/**
+ * Collect extra input type names referenced by plugin-injected filter fields.
+ *
+ * When the schema's filter type is used as source of truth, plugin-injected
+ * fields reference custom filter types (e.g., Bm25BodyFilter, TsvectorFilter,
+ * GeometryFilter) that also need to be generated. This function discovers
+ * those types by comparing the schema's filter type fields against the
+ * standard scalar filter types.
+ */
+function collectFilterExtraInputTypes(tables, typeRegistry) {
+    const extraTypes = new Set();
+    for (const table of tables) {
+        const filterTypeName = getFilterTypeName(table);
+        const filterType = typeRegistry.get(filterTypeName);
+        if (!filterType ||
+            filterType.kind !== 'INPUT_OBJECT' ||
+            !filterType.inputFields) {
+            continue;
+        }
+        for (const field of filterType.inputFields) {
+            // Skip logical operators (and/or/not reference the table's own filter type)
+            if (['and', 'or', 'not'].includes(field.name))
+                continue;
+            // Collect any filter type that isn't already generated as a base scalar filter
+            // This catches both plugin-injected fields (bm25Body, tsvTsv) AND regular columns
+            // whose custom scalar types have their own filter types (e.g., ConstructiveInternalTypeEmailFilter)
+            const baseName = getTypeBaseName(field.type);
+            if (baseName && !SCALAR_NAMES.has(baseName) && !BASE_FILTER_TYPE_NAMES.has(baseName)) {
+                extraTypes.add(baseName);
+            }
+        }
+    }
+    return extraTypes;
+}
 /**
  * Collect extra input type names referenced by plugin-injected condition fields.
  *
@@ -1348,7 +1405,9 @@ export function generateInputTypesFile(typeRegistry, usedInputTypes, tables, use
         statements.push(...generateEntityWithRelations(tablesList));
         statements.push(...generateEntitySelectTypes(tablesList, tableByName));
         // 4. Table filter types
-        statements.push(...generateTableFilterTypes(tablesList));
+        // Pass typeRegistry to use schema's filter type as source of truth,
+        // capturing plugin-injected filter fields (e.g., bm25, tsvector, trgm, vector, geom)
+        statements.push(...generateTableFilterTypes(tablesList, typeRegistry));
         // 4b. Table condition types (simple equality filter)
         // Pass typeRegistry to merge plugin-injected condition fields
         // (e.g., vectorEmbedding from VectorSearchPlugin)
@@ -1366,8 +1425,14 @@ export function generateInputTypesFile(typeRegistry, usedInputTypes, tables, use
     // Always emit this export so generated model/custom-op imports stay valid.
     statements.push(...generateConnectionFieldsMap(tablesList, tableByName));
     // 7. Custom input types from TypeRegistry
-    // Also include any extra types referenced by plugin-injected condition fields
+    // Also include any extra types referenced by plugin-injected filter/condition fields
     const mergedUsedInputTypes = new Set(usedInputTypes);
+    if (hasTables) {
+        const filterExtraTypes = collectFilterExtraInputTypes(tablesList, typeRegistry);
+        for (const typeName of filterExtraTypes) {
+            mergedUsedInputTypes.add(typeName);
+        }
+    }
     if (hasTables && conditionEnabled) {
         const conditionExtraTypes = collectConditionExtraInputTypes(tablesList, typeRegistry);
         for (const typeName of conditionExtraTypes) {

package/esm/core/codegen/orm/model-generator.d.ts

@@ -7,7 +7,7 @@ export interface GeneratedModelFile {
 }
 export declare function generateModelFile(table: Table, _useSharedTypes: boolean, options?: {
     condition?: boolean;
-}): GeneratedModelFile;
+}, allTables?: Table[]): GeneratedModelFile;
 export declare function generateAllModelFiles(tables: Table[], useSharedTypes: boolean, options?: {
     condition?: boolean;
 }): GeneratedModelFile[];

package/esm/core/codegen/orm/model-generator.js

@@ -5,8 +5,9 @@
  * Each method uses function overloads for IDE autocompletion of select objects.
  */
 import * as t from '@babel/types';
+import { singularize } from 'inflekt';
 import { generateCode } from '../babel-ast';
-import { getFilterTypeName, getGeneratedFileHeader, getOrderByTypeName, getPrimaryKeyInfo, getSingleRowQueryName, getTableNames, hasValidPrimaryKey, lcFirst, } from '../utils';
+import { getCreateInputTypeName, getCreateMutationName, getDeleteInputTypeName, getDeleteMutationName, getFilterTypeName, getGeneratedFileHeader, getOrderByTypeName, getPrimaryKeyInfo, getSingleRowQueryName, getTableNames, hasValidPrimaryKey, lcFirst, ucFirst, } from '../utils';
 function createImportDeclaration(moduleSpecifier, namedImports, typeOnly = false) {
     const specifiers = namedImports.map((name) => t.importSpecifier(t.identifier(name), t.identifier(name)));
     const decl = t.importDeclaration(specifiers, t.stringLiteral(moduleSpecifier));
@@ -65,7 +66,7 @@ function strictSelectGuard(selectTypeName) {
         t.tsTypeReference(t.identifier(selectTypeName)),
     ]));
 }
-export function generateModelFile(table, _useSharedTypes, options) {
+export function generateModelFile(table, _useSharedTypes, options, allTables) {
     const conditionEnabled = options?.condition !== false;
     const { typeName, singularName, pluralName } = getTableNames(table);
     const modelName = `${typeName}Model`;
@@ -79,7 +80,6 @@ export function generateModelFile(table, _useSharedTypes, options) {
     const orderByTypeName = getOrderByTypeName(table);
     const createInputTypeName = `Create${typeName}Input`;
     const updateInputTypeName = `Update${typeName}Input`;
-    const deleteInputTypeName = `Delete${typeName}Input`;
     const patchTypeName = `${typeName}Patch`;
     const pkFields = getPrimaryKeyInfo(table);
     const pkField = pkFields[0];
@@ -89,9 +89,16 @@ export function generateModelFile(table, _useSharedTypes, options) {
     const createMutationName = table.query?.create ?? `create${typeName}`;
     const updateMutationName = table.query?.update;
     const deleteMutationName = table.query?.delete;
+    const deleteInputTypeName = getDeleteInputTypeName(table);
     const statements = [];
     statements.push(createImportDeclaration('../client', ['OrmClient']));
-    statements.push(createImportDeclaration('../query-builder', [
+    const m2nRels = table.relations.manyToMany.filter((r) => r.junctionLeftKeyFields?.length && r.junctionRightKeyFields?.length);
+    // Check if any remove methods will actually be generated (need junction table with delete mutation)
+    const needsJunctionRemove = m2nRels.some((r) => {
+        const jt = allTables?.find((tb) => tb.name === r.junctionTable);
+        return jt?.query?.delete != null;
+    });
+    const queryBuilderImports = [
         'QueryBuilder',
         'buildFindManyDocument',
         'buildFindFirstDocument',
@@ -99,7 +106,9 @@ export function generateModelFile(table, _useSharedTypes, options) {
         'buildCreateDocument',
         'buildUpdateByPkDocument',
         'buildDeleteByPkDocument',
-    ]));
+        ...(needsJunctionRemove ? ['buildJunctionRemoveDocument'] : []),
+    ];
+    statements.push(createImportDeclaration('../query-builder', queryBuilderImports));
     statements.push(createImportDeclaration('../select-types', [
         'ConnectionResult',
         'FindManyArgs',
@@ -392,13 +401,12 @@ export function generateModelFile(table, _useSharedTypes, options) {
     }
     // ── delete ─────────────────────────────────────────────────────────────
     if (deleteMutationName) {
-        const whereLiteral = () => t.tsTypeLiteral([
-            (() => {
-                const prop = t.tsPropertySignature(t.identifier(pkField.name), t.tsTypeAnnotation(pkTsType()));
-                prop.optional = false;
-                return prop;
-            })(),
-        ]);
+        // Build where type with ALL PK fields (supports composite PKs)
+        const whereLiteral = () => t.tsTypeLiteral(pkFields.map((pk) => {
+            const prop = t.tsPropertySignature(t.identifier(pk.name), t.tsTypeAnnotation(tsTypeFromPrimitive(pk.tsType ?? 'string')));
+            prop.optional = false;
+            return prop;
+        }));
         const argsType = (sel) => t.tsTypeReference(t.identifier('DeleteArgs'), t.tsTypeParameterInstantiation([whereLiteral(), sel]));
         const retType = (sel) => t.tsTypeAnnotation(t.tsTypeReference(t.identifier('QueryBuilder'), t.tsTypeParameterInstantiation([
             t.tsTypeLiteral([
@@ -417,18 +425,144 @@ export function generateModelFile(table, _useSharedTypes, options) {
             strictSelectGuard(selectTypeName),
         ]));
         const selectExpr = t.memberExpression(t.identifier('args'), t.identifier('select'));
+        // Build keys object: { field1: args.where.field1, field2: args.where.field2, ... }
+        const keysObj = t.objectExpression(pkFields.map((pk) => t.objectProperty(t.identifier(pk.name), t.memberExpression(t.memberExpression(t.identifier('args'), t.identifier('where')), t.identifier(pk.name)))));
         const bodyArgs = [
             t.stringLiteral(typeName),
             t.stringLiteral(deleteMutationName),
             t.stringLiteral(entityLower),
-            t.memberExpression(t.memberExpression(t.identifier('args'), t.identifier('where')), t.identifier(pkField.name)),
+            keysObj,
             t.stringLiteral(deleteInputTypeName),
-            t.stringLiteral(pkField.name),
             selectExpr,
             t.identifier('connectionFieldsMap'),
         ];
         classBody.push(createClassMethod('delete', createTypeParam(selectTypeName), [implParam], retType(sRef()), buildMethodBody('buildDeleteByPkDocument', bodyArgs, 'mutation', typeName, deleteMutationName)));
     }
+    // ── M:N add/remove methods ────────────────────────────────────────────
+    for (const rel of m2nRels) {
+        if (!rel.fieldName)
+            continue;
+        const junctionTable = allTables?.find((tb) => tb.name === rel.junctionTable);
+        if (!junctionTable)
+            continue;
+        const junctionNames = getTableNames(junctionTable);
+        const junctionCreateMutation = getCreateMutationName(junctionTable);
+        const junctionCreateInputType = getCreateInputTypeName(junctionTable);
+        const junctionDeleteMutation = junctionTable.query?.delete ?? getDeleteMutationName(junctionTable);
+        const junctionDeleteInputType = getDeleteInputTypeName(junctionTable);
+        const junctionSingular = junctionNames.singularName;
+        // Derive a friendly singular name from the fieldName (e.g., "tags" → "Tag", "categories" → "Category")
+        const relSingular = ucFirst(singularize(rel.fieldName));
+        const leftKeys = rel.junctionLeftKeyFields;
+        const rightKeys = rel.junctionRightKeyFields;
+        const leftPkFields = rel.leftKeyFields ?? ['id'];
+        const rightPkFields = rel.rightKeyFields ?? ['id'];
+        // Resolve actual PK types from left (current) and right tables
+        const leftPkInfo = getPrimaryKeyInfo(table);
+        const rightTable = allTables?.find((tb) => tb.name === rel.rightTable);
+        const rightPkInfo = rightTable ? getPrimaryKeyInfo(rightTable) : [];
+        // ── add<Relation> ───────────────────────────────────────────────
+        {
+            // Parameters: one param per left PK + one param per right PK, with actual types
+            const params = [];
+            for (let i = 0; i < leftPkFields.length; i++) {
+                const p = t.identifier(leftPkFields[i]);
+                const pkInfo = leftPkInfo.find((pk) => pk.name === leftPkFields[i]);
+                p.typeAnnotation = t.tsTypeAnnotation(tsTypeFromPrimitive(pkInfo?.tsType ?? 'string'));
+                params.push(p);
+            }
+            for (let i = 0; i < rightPkFields.length; i++) {
+                const rk = rightPkFields[i];
+                const p = t.identifier(rk === leftPkFields[0] ? `right${ucFirst(rk)}` : rk);
+                const pkInfo = rightPkInfo.find((pk) => pk.name === rk);
+                p.typeAnnotation = t.tsTypeAnnotation(tsTypeFromPrimitive(pkInfo?.tsType ?? 'string'));
+                params.push(p);
+            }
+            // Build the junction row data object: { junctionLeftKey: leftPk, junctionRightKey: rightPk }
+            const dataProps = [];
+            for (let i = 0; i < leftKeys.length; i++) {
+                dataProps.push(t.objectProperty(t.identifier(leftKeys[i]), t.identifier(params[i].name)));
+            }
+            for (let i = 0; i < rightKeys.length; i++) {
+                dataProps.push(t.objectProperty(t.identifier(rightKeys[i]), t.identifier(params[leftPkFields.length + i].name)));
+            }
+            const body = [
+                t.variableDeclaration('const', [
+                    t.variableDeclarator(t.objectPattern([
+                        t.objectProperty(t.identifier('document'), t.identifier('document'), false, true),
+                        t.objectProperty(t.identifier('variables'), t.identifier('variables'), false, true),
+                    ]), t.callExpression(t.identifier('buildCreateDocument'), [
+                        t.stringLiteral(junctionNames.typeName),
+                        t.stringLiteral(junctionCreateMutation),
+                        t.stringLiteral(junctionSingular),
+                        t.objectExpression([t.objectProperty(t.identifier('id'), t.booleanLiteral(true))]),
+                        t.objectExpression(dataProps),
+                        t.stringLiteral(junctionCreateInputType),
+                    ])),
+                ]),
+                t.returnStatement(t.newExpression(t.identifier('QueryBuilder'), [
+                    t.objectExpression([
+                        t.objectProperty(t.identifier('client'), t.memberExpression(t.thisExpression(), t.identifier('client'))),
+                        t.objectProperty(t.identifier('operation'), t.stringLiteral('mutation')),
+                        t.objectProperty(t.identifier('operationName'), t.stringLiteral(junctionNames.typeName)),
+                        t.objectProperty(t.identifier('fieldName'), t.stringLiteral(junctionCreateMutation)),
+                        t.objectProperty(t.identifier('document'), t.identifier('document'), false, true),
+                        t.objectProperty(t.identifier('variables'), t.identifier('variables'), false, true),
+                    ]),
+                ])),
+            ];
+            classBody.push(t.classMethod('method', t.identifier(`add${relSingular}`), params, t.blockStatement(body)));
+        }
+        // ── remove<Relation> ────────────────────────────────────────────
+        if (junctionTable.query?.delete) {
+            const params = [];
+            for (let i = 0; i < leftPkFields.length; i++) {
+                const p = t.identifier(leftPkFields[i]);
+                const pkInfo = leftPkInfo.find((pk) => pk.name === leftPkFields[i]);
+                p.typeAnnotation = t.tsTypeAnnotation(tsTypeFromPrimitive(pkInfo?.tsType ?? 'string'));
+                params.push(p);
+            }
+            for (let i = 0; i < rightPkFields.length; i++) {
+                const rk = rightPkFields[i];
+                const p = t.identifier(rk === leftPkFields[0] ? `right${ucFirst(rk)}` : rk);
+                const pkInfo = rightPkInfo.find((pk) => pk.name === rk);
+                p.typeAnnotation = t.tsTypeAnnotation(tsTypeFromPrimitive(pkInfo?.tsType ?? 'string'));
+                params.push(p);
+            }
+            // Build the keys object for junction delete
+            const keysProps = [];
+            for (let i = 0; i < leftKeys.length; i++) {
+                keysProps.push(t.objectProperty(t.identifier(leftKeys[i]), t.identifier(params[i].name)));
+            }
+            for (let i = 0; i < rightKeys.length; i++) {
+                keysProps.push(t.objectProperty(t.identifier(rightKeys[i]), t.identifier(params[leftPkFields.length + i].name)));
+            }
+            const body = [
+                t.variableDeclaration('const', [
+                    t.variableDeclarator(t.objectPattern([
+                        t.objectProperty(t.identifier('document'), t.identifier('document'), false, true),
+                        t.objectProperty(t.identifier('variables'), t.identifier('variables'), false, true),
+                    ]), t.callExpression(t.identifier('buildJunctionRemoveDocument'), [
+                        t.stringLiteral(junctionNames.typeName),
+                        t.stringLiteral(junctionDeleteMutation),
+                        t.objectExpression(keysProps),
+                        t.stringLiteral(junctionDeleteInputType),
+                    ])),
+                ]),
+                t.returnStatement(t.newExpression(t.identifier('QueryBuilder'), [
+                    t.objectExpression([
+                        t.objectProperty(t.identifier('client'), t.memberExpression(t.thisExpression(), t.identifier('client'))),
+                        t.objectProperty(t.identifier('operation'), t.stringLiteral('mutation')),
+                        t.objectProperty(t.identifier('operationName'), t.stringLiteral(junctionNames.typeName)),
+                        t.objectProperty(t.identifier('fieldName'), t.stringLiteral(junctionDeleteMutation)),
+                        t.objectProperty(t.identifier('document'), t.identifier('document'), false, true),
+                        t.objectProperty(t.identifier('variables'), t.identifier('variables'), false, true),
+                    ]),
+                ])),
+            ];
+            classBody.push(t.classMethod('method', t.identifier(`remove${relSingular}`), params, t.blockStatement(body)));
+        }
+    }
     const classDecl = t.classDeclaration(t.identifier(modelName), null, t.classBody(classBody));
     statements.push(t.exportNamedDeclaration(classDecl));
     const header = getGeneratedFileHeader(`${typeName} model for ORM client`);
@@ -441,5 +575,5 @@ export function generateModelFile(table, _useSharedTypes, options) {
     };
 }
 export function generateAllModelFiles(tables, useSharedTypes, options) {
-    return tables.map((table) => generateModelFile(table, useSharedTypes, options));
+    return tables.map((table) => generateModelFile(table, useSharedTypes, options, tables));
 }

package/esm/core/codegen/utils.d.ts

@@ -118,12 +118,14 @@ export declare function getCreateInputTypeName(table: Table): string;
 export declare function getPatchTypeName(table: Table): string;
 /**
  * Get PostGraphile update input type name
- * e.g., "UpdateCarInput"
+ * Derives from actual mutation name when available (handles composite PK naming
+ * like UpdatePostTagByPostIdAndTagIdInput), falls back to Update${Entity}Input.
  */
 export declare function getUpdateInputTypeName(table: Table): string;
 /**
  * Get PostGraphile delete input type name
- * e.g., "DeleteCarInput"
+ * Derives from actual mutation name when available (handles composite PK naming
+ * like DeletePostTagByPostIdAndTagIdInput), falls back to Delete${Entity}Input.
  */
 export declare function getDeleteInputTypeName(table: Table): string;
 /**

package/esm/core/codegen/utils.js

@@ -199,17 +199,21 @@ export function getPatchTypeName(table) {
 }
 /**
  * Get PostGraphile update input type name
- * e.g., "UpdateCarInput"
+ * Derives from actual mutation name when available (handles composite PK naming
+ * like UpdatePostTagByPostIdAndTagIdInput), falls back to Update${Entity}Input.
  */
 export function getUpdateInputTypeName(table) {
-    return `Update${table.name}Input`;
+    const mutationName = table.query?.update;
+    return mutationName ? ucFirst(mutationName) + 'Input' : `Update${table.name}Input`;
 }
 /**
  * Get PostGraphile delete input type name
- * e.g., "DeleteCarInput"
+ * Derives from actual mutation name when available (handles composite PK naming
+ * like DeletePostTagByPostIdAndTagIdInput), falls back to Delete${Entity}Input.
  */
 export function getDeleteInputTypeName(table) {
-    return `Delete${table.name}Input`;
+    const mutationName = table.query?.delete;
+    return mutationName ? ucFirst(mutationName) + 'Input' : `Delete${table.name}Input`;
 }
 // ============================================================================
 // Type mapping: GraphQL → TypeScript

package/esm/core/introspect/enrich-relations.d.ts

@@ -0,0 +1,13 @@
+/**
+ * M:N Relation Enrichment
+ *
+ * After table inference from introspection, enriches ManyToManyRelation objects
+ * with junction key field metadata from _cachedTablesMeta (MetaSchemaPlugin).
+ */
+import type { Table } from '../../types/schema';
+import type { MetaTableInfo } from './source/types';
+/**
+ * Enrich M:N relations with junction key field metadata from _meta.
+ * Mutates the tables array in-place.
+ */
+export declare function enrichManyToManyRelations(tables: Table[], tablesMeta?: MetaTableInfo[]): void;

package/esm/core/introspect/enrich-relations.js

@@ -0,0 +1,23 @@
+/**
+ * Enrich M:N relations with junction key field metadata from _meta.
+ * Mutates the tables array in-place.
+ */
+export function enrichManyToManyRelations(tables, tablesMeta) {
+    if (!tablesMeta?.length)
+        return;
+    const metaByName = new Map(tablesMeta.map((m) => [m.name, m]));
+    for (const table of tables) {
+        const meta = metaByName.get(table.name);
+        if (!meta?.relations.manyToMany.length)
+            continue;
+        for (const rel of table.relations.manyToMany) {
+            const metaRel = meta.relations.manyToMany.find((m) => m.fieldName === rel.fieldName);
+            if (!metaRel)
+                continue;
+            rel.junctionLeftKeyFields = metaRel.junctionLeftKeyAttributes.map((a) => a.name);
+            rel.junctionRightKeyFields = metaRel.junctionRightKeyAttributes.map((a) => a.name);
+            rel.leftKeyFields = metaRel.leftKeyAttributes.map((a) => a.name);
+            rel.rightKeyFields = metaRel.rightKeyAttributes.map((a) => a.name);
+        }
+    }
+}

package/esm/core/pipeline/index.js

@@ -1,3 +1,4 @@
+import { enrichManyToManyRelations } from '../introspect/enrich-relations';
 import { inferTablesFromIntrospection } from '../introspect/infer-tables';
 import { filterTables } from '../introspect/transform';
 import { filterOperations, getCustomOperations, getTableOperationNames, transformSchemaToOperations, } from '../introspect/transform-schema';
@@ -20,13 +21,18 @@ export async function runCodegenPipeline(options) {
     const log = verbose ? console.log : () => { };
     // 1. Fetch introspection from source
     log(`Fetching schema from ${source.describe()}...`);
-    const { introspection } = await source.fetch();
+    const { introspection, tablesMeta } = await source.fetch();
     // 2. Infer tables from introspection (replaces _meta)
     log('Inferring table metadata from schema...');
     const commentsEnabled = config.codegen?.comments !== false;
     let tables = inferTablesFromIntrospection(introspection, { comments: commentsEnabled });
     const totalTables = tables.length;
     log(`  Found ${totalTables} tables`);
+    // 2a. Enrich M:N relations with junction key metadata from _meta
+    if (tablesMeta?.length) {
+        enrichManyToManyRelations(tables, tablesMeta);
+        log(`  Enriched M:N relations from _meta (${tablesMeta.length} tables)`);
+    }
     // 3. Filter tables by config (combine exclude and systemExclude)
     tables = filterTables(tables, config.tables.include, [
         ...config.tables.exclude,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@constructive-io/graphql-codegen",
-  "version": "4.20.0",
+  "version": "4.21.1",
   "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.8.1",
+    "@constructive-io/graphql-query": "^3.9.0",
     "@constructive-io/graphql-types": "^3.3.4",
     "@inquirerer/utils": "^3.3.4",
     "@pgpmjs/core": "^6.8.1",
@@ -101,5 +101,5 @@
     "tsx": "^4.21.0",
     "typescript": "^5.9.3"
   },
-  "gitHead": "9bd7e1bb2eb2e66ac18dce50cc29b84ef667649e"
+  "gitHead": "67136efd789e8e038da7b3adf3af49bd7bb1a49d"
 }