@ditojs/admin 2.7.0 → 2.7.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ditojs/admin",
-  "version": "2.7.0",
+  "version": "2.7.1",
   "type": "module",
   "description": "Dito.js Admin is a schema based admin interface for Dito.js Server, featuring auto-generated views and forms and built with Vue.js",
   "repository": "https://github.com/ditojs/dito/tree/master/packages/admin",
@@ -33,8 +33,8 @@
     "not ie_mob > 0"
   ],
   "dependencies": {
-    "@ditojs/ui": "^2.7.0",
-    "@ditojs/utils": "^2.7.0",
+    "@ditojs/ui": "^2.7.1",
+    "@ditojs/utils": "^2.7.1",
     "@kyvg/vue3-notification": "^2.9.0",
     "@lk77/vue3-color": "^3.0.6",
     "@tiptap/core": "^2.0.3",
@@ -83,7 +83,7 @@
     "vite": "^4.3.4"
   },
   "types": "types",
-  "gitHead": "874c68d5807ba97b67867f6b8d13f8fcb4990533",
+  "gitHead": "3fe49034af7e93f2cc61da3f2add40c4e41893d5",
   "scripts": {
     "build": "vite build",
     "watch": "yarn build --mode 'development' --watch",

package/src/DitoAdmin.js

@@ -4,7 +4,7 @@ import VueNotifications from '@kyvg/vue3-notification'
 import {
   isString,
   isAbsoluteUrl,
-  merge,
+  assignDeeply,
   hyphenate,
   camelize,
   defaultFormats,
@@ -31,12 +31,12 @@ export default class DitoAdmin {
     // Merge in `api` settings as passed from `config.admin` and through the
     // `AdminController` with `api` values from from 'admin/index.js'
     // NOTE: `AdminController` provides `dito.api.base`
-    this.api = api = merge({ base: '/' }, dito.api, api)
+    this.api = api = assignDeeply({ base: '/' }, dito.api, api)
     this.options = options
 
     // Setup default api settings:
     api.locale ||= 'en-US'
-    api.formats = merge({}, defaultFormats, api.formats)
+    api.formats = assignDeeply({}, defaultFormats, api.formats)
     api.request ||= options => request(api, options)
     api.getApiUrl ||= options => getApiUrl(api, options)
     api.isApiUrl ||= url => isApiUrl(api, url)

package/src/components/DitoForm.vue

@@ -48,7 +48,7 @@
 </template>
 
 <script>
-import { clone, capitalize, parseDataPath, merge } from '@ditojs/utils'
+import { clone, capitalize, parseDataPath, assignDeeply } from '@ditojs/utils'
 import DitoComponent from '../DitoComponent.js'
 import RouteMixin from '../mixins/RouteMixin.js'
 import ResourceMixin from '../mixins/ResourceMixin.js'
@@ -99,7 +99,7 @@ export default DitoComponent.component('DitoForm', {
 
     buttonSchemas() {
       return getButtonSchemas(
-        merge(
+        assignDeeply(
           {
             cancel: {
               type: 'button',

package/src/types/DitoTypeDate.vue

@@ -22,7 +22,7 @@
 import DitoTypeComponent from '../DitoTypeComponent.js'
 import { getSchemaAccessor } from '../utils/accessor.js'
 import { DatePicker, TimePicker, DateTimePicker } from '@ditojs/ui/src'
-import { isDate, merge } from '@ditojs/utils'
+import { isDate, assignDeeply } from '@ditojs/utils'
 
 export default DitoTypeComponent.register(
   ['date', 'datetime', 'time'],
@@ -53,7 +53,7 @@ export default DitoTypeComponent.register(
         type: Object,
         default: null,
         get(formats) {
-          const { date, time } = merge({}, this.api.formats, formats)
+          const { date, time } = assignDeeply({}, this.api.formats, formats)
           return {
             date: ['date', 'datetime'].includes(this.type) ? date : null,
             time: ['time', 'datetime'].includes(this.type) ? time : null

package/src/utils/schema.js

@@ -14,8 +14,8 @@ import {
   isModule,
   asArray,
   clone,
-  merge,
   camelize,
+  assignDeeply,
   mapConcurrently,
   getValueAtDataPath
 } from '@ditojs/utils'
@@ -321,7 +321,7 @@ export function processSchemaDefaults(api, schema) {
         if (schema[key] === undefined) {
           schema[key] = value
         } else {
-          schema[key] = merge(value, schema[key])
+          schema[key] = assignDeeply(value, schema[key])
         }
       }
     }