[upgraded] to TypeScript 2.4

Reviewers: O2 Material Motion, O3 Material JavaScript platform reviewers, #material_motion, featherless

Reviewed By: O2 Material Motion, #material_motion, featherless

Tags: #material_motion

Differential Revision: http://codereview.cc/D3256

package.json

@@ -44,7 +44,7 @@
     "sinon-chai": "2.9.0",
     "ts-loader": "2.0.3",
     "tslint": "4.5.1",
-    "typescript": "2.3",
+    "typescript": "2.4",
     "webpack": "2.3.1"
   }
 }

packages/core/src/Axis.ts

@@ -14,9 +14,9 @@
  *  under the License.
  */
 
-export const Axis = {
-  X: 'x',
-  Y: 'y',
-  ALL: 'all',
+export enum Axis {
+  X = 'x',
+  Y = 'y',
+  ALL = 'all',
 };
 export default Axis;

packages/core/src/GestureRecognitionState.ts

@@ -14,14 +14,14 @@
  *  under the License.
  */
 
-export const GestureRecognitionState = {
-  POSSIBLE: 'possible',
-  BEGAN: 'began',
-  CHANGED: 'changed',
-  ENDED: 'ended',
-  RECOGNIZED: 'ended',
-  CANCELLED: 'cancelled',
-  FAILED: 'failed',
+export enum GestureRecognitionState {
+  POSSIBLE = 'possible',
+  BEGAN = 'began',
+  CHANGED = 'changed',
+  ENDED = 'ended',
+  RECOGNIZED = 'ended',
+  CANCELLED = 'cancelled',
+  FAILED = 'failed',
 };
 
 export default GestureRecognitionState;

packages/core/src/State.ts

@@ -14,8 +14,8 @@
  *  under the License.
  */
 
-export const State = {
-  AT_REST: 'at_rest',
-  ACTIVE: 'active',
+export enum State {
+  AT_REST = 'at_rest',
+  ACTIVE = 'active',
 };
 export default State;

packages/core/src/ThresholdSide.ts

@@ -14,9 +14,9 @@
  *  under the License.
  */
 
-export const ThresholdSide = {
-  ABOVE: 'above',
-  WITHIN: 'within',
-  BELOW: 'below',
+export enum ThresholdSide {
+  ABOVE = 'above',
+  WITHIN = 'within',
+  BELOW = 'below',
 };
 export default ThresholdSide;

packages/core/src/interactions/Draggable.ts

@@ -46,21 +46,19 @@ import {
 } from '../GestureRecognitionState';
 
 export class Draggable {
-  // TODO: type this to be the values in the State enum
-  readonly state$: MotionProperty<string> = createProperty<string>({
+  readonly state$: MotionProperty<State> = createProperty<State>({
     initialValue: State.AT_REST,
   });
 
-  get state(): string {
+  get state(): State {
     return this.state$.read();
   }
 
-  // TODO: type this to be the values in the GestureRecognitionState enum
-  readonly recognitionState$: MotionProperty<string> = createProperty<string>({
+  readonly recognitionState$: MotionProperty<GestureRecognitionState> = createProperty<GestureRecognitionState>({
     initialValue: GestureRecognitionState.POSSIBLE,
   });
 
-  get recognitionState(): string {
+  get recognitionState(): GestureRecognitionState {
     return this.recognitionState$.read();
   }
 
@@ -76,16 +74,15 @@ export class Draggable {
     this.recognitionThreshold$.write(value);
   }
 
-  // TODO: type this to be the values in the Axis enum
-  readonly axis$: MotionProperty<string> = createProperty<string>({
+  readonly axis$: MotionProperty<Axis> = createProperty<Axis>({
     initialValue: Axis.ALL,
   });
 
-  get axis(): string {
+  get axis(): Axis {
     return this.axis$.read();
   }
 
-  set axis(value: string) {
+  set axis(value: Axis) {
     this.axis$.write(value);
   }
 

packages/core/src/interactions/NumericSpring.ts

@@ -18,6 +18,10 @@ import {
   MotionProperty,
 } from '../observables/MotionProperty';
 
+import {
+  State,
+} from '../State';
+
 import {
   ObservableWithMotionOperators,
 } from '../types';
@@ -57,8 +61,8 @@ export interface NumericSpring {
   readonly enabled$: MotionProperty<boolean>;
   enabled: boolean;
 
-  readonly state$: MotionProperty<string>;
-  readonly state: string;
+  readonly state$: MotionProperty<State>;
+  readonly state: State;
 
   value$: ObservableWithMotionOperators<number>;
 }

packages/core/src/interactions/Tossable.ts

@@ -47,12 +47,11 @@ export type TossableArgs = {
 };
 
 export class Tossable {
-  // TODO: type this to be the values in the State enum
-  readonly state$: MotionProperty<string> = createProperty<string>({
+  readonly state$: MotionProperty<State> = createProperty<State>({
     initialValue: State.AT_REST,
   });
 
-  get state(): string {
+  get state(): State {
     return this.state$.read();
   }
 

packages/core/src/observables/IndefiniteSubject.ts

@@ -19,6 +19,10 @@ import {
   Subscription,
 } from 'indefinite-observable';
 
+import {
+  isObserver,
+} from '../typeGuards';
+
 import {
   MemorylessIndefiniteSubject,
 } from './MemorylessIndefiniteSubject';
@@ -59,7 +63,7 @@ export class IndefiniteSubject<T> extends MemorylessIndefiniteSubject<T> {
     const subscription = super.subscribe(observerOrNext);
 
     if (this._hasStarted) {
-      observerOrNext.next
+      isObserver(observerOrNext)
         ? observerOrNext.next(this._lastValue)
         : observerOrNext(this._lastValue);
     }

packages/core/src/operators/offsetBy.ts

@@ -29,7 +29,7 @@ export interface MotionOffsetable<T> {
   offsetBy(offset$: T | Observable<T>): ObservableWithMotionOperators<T>;
 }
 
-export function withOffsetBy<T, S extends Constructor<MotionReactiveMappable<T>>>(superclass: S): S & Constructor<MotionOffsetable> {
+export function withOffsetBy<T, S extends Constructor<MotionReactiveMappable<T>>>(superclass: S): S & Constructor<MotionOffsetable<T>> {
   return class extends superclass implements MotionOffsetable<T> {
     /**
      * Adds the offset to the incoming value and dispatches the result.

packages/core/src/operators/slidingWindow.ts

@@ -17,6 +17,7 @@
 import {
   Constructor,
   MotionNextOperable,
+  NextChannel,
   Observable,
   ObservableWithMotionOperators,
   Observer,

packages/core/src/operators/threshold.ts

@@ -33,14 +33,13 @@ export function withThreshold<T, S extends Constructor<MotionMappable<T>>>(super
     threshold(limit: number): ObservableWithMotionOperators<ThresholdSide> {
       return (this as any as ObservableWithMotionOperators<number>)._map(
         (value: number) => {
-          if (value === limit) {
-            return ThresholdSide.WITHIN;
-
-          } else if (value < limit) {
+          if (value < limit) {
             return ThresholdSide.BELOW;
 
           } else if (value > limit) {
             return ThresholdSide.ABOVE;
+          } else {
+            return ThresholdSide.WITHIN;
           }
         }
       );

packages/core/src/typeGuards.ts

@@ -18,6 +18,7 @@ import $$observable from 'symbol-observable';
 
 import {
   Observable,
+  Observer,
   Point2D,
 } from './types';
 
@@ -57,6 +58,14 @@ export function isPoint2D(value: any): value is Point2D {
   return typeof value.x === 'number' && typeof value.y === 'number';
 }
 
+/**
+ * Checks if a value is an `Observer` by checking if the value has a `next`
+ * method.
+ */
+export function isObserver<T = any>(value: any): value is Observer<T> {
+  return typeof value.next === 'function';
+}
+
 /**
  * Checks if a value is a `PointerEvent` by checking if the value is an `Event`
  * whose `type` starts with `pointer`.

packages/testing-utils/package.json

@@ -10,7 +10,8 @@
     "build": "yarn run clean; ../../node_modules/.bin/tsc"
   },
   "dependencies": {
-    "mock-raf": "^1.0.0"
+    "mock-raf": "^1.0.0",
+    "tslib": "^1.2.0"
   },
   "peerDependencies": {
     "mocha-sugar-free": "1.3.1",

packages/testing-utils/yarn.lock

@@ -2,6 +2,10 @@
 # yarn lockfile v1
 
 
+"@types/sinon@^1.16.34":
+  version "1.16.36"
+  resolved "https://registry.yarnpkg.com/@types/sinon/-/sinon-1.16.36.tgz#74bb6ed7928597c1b3fb1b009005e94dc6eae357"
+
 mock-raf@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/mock-raf/-/mock-raf-1.0.0.tgz#a288145178893e2040b230f2182fee2049f16f25"
@@ -11,3 +15,7 @@ mock-raf@^1.0.0:
 object-assign@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-3.0.0.tgz#9bedd5ca0897949bca47e7ff408062d549f587f2"
+
+tslib@^1.2.0:
+  version "1.7.1"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.7.1.tgz#bc8004164691923a79fe8378bbeb3da2017538ec"