@unional/async-context 3.1.0 → 3.1.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.
@@ -4,7 +4,7 @@ export declare class AsyncContext<Init extends Record<string | symbol, any>, Con
4
4
  private init?;
5
5
  private transformers;
6
6
  private resolving;
7
- private resolve;
7
+ private resolvers;
8
8
  constructor(init?: Init | Promise<Init> | AsyncContext.Initializer<Init> | undefined);
9
9
  initialize<I extends Init = Init>(init: I | Promise<I> | AsyncContext.Initializer<I>): AsyncContext<I>;
10
10
  extend<CurrentContext extends Record<string | symbol, any> = Context, AdditionalContext extends Record<string | symbol, any> = Record<string | symbol, any>>(context: AdditionalContext | Promise<AdditionalContext> | AsyncContext.Transformer<CurrentContext, AdditionalContext>): AsyncContext<Init, LeftJoin<CurrentContext, AdditionalContext>>;
@@ -1 +1 @@
1
- {"version":3,"file":"AsyncContext.d.ts","sourceRoot":"","sources":["../ts/AsyncContext.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAA;AAGpC,qBAAa,YAAY,CACvB,IAAI,SAAS,MAAM,CAAC,MAAM,GAAG,MAAM,EAAE,GAAG,CAAC,EACzC,OAAO,SAAS,MAAM,CAAC,MAAM,GAAG,MAAM,EAAE,GAAG,CAAC,GAAG,IAAI;;IAKvC,OAAO,CAAC,IAAI,CAAC;IAHzB,OAAO,CAAC,YAAY,CAAgD;IACpE,OAAO,CAAC,SAAS,CAA0B;IAC3C,OAAO,CAAC,OAAO,CAA6D;gBACxD,IAAI,CAAC,mEAAuD;IAChF,UAAU,CAAC,CAAC,SAAS,IAAI,GAAG,IAAI,EAAE,IAAI,EAAE,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,GAAG,YAAY,CAAC,WAAW,CAAC,CAAC,CAAC,GAAG,YAAY,CAAC,CAAC,CAAC;IAOtG,MAAM,CACJ,cAAc,SAAS,MAAM,CAAC,MAAM,GAAG,MAAM,EAAE,GAAG,CAAC,GAAG,OAAO,EAC7D,iBAAiB,SAAS,MAAM,CAAC,MAAM,GAAG,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM,CAAC,MAAM,GAAG,MAAM,EAAE,GAAG,CAAC,EAErF,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,iBAAiB,CAAC,GAAG,YAAY,CAAC,WAAW,CAAC,cAAc,EAAE,iBAAiB,CAAC,GACpH,YAAY,CAAC,IAAI,EAAE,QAAQ,CAAC,cAAc,EAAE,iBAAiB,CAAC,CAAC;IAIlE,KAAK;IAGC,GAAG,CAAC,CAAC,GAAG,OAAO,KAAK,OAAO,CAAC,CAAC,CAAC;CAUrC;AACD,yBAAiB,YAAY,CAAC;IAC5B,KAAY,WAAW,CAAC,IAAI,IAAI,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IAC1D,KAAY,WAAW,CACrB,cAAc,EACd,iBAAiB,IACb,CAAC,OAAO,EAAE,cAAc,KAAK,iBAAiB,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAA;CAClF"}
1
+ {"version":3,"file":"AsyncContext.d.ts","sourceRoot":"","sources":["../ts/AsyncContext.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAA;AAGpC,qBAAa,YAAY,CACvB,IAAI,SAAS,MAAM,CAAC,MAAM,GAAG,MAAM,EAAE,GAAG,CAAC,EACzC,OAAO,SAAS,MAAM,CAAC,MAAM,GAAG,MAAM,EAAE,GAAG,CAAC,GAAG,IAAI;;IAKvC,OAAO,CAAC,IAAI,CAAC;IAHzB,OAAO,CAAC,YAAY,CAAgD;IACpE,OAAO,CAAC,SAAS,CAA0B;IAC3C,OAAO,CAAC,SAAS,CAAiD;gBAC9C,IAAI,CAAC,mEAAuD;IAChF,UAAU,CAAC,CAAC,SAAS,IAAI,GAAG,IAAI,EAAE,IAAI,EAAE,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,GAAG,YAAY,CAAC,WAAW,CAAC,CAAC,CAAC,GAAG,YAAY,CAAC,CAAC,CAAC;IAOtG,MAAM,CACJ,cAAc,SAAS,MAAM,CAAC,MAAM,GAAG,MAAM,EAAE,GAAG,CAAC,GAAG,OAAO,EAC7D,iBAAiB,SAAS,MAAM,CAAC,MAAM,GAAG,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM,CAAC,MAAM,GAAG,MAAM,EAAE,GAAG,CAAC,EAErF,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,iBAAiB,CAAC,GAAG,YAAY,CAAC,WAAW,CAAC,cAAc,EAAE,iBAAiB,CAAC,GACpH,YAAY,CAAC,IAAI,EAAE,QAAQ,CAAC,cAAc,EAAE,iBAAiB,CAAC,CAAC;IAKlE,KAAK;IAGC,GAAG,CAAC,CAAC,GAAG,OAAO,KAAK,OAAO,CAAC,CAAC,CAAC;CAUrC;AACD,yBAAiB,YAAY,CAAC;IAC5B,KAAY,WAAW,CAAC,IAAI,IAAI,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IAC1D,KAAY,WAAW,CACrB,cAAc,EACd,iBAAiB,IACb,CAAC,OAAO,EAAE,cAAc,KAAK,iBAAiB,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAA;CAClF"}
@@ -29,23 +29,24 @@ class AsyncContext {
29
29
  writable: true,
30
30
  value: void 0
31
31
  });
32
- Object.defineProperty(this, "resolve", {
32
+ Object.defineProperty(this, "resolvers", {
33
33
  enumerable: true,
34
34
  configurable: true,
35
35
  writable: true,
36
- value: undefined
36
+ value: []
37
37
  });
38
38
  }
39
39
  initialize(init) {
40
40
  if (this.init)
41
41
  throw new errors_1.ContextAlreadyInitialized();
42
42
  this.init = init;
43
- if (this.resolve)
44
- this.resolve(__classPrivateFieldGet(this, _AsyncContext_instances, "m", _AsyncContext_buildContext).call(this));
43
+ if (this.resolvers.length > 0)
44
+ this.resolvers.forEach(r => r(__classPrivateFieldGet(this, _AsyncContext_instances, "m", _AsyncContext_buildContext).call(this)));
45
45
  return this;
46
46
  }
47
47
  extend(context) {
48
48
  this.transformers.push(isTransformer(context) ? context : () => context);
49
+ this.resolving = undefined;
49
50
  return this;
50
51
  }
51
52
  clone() {
@@ -54,7 +55,7 @@ class AsyncContext {
54
55
  async get() {
55
56
  if (this.resolving)
56
57
  return this.resolving;
57
- return this.resolving = this.init ? __classPrivateFieldGet(this, _AsyncContext_instances, "m", _AsyncContext_buildContext).call(this) : new Promise(a => this.resolve = a);
58
+ return this.resolving = this.init ? __classPrivateFieldGet(this, _AsyncContext_instances, "m", _AsyncContext_buildContext).call(this) : new Promise(a => this.resolvers.push(a));
58
59
  }
59
60
  }
60
61
  exports.AsyncContext = AsyncContext;
@@ -1 +1 @@
1
- {"version":3,"file":"AsyncContext.js","sourceRoot":"","sources":["../ts/AsyncContext.ts"],"names":[],"mappings":";;;;;;;;;AACA,qCAAoD;AAEpD,MAAa,YAAY;IAOvB,YAAoB,IAA4D;;;;;;mBAA5D;;QAHpB;;;;mBAAkE,EAAE;WAAA;QACpE;;;;;WAA2C;QAC3C;;;;mBAAmE,SAAS;WAAA;IACQ,CAAC;IACrF,UAAU,CAAwB,IAAkD;QAClF,IAAI,IAAI,CAAC,IAAI;YAAE,MAAM,IAAI,kCAAyB,EAAE,CAAA;QACpD,IAAI,CAAC,IAAI,GAAG,IAAI,CAAA;QAEhB,IAAI,IAAI,CAAC,OAAO;YAAE,IAAI,CAAC,OAAO,CAAC,uBAAA,IAAI,2DAAc,MAAlB,IAAI,CAAgB,CAAC,CAAA;QACpD,OAAO,IAAuB,CAAA;IAChC,CAAC;IACD,MAAM,CAIJ,OAAqH;QAErH,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,CAAA;QACxE,OAAO,IAAuE,CAAA;IAChF,CAAC;IACD,KAAK;QACH,OAAO,IAAI,YAAY,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAA;IAC3C,CAAC;IACD,KAAK,CAAC,GAAG;QACP,IAAI,IAAI,CAAC,SAAS;YAAE,OAAO,IAAI,CAAC,SAAS,CAAA;QACzC,OAAO,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,uBAAA,IAAI,2DAAc,MAAlB,IAAI,CAAgB,CAAC,CAAC,CAAC,IAAI,OAAO,CAAM,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,GAAG,CAAC,CAAC,CAAA;IACpG,CAAC;CAOF;AArCD,oCAqCC;sEANC,KAAK;IACH,OAAO,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE;QAC7C,MAAM,CAAC,GAAG,MAAM,CAAC,CAAA;QACjB,OAAO,EAAE,GAAG,CAAC,EAAE,GAAG,MAAM,CAAC,CAAC,CAAC,CAAQ,EAAE,CAAA;IACvC,CAAC,EAAE,WAAW,CAAC,IAAI,CAAC,IAAK,CAAC,CAAqB,CAAA;AACjD,CAAC;AAUH,KAAK,UAAU,WAAW,CAEtB,IAA2D;IAC7D,OAAO,aAAa,CAAO,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,CAAA;AAClD,CAAC;AAED,SAAS,aAAa,CAGpB,OAAgB;IAChB,OAAO,OAAO,OAAO,KAAK,UAAU,CAAA;AACtC,CAAC;AAED,SAAS,aAAa,CAAI,OAAgB;IACxC,OAAO,OAAO,OAAO,KAAK,UAAU,CAAA;AACtC,CAAC","sourcesContent":["import { LeftJoin } from 'type-plus'\nimport { ContextAlreadyInitialized } from './errors'\n\nexport class AsyncContext<\n Init extends Record<string | symbol, any>,\n Context extends Record<string | symbol, any> = Init\n > {\n private transformers: Array<AsyncContext.Transformer<any, any>> = []\n private resolving: Promise<any> | undefined\n private resolve: ((value: Promise<Context>) => void) | undefined = undefined\n constructor(private init?: Init | Promise<Init> | AsyncContext.Initializer<Init>) { }\n initialize<I extends Init = Init>(init: I | Promise<I> | AsyncContext.Initializer<I>): AsyncContext<I> {\n if (this.init) throw new ContextAlreadyInitialized()\n this.init = init\n\n if (this.resolve) this.resolve(this.#buildContext())\n return this as AsyncContext<I>\n }\n extend<\n CurrentContext extends Record<string | symbol, any> = Context,\n AdditionalContext extends Record<string | symbol, any> = Record<string | symbol, any>\n >(\n context: AdditionalContext | Promise<AdditionalContext> | AsyncContext.Transformer<CurrentContext, AdditionalContext>\n ): AsyncContext<Init, LeftJoin<CurrentContext, AdditionalContext>> {\n this.transformers.push(isTransformer(context) ? context : () => context)\n return this as AsyncContext<Init, LeftJoin<CurrentContext, AdditionalContext>>\n }\n clone() {\n return new AsyncContext(() => this.get())\n }\n async get<C = Context>(): Promise<C> {\n if (this.resolving) return this.resolving\n return this.resolving = this.init ? this.#buildContext() : new Promise<any>(a => this.resolve = a)\n }\n async #buildContext(): Promise<Context> {\n return this.transformers.reduce(async (p, t) => {\n const c = await p\n return { ...c, ...await t(c) as any }\n }, resolveInit(this.init!)) as Promise<Context>\n }\n}\nexport namespace AsyncContext {\n export type Initializer<Init> = () => Init | Promise<Init>\n export type Transformer<\n CurrentContext,\n AdditionalContext\n > = (context: CurrentContext) => AdditionalContext | Promise<AdditionalContext>\n}\n\nasync function resolveInit<\n Init extends Record<string | symbol, any>,\n >(init: Init | Promise<Init> | AsyncContext.Initializer<Init>): Promise<Init> {\n return isInitializer<Init>(init) ? init() : init\n}\n\nfunction isTransformer<\n CurrentContext,\n AdditionalContext\n>(context: unknown): context is AsyncContext.Transformer<CurrentContext, AdditionalContext> {\n return typeof context === 'function'\n}\n\nfunction isInitializer<T>(context: unknown): context is AsyncContext.Initializer<T> {\n return typeof context === 'function'\n}\n"]}
1
+ {"version":3,"file":"AsyncContext.js","sourceRoot":"","sources":["../ts/AsyncContext.ts"],"names":[],"mappings":";;;;;;;;;AACA,qCAAoD;AAEpD,MAAa,YAAY;IAOvB,YAAoB,IAA4D;;;;;;mBAA5D;;QAHpB;;;;mBAAkE,EAAE;WAAA;QACpE;;;;;WAA2C;QAC3C;;;;mBAAgE,EAAE;WAAA;IACkB,CAAC;IACrF,UAAU,CAAwB,IAAkD;QAClF,IAAI,IAAI,CAAC,IAAI;YAAE,MAAM,IAAI,kCAAyB,EAAE,CAAA;QACpD,IAAI,CAAC,IAAI,GAAG,IAAI,CAAA;QAEhB,IAAI,IAAI,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC;YAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,uBAAA,IAAI,2DAAc,MAAlB,IAAI,CAAgB,CAAC,CAAC,CAAA;QACnF,OAAO,IAAuB,CAAA;IAChC,CAAC;IACD,MAAM,CAIJ,OAAqH;QAErH,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,CAAA;QACxE,IAAI,CAAC,SAAS,GAAG,SAAS,CAAA;QAC1B,OAAO,IAAuE,CAAA;IAChF,CAAC;IACD,KAAK;QACH,OAAO,IAAI,YAAY,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAA;IAC3C,CAAC;IACD,KAAK,CAAC,GAAG;QACP,IAAI,IAAI,CAAC,SAAS;YAAE,OAAO,IAAI,CAAC,SAAS,CAAA;QACzC,OAAO,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,uBAAA,IAAI,2DAAc,MAAlB,IAAI,CAAgB,CAAC,CAAC,CAAC,IAAI,OAAO,CAAM,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAA;IAC1G,CAAC;CAOF;AAtCD,oCAsCC;sEANC,KAAK;IACH,OAAO,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE;QAC7C,MAAM,CAAC,GAAG,MAAM,CAAC,CAAA;QACjB,OAAO,EAAE,GAAG,CAAC,EAAE,GAAG,MAAM,CAAC,CAAC,CAAC,CAAQ,EAAE,CAAA;IACvC,CAAC,EAAE,WAAW,CAAC,IAAI,CAAC,IAAK,CAAC,CAAqB,CAAA;AACjD,CAAC;AAUH,KAAK,UAAU,WAAW,CAEtB,IAA2D;IAC7D,OAAO,aAAa,CAAO,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,CAAA;AAClD,CAAC;AAED,SAAS,aAAa,CAGpB,OAAgB;IAChB,OAAO,OAAO,OAAO,KAAK,UAAU,CAAA;AACtC,CAAC;AAED,SAAS,aAAa,CAAI,OAAgB;IACxC,OAAO,OAAO,OAAO,KAAK,UAAU,CAAA;AACtC,CAAC","sourcesContent":["import { LeftJoin } from 'type-plus'\nimport { ContextAlreadyInitialized } from './errors'\n\nexport class AsyncContext<\n Init extends Record<string | symbol, any>,\n Context extends Record<string | symbol, any> = Init\n > {\n private transformers: Array<AsyncContext.Transformer<any, any>> = []\n private resolving: Promise<any> | undefined\n private resolvers: Array<((value: Promise<Context>) => void)> = []\n constructor(private init?: Init | Promise<Init> | AsyncContext.Initializer<Init>) { }\n initialize<I extends Init = Init>(init: I | Promise<I> | AsyncContext.Initializer<I>): AsyncContext<I> {\n if (this.init) throw new ContextAlreadyInitialized()\n this.init = init\n\n if (this.resolvers.length > 0) this.resolvers.forEach(r => r(this.#buildContext()))\n return this as AsyncContext<I>\n }\n extend<\n CurrentContext extends Record<string | symbol, any> = Context,\n AdditionalContext extends Record<string | symbol, any> = Record<string | symbol, any>\n >(\n context: AdditionalContext | Promise<AdditionalContext> | AsyncContext.Transformer<CurrentContext, AdditionalContext>\n ): AsyncContext<Init, LeftJoin<CurrentContext, AdditionalContext>> {\n this.transformers.push(isTransformer(context) ? context : () => context)\n this.resolving = undefined\n return this as AsyncContext<Init, LeftJoin<CurrentContext, AdditionalContext>>\n }\n clone() {\n return new AsyncContext(() => this.get())\n }\n async get<C = Context>(): Promise<C> {\n if (this.resolving) return this.resolving\n return this.resolving = this.init ? this.#buildContext() : new Promise<any>(a => this.resolvers.push(a))\n }\n async #buildContext(): Promise<Context> {\n return this.transformers.reduce(async (p, t) => {\n const c = await p\n return { ...c, ...await t(c) as any }\n }, resolveInit(this.init!)) as Promise<Context>\n }\n}\nexport namespace AsyncContext {\n export type Initializer<Init> = () => Init | Promise<Init>\n export type Transformer<\n CurrentContext,\n AdditionalContext\n > = (context: CurrentContext) => AdditionalContext | Promise<AdditionalContext>\n}\n\nasync function resolveInit<\n Init extends Record<string | symbol, any>,\n >(init: Init | Promise<Init> | AsyncContext.Initializer<Init>): Promise<Init> {\n return isInitializer<Init>(init) ? init() : init\n}\n\nfunction isTransformer<\n CurrentContext,\n AdditionalContext\n>(context: unknown): context is AsyncContext.Transformer<CurrentContext, AdditionalContext> {\n return typeof context === 'function'\n}\n\nfunction isInitializer<T>(context: unknown): context is AsyncContext.Initializer<T> {\n return typeof context === 'function'\n}\n"]}
@@ -4,7 +4,7 @@ export declare class AsyncContext<Init extends Record<string | symbol, any>, Con
4
4
  private init?;
5
5
  private transformers;
6
6
  private resolving;
7
- private resolve;
7
+ private resolvers;
8
8
  constructor(init?: Init | Promise<Init> | AsyncContext.Initializer<Init> | undefined);
9
9
  initialize<I extends Init = Init>(init: I | Promise<I> | AsyncContext.Initializer<I>): AsyncContext<I>;
10
10
  extend<CurrentContext extends Record<string | symbol, any> = Context, AdditionalContext extends Record<string | symbol, any> = Record<string | symbol, any>>(context: AdditionalContext | Promise<AdditionalContext> | AsyncContext.Transformer<CurrentContext, AdditionalContext>): AsyncContext<Init, LeftJoin<CurrentContext, AdditionalContext>>;
@@ -1 +1 @@
1
- {"version":3,"file":"AsyncContext.d.ts","sourceRoot":"","sources":["../ts/AsyncContext.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAA;AAGpC,qBAAa,YAAY,CACvB,IAAI,SAAS,MAAM,CAAC,MAAM,GAAG,MAAM,EAAE,GAAG,CAAC,EACzC,OAAO,SAAS,MAAM,CAAC,MAAM,GAAG,MAAM,EAAE,GAAG,CAAC,GAAG,IAAI;;IAKvC,OAAO,CAAC,IAAI,CAAC;IAHzB,OAAO,CAAC,YAAY,CAAgD;IACpE,OAAO,CAAC,SAAS,CAA0B;IAC3C,OAAO,CAAC,OAAO,CAA6D;gBACxD,IAAI,CAAC,mEAAuD;IAChF,UAAU,CAAC,CAAC,SAAS,IAAI,GAAG,IAAI,EAAE,IAAI,EAAE,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,GAAG,YAAY,CAAC,WAAW,CAAC,CAAC,CAAC,GAAG,YAAY,CAAC,CAAC,CAAC;IAOtG,MAAM,CACJ,cAAc,SAAS,MAAM,CAAC,MAAM,GAAG,MAAM,EAAE,GAAG,CAAC,GAAG,OAAO,EAC7D,iBAAiB,SAAS,MAAM,CAAC,MAAM,GAAG,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM,CAAC,MAAM,GAAG,MAAM,EAAE,GAAG,CAAC,EAErF,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,iBAAiB,CAAC,GAAG,YAAY,CAAC,WAAW,CAAC,cAAc,EAAE,iBAAiB,CAAC,GACpH,YAAY,CAAC,IAAI,EAAE,QAAQ,CAAC,cAAc,EAAE,iBAAiB,CAAC,CAAC;IAIlE,KAAK;IAGC,GAAG,CAAC,CAAC,GAAG,OAAO,KAAK,OAAO,CAAC,CAAC,CAAC;CAUrC;AACD,yBAAiB,YAAY,CAAC;IAC5B,KAAY,WAAW,CAAC,IAAI,IAAI,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IAC1D,KAAY,WAAW,CACrB,cAAc,EACd,iBAAiB,IACb,CAAC,OAAO,EAAE,cAAc,KAAK,iBAAiB,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAA;CAClF"}
1
+ {"version":3,"file":"AsyncContext.d.ts","sourceRoot":"","sources":["../ts/AsyncContext.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAA;AAGpC,qBAAa,YAAY,CACvB,IAAI,SAAS,MAAM,CAAC,MAAM,GAAG,MAAM,EAAE,GAAG,CAAC,EACzC,OAAO,SAAS,MAAM,CAAC,MAAM,GAAG,MAAM,EAAE,GAAG,CAAC,GAAG,IAAI;;IAKvC,OAAO,CAAC,IAAI,CAAC;IAHzB,OAAO,CAAC,YAAY,CAAgD;IACpE,OAAO,CAAC,SAAS,CAA0B;IAC3C,OAAO,CAAC,SAAS,CAAiD;gBAC9C,IAAI,CAAC,mEAAuD;IAChF,UAAU,CAAC,CAAC,SAAS,IAAI,GAAG,IAAI,EAAE,IAAI,EAAE,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,GAAG,YAAY,CAAC,WAAW,CAAC,CAAC,CAAC,GAAG,YAAY,CAAC,CAAC,CAAC;IAOtG,MAAM,CACJ,cAAc,SAAS,MAAM,CAAC,MAAM,GAAG,MAAM,EAAE,GAAG,CAAC,GAAG,OAAO,EAC7D,iBAAiB,SAAS,MAAM,CAAC,MAAM,GAAG,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM,CAAC,MAAM,GAAG,MAAM,EAAE,GAAG,CAAC,EAErF,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,iBAAiB,CAAC,GAAG,YAAY,CAAC,WAAW,CAAC,cAAc,EAAE,iBAAiB,CAAC,GACpH,YAAY,CAAC,IAAI,EAAE,QAAQ,CAAC,cAAc,EAAE,iBAAiB,CAAC,CAAC;IAKlE,KAAK;IAGC,GAAG,CAAC,CAAC,GAAG,OAAO,KAAK,OAAO,CAAC,CAAC,CAAC;CAUrC;AACD,yBAAiB,YAAY,CAAC;IAC5B,KAAY,WAAW,CAAC,IAAI,IAAI,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IAC1D,KAAY,WAAW,CACrB,cAAc,EACd,iBAAiB,IACb,CAAC,OAAO,EAAE,cAAc,KAAK,iBAAiB,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAA;CAClF"}
@@ -26,23 +26,24 @@ export class AsyncContext {
26
26
  writable: true,
27
27
  value: void 0
28
28
  });
29
- Object.defineProperty(this, "resolve", {
29
+ Object.defineProperty(this, "resolvers", {
30
30
  enumerable: true,
31
31
  configurable: true,
32
32
  writable: true,
33
- value: undefined
33
+ value: []
34
34
  });
35
35
  }
36
36
  initialize(init) {
37
37
  if (this.init)
38
38
  throw new ContextAlreadyInitialized();
39
39
  this.init = init;
40
- if (this.resolve)
41
- this.resolve(__classPrivateFieldGet(this, _AsyncContext_instances, "m", _AsyncContext_buildContext).call(this));
40
+ if (this.resolvers.length > 0)
41
+ this.resolvers.forEach(r => r(__classPrivateFieldGet(this, _AsyncContext_instances, "m", _AsyncContext_buildContext).call(this)));
42
42
  return this;
43
43
  }
44
44
  extend(context) {
45
45
  this.transformers.push(isTransformer(context) ? context : () => context);
46
+ this.resolving = undefined;
46
47
  return this;
47
48
  }
48
49
  clone() {
@@ -51,7 +52,7 @@ export class AsyncContext {
51
52
  async get() {
52
53
  if (this.resolving)
53
54
  return this.resolving;
54
- return this.resolving = this.init ? __classPrivateFieldGet(this, _AsyncContext_instances, "m", _AsyncContext_buildContext).call(this) : new Promise(a => this.resolve = a);
55
+ return this.resolving = this.init ? __classPrivateFieldGet(this, _AsyncContext_instances, "m", _AsyncContext_buildContext).call(this) : new Promise(a => this.resolvers.push(a));
55
56
  }
56
57
  }
57
58
  _AsyncContext_instances = new WeakSet(), _AsyncContext_buildContext = async function _AsyncContext_buildContext() {
@@ -1 +1 @@
1
- {"version":3,"file":"AsyncContext.js","sourceRoot":"","sources":["../ts/AsyncContext.ts"],"names":[],"mappings":";;;;;;AACA,OAAO,EAAE,yBAAyB,EAAE,MAAM,UAAU,CAAA;AAEpD,MAAM,OAAO,YAAY;IAOvB,YAAoB,IAA4D;;;;;;mBAA5D;;QAHpB;;;;mBAAkE,EAAE;WAAA;QACpE;;;;;WAA2C;QAC3C;;;;mBAAmE,SAAS;WAAA;IACQ,CAAC;IACrF,UAAU,CAAwB,IAAkD;QAClF,IAAI,IAAI,CAAC,IAAI;YAAE,MAAM,IAAI,yBAAyB,EAAE,CAAA;QACpD,IAAI,CAAC,IAAI,GAAG,IAAI,CAAA;QAEhB,IAAI,IAAI,CAAC,OAAO;YAAE,IAAI,CAAC,OAAO,CAAC,uBAAA,IAAI,2DAAc,MAAlB,IAAI,CAAgB,CAAC,CAAA;QACpD,OAAO,IAAuB,CAAA;IAChC,CAAC;IACD,MAAM,CAIJ,OAAqH;QAErH,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,CAAA;QACxE,OAAO,IAAuE,CAAA;IAChF,CAAC;IACD,KAAK;QACH,OAAO,IAAI,YAAY,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAA;IAC3C,CAAC;IACD,KAAK,CAAC,GAAG;QACP,IAAI,IAAI,CAAC,SAAS;YAAE,OAAO,IAAI,CAAC,SAAS,CAAA;QACzC,OAAO,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,uBAAA,IAAI,2DAAc,MAAlB,IAAI,CAAgB,CAAC,CAAC,CAAC,IAAI,OAAO,CAAM,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,GAAG,CAAC,CAAC,CAAA;IACpG,CAAC;CAOF;sEANC,KAAK;IACH,OAAO,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE;QAC7C,MAAM,CAAC,GAAG,MAAM,CAAC,CAAA;QACjB,OAAO,EAAE,GAAG,CAAC,EAAE,GAAG,MAAM,CAAC,CAAC,CAAC,CAAQ,EAAE,CAAA;IACvC,CAAC,EAAE,WAAW,CAAC,IAAI,CAAC,IAAK,CAAC,CAAqB,CAAA;AACjD,CAAC;AAUH,KAAK,UAAU,WAAW,CAEtB,IAA2D;IAC7D,OAAO,aAAa,CAAO,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,CAAA;AAClD,CAAC;AAED,SAAS,aAAa,CAGpB,OAAgB;IAChB,OAAO,OAAO,OAAO,KAAK,UAAU,CAAA;AACtC,CAAC;AAED,SAAS,aAAa,CAAI,OAAgB;IACxC,OAAO,OAAO,OAAO,KAAK,UAAU,CAAA;AACtC,CAAC","sourcesContent":["import { LeftJoin } from 'type-plus'\nimport { ContextAlreadyInitialized } from './errors'\n\nexport class AsyncContext<\n Init extends Record<string | symbol, any>,\n Context extends Record<string | symbol, any> = Init\n > {\n private transformers: Array<AsyncContext.Transformer<any, any>> = []\n private resolving: Promise<any> | undefined\n private resolve: ((value: Promise<Context>) => void) | undefined = undefined\n constructor(private init?: Init | Promise<Init> | AsyncContext.Initializer<Init>) { }\n initialize<I extends Init = Init>(init: I | Promise<I> | AsyncContext.Initializer<I>): AsyncContext<I> {\n if (this.init) throw new ContextAlreadyInitialized()\n this.init = init\n\n if (this.resolve) this.resolve(this.#buildContext())\n return this as AsyncContext<I>\n }\n extend<\n CurrentContext extends Record<string | symbol, any> = Context,\n AdditionalContext extends Record<string | symbol, any> = Record<string | symbol, any>\n >(\n context: AdditionalContext | Promise<AdditionalContext> | AsyncContext.Transformer<CurrentContext, AdditionalContext>\n ): AsyncContext<Init, LeftJoin<CurrentContext, AdditionalContext>> {\n this.transformers.push(isTransformer(context) ? context : () => context)\n return this as AsyncContext<Init, LeftJoin<CurrentContext, AdditionalContext>>\n }\n clone() {\n return new AsyncContext(() => this.get())\n }\n async get<C = Context>(): Promise<C> {\n if (this.resolving) return this.resolving\n return this.resolving = this.init ? this.#buildContext() : new Promise<any>(a => this.resolve = a)\n }\n async #buildContext(): Promise<Context> {\n return this.transformers.reduce(async (p, t) => {\n const c = await p\n return { ...c, ...await t(c) as any }\n }, resolveInit(this.init!)) as Promise<Context>\n }\n}\nexport namespace AsyncContext {\n export type Initializer<Init> = () => Init | Promise<Init>\n export type Transformer<\n CurrentContext,\n AdditionalContext\n > = (context: CurrentContext) => AdditionalContext | Promise<AdditionalContext>\n}\n\nasync function resolveInit<\n Init extends Record<string | symbol, any>,\n >(init: Init | Promise<Init> | AsyncContext.Initializer<Init>): Promise<Init> {\n return isInitializer<Init>(init) ? init() : init\n}\n\nfunction isTransformer<\n CurrentContext,\n AdditionalContext\n>(context: unknown): context is AsyncContext.Transformer<CurrentContext, AdditionalContext> {\n return typeof context === 'function'\n}\n\nfunction isInitializer<T>(context: unknown): context is AsyncContext.Initializer<T> {\n return typeof context === 'function'\n}\n"]}
1
+ {"version":3,"file":"AsyncContext.js","sourceRoot":"","sources":["../ts/AsyncContext.ts"],"names":[],"mappings":";;;;;;AACA,OAAO,EAAE,yBAAyB,EAAE,MAAM,UAAU,CAAA;AAEpD,MAAM,OAAO,YAAY;IAOvB,YAAoB,IAA4D;;;;;;mBAA5D;;QAHpB;;;;mBAAkE,EAAE;WAAA;QACpE;;;;;WAA2C;QAC3C;;;;mBAAgE,EAAE;WAAA;IACkB,CAAC;IACrF,UAAU,CAAwB,IAAkD;QAClF,IAAI,IAAI,CAAC,IAAI;YAAE,MAAM,IAAI,yBAAyB,EAAE,CAAA;QACpD,IAAI,CAAC,IAAI,GAAG,IAAI,CAAA;QAEhB,IAAI,IAAI,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC;YAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,uBAAA,IAAI,2DAAc,MAAlB,IAAI,CAAgB,CAAC,CAAC,CAAA;QACnF,OAAO,IAAuB,CAAA;IAChC,CAAC;IACD,MAAM,CAIJ,OAAqH;QAErH,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,CAAA;QACxE,IAAI,CAAC,SAAS,GAAG,SAAS,CAAA;QAC1B,OAAO,IAAuE,CAAA;IAChF,CAAC;IACD,KAAK;QACH,OAAO,IAAI,YAAY,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAA;IAC3C,CAAC;IACD,KAAK,CAAC,GAAG;QACP,IAAI,IAAI,CAAC,SAAS;YAAE,OAAO,IAAI,CAAC,SAAS,CAAA;QACzC,OAAO,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,uBAAA,IAAI,2DAAc,MAAlB,IAAI,CAAgB,CAAC,CAAC,CAAC,IAAI,OAAO,CAAM,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAA;IAC1G,CAAC;CAOF;sEANC,KAAK;IACH,OAAO,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE;QAC7C,MAAM,CAAC,GAAG,MAAM,CAAC,CAAA;QACjB,OAAO,EAAE,GAAG,CAAC,EAAE,GAAG,MAAM,CAAC,CAAC,CAAC,CAAQ,EAAE,CAAA;IACvC,CAAC,EAAE,WAAW,CAAC,IAAI,CAAC,IAAK,CAAC,CAAqB,CAAA;AACjD,CAAC;AAUH,KAAK,UAAU,WAAW,CAEtB,IAA2D;IAC7D,OAAO,aAAa,CAAO,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,CAAA;AAClD,CAAC;AAED,SAAS,aAAa,CAGpB,OAAgB;IAChB,OAAO,OAAO,OAAO,KAAK,UAAU,CAAA;AACtC,CAAC;AAED,SAAS,aAAa,CAAI,OAAgB;IACxC,OAAO,OAAO,OAAO,KAAK,UAAU,CAAA;AACtC,CAAC","sourcesContent":["import { LeftJoin } from 'type-plus'\nimport { ContextAlreadyInitialized } from './errors'\n\nexport class AsyncContext<\n Init extends Record<string | symbol, any>,\n Context extends Record<string | symbol, any> = Init\n > {\n private transformers: Array<AsyncContext.Transformer<any, any>> = []\n private resolving: Promise<any> | undefined\n private resolvers: Array<((value: Promise<Context>) => void)> = []\n constructor(private init?: Init | Promise<Init> | AsyncContext.Initializer<Init>) { }\n initialize<I extends Init = Init>(init: I | Promise<I> | AsyncContext.Initializer<I>): AsyncContext<I> {\n if (this.init) throw new ContextAlreadyInitialized()\n this.init = init\n\n if (this.resolvers.length > 0) this.resolvers.forEach(r => r(this.#buildContext()))\n return this as AsyncContext<I>\n }\n extend<\n CurrentContext extends Record<string | symbol, any> = Context,\n AdditionalContext extends Record<string | symbol, any> = Record<string | symbol, any>\n >(\n context: AdditionalContext | Promise<AdditionalContext> | AsyncContext.Transformer<CurrentContext, AdditionalContext>\n ): AsyncContext<Init, LeftJoin<CurrentContext, AdditionalContext>> {\n this.transformers.push(isTransformer(context) ? context : () => context)\n this.resolving = undefined\n return this as AsyncContext<Init, LeftJoin<CurrentContext, AdditionalContext>>\n }\n clone() {\n return new AsyncContext(() => this.get())\n }\n async get<C = Context>(): Promise<C> {\n if (this.resolving) return this.resolving\n return this.resolving = this.init ? this.#buildContext() : new Promise<any>(a => this.resolvers.push(a))\n }\n async #buildContext(): Promise<Context> {\n return this.transformers.reduce(async (p, t) => {\n const c = await p\n return { ...c, ...await t(c) as any }\n }, resolveInit(this.init!)) as Promise<Context>\n }\n}\nexport namespace AsyncContext {\n export type Initializer<Init> = () => Init | Promise<Init>\n export type Transformer<\n CurrentContext,\n AdditionalContext\n > = (context: CurrentContext) => AdditionalContext | Promise<AdditionalContext>\n}\n\nasync function resolveInit<\n Init extends Record<string | symbol, any>,\n >(init: Init | Promise<Init> | AsyncContext.Initializer<Init>): Promise<Init> {\n return isInitializer<Init>(init) ? init() : init\n}\n\nfunction isTransformer<\n CurrentContext,\n AdditionalContext\n>(context: unknown): context is AsyncContext.Transformer<CurrentContext, AdditionalContext> {\n return typeof context === 'function'\n}\n\nfunction isInitializer<T>(context: unknown): context is AsyncContext.Initializer<T> {\n return typeof context === 'function'\n}\n"]}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@unional/async-context",
3
- "version": "3.1.0",
3
+ "version": "3.1.1",
4
4
  "description": "Asynchronous context for functional style programming",
5
5
  "keywords": [
6
6
  "async",
@@ -7,13 +7,13 @@ export class AsyncContext<
7
7
  > {
8
8
  private transformers: Array<AsyncContext.Transformer<any, any>> = []
9
9
  private resolving: Promise<any> | undefined
10
- private resolve: ((value: Promise<Context>) => void) | undefined = undefined
10
+ private resolvers: Array<((value: Promise<Context>) => void)> = []
11
11
  constructor(private init?: Init | Promise<Init> | AsyncContext.Initializer<Init>) { }
12
12
  initialize<I extends Init = Init>(init: I | Promise<I> | AsyncContext.Initializer<I>): AsyncContext<I> {
13
13
  if (this.init) throw new ContextAlreadyInitialized()
14
14
  this.init = init
15
15
 
16
- if (this.resolve) this.resolve(this.#buildContext())
16
+ if (this.resolvers.length > 0) this.resolvers.forEach(r => r(this.#buildContext()))
17
17
  return this as AsyncContext<I>
18
18
  }
19
19
  extend<
@@ -23,6 +23,7 @@ export class AsyncContext<
23
23
  context: AdditionalContext | Promise<AdditionalContext> | AsyncContext.Transformer<CurrentContext, AdditionalContext>
24
24
  ): AsyncContext<Init, LeftJoin<CurrentContext, AdditionalContext>> {
25
25
  this.transformers.push(isTransformer(context) ? context : () => context)
26
+ this.resolving = undefined
26
27
  return this as AsyncContext<Init, LeftJoin<CurrentContext, AdditionalContext>>
27
28
  }
28
29
  clone() {
@@ -30,7 +31,7 @@ export class AsyncContext<
30
31
  }
31
32
  async get<C = Context>(): Promise<C> {
32
33
  if (this.resolving) return this.resolving
33
- return this.resolving = this.init ? this.#buildContext() : new Promise<any>(a => this.resolve = a)
34
+ return this.resolving = this.init ? this.#buildContext() : new Promise<any>(a => this.resolvers.push(a))
34
35
  }
35
36
  async #buildContext(): Promise<Context> {
36
37
  return this.transformers.reduce(async (p, t) => {