@angular-wave/angular.ts 0.0.63 → 0.0.64

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

package/src/angular.spec.js

@@ -25,8 +25,7 @@ import {
   snakeCase,
 } from "./shared/utils";
 import { dealoc, JQLite, startingTag } from "./shared/jqlite/jqlite";
-import { Angular, angularInit } from "./loader";
-import { publishExternalAPI } from "./public";
+import { Angular } from "./loader";
 import { createInjector } from "./injector";
 
 describe("angular", () => {
@@ -34,8 +33,6 @@ describe("angular", () => {
 
   beforeEach(() => {
     window.angular = new Angular();
-    publishExternalAPI();
-    createInjector();
     module = window.angular.module("defaultModule", ["ng"]);
     injector = createInjector(["ng", "defaultModule"]);
     $rootScope = injector.get("$rootScope");
@@ -1572,7 +1569,7 @@ describe("angular", () => {
     });
   });
 
-  describe("angularInit", () => {
+  describe("angular.init", () => {
     let bootstrapSpy;
     let element;
 
@@ -1594,7 +1591,7 @@ describe("angular", () => {
     });
 
     it("should do nothing when not found", () => {
-      angularInit(element);
+      window.angular.init(element);
       expect(bootstrapSpy).not.toHaveBeenCalled();
     });
 
@@ -1602,7 +1599,7 @@ describe("angular", () => {
       window.angular.module("ABC", []);
       const appElement = JQLite('<div ng-app="ABC"></div>')[0];
 
-      angularInit(appElement);
+      window.angular.init(appElement);
       expect(bootstrapSpy).toHaveBeenCalled();
     });
 
@@ -1610,27 +1607,27 @@ describe("angular", () => {
       window.angular.module("ABC", []);
       const appElement = JQLite('<div ng-app="ABC"></div>')[0];
       element.querySelector["[ng-app]"] = appElement;
-      angularInit(element);
+      window.angular.init(element);
       expect(bootstrapSpy).toHaveBeenCalled();
     });
 
     it("should bootstrap anonymously", () => {
       const appElement = JQLite("<div ng-app></div>")[0];
       element.querySelector["[ng-app]"] = appElement;
-      angularInit(element);
+      window.angular.init(element);
       expect(bootstrapSpy).toHaveBeenCalled();
     });
 
     it("should bootstrap if the annotation is on the root element", () => {
       const appElement = JQLite('<div ng-app=""></div>')[0];
-      angularInit(appElement);
+      window.angular.init(appElement);
       expect(bootstrapSpy).toHaveBeenCalled();
     });
 
     it("should complain if app module cannot be found", () => {
       const appElement = JQLite('<div ng-app="doesntexist"></div>')[0];
       expect(() => {
-        angularInit(appElement);
+        window.angular.init(appElement);
       }).toThrowError(/modulerr/);
     });
 
@@ -1656,7 +1653,7 @@ describe("angular", () => {
 
     it("should bootstrap in strict mode when ng-strict-di attribute is specified", () => {
       const appElement = JQLite('<div ng-app="" ng-strict-di></div>');
-      angularInit(JQLite("<div></div>").append(appElement[0])[0]);
+      window.angular.init(JQLite("<div></div>").append(appElement[0])[0]);
       expect(bootstrapSpy).toHaveBeenCalled();
       expect(bootstrapSpy.calls.mostRecent().args[2].strictDi).toBe(true);
 
@@ -1868,14 +1865,12 @@ describe("angular", () => {
   });
 
   describe("bootstrap", () => {
-    let module, injector, $rootScope, $compile;
+    let module, injector, $rootScope, $compile, angular;
 
     beforeEach(() => {
-      window.angular = new Angular();
-      publishExternalAPI();
-      createInjector();
-      module = window.angular.module("defaultModule", ["ng"]);
-      injector = createInjector(["ng", "defaultModule"]);
+      angular = new Angular();
+      module = angular.module("defaultModule", ["ng"]);
+      injector = createInjector(["defaultModule"]);
       $rootScope = injector.get("$rootScope");
       $compile = injector.get("$compile");
     });

package/src/animations/module.js

@@ -9,8 +9,8 @@ import { $$AnimateCssDriverProvider } from "./animate-css-driver";
 import { $$AnimateJsProvider } from "./animate-js";
 import { $$AnimateJsDriverProvider } from "./animate-js-driver";
 
-export function initAnimateModule() {
-  window["angular"]
+export function initAnimateModule(angular) {
+  angular
     .module("ngAnimate", [])
     .directive("ngAnimateSwap", ngAnimateSwapDirective)
     .directive("ngAnimateChildren", $$AnimateChildrenDirective)

package/src/binding.spec.js

@@ -1,10 +1,11 @@
 import { JQLite, dealoc } from "./shared/jqlite/jqlite";
-import { publishExternalAPI } from "./public";
+import { Angular } from "./loader";
 import { createInjector } from "./injector";
 import { browserTrigger } from "./shared/test-utils";
 
 describe("binding", () => {
   let element,
+    myModule,
     $injector,
     $rootScope,
     $compile,
@@ -17,12 +18,14 @@ describe("binding", () => {
 
   beforeEach(function () {
     errors = [];
-    publishExternalAPI().decorator("$exceptionHandler", function () {
+    window.angular = new Angular();
+    myModule = window.angular.module("myModule", ["ng"]);
+    myModule.decorator("$exceptionHandler", function () {
       return (exception, cause) => {
         errors.push(exception.message);
       };
     });
-    $injector = createInjector(["ng"]);
+    $injector = createInjector(["myModule"]);
     $rootScope = $injector.get("$rootScope");
     $compile = $injector.get("$compile");
     $exceptionHandler = $injector.get("$exceptionHandler");

package/src/core/animate/animate.spec.js

@@ -1,5 +1,4 @@
 import { dealoc, JQLite } from "../../shared/jqlite/jqlite";
-import { publishExternalAPI } from "../../public";
 import { Angular } from "../../loader";
 import { isObject } from "../../shared/utils";
 import { isFunction } from "../../shared/utils";
@@ -18,7 +17,6 @@ describe("$animate", () => {
 
     beforeEach(() => {
       window.angular = new Angular();
-      publishExternalAPI();
       defaultModule = window.angular.module("defaultModule", ["ng"]);
       injector = window.angular.bootstrap(dummy, ["defaultModule"]);
       injector.invoke(
@@ -268,7 +266,7 @@ describe("$animate", () => {
       it("$prop() should operate using a native DOM element", () => {
         const captureSpy = jasmine.createSpy();
         dealoc(dummy);
-        publishExternalAPI();
+        window.angular = new Angular();
         defaultModule = window.angular
           .module("defaultModule", ["ng"])
           .value("$$animateQueue", {

package/src/core/cache/cache-factory.spec.js

@@ -1,11 +1,11 @@
-import { publishExternalAPI } from "../../public";
+import { Angular } from "../../loader";
 import { createInjector } from "../../injector";
 
 describe("$cacheFactory", () => {
   let $cacheFactory;
 
   beforeEach(() => {
-    publishExternalAPI();
+    window.angular = new Angular();
     createInjector(["ng"]).invoke((_$cacheFactory_) => {
       $cacheFactory = _$cacheFactory_;
     });

package/src/core/compile/compile.spec.js

@@ -1,4 +1,4 @@
-import { publishExternalAPI } from "../../public";
+import { Angular } from "../../loader";
 import { createInjector } from "../../injector";
 import { dealoc, JQLite, getOrSetCacheData } from "../../shared/jqlite/jqlite";
 import {
@@ -59,7 +59,7 @@ describe("$compile", () => {
 
   beforeEach(() => {
     log = [];
-    publishExternalAPI();
+    window.angular = new Angular();
     module = window.angular.module("test1", ["ng"]);
     defaultModule = window.angular.module("defaultModule", ["ng"]);
     myModule = window.angular.module("myModule", ["ng"]);
@@ -6403,12 +6403,14 @@ describe("$compile", () => {
 
         describe("replace and not exactly one root element", () => {
           beforeEach(() => {
-            publishExternalAPI().decorator("$exceptionHandler", () => {
-              return (exception) => {
-                throw new Error(exception.message);
-              };
-            });
-            module = window.angular.module("test1", ["ng"]);
+            window.angular = new Angular();
+            module = window.angular
+              .module("test1", ["ng"])
+              .decorator("$exceptionHandler", () => {
+                return (exception) => {
+                  throw new Error(exception.message);
+                };
+              });
             module.directive("template", () => ({
               replace: true,
               templateUrl: "template.html",
@@ -6756,61 +6758,66 @@ describe("$compile", () => {
 
       beforeEach(() => {
         log = [];
-        publishExternalAPI().decorator("$exceptionHandler", () => {
-          return (exception, cause) => {
-            log.push(exception.message);
-          };
-        });
-        module = window.angular.module("test1", ["ng"]);
+
+        window.angular = new Angular();
+        module = window.angular
+          .module("test1", ["ng"])
+          .decorator("$exceptionHandler", () => {
+            return (exception) => {
+              log.push(exception.message);
+            };
+          });
+
         ["", "a", "b"].forEach((name) => {
-          module.directive(`scope${name.toUpperCase()}`, () => ({
-            scope: true,
-            restrict: "A",
-            compile() {
-              return {
-                pre(scope, element) {
+          module
+            .directive(`scope${name.toUpperCase()}`, () => ({
+              scope: true,
+              restrict: "A",
+              compile() {
+                return {
+                  pre(scope) {
+                    log.push(scope.$id);
+                  },
+                };
+              },
+            }))
+            .directive(`iscope${name.toUpperCase()}`, () => ({
+              scope: {},
+              restrict: "A",
+              compile() {
+                return function (scope) {
+                  iscope = scope;
                   log.push(scope.$id);
-                },
-              };
-            },
-          }));
-          module.directive(`iscope${name.toUpperCase()}`, () => ({
-            scope: {},
-            restrict: "A",
-            compile() {
-              return function (scope, element) {
-                iscope = scope;
-                log.push(scope.$id);
-              };
-            },
-          }));
-          module.directive(`tscope${name.toUpperCase()}`, () => ({
-            scope: true,
-            restrict: "A",
-            templateUrl: "tscope.html",
-            compile() {
-              return function (scope, element) {
-                log.push(scope.$id);
-              };
-            },
-          }));
-          module.directive(`stscope${name.toUpperCase()}`, () => ({
-            scope: true,
-            restrict: "A",
-            template: "<span></span>",
-            compile() {
-              return function (scope, element) {
-                log.push(scope.$id);
-              };
-            },
-          }));
+                };
+              },
+            }))
+            .directive(`tscope${name.toUpperCase()}`, () => ({
+              scope: true,
+              restrict: "A",
+              templateUrl: "tscope.html",
+              compile() {
+                return function (scope) {
+                  log.push(scope.$id);
+                };
+              },
+            }))
+            .directive(`stscope${name.toUpperCase()}`, () => ({
+              scope: true,
+              restrict: "A",
+              template: "<span></span>",
+              compile() {
+                return function (scope) {
+                  log.push(scope.$id);
+                };
+              },
+            }));
           module.directive(`trscope${name.toUpperCase()}`, () => ({
             scope: true,
             replace: true,
             restrict: "A",
             templateUrl: "trscope.html",
             compile() {
-              return function (scope, element) {
+              return function (scope) {
                 log.push(scope.$id);
               };
             },
@@ -6820,7 +6827,7 @@ describe("$compile", () => {
             restrict: "A",
             templateUrl: "tiscope.html",
             compile() {
-              return function (scope, element) {
+              return function (scope) {
                 iscope = scope;
                 log.push(scope.$id);
               };
@@ -6831,7 +6838,7 @@ describe("$compile", () => {
             restrict: "A",
             template: "<span></span>",
             compile() {
-              return function (scope, element) {
+              return function (scope) {
                 iscope = scope;
                 log.push(scope.$id);
               };

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

@@ -1,4 +1,4 @@
-import { publishExternalAPI } from "../../public";
+import { Angular } from "../../loader";
 import { createInjector } from "../../injector";
 
 describe("$controller", () => {
@@ -6,7 +6,7 @@ describe("$controller", () => {
   let $controller;
 
   beforeEach(() => {
-    publishExternalAPI();
+    window.angular = new Angular();
     createInjector([
       "ng",
       function (_$controllerProvider_) {

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

@@ -1,4 +1,4 @@
-import { publishExternalAPI } from "../public";
+import { Angular } from "../loader";
 import { createInjector } from "../injector";
 
 describe("$$cookieReader", () => {
@@ -27,7 +27,7 @@ describe("$$cookieReader", () => {
       deleteAllCookies();
       expect(document.cookie).toEqual("");
 
-      publishExternalAPI();
+      window.angular = new Angular();
       var injector = createInjector(["ng"]);
       $$cookieReader = injector.get("$$cookieReader");
     });

package/src/core/filter/filter.spec.js

@@ -1,9 +1,9 @@
-import { publishExternalAPI } from "../../public";
+import { Angular } from "../../loader";
 import { createInjector } from "../../injector";
 
 describe("filter", function () {
   beforeEach(() => {
-    publishExternalAPI();
+    window.angular = new Angular();
   });
   it("can be registered and obtained", () => {
     var myFilter = () => {};
@@ -83,7 +83,7 @@ describe("filter", function () {
 
 describe("filter filter", function () {
   beforeEach(function () {
-    publishExternalAPI();
+    window.angular = new Angular();
   });
   it("is available", function () {
     var injector = createInjector(["ng"]);
@@ -97,7 +97,7 @@ describe("$filter", () => {
   let $filter;
 
   beforeEach(() => {
-    publishExternalAPI();
+    window.angular = new Angular();
     const injector = createInjector([
       "ng",
       function (_$filterProvider_) {

package/src/core/interpolate/interpolate.spec.js

@@ -1,11 +1,11 @@
 import { createInjector } from "../../injector";
-import { publishExternalAPI } from "../../public";
+import { Angular } from "../../loader";
 
 describe("$interpolate", () => {
   let $interpolate, $injector, $rootScope, $sce;
 
   beforeEach(() => {
-    publishExternalAPI();
+    window.angular = new Angular();
     $injector = createInjector(["ng"]);
     $interpolate = $injector.get("$interpolate");
     $rootScope = $injector.get("$rootScope");

package/src/core/interval/interval.spec.js

@@ -1,4 +1,4 @@
-import { publishExternalAPI } from "../../public";
+import { Angular } from "../../loader";
 import { createInjector } from "../../injector";
 import { wait } from "../../shared/test-utils";
 
@@ -10,12 +10,15 @@ describe("$interval", () => {
 
   beforeEach(() => {
     errors = [];
-    publishExternalAPI().decorator("$exceptionHandler", () => {
-      return (exception) => {
-        errors.push(exception);
-      };
-    });
-    injector = createInjector(["ng"]);
+    window.angular = new Angular();
+    window.angular
+      .module("myModule", ["ng"])
+      .decorator("$exceptionHandler", () => {
+        return (exception) => {
+          errors.push(exception);
+        };
+      });
+    injector = createInjector(["myModule"]);
 
     $interval = injector.get("$interval");
     $rootScope = injector.get("$rootScope");

package/src/core/location/location.spec.js

@@ -4,13 +4,13 @@ import {
   $LocationProvider,
   LocationHashbangInHtml5Url,
 } from "./location";
-import { publishExternalAPI } from "../../public";
+import { Angular } from "../../loader";
 import { createInjector } from "../../injector";
 
 describe("$location", () => {
   let module;
   beforeEach(() => {
-    publishExternalAPI();
+    window.angular = new Angular();
     module = window.angular.module("test1", ["ng"]);
   });
 

package/src/core/ng-module.js

@@ -0,0 +1,167 @@
+import { isFunction, isDefined, isObject, minErr } from "../shared/utils";
+
+const ngMinErr = minErr("ng");
+
+export class NgModule {
+  /**
+   *
+   * @param {String} name - Name of the module
+   * @param {Array<String>} requires - List of modules which the injector will load before the current module
+   * @param {Function} [configFn]
+   */
+  constructor(name, requires, configFn) {
+    /**
+     * @type {string}
+     * Name of the module.
+     */
+    this.name = name;
+    /**
+     * Holds the list of modules which the injector will load before the current module is
+     * loaded.
+     */
+    this.requires = requires;
+
+    this.configFn = configFn;
+
+    /** @type {!Array.<Array.<*>>} */
+    this._invokeQueue = [];
+
+    /** @type {!Array.<any>} */
+    this._configBlocks = [];
+
+    /** @type {!Array.<Function>} */
+    this._runBlocks = [];
+
+    /** @type {Object} */
+    this.infoState = {};
+
+    if (configFn) {
+      this.config(configFn);
+    }
+  }
+
+  /**
+   *
+   * @param {Object} value
+   * @returns
+   */
+  info(value) {
+    if (isDefined(value)) {
+      if (!isObject(value))
+        throw ngMinErr("aobj", "Argument '{0}' must be an object", "value");
+      this.infoState = value;
+      return this;
+    }
+    return this.infoState;
+  }
+
+  /**
+   * @param {String} name
+   * @param {any} object
+   * @returns {NgModule}
+   */
+  value(name, object) {
+    this._invokeQueue.push(["$provide", "value", [name, object]]);
+    return this;
+  }
+
+  /**
+   * @param {String} name
+   * @param {any} object
+   * @returns {NgModule}
+   */
+  constant(name, object) {
+    this._invokeQueue.unshift(["$provide", "constant", [name, object]]);
+    return this;
+  }
+
+  config(configFn) {
+    this._configBlocks.push(["$injector", "invoke", [configFn]]);
+    return this;
+  }
+
+  run(block) {
+    this._runBlocks.push(block);
+    return this;
+  }
+
+  component(name, options) {
+    if (options && isFunction(options)) {
+      options.$$moduleName = name;
+    }
+    this._invokeQueue.push(["$compileProvider", "component", [name, options]]);
+    return this;
+  }
+
+  factory(name, providerFunction) {
+    if (providerFunction && isFunction(providerFunction)) {
+      providerFunction.$$moduleName = name;
+    }
+    this._invokeQueue.push(["$provide", "factory", [name, providerFunction]]);
+    return this;
+  }
+
+  service(name, serviceFunction) {
+    if (serviceFunction && isFunction(serviceFunction)) {
+      serviceFunction.$$moduleName = name;
+    }
+    this._invokeQueue.push(["$provide", "service", [name, serviceFunction]]);
+    return this;
+  }
+
+  provider(name, providerType) {
+    if (providerType && isFunction(providerType)) {
+      providerType.$$moduleName = name;
+    }
+    this._invokeQueue.push(["$provide", "provider", [name, providerType]]);
+    return this;
+  }
+
+  decorator(name, decorFn) {
+    if (decorFn && isFunction(decorFn)) {
+      decorFn.$$moduleName = name;
+    }
+    this._configBlocks.push(["$provide", "decorator", [name, decorFn]]);
+    return this;
+  }
+
+  directive(name, directiveFactory) {
+    if (directiveFactory && isFunction(directiveFactory)) {
+      directiveFactory.$$moduleName = name;
+    }
+    this._invokeQueue.push([
+      "$compileProvider",
+      "directive",
+      [name, directiveFactory],
+    ]);
+    return this;
+  }
+
+  animation(name, animationFactory) {
+    if (animationFactory && isFunction(animationFactory)) {
+      animationFactory.$$moduleName = name;
+    }
+    this._invokeQueue.push([
+      "$animateProvider",
+      "register",
+      [name, animationFactory],
+    ]);
+    return this;
+  }
+
+  filter(name, filterFn) {
+    if (filterFn && isFunction(filterFn)) {
+      filterFn.$$moduleName = name;
+    }
+    this._invokeQueue.push(["$filterProvider", "register", [name, filterFn]]);
+    return this;
+  }
+
+  controller(name, ctlFn) {
+    if (ctlFn && isFunction(ctlFn)) {
+      ctlFn.$$moduleName = name;
+    }
+    this._invokeQueue.push(["$controllerProvider", "register", [name, ctlFn]]);
+    return this;
+  }
+}

package/src/core/on.spec.js

@@ -1,4 +1,4 @@
-import { publishExternalAPI } from "../public";
+import { Angular } from "../loader";
 import { createInjector } from "../injector";
 import { valueFn } from "../shared/utils";
 
@@ -6,7 +6,7 @@ describe("ngOn* event binding", () => {
   let $rootScope, module, injector, $compile;
 
   beforeEach(() => {
-    publishExternalAPI();
+    window.angular = new Angular();
     module = window.angular.module("test1", ["ng"]);
     injector = createInjector(["ng", "test1"]);
     $rootScope = injector.get("$rootScope");