@constructive-io/graphql-query 3.12.8 → 3.12.10

package/esm/generators/index.js

@@ -4,10 +4,10 @@
  * Re-exports all query/mutation generation functions and naming helpers.
  */
 // SELECT, FindOne, Count query generators
-export { buildSelect, buildFindOne, buildCount, cleanTableToMetaObject, createASTQueryBuilder, generateIntrospectionSchema, toCamelCasePlural, toOrderByTypeName, } from './select';
+export { buildSelect, buildFindOne, buildCount, cleanTableToMetaObject, createASTQueryBuilder, generateIntrospectionSchema, } from './select';
 // Mutation generators (CREATE, UPDATE, DELETE)
 export { buildPostGraphileCreate, buildPostGraphileUpdate, buildPostGraphileDelete, } from './mutations';
 // Field selection utilities
 export { convertToSelectionOptions, isRelationalField, getAvailableRelations, validateFieldSelection, } from './field-selector';
 // Naming helpers (server-aware inflection)
-export { normalizeInflectionValue, toCamelCaseSingular, toCreateMutationName, toUpdateMutationName, toDeleteMutationName, toCreateInputTypeName, toUpdateInputTypeName, toDeleteInputTypeName, toFilterTypeName, toPatchFieldName, toOrderByEnumValue, } from './naming-helpers';
+export { normalizeInflectionValue, toCamelCasePlural, toCamelCaseSingular, toCreateMutationName, toUpdateMutationName, toDeleteMutationName, toCreateInputTypeName, toUpdateInputTypeName, toDeleteInputTypeName, toFilterTypeName, toOrderByTypeName, toPatchFieldName, toOrderByEnumValue, } from './naming-helpers';

package/esm/generators/select.js

@@ -10,8 +10,6 @@ import { QueryBuilder } from '../query-builder';
 import { convertToSelectionOptions, isRelationalField } from './field-selector';
 import { fuzzyFindByName } from 'inflekt';
 import { normalizeInflectionValue, toCamelCasePlural, toCamelCaseSingular, toCreateInputTypeName, toCreateMutationName, toDeleteInputTypeName, toDeleteMutationName, toFilterTypeName, toOrderByTypeName, toPatchFieldName, toUpdateInputTypeName, toUpdateMutationName, } from './naming-helpers';
-// Re-export naming helpers for backwards compatibility
-export { toCamelCasePlural, toOrderByTypeName } from './naming-helpers';
 /**
  * Convert Table to MetaObject format for QueryBuilder
  */

package/esm/index.js

@@ -21,7 +21,6 @@ export * from './custom-ast';
 export * from './types';
 // Meta object utilities (convert, validate)
 export * as MetaObject from './meta-object';
-// Also export meta-object functions directly for codegen backward compatibility
 export { convertFromMetaSchema } from './meta-object/convert';
 export { validateMetaObject } from './meta-object/validate';
 // Generators (buildSelect, buildFindOne, buildCount, mutations, field-selector, naming-helpers)

package/esm/introspect/infer-tables.js

@@ -369,14 +369,11 @@ function inferHasManyOrManyToMany(field, connectionTypeName, connectionToEntity)
     // Check for manyToMany pattern in field name
     const isManyToMany = field.name.includes('By') && field.name.includes('And');
     if (isManyToMany) {
-        // For ManyToMany, extract the actual entity name from the field name prefix
-        // Field name pattern: {relatedEntities}By{JunctionTable}{Keys}
-        // e.g., "usersByMembershipActorIdAndEntityId" → "users" → "User"
-        // e.g., "productsByOrderItemOrderIdAndProductId" → "products" → "Product"
-        const prefixMatch = field.name.match(/^([a-z]+)By/i);
-        const actualEntityName = prefixMatch
-            ? singularize(ucFirst(prefixMatch[1]))
-            : relatedEntityName;
+        // Use the entity name already resolved from the connection type mapping.
+        // This is more reliable than re-singularizing from the field name prefix,
+        // which can produce incorrect inflections (e.g. "codebases" → "Codebasis"
+        // instead of the correct "Codebase").
+        const actualEntityName = relatedEntityName;
         // Try to extract junction table from field name
         // Pattern: {relatedEntities}By{JunctionTable}{Keys}
         // e.g., "productsByProductCategoryProductIdAndCategoryId" → "ProductCategory"

package/generators/index.d.ts

@@ -3,7 +3,7 @@
  *
  * Re-exports all query/mutation generation functions and naming helpers.
  */
-export { buildSelect, buildFindOne, buildCount, cleanTableToMetaObject, createASTQueryBuilder, generateIntrospectionSchema, toCamelCasePlural, toOrderByTypeName, } from './select';
+export { buildSelect, buildFindOne, buildCount, cleanTableToMetaObject, createASTQueryBuilder, generateIntrospectionSchema, } from './select';
 export { buildPostGraphileCreate, buildPostGraphileUpdate, buildPostGraphileDelete, } from './mutations';
 export { convertToSelectionOptions, isRelationalField, getAvailableRelations, validateFieldSelection, } from './field-selector';
-export { normalizeInflectionValue, toCamelCaseSingular, toCreateMutationName, toUpdateMutationName, toDeleteMutationName, toCreateInputTypeName, toUpdateInputTypeName, toDeleteInputTypeName, toFilterTypeName, toPatchFieldName, toOrderByEnumValue, } from './naming-helpers';
+export { normalizeInflectionValue, toCamelCasePlural, toCamelCaseSingular, toCreateMutationName, toUpdateMutationName, toDeleteMutationName, toCreateInputTypeName, toUpdateInputTypeName, toDeleteInputTypeName, toFilterTypeName, toOrderByTypeName, toPatchFieldName, toOrderByEnumValue, } from './naming-helpers';

package/generators/index.js

@@ -5,7 +5,7 @@
  * Re-exports all query/mutation generation functions and naming helpers.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toOrderByEnumValue = exports.toPatchFieldName = exports.toFilterTypeName = exports.toDeleteInputTypeName = exports.toUpdateInputTypeName = exports.toCreateInputTypeName = exports.toDeleteMutationName = exports.toUpdateMutationName = exports.toCreateMutationName = exports.toCamelCaseSingular = exports.normalizeInflectionValue = exports.validateFieldSelection = exports.getAvailableRelations = exports.isRelationalField = exports.convertToSelectionOptions = exports.buildPostGraphileDelete = exports.buildPostGraphileUpdate = exports.buildPostGraphileCreate = exports.toOrderByTypeName = exports.toCamelCasePlural = exports.generateIntrospectionSchema = exports.createASTQueryBuilder = exports.cleanTableToMetaObject = exports.buildCount = exports.buildFindOne = exports.buildSelect = void 0;
+exports.toOrderByEnumValue = exports.toPatchFieldName = exports.toOrderByTypeName = exports.toFilterTypeName = exports.toDeleteInputTypeName = exports.toUpdateInputTypeName = exports.toCreateInputTypeName = exports.toDeleteMutationName = exports.toUpdateMutationName = exports.toCreateMutationName = exports.toCamelCaseSingular = exports.toCamelCasePlural = exports.normalizeInflectionValue = exports.validateFieldSelection = exports.getAvailableRelations = exports.isRelationalField = exports.convertToSelectionOptions = exports.buildPostGraphileDelete = exports.buildPostGraphileUpdate = exports.buildPostGraphileCreate = exports.generateIntrospectionSchema = exports.createASTQueryBuilder = exports.cleanTableToMetaObject = exports.buildCount = exports.buildFindOne = exports.buildSelect = void 0;
 // SELECT, FindOne, Count query generators
 var select_1 = require("./select");
 Object.defineProperty(exports, "buildSelect", { enumerable: true, get: function () { return select_1.buildSelect; } });
@@ -14,8 +14,6 @@ Object.defineProperty(exports, "buildCount", { enumerable: true, get: function (
 Object.defineProperty(exports, "cleanTableToMetaObject", { enumerable: true, get: function () { return select_1.cleanTableToMetaObject; } });
 Object.defineProperty(exports, "createASTQueryBuilder", { enumerable: true, get: function () { return select_1.createASTQueryBuilder; } });
 Object.defineProperty(exports, "generateIntrospectionSchema", { enumerable: true, get: function () { return select_1.generateIntrospectionSchema; } });
-Object.defineProperty(exports, "toCamelCasePlural", { enumerable: true, get: function () { return select_1.toCamelCasePlural; } });
-Object.defineProperty(exports, "toOrderByTypeName", { enumerable: true, get: function () { return select_1.toOrderByTypeName; } });
 // Mutation generators (CREATE, UPDATE, DELETE)
 var mutations_1 = require("./mutations");
 Object.defineProperty(exports, "buildPostGraphileCreate", { enumerable: true, get: function () { return mutations_1.buildPostGraphileCreate; } });
@@ -30,6 +28,7 @@ Object.defineProperty(exports, "validateFieldSelection", { enumerable: true, get
 // Naming helpers (server-aware inflection)
 var naming_helpers_1 = require("./naming-helpers");
 Object.defineProperty(exports, "normalizeInflectionValue", { enumerable: true, get: function () { return naming_helpers_1.normalizeInflectionValue; } });
+Object.defineProperty(exports, "toCamelCasePlural", { enumerable: true, get: function () { return naming_helpers_1.toCamelCasePlural; } });
 Object.defineProperty(exports, "toCamelCaseSingular", { enumerable: true, get: function () { return naming_helpers_1.toCamelCaseSingular; } });
 Object.defineProperty(exports, "toCreateMutationName", { enumerable: true, get: function () { return naming_helpers_1.toCreateMutationName; } });
 Object.defineProperty(exports, "toUpdateMutationName", { enumerable: true, get: function () { return naming_helpers_1.toUpdateMutationName; } });
@@ -38,5 +37,6 @@ Object.defineProperty(exports, "toCreateInputTypeName", { enumerable: true, get:
 Object.defineProperty(exports, "toUpdateInputTypeName", { enumerable: true, get: function () { return naming_helpers_1.toUpdateInputTypeName; } });
 Object.defineProperty(exports, "toDeleteInputTypeName", { enumerable: true, get: function () { return naming_helpers_1.toDeleteInputTypeName; } });
 Object.defineProperty(exports, "toFilterTypeName", { enumerable: true, get: function () { return naming_helpers_1.toFilterTypeName; } });
+Object.defineProperty(exports, "toOrderByTypeName", { enumerable: true, get: function () { return naming_helpers_1.toOrderByTypeName; } });
 Object.defineProperty(exports, "toPatchFieldName", { enumerable: true, get: function () { return naming_helpers_1.toPatchFieldName; } });
 Object.defineProperty(exports, "toOrderByEnumValue", { enumerable: true, get: function () { return naming_helpers_1.toOrderByEnumValue; } });

package/generators/select.d.ts

@@ -3,7 +3,6 @@ import { QueryBuilder } from '../query-builder';
 import type { MetaObject, QueryIntrospectionSchema } from '../types';
 import type { QueryOptions } from '../types/query';
 import type { Table } from '../types/schema';
-export { toCamelCasePlural, toOrderByTypeName } from './naming-helpers';
 /**
  * Convert Table to MetaObject format for QueryBuilder
  */

package/generators/select.js

@@ -33,7 +33,6 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toOrderByTypeName = exports.toCamelCasePlural = void 0;
 exports.cleanTableToMetaObject = cleanTableToMetaObject;
 exports.generateIntrospectionSchema = generateIntrospectionSchema;
 exports.createASTQueryBuilder = createASTQueryBuilder;
@@ -52,10 +51,6 @@ const query_builder_1 = require("../query-builder");
 const field_selector_1 = require("./field-selector");
 const inflekt_1 = require("inflekt");
 const naming_helpers_1 = require("./naming-helpers");
-// Re-export naming helpers for backwards compatibility
-var naming_helpers_2 = require("./naming-helpers");
-Object.defineProperty(exports, "toCamelCasePlural", { enumerable: true, get: function () { return naming_helpers_2.toCamelCasePlural; } });
-Object.defineProperty(exports, "toOrderByTypeName", { enumerable: true, get: function () { return naming_helpers_2.toOrderByTypeName; } });
 /**
  * Convert Table to MetaObject format for QueryBuilder
  */

package/index.js

@@ -63,7 +63,6 @@ __exportStar(require("./custom-ast"), exports);
 __exportStar(require("./types"), exports);
 // Meta object utilities (convert, validate)
 exports.MetaObject = __importStar(require("./meta-object"));
-// Also export meta-object functions directly for codegen backward compatibility
 var convert_1 = require("./meta-object/convert");
 Object.defineProperty(exports, "convertFromMetaSchema", { enumerable: true, get: function () { return convert_1.convertFromMetaSchema; } });
 var validate_1 = require("./meta-object/validate");

package/introspect/infer-tables.js

@@ -372,14 +372,11 @@ function inferHasManyOrManyToMany(field, connectionTypeName, connectionToEntity)
     // Check for manyToMany pattern in field name
     const isManyToMany = field.name.includes('By') && field.name.includes('And');
     if (isManyToMany) {
-        // For ManyToMany, extract the actual entity name from the field name prefix
-        // Field name pattern: {relatedEntities}By{JunctionTable}{Keys}
-        // e.g., "usersByMembershipActorIdAndEntityId" → "users" → "User"
-        // e.g., "productsByOrderItemOrderIdAndProductId" → "products" → "Product"
-        const prefixMatch = field.name.match(/^([a-z]+)By/i);
-        const actualEntityName = prefixMatch
-            ? (0, inflekt_1.singularize)((0, inflekt_1.ucFirst)(prefixMatch[1]))
-            : relatedEntityName;
+        // Use the entity name already resolved from the connection type mapping.
+        // This is more reliable than re-singularizing from the field name prefix,
+        // which can produce incorrect inflections (e.g. "codebases" → "Codebasis"
+        // instead of the correct "Codebase").
+        const actualEntityName = relatedEntityName;
         // Try to extract junction table from field name
         // Pattern: {relatedEntities}By{JunctionTable}{Keys}
         // e.g., "productsByProductCategoryProductIdAndCategoryId" → "ProductCategory"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@constructive-io/graphql-query",
-  "version": "3.12.8",
+  "version": "3.12.10",
   "description": "Constructive GraphQL Query",
   "author": "Constructive <developers@constructive.io>",
   "main": "index.js",
@@ -34,7 +34,7 @@
     "grafast": "1.0.0",
     "graphile-build-pg": "5.0.0",
     "graphile-config": "1.0.0",
-    "graphile-settings": "^4.18.3",
+    "graphile-settings": "^4.18.4",
     "graphql": "16.13.0",
     "inflection": "^3.0.0",
     "inflekt": "^0.7.1",
@@ -51,5 +51,5 @@
   "devDependencies": {
     "makage": "^0.3.0"
   },
-  "gitHead": "d28ce4f65863707e369e579f68c222b1d56c6ea3"
+  "gitHead": "d0d8f5ca5828ad3efba5f607bc699a8d520e4603"
 }