@ditojs/server 2.78.0 → 2.80.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ditojs/server",
-  "version": "2.78.0",
+  "version": "2.80.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.78.0",
-    "@ditojs/build": "^2.78.0",
-    "@ditojs/router": "^2.78.0",
-    "@ditojs/utils": "^2.78.0",
+    "@ditojs/admin": "^2.80.0",
+    "@ditojs/build": "^2.80.0",
+    "@ditojs/router": "^2.80.0",
+    "@ditojs/utils": "^2.80.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": "ede4c836e6b2bb5dfcc80e1614a3d85eb80b0efa"
+  "gitHead": "fd999439023af0616fa1e8afd51909eff651161d"
 }

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

@@ -29,7 +29,11 @@ export function convertSchema(
         mergeDefinitions(parentEntry.definitions, definitions)
       }
     }
-    return schema
+    // When the schema is null, a circular reference is being processed.
+    // Break the chain by cloning the original schema and converting it again:
+    return schema === null
+      ? convertSchema({ ...original }, options, parentEntry)
+      : schema
   }
 
   const entry = {
@@ -103,26 +107,27 @@ export function convertSchema(
           // TODO: Consider moving to `model` keyword instead that would support
           // model validation and still could be combined with other keywords.
           schema.$ref = type
-          // `$ref` doesn't play with `nullable`, so convert to `oneOf`
-          if (schema.nullable) {
-            delete schema.nullable
-            schema = {
-              oneOf: [
-                { type: 'null' },
-                schema
-              ]
-            }
-          }
         }
       }
     }
     if (excludeDefaults[schema.default]) {
       delete schema.default
     }
-    // Make nullable work with enum, see the issue for more details:
-    // https://github.com/ajv-validator/ajv/issues/1471
-    if (schema.nullable && schema.enum && !schema.enum.includes(null)) {
-      schema.enum.push(null)
+    if (schema.nullable) {
+      if (schema.$ref) {
+        // `$ref` doesn't play with `nullable`, so convert to `oneOf`
+        delete schema.nullable
+        schema = {
+          oneOf: [
+            { type: 'null' },
+            schema
+          ]
+        }
+      } else if (schema.enum && !schema.enum.includes(null)) {
+        // Make nullable work with enum, see the issue for more details:
+        // https://github.com/ajv-validator/ajv/issues/1471
+        schema.enum.push(null)
+      }
     }
 
     // Convert properties last. This is needed for circular references