@ditojs/server 2.6.10 → 2.7.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ditojs/server",
-  "version": "2.6.10",
+  "version": "2.7.1",
   "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.6.10",
+    "@ditojs/admin": "^2.7.1",
     "@ditojs/build": "^2.5.0",
-    "@ditojs/router": "^2.6.0",
-    "@ditojs/utils": "^2.6.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": "12d6a71efe6eb89b514b7ca9737fefc3afc319f2",
+  "gitHead": "3fe49034af7e93f2cc61da3f2add40c4e41893d5",
   "scripts": {
     "types": "tsc --noEmit --esModuleInterop ./types/index.d.ts"
   },

package/src/app/Application.js

@@ -26,11 +26,12 @@ import {
   isModule,
   hyphenate,
   clone,
-  merge,
+  assignDeeply,
   parseDataPath,
   normalizeDataPath,
   toPromiseCallback,
-  mapConcurrently
+  mapConcurrently,
+  deprecate
 } from '@ditojs/utils'
 import { Validator } from './Validator.js'
 import { EventEmitter } from '../lib/index.js'
@@ -39,7 +40,6 @@ import { Service } from '../services/index.js'
 import { Storage } from '../storage/index.js'
 import { convertSchema } from '../schema/index.js'
 import { getDuration, subtractDuration } from '../utils/duration.js'
-import { deprecate } from '../utils/deprecate.js'
 import {
   ResponseError,
   ValidationError,
@@ -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,13 +5,12 @@ 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 } 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'
 import { getRandomFreePort } from '../utils/net.js'
 import { formatJson } from '../utils/json.js'
-import { deprecate } from '../utils/deprecate.js'
 
 export class AdminController extends Controller {
   // @override
@@ -180,7 +179,7 @@ export class AdminController extends Controller {
     const views = path.join(root, 'views')
 
     return defineConfig(
-      merge(
+      assignDeeply(
         {
           root,
           base,

package/src/controllers/Controller.js

@@ -16,7 +16,6 @@ import {
 import { processHandlerParameters } from '../utils/handler.js'
 import { describeFunction } from '../utils/function.js'
 import { formatJson } from '../utils/json.js'
-import { deprecate } from '../utils/deprecate.js'
 import {
   isObject,
   isString,
@@ -26,7 +25,8 @@ import {
   asArray,
   equals,
   parseDataPath,
-  normalizeDataPath
+  normalizeDataPath,
+  deprecate
 } from '@ditojs/utils'
 
 export class Controller {

package/src/decorators/parameters.js

@@ -1,7 +1,6 @@
-import { isArray, isObject } from '@ditojs/utils'
+import { isArray, isObject, deprecate } from '@ditojs/utils'
 import { createDecorator } from '../utils/decorator.js'
 import { formatJson } from '../utils/json.js'
-import { deprecate } from '../utils/deprecate.js'
 
 export function parameters(parameters, options) {
   if (isObject(parameters)) {

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

package/src/query/QueryBuilder.js

@@ -8,7 +8,8 @@ import {
   mapKeys,
   getValueAtDataPath,
   setValueAtDataPath,
-  parseDataPath
+  parseDataPath,
+  deprecate
 } from '@ditojs/utils'
 import { QueryParameters } from './QueryParameters.js'
 import { KnexHelper } from '../lib/index.js'
@@ -16,7 +17,6 @@ import { DitoGraphProcessor, walkGraph } from '../graph/index.js'
 import { QueryBuilderError, RelationError } from '../errors/index.js'
 import { createLookup } from '../utils/object.js'
 import { getScope } from '../utils/scope.js'
-import { deprecate } from '../utils/deprecate.js'
 
 const SYMBOL_ALL = Symbol('all')
 

package/src/storage/Storage.js

@@ -4,9 +4,8 @@ import multer from '@koa/multer'
 import picomatch from 'picomatch'
 import { PassThrough } from 'stream'
 import { readMediaAttributes } from 'leather'
-import { hyphenate, toPromiseCallback } from '@ditojs/utils'
+import { hyphenate, toPromiseCallback, deprecate } from '@ditojs/utils'
 import { AssetFile } from './AssetFile.js'
-import { deprecate } from '../utils/deprecate.js'
 
 const storageClasses = {}
 

package/src/utils/deprecate.js

@@ -1,9 +0,0 @@
-const loggedDeprecations = new Set()
-
-export function deprecate(message) {
-  // Only log deprecation messages once.
-  if (!loggedDeprecations.has(message)) {
-    loggedDeprecations.add(message)
-    console.warn(message)
-  }
-}