@postxl/generator 0.44.0 → 0.44.2

package/dist/generators/models/repository.generator.js

@@ -220,6 +220,7 @@ exports.generateMockRepository = generateMockRepository;
 function _generateMainBuildingBlocks_InMemoryOnly({ model, meta, imports, blocks, }) {
     const methodTypeSignatures = getRepositoryMethodsTypeSignatures({ model, meta });
     const userRepositorySpecificBlocks = generateUserRepositorySpecificBlocks_InMemoryOnly({ model, meta, imports });
+    imports.addImport({ from: (0, types_1.toPath)('@pxl/common'), items: ['removeUndefinedProperties'].map(types_1.toFunctionName) });
     return {
         constructorCode: '',
         userRepositorySpecificBlocks,
@@ -347,7 +348,7 @@ function _generateMainBuildingBlocks_InMemoryOnly({ model, meta, imports, blocks
       
           ${blocks.uniqueStringFieldsBlocks.updateCode.join('\n')}
           
-          const newItem = await Promise.resolve({ ...existingItem, ...item })
+          const newItem = await Promise.resolve({ ...existingItem, ...removeUndefinedProperties(item) })
           ${model.updatedAtField ? `newItem.${model.updatedAtField.name} = new Date()` : ''}
   
           this.remove(existingItem)

package/dist/lib/utils/string.js

@@ -40,7 +40,7 @@ const toPascalCase = (str) => {
     return s.charAt(0).toUpperCase() + s.slice(1);
 };
 exports.toPascalCase = toPascalCase;
-const irregularPlurals = {
+const IRREGULAR_PLURALS = Object.entries({
     alumnus: 'alumni',
     analysis: 'analyses',
     appendix: 'appendices',
@@ -68,14 +68,24 @@ const irregularPlurals = {
     syllabus: 'syllabi',
     synopsis: 'synopses',
     thesis: 'theses',
-};
+});
 /**
  * Returns a pluralized version of the given string based on the count.
  */
 const pluralize = (s, count = 2) => {
+    // NOTE: If there's one of something we simply use the singluar form.
     if (count === 1) {
         return s;
     }
+    // NOTE: For plural forms, we first check whether a word is irregular.
+    const lower = s.toLowerCase();
+    for (const [singular, plural] of IRREGULAR_PLURALS) {
+        // NOTE: We check that items *end with* a given word becase we use combined words
+        //       like `UserHistory` as input values of this function.
+        if (lower.endsWith(singular)) {
+            return s.slice(0, -singular.length + 1) + plural.slice(1);
+        }
+    }
     if (s.endsWith('y') &&
         !s.endsWith('ay') &&
         !s.endsWith('ey') &&
@@ -87,13 +97,6 @@ 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.44.0",
+  "version": "0.44.2",
   "main": "./dist/generator.js",
   "typings": "./dist/generator.d.ts",
   "bin": {