@constructive-io/graphql-query 3.31.0 → 3.31.2

package/esm/introspect/infer-tables.js

@@ -178,7 +178,7 @@ function buildCleanTable(entityName, entityType, typeMap, queryFields, mutationF
     const relations = inferRelations(entityType, entityToConnection, connectionToEntity);
     // Match query and mutation operations
     const queryOps = matchQueryOperations(entityName, queryFields, entityToConnection);
-    const mutationOps = matchMutationOperations(entityName, mutationFields);
+    const mutationOps = matchMutationOperations(entityName, mutationFields, typeMap);
     // Check if we found at least one real operation (not a fallback)
     const hasRealOperation = !!(queryOps.all ||
         queryOps.one ||
@@ -485,6 +485,25 @@ function matchQueryOperations(entityName, queryFields, entityToConnection) {
     }
     return { all, one };
 }
+/**
+ * Check whether a mutation field is a real PostGraphile CRUD mutation.
+ *
+ * CRUD mutation payloads always contain a field named lcFirst(entityName)
+ * whose type is the entity itself (e.g. DeleteUserPayload has `user: User`).
+ * Custom SQL-function mutations that happen to follow the same naming
+ * convention (e.g. `deletePrincipal`) return something else — typically
+ * `result: Boolean` or `result: UUID` — and must not be treated as CRUD.
+ */
+function isCrudMutation(field, entityName, typeMap) {
+    const payloadTypeName = getBaseTypeName(field.type);
+    if (!payloadTypeName)
+        return false;
+    const payloadType = typeMap.get(payloadTypeName);
+    if (!payloadType || !payloadType.fields)
+        return false;
+    const entityFieldName = lcFirst(entityName);
+    return payloadType.fields.some((f) => f.name === entityFieldName && getBaseTypeName(f.type) === entityName);
+}
 /**
  * Match mutation operations for an entity
  *
@@ -496,8 +515,12 @@ function matchQueryOperations(entityName, queryFields, entityToConnection) {
  * - bulkUpsert{PluralName} (bulk upsert)
  * - bulkUpdate{PluralName} (bulk update)
  * - bulkDelete{PluralName} (bulk delete)
+ *
+ * A candidate is only accepted if its payload type returns the entity
+ * (i.e. it is a real CRUD mutation, not a custom SQL function that
+ * happens to share the naming convention).
  */
-function matchMutationOperations(entityName, mutationFields) {
+function matchMutationOperations(entityName, mutationFields, typeMap) {
     let create = null;
     let update = null;
     let del = null;
@@ -516,25 +539,27 @@ function matchMutationOperations(entityName, mutationFields) {
     const expectedBulkDelete = `bulkDelete${pluralName}`;
     for (const field of mutationFields) {
         // Exact match for create
-        if (field.name === expectedCreate) {
+        if (field.name === expectedCreate && isCrudMutation(field, entityName, typeMap)) {
             create = field.name;
         }
         // Match update (could be updateUser, updateUserById, or updateUserByFooAndBar for composite PKs)
-        if (field.name === expectedUpdate) {
+        if (field.name === expectedUpdate && isCrudMutation(field, entityName, typeMap)) {
             update = field.name;
         }
         else if (!update &&
             (field.name === `${expectedUpdate}ById` ||
-                field.name.startsWith(`${expectedUpdate}By`))) {
+                field.name.startsWith(`${expectedUpdate}By`)) &&
+            isCrudMutation(field, entityName, typeMap)) {
             update = field.name;
         }
         // Match delete (could be deleteUser, deleteUserById, or deleteUserByFooAndBar for composite PKs)
-        if (field.name === expectedDelete) {
+        if (field.name === expectedDelete && isCrudMutation(field, entityName, typeMap)) {
             del = field.name;
         }
         else if (!del &&
             (field.name === `${expectedDelete}ById` ||
-                field.name.startsWith(`${expectedDelete}By`))) {
+                field.name.startsWith(`${expectedDelete}By`)) &&
+            isCrudMutation(field, entityName, typeMap)) {
             del = field.name;
         }
         // Bulk mutations

package/introspect/infer-tables.js

@@ -181,7 +181,7 @@ function buildCleanTable(entityName, entityType, typeMap, queryFields, mutationF
     const relations = inferRelations(entityType, entityToConnection, connectionToEntity);
     // Match query and mutation operations
     const queryOps = matchQueryOperations(entityName, queryFields, entityToConnection);
-    const mutationOps = matchMutationOperations(entityName, mutationFields);
+    const mutationOps = matchMutationOperations(entityName, mutationFields, typeMap);
     // Check if we found at least one real operation (not a fallback)
     const hasRealOperation = !!(queryOps.all ||
         queryOps.one ||
@@ -488,6 +488,25 @@ function matchQueryOperations(entityName, queryFields, entityToConnection) {
     }
     return { all, one };
 }
+/**
+ * Check whether a mutation field is a real PostGraphile CRUD mutation.
+ *
+ * CRUD mutation payloads always contain a field named lcFirst(entityName)
+ * whose type is the entity itself (e.g. DeleteUserPayload has `user: User`).
+ * Custom SQL-function mutations that happen to follow the same naming
+ * convention (e.g. `deletePrincipal`) return something else — typically
+ * `result: Boolean` or `result: UUID` — and must not be treated as CRUD.
+ */
+function isCrudMutation(field, entityName, typeMap) {
+    const payloadTypeName = (0, introspection_1.getBaseTypeName)(field.type);
+    if (!payloadTypeName)
+        return false;
+    const payloadType = typeMap.get(payloadTypeName);
+    if (!payloadType || !payloadType.fields)
+        return false;
+    const entityFieldName = (0, inflekt_1.lcFirst)(entityName);
+    return payloadType.fields.some((f) => f.name === entityFieldName && (0, introspection_1.getBaseTypeName)(f.type) === entityName);
+}
 /**
  * Match mutation operations for an entity
  *
@@ -499,8 +518,12 @@ function matchQueryOperations(entityName, queryFields, entityToConnection) {
  * - bulkUpsert{PluralName} (bulk upsert)
  * - bulkUpdate{PluralName} (bulk update)
  * - bulkDelete{PluralName} (bulk delete)
+ *
+ * A candidate is only accepted if its payload type returns the entity
+ * (i.e. it is a real CRUD mutation, not a custom SQL function that
+ * happens to share the naming convention).
  */
-function matchMutationOperations(entityName, mutationFields) {
+function matchMutationOperations(entityName, mutationFields, typeMap) {
     let create = null;
     let update = null;
     let del = null;
@@ -519,25 +542,27 @@ function matchMutationOperations(entityName, mutationFields) {
     const expectedBulkDelete = `bulkDelete${pluralName}`;
     for (const field of mutationFields) {
         // Exact match for create
-        if (field.name === expectedCreate) {
+        if (field.name === expectedCreate && isCrudMutation(field, entityName, typeMap)) {
             create = field.name;
         }
         // Match update (could be updateUser, updateUserById, or updateUserByFooAndBar for composite PKs)
-        if (field.name === expectedUpdate) {
+        if (field.name === expectedUpdate && isCrudMutation(field, entityName, typeMap)) {
             update = field.name;
         }
         else if (!update &&
             (field.name === `${expectedUpdate}ById` ||
-                field.name.startsWith(`${expectedUpdate}By`))) {
+                field.name.startsWith(`${expectedUpdate}By`)) &&
+            isCrudMutation(field, entityName, typeMap)) {
             update = field.name;
         }
         // Match delete (could be deleteUser, deleteUserById, or deleteUserByFooAndBar for composite PKs)
-        if (field.name === expectedDelete) {
+        if (field.name === expectedDelete && isCrudMutation(field, entityName, typeMap)) {
             del = field.name;
         }
         else if (!del &&
             (field.name === `${expectedDelete}ById` ||
-                field.name.startsWith(`${expectedDelete}By`))) {
+                field.name.startsWith(`${expectedDelete}By`)) &&
+            isCrudMutation(field, entityName, typeMap)) {
             del = field.name;
         }
         // Bulk mutations

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@constructive-io/graphql-query",
-  "version": "3.31.0",
+  "version": "3.31.2",
   "description": "Constructive GraphQL Query",
   "author": "Constructive <developers@constructive.io>",
   "main": "index.js",
@@ -37,7 +37,7 @@
     "grafast": "1.0.2",
     "graphile-build-pg": "5.0.2",
     "graphile-config": "1.0.1",
-    "graphile-settings": "^5.12.0",
+    "graphile-settings": "^5.12.1",
     "graphql": "16.13.0",
     "inflection": "^3.0.0",
     "inflekt": "^0.7.1",
@@ -54,5 +54,5 @@
   "devDependencies": {
     "makage": "^0.3.0"
   },
-  "gitHead": "b8bed95aa8adf93f13f7611ee10778214567eafe"
+  "gitHead": "ed31ed2aa63fcd2d42acec6f27e672dd300a3959"
 }