@angular-wave/angular.ts 0.4.0 → 0.4.2

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

package/src/animations/animate-queue.js

@@ -195,12 +195,13 @@ export function AnimateQueueProvider($animateProvider) {
       // compiled. The $templateRequest.totalPendingRequests variable keeps track of
       // all of the remote templates being currently downloaded. If there are no
       // templates currently downloading then the watcher will still fire anyway.
+      $rootScope["$templateRequest"] = $templateRequest;
       const deregisterWatch = $rootScope.$watch(
-        () => $templateRequest.totalPendingRequests === 0,
-        (isEmpty) => {
-          if (!isEmpty) return;
+        "$templateRequest.totalPendingRequests",
+        (val) => {
+          if (val !== 0) return;
           deregisterWatch();
-
+          $rootScope["$templateRequest"] = undefined;
           // Now that all templates have been downloaded, $animate will wait until
           // the post digest queue is empty before enabling animations. By having two
           // calls to $postDigest calls we can ensure that the flag is enabled at the

package/src/animations/shared.js

@@ -1,6 +1,6 @@
-import { forEach, isString, minErr, extend } from "../shared/utils";
-import { JQLite } from "../shared/jqlite/jqlite";
-import { ASTType } from "../core/parser/ast-type";
+import { forEach, isString, minErr, extend } from "../shared/utils.js";
+import { JQLite } from "../shared/jqlite/jqlite.js";
+import { ASTType } from "../core/parse/ast-type.js";
 
 export const ADD_CLASS_SUFFIX = "-add";
 export const REMOVE_CLASS_SUFFIX = "-remove";

package/src/core/compile/compile.js

@@ -528,7 +528,7 @@ export function CompileProvider($provide, $$sanitizeUriProvider) {
      * @param {*} $interpolate
      * @param {import("../exception-handler").ErrorHandler} $exceptionHandler
      * @param {*} $templateRequest
-     * @param {import("../parser/parse").ParseService} $parse
+     * @param {import("../parse/parse").ParseService} $parse
      * @param {*} $controller
      * @param {import('../scope/scope').Scope} $rootScope
      * @param {*} $sce

package/src/core/interpolate/interpolate.js

@@ -6,7 +6,7 @@ import {
   valueFn,
   extend,
 } from "../../shared/utils";
-import { constantWatchDelegate } from "../parser/parse";
+import { constantWatchDelegate } from "../parse/parse.js";
 
 const $interpolateMinErr = minErr("$interpolate");
 function throwNoconcat(text) {
@@ -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 {import("../parse/parse").ParseService} $parse
      * @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/{parser/lexer.html → parse/ast/ast.html}

@@ -10,7 +10,7 @@
     <script src="/jasmine/jasmine-5.1.2/jasmine-html.js"></script>
     <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/core/parser/lexer.spec.js"></script>
+    <script type="module" src="/src/core/parse/ast/ast.spec.js"></script>
   </head>
   <body>
     <div id="dummy"></div>

package/src/core/{parser → parse/ast}/ast.js

@@ -1,6 +1,6 @@
-import { isAssignable } from "./interpreter";
-import { ASTType } from "./ast-type";
-import { minErr } from "../../shared/utils";
+import { isAssignable } from "../interpreter.js";
+import { ASTType } from "../ast-type.js";
+import { minErr } from "../../../shared/utils.js";
 
 const $parseMinErr = minErr("$parse");
 
@@ -48,10 +48,10 @@ export const literals = new Map(
  */
 export class AST {
   /**
-   * @param {import('./lexer').Lexer} lexer - The lexer instance for tokenizing input
+   * @param {import('../lexer/lexer.js').Lexer} lexer - The lexer instance for tokenizing input
    */
   constructor(lexer) {
-    /** @type {import('./lexer').Lexer} */
+    /** @type {import('../lexer/lexer.js').Lexer} */
     this.lexer = lexer;
     this.selfReferential = {
       this: { type: ASTType.ThisExpression },
@@ -202,7 +202,7 @@ export class AST {
     while ((token = this.expect("==", "!=", "===", "!=="))) {
       left = {
         type: ASTType.BinaryExpression,
-        operator: /** @type {import("./lexer").Token} */ (token).text,
+        operator: /** @type {import("../lexer/lexer.js").Token} */ (token).text,
         left,
         right: this.relational(),
       };
@@ -220,7 +220,7 @@ export class AST {
     while ((token = this.expect("<", ">", "<=", ">="))) {
       left = {
         type: ASTType.BinaryExpression,
-        operator: /** @type {import("./lexer").Token} */ (token).text,
+        operator: /** @type {import("../lexer/lexer.js").Token} */ (token).text,
         left,
         right: this.additive(),
       };
@@ -238,7 +238,7 @@ export class AST {
     while ((token = this.expect("+", "-"))) {
       left = {
         type: ASTType.BinaryExpression,
-        operator: /** @type {import("./lexer").Token} */ (token).text,
+        operator: /** @type {import("../lexer/lexer.js").Token} */ (token).text,
         left,
         right: this.multiplicative(),
       };
@@ -256,7 +256,7 @@ export class AST {
     while ((token = this.expect("*", "/", "%"))) {
       left = {
         type: ASTType.BinaryExpression,
-        operator: /** @type {import("./lexer").Token} */ (token).text,
+        operator: /** @type {import("../lexer/lexer.js").Token} */ (token).text,
         left,
         right: this.unary(),
       };
@@ -273,7 +273,7 @@ export class AST {
     if ((token = this.expect("+", "-", "!"))) {
       return {
         type: ASTType.UnaryExpression,
-        operator: /** @type {import("./lexer").Token} */ (token).text,
+        operator: /** @type {import("../lexer/lexer.js").Token} */ (token).text,
         prefix: true,
         argument: this.unary(),
       };
@@ -297,40 +297,48 @@ export class AST {
     } else if (
       Object.prototype.hasOwnProperty.call(
         this.selfReferential,
-        /** @type {import("./lexer").Token} */ (this.peek()).text,
+        /** @type {import("../lexer/lexer.js").Token} */ (this.peek()).text,
       )
     ) {
       primary = structuredClone(this.selfReferential[this.consume().text]);
     } else if (
-      literals.has(/** @type {import("./lexer").Token} */ (this.peek()).text)
+      literals.has(
+        /** @type {import("../lexer/lexer.js").Token} */ (this.peek()).text,
+      )
     ) {
       primary = {
         type: ASTType.Literal,
         value: literals.get(this.consume().text),
       };
     } else if (
-      /** @type {import("./lexer").Token} */ (this.peek()).identifier
+      /** @type {import("../lexer/lexer.js").Token} */ (this.peek()).identifier
     ) {
       primary = this.identifier();
-    } else if (/** @type {import("./lexer").Token} */ (this.peek()).constant) {
+    } else if (
+      /** @type {import("../lexer/lexer.js").Token} */ (this.peek()).constant
+    ) {
       primary = this.constant();
     } else {
       this.throwError(
         "not a primary expression",
-        /** @type {import("./lexer").Token} */ (this.peek()),
+        /** @type {import("../lexer/lexer.js").Token} */ (this.peek()),
       );
     }
 
     let next;
     while ((next = this.expect("(", "[", "."))) {
-      if (/** @type {import("./lexer").Token} */ (next).text === "(") {
+      if (
+        /** @type {import("../lexer/lexer.js").Token} */ (next).text === "("
+      ) {
         primary = {
           type: ASTType.CallExpression,
           callee: primary,
           arguments: this.parseArguments(),
         };
         this.consume(")");
-      } else if (/** @type {import("./lexer").Token} */ (next).text === "[") {
+      } else if (
+        /** @type {import("../lexer/lexer.js").Token} */ (next).text === "["
+      ) {
         primary = {
           type: ASTType.MemberExpression,
           object: primary,
@@ -338,7 +346,9 @@ export class AST {
           computed: true,
         };
         this.consume("]");
-      } else if (/** @type {import("./lexer").Token} */ (next).text === ".") {
+      } else if (
+        /** @type {import("../lexer/lexer.js").Token} */ (next).text === "."
+      ) {
         primary = {
           type: ASTType.MemberExpression,
           object: primary,
@@ -447,13 +457,17 @@ export class AST {
           break;
         }
         property = { type: ASTType.Property, kind: "init" };
-        if (/** @type {import("./lexer").Token} */ (this.peek()).constant) {
+        if (
+          /** @type {import("../lexer/lexer.js").Token} */ (this.peek())
+            .constant
+        ) {
           property.key = this.constant();
           property.computed = false;
           this.consume(":");
           property.value = this.assignment();
         } else if (
-          /** @type {import("./lexer").Token} */ (this.peek()).identifier
+          /** @type {import("../lexer/lexer.js").Token} */ (this.peek())
+            .identifier
         ) {
           property.key = this.identifier();
           property.computed = false;
@@ -473,7 +487,7 @@ export class AST {
         } else {
           this.throwError(
             "invalid key",
-            /** @type {import("./lexer").Token} */ (this.peek()),
+            /** @type {import("../lexer/lexer.js").Token} */ (this.peek()),
           );
         }
         properties.push(property);
@@ -487,7 +501,7 @@ export class AST {
   /**
    * Throws a syntax error.
    * @param {string} msg - The error message.
-   * @param {import("./lexer").Token} [token] - The token that caused the error.
+   * @param {import("../lexer/lexer.js").Token} [token] - The token that caused the error.
    */
   throwError(msg, token) {
     throw $parseMinErr(
@@ -504,7 +518,7 @@ export class AST {
   /**
    * Consumes a token if it matches the expected type.
    * @param {string} [e1] - The expected token type.
-   * @returns {import("./lexer").Token} The consumed token.
+   * @returns {import("../lexer/lexer.js").Token} The consumed token.
    */
   consume(e1) {
     if (this.tokens.length === 0) {
@@ -519,16 +533,16 @@ export class AST {
     if (!token) {
       this.throwError(
         `is unexpected, expecting [${e1}]`,
-        /** @type {import("./lexer").Token} */ (this.peek()),
+        /** @type {import("../lexer/lexer.js").Token} */ (this.peek()),
       );
     } else {
-      return /** @type  {import("./lexer").Token} */ (token);
+      return /** @type  {import("../lexer/lexer.js").Token} */ (token);
     }
   }
 
   /**
    * Returns the next token without consuming it.
-   * @returns {import("./lexer").Token} The next token.
+   * @returns {import("../lexer/lexer.js").Token} The next token.
    */
   peekToken() {
     if (this.tokens.length === 0) {
@@ -544,7 +558,7 @@ export class AST {
   /**
    * Checks if the next token matches any of the expected types.
    * @param {...string} [expected] - The expected token types.
-   * @returns {import('./lexer').Token|boolean} The next token if it matches, otherwise false.
+   * @returns {import('../lexer/lexer.js').Token|boolean} The next token if it matches, otherwise false.
    */
   peek(...expected) {
     return this.peekAhead(0, ...expected);
@@ -554,7 +568,7 @@ export class AST {
    * Checks if the token at the specified index matches any of the expected types.
    * @param {number} i - The index to check.
    * @param {...string} [expected] - The expected token types.
-   * @returns {import("./lexer").Token|boolean} The token at the specified index if it matches, otherwise false.
+   * @returns {import("../lexer/lexer.js").Token|boolean} The token at the specified index if it matches, otherwise false.
    */
   peekAhead(i, ...expected) {
     if (this.tokens.length > i) {
@@ -573,7 +587,7 @@ export class AST {
   /**
    * Consumes the next token if it matches any of the expected types.
    * @param {...string} [expected] - The expected token types.
-   * @returns {import("./lexer").Token|boolean} The consumed token if it matches, otherwise false.
+   * @returns {import("../lexer/lexer.js").Token|boolean} The consumed token if it matches, otherwise false.
    */
   expect(...expected) {
     const token = this.peek(...expected);