@ditojs/admin 2.0.5 → 2.1.1

package/src/utils/schema.js

@@ -5,7 +5,15 @@ import { getUid } from './uid.js'
 import { SchemaGraph } from './SchemaGraph.js'
 import { appendDataPath, isTemporaryId } from './data.js'
 import {
-  isObject, isString, isArray, isFunction, isPromise, clone, camelize, isModule,
+  isObject,
+  isString,
+  isArray,
+  isFunction,
+  isPromise,
+  isModule,
+  clone,
+  merge,
+  camelize,
   mapConcurrently
 } from '@ditojs/utils'
 import { markRaw } from 'vue'
@@ -27,16 +35,17 @@ export function getTypeComponent(type, allowNull = false) {
   return component
 }
 
-export function forEachSchemaComponent(schema, callback) {
+function getSchemas(schema) {
+  return schema
+    ? [...Object.values(schema.tabs || {}), schema]
+    : []
+}
+
+export function iterateSchemaComponents(schema, callback) {
   if (isSingleComponentView(schema)) {
-    const res = callback(schema.component, schema.name)
-    if (res !== undefined) {
-      return res
-    }
+    return callback(schema.component, schema.name)
   } else {
-    const schemas = schema
-      ? [...Object.values(schema.tabs || {}), schema]
-      : []
+    const schemas = getSchemas(schema)
     for (const schema of schemas) {
       for (const [name, component] of Object.entries(schema.components || {})) {
         const res = callback(component, name)
@@ -49,24 +58,32 @@ export function forEachSchemaComponent(schema, callback) {
 }
 
 export function findSchemaComponent(schema, callback) {
-  return forEachSchemaComponent(
-    schema,
-    (component, name) => callback(component, name) ? component : undefined
-  ) || null
+  return (
+    iterateSchemaComponents(
+      schema,
+      (component, name) => (callback(component, name) ? component : undefined)
+    ) || null
+  )
 }
 
 export function someSchemaComponent(schema, callback) {
-  return forEachSchemaComponent(
-    schema,
-    (component, name) => callback(component, name) ? true : undefined
-  ) === true
+  return (
+    iterateSchemaComponents(
+      schema,
+      (component, name) => (callback(component, name) ? true : undefined)
+    ) ===
+    true
+  )
 }
 
 export function everySchemaComponent(schema, callback) {
-  return forEachSchemaComponent(
-    schema,
-    (component, name) => !callback(component, name) ? false : undefined
-  ) !== false
+  return (
+    iterateSchemaComponents(
+      schema,
+      (component, name) => (!callback(component, name) ? false : undefined)
+    ) !==
+    false
+  )
 }
 
 export function isSchema(schema) {
@@ -174,18 +191,17 @@ export async function resolveSchemaComponents(schemas) {
 }
 
 export async function processView(component, api, schema, name) {
-  const children = []
   processRouteSchema(api, schema, name)
+  processDefaults(api, schema)
   await resolvePanels(schema)
+  const children = []
   if (isView(schema)) {
-    let level = 0
     if (isSingleComponentView(schema)) {
-      await processComponent(api, schema.component, name, children, level)
+      await processComponent(api, schema.component, name, children, 0)
     } else {
       // A multi-component view, start at level 1
-      await processSchemaComponents(api, schema, children, ++level)
+      await processSchemaComponents(api, schema, children, 1)
     }
-    schema.level = level
   } else {
     throw new Error(`Invalid view schema: '${getSchemaIdentifier(schema)}'`)
   }
@@ -201,34 +217,62 @@ export async function processView(component, api, schema, name) {
 }
 
 export async function processComponent(api, schema, name, routes, level) {
-  schema.level = level
+  processDefaults(api, schema)
   // Delegate schema processing to the actual type components.
   await getTypeOptions(schema)?.processSchema?.(
-    api, schema, name, routes, level
+    api,
+    schema,
+    name,
+    routes,
+    level
   )
 }
 
+export function processDefaults(api, schema) {
+  let defaults = api.defaults[schema.type]
+  if (defaults) {
+    if (isFunction(defaults)) {
+      defaults = defaults(schema)
+    }
+    if (isObject(defaults)) {
+      for (const [key, value] of Object.entries(defaults)) {
+        if (schema[key] === undefined) {
+          schema[key] = value
+        } else {
+          schema[key] = merge(value, schema[key])
+        }
+      }
+    }
+  }
+}
+
 export function processRouteSchema(api, schema, name) {
-  // Used for view and source schemas, see SourceMixin
+  // Used for view and source schemas, see SourceMixin.
   schema.name = name
   schema.path ||= api.normalizePath(name)
 }
 
 export async function processSchemaComponents(api, schema, routes, level) {
   const promises = []
-  forEachSchemaComponent(schema, (component, name) => {
+  iterateSchemaComponents(schema, (component, name) => {
     promises.push(processComponent(api, component, name, routes, level))
   })
   await Promise.all(promises)
 }
 
 export async function processForms(api, schema, level) {
+  const processForm = async form => {
+    form = await resolveForm(form)
+    processDefaults(api, schema)
+    return form
+  }
+
   // First resolve the forms and store the results back on the schema.
   let { form, forms, components } = schema
   if (forms) {
-    forms = schema.forms = await resolveSchemas(forms, resolveForm)
+    forms = schema.forms = await resolveSchemas(forms, processForm)
   } else if (form) {
-    form = schema.form = await resolveForm(form)
+    form = schema.form = await processForm(form)
   } else if (components) {
     // NOTE: Processing forms in computed components is not supported, since it
     // only can be computed in conjunction with actual data.
@@ -236,6 +280,7 @@ export async function processForms(api, schema, level) {
       form = { components }
     }
   }
+
   forms ||= { default: form } // Only used for process loop below.
   const children = []
   for (const form of Object.values(forms)) {
@@ -249,9 +294,7 @@ export async function resolveForm(schema) {
   if (!isForm(schema)) {
     throw new Error(`Invalid form schema: '${getSchemaIdentifier(schema)}'`)
   }
-  if (schema) {
-    await resolvePanels(schema)
-  }
+  await resolvePanels(schema)
   return schema
 }
 
@@ -282,13 +325,13 @@ export function getViewFormSchema(schema, context) {
   const { view } = schema
   const viewSchema = view && context.views[view]
   return viewSchema
-    // NOTE: Views can have tabs, in which case the view component is nested
-    // in one of the tabs, go find it.
-    ? forEachSchemaComponent(viewSchema, schema => {
-      if (hasFormSchema(schema)) {
-        return schema
-      }
-    }) || null
+    ? // NOTE: Views can have tabs, in which case the view component is nested
+      // in one of the tabs, go find it.
+      iterateSchemaComponents(viewSchema, schema => {
+        if (hasFormSchema(schema)) {
+          return schema
+        }
+      }) || null
     : null
 }
 
@@ -301,9 +344,9 @@ export function getViewSchema(schema, context) {
 export function getViewEditPath(schema, context) {
   const view = getViewSchema(schema, context)
   return view
-    ? view.level === 0
-      ? `/${view.path}` // A single-component view
-      : `/${view.path}/${view.path}` // A multi-component view
+    ? isSingleComponentView(view)
+      ? `/${view.path}`
+      : `/${view.path}/${view.path}`
     : null
 }
 
@@ -361,10 +404,7 @@ export function isInlined(schema) {
 }
 
 export function isNested(schema) {
-  return !!(
-    schema.nested ||
-    getTypeOptions(schema)?.defaultNested === true
-  )
+  return !!(schema.nested || getTypeOptions(schema)?.defaultNested === true)
 }
 
 export function shouldOmitPadding(schema) {
@@ -378,9 +418,10 @@ export function getDefaultValue(schema) {
   // we can't use `dataPath` to get to components, and the `defaultValue` from
   // there. That's why `defaultValue` is defined statically in the components:
   const defaultValue = schema.default
-  const value = defaultValue !== undefined
-    ? defaultValue
-    : getTypeOptions(schema)?.defaultValue
+  const value =
+    defaultValue !== undefined
+      ? defaultValue
+      : getTypeOptions(schema)?.defaultValue
   return isFunction(value)
     ? value(schema)
     : clone(value)
@@ -389,8 +430,7 @@ export function getDefaultValue(schema) {
 export function ignoreMissingValue(schema) {
   const typeOptions = getTypeOptions(schema)
   return !!(
-    typeOptions?.excludeValue ||
-    typeOptions?.ignoreMissingValue?.(schema)
+    typeOptions?.excludeValue || typeOptions?.ignoreMissingValue?.(schema)
   )
 }
 
@@ -404,7 +444,7 @@ export function hasLabels(schema) {
   )
 }
 
-export function setDefaults(schema, data = {}, component) {
+export function setDefaultValues(schema, data = {}, component) {
   const options = { component, rootData: data }
 
   const processBefore = (schema, data, name) => {
@@ -416,7 +456,13 @@ export function setDefaults(schema, data = {}, component) {
   // Sets up a data object that has keys with default values for all
   // form fields, so they can be correctly watched for changes.
   return processSchemaData(
-    schema, data, null, null, processBefore, null, options
+    schema,
+    data,
+    null,
+    null,
+    processBefore,
+    null,
+    options
   )
 }
 
@@ -426,15 +472,17 @@ export function computeValue(schema, data, name, dataPath, {
 } = {}) {
   const { compute } = schema
   if (compute) {
-    const value = compute(DitoContext.get(component, {
-      // Override value to prevent endless recursion through calling the
-      // getter for `this.value` in `DitoContext`:
-      value: data[name],
-      name,
-      data,
-      dataPath,
-      rootData
-    }))
+    const value = compute(
+      DitoContext.get(component, {
+        // Override value to prevent endless recursion through calling the
+        // getter for `this.value` in `DitoContext`:
+        value: data[name],
+        name,
+        data,
+        dataPath,
+        rootData
+      })
+    )
     if (value !== undefined) {
       // Access `data[name]` directly instead of `this.value = …` to update the
       // value without calling parse():
@@ -501,11 +549,11 @@ export function processData(schema, sourceSchema, data, dataPath, {
         value.sort((a, b) => {
           const id1 = a?.[idKey]
           const id2 = b?.[idKey]
-          return (
-            id1 == null || isTemporaryId(id1) ? 1
-            : id2 == null || isTemporaryId(id2) ? -1
-            : id1 - id2
-          )
+          return id1 == null || isTemporaryId(id1)
+            ? 1
+            : id2 == null || isTemporaryId(id2)
+              ? -1
+              : id1 - id2
         })
       }
     }
@@ -519,16 +567,17 @@ export function processData(schema, sourceSchema, data, dataPath, {
     const typeOptions = getTypeOptions(schema)
 
     // NOTE: We don't cache this context, since `value` is changing.
-    const getContext = () => DitoContext.get(component, {
-      value,
-      name,
-      data,
-      dataPath,
-      rootData: options.rootData,
-      // Pass the already processed data to `process()`, so it can be modified
-      // through `processedItem` from there.
-      processedData
-    })
+    const getContext = () =>
+      DitoContext.get(component, {
+        value,
+        name,
+        data,
+        dataPath,
+        rootData: options.rootData,
+        // Pass the already processed data to `process()`, so it can be modified
+        // through `processedItem` from there.
+        processedData
+      })
 
     // First unwrap the wrapped primitives again, to bring the data back into
     // its native form. Se `processBefore()` for more details.
@@ -583,9 +632,10 @@ export function processSchemaData(
   options
 ) {
   const processComponents = components => {
-    const getDataPath = (dataPath, token) => dataPath != null
-      ? appendDataPath(dataPath, token)
-      : null
+    const getDataPath = (dataPath, token) =>
+      dataPath != null
+        ? appendDataPath(dataPath, token)
+        : null
 
     if (components) {
       for (const [name, componentSchema] of Object.entries(components)) {
@@ -604,9 +654,10 @@ export function processSchemaData(
           const componentDataPath = getDataPath(dataPath, name)
 
           const processItem = (item, index = null) => {
-            const dataPath = index !== null
-              ? getDataPath(componentDataPath, index)
-              : componentDataPath
+            const dataPath =
+              index !== null
+                ? getDataPath(componentDataPath, index)
+                : componentDataPath
             const context = DitoContext.get(options.component, {
               data,
               value: item,
@@ -616,7 +667,7 @@ export function processSchemaData(
             })
             const getForms = (
               getTypeOptions(componentSchema)?.getFormSchemasForProcessing ||
-               getFormSchemas
+              getFormSchemas
             )
             const forms = getForms(componentSchema, context)
             const form = getItemFormSchemaFromForms(forms, item)
@@ -641,7 +692,11 @@ export function processSchemaData(
           }
 
           processBefore?.(
-            componentSchema, data, name, componentDataPath, processedData
+            componentSchema,
+            data,
+            name,
+            componentDataPath,
+            processedData
           )
           let value = processedData ? processedData[name] : data[name]
           if (value != null && hasFormSchema(componentSchema)) {
@@ -659,7 +714,11 @@ export function processSchemaData(
             }
           }
           processAfter?.(
-            componentSchema, data, name, componentDataPath, processedData
+            componentSchema,
+            data,
+            name,
+            componentDataPath,
+            processedData
           )
         }
       }
@@ -683,37 +742,42 @@ export function getNamedSchemas(schemas, defaults) {
   const toObject = (array, toSchema) => {
     return array.length > 0
       ? array.reduce((object, value) => {
-        const schema = toSchema(value)
-        if (schema) {
-          object[schema.name] = schema && defaults
-            ? { ...defaults, ...schema }
-            : schema
-        }
-        return object
-      }, {})
+          const schema = toSchema(value)
+          if (schema) {
+            object[schema.name] =
+              schema && defaults
+                ? { ...defaults, ...schema }
+                : schema
+          }
+          return object
+        }, {})
       : null
   }
 
   return isArray(schemas)
-    ? toObject(schemas, value => (
-      isObject(value) ? value : {
-        name: camelize(value, false)
-      }
-    ))
+    ? toObject(schemas, value =>
+        isObject(value)
+          ? value
+          : {
+              name: camelize(value, false)
+            }
+      )
     : isObject(schemas)
       ? toObject(
-        Object.entries(schemas),
-        ([name, value]) =>
-          isObject(value) ? {
-            name,
-            ...value
-          }
-          : isString(value) ? {
-            name,
-            label: value
-          }
-          : null
-      )
+          Object.entries(schemas),
+          ([name, value]) =>
+            isObject(value)
+              ? {
+                  name,
+                  ...value
+                }
+              : isString(value)
+                ? {
+                    name,
+                    label: value
+                  }
+                : null
+        )
       : null
 }
 
@@ -733,22 +797,23 @@ export function getTypeOptions(schemaOrType) {
 }
 
 export function getSourceType(schemaOrType) {
-  return getTypeOptions(schemaOrType)?.getSourceType?.(
-    getType(schemaOrType)
-  ) ?? null
+  return (
+    getTypeOptions(schemaOrType)?.getSourceType?.(getType(schemaOrType)) ??
+    null
+  )
 }
 
 export function getPanelSchema(schema, dataPath, tabComponent) {
   return schema
     ? {
-      schema,
-      // If the panel provides its own name, append it to the dataPath.
-      // This is used e.g. for $filters panels.
-      dataPath: schema.name
-        ? appendDataPath(dataPath, schema.name)
-        : dataPath,
-      tabComponent
-    }
+        schema,
+        // If the panel provides its own name, append it to the dataPath.
+        // This is used e.g. for $filters panels.
+        dataPath: schema.name
+          ? appendDataPath(dataPath, schema.name)
+          : dataPath,
+        tabComponent
+      }
     : null
 }
 

package/src/utils/type.js

@@ -1,6 +1,13 @@
 import {
-  isArray, isObject, isString, isBoolean, isNumber, isFunction, isDate,
-  isRegExp, asArray
+  isArray,
+  isObject,
+  isString,
+  isBoolean,
+  isNumber,
+  isFunction,
+  isDate,
+  isRegExp,
+  asArray
 } from '@ditojs/utils'
 
 const typeCheckers = {
@@ -20,27 +27,31 @@ const toBoolean = value => !!value
 const toNumber = value => +value
 const toString = value => String(value)
 
-const toDate = value => isDate(value)
-  ? value
-  : new Date(value)
+const toDate = value =>
+  isDate(value)
+    ? value
+    : new Date(value)
 
-const toArray = value => isArray(value)
-  ? value
-  : isString(value)
-    ? value.split(',')
-    : asArray(value)
+const toArray = value =>
+  isArray(value)
+    ? value
+    : isString(value)
+      ? value.split(',')
+      : asArray(value)
 
-const toObject = value => isObject(value)
-  ? value
-  // If a Object is expected but a Boolean provide, convert to an empty
-  // object. Used by `creatable` & co, that can be both.
-  : value === true
-    ? {}
-    : null
+const toObject = value =>
+  isObject(value)
+    ? value
+    : // If a Object is expected but a Boolean provide, convert to an empty
+      // object. Used by `creatable` & co, that can be both.
+      value === true
+      ? {}
+      : null
 
-const toRegExp = value => isRegExp(value)
-  ? value
-  : new RegExp(value)
+const toRegExp = value =>
+  isRegExp(value)
+    ? value
+    : new RegExp(value)
 
 const typeConverters = {
   Boolean: toBoolean,

package/src/validations/_decimals.js

@@ -4,9 +4,8 @@ export const decimals = {
     return new RegExp(`^[-+]?\\d*(\\.\\d${match})?$`).test(value)
   },
 
-  message: (value, decimals) => (
+  message: (value, decimals) =>
     `must be numeric and may contain ${
       !decimals || decimals === '*' ? '' : decimals
     } decimal points`
-  )
 }