@radio-garden/ditojs-server 2.91.0-2.566eca6ca → 2.92.0-1.79f40ebcd

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@radio-garden/ditojs-server",
-  "version": "2.91.0-2.566eca6ca",
+  "version": "2.92.0-1.79f40ebcd",
   "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",
@@ -32,12 +32,12 @@
     "bytes": "^3.1.2",
     "data-uri-to-buffer": "^7.0.0",
     "eventemitter2": "^6.4.9",
-    "file-type": "^21.3.1",
+    "file-type": "^21.3.3",
     "helmet": "^8.1.0",
     "koa": "^3.1.2",
     "koa-bodyparser": "^4.4.1",
     "koa-compose": "^4.1.0",
-    "koa-compress": "^5.2.0",
+    "koa-compress": "^5.2.1",
     "koa-conditional-get": "^3.0.0",
     "koa-helmet": "^9.0.0",
     "koa-mount": "^4.2.0",
@@ -49,7 +49,7 @@
     "mime-types": "^3.0.2",
     "multer": "^2.1.1",
     "multer-s3": "github:ditojs/multer-s3#dito",
-    "nanoid": "^5.1.6",
+    "nanoid": "^5.1.7",
     "parse-duration": "^2.1.5",
     "passport-local": "^1.0.0",
     "passthrough-counter": "^1.0.0",
@@ -61,10 +61,10 @@
     "repl": "^0.1.3",
     "type-fest": "^5.4.4",
     "uuid": "^13.0.0",
-    "@ditojs/admin": "npm:@radio-garden/ditojs-admin@^2.91.0-2.566eca6ca",
-    "@ditojs/build": "npm:@radio-garden/ditojs-build@^2.91.0-2.566eca6ca",
-    "@ditojs/utils": "npm:@radio-garden/ditojs-utils@^2.91.0-2.566eca6ca",
-    "@ditojs/router": "npm:@radio-garden/ditojs-router@^2.91.0-2.566eca6ca"
+    "@ditojs/admin": "^2.92.0",
+    "@ditojs/build": "^2.92.0",
+    "@ditojs/utils": "^2.92.0",
+    "@ditojs/router": "^2.92.0"
   },
   "peerDependencies": {
     "@aws-sdk/client-s3": "^3.0.0",
@@ -82,13 +82,13 @@
     "@types/koa-static": "^4.0.4",
     "@types/koa__cors": "^5.0.1",
     "@types/koa__multer": "^2.0.8",
-    "@types/node": "^25.4.0",
+    "@types/node": "^25.5.0",
     "knex": "^3.1.0",
     "objection": "^3.1.5",
     "typescript": "^5.9.3"
   },
-  "gitHead": "566eca6ca",
-  "gitBranch": "feature/asset-signatures",
+  "gitHead": "79f40ebcd",
+  "gitBranch": "rg",
   "scripts": {
     "types": "tsc --noEmit --esModuleInterop ./types/index.d.ts"
   }

package/src/app/Application.js

@@ -177,7 +177,7 @@ export class Application extends Koa {
         if (
           module &&
           module.name !== key &&
-          module.name?.replace(/^_|\d+$/g, '') === key
+          module.name?.replace(/^_|\$?\d+$/g, '') === key
         ) {
           Object.defineProperty(module, 'name', {
             value: key,

package/src/controllers/AdminController.js

@@ -205,9 +205,12 @@ export class AdminController extends Controller {
                 rollupOptions: {
                   output: {
                     manualChunks: id => {
-                      if (id.startsWith(views)) {
+                      // Strip Rollup's \0 prefix used for virtual modules
+                      // (e.g. CJS interop modules like ?commonjs-module)
+                      const cleanId = id.replace(/^\0/, '')
+                      if (cleanId.startsWith(views)) {
                         return 'views'
-                      } else if (id.startsWith(this.app.basePath)) {
+                      } else if (cleanId.startsWith(this.app.basePath)) {
                         return 'common'
                       } else {
                         const module = id.match(

package/src/models/Model.js

@@ -7,11 +7,12 @@ import {
   isPromise,
   asArray,
   clone,
-  equals,
   flatten,
+  equals,
   parseDataPath,
   normalizeDataPath,
   getValueAtDataPath,
+  getEntriesAtDataPath,
   setValueAtDataPath,
   mapConcurrently,
   assignDeeply,
@@ -624,8 +625,9 @@ export class Model extends objection.Model {
     }
     // Convert plain asset files objects to AssetFile instances with references
     // to the linked storage.
-    this.constructor._forEachAssetFile(json, (file, storage) => {
+    this.constructor._mapAssetFiles(json, (file, storage) => {
       storage.convertAssetFile(file, { trusted })
+      return file
     })
     return json
   }
@@ -1002,30 +1004,21 @@ export class Model extends objection.Model {
 
   // Assets handling
 
-  static _forEachAssetFile(json, callback) {
-    const { assets } = this.definition
-    if (assets) {
-      for (const dataPath in assets) {
-        const data = getValueAtDataPath(json, dataPath, noop)
-        if (!data) continue
-        const storage = this.app.getStorage(assets[dataPath].storage)
-        forEachAssetFile(data, storage, callback)
-      }
-    }
-  }
-
   static _mapAssetFiles(json, callback) {
     const { assets } = this.definition
     if (assets) {
       for (const dataPath in assets) {
-        const data = getValueAtDataPath(json, dataPath, noop)
-        if (!data) continue
         const storage = this.app.getStorage(assets[dataPath].storage)
-        setValueAtDataPath(
-          json,
-          dataPath,
-          mapAssetFiles(data, storage, callback)
-        )
+        const map = file => callback(file, storage)
+        const entries = getEntriesAtDataPath(json, dataPath, noop)
+        for (const [path, data] of Object.entries(entries)) {
+          if (!data) continue
+          setValueAtDataPath(
+            json,
+            path,
+            isArray(data) ? data.map(map) : map(data)
+          )
+        }
       }
     }
   }
@@ -1197,33 +1190,12 @@ function loadAssetDataPaths(query, dataPaths) {
 
 const noop = () => {}
 
-function forEachAssetFile(data, storage, callback) {
-  if (isArray(data)) {
-    for (const item of data) {
-      forEachAssetFile(item, storage, callback)
-    }
-  } else if (data) {
-    callback(data, storage)
-  }
-}
-
-function mapAssetFiles(data, storage, callback) {
-  if (isArray(data)) {
-    return data.map(item => mapAssetFiles(item, storage, callback))
-  }
-  return data ? callback(data, storage) : data
-}
-
-function getValueAtAssetDataPath(item, path) {
-  return getValueAtDataPath(item, path, noop)
-}
-
 function getFilesPerAssetDataPath(items, dataPaths) {
   return dataPaths.reduce(
     (allFiles, dataPath) => {
       allFiles[dataPath] = asArray(items).reduce(
         (files, item) => {
-          const data = asArray(getValueAtAssetDataPath(item, dataPath))
+          const data = asArray(getValueAtDataPath(item, dataPath, noop))
           // Use flatten() as dataPath may contain wildcards, resulting in
           // nested files arrays.
           files.push(...flatten(data).filter(file => !!file))

package/types/index.d.ts

@@ -1924,7 +1924,7 @@ export type ActionParameter = Schema & { name: string }
  * is bound to the controller instance.
  */
 export type ModelControllerActionHandler<
-  $ModelController extends ModelController = ModelController
+  $ModelController = any
 > = (this: $ModelController, ctx: KoaContext, ...args: any[]) => any
 
 /**
@@ -2034,7 +2034,7 @@ export type ControllerActionOptions<
 }
 
 export type ModelControllerActionOptions<
-  $ModelController extends ModelController = ModelController
+  $ModelController = any
 > = BaseControllerActionOptions & {
   /** The function to be called when the action route is requested. */
   handler: ModelControllerActionHandler<$ModelController>
@@ -2068,7 +2068,7 @@ export type MemberActionParameter<$Model extends Model = Model> =
  * `handler` or a bare handler function.
  */
 export type ModelControllerAction<
-  $ModelController extends ModelController = ModelController
+  $ModelController = any
 > =
   | ModelControllerActionOptions<$ModelController>
   | ModelControllerActionHandler<$ModelController>
@@ -2079,7 +2079,7 @@ export type ModelControllerAction<
  * `'post'`, `'post login'`).
  */
 export type ModelControllerActions<
-  $ModelController extends ModelController = ModelController
+  $ModelController = any
 > = {
   [name: ControllerActionName]: ModelControllerAction<$ModelController>
   allow?: OrReadOnly<ControllerActionName[]>
@@ -2087,7 +2087,7 @@ export type ModelControllerActions<
 }
 
 type ModelControllerMemberAction<
-  $ModelController extends ModelController = ModelController
+  $ModelController = any
 > =
   | (Omit<ModelControllerActionOptions<$ModelController>, 'parameters'> & {
       parameters?: {
@@ -2105,7 +2105,7 @@ type ModelControllerMemberAction<
  * parameters to receive the resolved member model.
  */
 export type ModelControllerMemberActions<
-  $ModelController extends ModelController = ModelController
+  $ModelController = any
 > = {
   [name: ControllerActionName]: ModelControllerMemberAction<$ModelController>
   allow?: OrReadOnly<ControllerActionName[]>
@@ -2177,7 +2177,7 @@ type ModelControllerHookKeys<
   | '*'
 }`
 type ModelControllerHook<
-  $ModelController extends ModelController = ModelController
+  $ModelController = any
 > = (
   ctx: KoaContext,
   result: objection.Page<ModelFromModelController<$ModelController>>
@@ -2215,7 +2215,7 @@ type HandlerFromHookKey<
   : never
 
 type ModelControllerHooks<
-  $ModelController extends ModelController = ModelController
+  $ModelController = any
 > = {
   [$Key in HookKeysFromController<$ModelController>]?: HandlerFromHookKey<
     $ModelController,
@@ -2271,12 +2271,12 @@ export class CollectionController<
    * The controller's collection actions with built-in CRUD
    * defaults.
    */
-  collection?: ModelControllerActions<CollectionController<$Model>>
+  collection?: ModelControllerActions
   /**
    * The controller's member actions with built-in CRUD
    * defaults.
    */
-  member?: ModelControllerMemberActions<CollectionController<$Model>>
+  member?: ModelControllerMemberActions
 
   /** Creates a query builder for this controller's model. */
   query(trx?: objection.Transaction): QueryBuilder<$Model>
@@ -2397,12 +2397,12 @@ export class ModelController<
    * The controller's collection actions. Wrap actions in
    * this object to assign them to the collection.
    */
-  collection?: ModelControllerActions<ModelController<$Model>>
+  collection?: ModelControllerActions
   /**
    * The controller's member actions. Wrap actions in this
    * object to assign them to the member.
    */
-  member?: ModelControllerMemberActions<ModelController<$Model>>
+  member?: ModelControllerMemberActions
   assets?:
     | boolean
     | {
@@ -3527,8 +3527,8 @@ type OrReadOnly<T> = Readonly<T> | T
 
 type OrPromiseOf<T> = Promise<T> | T
 
-type ModelFromModelController<$ModelController extends ModelController> =
-  InstanceType<Exclude<$ModelController['modelClass'], undefined>>
+type ModelFromModelController<$ModelController> =
+  $ModelController extends ModelController<infer $Model> ? $Model : Model
 
 type SerializeModelPropertyValue<T> = T extends (infer U)[]
   ? SerializeModelPropertyValue<U>[]