@ditojs/server 2.16.0 → 2.18.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ditojs/server",
-  "version": "2.16.0",
+  "version": "2.18.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.16.0",
-    "@ditojs/build": "^2.16.0",
-    "@ditojs/router": "^2.16.0",
-    "@ditojs/utils": "^2.16.0",
-    "@koa/cors": "^4.0.0",
+    "@ditojs/admin": "^2.18.0",
+    "@ditojs/build": "^2.18.0",
+    "@ditojs/router": "^2.18.0",
+    "@ditojs/utils": "^2.18.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": "^4.5.2",
+    "@vue/compiler-sfc": "^3.3.11",
     "ajv": "^8.12.0",
     "ajv-formats": "^2.1.1",
     "bcryptjs": "^2.4.3",
@@ -54,7 +54,7 @@
     "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",
@@ -64,10 +64,10 @@
     "pino-pretty": "^10.2.3",
     "pluralize": "^8.0.0",
     "repl": "^0.1.3",
-    "type-fest": "^4.8.2",
+    "type-fest": "^4.8.3",
     "uuid": "^9.0.1",
-    "vite": "^5.0.2",
-    "vue": "^3.3.9"
+    "vite": "^5.0.8",
+    "vue": "^3.3.11"
   },
   "peerDependencies": {
     "@aws-sdk/client-s3": "^3.0.0",
@@ -82,13 +82,13 @@
     "@types/koa-session": "^6.4.5",
     "@types/koa-static": "^4.0.4",
     "@types/koa__cors": "^4.0.3",
-    "@types/node": "^20.10.0",
-    "knex": "^3.0.1",
+    "@types/node": "^20.10.4",
+    "knex": "^3.1.0",
     "objection": "^3.1.3",
-    "typescript": "^5.3.2"
+    "typescript": "^5.3.3"
   },
   "types": "types",
-  "gitHead": "333d379f78a3d7469ca79993acd51b48e069ec9a",
+  "gitHead": "a19a3a9b1378a2da1edd05e88d383f48b2932f75",
   "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/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
             ))
           )

package/src/query/QueryBuilder.js

@@ -8,6 +8,7 @@ import {
   mapKeys,
   getValueAtDataPath,
   setValueAtDataPath,
+  normalizeDataPath,
   parseDataPath,
   deprecate
 } from '@ditojs/utils'
@@ -686,7 +687,7 @@ export class QueryBuilder extends objection.QueryBuilder {
     if (options?.cyclic && method.startsWith('upsert')) {
       // `_upsertCyclicDitoGraphAndFetch()` needs to run asynchronously,
       // but we can't do so here and `runBefore()` executes too late,
-      // so use `_executeFirst()` to work around it.
+      // so use `#executeFirst()` to work around it.
       this.#executeFirst = async () => {
         this.#executeFirst = null
         handleGraph(
@@ -727,11 +728,22 @@ export class QueryBuilder extends objection.QueryBuilder {
     // Now clone the data and delete all references from it, for the initial
     // upsert.
     const cloned = clone(data)
+    const sparseArrays = {}
     for (const path of Object.keys(references)) {
       const parts = parseDataPath(path)
       const key = parts.pop()
       const parent = getValueAtDataPath(cloned, parts)
       delete parent[key]
+      if (isArray(parent)) {
+        // For arrays, deleting the entry at `key` will leave 'holes' in the
+        // array and make it sparse. Collect it in order to compress it later.
+        sparseArrays[normalizeDataPath(parts)] = parent
+      }
+    }
+
+    // Now condense the sparse arrays to remove the empty entries again:
+    for (const [dataPath, array] of Object.entries(sparseArrays)) {
+      setValueAtDataPath(cloned, dataPath, Object.values(array))
     }
 
     // TODO: The model isn't necessarily fetched with data in the same order as