@angular-wave/angular.ts 0.0.13 → 0.0.15

package/src/router/core/params/paramTypes.js

@@ -5,7 +5,6 @@ import {
   equals,
   inherit,
   map,
-  extend,
   pick,
 } from "../common/common";
 import { isDefined, isNullOrUndefined } from "../common/predicates";
@@ -52,7 +51,7 @@ export class ParamTypes {
     ]);
     // Register default types. Store them in the prototype of this.types.
     const makeType = (definition, name) =>
-      new ParamType(extend({ name }, definition));
+      new ParamType(Object.assign({ name }, definition));
     this.types = inherit(map(this.defaultTypes, makeType), {});
   }
   dispose() {
@@ -65,9 +64,9 @@ export class ParamTypes {
    */
   type(name, definition, definitionFn) {
     if (!isDefined(definition)) return this.types[name];
-    if (this.types.hasOwnProperty(name))
+    if (Object.prototype.hasOwnProperty.call(this.types, name))
       throw new Error(`A type named '${name}' has already been defined.`);
-    this.types[name] = new ParamType(extend({ name }, definition));
+    this.types[name] = new ParamType(Object.assign({ name }, definition));
     if (definitionFn) {
       this.typeQueue.push({ name, def: definitionFn });
       if (!this.enqueue) this._flushTypeQueue();
@@ -79,7 +78,7 @@ export class ParamTypes {
       const type = this.typeQueue.shift();
       if (type.pattern)
         throw new Error("You cannot override a type's .pattern at runtime.");
-      extend(this.types[type.name], services.$injector.invoke(type.def));
+      Object.assign(this.types[type.name], services.$injector.invoke(type.def));
     }
   }
 }
@@ -94,10 +93,10 @@ function initDefaultTypes() {
       // tslint:disable-next-line:triple-equals
       equals: (a, b) => a == b, // allow coersion for null/undefined/""
     };
-    return extend({}, defaultTypeBase, def);
+    return Object.assign({}, defaultTypeBase, def);
   };
   // Default Parameter Type Definitions
-  extend(ParamTypes.prototype, {
+  Object.assign(ParamTypes.prototype, {
     string: makeDefaultType({}),
     path: makeDefaultType({
       pattern: /[^/]*/,

package/src/router/core/params/stateParams.js

@@ -1,7 +1,7 @@
-import { extend, ancestors } from "../common/common";
+import { ancestors } from "../common/common";
 export class StateParams {
   constructor(params = {}) {
-    extend(this, params);
+    Object.assign(this, params);
   }
   /**
    * Merges a set of parameters with all parameters inherited between the common parents of the
@@ -30,6 +30,6 @@ export class StateParams {
         inherited[parentParamsKeys[j]] = this[parentParamsKeys[j]];
       }
     }
-    return extend({}, inherited, newParams);
+    return Object.assign({}, inherited, newParams);
   }
 }

package/src/router/core/path/pathNode.js

@@ -1,4 +1,4 @@
-import { extend, applyPairs, find } from "../common/common";
+import { applyPairs, find } from "../common/common";
 import { propEq } from "../common/hof";
 import { Param } from "../params/param";
 /**
@@ -14,7 +14,7 @@ export class PathNode {
       const node = stateOrNode;
       this.state = node.state;
       this.paramSchema = node.paramSchema.slice();
-      this.paramValues = extend({}, node.paramValues);
+      this.paramValues = Object.assign({}, node.paramValues);
       this.resolvables = node.resolvables.slice();
       this.views = node.views && node.views.slice();
     } else {

package/src/router/core/path/pathUtils.js

@@ -1,5 +1,4 @@
 import {
-  extend,
   find,
   pick,
   omit,
@@ -76,7 +75,7 @@ export class PathUtils {
   static inheritParams(fromPath, toPath, toKeys = []) {
     function nodeParamVals(path, state) {
       const node = find(path, propEq("state", state));
-      return extend({}, node && node.paramValues);
+      return Object.assign({}, node && node.paramValues);
     }
     const noInherit = fromPath
       .map((node) => node.paramSchema)
@@ -89,7 +88,7 @@ export class PathUtils {
      */
     function makeInheritedParamsNode(toNode) {
       // All param values for the node (may include default key/vals, when key was not found in toParams)
-      let toParamVals = extend({}, toNode && toNode.paramValues);
+      let toParamVals = Object.assign({}, toNode && toNode.paramValues);
       // limited to only those keys found in toParams
       const incomingParamVals = pick(toParamVals, toKeys);
       toParamVals = omit(toParamVals, toKeys);
@@ -98,7 +97,7 @@ export class PathUtils {
         noInherit,
       );
       // extend toParamVals with any fromParamVals, then override any of those those with incomingParamVals
-      const ownParamVals = extend(
+      const ownParamVals = Object.assign(
         toParamVals,
         fromParamVals,
         incomingParamVals,
@@ -196,4 +195,4 @@ PathUtils.nonDynamicParams = (node) =>
   node.state.parameters({ inherit: false }).filter((param) => !param.dynamic);
 /** Gets the raw parameter values from a path */
 PathUtils.paramValues = (path) =>
-  path.reduce((acc, node) => extend(acc, node.paramValues), {});
+  path.reduce((acc, node) => Object.assign(acc, node.paramValues), {});

package/src/router/core/resolve/resolvable.js

@@ -1,4 +1,4 @@
-import { extend, identity } from "../../../core/utils";
+import { identity } from "../../../core/utils";
 import { services } from "../common/coreservices";
 import { trace } from "../common/trace";
 import { stringify } from "../common/strings";
@@ -26,7 +26,7 @@ export class Resolvable {
     this.resolved = false;
     this.promise = undefined;
     if (arg1 instanceof Resolvable) {
-      extend(this, arg1);
+      Object.assign(this, arg1);
     } else if (isFunction(resolveFn)) {
       if (isNullOrUndefined(arg1))
         throw new Error("new Resolvable(): token argument is required");

package/src/router/core/state/stateBuilder.js

@@ -1,6 +1,5 @@
 import {
   applyPairs,
-  extend,
   identity,
   inherit,
   mapObj,
@@ -89,7 +88,7 @@ function pathBuilder(state) {
   return state.parent ? state.parent.path.concat(state) : /*root*/ [state];
 }
 function includesBuilder(state) {
-  const includes = state.parent ? extend({}, state.parent.includes) : {};
+  const includes = state.parent ? Object.assign({}, state.parent.includes) : {};
   includes[state.name] = true;
   return includes;
 }

package/src/router/core/state/stateObject.js

@@ -1,4 +1,4 @@
-import { defaults, find, inherit } from "../common/common";
+import { defaults, find } from "../common/common";
 import { propEq } from "../common/hof";
 import { Glob } from "../common/glob";
 import { isObject, isFunction } from "../common/predicates";
@@ -25,7 +25,7 @@ export class StateObject {
     stateDecl = StateObject.isStateClass(stateDecl)
       ? new stateDecl()
       : stateDecl;
-    const state = inherit(inherit(stateDecl, StateObject.prototype));
+    const state = Object.setPrototypeOf(stateDecl, StateObject.prototype);
     stateDecl.$$state = () => state;
     state.self = stateDecl;
     state.__stateObjectCache = {
@@ -33,7 +33,7 @@ export class StateObject {
     };
     return state;
   }
-  /** @deprecated use State.create() */
+  // /** @deprecated use State.create() */
   constructor(config) {
     return StateObject.create(config || {});
   }

package/src/router/core/state/stateService.js

@@ -1,7 +1,6 @@
 import {
   createProxyFunctions,
   defaults,
-  extend,
   inArray,
   noop,
   removeFrom,
@@ -338,7 +337,7 @@ export class StateService {
     const globals = router.globals;
     options = defaults(options, defaultTransOpts);
     const getCurrent = () => globals.transition;
-    options = extend(options, { current: getCurrent });
+    options = Object.assign(options, { current: getCurrent });
     const ref = this.target(to, toParams, options);
     const currentPath = this.getCurrentPath();
     if (!ref.exists()) return this._handleInvalidTargetState(currentPath, ref);
@@ -391,7 +390,7 @@ export class StateService {
       .catch(rejectedTransitionHandler(transition));
     silenceUncaughtInPromise(transitionToPromise); // issue #2676
     // Return a promise for the transition, which also has the transition object on it.
-    return extend(transitionToPromise, { transition });
+    return Object.assign(transitionToPromise, { transition });
   }
   /**
    * Checks if the current state *is* the provided state

package/src/router/core/state/targetState.js

@@ -1,6 +1,5 @@
 import { isObject, isString } from "../common/predicates";
 import { stringify } from "../common/strings";
-import { extend } from "../common/common";
 /**
  * Encapsulate the target (destination) state/params/options of a [[Transition]].
  *
@@ -49,8 +48,8 @@ export class TargetState {
     this._stateRegistry = _stateRegistry;
     this._identifier = _identifier;
     this._identifier = _identifier;
-    this._params = extend({}, _params || {});
-    this._options = extend({}, _options || {});
+    this._params = Object.assign({}, _params || {});
+    this._options = Object.assign({}, _options || {});
     this._definition = _stateRegistry.matcher.find(
       _identifier,
       this._options.relative,
@@ -124,7 +123,9 @@ export class TargetState {
    *                When true the parameter values will be used instead of the current values.
    */
   withParams(params, replace = false) {
-    const newParams = replace ? params : extend({}, this._params, params);
+    const newParams = replace
+      ? params
+      : Object.assign({}, this._params, params);
     return new TargetState(
       this._stateRegistry,
       this._identifier,
@@ -140,7 +141,9 @@ export class TargetState {
    *                When true the options will be used instead of the current options.
    */
   withOptions(options, replace = false) {
-    const newOpts = replace ? options : extend({}, this._options, options);
+    const newOpts = replace
+      ? options
+      : Object.assign({}, this._options, options);
     return new TargetState(
       this._stateRegistry,
       this._identifier,

package/src/router/core/transition/hookBuilder.js

@@ -1,4 +1,4 @@
-import { extend, assertPredicate, unnestR, identity } from "../common/common";
+import { assertPredicate, unnestR, identity } from "../common/common";
 import { isArray } from "../common/predicates";
 import { TransitionHookPhase, TransitionHookScope } from "./interface";
 import { TransitionHook } from "./transitionHook";
@@ -57,7 +57,7 @@ export class HookBuilder {
       const matchingNodes = matches[hookType.criteriaMatchPath.name];
       // Return an array of HookTuples
       return matchingNodes.map((node) => {
-        const _options = extend(
+        const _options = Object.assign(
           {
             bind: hook.bind,
             traceData: { hookType: hookType.name, context: node },

package/src/router/core/transition/hookRegistry.js

@@ -1,4 +1,4 @@
-import { extend, removeFrom, tail, identity, mapObj } from "../common/common";
+import { removeFrom, tail, identity, mapObj } from "../common/common";
 import { isString, isFunction } from "../common/predicates";
 import { Glob } from "../common/glob";
 import {
@@ -114,7 +114,7 @@ export class RegisteredHook {
    * ```
    */
   _getMatchingNodes(treeChanges, transition) {
-    const criteria = extend(
+    const criteria = Object.assign(
       this._getDefaultMatchCriteria(),
       this.matchCriteria,
     );

package/src/router/core/transition/rejectFactory.js

@@ -1,5 +1,4 @@
-"use strict";
-import { extend, silentRejection } from "../common/common";
+import { silentRejection } from "../common/common";
 import { stringify } from "../common/strings";
 import { is } from "../common/hof";
 /** An enum for Transition Rejection reasons */
@@ -117,6 +116,6 @@ export class Rejection {
     return `Transition Rejection($id: ${$id} type: ${type}, message: ${message}, detail: ${detail})`;
   }
   toPromise() {
-    return extend(silentRejection(this), { _transitionRejection: this });
+    return Object.assign(silentRejection(this), { _transitionRejection: this });
   }
 }

package/src/router/core/transition/transition.js

@@ -4,7 +4,6 @@ import { stringify } from "../common/strings";
 import {
   map,
   find,
-  extend,
   mergeR,
   tail,
   omit,
@@ -118,7 +117,10 @@ export class Transition {
       throw new Error(targetState.error());
     }
     // current() is assumed to come from targetState.options, but provide a naive implementation otherwise.
-    this._options = extend({ current: val(this) }, targetState.options());
+    this._options = Object.assign(
+      { current: val(this) },
+      targetState.options(),
+    );
     this.$id = router.transitionService._transitionCount++;
     const toPath = PathUtils.buildToPath(fromPath, targetState);
     this._treeChanges = PathUtils.treeChanges(
@@ -496,7 +498,7 @@ export class Transition {
     ) {
       redirectOpts.location = "replace";
     }
-    const newOptions = extend(
+    const newOptions = Object.assign(
       {},
       this.options(),
       targetState.options(),

package/src/router/core/url/urlMatcherFactory.js

@@ -1,10 +1,4 @@
-import {
-  extend,
-  forEach,
-  isDefined,
-  isFunction,
-  isObject,
-} from "../../../core/utils";
+import { forEach, isDefined, isFunction, isObject } from "../../../core/utils";
 import { UrlMatcher } from "./urlMatcher";
 import { DefType, Param } from "../params/param";
 
@@ -93,7 +87,7 @@ export class UrlMatcherFactory {
       pattern,
       urlConfig.paramTypes,
       this.paramFactory,
-      extend(globalConfig, config),
+      Object.assign(globalConfig, config),
     );
   }
   /**

package/src/router/core/url/urlRule.js

@@ -1,6 +1,6 @@
 import { UrlMatcher } from "./urlMatcher";
 import { isString, isDefined, isFunction } from "../common/predicates";
-import { identity, extend } from "../common/common";
+import { identity } from "../common/common";
 import { is, or, pattern } from "../common/hof";
 import { StateObject } from "../state/stateObject";
 /**
@@ -95,7 +95,7 @@ export class UrlRuleFactory {
       return matched.length / optional.length;
     }
     const details = { urlMatcher, matchPriority, type: "URLMATCHER" };
-    return extend(new BaseUrlRule(matchUrlParamters, _handler), details);
+    return Object.assign(new BaseUrlRule(matchUrlParamters, _handler), details);
   }
   /**
    * A UrlRule which matches a state by its url
@@ -130,7 +130,7 @@ export class UrlRuleFactory {
       }
     };
     const details = { state, type: "STATE" };
-    return extend(this.fromUrlMatcher(state.url, handler), details);
+    return Object.assign(this.fromUrlMatcher(state.url, handler), details);
   }
   /**
    * A UrlRule which matches based on a regular expression
@@ -181,7 +181,10 @@ export class UrlRuleFactory {
     const _handler = isString(handler) ? redirectUrlTo : handler;
     const matchParamsFromRegexp = (url) => regexp.exec(url.path);
     const details = { regexp, type: "REGEXP" };
-    return extend(new BaseUrlRule(matchParamsFromRegexp, _handler), details);
+    return Object.assign(
+      new BaseUrlRule(matchParamsFromRegexp, _handler),
+      details,
+    );
   }
 }
 UrlRuleFactory.isUrlRule = (obj) =>

package/src/router/core/url/urlService.js

@@ -1,4 +1,4 @@
-import { extend, isString } from "../../../core/utils";
+import { isString } from "../../../core/utils";
 import { is, pattern } from "../common/hof";
 import { UrlRules } from "./urlRules";
 import { UrlConfig } from "./urlConfig";
@@ -243,7 +243,7 @@ export class UrlService {
    * Return the result as a [[MatchResult]].
    */
   match(url) {
-    url = extend({ path: "", search: {}, hash: "" }, url);
+    url = Object.assign({ path: "", search: {}, hash: "" }, url);
     const rules = this.rules.rules();
     // Checks a single rule. Returns { rule: rule, match: match, weight: weight } if it matched, or undefined
     const checkRule = (rule) => {

package/src/router/router.js

@@ -8,6 +8,14 @@ import {
 } from "./adapter/services";
 import { TemplateFactory } from "./adapter/templateFactory";
 import { trace } from "./core/common/trace";
+import { $ViewScrollProvider } from "./adapter/viewScroll";
+import { $IsStateFilter, $IncludedByStateFilter } from "./adapter/stateFilters";
+import {
+  uiSrefActiveDirective,
+  uiStateDirective,
+  uiSrefDirective,
+} from "./adapter/directives/stateDirectives";
+import { uiView, $ViewDirectiveFill } from "./adapter/directives/viewDirective";
 
 export function initRouter() {
   window.angular.module("ui.router.angular1", []);
@@ -35,16 +43,26 @@ export function initRouter() {
   mod_util.provider("$templateFactory", function () {
     return new TemplateFactory();
   });
-  mod_state.provider("$stateRegistry", getProviderFor("stateRegistry"));
-  mod_state.provider("$uiRouterGlobals", getProviderFor("globals"));
-  mod_state.provider("$transitions", getProviderFor("transitionService"));
-  mod_state.provider("$state", ["$uiRouterProvider", getStateProvider]);
-  mod_state.factory("$stateParams", [
-    "$uiRouter",
-    function StateParamse($uiRouter) {
-      return $uiRouter.globals.params;
-    },
-  ]);
+  mod_state
+    .provider("$stateRegistry", getProviderFor("stateRegistry"))
+    .provider("$uiRouterGlobals", getProviderFor("globals"))
+    .provider("$transitions", getProviderFor("transitionService"))
+    .provider("$state", ["$uiRouterProvider", getStateProvider])
+    .provider("$uiViewScroll", $ViewScrollProvider)
+    .factory("$stateParams", [
+      "$uiRouter",
+      function StateParamse($uiRouter) {
+        return $uiRouter.globals.params;
+      },
+    ])
+    .filter("isState", $IsStateFilter)
+    .filter("includedByState", $IncludedByStateFilter)
+    .directive("uiSref", uiSrefDirective)
+    .directive("uiSrefActive", uiSrefActiveDirective)
+    .directive("uiSrefActiveEq", uiSrefActiveDirective)
+    .directive("uiState", uiStateDirective)
+    .directive("uiView", uiView)
+    .directive("uiView", $ViewDirectiveFill);
   mod_main.factory("$view", function View() {
     return router.viewService;
   });

package/test/module-test.html

@@ -1,23 +1,26 @@
 <!doctype html>
 <html>
   <head>
+    <script></script>
+    <script type="module" src="../src/index.js"></script>
     <script>
       document.addEventListener("DOMContentLoaded", () => {
-        window.angular.module("test", ["ui.router"]);
+        var myApp = window.angular.module("test", ["ui.router"]);
+        myApp.config(function ($stateProvider) {
+          var helloState = {
+            name: "hello",
+            url: "/",
+            template: "<h3>hello world!</h3>",
+          };
+
+          $stateProvider.state(helloState);
+        });
       });
     </script>
-    <script type="module" src="../src/index.js"></script>
   </head>
   <body ng-app="test">
-    <div ng-init='list = [{ name: "x" }, { name: "y" }, { name: "z" }]'>
-      <label>Name:</label>
-      <input type="text" ng-model="yourName" placeholder="Enter a name here" />
-      <hr />
-      <h1>Hello {{yourName}}!</h1>
-
-      <ul ng-repeat="i in list">
-        <li>{{ i.name }}</li>
-      </ul>
-    </div>
+    {{ 2 + 2 }}
+    <a ui-sref="hello" ui-sref-active="active">Hello</a>
+    <ui-view></ui-view>
   </body>
 </html>

package/test/ng/directive/if.spec.js

@@ -103,7 +103,6 @@ describe("ngIf", () => {
 
     it("should destroy the child scope every time the expression evaluates to false", () => {
       $scope.value = true;
-      debugger;
       element.append($compile('<div ng-if="value"></div>')($scope));
       $scope.$apply();
 

package/test/original-test.html

@@ -1,21 +1,33 @@
 <!doctype html>
 <html>
   <head>
-    <script src="../legacy/build/angular.js"></script>
-  </head>
-  <body>
-    Test:
-    <my-component></my-component>
-    {{ 2 + 2 }}
-  </body>
+    <script src="../legacy/angular.js"></script>
+    <script src="//unpkg.com/@uirouter/angularjs/release/angular-ui-router.min.js"></script>
+    <script>
+      var myApp = angular.module("helloworld", ["ui.router"]);
+
+      myApp.config(function ($stateProvider) {
+        var helloState = {
+          name: "hello",
+          url: "/",
+          template: "<h3>hello world!</h3>",
+        };
 
-  <script>
-    document.addEventListener("DOMContentLoaded", () => {
-      window.angular.module("myModule", []).component("myComponent", {
-        template: "<div>ME</div>",
+        var aboutState = {
+          name: "about",
+          url: "/about",
+          template: "<h3>Its the UI-Router hello world app!</h3>",
+        };
+
+        $stateProvider.state(helloState);
+        $stateProvider.state(aboutState);
       });
-      window.angular.bootstrap(document, ["myModule"]);
-      //angularInit(document, window.angular.bootstrap);
-    });
-  </script>
+    </script>
+  </head>
+  <body ng-app="helloworld">
+    <a ui-sref="hello" ui-sref-active="active">Hello</a>
+    {{ 2 + 2}}
+    <ui-view></ui-view>
+    {{ 2 + 2}}
+  </body>
 </html>