@postxl/generator 0.73.5 → 0.73.6

package/dist/lib/utils/string.d.ts

@@ -18,6 +18,10 @@ export declare const toPascalCase: (str: string) => string;
  * Returns a pluralized version of the given string based on the count.
  */
 export declare const pluralize: (s: string, count?: number) => string;
+/**
+ * Returns true if the given string is already pluralized.
+ */
+export declare const isPlural: (s: string) => boolean;
 /**
  * Converts each line of a string to a commented line
  */

package/dist/lib/utils/string.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.conjugateNames = exports.commentLines = exports.pluralize = exports.toPascalCase = exports.toCamelCase = exports.capitalize = exports.uncapitalize = void 0;
+exports.conjugateNames = exports.commentLines = exports.isPlural = exports.pluralize = exports.toPascalCase = exports.toCamelCase = exports.capitalize = exports.uncapitalize = void 0;
 /**
  * Returns the same string with a lowercase first letter.
  */
@@ -88,6 +88,9 @@ const pluralize = (s, count = 2) => {
             return s.slice(0, -singular.length + 1) + plural.slice(1);
         }
     }
+    if (lower.endsWith('ss')) {
+        return s.slice(0, -2) + 'sses';
+    }
     if (s.endsWith('y') &&
         !s.endsWith('ay') &&
         !s.endsWith('ey') &&
@@ -102,6 +105,14 @@ const pluralize = (s, count = 2) => {
     return s + 's';
 };
 exports.pluralize = pluralize;
+/**
+ * Returns true if the given string is already pluralized.
+ */
+const isPlural = (s) => {
+    const plural = (0, exports.pluralize)(s);
+    return plural === s;
+};
+exports.isPlural = isPlural;
 /**
  * Converts each line of a string to a commented line
  */

package/dist/prisma/parse.js

@@ -34,6 +34,7 @@ const attributes_1 = require("./attributes");
  */
 function parsePrismaSchema({ datamodel: { enums: enumsRaw, models: modelsRaw }, config, }) {
     ensurePXLSystemModelsExist(modelsRaw);
+    ensureConsistency({ models: modelsRaw, enums: enumsRaw });
     // NOTE: We preprocess models and enums so that we can populate relationships.
     const models = modelsRaw.map((dmmfModel) => parseModelCore({ dmmfModel, config }));
     const enums = enumsRaw.map((dmmfEnum) => parseEnum({ dmmfEnum, config }));
@@ -72,6 +73,56 @@ function ensurePXLSystemModelsExist(models) {
         }
     }
 }
+/**
+ * Validates:
+ * - That there are no duplicate model names
+ * - That model names are singular
+ * - That model attributes are valid
+ * - That field attributes are valid
+ * - That enum attributes are valid
+ */
+function ensureConsistency({ models, enums }) {
+    const errors = [];
+    const modelNames = models.map((m) => m.name);
+    const duplicateModelName = modelNames.find((name, i) => modelNames.indexOf(name) !== i);
+    if (duplicateModelName) {
+        errors.push(`Model ${duplicateModelName} is defined more than once.`);
+    }
+    for (const model of models) {
+        if ((0, string_1.isPlural)(model.name)) {
+            errors.push(`Model ${(0, logger_1.highlight)(model.name)} is plural. Please use singular names for models.`);
+        }
+        try {
+            (0, attributes_1.getModelAttributes)(model);
+        }
+        catch (e) {
+            errors.push(`Model ${(0, logger_1.highlight)(model.name)} has invalid model attributes: ${(0, error_1.extractError)(e)}`);
+        }
+    }
+    for (const model of models) {
+        for (const field of model.fields) {
+            try {
+                (0, attributes_1.getFieldAttributes)(field);
+            }
+            catch (e) {
+                errors.push(`Model ${(0, logger_1.highlight)(model.name)} has invalid attributes for field ${(0, logger_1.highlight)(field.name)}: 
+            ${(0, error_1.extractError)(e)}`);
+            }
+        }
+    }
+    for (const enumDef of enums) {
+        try {
+            (0, attributes_1.getEnumAttributes)(enumDef);
+        }
+        catch (e) {
+            errors.push(`Enum ${(0, logger_1.highlight)(enumDef.name)} has invalid attributes: 
+        ${(0, error_1.extractError)(e)}`);
+        }
+    }
+    if (errors.length > 0) {
+        (0, error_1.throwError)(`${errors.length} ${(0, string_1.pluralize)('issue', errors.length)} detected in schema:\n   * ${errors.join('\n   * ')}`);
+    }
+}
 function isModelNotIgnored(model) {
     return model !== undefined && !model.attributes.ignore;
 }
@@ -79,6 +130,9 @@ function isModelNotIgnored(model) {
  * Parses the core properties of a model without fields.
  */
 function parseModelCore({ dmmfModel, config, }) {
+    if ((0, string_1.isPlural)(dmmfModel.name)) {
+        (0, error_1.throwError)(`Model ${dmmfModel.name} is plural. Please use singular names for models.`);
+    }
     const attributes = (0, attributes_1.getModelAttributes)(dmmfModel);
     return {
         name: Types.toModelName((0, string_1.toPascalCase)(dmmfModel.name)),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@postxl/generator",
-  "version": "0.73.5",
+  "version": "0.73.6",
   "main": "./dist/generator.js",
   "typings": "./dist/generator.d.ts",
   "bin": {