@angular-wave/angular.ts 0.4.5 → 0.5.0

package/package.json

@@ -2,7 +2,7 @@
   "name": "@angular-wave/angular.ts",
   "description": "A modern, optimized and typesafe version of AngularJS",
   "license": "MIT",
-  "version": "0.4.5",
+  "version": "0.5.0",
   "type": "module",
   "main": "dist/angular-ts.esm.js",
   "browser": "dist/angular-ts.umd.js",

package/src/animations/animate-js.js

@@ -61,7 +61,7 @@ export function AnimateJsProvider($animateProvider) {
             beforeFn = "leave";
             afterFn = "afterLeave"; // TODO(matsko): get rid of this
           } else {
-            beforeFn = `before${event.charAt(0).toUpperCase()}${event.substr(1)}`;
+            beforeFn = `before${event.charAt(0).toUpperCase()}${event.substring(1)}`;
             afterFn = event;
           }
 

package/src/animations/animate.js

@@ -118,7 +118,7 @@ export function AnimateProvider($provide) {
     }
 
     const key = `${name}-animation`;
-    provider.$$registeredAnimations[name.substr(1)] = key;
+    provider.$$registeredAnimations[name.substring(1)] = key;
     $provide.factory(key, factory);
   };
 

package/src/core/compile/compile.js

@@ -1010,7 +1010,7 @@ export function CompileProvider($provide, $$sanitizeUriProvider) {
                 name = name
                   .replace(PREFIX_REGEXP, "")
                   .toLowerCase()
-                  .substr(4 + ngPrefixMatch[1].length)
+                  .substring(4 + ngPrefixMatch[1].length)
                   .replace(/_(.)/g, (match, letter) => letter.toUpperCase());
 
                 // Support *-start / *-end multi element directives
@@ -1019,8 +1019,8 @@ export function CompileProvider($provide, $$sanitizeUriProvider) {
                 directiveIsMultiElement(multiElementMatch[1])
               ) {
                 attrStartName = name;
-                attrEndName = `${name.substr(0, name.length - 5)}end`;
-                name = name.substr(0, name.length - 6);
+                attrEndName = `${name.substring(0, name.length - 5)}end`;
+                name = name.substring(0, name.length - 6);
               }
 
               if (isNgProp || isNgEvent) {
@@ -2100,7 +2100,7 @@ export function CompileProvider($provide, $$sanitizeUriProvider) {
        *
        * @param {string} name name of the directive to look up.
        * @param {string} location The directive must be found in specific format.
-       *   String containing any of theses characters:
+       *   String containing any of these characters:
        *
        *   * `E`: element name
        *   * `A': attribute
@@ -2115,8 +2115,8 @@ export function CompileProvider($provide, $$sanitizeUriProvider) {
         startAttrName,
         endAttrName,
       ) {
-        if (name === ignoreDirective) return null;
-        let match = null;
+        if (name === ignoreDirective) return false;
+        let match = false;
         if (Object.prototype.hasOwnProperty.call(hasDirectives, name)) {
           for (
             let directive,
@@ -2394,7 +2394,7 @@ export function CompileProvider($provide, $$sanitizeUriProvider) {
           });
 
         return function delayedNodeLinkFn(
-          ignoreChildLinkFn,
+          _ignoreChildLinkFn,
           scope,
           node,
           rootElement,
@@ -2453,19 +2453,16 @@ export function CompileProvider($provide, $$sanitizeUriProvider) {
       }
 
       function addTextInterpolateDirective(directives, text) {
-        const interpolateFn = $interpolate(text, true);
+        const interpolateFn = $interpolate(text, true); // Create interpolation function
         if (interpolateFn) {
           directives.push({
             priority: 0,
-            compile: function textInterpolateCompileFn() {
-              // When transcluding a template that has bindings in the root
-              // we don't have a parent and thus need to add the class during linking fn.
-
-              return function textInterpolateLinkFn(scope, node) {
-                scope.$watch(interpolateFn, (value) => {
-                  node[0].nodeValue = value;
-                });
-              };
+            // When transcluding a template that has bindings in the root
+            // we don't have a parent and thus need to add the class during linking fn.
+            compile: () => (scope, node) => {
+              scope.$watch(interpolateFn, (value) => {
+                node[0].nodeValue = value; // Update text node with new interpolated value
+              });
             },
           });
         }

package/src/core/cookie-reader.spec.js

@@ -13,7 +13,7 @@ describe("$$cookieReader", () => {
       for (let i = 0; i < cookies.length; i++) {
         const cookie = cookies[i];
         const eqPos = cookie.indexOf("=");
-        const name = eqPos > -1 ? cookie.substr(0, eqPos) : cookie;
+        const name = eqPos > -1 ? cookie.substring(0, eqPos) : cookie;
         const parts = path.split("/");
         while (parts.length) {
           document.cookie = `${name}=;path=${parts.join("/") || "/"};expires=Thu, 01 Jan 1970 00:00:00 GMT`;

package/src/core/interpolate/interpolate.js

@@ -353,19 +353,16 @@ export class InterpolateProvider {
               expressions,
               $$watchDelegate(scope, listener) {
                 let lastValue;
-                return scope.$watchGroup(
-                  parseFns,
-                  function interpolateFnWatcher(values, oldValues) {
-                    const currValue = compute(values);
-                    listener.call(
-                      this,
-                      currValue,
-                      values !== oldValues ? lastValue : currValue,
-                      scope,
-                    );
-                    lastValue = currValue;
-                  },
-                );
+                return scope.$watchGroup(parseFns, (values, oldValues) => {
+                  const currValue = compute(values);
+                  listener.call(
+                    this,
+                    currValue,
+                    values !== oldValues ? lastValue : currValue,
+                    scope,
+                  );
+                  lastValue = currValue;
+                });
               },
             },
           );

package/src/core/location/location.js

@@ -2,6 +2,7 @@ import { JQLite } from "../../shared/jqlite/jqlite";
 import { urlResolve } from "../url-utils/url-utils";
 import {
   encodeUriSegment,
+  isBoolean,
   isDefined,
   isNumber,
   isObject,
@@ -42,6 +43,8 @@ export class Location {
    * @param {string} appBaseNoFile application base URL stripped of any filename
    */
   constructor(appBase, appBaseNoFile) {
+    const parsedUrl = urlResolve(appBase);
+
     /** @type {string} */
     this.appBase = appBase;
 
@@ -67,16 +70,17 @@ export class Location {
     this.$$replace = false;
 
     /** @type {import('../url-utils/url-utils').HttpProtocol} */
-    this.$$protocol = undefined;
+    this.$$protocol = parsedUrl.protocol;
 
     /** @type {string} */
-    this.$$host = undefined;
+    this.$$host = parsedUrl.hostname;
 
     /**
      * The port, without ":"
      * @type {number}
      */
-    this.$$port = undefined;
+    this.$$port =
+      toInt(parsedUrl.port) || DEFAULT_PORTS[parsedUrl.protocol] || null;
 
     /**
      * The pathname, beginning with "/"
@@ -359,7 +363,6 @@ export class LocationHtml5Url extends Location {
     super(appBase, appBaseNoFile);
     this.$$html5 = true;
     this.basePrefix = basePrefix || "";
-    parseAbsoluteUrl(appBase, this);
   }
 
   /**
@@ -387,7 +390,7 @@ export class LocationHtml5Url extends Location {
   }
 
   $$normalizeUrl(url) {
-    return this.appBaseNoFile + url.substr(1); // first char is always '/'
+    return this.appBaseNoFile + url.substring(1); // first char is always '/'
   }
 
   /**
@@ -442,10 +445,7 @@ export class LocationHtml5Url extends Location {
 export class LocationHashbangUrl extends Location {
   constructor(appBase, appBaseNoFile, hashPrefix) {
     super(appBase, appBaseNoFile);
-    this.appBase = appBase;
-    this.appBaseNoFile = appBaseNoFile;
     this.hashPrefix = hashPrefix;
-    parseAbsoluteUrl(appBase, this);
   }
 
   /**
@@ -542,28 +542,26 @@ export class LocationHashbangUrl extends Location {
   }
 }
 
-export class LocationProvider {
-  constructor() {
-    this.hashPrefixValue = "!";
-    this.html5ModeConfig = {
-      enabled: false,
-      requireBase: true,
-      rewriteLinks: true,
-    };
-  }
+export function LocationProvider() {
+  let hashPrefix = "!";
+  const html5Mode = {
+    enabled: false,
+    requireBase: true,
+    rewriteLinks: true,
+  };
 
   /**
    * The default value for the prefix is `'!'`.
-   * @param {string=} prefix - Prefix for hash part (containing path and search)
-   * @returns {string|LocationProvider} current value if used as getter or itself (chaining) if used as setter
+   * @param {string=} prefix Prefix for hash part (containing path and search)
+   * @returns {*} current value if used as getter or itself (chaining) if used as setter
    */
-  hashPrefix(prefix) {
-    if (typeof prefix !== "undefined") {
-      this.hashPrefixValue = prefix;
+  this.hashPrefix = function (prefix) {
+    if (isDefined(prefix)) {
+      hashPrefix = prefix;
       return this;
     }
-    return this.hashPrefixValue;
-  }
+    return hashPrefix;
+  };
 
   /**
    * @param {(boolean|Object)=} mode If boolean, sets `html5Mode.enabled` to value.
@@ -585,29 +583,30 @@ export class LocationProvider {
    *
    * @returns {Object} html5Mode object if used as getter or itself (chaining) if used as setter
    */
-  html5Mode(mode) {
-    if (typeof mode === "boolean") {
-      this.html5ModeConfig.enabled = mode;
+  this.html5Mode = function (mode) {
+    if (isBoolean(mode)) {
+      html5Mode.enabled = mode;
       return this;
     }
+    if (isObject(mode)) {
+      if (isBoolean(mode.enabled)) {
+        html5Mode.enabled = mode.enabled;
+      }
 
-    if (typeof mode === "object") {
-      if (typeof mode.enabled === "boolean")
-        this.html5ModeConfig.enabled = mode.enabled;
-      if (typeof mode.requireBase === "boolean")
-        this.html5ModeConfig.requireBase = mode.requireBase;
-      if (
-        typeof mode.rewriteLinks === "boolean" ||
-        typeof mode.rewriteLinks === "string"
-      ) {
-        this.html5ModeConfig.rewriteLinks = mode.rewriteLinks;
+      if (isBoolean(mode.requireBase)) {
+        html5Mode.requireBase = mode.requireBase;
       }
+
+      if (isBoolean(mode.rewriteLinks) || isString(mode.rewriteLinks)) {
+        html5Mode.rewriteLinks = mode.rewriteLinks;
+      }
+
       return this;
     }
-    return this.html5ModeConfig;
-  }
+    return html5Mode;
+  };
 
-  $get = [
+  this.$get = [
     "$rootScope",
     "$browser",
     "$rootElement",
@@ -626,8 +625,8 @@ export class LocationProvider {
       const initialUrl = /** @type {string} */ ($browser.url());
       let appBase;
 
-      if (this.html5Mode.enabled) {
-        if (!baseHref && this.html5Mode.requireBase) {
+      if (html5Mode.enabled) {
+        if (!baseHref && html5Mode.requireBase) {
           throw $locationMinErr(
             "nobase",
             "$location in HTML5 mode requires a <base> tag to be present!",
@@ -641,11 +640,7 @@ export class LocationProvider {
       }
       const appBaseNoFile = stripFile(appBase);
 
-      $location = new LocationMode(
-        appBase,
-        appBaseNoFile,
-        `#${this.hashPrefix}`,
-      );
+      $location = new LocationMode(appBase, appBaseNoFile, `#${hashPrefix}`);
       $location.$$parseLinkUrl(initialUrl, initialUrl);
 
       $location.$$state = $browser.state();
@@ -672,7 +667,7 @@ export class LocationProvider {
       }
 
       $rootElement.on("click", (event) => {
-        const { rewriteLinks } = this.html5Mode;
+        const { rewriteLinks } = html5Mode;
         // TODO(vojta): rewrite link when opening in new tab/window (in legacy browser)
         // currently we open nice url link and redirect then
 
@@ -775,7 +770,7 @@ export class LocationProvider {
       });
 
       // update browser
-      function browserUpdate() {
+      $rootScope.$watch(() => {
         if (initializing || $location.$$urlUpdatedByLocation) {
           $location.$$urlUpdatedByLocation = false;
 
@@ -823,9 +818,7 @@ export class LocationProvider {
 
         // we don't need to return anything because $evalAsync will make the digest loop dirty when
         // there is a change
-      }
-
-      setTimeout(() => browserUpdate());
+      });
 
       return $location;
 
@@ -837,7 +830,6 @@ export class LocationProvider {
           $location.$$state,
           oldState,
         );
-        browserUpdate();
       }
     },
   ];
@@ -940,17 +932,17 @@ function startsWith(str, search) {
  */
 export function stripBaseUrl(base, url) {
   if (startsWith(url, base)) {
-    return url.substr(base.length);
+    return url.substring(base.length);
   }
 }
 
 export function stripHash(url) {
   const index = url.indexOf("#");
-  return index === -1 ? url : url.substr(0, index);
+  return index === -1 ? url : url.substring(0, index);
 }
 
 export function stripFile(url) {
-  return url.substr(0, stripHash(url).lastIndexOf("/") + 1);
+  return url.substring(0, stripHash(url).lastIndexOf("/") + 1);
 }
 
 /* return the server only (scheme://host:port) */

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

@@ -688,7 +688,7 @@ describe("parser", () => {
         scope.zero = 0;
         scope.bool = false;
 
-        expect(scope.$eval("empty.substr(0)")).toBe("");
+        expect(scope.$eval("empty.substring(0)")).toBe("");
         expect(scope.$eval("zero.toString()")).toBe("0");
         expect(scope.$eval("bool.toString()")).toBe("false");
       });

package/src/directive/events/events.html

@@ -11,6 +11,7 @@
     <script src="/jasmine/jasmine-5.1.2/boot0.js"></script>
     <script src="/jasmine/jasmine-5.1.2/boot1.js"></script>
     <script type="module" src="/src/directive/events/event.spec.js"></script>
+    <script type="module" src="/src/directive/events/click.spec.js"></script>
   </head>
   <body>
     <div id="dummy"></div>

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

@@ -1265,7 +1265,7 @@ describe("ngModel", () => {
 
       it("should always use the most recent $viewValue for validation", () => {
         ctrl.$parsers.push((value) => {
-          if (value && value.substr(-1) === "b") {
+          if (value && value.slice(-1) === "b") {
             value = "a";
             ctrl.$setViewValue(value);
             ctrl.$render();
@@ -1288,14 +1288,14 @@ describe("ngModel", () => {
 
       it("should validate even if the modelValue did not change", () => {
         ctrl.$parsers.push((value) => {
-          if (value && value.substr(-1) === "b") {
+          if (value && value.slice(-1) === "b") {
             value = "a";
           }
 
           return value;
         });
 
-        ctrl.$validators.mock = function (modelValue) {
+        ctrl.$validators.mock = function () {
           return true;
         };
 

package/src/directive/observe/observe.js

@@ -6,8 +6,11 @@ export function ngObserveDirective() {
     restrict: "A",
     link: (scope, element, attrs) => {
       const targetElement = element[0];
-      const prop = targetElement.dataset["update"];
       const source = attrs["ngObserve"];
+      let prop = targetElement.dataset["update"];
+      if (!prop) {
+        prop = source;
+      }
 
       if (!scope[prop]) {
         scope[prop] = targetElement.getAttribute(source);

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

@@ -89,4 +89,25 @@ describe("observe", () => {
 
     expect(observerSpy.disconnect).toHaveBeenCalled();
   });
+
+  it("should observe attribute changes and update the same scope name if data-update attribute is absent", () => {
+    $scope.myProp = "";
+    const template = `<div ng-observe="test-attribute"></div>`;
+    element = $compile(template)($scope);
+    $scope.$digest();
+    spyOn($scope, "$digest").and.callThrough();
+
+    const mutationObserverCallback =
+      MutationObserver.calls.mostRecent().args[0];
+    const mutationRecord = {
+      target: element[0],
+      attributeName: "test-attribute",
+    };
+
+    element.attr("test-attribute", "newValue");
+    element[0].setAttribute("test-attribute", "newValue");
+
+    mutationObserverCallback([mutationRecord]);
+    expect($scope.$digest).toHaveBeenCalled();
+  });
 });

package/src/directive/observe/test.html

@@ -86,11 +86,7 @@
     <br />
 
     {{ activeid }}
-    <fluent-tabs
-      ng-observe="activeid"
-      data-update="activeid"
-      activeid="entrees"
-    >
+    <fluent-tabs ng-observe="activeid" activeid="entrees">
       <fluent-tab id="apps">Appetizers</fluent-tab>
       <fluent-tab id="entrees">Entrees</fluent-tab>
       <fluent-tab id="desserts">Desserts</fluent-tab>
@@ -173,13 +169,9 @@
       </fluent-tab-panel>
     </fluent-tabs>
 
-    {{ radio }}
+    {{ value }}
 
-    <fluent-radio-group
-      ng-observe="value"
-      data-update="radio"
-      orientation="vertical"
-    >
+    <fluent-radio-group ng-observe="value" orientation="vertical">
       <fluent-radio value="1">18-24</fluent-radio>
       <fluent-radio value="2">25-33</fluent-radio>
       <fluent-radio value="3">34-44</fluent-radio>

package/src/loader.js

@@ -146,13 +146,14 @@ export class Angular {
        * @param {import("./core/di/internal-injector").InjectorService} $injector
        */
       function (scope, el, compile, $injector) {
+              // ng-route deps
+        services.$injector = $injector;
+        services.$q = $injector.get("$q");
         scope.$apply(() => {
           el.data("$injector", $injector);
           compile(el)(scope);
         });
-        // ng-route deps
-        services.$injector = $injector;
-        services.$q = $injector.get("$q");
+  
         // https://github.com/angular-ui/ui-router/issues/3678
         if (!Object.prototype.hasOwnProperty.call($injector, "strictDi")) {
           try {

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

@@ -51,7 +51,7 @@ export class ParamType {
   }
   $subPattern() {
     const sub = this.pattern.toString();
-    return sub.substr(1, sub.length - 2);
+    return sub.substring(1, sub.length - 2);
   }
   toString() {
     return `{ParamType:${this.name}}`;

package/src/router/state/views.js

@@ -177,7 +177,7 @@ export class Ng1ViewConfig {
       ngViewName = relativeViewNameSugar[2]; // set view-name to "foo.bar"
     }
     if (ngViewName.charAt(0) === "!") {
-      ngViewName = ngViewName.substr(1);
+      ngViewName = ngViewName.substring(1);
       ngViewContextAnchor = ""; // target absolutely from root
     }
     // handle parent relative targeting "^.^.^"

package/src/shared/strings.js

@@ -20,7 +20,7 @@ import { pattern, val } from "./hof";
  */
 export function maxLength(max, str) {
   if (str.length <= max) return str;
-  return str.substr(0, max - 3) + "...";
+  return str.substring(0, max - 3) + "...";
 }
 /**
  * Returns a string, with spaces added to the end, up to a desired str length
@@ -46,7 +46,7 @@ export function functionToString(fn) {
   const toStr = namedFunctionMatch ? namedFunctionMatch[1] : fnStr;
   const fnName = fn["name"] || "";
   if (fnName && toStr.match(/function \(/)) {
-    return "function " + fnName + toStr.substr(9);
+    return "function " + fnName + toStr.substring(9);
   }
   return toStr;
 }
@@ -97,7 +97,7 @@ export const beforeAfterSubstr = (char) => (str) => {
   if (!str) return ["", ""];
   const idx = str.indexOf(char);
   if (idx === -1) return [str, ""];
-  return [str.substr(0, idx), str.substr(idx + 1)];
+  return [str.substring(0, idx), str.substring(idx + 1)];
 };
 export const hostRegex = new RegExp("^(?:[a-z]+:)?//[^/]+/");
 export const stripLastPathElement = (str) => str.replace(/\/[^/]*$/, "");

package/types/core/location/location.d.ts

@@ -230,15 +230,13 @@ export class LocationHtml5Url extends Location {
  */
 export class LocationHashbangUrl extends Location {
     constructor(appBase: any, appBaseNoFile: any, hashPrefix: any);
-    appBase: any;
-    appBaseNoFile: any;
     hashPrefix: any;
     /**
      * Parse given hashbang URL into properties
      * @param {string} url Hashbang URL
      */
     $$parse(url: string): void;
-    $$normalizeUrl(url: any): any;
+    $$normalizeUrl(url: any): string;
     /**
      * @param {string} url
      * @returns {boolean}