@ditojs/server 2.17.0 → 2.19.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ditojs/server",
-  "version": "2.17.0",
+  "version": "2.19.0",
   "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,15 +22,15 @@
     "node >= 18"
   ],
   "dependencies": {
-    "@ditojs/admin": "^2.17.0",
-    "@ditojs/build": "^2.17.0",
-    "@ditojs/router": "^2.17.0",
-    "@ditojs/utils": "^2.17.0",
-    "@koa/cors": "^4.0.0",
+    "@ditojs/admin": "^2.19.0",
+    "@ditojs/build": "^2.19.0",
+    "@ditojs/router": "^2.19.0",
+    "@ditojs/utils": "^2.19.0",
+    "@koa/cors": "^5.0.0",
     "@koa/multer": "^3.0.2",
     "@originjs/vite-plugin-commonjs": "^1.0.3",
-    "@vitejs/plugin-vue": "^4.5.0",
-    "@vue/compiler-sfc": "^3.3.9",
+    "@vitejs/plugin-vue": "^5.0.2",
+    "@vue/compiler-sfc": "^3.4.3",
     "ajv": "^8.12.0",
     "ajv-formats": "^2.1.1",
     "bcryptjs": "^2.4.3",
@@ -38,7 +38,7 @@
     "data-uri-to-buffer": "^6.0.1",
     "eventemitter2": "^6.4.9",
     "file-type": "^18.7.0",
-    "koa": "^2.14.2",
+    "koa": "^2.15.0",
     "koa-bodyparser": "^4.4.1",
     "koa-compose": "^4.1.0",
     "koa-compress": "^5.1.1",
@@ -54,20 +54,20 @@
     "mime-types": "^2.1.35",
     "multer": "^1.4.5-lts.1",
     "multer-s3": "https://github.com/ditojs/multer-s3#dito",
-    "nanoid": "^5.0.3",
+    "nanoid": "^5.0.4",
     "parse-duration": "^1.1.0",
     "passport-local": "^1.0.0",
     "passthrough-counter": "^1.0.0",
     "picocolors": "^1.0.0",
     "picomatch": "^3.0.1",
-    "pino": "^8.16.2",
-    "pino-pretty": "^10.2.3",
+    "pino": "^8.17.2",
+    "pino-pretty": "^10.3.1",
     "pluralize": "^8.0.0",
     "repl": "^0.1.3",
-    "type-fest": "^4.8.2",
+    "type-fest": "^4.9.0",
     "uuid": "^9.0.1",
-    "vite": "^5.0.4",
-    "vue": "^3.3.9"
+    "vite": "^5.0.10",
+    "vue": "^3.4.3"
   },
   "peerDependencies": {
     "@aws-sdk/client-s3": "^3.0.0",
@@ -81,14 +81,14 @@
     "@types/koa-response-time": "^2.1.5",
     "@types/koa-session": "^6.4.5",
     "@types/koa-static": "^4.0.4",
-    "@types/koa__cors": "^4.0.3",
-    "@types/node": "^20.10.1",
-    "knex": "^3.0.1",
+    "@types/koa__cors": "^5.0.0",
+    "@types/node": "^20.10.6",
+    "knex": "^3.1.0",
     "objection": "^3.1.3",
-    "typescript": "^5.3.2"
+    "typescript": "^5.3.3"
   },
   "types": "types",
-  "gitHead": "e0609d98891263c136320e65480c42ad7a289b4b",
+  "gitHead": "e2509f3306ebc3d08be2e00d18f5594bfba3f658",
   "scripts": {
     "types": "tsc --noEmit --esModuleInterop ./types/index.d.ts"
   },

package/src/app/Application.js

@@ -882,6 +882,7 @@ export class Application extends Koa {
     storage,
     addedFiles,
     removedFiles,
+    changedFiles,
     trx = null
   ) {
     let importedFiles = []
@@ -889,7 +890,7 @@ export class Application extends Koa {
     if (AssetModel) {
       importedFiles = await this.addForeignAssets(
         storage,
-        addedFiles,
+        [...addedFiles, ...changedFiles],
         trx
       )
       if (

package/src/middleware/logRequests.js

@@ -11,7 +11,7 @@ export function logRequests({ ignoreUrlPattern } = {}) {
       return next()
     }
     // request
-    const start = Date.now()
+    const start = performance.now()
 
     logRequest(ctx)
 
@@ -108,8 +108,10 @@ function logResponse({ ctx, start, length, err }) {
 }
 
 function formatTime(start) {
-  const delta = Date.now() - start
-  return delta < 10000 ? delta + 'ms' : Math.round(delta / 1000) + 's'
+  const delta = performance.now() - start
+  return delta < 10000
+    ? +delta.toFixed(2) + 'ms'
+    : +(delta / 1000).toFixed(2) + 's'
 }
 
 const colorCodes = {

package/src/models/Model.js

@@ -7,6 +7,7 @@ import {
   isPromise,
   asArray,
   flatten,
+  equals,
   parseDataPath,
   normalizeDataPath,
   getValueAtDataPath,
@@ -1066,8 +1067,12 @@ export class Model extends objection.Model {
           const afterFiles = afterFilesPerDataPath[dataPath] || []
           const beforeByKey = mapFilesByKey(beforeFiles)
           const afterByKey = mapFilesByKey(afterFiles)
-          const removedFiles = beforeFiles.filter(file => !afterByKey[file.key])
           const addedFiles = afterFiles.filter(file => !beforeByKey[file.key])
+          const removedFiles = beforeFiles.filter(file => !afterByKey[file.key])
+          const changedFiles = afterFiles.filter(file => {
+            const beforeFile = beforeByKey[file.key]
+            return beforeFile && !equals(file, beforeFile)
+          })
           // Also handle modified files, which are files where the data property
           // is changed before update / patch, meaning the file is changed.
           // NOTE: This will change the content for all the references to it,
@@ -1080,6 +1085,7 @@ export class Model extends objection.Model {
               storage,
               addedFiles,
               removedFiles,
+              changedFiles,
               transaction
             ))
           )