@ditojs/server 2.45.1 → 2.46.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ditojs/server",
-  "version": "2.45.1",
+  "version": "2.46.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",
@@ -25,12 +25,12 @@
     "node >= 18"
   ],
   "dependencies": {
-    "@ditojs/admin": "^2.45.1",
-    "@ditojs/build": "^2.45.0",
-    "@ditojs/router": "^2.45.0",
-    "@ditojs/utils": "^2.45.0",
+    "@ditojs/admin": "^2.46.0",
+    "@ditojs/build": "^2.46.0",
+    "@ditojs/router": "^2.46.0",
+    "@ditojs/utils": "^2.46.0",
     "@koa/cors": "^5.0.0",
-    "@koa/multer": "^3.0.2",
+    "@koa/multer": "^3.1.0",
     "@originjs/vite-plugin-commonjs": "^1.0.3",
     "ajv": "^8.17.1",
     "ajv-formats": "^2.1.1",
@@ -53,11 +53,11 @@
     "koa-session": "^7.0.2",
     "koa-static": "^5.0.0",
     "leather": "^3.0.3",
-    "mime-types": "^2.1.35",
+    "mime-types": "^3.0.1",
     "multer": "^1.4.5-lts.2",
     "multer-s3": "https://github.com/ditojs/multer-s3#dito",
     "nanoid": "^5.1.5",
-    "parse-duration": "^2.1.3",
+    "parse-duration": "^2.1.4",
     "passport-local": "^1.0.0",
     "passthrough-counter": "^1.0.0",
     "picocolors": "^1.1.1",
@@ -84,11 +84,11 @@
     "@types/koa-session": "^6.4.5",
     "@types/koa-static": "^4.0.4",
     "@types/koa__cors": "^5.0.0",
-    "@types/node": "^22.13.13",
+    "@types/node": "^22.13.14",
     "knex": "^3.1.0",
     "objection": "^3.1.5",
     "typescript": "^5.8.2"
   },
   "types": "types",
-  "gitHead": "6de5398fb812c9cbc030761e3ef82cac9a030117"
+  "gitHead": "7b8291912cfb1f1de8fe55dd7658ac544c23545a"
 }

package/src/models/Model.js

@@ -12,7 +12,8 @@ import {
   normalizeDataPath,
   getValueAtDataPath,
   mapConcurrently,
-  assignDeeply
+  assignDeeply,
+  deprecate
 } from '@ditojs/utils'
 import { QueryBuilder } from '../query/index.js'
 import { EventEmitter, KnexHelper } from '../lib/index.js'
@@ -756,7 +757,23 @@ export class Model extends objection.Model {
         )
       }
       // Now check possible scope prefixes and handle them:
-      switch (modifier[0]) {
+
+      let prefix = modifier[0]
+      const deprecatedPrefixes = { '-': '!', '#': '@' }
+      if (deprecatedPrefixes[prefix]) {
+        prefix = deprecatedPrefixes[prefix]
+        deprecate(
+          `The ${
+            modifier
+          } modifier is deprecated, use the ${
+            prefix
+          }${
+            modifier.slice(1)
+          } modifier instead.`
+        )
+      }
+
+      switch (prefix) {
         case '^': // Eager-applied scope:
           // Always apply eager-scopes, even if the model itself doesn't know
           // it. The scope may still be known in eager-loaded relations.
@@ -767,14 +784,17 @@ export class Model extends objection.Model {
             // that are defined on relations to be applied.
             false
           )
-        case '-': // Ignore scope:
+        case '!': // Ignore scope:
           return query.ignoreScope(modifier.slice(1))
-        case '#': // Select column:
+        case '@': // Select column:
           return query.select(modifier.slice(1))
+        case '~': // omit column:
+          return query.omit(modifier.slice(1))
         case '*': // Select all columns:
           if (modifier === '*') {
             return query.select('*')
           }
+          break
       }
     }
     super.modifierNotFound(query, modifier)

package/src/query/QueryBuilder.js

@@ -5,6 +5,7 @@ import {
   isBoolean,
   isObject,
   isPlainObject,
+  asArray,
   clone,
   mapKeys,
   getValueAtDataPath,
@@ -31,6 +32,7 @@ export class QueryBuilder extends objection.QueryBuilder {
   #appliedScopes = {}
   #allowFilters = null
   #executeFirst = null // Part of a work-around for cyclic graphs
+  #omits = []
 
   // @override
   clone() {
@@ -45,6 +47,14 @@ export class QueryBuilder extends objection.QueryBuilder {
 
   // @override
   async execute() {
+    if (this.#omits.length > 0) {
+      this.runAfter(result => {
+        for (const model of asArray(result)) {
+          model.$omitFromJson(...this.#omits)
+        }
+        return result
+      })
+    }
     this.#applyScopes()
     // In case of cyclic graphs, run `_executeFirst()` now:
     await this.#executeFirst?.()
@@ -88,6 +98,10 @@ export class QueryBuilder extends objection.QueryBuilder {
     return super.toFindQuery().clear('runAfter')
   }
 
+  omit(...properties) {
+    this.#omits.push(...properties)
+  }
+
   #withScope(...args) {
     const { checkAllowedScopes, scopes } = getScopes(args)
     for (const expr of scopes) {