@ditojs/admin 2.25.0 → 2.26.1

package/src/utils/schema.js

@@ -23,6 +23,7 @@ import { markRaw } from 'vue'
 
 const typeComponents = {}
 const unknownTypeReported = {}
+const emptySchema = {}
 
 export function registerTypeComponent(type, component) {
   typeComponents[type] = component
@@ -121,7 +122,12 @@ export function getSchemaIdentifier(schema) {
   return JSON.stringify(schema)
 }
 
-export async function resolveSchema(schema, unwrapModule = false) {
+const resolvedSchemas = new WeakMap()
+export async function resolveSchema(value, unwrapModule = false) {
+  if (resolvedSchemas.has(value)) {
+    return resolvedSchemas.get(value)
+  }
+  let schema = value
   if (isFunction(schema)) {
     schema = schema()
   }
@@ -146,6 +152,7 @@ export async function resolveSchema(schema, unwrapModule = false) {
       }
     }
   }
+  resolvedSchemas.set(value, schema)
   return schema
 }
 
@@ -235,29 +242,34 @@ export async function resolveSchemaComponents(schemas) {
   await mapConcurrently(Object.values(schemas || {}), resolveSchemaComponent)
 }
 
+const processedSchemas = new WeakSet()
 export async function processSchemaComponents(
   api,
   schema,
   routes = null,
   level = 0
 ) {
-  const promises = []
-  const process = (component, name, relativeLevel) => {
-    promises.push(
-      processSchemaComponent(
-        api,
-        component,
-        name,
-        routes,
-        level + relativeLevel
+  if (schema && !processedSchemas.has(schema)) {
+    processedSchemas.add(schema)
+
+    const promises = []
+    const process = (component, name, relativeLevel) => {
+      promises.push(
+        processSchemaComponent(
+          api,
+          component,
+          name,
+          routes,
+          level + relativeLevel
+        )
       )
-    )
-  }
+    }
 
-  iterateNestedSchemaComponents(schema, process)
-  iterateSchemaComponents(getPanelSchemas(schema), process)
+    iterateNestedSchemaComponents(schema, process)
+    iterateSchemaComponents(getPanelSchemas(schema), process)
 
-  await Promise.all(promises)
+    await Promise.all(promises)
+  }
 }
 
 export async function processSchemaComponent(
@@ -324,7 +336,7 @@ export function processSchemaDefaults(api, schema) {
         if (schema[key] === undefined) {
           schema[key] = value
         } else {
-          schema[key] = assignDeeply(value, schema[key])
+          schema[key] = assignDeeply(schema[key], value)
         }
       }
     }
@@ -518,7 +530,15 @@ export function getItemFormSchemaFromForms(forms, item) {
 }
 
 export function getItemFormSchema(schema, item, context) {
-  return getItemFormSchemaFromForms(getFormSchemas(schema, context), item)
+  return (
+    getItemFormSchemaFromForms(getFormSchemas(schema, context), item) ||
+    // Always return a schema object so we don't need to check for it.
+    emptySchema
+  )
+}
+
+export function isEmptySchema(schema) {
+  return schema === emptySchema
 }
 
 export function isCompact(schema) {
@@ -672,11 +692,15 @@ export function computeValue(schema, data, name, dataPath, {
     if (value !== undefined) {
       // Access `data[name]` directly to update the value without calling
       // parse():
+      // TODO: Fix side-effects
+      // eslint-disable-next-line vue/no-side-effects-in-computed-properties
       data[name] = value
     }
   }
   // If the value is still missing after compute, set the default for it:
   if (!(name in data) && !ignoreMissingValue(schema)) {
+    // TODO: Fix side-effects
+    // eslint-disable-next-line vue/no-side-effects-in-computed-properties
     data[name] = getDefaultValue(schema)
   }
   // Now access the value. This is important for reactivity and needs to