@ditojs/server 2.26.1 → 2.27.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ditojs/server",
-  "version": "2.26.1",
+  "version": "2.27.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": "^2.26.1",
-    "@ditojs/build": "^2.26.1",
-    "@ditojs/router": "^2.26.1",
-    "@ditojs/utils": "^2.26.1",
+    "@ditojs/admin": "^2.27.0",
+    "@ditojs/build": "^2.27.0",
+    "@ditojs/router": "^2.27.0",
+    "@ditojs/utils": "^2.27.0",
     "@koa/cors": "^5.0.0",
     "@koa/multer": "^3.0.2",
     "@originjs/vite-plugin-commonjs": "^1.0.3",
@@ -90,7 +90,7 @@
     "typescript": "^5.4.5"
   },
   "types": "types",
-  "gitHead": "8f2e07e3774d0e03b24ee78cffe60c5edacb93ae",
+  "gitHead": "e80d56a1887faa60f61f4c642502687d50ead333",
   "scripts": {
     "types": "tsc --noEmit --esModuleInterop ./types/index.d.ts"
   },

package/src/controllers/CollectionController.js

@@ -25,9 +25,12 @@ export class CollectionController extends Controller {
   // @override
   setup() {
     this.logController()
-    this.collection = this.setupActions('collection')
-    this.member = this.isOneToOne ? {} : this.setupActions('member')
-    this.assets = this.setupAssets()
+    this.setProperty('collection', this.setupActions('collection'))
+    this.setProperty(
+      'member',
+      this.isOneToOne ? {} : this.setupActions('member')
+    )
+    this.setProperty('assets', this.setupAssets())
   }
 
   // @override

package/src/controllers/Controller.js

@@ -70,26 +70,22 @@ export class Controller {
     // If the class name ends in 'Controller', remove it from controller name.
     this.name ||= this.constructor.name.match(/^(.*?)(?:Controller|)$/)[1]
     this.path ??= this.app.normalizePath(this.name)
-    if (!this.url) {
-      // NOTE: `RelationController.configure()` sets the `url` before calling
-      // `super.configure()` and has its own handling of logging.
-      const { path, namespace } = this
-      // TODO: The distinction between  `url` and `path` is a bit tricky, since
-      // what we call `url` here is called `path` in Router, and may contain
-      // mapped parameters or wildcards. Consider `path` / `route` instead?
-      const url = path ? `/${path}` : ''
-      this.url = namespace ? `/${namespace}${url}` : url
-    }
+    const { path, namespace } = this
+    // TODO: The distinction between  `url` and `path` is a bit tricky, since
+    // what we call `url` here is called `path` in Router, and may contain
+    // mapped parameters or wildcards. Consider `path` / `route` instead?
+    const url = path ? `/${path}` : ''
+    this.url = namespace ? `/${namespace}${url}` : url
   }
 
   // @overridable
   setup() {
     this.logController()
-    this.actions ||= this.reflectActionsObject()
+    this.setProperty('actions', this.actions || this.reflectActionsObject())
     // Now that the instance fields are reflected in the `controller` object
     // we can use the normal inheritance mechanism through `setupActions()`:
-    this.actions = this.setupActions('actions')
-    this.assets = this.setupAssets()
+    this.setProperty('actions', this.setupActions('actions'))
+    this.setProperty('assets', this.setupAssets())
   }
 
   // @overridable
@@ -119,6 +115,15 @@ export class Controller {
     )
   }
 
+  setProperty(key, value) {
+    Object.defineProperty(this, key, {
+      value,
+      writable: false,
+      enumerable: true,
+      configurable: true
+    })
+  }
+
   logRoute(str, indent = 0) {
     if (this.logRoutes) {
       console.info(`${'  '.repeat(indent)}${str}`)

package/src/controllers/ModelController.js

@@ -14,7 +14,7 @@ export class ModelController extends CollectionController {
 
   setup() {
     super.setup()
-    this.relations = this.setupRelations()
+    this.setProperty('relations', this.setupRelations())
   }
 
   setupRelations() {

package/src/controllers/RelationController.js

@@ -1,4 +1,3 @@
-import pico from 'picocolors'
 import { asArray } from '@ditojs/utils'
 import { CollectionController } from './CollectionController.js'
 import { ControllerError } from '../errors/index.js'
@@ -32,28 +31,18 @@ export class RelationController extends CollectionController {
       // relations:
       this.scope = asArray(parent.scope).filter(scope => getScope(scope).graph)
     }
-    // Copy over all fields in the relation object except the ones that are
-    // going to be inherited in `setup()` (relation, member, allow), for
-    // settings like scope, etc.
-    for (const key in this.object) {
-      if (!['relation', 'member', 'allow'].includes(key)) {
-        this[key] = this.object[key]
-      }
+    // Copy over all fields in the relation object.
+    for (const key in object) {
+      // On the relation objects, the `collection` actions are stored in a
+      // `relation` object, to make sense both for one- and many-relations:
+      this.setProperty(key === 'relation' ? 'collection' : key, object[key])
     }
   }
 
   // @override
   configure() {
-    // Setup the `url` before calling `super.configure()` to override its
-    // default behavior for `RelationController`:
-    this.url = `${this.parent.url}/${this.parent.getPath('member', this.path)}`
-    this.log(`${pico.blue(this.path)}${pico.white(':')}`, this.level)
     super.configure()
-  }
-
-  // @override
-  logController() {
-    // The parent controller logs itself already, that's enough.
+    this.url = `${this.parent.url}/${this.parent.getPath('member', this.path)}`
   }
 
   // @override
@@ -98,7 +87,7 @@ export class RelationController extends CollectionController {
     })
   }
 
-  collection = this.toCoreActions({})
+  collection = this.convertToCoreActions({})
 
-  member = this.toCoreActions({})
+  member = this.convertToCoreActions({})
 }