@ditojs/server 2.63.0 → 2.65.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ditojs/server",
-  "version": "2.63.0",
+  "version": "2.65.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.63.0",
-    "@ditojs/build": "^2.63.0",
-    "@ditojs/router": "^2.63.0",
-    "@ditojs/utils": "^2.63.0",
+    "@ditojs/admin": "^2.65.0",
+    "@ditojs/build": "^2.65.0",
+    "@ditojs/router": "^2.65.0",
+    "@ditojs/utils": "^2.65.0",
     "@koa/cors": "^5.0.0",
     "@koa/etag": "^5.0.1",
     "@koa/multer": "^4.0.0",
@@ -90,5 +90,5 @@
     "objection": "^3.1.5",
     "typescript": "^5.9.3"
   },
-  "gitHead": "b7798c1bc4a813093ec5c4efc2db43d103bac896"
+  "gitHead": "abd7830b97293838345f904105a3847cdbd34f52"
 }

package/src/controllers/AdminController.js

@@ -308,7 +308,6 @@ const coreDependencies = [
   'tippy.js',
   '@tiptap/*',
   'tiptap-*',
-  '@ditojs/tiptap-*',
   'prosemirror-*',
   'linkifyjs',
   'codeflask',

package/src/models/Model.js

@@ -340,7 +340,7 @@ export class Model extends objection.Model {
               properties: this.getIdPropertyArray().reduce(
                 (idProperties, idProperty) => {
                   idProperties[idProperty] = {
-                    type: this.definition.properties[idProperty].type
+                    type: this.getProperty(idProperty).type
                   }
                   return idProperties
                 },
@@ -467,25 +467,26 @@ export class Model extends objection.Model {
     )
   }
 
-  static getAttributes(filter) {
-    const attributes = []
-    const { properties } = this.definition
-    const { definitions } = this.jsonSchema
-    for (let [name, property] of Object.entries(properties)) {
-      // Expand $refs so we can even find properties that uses definitions:
+  static getProperty(name) {
+    let property = this.definition.properties[name]
+    // Expand $refs so we can even find properties that uses definitions:
+    if (property?.$ref) {
       const { $ref, ...schema } = property
-      const definition = $ref && definitions?.[$ref]
+      const definition = this.jsonSchema.definitions?.[$ref]
       if (definition) {
         property = {
           ...schema,
           ...definition
         }
       }
-      if (filter(property)) {
-        attributes.push(name)
-      }
     }
-    return attributes
+    return property ?? null
+  }
+
+  static getAttributes(filter) {
+    return Object.keys(this.definition.properties).filter(name =>
+      filter(this.getProperty(name))
+    )
   }
 
   static _getCached(identifier, calculate, empty = {}) {
@@ -707,7 +708,7 @@ export class Model extends objection.Model {
     }
 
     const [firstToken, ...otherTokens] = parsedDataPath
-    const property = this.definition.properties[firstToken]
+    const property = this.getProperty(firstToken)
     if (property) {
       return getResult({ property })
     } else if (firstToken === '*' || firstToken === '**') {
@@ -1058,7 +1059,7 @@ export class Model extends objection.Model {
                 // Select only the properties that are present in the data,
                 // and which aren't the result of computed properties.
                 Object.keys(inputItems[0]).filter(key => {
-                  const property = this.definition.properties[key]
+                  const property = this.getProperty(key)
                   return property && !property.computed
                 })
               )