@ditojs/server 1.3.0 → 1.4.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ditojs/server",
-  "version": "1.3.0",
+  "version": "1.4.2",
   "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",
@@ -14,22 +14,22 @@
     "dito": "./src/cli/index.js"
   },
   "engines": {
-    "node": ">= 14.0.0",
+    "node": ">= 16.0.0",
     "yarn": ">= 1.0.0"
   },
   "browserslist": [
-    "node >= 14"
+    "node >= 16"
   ],
   "dependencies": {
-    "@ditojs/admin": "^1.3.0",
-    "@ditojs/router": "^1.3.0",
-    "@ditojs/utils": "^1.3.0",
+    "@ditojs/admin": "^1.4.2",
+    "@ditojs/router": "^1.4.1",
+    "@ditojs/utils": "^1.4.1",
     "@koa/cors": "^3.2.0",
     "@koa/multer": "^3.0.0",
     "@originjs/vite-plugin-commonjs": "^1.0.3",
-    "ajv": "^8.10.0",
+    "ajv": "^8.11.0",
     "ajv-formats": "^2.1.1",
-    "aws-sdk": "^2.1095.0",
+    "aws-sdk": "^2.1098.0",
     "axios": "^0.26.1",
     "bcryptjs": "^2.4.3",
     "bytes": "^3.1.2",
@@ -61,7 +61,7 @@
     "passthrough-counter": "^1.0.0",
     "picocolors": "^1.0.0",
     "picomatch": "^2.3.1",
-    "pino": "^7.9.1",
+    "pino": "^7.9.2",
     "pino-pretty": "^7.5.4",
     "pluralize": "^8.0.0",
     "repl": "^0.1.3",
@@ -81,5 +81,5 @@
     "pg": "^8.7.3",
     "sqlite3": "^5.0.2"
   },
-  "gitHead": "23aac9eddfc17e3e9367db2b7ac73595bc2bad37"
+  "gitHead": "1790e50f979322b47a53421e9facddb86f6eff86"
 }

package/src/app/Application.js

@@ -171,7 +171,7 @@ export class Application extends Koa {
         }
         if (Object.keys(data).length > 0) {
           console.info(
-            pico.yellow.bold(`\n${modelClass.name}:\n`),
+            pico.yellow(pico.bold(`\n${modelClass.name}:\n`)),
             util.inspect(data, {
               colors: true,
               depth: null,

package/src/controllers/Controller.js

@@ -120,6 +120,15 @@ export class Controller {
         type, actions, name, action, authorize[name]
       )
     }
+    // Expose a direct reference to the controller on the action object, but
+    // also make it inherit from the controller so that all its public fields
+    // and functions (`app`, `query()`, `execute()`, etc.) can be accessed
+    // directly through `this` from actions.
+    // NOTE: Inheritance is also set up by `inheritValues()` so that from inside
+    // the handlers, `super` points to the parent controller's actions object,
+    // so that calling `super.patch()` from a patch handler magically works.
+    actions.controller = this
+    Object.setPrototypeOf(actions, this)
     return actions
   }
 
@@ -139,7 +148,9 @@ export class Controller {
     this.setupActionRoute(
       type,
       // eslint-disable-next-line new-cap
-      new actionClass(this, handler, type, name, method, path, authorize)
+      new actionClass(
+        this, actions, handler, type, name, method, path, authorize
+      )
     )
     return handler
   }
@@ -559,5 +570,5 @@ function isMethodAction(name) {
     options: true,
     trace: true,
     connect: true
-  }[name]
+  }[name] || false
 }

package/src/controllers/ControllerAction.js

@@ -1,7 +1,9 @@
 import { isString, isObject, asArray, clone } from '@ditojs/utils'
 
 export default class ControllerAction {
-  constructor(controller, handler, type, name, _method, _path, _authorize) {
+  constructor(
+    controller, actions, handler, type, name, _method, _path, _authorize
+  ) {
     const {
       core = false,
       // Allow decorators on actions to override the predetermined defaults for
@@ -20,6 +22,7 @@ export default class ControllerAction {
     } = handler
 
     this.controller = controller
+    this.actions = actions
     this.handler = handler
     this.type = type
     this.name = name
@@ -96,7 +99,7 @@ export default class ControllerAction {
   }
 
   async callHandler(ctx, ...args) {
-    return this.handler.call(this.controller, ctx, ...args)
+    return this.handler.call(this.actions, ctx, ...args)
   }
 
   createValidationError(options) {

package/src/query/QueryBuilder.js

@@ -216,38 +216,39 @@ export class QueryBuilder extends objection.QueryBuilder {
       this._allowScopes = query._allowScopes ? { ...query._allowScopes } : null
       this._ignoreScopes = { ...query._ignoreScopes }
     }
-    // If he target is a child query of a graph query, copy all scopes, graph
+    // If the target is a child query of a graph query, copy all scopes, graph
     // and non-graph. If it is a child query of a related or eager query,
     // copy only the graph scopes.
     const copyAllScopes =
       isSameModelClass && isChildQuery && query.has(/GraphAndFetch$/)
-    this._scopes = this._filterScopes(query._scopes, (scope, graph) =>
+    // When copying scopes for child-queries, we also need to take the already
+    // applied scopes into account and copy those too.
+    const scopes = isChildQuery
+      ? { ...query._appliedScopes, ...query._scopes }
+      : query._scopes
+    this._scopes = this._filterScopes(scopes, (scope, graph) =>
       copyAllScopes || graph)
   }
 
   _filterScopes(scopes, callback) {
-    return Object.entries(scopes).reduce(
-      (scopes, [scope, graph]) => {
-        if (callback(scope, graph)) {
-          scopes[scope] = graph
-        }
-        return scopes
-      },
-      {}
-    )
+    return Object.fromEntries(Object.entries(scopes).filter(
+      ([scope, graph]) => callback(scope, graph)
+    ))
   }
 
   _applyScope(scope, graph) {
     if (!this._ignoreScopes[SYMBOL_ALL] && !this._ignoreScopes[scope]) {
       // Prevent multiple application of scopes. This can easily occur
       // with the nesting and eager-application of graph-scopes, see below.
-      if (!this._appliedScopes[scope]) {
+      // NOTE: The boolean values indicate the `graph` settings, not whether the
+      // scopes were applied or not.
+      if (!(scope in this._appliedScopes)) {
         // Only apply graph-scopes that are actually defined on the model:
         const func = this.modelClass().getScope(scope)
         if (func) {
           func.call(this, this)
         }
-        this._appliedScopes[scope] = true
+        this._appliedScopes[scope] = graph
       }
       if (graph) {
         // Also bake the scope into any graph expression that may have been
@@ -255,12 +256,12 @@ export class QueryBuilder extends objection.QueryBuilder {
         const expr = this.graphExpressionObject()
         if (expr) {
           // Add a new modifier to the existing graph expression that
-          // recursively applies the graph-scope to the resulting queries.
-          // This even works if nested scopes expand the graph expression,
-          // because it re-applies itself to the result.
+          // recursively adds the graph-scope to the resulting queries. This
+          // even works if nested scopes expand the graph expression, because it
+          // re-applies itself to the result.
           const name = `^${scope}`
           const modifiers = {
-            [name]: query => query._applyScope(scope, graph)
+            [name]: query => query.withScope(name)
           }
           this.withGraph(
             addGraphScope(this.modelClass(), expr, [name], modifiers, true)

package/src/services/Service.js

@@ -26,6 +26,7 @@ export class Service {
   }
 
   getLogger(ctx) {
-    return ctx.logger.child({ name: this.name })
+    const logger = ctx?.logger ?? this.app.logger
+    return logger.child({ name: this.name })
   }
 }