@postxl/generator 0.6.0 → 0.6.1

package/dist/lib/schema/types.d.ts

@@ -2,7 +2,7 @@
  * Name of a Typescript type, e.g. "Aggregation".
  */
 export type TypeName = string & {
-    readonly typeName: unique symbol;
+    readonly ___type: 'TypeName';
 };
 /**
  * Brands a raw string to a TypeScript Type identifier.
@@ -12,7 +12,7 @@ export declare const toTypeName: (t: string) => TypeName;
  * The name of a function (e.g. "toAggregation").
  */
 export type Function = string & {
-    readonly functionName: unique symbol;
+    readonly ___type: 'FunctionName';
 };
 /**
  * Converts a string to a branded function name.
@@ -22,7 +22,7 @@ export declare const toFunction: (t: string) => Function;
  * The name of a class, e.g. "AggregationRepository".
  */
 export type ClassName = string & {
-    readonly className: unique symbol;
+    readonly ___type: 'ClassName';
 };
 /**
  * Converts a raw string to a branded ClassName.
@@ -32,7 +32,7 @@ export declare const toClassName: (t: string) => ClassName;
  * The name of a variable or a property in the generated code.
  */
 export type VariableName = string & {
-    readonly variableName: unique symbol;
+    readonly ___type: 'VariableName';
 };
 /**
  * Converts a string to a branded VariableName.
@@ -42,7 +42,7 @@ export declare const toVariableName: (t: string) => VariableName;
  * A name of the file without a file extension, e.g. "aggregation.type".
  */
 export type FileName = string & {
-    readonly fileName: unique symbol;
+    readonly ___type: 'FileName';
 };
 /**
  * Lets you brand a string value as a name of the file.
@@ -54,7 +54,7 @@ export declare const toFileName: (t: string) => FileName;
  * A name of the folder without the trailing and leading slash (e.g. "aggregation").
  */
 export type FolderName = string & {
-    readonly folderName: unique symbol;
+    readonly ___type: 'FolderName';
 };
 /**
  * Converts a string to a branded FolderName.
@@ -64,7 +64,7 @@ export declare const toFolderName: (t: string) => FolderName;
  * A relative or absolute path to a file or folder.
  */
 export type Path = string & {
-    readonly fileName: unique symbol;
+    readonly ___type: 'FileName';
 };
 /**
  * Converts a string to a branded FileName.

package/dist/lib/utils/string.js

@@ -33,6 +33,32 @@ const toPascalCase = (str) => {
     return s.charAt(0).toUpperCase() + s.slice(1);
 };
 exports.toPascalCase = toPascalCase;
+const irregularPlurals = {
+    alumnus: 'alumni',
+    analysis: 'analyses',
+    appendix: 'appendices',
+    axis: 'axes',
+    basis: 'bases',
+    child: 'children',
+    crisis: 'crises',
+    criterion: 'criteria',
+    data: 'data',
+    datum: 'data',
+    diagnosis: 'diagnoses',
+    focus: 'foci',
+    hypothesis: 'hypotheses',
+    index: 'indices',
+    matrix: 'matrices',
+    medium: 'media',
+    parenthesis: 'parentheses',
+    phenomenon: 'phenomena',
+    prognosis: 'prognoses',
+    radius: 'radii',
+    suffix: 'suffixes',
+    syllabus: 'syllabi',
+    synopsis: 'synopses',
+    thesis: 'theses',
+};
 /**
  * Returns a pluralized version of the given string based on the count.
  */
@@ -50,6 +76,13 @@ const pluralize = (s, count = 2) => {
     if (s.endsWith('s')) {
         return s;
     }
+    //check if word ends with any irregular plurals
+    const lower = s.toLowerCase();
+    for (const [irregularPlural, irregularSingular] of Object.entries(irregularPlurals)) {
+        if (lower.endsWith(irregularPlural)) {
+            return s.slice(0, -irregularPlural.length + 1) + irregularSingular.slice(1);
+        }
+    }
     return s + 's';
 };
 exports.pluralize = pluralize;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@postxl/generator",
-  "version": "0.6.0",
+  "version": "0.6.1",
   "main": "./dist/generator.js",
   "typings": "./dist/generator.d.ts",
   "bin": {
@@ -21,7 +21,7 @@
     "prettier": "^2.8.7",
     "remeda": "1.9.4",
     "zod": "3.21.4",
-    "@postxl/lock": "0.1.0"
+    "@postxl/lock": "0.1.1"
   },
   "devDependencies": {
     "@prisma/client": "4.12.0",
@@ -46,8 +46,10 @@
     "prepublish": "tsc -b",
     "dev": "tsc -b -w",
     "test": "jest",
+    "test:watch": "jest --watch",
     "test:types": "tsc --noEmit",
-    "testgen:mca": "pnpm run build && prisma generate --schema ./tests/schemas/mca/mca.prisma",
-    "testgen:la": "pnpm run build && prisma generate --schema ./tests/schemas/la/la.prisma"
+    "testgen:simple": "cd ./tests/schemas/simple/ && prisma generate",
+    "testgen:mca": "cd ./tests/schemas/mca/ && prisma generate",
+    "testgen:la": "cd ./tests/schemas/la/ && prisma generate"
   }
 }