Refactor/use property decorator

packages/survey-core/src/calculatedValue.ts

@@ -2,7 +2,7 @@ import { HashTable, Helpers } from "./helpers";
 import { Base } from "./base";
 import { ISurvey, ISurveyVariables } from "./base-interfaces";
 import { ExpressionRunner } from "./conditions";
-import { Serializer } from "./jsonobject";
+import { property, Serializer } from "./jsonobject";
 
 /**
  * The calculated value is a way to define the variable in Survey Creator.
@@ -24,6 +24,12 @@ export class CalculatedValue extends Base {
       this.expression = expression;
     }
   }
+  protected override onPropertyValueChanged(name: string, oldValue: any, newValue: any): void {
+    super.onPropertyValueChanged(name, oldValue, newValue);
+    if (name === "expression") {
+      this.rerunExpression();
+    }
+  }
   public setOwner(data: ISurveyVariables) {
     this.data = data;
     this.rerunExpression();
@@ -42,32 +48,16 @@ export class CalculatedValue extends Base {
   /**
    * The calculated value name. It should be non empty and unique.
    */
-  public get name(): string {
-    return this.getPropertyValue("name") || "";
-  }
-  public set name(val: string) {
-    this.setPropertyValue("name", val);
-  }
+  @property() name: string;
   /**
    * Set this property to true to include the non-empty calculated value into survey result, survey.data property.
    */
-  public get includeIntoResult(): boolean {
-    return this.getPropertyValue("includeIntoResult");
-  }
-  public set includeIntoResult(val: boolean) {
-    this.setPropertyValue("includeIntoResult", val);
-  }
+  @property() includeIntoResult: boolean;
   /**
    * The Expression that used to calculate the value. You may use standard operators like +, -, * and /, squares (). Here is the example of accessing the question value {questionname}.
    * Example: "({quantity} * {price}) * (100 - {discount}) / 100"
    */
-  public get expression(): string {
-    return this.getPropertyValue("expression") || "";
-  }
-  public set expression(val: string) {
-    this.setPropertyValue("expression", val);
-    this.rerunExpression();
-  }
+  @property() expression: string;
   public locCalculation() {
     this.expressionIsRunning = true;
   }

packages/survey-core/src/choicesRestful.ts

@@ -1,7 +1,7 @@
 import { Base } from "./base";
 import { ITextProcessor, IQuestion, ISurvey } from "./base-interfaces";
 import { ItemValue } from "./itemvalue";
-import { Serializer, JsonObjectProperty } from "./jsonobject";
+import { Serializer, JsonObjectProperty, property } from "./jsonobject";
 import { WebRequestError, WebRequestEmptyError } from "./error";
 import { IBeforeRequestChoicesOptions, settings } from "./settings";
 import { SurveyError } from "./survey-error";
@@ -143,8 +143,19 @@ export class ChoicesRestful extends Base {
   };
   protected onPropertyValueChanged(name: string, oldValue: any, newValue: any): void {
     super.onPropertyValueChanged(name, oldValue, newValue);
-    if (name === "url" && this.owner) {
-      (<Base><any>this.owner).setPropertyValue("isUsingRestful", !!newValue);
+    if (name === "url") {
+      if (this.owner) {
+        (<Base><any>this.owner).setPropertyValue("isUsingRestful", !!newValue);
+      }
+      this.isUsingCacheFromUrl = undefined;
+      if (!newValue) return;
+      if (newValue.indexOf(ChoicesRestful.cacheText) > -1) {
+        this.isUsingCacheFromUrl = true;
+      } else {
+        if (newValue.indexOf(ChoicesRestful.noCacheText) > -1) {
+          this.isUsingCacheFromUrl = false;
+        }
+      }
     }
   }
   public getSurvey(live: boolean = false): ISurvey {
@@ -388,21 +399,7 @@ export class ChoicesRestful extends Base {
    * @see valueName
    * @see titleName
    */
-  public get url(): string {
-    return this.getPropertyValue("url") || "";
-  }
-  public set url(val: string) {
-    this.setPropertyValue("url", val);
-    this.isUsingCacheFromUrl = undefined;
-    if (!val) return;
-    if (val.indexOf(ChoicesRestful.cacheText) > -1) {
-      this.isUsingCacheFromUrl = true;
-    } else {
-      if (val.indexOf(ChoicesRestful.noCacheText) > -1) {
-        this.isUsingCacheFromUrl = false;
-      }
-    }
-  }
+  @property({ returnValue: "" }) url: string;
   /**
    * Path to the array of choices. The following path separators are allowed: semicolon `;`, comma `,`.
    *
@@ -420,13 +417,7 @@ export class ChoicesRestful extends Base {
    * @see valueName
    * @see titleName
    */
-
-  public get path(): string {
-    return this.getPropertyValue("path") || "";
-  }
-  public set path(val: string) {
-    this.setPropertyValue("path", val);
-  }
+  @property({ returnValue: "" }) path: string;
   /**
    * Specifies which property in the obtained data object contains choice values.
    *
@@ -436,52 +427,29 @@ export class ChoicesRestful extends Base {
    * @see path
    * @see titleName
    */
-
-  public get valueName(): string {
-    return this.getPropertyValue("valueName") || "";
-  }
-  public set valueName(val: string) {
-    this.setPropertyValue("valueName", val);
-  }
+  @property({ returnValue: "" }) valueName: string;
   /**
    * Specifies which property in the obtained data object contains display texts for choices.
    *
    * @see url
    * @see path
    * @see valueName
    */
-
-  public get titleName(): string {
-    return this.getPropertyValue("titleName") || "";
-  }
-  public set titleName(val: string) {
-    this.setPropertyValue("titleName", val);
-  }
-
+  @property({ returnValue: "" }) titleName: string;
   /**
    * Specifies which property in the obtained data object contains image URLs. Used only in [Image Picker](https://surveyjs.io/Examples/Library?id=questiontype-imagepicker) questions.
    *
    * @see url
    * @see path
    * @see valueName
    */
-  public get imageLinkName(): string {
-    return this.getPropertyValue("imageLinkName") || "";
-  }
-  public set imageLinkName(val: string) {
-    this.setPropertyValue("imageLinkName", val);
-  }
+  @property({ returnValue: "" }) imageLinkName: string;
   /**
    * Specifies whether the service is allowed to return an empty response or an empty array in a response.
    *
    * Default value: `false`
    */
-  public get allowEmptyResponse(): boolean {
-    return this.getPropertyValue("allowEmptyResponse");
-  }
-  public set allowEmptyResponse(val: boolean) {
-    this.setPropertyValue("allowEmptyResponse", val);
-  }
+  @property() allowEmptyResponse: boolean;
   public get attachOriginalItems(): boolean {
     return this.attachData;
   }
@@ -522,12 +490,7 @@ export class ChoicesRestful extends Base {
    * }
    * ```
    */
-  public get attachData(): boolean {
-    return this.getPropertyValue("attachData");
-  }
-  public set attachData(val: boolean) {
-    this.setPropertyValue("attachData", val);
-  }
+  @property() attachData: boolean;
   public get itemValueType(): string {
     if (!this.owner) return "itemvalue";
     var prop = Serializer.findProperty(this.owner.getType(), "choices");

packages/survey-core/src/expressionItems.ts

@@ -26,12 +26,7 @@ export class ExpressionItem extends Base implements ILocalizableOwner {
   /**
    * The expression property. If this expression returns true, then survey will use html property to show on complete page.
    */
-  public get expression(): string {
-    return this.getPropertyValue("expression", "");
-  }
-  public set expression(val: string) {
-    this.setPropertyValue("expression", val);
-  }
+  @property({ returnValue: "" }) expression: string;
   get locHtml(): LocalizableString {
     return this.getLocalizableString("html");
   }

packages/survey-core/src/flowpanel.ts

@@ -30,13 +30,8 @@ export class FlowPanelModel extends PanelModel {
     super.onSurveyLoad();
     this.onContentChanged();
   }
-  @property({ localizable: true }) content;
-  public get html(): string {
-    return this.getPropertyValue("html", "");
-  }
-  public set html(val: string) {
-    this.setPropertyValue("html", val);
-  }
+  @property({ localizable: true }) content: string;
+  @property ({ returnValue: "" }) html: string;
   protected onContentChanged(): any {
     var html = "";
     if (!!this.onCustomHtmlProducing) {

packages/survey-core/src/itemvalue.ts

@@ -523,8 +523,7 @@ export class ItemValue extends BaseAction implements ILocalizableOwner, IShortcu
   }
   protected setLocTitle(val: LocalizableString): void {}
   protected setTitle(val: string): void {}
-  public get icon(): string { return this.getPropertyValue("icon", ""); }
-  public set icon(val: string) { this.setPropertyValue("icon", val); }
+  @property({ defaultValue: "" }) icon: string;
 }
 
 Base.createItemValue = function (source: any, type?: string): any {

packages/survey-core/src/jsonobject.ts

@@ -1,4 +1,3 @@
-import { getLocaleString } from "./surveyStrings";
 import { Base, ComputedUpdater } from "./base";
 import { Helpers, HashTable } from "./helpers";
 import { ILoadFromJSONOptions, ISaveToJSONOptions } from "./base-interfaces";
@@ -8,10 +7,14 @@ export interface IPropertyDecoratorOptions<T = any> {
   defaultValue?: T;
   defaultSource?: string;
   getDefaultValue?: (objectInstance?: any) => T;
+  calcFunc?: (objectInstance?: any) => T;
+  returnValue?: T;
   localizable?:
   | { name?: string, onCreate?: (obj: Base, locStr: any) => void, defaultStr?: string | boolean, markdown?: boolean }
   | boolean;
   onSet?: (val: T, objectInstance: any, prevVal?: T) => void;
+  onSetting?: (val: T, objectInstance: any, prevVal?: T) => T;
+  isLowerCase?: boolean;
 }
 function getLocalizablePropertyName(propertyName: string): string {
   return "loc" + propertyName.charAt(0).toUpperCase() + propertyName.slice(1);
@@ -42,19 +45,35 @@ export function property(options: IPropertyDecoratorOptions = {}) {
           //   ConsoleWarnings.error("remove defaultValue from @property for class " + target.getType() + " property name is " + key);
           // }
           let defaultVal = null;
+          let returnValue = undefined;
+          let calcFunc = undefined;
           if (!!options) {
+            returnValue = options.returnValue;
+            if (options.calcFunc) {
+              calcFunc = () => options.calcFunc(this);
+            }
             if (typeof options.getDefaultValue === "function") {
               defaultVal = options.getDefaultValue(this);
             }
             if (options.defaultValue !== undefined) {
               defaultVal = options.defaultValue;
             }
           }
-          return this.getPropertyValue(key, defaultVal);
+          const res = this.getPropertyValue(key, defaultVal, calcFunc);
+          return returnValue !== undefined && res === undefined ? returnValue : res;
         },
         set: function (val: any) {
-          const newValue = processComputedUpdater(this, val);
+          let newValue = processComputedUpdater(this, val);
           const prevValue = this.getPropertyValue(key);
+          if (!!options) {
+            if (options.isLowerCase) {
+              if (!newValue || typeof newValue !== "string") return;
+              newValue = newValue.toLowerCase();
+            }
+            if (!!options.onSetting) {
+              newValue = options.onSetting(newValue, this, prevValue);
+            }
+          }
           if (newValue !== prevValue) {
             this.setPropertyValue(key, newValue);
             if (!!options && options.onSet) {