@rebasepro/common 0.0.1-canary.eae7889 → 0.1.0

package/dist/index.es.js

@@ -6,17 +6,17 @@ import cloneDeep from "lodash/cloneDeep.js";
 const DEFAULT_ONE_OF_TYPE = "type";
 const DEFAULT_ONE_OF_VALUE = "value";
 function isReadOnly(property) {
-  if (property.readOnly) return true;
+  if (property.ui?.readOnly) return true;
   if (property.type === "date") {
     if (property.autoValue) return true;
   }
   if (property.type === "reference") {
-    return !property.path && !("Field" in property && property.Field);
+    return !property.path && !("Field" in (property.ui || {}) && property.ui?.Field);
   }
   return false;
 }
 function isHidden(property) {
-  return typeof property.disabled === "object" && Boolean(property.disabled.hidden);
+  return typeof property.ui?.disabled === "object" && Boolean(property.ui?.disabled.hidden);
 }
 function isPropertyBuilder(property) {
   return typeof property?.dynamicProps === "function";
@@ -500,7 +500,7 @@ function resolveArrayProperties({
       });
     }).filter((e) => Boolean(e)) : [];
     return resolvedProperties;
-  } else if (!("Field" in property && property.Field)) {
+  } else if (!("Field" in (property.ui || {}) && property.ui?.Field)) {
     throw Error(`The array property (${propertyKey}) needs to declare an 'of' or a 'oneOf' property, or provide a custom \`Field\` component`);
   } else {
     return [];
@@ -730,7 +730,7 @@ function getEntityImagePreviewPropertyKey(collection) {
   }
   for (const key in collection.properties) {
     const property = collection.properties[key];
-    if (property.type === "string" && property.url === "image") {
+    if (property.type === "string" && property.ui?.url === "image") {
       return key;
     }
   }
@@ -1453,7 +1453,8 @@ function applyPropertyConditions(property, context) {
   if (conditions.disabled) {
     const isDisabled = evaluateCondition(conditions.disabled, context);
     if (isDisabled) {
-      result.disabled = {
+      result.ui = result.ui || {};
+      result.ui.disabled = {
         clearOnDisabled: conditions.clearOnDisabled ?? false,
         disabledMessage: conditions.disabledMessage,
         hidden: false
@@ -1463,8 +1464,9 @@ function applyPropertyConditions(property, context) {
   if (conditions.hidden) {
     const isHidden2 = evaluateCondition(conditions.hidden, context);
     if (isHidden2) {
-      result.disabled = {
-        ...typeof result.disabled === "object" ? result.disabled : {},
+      result.ui = result.ui || {};
+      result.ui.disabled = {
+        ...typeof result.ui?.disabled === "object" ? result.ui.disabled : {},
         hidden: true,
         clearOnDisabled: conditions.clearOnDisabled ?? false
       };
@@ -1473,7 +1475,8 @@ function applyPropertyConditions(property, context) {
   if (conditions.readOnly) {
     const isReadOnly2 = evaluateCondition(conditions.readOnly, context);
     if (isReadOnly2) {
-      result.readOnly = true;
+      result.ui = result.ui || {};
+      result.ui.readOnly = true;
     }
   }
   if (conditions.required !== void 0) {
@@ -1495,7 +1498,7 @@ function applyPropertyConditions(property, context) {
       result.path = evaluateCondition(conditions.referencePath, context);
     }
     if (conditions.referenceFilter) {
-      result.forceFilter = evaluateCondition(conditions.referenceFilter, context);
+      result.fixedFilter = evaluateCondition(conditions.referenceFilter, context);
     }
   }
   if (result.type === "array") {
@@ -1823,7 +1826,10 @@ class CollectionRegistry {
       if (!relation) {
         throw new Error(`Relation '${relationKey}' not found in collection '${currentCollection.slug}'`);
       }
-      currentCollection = relation.target();
+      const target = relation.target();
+      const targetRelationKey = relation.relationName || target.slug;
+      const targetSlug = relation.overrides?.slug ?? targetRelationKey;
+      currentCollection = this.get(targetSlug) || this.normalizeCollection(target);
       if (i + 1 < pathSegments.length) ;
     }
     return currentCollection;
@@ -1872,7 +1878,7 @@ class CollectionRegistry {
         if (!subcollection) {
           throw new Error(`Subcollection '${subcollectionSlug}' not found in ${currentCollection.slug}`);
         }
-        currentCollection = subcollection;
+        currentCollection = this.get(subcollection.slug) || this.normalizeCollection(subcollection);
         collections.push(currentCollection);
       }
     }