@angular-wave/angular.ts 0.7.0-beta.1 → 0.7.1

package/src/core/controller/controller.spec.js

@@ -27,55 +27,61 @@ describe("$controller", () => {
       });
 
       it("instantiates controller functions", function () {
-        var $controller = injector.get("$controller");
+        const $controller = injector.get("$controller");
+
         function MyController() {
           this.invoked = true;
         }
-        var controller = $controller(MyController);
+
+        const controller = $controller(MyController);
         expect(controller).toBeDefined();
         expect(controller instanceof MyController).toBe(true);
         expect(controller.invoked).toBe(true);
       });
 
       it("instantiates controller classes", function () {
-        var $controller = injector.get("$controller");
+        const $controller = injector.get("$controller");
+
         class MyController {
           constructor() {
             this.invoked = true;
           }
         }
 
-        var controller = $controller(MyController);
+        const controller = $controller(MyController);
         expect(controller).toBeDefined();
         expect(controller instanceof MyController).toBe(true);
         expect(controller.invoked).toBe(true);
       });
 
       it("injects dependencies to controller functions", function () {
-        var injector = createInjector([
+        const injector = createInjector([
           "ng",
           function ($provide) {
             $provide.constant("aDep", 42);
           },
         ]);
-        var $controller = injector.get("$controller");
+        const $controller = injector.get("$controller");
+
         function MyController(aDep) {
           this.theDep = aDep;
         }
-        var controller = $controller(MyController);
+
+        const controller = $controller(MyController);
         expect(controller.theDep).toBe(42);
       });
 
       it("allows registering controllers at config time", function () {
         function MyController() {}
-        var injector = createInjector([
+
+        const injector = createInjector([
           "ng",
           function ($controllerProvider) {
             $controllerProvider.register("MyController", MyController);
           },
         ]);
-        var $controller = injector.get("$controller");
-        var controller = $controller("MyController");
+        const $controller = injector.get("$controller");
+        const controller = $controller("MyController");
         expect(controller).toBeDefined();
         expect(controller instanceof MyController).toBe(true);
       });
@@ -83,7 +89,8 @@ describe("$controller", () => {
       it("allows registering several controllers in an object", function () {
         function MyController() {}
         function MyOtherController() {}
-        var injector = createInjector([
+
+        const injector = createInjector([
           "ng",
           function ($controllerProvider) {
             $controllerProvider.register({
@@ -92,26 +99,26 @@ describe("$controller", () => {
             });
           },
         ]);
-        var $controller = injector.get("$controller");
-        var controller = $controller("MyController");
-        var otherController = $controller("MyOtherController");
+        const $controller = injector.get("$controller");
+        const controller = $controller("MyController");
+        const otherController = $controller("MyOtherController");
         expect(controller instanceof MyController).toBe(true);
         expect(otherController instanceof MyOtherController).toBe(true);
       });
 
       it("allows registering controllers through modules", function () {
-        var module = window.angular.module("myModule", []);
+        const module = window.angular.module("myModule", []);
         module.controller("MyController", function MyController() {});
-        var injector = createInjector(["ng", "myModule"]);
-        var $controller = injector.get("$controller");
-        var controller = $controller("MyController");
+        const injector = createInjector(["ng", "myModule"]);
+        const $controller = injector.get("$controller");
+        const controller = $controller("MyController");
         expect(controller).toBeDefined();
       });
 
       it("does not normally look controllers up from window", function () {
         window.MyController = function MyController() {};
-        var injector = createInjector(["ng"]);
-        var $controller = injector.get("$controller");
+        const injector = createInjector(["ng"]);
+        const $controller = injector.get("$controller");
         expect(function () {
           $controller("MyController");
         }).toThrow();

package/src/core/di/injector.js

@@ -9,8 +9,8 @@ import {
   isObject,
   assert,
 } from "../../shared/utils.js";
-import { INJECTOR_LITERAL } from "./ng-module";
-import { ProviderInjector, InjectorService } from "./internal-injector";
+import { INJECTOR_LITERAL } from "./ng-module.js";
+import { ProviderInjector, InjectorService } from "./internal-injector.js";
 
 const ARROW_ARG = /^([^(]+?)=>/;
 const FN_ARGS = /^[^(]*\(\s*([^)]*)\)/m;
@@ -18,10 +18,7 @@ const FN_ARG_SPLIT = /,/;
 const FN_ARG = /^\s*(_?)(\S+?)\1\s*$/;
 const STRIP_COMMENTS = /((\/\/.*$)|(\/\*[\s\S]*?\*\/))/gm;
 const $injectorMinErr = minErr(INJECTOR_LITERAL);
-
 const providerSuffix = "Provider";
-/** @type {String[]} Used only for error reporting of circular dependencies*/
-export const path = [];
 
 /**
  *

package/src/core/di/internal-injector.js

@@ -21,6 +21,7 @@ class AbstractInjector {
     this.cache = {};
     /** @type {boolean} */
     this.strictDi = strictDi;
+    /** @type {string[]} */
     this.path = [];
     /** @type {Object.<string, import("./ng-module.js").NgModule>} */
     this.modules = {};
@@ -139,6 +140,7 @@ class AbstractInjector {
   /**
    * @abstract
    * @param {string} _serviceName
+   * @returns {any}
    */
   factory(_serviceName) {
     console.error(`Unhandled ${_serviceName}`);

package/src/core/di/ng-module.js

@@ -1,3 +1,4 @@
+import { $injectTokens } from "../../injection-tokens.js";
 import {
   isFunction,
   isDefined,
@@ -6,7 +7,6 @@ import {
   assert,
 } from "../../shared/utils.js";
 
-export const PROVIDE_LITERAL = "$provide";
 export const INJECTOR_LITERAL = "$injector";
 export const COMPILE_LITERAL = "$compileProvider";
 export const ANIMATION_LITERAL = "$animateProvider";
@@ -83,7 +83,7 @@ export class NgModule {
    * @returns {NgModule}
    */
   value(name, object) {
-    this.invokeQueue.push([PROVIDE_LITERAL, "value", [name, object]]);
+    this.invokeQueue.push([$injectTokens.$provide, "value", [name, object]]);
     return this;
   }
 
@@ -93,7 +93,11 @@ export class NgModule {
    * @returns {NgModule}
    */
   constant(name, object) {
-    this.invokeQueue.unshift([PROVIDE_LITERAL, "constant", [name, object]]);
+    this.invokeQueue.unshift([
+      $injectTokens.$provide,
+      "constant",
+      [name, object],
+    ]);
     return this;
   }
 
@@ -139,7 +143,7 @@ export class NgModule {
       providerFunction.$$moduleName = name;
     }
     this.invokeQueue.push([
-      PROVIDE_LITERAL,
+      $injectTokens.$provide,
       "factory",
       [name, providerFunction],
     ]);
@@ -156,7 +160,7 @@ export class NgModule {
       serviceFunction.$$moduleName = name;
     }
     this.invokeQueue.push([
-      PROVIDE_LITERAL,
+      $injectTokens.$provide,
       "service",
       [name, serviceFunction],
     ]);
@@ -172,7 +176,11 @@ export class NgModule {
     if (providerType && isFunction(providerType)) {
       providerType.$$moduleName = name;
     }
-    this.invokeQueue.push([PROVIDE_LITERAL, "provider", [name, providerType]]);
+    this.invokeQueue.push([
+      $injectTokens.$provide,
+      "provider",
+      [name, providerType],
+    ]);
     return this;
   }
 
@@ -185,7 +193,11 @@ export class NgModule {
     if (decorFn && isFunction(decorFn)) {
       decorFn.$$moduleName = name;
     }
-    this.configBlocks.push([PROVIDE_LITERAL, "decorator", [name, decorFn]]);
+    this.configBlocks.push([
+      $injectTokens.$provide,
+      "decorator",
+      [name, decorFn],
+    ]);
     return this;
   }
 

package/src/core/di/ng-module.spec.js

@@ -1,12 +1,12 @@
 import {
   INJECTOR_LITERAL,
   NgModule,
-  PROVIDE_LITERAL,
   COMPILE_LITERAL,
   ANIMATION_LITERAL,
   FILTER_LITERAL,
   CONTROLLER_LITERAL,
-} from "./ng-module";
+} from "./ng-module.js";
+import { $injectTokens } from "../../injection-tokens.js";
 
 describe("NgModule", () => {
   /** @type {NgModule} */
@@ -36,7 +36,7 @@ describe("NgModule", () => {
     // when contants are registered
     ngModule.constant("aConstant", 42);
     expect(ngModule.invokeQueue[0]).toEqual([
-      PROVIDE_LITERAL,
+      $injectTokens.$provide,
       "constant",
       ["aConstant", 42],
     ]);
@@ -44,12 +44,12 @@ describe("NgModule", () => {
     // then they are prepended to invocation queue
     ngModule.constant("bConstant", 24);
     expect(ngModule.invokeQueue[0]).toEqual([
-      PROVIDE_LITERAL,
+      $injectTokens.$provide,
       "constant",
       ["bConstant", 24],
     ]);
     expect(ngModule.invokeQueue[1]).toEqual([
-      PROVIDE_LITERAL,
+      $injectTokens.$provide,
       "constant",
       ["aConstant", 42],
     ]);
@@ -59,7 +59,7 @@ describe("NgModule", () => {
     // when value are registered
     ngModule.value("aValue", 42);
     expect(ngModule.invokeQueue[0]).toEqual([
-      PROVIDE_LITERAL,
+      $injectTokens.$provide,
       "value",
       ["aValue", 42],
     ]);
@@ -67,12 +67,12 @@ describe("NgModule", () => {
     // then are pushed to invocation queue
     ngModule.value("bValue", 24);
     expect(ngModule.invokeQueue[1]).toEqual([
-      PROVIDE_LITERAL,
+      $injectTokens.$provide,
       "value",
       ["bValue", 24],
     ]);
     expect(ngModule.invokeQueue[0]).toEqual([
-      PROVIDE_LITERAL,
+      $injectTokens.$provide,
       "value",
       ["aValue", 42],
     ]);
@@ -120,13 +120,13 @@ describe("NgModule", () => {
   it("can store factories", () => {
     ngModule.factory("aFactory", a).factory("bFactory", b);
     expect(ngModule.invokeQueue[0]).toEqual([
-      PROVIDE_LITERAL,
+      $injectTokens.$provide,
       "factory",
       ["aFactory", a],
     ]);
 
     expect(ngModule.invokeQueue[1]).toEqual([
-      PROVIDE_LITERAL,
+      $injectTokens.$provide,
       "factory",
       ["bFactory", b],
     ]);
@@ -139,13 +139,13 @@ describe("NgModule", () => {
   it("can store services", () => {
     ngModule.service("aService", a).service("bService", b);
     expect(ngModule.invokeQueue[0]).toEqual([
-      PROVIDE_LITERAL,
+      $injectTokens.$provide,
       "service",
       ["aService", a],
     ]);
 
     expect(ngModule.invokeQueue[1]).toEqual([
-      PROVIDE_LITERAL,
+      $injectTokens.$provide,
       "service",
       ["bService", b],
     ]);
@@ -158,13 +158,13 @@ describe("NgModule", () => {
   it("can store providers", () => {
     ngModule.provider("aProvider", a).provider("bProvider", b);
     expect(ngModule.invokeQueue[0]).toEqual([
-      PROVIDE_LITERAL,
+      $injectTokens.$provide,
       "provider",
       ["aProvider", a],
     ]);
 
     expect(ngModule.invokeQueue[1]).toEqual([
-      PROVIDE_LITERAL,
+      $injectTokens.$provide,
       "provider",
       ["bProvider", b],
     ]);
@@ -177,13 +177,13 @@ describe("NgModule", () => {
   it("can store decorators", () => {
     ngModule.decorator("aDecorator", a).decorator("bDecorator", b);
     expect(ngModule.configBlocks[0]).toEqual([
-      PROVIDE_LITERAL,
+      $injectTokens.$provide,
       "decorator",
       ["aDecorator", a],
     ]);
 
     expect(ngModule.configBlocks[1]).toEqual([
-      PROVIDE_LITERAL,
+      $injectTokens.$provide,
       "decorator",
       ["bDecorator", b],
     ]);

package/src/core/error-handler.ts

@@ -2,6 +2,6 @@
  * A callback type for handling errors.
  *
  * @param exception - The exception associated with the error.
- * @param cause - Optional information about the context in which the error was thrown.
+ * @param [cause] - Optional information about the context in which the error was thrown.
  */
 export type ErrorHandler = (exception: Error, cause?: string) => void;

package/src/core/exception-handler.js

@@ -44,7 +44,7 @@
 
 /** @typedef {import('../services/log').LogService} LogService */
 
-/** @typedef {import("./error-handler.ts").ErrorHandler }  ErrorHandler */
+/** @typedef {import("./error-handler.ts").ErrorHandler}  ErrorHandler */
 
 /**
  * Provider for `$exceptionHandler` service. Delegates uncaught exceptions to `$log.error()` by default.

package/src/core/filter/filter.js

@@ -36,7 +36,6 @@ export function FilterProvider($provide) {
   this.$get = [
     "$injector",
     /**
-     *
      * @param {import("../../core/di/internal-injector.js").InjectorService} $injector
      * @returns
      */

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

@@ -29,15 +29,7 @@ describe("ast", () => {
   beforeEach(() => {
     createAst = function () {
       const lexer = new Lexer({});
-      const ast = new AST(lexer, {
-        csp: false,
-        literals: {
-          true: true,
-          false: false,
-          undefined: undefined,
-          null: null,
-        },
-      });
+      const ast = new AST(lexer);
       return ast.ast.apply(ast, arguments);
     };
   });

package/src/core/parse/interface.ts

@@ -2,7 +2,7 @@ import type { DecoratedASTNode } from "./interpreter.js";
 import type { Scope } from "../scope/scope.js";
 
 /**
- * Describes metadata and behavior for a compiled AngularJS expression.
+ * Describes metadata and behavior for a compiled AngularTS expression.
  */
 export interface CompiledExpressionProps {
   /** Indicates if the expression is a literal. */
@@ -43,7 +43,7 @@ export interface CompiledExpressionProps {
  * Evaluates the compiled expression.
  */
 export type CompiledExpressionFunction = (
-  context: Scope,
+  context?: Scope,
   locals?: object,
   assign?: any,
 ) => any;
@@ -78,7 +78,7 @@ export interface CompiledExpressionHandlerMap {
  * @returns A compiled expression.
  */
 export type ParseService = (
-  expression: CompiledExpression | string | ((scope: Scope) => any),
+  expression?: CompiledExpression | string | ((scope: Scope) => any),
   interceptorFn?: (value: any, scope: Scope, locals: any) => any,
   expensiveChecks?: boolean,
 ) => CompiledExpression;

package/src/core/parse/parse.js

@@ -7,10 +7,10 @@ export function ParseProvider() {
   const cache = Object.create(null);
 
   /** @type {function(any):boolean?} */
-  var identStart;
+  let identStart;
 
   /** @type {function(any):boolean?} */
-  var identContinue;
+  let identContinue;
 
   /**
    * Allows defining the set of characters that are allowed in AngularTS expressions. The function
@@ -47,7 +47,7 @@ export function ParseProvider() {
      */
     function ($filter) {
       /** @type {import("./lexer/lexer.js").LexerOptions} */
-      var $lexerOptions = {
+      const $lexerOptions = {
         isIdentifierStart: isFunction(identStart) && identStart,
         isIdentifierContinue: isFunction(identContinue) && identContinue,
       };
@@ -59,7 +59,7 @@ export function ParseProvider() {
        * @returns any
        */
       function $parse(exp, interceptorFn) {
-        var parsedExpression, cacheKey;
+        let parsedExpression, cacheKey;
 
         switch (typeof exp) {
           case "string":
@@ -69,8 +69,8 @@ export function ParseProvider() {
             parsedExpression = cache[cacheKey];
 
             if (!parsedExpression) {
-              var lexer = new Lexer($lexerOptions);
-              var parser = new Parser(lexer, $filter);
+              const lexer = new Lexer($lexerOptions);
+              const parser = new Parser(lexer, $filter);
               parsedExpression = parser.parse(exp);
 
               cache[cacheKey] = addWatchDelegate(parsedExpression);

package/src/core/pubsub/pubsub.js

@@ -1,3 +1,23 @@
+/** @typedef {import('../../interface.js').ServiceProvider} ServiceProvider
+
+/**
+ * Configurable provider for an injectable event bus
+ * @implements {ServiceProvider}
+ */
+export class PubSubProvider {
+  constructor() {
+    /**
+     * @type {PubSub}
+     */
+    this.eventBus = EventBus;
+  }
+
+  /**
+   * @returns {PubSub}
+   */
+  $get = () => this.eventBus;
+}
+
 export class PubSub {
   /**
    * Topic-based publish/subscribe channel.  Maintains a map of topics to

package/src/core/pubsub/pubsub.spec.js

@@ -1,4 +1,17 @@
-import { PubSub } from "./pubsub";
+import { PubSub } from "./pubsub.js";
+import { createInjector } from "../di/injector.js";
+import { Angular } from "../../loader.js";
+
+describe("PubSubProvider", () => {
+  it("should be injectable", () => {
+    let angular = new Angular();
+    angular.module("test", ["ng"]);
+    let $injector = createInjector(["test"]);
+    expect($injector.has("$eventBus")).toBeTrue();
+    expect($injector.get("$eventBus") instanceof PubSub).toBeTrue();
+    expect($injector.get("$eventBus").async_).toBeTrue();
+  });
+});
 
 describe("PubSub", function () {
   let pubsub;

package/src/core/sanitize/sanitize-uri.js

@@ -59,6 +59,7 @@ export class SanitizeUriProvider {
     return (uri, isMediaUrl) => {
       if (!uri) return uri;
 
+      /** @type {RegExp} */
       const regex = isMediaUrl
         ? this._imgSrcSanitizationTrustedUrlList
         : this._aHrefSanitizationTrustedUrlList;

package/src/core/sce/sce.js

@@ -313,7 +313,7 @@ export class SceDelegateProvider {
       "$exceptionHandler",
       /**
        *
-       * @param {import("../../core/di/internal-injector").InjectorService} $injector
+       * @param {import("../../core/di/internal-injector.js").InjectorService} $injector
        * @param {*} $$sanitizeUri
        * @param {ErrorHandler} $exceptionHandler
        * @returns
@@ -540,14 +540,11 @@ export class SceDelegateProvider {
             if (isResourceUrlAllowedByPolicy(maybeTrusted)) {
               return maybeTrusted;
             }
-            $exceptionHandler(
-              $sceMinErr(
-                "insecurl",
-                "Blocked loading resource from url not allowed by $sceDelegate policy.  URL: {0}",
-                maybeTrusted.toString(),
-              ),
+            throw $sceMinErr(
+              "insecurl",
+              "Blocked loading resource from url not allowed by $sceDelegate policy.  URL: {0}",
+              maybeTrusted.toString(),
             );
-            return;
           } else if (type === SCE_CONTEXTS.HTML) {
             // htmlSanitizer throws its own error when no sanitizer is available.
             return htmlSanitizer();
@@ -588,8 +585,7 @@ export function SceProvider() {
   this.$get = [
     "$parse",
     "$sceDelegate",
-    "$exceptionHandler",
-    function ($parse, $sceDelegate, $exceptionHandler) {
+    function ($parse, $sceDelegate) {
       const sce = shallowCopy(SCE_CONTEXTS);
 
       /**
@@ -833,11 +829,7 @@ export function SceProvider() {
           return parse(enumValue, expr);
         };
         sce[snakeToCamel(`get_trusted_${lName}`)] = function (value) {
-          try {
-            return getTrusted(enumValue, value);
-          } catch (e) {
-            $exceptionHandler(e);
-          }
+          return getTrusted(enumValue, value);
         };
         sce[snakeToCamel(`trust_as_${lName}`)] = function (value) {
           return trustAs(enumValue, value);