first-di 1.0.3 → 1.0.5

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "first-di",
-    "version": "1.0.3",
+    "version": "1.0.5",
     "description": "Easy dependency injection for typescript applications",
     "main": "./dist/index.js",
     "type": "module",
@@ -9,7 +9,7 @@
         "reflect-metadata": ">=0.1.0"
     },
     "devDependencies": {
-        "@labeg/code-style": "^2.0.52",
+        "@labeg/code-style": "^2.0.59",
         "@types/chai": "^4.3.4",
         "@types/mocha": "^10.0.0",
         "@types/node": "^18.11.9",

package/src/classes/di.ts

@@ -1,159 +0,0 @@
-
-import type {AutowiredOptions} from "../models/autowired-options.js";
-import type {ClassConstructor, OverrideConstructor} from "../typings/class-constructor.js";
-import {AutowiredLifetimes} from "../models/autowired-lifetimes.js";
-import type {OverrideOptions} from "../models/override-options.js";
-
-export class DI {
-
-    public static defaultOptions: AutowiredOptions = {
-        lifeTime: AutowiredLifetimes.Singleton
-    };
-
-    public autowired: (options?: AutowiredOptions) => PropertyDecorator;
-
-    public reset: () => void;
-
-    public resolve: <T extends object>(
-        constructor: ClassConstructor<T>,
-        options?: AutowiredOptions,
-        caller?: object,
-        propertyKey?: string | symbol
-    ) => T;
-
-    public singleton: <T extends object>(constructor: ClassConstructor<T>, options?: AutowiredOptions) => T;
-
-    public instance: <T extends object>(constructor: ClassConstructor<T>, options?: AutowiredOptions) => T;
-
-    public override: <T extends object>(
-        from: OverrideConstructor<object>, // Must be T, but typescript have bug with private property from implement class
-        to: ClassConstructor<T>,
-        options?: AutowiredOptions
-    ) => void;
-
-    protected singletonsList: Map<ClassConstructor<object>, object> = new Map<ClassConstructor<object>, object>();
-
-    protected overrideList: Map<OverrideConstructor<object>, OverrideOptions> = new Map<ClassConstructor<object>, OverrideOptions>();
-
-    public constructor () {
-        this.autowired = (options?: AutowiredOptions): PropertyDecorator => this.makeAutowired(options);
-        this.reset = (): void => {
-            this.makeReset();
-        };
-
-        this.resolve = <T extends object>(
-            constructor: ClassConstructor<T>,
-            options?: AutowiredOptions,
-            caller?: object,
-            propertyKey?: string | symbol
-        ): T => this.makeResolve(constructor, options, caller, propertyKey);
-
-        this.singleton = <T extends object>(
-            constructor: ClassConstructor<T>,
-            options?: AutowiredOptions
-        ): T => this.makeResolve(constructor, {...options,
-            lifeTime: AutowiredLifetimes.Singleton});
-
-        this.instance = <T extends object>(
-            constructor: ClassConstructor<T>,
-            options?: AutowiredOptions
-        ): T => this.makeResolve(constructor, {...options,
-            lifeTime: AutowiredLifetimes.PerInstance});
-
-        this.override = <T extends object>(
-            from: OverrideConstructor<T>,
-            to: ClassConstructor<T>,
-            options?: AutowiredOptions
-        ): void => {
-            this.makeOverride(from, to, options);
-        };
-    }
-
-    protected makeAutowired (options?: AutowiredOptions): PropertyDecorator {
-        return (target: object, propertyKey: string | symbol): void => {
-            const type = Reflect.getMetadata("design:type", target, propertyKey) as ClassConstructor<object>;
-            const {resolve} = this;
-
-            Reflect.defineProperty(
-                target,
-                propertyKey,
-                {
-                    configurable: false,
-                    enumerable: false,
-                    get () {
-                        return resolve(type, options, this as object, propertyKey);
-                    }
-                }
-            );
-        };
-    }
-
-    // eslint-disable-next-line max-statements
-    protected makeResolve<T extends object>(
-        inConstructor: ClassConstructor<T>,
-        inOptions?: AutowiredOptions,
-        caller?: object,
-        propertyKey?: string | symbol
-    ): T {
-        let constructor = inConstructor;
-        let options = inOptions;
-
-        if (this.overrideList.has(constructor)) {
-            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-            const overrideOptions = this.overrideList.get(constructor)!;
-            constructor = overrideOptions.to as ClassConstructor<T>;
-            options = overrideOptions.options ?? options;
-        }
-
-        const lifeTime = options?.lifeTime ?? AutowiredLifetimes.Singleton;
-        if (lifeTime === AutowiredLifetimes.Singleton) {
-            if (this.singletonsList.has(constructor)) {
-                return this.singletonsList.get(constructor) as T;
-            }
-        } else if (lifeTime === AutowiredLifetimes.PerOwned && Boolean(propertyKey)) {
-            if (Reflect.has(constructor, this.getDiKey(propertyKey))) {
-                return Reflect.get(constructor, this.getDiKey(propertyKey)) as T;
-            }
-        } else if (lifeTime === AutowiredLifetimes.PerInstance && caller && Boolean(propertyKey)) {
-            if (Reflect.has(caller, this.getDiKey(propertyKey))) {
-                return Reflect.get(caller, this.getDiKey(propertyKey)) as T;
-            }
-        }
-
-        const params: ClassConstructor<object>[] = Reflect
-            .getMetadata("design:paramtypes", constructor) as ([] | null) ?? [];
-
-        const object = new constructor(...params
-            .map((paramConstructor: ClassConstructor<object>) => this.makeResolve(paramConstructor, options)));
-
-        if (lifeTime === AutowiredLifetimes.Singleton) {
-            this.singletonsList.set(constructor, object);
-        } else if (lifeTime === AutowiredLifetimes.PerOwned) {
-            Reflect.set(constructor, this.getDiKey(propertyKey), object);
-        } else if (lifeTime === AutowiredLifetimes.PerInstance && caller) {
-            Reflect.set(caller, this.getDiKey(propertyKey), object);
-        }
-
-        return object;
-    }
-
-    protected makeReset (): void {
-        this.singletonsList = new Map<ClassConstructor<object>, object>();
-        this.overrideList = new Map<ClassConstructor<object>, OverrideOptions>();
-    }
-
-    protected makeOverride<T extends object>(from: OverrideConstructor<T>, to: ClassConstructor<T>, options?: AutowiredOptions): void {
-        this.overrideList.set(
-            from,
-            {
-                to,
-                options
-            }
-        );
-    }
-
-    protected getDiKey (propertyKey?: string | symbol): string {
-        return `$_di_${String(propertyKey)}`; // Think about symbol
-    }
-
-}

package/src/decorators/reflection.ts

@@ -1,5 +0,0 @@
-/* eslint-disable @typescript-eslint/no-unused-vars */
-
-export const reflection = (..._params: unknown[]): void => {
-    // For generation reflection by typescript
-};

package/src/index.ts

@@ -1,13 +0,0 @@
-export * from "./classes/di.js";
-export * from "./decorators/reflection.js";
-export * from "./models/autowired-lifetimes.js";
-
-import {DI} from "./classes/di.js";
-export const {
-    autowired,
-    override,
-    resolve,
-    singleton,
-    instance,
-    reset
-} = new DI(); // Export as singleton

package/src/models/autowired-lifetimes.ts

@@ -1,24 +0,0 @@
-export enum AutowiredLifetimes {
-
-    /**
-     * Create one instance for all resolvers
-     */
-
-    Singleton = 0,
-
-    /**
-     * Create one instance for each resolver
-     */
-
-    PerInstance = 1,
-
-    /**
-     * Create one instance for each type of resolver
-     */
-    PerOwned = 2,
-
-    /**
-     * Recreate each dependency on each access to dependency
-     */
-    PerAccess = 3
-}

package/src/models/autowired-options.ts

@@ -1,5 +0,0 @@
-import type {AutowiredLifetimes} from "./autowired-lifetimes.js";
-
-export interface AutowiredOptions {
-    lifeTime: AutowiredLifetimes;
-}

package/src/models/override-options.ts

@@ -1,8 +0,0 @@
-/* eslint-disable @typescript-eslint/ban-types */
-import type {ClassConstructor} from "../typings/class-constructor.js";
-import type {AutowiredOptions} from "./autowired-options.js";
-
-export interface OverrideOptions {
-    to: ClassConstructor<object>;
-    options?: AutowiredOptions;
-}

package/src/typings/class-constructor.ts

@@ -1,7 +0,0 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
-/* eslint-disable @typescript-eslint/no-type-alias */
-/* eslint-disable @typescript-eslint/ban-types */
-
-export type ClassConstructor<T extends object> = (new (...params: any) => T); // Use ConstructorParameters<T>, but how???
-
-export type OverrideConstructor<T extends object> = ClassConstructor<T> | (Function & {prototype: T});