@uniformdev/canvas 19.170.1 → 19.173.1-alpha.17

package/dist/index.esm.js

@@ -1631,6 +1631,59 @@ function evaluateCriterion(clause, rootOptions) {
   return null;
 }
 
+// src/enhancement/visibility/evaluatePropertyCriteria.ts
+function evaluatePropertyCriteria({
+  baseValue,
+  conditionalValues,
+  keepIndeterminate,
+  ...evaluateGroupOptions
+}) {
+  let authoritative = true;
+  const result = {
+    currentValue: baseValue,
+    remainingConditionalValues: evaluateGroupOptions.simplifyCriteria && conditionalValues ? [...conditionalValues] : conditionalValues,
+    currentConditionIndex: -1
+  };
+  if (!conditionalValues) {
+    return result;
+  }
+  const conditionIndexesToRemove = [];
+  for (let i = 0; i < conditionalValues.length; i++) {
+    const conditionalVariant = conditionalValues[i];
+    if (result.matched) {
+      conditionIndexesToRemove.push(i);
+      continue;
+    }
+    const evaluationResult = evaluateVisibilityCriteriaGroup({
+      ...evaluateGroupOptions,
+      criteriaGroup: conditionalVariant.when
+    });
+    if (evaluationResult === null) {
+      if (keepIndeterminate) {
+        authoritative = false;
+      } else {
+        conditionIndexesToRemove.push(i);
+      }
+    } else if (evaluationResult === true) {
+      result.matched = conditionalVariant;
+      result.currentValue = conditionalVariant.value;
+      result.currentConditionIndex = i;
+      conditionIndexesToRemove.push(i);
+    } else {
+      conditionIndexesToRemove.push(i);
+    }
+  }
+  if (evaluateGroupOptions.simplifyCriteria) {
+    for (let i = conditionIndexesToRemove.length - 1; i >= 0; i--) {
+      result.remainingConditionalValues.splice(conditionIndexesToRemove[i], 1);
+    }
+  }
+  if (authoritative) {
+    result.remainingConditionalValues = void 0;
+  }
+  return result;
+}
+
 // src/enhancement/visibility/types.ts
 var CANVAS_VIZ_CONTROL_PARAM = "$viz";
 
@@ -1658,8 +1711,8 @@ function evaluateNodeVisibility({
   return result;
 }
 
-// src/enhancement/visibility/evaluateWalkTreeVisibility.ts
-function evaluateWalkTreeVisibility({
+// src/enhancement/visibility/evaluateWalkTreeNodeVisibility.ts
+function evaluateWalkTreeNodeVisibility({
   rules,
   showIndeterminate,
   context
@@ -1676,6 +1729,69 @@ function evaluateWalkTreeVisibility({
   return true;
 }
 
+// src/enhancement/visibility/evaluateWalkTreePropertyCriteria.ts
+function evaluateWalkTreePropertyCriteria({
+  rules,
+  node,
+  keepIndeterminate
+}) {
+  const properties = getPropertiesValue(node);
+  if (!properties) {
+    return;
+  }
+  Object.entries(properties).forEach(([propertyName, property]) => {
+    var _a, _b, _c;
+    if (property.locales || property.localesConditions) {
+      const localesDefined = [
+        ...Object.keys((_a = property.locales) != null ? _a : {}),
+        ...Object.keys((_b = property.localesConditions) != null ? _b : {})
+      ];
+      localesDefined.forEach((locale) => {
+        var _a2, _b2, _c2, _d, _e, _f, _g;
+        const { currentValue, remainingConditionalValues } = evaluatePropertyCriteria({
+          baseValue: (_a2 = property.locales) == null ? void 0 : _a2[locale],
+          conditionalValues: (_b2 = property.localesConditions) == null ? void 0 : _b2[locale],
+          rules,
+          simplifyCriteria: true,
+          keepIndeterminate
+        });
+        if (currentValue === null) {
+          (_c2 = property.locales) == null ? true : delete _c2[locale];
+          if (!Object.keys((_d = property.locales) != null ? _d : {}).length) {
+            delete properties[propertyName];
+          }
+        } else {
+          (_e = property.locales) != null ? _e : property.locales = {};
+          property.locales[locale] = currentValue;
+        }
+        if (!(remainingConditionalValues == null ? void 0 : remainingConditionalValues.length)) {
+          (_f = property.localesConditions) == null ? true : delete _f[locale];
+        } else {
+          (_g = property.localesConditions) != null ? _g : property.localesConditions = {};
+          property.localesConditions[locale] = remainingConditionalValues;
+        }
+      });
+      if (!Object.keys((_c = property.localesConditions) != null ? _c : {}).length) {
+        delete property.localesConditions;
+      }
+    } else {
+      const { currentValue, remainingConditionalValues } = evaluatePropertyCriteria({
+        baseValue: property.value,
+        conditionalValues: property.conditions,
+        rules,
+        simplifyCriteria: true,
+        keepIndeterminate
+      });
+      if (currentValue === null) {
+        delete properties[propertyName];
+      } else {
+        property.value = currentValue;
+      }
+      property.conditions = remainingConditionalValues;
+    }
+  });
+}
+
 // src/enhancement/visibility/rules/evaluateStringMatch.ts
 var isEvaluator = (criteria, matchValue) => {
   if (Array.isArray(criteria)) {
@@ -1820,7 +1936,7 @@ function localize(options) {
       return;
     }
     if (isUsingModernOptions) {
-      const result = evaluateWalkTreeVisibility({
+      const result = evaluateWalkTreeNodeVisibility({
         context,
         rules: vizControlLocaleRule,
         showIndeterminate: true
@@ -1828,6 +1944,11 @@ function localize(options) {
       if (!result) {
         return;
       }
+      evaluateWalkTreePropertyCriteria({
+        node: context.node,
+        rules: vizControlLocaleRule,
+        keepIndeterminate: true
+      });
     }
     if (node.type === CANVAS_LOCALIZATION_TYPE) {
       const locales = extractLocales({ component: node });
@@ -3082,8 +3203,10 @@ export {
   createUniformApiEnhancer,
   createVariableReference,
   enhance,
+  evaluatePropertyCriteria,
   evaluateVisibilityCriteriaGroup,
-  evaluateWalkTreeVisibility,
+  evaluateWalkTreeNodeVisibility,
+  evaluateWalkTreePropertyCriteria,
   extractLocales,
   findParameterInNodeTree,
   flattenValues,

package/dist/index.js

@@ -352,8 +352,10 @@ __export(src_exports, {
   createUniformApiEnhancer: () => createUniformApiEnhancer,
   createVariableReference: () => createVariableReference,
   enhance: () => enhance,
+  evaluatePropertyCriteria: () => evaluatePropertyCriteria,
   evaluateVisibilityCriteriaGroup: () => evaluateVisibilityCriteriaGroup,
-  evaluateWalkTreeVisibility: () => evaluateWalkTreeVisibility,
+  evaluateWalkTreeNodeVisibility: () => evaluateWalkTreeNodeVisibility,
+  evaluateWalkTreePropertyCriteria: () => evaluateWalkTreePropertyCriteria,
   extractLocales: () => extractLocales,
   findParameterInNodeTree: () => findParameterInNodeTree,
   flattenValues: () => flattenValues,
@@ -1779,6 +1781,59 @@ function evaluateCriterion(clause, rootOptions) {
   return null;
 }
 
+// src/enhancement/visibility/evaluatePropertyCriteria.ts
+function evaluatePropertyCriteria({
+  baseValue,
+  conditionalValues,
+  keepIndeterminate,
+  ...evaluateGroupOptions
+}) {
+  let authoritative = true;
+  const result = {
+    currentValue: baseValue,
+    remainingConditionalValues: evaluateGroupOptions.simplifyCriteria && conditionalValues ? [...conditionalValues] : conditionalValues,
+    currentConditionIndex: -1
+  };
+  if (!conditionalValues) {
+    return result;
+  }
+  const conditionIndexesToRemove = [];
+  for (let i = 0; i < conditionalValues.length; i++) {
+    const conditionalVariant = conditionalValues[i];
+    if (result.matched) {
+      conditionIndexesToRemove.push(i);
+      continue;
+    }
+    const evaluationResult = evaluateVisibilityCriteriaGroup({
+      ...evaluateGroupOptions,
+      criteriaGroup: conditionalVariant.when
+    });
+    if (evaluationResult === null) {
+      if (keepIndeterminate) {
+        authoritative = false;
+      } else {
+        conditionIndexesToRemove.push(i);
+      }
+    } else if (evaluationResult === true) {
+      result.matched = conditionalVariant;
+      result.currentValue = conditionalVariant.value;
+      result.currentConditionIndex = i;
+      conditionIndexesToRemove.push(i);
+    } else {
+      conditionIndexesToRemove.push(i);
+    }
+  }
+  if (evaluateGroupOptions.simplifyCriteria) {
+    for (let i = conditionIndexesToRemove.length - 1; i >= 0; i--) {
+      result.remainingConditionalValues.splice(conditionIndexesToRemove[i], 1);
+    }
+  }
+  if (authoritative) {
+    result.remainingConditionalValues = void 0;
+  }
+  return result;
+}
+
 // src/enhancement/visibility/types.ts
 var CANVAS_VIZ_CONTROL_PARAM = "$viz";
 
@@ -1806,8 +1861,8 @@ function evaluateNodeVisibility({
   return result;
 }
 
-// src/enhancement/visibility/evaluateWalkTreeVisibility.ts
-function evaluateWalkTreeVisibility({
+// src/enhancement/visibility/evaluateWalkTreeNodeVisibility.ts
+function evaluateWalkTreeNodeVisibility({
   rules,
   showIndeterminate,
   context
@@ -1824,6 +1879,69 @@ function evaluateWalkTreeVisibility({
   return true;
 }
 
+// src/enhancement/visibility/evaluateWalkTreePropertyCriteria.ts
+function evaluateWalkTreePropertyCriteria({
+  rules,
+  node,
+  keepIndeterminate
+}) {
+  const properties = getPropertiesValue(node);
+  if (!properties) {
+    return;
+  }
+  Object.entries(properties).forEach(([propertyName, property]) => {
+    var _a, _b, _c;
+    if (property.locales || property.localesConditions) {
+      const localesDefined = [
+        ...Object.keys((_a = property.locales) != null ? _a : {}),
+        ...Object.keys((_b = property.localesConditions) != null ? _b : {})
+      ];
+      localesDefined.forEach((locale) => {
+        var _a2, _b2, _c2, _d, _e, _f, _g;
+        const { currentValue, remainingConditionalValues } = evaluatePropertyCriteria({
+          baseValue: (_a2 = property.locales) == null ? void 0 : _a2[locale],
+          conditionalValues: (_b2 = property.localesConditions) == null ? void 0 : _b2[locale],
+          rules,
+          simplifyCriteria: true,
+          keepIndeterminate
+        });
+        if (currentValue === null) {
+          (_c2 = property.locales) == null ? true : delete _c2[locale];
+          if (!Object.keys((_d = property.locales) != null ? _d : {}).length) {
+            delete properties[propertyName];
+          }
+        } else {
+          (_e = property.locales) != null ? _e : property.locales = {};
+          property.locales[locale] = currentValue;
+        }
+        if (!(remainingConditionalValues == null ? void 0 : remainingConditionalValues.length)) {
+          (_f = property.localesConditions) == null ? true : delete _f[locale];
+        } else {
+          (_g = property.localesConditions) != null ? _g : property.localesConditions = {};
+          property.localesConditions[locale] = remainingConditionalValues;
+        }
+      });
+      if (!Object.keys((_c = property.localesConditions) != null ? _c : {}).length) {
+        delete property.localesConditions;
+      }
+    } else {
+      const { currentValue, remainingConditionalValues } = evaluatePropertyCriteria({
+        baseValue: property.value,
+        conditionalValues: property.conditions,
+        rules,
+        simplifyCriteria: true,
+        keepIndeterminate
+      });
+      if (currentValue === null) {
+        delete properties[propertyName];
+      } else {
+        property.value = currentValue;
+      }
+      property.conditions = remainingConditionalValues;
+    }
+  });
+}
+
 // src/enhancement/visibility/rules/evaluateStringMatch.ts
 var isEvaluator = (criteria, matchValue) => {
   if (Array.isArray(criteria)) {
@@ -1968,7 +2086,7 @@ function localize(options) {
       return;
     }
     if (isUsingModernOptions) {
-      const result = evaluateWalkTreeVisibility({
+      const result = evaluateWalkTreeNodeVisibility({
         context,
         rules: vizControlLocaleRule,
         showIndeterminate: true
@@ -1976,6 +2094,11 @@ function localize(options) {
       if (!result) {
         return;
       }
+      evaluateWalkTreePropertyCriteria({
+        node: context.node,
+        rules: vizControlLocaleRule,
+        keepIndeterminate: true
+      });
     }
     if (node.type === CANVAS_LOCALIZATION_TYPE) {
       const locales = extractLocales({ component: node });
@@ -3231,8 +3354,10 @@ var CanvasClientError = import_api15.ApiClientError;
   createUniformApiEnhancer,
   createVariableReference,
   enhance,
+  evaluatePropertyCriteria,
   evaluateVisibilityCriteriaGroup,
-  evaluateWalkTreeVisibility,
+  evaluateWalkTreeNodeVisibility,
+  evaluateWalkTreePropertyCriteria,
   extractLocales,
   findParameterInNodeTree,
   flattenValues,

package/dist/index.mjs

@@ -1631,6 +1631,59 @@ function evaluateCriterion(clause, rootOptions) {
   return null;
 }
 
+// src/enhancement/visibility/evaluatePropertyCriteria.ts
+function evaluatePropertyCriteria({
+  baseValue,
+  conditionalValues,
+  keepIndeterminate,
+  ...evaluateGroupOptions
+}) {
+  let authoritative = true;
+  const result = {
+    currentValue: baseValue,
+    remainingConditionalValues: evaluateGroupOptions.simplifyCriteria && conditionalValues ? [...conditionalValues] : conditionalValues,
+    currentConditionIndex: -1
+  };
+  if (!conditionalValues) {
+    return result;
+  }
+  const conditionIndexesToRemove = [];
+  for (let i = 0; i < conditionalValues.length; i++) {
+    const conditionalVariant = conditionalValues[i];
+    if (result.matched) {
+      conditionIndexesToRemove.push(i);
+      continue;
+    }
+    const evaluationResult = evaluateVisibilityCriteriaGroup({
+      ...evaluateGroupOptions,
+      criteriaGroup: conditionalVariant.when
+    });
+    if (evaluationResult === null) {
+      if (keepIndeterminate) {
+        authoritative = false;
+      } else {
+        conditionIndexesToRemove.push(i);
+      }
+    } else if (evaluationResult === true) {
+      result.matched = conditionalVariant;
+      result.currentValue = conditionalVariant.value;
+      result.currentConditionIndex = i;
+      conditionIndexesToRemove.push(i);
+    } else {
+      conditionIndexesToRemove.push(i);
+    }
+  }
+  if (evaluateGroupOptions.simplifyCriteria) {
+    for (let i = conditionIndexesToRemove.length - 1; i >= 0; i--) {
+      result.remainingConditionalValues.splice(conditionIndexesToRemove[i], 1);
+    }
+  }
+  if (authoritative) {
+    result.remainingConditionalValues = void 0;
+  }
+  return result;
+}
+
 // src/enhancement/visibility/types.ts
 var CANVAS_VIZ_CONTROL_PARAM = "$viz";
 
@@ -1658,8 +1711,8 @@ function evaluateNodeVisibility({
   return result;
 }
 
-// src/enhancement/visibility/evaluateWalkTreeVisibility.ts
-function evaluateWalkTreeVisibility({
+// src/enhancement/visibility/evaluateWalkTreeNodeVisibility.ts
+function evaluateWalkTreeNodeVisibility({
   rules,
   showIndeterminate,
   context
@@ -1676,6 +1729,69 @@ function evaluateWalkTreeVisibility({
   return true;
 }
 
+// src/enhancement/visibility/evaluateWalkTreePropertyCriteria.ts
+function evaluateWalkTreePropertyCriteria({
+  rules,
+  node,
+  keepIndeterminate
+}) {
+  const properties = getPropertiesValue(node);
+  if (!properties) {
+    return;
+  }
+  Object.entries(properties).forEach(([propertyName, property]) => {
+    var _a, _b, _c;
+    if (property.locales || property.localesConditions) {
+      const localesDefined = [
+        ...Object.keys((_a = property.locales) != null ? _a : {}),
+        ...Object.keys((_b = property.localesConditions) != null ? _b : {})
+      ];
+      localesDefined.forEach((locale) => {
+        var _a2, _b2, _c2, _d, _e, _f, _g;
+        const { currentValue, remainingConditionalValues } = evaluatePropertyCriteria({
+          baseValue: (_a2 = property.locales) == null ? void 0 : _a2[locale],
+          conditionalValues: (_b2 = property.localesConditions) == null ? void 0 : _b2[locale],
+          rules,
+          simplifyCriteria: true,
+          keepIndeterminate
+        });
+        if (currentValue === null) {
+          (_c2 = property.locales) == null ? true : delete _c2[locale];
+          if (!Object.keys((_d = property.locales) != null ? _d : {}).length) {
+            delete properties[propertyName];
+          }
+        } else {
+          (_e = property.locales) != null ? _e : property.locales = {};
+          property.locales[locale] = currentValue;
+        }
+        if (!(remainingConditionalValues == null ? void 0 : remainingConditionalValues.length)) {
+          (_f = property.localesConditions) == null ? true : delete _f[locale];
+        } else {
+          (_g = property.localesConditions) != null ? _g : property.localesConditions = {};
+          property.localesConditions[locale] = remainingConditionalValues;
+        }
+      });
+      if (!Object.keys((_c = property.localesConditions) != null ? _c : {}).length) {
+        delete property.localesConditions;
+      }
+    } else {
+      const { currentValue, remainingConditionalValues } = evaluatePropertyCriteria({
+        baseValue: property.value,
+        conditionalValues: property.conditions,
+        rules,
+        simplifyCriteria: true,
+        keepIndeterminate
+      });
+      if (currentValue === null) {
+        delete properties[propertyName];
+      } else {
+        property.value = currentValue;
+      }
+      property.conditions = remainingConditionalValues;
+    }
+  });
+}
+
 // src/enhancement/visibility/rules/evaluateStringMatch.ts
 var isEvaluator = (criteria, matchValue) => {
   if (Array.isArray(criteria)) {
@@ -1820,7 +1936,7 @@ function localize(options) {
       return;
     }
     if (isUsingModernOptions) {
-      const result = evaluateWalkTreeVisibility({
+      const result = evaluateWalkTreeNodeVisibility({
         context,
         rules: vizControlLocaleRule,
         showIndeterminate: true
@@ -1828,6 +1944,11 @@ function localize(options) {
       if (!result) {
         return;
       }
+      evaluateWalkTreePropertyCriteria({
+        node: context.node,
+        rules: vizControlLocaleRule,
+        keepIndeterminate: true
+      });
     }
     if (node.type === CANVAS_LOCALIZATION_TYPE) {
       const locales = extractLocales({ component: node });
@@ -3082,8 +3203,10 @@ export {
   createUniformApiEnhancer,
   createVariableReference,
   enhance,
+  evaluatePropertyCriteria,
   evaluateVisibilityCriteriaGroup,
-  evaluateWalkTreeVisibility,
+  evaluateWalkTreeNodeVisibility,
+  evaluateWalkTreePropertyCriteria,
   extractLocales,
   findParameterInNodeTree,
   flattenValues,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniformdev/canvas",
-  "version": "19.170.1",
+  "version": "19.173.1-alpha.17+25c1176cea",
   "description": "Common functionality and types for Uniform Canvas",
   "license": "SEE LICENSE IN LICENSE.txt",
   "main": "./dist/index.js",
@@ -32,14 +32,14 @@
   },
   "devDependencies": {
     "@types/retry": "0.12.5",
-    "lexical": "^0.12.0",
+    "lexical": "0.16.1",
     "p-retry": "5.1.2",
     "p-throttle": "5.0.0",
     "pusher-js": "8.2.0"
   },
   "dependencies": {
-    "@uniformdev/assets": "19.170.1",
-    "@uniformdev/context": "19.170.1",
+    "@uniformdev/assets": "19.173.1-alpha.17+25c1176cea",
+    "@uniformdev/context": "19.173.1-alpha.17+25c1176cea",
     "immer": "10.1.1"
   },
   "files": [
@@ -48,5 +48,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "702c0e149e1470e21ac9a61526c7f2ab668abd84"
+  "gitHead": "25c1176cea8d5114b92fc75cdd8bba4aa6463a50"
 }