@ditojs/server 2.10.1 → 2.10.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ditojs/server",
-  "version": "2.10.1",
+  "version": "2.10.2",
   "type": "module",
   "description": "Dito.js Server – Dito.js is a declarative and modern web framework, based on Objection.js, Koa.js and Vue.js",
   "repository": "https://github.com/ditojs/dito/tree/master/packages/server",
@@ -22,7 +22,7 @@
     "node >= 18"
   ],
   "dependencies": {
-    "@ditojs/admin": "^2.10.1",
+    "@ditojs/admin": "^2.10.2",
     "@ditojs/build": "^2.10.0",
     "@ditojs/router": "^2.10.0",
     "@ditojs/utils": "^2.10.0",
@@ -37,7 +37,7 @@
     "bytes": "^3.1.2",
     "data-uri-to-buffer": "^5.0.1",
     "eventemitter2": "^6.4.9",
-    "file-type": "^18.4.0",
+    "file-type": "^18.5.0",
     "koa": "^2.14.2",
     "koa-bodyparser": "^4.4.0",
     "koa-compose": "^4.1.0",
@@ -55,7 +55,7 @@
     "multer": "^1.4.5-lts.1",
     "multer-s3": "https://github.com/ditojs/multer-s3#dito",
     "nanoid": "^4.0.2",
-    "parse-duration": "^1.0.3",
+    "parse-duration": "^1.1.0",
     "passport-local": "^1.0.0",
     "passthrough-counter": "^1.0.0",
     "picocolors": "^1.0.0",
@@ -88,7 +88,7 @@
     "typescript": "^5.1.3"
   },
   "types": "types",
-  "gitHead": "add6bbbdd21d0980af235994b96c4641ace5eeda",
+  "gitHead": "b55fe95fb3e52f5ef6a59d0fc8670c15313985d6",
   "scripts": {
     "types": "tsc --noEmit --esModuleInterop ./types/index.d.ts"
   },

package/src/app/Application.js

@@ -26,6 +26,7 @@ import {
   isModule,
   hyphenate,
   clone,
+  groupBy,
   assignDeeply,
   parseDataPath,
   normalizeDataPath,
@@ -907,11 +908,13 @@ export class Application extends Koa {
     const AssetModel = this.getModel('Asset')
     if (AssetModel) {
       // Find missing assets (copied from another system), and add them.
+      const filesByKey = groupBy(files, file => file.key)
       await mapConcurrently(
-        files,
-        async file => {
-          const asset = await AssetModel.query(trx).findOne('key', file.key)
+        Object.entries(filesByKey),
+        async ([key, files]) => {
+          const asset = await AssetModel.query(trx).findOne('key', key)
           if (!asset) {
+            const [file] = files // Pick the first file
             if (file.data || file.url) {
               let { data } = file
               if (!data) {
@@ -946,11 +949,13 @@ export class Application extends Koa {
               }
               const importedFile = await storage.addFile(file, data)
               await this.createAssets(storage, [importedFile], 0, trx)
-              // Merge back the changed file properties into the actual files
-              // object, so that the data from the static model hook can be used
-              // directly for the actual running query.
-              Object.assign(file, importedFile)
               importedFiles.push(importedFile)
+              // Merge back the changed file properties into the actual file
+              // objects, so that the data from the static model hook can be
+              // used directly for the actual running query.
+              for (const file of files) {
+                Object.assign(file, importedFile)
+              }
             } else {
               throw new AssetError(
                 `Unable to import asset from foreign source: '${
@@ -963,7 +968,9 @@ export class Application extends Koa {
           } else {
             // Asset is from a foreign source, but was already imported and can
             // be reused. See above for an explanation of this merge.
-            Object.assign(file, asset.file)
+            for (const file of files) {
+              Object.assign(file, asset.file)
+            }
             // NOTE: No need to add `file` to `importedFiles`, since it's
             // already been imported to the storage before.
           }