@clairejs/server 3.28.13 → 3.28.15

package/README.md

@@ -1,5 +1,13 @@
 ## Change Log
 
+#### 3.28.15
+
+-   fix uri mapper for expanded & has many fields
+
+#### 3.28.14
+
+-   implement @Expand and paralel run in getMany
+
 #### 3.28.13
 
 -   fix update records handle undefined result

package/dist/http/repository/ModelRepository.js

@@ -202,7 +202,8 @@ export class ModelRepository extends AbstractRepository {
                     const value = record[field.name];
                     if (!value)
                         continue;
-                    if (field.elementDto && value) {
+                    //-- expand and hasMany fields are already mapped using the repo get many
+                    if (field.elementDto && value && !field.expand && !field.hasMany) {
                         mapRecords(field.vectorProps ? value : [value], field.elementDto);
                     }
                     else if (field.uriMapper) {
@@ -572,8 +573,13 @@ export class ModelRepository extends AbstractRepository {
         //-- check if there is any multi-local fields in projection
         const multiLocaleFields = this.modelMetadata.fields.filter((f) => f.isMultiLocale && (!queries?.projection || queries.projection.includes(f.name)));
         const localeOfFields = this.modelMetadata.fields.filter((f) => multiLocaleFields.find((locale) => locale.name === f.multiLocaleColumn));
+        const expandFields = this.modelMetadata.fields.filter((f) => f.expand && (!queries?.projection || queries.projection.includes(f.name)));
         const finalProjection = queries?.projection && [
-            ...queries.projection.filter((fieldName) => !this.modelMetadata.fields.find((f) => f.name === fieldName && !!f.hasMany)),
+            ...queries.projection.filter((fieldName) => !this.modelMetadata.fields.find((f) => f.name === fieldName && (!!f.hasMany || !!f.expand))),
+            //-- include FK columns for expand fields so we can resolve them
+            ...expandFields
+                .map((f) => f.expand.column)
+                .filter((col) => !queries.projection.includes(col)),
             ...localeOfFields.map((f) => f.name),
         ];
         const result = await this.db.use(this.model, tx).getMany(conditions.length ? { _and: conditions } : {}, {
@@ -590,65 +596,93 @@ export class ModelRepository extends AbstractRepository {
             .flatMap((ids) => ids)
             .filter((id) => id);
         const systemLocale = getSystemLocale();
-        const translations = !allLocaleEntries.length
-            ? []
+        //-- fetch translations, has many, and expand fields in parallel
+        const hasManyFields = this.modelMetadata.fields.filter((f) => f.hasMany && (!queries?.projection || queries.projection.includes(f.name)));
+        const translationsPromise = !allLocaleEntries.length
+            ? Promise.resolve([])
             : !queries?.locale
                 ? //-- if locale is not specified then get translation for all locales
-                    await this.db.use(LocaleTranslation, tx).getRecords({
+                    this.db.use(LocaleTranslation, tx).getRecords({
                         _in: { entryId: allLocaleEntries },
                     }, { projection: ["entryId", "localeCode", "translation"] })
                 : //-- if locale is specified then get only the translation of that locale
                     queries.locale.toLowerCase() !== systemLocale
-                        ? await this.db.use(LocaleTranslation, tx).getRecords({
+                        ? this.db.use(LocaleTranslation, tx).getRecords({
                             _in: { entryId: allLocaleEntries },
                             _eq: { localeCode: queries.locale },
                         }, { projection: ["entryId", "localeCode", "translation"] })
                         : //-- locale is system locale, no need to fetch translation
-                            [];
-        for (const record of result.records) {
-            for (const field of localeOfFields) {
-                //-- map back translation
-                if (!queries?.locale) {
-                    //-- map as object
-                    const fieldTranslations = translations
-                        .filter((t) => t.entryId === record[field.name])
-                        .map((t) => [t.localeCode, t.translation]);
-                    if (systemLocale) {
-                        fieldTranslations.push([systemLocale, record[field.multiLocaleColumn]]);
+                            Promise.resolve([]);
+        await Promise.all([
+            //-- translations
+            translationsPromise.then((translations) => {
+                for (const record of result.records) {
+                    for (const field of localeOfFields) {
+                        //-- map back translation
+                        if (!queries?.locale) {
+                            //-- map as object
+                            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
+                            const translation = translations.find((t) => t.localeCode === queries.locale && t.entryId === record[field.name]);
+                            if (translation) {
+                                record[field.multiLocaleColumn] = translation.translation;
+                            }
+                        }
                     }
-                    record[field.name] = Object.fromEntries(fieldTranslations);
                 }
-                else {
-                    //-- replace value
-                    const translation = translations.find((t) => t.localeCode === queries.locale && t.entryId === record[field.name]);
-                    if (translation) {
-                        record[field.multiLocaleColumn] = translation.translation;
-                    }
+            }),
+            //-- has many
+            ...hasManyFields.map(async (field) => {
+                const model = getModelById(field.hasMany.relationDto.id);
+                if (!model) {
+                    throw Errors.NOT_FOUND(`Model not found by id: ${field.hasMany.relationDto.id}`);
                 }
-            }
-        }
-        //-- get has many fields
-        for (const field of this.modelMetadata.fields) {
-            if (!field.hasMany || (queries?.projection && !queries.projection.includes(field.name))) {
-                continue;
-            }
-            const model = getModelById(field.hasMany.relationDto.id);
-            if (!model) {
-                throw Errors.NOT_FOUND(`Model not found by id: ${field.hasMany.relationDto.id}`);
-            }
-            const service = new ModelRepository(model, this.db);
-            const innerRecords = !recordIds.length
-                ? { records: [] }
-                : await service.getMany({
-                    queries: { fields: { [field.hasMany.column]: recordIds }, limit: field.hasMany.single ? 1 : 0 },
-                    tx,
-                });
-            //-- filter corresponding inner records for each master record
-            for (const record of result.records) {
-                const finalRecords = innerRecords.records.filter((r) => r[field.hasMany.column] === record.id);
-                record[field.name] = (field.hasMany.single ? finalRecords[0] : finalRecords);
-            }
-        }
+                const service = new ModelRepository(model, this.db);
+                const innerRecords = !recordIds.length
+                    ? { records: [] }
+                    : await service.getMany({
+                        queries: { fields: { [field.hasMany.column]: recordIds }, limit: field.hasMany.single ? 1 : 0 },
+                        tx,
+                    });
+                //-- filter corresponding inner records for each master record
+                for (const record of result.records) {
+                    const finalRecords = innerRecords.records.filter((r) => r[field.hasMany.column] === record.id);
+                    record[field.name] = (field.hasMany.single ? finalRecords[0] : finalRecords);
+                }
+            }),
+            //-- expand
+            ...expandFields.map(async (field) => {
+                const model = getModelById(field.expand.relationDto.id);
+                if (!model) {
+                    throw Errors.NOT_FOUND(`Model not found by id: ${field.expand.relationDto.id}`);
+                }
+                //-- collect unique FK values from current records
+                const fkValues = result.records
+                    .map((r) => r[field.expand.column])
+                    .filter((v) => v !== undefined && v !== null)
+                    .reduce(uniqueReducer, []);
+                const service = new ModelRepository(model, this.db);
+                const expandedRecords = !fkValues.length
+                    ? { records: [] }
+                    : await service.getMany({
+                        queries: { fields: { id: fkValues } },
+                        tx,
+                    });
+                //-- assign expanded record to each master record
+                for (const record of result.records) {
+                    const fkValue = record[field.expand.column];
+                    record[field.name] = expandedRecords.records.find((r) => r.id === fkValue);
+                }
+            }),
+        ]);
         await this.beforeReturning(result.records);
         return {
             total: result.total,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@clairejs/server",
-    "version": "3.28.13",
+    "version": "3.28.15",
     "description": "Claire server NodeJs framework written in Typescript.",
     "types": "dist/index.d.ts",
     "main": "dist/index.js",
@@ -35,8 +35,8 @@
     },
     "peerDependencies": {
         "@clairejs/client": "^3.5.1",
-        "@clairejs/core": "^3.9.4",
-        "@clairejs/orm": "^3.17.2"
+        "@clairejs/core": "^3.9.5",
+        "@clairejs/orm": "^3.19.11"
     },
     "devDependencies": {
         "@types/cookie-parser": "^1.4.3",