@ditojs/server 2.88.0 → 2.90.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ditojs/server",
-  "version": "2.88.0",
+  "version": "2.90.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/main/packages/server",
@@ -25,10 +25,10 @@
     "node >= 18"
   ],
   "dependencies": {
-    "@ditojs/admin": "^2.87.0",
-    "@ditojs/build": "^2.87.0",
-    "@ditojs/router": "^2.87.0",
-    "@ditojs/utils": "^2.87.0",
+    "@ditojs/admin": "^2.90.0",
+    "@ditojs/build": "^2.90.0",
+    "@ditojs/router": "^2.90.0",
+    "@ditojs/utils": "^2.90.0",
     "@koa/cors": "^5.0.0",
     "@koa/etag": "^5.0.2",
     "@koa/multer": "^4.0.0",
@@ -90,5 +90,5 @@
     "objection": "^3.1.5",
     "typescript": "^5.9.3"
   },
-  "gitHead": "1d413e8528f8a40e3cc7950db62ebeb4d687ce67"
+  "gitHead": "4e5489c32920078f98f23460cef00d658216b878"
 }

package/src/storage/AssetFile.js

@@ -58,8 +58,6 @@ export class AssetFile {
   }
 
   static convert(object, storage) {
-    // Signature must never be persisted.
-    delete object.signature
     Object.setPrototypeOf(object, AssetFile.prototype)
     setHiddenProperty(object, SYMBOL_STORAGE, storage)
   }

package/src/storage/Storage.js

@@ -83,17 +83,20 @@ export class Storage {
   }
 
   convertAssetFile(file, { trusted = false } = {}) {
-    if (!trusted) {
-      if (this.isImportSourceAllowed(file.url)) {
-        this.signAssetFile(file)
-      } else if (!this.verifyAssetFile(file)) {
-        throw new AssetError(
-          `Invalid asset signature for file '${
-            file.name ?? file.key
-          }'`
-        )
-      }
+    if (
+      !trusted &&
+      !(file instanceof AssetFile) &&
+      !this.isImportSourceAllowed(file.url) &&
+      !this.verifyAssetFile(file)
+    ) {
+      throw new AssetError(
+        `Invalid asset signature for file '${
+          file.name ?? file.key
+        }'`
+      )
     }
+    // Remove signature once the data made it to here.
+    delete file.signature
     AssetFile.convert(file, this)
   }
 

package/src/utils/asset.js

@@ -1,7 +1,7 @@
 import path from 'path'
 
 export function resolveFileUrl(url) {
-  return url.startsWith('file://')
+  return url?.startsWith('file://')
     ? `file://${path.resolve(url.slice(7))}`
     : url
 }