@clairejs/server 3.18.0 → 3.18.2

package/README.md

@@ -1,7 +1,9 @@
 ## Change Log
 
-#### 3.18.0:
+#### 3.18.2:
 
+-   fix multi locale issue with model repo
+-   fix multi locale field data type
 -   adapt claire core & clare orm
 
 #### 3.17.10:

package/dist/http/repository/ModelRepository.js

@@ -229,8 +229,7 @@ export class ModelRepository extends AbstractRepository {
             }
         }
         //-- create locale entries
-        const translationEntryData = originalRecords
-            .map((record, index) => {
+        const translationEntryData = originalRecords.flatMap((record, index) => {
             return localeFields
                 .filter((f) => !!record[f.name])
                 .map((f) => ({
@@ -238,27 +237,24 @@ export class ModelRepository extends AbstractRepository {
                 field: f.name,
                 entryObject: {},
             }));
-        })
-            .flatMap((arr) => arr);
+        });
         const translationEntries = await tx
             .use(LocaleEntry)
             .createMany(translationEntryData.map((data) => data.entryObject));
         //-- translation data will have same length as translationEntries
-        const translationData = originalRecords
-            .map((record) => {
+        const translationData = originalRecords.flatMap((record) => {
             return localeFields.filter((f) => !!record[f.name]).map((f) => record[f.name]);
-        })
-            .flatMap((arr) => arr);
+        });
         //-- mapping supplied data with entry ids
-        const translations = translationData
-            .map((data, index) => {
-            return Object.keys(data).map((localeCode) => ({
+        const translations = translationData.flatMap((data, index) => {
+            return Object.keys(data)
+                .filter((locale) => locale !== systemLocale)
+                .map((localeCode) => ({
                 localeCode,
                 entryId: translationEntries[index].id,
                 translation: data[localeCode],
             }));
-        })
-            .flatMap((arr) => arr);
+        });
         //-- create translation records
         await tx.use(LocaleTranslation).createMany(translations);
         //-- first create records for direct fields
@@ -343,7 +339,7 @@ export class ModelRepository extends AbstractRepository {
         const localeOfFields = this.modelMetadata.fields.filter((f) => updatedFields.includes(f.name) && f.multiLocaleColumn);
         const cleanUp = await this.uriHandling([body.update]);
         //-- calculate direct update after uri handling
-        const directUpdate = leanData(directUpdateFields.reduce((collector, field) => Object.assign(collector, { [field.name]: body.update[field.name] }), {})) || {};
+        const directUpdate = leanData(Object.fromEntries(directUpdateFields.map((field) => [field.name, body.update[field.name]]))) || {};
         if (systemLocale) {
             //-- override values in record
             for (const field of localeOfFields) {
@@ -391,7 +387,7 @@ export class ModelRepository extends AbstractRepository {
             }
         }
         //-- body.update here had been modified by uri handling
-        const records = updatedRecords.map((re) => ({ ...body.update, ...re }));
+        const records = updatedRecords.map((re) => ({ ...body.update, ...directUpdate, ...re }));
         //-- update translations
         if (localeOfFields.length) {
             //-- check if there is missing locale entry for localeFields
@@ -505,7 +501,7 @@ export class ModelRepository extends AbstractRepository {
             //-- return result
             projection = [
                 ...projection,
-                ...Object.keys(body.update).filter((key) => body.update[key] !== undefined),
+                ...Object.keys(directUpdate).filter((key) => directUpdate[key] !== undefined),
                 "lastModified",
             ];
         }
@@ -571,13 +567,13 @@ export class ModelRepository extends AbstractRepository {
                 //-- map back translation
                 if (!queries?.locale) {
                     //-- map as object
-                    const fieldTranslations = translations.filter((t) => t.entryId === record[field.name]);
-                    if (!fieldTranslations.length) {
-                        record[field.name] = {};
-                    }
-                    else {
-                        record[field.name] = fieldTranslations.reduce((collector, t) => Object.assign(collector, { [t.localeCode]: t.translation }), {});
+                    const fieldTranslations = translations
+                        .filter((t) => t.entryId === record[field.name])
+                        .map((t) => [t.localeCode, t.translation]);
+                    if (systemLocale) {
+                        fieldTranslations.push([systemLocale, record[field.multiLocaleColumn]]);
                     }
+                    record[field.name] = Object.fromEntries(fieldTranslations);
                 }
                 else {
                     //-- replace value

package/dist/system/locale/decorators.js

@@ -6,9 +6,9 @@ export const LocaleOf = (
  */
 referenceColumn) => (prototype, propertyKey) => {
     const field = initFieldMetadata(prototype, propertyKey);
+    field.dataType = DataType.OBJECT;
     field.multiLocaleColumn = referenceColumn;
     field.fk = FK({ model: LocaleEntry, cascade: "nullify" }).fk;
-    field.dataType = DataType.NUMBER;
     const refField = initFieldMetadata(prototype, referenceColumn);
     refField.isMultiLocale = true;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@clairejs/server",
-    "version": "3.18.0",
+    "version": "3.18.2",
     "description": "Claire server NodeJs framework written in Typescript.",
     "types": "dist/index.d.ts",
     "main": "dist/index.js",