@ditojs/server 2.7.0 → 2.7.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ditojs/server",
-  "version": "2.7.0",
+  "version": "2.7.2",
   "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.7.0",
+    "@ditojs/admin": "^2.7.2",
     "@ditojs/build": "^2.5.0",
-    "@ditojs/router": "^2.7.0",
-    "@ditojs/utils": "^2.7.0",
+    "@ditojs/router": "^2.7.1",
+    "@ditojs/utils": "^2.7.1",
     "@koa/cors": "^4.0.0",
     "@koa/multer": "^3.0.2",
     "@originjs/vite-plugin-commonjs": "^1.0.3",
@@ -88,7 +88,7 @@
     "typescript": "^5.0.4"
   },
   "types": "types",
-  "gitHead": "874c68d5807ba97b67867f6b8d13f8fcb4990533",
+  "gitHead": "1e84bcce13c988b1d388c128e6adf6ad9cb5517f",
   "scripts": {
     "types": "tsc --noEmit --esModuleInterop ./types/index.d.ts"
   },

package/src/app/Application.js

@@ -26,7 +26,7 @@ import {
   isModule,
   hyphenate,
   clone,
-  merge,
+  assignDeeply,
   parseDataPath,
   normalizeDataPath,
   toPromiseCallback,
@@ -86,8 +86,8 @@ export class Application extends Koa {
         log === false || log?.silent || process.env.DITO_SILENT
           ? {}
           : getOptions(log),
-      assets: merge(defaultAssetOptions, getOptions(assets)),
-      logger: merge(defaultLoggerOptions, getOptions(logger)),
+      assets: assignDeeply(defaultAssetOptions, getOptions(assets)),
+      logger: assignDeeply(defaultLoggerOptions, getOptions(logger)),
       ...rest
     }
     this.keys = keys
@@ -586,7 +586,7 @@ export class Application extends Koa {
     if (app.compress !== false) {
       this.use(
         compress(
-          merge(
+          assignDeeply(
             {
               // Use a reasonable default for Brotli compression.
               // See https://github.com/koajs/compress/issues/126

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 { merge, deprecate } from '@ditojs/utils'
+import { assignDeeply, deprecate } from '@ditojs/utils'
 import { Controller } from './Controller.js'
 import { handleConnectMiddleware } from '../middleware/index.js'
 import { ControllerError } from '../errors/index.js'
@@ -179,7 +179,7 @@ export class AdminController extends Controller {
     const views = path.join(root, 'views')
 
     return defineConfig(
-      merge(
+      assignDeeply(
         {
           root,
           base,

package/src/models/Model.js

@@ -6,12 +6,12 @@ import {
   isFunction,
   isPromise,
   asArray,
-  merge,
   flatten,
   parseDataPath,
   normalizeDataPath,
   getValueAtDataPath,
-  mapConcurrently
+  mapConcurrently,
+  assignDeeply
 } from '@ditojs/utils'
 import { QueryBuilder } from '../query/index.js'
 import { EventEmitter, KnexHelper } from '../lib/index.js'
@@ -391,7 +391,7 @@ export class Model extends objection.Model {
         })
         addRelationSchemas(this, schema.properties)
         // Merge in root-level schema additions
-        merge(schema, this.definition.schema)
+        assignDeeply(schema, this.definition.schema)
         return {
           $id: this.name,
           ...schema