@tanbo/di - npm Package Compare versions

Comparing version 0.0.31 to 0.0.32

bundles/core/annotations.d.ts

@@ -0,0 +0,0 @@ import { Injector } from './injector';

bundles/core/annotations.js

@@ -0,0 +0,0 @@ export class Annotations {

bundles/core/decorators.d.ts

@@ -0,0 +0,0 @@ import { Annotations, ClassDecoratorContextCallback, PropertyDecoratorContextCallback } from './annotations';

bundles/core/decorators.js

@@ -0,0 +0,0 @@ import { Annotations } from './annotations';

bundles/core/forward-ref.d.ts

@@ -1,6 +0,6 @@
-export declare class ForwardRef {
+export declare class ForwardRef<T = any> {
     private forwardRefFn;
-    constructor(forwardRefFn: () => any);
-    getRef(): any;
+    constructor(forwardRefFn: () => T);
+    getRef(): T;
 }
-export declare function forwardRef(fn: () => any): ForwardRef;
+export declare function forwardRef<T>(fn: () => T): ForwardRef<T>;

bundles/core/forward-ref.js

@@ -0,0 +0,0 @@ export class ForwardRef {

bundles/core/injectable.d.ts

@@ -0,0 +0,0 @@ export interface Injectable {

bundles/core/injectable.js

@@ -0,0 +0,0 @@ import { makeClassDecorator } from './decorators';

bundles/core/injection-token.d.ts

@@ -0,0 +0,0 @@ export declare class InjectionToken<T> {

bundles/core/injection-token.js

@@ -0,0 +0,0 @@ export class InjectionToken {

bundles/core/injector.d.ts

 import { Type } from './type';
 import { InjectionToken } from './injection-token';
 export declare enum InjectFlags {
-    Default = 0,
-    Self = 1,
-    SkipSelf = 2,
-    Optional = 3
+    Default = "Default",
+    Self = "Self",
+    SkipSelf = "SkipSelf",
+    Optional = "Optional"
 }
@@ -9,0 +9,0 @@ export declare abstract class Injector {

bundles/core/injector.js

 export var InjectFlags;
 (function (InjectFlags) {
-    InjectFlags[InjectFlags["Default"] = 0] = "Default";
-    InjectFlags[InjectFlags["Self"] = 1] = "Self";
-    InjectFlags[InjectFlags["SkipSelf"] = 2] = "SkipSelf";
-    InjectFlags[InjectFlags["Optional"] = 3] = "Optional";
+    InjectFlags["Default"] = "Default";
+    InjectFlags["Self"] = "Self";
+    InjectFlags["SkipSelf"] = "SkipSelf";
+    InjectFlags["Optional"] = "Optional";
 })(InjectFlags || (InjectFlags = {}));
 export class Injector {
 }

bundles/core/metadata.d.ts

 import { Type } from './type';
+import { InjectFlags } from './injector';
+import { InjectionToken } from './injection-token';
+import { ForwardRef } from './forward-ref';
 export interface Inject {
@@ -33,11 +36,10 @@ token: any;
     <T extends Type<any>>(type: T): T;
-    (target: Object, propertyKey?: string | symbol, parameterIndex?: number): void;
+    (target: unknown, propertyKey?: string | symbol, parameterIndex?: number): void;
 }
 export interface Prop {
-    token: any;
 }
 export interface PropDecorator {
-    (token: any): PropertyDecorator;
+    <T>(token: Type<T> | InjectionToken<T> | ForwardRef<T>, notFoundValue?: T, flags?: InjectFlags): PropertyDecorator;
     new (token: any): Prop;
 }
 export declare const Prop: PropDecorator;

bundles/core/metadata.js

@@ -28,6 +28,3 @@ import { makeParamDecorator, makePropertyDecorator } from './decorators';
 export const Prop = function PropDecorator(token, notFoundValue = THROW_IF_NOT_FOUND, flags) {
-    if (this instanceof PropDecorator) {
-        this.token = token;
-    }
-    else {
+    if (!(this instanceof Prop)) {
         return makePropertyDecorator(Prop, function (instance, propertyName, injector) {
@@ -34,0 +31,0 @@ instance[propertyName] = injector.get(token instanceof ForwardRef ? token.getRef() : token, notFoundValue, flags);

bundles/core/null-injector.d.ts

 import { Injector } from './injector';
-export declare const THROW_IF_NOT_FOUND: {};
+export declare const THROW_IF_NOT_FOUND: any;
 export declare class NullInjector implements Injector {
@@ -4,0 +4,0 @@ parentInjector: any;

bundles/core/null-injector.js

 import { makeInjectError } from './utils/_api';
-export const THROW_IF_NOT_FOUND = {};
+export const THROW_IF_NOT_FOUND = {
+    __debug_value__: 'THROW_IF_NOT_FOUND'
+};
 const nullInjectorErrorFn = makeInjectError('NullInjectorError');
@@ -4,0 +6,0 @@ export class NullInjector {

bundles/core/provider.d.ts

@@ -0,0 +0,0 @@ import { Type } from './type';

bundles/core/provider.js

 export {};

bundles/core/reflective-injector.d.ts

@@ -0,0 +0,0 @@ import { Provider } from './provider';

bundles/core/reflective-injector.js

@@ -34,3 +34,3 @@ import { InjectFlags, Injector } from './injector';
                 const params = this.resolveDeps(deps || [], notFoundValue);
-                let reflectiveValue = factory(...params);
+                const reflectiveValue = factory(...params);
                 this.reflectiveValues.set(token, reflectiveValue);
@@ -40,4 +40,7 @@ return reflectiveValue;
         }
-        if (flags === InjectFlags.Self && notFoundValue === THROW_IF_NOT_FOUND) {
-            throw reflectiveInjectorErrorFn(token);
+        if (flags === InjectFlags.Self) {
+            if (notFoundValue === THROW_IF_NOT_FOUND) {
+                throw reflectiveInjectorErrorFn(token);
+            }
+            return notFoundValue;
         }
@@ -63,5 +66,10 @@ if (this.parentInjector) {
                 if (this.parentInjector) {
-                    reflectiveValue = this.parentInjector.get(injectToken, tryValue, InjectFlags.Default);
+                    reflectiveValue = this.parentInjector.get(injectToken, tryValue, dep.optional ? InjectFlags.Optional : InjectFlags.Default);
                 }
                 else {
+                    if (dep.optional) {
+                        if (notFoundValue === THROW_IF_NOT_FOUND) {
+                            return null;
+                        }
+                    }
                     throw reflectiveInjectorErrorFn(injectToken);
@@ -68,0 +76,0 @@ }

bundles/core/reflective-provider.d.ts

@@ -0,0 +0,0 @@ import { Provider } from './provider';

bundles/core/reflective-provider.js

@@ -0,0 +0,0 @@ import { Inject, Optional, Self, SkipSelf } from './metadata';

bundles/core/type.d.ts

@@ -0,0 +0,0 @@ export declare const Type: FunctionConstructor;

bundles/core/type.js

 export const Type = Function;

bundles/core/utils/_api.d.ts

 export * from './inject-error';
 export * from './stringify';

bundles/core/utils/_api.js

 export * from './inject-error';
 export * from './stringify';

bundles/core/utils/inject-error.d.ts

 export declare function makeInjectError(name: string): (token: any) => Error;

bundles/core/utils/inject-error.js

@@ -0,0 +0,0 @@ import { stringify } from './stringify';

bundles/core/utils/stringify.d.ts

 export declare function stringify(token: any): string;

bundles/core/utils/stringify.js

@@ -0,0 +0,0 @@ export function stringify(token) {

bundles/public-api.d.ts

@@ -0,0 +0,0 @@ export * from './core/utils/_api';

bundles/public-api.js

@@ -0,0 +0,0 @@ export * from './core/utils/_api';

package.json

 {
   "name": "@tanbo/di",
-  "version": "0.0.31",
+  "version": "0.0.32",
   "description": "A dependency injection Library",
@@ -5,0 +5,0 @@ "main": "./bundles/public-api.js",

No alert changes

Improved metrics

Total package byte prevSize

26333

increased by4.6%

Lines of code

682

increased by1.34%

No dependency changes