@nmtjs/core 0.6.2 → 0.6.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/index.js +4 -4
- package/dist/index.js.map +1 -1
- package/dist/lib/container.js +6 -2
- package/dist/lib/container.js.map +1 -1
- package/dist/lib/logger.js.map +1 -1
- package/dist/lib/registry.js.map +1 -1
- package/index.ts +4 -4
- package/lib/container.ts +28 -17
- package/lib/logger.ts +1 -1
- package/lib/registry.ts +1 -1
- package/package.json +3 -4
- package/tsconfig.json +0 -3
package/dist/index.js
CHANGED
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
export * from "./lib/constants.js";
|
|
2
|
-
export * from "./lib/
|
|
2
|
+
export * from "./lib/container.js";
|
|
3
3
|
export * from "./lib/enums.js";
|
|
4
4
|
export * from "./lib/hooks.js";
|
|
5
|
+
export * from "./lib/injectables.js";
|
|
5
6
|
export * from "./lib/logger.js";
|
|
7
|
+
export * from "./lib/plugin.js";
|
|
6
8
|
export * from "./lib/registry.js";
|
|
7
|
-
export * from "./lib/container.js";
|
|
8
|
-
export * from "./lib/injectables.js";
|
|
9
9
|
export * from "./lib/types.js";
|
|
10
|
-
export * from "./lib/
|
|
10
|
+
export * from "./lib/types.js";
|
|
11
11
|
export * from "./lib/utils/index.js";
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../index.ts"],"sourcesContent":["export * from './lib/constants.ts'\nexport * from './lib/
|
|
1
|
+
{"version":3,"sources":["../../index.ts"],"sourcesContent":["export * from './lib/constants.ts'\nexport * from './lib/container.ts'\nexport * from './lib/enums.ts'\nexport * from './lib/hooks.ts'\nexport * from './lib/injectables.ts'\nexport * from './lib/logger.ts'\nexport * from './lib/plugin.ts'\nexport * from './lib/registry.ts'\nexport * from './lib/types.ts'\nexport * from './lib/types.ts'\nexport * from './lib/utils/index.ts'\n"],"names":[],"mappings":"AAAA,cAAc,qBAAoB;AAClC,cAAc,qBAAoB;AAClC,cAAc,iBAAgB;AAC9B,cAAc,iBAAgB;AAC9B,cAAc,uBAAsB;AACpC,cAAc,kBAAiB;AAC/B,cAAc,kBAAiB;AAC/B,cAAc,oBAAmB;AACjC,cAAc,iBAAgB;AAC9B,cAAc,iBAAgB;AAC9B,cAAc,uBAAsB"}
|
package/dist/lib/container.js
CHANGED
|
@@ -105,6 +105,7 @@ export class Container {
|
|
|
105
105
|
}
|
|
106
106
|
this.instances.set(injectable, {
|
|
107
107
|
instance,
|
|
108
|
+
picked: instance,
|
|
108
109
|
context: undefined
|
|
109
110
|
});
|
|
110
111
|
}
|
|
@@ -136,7 +137,7 @@ export class Container {
|
|
|
136
137
|
dependants.add(dependant);
|
|
137
138
|
}
|
|
138
139
|
if (this.instances.has(injectable)) {
|
|
139
|
-
return Promise.resolve(this.instances.get(injectable).
|
|
140
|
+
return Promise.resolve(this.instances.get(injectable).picked);
|
|
140
141
|
} else if (this.resolvers.has(injectable)) {
|
|
141
142
|
return this.resolvers.get(injectable);
|
|
142
143
|
} else {
|
|
@@ -152,12 +153,14 @@ export class Container {
|
|
|
152
153
|
instance,
|
|
153
154
|
context
|
|
154
155
|
}))).then(({ instance, context })=>{
|
|
156
|
+
const picked = injectable.pick(instance);
|
|
155
157
|
if (compareScope(this.scope, '>=', scope)) this.instances.set(injectable, {
|
|
156
158
|
instance,
|
|
159
|
+
picked,
|
|
157
160
|
context
|
|
158
161
|
});
|
|
159
162
|
if (scope !== Scope.Transient) this.resolvers.delete(injectable);
|
|
160
|
-
return
|
|
163
|
+
return picked;
|
|
161
164
|
});
|
|
162
165
|
if (scope !== Scope.Transient) this.resolvers.set(injectable, resolution);
|
|
163
166
|
return resolution;
|
|
@@ -263,6 +266,7 @@ export function createFactoryInjectable(paramsOrFactory, label) {
|
|
|
263
266
|
scope: params.scope ?? Scope.Global,
|
|
264
267
|
factory: params.factory,
|
|
265
268
|
dispose: params.dispose,
|
|
269
|
+
pick: params.pick ?? ((instance)=>instance),
|
|
266
270
|
label,
|
|
267
271
|
stack: tryCaptureStackTrace(),
|
|
268
272
|
[kInjectable]: true,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../lib/container.ts"],"sourcesContent":["import type { Async } from '@nmtjs/common'\nimport { tryCaptureStackTrace } from '@nmtjs/common'\nimport {\n kFactoryInjectable,\n kInjectable,\n kLazyInjectable,\n kOptionalDependency,\n kValueInjectable,\n} from './constants.ts'\nimport { Scope } from './enums.ts'\nimport type { Logger } from './logger.ts'\nimport type { Registry } from './registry.ts'\n\nconst ScopeStrictness = {\n [Scope.Global]: 0,\n [Scope.Connection]: 1,\n [Scope.Call]: 2,\n [Scope.Transient]: 3,\n}\n\nexport type DependencyOptional<T extends AnyInjectable = AnyInjectable> = {\n [kOptionalDependency]: any\n injectable: T\n}\n\nexport type Depedency = DependencyOptional | AnyInjectable\n\nexport type Dependencies = Record<string, Depedency>\n\nexport type ResolveInjectableType<T extends AnyInjectable> =\n T extends Injectable<infer Type, any, any> ? Type : never\n\nexport interface Dependant<Deps extends Dependencies = Dependencies> {\n dependencies: Deps\n label?: string\n stack?: string\n}\n\nexport type DependencyInjectable<T extends Depedency> = T extends AnyInjectable\n ? T\n : T extends DependencyOptional\n ? T['injectable']\n : never\n\nexport type DependencyContext<Deps extends Dependencies> = {\n readonly [K in keyof Deps as Deps[K] extends AnyInjectable\n ? K\n : never]: Deps[K] extends AnyInjectable\n ? ResolveInjectableType<Deps[K]>\n : never\n} & {\n readonly [K in keyof Deps as Deps[K] extends DependencyOptional\n ? K\n : never]?: Deps[K] extends DependencyOptional\n ? ResolveInjectableType<Deps[K]['injectable']>\n : never\n}\n\nexport type InjectableFactoryType<\n InjectableType,\n InjectableDeps extends Dependencies,\n> = (context: DependencyContext<InjectableDeps>) => Async<InjectableType>\n\nexport type InjectableDisposeType<\n InjectableType,\n InjectableDeps extends Dependencies,\n> = (\n instance: InjectableType,\n context: DependencyContext<InjectableDeps>,\n) => any\n\nexport interface LazyInjectable<T, S extends Scope = Scope.Global>\n extends Dependant<{}> {\n scope: S\n [kInjectable]: any\n [kLazyInjectable]: T\n}\n\nexport interface ValueInjectable<T> extends Dependant<{}> {\n scope: Scope.Global\n value: T\n [kInjectable]: any\n [kValueInjectable]: any\n}\n\nexport interface FactoryInjectable<\n T,\n D extends Dependencies = {},\n S extends Scope = Scope.Global,\n> extends Dependant<D> {\n scope: S\n factory(context: DependencyContext<D>): Async<T>\n dispose?(instance: T, context: DependencyContext<D>): any\n [kInjectable]: any\n [kFactoryInjectable]: any\n}\n\nexport type Injectable<\n InjectableValue = any,\n InjectableDeps extends Dependencies = {},\n InjectableScope extends Scope = Scope,\n> =\n | LazyInjectable<InjectableValue, InjectableScope>\n | ValueInjectable<InjectableValue>\n | FactoryInjectable<InjectableValue, InjectableDeps, InjectableScope>\n\nexport type AnyInjectable<T = any, S extends Scope = Scope> = Injectable<\n T,\n any,\n S\n>\n\nexport class Container {\n readonly instances = new Map<AnyInjectable, { instance: any; context: any }>()\n private readonly resolvers = new Map<AnyInjectable, Promise<any>>()\n private readonly injectables = new Set<AnyInjectable>()\n private readonly dependants = new Map<AnyInjectable, Set<AnyInjectable>>()\n\n constructor(\n private readonly application: {\n registry: Registry\n logger: Logger\n },\n public readonly scope: Exclude<Scope, Scope.Transient> = Scope.Global,\n private readonly parent?: Container,\n ) {\n if ((scope as any) === Scope.Transient) {\n throw new Error('Invalid scope')\n }\n }\n\n async load() {\n const traverse = (dependencies: Dependencies) => {\n for (const key in dependencies) {\n const dependency = dependencies[key]\n const injectable = getDepedencencyInjectable(dependency)\n this.injectables.add(injectable)\n traverse(injectable.dependencies)\n }\n }\n\n for (const dependant of this.application.registry.getDependants()) {\n traverse(dependant.dependencies)\n }\n\n const injectables = Array.from(this.findCurrentScopeInjectables())\n await Promise.all(injectables.map((injectable) => this.resolve(injectable)))\n }\n\n fork(scope: Exclude<Scope, Scope.Transient>) {\n return new Container(this.application, scope, this)\n }\n\n async dispose() {\n this.application.logger.trace('Disposing [%s] scope context...', this.scope)\n\n // Loop through all instances and dispose them,\n // until there are no more instances left\n while (this.instances.size) {\n for (const injectable of this.instances.keys()) {\n const dependants = this.dependants.get(injectable)\n // Firstly, dispose instances that other injectables don't depend on\n if (!dependants?.size) {\n await this.disposeInjectable(injectable)\n for (const dependants of this.dependants.values()) {\n // Clear current istances as a dependant for other injectables\n if (dependants.has(injectable)) {\n dependants.delete(injectable)\n }\n }\n }\n }\n }\n\n this.instances.clear()\n this.injectables.clear()\n this.resolvers.clear()\n this.dependants.clear()\n }\n\n containsWithinSelf(injectable: AnyInjectable) {\n return this.instances.has(injectable) || this.resolvers.has(injectable)\n }\n\n contains(injectable: AnyInjectable): boolean {\n return (\n this.containsWithinSelf(injectable) ||\n (this.parent?.contains(injectable) ?? false)\n )\n }\n\n get<T extends AnyInjectable>(injectable: T): ResolveInjectableType<T> {\n if (this.instances.has(injectable)) {\n return this.instances.get(injectable)!.instance\n }\n\n if (this.parent?.contains(injectable)) {\n return this.parent.get(injectable)\n }\n\n throw new Error('No instance found')\n }\n\n resolve<T extends AnyInjectable>(injectable: T) {\n return this.resolveInjectable(injectable)\n }\n\n async createContext<T extends Dependencies>(dependencies: T) {\n return this.createInjectableContext(dependencies)\n }\n\n private async createInjectableContext<T extends Dependencies>(\n dependencies: T,\n dependant?: AnyInjectable,\n ) {\n const injections: Record<string, any> = {}\n const deps = Object.entries(dependencies)\n const resolvers: Promise<any>[] = Array(deps.length)\n for (let i = 0; i < deps.length; i++) {\n const [key, dependency] = deps[i]\n const injectable = getDepedencencyInjectable(dependency)\n const resolver = this.resolveInjectable(injectable, dependant)\n resolvers[i] = resolver.then((value) => (injections[key] = value))\n }\n await Promise.all(resolvers)\n return Object.freeze(injections) as DependencyContext<T>\n }\n\n async provide<T extends AnyInjectable>(\n injectable: T,\n instance: ResolveInjectableType<T>,\n ) {\n if (compareScope(injectable.scope, '>', this.scope)) {\n throw new Error('Invalid scope') // TODO: more informative error\n }\n this.instances.set(injectable, { instance, context: undefined })\n }\n\n satisfies(injectable: AnyInjectable) {\n return compareScope(injectable.scope, '<=', this.scope)\n }\n\n private *findCurrentScopeInjectables() {\n for (const injectable of this.injectables) {\n if (injectable.scope === this.scope) {\n yield injectable\n }\n }\n }\n\n private resolveInjectable<T extends AnyInjectable>(\n injectable: T,\n dependant?: AnyInjectable,\n ): Promise<ResolveInjectableType<T>> {\n if (dependant && compareScope(dependant.scope, '<', injectable.scope)) {\n throw new Error('Invalid scope: dependant is looser than injectable') // TODO: more informative error\n }\n\n if (checkIsValueInjectable(injectable)) {\n return Promise.resolve(injectable.value)\n } else if (\n this.parent?.contains(injectable) ||\n (this.parent?.satisfies(injectable) &&\n compareScope(this.parent.scope, '<', this.scope))\n ) {\n return this.parent.resolveInjectable(injectable, dependant)\n } else {\n const { scope, dependencies, stack, label } = injectable\n\n if (dependant && compareScope(scope, '=', dependant.scope)) {\n let dependants = this.dependants.get(injectable)\n if (!dependants) {\n this.dependants.set(injectable, (dependants = new Set()))\n }\n dependants.add(dependant)\n }\n\n if (this.instances.has(injectable)) {\n return Promise.resolve(this.instances.get(injectable)!.instance)\n } else if (this.resolvers.has(injectable)) {\n return this.resolvers.get(injectable)!\n } else {\n const isLazy = checkIsLazyInjectable(injectable)\n\n if (isLazy) {\n const isOptional = checkIsOptional(injectable)\n if (isOptional) return Promise.resolve(undefined as any)\n return Promise.reject(\n new Error(\n `No instance provided for ${label || 'an'} injectable:\\n${stack}`,\n ),\n )\n } else if (!checkIsFactoryInjectable(injectable)) {\n throw new Error('Invalid injectable')\n }\n\n const resolution = this.createInjectableContext(\n dependencies,\n injectable,\n )\n .then((context) =>\n Promise.resolve(injectable.factory(context)).then((instance) => ({\n instance,\n context,\n })),\n )\n .then(({ instance, context }) => {\n if (compareScope(this.scope, '>=', scope))\n this.instances.set(injectable, { instance, context })\n if (scope !== Scope.Transient) this.resolvers.delete(injectable)\n return instance\n })\n if (scope !== Scope.Transient)\n this.resolvers.set(injectable, resolution)\n return resolution\n }\n }\n }\n\n private async disposeInjectable(injectable: AnyInjectable) {\n try {\n if (kFactoryInjectable in injectable) {\n const { dispose } = injectable\n if (dispose) {\n const { instance, context } = this.instances.get(injectable)!\n await dispose(instance, context)\n }\n }\n } catch (cause) {\n const error = new Error(\n 'Injectable disposal error. Potential memory leak',\n { cause },\n )\n this.application.logger.error(error)\n } finally {\n this.instances.delete(injectable)\n }\n }\n}\n\nfunction compareScope(\n left: Scope,\n operator: '>' | '<' | '>=' | '<=' | '=' | '!=',\n right: Scope,\n) {\n const leftScope = ScopeStrictness[left]\n const rightScope = ScopeStrictness[right]\n switch (operator) {\n case '=':\n return leftScope === rightScope\n case '!=':\n return leftScope !== rightScope\n case '>':\n return leftScope > rightScope\n case '<':\n return leftScope < rightScope\n case '>=':\n return leftScope >= rightScope\n case '<=':\n return leftScope <= rightScope\n default:\n throw new Error('Invalid operator')\n }\n}\n\nexport const checkIsLazyInjectable = (\n injectable: any,\n): injectable is LazyInjectable<any> => kLazyInjectable in injectable\nexport const checkIsFactoryInjectable = (\n injectable: any,\n): injectable is FactoryInjectable<any> => kFactoryInjectable in injectable\nexport const checkIsValueInjectable = (\n injectable: any,\n): injectable is ValueInjectable<any> => kValueInjectable in injectable\nexport const checkIsInjectable = (\n injectable: any,\n): injectable is AnyInjectable<any> => kInjectable in injectable\nexport const checkIsOptional = (\n injectable: any,\n): injectable is DependencyOptional<any> => kOptionalDependency in injectable\n\nexport function getInjectableScope(injectable: AnyInjectable) {\n let scope = injectable.scope\n const deps = Object.values(injectable.dependencies as Dependencies)\n for (const dependency of deps) {\n const injectable = getDepedencencyInjectable(dependency)\n const dependencyScope = getInjectableScope(injectable)\n if (compareScope(dependencyScope, '>', scope)) {\n scope = dependencyScope\n }\n }\n return scope\n}\n\nexport function getDepedencencyInjectable(\n dependency: Depedency,\n): AnyInjectable {\n if (kOptionalDependency in dependency) {\n return dependency.injectable\n }\n return dependency\n}\n\nexport function createOptionalInjectable<T extends AnyInjectable>(\n injectable: T,\n) {\n return {\n [kOptionalDependency]: true,\n injectable,\n } as DependencyOptional<T>\n}\n\nexport function createLazyInjectable<T, S extends Scope = Scope.Global>(\n scope = Scope.Global as S,\n label?: string,\n): LazyInjectable<T, S> {\n return Object.freeze({\n scope,\n dependencies: {},\n label,\n stack: tryCaptureStackTrace(),\n [kInjectable]: true,\n [kLazyInjectable]: true as unknown as T,\n })\n}\n\nexport function createValueInjectable<T>(\n value: T,\n label?: string,\n): ValueInjectable<T> {\n return Object.freeze({\n value,\n scope: Scope.Global,\n dependencies: {},\n label,\n stack: tryCaptureStackTrace(),\n [kInjectable]: true,\n [kValueInjectable]: true,\n })\n}\n\nexport function createFactoryInjectable<\n T,\n D extends Dependencies = {},\n S extends Scope = Scope.Global,\n>(\n paramsOrFactory:\n | {\n dependencies?: D\n scope?: S\n factory: InjectableFactoryType<T, D>\n dispose?: InjectableDisposeType<T, D>\n }\n | InjectableFactoryType<T, D>,\n label?: string,\n): FactoryInjectable<T, D, S> {\n const isFactory = typeof paramsOrFactory === 'function'\n const params = isFactory\n ? {\n factory: paramsOrFactory,\n }\n : paramsOrFactory\n const injectable = {\n dependencies: (params.dependencies ?? {}) as D,\n scope: (params.scope ?? Scope.Global) as S,\n factory: params.factory,\n dispose: params.dispose,\n label,\n stack: tryCaptureStackTrace(),\n [kInjectable]: true,\n [kFactoryInjectable]: true,\n }\n const actualScope = getInjectableScope(injectable)\n if (\n !isFactory &&\n params.scope &&\n ScopeStrictness[actualScope] > ScopeStrictness[params.scope]\n )\n throw new Error(\n `Invalid scope ${params.scope} for factory injectable: dependencies have stricter scope - ${actualScope}`,\n )\n injectable.scope = actualScope as unknown as S\n return Object.freeze(injectable)\n}\n"],"names":["tryCaptureStackTrace","kFactoryInjectable","kInjectable","kLazyInjectable","kOptionalDependency","kValueInjectable","Scope","ScopeStrictness","Global","Connection","Call","Transient","Container","instances","resolvers","injectables","dependants","constructor","application","scope","parent","Map","Set","Error","load","traverse","dependencies","key","dependency","injectable","getDepedencencyInjectable","add","dependant","registry","getDependants","Array","from","findCurrentScopeInjectables","Promise","all","map","resolve","fork","dispose","logger","trace","size","keys","get","disposeInjectable","values","has","delete","clear","containsWithinSelf","contains","instance","resolveInjectable","createContext","createInjectableContext","injections","deps","Object","entries","length","i","resolver","then","value","freeze","provide","compareScope","set","context","undefined","satisfies","checkIsValueInjectable","stack","label","isLazy","checkIsLazyInjectable","isOptional","checkIsOptional","reject","checkIsFactoryInjectable","resolution","factory","cause","error","left","operator","right","leftScope","rightScope","checkIsInjectable","getInjectableScope","dependencyScope","createOptionalInjectable","createLazyInjectable","createValueInjectable","createFactoryInjectable","paramsOrFactory","isFactory","params","actualScope"],"mappings":"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"}
|
|
1
|
+
{"version":3,"sources":["../../../lib/container.ts"],"sourcesContent":["import type { Async } from '@nmtjs/common'\nimport { tryCaptureStackTrace } from '@nmtjs/common'\nimport {\n kFactoryInjectable,\n kInjectable,\n kLazyInjectable,\n kOptionalDependency,\n kValueInjectable,\n} from './constants.ts'\nimport { Scope } from './enums.ts'\nimport type { Logger } from './logger.ts'\nimport type { Registry } from './registry.ts'\n\nconst ScopeStrictness = {\n [Scope.Global]: 0,\n [Scope.Connection]: 1,\n [Scope.Call]: 2,\n [Scope.Transient]: 3,\n}\n\nexport type DependencyOptional<T extends AnyInjectable = AnyInjectable> = {\n [kOptionalDependency]: any\n injectable: T\n}\n\nexport type Depedency = DependencyOptional | AnyInjectable\n\nexport type Dependencies = Record<string, Depedency>\n\nexport type ResolveInjectableType<T extends AnyInjectable> =\n T extends Injectable<infer Type, any, any> ? Type : never\n\nexport interface Dependant<Deps extends Dependencies = Dependencies> {\n dependencies: Deps\n label?: string\n stack?: string\n}\n\nexport type DependencyInjectable<T extends Depedency> = T extends AnyInjectable\n ? T\n : T extends DependencyOptional\n ? T['injectable']\n : never\n\nexport type DependencyContext<Deps extends Dependencies> = {\n readonly [K in keyof Deps as Deps[K] extends AnyInjectable\n ? K\n : never]: Deps[K] extends AnyInjectable\n ? ResolveInjectableType<Deps[K]>\n : never\n} & {\n readonly [K in keyof Deps as Deps[K] extends DependencyOptional\n ? K\n : never]?: Deps[K] extends DependencyOptional\n ? ResolveInjectableType<Deps[K]['injectable']>\n : never\n}\n\nexport type InjectableFactoryType<\n InjectableType,\n InjectableDeps extends Dependencies,\n> = (context: DependencyContext<InjectableDeps>) => Async<InjectableType>\n\nexport type InjectablePickType<Input, Output> = (injectable: Input) => Output\n\nexport type InjectableDisposeType<\n InjectableType,\n InjectableDeps extends Dependencies,\n> = (\n instance: InjectableType,\n context: DependencyContext<InjectableDeps>,\n) => any\n\nexport interface LazyInjectable<T, S extends Scope = Scope.Global>\n extends Dependant<{}> {\n scope: S\n [kInjectable]: any\n [kLazyInjectable]: T\n}\n\nexport interface ValueInjectable<T> extends Dependant<{}> {\n scope: Scope.Global\n value: T\n [kInjectable]: any\n [kValueInjectable]: any\n}\n\nexport interface FactoryInjectable<\n T,\n D extends Dependencies = {},\n S extends Scope = Scope.Global,\n P = T,\n> extends Dependant<D> {\n scope: S\n factory: InjectableFactoryType<P, D>\n pick: InjectablePickType<P, T>\n dispose?: InjectableDisposeType<P, D>\n [kInjectable]: any\n [kFactoryInjectable]: any\n}\n\nexport type Injectable<\n InjectableValue = any,\n InjectableDeps extends Dependencies = {},\n InjectableScope extends Scope = Scope,\n> =\n | LazyInjectable<InjectableValue, InjectableScope>\n | ValueInjectable<InjectableValue>\n | FactoryInjectable<InjectableValue, InjectableDeps, InjectableScope>\n\nexport type AnyInjectable<T = any, S extends Scope = Scope> = Injectable<\n T,\n any,\n S\n>\n\nexport class Container {\n readonly instances = new Map<\n AnyInjectable,\n { instance: any; picked: any; context: any }\n >()\n private readonly resolvers = new Map<AnyInjectable, Promise<any>>()\n private readonly injectables = new Set<AnyInjectable>()\n private readonly dependants = new Map<AnyInjectable, Set<AnyInjectable>>()\n\n constructor(\n private readonly application: {\n registry: Registry\n logger: Logger\n },\n public readonly scope: Exclude<Scope, Scope.Transient> = Scope.Global,\n private readonly parent?: Container,\n ) {\n if ((scope as any) === Scope.Transient) {\n throw new Error('Invalid scope')\n }\n }\n\n async load() {\n const traverse = (dependencies: Dependencies) => {\n for (const key in dependencies) {\n const dependency = dependencies[key]\n const injectable = getDepedencencyInjectable(dependency)\n this.injectables.add(injectable)\n traverse(injectable.dependencies)\n }\n }\n\n for (const dependant of this.application.registry.getDependants()) {\n traverse(dependant.dependencies)\n }\n\n const injectables = Array.from(this.findCurrentScopeInjectables())\n await Promise.all(injectables.map((injectable) => this.resolve(injectable)))\n }\n\n fork(scope: Exclude<Scope, Scope.Transient>) {\n return new Container(this.application, scope, this)\n }\n\n async dispose() {\n this.application.logger.trace('Disposing [%s] scope context...', this.scope)\n\n // Loop through all instances and dispose them,\n // until there are no more instances left\n while (this.instances.size) {\n for (const injectable of this.instances.keys()) {\n const dependants = this.dependants.get(injectable)\n // Firstly, dispose instances that other injectables don't depend on\n if (!dependants?.size) {\n await this.disposeInjectable(injectable)\n for (const dependants of this.dependants.values()) {\n // Clear current istances as a dependant for other injectables\n if (dependants.has(injectable)) {\n dependants.delete(injectable)\n }\n }\n }\n }\n }\n\n this.instances.clear()\n this.injectables.clear()\n this.resolvers.clear()\n this.dependants.clear()\n }\n\n containsWithinSelf(injectable: AnyInjectable) {\n return this.instances.has(injectable) || this.resolvers.has(injectable)\n }\n\n contains(injectable: AnyInjectable): boolean {\n return (\n this.containsWithinSelf(injectable) ||\n (this.parent?.contains(injectable) ?? false)\n )\n }\n\n get<T extends AnyInjectable>(injectable: T): ResolveInjectableType<T> {\n if (this.instances.has(injectable)) {\n return this.instances.get(injectable)!.instance\n }\n\n if (this.parent?.contains(injectable)) {\n return this.parent.get(injectable)\n }\n\n throw new Error('No instance found')\n }\n\n resolve<T extends AnyInjectable>(injectable: T) {\n return this.resolveInjectable(injectable)\n }\n\n async createContext<T extends Dependencies>(dependencies: T) {\n return this.createInjectableContext(dependencies)\n }\n\n private async createInjectableContext<T extends Dependencies>(\n dependencies: T,\n dependant?: AnyInjectable,\n ) {\n const injections: Record<string, any> = {}\n const deps = Object.entries(dependencies)\n const resolvers: Promise<any>[] = Array(deps.length)\n for (let i = 0; i < deps.length; i++) {\n const [key, dependency] = deps[i]\n const injectable = getDepedencencyInjectable(dependency)\n const resolver = this.resolveInjectable(injectable, dependant)\n resolvers[i] = resolver.then((value) => (injections[key] = value))\n }\n await Promise.all(resolvers)\n return Object.freeze(injections) as DependencyContext<T>\n }\n\n async provide<T extends AnyInjectable>(\n injectable: T,\n instance: ResolveInjectableType<T>,\n ) {\n if (compareScope(injectable.scope, '>', this.scope)) {\n throw new Error('Invalid scope') // TODO: more informative error\n }\n this.instances.set(injectable, {\n instance,\n picked: instance,\n context: undefined,\n })\n }\n\n satisfies(injectable: AnyInjectable) {\n return compareScope(injectable.scope, '<=', this.scope)\n }\n\n private *findCurrentScopeInjectables() {\n for (const injectable of this.injectables) {\n if (injectable.scope === this.scope) {\n yield injectable\n }\n }\n }\n\n private resolveInjectable<T extends AnyInjectable>(\n injectable: T,\n dependant?: AnyInjectable,\n ): Promise<ResolveInjectableType<T>> {\n if (dependant && compareScope(dependant.scope, '<', injectable.scope)) {\n throw new Error('Invalid scope: dependant is looser than injectable') // TODO: more informative error\n }\n\n if (checkIsValueInjectable(injectable)) {\n return Promise.resolve(injectable.value)\n } else if (\n this.parent?.contains(injectable) ||\n (this.parent?.satisfies(injectable) &&\n compareScope(this.parent.scope, '<', this.scope))\n ) {\n return this.parent.resolveInjectable(injectable, dependant)\n } else {\n const { scope, dependencies, stack, label } = injectable\n\n if (dependant && compareScope(scope, '=', dependant.scope)) {\n let dependants = this.dependants.get(injectable)\n if (!dependants) {\n this.dependants.set(injectable, (dependants = new Set()))\n }\n dependants.add(dependant)\n }\n\n if (this.instances.has(injectable)) {\n return Promise.resolve(this.instances.get(injectable)!.picked)\n } else if (this.resolvers.has(injectable)) {\n return this.resolvers.get(injectable)!\n } else {\n const isLazy = checkIsLazyInjectable(injectable)\n\n if (isLazy) {\n const isOptional = checkIsOptional(injectable)\n if (isOptional) return Promise.resolve(undefined as any)\n return Promise.reject(\n new Error(\n `No instance provided for ${label || 'an'} injectable:\\n${stack}`,\n ),\n )\n } else if (!checkIsFactoryInjectable(injectable)) {\n throw new Error('Invalid injectable')\n }\n\n const resolution = this.createInjectableContext(\n dependencies,\n injectable,\n )\n .then((context) =>\n Promise.resolve(injectable.factory(context)).then((instance) => ({\n instance,\n context,\n })),\n )\n .then(({ instance, context }) => {\n const picked = injectable.pick(instance)\n if (compareScope(this.scope, '>=', scope))\n this.instances.set(injectable, { instance, picked, context })\n if (scope !== Scope.Transient) this.resolvers.delete(injectable)\n return picked\n })\n if (scope !== Scope.Transient)\n this.resolvers.set(injectable, resolution)\n return resolution\n }\n }\n }\n\n private async disposeInjectable(injectable: AnyInjectable) {\n try {\n if (kFactoryInjectable in injectable) {\n const { dispose } = injectable\n if (dispose) {\n const { instance, context } = this.instances.get(injectable)!\n await dispose(instance, context)\n }\n }\n } catch (cause) {\n const error = new Error(\n 'Injectable disposal error. Potential memory leak',\n { cause },\n )\n this.application.logger.error(error)\n } finally {\n this.instances.delete(injectable)\n }\n }\n}\n\nfunction compareScope(\n left: Scope,\n operator: '>' | '<' | '>=' | '<=' | '=' | '!=',\n right: Scope,\n) {\n const leftScope = ScopeStrictness[left]\n const rightScope = ScopeStrictness[right]\n switch (operator) {\n case '=':\n return leftScope === rightScope\n case '!=':\n return leftScope !== rightScope\n case '>':\n return leftScope > rightScope\n case '<':\n return leftScope < rightScope\n case '>=':\n return leftScope >= rightScope\n case '<=':\n return leftScope <= rightScope\n default:\n throw new Error('Invalid operator')\n }\n}\n\nexport const checkIsLazyInjectable = (\n injectable: any,\n): injectable is LazyInjectable<any> => kLazyInjectable in injectable\nexport const checkIsFactoryInjectable = (\n injectable: any,\n): injectable is FactoryInjectable<any> => kFactoryInjectable in injectable\nexport const checkIsValueInjectable = (\n injectable: any,\n): injectable is ValueInjectable<any> => kValueInjectable in injectable\nexport const checkIsInjectable = (\n injectable: any,\n): injectable is AnyInjectable<any> => kInjectable in injectable\nexport const checkIsOptional = (\n injectable: any,\n): injectable is DependencyOptional<any> => kOptionalDependency in injectable\n\nexport function getInjectableScope(injectable: AnyInjectable) {\n let scope = injectable.scope\n const deps = Object.values(injectable.dependencies as Dependencies)\n for (const dependency of deps) {\n const injectable = getDepedencencyInjectable(dependency)\n const dependencyScope = getInjectableScope(injectable)\n if (compareScope(dependencyScope, '>', scope)) {\n scope = dependencyScope\n }\n }\n return scope\n}\n\nexport function getDepedencencyInjectable(\n dependency: Depedency,\n): AnyInjectable {\n if (kOptionalDependency in dependency) {\n return dependency.injectable\n }\n return dependency\n}\n\nexport function createOptionalInjectable<T extends AnyInjectable>(\n injectable: T,\n) {\n return {\n [kOptionalDependency]: true,\n injectable,\n } as DependencyOptional<T>\n}\n\nexport function createLazyInjectable<T, S extends Scope = Scope.Global>(\n scope = Scope.Global as S,\n label?: string,\n): LazyInjectable<T, S> {\n return Object.freeze({\n scope,\n dependencies: {},\n label,\n stack: tryCaptureStackTrace(),\n [kInjectable]: true,\n [kLazyInjectable]: true as unknown as T,\n })\n}\n\nexport function createValueInjectable<T>(\n value: T,\n label?: string,\n): ValueInjectable<T> {\n return Object.freeze({\n value,\n scope: Scope.Global,\n dependencies: {},\n label,\n stack: tryCaptureStackTrace(),\n [kInjectable]: true,\n [kValueInjectable]: true,\n })\n}\n\nexport function createFactoryInjectable<\n T,\n D extends Dependencies = {},\n S extends Scope = Scope.Global,\n P = T,\n>(\n paramsOrFactory:\n | {\n dependencies?: D\n scope?: S\n pick?: InjectablePickType<P, T>\n factory: InjectableFactoryType<P, D>\n dispose?: InjectableDisposeType<P, D>\n }\n | InjectableFactoryType<P, D>,\n label?: string,\n): FactoryInjectable<null extends T ? P : T, D, S, P> {\n const isFactory = typeof paramsOrFactory === 'function'\n const params = isFactory ? { factory: paramsOrFactory } : paramsOrFactory\n const injectable = {\n dependencies: (params.dependencies ?? {}) as D,\n scope: (params.scope ?? Scope.Global) as S,\n factory: params.factory,\n dispose: params.dispose,\n pick: params.pick ?? ((instance: P) => instance as unknown as T),\n label,\n stack: tryCaptureStackTrace(),\n [kInjectable]: true,\n [kFactoryInjectable]: true,\n }\n const actualScope = getInjectableScope(injectable)\n if (\n !isFactory &&\n params.scope &&\n ScopeStrictness[actualScope] > ScopeStrictness[params.scope]\n )\n throw new Error(\n `Invalid scope ${params.scope} for factory injectable: dependencies have stricter scope - ${actualScope}`,\n )\n injectable.scope = actualScope as unknown as S\n return Object.freeze(injectable) as any\n}\n"],"names":["tryCaptureStackTrace","kFactoryInjectable","kInjectable","kLazyInjectable","kOptionalDependency","kValueInjectable","Scope","ScopeStrictness","Global","Connection","Call","Transient","Container","instances","resolvers","injectables","dependants","constructor","application","scope","parent","Map","Set","Error","load","traverse","dependencies","key","dependency","injectable","getDepedencencyInjectable","add","dependant","registry","getDependants","Array","from","findCurrentScopeInjectables","Promise","all","map","resolve","fork","dispose","logger","trace","size","keys","get","disposeInjectable","values","has","delete","clear","containsWithinSelf","contains","instance","resolveInjectable","createContext","createInjectableContext","injections","deps","Object","entries","length","i","resolver","then","value","freeze","provide","compareScope","set","picked","context","undefined","satisfies","checkIsValueInjectable","stack","label","isLazy","checkIsLazyInjectable","isOptional","checkIsOptional","reject","checkIsFactoryInjectable","resolution","factory","pick","cause","error","left","operator","right","leftScope","rightScope","checkIsInjectable","getInjectableScope","dependencyScope","createOptionalInjectable","createLazyInjectable","createValueInjectable","createFactoryInjectable","paramsOrFactory","isFactory","params","actualScope"],"mappings":"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"}
|
package/dist/lib/logger.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../lib/logger.ts"],"sourcesContent":["import { threadId } from 'node:worker_threads'\nimport {\n type DestinationStream,\n type Level,\n type Logger as PinoLogger,\n type StreamEntry,\n
|
|
1
|
+
{"version":3,"sources":["../../../lib/logger.ts"],"sourcesContent":["import { threadId } from 'node:worker_threads'\nimport {\n type DestinationStream,\n type Level,\n type Logger as PinoLogger,\n pino,\n type StreamEntry,\n stdTimeFunctions,\n} from 'pino'\nimport { build as pretty } from 'pino-pretty'\n\nexport type Logger = PinoLogger\nexport type LoggingOptions = {\n destinations?: Array<DestinationStream | StreamEntry<Level>>\n pinoOptions?: any\n}\n\n// TODO: use node:util inspect\nconst bg = (value, color) => `\\x1b[${color}m${value}\\x1b[0m`\nconst fg = (value, color) => `\\x1b[38;5;${color}m${value}\\x1b[0m`\n\nconst levelColors = {\n 10: 100,\n 20: 102,\n 30: 106,\n 40: 104,\n 50: 101,\n 60: 105,\n [Number.POSITIVE_INFINITY]: 0,\n}\nconst messageColors = {\n 10: 0,\n 20: 2,\n 30: 6,\n 40: 4,\n 50: 1,\n 60: 5,\n [Number.POSITIVE_INFINITY]: 0,\n}\n\nconst levelLabels = {\n 10: ' TRACE ',\n 20: ' DEBUG ',\n 30: ' INFO ',\n 40: ' WARN ',\n 50: ' ERROR ',\n 60: ' FATAL ',\n [Number.POSITIVE_INFINITY]: 'SILENT',\n}\n\nexport const createLogger = (options: LoggingOptions = {}, $group: string) => {\n let { destinations, pinoOptions } = options\n\n if (!destinations || !destinations?.length) {\n destinations = [createConsolePrettyDestination('info')]\n }\n\n const lowestLevelValue = destinations!.reduce(\n (acc, destination) =>\n Math.min(\n acc,\n 'stream' in destination\n ? pino.levels.values[destination.level!]\n : Number.POSITIVE_INFINITY,\n ),\n Number.POSITIVE_INFINITY,\n )\n const level = pino.levels.labels[lowestLevelValue]\n return pino(\n {\n timestamp: stdTimeFunctions.isoTime,\n ...pinoOptions,\n level,\n },\n pino.multistream(destinations!),\n ).child({ $group, $threadId: threadId })\n}\n\nexport const createConsolePrettyDestination = (\n level: Level,\n sync = true,\n): StreamEntry => ({\n level,\n stream: pretty({\n colorize: true,\n ignore: 'hostname,$group,$threadId',\n errorLikeObjectKeys: ['err', 'error', 'cause'],\n messageFormat: (log, messageKey) => {\n const group = fg(`[${log.$group}]`, 11)\n const msg = fg(log[messageKey], messageColors[log.level as number])\n const thread = fg(`(Thread-${log.$threadId})`, 89)\n return `\\x1b[0m${thread} ${group} ${msg}`\n },\n customPrettifiers: {\n level: (level: any) => bg(levelLabels[level], levelColors[level]),\n },\n sync,\n }),\n})\n"],"names":["threadId","pino","stdTimeFunctions","build","pretty","bg","value","color","fg","levelColors","Number","POSITIVE_INFINITY","messageColors","levelLabels","createLogger","options","$group","destinations","pinoOptions","length","createConsolePrettyDestination","lowestLevelValue","reduce","acc","destination","Math","min","levels","values","level","labels","timestamp","isoTime","multistream","child","$threadId","sync","stream","colorize","ignore","errorLikeObjectKeys","messageFormat","log","messageKey","group","msg","thread","customPrettifiers"],"mappings":"AAAA,SAASA,QAAQ,QAAQ,sBAAqB;AAC9C,SAIEC,IAAI,EAEJC,gBAAgB,QACX,OAAM;AACb,SAASC,SAASC,MAAM,QAAQ,cAAa;AAS7C,MAAMC,KAAK,CAACC,OAAOC,QAAU,CAAC,KAAK,EAAEA,MAAM,CAAC,EAAED,MAAM,OAAO,CAAC;AAC5D,MAAME,KAAK,CAACF,OAAOC,QAAU,CAAC,UAAU,EAAEA,MAAM,CAAC,EAAED,MAAM,OAAO,CAAC;AAEjE,MAAMG,cAAc;IAClB,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,CAACC,OAAOC,iBAAiB,CAAC,EAAE;AAC9B;AACA,MAAMC,gBAAgB;IACpB,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,CAACF,OAAOC,iBAAiB,CAAC,EAAE;AAC9B;AAEA,MAAME,cAAc;IAClB,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,CAACH,OAAOC,iBAAiB,CAAC,EAAE;AAC9B;AAEA,OAAO,MAAMG,eAAe,CAACC,UAA0B,CAAC,CAAC,EAAEC;IACzD,IAAI,EAAEC,YAAY,EAAEC,WAAW,EAAE,GAAGH;IAEpC,IAAI,CAACE,gBAAgB,CAACA,cAAcE,QAAQ;QAC1CF,eAAe;YAACG,+BAA+B;SAAQ;IACzD;IAEA,MAAMC,mBAAmBJ,aAAcK,MAAM,CAC3C,CAACC,KAAKC,cACJC,KAAKC,GAAG,CACNH,KACA,YAAYC,cACRvB,KAAK0B,MAAM,CAACC,MAAM,CAACJ,YAAYK,KAAK,CAAE,GACtCnB,OAAOC,iBAAiB,GAEhCD,OAAOC,iBAAiB;IAE1B,MAAMkB,QAAQ5B,KAAK0B,MAAM,CAACG,MAAM,CAACT,iBAAiB;IAClD,OAAOpB,KACL;QACE8B,WAAW7B,iBAAiB8B,OAAO;QACnC,GAAGd,WAAW;QACdW;IACF,GACA5B,KAAKgC,WAAW,CAAChB,eACjBiB,KAAK,CAAC;QAAElB;QAAQmB,WAAWnC;IAAS;AACxC,EAAC;AAED,OAAO,MAAMoB,iCAAiC,CAC5CS,OACAO,OAAO,IAAI,GACM,CAAA;QACjBP;QACAQ,QAAQjC,OAAO;YACbkC,UAAU;YACVC,QAAQ;YACRC,qBAAqB;gBAAC;gBAAO;gBAAS;aAAQ;YAC9CC,eAAe,CAACC,KAAKC;gBACnB,MAAMC,QAAQpC,GAAG,CAAC,CAAC,EAAEkC,IAAI1B,MAAM,CAAC,CAAC,CAAC,EAAE;gBACpC,MAAM6B,MAAMrC,GAAGkC,GAAG,CAACC,WAAW,EAAE/B,aAAa,CAAC8B,IAAIb,KAAK,CAAW;gBAClE,MAAMiB,SAAStC,GAAG,CAAC,QAAQ,EAAEkC,IAAIP,SAAS,CAAC,CAAC,CAAC,EAAE;gBAC/C,OAAO,CAAC,OAAO,EAAEW,OAAO,CAAC,EAAEF,MAAM,CAAC,EAAEC,IAAI,CAAC;YAC3C;YACAE,mBAAmB;gBACjBlB,OAAO,CAACA,QAAexB,GAAGQ,WAAW,CAACgB,MAAM,EAAEpB,WAAW,CAACoB,MAAM;YAClE;YACAO;QACF;IACF,CAAA,EAAE"}
|
package/dist/lib/registry.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../lib/registry.ts"],"sourcesContent":["import {\n type AnyInjectable,\n type Dependant,\n getInjectableScope,\n} from './container.ts'\nimport { type Hook, Scope } from './enums.ts'\nimport { type HookType
|
|
1
|
+
{"version":3,"sources":["../../../lib/registry.ts"],"sourcesContent":["import {\n type AnyInjectable,\n type Dependant,\n getInjectableScope,\n} from './container.ts'\nimport { type Hook, Scope } from './enums.ts'\nimport { Hooks, type HookType } from './hooks.ts'\nimport type { Logger } from './logger.ts'\n\nexport class Registry {\n readonly hooks = new Hooks()\n\n constructor(\n protected readonly application: {\n logger: Logger\n },\n ) {}\n\n registerHooks<T extends Hooks>(hooks: T) {\n Hooks.merge(hooks, this.hooks)\n }\n\n registerHook<T extends Hook>(name: T, callback: HookType[T]) {\n this.hooks.add(name, callback)\n }\n\n *getDependants(): Generator<Dependant> {}\n\n clear() {\n this.hooks.clear()\n }\n}\n\nexport const scopeErrorMessage = (name, scope = Scope.Global) =>\n `${name} must be a ${scope} scope (including all nested dependencies)`\n\nexport function hasInvalidScopeDeps(\n injectables: AnyInjectable[],\n scope = Scope.Global,\n) {\n return injectables.some(\n (injectable) => getInjectableScope(injectable) !== scope,\n )\n}\n"],"names":["getInjectableScope","Scope","Hooks","Registry","hooks","constructor","application","registerHooks","merge","registerHook","name","callback","add","getDependants","clear","scopeErrorMessage","scope","Global","hasInvalidScopeDeps","injectables","some","injectable"],"mappings":"AAAA,SAGEA,kBAAkB,QACb,iBAAgB;AACvB,SAAoBC,KAAK,QAAQ,aAAY;AAC7C,SAASC,KAAK,QAAuB,aAAY;AAGjD,OAAO,MAAMC;;IACFC,MAAmB;IAE5BC,YACE,AAAmBC,WAElB,CACD;aAHmBA,cAAAA;aAHZF,QAAQ,IAAIF;IAMlB;IAEHK,cAA+BH,KAAQ,EAAE;QACvCF,MAAMM,KAAK,CAACJ,OAAO,IAAI,CAACA,KAAK;IAC/B;IAEAK,aAA6BC,IAAO,EAAEC,QAAqB,EAAE;QAC3D,IAAI,CAACP,KAAK,CAACQ,GAAG,CAACF,MAAMC;IACvB;IAEA,CAACE,gBAAsC,CAAC;IAExCC,QAAQ;QACN,IAAI,CAACV,KAAK,CAACU,KAAK;IAClB;AACF;AAEA,OAAO,MAAMC,oBAAoB,CAACL,MAAMM,QAAQf,MAAMgB,MAAM,GAC1D,CAAC,EAAEP,KAAK,WAAW,EAAEM,MAAM,0CAA0C,CAAC,CAAA;AAExE,OAAO,SAASE,oBACdC,WAA4B,EAC5BH,QAAQf,MAAMgB,MAAM;IAEpB,OAAOE,YAAYC,IAAI,CACrB,CAACC,aAAerB,mBAAmBqB,gBAAgBL;AAEvD"}
|
package/index.ts
CHANGED
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
export * from './lib/constants.ts'
|
|
2
|
-
export * from './lib/
|
|
2
|
+
export * from './lib/container.ts'
|
|
3
3
|
export * from './lib/enums.ts'
|
|
4
4
|
export * from './lib/hooks.ts'
|
|
5
|
+
export * from './lib/injectables.ts'
|
|
5
6
|
export * from './lib/logger.ts'
|
|
7
|
+
export * from './lib/plugin.ts'
|
|
6
8
|
export * from './lib/registry.ts'
|
|
7
|
-
export * from './lib/container.ts'
|
|
8
|
-
export * from './lib/injectables.ts'
|
|
9
9
|
export * from './lib/types.ts'
|
|
10
|
-
export * from './lib/
|
|
10
|
+
export * from './lib/types.ts'
|
|
11
11
|
export * from './lib/utils/index.ts'
|
package/lib/container.ts
CHANGED
|
@@ -61,6 +61,8 @@ export type InjectableFactoryType<
|
|
|
61
61
|
InjectableDeps extends Dependencies,
|
|
62
62
|
> = (context: DependencyContext<InjectableDeps>) => Async<InjectableType>
|
|
63
63
|
|
|
64
|
+
export type InjectablePickType<Input, Output> = (injectable: Input) => Output
|
|
65
|
+
|
|
64
66
|
export type InjectableDisposeType<
|
|
65
67
|
InjectableType,
|
|
66
68
|
InjectableDeps extends Dependencies,
|
|
@@ -87,10 +89,12 @@ export interface FactoryInjectable<
|
|
|
87
89
|
T,
|
|
88
90
|
D extends Dependencies = {},
|
|
89
91
|
S extends Scope = Scope.Global,
|
|
92
|
+
P = T,
|
|
90
93
|
> extends Dependant<D> {
|
|
91
94
|
scope: S
|
|
92
|
-
factory
|
|
93
|
-
|
|
95
|
+
factory: InjectableFactoryType<P, D>
|
|
96
|
+
pick: InjectablePickType<P, T>
|
|
97
|
+
dispose?: InjectableDisposeType<P, D>
|
|
94
98
|
[kInjectable]: any
|
|
95
99
|
[kFactoryInjectable]: any
|
|
96
100
|
}
|
|
@@ -111,7 +115,10 @@ export type AnyInjectable<T = any, S extends Scope = Scope> = Injectable<
|
|
|
111
115
|
>
|
|
112
116
|
|
|
113
117
|
export class Container {
|
|
114
|
-
readonly instances = new Map<
|
|
118
|
+
readonly instances = new Map<
|
|
119
|
+
AnyInjectable,
|
|
120
|
+
{ instance: any; picked: any; context: any }
|
|
121
|
+
>()
|
|
115
122
|
private readonly resolvers = new Map<AnyInjectable, Promise<any>>()
|
|
116
123
|
private readonly injectables = new Set<AnyInjectable>()
|
|
117
124
|
private readonly dependants = new Map<AnyInjectable, Set<AnyInjectable>>()
|
|
@@ -233,7 +240,11 @@ export class Container {
|
|
|
233
240
|
if (compareScope(injectable.scope, '>', this.scope)) {
|
|
234
241
|
throw new Error('Invalid scope') // TODO: more informative error
|
|
235
242
|
}
|
|
236
|
-
this.instances.set(injectable, {
|
|
243
|
+
this.instances.set(injectable, {
|
|
244
|
+
instance,
|
|
245
|
+
picked: instance,
|
|
246
|
+
context: undefined,
|
|
247
|
+
})
|
|
237
248
|
}
|
|
238
249
|
|
|
239
250
|
satisfies(injectable: AnyInjectable) {
|
|
@@ -276,7 +287,7 @@ export class Container {
|
|
|
276
287
|
}
|
|
277
288
|
|
|
278
289
|
if (this.instances.has(injectable)) {
|
|
279
|
-
return Promise.resolve(this.instances.get(injectable)!.
|
|
290
|
+
return Promise.resolve(this.instances.get(injectable)!.picked)
|
|
280
291
|
} else if (this.resolvers.has(injectable)) {
|
|
281
292
|
return this.resolvers.get(injectable)!
|
|
282
293
|
} else {
|
|
@@ -305,10 +316,11 @@ export class Container {
|
|
|
305
316
|
})),
|
|
306
317
|
)
|
|
307
318
|
.then(({ instance, context }) => {
|
|
319
|
+
const picked = injectable.pick(instance)
|
|
308
320
|
if (compareScope(this.scope, '>=', scope))
|
|
309
|
-
this.instances.set(injectable, { instance, context })
|
|
321
|
+
this.instances.set(injectable, { instance, picked, context })
|
|
310
322
|
if (scope !== Scope.Transient) this.resolvers.delete(injectable)
|
|
311
|
-
return
|
|
323
|
+
return picked
|
|
312
324
|
})
|
|
313
325
|
if (scope !== Scope.Transient)
|
|
314
326
|
this.resolvers.set(injectable, resolution)
|
|
@@ -443,28 +455,27 @@ export function createFactoryInjectable<
|
|
|
443
455
|
T,
|
|
444
456
|
D extends Dependencies = {},
|
|
445
457
|
S extends Scope = Scope.Global,
|
|
458
|
+
P = T,
|
|
446
459
|
>(
|
|
447
460
|
paramsOrFactory:
|
|
448
461
|
| {
|
|
449
462
|
dependencies?: D
|
|
450
463
|
scope?: S
|
|
451
|
-
|
|
452
|
-
|
|
464
|
+
pick?: InjectablePickType<P, T>
|
|
465
|
+
factory: InjectableFactoryType<P, D>
|
|
466
|
+
dispose?: InjectableDisposeType<P, D>
|
|
453
467
|
}
|
|
454
|
-
| InjectableFactoryType<
|
|
468
|
+
| InjectableFactoryType<P, D>,
|
|
455
469
|
label?: string,
|
|
456
|
-
): FactoryInjectable<T, D, S> {
|
|
470
|
+
): FactoryInjectable<null extends T ? P : T, D, S, P> {
|
|
457
471
|
const isFactory = typeof paramsOrFactory === 'function'
|
|
458
|
-
const params = isFactory
|
|
459
|
-
? {
|
|
460
|
-
factory: paramsOrFactory,
|
|
461
|
-
}
|
|
462
|
-
: paramsOrFactory
|
|
472
|
+
const params = isFactory ? { factory: paramsOrFactory } : paramsOrFactory
|
|
463
473
|
const injectable = {
|
|
464
474
|
dependencies: (params.dependencies ?? {}) as D,
|
|
465
475
|
scope: (params.scope ?? Scope.Global) as S,
|
|
466
476
|
factory: params.factory,
|
|
467
477
|
dispose: params.dispose,
|
|
478
|
+
pick: params.pick ?? ((instance: P) => instance as unknown as T),
|
|
468
479
|
label,
|
|
469
480
|
stack: tryCaptureStackTrace(),
|
|
470
481
|
[kInjectable]: true,
|
|
@@ -480,5 +491,5 @@ export function createFactoryInjectable<
|
|
|
480
491
|
`Invalid scope ${params.scope} for factory injectable: dependencies have stricter scope - ${actualScope}`,
|
|
481
492
|
)
|
|
482
493
|
injectable.scope = actualScope as unknown as S
|
|
483
|
-
return Object.freeze(injectable)
|
|
494
|
+
return Object.freeze(injectable) as any
|
|
484
495
|
}
|
package/lib/logger.ts
CHANGED
package/lib/registry.ts
CHANGED
|
@@ -4,7 +4,7 @@ import {
|
|
|
4
4
|
getInjectableScope,
|
|
5
5
|
} from './container.ts'
|
|
6
6
|
import { type Hook, Scope } from './enums.ts'
|
|
7
|
-
import { type HookType
|
|
7
|
+
import { Hooks, type HookType } from './hooks.ts'
|
|
8
8
|
import type { Logger } from './logger.ts'
|
|
9
9
|
|
|
10
10
|
export class Registry {
|
package/package.json
CHANGED
|
@@ -11,8 +11,8 @@
|
|
|
11
11
|
"dependencies": {
|
|
12
12
|
"pino": "^9.0.0",
|
|
13
13
|
"pino-pretty": "^11.0.0",
|
|
14
|
-
"@nmtjs/common": "0.6.
|
|
15
|
-
"@nmtjs/type": "0.6.
|
|
14
|
+
"@nmtjs/common": "0.6.4",
|
|
15
|
+
"@nmtjs/type": "0.6.4"
|
|
16
16
|
},
|
|
17
17
|
"devDependencies": {
|
|
18
18
|
"@types/node": "^20"
|
|
@@ -21,11 +21,10 @@
|
|
|
21
21
|
"index.ts",
|
|
22
22
|
"lib",
|
|
23
23
|
"dist",
|
|
24
|
-
"tsconfig.json",
|
|
25
24
|
"LICENSE.md",
|
|
26
25
|
"README.md"
|
|
27
26
|
],
|
|
28
|
-
"version": "0.6.
|
|
27
|
+
"version": "0.6.4",
|
|
29
28
|
"scripts": {
|
|
30
29
|
"build": "neemata-build ./index.ts './lib/**/*.ts'",
|
|
31
30
|
"type-check": "tsc --noEmit"
|
package/tsconfig.json
DELETED