@angular-wave/angular.ts 0.4.0 → 0.4.1

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.0",
+  "version": "0.4.1",
   "type": "module",
   "main": "dist/angular-ts.esm.js",
   "browser": "dist/angular-ts.umd.js",

package/src/core/interpolate/interpolate.js

@@ -40,9 +40,13 @@ function interr(text, err) {
  * security bugs!
  * </div>
  */
-export function InterpolateProvider() {
-  let startSymbol = "{{";
-  let endSymbol = "}}";
+export class InterpolateProvider {
+  constructor() {
+    /** @type {string} */
+    this.start = "{{";
+    /** @type {string} */
+    this.end = "}}";
+  }
 
   /**
    * Symbol to denote start of expression in the interpolated string. Defaults to `{{`.
@@ -50,13 +54,13 @@ export function InterpolateProvider() {
    * @param {string=} value new value to set the starting symbol to.
    * @returns {string|InterpolateProvider} Returns the symbol when used as getter and self if used as setter.
    */
-  this.startSymbol = function (value) {
+  startSymbol(value) {
     if (value) {
-      startSymbol = value;
+      this.start = value;
       return this;
     }
-    return startSymbol;
-  };
+    return this.start;
+  }
 
   /**
    * Symbol to denote the end of expression in the interpolated string. Defaults to `}}`.
@@ -64,33 +68,36 @@ export function InterpolateProvider() {
    * @param {string=} value new value to set the ending symbol to.
    * @returns {string|InterpolateProvider} Returns the symbol when used as getter and self if used as setter.
    */
-  this.endSymbol = function (value) {
+  endSymbol(value) {
     if (value) {
-      endSymbol = value;
+      this.end = value;
       return this;
     }
-    return endSymbol;
-  };
+    return this.end;
+  }
 
-  this.$get = [
+  $get = [
     "$parse",
-    "$exceptionHandler",
     "$sce",
     /**
      *
      * @param {import("../parser/parse").ParseService} $parse
-     * @param {import('../exception-handler').ErrorHandler} $exceptionHandler
      * @param {*} $sce
      * @returns
      */
-    function ($parse, $exceptionHandler, $sce) {
-      const startSymbolLength = startSymbol.length;
-      const endSymbolLength = endSymbol.length;
+    function ($parse, $sce) {
+      /** @type {InterpolateProvider} */
+      const provider = this;
+      const startSymbolLength = provider.start.length;
+      const endSymbolLength = provider.end.length;
       const escapedStartRegexp = new RegExp(
-        startSymbol.replace(/./g, escape),
+        this.start.replace(/./g, escape),
+        "g",
+      );
+      const escapedEndRegexp = new RegExp(
+        provider.end.replace(/./g, escape),
         "g",
       );
-      const escapedEndRegexp = new RegExp(endSymbol.replace(/./g, escape), "g");
 
       function escape(ch) {
         return `\\\\\\${ch}`;
@@ -98,8 +105,8 @@ export function InterpolateProvider() {
 
       function unescapeText(text) {
         return text
-          .replace(escapedStartRegexp, startSymbol)
-          .replace(escapedEndRegexp, endSymbol);
+          .replace(escapedStartRegexp, provider.start)
+          .replace(escapedEndRegexp, provider.end);
       }
 
       /**
@@ -222,7 +229,7 @@ export function InterpolateProvider() {
           trustedContext === $sce.URL || trustedContext === $sce.MEDIA_URL;
 
         // Provide a quick exit and simplified result function for text with no interpolation
-        if (!text.length || text.indexOf(startSymbol) === -1) {
+        if (!text.length || text.indexOf(provider.start) === -1) {
           if (mustHaveExpression) return;
 
           let unescapedText = unescapeText(text);
@@ -255,9 +262,9 @@ export function InterpolateProvider() {
 
         while (index < textLength) {
           if (
-            (startIndex = text.indexOf(startSymbol, index)) !== -1 &&
+            (startIndex = text.indexOf(provider.start, index)) !== -1 &&
             (endIndex = text.indexOf(
-              endSymbol,
+              provider.end,
               startIndex + startSymbolLength,
             )) !== -1
           ) {
@@ -390,7 +397,7 @@ export function InterpolateProvider() {
        * @returns {string} start symbol.
        */
       $interpolate.startSymbol = function () {
-        return startSymbol;
+        return provider.start;
       };
 
       /**
@@ -402,7 +409,7 @@ export function InterpolateProvider() {
        * @returns {string} end symbol.
        */
       $interpolate.endSymbol = function () {
-        return endSymbol;
+        return provider.end;
       };
 
       return $interpolate;

package/src/core/scope/scope.js

@@ -102,7 +102,7 @@ export class RootScopeProvider {
      * @param {import('../../services/browser').Browser} browser
      * @returns {Scope} root scope
      */
-    function (exceptionHandler, parse, browser) {
+    (exceptionHandler, parse, browser) => {
       $exceptionHandler = exceptionHandler;
       $parse = parse;
       $browser = browser;
@@ -200,7 +200,6 @@ export class Scope {
     /** @type {boolean} */
     this.$$suspended = false;
 
-    // TODO use maps
     /** @type {Map<String, Function[]>} */
     this.$$listeners = new Map();
 
@@ -245,7 +244,7 @@ export class Scope {
     let child = isolate ? new Scope() : Object.create(this);
 
     if (isolate) {
-      child.$root = this.isRoot ? this : this.$root;
+      child.$root = this.$root;
     } else {
       // Initialize properties for a non-isolated child scope
       child.$id = nextUid();

package/types/core/interpolate/interpolate.d.ts

@@ -10,23 +10,26 @@
  * security bugs!
  * </div>
  */
-export function InterpolateProvider(): void;
 export class InterpolateProvider {
+    /** @type {string} */
+    start: string;
+    /** @type {string} */
+    end: string;
     /**
      * Symbol to denote start of expression in the interpolated string. Defaults to `{{`.
      *
      * @param {string=} value new value to set the starting symbol to.
      * @returns {string|InterpolateProvider} Returns the symbol when used as getter and self if used as setter.
      */
-    startSymbol: (value?: string | undefined) => string | InterpolateProvider;
+    startSymbol(value?: string | undefined): string | InterpolateProvider;
     /**
      * Symbol to denote the end of expression in the interpolated string. Defaults to `}}`.
      *
      * @param {string=} value new value to set the ending symbol to.
      * @returns {string|InterpolateProvider} Returns the symbol when used as getter and self if used as setter.
      */
-    endSymbol: (value?: string | undefined) => string | InterpolateProvider;
-    $get: (string | (($parse: import("../parser/parse").ParseService, $exceptionHandler: import("../exception-handler").ErrorHandler, $sce: any) => {
+    endSymbol(value?: string | undefined): string | InterpolateProvider;
+    $get: (string | (($parse: import("../parser/parse").ParseService, $sce: any) => {
         (text: string, mustHaveExpression?: boolean | undefined, trustedContext?: string | undefined, allOrNothing?: boolean | undefined): Function;
         /**
          * Symbol to denote the start of expression in the interpolated string. Defaults to `{{`.