conode 0.1.23 → 0.1.24

package/README.md

@@ -1,6 +1,6 @@
 # CoNode
 
-0-Deps, simple and fast context library for NodeJS
+0-deps async context management for Node.js
 
 [![Build Status][github-image]][github-url]
 [![NPM version][npm-image]][npm-url]
@@ -18,9 +18,10 @@
 
 ## Features
 
-- Provides useful wrappers of [AsyncLocalStorage](https://nodejs.org/api/async_context.html)
-- Supports TypeScript typings
-- Supports CommonJS and ES Module systems
+- Zero dependencies  
+- Lightweight wrappers around [AsyncLocalStorage](https://nodejs.org/api/async_hooks.html)  
+- Full TypeScript support  
+- Works in CommonJS and ES Module environments  
 
 ## Installing
 
@@ -38,6 +39,22 @@ yarn add conode
 
 ## Examples
 
+Quick start
+```typescript
+import { createContext } from 'conode';
+
+interface RequestContext { userId: string }
+
+const reqCtx = createContext<RequestContext>();
+
+async function handleRequest() {
+  console.log(reqCtx.getContext()?.userId);
+}
+
+await reqCtx.contextualize({ userId: 'abc123' }, handleRequest);
+// Logs: 'abc123'
+```
+
 Functional approach
 ```typescript
 import { createContext } from '../index';
@@ -51,7 +68,7 @@ const action = () => {
 auth.contextualize(jwt, action);
 ```
 
-Class approach
+Class approach with decorator
 ```typescript
 import { contextualize, Context } from '../index';
 
@@ -83,8 +100,8 @@ Copyright (c) 2022-present Ivan Zakharchanka
 [npm-url]: https://www.npmjs.com/package/conode
 [downloads-image]: https://img.shields.io/npm/dw/conode.svg?maxAge=43200
 [npm-image]: https://img.shields.io/npm/v/conode.svg?maxAge=43200
-[github-url]: https://github.com/3axap4eHko/conode/actions/workflows/cicd.yml
-[github-image]: https://github.com/3axap4eHko/conode/actions/workflows/cicd.yml/badge.svg
+[github-url]: https://github.com/3axap4eHko/conode/actions/workflows/build.yml
+[github-image]: https://github.com/3axap4eHko/conode/actions/workflows/build.yml/badge.svg
 [codecov-url]: https://codecov.io/gh/3axap4eHko/conode
 [codecov-image]: https://codecov.io/gh/3axap4eHko/conode/branch/master/graph/badge.svg?token=JZ8QCGH6PI
 [codeclimate-url]: https://codeclimate.com/github/3axap4eHko/conode/maintainability

package/build/index.cjs

@@ -1,70 +1,60 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+function _export(target, all) {
+    for(var name in all)Object.defineProperty(target, name, {
+        enumerable: true,
+        get: all[name]
     });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.contextualize = exports.Context = exports.createContext = void 0;
-const async_hooks_1 = require("async_hooks");
-const createContext = () => {
-    const storage = new async_hooks_1.AsyncLocalStorage();
+}
+_export(exports, {
+    Context: function() {
+        return Context;
+    },
+    contextualize: function() {
+        return contextualize;
+    },
+    createContext: function() {
+        return createContext;
+    }
+});
+const _nodeasync_hooks = require("node:async_hooks");
+const createContext = ()=>{
+    const storage = new _nodeasync_hooks.AsyncLocalStorage();
     return {
-        contextualize(value, callback) {
-            return new Promise((resolve, reject) => {
-                storage.run(value, () => __awaiter(this, void 0, void 0, function* () {
-                    try {
-                        yield callback();
-                        resolve();
-                    }
-                    catch (e) {
-                        reject(e);
-                    }
-                }));
-            });
+        contextualize (value, callback) {
+            return storage.run(value, callback);
         },
-        getContext() {
+        getContext () {
             return storage.getStore();
         }
     };
 };
-exports.createContext = createContext;
-function Context(Base) {
-    const context = (0, exports.createContext)();
-    return Base
-        ? class Contextual extends Base {
-            static get context() {
-                return context.getContext();
-            }
-            contextualize(callback) {
-                return __awaiter(this, void 0, void 0, function* () {
-                    return context.contextualize(this, callback);
-                });
-            }
+function Context(BaseClass = class {
+}) {
+    const context = createContext();
+    return class Contextual extends BaseClass {
+        static get context() {
+            return context.getContext();
         }
-        : class Contextual {
-            static get context() {
-                return context.getContext();
-            }
-            contextualize(callback) {
-                return __awaiter(this, void 0, void 0, function* () {
-                    return context.contextualize(this, callback);
-                });
-            }
-        };
+        async contextualize(callback) {
+            return context.contextualize(this, callback);
+        }
+    };
 }
-exports.Context = Context;
 function contextualize(target, _, descriptor) {
-    const method = descriptor.value;
-    function contextualized() {
-        return target.contextualize(() => method.apply(this, arguments));
+    const property = descriptor.value;
+    if (typeof property === 'function') {
+        const method = property?.bind(target);
+        if (method) {
+            function contextualized(...args) {
+                return target.contextualize(()=>method.apply(null, args));
+            }
+            ;
+            descriptor.value = contextualized;
+        }
     }
-    ;
-    descriptor.value = contextualized;
 }
-exports.contextualize = contextualize;
-//# sourceMappingURL=index.cjs.map
+
+//# sourceMappingURL=index.cjs.map

package/build/index.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"index.cjs","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6CAAgD;AAIzC,MAAM,aAAa,GAAG,GAAM,EAAE;IACnC,MAAM,OAAO,GAAG,IAAI,+BAAiB,EAAK,CAAC;IAE3C,OAAO;QACL,aAAa,CAAC,KAAQ,EAAE,QAAkB;YACxC,OAAO,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;gBAC3C,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,GAAS,EAAE;oBAC5B,IAAI;wBACF,MAAM,QAAQ,EAAE,CAAC;wBACjB,OAAO,EAAE,CAAC;qBACX;oBAAC,OAAO,CAAC,EAAE;wBACV,MAAM,CAAC,CAAC,CAAC,CAAC;qBACX;gBACH,CAAC,CAAA,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;QACL,CAAC;QACD,UAAU;YACR,OAAO,OAAO,CAAC,QAAQ,EAAE,CAAC;QAC5B,CAAC;KACF,CAAC;AACJ,CAAC,CAAC;AApBW,QAAA,aAAa,iBAoBxB;AAIF,SAAgB,OAAO,CAAC,IAAkB;IACxC,MAAM,OAAO,GAAG,IAAA,qBAAa,GAAE,CAAC;IAEhC,OAAO,IAAI;QACT,CAAC,CAAC,MAAM,UAAW,SAAQ,IAAI;YAC7B,MAAM,KAAK,OAAO;gBAChB,OAAO,OAAO,CAAC,UAAU,EAAE,CAAC;YAC9B,CAAC;YAEK,aAAa,CAAC,QAAkB;;oBACpC,OAAO,OAAO,CAAC,aAAa,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;gBAC/C,CAAC;aAAA;SACF;QACD,CAAC,CAAC,MAAM,UAAU;YAChB,MAAM,KAAK,OAAO;gBAChB,OAAO,OAAO,CAAC,UAAU,EAAE,CAAC;YAC9B,CAAC;YAEK,aAAa,CAAC,QAAkB;;oBACpC,OAAO,OAAO,CAAC,aAAa,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;gBAC/C,CAAC;aAAA;SACF,CAAC;AACN,CAAC;AAtBD,0BAsBC;AAMD,SAAgB,aAAa,CAA2B,MAAS,EAAE,CAAS,EAAE,UAA6C;IACzH,MAAM,MAAM,GAAG,UAAU,CAAC,KAAM,CAAC;IACjC,SAAS,cAAc;QACrB,OAAO,MAAM,CAAC,aAAa,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC;IACnE,CAAC;IAAA,CAAC;IACF,UAAU,CAAC,KAAK,GAAG,cAAqB,CAAC;AAC3C,CAAC;AAND,sCAMC"}
+{"version":3,"sources":["../src/index.ts"],"sourcesContent":["import { AsyncLocalStorage } from 'node:async_hooks';\n\nexport type Callback = (...args: unknown[]) => PromiseLike<unknown> | unknown;\n\nexport const createContext = <T>() => {\n  const storage = new AsyncLocalStorage<T>();\n\n  return {\n    contextualize(value: T, callback: Callback) {\n      return storage.run(value, callback);\n    },\n    getContext() {\n      return storage.getStore();\n    }\n  };\n};\n\ntype Constructor = new (...args: unknown[]) => object;\n\nexport function Context(BaseClass: Constructor = class { }) {\n  const context = createContext();\n  return class Contextual extends BaseClass {\n    static get context() {\n      return context.getContext();\n    }\n\n    async contextualize(callback: Callback) {\n      return context.contextualize(this, callback);\n    }\n  };\n}\n\nexport interface Contextualized {\n  contextualize(callback: Callback): Promise<any>;\n}\n\nexport function contextualize<T extends Contextualized, K extends keyof T>(target: T, _: K, descriptor: PropertyDescriptor) {\n  const property = descriptor.value;\n  if (typeof property === 'function') {\n    const method = property?.bind(target);\n    if (method) {\n      function contextualized<A extends unknown[]>(...args: A) {\n        return target.contextualize(() => method.apply(null, args));\n      };\n      descriptor.value = contextualized as T[K];\n    }\n  }\n}\n\n"],"names":["Context","contextualize","createContext","storage","AsyncLocalStorage","value","callback","run","getContext","getStore","BaseClass","context","Contextual","target","_","descriptor","property","method","bind","contextualized","args","apply"],"mappings":";;;;;;;;;;;IAmBgBA,OAAO;eAAPA;;IAiBAC,aAAa;eAAbA;;IAhCHC,aAAa;eAAbA;;;iCAJqB;AAI3B,MAAMA,gBAAgB;IAC3B,MAAMC,UAAU,IAAIC,kCAAiB;IAErC,OAAO;QACLH,eAAcI,KAAQ,EAAEC,QAAkB;YACxC,OAAOH,QAAQI,GAAG,CAACF,OAAOC;QAC5B;QACAE;YACE,OAAOL,QAAQM,QAAQ;QACzB;IACF;AACF;AAIO,SAAST,QAAQU,YAAyB;AAAQ,CAAC;IACxD,MAAMC,UAAUT;IAChB,OAAO,MAAMU,mBAAmBF;QAC9B,WAAWC,UAAU;YACnB,OAAOA,QAAQH,UAAU;QAC3B;QAEA,MAAMP,cAAcK,QAAkB,EAAE;YACtC,OAAOK,QAAQV,aAAa,CAAC,IAAI,EAAEK;QACrC;IACF;AACF;AAMO,SAASL,cAA2DY,MAAS,EAAEC,CAAI,EAAEC,UAA8B;IACxH,MAAMC,WAAWD,WAAWV,KAAK;IACjC,IAAI,OAAOW,aAAa,YAAY;QAClC,MAAMC,SAASD,UAAUE,KAAKL;QAC9B,IAAII,QAAQ;YACV,SAASE,eAAoC,GAAGC,IAAO;gBACrD,OAAOP,OAAOZ,aAAa,CAAC,IAAMgB,OAAOI,KAAK,CAAC,MAAMD;YACvD;;YACAL,WAAWV,KAAK,GAAGc;QACrB;IACF;AACF"}

package/build/index.d.ts

@@ -1,17 +1,17 @@
-export type Callback = () => any;
+export type Callback = (...args: unknown[]) => PromiseLike<unknown> | unknown;
 export declare const createContext: <T>() => {
-    contextualize(value: T, callback: Callback): Promise<void>;
+    contextualize(value: T, callback: Callback): unknown;
     getContext(): T | undefined;
 };
-type Constructor = new (...args: any[]) => {};
-export declare function Context(Base?: Constructor): {
-    new (...args: any[]): {
-        contextualize(callback: Callback): Promise<void>;
+type Constructor = new (...args: unknown[]) => object;
+export declare function Context(BaseClass?: Constructor): {
+    new (...args: unknown[]): {
+        contextualize(callback: Callback): Promise<unknown>;
     };
     readonly context: unknown;
 };
 export interface Contextualized {
     contextualize(callback: Callback): Promise<any>;
 }
-export declare function contextualize<T extends Contextualized>(target: T, _: string, descriptor: TypedPropertyDescriptor<Callback>): void;
+export declare function contextualize<T extends Contextualized, K extends keyof T>(target: T, _: K, descriptor: PropertyDescriptor): void;
 export {};

package/build/index.js

@@ -1,51 +1,39 @@
-import { AsyncLocalStorage } from 'async_hooks';
-export const createContext = () => {
+import { AsyncLocalStorage } from 'node:async_hooks';
+export const createContext = ()=>{
     const storage = new AsyncLocalStorage();
     return {
-        contextualize(value, callback) {
-            return new Promise((resolve, reject) => {
-                storage.run(value, async () => {
-                    try {
-                        await callback();
-                        resolve();
-                    }
-                    catch (e) {
-                        reject(e);
-                    }
-                });
-            });
+        contextualize (value, callback) {
+            return storage.run(value, callback);
         },
-        getContext() {
+        getContext () {
             return storage.getStore();
         }
     };
 };
-export function Context(Base) {
+export function Context(BaseClass = class {
+}) {
     const context = createContext();
-    return Base
-        ? class Contextual extends Base {
-            static get context() {
-                return context.getContext();
-            }
-            async contextualize(callback) {
-                return context.contextualize(this, callback);
-            }
+    return class Contextual extends BaseClass {
+        static get context() {
+            return context.getContext();
         }
-        : class Contextual {
-            static get context() {
-                return context.getContext();
-            }
-            async contextualize(callback) {
-                return context.contextualize(this, callback);
-            }
-        };
+        async contextualize(callback) {
+            return context.contextualize(this, callback);
+        }
+    };
 }
 export function contextualize(target, _, descriptor) {
-    const method = descriptor.value;
-    function contextualized() {
-        return target.contextualize(() => method.apply(this, arguments));
+    const property = descriptor.value;
+    if (typeof property === 'function') {
+        const method = property?.bind(target);
+        if (method) {
+            function contextualized(...args) {
+                return target.contextualize(()=>method.apply(null, args));
+            }
+            ;
+            descriptor.value = contextualized;
+        }
     }
-    ;
-    descriptor.value = contextualized;
 }
-//# sourceMappingURL=index.js.map
+
+//# sourceMappingURL=index.js.map

package/build/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAIhD,MAAM,CAAC,MAAM,aAAa,GAAG,GAAM,EAAE;IACnC,MAAM,OAAO,GAAG,IAAI,iBAAiB,EAAK,CAAC;IAE3C,OAAO;QACL,aAAa,CAAC,KAAQ,EAAE,QAAkB;YACxC,OAAO,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;gBAC3C,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,KAAK,IAAI,EAAE;oBAC5B,IAAI;wBACF,MAAM,QAAQ,EAAE,CAAC;wBACjB,OAAO,EAAE,CAAC;qBACX;oBAAC,OAAO,CAAC,EAAE;wBACV,MAAM,CAAC,CAAC,CAAC,CAAC;qBACX;gBACH,CAAC,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;QACL,CAAC;QACD,UAAU;YACR,OAAO,OAAO,CAAC,QAAQ,EAAE,CAAC;QAC5B,CAAC;KACF,CAAC;AACJ,CAAC,CAAC;AAIF,MAAM,UAAU,OAAO,CAAC,IAAkB;IACxC,MAAM,OAAO,GAAG,aAAa,EAAE,CAAC;IAEhC,OAAO,IAAI;QACT,CAAC,CAAC,MAAM,UAAW,SAAQ,IAAI;YAC7B,MAAM,KAAK,OAAO;gBAChB,OAAO,OAAO,CAAC,UAAU,EAAE,CAAC;YAC9B,CAAC;YAED,KAAK,CAAC,aAAa,CAAC,QAAkB;gBACpC,OAAO,OAAO,CAAC,aAAa,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;YAC/C,CAAC;SACF;QACD,CAAC,CAAC,MAAM,UAAU;YAChB,MAAM,KAAK,OAAO;gBAChB,OAAO,OAAO,CAAC,UAAU,EAAE,CAAC;YAC9B,CAAC;YAED,KAAK,CAAC,aAAa,CAAC,QAAkB;gBACpC,OAAO,OAAO,CAAC,aAAa,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;YAC/C,CAAC;SACF,CAAC;AACN,CAAC;AAMD,MAAM,UAAU,aAAa,CAA2B,MAAS,EAAE,CAAS,EAAE,UAA6C;IACzH,MAAM,MAAM,GAAG,UAAU,CAAC,KAAM,CAAC;IACjC,SAAS,cAAc;QACrB,OAAO,MAAM,CAAC,aAAa,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC;IACnE,CAAC;IAAA,CAAC;IACF,UAAU,CAAC,KAAK,GAAG,cAAqB,CAAC;AAC3C,CAAC"}
+{"version":3,"sources":["../src/index.ts"],"sourcesContent":["import { AsyncLocalStorage } from 'node:async_hooks';\n\nexport type Callback = (...args: unknown[]) => PromiseLike<unknown> | unknown;\n\nexport const createContext = <T>() => {\n  const storage = new AsyncLocalStorage<T>();\n\n  return {\n    contextualize(value: T, callback: Callback) {\n      return storage.run(value, callback);\n    },\n    getContext() {\n      return storage.getStore();\n    }\n  };\n};\n\ntype Constructor = new (...args: unknown[]) => object;\n\nexport function Context(BaseClass: Constructor = class { }) {\n  const context = createContext();\n  return class Contextual extends BaseClass {\n    static get context() {\n      return context.getContext();\n    }\n\n    async contextualize(callback: Callback) {\n      return context.contextualize(this, callback);\n    }\n  };\n}\n\nexport interface Contextualized {\n  contextualize(callback: Callback): Promise<any>;\n}\n\nexport function contextualize<T extends Contextualized, K extends keyof T>(target: T, _: K, descriptor: PropertyDescriptor) {\n  const property = descriptor.value;\n  if (typeof property === 'function') {\n    const method = property?.bind(target);\n    if (method) {\n      function contextualized<A extends unknown[]>(...args: A) {\n        return target.contextualize(() => method.apply(null, args));\n      };\n      descriptor.value = contextualized as T[K];\n    }\n  }\n}\n\n"],"names":["AsyncLocalStorage","createContext","storage","contextualize","value","callback","run","getContext","getStore","Context","BaseClass","context","Contextual","target","_","descriptor","property","method","bind","contextualized","args","apply"],"mappings":"AAAA,SAASA,iBAAiB,QAAQ,mBAAmB;AAIrD,OAAO,MAAMC,gBAAgB;IAC3B,MAAMC,UAAU,IAAIF;IAEpB,OAAO;QACLG,eAAcC,KAAQ,EAAEC,QAAkB;YACxC,OAAOH,QAAQI,GAAG,CAACF,OAAOC;QAC5B;QACAE;YACE,OAAOL,QAAQM,QAAQ;QACzB;IACF;AACF,EAAE;AAIF,OAAO,SAASC,QAAQC,YAAyB;AAAQ,CAAC;IACxD,MAAMC,UAAUV;IAChB,OAAO,MAAMW,mBAAmBF;QAC9B,WAAWC,UAAU;YACnB,OAAOA,QAAQJ,UAAU;QAC3B;QAEA,MAAMJ,cAAcE,QAAkB,EAAE;YACtC,OAAOM,QAAQR,aAAa,CAAC,IAAI,EAAEE;QACrC;IACF;AACF;AAMA,OAAO,SAASF,cAA2DU,MAAS,EAAEC,CAAI,EAAEC,UAA8B;IACxH,MAAMC,WAAWD,WAAWX,KAAK;IACjC,IAAI,OAAOY,aAAa,YAAY;QAClC,MAAMC,SAASD,UAAUE,KAAKL;QAC9B,IAAII,QAAQ;YACV,SAASE,eAAoC,GAAGC,IAAO;gBACrD,OAAOP,OAAOV,aAAa,CAAC,IAAMc,OAAOI,KAAK,CAAC,MAAMD;YACvD;;YACAL,WAAWX,KAAK,GAAGe;QACrB;IACF;AACF"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "conode",
-  "version": "0.1.23",
+  "version": "0.1.24",
   "description": "0-Deps, simple and fast context library for NodeJS",
   "type": "module",
   "main": "build/index.cjs",
@@ -11,13 +11,6 @@
   ],
   "module": "build/index.js",
   "sideEffects": false,
-  "scripts": {
-    "convert-cjs": "node scripts/convert-cjs.js",
-    "build": "rm -rf build && yarn build:cjs && yarn build:mjs",
-    "build:cjs": "tsc -p tsconfig.cjs.json && yarn convert-cjs",
-    "build:mjs": "tsc -p tsconfig.mjs.json --declaration",
-    "test": "jest"
-  },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/3axap4eHko/conode.git"
@@ -39,10 +32,15 @@
   },
   "homepage": "https://github.com/3axap4eHko/conode#readme",
   "devDependencies": {
-    "@types/jest": "^27.5.1",
-    "@types/node": "^17.0.35",
-    "jest": "^28.1.0",
-    "ts-jest": "^28.0.3",
-    "typescript": "^4.7.2"
+    "@swc/jest": "^0.2.38",
+    "@types/jest": "^29.5.14",
+    "@types/node": "^22.15.18",
+    "inop": "^0.7.8",
+    "jest": "^29.7.0",
+    "typescript": "^5.8.3"
+  },
+  "scripts": {
+    "build": "rm -rf build && inop src build -i __tests__ -i *.tmp.ts && tsc --declaration --emitDeclarationOnly",
+    "test": "jest"
   }
-}
+}

package/src/index.ts

@@ -1,22 +1,13 @@
-import { AsyncLocalStorage } from 'async_hooks';
+import { AsyncLocalStorage } from 'node:async_hooks';
 
-export type Callback = () => any;
+export type Callback = (...args: unknown[]) => PromiseLike<unknown> | unknown;
 
 export const createContext = <T>() => {
   const storage = new AsyncLocalStorage<T>();
 
   return {
     contextualize(value: T, callback: Callback) {
-      return new Promise<void>((resolve, reject) => {
-        storage.run(value, async () => {
-          try {
-            await callback();
-            resolve();
-          } catch (e) {
-            reject(e);
-          }
-        });
-      });
+      return storage.run(value, callback);
     },
     getContext() {
       return storage.getStore();
@@ -24,40 +15,35 @@ export const createContext = <T>() => {
   };
 };
 
-type Constructor = new (...args: any[]) => {};
+type Constructor = new (...args: unknown[]) => object;
 
-export function Context(Base?: Constructor) {
+export function Context(BaseClass: Constructor = class { }) {
   const context = createContext();
+  return class Contextual extends BaseClass {
+    static get context() {
+      return context.getContext();
+    }
 
-  return Base
-    ? class Contextual extends Base {
-      static get context() {
-        return context.getContext();
-      }
-
-      async contextualize(callback: Callback) {
-        return context.contextualize(this, callback);
-      }
+    async contextualize(callback: Callback) {
+      return context.contextualize(this, callback);
     }
-    : class Contextual {
-      static get context() {
-        return context.getContext();
-      }
-
-      async contextualize(callback: Callback) {
-        return context.contextualize(this, callback);
-      }
-    };
+  };
 }
 
 export interface Contextualized {
   contextualize(callback: Callback): Promise<any>;
 }
 
-export function contextualize<T extends Contextualized>(target: T, _: string, descriptor: TypedPropertyDescriptor<Callback>) {
-  const method = descriptor.value!;
-  function contextualized() {
-    return target.contextualize(() => method.apply(this, arguments));
-  };
-  descriptor.value = contextualized as any;
+export function contextualize<T extends Contextualized, K extends keyof T>(target: T, _: K, descriptor: PropertyDescriptor) {
+  const property = descriptor.value;
+  if (typeof property === 'function') {
+    const method = property?.bind(target);
+    if (method) {
+      function contextualized<A extends unknown[]>(...args: A) {
+        return target.contextualize(() => method.apply(null, args));
+      };
+      descriptor.value = contextualized as T[K];
+    }
+  }
 }
+