@ditojs/server 1.4.1 → 1.4.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ditojs/server",
-  "version": "1.4.1",
+  "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",
@@ -21,7 +21,7 @@
     "node >= 16"
   ],
   "dependencies": {
-    "@ditojs/admin": "^1.4.1",
+    "@ditojs/admin": "^1.4.2",
     "@ditojs/router": "^1.4.1",
     "@ditojs/utils": "^1.4.1",
     "@koa/cors": "^3.2.0",
@@ -81,5 +81,5 @@
     "pg": "^8.7.3",
     "sqlite3": "^5.0.2"
   },
-  "gitHead": "0e8a22ea0cb68eec3df1b6236cf77a85f5a2c836"
+  "gitHead": "1790e50f979322b47a53421e9facddb86f6eff86"
 }

package/src/query/QueryBuilder.js

@@ -221,7 +221,12 @@ export class QueryBuilder extends objection.QueryBuilder {
     // 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)
   }
 
@@ -235,13 +240,15 @@ export class QueryBuilder extends objection.QueryBuilder {
     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