@constructive-io/graphql-query 3.11.0 → 3.12.0

package/ast.js

@@ -321,7 +321,7 @@ const createOne = ({ mutationName, operationName, mutation, selection, }) => {
     if (!mutation.properties?.input?.properties) {
         throw new Error(`No input field for mutation: ${mutationName}`);
     }
-    const modelName = (0, inflekt_1.camelize)([(0, inflekt_1.singularize)(mutation.model)].join('_'), true);
+    const modelName = (0, inflekt_1.toCamelCase)((0, inflekt_1.singularize)(mutation.model));
     const inputProperties = mutation.properties.input
         .properties;
     const modelProperties = inputProperties[modelName];
@@ -367,7 +367,7 @@ const patchOne = ({ mutationName, operationName, mutation, selection, }) => {
     if (!mutation.properties?.input?.properties) {
         throw new Error(`No input field for mutation: ${mutationName}`);
     }
-    const modelName = (0, inflekt_1.camelize)([(0, inflekt_1.singularize)(mutation.model)].join('_'), true);
+    const modelName = (0, inflekt_1.toCamelCase)((0, inflekt_1.singularize)(mutation.model));
     const inputProperties = mutation.properties.input
         .properties;
     const patchProperties = inputProperties['patch'];
@@ -420,7 +420,7 @@ const deleteOne = ({ mutationName, operationName, mutation, }) => {
     if (!mutation.properties?.input?.properties) {
         throw new Error(`No input field for mutation: ${mutationName}`);
     }
-    const modelName = (0, inflekt_1.camelize)([(0, inflekt_1.singularize)(mutation.model)].join('_'), true);
+    const modelName = (0, inflekt_1.toCamelCase)((0, inflekt_1.singularize)(mutation.model));
     const inputProperties = mutation.properties.input
         .properties;
     const deleteAttrs = objectToArray(inputProperties);

package/esm/ast.js

@@ -1,6 +1,6 @@
 import * as t from 'gql-ast';
 import { OperationTypeNode } from 'graphql';
-import { camelize, singularize } from 'inflekt';
+import { toCamelCase, singularize } from 'inflekt';
 import { getCustomAst } from './custom-ast';
 const NON_MUTABLE_PROPS = ['createdAt', 'createdBy', 'updatedAt', 'updatedBy'];
 const objectToArray = (obj) => Object.keys(obj).map((k) => ({
@@ -280,7 +280,7 @@ export const createOne = ({ mutationName, operationName, mutation, selection, })
     if (!mutation.properties?.input?.properties) {
         throw new Error(`No input field for mutation: ${mutationName}`);
     }
-    const modelName = camelize([singularize(mutation.model)].join('_'), true);
+    const modelName = toCamelCase(singularize(mutation.model));
     const inputProperties = mutation.properties.input
         .properties;
     const modelProperties = inputProperties[modelName];
@@ -325,7 +325,7 @@ export const patchOne = ({ mutationName, operationName, mutation, selection, })
     if (!mutation.properties?.input?.properties) {
         throw new Error(`No input field for mutation: ${mutationName}`);
     }
-    const modelName = camelize([singularize(mutation.model)].join('_'), true);
+    const modelName = toCamelCase(singularize(mutation.model));
     const inputProperties = mutation.properties.input
         .properties;
     const patchProperties = inputProperties['patch'];
@@ -377,7 +377,7 @@ export const deleteOne = ({ mutationName, operationName, mutation, }) => {
     if (!mutation.properties?.input?.properties) {
         throw new Error(`No input field for mutation: ${mutationName}`);
     }
-    const modelName = camelize([singularize(mutation.model)].join('_'), true);
+    const modelName = toCamelCase(singularize(mutation.model));
     const inputProperties = mutation.properties.input
         .properties;
     const deleteAttrs = objectToArray(inputProperties);

package/esm/generators/naming-helpers.js

@@ -7,7 +7,7 @@
  *
  * Back-ported from Dashboard's `packages/data/src/query-generator.ts`.
  */
-import { camelize, pluralize } from 'inflekt';
+import { toCamelCase, toScreamingSnake, pluralize } from 'inflekt';
 // ---------------------------------------------------------------------------
 // Internal helpers
 // ---------------------------------------------------------------------------
@@ -33,7 +33,7 @@ export function normalizeInflectionValue(value) {
  * Example: "ActionGoal" -> "actionGoals", "User" -> "users", "Person" -> "people"
  */
 export function toCamelCasePlural(tableName, table) {
-    const singular = camelize(tableName, true);
+    const singular = toCamelCase(tableName);
     const inflectedPlural = pluralize(singular);
     const serverPluralCandidates = [
         table?.query?.all,
@@ -60,7 +60,7 @@ export function toCamelCasePlural(tableName, table) {
  * Prefers server-provided names when available.
  */
 export function toCamelCaseSingular(tableName, table) {
-    const localSingular = camelize(tableName, true);
+    const localSingular = toCamelCase(tableName);
     for (const candidateRaw of [
         table?.query?.one,
         table?.inflection?.tableFieldName,
@@ -137,9 +137,7 @@ export function toPatchFieldName(tableName, table) {
  * "id"          -> "ID_ASC"
  */
 export function toOrderByEnumValue(fieldName, direction) {
-    const screaming = fieldName
-        .replace(/([a-z0-9])([A-Z])/g, '$1_$2')
-        .toUpperCase();
+    const screaming = toScreamingSnake(fieldName);
     return `${screaming}_${direction.toUpperCase()}`;
 }
 /**

package/esm/query-builder.js

@@ -1,5 +1,5 @@
 import { print as gqlPrint } from 'graphql';
-import { camelize, pluralize, underscore } from 'inflekt';
+import { toCamelCase, toPascalCase, pluralize, underscore } from 'inflekt';
 import { createOne, deleteOne, getAll, getCount, getMany, getOne, patchOne, } from './ast';
 import { validateMetaObject } from './meta-object';
 export * as MetaObject from './meta-object';
@@ -88,13 +88,13 @@ export class QueryBuilder {
         const getInputName = (mutationType) => {
             switch (mutationType) {
                 case 'delete': {
-                    return `Delete${camelize(this._model)}Input`;
+                    return `Delete${toPascalCase(this._model)}Input`;
                 }
                 case 'create': {
-                    return `Create${camelize(this._model)}Input`;
+                    return `Create${toPascalCase(this._model)}Input`;
                 }
                 case 'patch': {
-                    return `Update${camelize(this._model)}Input`;
+                    return `Update${toPascalCase(this._model)}Input`;
                 }
                 default:
                     throw new Error('Unhandled mutation type' + mutationType);
@@ -123,7 +123,7 @@ export class QueryBuilder {
     getMany({ select } = {}) {
         this._op = 'getMany';
         this._key = this._findQuery();
-        this.queryName(camelize(['get', underscore(this._key), 'query'].join('_'), true));
+        this.queryName(toCamelCase(['get', underscore(this._key), 'query'].join('_')));
         const defn = this._introspection[this._key];
         this.select(select);
         this._ast = getMany({
@@ -138,7 +138,7 @@ export class QueryBuilder {
     all({ select } = {}) {
         this._op = 'getMany';
         this._key = this._findQuery();
-        this.queryName(camelize(['get', underscore(this._key), 'query', 'all'].join('_'), true));
+        this.queryName(toCamelCase(['get', underscore(this._key), 'query', 'all'].join('_')));
         const defn = this._introspection[this._key];
         this.select(select);
         this._ast = getAll({
@@ -152,7 +152,7 @@ export class QueryBuilder {
     count() {
         this._op = 'getMany';
         this._key = this._findQuery();
-        this.queryName(camelize(['get', underscore(this._key), 'count', 'query'].join('_'), true));
+        this.queryName(toCamelCase(['get', underscore(this._key), 'count', 'query'].join('_')));
         const defn = this._introspection[this._key];
         this._ast = getCount({
             queryName: this._queryName,
@@ -164,7 +164,7 @@ export class QueryBuilder {
     getOne({ select } = {}) {
         this._op = 'getOne';
         this._key = this._findQuery();
-        this.queryName(camelize(['get', underscore(this._key), 'query'].join('_'), true));
+        this.queryName(toCamelCase(['get', underscore(this._key), 'query'].join('_')));
         const defn = this._introspection[this._key];
         this.select(select);
         this._ast = getOne({
@@ -180,7 +180,7 @@ export class QueryBuilder {
         this._op = 'mutation';
         this._mutation = 'create';
         this._key = this._findMutation();
-        this.queryName(camelize([underscore(this._key), 'mutation'].join('_'), true));
+        this.queryName(toCamelCase([underscore(this._key), 'mutation'].join('_')));
         const defn = this._introspection[this._key];
         this.select(select);
         this._ast = createOne({
@@ -195,7 +195,7 @@ export class QueryBuilder {
         this._op = 'mutation';
         this._mutation = 'delete';
         this._key = this._findMutation();
-        this.queryName(camelize([underscore(this._key), 'mutation'].join('_'), true));
+        this.queryName(toCamelCase([underscore(this._key), 'mutation'].join('_')));
         const defn = this._introspection[this._key];
         this.select(select);
         this._ast = deleteOne({
@@ -209,7 +209,7 @@ export class QueryBuilder {
         this._op = 'mutation';
         this._mutation = 'patch';
         this._key = this._findMutation();
-        this.queryName(camelize([underscore(this._key), 'mutation'].join('_'), true));
+        this.queryName(toCamelCase([underscore(this._key), 'mutation'].join('_')));
         const defn = this._introspection[this._key];
         this.select(select);
         this._ast = patchOne({
@@ -371,5 +371,5 @@ function isRelationalField(fieldName, modelMeta) {
 // Get getMany op name from model
 // ie. UserSetting => userSettings
 function modelNameToGetMany(model) {
-    return camelize(pluralize(underscore(model)), true);
+    return toCamelCase(pluralize(underscore(model)));
 }

package/generators/naming-helpers.js

@@ -48,7 +48,7 @@ function normalizeInflectionValue(value) {
  * Example: "ActionGoal" -> "actionGoals", "User" -> "users", "Person" -> "people"
  */
 function toCamelCasePlural(tableName, table) {
-    const singular = (0, inflekt_1.camelize)(tableName, true);
+    const singular = (0, inflekt_1.toCamelCase)(tableName);
     const inflectedPlural = (0, inflekt_1.pluralize)(singular);
     const serverPluralCandidates = [
         table?.query?.all,
@@ -75,7 +75,7 @@ function toCamelCasePlural(tableName, table) {
  * Prefers server-provided names when available.
  */
 function toCamelCaseSingular(tableName, table) {
-    const localSingular = (0, inflekt_1.camelize)(tableName, true);
+    const localSingular = (0, inflekt_1.toCamelCase)(tableName);
     for (const candidateRaw of [
         table?.query?.one,
         table?.inflection?.tableFieldName,
@@ -152,9 +152,7 @@ function toPatchFieldName(tableName, table) {
  * "id"          -> "ID_ASC"
  */
 function toOrderByEnumValue(fieldName, direction) {
-    const screaming = fieldName
-        .replace(/([a-z0-9])([A-Z])/g, '$1_$2')
-        .toUpperCase();
+    const screaming = (0, inflekt_1.toScreamingSnake)(fieldName);
     return `${screaming}_${direction.toUpperCase()}`;
 }
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@constructive-io/graphql-query",
-  "version": "3.11.0",
+  "version": "3.12.0",
   "description": "Constructive GraphQL Query",
   "author": "Constructive <developers@constructive.io>",
   "main": "index.js",
@@ -30,14 +30,14 @@
   },
   "dependencies": {
     "ajv": "^8.18.0",
-    "gql-ast": "^3.3.3",
+    "gql-ast": "^3.4.0",
     "grafast": "1.0.0-rc.9",
     "graphile-build-pg": "5.0.0-rc.8",
     "graphile-config": "1.0.0-rc.6",
-    "graphile-settings": "^4.15.0",
+    "graphile-settings": "^4.16.0",
     "graphql": "16.13.0",
     "inflection": "^3.0.0",
-    "inflekt": "^0.5.0",
+    "inflekt": "^0.5.1",
     "lru-cache": "^11.2.7",
     "postgraphile": "5.0.0-rc.10"
   },
@@ -51,5 +51,5 @@
   "devDependencies": {
     "makage": "^0.1.10"
   },
-  "gitHead": "2660dbd64e96cdb785ace8b28fbf9275cb3812aa"
+  "gitHead": "b8ed57a447cd71b93094edf362e72b94801e5f3a"
 }

package/query-builder.js

@@ -124,13 +124,13 @@ class QueryBuilder {
         const getInputName = (mutationType) => {
             switch (mutationType) {
                 case 'delete': {
-                    return `Delete${(0, inflekt_1.camelize)(this._model)}Input`;
+                    return `Delete${(0, inflekt_1.toPascalCase)(this._model)}Input`;
                 }
                 case 'create': {
-                    return `Create${(0, inflekt_1.camelize)(this._model)}Input`;
+                    return `Create${(0, inflekt_1.toPascalCase)(this._model)}Input`;
                 }
                 case 'patch': {
-                    return `Update${(0, inflekt_1.camelize)(this._model)}Input`;
+                    return `Update${(0, inflekt_1.toPascalCase)(this._model)}Input`;
                 }
                 default:
                     throw new Error('Unhandled mutation type' + mutationType);
@@ -159,7 +159,7 @@ class QueryBuilder {
     getMany({ select } = {}) {
         this._op = 'getMany';
         this._key = this._findQuery();
-        this.queryName((0, inflekt_1.camelize)(['get', (0, inflekt_1.underscore)(this._key), 'query'].join('_'), true));
+        this.queryName((0, inflekt_1.toCamelCase)(['get', (0, inflekt_1.underscore)(this._key), 'query'].join('_')));
         const defn = this._introspection[this._key];
         this.select(select);
         this._ast = (0, ast_1.getMany)({
@@ -174,7 +174,7 @@ class QueryBuilder {
     all({ select } = {}) {
         this._op = 'getMany';
         this._key = this._findQuery();
-        this.queryName((0, inflekt_1.camelize)(['get', (0, inflekt_1.underscore)(this._key), 'query', 'all'].join('_'), true));
+        this.queryName((0, inflekt_1.toCamelCase)(['get', (0, inflekt_1.underscore)(this._key), 'query', 'all'].join('_')));
         const defn = this._introspection[this._key];
         this.select(select);
         this._ast = (0, ast_1.getAll)({
@@ -188,7 +188,7 @@ class QueryBuilder {
     count() {
         this._op = 'getMany';
         this._key = this._findQuery();
-        this.queryName((0, inflekt_1.camelize)(['get', (0, inflekt_1.underscore)(this._key), 'count', 'query'].join('_'), true));
+        this.queryName((0, inflekt_1.toCamelCase)(['get', (0, inflekt_1.underscore)(this._key), 'count', 'query'].join('_')));
         const defn = this._introspection[this._key];
         this._ast = (0, ast_1.getCount)({
             queryName: this._queryName,
@@ -200,7 +200,7 @@ class QueryBuilder {
     getOne({ select } = {}) {
         this._op = 'getOne';
         this._key = this._findQuery();
-        this.queryName((0, inflekt_1.camelize)(['get', (0, inflekt_1.underscore)(this._key), 'query'].join('_'), true));
+        this.queryName((0, inflekt_1.toCamelCase)(['get', (0, inflekt_1.underscore)(this._key), 'query'].join('_')));
         const defn = this._introspection[this._key];
         this.select(select);
         this._ast = (0, ast_1.getOne)({
@@ -216,7 +216,7 @@ class QueryBuilder {
         this._op = 'mutation';
         this._mutation = 'create';
         this._key = this._findMutation();
-        this.queryName((0, inflekt_1.camelize)([(0, inflekt_1.underscore)(this._key), 'mutation'].join('_'), true));
+        this.queryName((0, inflekt_1.toCamelCase)([(0, inflekt_1.underscore)(this._key), 'mutation'].join('_')));
         const defn = this._introspection[this._key];
         this.select(select);
         this._ast = (0, ast_1.createOne)({
@@ -231,7 +231,7 @@ class QueryBuilder {
         this._op = 'mutation';
         this._mutation = 'delete';
         this._key = this._findMutation();
-        this.queryName((0, inflekt_1.camelize)([(0, inflekt_1.underscore)(this._key), 'mutation'].join('_'), true));
+        this.queryName((0, inflekt_1.toCamelCase)([(0, inflekt_1.underscore)(this._key), 'mutation'].join('_')));
         const defn = this._introspection[this._key];
         this.select(select);
         this._ast = (0, ast_1.deleteOne)({
@@ -245,7 +245,7 @@ class QueryBuilder {
         this._op = 'mutation';
         this._mutation = 'patch';
         this._key = this._findMutation();
-        this.queryName((0, inflekt_1.camelize)([(0, inflekt_1.underscore)(this._key), 'mutation'].join('_'), true));
+        this.queryName((0, inflekt_1.toCamelCase)([(0, inflekt_1.underscore)(this._key), 'mutation'].join('_')));
         const defn = this._introspection[this._key];
         this.select(select);
         this._ast = (0, ast_1.patchOne)({
@@ -408,5 +408,5 @@ function isRelationalField(fieldName, modelMeta) {
 // Get getMany op name from model
 // ie. UserSetting => userSettings
 function modelNameToGetMany(model) {
-    return (0, inflekt_1.camelize)((0, inflekt_1.pluralize)((0, inflekt_1.underscore)(model)), true);
+    return (0, inflekt_1.toCamelCase)((0, inflekt_1.pluralize)((0, inflekt_1.underscore)(model)));
 }