@arinoto/cdk-arch 0.6.0 → 0.7.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.
@@ -0,0 +1,4 @@
1
+ export type RuntimeContext = Record<string, unknown>;
2
+ export declare function getCurrentContext(): RuntimeContext | undefined;
3
+ export declare function runWithContext<T>(ctx: RuntimeContext, fn: () => Promise<T>): Promise<T>;
4
+ //# sourceMappingURL=context.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../src/context.ts"],"names":[],"mappings":"AAEA,MAAM,MAAM,cAAc,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAIrD,wBAAgB,iBAAiB,IAAI,cAAc,GAAG,SAAS,CAE9D;AAED,wBAAgB,cAAc,CAAC,CAAC,EAAE,GAAG,EAAE,cAAc,EAAE,EAAE,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAEvF"}
@@ -0,0 +1,13 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.getCurrentContext = getCurrentContext;
4
+ exports.runWithContext = runWithContext;
5
+ const async_hooks_1 = require("async_hooks");
6
+ const als = new async_hooks_1.AsyncLocalStorage();
7
+ function getCurrentContext() {
8
+ return als.getStore();
9
+ }
10
+ function runWithContext(ctx, fn) {
11
+ return als.run(ctx, fn);
12
+ }
13
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udGV4dC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9jb250ZXh0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBTUEsOENBRUM7QUFFRCx3Q0FFQztBQVpELDZDQUFnRDtBQUloRCxNQUFNLEdBQUcsR0FBRyxJQUFJLCtCQUFpQixFQUFrQixDQUFDO0FBRXBELFNBQWdCLGlCQUFpQjtJQUMvQixPQUFPLEdBQUcsQ0FBQyxRQUFRLEVBQUUsQ0FBQztBQUN4QixDQUFDO0FBRUQsU0FBZ0IsY0FBYyxDQUFJLEdBQW1CLEVBQUUsRUFBb0I7SUFDekUsT0FBTyxHQUFHLENBQUMsR0FBRyxDQUFDLEdBQUcsRUFBRSxFQUFFLENBQUMsQ0FBQztBQUMxQixDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgQXN5bmNMb2NhbFN0b3JhZ2UgfSBmcm9tICdhc3luY19ob29rcyc7XG5cbmV4cG9ydCB0eXBlIFJ1bnRpbWVDb250ZXh0ID0gUmVjb3JkPHN0cmluZywgdW5rbm93bj47XG5cbmNvbnN0IGFscyA9IG5ldyBBc3luY0xvY2FsU3RvcmFnZTxSdW50aW1lQ29udGV4dD4oKTtcblxuZXhwb3J0IGZ1bmN0aW9uIGdldEN1cnJlbnRDb250ZXh0KCk6IFJ1bnRpbWVDb250ZXh0IHwgdW5kZWZpbmVkIHtcbiAgcmV0dXJuIGFscy5nZXRTdG9yZSgpO1xufVxuXG5leHBvcnQgZnVuY3Rpb24gcnVuV2l0aENvbnRleHQ8VD4oY3R4OiBSdW50aW1lQ29udGV4dCwgZm46ICgpID0+IFByb21pc2U8VD4pOiBQcm9taXNlPFQ+IHtcbiAgcmV0dXJuIGFscy5ydW4oY3R4LCBmbik7XG59XG4iXX0=
@@ -1,13 +1,10 @@
1
1
  import { Construct } from 'constructs';
2
2
  export type FunctionHandler<TArgs extends any[] = any[], TReturn = any> = (...args: TArgs) => Promise<TReturn>;
3
- export type FunctionRuntimeContextMarker = {
4
- runtimeContext?: boolean;
5
- };
6
3
  /**
7
4
  * Represents a serverless function or handler in the architecture.
8
5
  * Generic over argument types (TArgs) and return type (TReturn).
9
6
  */
10
- export declare class Function<TArgs extends any[] = any[], TReturn = any, TRuntimeContext extends FunctionRuntimeContextMarker = any> extends Construct {
7
+ export declare class Function<TArgs extends any[] = any[], TReturn = any> extends Construct {
11
8
  readonly handler: FunctionHandler<TArgs, TReturn>;
12
9
  private _overload?;
13
10
  constructor(scope: Construct, id: string, handler: FunctionHandler<TArgs, TReturn>);
@@ -18,7 +15,6 @@ export declare class Function<TArgs extends any[] = any[], TReturn = any, TRunti
18
15
  overload(handler: FunctionHandler<TArgs, TReturn>): void;
19
16
  hasOverload(): boolean;
20
17
  invoke(...args: TArgs): Promise<TReturn>;
21
- invokeWithRuntimeContext(args: TArgs, ctx: TRuntimeContext): Promise<TReturn>;
22
18
  }
23
19
  /**
24
20
  * A placeholder function that must be overloaded before use.
@@ -1 +1 @@
1
- {"version":3,"file":"function.d.ts","sourceRoot":"","sources":["../src/function.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEvC,MAAM,MAAM,eAAe,CAAC,KAAK,SAAS,GAAG,EAAE,GAAG,GAAG,EAAE,EAAE,OAAO,GAAG,GAAG,IAAI,CAAC,GAAG,IAAI,EAAE,KAAK,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;AAE/G,MAAM,MAAM,4BAA4B,GAAG;IAAE,cAAc,CAAC,EAAE,OAAO,CAAA;CAAC,CAAC;AAEvE;;;GAGG;AACH,qBAAa,QAAQ,CAAC,KAAK,SAAS,GAAG,EAAE,GAAG,GAAG,EAAE,EAAE,OAAO,GAAG,GAAG,EAAE,eAAe,SAAS,4BAA4B,GAAG,GAAG,CAAE,SAAQ,SAAS;IAC7I,SAAgB,OAAO,EAAE,eAAe,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IACzD,OAAO,CAAC,SAAS,CAAC,CAAkC;gBAExC,KAAK,EAAE,SAAS,EAAE,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,eAAe,CAAC,KAAK,EAAE,OAAO,CAAC;IAKlF;;;OAGG;IACH,QAAQ,CAAC,OAAO,EAAE,eAAe,CAAC,KAAK,EAAE,OAAO,CAAC,GAAG,IAAI;IAIxD,WAAW,IAAI,OAAO;IAIf,MAAM,CAAC,GAAG,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC;IAKxC,wBAAwB,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,EAAE,eAAe,GAAG,OAAO,CAAC,OAAO,CAAC;CAIrF;AAED;;;GAGG;AACH,qBAAa,WAAW,CAAC,KAAK,SAAS,GAAG,EAAE,GAAG,GAAG,EAAE,EAAE,OAAO,GAAG,GAAG,CAAE,SAAQ,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC;gBACvF,KAAK,EAAE,SAAS,EAAE,EAAE,EAAE,MAAM;CAGzC"}
1
+ {"version":3,"file":"function.d.ts","sourceRoot":"","sources":["../src/function.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEvC,MAAM,MAAM,eAAe,CAAC,KAAK,SAAS,GAAG,EAAE,GAAG,GAAG,EAAE,EAAE,OAAO,GAAG,GAAG,IAAI,CAAC,GAAG,IAAI,EAAE,KAAK,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;AAE/G;;;GAGG;AACH,qBAAa,QAAQ,CAAC,KAAK,SAAS,GAAG,EAAE,GAAG,GAAG,EAAE,EAAE,OAAO,GAAG,GAAG,CAAE,SAAQ,SAAS;IACjF,SAAgB,OAAO,EAAE,eAAe,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IACzD,OAAO,CAAC,SAAS,CAAC,CAAkC;gBAExC,KAAK,EAAE,SAAS,EAAE,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,eAAe,CAAC,KAAK,EAAE,OAAO,CAAC;IAKlF;;;OAGG;IACH,QAAQ,CAAC,OAAO,EAAE,eAAe,CAAC,KAAK,EAAE,OAAO,CAAC,GAAG,IAAI;IAIxD,WAAW,IAAI,OAAO;IAIf,MAAM,CAAC,GAAG,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC;CAKhD;AAED;;;GAGG;AACH,qBAAa,WAAW,CAAC,KAAK,SAAS,GAAG,EAAE,GAAG,GAAG,EAAE,EAAE,OAAO,GAAG,GAAG,CAAE,SAAQ,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC;gBACvF,KAAK,EAAE,SAAS,EAAE,EAAE,EAAE,MAAM;CAGzC"}
package/dist/function.js CHANGED
@@ -25,10 +25,6 @@ class Function extends constructs_1.Construct {
25
25
  const fn = this._overload ?? this.handler;
26
26
  return fn(...args);
27
27
  }
28
- invokeWithRuntimeContext(args, ctx) {
29
- const fn = this._overload ?? this.handler;
30
- return fn.apply({ runtimeContext: true, ...ctx }, args);
31
- }
32
28
  }
33
29
  exports.Function = Function;
34
30
  /**
@@ -41,4 +37,4 @@ class TBDFunction extends Function {
41
37
  }
42
38
  }
43
39
  exports.TBDFunction = TBDFunction;
44
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZnVuY3Rpb24uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvZnVuY3Rpb24udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsMkNBQXVDO0FBTXZDOzs7R0FHRztBQUNILE1BQWEsUUFBaUgsU0FBUSxzQkFBUztJQUk3SSxZQUFZLEtBQWdCLEVBQUUsRUFBVSxFQUFFLE9BQXdDO1FBQ2hGLEtBQUssQ0FBQyxLQUFLLEVBQUUsRUFBRSxDQUFDLENBQUM7UUFDakIsSUFBSSxDQUFDLE9BQU8sR0FBRyxPQUFPLENBQUM7SUFDekIsQ0FBQztJQUVEOzs7T0FHRztJQUNILFFBQVEsQ0FBQyxPQUF3QztRQUMvQyxJQUFJLENBQUMsU0FBUyxHQUFHLE9BQU8sQ0FBQztJQUMzQixDQUFDO0lBRUQsV0FBVztRQUNULE9BQU8sSUFBSSxDQUFDLFNBQVMsS0FBSyxTQUFTLENBQUM7SUFDdEMsQ0FBQztJQUVNLE1BQU0sQ0FBQyxHQUFHLElBQVc7UUFDMUIsTUFBTSxFQUFFLEdBQUcsSUFBSSxDQUFDLFNBQVMsSUFBSSxJQUFJLENBQUMsT0FBTyxDQUFDO1FBQzFDLE9BQU8sRUFBRSxDQUFDLEdBQUcsSUFBSSxDQUFDLENBQUM7SUFDckIsQ0FBQztJQUVNLHdCQUF3QixDQUFDLElBQVcsRUFBRSxHQUFvQjtRQUMvRCxNQUFNLEVBQUUsR0FBRyxJQUFJLENBQUMsU0FBUyxJQUFJLElBQUksQ0FBQyxPQUFPLENBQUM7UUFDMUMsT0FBTyxFQUFFLENBQUMsS0FBSyxDQUFDLEVBQUUsY0FBYyxFQUFFLElBQUksRUFBRSxHQUFHLEdBQUcsRUFBRSxFQUFFLElBQUksQ0FBQyxDQUFDO0lBQzFELENBQUM7Q0FDRjtBQTlCRCw0QkE4QkM7QUFFRDs7O0dBR0c7QUFDSCxNQUFhLFdBQXdELFNBQVEsUUFBd0I7SUFDbkcsWUFBWSxLQUFnQixFQUFFLEVBQVU7UUFDdEMsS0FBSyxDQUFDLEtBQUssRUFBRSxFQUFFLEVBQUUsQ0FBQyxHQUFHLEVBQUUsQ0FBQyxPQUFPLENBQUMsTUFBTSxDQUFDLElBQUksS0FBSyxDQUFDLGFBQWEsRUFBRSw0REFBNEQsQ0FBQyxDQUFDLENBQW9DLENBQUMsQ0FBQztJQUN0SyxDQUFDO0NBQ0Y7QUFKRCxrQ0FJQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IENvbnN0cnVjdCB9IGZyb20gJ2NvbnN0cnVjdHMnO1xuXG5leHBvcnQgdHlwZSBGdW5jdGlvbkhhbmRsZXI8VEFyZ3MgZXh0ZW5kcyBhbnlbXSA9IGFueVtdLCBUUmV0dXJuID0gYW55PiA9ICguLi5hcmdzOiBUQXJncykgPT4gUHJvbWlzZTxUUmV0dXJuPjtcblxuZXhwb3J0IHR5cGUgRnVuY3Rpb25SdW50aW1lQ29udGV4dE1hcmtlciA9IHsgcnVudGltZUNvbnRleHQ/OiBib29sZWFufTtcblxuLyoqXG4gKiBSZXByZXNlbnRzIGEgc2VydmVybGVzcyBmdW5jdGlvbiBvciBoYW5kbGVyIGluIHRoZSBhcmNoaXRlY3R1cmUuXG4gKiBHZW5lcmljIG92ZXIgYXJndW1lbnQgdHlwZXMgKFRBcmdzKSBhbmQgcmV0dXJuIHR5cGUgKFRSZXR1cm4pLlxuICovXG5leHBvcnQgY2xhc3MgRnVuY3Rpb248VEFyZ3MgZXh0ZW5kcyBhbnlbXSA9IGFueVtdLCBUUmV0dXJuID0gYW55LCBUUnVudGltZUNvbnRleHQgZXh0ZW5kcyBGdW5jdGlvblJ1bnRpbWVDb250ZXh0TWFya2VyID0gYW55PiBleHRlbmRzIENvbnN0cnVjdCB7XG4gIHB1YmxpYyByZWFkb25seSBoYW5kbGVyOiBGdW5jdGlvbkhhbmRsZXI8VEFyZ3MsIFRSZXR1cm4+O1xuICBwcml2YXRlIF9vdmVybG9hZD86IEZ1bmN0aW9uSGFuZGxlcjxUQXJncywgVFJldHVybj47XG5cbiAgY29uc3RydWN0b3Ioc2NvcGU6IENvbnN0cnVjdCwgaWQ6IHN0cmluZywgaGFuZGxlcjogRnVuY3Rpb25IYW5kbGVyPFRBcmdzLCBUUmV0dXJuPikge1xuICAgIHN1cGVyKHNjb3BlLCBpZCk7XG4gICAgdGhpcy5oYW5kbGVyID0gaGFuZGxlcjtcbiAgfVxuXG4gIC8qKlxuICAgKiBPdmVycmlkZSB0aGUgZnVuY3Rpb24ncyBpbXBsZW1lbnRhdGlvbiBhdCBydW50aW1lLlxuICAgKiBVc2VkIGZvciByZXBsYWNpbmcgaW4tbWVtb3J5IGltcGxlbWVudGF0aW9ucyB3aXRoIHN0b3JhZ2UgYWRhcHRlcnMgb3IgSFRUUCBjYWxscy5cbiAgICovXG4gIG92ZXJsb2FkKGhhbmRsZXI6IEZ1bmN0aW9uSGFuZGxlcjxUQXJncywgVFJldHVybj4pOiB2b2lkIHtcbiAgICB0aGlzLl9vdmVybG9hZCA9IGhhbmRsZXI7XG4gIH1cblxuICBoYXNPdmVybG9hZCgpOiBib29sZWFuIHtcbiAgICByZXR1cm4gdGhpcy5fb3ZlcmxvYWQgIT09IHVuZGVmaW5lZDtcbiAgfVxuXG4gIHB1YmxpYyBpbnZva2UoLi4uYXJnczogVEFyZ3MpOiBQcm9taXNlPFRSZXR1cm4+IHtcbiAgICBjb25zdCBmbiA9IHRoaXMuX292ZXJsb2FkID8/IHRoaXMuaGFuZGxlcjtcbiAgICByZXR1cm4gZm4oLi4uYXJncyk7XG4gIH1cblxuICBwdWJsaWMgaW52b2tlV2l0aFJ1bnRpbWVDb250ZXh0KGFyZ3M6IFRBcmdzLCBjdHg6IFRSdW50aW1lQ29udGV4dCk6IFByb21pc2U8VFJldHVybj4ge1xuICAgIGNvbnN0IGZuID0gdGhpcy5fb3ZlcmxvYWQgPz8gdGhpcy5oYW5kbGVyO1xuICAgIHJldHVybiBmbi5hcHBseSh7IHJ1bnRpbWVDb250ZXh0OiB0cnVlLCAuLi5jdHggfSwgYXJncyk7XG4gIH1cbn1cblxuLyoqXG4gKiBBIHBsYWNlaG9sZGVyIGZ1bmN0aW9uIHRoYXQgbXVzdCBiZSBvdmVybG9hZGVkIGJlZm9yZSB1c2UuXG4gKiBVc2UgdGhpcyB3aGVuIGRlZmluaW5nIGFuIEFQSSBjb250cmFjdCB3aXRob3V0IHByb3ZpZGluZyBhbiBpbXBsZW1lbnRhdGlvbi5cbiAqL1xuZXhwb3J0IGNsYXNzIFRCREZ1bmN0aW9uPFRBcmdzIGV4dGVuZHMgYW55W10gPSBhbnlbXSwgVFJldHVybiA9IGFueT4gZXh0ZW5kcyBGdW5jdGlvbjxUQXJncywgVFJldHVybj4ge1xuICBjb25zdHJ1Y3RvcihzY29wZTogQ29uc3RydWN0LCBpZDogc3RyaW5nKSB7XG4gICAgc3VwZXIoc2NvcGUsIGlkLCAoKCkgPT4gUHJvbWlzZS5yZWplY3QobmV3IEVycm9yKGBGdW5jdGlvbiAnJHtpZH0nIGlzIG5vdCBpbXBsZW1lbnRlZC4gUHJvdmlkZSBhbiBvdmVybG9hZCBiZWZvcmUgaW52b2tpbmcuYCkpKSBhcyBGdW5jdGlvbkhhbmRsZXI8VEFyZ3MsIFRSZXR1cm4+KTtcbiAgfVxufVxuIl19
40
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZnVuY3Rpb24uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvZnVuY3Rpb24udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsMkNBQXVDO0FBSXZDOzs7R0FHRztBQUNILE1BQWEsUUFBcUQsU0FBUSxzQkFBUztJQUlqRixZQUFZLEtBQWdCLEVBQUUsRUFBVSxFQUFFLE9BQXdDO1FBQ2hGLEtBQUssQ0FBQyxLQUFLLEVBQUUsRUFBRSxDQUFDLENBQUM7UUFDakIsSUFBSSxDQUFDLE9BQU8sR0FBRyxPQUFPLENBQUM7SUFDekIsQ0FBQztJQUVEOzs7T0FHRztJQUNILFFBQVEsQ0FBQyxPQUF3QztRQUMvQyxJQUFJLENBQUMsU0FBUyxHQUFHLE9BQU8sQ0FBQztJQUMzQixDQUFDO0lBRUQsV0FBVztRQUNULE9BQU8sSUFBSSxDQUFDLFNBQVMsS0FBSyxTQUFTLENBQUM7SUFDdEMsQ0FBQztJQUVNLE1BQU0sQ0FBQyxHQUFHLElBQVc7UUFDMUIsTUFBTSxFQUFFLEdBQUcsSUFBSSxDQUFDLFNBQVMsSUFBSSxJQUFJLENBQUMsT0FBTyxDQUFDO1FBQzFDLE9BQU8sRUFBRSxDQUFDLEdBQUcsSUFBSSxDQUFDLENBQUM7SUFDckIsQ0FBQztDQUVGO0FBMUJELDRCQTBCQztBQUVEOzs7R0FHRztBQUNILE1BQWEsV0FBd0QsU0FBUSxRQUF3QjtJQUNuRyxZQUFZLEtBQWdCLEVBQUUsRUFBVTtRQUN0QyxLQUFLLENBQUMsS0FBSyxFQUFFLEVBQUUsRUFBRSxDQUFDLEdBQUcsRUFBRSxDQUFDLE9BQU8sQ0FBQyxNQUFNLENBQUMsSUFBSSxLQUFLLENBQUMsYUFBYSxFQUFFLDREQUE0RCxDQUFDLENBQUMsQ0FBb0MsQ0FBQyxDQUFDO0lBQ3RLLENBQUM7Q0FDRjtBQUpELGtDQUlDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgQ29uc3RydWN0IH0gZnJvbSAnY29uc3RydWN0cyc7XG5cbmV4cG9ydCB0eXBlIEZ1bmN0aW9uSGFuZGxlcjxUQXJncyBleHRlbmRzIGFueVtdID0gYW55W10sIFRSZXR1cm4gPSBhbnk+ID0gKC4uLmFyZ3M6IFRBcmdzKSA9PiBQcm9taXNlPFRSZXR1cm4+O1xuXG4vKipcbiAqIFJlcHJlc2VudHMgYSBzZXJ2ZXJsZXNzIGZ1bmN0aW9uIG9yIGhhbmRsZXIgaW4gdGhlIGFyY2hpdGVjdHVyZS5cbiAqIEdlbmVyaWMgb3ZlciBhcmd1bWVudCB0eXBlcyAoVEFyZ3MpIGFuZCByZXR1cm4gdHlwZSAoVFJldHVybikuXG4gKi9cbmV4cG9ydCBjbGFzcyBGdW5jdGlvbjxUQXJncyBleHRlbmRzIGFueVtdID0gYW55W10sIFRSZXR1cm4gPSBhbnk+IGV4dGVuZHMgQ29uc3RydWN0IHtcbiAgcHVibGljIHJlYWRvbmx5IGhhbmRsZXI6IEZ1bmN0aW9uSGFuZGxlcjxUQXJncywgVFJldHVybj47XG4gIHByaXZhdGUgX292ZXJsb2FkPzogRnVuY3Rpb25IYW5kbGVyPFRBcmdzLCBUUmV0dXJuPjtcblxuICBjb25zdHJ1Y3RvcihzY29wZTogQ29uc3RydWN0LCBpZDogc3RyaW5nLCBoYW5kbGVyOiBGdW5jdGlvbkhhbmRsZXI8VEFyZ3MsIFRSZXR1cm4+KSB7XG4gICAgc3VwZXIoc2NvcGUsIGlkKTtcbiAgICB0aGlzLmhhbmRsZXIgPSBoYW5kbGVyO1xuICB9XG5cbiAgLyoqXG4gICAqIE92ZXJyaWRlIHRoZSBmdW5jdGlvbidzIGltcGxlbWVudGF0aW9uIGF0IHJ1bnRpbWUuXG4gICAqIFVzZWQgZm9yIHJlcGxhY2luZyBpbi1tZW1vcnkgaW1wbGVtZW50YXRpb25zIHdpdGggc3RvcmFnZSBhZGFwdGVycyBvciBIVFRQIGNhbGxzLlxuICAgKi9cbiAgb3ZlcmxvYWQoaGFuZGxlcjogRnVuY3Rpb25IYW5kbGVyPFRBcmdzLCBUUmV0dXJuPik6IHZvaWQge1xuICAgIHRoaXMuX292ZXJsb2FkID0gaGFuZGxlcjtcbiAgfVxuXG4gIGhhc092ZXJsb2FkKCk6IGJvb2xlYW4ge1xuICAgIHJldHVybiB0aGlzLl9vdmVybG9hZCAhPT0gdW5kZWZpbmVkO1xuICB9XG5cbiAgcHVibGljIGludm9rZSguLi5hcmdzOiBUQXJncyk6IFByb21pc2U8VFJldHVybj4ge1xuICAgIGNvbnN0IGZuID0gdGhpcy5fb3ZlcmxvYWQgPz8gdGhpcy5oYW5kbGVyO1xuICAgIHJldHVybiBmbiguLi5hcmdzKTtcbiAgfVxuXG59XG5cbi8qKlxuICogQSBwbGFjZWhvbGRlciBmdW5jdGlvbiB0aGF0IG11c3QgYmUgb3ZlcmxvYWRlZCBiZWZvcmUgdXNlLlxuICogVXNlIHRoaXMgd2hlbiBkZWZpbmluZyBhbiBBUEkgY29udHJhY3Qgd2l0aG91dCBwcm92aWRpbmcgYW4gaW1wbGVtZW50YXRpb24uXG4gKi9cbmV4cG9ydCBjbGFzcyBUQkRGdW5jdGlvbjxUQXJncyBleHRlbmRzIGFueVtdID0gYW55W10sIFRSZXR1cm4gPSBhbnk+IGV4dGVuZHMgRnVuY3Rpb248VEFyZ3MsIFRSZXR1cm4+IHtcbiAgY29uc3RydWN0b3Ioc2NvcGU6IENvbnN0cnVjdCwgaWQ6IHN0cmluZykge1xuICAgIHN1cGVyKHNjb3BlLCBpZCwgKCgpID0+IFByb21pc2UucmVqZWN0KG5ldyBFcnJvcihgRnVuY3Rpb24gJyR7aWR9JyBpcyBub3QgaW1wbGVtZW50ZWQuIFByb3ZpZGUgYW4gb3ZlcmxvYWQgYmVmb3JlIGludm9raW5nLmApKSkgYXMgRnVuY3Rpb25IYW5kbGVyPFRBcmdzLCBUUmV0dXJuPik7XG4gIH1cbn1cbiJdfQ==
@@ -1 +1 @@
1
- {"version":3,"file":"http-handler.d.ts","sourceRoot":"","sources":["../src/http-handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEzE,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAE5C,MAAM,MAAM,OAAO,GAAG,MAAM;IAAE,KAAK,EAAE,OAAO,KAAK,CAAA;CAAE,CAAC;AAEpD;;;GAGG;AACH,eAAO,MAAM,WAAW,GACtB,OAAO,SAAS,SAAS,EACzB,CAAC,SAAS,MAAM,OAAO,GAAG,MAAM,EAEhC,UAAU,eAAe,EACzB,WAAW,YAAY,CAAC,OAAO,CAAC,EAChC,WAAW,CAAC,EACZ,UAAS,OAAyB,KACjC,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC,CA+B1B,CAAC;AAEF;;;;;;;;;;;;;;;;;;;GAmBG;AACH,eAAO,MAAM,kBAAkB,GAC7B,OAAO,SAAS,SAAS,EACzB,CAAC,SAAS,MAAM,OAAO,GAAG,MAAM,EAEhC,UAAU,eAAe,EACzB,WAAW,YAAY,CAAC,OAAO,CAAC,EAChC,YAAY,SAAS,CAAC,EAAE,EACxB,UAAS,OAAyB,KACjC,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,CAAC,CAQhC,CAAC"}
1
+ {"version":3,"file":"http-handler.d.ts","sourceRoot":"","sources":["../src/http-handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEzE,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAE5C,MAAM,MAAM,OAAO,GAAG,MAAM;IAAE,KAAK,EAAE,OAAO,KAAK,CAAA;CAAE,CAAC;AAEpD;;;GAGG;AACH,eAAO,MAAM,WAAW,GACtB,OAAO,SAAS,SAAS,EACzB,CAAC,SAAS,MAAM,OAAO,GAAG,MAAM,EAEhC,UAAU,eAAe,EACzB,WAAW,YAAY,CAAC,OAAO,CAAC,EAChC,WAAW,CAAC,EACZ,UAAS,OAAyB,KACjC,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC,CAuC1B,CAAC;AAEF;;;;;;;;;;;;;;;;;;;GAmBG;AACH,eAAO,MAAM,kBAAkB,GAC7B,OAAO,SAAS,SAAS,EACzB,CAAC,SAAS,MAAM,OAAO,GAAG,MAAM,EAEhC,UAAU,eAAe,EACzB,WAAW,YAAY,CAAC,OAAO,CAAC,EAChC,YAAY,SAAS,CAAC,EAAE,EACxB,UAAS,OAAyB,KACjC,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,CAAC,CAQhC,CAAC"}
@@ -10,18 +10,26 @@ const httpHandler = (endpoint, container, routeName, fetcher = () => ({ fetch })
10
10
  const [method, path] = route.path.split(' ');
11
11
  const pathParams = path.match(/\{(\w+)\}/g) || [];
12
12
  const handler = async (...args) => {
13
- const url = pathParams.reduce((u, param, i) => args[i] !== undefined ? u.replace(param, encodeURIComponent(String(args[i]))) : u, `${endpoint.baseUrl}${path}`);
13
+ const baseUrl = pathParams.reduce((u, param, i) => args[i] !== undefined ? u.replace(param, encodeURIComponent(String(args[i]))) : u, `${endpoint.baseUrl}${path}`);
14
+ const extraArgs = args.slice(pathParams.length);
15
+ const isGet = (method ?? 'GET') === 'GET';
16
+ let url = baseUrl;
17
+ if (isGet && extraArgs.length > 0 && extraArgs[0] != null && typeof extraArgs[0] === 'object') {
18
+ const qs = new URLSearchParams(extraArgs[0]).toString();
19
+ if (qs) {
20
+ url = `${baseUrl}?${qs}`;
21
+ }
22
+ }
14
23
  const options = {
15
24
  method: method || 'GET',
16
25
  headers: { 'Content-Type': 'application/json' },
17
- ...((method === 'POST' || method === 'PUT') && args.length > pathParams.length
18
- ? { body: JSON.stringify(args.slice(pathParams.length)) }
26
+ ...(!isGet && extraArgs.length > 0
27
+ ? { body: extraArgs.length === 1 ? JSON.stringify(extraArgs[0]) : JSON.stringify(extraArgs) }
19
28
  : {})
20
29
  };
21
- console.log('HTTP handler. Will fetch', { url, options });
22
30
  const response = await fetcher().fetch(url, options);
23
31
  if (!response.ok) {
24
- throw new Error(`Remote call to ${url} with ${JSON.stringify(options)} failed: ${JSON.stringify(response)}`);
32
+ throw new Error(`Remote call to ${url} with ${JSON.stringify(options)} failed: ${response.status} ${response.statusText}`);
25
33
  }
26
34
  return response.json();
27
35
  };
@@ -55,4 +63,4 @@ const createHttpBindings = (endpoint, container, routeNames, fetcher = () => ({
55
63
  }, {});
56
64
  };
57
65
  exports.createHttpBindings = createHttpBindings;
58
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaHR0cC1oYW5kbGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2h0dHAtaGFuZGxlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFNQTs7O0dBR0c7QUFDSSxNQUFNLFdBQVcsR0FBRyxDQUl6QixRQUF5QixFQUN6QixTQUFnQyxFQUNoQyxTQUFZLEVBQ1osVUFBbUIsR0FBRyxFQUFFLENBQUMsQ0FBQyxFQUFDLEtBQUssRUFBQyxDQUFDLEVBQ1AsRUFBRTtJQUM3QixNQUFNLEtBQUssR0FBRyxTQUFTLENBQUMsUUFBUSxDQUFDLFNBQVMsQ0FBQyxDQUFDO0lBRTVDLE1BQU0sQ0FBQyxNQUFNLEVBQUUsSUFBSSxDQUFDLEdBQUcsS0FBSyxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUM7SUFDN0MsTUFBTSxVQUFVLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQyxZQUFZLENBQUMsSUFBSSxFQUFFLENBQUM7SUFFbEQsTUFBTSxPQUFPLEdBQUcsS0FBSyxFQUFFLEdBQUcsSUFBVyxFQUFFLEVBQUU7UUFDdkMsTUFBTSxHQUFHLEdBQUcsVUFBVSxDQUFDLE1BQU0sQ0FDM0IsQ0FBQyxDQUFDLEVBQUUsS0FBSyxFQUFFLENBQUMsRUFBRSxFQUFFLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxLQUFLLFNBQVMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxLQUFLLEVBQUUsa0JBQWtCLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxFQUNsRyxHQUFHLFFBQVEsQ0FBQyxPQUFPLEdBQUcsSUFBSSxFQUFFLENBQzdCLENBQUM7UUFFRixNQUFNLE9BQU8sR0FBZ0I7WUFDM0IsTUFBTSxFQUFFLE1BQU0sSUFBSSxLQUFLO1lBQ3ZCLE9BQU8sRUFBRSxFQUFFLGNBQWMsRUFBRSxrQkFBa0IsRUFBRTtZQUMvQyxHQUFHLENBQUMsQ0FBQyxNQUFNLEtBQUssTUFBTSxJQUFJLE1BQU0sS0FBSyxLQUFLLENBQUMsSUFBSSxJQUFJLENBQUMsTUFBTSxHQUFHLFVBQVUsQ0FBQyxNQUFNO2dCQUM1RSxDQUFDLENBQUMsRUFBRSxJQUFJLEVBQUUsSUFBSSxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLFVBQVUsQ0FBQyxNQUFNLENBQUMsQ0FBQyxFQUFFO2dCQUN6RCxDQUFDLENBQUMsRUFBRSxDQUFDO1NBQ1IsQ0FBQztRQUVGLE9BQU8sQ0FBQyxHQUFHLENBQUMsMEJBQTBCLEVBQUUsRUFBQyxHQUFHLEVBQUUsT0FBTyxFQUFDLENBQUMsQ0FBQztRQUN4RCxNQUFNLFFBQVEsR0FBRyxNQUFNLE9BQU8sRUFBRSxDQUFDLEtBQUssQ0FBQyxHQUFHLEVBQUUsT0FBTyxDQUFDLENBQUM7UUFFckQsSUFBSSxDQUFDLFFBQVEsQ0FBQyxFQUFFLEVBQUUsQ0FBQztZQUNqQixNQUFNLElBQUksS0FBSyxDQUFDLGtCQUFrQixHQUFHLFNBQVMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxPQUFPLENBQUMsWUFBWSxJQUFJLENBQUMsU0FBUyxDQUFDLFFBQVEsQ0FBQyxFQUFFLENBQUMsQ0FBQztRQUMvRyxDQUFDO1FBRUQsT0FBTyxRQUFRLENBQUMsSUFBSSxFQUFFLENBQUM7SUFDekIsQ0FBQyxDQUFDO0lBRUYsT0FBTyxPQUFvQyxDQUFDO0FBQzlDLENBQUMsQ0FBQztBQXZDVyxRQUFBLFdBQVcsZUF1Q3RCO0FBRUY7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7R0FtQkc7QUFDSSxNQUFNLGtCQUFrQixHQUFHLENBSWhDLFFBQXlCLEVBQ3pCLFNBQWdDLEVBQ2hDLFVBQXdCLEVBQ3hCLFVBQW1CLEdBQUcsRUFBRSxDQUFDLENBQUMsRUFBQyxLQUFLLEVBQUMsQ0FBQyxFQUNELEVBQUU7SUFDbkMsT0FBTyxVQUFVLENBQUMsTUFBTSxDQUN0QixDQUFDLEdBQUcsRUFBRSxJQUFJLEVBQUUsRUFBRTtRQUNaLEdBQUcsQ0FBQyxJQUFJLENBQUMsR0FBRyxJQUFBLG1CQUFXLEVBQUMsUUFBUSxFQUFFLFNBQVMsRUFBRSxJQUFJLEVBQUUsT0FBTyxDQUFDLENBQUM7UUFDNUQsT0FBTyxHQUFHLENBQUM7SUFDYixDQUFDLEVBQ0QsRUFBcUMsQ0FDdEMsQ0FBQztBQUNKLENBQUMsQ0FBQztBQWhCVyxRQUFBLGtCQUFrQixzQkFnQjdCIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgQXBpQ29udGFpbmVyLCBBcGlSb3V0ZXMsIFJvdXRlSGFuZGxlcnMgfSBmcm9tICcuL2FwaS1jb250YWluZXInO1xuaW1wb3J0IHsgRnVuY3Rpb25IYW5kbGVyIH0gZnJvbSAnLi9mdW5jdGlvbic7XG5pbXBvcnQgeyBTZXJ2aWNlRW5kcG9pbnQgfSBmcm9tICcuL2JpbmRpbmcnO1xuXG5leHBvcnQgdHlwZSBGZXRjaGVyID0gKCkgPT4geyBmZXRjaDogdHlwZW9mIGZldGNoIH07XG5cbi8qKlxuICogQ3JlYXRlIGFuIEhUVFAgaGFuZGxlciBmb3IgYSByb3V0ZSBieSBuYW1lLlxuICogTG9va3MgdXAgdGhlIHJvdXRlIHBhdGggZnJvbSB0aGUgY29udGFpbmVyJ3MgcmVnaXN0cnkuXG4gKi9cbmV4cG9ydCBjb25zdCBodHRwSGFuZGxlciA9IDxcbiAgVFJvdXRlcyBleHRlbmRzIEFwaVJvdXRlcyxcbiAgSyBleHRlbmRzIGtleW9mIFRSb3V0ZXMgJiBzdHJpbmdcbj4oXG4gIGVuZHBvaW50OiBTZXJ2aWNlRW5kcG9pbnQsXG4gIGNvbnRhaW5lcjogQXBpQ29udGFpbmVyPFRSb3V0ZXM+LFxuICByb3V0ZU5hbWU6IEssXG4gIGZldGNoZXI6IEZldGNoZXIgPSAoKSA9PiAoe2ZldGNofSlcbik6IFJvdXRlSGFuZGxlcnM8VFJvdXRlcz5bS10gPT4ge1xuICBjb25zdCByb3V0ZSA9IGNvbnRhaW5lci5nZXRSb3V0ZShyb3V0ZU5hbWUpO1xuXG4gIGNvbnN0IFttZXRob2QsIHBhdGhdID0gcm91dGUucGF0aC5zcGxpdCgnICcpO1xuICBjb25zdCBwYXRoUGFyYW1zID0gcGF0aC5tYXRjaCgvXFx7KFxcdyspXFx9L2cpIHx8IFtdO1xuXG4gIGNvbnN0IGhhbmRsZXIgPSBhc3luYyAoLi4uYXJnczogYW55W10pID0+IHtcbiAgICBjb25zdCB1cmwgPSBwYXRoUGFyYW1zLnJlZHVjZShcbiAgICAgICh1LCBwYXJhbSwgaSkgPT4gYXJnc1tpXSAhPT0gdW5kZWZpbmVkID8gdS5yZXBsYWNlKHBhcmFtLCBlbmNvZGVVUklDb21wb25lbnQoU3RyaW5nKGFyZ3NbaV0pKSkgOiB1LFxuICAgICAgYCR7ZW5kcG9pbnQuYmFzZVVybH0ke3BhdGh9YFxuICAgICk7XG5cbiAgICBjb25zdCBvcHRpb25zOiBSZXF1ZXN0SW5pdCA9IHtcbiAgICAgIG1ldGhvZDogbWV0aG9kIHx8ICdHRVQnLFxuICAgICAgaGVhZGVyczogeyAnQ29udGVudC1UeXBlJzogJ2FwcGxpY2F0aW9uL2pzb24nIH0sXG4gICAgICAuLi4oKG1ldGhvZCA9PT0gJ1BPU1QnIHx8IG1ldGhvZCA9PT0gJ1BVVCcpICYmIGFyZ3MubGVuZ3RoID4gcGF0aFBhcmFtcy5sZW5ndGhcbiAgICAgICAgPyB7IGJvZHk6IEpTT04uc3RyaW5naWZ5KGFyZ3Muc2xpY2UocGF0aFBhcmFtcy5sZW5ndGgpKSB9XG4gICAgICAgIDoge30pXG4gICAgfTtcblxuICAgIGNvbnNvbGUubG9nKCdIVFRQIGhhbmRsZXIuIFdpbGwgZmV0Y2gnLCB7dXJsLCBvcHRpb25zfSk7XG4gICAgY29uc3QgcmVzcG9uc2UgPSBhd2FpdCBmZXRjaGVyKCkuZmV0Y2godXJsLCBvcHRpb25zKTtcblxuICAgIGlmICghcmVzcG9uc2Uub2spIHtcbiAgICAgIHRocm93IG5ldyBFcnJvcihgUmVtb3RlIGNhbGwgdG8gJHt1cmx9IHdpdGggJHtKU09OLnN0cmluZ2lmeShvcHRpb25zKX0gZmFpbGVkOiAke0pTT04uc3RyaW5naWZ5KHJlc3BvbnNlKX1gKTtcbiAgICB9XG5cbiAgICByZXR1cm4gcmVzcG9uc2UuanNvbigpO1xuICB9O1xuXG4gIHJldHVybiBoYW5kbGVyIGFzIFJvdXRlSGFuZGxlcnM8VFJvdXRlcz5bS107XG59O1xuXG4vKipcbiAqIENyZWF0ZSBIVFRQIGJpbmRpbmdzIGZvciBtdWx0aXBsZSByb3V0ZXMgYXMgYSBjYWxsYWJsZSBjbGllbnQuXG4gKiBSZXR1cm5zIGEgc3Ryb25nbHktdHlwZWQgb2JqZWN0IHdoZXJlIGVhY2ggcm91dGUgbmFtZSBtYXBzIHRvIGFuIGFzeW5jIGZ1bmN0aW9uXG4gKiB3aXRoIHRoZSBzYW1lIHNpZ25hdHVyZSBhcyB0aGUgb3JpZ2luYWwgaGFuZGxlci5cbiAqXG4gKiBAdHlwZVBhcmFtIFRSb3V0ZXMgLSBUaGUgcm91dGVzIHR5cGUgZnJvbSB0aGUgQXBpQ29udGFpbmVyXG4gKiBAdHlwZVBhcmFtIEsgLSBUaGUgc3Vic2V0IG9mIHJvdXRlIG5hbWVzIHRvIGluY2x1ZGUgaW4gdGhlIGNsaWVudFxuICpcbiAqIEBleGFtcGxlXG4gKiBgYGB0eXBlc2NyaXB0XG4gKiBjb25zdCBhcGkgPSBuZXcgQXBpQ29udGFpbmVyKGFyY2gsICdhcGknLCB7XG4gKiAgIGhlbGxvOiB7IHBhdGg6ICdHRVQgL3YxL2FwaS9oZWxsby97bmFtZX0nLCBoYW5kbGVyOiBoZWxsb0Z1bmN0aW9uIH0sXG4gKiAgIGhlbGxvczogeyBwYXRoOiAnR0VUIC92MS9hcGkvaGVsbG9zJywgaGFuZGxlcjogaGVsbG9zRnVuY3Rpb24gfVxuICogfSk7XG4gKlxuICogY29uc3QgY2xpZW50ID0gY3JlYXRlSHR0cEJpbmRpbmdzKGVuZHBvaW50LCBhcGksIFsnaGVsbG8nLCAnaGVsbG9zJ10pO1xuICogYXdhaXQgY2xpZW50LmhlbGxvKCdKb2huJyk7ICAvLyAobmFtZTogc3RyaW5nKSA9PiBQcm9taXNlPHN0cmluZz5cbiAqIGF3YWl0IGNsaWVudC5oZWxsb3MoKTsgICAgICAgLy8gKCkgPT4gUHJvbWlzZTxHcmVldGluZ1tdPlxuICogYGBgXG4gKi9cbmV4cG9ydCBjb25zdCBjcmVhdGVIdHRwQmluZGluZ3MgPSA8XG4gIFRSb3V0ZXMgZXh0ZW5kcyBBcGlSb3V0ZXMsXG4gIEsgZXh0ZW5kcyBrZXlvZiBUUm91dGVzICYgc3RyaW5nXG4+KFxuICBlbmRwb2ludDogU2VydmljZUVuZHBvaW50LFxuICBjb250YWluZXI6IEFwaUNvbnRhaW5lcjxUUm91dGVzPixcbiAgcm91dGVOYW1lczogcmVhZG9ubHkgS1tdLFxuICBmZXRjaGVyOiBGZXRjaGVyID0gKCkgPT4gKHtmZXRjaH0pXG4pOiBQaWNrPFJvdXRlSGFuZGxlcnM8VFJvdXRlcz4sIEs+ID0+IHtcbiAgcmV0dXJuIHJvdXRlTmFtZXMucmVkdWNlKFxuICAgIChhY2MsIG5hbWUpID0+IHtcbiAgICAgIGFjY1tuYW1lXSA9IGh0dHBIYW5kbGVyKGVuZHBvaW50LCBjb250YWluZXIsIG5hbWUsIGZldGNoZXIpO1xuICAgICAgcmV0dXJuIGFjYztcbiAgICB9LFxuICAgIHt9IGFzIFBpY2s8Um91dGVIYW5kbGVyczxUUm91dGVzPiwgSz5cbiAgKTtcbn07XG4iXX0=
66
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaHR0cC1oYW5kbGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2h0dHAtaGFuZGxlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFNQTs7O0dBR0c7QUFDSSxNQUFNLFdBQVcsR0FBRyxDQUl6QixRQUF5QixFQUN6QixTQUFnQyxFQUNoQyxTQUFZLEVBQ1osVUFBbUIsR0FBRyxFQUFFLENBQUMsQ0FBQyxFQUFDLEtBQUssRUFBQyxDQUFDLEVBQ1AsRUFBRTtJQUM3QixNQUFNLEtBQUssR0FBRyxTQUFTLENBQUMsUUFBUSxDQUFDLFNBQVMsQ0FBQyxDQUFDO0lBRTVDLE1BQU0sQ0FBQyxNQUFNLEVBQUUsSUFBSSxDQUFDLEdBQUcsS0FBSyxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUM7SUFDN0MsTUFBTSxVQUFVLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQyxZQUFZLENBQUMsSUFBSSxFQUFFLENBQUM7SUFFbEQsTUFBTSxPQUFPLEdBQUcsS0FBSyxFQUFFLEdBQUcsSUFBVyxFQUFFLEVBQUU7UUFDdkMsTUFBTSxPQUFPLEdBQUcsVUFBVSxDQUFDLE1BQU0sQ0FDL0IsQ0FBQyxDQUFDLEVBQUUsS0FBSyxFQUFFLENBQUMsRUFBRSxFQUFFLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxLQUFLLFNBQVMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxLQUFLLEVBQUUsa0JBQWtCLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxFQUNsRyxHQUFHLFFBQVEsQ0FBQyxPQUFPLEdBQUcsSUFBSSxFQUFFLENBQzdCLENBQUM7UUFFRixNQUFNLFNBQVMsR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLFVBQVUsQ0FBQyxNQUFNLENBQUMsQ0FBQztRQUNoRCxNQUFNLEtBQUssR0FBRyxDQUFDLE1BQU0sSUFBSSxLQUFLLENBQUMsS0FBSyxLQUFLLENBQUM7UUFFMUMsSUFBSSxHQUFHLEdBQUcsT0FBTyxDQUFDO1FBQ2xCLElBQUksS0FBSyxJQUFJLFNBQVMsQ0FBQyxNQUFNLEdBQUcsQ0FBQyxJQUFJLFNBQVMsQ0FBQyxDQUFDLENBQUMsSUFBSSxJQUFJLElBQUksT0FBTyxTQUFTLENBQUMsQ0FBQyxDQUFDLEtBQUssUUFBUSxFQUFFLENBQUM7WUFDOUYsTUFBTSxFQUFFLEdBQUcsSUFBSSxlQUFlLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBMkIsQ0FBQyxDQUFDLFFBQVEsRUFBRSxDQUFDO1lBQ2xGLElBQUksRUFBRSxFQUFFLENBQUM7Z0JBQUMsR0FBRyxHQUFHLEdBQUcsT0FBTyxJQUFJLEVBQUUsRUFBRSxDQUFDO1lBQUMsQ0FBQztRQUN2QyxDQUFDO1FBRUQsTUFBTSxPQUFPLEdBQWdCO1lBQzNCLE1BQU0sRUFBRSxNQUFNLElBQUksS0FBSztZQUN2QixPQUFPLEVBQUUsRUFBRSxjQUFjLEVBQUUsa0JBQWtCLEVBQUU7WUFDL0MsR0FBRyxDQUFDLENBQUMsS0FBSyxJQUFJLFNBQVMsQ0FBQyxNQUFNLEdBQUcsQ0FBQztnQkFDaEMsQ0FBQyxDQUFDLEVBQUUsSUFBSSxFQUFFLFNBQVMsQ0FBQyxNQUFNLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsU0FBUyxDQUFDLFNBQVMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsU0FBUyxDQUFDLFNBQVMsQ0FBQyxFQUFFO2dCQUM3RixDQUFDLENBQUMsRUFBRSxDQUFDO1NBQ1IsQ0FBQztRQUVGLE1BQU0sUUFBUSxHQUFHLE1BQU0sT0FBTyxFQUFFLENBQUMsS0FBSyxDQUFDLEdBQUcsRUFBRSxPQUFPLENBQUMsQ0FBQztRQUVyRCxJQUFJLENBQUMsUUFBUSxDQUFDLEVBQUUsRUFBRSxDQUFDO1lBQ2pCLE1BQU0sSUFBSSxLQUFLLENBQUMsa0JBQWtCLEdBQUcsU0FBUyxJQUFJLENBQUMsU0FBUyxDQUFDLE9BQU8sQ0FBQyxZQUFZLFFBQVEsQ0FBQyxNQUFNLElBQUksUUFBUSxDQUFDLFVBQVUsRUFBRSxDQUFDLENBQUM7UUFDN0gsQ0FBQztRQUVELE9BQU8sUUFBUSxDQUFDLElBQUksRUFBRSxDQUFDO0lBQ3pCLENBQUMsQ0FBQztJQUVGLE9BQU8sT0FBb0MsQ0FBQztBQUM5QyxDQUFDLENBQUM7QUEvQ1csUUFBQSxXQUFXLGVBK0N0QjtBQUVGOzs7Ozs7Ozs7Ozs7Ozs7Ozs7O0dBbUJHO0FBQ0ksTUFBTSxrQkFBa0IsR0FBRyxDQUloQyxRQUF5QixFQUN6QixTQUFnQyxFQUNoQyxVQUF3QixFQUN4QixVQUFtQixHQUFHLEVBQUUsQ0FBQyxDQUFDLEVBQUMsS0FBSyxFQUFDLENBQUMsRUFDRCxFQUFFO0lBQ25DLE9BQU8sVUFBVSxDQUFDLE1BQU0sQ0FDdEIsQ0FBQyxHQUFHLEVBQUUsSUFBSSxFQUFFLEVBQUU7UUFDWixHQUFHLENBQUMsSUFBSSxDQUFDLEdBQUcsSUFBQSxtQkFBVyxFQUFDLFFBQVEsRUFBRSxTQUFTLEVBQUUsSUFBSSxFQUFFLE9BQU8sQ0FBQyxDQUFDO1FBQzVELE9BQU8sR0FBRyxDQUFDO0lBQ2IsQ0FBQyxFQUNELEVBQXFDLENBQ3RDLENBQUM7QUFDSixDQUFDLENBQUM7QUFoQlcsUUFBQSxrQkFBa0Isc0JBZ0I3QiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IEFwaUNvbnRhaW5lciwgQXBpUm91dGVzLCBSb3V0ZUhhbmRsZXJzIH0gZnJvbSAnLi9hcGktY29udGFpbmVyJztcbmltcG9ydCB7IEZ1bmN0aW9uSGFuZGxlciB9IGZyb20gJy4vZnVuY3Rpb24nO1xuaW1wb3J0IHsgU2VydmljZUVuZHBvaW50IH0gZnJvbSAnLi9iaW5kaW5nJztcblxuZXhwb3J0IHR5cGUgRmV0Y2hlciA9ICgpID0+IHsgZmV0Y2g6IHR5cGVvZiBmZXRjaCB9O1xuXG4vKipcbiAqIENyZWF0ZSBhbiBIVFRQIGhhbmRsZXIgZm9yIGEgcm91dGUgYnkgbmFtZS5cbiAqIExvb2tzIHVwIHRoZSByb3V0ZSBwYXRoIGZyb20gdGhlIGNvbnRhaW5lcidzIHJlZ2lzdHJ5LlxuICovXG5leHBvcnQgY29uc3QgaHR0cEhhbmRsZXIgPSA8XG4gIFRSb3V0ZXMgZXh0ZW5kcyBBcGlSb3V0ZXMsXG4gIEsgZXh0ZW5kcyBrZXlvZiBUUm91dGVzICYgc3RyaW5nXG4+KFxuICBlbmRwb2ludDogU2VydmljZUVuZHBvaW50LFxuICBjb250YWluZXI6IEFwaUNvbnRhaW5lcjxUUm91dGVzPixcbiAgcm91dGVOYW1lOiBLLFxuICBmZXRjaGVyOiBGZXRjaGVyID0gKCkgPT4gKHtmZXRjaH0pXG4pOiBSb3V0ZUhhbmRsZXJzPFRSb3V0ZXM+W0tdID0+IHtcbiAgY29uc3Qgcm91dGUgPSBjb250YWluZXIuZ2V0Um91dGUocm91dGVOYW1lKTtcblxuICBjb25zdCBbbWV0aG9kLCBwYXRoXSA9IHJvdXRlLnBhdGguc3BsaXQoJyAnKTtcbiAgY29uc3QgcGF0aFBhcmFtcyA9IHBhdGgubWF0Y2goL1xceyhcXHcrKVxcfS9nKSB8fCBbXTtcblxuICBjb25zdCBoYW5kbGVyID0gYXN5bmMgKC4uLmFyZ3M6IGFueVtdKSA9PiB7XG4gICAgY29uc3QgYmFzZVVybCA9IHBhdGhQYXJhbXMucmVkdWNlKFxuICAgICAgKHUsIHBhcmFtLCBpKSA9PiBhcmdzW2ldICE9PSB1bmRlZmluZWQgPyB1LnJlcGxhY2UocGFyYW0sIGVuY29kZVVSSUNvbXBvbmVudChTdHJpbmcoYXJnc1tpXSkpKSA6IHUsXG4gICAgICBgJHtlbmRwb2ludC5iYXNlVXJsfSR7cGF0aH1gXG4gICAgKTtcblxuICAgIGNvbnN0IGV4dHJhQXJncyA9IGFyZ3Muc2xpY2UocGF0aFBhcmFtcy5sZW5ndGgpO1xuICAgIGNvbnN0IGlzR2V0ID0gKG1ldGhvZCA/PyAnR0VUJykgPT09ICdHRVQnO1xuXG4gICAgbGV0IHVybCA9IGJhc2VVcmw7XG4gICAgaWYgKGlzR2V0ICYmIGV4dHJhQXJncy5sZW5ndGggPiAwICYmIGV4dHJhQXJnc1swXSAhPSBudWxsICYmIHR5cGVvZiBleHRyYUFyZ3NbMF0gPT09ICdvYmplY3QnKSB7XG4gICAgICBjb25zdCBxcyA9IG5ldyBVUkxTZWFyY2hQYXJhbXMoZXh0cmFBcmdzWzBdIGFzIFJlY29yZDxzdHJpbmcsIHN0cmluZz4pLnRvU3RyaW5nKCk7XG4gICAgICBpZiAocXMpIHsgdXJsID0gYCR7YmFzZVVybH0/JHtxc31gOyB9XG4gICAgfVxuXG4gICAgY29uc3Qgb3B0aW9uczogUmVxdWVzdEluaXQgPSB7XG4gICAgICBtZXRob2Q6IG1ldGhvZCB8fCAnR0VUJyxcbiAgICAgIGhlYWRlcnM6IHsgJ0NvbnRlbnQtVHlwZSc6ICdhcHBsaWNhdGlvbi9qc29uJyB9LFxuICAgICAgLi4uKCFpc0dldCAmJiBleHRyYUFyZ3MubGVuZ3RoID4gMFxuICAgICAgICA/IHsgYm9keTogZXh0cmFBcmdzLmxlbmd0aCA9PT0gMSA/IEpTT04uc3RyaW5naWZ5KGV4dHJhQXJnc1swXSkgOiBKU09OLnN0cmluZ2lmeShleHRyYUFyZ3MpIH1cbiAgICAgICAgOiB7fSlcbiAgICB9O1xuXG4gICAgY29uc3QgcmVzcG9uc2UgPSBhd2FpdCBmZXRjaGVyKCkuZmV0Y2godXJsLCBvcHRpb25zKTtcblxuICAgIGlmICghcmVzcG9uc2Uub2spIHtcbiAgICAgIHRocm93IG5ldyBFcnJvcihgUmVtb3RlIGNhbGwgdG8gJHt1cmx9IHdpdGggJHtKU09OLnN0cmluZ2lmeShvcHRpb25zKX0gZmFpbGVkOiAke3Jlc3BvbnNlLnN0YXR1c30gJHtyZXNwb25zZS5zdGF0dXNUZXh0fWApO1xuICAgIH1cblxuICAgIHJldHVybiByZXNwb25zZS5qc29uKCk7XG4gIH07XG5cbiAgcmV0dXJuIGhhbmRsZXIgYXMgUm91dGVIYW5kbGVyczxUUm91dGVzPltLXTtcbn07XG5cbi8qKlxuICogQ3JlYXRlIEhUVFAgYmluZGluZ3MgZm9yIG11bHRpcGxlIHJvdXRlcyBhcyBhIGNhbGxhYmxlIGNsaWVudC5cbiAqIFJldHVybnMgYSBzdHJvbmdseS10eXBlZCBvYmplY3Qgd2hlcmUgZWFjaCByb3V0ZSBuYW1lIG1hcHMgdG8gYW4gYXN5bmMgZnVuY3Rpb25cbiAqIHdpdGggdGhlIHNhbWUgc2lnbmF0dXJlIGFzIHRoZSBvcmlnaW5hbCBoYW5kbGVyLlxuICpcbiAqIEB0eXBlUGFyYW0gVFJvdXRlcyAtIFRoZSByb3V0ZXMgdHlwZSBmcm9tIHRoZSBBcGlDb250YWluZXJcbiAqIEB0eXBlUGFyYW0gSyAtIFRoZSBzdWJzZXQgb2Ygcm91dGUgbmFtZXMgdG8gaW5jbHVkZSBpbiB0aGUgY2xpZW50XG4gKlxuICogQGV4YW1wbGVcbiAqIGBgYHR5cGVzY3JpcHRcbiAqIGNvbnN0IGFwaSA9IG5ldyBBcGlDb250YWluZXIoYXJjaCwgJ2FwaScsIHtcbiAqICAgaGVsbG86IHsgcGF0aDogJ0dFVCAvdjEvYXBpL2hlbGxvL3tuYW1lfScsIGhhbmRsZXI6IGhlbGxvRnVuY3Rpb24gfSxcbiAqICAgaGVsbG9zOiB7IHBhdGg6ICdHRVQgL3YxL2FwaS9oZWxsb3MnLCBoYW5kbGVyOiBoZWxsb3NGdW5jdGlvbiB9XG4gKiB9KTtcbiAqXG4gKiBjb25zdCBjbGllbnQgPSBjcmVhdGVIdHRwQmluZGluZ3MoZW5kcG9pbnQsIGFwaSwgWydoZWxsbycsICdoZWxsb3MnXSk7XG4gKiBhd2FpdCBjbGllbnQuaGVsbG8oJ0pvaG4nKTsgIC8vIChuYW1lOiBzdHJpbmcpID0+IFByb21pc2U8c3RyaW5nPlxuICogYXdhaXQgY2xpZW50LmhlbGxvcygpOyAgICAgICAvLyAoKSA9PiBQcm9taXNlPEdyZWV0aW5nW10+XG4gKiBgYGBcbiAqL1xuZXhwb3J0IGNvbnN0IGNyZWF0ZUh0dHBCaW5kaW5ncyA9IDxcbiAgVFJvdXRlcyBleHRlbmRzIEFwaVJvdXRlcyxcbiAgSyBleHRlbmRzIGtleW9mIFRSb3V0ZXMgJiBzdHJpbmdcbj4oXG4gIGVuZHBvaW50OiBTZXJ2aWNlRW5kcG9pbnQsXG4gIGNvbnRhaW5lcjogQXBpQ29udGFpbmVyPFRSb3V0ZXM+LFxuICByb3V0ZU5hbWVzOiByZWFkb25seSBLW10sXG4gIGZldGNoZXI6IEZldGNoZXIgPSAoKSA9PiAoe2ZldGNofSlcbik6IFBpY2s8Um91dGVIYW5kbGVyczxUUm91dGVzPiwgSz4gPT4ge1xuICByZXR1cm4gcm91dGVOYW1lcy5yZWR1Y2UoXG4gICAgKGFjYywgbmFtZSkgPT4ge1xuICAgICAgYWNjW25hbWVdID0gaHR0cEhhbmRsZXIoZW5kcG9pbnQsIGNvbnRhaW5lciwgbmFtZSwgZmV0Y2hlcik7XG4gICAgICByZXR1cm4gYWNjO1xuICAgIH0sXG4gICAge30gYXMgUGljazxSb3V0ZUhhbmRsZXJzPFRSb3V0ZXM+LCBLPlxuICApO1xufTtcbiJdfQ==
package/dist/index.d.ts CHANGED
@@ -1,7 +1,8 @@
1
1
  export { Construct } from 'constructs';
2
2
  export { Architecture, ArchitectureDefinition, ComponentDefinition } from './architecture';
3
- export { Function, TBDFunction, FunctionHandler, FunctionRuntimeContextMarker } from './function';
3
+ export { Function, TBDFunction, FunctionHandler } from './function';
4
4
  export { ApiContainer, ApiRoutes, RouteEntry, HandlerOf, RouteHandlers } from './api-container';
5
5
  export { ArchitectureBinding, ServiceEndpoint, architectureBinding } from './binding';
6
6
  export { httpHandler, createHttpBindings, Fetcher } from './http-handler';
7
+ export { RuntimeContext, getCurrentContext, runWithContext } from './context';
7
8
  //# sourceMappingURL=index.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACvC,OAAO,EAAE,YAAY,EAAE,sBAAsB,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAC3F,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,eAAe,EAAE,4BAA4B,EAAE,MAAM,YAAY,CAAC;AAClG,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,UAAU,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChG,OAAO,EAAE,mBAAmB,EAAE,eAAe,EAAE,mBAAmB,EAAE,MAAM,WAAW,CAAC;AACtF,OAAO,EAAE,WAAW,EAAE,kBAAkB,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACvC,OAAO,EAAE,YAAY,EAAE,sBAAsB,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAC3F,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AACpE,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,UAAU,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChG,OAAO,EAAE,mBAAmB,EAAE,eAAe,EAAE,mBAAmB,EAAE,MAAM,WAAW,CAAC;AACtF,OAAO,EAAE,WAAW,EAAE,kBAAkB,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAC1E,OAAO,EAAE,cAAc,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC"}
package/dist/index.js CHANGED
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.createHttpBindings = exports.httpHandler = exports.architectureBinding = exports.ArchitectureBinding = exports.ApiContainer = exports.TBDFunction = exports.Function = exports.Architecture = exports.Construct = void 0;
3
+ exports.runWithContext = exports.getCurrentContext = exports.createHttpBindings = exports.httpHandler = exports.architectureBinding = exports.ArchitectureBinding = exports.ApiContainer = exports.TBDFunction = exports.Function = exports.Architecture = exports.Construct = void 0;
4
4
  var constructs_1 = require("constructs");
5
5
  Object.defineProperty(exports, "Construct", { enumerable: true, get: function () { return constructs_1.Construct; } });
6
6
  var architecture_1 = require("./architecture");
@@ -16,4 +16,7 @@ Object.defineProperty(exports, "architectureBinding", { enumerable: true, get: f
16
16
  var http_handler_1 = require("./http-handler");
17
17
  Object.defineProperty(exports, "httpHandler", { enumerable: true, get: function () { return http_handler_1.httpHandler; } });
18
18
  Object.defineProperty(exports, "createHttpBindings", { enumerable: true, get: function () { return http_handler_1.createHttpBindings; } });
19
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEseUNBQXVDO0FBQTlCLHVHQUFBLFNBQVMsT0FBQTtBQUNsQiwrQ0FBMkY7QUFBbEYsNEdBQUEsWUFBWSxPQUFBO0FBQ3JCLHVDQUFrRztBQUF6RixvR0FBQSxRQUFRLE9BQUE7QUFBRSx1R0FBQSxXQUFXLE9BQUE7QUFDOUIsaURBQWdHO0FBQXZGLDZHQUFBLFlBQVksT0FBQTtBQUNyQixxQ0FBc0Y7QUFBN0UsOEdBQUEsbUJBQW1CLE9BQUE7QUFBbUIsOEdBQUEsbUJBQW1CLE9BQUE7QUFDbEUsK0NBQTBFO0FBQWpFLDJHQUFBLFdBQVcsT0FBQTtBQUFFLGtIQUFBLGtCQUFrQixPQUFBIiwic291cmNlc0NvbnRlbnQiOlsiZXhwb3J0IHsgQ29uc3RydWN0IH0gZnJvbSAnY29uc3RydWN0cyc7XG5leHBvcnQgeyBBcmNoaXRlY3R1cmUsIEFyY2hpdGVjdHVyZURlZmluaXRpb24sIENvbXBvbmVudERlZmluaXRpb24gfSBmcm9tICcuL2FyY2hpdGVjdHVyZSc7XG5leHBvcnQgeyBGdW5jdGlvbiwgVEJERnVuY3Rpb24sIEZ1bmN0aW9uSGFuZGxlciwgRnVuY3Rpb25SdW50aW1lQ29udGV4dE1hcmtlciB9IGZyb20gJy4vZnVuY3Rpb24nO1xuZXhwb3J0IHsgQXBpQ29udGFpbmVyLCBBcGlSb3V0ZXMsIFJvdXRlRW50cnksIEhhbmRsZXJPZiwgUm91dGVIYW5kbGVycyB9IGZyb20gJy4vYXBpLWNvbnRhaW5lcic7XG5leHBvcnQgeyBBcmNoaXRlY3R1cmVCaW5kaW5nLCBTZXJ2aWNlRW5kcG9pbnQsIGFyY2hpdGVjdHVyZUJpbmRpbmcgfSBmcm9tICcuL2JpbmRpbmcnO1xuZXhwb3J0IHsgaHR0cEhhbmRsZXIsIGNyZWF0ZUh0dHBCaW5kaW5ncywgRmV0Y2hlciB9IGZyb20gJy4vaHR0cC1oYW5kbGVyJztcbiJdfQ==
19
+ var context_1 = require("./context");
20
+ Object.defineProperty(exports, "getCurrentContext", { enumerable: true, get: function () { return context_1.getCurrentContext; } });
21
+ Object.defineProperty(exports, "runWithContext", { enumerable: true, get: function () { return context_1.runWithContext; } });
22
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEseUNBQXVDO0FBQTlCLHVHQUFBLFNBQVMsT0FBQTtBQUNsQiwrQ0FBMkY7QUFBbEYsNEdBQUEsWUFBWSxPQUFBO0FBQ3JCLHVDQUFvRTtBQUEzRCxvR0FBQSxRQUFRLE9BQUE7QUFBRSx1R0FBQSxXQUFXLE9BQUE7QUFDOUIsaURBQWdHO0FBQXZGLDZHQUFBLFlBQVksT0FBQTtBQUNyQixxQ0FBc0Y7QUFBN0UsOEdBQUEsbUJBQW1CLE9BQUE7QUFBbUIsOEdBQUEsbUJBQW1CLE9BQUE7QUFDbEUsK0NBQTBFO0FBQWpFLDJHQUFBLFdBQVcsT0FBQTtBQUFFLGtIQUFBLGtCQUFrQixPQUFBO0FBQ3hDLHFDQUE4RTtBQUFyRCw0R0FBQSxpQkFBaUIsT0FBQTtBQUFFLHlHQUFBLGNBQWMsT0FBQSIsInNvdXJjZXNDb250ZW50IjpbImV4cG9ydCB7IENvbnN0cnVjdCB9IGZyb20gJ2NvbnN0cnVjdHMnO1xuZXhwb3J0IHsgQXJjaGl0ZWN0dXJlLCBBcmNoaXRlY3R1cmVEZWZpbml0aW9uLCBDb21wb25lbnREZWZpbml0aW9uIH0gZnJvbSAnLi9hcmNoaXRlY3R1cmUnO1xuZXhwb3J0IHsgRnVuY3Rpb24sIFRCREZ1bmN0aW9uLCBGdW5jdGlvbkhhbmRsZXIgfSBmcm9tICcuL2Z1bmN0aW9uJztcbmV4cG9ydCB7IEFwaUNvbnRhaW5lciwgQXBpUm91dGVzLCBSb3V0ZUVudHJ5LCBIYW5kbGVyT2YsIFJvdXRlSGFuZGxlcnMgfSBmcm9tICcuL2FwaS1jb250YWluZXInO1xuZXhwb3J0IHsgQXJjaGl0ZWN0dXJlQmluZGluZywgU2VydmljZUVuZHBvaW50LCBhcmNoaXRlY3R1cmVCaW5kaW5nIH0gZnJvbSAnLi9iaW5kaW5nJztcbmV4cG9ydCB7IGh0dHBIYW5kbGVyLCBjcmVhdGVIdHRwQmluZGluZ3MsIEZldGNoZXIgfSBmcm9tICcuL2h0dHAtaGFuZGxlcic7XG5leHBvcnQgeyBSdW50aW1lQ29udGV4dCwgZ2V0Q3VycmVudENvbnRleHQsIHJ1bldpdGhDb250ZXh0IH0gZnJvbSAnLi9jb250ZXh0JztcbiJdfQ==
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@arinoto/cdk-arch",
3
- "version": "0.6.0",
3
+ "version": "0.7.1",
4
4
  "description": "CDK Architecture primitives for event-driven solution architectures",
5
5
  "repository": {
6
6
  "type": "git",
@@ -10,7 +10,6 @@
10
10
  "main": "dist/index.js",
11
11
  "types": "dist/index.d.ts",
12
12
  "module": "dist/index.js",
13
- "private": false,
14
13
  "publishConfig": {
15
14
  "access": "public"
16
15
  },
@@ -21,7 +20,8 @@
21
20
  "scripts": {
22
21
  "build": "tsc",
23
22
  "clean": "rm -rf dist",
24
- "prepublish": "cp ../../IDEA.md ./README.md"
23
+ "prepublish": "cp ../../IDEA.md ./README.md",
24
+ "test": "vitest run"
25
25
  },
26
26
  "keywords": [
27
27
  "cdk",
@@ -31,7 +31,8 @@
31
31
  "license": "MIT",
32
32
  "devDependencies": {
33
33
  "@types/node": "^20.0.0",
34
- "typescript": "^5.0.0"
34
+ "typescript": "^5.0.0",
35
+ "vitest": "^1.6.1"
35
36
  },
36
37
  "dependencies": {
37
38
  "constructs": "^10.4.5"
package/src/context.ts ADDED
@@ -0,0 +1,13 @@
1
+ import { AsyncLocalStorage } from 'async_hooks';
2
+
3
+ export type RuntimeContext = Record<string, unknown>;
4
+
5
+ const als = new AsyncLocalStorage<RuntimeContext>();
6
+
7
+ export function getCurrentContext(): RuntimeContext | undefined {
8
+ return als.getStore();
9
+ }
10
+
11
+ export function runWithContext<T>(ctx: RuntimeContext, fn: () => Promise<T>): Promise<T> {
12
+ return als.run(ctx, fn);
13
+ }
package/src/function.ts CHANGED
@@ -2,13 +2,11 @@ import { Construct } from 'constructs';
2
2
 
3
3
  export type FunctionHandler<TArgs extends any[] = any[], TReturn = any> = (...args: TArgs) => Promise<TReturn>;
4
4
 
5
- export type FunctionRuntimeContextMarker = { runtimeContext?: boolean};
6
-
7
5
  /**
8
6
  * Represents a serverless function or handler in the architecture.
9
7
  * Generic over argument types (TArgs) and return type (TReturn).
10
8
  */
11
- export class Function<TArgs extends any[] = any[], TReturn = any, TRuntimeContext extends FunctionRuntimeContextMarker = any> extends Construct {
9
+ export class Function<TArgs extends any[] = any[], TReturn = any> extends Construct {
12
10
  public readonly handler: FunctionHandler<TArgs, TReturn>;
13
11
  private _overload?: FunctionHandler<TArgs, TReturn>;
14
12
 
@@ -34,10 +32,6 @@ export class Function<TArgs extends any[] = any[], TReturn = any, TRuntimeContex
34
32
  return fn(...args);
35
33
  }
36
34
 
37
- public invokeWithRuntimeContext(args: TArgs, ctx: TRuntimeContext): Promise<TReturn> {
38
- const fn = this._overload ?? this.handler;
39
- return fn.apply({ runtimeContext: true, ...ctx }, args);
40
- }
41
35
  }
42
36
 
43
37
  /**
@@ -23,24 +23,32 @@ export const httpHandler = <
23
23
  const pathParams = path.match(/\{(\w+)\}/g) || [];
24
24
 
25
25
  const handler = async (...args: any[]) => {
26
- const url = pathParams.reduce(
26
+ const baseUrl = pathParams.reduce(
27
27
  (u, param, i) => args[i] !== undefined ? u.replace(param, encodeURIComponent(String(args[i]))) : u,
28
28
  `${endpoint.baseUrl}${path}`
29
29
  );
30
30
 
31
+ const extraArgs = args.slice(pathParams.length);
32
+ const isGet = (method ?? 'GET') === 'GET';
33
+
34
+ let url = baseUrl;
35
+ if (isGet && extraArgs.length > 0 && extraArgs[0] != null && typeof extraArgs[0] === 'object') {
36
+ const qs = new URLSearchParams(extraArgs[0] as Record<string, string>).toString();
37
+ if (qs) { url = `${baseUrl}?${qs}`; }
38
+ }
39
+
31
40
  const options: RequestInit = {
32
41
  method: method || 'GET',
33
42
  headers: { 'Content-Type': 'application/json' },
34
- ...((method === 'POST' || method === 'PUT') && args.length > pathParams.length
35
- ? { body: JSON.stringify(args.slice(pathParams.length)) }
43
+ ...(!isGet && extraArgs.length > 0
44
+ ? { body: extraArgs.length === 1 ? JSON.stringify(extraArgs[0]) : JSON.stringify(extraArgs) }
36
45
  : {})
37
46
  };
38
47
 
39
- console.log('HTTP handler. Will fetch', {url, options});
40
48
  const response = await fetcher().fetch(url, options);
41
49
 
42
50
  if (!response.ok) {
43
- throw new Error(`Remote call to ${url} with ${JSON.stringify(options)} failed: ${JSON.stringify(response)}`);
51
+ throw new Error(`Remote call to ${url} with ${JSON.stringify(options)} failed: ${response.status} ${response.statusText}`);
44
52
  }
45
53
 
46
54
  return response.json();
package/src/index.ts CHANGED
@@ -1,6 +1,7 @@
1
1
  export { Construct } from 'constructs';
2
2
  export { Architecture, ArchitectureDefinition, ComponentDefinition } from './architecture';
3
- export { Function, TBDFunction, FunctionHandler, FunctionRuntimeContextMarker } from './function';
3
+ export { Function, TBDFunction, FunctionHandler } from './function';
4
4
  export { ApiContainer, ApiRoutes, RouteEntry, HandlerOf, RouteHandlers } from './api-container';
5
5
  export { ArchitectureBinding, ServiceEndpoint, architectureBinding } from './binding';
6
6
  export { httpHandler, createHttpBindings, Fetcher } from './http-handler';
7
+ export { RuntimeContext, getCurrentContext, runWithContext } from './context';