@angular-wave/angular.ts 0.0.19 → 0.0.21

package/index.html

@@ -17,7 +17,6 @@
       <!-- <script src="dist/angular-ts.umd.js"></script> -->
       <!-- include spec files here... -->
 
-      <script type="module" src="test/directive/a.spec.js"></script>
       <script type="module" src="test/directive/boolean.spec.js"></script>
       <script type="module" src="test/directive/form.spec.js"></script>
       <script type="module" src="test/directive/input.spec.js"></script> 
@@ -100,7 +99,9 @@
       
       <!-- Router specs--> 
       <script type="module" src="test/router/glob.spec.js"></script>
+      <script type="module" src="test/router/state-filter.spec.js"></script>
       <script type="module" src="test/router/state.spec.js"></script>
+      
     
 
       <!-- Run asyncs last to prevent digest polution-->

package/package.json

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

package/src/core/q.js

@@ -328,7 +328,7 @@ function qFactory(nextTick, exceptionHandler, errorOnUnhandledRejections) {
   }
 
   function Deferred() {
-    const promise = (this.promise = new Promise());
+    const promise = (this.promise = new QPromise());
     // Non prototype methods necessary to support unbound execution :/
     this.resolve = function (val) {
       resolvePromise(promise, val);
@@ -341,11 +341,11 @@ function qFactory(nextTick, exceptionHandler, errorOnUnhandledRejections) {
     };
   }
 
-  function Promise() {
+  function QPromise() {
     this.$$state = { status: 0 };
   }
 
-  extend(Promise.prototype, {
+  extend(QPromise.prototype, {
     then(onFulfilled, onRejected, progressBack) {
       if (
         isUndefined(onFulfilled) &&
@@ -354,7 +354,7 @@ function qFactory(nextTick, exceptionHandler, errorOnUnhandledRejections) {
       ) {
         return this;
       }
-      const result = new Promise();
+      const result = new QPromise();
 
       this.$$state.pending = this.$$state.pending || [];
       this.$$state.pending.push([
@@ -572,7 +572,7 @@ function qFactory(nextTick, exceptionHandler, errorOnUnhandledRejections) {
    * @returns {Promise} Returns a promise that was already resolved as rejected with the `reason`.
    */
   function reject(reason) {
-    const result = new Promise();
+    const result = new QPromise();
     rejectPromise(result, reason);
     return result;
   }
@@ -608,7 +608,7 @@ function qFactory(nextTick, exceptionHandler, errorOnUnhandledRejections) {
    */
 
   function when(value, callback, errback, progressBack) {
-    const result = new Promise();
+    const result = new QPromise();
     resolvePromise(result, value);
     return result.then(callback, errback, progressBack);
   }
@@ -646,7 +646,7 @@ function qFactory(nextTick, exceptionHandler, errorOnUnhandledRejections) {
    */
 
   function all(promises) {
-    const result = new Promise();
+    const result = new QPromise();
     let counter = 0;
     const results = Array.isArray(promises) ? [] : {};
 
@@ -699,7 +699,7 @@ function qFactory(nextTick, exceptionHandler, errorOnUnhandledRejections) {
       throw $qMinErr("norslvr", "Expected resolverFn, got '{0}'", resolver);
     }
 
-    const promise = new Promise();
+    const promise = new QPromise();
 
     function resolveFn(value) {
       resolvePromise(promise, value);
@@ -716,7 +716,7 @@ function qFactory(nextTick, exceptionHandler, errorOnUnhandledRejections) {
 
   // Let's make the instanceof operator work for promises, so that
   // `new $q(fn) instanceof $q` would evaluate to true.
-  $Q.prototype = Promise.prototype;
+  $Q.prototype = QPromise.prototype;
 
   $Q.defer = defer;
   $Q.reject = reject;

package/src/core/sanitize-uri.js

@@ -28,7 +28,7 @@ export function SanitizeUriProvider() {
    * to the DOM it is inactive and potentially malicious code will not be executed.
    *
    * @param {RegExp=} regexp New regexp to trust urls with.
-   * @returns {RegExp|ng.$compileProvider} Current RegExp if called without value or self for
+   * @returns {RegExp|ng.ICompileProvider} Current RegExp if called without value or self for
    *    chaining otherwise.
    */
   this.aHrefSanitizationTrustedUrlList = function (regexp) {

package/src/core/sce.js

@@ -487,7 +487,7 @@ export function $SceDelegateProvider() {
           );
         } else if (type === SCE_CONTEXTS.HTML) {
           // htmlSanitizer throws its own error when no sanitizer is available.
-          return htmlSanitizer(maybeTrusted);
+          return htmlSanitizer();
         }
         // Default error when the $sce service has no way to make the input safe.
         throw $sceMinErr(

package/src/public.js

@@ -1,5 +1,4 @@
 import { $CompileProvider } from "./core/compile";
-import { htmlAnchorDirective } from "./directive/a";
 import {
   inputDirective,
   ngValueDirective,
@@ -117,7 +116,6 @@ export function publishExternalAPI() {
         $provide
           .provider("$compile", $CompileProvider)
           .directive({
-            a: htmlAnchorDirective,
             input: inputDirective,
             textarea: inputDirective,
             form: formDirective,

package/src/router/stateProvider.js

@@ -6,6 +6,8 @@ import { minErr } from "../shared/utils";
 
 const err = minErr("$stateProvider");
 const validKeys = [
+  "$$state",
+  "__stateObjectCache",
   "controller",
   "controllerProvider",
   "component",

package/test/router/state-filter.spec.js

@@ -0,0 +1,146 @@
+import { Angular } from "../../src/loader";
+import { publishExternalAPI } from "../../src/public";
+
+describe("router filters", function () {
+  let module, $parse, $state, $q, $rootScope, $location;
+
+  beforeEach(() => {
+    window.angular = new Angular();
+    publishExternalAPI();
+  });
+
+  afterEach(() => (window.location.hash = "#!"));
+
+  describe("isState filter", () => {
+    beforeEach(() => {
+      module = window.angular.module("defaultModule", ["ui.router"]);
+      module.config(function ($stateProvider) {
+        $stateProvider
+          .state({ name: "a", url: "/" })
+          .state({ name: "a.b", url: "/b" })
+          .state({ name: "with-param", url: "/with/:param" });
+      });
+      let $injector = window.angular.bootstrap(
+        document.getElementById("dummy"),
+        ["defaultModule"],
+      );
+
+      $injector.invoke(
+        (
+          _$parse_,
+          _$state_,
+          _$rootScope_,
+          _$transitions_,
+          _$q_,
+          _$location_,
+          _$compile_,
+          _$router_,
+        ) => {
+          $parse = _$parse_;
+          $state = _$state_;
+          $rootScope = _$rootScope_;
+          $q = _$q_;
+          $location = _$location_;
+        },
+      );
+    });
+    it("should return true if the current state exactly matches the input state", async () => {
+      await $state.go("a");
+      expect($parse('"a" | isState')($rootScope)).toBe(true);
+    });
+
+    it("should return false if the current state does not exactly match the input state", async () => {
+      await $state.go("a.b");
+      expect($parse('"a" | isState')($rootScope)).toBe(false);
+    });
+
+    it("should return true if the current state and param matches the input state", async () => {
+      await $state.go("with-param", { param: "a" });
+
+      expect($parse('"with-param" | isState: {param: "a"}')($rootScope)).toBe(
+        true,
+      );
+    });
+
+    it("should return false if the current state and param does not match the input state", async () => {
+      await $state.go("with-param", { param: "b" });
+
+      expect($parse('"with-param" | isState: {param: "a"}')($rootScope)).toBe(
+        false,
+      );
+    });
+  });
+
+  describe("includedByState filter", function () {
+    beforeEach(() => {
+      module = window.angular.module("defaultModule", ["ui.router"]);
+      module.config(function ($stateProvider) {
+        $stateProvider
+          .state({ name: "a", url: "/" })
+          .state({ name: "a.b", url: "/b" })
+          .state({ name: "c", url: "/c" })
+          .state({ name: "d", url: "/d/:id" });
+      });
+
+      let $injector = window.angular.bootstrap(
+        document.getElementById("dummy"),
+        ["defaultModule"],
+      );
+
+      $injector.invoke(
+        (
+          _$parse_,
+          _$state_,
+          _$rootScope_,
+          _$transitions_,
+          _$q_,
+          _$location_,
+          _$compile_,
+          _$router_,
+        ) => {
+          $parse = _$parse_;
+          $state = _$state_;
+          $rootScope = _$rootScope_;
+          $q = _$q_;
+          $location = _$location_;
+        },
+      );
+    });
+
+    afterEach(() => (window.location.hash = "#!"));
+
+    it("should return true if the current state exactly matches the input state", async () => {
+      await $state.go("a");
+
+      expect($parse('"a" | includedByState')($rootScope)).toBe(true);
+    });
+
+    it("should return true if the current state includes the input state", async () => {
+      await $state.go("a.b");
+
+      expect($parse('"a" | includedByState')($rootScope)).toBe(true);
+    });
+
+    it("should return false if the current state does not include input state", async () => {
+      await $state.go("c");
+
+      expect($parse('"a" | includedByState')($rootScope)).toBe(false);
+    });
+
+    it("should return true if the current state include input state and params", async () => {
+      await $state.go("d", { id: 123 });
+
+      expect($parse('"d" | includedByState:{ id: 123 }')($rootScope)).toBe(
+        true,
+      );
+    });
+
+    it("should return false if the current state does not include input state and params", async () => {
+      await $state.go("d", { id: 2377 });
+
+      expect($parse('"d" | includedByState:{ id: 123 }')($rootScope)).toBe(
+        false,
+      );
+    });
+  });
+});

package/test/directive/a.spec.js

@@ -1,192 +0,0 @@
-import { publishExternalAPI } from "../../src/public";
-import { createInjector } from "../../src/injector";
-import { dealoc, jqLite } from "../../src/jqLite";
-import { valueFn, isDefined } from "../../src/shared/utils";
-
-describe("a", () => {
-  let element;
-  let $compile;
-  let $rootScope;
-
-  beforeEach(() => {
-    publishExternalAPI();
-    createInjector([
-      "ng",
-      function ($compileProvider) {
-        $compileProvider
-          .directive(
-            "linkTo",
-            valueFn({
-              restrict: "A",
-              template:
-                '<div class="my-link"><a href="{{destination}}">{{destination}}</a></div>',
-              replace: true,
-              scope: {
-                destination: "@linkTo",
-              },
-            }),
-          )
-          .directive(
-            "linkNot",
-            valueFn({
-              restrict: "A",
-              template:
-                '<div class="my-link"><a href>{{destination}}</a></div>',
-              replace: true,
-              scope: {
-                destination: "@linkNot",
-              },
-            }),
-          );
-      },
-    ]).invoke((_$compile_, _$rootScope_) => {
-      $compile = _$compile_;
-      $rootScope = _$rootScope_;
-    });
-  });
-
-  afterEach(() => {
-    dealoc(element);
-  });
-
-  it("should prevent default action to be executed when href is empty", () => {
-    const orgLocation = window.document.location.href;
-    let preventDefaultCalled = false;
-    let event;
-
-    element = $compile('<a href="">empty link</a>')($rootScope);
-
-    event = window.document.createEvent("MouseEvent");
-    event.initMouseEvent(
-      "click",
-      true,
-      true,
-      window,
-      0,
-      0,
-      0,
-      0,
-      0,
-      false,
-      false,
-      false,
-      false,
-      0,
-      null,
-    );
-
-    event.preventDefaultOrg = event.preventDefault;
-    event.preventDefault = function () {
-      preventDefaultCalled = true;
-      if (this.preventDefaultOrg) this.preventDefaultOrg();
-    };
-
-    element[0].dispatchEvent(event);
-
-    expect(preventDefaultCalled).toEqual(true);
-
-    expect(window.document.location.href).toEqual(orgLocation);
-  });
-
-  it("should not link and hookup an event if href is present at compile", () => {
-    const jq = jqLite;
-    element = jq('<a href="//a.com">hello@you</a>');
-    const linker = $compile(element);
-
-    spyOn(jq.prototype, "on");
-
-    linker($rootScope);
-
-    expect(jq.prototype.on).not.toHaveBeenCalled();
-  });
-
-  it("should not preventDefault if anchor element is replaced with href-containing element", () => {
-    spyOn(jqLite.prototype, "on").and.callThrough();
-    element = $compile('<a link-to="https://www.google.com">')($rootScope);
-    $rootScope.$digest();
-
-    const child = element.children("a");
-    const preventDefault = jasmine.createSpy("preventDefault");
-
-    child.triggerHandler({
-      type: "click",
-      preventDefault,
-    });
-
-    expect(preventDefault).not.toHaveBeenCalled();
-  });
-
-  it("should preventDefault if anchor element is replaced with element without href attribute", () => {
-    spyOn(jqLite.prototype, "on").and.callThrough();
-    element = $compile('<a link-not="https://www.google.com">')($rootScope);
-    $rootScope.$digest();
-
-    const child = element.children("a");
-    const preventDefault = jasmine.createSpy("preventDefault");
-
-    child.triggerHandler({
-      type: "click",
-      preventDefault,
-    });
-
-    expect(preventDefault).toHaveBeenCalled();
-  });
-
-  if (isDefined(window.SVGElement)) {
-    describe("SVGAElement", () => {
-      it("should prevent default action to be executed when href is empty", () => {
-        const orgLocation = window.document.location.href;
-        let preventDefaultCalled = false;
-        let event;
-        let child;
-
-        element = $compile('<svg><a xlink:href="">empty link</a></svg>')(
-          $rootScope,
-        );
-        child = element.children("a");
-
-        event = window.document.createEvent("MouseEvent");
-        event.initMouseEvent(
-          "click",
-          true,
-          true,
-          window,
-          0,
-          0,
-          0,
-          0,
-          0,
-          false,
-          false,
-          false,
-          false,
-          0,
-          null,
-        );
-
-        event.preventDefaultOrg = event.preventDefault;
-        event.preventDefault = function () {
-          preventDefaultCalled = true;
-          if (this.preventDefaultOrg) this.preventDefaultOrg();
-        };
-
-        child[0].dispatchEvent(event);
-
-        expect(preventDefaultCalled).toEqual(true);
-        expect(window.document.location.href).toEqual(orgLocation);
-      });
-
-      it("should not link and hookup an event if xlink:href is present at compile", () => {
-        const jq = jqLite;
-        element = jq('<svg><a xlink:href="bobby">hello@you</a></svg>');
-        const linker = $compile(element);
-
-        spyOn(jq.prototype, "on");
-
-        linker($rootScope);
-
-        expect(jq.prototype.on).not.toHaveBeenCalled();
-      });
-    });
-  }
-});