fix(renderer): stop performing value conversions (#806)

sis0k0 · web-flow · commit 354074d60432 · 2017-05-19T20:31:10.000+03:00
These conversions are now handled by core modules. The conversions performed in the renderer and value accessors are no longer needed. fixes #799
diff --git a/nativescript-angular/common/utils.ts b/nativescript-angular/common/utils.ts
diff --git a/nativescript-angular/directives/tab-view.ts b/nativescript-angular/directives/tab-view.ts
@@ -10,7 +10,6 @@ import {
 import { TabView, TabViewItem } from "tns-core-modules/ui/tab-view";
 
 import { CommentNode } from "../element-types";
-import { convertToInt } from "../common/utils";
 import { rendererLog } from "../trace";
 import { isBlank } from "../lang-facade";
 
@@ -28,7 +27,7 @@ export class TabViewDirective implements AfterViewInit {
     }
 
     set selectedIndex(value) {
-        this._selectedIndex = convertToInt(value);
+        this._selectedIndex = value;
         if (this.viewInitialized) {
             this.tabView.selectedIndex = this._selectedIndex;
         }
diff --git a/nativescript-angular/lang-facade.ts b/nativescript-angular/lang-facade.ts
@@ -11,10 +11,6 @@ export function isBlank(obj: any): boolean {
   return obj === undefined || obj === null;
 }
 
-export function isNumber(obj: any): boolean {
-  return typeof obj === 'number';
-}
-
 export function isDate(obj: any): obj is Date {
   return obj instanceof Date && !isNaN(obj.valueOf());
 }
diff --git a/nativescript-angular/value-accessors/checked-value-accessor.ts b/nativescript-angular/value-accessors/checked-value-accessor.ts
@@ -1,6 +1,5 @@
 import { Directive, ElementRef, forwardRef, HostListener } from "@angular/core";
 import { NG_VALUE_ACCESSOR } from "@angular/forms";
-import { isBlank } from "../lang-facade";
 import { BaseValueAccessor } from "./base-value-accessor";
 import { Switch } from "tns-core-modules/ui/switch";
 
@@ -34,15 +33,7 @@ export class CheckedValueAccessor extends BaseValueAccessor<Switch> { // tslint:
     }
 
     writeValue(value: any): void {
-        let normalizedValue = false;
-        if (!isBlank(value)) {
-            if (typeof value === "string") {
-                normalizedValue = value.toLowerCase() === "true" ? true : false;
-            } else {
-                normalizedValue = !!value;
-            }
-        }
-        this.view.checked = normalizedValue;
+        this.view.checked = value;
     }
 
     registerOnTouched(fn: () => void): void { this.onTouched = fn; }
diff --git a/nativescript-angular/value-accessors/date-value-accessor.ts b/nativescript-angular/value-accessors/date-value-accessor.ts
@@ -1,6 +1,5 @@
 import { Directive, ElementRef, forwardRef, HostListener } from "@angular/core";
 import { NG_VALUE_ACCESSOR } from "@angular/forms";
-import { isBlank, isDate } from "../lang-facade";
 import { BaseValueAccessor } from "./base-value-accessor";
 import { DatePicker } from "tns-core-modules/ui/date-picker";
 
@@ -34,19 +33,7 @@ export class DateValueAccessor extends BaseValueAccessor<DatePicker> { // tslint
     }
 
     writeValue(value: any): void {
-        let normalizedValue = isBlank(value) ? new Date() : value;
-        if (!isDate(normalizedValue)) {
-            if (typeof normalizedValue === "string") {
-                normalizedValue = new Date(normalizedValue);
-            } else if (typeof normalizedValue === "number") {
-                normalizedValue = new Date(normalizedValue);
-            }
-
-            if (!isDate(normalizedValue)) {
-                normalizedValue = new Date();
-            }
-        }
-        this.view.date = normalizedValue;
+        this.view.date = value;
     }
 
     registerOnTouched(fn: () => void): void { this.onTouched = fn; }
diff --git a/nativescript-angular/value-accessors/number-value-accessor.ts b/nativescript-angular/value-accessors/number-value-accessor.ts
@@ -1,6 +1,5 @@
 import { Directive, ElementRef, forwardRef, HostListener } from "@angular/core";
 import { NG_VALUE_ACCESSOR } from "@angular/forms";
-import { isBlank, isNumber } from "../lang-facade";
 import { BaseValueAccessor } from "./base-value-accessor";
 import { Slider } from "tns-core-modules/ui/slider";
 
@@ -34,18 +33,7 @@ export class NumberValueAccessor extends BaseValueAccessor<Slider> { // tslint:d
     }
 
     writeValue(value: any): void {
-        let normalizedValue;
-        if (isBlank(value)) {
-            normalizedValue = 0;
-        } else {
-            if (isNumber(value)) {
-                normalizedValue = value;
-            } else {
-                let parsedValue = Number(value);
-                normalizedValue = isNaN(parsedValue) ? 0 : parsedValue;
-            }
-        }
-        this.view.value = normalizedValue;
+        this.view.value = value;
     }
 
     registerOnTouched(fn: () => void): void { this.onTouched = fn; }
diff --git a/nativescript-angular/value-accessors/selectedIndex-value-accessor.ts b/nativescript-angular/value-accessors/selectedIndex-value-accessor.ts
@@ -2,7 +2,6 @@ import { Directive, ElementRef, forwardRef, AfterViewInit, HostListener } from "
 import { NG_VALUE_ACCESSOR } from "@angular/forms";
 import { BaseValueAccessor } from "./base-value-accessor";
 import { View } from "tns-core-modules/ui/core/view";
-import { convertToInt } from "../common/utils";
 
 const SELECTED_INDEX_VALUE_ACCESSOR = {provide: NG_VALUE_ACCESSOR,
     useExisting: forwardRef(() => SelectedIndexValueAccessor), multi: true};
@@ -35,19 +34,19 @@ export class SelectedIndexValueAccessor extends BaseValueAccessor<SelectableView
         super(elementRef.nativeElement);
     }
 
-    private _normalizedValue: number;
+    private value: number;
     private viewInitialized: boolean;
 
     writeValue(value: any): void {
-        this._normalizedValue = convertToInt(value);
+        this.value = value;
         if (this.viewInitialized) {
-            this.view.selectedIndex = this._normalizedValue;
+            this.view.selectedIndex = this.value;
         }
     }
 
     ngAfterViewInit() {
         this.viewInitialized = true;
-        this.view.selectedIndex = this._normalizedValue;
+        this.view.selectedIndex = this.value;
     }
 
     registerOnTouched(fn: () => void): void { this.onTouched = fn; }
diff --git a/nativescript-angular/value-accessors/text-value-accessor.ts b/nativescript-angular/value-accessors/text-value-accessor.ts
@@ -1,6 +1,5 @@
 import { Directive, ElementRef, forwardRef, HostListener } from "@angular/core";
 import { NG_VALUE_ACCESSOR } from "@angular/forms";
-import { isBlank } from "../lang-facade";
 import { BaseValueAccessor } from "./base-value-accessor";
 import { View } from "tns-core-modules/ui/core/view";
 
@@ -36,8 +35,7 @@ export class TextValueAccessor extends BaseValueAccessor<TextView> { // tslint:d
     }
 
     writeValue(value: any): void {
-        let normalizedValue = isBlank(value) ? "" : value.toString();
-        this.view.text = normalizedValue;
+        this.view.text = value;
     }
 
     registerOnTouched(fn: () => void): void { this.onTouched = fn; }
diff --git a/nativescript-angular/value-accessors/time-value-accessor.ts b/nativescript-angular/value-accessors/time-value-accessor.ts
@@ -1,6 +1,5 @@
 import { Directive, ElementRef, forwardRef, HostListener } from "@angular/core";
 import { NG_VALUE_ACCESSOR } from "@angular/forms";
-import { isBlank, isDate } from "../lang-facade";
 import { BaseValueAccessor } from "./base-value-accessor";
 import { TimePicker } from "tns-core-modules/ui/time-picker";
 
@@ -34,18 +33,7 @@ export class TimeValueAccessor extends BaseValueAccessor<TimePicker> { // tslint
     }
 
     writeValue(value: any): void {
-        let normalizedValue = isBlank(value) ? new Date() : value;
-        if (!isDate(normalizedValue)) {
-            if (typeof normalizedValue === "string") {
-                normalizedValue = new Date(normalizedValue);
-            } else if (typeof normalizedValue === "number") {
-                normalizedValue = new Date(normalizedValue);
-            }
-            if (!isDate(normalizedValue)) {
-                normalizedValue = new Date();
-            }
-        }
-        this.view.time = normalizedValue;
+        this.view.time = value;
     }
 
     registerOnTouched(fn: () => void): void { this.onTouched = fn; }
diff --git a/nativescript-angular/view-util.ts b/nativescript-angular/view-util.ts
@@ -207,41 +207,32 @@ export class ViewUtil {
 
 
     private setPropertyInternal(view: NgView, attributeName: string, value: any): void {
-        traceLog("Setting attribute: " + attributeName);
-
-        let propMap = this.getProperties(view);
+        traceLog(`Setting attribute: ${attributeName}=${value} to ${view}`);
 
         if (attributeName === "class") {
             this.setClasses(view, value);
-        } else if (XML_ATTRIBUTES.indexOf(attributeName) !== -1) {
-            view._applyXmlAttribute(attributeName, value);
-        } else if (propMap.has(attributeName)) {
-            // We have a lower-upper case mapped property.
-            let propertyName = propMap.get(attributeName);
-            view[propertyName] = this.convertValue(value);
-        } else {
-            // Unknown attribute value -- just set it to our object as is.
-            view[attributeName] = this.convertValue(value);
+            return;
         }
-    }
 
-    private convertValue(value: any): any {
-        if (typeof (value) !== "string" || value === "") {
-            return value;
+        if (XML_ATTRIBUTES.indexOf(attributeName) !== -1) {
+            view._applyXmlAttribute(attributeName, value);
+            return;
         }
 
-        let valueAsNumber = +value;
-        if (!isNaN(valueAsNumber)) {
-            return valueAsNumber;
-        } else if (value && (value.toLowerCase() === "true" || value.toLowerCase() === "false")) {
-            return value.toLowerCase() === "true" ? true : false;
-        } else {
-            return value;
+        const propMap = this.getProperties(view);
+        const propertyName = propMap.get(attributeName);
+        if (propertyName) {
+            // We have a lower-upper case mapped property.
+            view[propertyName] = value;
+            return;
         }
+
+        // Unknown attribute value -- just set it to our object as is.
+        view[attributeName] = value;
     }
 
     private getProperties(instance: any): Map<string, string> {
-        let type = instance && instance.constructor;
+        const type = instance && instance.constructor;
         if (!type) {
             return new Map<string, string>();
         }
@@ -253,6 +244,7 @@ export class ViewUtil {
             }
             propertyMaps.set(type, propMap);
         }
+
         return propertyMaps.get(type);
     }
 
diff --git a/tests/app/tests/property-sets.ts b/tests/app/tests/property-sets.ts
@@ -36,20 +36,24 @@ describe("setting View properties", () => {
         assert.equal("blah", view.stringValue);
     });
 
-    it("converts number values", () => {
+    it("doesn\'t convert number values", () => {
         let view = new TestView();
         viewUtil.setProperty(view, "numValue", "42");
-        assert.strictEqual(42, view.numValue);
+        assert.strictEqual("42", view.numValue);
+
+        viewUtil.setProperty(view, "numValue", "42.");
+        assert.strictEqual("42.", view.numValue);
+
         viewUtil.setProperty(view, "numValue", 0);
         assert.strictEqual(0, view.numValue);
     });
 
-    it("converts boolean values", () => {
+    it("doesn\'t convert boolean values", () => {
         let view = new TestView();
         viewUtil.setProperty(view, "boolValue", "true");
-        assert.strictEqual(true, view.boolValue);
+        assert.strictEqual("true", view.boolValue);
         viewUtil.setProperty(view, "boolValue", "false");
-        assert.strictEqual(false, view.boolValue);
+        assert.strictEqual("false", view.boolValue);
     });
 
     it("sets style values", () => {
diff --git a/tests/app/tests/value-accessor-tests.ts b/tests/app/tests/value-accessor-tests.ts
@@ -78,72 +78,62 @@ describe("two-way binding via ng-model", () => {
         assert.strictEqual(42, accessor.view.value);
 
         accessor.writeValue("blah");
-        assert.strictEqual(0, accessor.view.value, "default to 0 on parse errors");
+        assert.notEqual(accessor.view.value, accessor.view.value, "defaults to NaN on parse errors");
     });
 
     it("converts strings to bools", () => {
         const accessor = new TestCheckedValueAccessor();
 
         accessor.writeValue(null);
-        assert.strictEqual(false, accessor.view.checked, "default to false on empty");
+        assert.strictEqual(null, accessor.view.checked, "default to null on empty");
 
         accessor.writeValue("true");
         assert.strictEqual(true, accessor.view.checked);
 
-        accessor.writeValue("blah");
-        assert.strictEqual(false, accessor.view.checked, "default to false on parse errors");
+        assert.throws(() => accessor.writeValue("blah"));
     });
 
     it("converts strings to dates", () => {
         const now = new Date();
         const accessor = new TestDateValueAccessor();
 
         accessor.writeValue(null);
-        assert.equal(formatDate(now), formatDate(accessor.view.date), "default to now on empty");
+        assert.equal(null, accessor.view.date, "default to null on empty");
 
         accessor.writeValue("2010-03-17");
         assert.equal(formatDate(new Date(2010, 2, 17)), formatDate(accessor.view.date));
-
-        accessor.writeValue("a fortnight ago");
-        assert.equal(formatDate(now), formatDate(accessor.view.date), "default to now on parse error");
     });
 
     it("converts strings to int selection", () => {
         const accessor = new TestSelectedIndexValueAccessor();
 
         accessor.writeValue(null);
         accessor.ngAfterViewInit();
-        assert.strictEqual(0, accessor.view.selectedIndex, "default to 0 on empty");
+        assert.strictEqual(null, accessor.view.selectedIndex, "default to null on empty");
 
         accessor.writeValue("3");
         accessor.ngAfterViewInit();
         assert.strictEqual(3, accessor.view.selectedIndex);
 
         accessor.writeValue("blah");
         accessor.ngAfterViewInit();
-        assert.strictEqual(0, accessor.view.selectedIndex, "default to 0 on parse errors");
+        assert.notEqual(accessor.view.selectedIndex, accessor.view.selectedIndex,
+            "default to NaN on parse errors");
     });
 
     it("converts strings to times", () => {
-        const now = new Date();
         const accessor = new TestTimeValueAccessor();
 
-        accessor.writeValue(null);
-        assert.equal(formatTime(now), formatTime(accessor.view.time), "default to now on empty");
-
-        accessor.writeValue("2010/03/17 12:54");
-        assert.equal(formatTime(new Date(2010, 2, 17, 12, 54)), formatTime(accessor.view.time));
-
-        accessor.writeValue("three hours from now");
-        assert.equal(formatTime(now), formatTime(accessor.view.time), "default to now on parse error");
+        assert.throws(() => accessor.writeValue(null));
+        assert.throws(() => accessor.writeValue("2010/03/17 12:54"));
+        assert.throws(() => accessor.writeValue("three hours from now"));
     });
 
     it("converts values to text", () => {
-        const now = new Date();
         const accessor = new TestTextValueAccessor();
 
         accessor.writeValue(null);
-        assert.equal("", accessor.view.text);
+        assert.equal(null, accessor.view.text, "defaults to null on empty");
 
         accessor.writeValue("blah");
         assert.equal("blah", accessor.view.text);
diff --git a/tests/package.json b/tests/package.json
@@ -69,6 +69,7 @@
     "appium-android": "tns build android && npm run run-appium-android",
     "run-appium-android": "nativescript-dev-appium android",
     "appium-ios-simulator": "tns build ios && nativescript-dev-appium ios-simulator",
-    "tslint": "tslint --project tsconfig.json --config tslint.json"
+    "tslint": "tslint --project tsconfig.json --config tslint.json",
+    "appium": "nativescript-dev-appium"
   }
 }
diff --git a/tests/references.d.ts b/tests/references.d.ts

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,6 @@ import {`
`10`	`10`	`import { TabView, TabViewItem } from "tns-core-modules/ui/tab-view";`
`11`	`11`
`12`	`12`	`import { CommentNode } from "../element-types";`
`13`		`-import { convertToInt } from "../common/utils";`
`14`	`13`	`import { rendererLog } from "../trace";`
`15`	`14`	`import { isBlank } from "../lang-facade";`
`16`	`15`
`@@ -28,7 +27,7 @@ export class TabViewDirective implements AfterViewInit {`
`28`	`27`	`}`
`29`	`28`
`30`	`29`	`set selectedIndex(value) {`
`31`		`- this._selectedIndex = convertToInt(value);`
	`30`	`+ this._selectedIndex = value;`
`32`	`31`	`if (this.viewInitialized) {`
`33`	`32`	`this.tabView.selectedIndex = this._selectedIndex;`
`34`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,10 +11,6 @@ export function isBlank(obj: any): boolean {`
`11`	`11`	`return obj === undefined \|\| obj === null;`
`12`	`12`	`}`
`13`	`13`
`14`		`-export function isNumber(obj: any): boolean {`
`15`		`- return typeof obj === 'number';`
`16`		`-}`
`17`		`-`
`18`	`14`	`export function isDate(obj: any): obj is Date {`
`19`	`15`	`return obj instanceof Date && !isNaN(obj.valueOf());`
`20`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`import { Directive, ElementRef, forwardRef, HostListener } from "@angular/core";`
`2`	`2`	`import { NG_VALUE_ACCESSOR } from "@angular/forms";`
`3`		`-import { isBlank } from "../lang-facade";`
`4`	`3`	`import { BaseValueAccessor } from "./base-value-accessor";`
`5`	`4`	`import { View } from "tns-core-modules/ui/core/view";`
`6`	`5`
`@@ -36,8 +35,7 @@ export class TextValueAccessor extends BaseValueAccessor<TextView> { // tslint:d`
`36`	`35`	`}`
`37`	`36`
`38`	`37`	`writeValue(value: any): void {`
`39`		`- let normalizedValue = isBlank(value) ? "" : value.toString();`
`40`		`- this.view.text = normalizedValue;`
	`38`	`+ this.view.text = value;`
`41`	`39`	`}`
`42`	`40`
`43`	`41`	`registerOnTouched(fn: () => void): void { this.onTouched = fn; }`