graphile-simple-inflector 0.4.1 → 0.4.3

package/esm/index.js

@@ -1,6 +1,7 @@
-const fixCapitalisedPlural = (fn) => function capitalisedPlural(str) {
+import { pluralize, singularize, fixCapitalisedPlural } from 'inflekt';
+const fixCapitalisedPluralWrapper = (fn) => function capitalisedPlural(str) {
     const original = fn.call(this, str);
-    return original.replace(/[0-9]S(?=[A-Z]|$)/g, (match) => match.toLowerCase());
+    return fixCapitalisedPlural(original);
 };
 const fixChangePlural = (fn) => function changePlural(str) {
     const matches = str.match(/([A-Z]|_[a-z0-9])[a-z0-9]*_*$/);
@@ -12,6 +13,9 @@ const fixChangePlural = (fn) => function changePlural(str) {
     const suffix = str.slice(suffixIndex);
     return `${prefix}${fn.call(this, word)}${suffix}`;
 };
+// Helper functions that use inflekt library directly (no 'this' dependency)
+const inflektPluralize = (str) => pluralize(str);
+const inflektSingularize = (str) => singularize(str);
 const DEFAULT_NODE_ID = 'nodeId';
 export const PgSimpleInflector = (builder, { pgSimpleCollections, pgOmitListSuffix, pgSimplifyPatch = true, pgSimplifyAllRows = true, pgShortPk = true, pgSimplifyMultikeyRelations = true, pgSimplifyOppositeBaseNames = true, nodeIdFieldName = DEFAULT_NODE_ID, } = {}) => {
     const hasConnections = pgSimpleCollections !== 'only';
@@ -34,14 +38,19 @@ export const PgSimpleInflector = (builder, { pgSimpleCollections, pgOmitListSuff
              * This solves the issue with `blah-table1s` becoming `blahTable1S`
              * (i.e. the capital S at the end) or `table1-connection becoming `Table1SConnection`
              */
-            camelCase: fixCapitalisedPlural(oldInflection.camelCase),
-            upperCamelCase: fixCapitalisedPlural(oldInflection.upperCamelCase),
+            camelCase: fixCapitalisedPluralWrapper(oldInflection.camelCase),
+            upperCamelCase: fixCapitalisedPluralWrapper(oldInflection.upperCamelCase),
             /*
              * Pluralize/singularize only supports single words, so only run
              * on the final segment of a name.
+             * Use inflekt library instead of the default pluralize library.
              */
-            pluralize: fixChangePlural(oldInflection.pluralize),
-            singularize: fixChangePlural(oldInflection.singularize),
+            pluralize: fixChangePlural(function pluralize(str) {
+                return inflektPluralize(str);
+            }),
+            singularize: fixChangePlural(function singularize(str) {
+                return inflektSingularize(str);
+            }),
             distinctPluralize(str) {
                 const singular = this.singularize(str);
                 const plural = this.pluralize(singular);

package/index.js

@@ -1,9 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PgSimpleInflector = void 0;
-const fixCapitalisedPlural = (fn) => function capitalisedPlural(str) {
+const inflekt_1 = require("inflekt");
+const fixCapitalisedPluralWrapper = (fn) => function capitalisedPlural(str) {
     const original = fn.call(this, str);
-    return original.replace(/[0-9]S(?=[A-Z]|$)/g, (match) => match.toLowerCase());
+    return (0, inflekt_1.fixCapitalisedPlural)(original);
 };
 const fixChangePlural = (fn) => function changePlural(str) {
     const matches = str.match(/([A-Z]|_[a-z0-9])[a-z0-9]*_*$/);
@@ -15,6 +16,9 @@ const fixChangePlural = (fn) => function changePlural(str) {
     const suffix = str.slice(suffixIndex);
     return `${prefix}${fn.call(this, word)}${suffix}`;
 };
+// Helper functions that use inflekt library directly (no 'this' dependency)
+const inflektPluralize = (str) => (0, inflekt_1.pluralize)(str);
+const inflektSingularize = (str) => (0, inflekt_1.singularize)(str);
 const DEFAULT_NODE_ID = 'nodeId';
 const PgSimpleInflector = (builder, { pgSimpleCollections, pgOmitListSuffix, pgSimplifyPatch = true, pgSimplifyAllRows = true, pgShortPk = true, pgSimplifyMultikeyRelations = true, pgSimplifyOppositeBaseNames = true, nodeIdFieldName = DEFAULT_NODE_ID, } = {}) => {
     const hasConnections = pgSimpleCollections !== 'only';
@@ -37,14 +41,19 @@ const PgSimpleInflector = (builder, { pgSimpleCollections, pgOmitListSuffix, pgS
              * This solves the issue with `blah-table1s` becoming `blahTable1S`
              * (i.e. the capital S at the end) or `table1-connection becoming `Table1SConnection`
              */
-            camelCase: fixCapitalisedPlural(oldInflection.camelCase),
-            upperCamelCase: fixCapitalisedPlural(oldInflection.upperCamelCase),
+            camelCase: fixCapitalisedPluralWrapper(oldInflection.camelCase),
+            upperCamelCase: fixCapitalisedPluralWrapper(oldInflection.upperCamelCase),
             /*
              * Pluralize/singularize only supports single words, so only run
              * on the final segment of a name.
+             * Use inflekt library instead of the default pluralize library.
              */
-            pluralize: fixChangePlural(oldInflection.pluralize),
-            singularize: fixChangePlural(oldInflection.singularize),
+            pluralize: fixChangePlural(function pluralize(str) {
+                return inflektPluralize(str);
+            }),
+            singularize: fixChangePlural(function singularize(str) {
+                return inflektSingularize(str);
+            }),
             distinctPluralize(str) {
                 const singular = this.singularize(str);
                 const plural = this.pluralize(singular);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "graphile-simple-inflector",
-  "version": "0.4.1",
+  "version": "0.4.3",
   "description": "Simple inflector plugin for Graphile/PostGraphile",
   "author": "Constructive <developers@constructive.io>",
   "homepage": "https://github.com/constructive-io/constructive",
@@ -40,13 +40,14 @@
     "url": "https://github.com/constructive-io/constructive/issues"
   },
   "devDependencies": {
-    "graphile-test": "^2.13.1",
+    "graphile-test": "^2.13.3",
     "graphql-tag": "2.12.6",
     "makage": "^0.1.10",
-    "pgsql-test": "^2.24.1"
+    "pgsql-test": "^2.24.3"
   },
   "dependencies": {
-    "graphile-build": "^4.14.1"
+    "graphile-build": "^4.14.1",
+    "inflekt": "^0.1.2"
   },
-  "gitHead": "baa2f7598cde3baf3f05f161a11bafa12c66f6aa"
+  "gitHead": "22c89cfc6f67879e77ca47f652c31c80828665f5"
 }