@ditojs/server 2.79.0 → 2.81.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ditojs/server",
-  "version": "2.79.0",
+  "version": "2.81.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.79.0",
-    "@ditojs/build": "^2.79.0",
-    "@ditojs/router": "^2.79.0",
-    "@ditojs/utils": "^2.79.0",
+    "@ditojs/admin": "^2.81.0",
+    "@ditojs/build": "^2.81.0",
+    "@ditojs/router": "^2.81.0",
+    "@ditojs/utils": "^2.81.0",
     "@koa/cors": "^5.0.0",
     "@koa/etag": "^5.0.2",
     "@koa/multer": "^4.0.0",
@@ -90,5 +90,5 @@
     "objection": "^3.1.5",
     "typescript": "^5.9.3"
   },
-  "gitHead": "f87ce5ce121a30830776774cd447014afef5b8ec"
+  "gitHead": "13502bffe56e6c570a96092c692b9178789e3f62"
 }

package/src/schema/relations.js

@@ -146,6 +146,7 @@ export function convertRelation(schema, models) {
   let {
     relation,
     // Dito.js-style relation description:
+    modelClass,
     from,
     to,
     through,
@@ -224,7 +225,7 @@ export function convertRelation(schema, models) {
       const origModify = modify
       modify = query => {
         query.applyScope(
-          scope,
+          ...asArray(scope),
           // Pass `false` for `checkAllowedScopes`, to always allow scopes
           // that are defined on relations to be applied.
           false
@@ -234,9 +235,18 @@ export function convertRelation(schema, models) {
         }
       }
     }
+    if (isString(modelClass)) {
+      const modelName = modelClass
+      modelClass = models[modelName]
+      if (!modelClass) {
+        throw new RelationError(
+          `Unknown model class: ${modelName}`
+        )
+      }
+    }
     return {
       relation: relationClass,
-      modelClass: to.modelClass,
+      modelClass: modelClass ?? to.modelClass,
       join: {
         from: from.toValue(),
         to: to.toValue(),

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 &&