@clairejs/server 3.22.0 → 3.22.1

package/README.md

@@ -1,7 +1,8 @@
 ## Change Log
 
-#### 3.22.0:
+#### 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
 

package/dist/common/ServerModelMetadata.d.ts

@@ -2,10 +2,7 @@ import { ModelFieldMetadata, ModelMetadata } from "@clairejs/core";
 import { IPrincipal } from "./auth/IPrincipal";
 import { UriMapperHandler } from "../http/file-upload/types";
 export interface ServerModelFieldMetadata extends ModelFieldMetadata {
-    uriMapper?: {
-        mapper: UriMapperHandler;
-        subkeys: string[];
-    };
+    uriMapper?: UriMapperHandler;
     userResolver?: (principal: IPrincipal) => any;
 }
 export interface ServerModelMetadata extends ModelMetadata {

package/dist/http/decorators.d.ts

@@ -1,4 +1,4 @@
-import { type Constructor, HttpMethod, RecursiveKeys, AbstractModel } 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: RecursiveKeys<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/decorators.js

@@ -61,9 +61,8 @@ export const Headers = () => RequestDeco("headers");
 export const Socket = () => RequestDeco("socket");
 export const Raw = () => RequestDeco("raw");
 export const UriMapper = (mapper) => (prototype, propertyKey) => {
-    const [rootKey, ...keys] = propertyKey.split(".");
-    const field = initFieldMetadata(prototype, rootKey);
-    field.uriMapper = { mapper, subkeys: keys };
+    const field = initFieldMetadata(prototype, propertyKey);
+    field.uriMapper = mapper;
 };
 /**
  * Current User decorator only has effect when being used with ICrudRepository.

package/dist/http/repository/ModelRepository.js

@@ -4,31 +4,11 @@ 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, subkeys) => {
-    return field.vectorProps
-        ? field.vectorProps.elementDataType === DataType.STRING
-            ? record[field.name]
-            : record[field.name].map((obj) => subkeys.reduce((value, key) => value[key], obj))
-        : [record[field.name]];
+const resolveUris = (record, field) => {
+    return field.vectorProps?.elementDataType === DataType.STRING ? record[field.name] : [record[field.name]];
 };
-const assignUrls = (record, field, subkeys, urls) => {
-    if (field.vectorProps) {
-        if (field.vectorProps.elementDataType === DataType.STRING) {
-            record[field.name] = urls;
-        }
-        else {
-            record[field.name].forEach((obj, index) => {
-                let currentObj = obj;
-                for (let i = 0; i < subkeys.length - 1; i++) {
-                    currentObj = currentObj[subkeys[i]];
-                }
-                currentObj[subkeys[subkeys.length - 1]] = urls[index];
-            });
-        }
-    }
-    else {
-        record[field.name] = urls[0];
-    }
+const assignUrls = (record, field, urls) => {
+    record[field.name] = field.vectorProps?.elementDataType === DataType.STRING ? urls : urls[0];
 };
 export class ModelRepository extends AbstractRepository {
     model;
@@ -157,12 +137,18 @@ export class ModelRepository extends AbstractRepository {
             //-- update record value and not persist yet
             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 { subkeys, mapper } = field.uriMapper;
-                        const tmpUris = resolveUris(record, field, subkeys);
+                    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 = resolveUris(record, field);
                         if (!tmpUris.length) {
                             continue;
                         }
@@ -171,11 +157,14 @@ export class ModelRepository extends AbstractRepository {
                         }
                         operations.push((async () => {
                             const urls = await Promise.all(tmpUris.map((uri, index) => uriHandler(uri, index, mapper, getSystemLocale())));
-                            assignUrls(record, field, subkeys, urls);
+                            assignUrls(record, field, urls);
                         })());
                     }
                 }
             }
+        };
+        if (fileUploadHandler) {
+            mapRecords(records, this.modelMetadata);
         }
         //-- await all operations once to save time
         await Promise.all(operations);
@@ -192,22 +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 && record[field.name]) {
-                    const { subkeys } = field.uriMapper;
-                    const uris = resolveUris(record, field, subkeys);
-                    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, subkeys, urls);
-                    })());
+        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);
+                    }
+                    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.22.0",
+    "version": "3.22.1",
     "description": "Claire server NodeJs framework written in Typescript.",
     "types": "dist/index.d.ts",
     "main": "dist/index.js",