@travetto/context 7.1.3 → 8.0.0-alpha.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/context",
-  "version": "7.1.3",
+  "version": "8.0.0-alpha.0",
   "type": "module",
   "description": "Async-aware state management, maintaining context across asynchronous calls.",
   "keywords": [
@@ -27,10 +27,10 @@
     "directory": "module/context"
   },
   "dependencies": {
-    "@travetto/di": "^7.1.3"
+    "@travetto/di": "^8.0.0-alpha.0"
   },
   "peerDependencies": {
-    "@travetto/test": "^7.1.3"
+    "@travetto/test": "^8.0.0-alpha.0"
   },
   "peerDependenciesMeta": {
     "@travetto/test": {

package/src/service.ts

@@ -1,7 +1,7 @@
 import { AsyncLocalStorage } from 'node:async_hooks';
 
 import { Injectable } from '@travetto/di';
-import { AppError, AsyncQueue, castTo } from '@travetto/runtime';
+import { RuntimeError, AsyncQueue, castTo } from '@travetto/runtime';
 
 type Ctx<T = unknown> = Record<string | symbol, T>;
 
@@ -21,7 +21,7 @@ export class AsyncContext {
   #get<T = unknown>(): Ctx<T> {
     const store = this.storage.getStore();
     if (!store) {
-      throw new AppError('Context is not initialized');
+      throw new RuntimeError('Context is not initialized');
     }
     return castTo(store);
   }

package/src/value.ts

@@ -1,6 +1,6 @@
 import type { AsyncLocalStorage } from 'node:async_hooks';
 
-import { AppError, castTo } from '@travetto/runtime';
+import { RuntimeError, castTo } from '@travetto/runtime';
 
 type Payload<T> = Record<string | symbol, T | undefined>;
 type Storage<T = unknown> = AsyncLocalStorage<Payload<T>>;
@@ -36,7 +36,7 @@ export class AsyncContextValue<T = unknown> {
   #store(mode: keyof ReadWriteConfig): Payload<T> | undefined {
     const store = (this.#storage ??= this.#source()).getStore();
     if (!store && this.#failIfUnbound[mode]) {
-      throw new AppError('Context not initialized');
+      throw new RuntimeError('Context not initialized');
     }
     return store;
   }

package/support/test/context.ts

@@ -1,11 +1,31 @@
 import { DependencyRegistryIndex } from '@travetto/di';
-import type { Class } from '@travetto/runtime';
+import { castKey, castTo, type Class } from '@travetto/runtime';
 import { Registry } from '@travetto/registry';
-import { SuiteRegistryIndex } from '@travetto/test';
+import { SuiteRegistryIndex, type SuitePhaseHandler } from '@travetto/test';
 
 import { AsyncContext } from '../../src/service.ts';
 
-const Init = Symbol();
+class ContextSuiteHandler<T extends object> implements SuitePhaseHandler<T> {
+  target: Class<T>;
+
+  constructor(target: Class<T>) {
+    this.target = target;
+  }
+
+  async beforeAll(instance: T) {
+    await Registry.init();
+    const ctx = await DependencyRegistryIndex.getInstance(AsyncContext);
+    for (const test of Object.values(SuiteRegistryIndex.getConfig(this.target).tests)) {
+      const methodName = castKey<typeof instance>(test.methodName);
+      if (methodName in instance && typeof instance[methodName] === 'function') {
+        const og = instance[methodName];
+        const wrapped = function (this: unknown) { return ctx.run(og.bind(this)); };
+        Object.defineProperty(wrapped, 'name', { value: test.methodName });
+        instance[methodName] = castTo(wrapped);
+      }
+    }
+  }
+}
 
 /**
  * Allows for defining a common suite context
@@ -13,27 +33,8 @@ const Init = Symbol();
  */
 export function WithSuiteContext() {
   return (target: Class): void => {
-    function wrapped(ctx: AsyncContext, og: Function) {
-      return function (this: unknown) {
-        return ctx.run(og.bind(this));
-      };
-    }
-
     SuiteRegistryIndex.getForRegister(target).register({
-      beforeEach: [
-        async function (this: { [Init]?: boolean } & Record<string, Function>) {
-          if (!this[Init]) {
-            this[Init] = true;
-            await Registry.init();
-            const ctx = await DependencyRegistryIndex.getInstance(AsyncContext);
-            for (const [k, t] of Object.entries(SuiteRegistryIndex.getConfig(target).tests)) {
-              const fn = wrapped(ctx, this[t.methodName]);
-              Object.defineProperty(fn, 'name', { value: t.methodName });
-              this[t.methodName] = fn;
-            }
-          }
-        }
-      ]
+      phaseHandlers: [new ContextSuiteHandler(target)]
     });
   };
 }