@angular-wave/angular.ts 0.0.64 → 0.0.65

package/src/directive/script/script.spec.js

@@ -1,5 +1,5 @@
 import { Angular } from "../../loader";
-import { createInjector } from "../../injector";
+import { createInjector } from "../../core/di/injector";
 import { dealoc, JQLite } from "../../shared/jqlite/jqlite";
 
 describe("scriptDirective", () => {

package/src/directive/select/select.spec.js

@@ -1,5 +1,5 @@
 import { Angular } from "../../loader";
-import { createInjector } from "../../injector";
+import { createInjector } from "../../core/di/injector";
 import { dealoc, JQLite } from "../../shared/jqlite/jqlite";
 import { forEach, hashKey, equals, isNumberNaN } from "../../shared/utils";
 import { browserTrigger } from "../../shared/test-utils";

package/src/directive/show-hide/show-hide.spec.js

@@ -1,5 +1,5 @@
 import { Angular } from "../../loader";
-import { createInjector } from "../../injector";
+import { createInjector } from "../../core/di/injector";
 import { dealoc, JQLite } from "../../shared/jqlite/jqlite";
 
 describe("ngShow / ngHide", () => {

package/src/directive/style/style.spec.js

@@ -1,5 +1,5 @@
 import { Angular } from "../../loader";
-import { createInjector } from "../../injector";
+import { createInjector } from "../../core/di/injector";
 import { dealoc, JQLite } from "../../shared/jqlite/jqlite";
 
 describe("ng-style", () => {

package/src/directive/switch/switch.spec.js

@@ -1,5 +1,5 @@
 import { Angular } from "../../loader";
-import { createInjector } from "../../injector";
+import { createInjector } from "../../core/di/injector";
 import { dealoc, JQLite } from "../../shared/jqlite/jqlite";
 
 describe("ngSwitch", () => {

package/src/directive/validators/validators.spec.js

@@ -1,5 +1,5 @@
 import { Angular } from "../../loader";
-import { createInjector } from "../../injector";
+import { createInjector } from "../../core/di/injector";
 import { dealoc } from "../../shared/jqlite/jqlite";
 
 describe("validators", () => {

package/src/exts/aria/aria.spec.js

@@ -1,4 +1,4 @@
-import { createInjector } from "../../injector";
+import { createInjector } from "../../core/di/injector";
 import { Angular } from "../../loader";
 import { dealoc, JQLite } from "../../shared/jqlite/jqlite";
 

package/src/exts/messages/messages.spec.js

@@ -1,4 +1,4 @@
-import { createInjector } from "../../injector";
+import { createInjector } from "../../core/di/injector";
 import { countWatchers } from "../../core/scope/scope";
 import { Angular } from "../../loader";
 import { isString } from "../../shared/utils";

package/src/filters/filter.spec.js

@@ -1,5 +1,5 @@
 import { Angular } from "../loader";
-import { createInjector } from "../injector";
+import { createInjector } from "../core/di/injector";
 import { isString, includes } from "../shared/utils";
 import { JQLite } from "../shared/jqlite/jqlite";
 

package/src/filters/filters.spec.js

@@ -1,5 +1,5 @@
 import { Angular } from "../loader";
-import { createInjector } from "../injector";
+import { createInjector } from "../core/di/injector";
 import { toJson } from "../shared/utils";
 
 describe("filters", () => {

package/src/filters/limit-to.spec.js

@@ -1,5 +1,5 @@
 import { Angular } from "../loader";
-import { createInjector } from "../injector";
+import { createInjector } from "../di/injector";
 import { JQLite } from "../shared/jqlite/jqlite";
 
 describe("Filter: limitTo", () => {

package/src/filters/order-by.spec.js

@@ -1,5 +1,5 @@
 import { Angular } from "../loader";
-import { createInjector } from "../injector";
+import { createInjector } from "../di/injector";
 
 describe("Filter: orderBy", () => {
   let orderBy;

package/src/loader.js

@@ -7,16 +7,16 @@ import {
   errorHandlingConfig,
 } from "./shared/utils";
 import { JQLite } from "./shared/jqlite/jqlite";
-import { createInjector } from "./injector";
+import { createInjector } from "./core/di/injector";
+import { NgModule } from "./core/di/ng-module";
 import { CACHE } from "./core/cache/cache";
 import { publishExternalAPI } from "./public";
-import { NgModule } from "./core/ng-module";
 import { VERSION } from "./public";
 
 const ngMinErr = minErr("ng");
 const $injectorMinErr = minErr("$injector");
 
-/** @type {Object.<string, import('./types').Module>} */
+/** @type {Object.<string, NgModule>} */
 const modules = {};
 
 /**
@@ -264,10 +264,10 @@ export class Angular {
    * {@link ng.directive:ngApp ngApp} or
    * {@link angular.bootstrap} to simplify this process for you.
    *
-   * @param {!string} name The name of the module to create or retrieve.
-   * @param {!Array.<string>=} requires If specified then new module is being created. If
+   * @param {string} name The name of the module to create or retrieve.
+   * @param {Array.<string>} [requires] If specified then new module is being created. If
    *        unspecified then the module is being retrieved for further configuration.
-   * @param {Function=} configFn Optional configuration function for the module. Same as
+   * @param {Function} [configFn] Optional configuration function for the module. Same as
    *        {@link import('./types').Module#config Module#config()}.
    * @returns {NgModule} A newly registered module.
    */

package/src/loader.spec.js

@@ -1,27 +1,12 @@
 import { Angular } from "./loader";
-import { createInjector } from "./injector";
+import { createInjector } from "./core/di/injector";
 
 describe("module loader", () => {
   var angular;
   beforeEach(() => {
-    delete window.angular;
     angular = window.angular = new Angular();
   });
 
-  it("should set up namespace", () => {
-    expect(angular).toBeDefined();
-    expect(angular.module).toBeDefined();
-  });
-
-  it("should not override existing namespace", () => {
-    const { angular } = window;
-    const { module } = angular;
-
-    window.angular = new Angular();
-    expect(angular).toBe(angular);
-    expect(angular.module).toBe(module);
-  });
-
   it("allows registering a module", () => {
     const myModule = angular.module("myModule", []);
     expect(myModule).toBeDefined();
@@ -81,7 +66,7 @@ describe("module loader", () => {
     ).toBe(myModule);
 
     expect(myModule.requires).toEqual(["other"]);
-    expect(myModule._invokeQueue).toEqual([
+    expect(myModule.invokeQueue).toEqual([
       ["$provide", "constant", jasmine.objectContaining(["abc", 123])],
       ["$provide", "provider", jasmine.objectContaining(["sk", "sv"])],
       ["$provide", "factory", jasmine.objectContaining(["fk", "fv"])],
@@ -96,12 +81,12 @@ describe("module loader", () => {
         jasmine.objectContaining(["ctrl", "ccc"]),
       ],
     ]);
-    expect(myModule._configBlocks).toEqual([
+    expect(myModule.configBlocks).toEqual([
       ["$injector", "invoke", jasmine.objectContaining(["config"])],
       ["$provide", "decorator", jasmine.objectContaining(["dk", "dv"])],
       ["$injector", "invoke", jasmine.objectContaining(["init2"])],
     ]);
-    expect(myModule._runBlocks).toEqual(["runBlock"]);
+    expect(myModule.runBlocks).toEqual(["runBlock"]);
   });
 
   it("should not throw error when `module.decorator` is declared before provider that it decorates", () => {

package/src/public.spec.js

@@ -1,4 +1,4 @@
-import { createInjector } from "./injector";
+import { createInjector } from "./core/di/injector";
 import { Angular } from "./loader";
 
 describe("public", () => {

package/src/services/http/http.spec.js

@@ -1,4 +1,4 @@
-import { createInjector } from "../../injector";
+import { createInjector } from "../../core/di/injector";
 import { isObject } from "../../shared/utils";
 import { Angular } from "../../loader";
 

package/src/services/http/template-request.spec.js

@@ -1,4 +1,4 @@
-import { createInjector } from "../../injector";
+import { createInjector } from "../../core/di/injector";
 import { Angular } from "../../loader";
 
 describe("$templateRequest", () => {

package/src/services/http-backend/http-backend.spec.js

@@ -1,4 +1,4 @@
-import { createInjector } from "../../injector";
+import { createInjector } from "../../core/di/injector";
 import { Angular } from "../../loader";
 import { createHttpBackend } from "./http-backend";
 import sinon from "sinon";

package/src/shared/jqlite/jqlite.js

@@ -744,11 +744,9 @@ JQLite.prototype.triggerHandler = function (event, extraParameters) {
     if (isUndefined(value)) {
       value = fn(this[i], event, extraParameters);
       if (isDefined(value)) {
-        // @ts-ignore
         value = JQLite(value);
       }
     } else {
-      // @ts-ignore
       addNodes(value, fn(this[i], event, extraParameters));
     }
   }

package/src/shared/jqlite/jqlite.spec.js

@@ -7,7 +7,7 @@ import {
   removeElementData,
 } from "./jqlite";
 import { Angular } from "../../loader";
-import { createInjector } from "../../injector";
+import { createInjector } from "../../core/di/injector";
 import { equals, forEach } from "../../shared/utils";
 import { browserTrigger } from "../../shared/test-utils";
 import { CACHE, EXPANDO } from "../../core/cache/cache";

package/src/shared/utils.js

@@ -1070,7 +1070,16 @@ export function shallowCopy(src, dst) {
 }
 
 /**
- * throw error if the argument is falsy.
+ * Throw error if the argument is false
+ * @param {boolean} argument
+ * @param {string} errorMsg
+ */
+export function assert(argument, errorMsg = "Assertion failed") {
+  if (!argument) throw new Error(errorMsg);
+}
+
+/**
+ * Throw error if the argument is falsy.
  */
 export function assertArg(arg, name, reason) {
   if (!arg) {

package/src/src.html

@@ -12,7 +12,6 @@
     <script src="/jasmine/jasmine-5.1.2/boot1.js"></script>
     <script type="module" src="/src/angular.spec.js"></script>
     <script type="module" src="/src/binding.spec.js"></script>
-    <script type="module" src="/src/injector.spec.js"></script>
     <script type="module" src="/src/loader.spec.js"></script>
     <script type="module" src="/src/public.spec.js"></script>
   </head>

package/types/core/di/injector.d.ts

@@ -0,0 +1,12 @@
+/**
+ *
+ * @param {Array<String|Function>} modulesToLoad
+ * @param {boolean} [strictDi]
+ * @returns {import("../../types").InjectorService}
+ */
+export function createInjector(modulesToLoad: Array<string | Function>, strictDi?: boolean): import("../../types").InjectorService;
+export namespace createInjector {
+    export { annotate as $$annotate };
+}
+declare function annotate(fn: any, strictDi: any, name: any): any;
+export {};

package/types/core/{ng-module.d.ts → di/ng-module.d.ts}

@@ -1,3 +1,19 @@
+export const PROVIDE_LITERAL: "$provide";
+export const INJECTOR_LITERAL: "$injector";
+export const COMPILE_LITERAL: "$compileProvider";
+export const ANIMATION_LITERAL: "$animateProvider";
+export const FILTER_LITERAL: "$filterProvider";
+export const CONTROLLER_LITERAL: "$controllerProvider";
+/**
+ * Modules are collections of application configuration information for components:
+ * controllers, directives, filters, etc. They provide recipes for the injector
+ * to do the actual instantiation. A module itself has no behaviour but only state.
+ * A such, it acts as a data structure between the Angular instance and the injector service.
+ *
+ * Since this is an internal structure that is exposed only via the Angular instance,
+ * it contains no validation of the items it receives. It is up to the instantiator on
+ * modules to do the actual validation.
+ */
 export class NgModule {
     /**
      *
@@ -16,17 +32,18 @@ export class NgModule {
      * loaded.
      */
     requires: string[];
-    configFn: Function;
-    /** @type {!Array.<Array.<*>>} */
-    _invokeQueue: Array<Array<any>>;
-    /** @type {!Array.<any>} */
-    _configBlocks: Array<any>;
+    /**
+     * Holds a collection of tasks, required to instantiate an angular component
+     * @type {!Array<Array<*>>}
+     */
+    invokeQueue: Array<Array<any>>;
+    /** @type {!Array<Array<*>>} */
+    configBlocks: Array<Array<any>>;
     /** @type {!Array.<Function>} */
-    _runBlocks: Array<Function>;
+    runBlocks: Array<Function>;
     /** @type {Object} */
     infoState: any;
     /**
-     *
      * @param {Object} value
      * @returns
      */
@@ -43,7 +60,12 @@ export class NgModule {
      * @returns {NgModule}
      */
     constant(name: string, object: any): NgModule;
-    config(configFn: any): this;
+    /**
+     *
+     * @param {Function} configFn
+     * @returns {NgModule}
+     */
+    config(configFn: Function): NgModule;
     run(block: any): this;
     component(name: any, options: any): this;
     factory(name: any, providerFunction: any): this;

package/types/loader.d.ts

@@ -126,14 +126,14 @@ export class Angular {
      * {@link ng.directive:ngApp ngApp} or
      * {@link angular.bootstrap} to simplify this process for you.
      *
-     * @param {!string} name The name of the module to create or retrieve.
-     * @param {!Array.<string>=} requires If specified then new module is being created. If
+     * @param {string} name The name of the module to create or retrieve.
+     * @param {Array.<string>} [requires] If specified then new module is being created. If
      *        unspecified then the module is being retrieved for further configuration.
-     * @param {Function=} configFn Optional configuration function for the module. Same as
+     * @param {Function} [configFn] Optional configuration function for the module. Same as
      *        {@link import('./types').Module#config Module#config()}.
      * @returns {NgModule} A newly registered module.
      */
-    module(name: string, requires?: Array<string> | undefined, configFn?: Function | undefined): NgModule;
+    module(name: string, requires?: Array<string>, configFn?: Function): NgModule;
 }
 /**
  * Configuration option for AngularTS bootstrap process.
@@ -144,4 +144,4 @@ export type AngularBootstrapConfig = {
      */
     strictDi?: boolean;
 };
-import { NgModule } from "./core/ng-module";
+import { NgModule } from "./core/di/ng-module";

package/types/shared/utils.d.ts

@@ -486,7 +486,13 @@ export function getNgAttribute(element: any, ngAttr: any): any;
  */
 export function shallowCopy(src: any, dst: any): any;
 /**
- * throw error if the argument is falsy.
+ * Throw error if the argument is false
+ * @param {boolean} argument
+ * @param {string} errorMsg
+ */
+export function assert(argument: boolean, errorMsg?: string): void;
+/**
+ * Throw error if the argument is falsy.
  */
 export function assertArg(arg: any, name: any, reason: any): any;
 export function assertArgFn(arg: any, name: any, acceptArrayAnnotation: any): any;

package/types/injector.d.ts

@@ -1,12 +0,0 @@
-/**
- *
- * @param {*} modulesToLoad
- * @param {*} strictDi
- * @returns {import("./types").InjectorService}
- */
-export function createInjector(modulesToLoad: any, strictDi: any): import("./types").InjectorService;
-export namespace createInjector {
-    export { annotate as $$annotate };
-}
-declare function annotate(fn: any, strictDi: any, name: any): any;
-export {};