@angular-wave/angular.ts 0.0.68 → 0.0.69

package/src/loader.spec.js

@@ -2,7 +2,7 @@ import { Angular } from "./loader";
 import { createInjector } from "./core/di/injector";
 
 describe("module loader", () => {
-  var angular;
+  let angular;
   beforeEach(() => {
     angular = window.angular = new Angular();
   });

package/src/public.js

@@ -90,7 +90,13 @@ import { TemplateRequestProvider } from "./services/template-request";
 import { $TimeoutProvider } from "./core/timeout/timeout";
 import { SanitizeUriProvider } from "./core/sanitize/sanitize-uri";
 import { initAnimateModule } from "./animations/module";
-import { initMessageModule } from "./exts/messages/messages";
+import {
+  ngMessageDefaultDirective,
+  ngMessageDirective,
+  ngMessageExpDirective,
+  ngMessagesDirective,
+  ngMessagesIncludeDirective,
+} from "./directive/messages/messages";
 import { initAriaModule } from "./exts/aria/aria";
 import { initRouter } from "./router/index";
 
@@ -139,6 +145,11 @@ export function publishExternalAPI(angular) {
               ngIf: ngIfDirective,
               ngInclude: ngIncludeDirective,
               ngInit: ngInitDirective,
+              ngMessages: ngMessagesDirective,
+              ngMessage: ngMessageDirective,
+              ngMessageExp: ngMessageExpDirective,
+              ngMessagesInclude: ngMessagesIncludeDirective,
+              ngMessageDefault: ngMessageDefaultDirective,
               ngNonBindable: ngNonBindableDirective,
               ngRef: ngRefDirective,
               ngRepeat: ngRepeatDirective,
@@ -207,7 +218,6 @@ export function publishExternalAPI(angular) {
     .info({ version: VERSION });
 
   initAnimateModule(angular);
-  initMessageModule(angular);
   initAriaModule(angular);
   initRouter(angular);
   return ng;

package/src/router/common/glob.spec.js

@@ -1,4 +1,4 @@
-import { Glob } from "../../router/common/glob";
+import { Glob } from "./glob";
 
 describe("Glob", function () {
   it("should match exact strings", function () {

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

@@ -1,4 +1,4 @@
-import { DefType, Param } from "../params/param";
+import { DefType, Param } from "./param";
 
 export class ParamFactory {
   constructor(urlServiceConfig) {

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

@@ -1,4 +1,4 @@
-import { StateBuilder } from "../../router/state/state-builder";
+import { StateBuilder } from "./state-builder";
 
 // TODO refactor this to url service
 xdescribe("StateBuilder", function () {

package/src/router/template-factory.js

@@ -111,7 +111,9 @@ export class TemplateFactory {
    * string.
    */
   fromString(template, params) {
-    return isFunction(template) ? template(params) : template;
+    return isFunction(template)
+      ? /** @type {Function} */ (template)(params)
+      : template;
   }
   /**
    * Loads a template from the a URL via `$http` and `$templateCache`.
@@ -123,7 +125,7 @@ export class TemplateFactory {
    * for that string.
    */
   fromUrl(url, params) {
-    if (isFunction(url)) url = url(params);
+    if (isFunction(url)) url = /** @type {Function} */ (url)(params);
     if (url == null) return null;
     if (this._useHttp) {
       return this.$http
@@ -141,7 +143,7 @@ export class TemplateFactory {
    * Creates a template by invoking an injectable provider function.
    *
    * @param {import('../types').Injectable<any>} provider Function to invoke via `locals`
-   * @param {Function} injectFn a function used to invoke the template provider
+   * @param {Function} params a function used to invoke the template provider
    * @param {import("./resolve/resolve-context").ResolveContext} context
    * @return {string|Promise.<string>} The template html as a string, or a promise
    * for that string.
@@ -156,7 +158,7 @@ export class TemplateFactory {
    * Creates a component's template by invoking an injectable provider function.
    *
    * @param {import('../types').Injectable<any>} provider Function to invoke via `locals`
-   * @param {Function} injectFn a function used to invoke the template provider
+   * @param {Function} params a function used to invoke the template provider
    * @return {string} The template html as a string: "<component-name input1='::$resolve.foo'></component-name>".
    */
   fromComponentProvider(provider, params, context) {

package/src/router/view/view.spec.js

@@ -1,16 +1,13 @@
-import { dealoc, JQLite } from "../../shared/jqlite/jqlite";
+import { dealoc } from "../../shared/jqlite/jqlite";
 import { Angular } from "../../loader";
 import { curry } from "../../shared/hof";
-import { StateMatcher } from "../../router/state/state-matcher";
-import { StateBuilder } from "../../router/state/state-builder";
-import { StateObject } from "../../router/state/state-object";
-import { ViewService } from "../../router/view/view";
-import {
-  ng1ViewsBuilder,
-  getNg1ViewConfigFactory,
-} from "../../router/state/views";
-import { PathNode } from "../../router/path/path-node";
-import { PathUtils } from "../../router/path/path-utils";
+import { StateMatcher } from "../state/state-matcher";
+import { StateBuilder } from "../state/state-builder";
+import { StateObject } from "../state/state-object";
+import { ViewService } from "./view.js";
+import { ng1ViewsBuilder, getNg1ViewConfigFactory } from "../state/views.js";
+import { PathNode } from "../path/path-node";
+import { PathUtils } from "../path/path-utils";
 import { tail } from "../../shared/common";
 import { wait } from "../../shared/test-utils";
 

package/src/router/view-scroll.js

@@ -6,7 +6,12 @@ export function $ViewScrollProvider() {
   this.$get = [
     "$anchorScroll",
     "$timeout",
-    function ($anchorScroll, $timeout) {
+    /**
+     * @param {import('../services/anchor-scroll').AnchorScrollObject} $anchorScroll
+     * @param {*} $timeout
+     * @returns {import('../services/anchor-scroll').AnchorScrollObject|Function}
+     */
+    ($anchorScroll, $timeout) => {
       if (useAnchorScroll) {
         return $anchorScroll;
       }

package/src/services/anchor-scroll.html

@@ -0,0 +1,83 @@
+<!doctype html>
+<html>
+  <head>
+    <meta charset="utf-8" />
+    <title>AngularTS Test Runner</title>
+
+    <link rel="shortcut icon" type="image/png" href="/images/favicon.ico" />
+
+    <!--     
+    <script src="https://cdn.jsdelivr.net/npm/angular@1.8.3/angular.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/angular-animate@1.8.3/angular-animate.js"></script>
+    <script>window.angular.module("test", ["ngAnimate"])</script> -->
+
+    <script type="module" src="/src/index.js"></script>
+    <script>
+      document.addEventListener("DOMContentLoaded", () => {
+        window.angular
+          .module("test", [])
+          .run([
+            "$anchorScroll",
+            function ($anchorScroll) {
+              $anchorScroll.yOffset = 100; // always scroll by 50 extra pixels
+            },
+          ])
+          .controller("headerCtrl", [
+            "$anchorScroll",
+            "$location",
+            "$scope",
+            function ($anchorScroll, $location, $scope) {
+              $scope.gotoAnchor = function (x) {
+                window.$locationTest = $location;
+                var newHash = "anchor" + x;
+                if ($location.hash() !== newHash) {
+                  // set the $location.hash to `newHash` and
+                  // $anchorScroll will automatically scroll to it
+                  $location.hash("anchor" + x);
+                } else {
+                  // call $anchorScroll() explicitly,
+                  // since $location.hash hasn't changed
+                  $anchorScroll();
+                }
+              };
+            },
+          ]);
+      });
+    </script>
+
+    <style>
+      body {
+        padding-top: 50px;
+      }
+
+      .anchor {
+        border: 2px dashed DarkOrchid;
+        padding: 10px 10px 200px 10px;
+      }
+
+      .fixed-header {
+        background-color: rgba(0, 0, 0, 0.2);
+        height: 50px;
+        position: fixed;
+        top: 0;
+        left: 0;
+        right: 0;
+      }
+
+      .fixed-header > a {
+        display: inline-block;
+        margin: 5px 15px;
+      }
+    </style>
+  </head>
+  <body ng-app="test">
+    <div class="fixed-header" ng-controller="headerCtrl">
+      <a ng-click="gotoAnchor(x)" ng-repeat="x in [1,2,3,4,5]">
+        Go to anchor {{x}}
+      </a>
+    </div>
+    <div id="anchor{{x}}" class="anchor" ng-repeat="x in [1,2,3,4,5]">
+      Anchor {{x}} of 5
+    </div>
+  </body>
+</html>

package/src/services/anchor-scroll.js

@@ -6,6 +6,19 @@ import {
   getNodeName,
 } from "../shared/utils";
 
+/**
+ * @typedef {Object} AnchorScrollObject
+ * @property {number|function|import("../shared/jqlite/jqlite").JQLite} yOffset
+ */
+
+/**
+ * @typedef {(string) => void} AnchorScrollFunction
+ */
+
+/**
+ * @typedef {AnchorScrollFunction | AnchorScrollObject} AnchorScrollService
+ */
+
 export function AnchorScrollProvider() {
   let autoScrollingEnabled = true;
 
@@ -38,10 +51,11 @@ export function AnchorScrollProvider() {
       }
 
       function getYOffset() {
-        let offset = scroll.yOffset;
+        // Figure out a better way to configure this other than bolting on a property onto a function
+        let offset = /** @type {AnchorScrollObject} */ (scroll).yOffset;
 
         if (isFunction(offset)) {
-          offset = offset();
+          offset = /** @type {Function} */ (offset)();
         } else if (isElement(offset)) {
           const elem = offset[0];
           const style = window.getComputedStyle(elem);
@@ -78,14 +92,15 @@ export function AnchorScrollProvider() {
             // the top of the element and the offset, which is enough to align the top of `elem` at the
             // desired position.
             const elemTop = elem.getBoundingClientRect().top;
-            window.scrollBy(0, elemTop - offset);
+            window.scrollBy(0, elemTop - /** @type {number} */ (offset));
           }
         } else {
           window.scrollTo(0, 0);
         }
       }
 
-      function scroll(hash) {
+      /** @type {AnchorScrollService} */
+      const scroll = function (hash) {
         // Allow numeric hashes
         hash = isString(hash)
           ? hash
@@ -95,7 +110,9 @@ export function AnchorScrollProvider() {
         let elm;
 
         // empty hash, scroll to the top of the page
-        if (!hash) scrollTo(null);
+        if (!hash) {
+          scrollTo(null);
+        }
         // element with given id
         else if ((elm = document.getElementById(hash))) scrollTo(elm);
         // first anchor with given name :-D
@@ -103,7 +120,7 @@ export function AnchorScrollProvider() {
           scrollTo(elm);
         // no element and hash === 'top', scroll to the top of the page
         else if (hash === "top") scrollTo(null);
-      }
+      };
 
       // does not scroll when user clicks on anchor link that is currently on
       // (no url change, no $location.hash() change), browser native does scroll

package/src/services/browser.js

@@ -242,7 +242,7 @@ export function Browser(taskTracker) {
    * @param {function():any} fn A function, who's execution should be deferred.
    * @param {number=} [delay=0] Number of milliseconds to defer the function execution.
    * @param {string=} [taskType=DEFAULT_TASK_TYPE] The type of task that is deferred.
-   * @returns {*} DeferId that can be used to cancel the task via `$browser.cancel()`.
+   * @returns {number} DeferId that can be used to cancel the task via `$browser.cancel()`.
    *
    * @description
    * Executes a fn asynchronously via `setTimeout(fn, delay)`.

package/src/services/http/http.spec.js

@@ -27,7 +27,7 @@ describe("$http", function () {
   });
 
   it("returns a Promise", function () {
-    var result = $http({ url: "test" });
+    const result = $http({ url: "test" });
     expect(result).toBeDefined();
     expect(result.then).toBeDefined();
   });
@@ -197,11 +197,11 @@ describe("$http", function () {
   });
 
   it("supports functions as header values", async function () {
-    var contentTypeSpy = jasmine
+    const contentTypeSpy = jasmine
       .createSpy()
       .and.returnValue("text/plain;charset=utf-8");
     $http.defaults.headers.post["Content-Type"] = contentTypeSpy;
-    var request = {
+    const request = {
       method: "POST",
       url: "/mock/hello",
       data: 42,
@@ -216,9 +216,9 @@ describe("$http", function () {
   });
 
   it("ignores header function value when null/undefined", async function () {
-    var cacheControlSpy = jasmine.createSpy().and.returnValue(null);
+    const cacheControlSpy = jasmine.createSpy().and.returnValue(null);
     $http.defaults.headers.post["Cache-Control"] = cacheControlSpy;
-    var request = {
+    const request = {
       method: "POST",
       url: "/mock/hello",
       data: 42,
@@ -284,7 +284,7 @@ describe("$http", function () {
   });
 
   it("allows transforming requests with functions", async function () {
-    var transformedData;
+    let transformedData;
     await $http({
       method: "POST",
       url: "/mock/hello",
@@ -300,7 +300,7 @@ describe("$http", function () {
   });
 
   it("allows multiple request transform functions", async function () {
-    var transformedData;
+    let transformedData;
     await $http({
       method: "POST",
       url: "/mock/hello",
@@ -320,7 +320,7 @@ describe("$http", function () {
   });
 
   it("allows settings transforms in defaults", async function () {
-    var transformedData;
+    let transformedData;
     $http.defaults.transformRequest = [
       function (data) {
         transformedData = "*" + data + "*";
@@ -336,7 +336,7 @@ describe("$http", function () {
   });
 
   it("passes request headers getter to transforms", async function () {
-    var transformedData;
+    let transformedData;
     $http.defaults.transformRequest = [
       function (data, headers) {
         if (headers("Content-Type") === "text/emphasized") {
@@ -417,7 +417,7 @@ describe("$http", function () {
   });
 
   it("passes HTTP status to response transformers", async function () {
-    var response;
+    let response;
     await $http({
       url: "/mock/401",
       transformResponse: function (data, headers, status) {
@@ -461,16 +461,16 @@ describe("$http", function () {
   });
 
   it("does not serialize blobs for requests", async function () {
-    var blob;
+    let blob;
     if (window.Blob) {
       blob = new Blob(["hello"]);
     } else {
-      var BlobBuilder =
+      const BlobBuilder =
         window.BlobBuilder ||
         window.WebKitBlobBuilder ||
         window.MozBlobBuilder ||
         window.MSBlobBuilder;
-      var bb = new BlobBuilder();
+      const bb = new BlobBuilder();
       bb.append("hello");
       blob = bb.getBlob("text/plain");
     }
@@ -489,7 +489,7 @@ describe("$http", function () {
   });
 
   it("does not serialize form data for requests", async function () {
-    var formData = new FormData();
+    const formData = new FormData();
     formData.append("aField", "aValue");
     await $http({
       method: "POST",
@@ -548,7 +548,7 @@ describe("$http", function () {
   });
 
   it("does not choke on response resembling JSON but not valid", async function () {
-    var response;
+    let response;
     await $http({
       method: "POST",
       url: "/mock/invalidarray",
@@ -561,7 +561,7 @@ describe("$http", function () {
   });
 
   it("does not try to parse interpolation expr as JSON", async function () {
-    var response;
+    let response;
     await $http({
       method: "GET",
       url: "/mock/interpolation",
@@ -716,7 +716,7 @@ describe("$http", function () {
   });
 
   it("allows substituting param serializer through DI", async function () {
-    var injector = createInjector([
+    const injector = createInjector([
       "ng",
       function ($provide) {
         $provide.factory("mySpecialSerializer", function () {
@@ -752,9 +752,9 @@ describe("$http", function () {
   });
 
   it("makes default param serializer available through DI", async function () {
-    var injector = createInjector(["ng"]);
+    const injector = createInjector(["ng"]);
     injector.invoke(function ($httpParamSerializer) {
-      var result = $httpParamSerializer({ a: 42, b: 43 });
+      const result = $httpParamSerializer({ a: 42, b: 43 });
       expect(result).toEqual("a=42&b=43");
     });
   });
@@ -859,8 +859,8 @@ describe("$http", function () {
   });
 
   it("allows attaching interceptor factories", async function () {
-    var interceptorFactorySpy = jasmine.createSpy();
-    var injector = createInjector([
+    const interceptorFactorySpy = jasmine.createSpy();
+    const injector = createInjector([
       "ng",
       function ($httpProvider) {
         $httpProvider.interceptors.push(interceptorFactorySpy);
@@ -872,22 +872,22 @@ describe("$http", function () {
   });
 
   it("uses DI to instantiate interceptors", async function () {
-    var interceptorFactorySpy = jasmine.createSpy();
-    var injector = createInjector([
+    const interceptorFactorySpy = jasmine.createSpy();
+    const injector = createInjector([
       "ng",
       function ($httpProvider) {
         $httpProvider.interceptors.push(["$rootScope", interceptorFactorySpy]);
       },
     ]);
     $http = injector.get("$http");
-    var $rootScope = injector.get("$rootScope");
+    const $rootScope = injector.get("$rootScope");
 
     expect(interceptorFactorySpy).toHaveBeenCalledWith($rootScope);
   });
 
   it("allows referencing existing interceptor factories", async function () {
-    var interceptorFactorySpy = jasmine.createSpy().and.returnValue({});
-    var injector = createInjector([
+    const interceptorFactorySpy = jasmine.createSpy().and.returnValue({});
+    const injector = createInjector([
       "ng",
       function ($provide, $httpProvider) {
         $provide.factory("myInterceptor", interceptorFactorySpy);
@@ -900,7 +900,7 @@ describe("$http", function () {
   });
 
   it("allows intercepting requests", async function () {
-    var injector = createInjector([
+    const injector = createInjector([
       "ng",
       function ($httpProvider) {
         $httpProvider.interceptors.push(function () {
@@ -930,7 +930,7 @@ describe("$http", function () {
   });
 
   it("allows returning promises from request intercepts", async function () {
-    var injector = createInjector([
+    const injector = createInjector([
       "ng",
       function ($httpProvider) {
         $httpProvider.interceptors.push(function ($q) {
@@ -959,7 +959,7 @@ describe("$http", function () {
   });
 
   it("allows intercepting responses", async function () {
-    var injector = createInjector([
+    const injector = createInjector([
       "ng",
       function ($httpProvider) {
         $httpProvider.interceptors.push(() => ({
@@ -973,7 +973,7 @@ describe("$http", function () {
     $http = injector.get("$http");
     $rootScope = injector.get("$rootScope");
 
-    var response;
+    let response;
     await $http.get("/mock/hello").then(function (r) {
       response = r;
     });
@@ -983,8 +983,8 @@ describe("$http", function () {
   });
 
   it("allows intercepting request errors", async function () {
-    var requestErrorSpy = jasmine.createSpy();
-    var injector = createInjector([
+    const requestErrorSpy = jasmine.createSpy();
+    const injector = createInjector([
       "ng",
       function ($httpProvider) {
         $httpProvider.interceptors.push(() => ({
@@ -1012,8 +1012,8 @@ describe("$http", function () {
   });
 
   it("allows intercepting response errors", async function () {
-    var responseErrorSpy = jasmine.createSpy();
-    var injector = createInjector([
+    const responseErrorSpy = jasmine.createSpy();
+    const injector = createInjector([
       "ng",
       function ($httpProvider) {
         $httpProvider.interceptors.push(() => ({
@@ -1037,7 +1037,7 @@ describe("$http", function () {
   });
 
   it("allows attaching success handlers", async function () {
-    var data, status, config;
+    let data, status, config;
     await $http.get("/mock/hello").then(function (res) {
       data = res.data;
       status = res.status;
@@ -1051,7 +1051,7 @@ describe("$http", function () {
   });
 
   it("allows attaching error handlers", async function () {
-    var res;
+    let res;
     await $http.get("/mock/401").then(
       () => {},
       function (r) {
@@ -1184,7 +1184,7 @@ describe("$http", function () {
   });
 
   it("allows aborting a request with a Promise", async function () {
-    var timeout = $q.defer();
+    const timeout = $q.defer();
     $http
       .get("/mock/never", {
         timeout: timeout.promise,
@@ -1242,7 +1242,7 @@ describe("$http", function () {
 
   describe("useApplyAsync", function () {
     beforeEach(function () {
-      var injector = createInjector([
+      const injector = createInjector([
         "ng",
         function ($httpProvider) {
           $httpProvider.useApplyAsync(true);
@@ -1253,7 +1253,7 @@ describe("$http", function () {
     });
 
     it("does not resolve promise immediately when enabled", async function () {
-      var resolvedSpy = jasmine.createSpy();
+      const resolvedSpy = jasmine.createSpy();
       $http.get("/mock/hello").then(resolvedSpy);
       $rootScope.$apply();
 
@@ -1261,7 +1261,7 @@ describe("$http", function () {
     });
 
     it("resolves promise later when enabled", async function () {
-      var resolvedSpy = jasmine.createSpy();
+      const resolvedSpy = jasmine.createSpy();
       await $http.get("/mock/hello").then(resolvedSpy);
       $rootScope.$apply();
 

package/src/shared/jqlite/jqlite.js

@@ -12,7 +12,7 @@ import {
   lowercase,
   getNodeName,
   shallowCopy,
-} from "../../shared/utils";
+} from "../utils";
 import { CACHE, EXPANDO } from "../../core/cache/cache";
 
 /** @type {number} */
@@ -1117,7 +1117,7 @@ function specialMouseHandlerWrapper(target, event, handler) {
 export function startingTag(elementStr) {
   const clone = JQLite(elementStr)[0].cloneNode(true);
   const element = JQLite(clone).empty();
-  var elemHtml = JQLite("<div></div>").append(element[0]).html();
+  const elemHtml = JQLite("<div></div>").append(element[0]).html();
   try {
     return element[0].nodeType === Node.TEXT_NODE
       ? lowercase(elemHtml)
@@ -1170,7 +1170,7 @@ export function getBooleanAttrName(element, name) {
  */
 export function cleanElementData(nodes) {
   for (let i = 0, ii = nodes.length; i < ii; i++) {
-    var events = (CACHE.get(nodes[i][EXPANDO]) || {}).events;
+    const events = (CACHE.get(nodes[i][EXPANDO]) || {}).events;
     if (events && events.$destroy) {
       JQLite(nodes[i]).triggerHandler("$destroy");
     }

package/src/shared/jqlite/jqlite.spec.js

@@ -8,8 +8,8 @@ import {
 } from "./jqlite";
 import { Angular } from "../../loader";
 import { createInjector } from "../../core/di/injector";
-import { equals, forEach } from "../../shared/utils";
-import { browserTrigger } from "../../shared/test-utils";
+import { equals, forEach } from "../utils";
+import { browserTrigger } from "../test-utils";
 import { CACHE, EXPANDO } from "../../core/cache/cache";
 
 describe("jqLite", () => {
@@ -592,8 +592,8 @@ describe("jqLite", () => {
     });
 
     it("should emit $destroy event if element removed via remove()", function () {
-      var log = "";
-      var element = JQLite(a);
+      let log = "";
+      const element = JQLite(a);
       element.on("$destroy", function () {
         log += "destroy;";
       });

package/src/shared/utils.js

@@ -1,4 +1,4 @@
-import { PREFIX_REGEXP, SPECIAL_CHARS_REGEXP } from "../shared/constants";
+import { PREFIX_REGEXP, SPECIAL_CHARS_REGEXP } from "./constants";
 
 const ngMinErr = minErr("ng");