@nmtjs/core 0.16.1 → 0.17.0-beta.1

package/src/container.ts

@@ -122,7 +122,7 @@ export class Container {
     this.disposing = false
   }
 
-  containsWithinSelf(injectable: AnyInjectable) {
+  owns(injectable: AnyInjectable) {
     return (
       this.provisions.has(injectable) ||
       this.instances.has(injectable) ||
@@ -131,10 +131,7 @@ export class Container {
   }
 
   contains(injectable: AnyInjectable): boolean {
-    return (
-      this.containsWithinSelf(injectable) ||
-      (this.parent?.contains(injectable) ?? false)
-    )
+    return this.owns(injectable) || (this.parent?.contains(injectable) ?? false)
   }
 
   get<T extends AnyInjectable>(injectable: T): ResolveInjectableType<T> {
@@ -342,7 +339,6 @@ export class Container {
           ).finally(() => {
             this.resolvers.delete(injectable)
 
-            // biome-ignore lint: false
             // @ts-ignore
             if (measurements && measure) measurements.push(measure)
           })
@@ -372,7 +368,7 @@ export class Container {
     }
     if (isFactoryInjectable(injectable)) {
       wrapper.private = await Promise.resolve(
-        injectable.factory(wrapper.context),
+        injectable.create(wrapper.context),
       )
       wrapper.public = injectable.pick(wrapper.private)
     } else {

package/src/execution-environment.ts

@@ -0,0 +1,50 @@
+import type { Container } from './container.ts'
+import type { AnyInjectable, Dependant } from './injectables.ts'
+import type { Logger } from './logger.ts'
+import { Container as CoreContainer } from './container.ts'
+import { Scope } from './enums.ts'
+import {
+  CoreInjectables,
+  getDepedencencyInjectable,
+  provision,
+} from './injectables.ts'
+import { forkLogger } from './logger.ts'
+
+export type ExecutionEnvironmentOptions = {
+  logger: Logger
+  container?: Container
+  label?: string
+}
+
+export class ExecutionEnvironment {
+  readonly logger: Logger
+  readonly container: Container
+
+  constructor(options: ExecutionEnvironmentOptions) {
+    this.logger = options.label
+      ? forkLogger(options.logger, options.label)
+      : options.logger
+
+    this.container = options.container
+      ? options.container.fork(Scope.Global)
+      : new CoreContainer({ logger: this.logger })
+
+    this.container.provide([provision(CoreInjectables.logger, this.logger)])
+  }
+
+  async initialize(dependants: Iterable<Dependant> = []): Promise<void> {
+    const dependencies = new Set<AnyInjectable>()
+
+    for (const dependant of dependants) {
+      for (const dependency of Object.values(dependant.dependencies)) {
+        dependencies.add(getDepedencencyInjectable(dependency))
+      }
+    }
+
+    await this.container.initialize(dependencies)
+  }
+
+  async dispose(): Promise<void> {
+    await this.container.dispose()
+  }
+}

package/src/index.ts

@@ -1,10 +1,10 @@
 export * from './constants.ts'
 export * from './container.ts'
 export * from './enums.ts'
+export * from './execution-environment.ts'
 export * from './hooks.ts'
 export * from './injectables.ts'
 export * from './logger.ts'
 export * from './metadata.ts'
 export * from './plugin.ts'
 export * from './types.ts'
-export * from './utils/index.ts'

package/src/injectables.ts

@@ -11,6 +11,7 @@ import {
   kValueInjectable,
 } from './constants.ts'
 import { Scope } from './enums.ts'
+import { forkLogger } from './logger.ts'
 
 const ScopeStrictness = {
   [Scope.Transient]: Number.NaN, // this should make it always fail to compare with other scopes
@@ -57,6 +58,46 @@ export type DependencyContext<Deps extends Dependencies> = {
     : never
 }
 
+export type HandlerFn<
+  Deps extends Dependencies,
+  Args extends readonly unknown[],
+  Return,
+> = (context: DependencyContext<Deps>, ...args: Args) => MaybePromise<Return>
+
+export interface Handler<
+  Deps extends Dependencies,
+  Args extends readonly unknown[],
+  Return,
+> extends Dependant<Deps> {
+  handler: HandlerFn<Deps, Args, Return>
+}
+
+export type HandlerInput<
+  Deps extends Dependencies,
+  Args extends readonly unknown[],
+  Return,
+> =
+  | HandlerFn<{}, Args, Return>
+  | {
+      dependencies?: Deps
+      handler: HandlerFn<Deps, Args, Return>
+    }
+
+export function createHandler<
+  Args extends readonly unknown[],
+  Return,
+  Deps extends Dependencies = {},
+>(
+  paramsOrHandler: HandlerInput<Deps, Args, Return>,
+): Handler<Deps, Args, Return> {
+  const { dependencies = {} as Deps, handler } =
+    typeof paramsOrHandler === 'function'
+      ? { handler: paramsOrHandler }
+      : paramsOrHandler
+
+  return Object.freeze({ dependencies, handler }) as Handler<Deps, Args, Return>
+}
+
 export type InjectableFactoryType<
   InjectableType,
   InjectableDeps extends Dependencies,
@@ -72,11 +113,12 @@ export type InjectableDisposeType<
   context: DependencyContext<InjectableDeps>,
 ) => any
 
-export interface LazyInjectable<T, S extends Scope = Scope.Global>
-  extends Dependant<{}> {
+export interface LazyInjectable<
+  T,
+  S extends Scope = Scope.Global,
+> extends Dependant<{}> {
   scope: S
   $withType<O extends T>(): LazyInjectable<O, S>
-  optional(): DependencyOptional<LazyInjectable<T, S>>
   [kInjectable]: any
   [kLazyInjectable]: T
 }
@@ -95,10 +137,9 @@ export interface FactoryInjectable<
   P = T,
 > extends Dependant<D> {
   scope: S
-  factory: InjectableFactoryType<P, D>
+  create: InjectableFactoryType<P, D>
   pick: InjectablePickType<P, T>
   dispose?: InjectableDisposeType<P, D>
-  optional(): DependencyOptional<FactoryInjectable<T, D, S, P>>
   [kInjectable]: any
   [kFactoryInjectable]: any
 }
@@ -162,7 +203,7 @@ export function getDepedencencyInjectable(
   return dependency
 }
 
-export function createOptionalInjectable<T extends AnyInjectable>(
+export function createOptionalInjectable<T extends LazyInjectable<any, any>>(
   injectable: T,
 ) {
   return Object.freeze({
@@ -171,6 +212,15 @@ export function createOptionalInjectable<T extends AnyInjectable>(
   }) as DependencyOptional<T>
 }
 
+export function optional<T, S extends Scope>(
+  injectable: LazyInjectable<T, S>,
+): DependencyOptional<LazyInjectable<T, S>> {
+  if (!isLazyInjectable(injectable)) {
+    throw new TypeError('Optional dependencies can only wrap lazy injectables')
+  }
+  return createOptionalInjectable(injectable)
+}
+
 export function createLazyInjectable<T, S extends Scope = Scope.Global>(
   scope = Scope.Global as S,
   label?: string,
@@ -181,7 +231,6 @@ export function createLazyInjectable<T, S extends Scope = Scope.Global>(
     dependencies: {},
     label,
     stack: tryCaptureStackTrace(stackTraceDepth),
-    optional: () => createOptionalInjectable(injectable),
     $withType: () => injectable as any,
     [kInjectable]: true,
     [kLazyInjectable]: true as unknown as T,
@@ -216,7 +265,7 @@ export function createFactoryInjectable<
         dependencies?: D
         scope?: S
         pick?: InjectablePickType<P, T>
-        factory: InjectableFactoryType<P, D>
+        create: InjectableFactoryType<P, D>
         dispose?: InjectableDisposeType<P, D>
       }
     | InjectableFactoryType<P, D>,
@@ -224,16 +273,15 @@ export function createFactoryInjectable<
   stackTraceDepth = 0,
 ): FactoryInjectable<null extends T ? P : T, D, S, P> {
   const isFactory = typeof paramsOrFactory === 'function'
-  const params = isFactory ? { factory: paramsOrFactory } : paramsOrFactory
+  const params = isFactory ? { create: paramsOrFactory } : paramsOrFactory
   const injectable = {
     dependencies: (params.dependencies ?? {}) as D,
     scope: (params.scope ?? Scope.Global) as S,
-    factory: params.factory,
+    create: params.create,
     dispose: params.dispose,
     pick: params.pick ?? ((instance: P) => instance as unknown as T),
     label,
     stack: tryCaptureStackTrace(stackTraceDepth),
-    optional: () => createOptionalInjectable(injectable),
     [kInjectable]: true,
     [kFactoryInjectable]: true,
   }
@@ -308,11 +356,10 @@ export function compareScope(
 
 const loggerInjectable = Object.assign(
   (label: string | undefined, options?: ChildLoggerOptions) => {
-    const bindings = label ? { $label: label } : {}
     return createFactoryInjectable({
       dependencies: { logger: loggerInjectable },
       scope: Scope.Global,
-      factory: ({ logger }) => logger.child(bindings, options),
+      create: ({ logger }) => forkLogger(logger, label, options),
     })
   },
   createLazyInjectable<Logger>(Scope.Global, 'Logger'),

package/src/logger.ts

@@ -2,6 +2,7 @@ import { AsyncLocalStorage } from 'node:async_hooks'
 import { threadId } from 'node:worker_threads'
 
 import type {
+  Bindings,
   ChildLoggerOptions,
   DestinationStream,
   Level,
@@ -52,13 +53,12 @@ export const loggerLocalStorage = new AsyncLocalStorage<object | undefined>({
 })
 
 export const createLogger = (options: LoggingOptions = {}, $label: string) => {
-  let { destinations, pinoOptions } = options
+  let { destinations } = options
+  const { pinoOptions } = options
 
-  if (!destinations || !destinations?.length) {
+  if (!destinations?.length) {
     destinations = [
-      createConsolePrettyDestination(
-        (options.pinoOptions?.level || 'info') as Level,
-      ),
+      createConsolePrettyDestination((pinoOptions?.level || 'info') as Level),
     ]
   }
 
@@ -101,9 +101,21 @@ export const createLogger = (options: LoggingOptions = {}, $label: string) => {
           return object
         },
       },
+      base: { $label, $threadId: threadId },
     },
     multistream(destinations!),
-  ).child({ $label, $threadId: threadId })
+  )
+}
+
+export const forkLogger = (
+  logger: Logger,
+  label: string | undefined,
+  options?: ChildLoggerOptions,
+  bindings?: Bindings,
+) => {
+  const _bindings = { ...bindings }
+  if (label !== undefined) _bindings.$label = label
+  return logger.child(_bindings, options)
 }
 
 export type CreateConsolePrettyDestination = (
@@ -121,9 +133,12 @@ export const createConsolePrettyDestination: CreateConsolePrettyDestination = (
     ignore: 'hostname,$label,$threadId',
     errorLikeObjectKeys: ['err', 'error', 'cause'],
     messageFormat: (log, messageKey) => {
-      const group = fg(`[${log.$label}]`, 11)
-      const msg = fg(log[messageKey], messageColors[log.level as number])
-      const thread = fg(`(Thread-${log.$threadId})`, 89)
+      const group = fg(`[${String(log.$label)}]`, 11)
+      const msg = fg(
+        String(log[messageKey]),
+        messageColors[log.level as number],
+      )
+      const thread = fg(`(T-${String(log.$threadId)})`, 89)
       return `\x1b[0m${thread} ${group} ${msg}`
     },
     customPrettifiers: {

package/src/metadata.ts

@@ -1,18 +1,14 @@
-import type { MaybePromise } from '@nmtjs/common'
-
 import type {
   Dependant,
   Dependencies,
-  DependencyContext,
+  Handler,
+  HandlerFn,
   LazyInjectable,
   ResolveInjectableType,
 } from './injectables.ts'
 import { kMetaBinding, kMetadata } from './constants.ts'
 import { Scope } from './enums.ts'
-import {
-  createLazyInjectable,
-  createOptionalInjectable,
-} from './injectables.ts'
+import { createLazyInjectable } from './injectables.ts'
 
 export enum MetadataKind {
   STATIC = 'STATIC',
@@ -55,8 +51,7 @@ type MetaBindingToken<T extends AnyMeta = AnyMeta> = {
 }
 
 export interface StaticMetaBinding<T extends AnyMeta = AnyMeta>
-  extends Dependant<{}>,
-    MetaBindingToken<T> {
+  extends Dependant<{}>, MetaBindingToken<T> {
   readonly kind: MetadataKind.STATIC
   readonly value: ResolveInjectableType<T>
 }
@@ -67,15 +62,12 @@ export interface MetaFactoryBinding<
   Phase extends MetaPhase = MetaPhase,
   Call = unknown,
   Input = unknown,
-> extends Dependant<Deps>,
+>
+  extends
+    Handler<Deps, [call: Call, input: Input], ResolveInjectableType<T>>,
     MetaBindingToken<T> {
   readonly kind: MetadataKind.FACTORY
   readonly phase: Phase
-  readonly resolve: (
-    context: DependencyContext<Deps>,
-    call: Call,
-    input: Input,
-  ) => MaybePromise<ResolveInjectableType<T>>
 }
 
 export type BeforeDecodeMetaBinding<
@@ -107,20 +99,12 @@ export type MetaFactoryMethod<Value, Call = unknown> = {
   <Deps extends Dependencies = {}>(params: {
     dependencies?: Deps
     phase?: 'beforeDecode'
-    resolve: (
-      context: DependencyContext<Deps>,
-      call: Call,
-      payload: unknown,
-    ) => MaybePromise<Value>
+    handler: HandlerFn<Deps, [call: Call, payload: unknown], Value>
   }): BeforeDecodeMetaBinding<MetaToken<Value>, Deps, Call>
   <Deps extends Dependencies = {}, Input = unknown>(params: {
     dependencies?: Deps
     phase: 'afterDecode'
-    resolve: (
-      context: DependencyContext<Deps>,
-      call: Call,
-      input: Input,
-    ) => MaybePromise<Value>
+    handler: HandlerFn<Deps, [call: Call, input: Input], Value>
   }): AfterDecodeMetaBinding<MetaToken<Value>, Deps, Call, Input>
 }
 
@@ -153,7 +137,6 @@ export function createMeta<
     ...injectable,
     [kMetadata]: true as const,
     $withType: () => meta as any,
-    optional: () => createOptionalInjectable(meta),
     static: (value: Value) =>
       Object.freeze({
         dependencies: {},
@@ -164,17 +147,13 @@ export function createMeta<
     factory: ((params: {
       dependencies?: Dependencies
       phase?: MetaPhase
-      resolve: (
-        context: DependencyContext<any>,
-        call: Call,
-        input: unknown,
-      ) => unknown
+      handler: HandlerFn<any, [call: Call, input: unknown], unknown>
     }) => {
       return Object.freeze({
         dependencies: params.dependencies ?? {},
+        handler: params.handler,
         kind: MetadataKind.FACTORY,
         phase: params.phase ?? 'beforeDecode',
-        resolve: params.resolve,
         [kMetaBinding]: meta,
       })
     }) as MetaFactoryMethod<Value, Call>,

package/dist/utils/functions.d.ts

@@ -1,7 +0,0 @@
-export { match } from '@nmtjs/common';
-export declare function isJsFile(name: string): boolean;
-export declare function pick<T extends object, K extends {
-    [KK in keyof T as T[KK] extends (...args: any[]) => any ? never : KK]?: true;
-}>(obj: T, keys: K): Pick<T, keyof {
-    [KK in keyof K as K[KK] extends true ? KK : never]: K[KK];
-}>;

package/dist/utils/functions.js

@@ -1,18 +0,0 @@
-export { match } from '@nmtjs/common';
-export function isJsFile(name) {
-    if (name.endsWith('.d.ts'))
-        return false;
-    const leading = name.split('.').slice(1);
-    const ext = leading.join('.');
-    return ['js', 'mjs', 'cjs', 'ts', 'mts', 'cts'].includes(ext);
-}
-export function pick(obj, keys) {
-    const result = {};
-    for (const key in keys) {
-        if (key in obj) {
-            result[key] = obj[key];
-        }
-    }
-    return result;
-}
-//# sourceMappingURL=functions.js.map

package/dist/utils/functions.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"functions.js","sourceRoot":"","sources":["../../src/utils/functions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAA;AAErC,MAAM,UAAU,QAAQ,CAAC,IAAY;IACnC,IAAI,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC;QAAE,OAAO,KAAK,CAAA;IACxC,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;IACxC,MAAM,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IAC7B,OAAO,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAA;AAC/D,CAAC;AAED,MAAM,UAAU,IAAI,CAMlB,GAAM,EACN,IAAO;IAOP,MAAM,MAAM,GAAG,EAAS,CAAA;IACxB,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;QACvB,IAAI,GAAG,IAAI,GAAG,EAAE,CAAC;YACf,MAAM,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,GAAkC,CAAC,CAAA;QACvD,CAAC;IACH,CAAC;IACD,OAAO,MAAM,CAAA;AACf,CAAC"}

package/dist/utils/index.d.ts

@@ -1,3 +0,0 @@
-export * from './functions.ts';
-export * from './pool.ts';
-export * from './semaphore.ts';

package/dist/utils/index.js

@@ -1,4 +0,0 @@
-export * from './functions.js';
-export * from './pool.js';
-export * from './semaphore.js';
-//# sourceMappingURL=index.js.map

package/dist/utils/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAA;AAC9B,cAAc,WAAW,CAAA;AACzB,cAAc,gBAAgB,CAAA"}

package/dist/utils/pool.d.ts

@@ -1,18 +0,0 @@
-interface PoolOptions {
-    timeout?: number;
-}
-export declare class PoolError extends Error {
-}
-export declare class Pool<T = unknown> {
-    #private;
-    private readonly options;
-    constructor(options?: PoolOptions);
-    add(item: T): void;
-    remove(item: T): void;
-    capture(timeout?: number | undefined): Promise<T>;
-    next(exclusive?: boolean, timeout?: number | undefined): Promise<T>;
-    release(item: T): void;
-    isFree(item: T): boolean;
-    get items(): T[];
-}
-export {};

package/dist/utils/pool.js

@@ -1,106 +0,0 @@
-export class PoolError extends Error {
-}
-// Fixed pool from https://github.com/metarhia/metautil
-export class Pool {
-    options;
-    #items = [];
-    #free = [];
-    #queue = [];
-    #current = 0;
-    #size = 0;
-    #available = 0;
-    constructor(options = {}) {
-        this.options = options;
-    }
-    add(item) {
-        if (this.#items.includes(item))
-            throw new PoolError('Item already exists');
-        this.#size++;
-        this.#available++;
-        this.#items.push(item);
-        this.#free.push(true);
-    }
-    remove(item) {
-        if (this.#size === 0)
-            throw new PoolError('Pool is empty');
-        const index = this.#items.indexOf(item);
-        if (index < 0)
-            throw new PoolError('Item is not in the pool');
-        const isCaptured = this.isFree(item);
-        if (isCaptured)
-            this.#available--;
-        this.#size--;
-        this.#current--;
-        this.#items.splice(index, 1);
-        this.#free.splice(index, 1);
-    }
-    capture(timeout = this.options.timeout) {
-        return this.next(true, timeout);
-    }
-    async next(exclusive = false, timeout = this.options.timeout) {
-        if (this.#size === 0)
-            throw new PoolError('Pool is empty');
-        if (this.#available === 0) {
-            return new Promise((resolve, reject) => {
-                const waiting = {
-                    resolve: (item) => {
-                        if (exclusive)
-                            this.#capture(item);
-                        resolve(item);
-                    },
-                    timer: undefined,
-                };
-                if (timeout) {
-                    waiting.timer = setTimeout(() => {
-                        waiting.resolve = undefined;
-                        this.#queue.shift();
-                        reject(new PoolError('Next item timeout'));
-                    }, timeout);
-                }
-                this.#queue.push(waiting);
-            });
-        }
-        let item;
-        let free = false;
-        do {
-            item = this.#items[this.#current];
-            free = this.#free[this.#current];
-            this.#current++;
-            if (this.#current >= this.#size)
-                this.#current = 0;
-        } while (typeof item === 'undefined' || !free);
-        if (exclusive)
-            this.#capture(item);
-        return item;
-    }
-    release(item) {
-        const index = this.#items.indexOf(item);
-        if (index < 0)
-            throw new PoolError('Unexpected item');
-        if (this.#free[index])
-            throw new PoolError('Unable to release not captured item');
-        this.#free[index] = true;
-        this.#available++;
-        if (this.#queue.length > 0) {
-            const { resolve, timer } = this.#queue.shift();
-            clearTimeout(timer);
-            if (resolve)
-                setTimeout(resolve, 0, item);
-        }
-    }
-    isFree(item) {
-        const index = this.#items.indexOf(item);
-        if (index < 0)
-            return false;
-        return this.#free[index];
-    }
-    get items() {
-        return [...this.#items];
-    }
-    #capture(item) {
-        const index = this.#items.indexOf(item);
-        this.#free[index] = false;
-        this.#available--;
-    }
-}
-//# sourceMappingURL=pool.js.map

package/dist/utils/pool.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"pool.js","sourceRoot":"","sources":["../../src/utils/pool.ts"],"names":[],"mappings":"AAWA,MAAM,OAAO,SAAU,SAAQ,KAAK;CAAG;AAEvC,uDAAuD;AACvD,MAAM,OAAO,IAAI;IAQc,OAAO;IAPpC,MAAM,GAAa,EAAE,CAAA;IACrB,KAAK,GAAmB,EAAE,CAAA;IAC1B,MAAM,GAAoB,EAAE,CAAA;IAC5B,QAAQ,GAAW,CAAC,CAAA;IACpB,KAAK,GAAW,CAAC,CAAA;IACjB,UAAU,GAAW,CAAC,CAAA;IAEtB,YAA6B,OAAO,GAAgB,EAAE;uBAAzB,OAAO;IAAqB,CAAC;IAE1D,GAAG,CAAC,IAAO;QACT,IAAI,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC;YAAE,MAAM,IAAI,SAAS,CAAC,qBAAqB,CAAC,CAAA;QAC1E,IAAI,CAAC,KAAK,EAAE,CAAA;QACZ,IAAI,CAAC,UAAU,EAAE,CAAA;QACjB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QACtB,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IACvB,CAAC;IAED,MAAM,CAAC,IAAO;QACZ,IAAI,IAAI,CAAC,KAAK,KAAK,CAAC;YAAE,MAAM,IAAI,SAAS,CAAC,eAAe,CAAC,CAAA;QAC1D,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;QACvC,IAAI,KAAK,GAAG,CAAC;YAAE,MAAM,IAAI,SAAS,CAAC,yBAAyB,CAAC,CAAA;QAC7D,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;QACpC,IAAI,UAAU;YAAE,IAAI,CAAC,UAAU,EAAE,CAAA;QACjC,IAAI,CAAC,KAAK,EAAE,CAAA;QACZ,IAAI,CAAC,QAAQ,EAAE,CAAA;QACf,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAA;QAC5B,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAA;IAC7B,CAAC;IAED,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO;QACpC,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAA;IACjC,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,SAAS,GAAG,KAAK,EAAE,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO;QAC1D,IAAI,IAAI,CAAC,KAAK,KAAK,CAAC;YAAE,MAAM,IAAI,SAAS,CAAC,eAAe,CAAC,CAAA;QAC1D,IAAI,IAAI,CAAC,UAAU,KAAK,CAAC,EAAE,CAAC;YAC1B,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;gBACrC,MAAM,OAAO,GAAkB;oBAC7B,OAAO,EAAE,CAAC,IAAO,EAAE,EAAE;wBACnB,IAAI,SAAS;4BAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;wBAClC,OAAO,CAAC,IAAI,CAAC,CAAA;oBACf,CAAC;oBACD,KAAK,EAAE,SAAS;iBACjB,CAAA;gBACD,IAAI,OAAO,EAAE,CAAC;oBACZ,OAAO,CAAC,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE;wBAC9B,OAAO,CAAC,OAAO,GAAG,SAAS,CAAA;wBAC3B,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAA;wBACnB,MAAM,CAAC,IAAI,SAAS,CAAC,mBAAmB,CAAC,CAAC,CAAA;oBAC5C,CAAC,EAAE,OAAO,CAAC,CAAA;gBACb,CAAC;gBACD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;YAC3B,CAAC,CAAC,CAAA;QACJ,CAAC;QACD,IAAI,IAAmB,CAAA;QACvB,IAAI,IAAI,GAAG,KAAK,CAAA;QAChB,GAAG,CAAC;YACF,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;YACjC,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;YAChC,IAAI,CAAC,QAAQ,EAAE,CAAA;YACf,IAAI,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,KAAK;gBAAE,IAAI,CAAC,QAAQ,GAAG,CAAC,CAAA;QACpD,CAAC,QAAQ,OAAO,IAAI,KAAK,WAAW,IAAI,CAAC,IAAI,EAAC;QAC9C,IAAI,SAAS;YAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;QAClC,OAAO,IAAI,CAAA;IACb,CAAC;IAED,OAAO,CAAC,IAAO;QACb,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;QACvC,IAAI,KAAK,GAAG,CAAC;YAAE,MAAM,IAAI,SAAS,CAAC,iBAAiB,CAAC,CAAA;QACrD,IAAI,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC;YACnB,MAAM,IAAI,SAAS,CAAC,qCAAqC,CAAC,CAAA;QAC5D,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,IAAI,CAAA;QACxB,IAAI,CAAC,UAAU,EAAE,CAAA;QACjB,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC3B,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,EAAG,CAAA;YAC/C,YAAY,CAAC,KAAK,CAAC,CAAA;YACnB,IAAI,OAAO;gBAAE,UAAU,CAAC,OAAO,EAAE,CAAC,EAAE,IAAI,CAAC,CAAA;QAC3C,CAAC;IACH,CAAC;IAED,MAAM,CAAC,IAAO;QACZ,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;QACvC,IAAI,KAAK,GAAG,CAAC;YAAE,OAAO,KAAK,CAAA;QAC3B,OAAO,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;IAC1B,CAAC;IAED,IAAI,KAAK;QACP,OAAO,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,CAAA;IACzB,CAAC;IAED,QAAQ,CAAC,IAAO;QACd,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;QACvC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,KAAK,CAAA;QACzB,IAAI,CAAC,UAAU,EAAE,CAAA;IACnB,CAAC;CACF"}

package/dist/utils/semaphore.d.ts

@@ -1,13 +0,0 @@
-export declare class SemaphoreError extends Error {
-}
-export declare class Semaphore {
-    private readonly size;
-    private readonly timeout;
-    private counter;
-    private readonly queue;
-    constructor(concurrency: number, size?: number, timeout?: number);
-    enter(): Promise<void>;
-    leave(): void;
-    get isEmpty(): boolean;
-    get queueLength(): number;
-}

package/dist/utils/semaphore.js

@@ -1,56 +0,0 @@
-export class SemaphoreError extends Error {
-}
-// Semaphore from https://github.com/metarhia/metautil
-export class Semaphore {
-    size;
-    timeout;
-    counter;
-    queue = [];
-    constructor(concurrency, size = 0, timeout = 0) {
-        this.size = size;
-        this.timeout = timeout;
-        this.counter = concurrency;
-    }
-    enter() {
-        if (this.counter > 0) {
-            this.counter--;
-            return Promise.resolve();
-        }
-        else if (this.queue.length >= this.size) {
-            return Promise.reject(new SemaphoreError('Queue is full'));
-        }
-        else {
-            return new Promise((resolve, reject) => {
-                const waiting = { resolve };
-                waiting.timer = setTimeout(() => {
-                    waiting.resolve = undefined;
-                    this.queue.shift();
-                    reject(new SemaphoreError('Timeout'));
-                }, this.timeout);
-                this.queue.push(waiting);
-            });
-        }
-    }
-    leave() {
-        if (this.queue.length === 0) {
-            this.counter++;
-        }
-        else {
-            const item = this.queue.shift();
-            if (item) {
-                const { resolve, timer } = item;
-                if (timer)
-                    clearTimeout(timer);
-                if (resolve)
-                    setTimeout(resolve, 0);
-            }
-        }
-    }
-    get isEmpty() {
-        return this.queue.length === 0;
-    }
-    get queueLength() {
-        return this.queue.length;
-    }
-}
-//# sourceMappingURL=semaphore.js.map

package/dist/utils/semaphore.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"semaphore.js","sourceRoot":"","sources":["../../src/utils/semaphore.ts"],"names":[],"mappings":"AAOA,MAAM,OAAO,cAAe,SAAQ,KAAK;CAAG;AAE5C,sDAAsD;AACtD,MAAM,OAAO,SAAS;IAOD,IAAI;IACJ,OAAO;IAPlB,OAAO,CAAQ;IAEN,KAAK,GAAyB,EAAE,CAAA;IAEjD,YACE,WAAmB,EACF,IAAI,GAAW,CAAC,EAChB,OAAO,GAAW,CAAC;oBADnB,IAAI;uBACJ,OAAO;QAExB,IAAI,CAAC,OAAO,GAAG,WAAW,CAAA;IAC5B,CAAC;IAED,KAAK;QACH,IAAI,IAAI,CAAC,OAAO,GAAG,CAAC,EAAE,CAAC;YACrB,IAAI,CAAC,OAAO,EAAE,CAAA;YACd,OAAO,OAAO,CAAC,OAAO,EAAE,CAAA;QAC1B,CAAC;aAAM,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;YAC1C,OAAO,OAAO,CAAC,MAAM,CAAC,IAAI,cAAc,CAAC,eAAe,CAAC,CAAC,CAAA;QAC5D,CAAC;aAAM,CAAC;YACN,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;gBACrC,MAAM,OAAO,GAAuB,EAAE,OAAO,EAAE,CAAA;gBAC/C,OAAO,CAAC,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE;oBAC9B,OAAO,CAAC,OAAO,GAAG,SAAS,CAAA;oBAC3B,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAA;oBAClB,MAAM,CAAC,IAAI,cAAc,CAAC,SAAS,CAAC,CAAC,CAAA;gBACvC,CAAC,EAAE,IAAI,CAAC,OAAO,CAAC,CAAA;gBAChB,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;YAC1B,CAAC,CAAC,CAAA;QACJ,CAAC;IACH,CAAC;IAED,KAAK;QACH,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC5B,IAAI,CAAC,OAAO,EAAE,CAAA;QAChB,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAA;YAC/B,IAAI,IAAI,EAAE,CAAC;gBACT,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,IAAI,CAAA;gBAC/B,IAAI,KAAK;oBAAE,YAAY,CAAC,KAAK,CAAC,CAAA;gBAC9B,IAAI,OAAO;oBAAE,UAAU,CAAC,OAAO,EAAE,CAAC,CAAC,CAAA;YACrC,CAAC;QACH,CAAC;IACH,CAAC;IAED,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,CAAA;IAChC,CAAC;IAED,IAAI,WAAW;QACb,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,CAAA;IAC1B,CAAC;CACF"}