@nmtjs/core 0.6.3 → 0.6.4

package/dist/lib/container.js

@@ -105,6 +105,7 @@ export class Container {
         }
         this.instances.set(injectable, {
             instance,
+            picked: instance,
             context: undefined
         });
     }
@@ -136,7 +137,7 @@ export class Container {
                 dependants.add(dependant);
             }
             if (this.instances.has(injectable)) {
-                return Promise.resolve(this.instances.get(injectable).instance);
+                return Promise.resolve(this.instances.get(injectable).picked);
             } else if (this.resolvers.has(injectable)) {
                 return this.resolvers.get(injectable);
             } else {
@@ -152,12 +153,14 @@ export class Container {
                             instance,
                             context
                         }))).then(({ instance, context })=>{
+                    const picked = injectable.pick(instance);
                     if (compareScope(this.scope, '>=', scope)) this.instances.set(injectable, {
                         instance,
+                        picked,
                         context
                     });
                     if (scope !== Scope.Transient) this.resolvers.delete(injectable);
-                    return instance;
+                    return picked;
                 });
                 if (scope !== Scope.Transient) this.resolvers.set(injectable, resolution);
                 return resolution;
@@ -263,6 +266,7 @@ export function createFactoryInjectable(paramsOrFactory, label) {
         scope: params.scope ?? Scope.Global,
         factory: params.factory,
         dispose: params.dispose,
+        pick: params.pick ?? ((instance)=>instance),
         label,
         stack: tryCaptureStackTrace(),
         [kInjectable]: true,

package/dist/lib/container.js.map

@@ -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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"}
+{"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/lib/container.ts

@@ -61,6 +61,8 @@ export type InjectableFactoryType<
   InjectableDeps extends Dependencies,
 > = (context: DependencyContext<InjectableDeps>) => Async<InjectableType>
 
+export type InjectablePickType<Input, Output> = (injectable: Input) => Output
+
 export type InjectableDisposeType<
   InjectableType,
   InjectableDeps extends Dependencies,
@@ -87,10 +89,12 @@ export interface FactoryInjectable<
   T,
   D extends Dependencies = {},
   S extends Scope = Scope.Global,
+  P = T,
 > extends Dependant<D> {
   scope: S
-  factory(context: DependencyContext<D>): Async<T>
-  dispose?(instance: T, context: DependencyContext<D>): any
+  factory: InjectableFactoryType<P, D>
+  pick: InjectablePickType<P, T>
+  dispose?: InjectableDisposeType<P, D>
   [kInjectable]: any
   [kFactoryInjectable]: any
 }
@@ -111,7 +115,10 @@ export type AnyInjectable<T = any, S extends Scope = Scope> = Injectable<
 >
 
 export class Container {
-  readonly instances = new Map<AnyInjectable, { instance: any; context: any }>()
+  readonly instances = new Map<
+    AnyInjectable,
+    { instance: any; picked: any; context: any }
+  >()
   private readonly resolvers = new Map<AnyInjectable, Promise<any>>()
   private readonly injectables = new Set<AnyInjectable>()
   private readonly dependants = new Map<AnyInjectable, Set<AnyInjectable>>()
@@ -233,7 +240,11 @@ export class Container {
     if (compareScope(injectable.scope, '>', this.scope)) {
       throw new Error('Invalid scope') // TODO: more informative error
     }
-    this.instances.set(injectable, { instance, context: undefined })
+    this.instances.set(injectable, {
+      instance,
+      picked: instance,
+      context: undefined,
+    })
   }
 
   satisfies(injectable: AnyInjectable) {
@@ -276,7 +287,7 @@ export class Container {
       }
 
       if (this.instances.has(injectable)) {
-        return Promise.resolve(this.instances.get(injectable)!.instance)
+        return Promise.resolve(this.instances.get(injectable)!.picked)
       } else if (this.resolvers.has(injectable)) {
         return this.resolvers.get(injectable)!
       } else {
@@ -305,10 +316,11 @@ export class Container {
             })),
           )
           .then(({ instance, context }) => {
+            const picked = injectable.pick(instance)
             if (compareScope(this.scope, '>=', scope))
-              this.instances.set(injectable, { instance, context })
+              this.instances.set(injectable, { instance, picked, context })
             if (scope !== Scope.Transient) this.resolvers.delete(injectable)
-            return instance
+            return picked
           })
         if (scope !== Scope.Transient)
           this.resolvers.set(injectable, resolution)
@@ -443,28 +455,27 @@ export function createFactoryInjectable<
   T,
   D extends Dependencies = {},
   S extends Scope = Scope.Global,
+  P = T,
 >(
   paramsOrFactory:
     | {
         dependencies?: D
         scope?: S
-        factory: InjectableFactoryType<T, D>
-        dispose?: InjectableDisposeType<T, D>
+        pick?: InjectablePickType<P, T>
+        factory: InjectableFactoryType<P, D>
+        dispose?: InjectableDisposeType<P, D>
       }
-    | InjectableFactoryType<T, D>,
+    | InjectableFactoryType<P, D>,
   label?: string,
-): FactoryInjectable<T, D, S> {
+): FactoryInjectable<null extends T ? P : T, D, S, P> {
   const isFactory = typeof paramsOrFactory === 'function'
-  const params = isFactory
-    ? {
-        factory: paramsOrFactory,
-      }
-    : paramsOrFactory
+  const params = isFactory ? { factory: paramsOrFactory } : paramsOrFactory
   const injectable = {
     dependencies: (params.dependencies ?? {}) as D,
     scope: (params.scope ?? Scope.Global) as S,
     factory: params.factory,
     dispose: params.dispose,
+    pick: params.pick ?? ((instance: P) => instance as unknown as T),
     label,
     stack: tryCaptureStackTrace(),
     [kInjectable]: true,
@@ -480,5 +491,5 @@ export function createFactoryInjectable<
       `Invalid scope ${params.scope} for factory injectable: dependencies have stricter scope - ${actualScope}`,
     )
   injectable.scope = actualScope as unknown as S
-  return Object.freeze(injectable)
+  return Object.freeze(injectable) as any
 }

package/package.json

@@ -11,8 +11,8 @@
   "dependencies": {
     "pino": "^9.0.0",
     "pino-pretty": "^11.0.0",
-    "@nmtjs/type": "0.6.3",
-    "@nmtjs/common": "0.6.3"
+    "@nmtjs/common": "0.6.4",
+    "@nmtjs/type": "0.6.4"
   },
   "devDependencies": {
     "@types/node": "^20"
@@ -24,7 +24,7 @@
     "LICENSE.md",
     "README.md"
   ],
-  "version": "0.6.3",
+  "version": "0.6.4",
   "scripts": {
     "build": "neemata-build ./index.ts './lib/**/*.ts'",
     "type-check": "tsc --noEmit"