@clairejs/server 3.21.9 → 3.22.1

package/README.md

@@ -1,5 +1,11 @@
 ## Change Log
 
+#### 3.22.1:
+
+-   fix uri mapper to map Identifiable classes
+-   remove support of uri mapper for locale fields
+-   support uri mapper for nested array field
+
 #### 3.21.9:
 
 -   fix express wrapper parse multipart form data

package/dist/http/decorators.d.ts

@@ -1,4 +1,4 @@
-import { type Constructor, AbstractModel, HttpMethod } from "@clairejs/core";
+import { type Constructor, HttpMethod, Identifiable } from "@clairejs/core";
 import { type UriMapperHandler } from "./file-upload/types";
 import { type HttpResponse } from "./common/HttpResponse";
 import { type IPrincipal } from "../common/auth/IPrincipal";
@@ -21,7 +21,7 @@ export declare const Queries: () => (prototype: AbstractHttpController, property
 export declare const Headers: () => (prototype: AbstractHttpController, propertyKey: string, paramIndex: number) => void;
 export declare const Socket: () => (prototype: AbstractHttpController, propertyKey: string, paramIndex: number) => void;
 export declare const Raw: () => (prototype: AbstractHttpController, propertyKey: string, paramIndex: number) => void;
-export declare const UriMapper: (mapper: UriMapperHandler) => <T extends AbstractModel>(prototype: T, propertyKey: keyof T) => void;
+export declare const UriMapper: (mapper: UriMapperHandler) => <T extends Identifiable>(prototype: T, propertyKey: keyof T) => void;
 /**
  * Current User decorator only has effect when being used with ICrudRepository.
  *  */

package/dist/http/repository/ModelRepository.js

@@ -4,6 +4,12 @@ import { AbstractFileUploadHandler } from "../file-upload/AbstractFileUploadHand
 import { AbstractRepository } from "./AbstractRepository";
 import { LocaleTranslation } from "../../system/locale/LocaleTranslation";
 import { LocaleEntry } from "../../system/locale/LocaleEntry";
+const resolveUris = (record, field) => {
+    return field.vectorProps?.elementDataType === DataType.STRING ? record[field.name] : [record[field.name]];
+};
+const assignUrls = (record, field, urls) => {
+    record[field.name] = field.vectorProps?.elementDataType === DataType.STRING ? urls : urls[0];
+};
 export class ModelRepository extends AbstractRepository {
     model;
     db;
@@ -129,17 +135,20 @@ export class ModelRepository extends AbstractRepository {
             //-- move from currentUri to newUri
             await fileUploadHandler.copyFile(tmpUri, newUri);
             //-- update record value and not persist yet
-            // newUriCb(newUri);
             return newUri;
         };
-        if (fileUploadHandler) {
-            for (const field of this.modelMetadata.fields) {
+        const mapRecords = (records, modelMetadata) => {
+            for (const field of modelMetadata.fields) {
                 for (const record of records) {
-                    if (field.uriMapper && record[field.name]) {
+                    const value = record[field.name];
+                    if (!value)
+                        continue;
+                    if (field.elementDto) {
+                        mapRecords(field.vectorProps ? value : [value], field.elementDto);
+                    }
+                    else if (field.uriMapper) {
                         const mapper = field.uriMapper;
-                        const tmpUris = field.vectorProps
-                            ? record[field.name]
-                            : [record[field.name]];
+                        const tmpUris = resolveUris(record, field);
                         if (!tmpUris.length) {
                             continue;
                         }
@@ -148,36 +157,14 @@ export class ModelRepository extends AbstractRepository {
                         }
                         operations.push((async () => {
                             const urls = await Promise.all(tmpUris.map((uri, index) => uriHandler(uri, index, mapper, getSystemLocale())));
-                            record[field.name] = field.vectorProps ? urls : urls[0];
+                            assignUrls(record, field, urls);
                         })());
                     }
-                    else if (field.multiLocaleColumn) {
-                        const targetField = this.modelMetadata.fields.find((f) => f.name === field.multiLocaleColumn);
-                        if (targetField?.uriMapper && record[field.name]) {
-                            const mapper = targetField.uriMapper;
-                            //-- this field is locale for targetField, which has uri mapper
-                            const localeUris = Object.keys(record[field.name]).map((lang) => [
-                                lang,
-                                targetField.vectorProps
-                                    ? record[field.name][lang]
-                                    : [record[field.name][lang]],
-                            ]);
-                            //-- for each pair or locale and tmp uri, invoke handle logic
-                            for (const localeUri of localeUris) {
-                                if (!targetField.mimeProps?.keepOnRemove) {
-                                    modified.push(...localeUri[1]);
-                                }
-                                operations.push((async () => {
-                                    const urls = await Promise.all(localeUri[1].map((uri, index) => uriHandler(uri, index, mapper, localeUri[0])));
-                                    record[field.name][localeUri[0]] = targetField.vectorProps
-                                        ? urls
-                                        : urls[0];
-                                })());
-                            }
-                        }
-                    }
                 }
             }
+        };
+        if (fileUploadHandler) {
+            mapRecords(records, this.modelMetadata);
         }
         //-- await all operations once to save time
         await Promise.all(operations);
@@ -194,48 +181,30 @@ export class ModelRepository extends AbstractRepository {
             return;
         }
         const mappingOperations = [];
-        for (const record of records) {
-            for (const field of this.modelMetadata.fields) {
-                if (field.uriMapper) {
-                    const uri = record[field.name];
-                    if (!uri) {
+        const mapRecords = (records, modelMetadata) => {
+            for (const record of records) {
+                for (const field of modelMetadata.fields) {
+                    const value = record[field.name];
+                    if (!value)
                         continue;
+                    if (field.elementDto && value) {
+                        mapRecords(field.vectorProps ? value : [value], field.elementDto);
                     }
-                    const uris = field.vectorProps ? uri : [uri];
-                    mappingOperations.push((async () => {
-                        const urls = await Promise.all(uris.map(async (uri) => {
-                            return field.mimeProps?.public
-                                ? await fileUploadHandler.resolvePublicUrl(uri)
-                                : await fileUploadHandler.resolvePrivateUrl(uri);
-                        }));
-                        record[field.name] = field.vectorProps ? urls : urls[0];
-                    })());
-                }
-                else if (field.multiLocaleColumn) {
-                    const targetField = this.modelMetadata.fields.find((f) => f.name === field.multiLocaleColumn);
-                    if (targetField?.uriMapper) {
-                        const localeObject = record[field.name];
-                        if (!localeObject) {
-                            continue;
-                        }
-                        for (const locale of Object.keys(localeObject)) {
-                            mappingOperations.push((async () => {
-                                const uri = localeObject[locale];
-                                if (!uri)
-                                    return;
-                                const uris = targetField.vectorProps ? uri : [uri];
-                                const urls = await Promise.all(uris.map(async (uri) => {
-                                    return targetField.mimeProps?.public
-                                        ? await fileUploadHandler.resolvePublicUrl(uri)
-                                        : await fileUploadHandler.resolvePrivateUrl(uri);
-                                }));
-                                localeObject[locale] = targetField.vectorProps ? urls : urls[0];
-                            })());
-                        }
+                    else if (field.uriMapper) {
+                        const uris = resolveUris(record, field);
+                        mappingOperations.push((async () => {
+                            const urls = await Promise.all(uris.map(async (uri) => {
+                                return field.mimeProps?.public
+                                    ? await fileUploadHandler.resolvePublicUrl(uri)
+                                    : await fileUploadHandler.resolvePrivateUrl(uri);
+                            }));
+                            assignUrls(record, field, urls);
+                        })());
                     }
                 }
             }
-        }
+        };
+        mapRecords(records, this.modelMetadata);
         await Promise.all(mappingOperations);
     }
     async createMany({ principal, body, tx, logger, }) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@clairejs/server",
-    "version": "3.21.9",
+    "version": "3.22.1",
     "description": "Claire server NodeJs framework written in Typescript.",
     "types": "dist/index.d.ts",
     "main": "dist/index.js",
@@ -33,9 +33,9 @@
         "ws": "^7.5.5"
     },
     "peerDependencies": {
-        "@clairejs/client": "^3.4.1",
-        "@clairejs/core": "^3.8.8",
-        "@clairejs/orm": "^3.16.7"
+        "@clairejs/client": "^3.4.4",
+        "@clairejs/core": "^3.8.9",
+        "@clairejs/orm": "^3.16.10"
     },
     "devDependencies": {
         "@types/cookie-parser": "^1.4.3",