@uniformdev/canvas 19.181.1 → 19.181.2

package/dist/index.d.mts

@@ -27380,15 +27380,9 @@ declare const parseComponentPlaceholderId: (id: string) => {
     parent?: PlaceholderParent;
 } | undefined;
 
-/**
- * @deprecated do not use, will be removed in a future version
- */
 type FlattenProperty<P> = P extends {
     value: unknown;
 } ? P['value'] : P;
-/**
- * @deprecated do not use, will be removed in a future version
- */
 type FlattenValues<T extends DataWithProperties> = T extends Pick<ComponentInstance, 'parameters'> ? Record<string, unknown> & {
     [Property in keyof T['parameters']]: FlattenProperty<T['parameters'][Property]>;
 } : T extends Pick<EntryData, 'fields'> ? Record<string, unknown> & {
@@ -27399,9 +27393,6 @@ type FlattenValues<T extends DataWithProperties> = T extends Pick<ComponentInsta
  * If no properties are defined, returns undefined.
  */
 declare function getPropertiesValue(entity: Pick<ComponentInstance, 'parameters'> | Pick<EntryData, 'fields'>): ComponentInstance['parameters'];
-/**
- * @deprecated do not use, will be removed in a future version
- */
 interface FlattenValuesOptions {
     /**
      * Take only the first item from an array
@@ -27447,27 +27438,12 @@ declare function getLocalizedPropertyValues<TValue, T extends ComponentParameter
 declare function getLocalizedPropertyValues(parameter: null): null;
 declare function getLocalizedPropertyValues(parameter: undefined): undefined;
 type DataWithProperties = Pick<ComponentInstance, 'parameters'> | Pick<EntryData, 'fields'>;
-/**
- * @deprecated do not use, will be removed in a future version
- */
 declare function flattenValues(data: null, options?: FlattenValuesOptions): null;
-/**
- * @deprecated do not use, will be removed in a future version
- */
 declare function flattenValues(data: undefined, options?: FlattenValuesOptions): undefined;
-/**
- * @deprecated do not use, will be removed in a future version
- */
 declare function flattenValues<Data extends DataWithProperties>(data: Data | null | undefined, options?: FlattenValuesOptions): FlattenValues<Data> | null | undefined;
-/**
- * @deprecated do not use, will be removed in a future version
- */
 declare function flattenValues<Data extends DataWithProperties>(data: Array<Data> | null | undefined, options: {
     toSingle: true;
 } & Omit<FlattenValuesOptions, 'toSingle'>): FlattenValues<Data> | null | undefined;
-/**
- * @deprecated do not use, will be removed in a future version
- */
 declare function flattenValues<Data extends DataWithProperties>(data: Array<Data> | null | undefined, options?: FlattenValuesOptions): Array<FlattenValues<Data>> | null | undefined;
 
 type BindVariablesResult<TValue> = {

package/dist/index.d.ts

@@ -27380,15 +27380,9 @@ declare const parseComponentPlaceholderId: (id: string) => {
     parent?: PlaceholderParent;
 } | undefined;
 
-/**
- * @deprecated do not use, will be removed in a future version
- */
 type FlattenProperty<P> = P extends {
     value: unknown;
 } ? P['value'] : P;
-/**
- * @deprecated do not use, will be removed in a future version
- */
 type FlattenValues<T extends DataWithProperties> = T extends Pick<ComponentInstance, 'parameters'> ? Record<string, unknown> & {
     [Property in keyof T['parameters']]: FlattenProperty<T['parameters'][Property]>;
 } : T extends Pick<EntryData, 'fields'> ? Record<string, unknown> & {
@@ -27399,9 +27393,6 @@ type FlattenValues<T extends DataWithProperties> = T extends Pick<ComponentInsta
  * If no properties are defined, returns undefined.
  */
 declare function getPropertiesValue(entity: Pick<ComponentInstance, 'parameters'> | Pick<EntryData, 'fields'>): ComponentInstance['parameters'];
-/**
- * @deprecated do not use, will be removed in a future version
- */
 interface FlattenValuesOptions {
     /**
      * Take only the first item from an array
@@ -27447,27 +27438,12 @@ declare function getLocalizedPropertyValues<TValue, T extends ComponentParameter
 declare function getLocalizedPropertyValues(parameter: null): null;
 declare function getLocalizedPropertyValues(parameter: undefined): undefined;
 type DataWithProperties = Pick<ComponentInstance, 'parameters'> | Pick<EntryData, 'fields'>;
-/**
- * @deprecated do not use, will be removed in a future version
- */
 declare function flattenValues(data: null, options?: FlattenValuesOptions): null;
-/**
- * @deprecated do not use, will be removed in a future version
- */
 declare function flattenValues(data: undefined, options?: FlattenValuesOptions): undefined;
-/**
- * @deprecated do not use, will be removed in a future version
- */
 declare function flattenValues<Data extends DataWithProperties>(data: Data | null | undefined, options?: FlattenValuesOptions): FlattenValues<Data> | null | undefined;
-/**
- * @deprecated do not use, will be removed in a future version
- */
 declare function flattenValues<Data extends DataWithProperties>(data: Array<Data> | null | undefined, options: {
     toSingle: true;
 } & Omit<FlattenValuesOptions, 'toSingle'>): FlattenValues<Data> | null | undefined;
-/**
- * @deprecated do not use, will be removed in a future version
- */
 declare function flattenValues<Data extends DataWithProperties>(data: Array<Data> | null | undefined, options?: FlattenValuesOptions): Array<FlattenValues<Data>> | null | undefined;
 
 type BindVariablesResult<TValue> = {

package/dist/index.esm.js

@@ -1868,7 +1868,7 @@ function evaluateWalkTreePropertyCriteria({
         ...Object.keys((_b = property.localesConditions) != null ? _b : {})
       ];
       localesDefined.forEach((locale) => {
-        var _a2, _b2, _c2, _d, _e, _f, _g;
+        var _a2, _b2, _c2, _d, _e, _f;
         const { currentValue, remainingConditionalValues } = evaluatePropertyCriteria({
           baseValue: (_a2 = property.locales) == null ? void 0 : _a2[locale],
           conditionalValues: (_b2 = property.localesConditions) == null ? void 0 : _b2[locale],
@@ -1876,25 +1876,25 @@ function evaluateWalkTreePropertyCriteria({
           simplifyCriteria: true,
           keepIndeterminate
         });
-        if (currentValue === null) {
+        if (currentValue === null || currentValue === void 0) {
           (_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 = {};
+          (_d = property.locales) != null ? _d : property.locales = {};
           property.locales[locale] = currentValue;
         }
         if (!(remainingConditionalValues == null ? void 0 : remainingConditionalValues.length)) {
-          (_f = property.localesConditions) == null ? true : delete _f[locale];
+          (_e = property.localesConditions) == null ? true : delete _e[locale];
         } else {
-          (_g = property.localesConditions) != null ? _g : property.localesConditions = {};
+          (_f = property.localesConditions) != null ? _f : property.localesConditions = {};
           property.localesConditions[locale] = remainingConditionalValues;
         }
       });
       if (!Object.keys((_c = property.localesConditions) != null ? _c : {}).length) {
         delete property.localesConditions;
       }
+      if (!property.locales && !property.localesConditions) {
+        delete properties[propertyName];
+      }
     } else {
       const { currentValue, remainingConditionalValues } = evaluatePropertyCriteria({
         baseValue: property.value,
@@ -1906,9 +1906,17 @@ function evaluateWalkTreePropertyCriteria({
       if (currentValue === null) {
         delete properties[propertyName];
       } else {
-        property.value = currentValue;
+        if (currentValue !== void 0) {
+          property.value = currentValue;
+        } else {
+          delete property.value;
+        }
+      }
+      if (remainingConditionalValues === void 0) {
+        delete property.conditions;
+      } else {
+        property.conditions = remainingConditionalValues;
       }
-      property.conditions = remainingConditionalValues;
     }
   });
 }
@@ -2078,7 +2086,7 @@ function localize(options) {
     const { type, node, actions } = context;
     if (type !== "component") {
       if (isUsingModernOptions) {
-        localizeProperties(node.fields, locale);
+        localizeProperties(node, locale, vizControlLocaleRule);
       }
       return;
     }
@@ -2091,11 +2099,6 @@ 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 });
@@ -2108,7 +2111,7 @@ function localize(options) {
         replaceComponent.forEach((component) => {
           removeLocaleProperty(component);
           if (isUsingModernOptions) {
-            localizeProperties(getPropertiesValue(component), locale);
+            localizeProperties(component, locale, vizControlLocaleRule);
           }
         });
         const [first, ...rest] = replaceComponent;
@@ -2120,7 +2123,7 @@ function localize(options) {
         actions.remove();
       }
     } else if (isUsingModernOptions) {
-      localizeProperties(getPropertiesValue(node), locale);
+      localizeProperties(node, locale, vizControlLocaleRule);
     }
   });
 }
@@ -2139,24 +2142,36 @@ function removeLocaleProperty(component) {
     }
   }
 }
-function localizeProperties(properties, locale) {
+function localizeProperties(node, locale, rules) {
+  const properties = getPropertiesValue(node);
   if (!properties) {
     return void 0;
   }
-  Object.entries(properties).forEach(([key, property]) => {
-    var _a;
+  Object.entries(properties).forEach(([propertyId, propertyValue]) => {
+    var _a, _b;
     if (!locale) {
-      delete property.locales;
+      delete propertyValue.locales;
+      delete propertyValue.localesConditions;
     }
-    const currentLocaleValue = locale ? (_a = property.locales) == null ? void 0 : _a[locale] : void 0;
+    const currentLocaleValue = locale ? (_a = propertyValue.locales) == null ? void 0 : _a[locale] : void 0;
     if (currentLocaleValue !== void 0) {
-      property.value = currentLocaleValue;
+      propertyValue.value = currentLocaleValue;
+    }
+    const currentLocaleConditionalValues = locale ? (_b = propertyValue.localesConditions) == null ? void 0 : _b[locale] : void 0;
+    if (currentLocaleConditionalValues !== void 0) {
+      propertyValue.conditions = currentLocaleConditionalValues;
     }
-    delete property.locales;
-    if (property.value === void 0) {
-      delete properties[key];
+    delete propertyValue.locales;
+    delete propertyValue.localesConditions;
+    if (propertyValue.value === void 0 && propertyValue.conditions === void 0) {
+      delete properties[propertyId];
     }
   });
+  evaluateWalkTreePropertyCriteria({
+    node,
+    rules,
+    keepIndeterminate: true
+  });
 }
 
 // src/enhancement/UniqueBatchEntries.ts

package/dist/index.js

@@ -2023,7 +2023,7 @@ function evaluateWalkTreePropertyCriteria({
         ...Object.keys((_b = property.localesConditions) != null ? _b : {})
       ];
       localesDefined.forEach((locale) => {
-        var _a2, _b2, _c2, _d, _e, _f, _g;
+        var _a2, _b2, _c2, _d, _e, _f;
         const { currentValue, remainingConditionalValues } = evaluatePropertyCriteria({
           baseValue: (_a2 = property.locales) == null ? void 0 : _a2[locale],
           conditionalValues: (_b2 = property.localesConditions) == null ? void 0 : _b2[locale],
@@ -2031,25 +2031,25 @@ function evaluateWalkTreePropertyCriteria({
           simplifyCriteria: true,
           keepIndeterminate
         });
-        if (currentValue === null) {
+        if (currentValue === null || currentValue === void 0) {
           (_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 = {};
+          (_d = property.locales) != null ? _d : property.locales = {};
           property.locales[locale] = currentValue;
         }
         if (!(remainingConditionalValues == null ? void 0 : remainingConditionalValues.length)) {
-          (_f = property.localesConditions) == null ? true : delete _f[locale];
+          (_e = property.localesConditions) == null ? true : delete _e[locale];
         } else {
-          (_g = property.localesConditions) != null ? _g : property.localesConditions = {};
+          (_f = property.localesConditions) != null ? _f : property.localesConditions = {};
           property.localesConditions[locale] = remainingConditionalValues;
         }
       });
       if (!Object.keys((_c = property.localesConditions) != null ? _c : {}).length) {
         delete property.localesConditions;
       }
+      if (!property.locales && !property.localesConditions) {
+        delete properties[propertyName];
+      }
     } else {
       const { currentValue, remainingConditionalValues } = evaluatePropertyCriteria({
         baseValue: property.value,
@@ -2061,9 +2061,17 @@ function evaluateWalkTreePropertyCriteria({
       if (currentValue === null) {
         delete properties[propertyName];
       } else {
-        property.value = currentValue;
+        if (currentValue !== void 0) {
+          property.value = currentValue;
+        } else {
+          delete property.value;
+        }
+      }
+      if (remainingConditionalValues === void 0) {
+        delete property.conditions;
+      } else {
+        property.conditions = remainingConditionalValues;
       }
-      property.conditions = remainingConditionalValues;
     }
   });
 }
@@ -2233,7 +2241,7 @@ function localize(options) {
     const { type, node, actions } = context;
     if (type !== "component") {
       if (isUsingModernOptions) {
-        localizeProperties(node.fields, locale);
+        localizeProperties(node, locale, vizControlLocaleRule);
       }
       return;
     }
@@ -2246,11 +2254,6 @@ 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 });
@@ -2263,7 +2266,7 @@ function localize(options) {
         replaceComponent.forEach((component) => {
           removeLocaleProperty(component);
           if (isUsingModernOptions) {
-            localizeProperties(getPropertiesValue(component), locale);
+            localizeProperties(component, locale, vizControlLocaleRule);
           }
         });
         const [first, ...rest] = replaceComponent;
@@ -2275,7 +2278,7 @@ function localize(options) {
         actions.remove();
       }
     } else if (isUsingModernOptions) {
-      localizeProperties(getPropertiesValue(node), locale);
+      localizeProperties(node, locale, vizControlLocaleRule);
     }
   });
 }
@@ -2294,24 +2297,36 @@ function removeLocaleProperty(component) {
     }
   }
 }
-function localizeProperties(properties, locale) {
+function localizeProperties(node, locale, rules) {
+  const properties = getPropertiesValue(node);
   if (!properties) {
     return void 0;
   }
-  Object.entries(properties).forEach(([key, property]) => {
-    var _a;
+  Object.entries(properties).forEach(([propertyId, propertyValue]) => {
+    var _a, _b;
     if (!locale) {
-      delete property.locales;
+      delete propertyValue.locales;
+      delete propertyValue.localesConditions;
     }
-    const currentLocaleValue = locale ? (_a = property.locales) == null ? void 0 : _a[locale] : void 0;
+    const currentLocaleValue = locale ? (_a = propertyValue.locales) == null ? void 0 : _a[locale] : void 0;
     if (currentLocaleValue !== void 0) {
-      property.value = currentLocaleValue;
+      propertyValue.value = currentLocaleValue;
+    }
+    const currentLocaleConditionalValues = locale ? (_b = propertyValue.localesConditions) == null ? void 0 : _b[locale] : void 0;
+    if (currentLocaleConditionalValues !== void 0) {
+      propertyValue.conditions = currentLocaleConditionalValues;
     }
-    delete property.locales;
-    if (property.value === void 0) {
-      delete properties[key];
+    delete propertyValue.locales;
+    delete propertyValue.localesConditions;
+    if (propertyValue.value === void 0 && propertyValue.conditions === void 0) {
+      delete properties[propertyId];
     }
   });
+  evaluateWalkTreePropertyCriteria({
+    node,
+    rules,
+    keepIndeterminate: true
+  });
 }
 
 // src/enhancement/UniqueBatchEntries.ts

package/dist/index.mjs

@@ -1868,7 +1868,7 @@ function evaluateWalkTreePropertyCriteria({
         ...Object.keys((_b = property.localesConditions) != null ? _b : {})
       ];
       localesDefined.forEach((locale) => {
-        var _a2, _b2, _c2, _d, _e, _f, _g;
+        var _a2, _b2, _c2, _d, _e, _f;
         const { currentValue, remainingConditionalValues } = evaluatePropertyCriteria({
           baseValue: (_a2 = property.locales) == null ? void 0 : _a2[locale],
           conditionalValues: (_b2 = property.localesConditions) == null ? void 0 : _b2[locale],
@@ -1876,25 +1876,25 @@ function evaluateWalkTreePropertyCriteria({
           simplifyCriteria: true,
           keepIndeterminate
         });
-        if (currentValue === null) {
+        if (currentValue === null || currentValue === void 0) {
           (_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 = {};
+          (_d = property.locales) != null ? _d : property.locales = {};
           property.locales[locale] = currentValue;
         }
         if (!(remainingConditionalValues == null ? void 0 : remainingConditionalValues.length)) {
-          (_f = property.localesConditions) == null ? true : delete _f[locale];
+          (_e = property.localesConditions) == null ? true : delete _e[locale];
         } else {
-          (_g = property.localesConditions) != null ? _g : property.localesConditions = {};
+          (_f = property.localesConditions) != null ? _f : property.localesConditions = {};
           property.localesConditions[locale] = remainingConditionalValues;
         }
       });
       if (!Object.keys((_c = property.localesConditions) != null ? _c : {}).length) {
         delete property.localesConditions;
       }
+      if (!property.locales && !property.localesConditions) {
+        delete properties[propertyName];
+      }
     } else {
       const { currentValue, remainingConditionalValues } = evaluatePropertyCriteria({
         baseValue: property.value,
@@ -1906,9 +1906,17 @@ function evaluateWalkTreePropertyCriteria({
       if (currentValue === null) {
         delete properties[propertyName];
       } else {
-        property.value = currentValue;
+        if (currentValue !== void 0) {
+          property.value = currentValue;
+        } else {
+          delete property.value;
+        }
+      }
+      if (remainingConditionalValues === void 0) {
+        delete property.conditions;
+      } else {
+        property.conditions = remainingConditionalValues;
       }
-      property.conditions = remainingConditionalValues;
     }
   });
 }
@@ -2078,7 +2086,7 @@ function localize(options) {
     const { type, node, actions } = context;
     if (type !== "component") {
       if (isUsingModernOptions) {
-        localizeProperties(node.fields, locale);
+        localizeProperties(node, locale, vizControlLocaleRule);
       }
       return;
     }
@@ -2091,11 +2099,6 @@ 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 });
@@ -2108,7 +2111,7 @@ function localize(options) {
         replaceComponent.forEach((component) => {
           removeLocaleProperty(component);
           if (isUsingModernOptions) {
-            localizeProperties(getPropertiesValue(component), locale);
+            localizeProperties(component, locale, vizControlLocaleRule);
           }
         });
         const [first, ...rest] = replaceComponent;
@@ -2120,7 +2123,7 @@ function localize(options) {
         actions.remove();
       }
     } else if (isUsingModernOptions) {
-      localizeProperties(getPropertiesValue(node), locale);
+      localizeProperties(node, locale, vizControlLocaleRule);
     }
   });
 }
@@ -2139,24 +2142,36 @@ function removeLocaleProperty(component) {
     }
   }
 }
-function localizeProperties(properties, locale) {
+function localizeProperties(node, locale, rules) {
+  const properties = getPropertiesValue(node);
   if (!properties) {
     return void 0;
   }
-  Object.entries(properties).forEach(([key, property]) => {
-    var _a;
+  Object.entries(properties).forEach(([propertyId, propertyValue]) => {
+    var _a, _b;
     if (!locale) {
-      delete property.locales;
+      delete propertyValue.locales;
+      delete propertyValue.localesConditions;
     }
-    const currentLocaleValue = locale ? (_a = property.locales) == null ? void 0 : _a[locale] : void 0;
+    const currentLocaleValue = locale ? (_a = propertyValue.locales) == null ? void 0 : _a[locale] : void 0;
     if (currentLocaleValue !== void 0) {
-      property.value = currentLocaleValue;
+      propertyValue.value = currentLocaleValue;
+    }
+    const currentLocaleConditionalValues = locale ? (_b = propertyValue.localesConditions) == null ? void 0 : _b[locale] : void 0;
+    if (currentLocaleConditionalValues !== void 0) {
+      propertyValue.conditions = currentLocaleConditionalValues;
     }
-    delete property.locales;
-    if (property.value === void 0) {
-      delete properties[key];
+    delete propertyValue.locales;
+    delete propertyValue.localesConditions;
+    if (propertyValue.value === void 0 && propertyValue.conditions === void 0) {
+      delete properties[propertyId];
     }
   });
+  evaluateWalkTreePropertyCriteria({
+    node,
+    rules,
+    keepIndeterminate: true
+  });
 }
 
 // src/enhancement/UniqueBatchEntries.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniformdev/canvas",
-  "version": "19.181.1",
+  "version": "19.181.2",
   "description": "Common functionality and types for Uniform Canvas",
   "license": "SEE LICENSE IN LICENSE.txt",
   "main": "./dist/index.js",
@@ -38,9 +38,9 @@
     "pusher-js": "8.2.0"
   },
   "dependencies": {
-    "@uniformdev/assets": "19.181.1",
-    "@uniformdev/context": "19.181.1",
-    "@uniformdev/richtext": "19.181.1",
+    "@uniformdev/assets": "19.181.2",
+    "@uniformdev/context": "19.181.2",
+    "@uniformdev/richtext": "19.181.2",
     "immer": "10.1.1"
   },
   "files": [
@@ -49,5 +49,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "b9bb017045427d3387878b65a7bddb8ae4ef1140"
+  "gitHead": "89ffb2d1ab09ac3cb09b3928194352e358ef7f07"
 }