@angular-wave/angular.ts 0.8.0 → 0.8.2

package/src/core/compile/compile.js

@@ -333,7 +333,7 @@ export class CompileProvider {
     /**
      * @param {string|Object} name Name of the component in camelCase (i.e. `myComp` which will match `<my-comp>`),
      *    or an object map of components where the keys are the names and the values are the component definition objects.
-     * @param {Object} options Component definition object (a simplified
+     * @param {import("../../interface.js").ComponentOptions} options Component definition object (a simplified
      *    {directive definition object}),
      *    with the following properties (all optional):
      *

package/src/core/di/ng-module.js

@@ -26,7 +26,7 @@ export class NgModule {
   /**
    * @param {string} name - Name of the module
    * @param {Array<string>} requires - List of modules which the injector will load before the current module
-   * @param {Function} [configFn]
+   * @param {import("../../interface.js").Injectable} [configFn]
    */
   constructor(name, requires, configFn) {
     assert(isString(name), "name required");
@@ -52,7 +52,7 @@ export class NgModule {
     /** @type {!Array<Array<*>>} */
     this.configBlocks = [];
 
-    /** @type {!Array.<Function>} */
+    /** @type {!Array.<import("../../interface.js").Injectable>} */
     this.runBlocks = [];
 
     if (configFn) {
@@ -82,7 +82,7 @@ export class NgModule {
 
   /**
    *
-   * @param {Function} configFn
+   * @param {import("../../interface.js").Injectable} configFn
    * @returns {NgModule}
    */
   config(configFn) {
@@ -91,7 +91,7 @@ export class NgModule {
   }
 
   /**
-   * @param {Function} block
+   * @param {import("../../interface.js").Injectable} block
    * @returns {NgModule}
    */
   run(block) {
@@ -101,12 +101,12 @@ export class NgModule {
 
   /**
    * @param {string} name
-   * @param {*} options
+   * @param {import("../../interface.js").ComponentOptions} options
    * @returns {NgModule}
    */
   component(name, options) {
     if (options && isFunction(options)) {
-      options.$$moduleName = name;
+      options["$$moduleName"] = name;
     }
     this.invokeQueue.push([COMPILE_LITERAL, "component", [name, options]]);
     return this;
@@ -114,12 +114,12 @@ export class NgModule {
 
   /**
    * @param {string} name
-   * @param {*} providerFunction
+   * @param {import("../../interface.js").Injectable} providerFunction
    * @returns {NgModule}
    */
   factory(name, providerFunction) {
     if (providerFunction && isFunction(providerFunction)) {
-      providerFunction.$$moduleName = name;
+      providerFunction["$$moduleName"] = name;
     }
     this.invokeQueue.push([$t.$provide, "factory", [name, providerFunction]]);
     return this;
@@ -127,12 +127,12 @@ export class NgModule {
 
   /**
    * @param {string} name
-   * @param {*} serviceFunction
+   * @param {import("../../interface.js").Injectable} serviceFunction
    * @returns {NgModule}
    */
   service(name, serviceFunction) {
     if (serviceFunction && isFunction(serviceFunction)) {
-      serviceFunction.$$moduleName = name;
+      serviceFunction["$$moduleName"] = name;
     }
     this.invokeQueue.push([$t.$provide, "service", [name, serviceFunction]]);
     return this;
@@ -140,12 +140,12 @@ export class NgModule {
 
   /**
    * @param {string} name
-   * @param {*} providerType
+   * @param {import("../../interface.js").Injectable} providerType
    * @returns {NgModule}
    */
   provider(name, providerType) {
     if (providerType && isFunction(providerType)) {
-      providerType.$$moduleName = name;
+      providerType["$$moduleName"] = name;
     }
     this.invokeQueue.push([$t.$provide, "provider", [name, providerType]]);
     return this;
@@ -153,12 +153,12 @@ export class NgModule {
 
   /**
    * @param {string} name
-   * @param {*} decorFn
+   * @param {import("../../interface.js").Injectable} decorFn
    * @returns {NgModule}
    */
   decorator(name, decorFn) {
     if (decorFn && isFunction(decorFn)) {
-      decorFn.$$moduleName = name;
+      decorFn["$$moduleName"] = name;
     }
     this.configBlocks.push([$t.$provide, "decorator", [name, decorFn]]);
     return this;
@@ -166,12 +166,12 @@ export class NgModule {
 
   /**
    * @param {string} name
-   * @param {*} directiveFactory
+   * @param {import("../../interface.js").Injectable} directiveFactory
    * @returns {NgModule}
    */
   directive(name, directiveFactory) {
     if (directiveFactory && isFunction(directiveFactory)) {
-      directiveFactory.$$moduleName = name;
+      directiveFactory["$$moduleName"] = name;
     }
     this.invokeQueue.push([
       COMPILE_LITERAL,
@@ -183,12 +183,12 @@ export class NgModule {
 
   /**
    * @param {string} name
-   * @param {*} animationFactory
+   * @param {import("../../interface.js").Injectable} animationFactory
    * @returns {NgModule}
    */
   animation(name, animationFactory) {
     if (animationFactory && isFunction(animationFactory)) {
-      animationFactory.$$moduleName = name;
+      animationFactory["$$moduleName"] = name;
     }
     this.invokeQueue.push([
       ANIMATION_LITERAL,
@@ -198,9 +198,14 @@ export class NgModule {
     return this;
   }
 
+  /**
+   * @param {string} name
+   * @param {import("../../interface.js").Injectable} filterFn
+   * @return {NgModule}
+   */
   filter(name, filterFn) {
     if (filterFn && isFunction(filterFn)) {
-      filterFn.$$moduleName = name;
+      filterFn["$$moduleName"] = name;
     }
     this.invokeQueue.push([FILTER_LITERAL, "register", [name, filterFn]]);
     return this;
@@ -208,12 +213,12 @@ export class NgModule {
 
   /**
    * @param {string} name
-   * @param {*} ctlFn
+   * @param {import("../../interface.js").Injectable} ctlFn
    * @returns {NgModule}
    */
   controller(name, ctlFn) {
     if (ctlFn && isFunction(ctlFn)) {
-      ctlFn.$$moduleName = name;
+      ctlFn["$$moduleName"] = name;
     }
     this.invokeQueue.push([CONTROLLER_LITERAL, "register", [name, ctlFn]]);
     return this;

package/src/core/parse/parse.spec.js

@@ -1787,37 +1787,36 @@ describe("parser", () => {
       });
 
       [0, false, "", NaN].forEach((falsyValue) => {
-        "should not overwrite $prop scope properties when assigning",
-          () => {
-            let scope;
-
-            scope = { a: falsyValue, c: falsyValue };
-            tryParseAndIgnoreException("a.b = 1");
-            tryParseAndIgnoreException('c["d"] = 2');
-            expect(scope).toEqual({ a: falsyValue, c: falsyValue });
-
-            scope = { a: { b: falsyValue, c: falsyValue } };
-            tryParseAndIgnoreException("a.b.c = 1");
-            tryParseAndIgnoreException('a.c["d"] = 2');
-            expect(scope).toEqual({ a: { b: falsyValue, c: falsyValue } });
-
-            // Helpers
-            //
-            // Normally assigning property on a primitive should throw exception in strict mode
-            // and silently fail in non-strict mode, IE seems to always have the non-strict-mode behavior,
-            // so if we try to use 'expect(() => {$parse('a.b=1')({a:false});).toThrow()' for testing
-            // the test will fail in case of IE because it will not throw exception, and if we just use
-            // '$parse('a.b=1')({a:false})' the test will fail because it will throw exception in case of Chrome
-            // so we use tryParseAndIgnoreException helper to catch the exception silently for all cases.
-            //
-            function tryParseAndIgnoreException(expression) {
-              try {
-                $parse(expression)(scope);
-              } catch (error) {
-                /* ignore exception */
-              }
+        it("should not overwrite $prop scope properties when assigning", () => {
+          let scope;
+
+          scope = { a: falsyValue, c: falsyValue };
+          tryParseAndIgnoreException("a.b = 1");
+          tryParseAndIgnoreException('c["d"] = 2');
+          expect(scope).toEqual({ a: falsyValue, c: falsyValue });
+
+          scope = { a: { b: falsyValue, c: falsyValue } };
+          tryParseAndIgnoreException("a.b.c = 1");
+          tryParseAndIgnoreException('a.c["d"] = 2');
+          expect(scope).toEqual({ a: { b: falsyValue, c: falsyValue } });
+
+          // Helpers
+          //
+          // Normally assigning property on a primitive should throw exception in strict mode
+          // and silently fail in non-strict mode, IE seems to always have the non-strict-mode behavior,
+          // so if we try to use 'expect(() => {$parse('a.b=1')({a:false});).toThrow()' for testing
+          // the test will fail in case of IE because it will not throw exception, and if we just use
+          // '$parse('a.b=1')({a:false})' the test will fail because it will throw exception in case of Chrome
+          // so we use tryParseAndIgnoreException helper to catch the exception silently for all cases.
+          //
+          function tryParseAndIgnoreException(expression) {
+            try {
+              $parse(expression)(scope);
+            } catch (error) {
+              /* ignore exception */
             }
-          };
+          }
+        });
       });
     });
 

package/src/directive/events/event.spec.js

@@ -60,13 +60,13 @@ describe("event directives", () => {
     });
 
     it("should expose event on form submit", () => {
-      (app.innerHTML =
+      app.innerHTML =
         '<form ng-submit="formSubmission($event)">' +
         '<input type="submit" />' +
-        "</form>"),
-        window.angular.bootstrap(app, ["myModule"]).invoke((_$rootScope_) => {
-          $rootScope = _$rootScope_;
-        });
+        "</form>";
+      window.angular.bootstrap(app, ["myModule"]).invoke((_$rootScope_) => {
+        $rootScope = _$rootScope_;
+      });
       element = app.querySelector("form");
       $rootScope.formSubmission = function (e) {
         if (e) {

package/src/directive/messages/messages.md

@@ -352,7 +352,6 @@
   _ `ngMessages` is a directive that is designed to show and hide messages based on the state
   _ of a key/value object that it listens on. The directive itself complements error message
   _ reporting with the `ngModel` $error object (which stores a key/value state of validation errors).
-
   -
   - `ngMessages` manages the state of internal messages within its container element. The internal
   - messages use the `ngMessage` directive and will be inserted/removed from the page depending
@@ -440,7 +439,6 @@
   _ determine what messages are overridden due to the placement of the ngMessagesInclude directive. \*
   _ @usage
   _ `html
-
   - <!-- using attribute directives -->
   - <ANY ng-messages="expression" role="alert">
   - <ANY ng-messages-include="remoteTplString">...</ANY>
@@ -473,7 +471,6 @@ _ {@link module:ngMessages Click here} to learn more about`ngMessages`and`ngMess
   _ {@link module:ngMessages `ngMessages` module documentation}. \*
   _ @usage
   _ `html
-
   - <!-- using attribute directives -->
   - <ANY ng-messages="expression" role="alert">
   - <ANY ng-message="stringValue">...</ANY>
@@ -502,7 +499,6 @@ _ {@link module:ngMessages Click here} to learn more about`ngMessages`and`ngMess
   _
   _ @usage
   _ `html
-
   - <!-- using attribute directives -->
   - <ANY ng-messages="expression">
   - <ANY ng-message-exp="expressionValue">...</ANY>

package/src/directive/repeat/repeat.js

@@ -85,7 +85,7 @@ export function ngRepeatDirective($animate) {
     transclude: "element",
     priority: 1000,
     terminal: true,
-    compile: ($element, $attr) => {
+    compile: (_$element, $attr) => {
       const expression = $attr["ngRepeat"];
       const hasAnimate = !!$attr["animate"];
 

package/src/injection-tokens.js

@@ -44,11 +44,11 @@ export const $injectTokens = Object.freeze({
   $interpolate: "$interpolate",
   $location: "$location",
   $log: "$log",
-  $ngViewScroll: "$ngViewScroll",
+  $viewScroll: "$viewScroll",
   $parse: "$parse",
   $rootScope: "$rootScope",
   $rootElement: "$rootElement",
-  $routerGlobals: "$routerGlobals",
+  $router: "$router",
   $sce: "$sce",
   $sceDelegate: "$sceDelegate",
   $state: "$state",

package/src/interface.ts

@@ -37,6 +37,7 @@ export type ExpandoStore = {
  * ```
  */
 export type AnnotatedFactory = [...string[], (...args: any[]) => any];
+export type InjectableFactory = (...args: any[]) => any;
 
 /**
  * A factory that can be either a standalone function or a dependency-annotated array.
@@ -44,8 +45,6 @@ export type AnnotatedFactory = [...string[], (...args: any[]) => any];
  * The array form is used to support minification-safe dependency injection.
  * See {@link AnnotatedFactory}.
  */
-export type InjectableFactory = (...args: any[]) => any;
-
 export type Injectable = AnnotatedFactory | InjectableFactory;
 
 /**

package/src/ng.js

@@ -105,7 +105,7 @@ import { AnimateJsDriverProvider } from "./animations/animate-js-driver.js";
 import { ngAnimateSwapDirective } from "./animations/animate-swap.js";
 import { $$AnimateChildrenDirective } from "./animations/animate-children-directive.js";
 import { UrlConfigProvider } from "./router/url/url-config.js";
-import { RouterGlobals } from "./router/globals.js";
+import { Router } from "./router/router.js";
 import { ViewService } from "./router/view/view.js";
 import { TransitionProvider } from "./router/transition/transition-service.js";
 import { StateProvider } from "./router/state/state-service.js";
@@ -259,7 +259,7 @@ export function registerNgModule(angular) {
             $parse: ParseProvider,
             $$rAFScheduler: RafSchedulerProvider,
             $rootScope: RootScopeProvider,
-            $routerGlobals: RouterGlobals,
+            $router: Router,
             $sce: SceProvider,
             $sceDelegate: SceDelegateProvider,
             $templateCache: TemplateCacheProvider,
@@ -268,7 +268,7 @@ export function registerNgModule(angular) {
             $view: ViewService,
             $transitions: TransitionProvider,
             $state: StateProvider,
-            $ngViewScroll: ViewScrollProvider,
+            $viewScroll: ViewScrollProvider,
             $templateFactory: TemplateFactoryProvider,
             $url: UrlService,
             $stateRegistry: StateRegistryProvider,
@@ -278,9 +278,9 @@ export function registerNgModule(angular) {
       ],
     )
     .factory("$stateParams", [
-      $t.$routerGlobals,
+      $t.$router,
       /**
-       * @param {import('./router/globals.js').RouterGlobals} globals
+       * @param {import('./router/router.js').Router} globals
        * @returns {import('./router/params/state-params.js').StateParams }
        */
       (globals) => globals.params,

package/src/ng.spec.js

@@ -9,7 +9,7 @@ describe("public", () => {
   it("sets up the angular object and the module loader", () => {
     expect(window.angular).toBeDefined();
     expect(window.angular.module).toBeDefined();
-    expect(window.angular.$injectTokens).toBeDefined();
+    expect(window.angular.$t).toBeDefined();
   });
 
   it("sets up the ng module", () => {

package/src/router/directives/state-directives.js

@@ -245,7 +245,7 @@ export function $StateRefDynamicDirective(
 
 $StateRefActiveDirective.$inject = [
   "$state",
-  "$routerGlobals",
+  "$router",
   "$interpolate",
   "$stateRegistry",
   "$transitions",
@@ -253,7 +253,7 @@ $StateRefActiveDirective.$inject = [
 
 /**
  * @param {*} $state
- * @param {import('../globals.js').RouterGlobals} $routerGlobals
+ * @param {import('../router.js').Router} $router
  * @param {*} $interpolate
  * @param {*} $stateRegistry
  * @param {*} $transitions
@@ -261,7 +261,7 @@ $StateRefActiveDirective.$inject = [
  */
 export function $StateRefActiveDirective(
   $state,
-  $routerGlobals,
+  $router,
   $interpolate,
   $stateRegistry,
   $transitions,
@@ -300,8 +300,8 @@ export function $StateRefActiveDirective(
         trans.promise.then(update, () => {});
       }
       $scope.$on("$destroy", setupEventListeners());
-      if ($routerGlobals.transition) {
-        updateAfterTransition($routerGlobals.transition);
+      if ($router.transition) {
+        updateAfterTransition($router.transition);
       }
       function setupEventListeners() {
         const deregisterStatesChangedListener =

package/src/router/directives/state-directives.spec.js

@@ -61,7 +61,7 @@ describe("ngStateRef", () => {
     $rootScope = $injector.get("$rootScope");
     $compile = $injector.get("$compile");
     $state = $injector.get("$state");
-    $stateParams = $injector.get("$routerGlobals").params;
+    $stateParams = $injector.get("$router").params;
     $url = $injector.get("$url");
     $url.listen();
   });
@@ -705,7 +705,7 @@ describe("ngSrefActive", () => {
     $rootScope = $injector.get("$rootScope");
     $compile = $injector.get("$compile");
     $state = $injector.get("$state");
-    $stateParams = $injector.get("$routerGlobals").params;
+    $stateParams = $injector.get("$router").params;
   });
 
   it("should update class for sibling ngSref", async () => {

package/src/router/directives/view-directive.js

@@ -24,7 +24,7 @@ import { getLocals } from "../state/state-registry.js";
  *   The ng-view can be targeted in a View using the name ([[StateDeclaration.views]]).
  *
  * - `autoscroll`: an expression. When it evaluates to true, the `ng-view` will be scrolled into view when it is activated.
- *   Uses [[$ngViewScroll]] to do the scrolling.
+ *   Uses [[$viewScroll]] to do the scrolling.
  *
  * - `onload`: Expression to evaluate whenever the view updates.
  *
@@ -143,16 +143,16 @@ import { getLocals } from "../state/state-registry.js";
 export let ngView = [
   "$view",
   "$animate",
-  "$ngViewScroll",
+  "$viewScroll",
   "$interpolate",
   /**
    * @param {*} $view
    * @param {*} $animate
-   * @param {*} $ngViewScroll
+   * @param {*} $viewScroll
    * @param {*} $interpolate
    * @returns {import("../../interface.js").Directive}
    */
-  function $ViewDirective($view, $animate, $ngViewScroll, $interpolate) {
+  function $ViewDirective($view, $animate, $viewScroll, $interpolate) {
     function getRenderer() {
       return {
         enter: function (element, target, cb) {
@@ -289,7 +289,7 @@ export let ngView = [
                   (isDefined(autoScrollExp) && !autoScrollExp) ||
                   scope.$eval(autoScrollExp)
                 ) {
-                  $ngViewScroll(clone);
+                  $viewScroll(clone);
                 }
               });
               cleanupLastView();

package/src/router/directives/view-directive.spec.js

@@ -12,7 +12,7 @@ describe("ngView", () => {
     app,
     $injector,
     $state,
-    $ngViewScroll;
+    $viewScroll;
 
   const aState = {
       name: "a",
@@ -129,8 +129,8 @@ describe("ngView", () => {
     app = window.angular
       .module("defaultModule", [])
       .config(($provide, _$stateProvider_) => {
-        $provide.decorator("$ngViewScroll", () => {
-          return jasmine.createSpy("$ngViewScroll");
+        $provide.decorator("$viewScroll", () => {
+          return jasmine.createSpy("$viewScroll");
         });
 
         _$stateProvider_
@@ -156,11 +156,11 @@ describe("ngView", () => {
       "defaultModule",
     ]);
 
-    $injector.invoke((_$state_, $rootScope, _$compile_, _$ngViewScroll_) => {
+    $injector.invoke((_$state_, $rootScope, _$compile_, _$viewScroll_) => {
       scope = $rootScope.$new();
       $compile = _$compile_;
       $state = _$state_;
-      $ngViewScroll = _$ngViewScroll_;
+      $viewScroll = _$viewScroll_;
     });
   });
 
@@ -312,7 +312,7 @@ describe("ngView", () => {
 
       $state.transitionTo(aState);
       await wait(100);
-      expect($ngViewScroll).not.toHaveBeenCalled();
+      expect($viewScroll).not.toHaveBeenCalled();
     });
 
     it("should autoscroll when expression is missing", async () => {
@@ -324,7 +324,7 @@ describe("ngView", () => {
 
       // animateFlush($animate);
 
-      expect($ngViewScroll).toHaveBeenCalledWith(elem.querySelector("ng-view"));
+      expect($viewScroll).toHaveBeenCalledWith(elem.querySelector("ng-view"));
     });
 
     it("should autoscroll based on expression", async () => {
@@ -336,12 +336,12 @@ describe("ngView", () => {
       $state.transitionTo(aState);
       await wait(100);
 
-      expect($ngViewScroll).not.toHaveBeenCalled();
+      expect($viewScroll).not.toHaveBeenCalled();
 
       scope.doScroll = true;
       $state.transitionTo(bState);
       await wait(100);
-      expect($ngViewScroll).toHaveBeenCalledWith(elem.querySelector("ng-view"));
+      expect($viewScroll).toHaveBeenCalledWith(elem.querySelector("ng-view"));
     });
   });
 
@@ -809,7 +809,7 @@ describe("ngView named", () => {
     $injector,
     $state,
     $rootScope,
-    $ngViewScroll;
+    $viewScroll;
 
   beforeEach(() => {
     window.angular = new Angular();
@@ -831,12 +831,12 @@ describe("ngView named", () => {
       "defaultModule",
     ]);
 
-    $injector.invoke((_$state_, _$rootScope_, _$compile_, _$ngViewScroll_) => {
+    $injector.invoke((_$state_, _$rootScope_, _$compile_, _$viewScroll_) => {
       $rootScope = _$rootScope_;
       scope = $rootScope.$new();
       $compile = _$compile_;
       $state = _$state_;
-      $ngViewScroll = _$ngViewScroll_;
+      $viewScroll = _$viewScroll_;
     });
   });
 
@@ -903,7 +903,7 @@ describe("ngView transclusion", () => {
       "defaultModule",
     ]);
 
-    $injector.invoke((_$state_, _$rootScope_, _$compile_, _$ngViewScroll_) => {
+    $injector.invoke((_$state_, _$rootScope_, _$compile_, _$viewScroll_) => {
       $rootScope = _$rootScope_;
       scope = $rootScope.$new();
       $compile = _$compile_;
@@ -973,7 +973,7 @@ describe("ngView controllers or onEnter handlers", () => {
       "defaultModule",
     ]);
 
-    $injector.invoke((_$state_, _$rootScope_, _$compile_, _$ngViewScroll_) => {
+    $injector.invoke((_$state_, _$rootScope_, _$compile_, _$viewScroll_) => {
       $rootScope = _$rootScope_;
       scope = $rootScope.$new();
       $compile = _$compile_;
@@ -1832,9 +1832,9 @@ describe("angular 1.5+ style .component()", () => {
         name: "ng12-dynamic-directive",
         url: "/ng12dynamicDirective/:type",
         componentProvider: [
-          "$routerGlobals",
-          function ($routerGlobals) {
-            return $routerGlobals.params.type;
+          "$router",
+          function ($router) {
+            return $router.params.type;
           },
         ],
       });
@@ -1860,9 +1860,9 @@ describe("angular 1.5+ style .component()", () => {
         name: "dynamicComponent",
         url: "/dynamicComponent/:type",
         componentProvider: [
-          "$routerGlobals",
-          function ($routerGlobals) {
-            return $routerGlobals.params.type;
+          "$router",
+          function ($router) {
+            return $router.params.type;
           },
         ],
       });

package/src/router/params/param-type.js

@@ -27,7 +27,6 @@ export class ParamType {
   /**
    * @param def  A configuration object which contains the custom type definition.  The object's
    *        properties will override the default methods and/or pattern in `ParamType`'s public interface.
-   * @returns a new ParamType object
    */
   constructor(def) {
     this.pattern = /.*/;

package/src/router/params/param.js

@@ -192,7 +192,7 @@ export class Param {
     const normalized = this.type.$normalize(value);
     if (!this.type.is(normalized)) return false;
     // The value was of the correct type, but when encoded, did not match the ParamType's regexp
-    const encoded = this.type.encode(normalized);
+    const encoded = normalized; // this.type.encode(normalized);
     return !(isString(encoded) && !this.type.pattern.exec(encoded));
   }
   toString() {

package/src/router/{globals.js → router.js}

@@ -9,7 +9,7 @@ import { Queue } from "../shared/queue.js";
  * This is where we hold the global mutable state such as current state, current
  * params, current transition, etc.
  */
-export class RouterGlobals {
+export class Router {
   constructor() {
     /**
      * Current parameter values