@nmtjs/core 0.9.0 → 0.10.1

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.
@@ -118,8 +118,8 @@ export function createExtendableClassInjectable(baseClass, dependencies = {}, sc
118
118
  super($context);
119
119
  } else {
120
120
  super(...baseClassArgs);
121
- this.$context = $context;
122
121
  }
122
+ this.$context = $context;
123
123
  }
124
124
  async $onCreate() {
125
125
  await super.$onCreate?.();
@@ -1 +1 @@
1
- {"mappings":"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","names":["injectable: any","injectable: AnyInjectable","dependency: Depedency","injectable: T","label?: string","value: T","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>","instance: P","dependencies: D","scope: S","$context: DependencyContext<D>","baseClass: B","substitution: DependenciesSubstitution<T['dependencies']>","left: Scope","operator: '>' | '<' | '>=' | '<=' | '=' | '!='","right: Scope"],"sources":["../src/injectables.ts"],"sourcesContent":["import {\n type Async,\n type ClassConstructor,\n type ClassConstructorArgs,\n type ClassInstance,\n tryCaptureStackTrace,\n} from '@nmtjs/common'\nimport {\n kClassInjectable,\n kFactoryInjectable,\n kInjectable,\n kLazyInjectable,\n kOptionalDependency,\n kValueInjectable,\n} from './constants.ts'\nimport type { InjectFn } from './container.ts'\nimport { Scope } from './enums.ts'\nimport type { Logger } from './logger.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 interface BaseClassInjectable<\n T,\n D extends Dependencies = {},\n S extends Scope = Scope.Global,\n> extends Dependant<D> {\n new (...args: any[]): T\n scope: S\n [kInjectable]: any\n [kClassInjectable]: any\n}\n\nexport interface ClassInjectable<\n T,\n D extends Dependencies = {},\n S extends Scope = Scope.Global,\n A extends any[] = [],\n> extends Dependant<D> {\n new (\n $context: DependencyContext<D>,\n ...args: A\n ): T & {\n $context: DependencyContext<D>\n }\n scope: S\n [kInjectable]: any\n [kClassInjectable]: any\n}\n\nexport type Injectable<\n V = any,\n D extends Dependencies = {},\n S extends Scope = Scope,\n> =\n | LazyInjectable<V, S>\n | ValueInjectable<V>\n | FactoryInjectable<V, D, S, any>\n | BaseClassInjectable<V, D, S>\n\nexport type AnyInjectable<T = any, S extends Scope = Scope> = Injectable<\n T,\n any,\n S\n>\n\nexport const isLazyInjectable = (\n injectable: any,\n): injectable is LazyInjectable<any> => kLazyInjectable in injectable\nexport const isFactoryInjectable = (\n injectable: any,\n): injectable is FactoryInjectable<any> => kFactoryInjectable in injectable\nexport const isClassInjectable = (\n injectable: any,\n): injectable is ClassInjectable<any> => kClassInjectable in injectable\nexport const isValueInjectable = (\n injectable: any,\n): injectable is ValueInjectable<any> => kValueInjectable in injectable\nexport const isInjectable = (\n injectable: any,\n): injectable is AnyInjectable<any> => kInjectable in injectable\nexport const isOptionalInjectable = (\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 stackTraceDepth = 0,\n): LazyInjectable<T, S> {\n return Object.freeze({\n scope,\n dependencies: {},\n label,\n stack: tryCaptureStackTrace(stackTraceDepth),\n [kInjectable]: true,\n [kLazyInjectable]: true as unknown as T,\n })\n}\n\nexport function createValueInjectable<T>(\n value: T,\n label?: string,\n stackTraceDepth = 0,\n): ValueInjectable<T> {\n return Object.freeze({\n value,\n scope: Scope.Global,\n dependencies: {},\n label,\n stack: tryCaptureStackTrace(stackTraceDepth),\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 stackTraceDepth = 0,\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(stackTraceDepth),\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\nexport const createClassInjectable = <\n D extends Dependencies = {},\n S extends Scope = Scope.Global,\n>(\n dependencies: D = {} as D,\n scope: S = Scope.Global as S,\n stackTraceDepth = 0,\n): ClassInjectable<ClassInstance<typeof klass>, D, S> => {\n const klass = class {\n static dependencies = dependencies\n static scope = scope\n static stack = tryCaptureStackTrace(stackTraceDepth + 2)\n static [kInjectable] = true\n static [kClassInjectable] = true\n\n static get label() {\n // biome-ignore lint/complexity/noThisInStatic:\n return this.name\n }\n\n constructor(public $context: DependencyContext<D>) {}\n\n protected async $onCreate() {}\n protected async $onDispose() {}\n }\n return klass\n}\n\nexport function createExtendableClassInjectable<\n B extends ClassConstructor<any>,\n D extends Dependencies = {},\n S extends Scope = Scope.Global,\n>(\n baseClass: B,\n dependencies: D = {} as D,\n scope: S = Scope.Global as S,\n stackTraceDepth = 0,\n): B extends ClassInjectable<any>\n ? ClassInjectable<ClassInstance<B>, D, S>\n : ClassInjectable<ClassInstance<B>, D, S, ClassConstructorArgs<B, []>> {\n if (isClassInjectable(baseClass)) {\n dependencies = Object.assign({}, baseClass.dependencies, dependencies)\n if (compareScope(scope, '<', baseClass.scope)) {\n throw new Error(\n 'Invalid scope for injectable: base class has stricter scope',\n )\n }\n }\n // @ts-expect-error\n return class extends baseClass {\n static dependencies = dependencies\n static scope = scope\n static stack = tryCaptureStackTrace(stackTraceDepth)\n static [kInjectable] = true\n static [kClassInjectable] = true\n\n static get label() {\n // biome-ignore lint/complexity/noThisInStatic:\n return this.name\n }\n\n $context!: DependencyContext<D>\n\n constructor(...args: any[]) {\n const [$context, ...baseClassArgs] = args\n if (isClassInjectable(baseClass)) {\n super($context)\n } else {\n super(...baseClassArgs)\n this.$context = $context\n }\n }\n\n protected async $onCreate() {\n await super.$onCreate?.()\n }\n\n protected async $onDispose() {\n await super.$onDispose?.()\n }\n }\n}\n\nexport type DependenciesSubstitution<T extends Dependencies> = {\n [K in keyof T]?: T[K] extends AnyInjectable<infer Type>\n ? AnyInjectable<Type> | DependenciesSubstitution<T[K]['dependencies']>\n : never\n}\n\nexport function substitute<\n T extends\n | FactoryInjectable<any, any, Scope>\n | BaseClassInjectable<any, any, Scope>,\n>(\n injectable: T,\n substitution: DependenciesSubstitution<T['dependencies']>,\n stackTraceDepth = 0,\n): T {\n const dependencies = { ...injectable.dependencies }\n const depth = stackTraceDepth + 1\n for (const key in substitution) {\n const value = substitution[key]!\n if (key in dependencies) {\n const original = dependencies[key]\n if (isInjectable(value)) {\n dependencies[key] = value\n } else if (isClassInjectable(original) || isFactoryInjectable(original)) {\n dependencies[key] = substitute(original, value, depth)\n }\n }\n }\n\n if (isClassInjectable(injectable)) {\n // @ts-expect-error\n return createExtendableClassInjectable(\n injectable,\n dependencies,\n injectable.scope,\n depth,\n )\n } else if (isFactoryInjectable(injectable)) {\n // @ts-expect-error\n return createFactoryInjectable(\n {\n ...injectable,\n dependencies,\n },\n injectable.label,\n depth,\n )\n }\n\n throw new Error('Invalid injectable type')\n}\n\nexport function 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 CoreInjectables = {\n logger: createLazyInjectable<Logger>(Scope.Global, 'Logger'),\n inject: createLazyInjectable<InjectFn>(Scope.Global, 'Inject function'),\n}\n"],"version":3,"file":"injectables.js"}
1
+ {"mappings":"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","names":["injectable: any","injectable: AnyInjectable","dependency: Depedency","injectable: T","label?: string","value: T","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>","instance: P","dependencies: D","scope: S","$context: DependencyContext<D>","baseClass: B","substitution: DependenciesSubstitution<T['dependencies']>","left: Scope","operator: '>' | '<' | '>=' | '<=' | '=' | '!='","right: Scope"],"sources":["../src/injectables.ts"],"sourcesContent":["import {\n type Async,\n type ClassConstructor,\n type ClassConstructorArgs,\n type ClassInstance,\n tryCaptureStackTrace,\n} from '@nmtjs/common'\nimport {\n kClassInjectable,\n kFactoryInjectable,\n kInjectable,\n kLazyInjectable,\n kOptionalDependency,\n kValueInjectable,\n} from './constants.ts'\nimport type { InjectFn } from './container.ts'\nimport { Scope } from './enums.ts'\nimport type { Logger } from './logger.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 interface BaseClassInjectable<\n T,\n D extends Dependencies = {},\n S extends Scope = Scope.Global,\n> extends Dependant<D> {\n new (...args: any[]): T\n scope: S\n [kInjectable]: any\n [kClassInjectable]: any\n}\n\nexport interface ClassInjectable<\n T,\n D extends Dependencies = {},\n S extends Scope = Scope.Global,\n A extends any[] = [],\n> extends Dependant<D> {\n new (\n $context: DependencyContext<D>,\n ...args: A\n ): T & {\n $context: DependencyContext<D>\n }\n scope: S\n [kInjectable]: any\n [kClassInjectable]: any\n}\n\nexport type Injectable<\n V = any,\n D extends Dependencies = {},\n S extends Scope = Scope,\n> =\n | LazyInjectable<V, S>\n | ValueInjectable<V>\n | FactoryInjectable<V, D, S, any>\n | BaseClassInjectable<V, D, S>\n\nexport type AnyInjectable<T = any, S extends Scope = Scope> = Injectable<\n T,\n any,\n S\n>\n\nexport const isLazyInjectable = (\n injectable: any,\n): injectable is LazyInjectable<any> => kLazyInjectable in injectable\nexport const isFactoryInjectable = (\n injectable: any,\n): injectable is FactoryInjectable<any> => kFactoryInjectable in injectable\nexport const isClassInjectable = (\n injectable: any,\n): injectable is ClassInjectable<any> => kClassInjectable in injectable\nexport const isValueInjectable = (\n injectable: any,\n): injectable is ValueInjectable<any> => kValueInjectable in injectable\nexport const isInjectable = (\n injectable: any,\n): injectable is AnyInjectable<any> => kInjectable in injectable\nexport const isOptionalInjectable = (\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 stackTraceDepth = 0,\n): LazyInjectable<T, S> {\n return Object.freeze({\n scope,\n dependencies: {},\n label,\n stack: tryCaptureStackTrace(stackTraceDepth),\n [kInjectable]: true,\n [kLazyInjectable]: true as unknown as T,\n })\n}\n\nexport function createValueInjectable<T>(\n value: T,\n label?: string,\n stackTraceDepth = 0,\n): ValueInjectable<T> {\n return Object.freeze({\n value,\n scope: Scope.Global,\n dependencies: {},\n label,\n stack: tryCaptureStackTrace(stackTraceDepth),\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 stackTraceDepth = 0,\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(stackTraceDepth),\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\nexport const createClassInjectable = <\n D extends Dependencies = {},\n S extends Scope = Scope.Global,\n>(\n dependencies: D = {} as D,\n scope: S = Scope.Global as S,\n stackTraceDepth = 0,\n): ClassInjectable<ClassInstance<typeof klass>, D, S> => {\n const klass = class {\n static dependencies = dependencies\n static scope = scope\n static stack = tryCaptureStackTrace(stackTraceDepth + 2)\n static [kInjectable] = true\n static [kClassInjectable] = true\n\n static get label() {\n // biome-ignore lint/complexity/noThisInStatic:\n return this.name\n }\n\n constructor(public $context: DependencyContext<D>) {}\n\n protected async $onCreate() {}\n protected async $onDispose() {}\n }\n return klass\n}\n\nexport function createExtendableClassInjectable<\n B extends ClassConstructor<any>,\n D extends Dependencies = {},\n S extends Scope = Scope.Global,\n>(\n baseClass: B,\n dependencies: D = {} as D,\n scope: S = Scope.Global as S,\n stackTraceDepth = 0,\n): B extends ClassInjectable<any>\n ? ClassInjectable<ClassInstance<B>, D, S>\n : ClassInjectable<ClassInstance<B>, D, S, ClassConstructorArgs<B, []>> {\n if (isClassInjectable(baseClass)) {\n dependencies = Object.assign({}, baseClass.dependencies, dependencies)\n if (compareScope(scope, '<', baseClass.scope)) {\n throw new Error(\n 'Invalid scope for injectable: base class has stricter scope',\n )\n }\n }\n // @ts-expect-error\n return class extends baseClass {\n static dependencies = dependencies\n static scope = scope\n static stack = tryCaptureStackTrace(stackTraceDepth)\n static [kInjectable] = true\n static [kClassInjectable] = true\n\n static get label() {\n // biome-ignore lint/complexity/noThisInStatic:\n return this.name\n }\n\n $context!: DependencyContext<D>\n\n constructor(...args: any[]) {\n const [$context, ...baseClassArgs] = args\n if (isClassInjectable(baseClass)) {\n super($context)\n } else {\n super(...baseClassArgs)\n }\n this.$context = $context\n }\n\n protected async $onCreate() {\n await super.$onCreate?.()\n }\n\n protected async $onDispose() {\n await super.$onDispose?.()\n }\n }\n}\n\nexport type DependenciesSubstitution<T extends Dependencies> = {\n [K in keyof T]?: T[K] extends AnyInjectable<infer Type>\n ? AnyInjectable<Type> | DependenciesSubstitution<T[K]['dependencies']>\n : never\n}\n\nexport function substitute<\n T extends\n | FactoryInjectable<any, any, Scope>\n | BaseClassInjectable<any, any, Scope>,\n>(\n injectable: T,\n substitution: DependenciesSubstitution<T['dependencies']>,\n stackTraceDepth = 0,\n): T {\n const dependencies = { ...injectable.dependencies }\n const depth = stackTraceDepth + 1\n for (const key in substitution) {\n const value = substitution[key]!\n if (key in dependencies) {\n const original = dependencies[key]\n if (isInjectable(value)) {\n dependencies[key] = value\n } else if (isClassInjectable(original) || isFactoryInjectable(original)) {\n dependencies[key] = substitute(original, value, depth)\n }\n }\n }\n\n if (isClassInjectable(injectable)) {\n // @ts-expect-error\n return createExtendableClassInjectable(\n injectable,\n dependencies,\n injectable.scope,\n depth,\n )\n } else if (isFactoryInjectable(injectable)) {\n // @ts-expect-error\n return createFactoryInjectable(\n {\n ...injectable,\n dependencies,\n },\n injectable.label,\n depth,\n )\n }\n\n throw new Error('Invalid injectable type')\n}\n\nexport function 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 CoreInjectables = {\n logger: createLazyInjectable<Logger>(Scope.Global, 'Logger'),\n inject: createLazyInjectable<InjectFn>(Scope.Global, 'Inject function'),\n}\n"],"version":3,"file":"injectables.js"}
package/package.json CHANGED
@@ -10,15 +10,15 @@
10
10
  "peerDependencies": {
11
11
  "pino": "^9.6.0",
12
12
  "pino-pretty": "^13.0.0",
13
- "@nmtjs/type": "0.9.0",
14
- "@nmtjs/common": "0.9.0"
13
+ "@nmtjs/common": "0.10.1",
14
+ "@nmtjs/type": "0.10.1"
15
15
  },
16
16
  "devDependencies": {
17
17
  "@types/node": "^18",
18
18
  "pino": "^9.6.0",
19
19
  "pino-pretty": "^13.0.0",
20
- "@nmtjs/common": "0.9.0",
21
- "@nmtjs/type": "0.9.0"
20
+ "@nmtjs/common": "0.10.1",
21
+ "@nmtjs/type": "0.10.1"
22
22
  },
23
23
  "files": [
24
24
  "src",
@@ -26,7 +26,7 @@
26
26
  "LICENSE.md",
27
27
  "README.md"
28
28
  ],
29
- "version": "0.9.0",
29
+ "version": "0.10.1",
30
30
  "scripts": {
31
31
  "build": "neemata-build --root=./src './**/*.ts'",
32
32
  "type-check": "tsc --noEmit"
@@ -343,8 +343,8 @@ export function createExtendableClassInjectable<
343
343
  super($context)
344
344
  } else {
345
345
  super(...baseClassArgs)
346
- this.$context = $context
347
346
  }
347
+ this.$context = $context
348
348
  }
349
349
 
350
350
  protected async $onCreate() {