format

packages/core/src/common/index.ts

@@ -2,7 +2,7 @@ import Backbone from 'backbone';
 import { HTMLParserOptions } from '../parser/config/config';
 export { default as $ } from '../utils/cash-dom';
 
-interface NOOP { }
+interface NOOP {}
 
 export const collectionEvents = 'add remove reset change';
 
@@ -62,7 +62,7 @@ export interface Dimensions {
   width: number;
 }
 
-export interface BoxRect extends Coordinates, Dimensions { }
+export interface BoxRect extends Coordinates, Dimensions {}
 
 export type ElementRect = {
   top: number;
@@ -77,13 +77,13 @@ export type CombinedModelConstructorOptions<
 > = Backbone.ModelConstructorOptions<M> & E;
 
 export interface ViewOptions<TModel extends Model | undefined = Model, TElement extends Element = HTMLElement>
-  extends Backbone.ViewOptions<TModel, TElement> { }
+  extends Backbone.ViewOptions<TModel, TElement> {}
 
-export class Model<T extends ObjectHash = any, S = SetOptions, E = any> extends Backbone.Model<T, S, E> { }
+export class Model<T extends ObjectHash = any, S = SetOptions, E = any> extends Backbone.Model<T, S, E> {}
 
-export class Collection<T extends Model = Model> extends Backbone.Collection<T> { }
+export class Collection<T extends Model = Model> extends Backbone.Collection<T> {}
 
-export class View<T extends Model | undefined = Model, E extends Element = HTMLElement> extends Backbone.View<T, E> { }
+export class View<T extends Model | undefined = Model, E extends Element = HTMLElement> extends Backbone.View<T, E> {}
 
 export type PickMatching<T, V> = { [K in keyof T as T[K] extends V ? K : never]: T[K] };
 

packages/core/src/dom_components/model/Component.ts

@@ -54,12 +54,12 @@ import {
 import { ComponentDynamicValueListener } from './ComponentDynamicValueListener';
 import { DynamicValueWatcher } from './DynamicValueWatcher';
 
-export interface IComponent extends ExtractMethods<Component> { }
+export interface IComponent extends ExtractMethods<Component> {}
 export interface DynamicWatchersOptions {
   skipWatcherUpdates?: boolean;
 }
-export interface SetAttrOptions extends SetOptions, UpdateStyleOptions, DynamicWatchersOptions { }
+export interface SetAttrOptions extends SetOptions, UpdateStyleOptions, DynamicWatchersOptions {}
-export interface ComponentSetOptions extends SetOptions, DynamicWatchersOptions { }
+export interface ComponentSetOptions extends SetOptions, DynamicWatchersOptions {}
 
 const escapeRegExp = (str: string) => {
   return str.replace(/[|\\{}()[\]^$+*?.]/g, '\\$&');
@@ -226,12 +226,12 @@ export default class Component extends StyleableModel<ComponentProperties> {
     return this.frame?.getPage();
   }
 
-  preInit() { }
+  preInit() {}
 
   /**
    * Hook method, called once the model is created
    */
-  init() { }
+  init() {}
 
   /**
    * Hook method, called when the model has been updated (eg. updated some model's property)
@@ -239,12 +239,12 @@ export default class Component extends StyleableModel<ComponentProperties> {
    * @param {*} value Property value, if triggered after some property update
    * @param {*} previous Property previous value, if triggered after some property update
    */
-  updated(property: string, value: any, previous: any) { }
+  updated(property: string, value: any, previous: any) {}
 
   /**
    * Hook method, called once the model has been removed
    */
-  removed() { }
+  removed() {}
 
   em!: EditorModel;
   opt!: ComponentOptions;
@@ -1575,14 +1575,14 @@ export default class Component extends StyleableModel<ComponentProperties> {
     const dynamicTraitsObj = this.componentDVListener.getTraitsDefs();
     const keys = Object.keys(dynamicTraitsObj);
     const serializedTraits: ObjectAny[] = [];
-    keys.forEach(key => {
+    keys.forEach((key) => {
       const traitJSON = this.getTrait(key).toJSON();
       const traitValue = dynamicTraitsObj[key];
       serializedTraits.push({
         ...traitJSON,
         name: key,
-        value: traitValue
+        value: traitValue,
-      })
+      });
     });
     if (serializedTraits.length > 0) {
       obj[dynamicAttrKey] = serializedTraits;

packages/core/src/dom_components/model/ComponentDynamicValueListener.ts

@@ -35,20 +35,18 @@ export class ComponentDynamicValueListener {
     }
 
     if (Array.isArray(values[dynamicAttrKey]) && values[dynamicAttrKey].length > 0) {
-      values.traits = values.traits
+      values.traits = values.traits ? [...values[dynamicAttrKey], ...values.traits] : values[dynamicAttrKey];
-        ? [...values[dynamicAttrKey], ...values.traits]
-        : values[dynamicAttrKey];
     }
 
     if (values.traits) {
       const evaluatedTraitsValues = DynamicValueWatcher.getStaticValues(
         values.traits.map((trait: any) => trait.value),
-        em
+        em,
       );
 
       props.traits = values.traits.map((trait: any, index: number) => ({
         ...trait,
-        value: evaluatedTraitsValues[index]
+        value: evaluatedTraitsValues[index],
       }));
     }
 
@@ -80,7 +78,7 @@ export class ComponentDynamicValueListener {
   }
 
   watchTraits(traits: (string | ObjectAny)[]) {
-    const evaluatedTraits: { [key: string]: ObjectAny } = {}
+    const evaluatedTraits: { [key: string]: ObjectAny } = {};
     traits?.forEach((trait: any) => {
       if (typeof trait === 'string' || !trait.name) {
         return;

packages/core/test/specs/data_sources/model/conditional_variables/ConditionalTraits.ts

@@ -176,18 +176,20 @@ describe('TraitConditionalVariable', () => {
               component: {
                 components: [
                   {
-                    [dynamicAttrKey]: [{
+                    [dynamicAttrKey]: [
-                      name: 'dynamicTrait',
+                      {
-                      value: {
+                        name: 'dynamicTrait',
-                        condition: {
+                        value: {
-                          left: 0,
+                          condition: {
-                          operator: '>',
+                            left: 0,
-                          right: -1,
+                            operator: '>',
+                            right: -1,
+                          },
+                          ifTrue: 'Positive',
+                          type: 'conditional-variable',
                         },
-                        ifTrue: 'Positive',
-                        type: 'conditional-variable',
                       },
-                    }],
+                    ],
                     type: 'text',
                   },
                 ],