@ditojs/server 1.27.0 → 1.28.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ditojs/server",
-  "version": "1.27.0",
+  "version": "1.28.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,10 +22,10 @@
     "node >= 18"
   ],
   "dependencies": {
-    "@ditojs/admin": "^1.27.0",
-    "@ditojs/build": "^1.25.0",
-    "@ditojs/router": "^1.27.0",
-    "@ditojs/utils": "^1.27.0",
+    "@ditojs/admin": "^1.28.0",
+    "@ditojs/build": "^1.28.0",
+    "@ditojs/router": "^1.28.0",
+    "@ditojs/utils": "^1.28.0",
     "@koa/cors": "^4.0.0",
     "@koa/multer": "^3.0.2",
     "@originjs/vite-plugin-commonjs": "^1.0.3",
@@ -90,7 +90,7 @@
     "typescript": "^4.9.5"
   },
   "types": "types",
-  "gitHead": "96b1437fc3950eb8259d40b93501e1a7e32ebb0e",
+  "gitHead": "9e43f6a450f6c38a5147502863d1f44738fcecef",
   "scripts": {
     "types": "tsc --noEmit ./src/index.d.ts"
   },

package/src/cli/db/listAssetConfig.js

@@ -1,4 +1,4 @@
-import { formatJson } from '@ditojs/server'
+import { formatJson } from '../../utils/json.js'
 
 export async function listAssetConfig(app, ...args) {
   const assetConfig = app.getAssetConfig({

package/src/models/Model.js

@@ -42,7 +42,7 @@ export class Model extends objection.Model {
     const { hooks, assets } = this.definition
     this._configureEmitter(hooks)
     if (assets) {
-      this._configureAssetsEvents(assets)
+      this._configureAssetsHooks(assets)
     }
     try {
       for (const relation of Object.values(this.getRelations())) {
@@ -923,7 +923,7 @@ export class Model extends objection.Model {
 
   // Assets handling
 
-  static _configureAssetsEvents(assets) {
+  static _configureAssetsHooks(assets) {
     const assetDataPaths = Object.keys(assets)
 
     this.on([
@@ -931,34 +931,50 @@ export class Model extends objection.Model {
       'before:update',
       'before:delete'
     ], async ({ type, transaction, inputItems, asFindQuery }) => {
-      const afterItems = type === 'before:delete'
-        ? []
-        : inputItems
+      const isInsert = type === 'before:insert'
+      const isDelete = type === 'before:delete'
       // Figure out which asset data paths where actually present in the
       // submitted data, and only compare these. But when deleting, use all.
-      const dataPaths = afterItems.length > 0
-        ? assetDataPaths.filter(
-          path => getValueAtAssetDataPath(afterItems[0], path) !== undefined
+      const dataPaths = isDelete
+        ? assetDataPaths
+        : assetDataPaths.filter(
+          dataPath => (
+            // Skip check for wildcard data-paths.
+            /^\*\*?/.test(dataPath) ||
+            // Only keep normal data paths that match present properties.
+            (parseDataPath(dataPath)[0] in inputItems[0])
+          )
         )
-        : assetDataPaths
-
       // `dataPaths` is empty in the case of an update/insert that does not
       // affect the assets.
       if (dataPaths.length === 0) return
 
+      const afterItems = isDelete
+        ? []
+        : inputItems
       // Load the model's asset files in their current state before the query is
-      // executed.
-      const beforeItems = type === 'before:insert'
+      // executed. For deletes, load the data for all asset data-paths.
+      // Otherwise, only load the columns present in the input data.
+      const beforeItems = isInsert
         ? []
-        : await loadAssetDataPaths(asFindQuery(), dataPaths)
-      const beforeFilesPerDataPath = getFilesPerAssetDataPath(
-        beforeItems,
-        dataPaths
-      )
+        : isDelete
+          ? await loadAssetDataPaths(asFindQuery(), dataPaths)
+          : await asFindQuery().select(
+            // Select all columns that are present in the data and not computed.
+            Object.keys(inputItems[0]).filter(key => {
+              const property = this.definition.properties[key]
+              return property && !property.computed
+            })
+          )
+
       const afterFilesPerDataPath = getFilesPerAssetDataPath(
         afterItems,
         dataPaths
       )
+      const beforeFilesPerDataPath = getFilesPerAssetDataPath(
+        beforeItems,
+        dataPaths
+      )
 
       const importedFiles = []
       const modifiedFiles = []