pangea-server 3.3.81 → 3.3.82

package/dist/router/call-controller.js

@@ -56,19 +56,32 @@ function hasInstancesAndTotalCount(obj) {
 }
 async function setFilesUrls(data) {
     const visited = new WeakSet();
-    const singleTargets = [];
-    const arrayTargets = [];
-    function isTargetKey(key) {
-        const k = key.toLowerCase();
-        return k.includes('image') || k.includes('video');
+    const targets = [];
+    function getFieldMode(key) {
+        const lowerKey = key.toLowerCase();
+        if (lowerKey.endsWith('url') || lowerKey.endsWith('urls'))
+            return null;
+        if (lowerKey.includes('images') || lowerKey.includes('videos'))
+            return 'plural';
+        if (lowerKey.includes('image') || lowerKey.includes('video'))
+            return 'single';
+        return null;
     }
-    function normalizeArray(value) {
+    function normalizePluralValue(value) {
         if (Array.isArray(value))
-            return value;
-        if (typeof value === 'string' && value.length)
-            return value.split(',').map((v) => v.trim()).filter(Boolean);
+            return value.filter((item) => typeof item === 'string' && item.length > 0);
+        if (typeof value === 'string' && value.length > 0)
+            return value
+                .split(',')
+                .map((item) => item.trim())
+                .filter(Boolean);
         return [];
     }
+    function normalizeSingleValue(value) {
+        if (typeof value === 'string')
+            return value.length > 0 ? value : null;
+        return null;
+    }
     function collect(node) {
         if (!node)
             return;
@@ -81,62 +94,35 @@ async function setFilesUrls(data) {
         if (visited.has(node))
             return;
         visited.add(node);
-        for (const [key, value] of Object.entries(node)) {
-            if (isTargetKey(key)) {
-                if (Array.isArray(value) || typeof value === 'string') {
-                    const arr = normalizeArray(value);
-                    if (arr.length > 1) {
-                        node[key] = arr;
-                        arrayTargets.push({ node, key });
-                    }
-                    else if (arr.length === 1) {
-                        node[key] = arr[0];
-                        singleTargets.push({ node, key });
-                    }
-                    else if (Array.isArray(value)) {
-                        node[key] = [];
-                        arrayTargets.push({ node, key });
-                    }
-                    else {
-                        node[key] = null;
-                        singleTargets.push({ node, key });
-                    }
-                }
+        Object.entries(node).forEach(([key, value]) => {
+            const mode = getFieldMode(key);
+            if (mode === 'plural') {
+                targets.push({ node, key, mode });
+            }
+            else if (mode === 'single' && typeof value === 'string') {
+                targets.push({ node, key, mode });
             }
             collect(value);
-        }
+        });
     }
     collect(data);
-    const filesSet = new Set();
-    singleTargets.forEach(({ node, key }) => {
-        const val = node[key];
-        if (typeof val === 'string' && val.length)
-            filesSet.add(val);
-    });
-    arrayTargets.forEach(({ node, key }) => {
-        const arr = node[key];
-        if (!Array.isArray(arr))
-            return;
-        arr.forEach((v) => {
-            if (typeof v === 'string' && v.length)
-                filesSet.add(v);
-        });
-    });
-    const files = Array.from(filesSet);
-    if (!files.length) {
-        arrayTargets.forEach(({ node, key }) => (node[`${key}Urls`] = []));
-        singleTargets.forEach(({ node, key }) => (node[`${key}Url`] = null));
+    if (!targets.length)
         return;
-    }
-    const urls = await Promise.all(files.map((file) => helpers_1.FileStorage.GenerateDownloadUrl(file)));
+    const allFiles = Array.from(new Set(targets.flatMap((target) => target.mode === 'plural'
+        ? normalizePluralValue(target.node[target.key])
+        : normalizeSingleValue(target.node[target.key]) || [])));
     const map = new Map();
-    files.forEach((file, i) => map.set(file, urls[i]));
-    singleTargets.forEach(({ node, key }) => {
-        const val = node[key];
-        node[`${key}Url`] = typeof val === 'string' && val.length ? map.get(val) || null : null;
-    });
-    arrayTargets.forEach(({ node, key }) => {
-        const arr = node[key];
-        node[`${key}Urls`] = Array.isArray(arr) ? arr.map((v) => (v && map.has(v) ? map.get(v) : null)) : [];
+    if (allFiles.length) {
+        const urls = await Promise.all(allFiles.map((file) => helpers_1.FileStorage.GenerateDownloadUrl(file)));
+        allFiles.forEach((file, i) => map.set(file, urls[i]));
+    }
+    targets.forEach((target) => {
+        if (target.mode === 'plural') {
+            const files = normalizePluralValue(target.node[target.key]);
+            target.node[`${target.key}Urls`] = files.map((file) => map.get(file) || null);
+            return;
+        }
+        const file = normalizeSingleValue(target.node[target.key]);
+        target.node[`${target.key}Url`] = file ? map.get(file) || null : null;
     });
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "pangea-server",
   "description": "",
-  "version": "3.3.81",
+  "version": "3.3.82",
   "files": [
     "dist"
   ],