@ditojs/server 2.80.0 → 2.82.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ditojs/server",
-  "version": "2.80.0",
+  "version": "2.82.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",
@@ -26,10 +26,10 @@
     "node >= 18"
   ],
   "dependencies": {
-    "@ditojs/admin": "^2.80.0",
-    "@ditojs/build": "^2.80.0",
-    "@ditojs/router": "^2.80.0",
-    "@ditojs/utils": "^2.80.0",
+    "@ditojs/admin": "^2.82.0",
+    "@ditojs/build": "^2.82.0",
+    "@ditojs/router": "^2.82.0",
+    "@ditojs/utils": "^2.82.0",
     "@koa/cors": "^5.0.0",
     "@koa/etag": "^5.0.2",
     "@koa/multer": "^4.0.0",
@@ -63,11 +63,11 @@
     "passthrough-counter": "^1.0.0",
     "picocolors": "^1.1.1",
     "picomatch": "^4.0.3",
-    "pino": "^10.3.0",
+    "pino": "^10.3.1",
     "pino-pretty": "^13.1.3",
     "pluralize": "^8.0.0",
     "repl": "^0.1.3",
-    "type-fest": "^5.4.1",
+    "type-fest": "^5.4.4",
     "uuid": "^13.0.0"
   },
   "peerDependencies": {
@@ -85,10 +85,10 @@
     "@types/koa-session": "^6.4.5",
     "@types/koa-static": "^4.0.4",
     "@types/koa__cors": "^5.0.1",
-    "@types/node": "^25.0.10",
+    "@types/node": "^25.2.2",
     "knex": "^3.1.0",
     "objection": "^3.1.5",
     "typescript": "^5.9.3"
   },
-  "gitHead": "fd999439023af0616fa1e8afd51909eff651161d"
+  "gitHead": "7e721714e882dd1a02bf13354569a3744d4fefbe"
 }

package/src/query/QueryBuilder.js

@@ -305,6 +305,14 @@ export class QueryBuilder extends objection.QueryBuilder {
   }
 
   applyFilter(name, ...args) {
+    if (isObject(name)) {
+      // Multiple filters: applyFilter({ active: [], recent: [30] })
+      for (const [key, value] of Object.entries(name)) {
+        this.applyFilter(key, ...asArray(value))
+      }
+      return this
+    }
+
     if (this.#allowFilters && !this.#allowFilters[name]) {
       throw new QueryBuilderError(`Query filter '${name}' is not allowed.`)
     }

package/src/query/QueryParameters.js

@@ -13,11 +13,14 @@ QueryParameters.register({
 
   filter(query, key, value) {
     try {
-      for (const filter of asArray(value)) {
-        const [, name, json] = filter.match(/^(\w+):(.*)$/)
-        const args = asArray(JSON.parse(`[${json}]`))
-        query.applyFilter(name, ...args)
-      }
+      query.applyFilter(
+        Object.fromEntries(
+          asArray(value).map(filter => {
+            const [, name, json] = filter.match(/^(\w+):(.*)$/)
+            return [name, JSON.parse(`[${json}]`)]
+          })
+        )
+      )
     } catch (error) {
       throw error instanceof ResponseError
         ? error

package/src/schema/relations.js

@@ -10,6 +10,7 @@ import {
   isObject,
   isArray,
   isString,
+  isFunction,
   asArray,
   capitalize,
   camelize
@@ -153,9 +154,9 @@ export function convertRelation(schema, models) {
     inverse,
     modify,
     scope,
+    filter,
     // Objection.js-style relation description (`modify` is shared)
     join,
-    filter,
     // Pluck Dito.js-related properties that should not end up in `rest`:
     nullable,
     owner,
@@ -213,15 +214,20 @@ export function convertRelation(schema, models) {
     } else if (through) {
       throw new RelationError('Unsupported through join definition')
     }
-    // Combine `modify` and `filter`. Setting both together is not supported.
-    modify ||= filter
+    // Combine `modify` and `filter` when `filter` is a function (Objection.js
+    // backward-compatible style). Otherwise, handle `filter` as a Dito.js-style
+    // filter name/array below.
+    if (isFunction(filter)) {
+      modify ||= filter
+      filter = null
+    }
     if (isObject(modify)) {
       // Convert a find-filter object to a filter function, same as in the
       // handling of definition.scopes, see Model.js
       modify = query => query.find(modify)
     }
     if (scope) {
-      // Create a new modify function that merges scope and modify them:
+      // Create a new modify function that merges scope and modify:
       const origModify = modify
       modify = query => {
         query.applyScope(
@@ -235,6 +241,16 @@ export function convertRelation(schema, models) {
         }
       }
     }
+    if (filter) {
+      // Create a new modify function that merges filter and modify:
+      const origModify = modify
+      modify = query => {
+        query.applyFilter(filter)
+        if (origModify) {
+          query.modify(origModify)
+        }
+      }
+    }
     if (isString(modelClass)) {
       const modelName = modelClass
       modelClass = models[modelName]

package/src/schema/schema.js

@@ -146,15 +146,17 @@ export function convertSchema(
       }
       hasConvertedProperties = true
     }
-    if (schema.patternProperties) {
-      // TODO: Don't we need to handle required here too?
-      const { properties } = convertProperties(
-        schema.patternProperties,
-        options,
-        entry
-      )
-      schema.patternProperties = properties
-      hasConvertedProperties = true
+    for (const key of ['additionalProperties', 'patternProperties']) {
+      if (isObject(schema[key])) {
+        // TODO: Don't we need to handle required here too?
+        const { properties } = convertProperties(
+          schema[key],
+          options,
+          entry
+        )
+        schema[key] = properties
+        hasConvertedProperties = true
+      }
     }
     if (
       jsonType &&

package/types/index.d.ts

@@ -493,6 +493,13 @@ export interface ModelRelation {
    * class' scopes definitions.
    */
   scope?: string
+  /**
+   * Optionally, a filter can be defined to be applied when loading the
+   * relation's models. The filter needs to be defined in the related model
+   * class' filters definitions. Can be a single filter name or an object with
+   * filter names as keys and argument arrays as values.
+   */
+  filter?: string | { [name: string]: any[] }
   /**
    * Controls whether the auto-inserted foreign key property should be marked as
    * nullable. This only makes sense on a 'belongsTo' relation, where the model
@@ -1471,7 +1478,11 @@ export class QueryBuilder<
   applyScope: (...scopes: string[]) => this
   allowScope: (...scopes: string[]) => void
   clearAllowScope: () => void
-  applyFilter: (name: string, ...args: any[]) => this
+  applyFilter: {
+    (name: string, ...args: any[]): this
+    (filters: { [name: string]: any[] }): this
+  }
+
   allowFilter: (...filters: string[]) => void
   withGraph: (
     expr: objection.RelationExpression<M>,