@clairejs/server 3.19.2 → 3.19.4

package/README.md

@@ -1,7 +1,9 @@
 ## Change Log
 
-#### 3.19.2:
+#### 3.19.4:
 
+-   fix uri mapper with vector props
+-   update claire orm and fix
 -   fix isEndpoint
 -   fix ModelRepository getMany
 -   adapt interface with new claire orm

package/dist/http/file-upload/types.d.ts

@@ -1 +1 @@
-export type UriMapperHandler = (tmpUri: string, locale?: string) => string;
+export type UriMapperHandler = (tmpUri: string, index: number, locale?: string) => string;

package/dist/http/repository/ModelRepository.js

@@ -1,5 +1,5 @@
-import { DataType, getModelById, getServiceProvider, RangeQueryDto, uniqueReducer, leanData, getSystemLocale, Errors, omitData, } from "@clairejs/core";
-import { getDirectFields, } from "@clairejs/orm";
+import { DataType, getModelById, getServiceProvider, RangeQueryDto, uniqueReducer, leanData, getSystemLocale, Errors, omitData, MODEL_FIELD_SEPARATOR, } from "@clairejs/core";
+import { getDirectFields } from "@clairejs/orm";
 import { AbstractFileUploadHandler } from "../file-upload/AbstractFileUploadHandler";
 import { AbstractRepository } from "./AbstractRepository";
 import { LocaleTranslation } from "../../system/locale/LocaleTranslation";
@@ -41,7 +41,7 @@ export class ModelRepository extends AbstractRepository {
     getRequestQueryConditionFromQuery(queries, modelMetadata) {
         const result = [];
         for (const fieldMetadata of getDirectFields(modelMetadata)) {
-            const fieldName = `${modelMetadata.id}.${fieldMetadata.name}`;
+            const fieldName = `${modelMetadata.id}${MODEL_FIELD_SEPARATOR}${fieldMetadata.name}`;
             const queryValue = queries[fieldMetadata.name];
             if (queryValue === undefined) {
                 continue;
@@ -121,8 +121,8 @@ export class ModelRepository extends AbstractRepository {
         const modified = [];
         const fileUploadHandler = await this.getUploadHandler();
         const operations = [];
-        const uriHandler = async (tmpUri, uriMapper, locale, newUriCb) => {
-            const newUri = uriMapper(tmpUri, locale);
+        const uriHandler = async (tmpUri, index, uriMapper, locale, newUriCb) => {
+            const newUri = uriMapper(tmpUri, index, locale);
             if (!newUri) {
                 return;
             }
@@ -134,30 +134,36 @@ export class ModelRepository extends AbstractRepository {
         if (fileUploadHandler) {
             for (const field of this.modelMetadata.fields) {
                 for (const record of records) {
-                    if (field.uriMapper) {
-                        const tmpUri = record[field.name];
-                        if (!tmpUri) {
+                    if (field.uriMapper && record[field.name]) {
+                        const mapper = field.uriMapper;
+                        const tmpUri = field.vectorProps
+                            ? record[field.name]
+                            : [record[field.name]];
+                        if (!tmpUri.length) {
                             continue;
                         }
                         if (!field.mimeProps?.keepOnRemove) {
-                            modified.push(tmpUri);
+                            modified.push(...tmpUri);
                         }
-                        operations.push(uriHandler(tmpUri, field.uriMapper, getSystemLocale(), (newUri) => (record[field.name] = newUri)));
+                        operations.push(...tmpUri.map((uri, index) => uriHandler(uri, index, mapper, getSystemLocale(), (newUri) => (record[field.name] = newUri))));
                     }
                     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,
-                                record[field.name][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]);
+                                    modified.push(...localeUri[1]);
                                 }
-                                operations.push(uriHandler(localeUri[1], targetField.uriMapper, localeUri[0], (newUri) => (record[field.name][localeUri[0]] = newUri)));
+                                operations.push(...localeUri[1].map((uri, index) => uriHandler(uri, index, mapper, localeUri[0], (newUri) => (record[field.name][localeUri[0]] = newUri))));
                             }
                         }
                     }
@@ -182,13 +188,18 @@ export class ModelRepository extends AbstractRepository {
         for (const record of records) {
             for (const field of this.modelMetadata.fields) {
                 if (field.uriMapper) {
-                    if (!record[field.name]) {
+                    const uri = record[field.name];
+                    if (!uri) {
                         continue;
                     }
+                    const uris = field.vectorProps ? uri : [uri];
                     mappingOperations.push((async () => {
-                        record[field.name] = field.mimeProps?.public
-                            ? await fileUploadHandler.resolvePublicUrl(record[field.name])
-                            : await fileUploadHandler.resolvePrivateUrl(record[field.name]);
+                        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) {
@@ -200,9 +211,16 @@ export class ModelRepository extends AbstractRepository {
                         }
                         for (const locale of Object.keys(localeObject)) {
                             mappingOperations.push((async () => {
-                                localeObject[locale] = targetField.mimeProps?.public
-                                    ? await fileUploadHandler.resolvePublicUrl(localeObject[locale])
-                                    : await fileUploadHandler.resolvePrivateUrl(localeObject[locale]);
+                                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];
                             })());
                         }
                     }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@clairejs/server",
-    "version": "3.19.2",
+    "version": "3.19.4",
     "description": "Claire server NodeJs framework written in Typescript.",
     "types": "dist/index.d.ts",
     "main": "dist/index.js",
@@ -15,6 +15,7 @@
     "author": "immort",
     "license": "ISC",
     "dependencies": {
+        "@clairejs/client": "^3.4.1",
         "aws-sdk": "^2.841.0",
         "axios": "^0.21.4",
         "cookie-parser": "^1.4.6",
@@ -33,8 +34,8 @@
         "ws": "^7.5.5"
     },
     "peerDependencies": {
-        "@clairejs/core": "^3.7.9",
-        "@clairejs/orm": "^3.15.2"
+        "@clairejs/core": "^3.8.2",
+        "@clairejs/orm": "^3.15.9"
     },
     "devDependencies": {
         "@types/cookie-parser": "^1.4.3",