@constructive-io/graphql-query 3.8.1 → 3.9.1

package/esm/introspect/infer-tables.js

@@ -185,10 +185,10 @@ function buildCleanTable(entityName, entityType, typeMap, queryFields, mutationF
         mutationOps.create ||
         mutationOps.update ||
         mutationOps.delete);
-    // Infer primary key from mutation inputs
-    const constraints = inferConstraints(entityName, typeMap);
+    // Infer primary key from mutation inputs (pass mutation ops for composite PK input type derivation)
+    const constraints = inferConstraints(entityName, typeMap, mutationOps);
     // Infer the patch field name from UpdateXxxInput (e.g., "userPatch")
-    const patchFieldName = inferPatchFieldName(entityName, typeMap);
+    const patchFieldName = inferPatchFieldName(entityName, typeMap, mutationOps);
     // Build inflection map from discovered types
     const inflection = buildInflection(entityName, typeMap, entityToConnection);
     // Combine query operations with fallbacks for UI purposes
@@ -462,21 +462,23 @@ function matchMutationOperations(entityName, mutationFields) {
         if (field.name === expectedCreate) {
             create = field.name;
         }
-        // Match update (could be updateUser or updateUserById)
-        if (field.name === expectedUpdate ||
-            field.name === `${expectedUpdate}ById`) {
-            // Prefer non-ById version
-            if (!update || field.name === expectedUpdate) {
-                update = field.name;
-            }
+        // Match update (could be updateUser, updateUserById, or updateUserByFooAndBar for composite PKs)
+        if (field.name === expectedUpdate) {
+            update = field.name;
         }
-        // Match delete (could be deleteUser or deleteUserById)
-        if (field.name === expectedDelete ||
-            field.name === `${expectedDelete}ById`) {
-            // Prefer non-ById version
-            if (!del || field.name === expectedDelete) {
-                del = field.name;
-            }
+        else if (!update &&
+            (field.name === `${expectedUpdate}ById` ||
+                field.name.startsWith(`${expectedUpdate}By`))) {
+            update = field.name;
+        }
+        // Match delete (could be deleteUser, deleteUserById, or deleteUserByFooAndBar for composite PKs)
+        if (field.name === expectedDelete) {
+            del = field.name;
+        }
+        else if (!del &&
+            (field.name === `${expectedDelete}ById` ||
+                field.name.startsWith(`${expectedDelete}By`))) {
+            del = field.name;
         }
     }
     return { create, update, delete: del };
@@ -489,25 +491,29 @@ function matchMutationOperations(entityName, mutationFields) {
  *
  * Primary key can be inferred from Update/Delete mutation input types,
  * which typically have an 'id' field or similar.
+ *
+ * For composite PK tables (e.g. junction tables), PostGraphile generates
+ * mutations like `deletePostTagByPostIdAndTagId` with input type
+ * `DeletePostTagByPostIdAndTagIdInput`. We derive input type names from
+ * the actual matched mutation names when available.
  */
-function inferConstraints(entityName, typeMap) {
+function inferConstraints(entityName, typeMap, mutations) {
     const primaryKey = [];
-    // Try to find Update or Delete input type to extract PK
-    const updateInputName = `Update${entityName}Input`;
-    const deleteInputName = `Delete${entityName}Input`;
+    const deleteInputName = inputTypeFromMutation(mutations?.delete, `Delete${entityName}Input`);
+    const updateInputName = inputTypeFromMutation(mutations?.update, `Update${entityName}Input`);
     const updateInput = typeMap.get(updateInputName);
     const deleteInput = typeMap.get(deleteInputName);
-    const keyInputField = inferPrimaryKeyFromInputObject(updateInput) ||
-        inferPrimaryKeyFromInputObject(deleteInput);
-    if (keyInputField) {
+    // Prefer Delete input (fewer non-PK fields) over Update input
+    const keyFields = inferPrimaryKeyFromInputObject(deleteInput).length > 0
+        ? inferPrimaryKeyFromInputObject(deleteInput)
+        : inferPrimaryKeyFromInputObject(updateInput);
+    if (keyFields.length > 0) {
         primaryKey.push({
             name: 'primary',
-            fields: [
-                {
-                    name: keyInputField.name,
-                    type: convertToCleanFieldType(keyInputField.type),
-                },
-            ],
+            fields: keyFields.map((f) => ({
+                name: f.name,
+                type: convertToCleanFieldType(f.type),
+            })),
         });
     }
     // If no PK found from inputs, try to find 'id' field in entity type
@@ -535,22 +541,23 @@ function inferConstraints(entityName, typeMap) {
     };
 }
 /**
- * Infer a single-row lookup key from an Update/Delete input object.
+ * Infer primary key fields from an Update/Delete input object.
  *
  * Priority:
  * 1. Canonical keys: id, nodeId, rowId
- * 2. Single non-patch/non-clientMutationId scalar-ish field
+ * 2. All non-patch/non-clientMutationId fields (supports composite keys)
  *
- * If multiple possible key fields remain, return null to avoid guessing.
+ * Returns all candidate key fields, enabling composite PK detection
+ * for junction tables like PostTag(postId, tagId).
  */
 function inferPrimaryKeyFromInputObject(inputType) {
     const inputFields = inputType?.inputFields ?? [];
     if (inputFields.length === 0)
-        return null;
+        return [];
     const canonicalKey = inputFields.find((field) => field.name === 'id' || field.name === 'nodeId' || field.name === 'rowId');
     if (canonicalKey)
-        return canonicalKey;
-    const candidates = inputFields.filter((field) => {
+        return [canonicalKey];
+    return inputFields.filter((field) => {
         if (field.name === 'clientMutationId')
             return false;
         const baseTypeName = getBaseTypeName(field.type);
@@ -562,7 +569,6 @@ function inferPrimaryKeyFromInputObject(inputType) {
             return false;
         return true;
     });
-    return candidates.length === 1 ? candidates[0] : null;
 }
 /**
  * Infer the patch field name from an Update input type.
@@ -573,8 +579,8 @@ function inferPrimaryKeyFromInputObject(inputType) {
  *
  * Pattern: {lcFirst(entityTypeName)}Patch
  */
-function inferPatchFieldName(entityName, typeMap) {
-    const updateInputName = `Update${entityName}Input`;
+function inferPatchFieldName(entityName, typeMap, mutations) {
+    const updateInputName = inputTypeFromMutation(mutations?.update, `Update${entityName}Input`);
     const updateInput = typeMap.get(updateInputName);
     const inputFields = updateInput?.inputFields ?? [];
     // Find the field whose type name ends in 'Patch'
@@ -679,6 +685,15 @@ function findOrderByType(entityName, pluralName, typeMap) {
 // ============================================================================
 // Utility Functions
 // ============================================================================
+/**
+ * Derive the input type name for a mutation.
+ * PostGraphile always generates input types as ${PascalCaseMutationName}Input.
+ * When the actual mutation name is known (e.g. from introspection), we derive
+ * from it directly. Otherwise we fall back to the conventional ${Verb}${Entity}Input.
+ */
+function inputTypeFromMutation(mutationName, fallback) {
+    return mutationName ? ucFirst(mutationName) + 'Input' : fallback;
+}
 /**
  * Build a map of type name → IntrospectionType for efficient lookup
  */

package/introspect/infer-tables.js

@@ -188,10 +188,10 @@ function buildCleanTable(entityName, entityType, typeMap, queryFields, mutationF
         mutationOps.create ||
         mutationOps.update ||
         mutationOps.delete);
-    // Infer primary key from mutation inputs
-    const constraints = inferConstraints(entityName, typeMap);
+    // Infer primary key from mutation inputs (pass mutation ops for composite PK input type derivation)
+    const constraints = inferConstraints(entityName, typeMap, mutationOps);
     // Infer the patch field name from UpdateXxxInput (e.g., "userPatch")
-    const patchFieldName = inferPatchFieldName(entityName, typeMap);
+    const patchFieldName = inferPatchFieldName(entityName, typeMap, mutationOps);
     // Build inflection map from discovered types
     const inflection = buildInflection(entityName, typeMap, entityToConnection);
     // Combine query operations with fallbacks for UI purposes
@@ -465,21 +465,23 @@ function matchMutationOperations(entityName, mutationFields) {
         if (field.name === expectedCreate) {
             create = field.name;
         }
-        // Match update (could be updateUser or updateUserById)
-        if (field.name === expectedUpdate ||
-            field.name === `${expectedUpdate}ById`) {
-            // Prefer non-ById version
-            if (!update || field.name === expectedUpdate) {
-                update = field.name;
-            }
+        // Match update (could be updateUser, updateUserById, or updateUserByFooAndBar for composite PKs)
+        if (field.name === expectedUpdate) {
+            update = field.name;
         }
-        // Match delete (could be deleteUser or deleteUserById)
-        if (field.name === expectedDelete ||
-            field.name === `${expectedDelete}ById`) {
-            // Prefer non-ById version
-            if (!del || field.name === expectedDelete) {
-                del = field.name;
-            }
+        else if (!update &&
+            (field.name === `${expectedUpdate}ById` ||
+                field.name.startsWith(`${expectedUpdate}By`))) {
+            update = field.name;
+        }
+        // Match delete (could be deleteUser, deleteUserById, or deleteUserByFooAndBar for composite PKs)
+        if (field.name === expectedDelete) {
+            del = field.name;
+        }
+        else if (!del &&
+            (field.name === `${expectedDelete}ById` ||
+                field.name.startsWith(`${expectedDelete}By`))) {
+            del = field.name;
         }
     }
     return { create, update, delete: del };
@@ -492,25 +494,29 @@ function matchMutationOperations(entityName, mutationFields) {
  *
  * Primary key can be inferred from Update/Delete mutation input types,
  * which typically have an 'id' field or similar.
+ *
+ * For composite PK tables (e.g. junction tables), PostGraphile generates
+ * mutations like `deletePostTagByPostIdAndTagId` with input type
+ * `DeletePostTagByPostIdAndTagIdInput`. We derive input type names from
+ * the actual matched mutation names when available.
  */
-function inferConstraints(entityName, typeMap) {
+function inferConstraints(entityName, typeMap, mutations) {
     const primaryKey = [];
-    // Try to find Update or Delete input type to extract PK
-    const updateInputName = `Update${entityName}Input`;
-    const deleteInputName = `Delete${entityName}Input`;
+    const deleteInputName = inputTypeFromMutation(mutations?.delete, `Delete${entityName}Input`);
+    const updateInputName = inputTypeFromMutation(mutations?.update, `Update${entityName}Input`);
     const updateInput = typeMap.get(updateInputName);
     const deleteInput = typeMap.get(deleteInputName);
-    const keyInputField = inferPrimaryKeyFromInputObject(updateInput) ||
-        inferPrimaryKeyFromInputObject(deleteInput);
-    if (keyInputField) {
+    // Prefer Delete input (fewer non-PK fields) over Update input
+    const keyFields = inferPrimaryKeyFromInputObject(deleteInput).length > 0
+        ? inferPrimaryKeyFromInputObject(deleteInput)
+        : inferPrimaryKeyFromInputObject(updateInput);
+    if (keyFields.length > 0) {
         primaryKey.push({
             name: 'primary',
-            fields: [
-                {
-                    name: keyInputField.name,
-                    type: convertToCleanFieldType(keyInputField.type),
-                },
-            ],
+            fields: keyFields.map((f) => ({
+                name: f.name,
+                type: convertToCleanFieldType(f.type),
+            })),
         });
     }
     // If no PK found from inputs, try to find 'id' field in entity type
@@ -538,22 +544,23 @@ function inferConstraints(entityName, typeMap) {
     };
 }
 /**
- * Infer a single-row lookup key from an Update/Delete input object.
+ * Infer primary key fields from an Update/Delete input object.
  *
  * Priority:
  * 1. Canonical keys: id, nodeId, rowId
- * 2. Single non-patch/non-clientMutationId scalar-ish field
+ * 2. All non-patch/non-clientMutationId fields (supports composite keys)
  *
- * If multiple possible key fields remain, return null to avoid guessing.
+ * Returns all candidate key fields, enabling composite PK detection
+ * for junction tables like PostTag(postId, tagId).
  */
 function inferPrimaryKeyFromInputObject(inputType) {
     const inputFields = inputType?.inputFields ?? [];
     if (inputFields.length === 0)
-        return null;
+        return [];
     const canonicalKey = inputFields.find((field) => field.name === 'id' || field.name === 'nodeId' || field.name === 'rowId');
     if (canonicalKey)
-        return canonicalKey;
-    const candidates = inputFields.filter((field) => {
+        return [canonicalKey];
+    return inputFields.filter((field) => {
         if (field.name === 'clientMutationId')
             return false;
         const baseTypeName = (0, introspection_1.getBaseTypeName)(field.type);
@@ -565,7 +572,6 @@ function inferPrimaryKeyFromInputObject(inputType) {
             return false;
         return true;
     });
-    return candidates.length === 1 ? candidates[0] : null;
 }
 /**
  * Infer the patch field name from an Update input type.
@@ -576,8 +582,8 @@ function inferPrimaryKeyFromInputObject(inputType) {
  *
  * Pattern: {lcFirst(entityTypeName)}Patch
  */
-function inferPatchFieldName(entityName, typeMap) {
-    const updateInputName = `Update${entityName}Input`;
+function inferPatchFieldName(entityName, typeMap, mutations) {
+    const updateInputName = inputTypeFromMutation(mutations?.update, `Update${entityName}Input`);
     const updateInput = typeMap.get(updateInputName);
     const inputFields = updateInput?.inputFields ?? [];
     // Find the field whose type name ends in 'Patch'
@@ -682,6 +688,15 @@ function findOrderByType(entityName, pluralName, typeMap) {
 // ============================================================================
 // Utility Functions
 // ============================================================================
+/**
+ * Derive the input type name for a mutation.
+ * PostGraphile always generates input types as ${PascalCaseMutationName}Input.
+ * When the actual mutation name is known (e.g. from introspection), we derive
+ * from it directly. Otherwise we fall back to the conventional ${Verb}${Entity}Input.
+ */
+function inputTypeFromMutation(mutationName, fallback) {
+    return mutationName ? (0, inflekt_1.ucFirst)(mutationName) + 'Input' : fallback;
+}
 /**
  * Build a map of type name → IntrospectionType for efficient lookup
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@constructive-io/graphql-query",
-  "version": "3.8.1",
+  "version": "3.9.1",
   "description": "Constructive GraphQL Query",
   "author": "Constructive <developers@constructive.io>",
   "main": "index.js",
@@ -34,7 +34,7 @@
     "grafast": "1.0.0-rc.9",
     "graphile-build-pg": "5.0.0-rc.8",
     "graphile-config": "1.0.0-rc.6",
-    "graphile-settings": "^4.12.1",
+    "graphile-settings": "^4.12.2",
     "graphql": "16.13.0",
     "inflection": "^3.0.0",
     "inflekt": "^0.3.3",
@@ -51,5 +51,5 @@
   "devDependencies": {
     "makage": "^0.1.10"
   },
-  "gitHead": "b0ff4ed0025af0e5df91d8e3535c347e4cde6438"
+  "gitHead": "bfc62d3bf8b8374dea67536cfea9d16cbe0575ac"
 }