@ditojs/server 2.28.2 → 2.29.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ditojs/server",
-  "version": "2.28.2",
+  "version": "2.29.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",
@@ -22,10 +22,10 @@
     "node >= 18"
   ],
   "dependencies": {
-    "@ditojs/admin": "^2.28.2",
-    "@ditojs/build": "^2.28.0",
-    "@ditojs/router": "^2.28.1",
-    "@ditojs/utils": "^2.28.0",
+    "@ditojs/admin": "^2.29.0",
+    "@ditojs/build": "^2.29.0",
+    "@ditojs/router": "^2.29.0",
+    "@ditojs/utils": "^2.29.0",
     "@koa/cors": "^5.0.0",
     "@koa/multer": "^3.0.2",
     "@originjs/vite-plugin-commonjs": "^1.0.3",
@@ -90,7 +90,7 @@
     "typescript": "^5.4.5"
   },
   "types": "types",
-  "gitHead": "a9db3666df01cb3ee66a0ec7525d9221e15c5655",
+  "gitHead": "bdf4f66c3d6232f2322dacb088a0611f1e07dc7b",
   "scripts": {
     "types": "tsc --noEmit --esModuleInterop ./types/index.d.ts"
   },

package/src/app/Application.js

@@ -402,14 +402,6 @@ export class Application extends Koa {
     return this.getAdminController()?.defineViteConfig(config) || null
   }
 
-  getAdminViteConfig(config) {
-    deprecate(
-      `app.getAdminViteConfig() is deprecated. Use app.defineAdminViteConfig() instead.`
-    )
-
-    return this.defineAdminViteConfig(config)
-  }
-
   async loadAdminViteConfig() {
     const cwd = process.cwd()
     for (const extension of ['js', 'mjs', 'cjs', 'ts']) {

package/src/controllers/AdminController.js

@@ -5,7 +5,7 @@ import { defineConfig, createServer } from 'vite'
 import createVuePlugin from '@vitejs/plugin-vue'
 import { viteCommonjs as createCommonJsPlugin } from '@originjs/vite-plugin-commonjs'
 import { testModuleIdentifier, getPostCssConfig } from '@ditojs/build'
-import { assignDeeply, deprecate } from '@ditojs/utils'
+import { assignDeeply } from '@ditojs/utils'
 import { Controller } from './Controller.js'
 import { handleConnectMiddleware } from '../middleware/index.js'
 import { ControllerError } from '../errors/index.js'
@@ -34,19 +34,7 @@ export class AdminController extends Controller {
 
   getPath(name) {
     const { config } = this
-    let str = config[name]
-    if (config.build?.path || config.dist?.path) {
-      deprecate(
-        `config.admin.build.path and config.admin.dist.path are deprecated. Use config.admin.root and config.admin.dist instead.`
-      )
-
-      str =
-        name === 'root'
-          ? config.build?.path
-          : name === 'dist'
-            ? config.dist?.path
-            : null
-    }
+    const str = config[name]
     if (!str) {
       throw new ControllerError(
         this,

package/src/controllers/Controller.js

@@ -25,8 +25,7 @@ import {
   asArray,
   equals,
   parseDataPath,
-  normalizeDataPath,
-  deprecate
+  normalizeDataPath
 } from '@ditojs/utils'
 
 export class Controller {
@@ -625,15 +624,6 @@ function convertActionObject(name, object, actions) {
   // notation, deploy this crazy JS sorcery:
   Object.setPrototypeOf(object, Object.getPrototypeOf(actions))
 
-  if (action) {
-    deprecate(
-      `action.action is deprecated. Use action.method and action.path instead.`
-    )
-    const [method, path] = asArray(action)
-    handler.method = method
-    handler.path = path
-  }
-
   if (!handler) {
     throw new Error(
       `Missing handler in '${name}' action: ${formatJson(object)}`

package/src/decorators/parameters.js

@@ -1,19 +1,7 @@
-import { isArray, isObject, deprecate } from '@ditojs/utils'
+import { isArray, isObject } from '@ditojs/utils'
 import { createDecorator } from '../utils/decorator.js'
-import { formatJson } from '../utils/json.js'
 
 export function parameters(parameters, options) {
-  if (isObject(parameters)) {
-    const first = parameters[Object.keys(parameters)[0]]
-    if (!isObject(first)) {
-      deprecate(
-        `@parameters(${
-          formatJson(parameters, false)
-        }) with parameter schema object is deprecated: Schema object should be passed nested inside an array or object definition.`
-      )
-      parameters = [...arguments]
-    }
-  }
   if (!isArray(parameters) && !isObject(parameters)) {
     throw new Error(
       `@parameters() need to be defined using array or object definitions`

package/src/models/Model.js

@@ -762,7 +762,7 @@ export class Model extends objection.Model {
         case '#': // Select column:
           return query.select(modifier.slice(1))
         case '*': // Select all columns:
-          if (modifier.length === 1) {
+          if (modifier === '*') {
             return query.select('*')
           }
       }

package/src/query/QueryBuilder.js

@@ -1,16 +1,16 @@
 import objection from 'objection'
 import {
+  isArray,
+  isString,
+  isBoolean,
   isObject,
   isPlainObject,
-  isString,
-  isArray,
   clone,
   mapKeys,
   getValueAtDataPath,
   setValueAtDataPath,
   normalizeDataPath,
-  parseDataPath,
-  deprecate
+  parseDataPath
 } from '@ditojs/utils'
 import { QueryParameters } from './QueryParameters.js'
 import { KnexHelper } from '../lib/index.js'
@@ -88,11 +88,16 @@ export class QueryBuilder extends objection.QueryBuilder {
     return super.toFindQuery().clear('runAfter')
   }
 
-  withScope(...scopes) {
+  withScope(...args) {
+    const { checkAllowedScopes, scopes } = getScopes(args)
     for (const expr of scopes) {
       if (expr) {
         const { scope, graph } = getScope(expr)
-        if (this.#allowScopes && !this.#allowScopes[scope]) {
+        if (
+          checkAllowedScopes &&
+          this.#allowScopes &&
+          !this.#allowScopes[scope]
+        ) {
           throw new QueryBuilderError(
             `Query scope '${scope}' is not allowed.`
           )
@@ -125,12 +130,12 @@ export class QueryBuilder extends objection.QueryBuilder {
     return this
   }
 
-  applyScope(...scopes) {
+  applyScope(...args) {
     // When directly applying a scope, still merge it into `this.#scopes`,
     // so it can still be passed on to forked child queries. This also handles
     // the checks against `_allowScopes`.
-    this.withScope(...scopes)
-    for (const expr of scopes) {
+    this.withScope(...args)
+    for (const expr of getScopes(args).scopes) {
       if (expr) {
         const { scope, graph } = getScope(expr)
         this.#applyScope(scope, graph)
@@ -155,28 +160,6 @@ export class QueryBuilder extends objection.QueryBuilder {
     this.#allowScopes = null
   }
 
-  scope(...scopes) {
-    deprecate(`QueryBuilder#scope() is deprecated. Use #withScope() instead.`)
-
-    return this.clearWithScope().withScope(...scopes)
-  }
-
-  mergeScope(...scopes) {
-    deprecate(
-      `QueryBuilder#mergeScope() is deprecated. Use #withScope() instead.`
-    )
-
-    return this.withScope(...scopes)
-  }
-
-  clearScope() {
-    deprecate(
-      `QueryBuilder#clearScope() is deprecated. Use #clearWithScope() or #ignoreScope() instead.`
-    )
-
-    return this.clearWithScope()
-  }
-
   #clearScopes(addDefault) {
     // `_scopes` is an object where the keys are the scopes and the values
     // indicate if the scope should be eager-applied or not:
@@ -869,6 +852,17 @@ for (const key of [
   }
 }
 
+function getScopes(args) {
+  const last = args.at(-1)
+  let scopes = args
+  let checkAllowedScopes = true
+  if (isBoolean(last)) {
+    checkAllowedScopes = last
+    scopes = args.slice(0, -1)
+  }
+  return { scopes, checkAllowedScopes }
+}
+
 function filterScopes(scopes, callback) {
   return Object.fromEntries(
     Object.entries(scopes).filter(

package/src/schema/relations.js

@@ -223,7 +223,12 @@ export function convertRelation(schema, models) {
       // Create a new modify function that merges scope and modify them:
       const origModify = modify
       modify = query => {
-        query.applyScope(scope)
+        query.applyScope(
+          scope,
+          // Pass `false` for `checkAllowedScopes`, to always allow scopes
+          // that are defined on relations to be applied.
+          false
+        )
         if (origModify) {
           query.modify(origModify)
         }