@angular-wave/angular.ts 0.0.22 → 0.0.24

package/index.html

@@ -103,8 +103,12 @@
       <script type="module" src="test/router/state-directives.spec.js"></script>
       <script type="module" src="test/router/state-filter.spec.js"></script>
       <script type="module" src="test/router/state.spec.js"></script>
-      
-    
+      <script type="module" src="test/router/template-factory.spec.js"></script>
+      <script type="module" src="test/router/url-matcher-factory.spec.js"></script>
+      <script type="module" src="test/router/view-directive.spec.js"></script>
+      <script type="module" src="test/router/view-hook.spec.js"></script>
+      <script type="module" src="test/router/view-scroll.spec.js"></script>
+      <script type="module" src="test/router/view.spec.js"></script>
 
       <!-- Run asyncs last to prevent digest polution-->
       <script type="module" src="test/core/interval.spec.js"></script>

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@angular-wave/angular.ts",
   "license": "MIT",
-  "version": "0.0.22",
+  "version": "0.0.24",
   "type": "module",
   "main": "dist/angular-ts.esm.js",
   "browser": "dist/angular-ts.umd.js",

package/src/core/compile.js

@@ -6,7 +6,6 @@ import {
   assertNotHasOwnProperty,
   createMap,
   forEach,
-  identity,
   isDefined,
   isFunction,
   isObject,
@@ -969,7 +968,7 @@ export function $CompileProvider($provide, $$sanitizeUriProvider) {
       const endSymbol = $interpolate.endSymbol();
       const denormalizeTemplate =
         startSymbol === "{{" && endSymbol === "}}"
-          ? identity
+          ? (x) => x
           : function denormalizeTemplate(template) {
               return template
                 .replace(/\{\{/g, startSymbol)
@@ -2902,7 +2901,7 @@ export function $CompileProvider($provide, $$sanitizeUriProvider) {
         const nodeName = nodeName_(node);
         const trustedContext = getTrustedPropContext(nodeName, propName);
 
-        let sanitizer = identity;
+        let sanitizer = (x) => x;
         // Sanitize img[srcset] + source[srcset] values.
         if (
           propName === "srcset" &&

package/src/core/parser/parse.js

@@ -2,7 +2,6 @@ import {
   createMap,
   csp,
   forEach,
-  identity,
   isDefined,
   isFunction,
   minErr,
@@ -2213,7 +2212,7 @@ export function $ParseProvider() {
         var unwatch, lastValue;
 
         var exp = parsedExpression.$$intercepted || parsedExpression;
-        var post = parsedExpression.$$interceptor || identity;
+        var post = parsedExpression.$$interceptor || ((x) => x);
 
         var useInputs = parsedExpression.inputs && !exp.inputs;
 
@@ -2476,7 +2475,7 @@ export function oneTimeWatchDelegate(
   let lastValue;
 
   const exp = parsedExpression.$$intercepted || parsedExpression;
-  const post = parsedExpression.$$interceptor || identity;
+  const post = parsedExpression.$$interceptor || ((x) => x);
 
   const useInputs = parsedExpression.inputs && !exp.inputs;
 

package/src/filters/order-by.js

@@ -12,7 +12,7 @@ orderByFilter.$inject = ["$parse"];
 
 /**
  *
- * @param {angular.IFilterOrderBy} $parse
+ * @param {angular.IParseService} $parse
  * @returns
  */
 export function orderByFilter($parse) {
@@ -90,12 +90,12 @@ export function orderByFilter($parse) {
           predicate = predicate.substring(1);
         }
         if (predicate !== "") {
-          get = $parse(predicate);
-          if (get.constant) {
-            const key = get();
-            get = function (value) {
-              return value[key];
-            };
+          let parsed = $parse(predicate);
+          if (parsed.constant) {
+            const key = parsed();
+            get = (value) => value[key];
+          } else {
+            get = parsed;
           }
         }
       }
@@ -130,7 +130,7 @@ export function orderByFilter($parse) {
   }
 
   function getPredicateValue(value, index) {
-    let type = typeof value;
+    /** @type {String} */ let type = typeof value;
     if (value === null) {
       type = "null";
     } else if (type === "object") {

package/src/router/directives/{stateDirectives.js → state-directives.js}

@@ -9,7 +9,6 @@ import {
   forEach,
   tail,
   unnestR,
-  identity,
   uniqR,
   inArray,
   removeFrom,
@@ -642,7 +641,7 @@ export let uiSrefActiveDirective = [
           }
           // Update route state
           function update() {
-            const splitClasses = (str) => str.split(/\s/).filter(identity);
+            const splitClasses = (str) => str.split(/\s/).filter(Boolean);
             const getClasses = (stateList) =>
               stateList
                 .map((x) => x.activeClass)

package/src/router/directives/{viewDirective.js → view-directive.js}

@@ -3,7 +3,7 @@ import { isDefined, isFunction, isString } from "../../shared/utils";
 import { kebobString } from "../../shared/strings";
 
 import { parse } from "../../shared/hof";
-import { ResolveContext } from "../resolve/resolveContext";
+import { ResolveContext } from "../resolve/resolve-context";
 import { trace } from "../common/trace";
 import { getLocals } from "../services";
 import { Ng1ViewConfig } from "../state/views";
@@ -143,18 +143,10 @@ export let uiView = [
     function getRenderer() {
       return {
         enter: function (element, target, cb) {
-          // if (angular.version.minor > 2) {
-          //$animate.enter(element, null, target).then(cb);
-          // } else {
-          $animate.enter(element, null, target, cb);
-          // }
+          $animate.enter(element, null, target).then(cb);
         },
         leave: function (element, cb) {
-          // if (angular.version.minor > 2) {
-          //$animate.leave(element).then(cb);
-          // } else {
-          $animate.leave(element, cb);
-          // }
+          $animate.leave(element).then(cb);
         },
       };
     }
@@ -273,7 +265,7 @@ export let uiView = [
             const cloned = $transclude(newScope, function (clone) {
               clone.data("$uiViewAnim", $uiViewAnim);
               clone.data("$uiView", $uiViewData);
-              renderer.enter(clone, $element, function onUIViewEnter() {
+              renderer.enter(clone, $element, function () {
                 animEnter.resolve();
                 if (currentScope)
                   currentScope.$emit("$viewContentAnimationEnded");

package/src/router/globals.js

@@ -1,4 +1,4 @@
-import { StateParams } from "./params/stateParams";
+import { StateParams } from "./params/state-params";
 import { Queue } from "./common/queue";
 /**
  * Global router state

package/src/router/hooks/{ignoredTransition.js → ignored-transition.js}

@@ -1,5 +1,5 @@
 import { trace } from "../common/trace";
-import { Rejection } from "../transition/rejectFactory";
+import { Rejection } from "../transition/reject-factory";
 /**
  * A [[TransitionHookFn]] that skips a transition if it should be ignored
  *

package/src/router/hooks/{redirectTo.js → redirect-to.js}

@@ -1,6 +1,6 @@
 import { isString, isFunction } from "../../shared/utils";
 import { services } from "../common/coreservices";
-import { TargetState } from "../state/targetState";
+import { TargetState } from "../state/target-state";
 /**
  * A [[TransitionHookFn]] that redirects to a different state or params
  *

package/src/router/hooks/resolve.js

@@ -1,4 +1,4 @@
-import { ResolveContext } from "../resolve/resolveContext";
+import { ResolveContext } from "../resolve/resolve-context";
 import { val } from "../../shared/hof";
 export const RESOLVE_HOOK_PRIORITY = 1000;
 /**

package/src/router/index.js

@@ -6,16 +6,16 @@ import {
   runBlock,
   watchDigests,
 } from "./services";
-import { TemplateFactory } from "./templateFactory";
+import { TemplateFactory } from "./template-factory";
 import { trace } from "./common/trace";
-import { $ViewScrollProvider } from "./viewScroll";
-import { $IsStateFilter, $IncludedByStateFilter } from "./stateFilters";
+import { $ViewScrollProvider } from "./view-scroll";
+import { $IsStateFilter, $IncludedByStateFilter } from "./state-filters";
 import {
   uiSrefActiveDirective,
   uiStateDirective,
   uiSrefDirective,
-} from "./directives/stateDirectives";
-import { uiView, $ViewDirectiveFill } from "./directives/viewDirective";
+} from "./directives/state-directives";
+import { uiView, $ViewDirectiveFill } from "./directives/view-directive";
 
 export function initRouter() {
   window.angular
@@ -28,9 +28,7 @@ export function initRouter() {
         return router.urlMatcherFactory;
       },
     ])
-    .provider("$templateFactory", function () {
-      return new TemplateFactory();
-    })
+    .provider("$templateFactory", TemplateFactory)
     .provider("$stateRegistry", getProviderFor("stateRegistry"))
     .provider("$routerGlobals", getProviderFor("globals"))
     .provider("$transitions", getProviderFor("transitionService"))

package/src/router/params/{paramTypes.js → param-types.js}

@@ -1,7 +1,6 @@
 import {
   fromJson,
   toJson,
-  identity,
   equals,
   inherit,
   map,
@@ -11,7 +10,7 @@ import { isNullOrUndefined } from "../../shared/predicates";
 import { isDefined } from "../../shared/utils";
 import { is } from "../../shared/hof";
 import { services } from "../common/coreservices";
-import { ParamType } from "./paramType";
+import { ParamType } from "./param-type";
 /**
  * A registry for parameter types.
  *
@@ -153,8 +152,8 @@ function initDefaultTypes() {
     }),
     // does not encode/decode
     any: makeDefaultType({
-      encode: identity,
-      decode: identity,
+      encode: (x) => x,
+      decode: (x) => x,
       is: () => true,
       equals: equals,
     }),

package/src/router/params/param.js

@@ -3,7 +3,7 @@ import { prop } from "../../shared/hof";
 import { isInjectable } from "../../shared/predicates";
 import { isDefined, isUndefined, isString } from "../../shared/utils";
 import { services } from "../common/coreservices";
-import { ParamType } from "./paramType";
+import { ParamType } from "./param-type";
 const hasOwn = Object.prototype.hasOwnProperty;
 const isShorthand = (cfg) =>
   ["value", "type", "squash", "array", "dynamic"].filter(hasOwn.bind(cfg || {}))

package/src/router/path/{pathUtils.js → path-utils.js}

@@ -9,8 +9,8 @@ import {
   arrayTuples,
 } from "../../shared/common";
 import { prop, propEq } from "../../shared/hof";
-import { TargetState } from "../state/targetState";
-import { PathNode } from "./pathNode";
+import { TargetState } from "../state/target-state";
+import { PathNode } from "./path-node";
 /**
  * This class contains functions which convert TargetStates, Nodes and paths from one type to another.
  */

package/src/router/resolve/resolvable.js

@@ -1,4 +1,4 @@
-import { identity, isFunction, isObject } from "../../shared/utils";
+import { isFunction, isObject } from "../../shared/utils";
 import { services } from "../common/coreservices";
 import { trace } from "../common/trace";
 import { stringify } from "../../shared/strings";
@@ -87,7 +87,7 @@ export class Resolvable {
     const node = resolveContext.findNode(this);
     const state = node && node.state;
     const asyncPolicy = this.getPolicy(state).async;
-    const customAsyncPolicy = isFunction(asyncPolicy) ? asyncPolicy : identity;
+    const customAsyncPolicy = isFunction(asyncPolicy) ? asyncPolicy : (x) => x;
     // After the final value has been resolved, update the state of the Resolvable
     const applyResolvedValue = (resolvedValue) => {
       this.data = resolvedValue;

package/src/router/resolve/{resolveContext.js → resolve-context.js}

@@ -3,7 +3,7 @@ import { propEq, not } from "../../shared/hof";
 import { trace } from "../common/trace";
 import { services } from "../common/coreservices";
 import { Resolvable } from "./resolvable";
-import { PathUtils } from "../path/pathUtils";
+import { PathUtils } from "../path/path-utils";
 import { stringify } from "../../shared/strings";
 import { isUndefined } from "../../shared/utils";
 

package/src/router/router.js

@@ -1,13 +1,13 @@
-import { UrlMatcherFactory } from "./url/urlMatcherFactory";
-import { UrlRouter } from "./url/urlRouter";
-import { TransitionService } from "./transition/transitionService";
+import { UrlMatcherFactory } from "./url/url-matcher-factory";
+import { UrlRouter } from "./url/url-router";
+import { TransitionService } from "./transition/transition-service";
 import { ViewService } from "./view/view";
-import { StateRegistry } from "./state/stateRegistry";
-import { StateService } from "./state/stateService";
+import { StateRegistry } from "./state/state-registry";
+import { StateService } from "./state/state-service";
 import { UIRouterGlobals } from "./globals";
 import { removeFrom } from "../shared/common";
 import { isFunction } from "../shared/utils";
-import { UrlService } from "./url/urlService";
+import { UrlService } from "./url/url-service";
 import { trace } from "./common/trace";
 
 /**
@@ -26,11 +26,11 @@ export class UIRouter {
   /**
    * Creates a new `UIRouter` object
    *
-   * @param {import('./locationServices').Ng1LocationServices} locationService
+   * @param {import('./location-services').Ng1LocationServices} locationService
    */
   constructor(locationService) {
     /**
-     * @type {import('./locationServices').Ng1LocationServices}
+     * @type {import('./location-services').Ng1LocationServices}
      */
     this.locationService = locationService;
     /**  @type {number} */ this.$id = routerId++;

package/src/router/services.js

@@ -15,9 +15,9 @@ import { trace } from "./common/trace";
 import { UIRouter } from "./router";
 import { ng1ViewsBuilder, getNg1ViewConfigFactory } from "./state/views";
 
-import { StateProvider } from "./stateProvider";
-import { Ng1LocationServices } from "./locationServices";
-import { ResolveContext } from "./resolve/resolveContext";
+import { StateProvider } from "./state-provider";
+import { Ng1LocationServices } from "./location-services";
+import { ResolveContext } from "./resolve/resolve-context";
 
 export let router = null;
 $routerProvider.$inject = ["$locationProvider"];

package/src/router/state/{stateBuilder.js → state-builder.js}

@@ -1,6 +1,5 @@
 import {
   applyPairs,
-  identity,
   inherit,
   mapObj,
   omit,
@@ -201,12 +200,12 @@ export function resolvablesBuilder(state) {
     ],
     [
       prop("useExisting"),
-      (p) => new Resolvable(getToken(p), identity, [p.useExisting], p.policy),
+      (p) => new Resolvable(getToken(p), (x) => x, [p.useExisting], p.policy),
     ],
   ]);
   // prettier-ignore
   const tuple2Resolvable = pattern([
-        [pipe(prop('val'), isString), (tuple) => new Resolvable(tuple.token, identity, [tuple.val], tuple.policy)],
+        [pipe(prop('val'), isString), (tuple) => new Resolvable(tuple.token, ((x) => x), [tuple.val], tuple.policy)],
         [pipe(prop('val'), Array.isArray), (tuple) => new Resolvable(tuple.token, tail(tuple.val), tuple.val.slice(0, -1), tuple.policy)],
         [pipe(prop('val'), isFunction), (tuple) => new Resolvable(tuple.token, tuple.val, annotate(tuple.val), tuple.policy)],
     ]);

package/src/router/state/{stateQueueManager.js → state-queue-manager.js}

@@ -1,7 +1,8 @@
 import { inArray } from "../../shared/common";
 import { prop } from "../../shared/hof";
 import { isString } from "../../shared/utils";
-import { StateObject } from "./stateObject";
+import { StateObject } from "./state-object";
+
 export class StateQueueManager {
   constructor(router, states, builder, listeners) {
     this.router = router;

package/src/router/state/{stateRegistry.js → state-registry.js}

@@ -1,6 +1,6 @@
-import { StateMatcher } from "./stateMatcher";
-import { StateBuilder } from "./stateBuilder";
-import { StateQueueManager } from "./stateQueueManager";
+import { StateMatcher } from "./state-matcher";
+import { StateBuilder } from "./state-builder";
+import { StateQueueManager } from "./state-queue-manager";
 import { removeFrom } from "../../shared/common";
 import { propEq } from "../../shared/hof";
 /**

package/src/router/state/{stateService.js → state-service.js}

@@ -9,15 +9,15 @@ import {
 import { isDefined, isObject, isString } from "../../shared/utils";
 import { Queue } from "../common/queue";
 import { services } from "../common/coreservices";
-import { PathUtils } from "../path/pathUtils";
-import { PathNode } from "../path/pathNode";
-import { defaultTransOpts } from "../transition/transitionService";
-import { Rejection, RejectType } from "../transition/rejectFactory";
-import { TargetState } from "./targetState";
+import { PathUtils } from "../path/path-utils";
+import { PathNode } from "../path/path-node";
+import { defaultTransOpts } from "../transition/transition-service";
+import { Rejection, RejectType } from "../transition/reject-factory";
+import { TargetState } from "./target-state";
 import { Param } from "../params/param";
 import { Glob } from "../common/glob";
-import { ResolveContext } from "../resolve/resolveContext";
-import { lazyLoadState } from "../hooks/lazyLoad";
+import { ResolveContext } from "../resolve/resolve-context";
+import { lazyLoadState } from "../hooks/lazy-load";
 import { not, val } from "../../shared/hof";
 /**
  * Provides services related to ui-router states.

package/src/router/state/views.js

@@ -4,7 +4,7 @@ import { isInjectable } from "../../shared/predicates";
 import { services } from "../common/coreservices";
 import { trace } from "../common/trace";
 import { ViewService } from "../view/view";
-import { ResolveContext } from "../resolve/resolveContext";
+import { ResolveContext } from "../resolve/resolve-context";
 import { Resolvable } from "../resolve/resolvable";
 
 export function getNg1ViewConfigFactory() {

package/src/router/{stateProvider.js → state-provider.js}

@@ -5,14 +5,20 @@ import { createProxyFunctions } from "../shared/common";
 import { minErr } from "../shared/utils";
 
 const err = minErr("$stateProvider");
+// Right now this is a collection of all the properties we encounter in tests
 const validKeys = [
   "$$state",
   "__stateObjectCache",
+  "abstract",
+  "bindings",
   "controller",
+  "controllerAs",
   "controllerProvider",
   "component",
+  "componentProvider",
   "data",
   "includes",
+  "lazyLoad",
   "name",
   "navigable",
   "onEnter",
@@ -21,8 +27,10 @@ const validKeys = [
   "params",
   "parent",
   "path",
+  "redirectTo",
   "reloadOnSearch",
   "resolve",
+  "resolveAs",
   "resolvables",
   "self",
   "template",