UIP-1637 First pass at strong mode compliance

.analysis_options

@@ -1,9 +1,11 @@
 analyzer:
   exclude:
     - integrate/**
+  strong-mode: true
 linter:
   rules:
     - annotate_overrides
+    - avoid_as
     - avoid_empty_else
     - avoid_init_to_null
     - avoid_return_types_on_setters

.gitignore

@@ -35,7 +35,7 @@ build/
 
 # Since over_react is a library package, we shouldn't track pubspec.lock:
 # https://www.dartlang.org/tools/pub/glossary.html#library-package
-/pubspec.lock
+pubspec.lock
 
 # Should not track the output of code coverage for now
 coverage/

.travis.yml

@@ -1,6 +1,6 @@
 language: dart
 dart:
-  - "1.17.1"
+  - "1.19.1"
 with_content_shell: true
 before_install:
   - export DISPLAY=:99.0

integrate/lib/test_component_declaration.dart

@@ -14,8 +14,7 @@
 
 library test_component_declaration;
 
-import 'package:over_react/ui_core.dart';
-import 'package:over_react/ui_components.dart';
+import 'package:over_react/over_react.dart';
 
 @Factory()
 UiFactory<FooProps> Foo;
@@ -30,7 +29,7 @@ class FooState extends UiState {}
 class FooComponent extends UiStatefulComponent<FooProps, FooState> {
   @override
   render() {
-    return Button()(
+    return Dom.div()(
       'Child 1',
       'Child 2'
     );

integrate/pubspec.yaml

@@ -1,19 +1,18 @@
-name: import_web_skin_dart_test
+name: import_over_react_test
 version: 0.0.1
-description: Test importing web_skin_dart
+description: Test importing over_react
 environment:
-  sdk: ">=1.12.1"
+  sdk: ">=1.19.1"
 dependencies:
   browser: ">=0.10.0 <0.11.0"
   crypto: "0.9.2+1"
-  source_gen: "^0.4.1"
-  web_skin_dart:
+  over_react:
     git:
       url: git://127.0.0.1:9000/
       ref: HEAD
 dev_dependencies:
   dart_dev: "^1.0.5"
   test: "^0.12.6+2"
 transformers:
-- test/pub_serve:
-    $include: test/test_runtime_import.dart
+  - test/pub_serve:
+      $include: test/test_runtime_import.dart

integrate/test/test_runtime_import.dart

@@ -18,9 +18,7 @@ library test;
 import 'package:react/react_client.dart' show setClientConfiguration;
 import 'package:react/react_test_utils.dart' as react_test_utils;
 import 'package:test/test.dart';
-import 'package:over_react/test_util.dart';
-import 'package:over_react/ui_components.dart';
-import 'package:over_react/ui_core.dart';
+import 'package:over_react/over_react.dart';
 
 /// Entry point into tests
 main() {
@@ -34,7 +32,7 @@ main() {
   });
 
   test('renders without breaking', () {
-    var well = react_test_utils.renderIntoDocument(Well()('Hello World!'));
+    var well = react_test_utils.renderIntoDocument(Dom.div()('Hello World!'));
     expect(well, isNotNull);
   });
 }

integrate/web/test_import.dart

@@ -17,10 +17,10 @@ import 'dart:html';
 import 'package:react/react_dom.dart' as react_dom;
 import 'package:react/react_client.dart' show setClientConfiguration;
 
-import 'package:over_react/ui_components.dart';
+import 'package:over_react/over_react.dart';
 
 void main() {
   setClientConfiguration();
 
-  react_dom.render(Well()('Hello World!'), querySelector('.main'));
+  react_dom.render(Dom.div()('Hello World!'), querySelector('.main'));
 }

lib/src/component/prop_mixins.dart

@@ -64,12 +64,14 @@ abstract class DomPropsMixin {
 
   Map<String, dynamic> style;
 
+  String className, title, id;
+
   dynamic accept, acceptCharset, accessKey, action, allowTransparency, alt, autoComplete, cellPadding, cellSpacing,
-    charSet, classID, className, colSpan, content, contentEditable, contextMenu, coords, crossOrigin, data, dateTime,
-    dir, download, draggable, encType, form, frameBorder, height, href, hrefLang, htmlFor, httpEquiv, icon, id, label,
+    charSet, classID, colSpan, content, contentEditable, contextMenu, coords, crossOrigin, data, dateTime,
+    dir, download, draggable, encType, form, frameBorder, height, href, hrefLang, htmlFor, httpEquiv, icon, label,
     lang, list, manifest, max, maxLength, media, mediaGroup, method, min, name, open, pattern, placeholder,
     poster, preload, radioGroup, rel, role, rowSpan, sandbox, scope, scrolling, shape, sizes, spellCheck, src, srcDoc,
-    srcSet, step, tabIndex, target, title, type, useMap, value, width, wmode;
+    srcSet, step, tabIndex, target, type, useMap, value, width, wmode;
 
   ClipboardEventCallback onCopy, onCut, onPaste;
   KeyboardEventCallback onKeyDown, onKeyPress, onKeyUp;

lib/src/component/resize_sensor.dart

@@ -133,7 +133,7 @@ class ResizeSensorComponent extends UiComponent<ResizeSensorProps> {
           )(expandSensor, collapseSensor)
     );
 
-    var wrapperStyles;
+    Map<String, dynamic> wrapperStyles;
 
     if (props.isFlexChild) {
       wrapperStyles = {

lib/src/component_declaration/component_base.dart

@@ -48,7 +48,8 @@ ReactDartComponentFactoryProxy registerComponent(react.Component dartComponentFa
     Type componentClass,
     String displayName
 }) {
-  ReactDartComponentFactoryProxy reactComponentFactory = react.registerComponent(dartComponentFactory);
+  // ignore: avoid_as
+  final reactComponentFactory = react.registerComponent(dartComponentFactory) as ReactDartComponentFactoryProxy;
 
   if (displayName != null) {
     reactComponentFactory.reactClass.displayName = displayName;
@@ -84,8 +85,6 @@ typedef TProps UiFactory<TProps extends UiProps>([Map backingProps]);
 /// For use as a Function variable type when the `backingProps` argument is not required.
 typedef TProps BuilderOnlyUiFactory<TProps extends UiProps>();
 
-typedef dynamic _RefTypedef(String ref);
-
 /// The basis for a over_react component.
 ///
 /// Includes support for strongly-typed props and utilities for prop and CSS classname forwarding.
@@ -94,14 +93,6 @@ typedef dynamic _RefTypedef(String ref);
 ///
 /// Related: [UiStatefulComponent]
 abstract class UiComponent<TProps extends UiProps> extends react.Component {
-  /// Returns the component of the specified [ref].
-  /// > `react.Component` if it is a Dart component
-  /// > DOM node if it is a DOM component.
-  ///
-  /// Overridden for strong typing.
-  @override
-  _RefTypedef get ref => super.ref;
-
   /// The props for the non-forwarding props defined in this component.
   Iterable<ConsumedProps> get consumedProps => null;
 
@@ -133,12 +124,12 @@ abstract class UiComponent<TProps extends UiProps> extends react.Component {
   void validateRequiredProps(Map appliedProps) {
     consumedProps?.forEach((ConsumedProps consumedProps) {
       consumedProps.props.forEach((PropDescriptor prop) {
-            if (!prop.isRequired) return;
-            if (prop.isNullable && appliedProps.containsKey(prop.key)) return;
-            if (!prop.isNullable && appliedProps[prop.key] != null) return;
+        if (!prop.isRequired) return;
+        if (prop.isNullable && appliedProps.containsKey(prop.key)) return;
+        if (!prop.isNullable && appliedProps[prop.key] != null) return;
 
-            throw new PropError.required(prop.key, prop.errorMessage);
-          });
+        throw new PropError.required(prop.key, prop.errorMessage);
+      });
     });
   }
 
@@ -166,16 +157,15 @@ abstract class UiComponent<TProps extends UiProps> extends react.Component {
   //   BEGIN Typed props helpers
   //
 
-  // Keep this Expando unparameterized to work around this bug: https://code.google.com/p/dart/issues/detail?id=18713
-  Expando _typedPropsCache = new Expando();
+  var _typedPropsCache = new Expando<TProps>();
 
   /// A typed props object corresponding to the current untyped props Map ([unwrappedProps]).
   ///
   /// Created using [typedPropsFactory] and cached for each Map instance.
   @override
   TProps get props {
     var unwrappedProps = this.unwrappedProps;
-    TProps typedProps = _typedPropsCache[unwrappedProps];
+    var typedProps = _typedPropsCache[unwrappedProps];
     if (typedProps == null) {
       typedProps = typedPropsFactory(unwrappedProps);
       _typedPropsCache[unwrappedProps] = typedProps;
@@ -191,6 +181,7 @@ abstract class UiComponent<TProps extends UiProps> extends react.Component {
   set unwrappedProps(Map value) => super.props = value;
 
   /// Returns a typed props object backed by the specified [propsMap].
+  ///
   /// Required to properly instantiate the generic [TProps] class.
   TProps typedPropsFactory(Map propsMap);
 
@@ -217,16 +208,15 @@ abstract class UiStatefulComponent<TProps extends UiProps, TState extends UiStat
   //   BEGIN Typed state helpers
   //
 
-   // Keep this Expando unparameterized to work around this bug: https://code.google.com/p/dart/issues/detail?id=18713
-  Expando _typedStateCache = new Expando();
+  var _typedStateCache = new Expando<TState>();
 
   /// A typed state object corresponding to the current untyped state Map ([unwrappedState]).
   ///
   /// Created using [typedStateFactory] and cached for each Map instance.
   @override
   TState get state {
     var unwrappedState = this.unwrappedState;
-    TState typedState = _typedStateCache[unwrappedState];
+    var typedState = _typedStateCache[unwrappedState];
     if (typedState == null) {
       typedState = typedStateFactory(unwrappedState);
       _typedStateCache[unwrappedState] = typedState;
@@ -242,6 +232,7 @@ abstract class UiStatefulComponent<TProps extends UiProps, TState extends UiStat
   set unwrappedState(Map value) => super.state = value;
 
   /// Returns a typed state object backed by the specified [stateMap].
+  ///
   /// Required to properly instantiate the generic [TState] class.
   TState typedStateFactory(Map stateMap);
 
@@ -387,7 +378,7 @@ abstract class UiProps
   }
 
   /// Validates that no [children] are instances of [UiProps], and prints a helpful message for a better debugging
-  /// experiance.
+  /// experience.
   bool _validateChildren(dynamic children) {
     // Should not validate non-list iterables to avoid more than one iteration.
     if (children != null && (children is! Iterable || children is List)) {

lib/src/component_declaration/flux_component.dart

@@ -18,7 +18,7 @@ abstract class FluxUiProps<ActionsT, StoresT> extends UiProps {
   /// There is no strict rule on the [ActionsT] type. Depending on application
   /// structure, there may be [Action]s available directly on this object, or
   /// this object may represent a hierarchy of actions.
-  ActionsT get actions => props[_actionsPropKey];
+  ActionsT get actions => props[_actionsPropKey] as ActionsT; // ignore: avoid_as
   set actions(ActionsT value) => props[_actionsPropKey] = value;
 
   /// The prop defined by [StoresT].
@@ -37,7 +37,7 @@ abstract class FluxUiProps<ActionsT, StoresT> extends UiProps {
   /// [StoresT] should be a class that provides access to these multiple stores.
   /// Then, you can explicitly select the [Store] instances that should be
   /// listened to by overriding [_FluxComponentMixin.redrawOn].
-  StoresT get store => props[_storePropKey];
+  StoresT get store => props[_storePropKey] as StoresT; // ignore: avoid_as
   set store(StoresT value) => props[_storePropKey] = value;
 }
 
@@ -67,10 +67,8 @@ abstract class FluxUiStatefulComponent<TProps extends FluxUiProps, TState extend
 /// Helper mixin to keep [FluxUiComponent] and [FluxUiStatefulComponent] clean/DRY.
 ///
 /// Private so it will only get used in this file, since having lifecycle methods in a mixin is risky.
-abstract class _FluxComponentMixin<TProps extends FluxUiProps> {
+abstract class _FluxComponentMixin<TProps extends FluxUiProps> implements BatchedRedraws {
   TProps get props;
-  bool shouldBatchRedraw;
-  redraw([callback()]);
 
   /// List of store subscriptions created when the component mounts.
   ///
@@ -85,8 +83,9 @@ abstract class _FluxComponentMixin<TProps extends FluxUiProps> {
     ///
     /// [Store]s included in the [getStoreHandlers] result will be listened to and wired up to their
     /// respective handlers.
-    Map<Store, Function> handlers = new Map.fromIterable(redrawOn(),
+    Map<Store, StoreHandler> handlers = new Map.fromIterable(redrawOn(),
         value: (_) => (_) => redraw())..addAll(getStoreHandlers());
+
     handlers.forEach((store, handler) {
       StreamSubscription subscription = store.listen(handler);
       _subscriptions.add(subscription);
@@ -122,7 +121,7 @@ abstract class _FluxComponentMixin<TProps extends FluxUiProps> {
   ///     redrawOn() => [store.tasks, store.users];
   List<Store> redrawOn() {
     if (props.store is Store) {
-      return [props.store];
+      return <Store>[props.store];
     } else {
       return [];
     }
@@ -137,7 +136,7 @@ abstract class _FluxComponentMixin<TProps extends FluxUiProps> {
   /// If possible, however, [redrawOn] should be used instead of this in order
   /// to avoid keeping additional state within this component and manually
   /// managing redraws.
-  Map<Store, Function> getStoreHandlers() {
+  Map<Store, StoreHandler> getStoreHandlers() {
     return {};
   }
 

lib/src/component_declaration/transformer_helpers.dart

@@ -14,17 +14,13 @@
 
 library over_react.component_declaration.transformer_helpers;
 
-import 'dart:html';
-
 import './component_base.dart' as component_base;
 import './annotations.dart' as annotations;
 
 export './annotations.dart';
 export './component_base.dart'
     hide UiComponent, UiStatefulComponent, UiProps, UiState;
 
-typedef dynamic _RefTypedef(String ref);
-
 // ----------------------------------------------------------------------
 //   Helpers and extras consumable by generated code and consumers of
 //   generated code.
@@ -99,15 +95,6 @@ abstract class UiComponent<TProps extends UiProps> extends component_base.UiComp
     _throwIfNotGenerated();
   }
 
-  /// Returns the component of the specified [ref].
-  ///
-  /// * Will be a [react.Component] if it is a Dart component.
-  /// * [Element] if it is a Dom component.
-  ///
-  /// Overridden for strong typing.
-  @override
-  _RefTypedef get ref => super.ref;
-
   /// The default consumed props, taken from the keys generated in the associated @[annotations.Props] class.
   @toBeGenerated
   Iterable<component_base.ConsumedProps> get $defaultConsumedProps => throw new UngeneratedError(member: #$defaultConsumedProps);
@@ -137,15 +124,6 @@ abstract class UiStatefulComponent<TProps extends UiProps, TState extends UiStat
     _throwIfNotGenerated();
   }
 
-  /// Returns the component of the specified [ref].
-  ///
-  /// * Will be a [react.Component] if it is a Dart component.
-  /// * [Element] if it is a Dom component.
-  ///
-  /// Overridden for strong typing.
-  @override
-  _RefTypedef get ref => super.ref;
-
   /// The default consumed prop keys, taken from the keys generated in the associated @[annotations.Props] class.
   @toBeGenerated
   Iterable<component_base.ConsumedProps> get $defaultConsumedProps => throw new UngeneratedError(member: #$defaultConsumedProps);