@angular-wave/angular.ts 0.7.8 → 0.8.0

package/src/directive/model/model.js

@@ -9,21 +9,22 @@ import {
   VALID_CLASS,
 } from "../../shared/constants.js";
 import {
-  minErr,
+  hasAnimate,
+  isBoolean,
+  isFunction,
   isNumber,
   isNumberNaN,
+  isObjectEmpty,
   isPromiseLike,
+  isProxy,
   isUndefined,
-  isFunction,
-  hasAnimate,
-  isBoolean,
+  minErr,
   snakeCase,
-  isObjectEmpty,
-  isProxy,
 } from "../../shared/utils.js";
 import { nullFormCtrl, PENDING_CLASS } from "../form/form.js";
 import { defaultModelOptions } from "../model-options/model-options.js";
 import { startingTag } from "../../shared/dom.js";
+import { $injectTokens as $t } from "../../injection-tokens.js";
 
 export const ngModelMinErr = minErr("ngModel");
 
@@ -66,14 +67,14 @@ export const ngModelMinErr = minErr("ngModel");
 
 export class NgModelController {
   static $nonscope = true;
-  static $inject = [
+  /* @ignore */ static $inject = [
     "$scope",
-    "$exceptionHandler",
+    $t.$exceptionHandler,
     "$attrs",
     "$element",
-    "$parse",
-    "$animate",
-    "$interpolate",
+    $t.$parse,
+    $t.$animate,
+    $t.$interpolate,
   ];
 
   /**
@@ -720,8 +721,7 @@ export class NgModelController {
   }
 
   $$parseAndValidate() {
-    const viewValue = this.$$lastCommittedViewValue;
-    let modelValue = viewValue;
+    let modelValue = this.$$lastCommittedViewValue;
     const that = this;
 
     this.$$parserValid = isUndefined(modelValue) ? undefined : true;

package/src/directive/model/model.spec.js

@@ -1,5 +1,5 @@
 import { createElementFromHTML, dealoc } from "../../shared/dom.js";
-import { Angular } from "../../loader.js";
+import { Angular } from "../../angular.js";
 import { NgModelController } from "./model.js";
 import { isDefined, isObject } from "../../shared/utils.js";
 import { browserTrigger, wait } from "../../shared/test-utils.js";

package/src/directive/model/model.test.js

@@ -5,6 +5,7 @@ const TEST_URL = "src/directive/model/model.html";
 test("unit tests contain no errors", async ({ page }) => {
   await page.goto(TEST_URL);
   await page.content();
+  await page.waitForTimeout(1000);
   await expect(page.locator(".jasmine-overall-result")).toHaveText(
     /0 failures/,
   );

package/src/directive/model-options/model-option.test.js

@@ -5,6 +5,7 @@ const TEST_URL = "src/directive/model-options/model-options.html";
 test("unit tests contain no errors", async ({ page }) => {
   await page.goto(TEST_URL);
   await page.content();
+  await page.waitForTimeout(1000);
   await expect(page.locator(".jasmine-overall-result")).toHaveText(
     /0 failures/,
   );

package/src/directive/model-options/model-options.js

@@ -13,7 +13,7 @@ const DEFAULT_REGEXP = /(\s+|^)default(\s+|$)/;
 
 class NgModelOptionsController {
   static $nonscope = true;
-  static $inject = ["$attrs", "$scope"];
+  /* @ignore */ static $inject = ["$attrs", "$scope"];
 
   /**
    * @param {import('../../core/compile/attributes.js').Attributes} $attrs

package/src/directive/model-options/model-options.spec.js

@@ -1,6 +1,6 @@
 import { defaultModelOptions } from "./model-options.js";
 import { dealoc, getController } from "../../shared/dom.js";
-import { Angular } from "../../loader.js";
+import { Angular } from "../../angular.js";
 import { bootstrap, wait } from "../../shared/test-utils.js";
 
 function changeGivenInputTo(inputElm, val) {

package/src/directive/non-bindable/non-bindable.spec.js

@@ -1,5 +1,5 @@
 import { dealoc } from "../../shared/dom.js";
-import { Angular } from "../../loader.js";
+import { Angular } from "../../angular.js";
 import { createInjector } from "../../core/di/injector.js";
 import { wait } from "../../shared/test-utils.js";
 

package/src/directive/non-bindable/non-bindable.test.js

@@ -5,6 +5,7 @@ const TEST_URL = "src/directive/non-bindable/non-bindable.html";
 test("unit tests contain no errors", async ({ page }) => {
   await page.goto(TEST_URL);
   await page.content();
+  await page.waitForTimeout(1000);
   await expect(page.locator(".jasmine-overall-result")).toHaveText(
     /0 failures/,
   );

package/src/directive/observe/observe.spec.js

@@ -1,4 +1,4 @@
-import { Angular } from "../../loader.js";
+import { Angular } from "../../angular.js";
 import { createElementFromHTML, dealoc } from "../../shared/dom.js";
 import { wait } from "../../shared/test-utils.js";
 

package/src/directive/observe/observe.test.js

@@ -3,6 +3,7 @@ import { test, expect } from "@playwright/test";
 test("unit observer tests contain no errors", async ({ page }) => {
   await page.goto("src/directive/observe/observe.html");
   await page.content();
+  await page.waitForTimeout(1000);
   await expect(page.locator(".jasmine-overall-result")).toHaveText(
     /0 failures/,
   );

package/src/directive/on/on.spec.js

@@ -1,4 +1,4 @@
-import { Angular } from "../../loader.js";
+import { Angular } from "../../angular.js";
 import { browserTrigger, wait } from "../../shared/test-utils.js";
 import { createInjector } from "../../core/di/injector.js";
 

package/src/directive/on/on.test.js

@@ -5,6 +5,7 @@ const TEST_URL = "src/directive/on/on.html";
 test("unit tests contain no errors", async ({ page }) => {
   await page.goto(TEST_URL);
   await page.content();
+  await page.waitForTimeout(1000);
   await expect(page.locator(".jasmine-overall-result")).toHaveText(
     /0 failures/,
   );

package/src/directive/options/options.spec.js

@@ -1,6 +1,6 @@
 import { createInjector } from "../../core/di/injector.js";
 import { dealoc, getController } from "../../shared/dom.js";
-import { Angular } from "../../loader.js";
+import { Angular } from "../../angular.js";
 import {
   isBoolean,
   hashKey,

package/src/directive/options/options.test.js

@@ -5,6 +5,7 @@ const TEST_URL = "src/directive/options/options.html";
 test("unit tests contain no errors", async ({ page }) => {
   await page.goto(TEST_URL);
   await page.content();
+  await page.waitForTimeout(3000);
   await expect(page.locator(".jasmine-overall-result")).toHaveText(
     /0 failures/,
   );

package/src/directive/ref/href.spec.js

@@ -1,4 +1,4 @@
-import { Angular } from "../../loader.js";
+import { Angular } from "../../angular.js";
 import { createInjector } from "../../core/di/injector.js";
 import { dealoc } from "../../shared/dom.js";
 import { isDefined } from "../../shared/utils.js";

package/src/directive/ref/href.test.js

@@ -3,6 +3,7 @@ import { test, expect } from "@playwright/test";
 test("unit href tests contain no errors", async ({ page }) => {
   await page.goto("src/directive/ref/href.html");
   await page.content();
+  await page.waitForTimeout(1000);
   await expect(page.locator(".jasmine-overall-result")).toHaveText(
     /0 failures/,
   );
@@ -11,6 +12,7 @@ test("unit href tests contain no errors", async ({ page }) => {
 test("unit ref tests contain no errors", async ({ page }) => {
   await page.goto("src/directive/ref/ref.html");
   await page.content();
+  await page.waitForTimeout(1000);
   await expect(page.locator(".jasmine-overall-result")).toHaveText(
     /0 failures/,
   );

package/src/directive/ref/ref.spec.js

@@ -1,5 +1,5 @@
 import { createInjector } from "../../core/di/injector.js";
-import { Angular } from "../../loader.js";
+import { Angular } from "../../angular.js";
 import { createElementFromHTML } from "../../shared/dom.js";
 
 describe("ngRef", () => {

package/src/directive/repeat/repeat.spec.js

@@ -1,4 +1,4 @@
-import { Angular } from "../../loader.js";
+import { Angular } from "../../angular.js";
 import { createElementFromHTML, dealoc } from "../../shared/dom.js";
 import { wait } from "../../shared/test-utils.js";
 
@@ -88,8 +88,7 @@ describe("ngRepeat", () => {
       "<a class='test' name='y'>b</a>" +
       "<a class='test' name='x'>c</a>";
 
-    const htmlCollection = document.getElementsByClassName("test");
-    scope.items = htmlCollection;
+    scope.items = document.getElementsByClassName("test");
     await wait();
     expect(element.querySelectorAll("li").length).toEqual(3);
     expect(element.textContent).toEqual("x;y;x;");

package/src/directive/repeat/repeat.test.js

@@ -5,6 +5,7 @@ const TEST_URL = "src/directive/repeat/repeat.html";
 test("unit tests contain no errors", async ({ page }) => {
   await page.goto(TEST_URL);
   await page.content();
+  await page.waitForTimeout(1000);
   await expect(page.locator(".jasmine-overall-result")).toHaveText(
     /0 failures/,
   );

package/src/directive/script/script.spec.js

@@ -1,4 +1,4 @@
-import { Angular } from "../../loader.js";
+import { Angular } from "../../angular.js";
 import { createInjector } from "../../core/di/injector.js";
 import { createElementFromHTML } from "../../shared/dom.js";
 import { wait } from "../../shared/test-utils.js";

package/src/directive/script/script.test.js

@@ -5,6 +5,7 @@ const TEST_URL = "src/directive/script/script.html";
 test("unit tests contain no errors", async ({ page }) => {
   await page.goto(TEST_URL);
   await page.content();
+  await page.waitForTimeout(1000);
   await expect(page.locator(".jasmine-overall-result")).toHaveText(
     /0 failures/,
   );

package/src/directive/select/select.js

@@ -27,7 +27,7 @@ class SelectController {
   /**
    * @type {Array<string>}
    */
-  static $inject = ["$element", "$scope"];
+  /* @ignore */ static $inject = ["$element", "$scope"];
 
   /**
    * @param {HTMLSelectElement} $element

package/src/directive/select/select.spec.js

@@ -1,4 +1,4 @@
-import { Angular } from "../../loader.js";
+import { Angular } from "../../angular.js";
 import {
   createElementFromHTML,
   dealoc,

package/src/directive/select/select.test.js

@@ -5,6 +5,7 @@ const TEST_URL = "src/directive/select/select.html";
 test("unit tests contain no errors", async ({ page }) => {
   await page.goto(TEST_URL);
   await page.content();
+  await page.waitForTimeout(1000);
   await expect(page.locator(".jasmine-overall-result")).toHaveText(
     /0 failures/,
   );

package/src/directive/setter/setter.spec.js

@@ -1,4 +1,4 @@
-import { Angular } from "../../loader.js";
+import { Angular } from "../../angular.js";
 import { dealoc } from "../../shared/dom.js";
 import { wait } from "../../shared/test-utils.js";
 

package/src/directive/setter/setter.test.js

@@ -5,6 +5,7 @@ const TEST_URL = "src/directive/setter/setter.html";
 test("unit tests contain no errors", async ({ page }) => {
   await page.goto(TEST_URL);
   await page.content();
+  await page.waitForTimeout(1000);
   await expect(page.locator(".jasmine-overall-result")).toHaveText(
     /0 failures/,
   );

package/src/directive/show-hide/show-hide.spec.js

@@ -1,4 +1,4 @@
-import { Angular } from "../../loader.js";
+import { Angular } from "../../angular.js";
 import { createInjector } from "../../core/di/injector.js";
 import { dealoc, createElementFromHTML } from "../../shared/dom.js";
 import { wait } from "../../shared/test-utils.js";

package/src/directive/show-hide/show-hide.test.js

@@ -5,6 +5,7 @@ const TEST_URL = "src/directive/show-hide/show-hide.html";
 test("unit tests contain no errors", async ({ page }) => {
   await page.goto(TEST_URL);
   await page.content();
+  await page.waitForTimeout(1000);
   await expect(page.locator(".jasmine-overall-result")).toHaveText(
     /0 failures/,
   );

package/src/directive/style/style.spec.js

@@ -1,4 +1,4 @@
-import { Angular } from "../../loader.js";
+import { Angular } from "../../angular.js";
 import { createInjector } from "../../core/di/injector.js";
 import { createElementFromHTML, dealoc } from "../../shared/dom.js";
 import { wait } from "../../shared/test-utils.js";

package/src/directive/style/style.test.js

@@ -5,6 +5,7 @@ const TEST_URL = "src/directive/style/style.html";
 test("unit tests contain no errors", async ({ page }) => {
   await page.goto(TEST_URL);
   await page.content();
+  await page.waitForTimeout(1000);
   await expect(page.locator(".jasmine-overall-result")).toHaveText(
     /0 failures/,
   );

package/src/directive/switch/switch.spec.js

@@ -1,4 +1,4 @@
-import { Angular } from "../../loader.js";
+import { Angular } from "../../angular.js";
 import { dealoc } from "../../shared/dom.js";
 import { wait } from "../../shared/test-utils.js";
 

package/src/directive/switch/switch.test.js

@@ -5,6 +5,7 @@ const TEST_URL = "src/directive/switch/switch.html";
 test("unit tests contain no errors", async ({ page }) => {
   await page.goto(TEST_URL);
   await page.content();
+  await page.waitForTimeout(1000);
   await expect(page.locator(".jasmine-overall-result")).toHaveText(
     /0 failures/,
   );

package/src/directive/validators/validators.js

@@ -1,7 +1,6 @@
 import {
   isNumberNaN,
   isString,
-  toInt,
   minErr,
   isUndefined,
   isProxy,
@@ -9,6 +8,7 @@ import {
 } from "../../shared/utils.js";
 import { REGEX_STRING_REGEXP } from "./../attrs/attrs.js";
 import { startingTag } from "../../shared/dom.js";
+import { $injectTokens as $t } from "../../injection-tokens.js";
 
 /**
  *
@@ -34,7 +34,7 @@ import { startingTag } from "../../shared/dom.js";
  *
  */
 export const requiredDirective = [
-  "$parse",
+  $t.$parse,
   /**
    * @param {import("../../core/parse/interface.ts").ParseService} $parse
    * @returns {import("../../interface.ts").Directive}
@@ -116,75 +116,72 @@ export const requiredDirective = [
  * </div>
  */
 export const patternDirective = [
-  "$parse",
+  $t.$parse,
   /**
    * @param {import("../../core/parse/interface.ts").ParseService} $parse
    * @returns {import("../../interface.ts").Directive}
    */
-  ($parse) => {
-    return {
-      restrict: "A",
-      require: "?ngModel",
-      compile: (_Elm, tAttr) => {
-        let patternExp;
-        let parseFn;
+  ($parse) => ({
+    restrict: "A",
+    require: "?ngModel",
+    compile: (_Elm, tAttr) => {
+      let patternExp;
+      let parseFn;
 
-        if (tAttr["ngPattern"]) {
-          patternExp = tAttr["ngPattern"];
+      if (tAttr["ngPattern"]) {
+        patternExp = tAttr["ngPattern"];
 
-          // ngPattern might be a scope expression, or an inlined regex, which is not parsable.
-          // We get value of the attribute here, so we can compare the old and the new value
-          // in the observer to avoid unnecessary validations
-          if (
-            tAttr["ngPattern"].charAt(0) === "/" &&
-            REGEX_STRING_REGEXP.test(tAttr["ngPattern"])
-          ) {
-            parseFn = function () {
-              return tAttr["ngPattern"];
-            };
-          } else {
-            parseFn = $parse(tAttr["ngPattern"]);
-          }
+        // ngPattern might be a scope expression, or an inlined regex, which is not parsable.
+        // We get value of the attribute here, so we can compare the old and the new value
+        // in the observer to avoid unnecessary validations
+        if (
+          tAttr["ngPattern"].charAt(0) === "/" &&
+          REGEX_STRING_REGEXP.test(tAttr["ngPattern"])
+        ) {
+          parseFn = function () {
+            return tAttr["ngPattern"];
+          };
+        } else {
+          parseFn = $parse(tAttr["ngPattern"]);
         }
+      }
 
-        return function (scope, elm, attr, ctrl) {
-          if (!ctrl) return;
-
-          let attrVal = attr["pattern"];
+      return function (scope, elm, attr, ctrl) {
+        if (!ctrl) return;
+        let attrVal = attr["pattern"];
 
-          if (attr["ngPattern"]) {
-            attrVal = parseFn(scope);
-          } else {
-            patternExp = attr["pattern"];
-          }
+        if (attr["ngPattern"]) {
+          attrVal = parseFn(scope);
+        } else {
+          patternExp = attr["pattern"];
+        }
 
-          let regexp = parsePatternAttr(attrVal, patternExp, elm);
-          attr.$observe("pattern", function (newVal) {
-            const oldRegexp = regexp;
+        let regexp = parsePatternAttr(attrVal, patternExp, elm);
+        attr.$observe("pattern", (newVal) => {
+          const oldRegexp = regexp;
 
-            regexp = parsePatternAttr(newVal, patternExp, elm);
+          regexp = parsePatternAttr(newVal, patternExp, elm);
 
-            if (
-              (oldRegexp && oldRegexp.toString()) !==
-              (regexp && regexp.toString())
-            ) {
-              ctrl["$validate"]();
-            }
-          });
+          if (
+            (oldRegexp && oldRegexp.toString()) !==
+            (regexp && regexp.toString())
+          ) {
+            ctrl["$validate"]();
+          }
+        });
 
-          ctrl["$validators"]["pattern"] = function (modelValue, viewValue) {
-            // HTML5 pattern constraint validates the input value, so we validate the viewValue
-            return (
-              // @ts-ignore
-              ctrl.$isEmpty(viewValue) ||
-              isUndefined(regexp) ||
-              regexp.test(viewValue)
-            );
-          };
+        ctrl["$validators"]["pattern"] = (_modelValue, viewValue) => {
+          // HTML5 pattern constraint validates the input value, so we validate the viewValue
+          return (
+            // @ts-ignore
+            ctrl.$isEmpty(viewValue) ||
+            isUndefined(regexp) ||
+            regexp.test(viewValue)
+          );
         };
-      },
-    };
-  },
+      };
+    },
+  }),
 ];
 
 /**
@@ -218,7 +215,7 @@ export const patternDirective = [
  *
  */
 export const maxlengthDirective = [
-  "$parse",
+  $t.$parse,
   /**
    * @param {import("../../core/parse/interface.ts").ParseService} $parse
    * @returns {import("../../interface.ts").Directive}
@@ -290,32 +287,28 @@ export const maxlengthDirective = [
  *
  */
 export const minlengthDirective = [
-  "$parse",
-  function ($parse) {
-    return {
-      restrict: "A",
-      require: "?ngModel",
-      link(scope, elm, attr, ctrl) {
-        if (!ctrl) return;
+  $t.$parse,
+  ($parse) => ({
+    restrict: "A",
+    require: "?ngModel",
+    link(scope, elm, attr, ctrl) {
+      if (!ctrl) return;
 
-        let minlength = attr.minlength || $parse(attr.ngMinlength)(scope);
-        let minlengthParsed = parseLength(minlength) || -1;
+      let minlength = attr.minlength || $parse(attr.ngMinlength)(scope);
+      let minlengthParsed = parseLength(minlength) || -1;
 
-        attr.$observe("minlength", (value) => {
-          if (minlength !== value) {
-            minlengthParsed = parseLength(value) || -1;
-            minlength = value;
-            ctrl.$validate();
-          }
-        });
-        ctrl.$validators.minlength = function (modelValue, viewValue) {
-          return (
-            ctrl.$isEmpty(viewValue) || viewValue.length >= minlengthParsed
-          );
-        };
-      },
-    };
-  },
+      attr.$observe("minlength", (value) => {
+        if (minlength !== value) {
+          minlengthParsed = parseLength(value) || -1;
+          minlength = value;
+          ctrl.$validate();
+        }
+      });
+      ctrl.$validators.minlength = function (modelValue, viewValue) {
+        return ctrl.$isEmpty(viewValue) || viewValue.length >= minlengthParsed;
+      };
+    },
+  }),
 ];
 
 function parsePatternAttr(regex, patternExp, elm) {
@@ -326,7 +319,12 @@ function parsePatternAttr(regex, patternExp, elm) {
   }
 
   if (isString(regex)) {
-    regex = new RegExp(`^${regex}$`);
+    const match = regex.match(/^\/(.*)\/([gimsuy]*)$/);
+    if (match) {
+      regex = new RegExp(match[1], match[2]);
+    } else {
+      regex = new RegExp(`^${regex}$`);
+    }
   }
 
   if (!regex.test) {
@@ -343,6 +341,6 @@ function parsePatternAttr(regex, patternExp, elm) {
 }
 
 function parseLength(val) {
-  const intVal = toInt(val);
+  const intVal = parseInt(val, 10);
   return isNumberNaN(intVal) ? -1 : intVal;
 }

package/src/directive/validators/validators.spec.js

@@ -1,6 +1,6 @@
-import { Angular } from "../../loader.js";
+import { Angular } from "../../angular.js";
 import { wait } from "../../shared/test-utils.js";
-import { getController } from "../../shared/dom.js";
+import { dealoc, getController } from "../../shared/dom.js";
 
 describe("validators", () => {
   let $rootScope;
@@ -9,6 +9,7 @@ describe("validators", () => {
   let errors = [];
 
   beforeEach(() => {
+    dealoc(document.getElementById("app"));
     errors = [];
     window.angular = new Angular();
     window.angular
@@ -27,7 +28,7 @@ describe("validators", () => {
   });
 
   describe("pattern", () => {
-    it("should validate in-lined pattern", () => {
+    it("should validate in-lined pattern", async () => {
       inputElm = $compile(
         '<input type="text" ng-model="value" ng-pattern="/^\\d\\d\\d-\\d\\d-\\d\\d\\d\\d$/" />',
       )($rootScope);
@@ -246,7 +247,7 @@ describe("validators", () => {
       inputElm.dispatchEvent(new Event("change"));
       expect($rootScope.form.test.$error.pattern).toBe(true);
       expect(inputElm.classList.contains("ng-invalid")).toBeTrue();
-
+      //
       inputElm.setAttribute("value", "12345");
       inputElm.dispatchEvent(new Event("change"));
       expect($rootScope.form.test.$error.pattern).toBe(true);

package/src/directive/validators/validators.test.js

@@ -5,6 +5,7 @@ const TEST_URL = "src/directive/validators/validators.html";
 test("unit tests contain no errors", async ({ page }) => {
   await page.goto(TEST_URL);
   await page.content();
+  await page.waitForTimeout(3000);
   await expect(page.locator(".jasmine-overall-result")).toHaveText(
     /0 failures/,
   );

package/src/filters/filter.spec.js

@@ -1,4 +1,4 @@
-import { Angular } from "../loader.js";
+import { Angular } from "../angular.js";
 import { createInjector } from "../core/di/injector.js";
 import { isString, includes } from "../shared/utils.js";
 import { createElementFromHTML } from "../shared/dom.js";

package/src/filters/filters.spec.js

@@ -1,4 +1,4 @@
-import { Angular } from "../loader.js";
+import { Angular } from "../angular.js";
 import { createInjector } from "../core/di/injector.js";
 import { toJson } from "../shared/utils.js";