@angular-wave/angular.ts 0.0.65 → 0.0.66

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

@@ -2,11 +2,17 @@
  *
  * @param {Array<String|Function>} modulesToLoad
  * @param {boolean} [strictDi]
- * @returns {import("../../types").InjectorService}
+ * @returns {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 {};
+export function createInjector(modulesToLoad: Array<string | Function>, strictDi?: boolean): InjectorService;
+/**
+ *
+ * @param {any} fn
+ * @param {boolean} [strictDi]
+ * @param {String} [name]
+ * @returns {Array<string>}
+ */
+export function annotate(fn: any, strictDi?: boolean, name?: string): Array<string>;
+/** @type {String[]} Used only for error reporting of circular dependencies*/
+export const path: string[];
+import { InjectorService } from "./internal-injector";

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

@@ -0,0 +1,36 @@
+export class ProviderInjector {
+    /**
+     *
+     * @param {Object} cache
+     * @param {boolean} strictDi
+     */
+    constructor(cache: any, strictDi: boolean);
+    cache: any;
+    strictDi: boolean;
+    path: any[];
+    providerCache: any;
+    modules: any;
+    factory(caller: any): void;
+    /**
+     *
+     * @param {String} serviceName
+     * @returns {any}
+     */
+    get(serviceName: string): any;
+    injectionArgs(fn: any, locals: any, serviceName: any): any[];
+    invoke(fn: any, self: any, locals: any, serviceName: any): any;
+    instantiate(Type: any, locals: any, serviceName: any): any;
+    /**
+     *
+     * @param {String} name
+     * @returns {boolean}
+     */
+    has(name: string): boolean;
+}
+export class InjectorService extends ProviderInjector {
+    constructor(cache: any, strictDi: any, providerInjector: any);
+    strictDi: any;
+    providerInjector: any;
+    factory(serviceName: any, caller: any): any;
+    loadNewModules(): void;
+}

package/types/core/filter/filter.d.ts

@@ -2,7 +2,7 @@ export function $FilterProvider($provide: any): void;
 export class $FilterProvider {
     constructor($provide: any);
     register: (name: any, factory: any) => any;
-    $get: (string | (($injector: any) => (name: any) => any))[];
+    $get: (string | (($injector: import("../../core/di/internal-injector").InjectorService) => (name: any) => any))[];
 }
 export namespace $FilterProvider {
     let $inject: string[];

package/types/core/sce/sce.d.ts

@@ -150,7 +150,7 @@ export class $SceDelegateProvider {
      * array (i.e. there is no `bannedResourceUrlList`.)
      */
     bannedResourceUrlList: (value: any, ...args: any[]) => any[];
-    $get: (string | (($injector: any, $$sanitizeUri: any) => {
+    $get: (string | (($injector: import("../../core/di/internal-injector").InjectorService, $$sanitizeUri: any) => {
         trustAs: (type: string, trustedValue: any) => any;
         getTrusted: (type: string, maybeTrusted: any) => any;
         valueOf: (maybeTrusted: any) => any;

package/types/router/services.d.ts

@@ -1,4 +1,11 @@
-export function runBlock($injector: any, $q: any, $stateRegistry: any, $urlService: any): void;
+/**
+ *
+ * @param {import("../core/di/internal-injector").InjectorService} $injector
+ * @param {*} $q
+ * @param {*} $stateRegistry
+ * @param {*} $urlService
+ */
+export function runBlock($injector: import("../core/di/internal-injector").InjectorService, $q: any, $stateRegistry: any, $urlService: any): void;
 export namespace runBlock {
     let $inject: string[];
 }

package/types/router/state/state-registry.d.ts

@@ -9,12 +9,12 @@ export class StateRegistry {
     states: {};
     urlService: any;
     urlServiceRules: any;
-    $injector: any;
+    $injector: import("../../core/di/internal-injector").InjectorService;
     listeners: any[];
     matcher: StateMatcher;
     builder: StateBuilder;
     stateQueue: StateQueueManager;
-    $get: (string | (($injector: any) => this))[];
+    $get: (string | (($injector: import("../../core/di/internal-injector").InjectorService) => this))[];
     /**
      * This is a [[StateBuilder.builder]] function for angular1 `onEnter`, `onExit`,
      * `onRetain` callback hooks on a [[Ng1StateDeclaration]].

package/types/router/template-factory.d.ts

@@ -9,12 +9,12 @@
 export class TemplateFactory {
     /** @type {boolean} */
     _useHttp: boolean;
-    $get: (string | (($http: angular.IHttpService, $templateCache: angular.ITemplateCacheService, $templateRequest: angular.ITemplateRequestService, $q: angular.IQService, $injector: angular.auto.IInjectorService) => this))[];
+    $get: (string | (($http: angular.IHttpService, $templateCache: angular.ITemplateCacheService, $templateRequest: angular.ITemplateRequestService, $q: angular.IQService, $injector: import("../core/di/internal-injector").InjectorService) => this))[];
     $templateRequest: angular.ITemplateRequestService;
     $http: angular.IHttpService;
     $templateCache: angular.ITemplateCacheService;
     $q: angular.IQService;
-    $injector: angular.auto.IInjectorService;
+    $injector: import("../core/di/internal-injector").InjectorService;
     /**
      * Forces the provider to use $http service directly
      * @param {boolean} value

package/types/services/http/http.d.ts

@@ -113,7 +113,7 @@ export class $HttpProvider {
     useApplyAsync: (value?: boolean | undefined) => boolean | any;
     interceptors: any[];
     xsrfTrustedOrigins: any[];
-    $get: (string | (($browser: any, $httpBackend: any, $$cookieReader: any, $cacheFactory: any, $rootScope: any, $q: any, $injector: any, $sce: any) => {
+    $get: (string | (($browser: any, $httpBackend: any, $$cookieReader: any, $cacheFactory: any, $rootScope: any, $q: any, $injector: import("../../core/di/internal-injector").InjectorService, $sce: any) => {
         (requestConfig: any): HttpPromise;
         pendingRequests: any[];
         /**

package/types/types.d.ts

@@ -1,5 +1,12 @@
 export type BootstrapConfig = any;
 export type Injectable<T_1> = Function | Array<string | Function>;
+export type Annotated = {
+    /**
+     *  *
+     */
+    $inject: Array<string>;
+};
+export type AnnotatedFunction = Function & Annotated & Array<any>;
 export type ComponentOptions = any;
 export type ControllerConstructor = Function;
 export type OnChangesObject = any;
@@ -409,35 +416,3 @@ export type ModelValidators = {
 export type AsyncModelValidators = {
     [x: string]: (arg0: any, arg1: any) => Promise<any>;
 };
-export type InjectorService = {
-    /**
-     * - Annotate a function or an array of inline annotations.
-     */
-    annotate: (arg0: Function, arg1: boolean | undefined) => string[];
-    /**
-     * - Get a service by name.
-     */
-    get: (arg0: string, arg1: string | undefined) => any;
-    /**
-     * - Instantiate a type constructor with optional locals.
-     */
-    instantiate: (arg0: Function, arg1: any | null) => any;
-    /**
-     * - Invoke a function with optional context and locals.
-     */
-    invoke: (arg0: Injectable<Function | ((...args: any[]) => any)>, arg1: any | undefined, arg2: any | undefined) => any;
-    /**
-     * - Add and load new modules to the injector.
-     */
-    loadNewModules?: (arg0: Array<Module | string | Injectable<(...args: any[]) => void>>) => void;
-    /**
-     * - A map of all the modules loaded into the injector.
-     */
-    modules?: {
-        [x: string]: Module;
-    };
-    /**
-     * - Indicates if strict dependency injection is enforced.
-     */
-    strictDi?: boolean;
-};