conode 0.1.24 → 0.2.1

package/README.md

@@ -6,8 +6,6 @@
 [![NPM version][npm-image]][npm-url]
 [![Downloads][downloads-image]][npm-url]
 [![Coverage Status][codecov-image]][codecov-url]
-[![Maintainability][codeclimate-image]][codeclimate-url]
-[![Snyk][snyk-image]][snyk-url]
 
 ## Table of Contents
 
@@ -70,14 +68,14 @@ auth.contextualize(jwt, action);
 
 Class approach with decorator
 ```typescript
-import { contextualize, Context } from '../index';
+import { contextualize, Contextable } from '../index';
 
 const action = () => {
   const service = Service.getContext();
   console.log(service.getSomething());
 };
 
-class Service extends Context() {
+class Service extends Contextable() {
   @contextualize
   async run() {
     await action();
@@ -104,8 +102,4 @@ Copyright (c) 2022-present Ivan Zakharchanka
 [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
-[codeclimate-image]: https://api.codeclimate.com/v1/badges/0ba20f27f6db2b0fec8c/maintainability
-[snyk-url]: https://snyk.io/test/npm/conode/latest
-[snyk-image]: https://img.shields.io/snyk/vulnerabilities/github/3axap4eHko/conode.svg?maxAge=43200
 

package/build/index.cjs

@@ -9,8 +9,8 @@ function _export(target, all) {
     });
 }
 _export(exports, {
-    Context: function() {
-        return Context;
+    Contextable: function() {
+        return Contextable;
     },
     contextualize: function() {
         return contextualize;
@@ -23,37 +23,42 @@ const _nodeasync_hooks = require("node:async_hooks");
 const createContext = ()=>{
     const storage = new _nodeasync_hooks.AsyncLocalStorage();
     return {
-        contextualize (value, callback) {
-            return storage.run(value, callback);
+        contextualize (context, callback) {
+            return storage.run({
+                context
+            }, callback);
         },
         getContext () {
-            return storage.getStore();
+            const store = storage.getStore();
+            if (!store) {
+                throw new Error('Context not initialized');
+            }
+            return store.context;
         }
     };
 };
-function Context(BaseClass = class {
+function Contextable(BaseClass = class {
 }) {
     const context = createContext();
     return class Contextual extends BaseClass {
-        static get context() {
+        static getContext() {
             return context.getContext();
         }
-        async contextualize(callback) {
+        constructor(...args){
+            super(...args);
+        }
+        contextualize(callback) {
             return context.contextualize(this, callback);
         }
     };
 }
-function contextualize(target, _, descriptor) {
-    const property = descriptor.value;
+function contextualize(...args) {
+    const [, , descriptor] = args;
+    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 = function(...args) {
+            return this.contextualize(()=>property.apply(this, args));
+        };
     }
 }
 

package/build/index.cjs.map

@@ -1 +1 @@
-{"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"}
+{"version":3,"sources":["../src/index.ts"],"sourcesContent":["import { AsyncLocalStorage } from 'node:async_hooks';\n\nexport type Fn<T extends unknown[], R> = (...args: T) => R;\n\nexport const createContext = <T>() => {\n  const storage = new AsyncLocalStorage<{ context: T }>();\n  return {\n    contextualize<R>(context: T, callback: Fn<[], R>): R {\n      return storage.run({ context }, callback);\n    },\n    getContext() {\n      const store = storage.getStore();\n      if (!store) {\n        throw new Error('Context not initialized');\n      }\n      return store.context;\n    }\n  };\n};\n\ntype Constructor = new (...args: any) => any;\n\nexport interface Contextualized {\n  contextualize<R>(callback: Fn<[], R>): Promise<R>;\n}\n\nexport function Contextable(BaseClass: Constructor = class { }) {\n  const context = createContext();\n  return class Contextual extends BaseClass {\n    static getContext<C extends Constructor>(this: C) {\n      return context.getContext() as InstanceType<C>;\n    }\n    constructor(...args: unknown[]) {\n      super(...args);\n    }\n\n    contextualize<R>(callback: Fn<[], R>): R {\n      return context.contextualize(this, callback);\n    }\n  };\n}\n\nexport function contextualize<T extends Contextualized, K extends keyof T>(...args: unknown[]) {\n  const [, , descriptor] = args as [T, K, TypedPropertyDescriptor<T[K]>];\n  const property = descriptor?.value;\n  if (typeof property === 'function') {\n    descriptor.value = function(this: Contextualized, ...args: unknown[]) {\n      return this.contextualize(() => property.apply(this, args));\n    } as T[K];\n  }\n}\n\n"],"names":["Contextable","contextualize","createContext","storage","AsyncLocalStorage","context","callback","run","getContext","store","getStore","Error","BaseClass","Contextual","constructor","args","descriptor","property","value","apply"],"mappings":";;;;;;;;;;;IA0BgBA,WAAW;eAAXA;;IAgBAC,aAAa;eAAbA;;IAtCHC,aAAa;eAAbA;;;iCAJqB;AAI3B,MAAMA,gBAAgB;IAC3B,MAAMC,UAAU,IAAIC,kCAAiB;IACrC,OAAO;QACLH,eAAiBI,OAAU,EAAEC,QAAmB;YAC9C,OAAOH,QAAQI,GAAG,CAAC;gBAAEF;YAAQ,GAAGC;QAClC;QACAE;YACE,MAAMC,QAAQN,QAAQO,QAAQ;YAC9B,IAAI,CAACD,OAAO;gBACV,MAAM,IAAIE,MAAM;YAClB;YACA,OAAOF,MAAMJ,OAAO;QACtB;IACF;AACF;AAQO,SAASL,YAAYY,YAAyB;AAAQ,CAAC;IAC5D,MAAMP,UAAUH;IAChB,OAAO,MAAMW,mBAAmBD;QAC9B,OAAOJ,aAA2C;YAChD,OAAOH,QAAQG,UAAU;QAC3B;QACAM,YAAY,GAAGC,IAAe,CAAE;YAC9B,KAAK,IAAIA;QACX;QAEAd,cAAiBK,QAAmB,EAAK;YACvC,OAAOD,QAAQJ,aAAa,CAAC,IAAI,EAAEK;QACrC;IACF;AACF;AAEO,SAASL,cAA2D,GAAGc,IAAe;IAC3F,MAAM,KAAKC,WAAW,GAAGD;IACzB,MAAME,WAAWD,YAAYE;IAC7B,IAAI,OAAOD,aAAa,YAAY;QAClCD,WAAWE,KAAK,GAAG,SAA+B,GAAGH,IAAe;YAClE,OAAO,IAAI,CAACd,aAAa,CAAC,IAAMgB,SAASE,KAAK,CAAC,IAAI,EAAEJ;QACvD;IACF;AACF"}

package/build/index.d.ts

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

package/build/index.js

@@ -2,37 +2,42 @@ import { AsyncLocalStorage } from 'node:async_hooks';
 export const createContext = ()=>{
     const storage = new AsyncLocalStorage();
     return {
-        contextualize (value, callback) {
-            return storage.run(value, callback);
+        contextualize (context, callback) {
+            return storage.run({
+                context
+            }, callback);
         },
         getContext () {
-            return storage.getStore();
+            const store = storage.getStore();
+            if (!store) {
+                throw new Error('Context not initialized');
+            }
+            return store.context;
         }
     };
 };
-export function Context(BaseClass = class {
+export function Contextable(BaseClass = class {
 }) {
     const context = createContext();
     return class Contextual extends BaseClass {
-        static get context() {
+        static getContext() {
             return context.getContext();
         }
-        async contextualize(callback) {
+        constructor(...args){
+            super(...args);
+        }
+        contextualize(callback) {
             return context.contextualize(this, callback);
         }
     };
 }
-export function contextualize(target, _, descriptor) {
-    const property = descriptor.value;
+export function contextualize(...args) {
+    const [, , descriptor] = args;
+    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 = function(...args) {
+            return this.contextualize(()=>property.apply(this, args));
+        };
     }
 }
 

package/build/index.js.map

@@ -1 +1 @@
-{"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"}
+{"version":3,"sources":["../src/index.ts"],"sourcesContent":["import { AsyncLocalStorage } from 'node:async_hooks';\n\nexport type Fn<T extends unknown[], R> = (...args: T) => R;\n\nexport const createContext = <T>() => {\n  const storage = new AsyncLocalStorage<{ context: T }>();\n  return {\n    contextualize<R>(context: T, callback: Fn<[], R>): R {\n      return storage.run({ context }, callback);\n    },\n    getContext() {\n      const store = storage.getStore();\n      if (!store) {\n        throw new Error('Context not initialized');\n      }\n      return store.context;\n    }\n  };\n};\n\ntype Constructor = new (...args: any) => any;\n\nexport interface Contextualized {\n  contextualize<R>(callback: Fn<[], R>): Promise<R>;\n}\n\nexport function Contextable(BaseClass: Constructor = class { }) {\n  const context = createContext();\n  return class Contextual extends BaseClass {\n    static getContext<C extends Constructor>(this: C) {\n      return context.getContext() as InstanceType<C>;\n    }\n    constructor(...args: unknown[]) {\n      super(...args);\n    }\n\n    contextualize<R>(callback: Fn<[], R>): R {\n      return context.contextualize(this, callback);\n    }\n  };\n}\n\nexport function contextualize<T extends Contextualized, K extends keyof T>(...args: unknown[]) {\n  const [, , descriptor] = args as [T, K, TypedPropertyDescriptor<T[K]>];\n  const property = descriptor?.value;\n  if (typeof property === 'function') {\n    descriptor.value = function(this: Contextualized, ...args: unknown[]) {\n      return this.contextualize(() => property.apply(this, args));\n    } as T[K];\n  }\n}\n\n"],"names":["AsyncLocalStorage","createContext","storage","contextualize","context","callback","run","getContext","store","getStore","Error","Contextable","BaseClass","Contextual","constructor","args","descriptor","property","value","apply"],"mappings":"AAAA,SAASA,iBAAiB,QAAQ,mBAAmB;AAIrD,OAAO,MAAMC,gBAAgB;IAC3B,MAAMC,UAAU,IAAIF;IACpB,OAAO;QACLG,eAAiBC,OAAU,EAAEC,QAAmB;YAC9C,OAAOH,QAAQI,GAAG,CAAC;gBAAEF;YAAQ,GAAGC;QAClC;QACAE;YACE,MAAMC,QAAQN,QAAQO,QAAQ;YAC9B,IAAI,CAACD,OAAO;gBACV,MAAM,IAAIE,MAAM;YAClB;YACA,OAAOF,MAAMJ,OAAO;QACtB;IACF;AACF,EAAE;AAQF,OAAO,SAASO,YAAYC,YAAyB;AAAQ,CAAC;IAC5D,MAAMR,UAAUH;IAChB,OAAO,MAAMY,mBAAmBD;QAC9B,OAAOL,aAA2C;YAChD,OAAOH,QAAQG,UAAU;QAC3B;QACAO,YAAY,GAAGC,IAAe,CAAE;YAC9B,KAAK,IAAIA;QACX;QAEAZ,cAAiBE,QAAmB,EAAK;YACvC,OAAOD,QAAQD,aAAa,CAAC,IAAI,EAAEE;QACrC;IACF;AACF;AAEA,OAAO,SAASF,cAA2D,GAAGY,IAAe;IAC3F,MAAM,KAAKC,WAAW,GAAGD;IACzB,MAAME,WAAWD,YAAYE;IAC7B,IAAI,OAAOD,aAAa,YAAY;QAClCD,WAAWE,KAAK,GAAG,SAA+B,GAAGH,IAAe;YAClE,OAAO,IAAI,CAACZ,aAAa,CAAC,IAAMc,SAASE,KAAK,CAAC,IAAI,EAAEJ;QACvD;IACF;AACF"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "conode",
-  "version": "0.1.24",
+  "version": "0.2.1",
   "description": "0-Deps, simple and fast context library for NodeJS",
   "type": "module",
   "main": "build/index.cjs",
@@ -11,6 +11,11 @@
   ],
   "module": "build/index.js",
   "sideEffects": false,
+  "scripts": {
+    "build": "rm -rf build && inop src build -i __tests__ -i *.tmp.ts && tsc --declaration --emitDeclarationOnly",
+    "test": "jest",
+    "test:build": "node src/__tests__/index.cjs && node src/__tests__/index.mjs"
+  },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/3axap4eHko/conode.git"
@@ -39,8 +44,5 @@
     "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"
-  }
-}
+  "packageManager": "pnpm@10.11.0"
+}

package/src/index.ts

@@ -1,49 +1,52 @@
 import { AsyncLocalStorage } from 'node:async_hooks';
 
-export type Callback = (...args: unknown[]) => PromiseLike<unknown> | unknown;
+export type Fn<T extends unknown[], R> = (...args: T) => R;
 
 export const createContext = <T>() => {
-  const storage = new AsyncLocalStorage<T>();
-
+  const storage = new AsyncLocalStorage<{ context: T }>();
   return {
-    contextualize(value: T, callback: Callback) {
-      return storage.run(value, callback);
+    contextualize<R>(context: T, callback: Fn<[], R>): R {
+      return storage.run({ context }, callback);
     },
     getContext() {
-      return storage.getStore();
+      const store = storage.getStore();
+      if (!store) {
+        throw new Error('Context not initialized');
+      }
+      return store.context;
     }
   };
 };
 
-type Constructor = new (...args: unknown[]) => object;
+type Constructor = new (...args: any) => any;
 
-export function Context(BaseClass: Constructor = class { }) {
+export interface Contextualized {
+  contextualize<R>(callback: Fn<[], R>): Promise<R>;
+}
+
+export function Contextable(BaseClass: Constructor = class { }) {
   const context = createContext();
   return class Contextual extends BaseClass {
-    static get context() {
-      return context.getContext();
+    static getContext<C extends Constructor>(this: C) {
+      return context.getContext() as InstanceType<C>;
+    }
+    constructor(...args: unknown[]) {
+      super(...args);
     }
 
-    async contextualize(callback: Callback) {
+    contextualize<R>(callback: Fn<[], R>): R {
       return context.contextualize(this, callback);
     }
   };
 }
 
-export interface Contextualized {
-  contextualize(callback: Callback): Promise<any>;
-}
-
-export function contextualize<T extends Contextualized, K extends keyof T>(target: T, _: K, descriptor: PropertyDescriptor) {
-  const property = descriptor.value;
+export function contextualize<T extends Contextualized, K extends keyof T>(...args: unknown[]) {
+  const [, , descriptor] = args as [T, K, TypedPropertyDescriptor<T[K]>];
+  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];
-    }
+    descriptor.value = function(this: Contextualized, ...args: unknown[]) {
+      return this.contextualize(() => property.apply(this, args));
+    } as T[K];
   }
 }