@nmtjs/core 0.7.6 → 0.7.8
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/container.js +1 -1
- package/dist/container.js.map +1 -1
- package/package.json +3 -3
- package/src/container.ts +1 -1
package/dist/container.js
CHANGED
|
@@ -156,7 +156,7 @@ export class Container {
|
|
|
156
156
|
}).then((instance) => {
|
|
157
157
|
if (compareScope(this.scope, ">=", scope)) this.instances.set(injectable, {
|
|
158
158
|
instance,
|
|
159
|
-
picked:
|
|
159
|
+
picked: instance,
|
|
160
160
|
context: undefined
|
|
161
161
|
});
|
|
162
162
|
if (scope !== Scope.Transient) this.resolvers.delete(injectable);
|
package/dist/container.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"mappings":"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","names":["application: {\n registry: Registry\n logger: Logger\n }","scope: Exclude<Scope, Scope.Transient>","parent?: Container","dependencies: Dependencies","injectable: AnyInjectable","injectable: T","dependencies: T","dependant?: AnyInjectable","injections: Record<string, any>","resolvers: Promise<any>[]","instance: ResolveInjectableType<T>","container: Container","context: InlineInjectionDependencies<T>"],"sources":["src/container.ts"],"sourcesContent":["import { Scope } from './enums.ts'\nimport {\n type AnyInjectable,\n CoreInjectables,\n compareScope,\n createValueInjectable,\n type Dependencies,\n type DependencyContext,\n getDepedencencyInjectable,\n isClassInjectable,\n isFactoryInjectable,\n isInjectable,\n isLazyInjectable,\n isOptionalInjectable,\n isValueInjectable,\n type ResolveInjectableType,\n} from './injectables.ts'\nimport type { Logger } from './logger.ts'\nimport type { Registry } from './registry.ts'\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 this.provide(CoreInjectables.inject, createInjectFunction(this))\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 // TODO: more informative error\n throw new Error('Invalid scope: dependant is looser than injectable')\n }\n\n if (isValueInjectable(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 = isLazyInjectable(injectable)\n\n if (isLazy) {\n const isOptional = isOptionalInjectable(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 (isFactoryInjectable(injectable)) {\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 } else if (isClassInjectable(injectable)) {\n const resolution = this.createInjectableContext(\n dependencies,\n injectable,\n )\n .then((context) => {\n const instance = new injectable(context)\n return instance.$onCreate().then(() => instance)\n })\n .then((instance) => {\n // const picked = injectable.pick(instance)\n if (compareScope(this.scope, '>=', scope))\n this.instances.set(injectable, {\n instance,\n picked: undefined,\n context: undefined,\n })\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 } else {\n throw new Error('Invalid injectable type')\n }\n }\n }\n }\n\n private async disposeInjectable(injectable: AnyInjectable) {\n try {\n if (isFactoryInjectable(injectable)) {\n const { dispose } = injectable\n if (dispose) {\n const { instance, context } = this.instances.get(injectable)!\n await dispose(instance, context)\n }\n } else if (isClassInjectable(injectable)) {\n const { instance } = this.instances.get(injectable)!\n await instance.$onDispose()\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\nexport function createInjectFunction(container: Container) {\n return <T extends AnyInjectable>(\n injectable: T,\n context: InlineInjectionDependencies<T>,\n ) => {\n const dependencies: Dependencies = {}\n\n for (const key in context) {\n const dep = context[key]\n if (isInjectable(dep) || isOptionalInjectable(dep)) {\n dependencies[key] = dep\n } else {\n dependencies[key] = createValueInjectable(dep)\n }\n }\n\n const newInjectable = {\n ...injectable,\n dependencies,\n scope: Scope.Transient,\n }\n\n return container.resolve(newInjectable)\n }\n}\n\ntype InlineInjectionDependencies<T extends AnyInjectable> = {\n [K in keyof T['dependencies']]:\n | ResolveInjectableType<T['dependencies'][K]>\n | AnyInjectable<ResolveInjectableType<T['dependencies'][K]>>\n}\n\nexport type InjectFn = ReturnType<typeof createInjectFunction>\n"],"version":3}
|
|
1
|
+
{"mappings":"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","names":["application: {\n registry: Registry\n logger: Logger\n }","scope: Exclude<Scope, Scope.Transient>","parent?: Container","dependencies: Dependencies","injectable: AnyInjectable","injectable: T","dependencies: T","dependant?: AnyInjectable","injections: Record<string, any>","resolvers: Promise<any>[]","instance: ResolveInjectableType<T>","container: Container","context: InlineInjectionDependencies<T>"],"sources":["src/container.ts"],"sourcesContent":["import { Scope } from './enums.ts'\nimport {\n type AnyInjectable,\n CoreInjectables,\n compareScope,\n createValueInjectable,\n type Dependencies,\n type DependencyContext,\n getDepedencencyInjectable,\n isClassInjectable,\n isFactoryInjectable,\n isInjectable,\n isLazyInjectable,\n isOptionalInjectable,\n isValueInjectable,\n type ResolveInjectableType,\n} from './injectables.ts'\nimport type { Logger } from './logger.ts'\nimport type { Registry } from './registry.ts'\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 this.provide(CoreInjectables.inject, createInjectFunction(this))\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 // TODO: more informative error\n throw new Error('Invalid scope: dependant is looser than injectable')\n }\n\n if (isValueInjectable(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 = isLazyInjectable(injectable)\n\n if (isLazy) {\n const isOptional = isOptionalInjectable(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 (isFactoryInjectable(injectable)) {\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 } else if (isClassInjectable(injectable)) {\n const resolution = this.createInjectableContext(\n dependencies,\n injectable,\n )\n .then((context) => {\n const instance = new injectable(context)\n return instance.$onCreate().then(() => instance)\n })\n .then((instance) => {\n // const picked = injectable.pick(instance)\n if (compareScope(this.scope, '>=', scope))\n this.instances.set(injectable, {\n instance,\n picked: instance,\n context: undefined,\n })\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 } else {\n throw new Error('Invalid injectable type')\n }\n }\n }\n }\n\n private async disposeInjectable(injectable: AnyInjectable) {\n try {\n if (isFactoryInjectable(injectable)) {\n const { dispose } = injectable\n if (dispose) {\n const { instance, context } = this.instances.get(injectable)!\n await dispose(instance, context)\n }\n } else if (isClassInjectable(injectable)) {\n const { instance } = this.instances.get(injectable)!\n await instance.$onDispose()\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\nexport function createInjectFunction(container: Container) {\n return <T extends AnyInjectable>(\n injectable: T,\n context: InlineInjectionDependencies<T>,\n ) => {\n const dependencies: Dependencies = {}\n\n for (const key in context) {\n const dep = context[key]\n if (isInjectable(dep) || isOptionalInjectable(dep)) {\n dependencies[key] = dep\n } else {\n dependencies[key] = createValueInjectable(dep)\n }\n }\n\n const newInjectable = {\n ...injectable,\n dependencies,\n scope: Scope.Transient,\n }\n\n return container.resolve(newInjectable)\n }\n}\n\ntype InlineInjectionDependencies<T extends AnyInjectable> = {\n [K in keyof T['dependencies']]:\n | ResolveInjectableType<T['dependencies'][K]>\n | AnyInjectable<ResolveInjectableType<T['dependencies'][K]>>\n}\n\nexport type InjectFn = ReturnType<typeof createInjectFunction>\n"],"version":3}
|
package/package.json
CHANGED
|
@@ -10,8 +10,8 @@
|
|
|
10
10
|
"dependencies": {
|
|
11
11
|
"pino": "^9.6.0",
|
|
12
12
|
"pino-pretty": "^11.3.0",
|
|
13
|
-
"@nmtjs/
|
|
14
|
-
"@nmtjs/
|
|
13
|
+
"@nmtjs/common": "0.7.8",
|
|
14
|
+
"@nmtjs/type": "0.7.8"
|
|
15
15
|
},
|
|
16
16
|
"devDependencies": {
|
|
17
17
|
"@types/node": "^20.17.30"
|
|
@@ -22,7 +22,7 @@
|
|
|
22
22
|
"LICENSE.md",
|
|
23
23
|
"README.md"
|
|
24
24
|
],
|
|
25
|
-
"version": "0.7.
|
|
25
|
+
"version": "0.7.8",
|
|
26
26
|
"scripts": {
|
|
27
27
|
"build": "neemata-build --root=./src './**/*.ts'",
|
|
28
28
|
"type-check": "tsc --noEmit"
|
package/src/container.ts
CHANGED
|
@@ -242,7 +242,7 @@ export class Container {
|
|
|
242
242
|
if (compareScope(this.scope, '>=', scope))
|
|
243
243
|
this.instances.set(injectable, {
|
|
244
244
|
instance,
|
|
245
|
-
picked:
|
|
245
|
+
picked: instance,
|
|
246
246
|
context: undefined,
|
|
247
247
|
})
|
|
248
248
|
if (scope !== Scope.Transient) this.resolvers.delete(injectable)
|