@travetto/web 7.0.0-rc.3 → 7.0.0-rc.5

package/README.md

@@ -78,10 +78,10 @@ export interface WebResponseContext {
 export class WebResponse<B = unknown> extends BaseWebMessage<B, WebResponseContext> {
 
   /**
-    * Build the redirect
-    * @param location Location to redirect to
-    * @param statusCode Status code
-    */
+   * Build the redirect
+   * @param location Location to redirect to
+   * @param statusCode Status code
+   */
   static redirect(location: string, statusCode = 302): WebResponse<undefined> {
     return new WebResponse({ context: { httpStatusCode: statusCode }, headers: { Location: location } });
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/web",
-  "version": "7.0.0-rc.3",
+  "version": "7.0.0-rc.5",
   "description": "Declarative support for creating Web Applications",
   "keywords": [
     "web",
@@ -25,18 +25,18 @@
     "directory": "module/web"
   },
   "dependencies": {
-    "@travetto/config": "^7.0.0-rc.2",
-    "@travetto/context": "^7.0.0-rc.2",
-    "@travetto/di": "^7.0.0-rc.2",
-    "@travetto/registry": "^7.0.0-rc.2",
-    "@travetto/runtime": "^7.0.0-rc.2",
-    "@travetto/schema": "^7.0.0-rc.2",
+    "@travetto/config": "^7.0.0-rc.4",
+    "@travetto/context": "^7.0.0-rc.4",
+    "@travetto/di": "^7.0.0-rc.4",
+    "@travetto/registry": "^7.0.0-rc.4",
+    "@travetto/runtime": "^7.0.0-rc.4",
+    "@travetto/schema": "^7.0.0-rc.4",
     "find-my-way": "^9.3.0"
   },
   "peerDependencies": {
-    "@travetto/cli": "^7.0.0-rc.2",
-    "@travetto/test": "^7.0.0-rc.2",
-    "@travetto/transformer": "^7.0.0-rc.2"
+    "@travetto/cli": "^7.0.0-rc.4",
+    "@travetto/test": "^7.0.0-rc.4",
+    "@travetto/transformer": "^7.0.0-rc.3"
   },
   "peerDependenciesMeta": {
     "@travetto/transformer": {

package/src/registry/registry-index.ts

@@ -1,5 +1,5 @@
-import { ChangeEvent, RegistryIndex, RegistryIndexStore, Registry } from '@travetto/registry';
-import { Class, ClassInstance, getClass, RetainPrimitiveFields } from '@travetto/runtime';
+import { RegistryIndex, RegistryIndexStore, Registry } from '@travetto/registry';
+import { Class, ClassInstance, getClass, isClass, RetainPrimitiveFields } from '@travetto/runtime';
 import { DependencyRegistryIndex } from '@travetto/di';
 import { SchemaRegistryIndex } from '@travetto/schema';
 
@@ -8,8 +8,6 @@ import { ControllerConfig, EndpointConfig, EndpointDecorator } from './types';
 import { WebAsyncContext } from '../context';
 import type { WebInterceptor } from '../types/interceptor.ts';
 
-const isClass = (property: unknown, target: unknown): target is Class => !property;
-
 export class ControllerRegistryIndex implements RegistryIndex {
 
   static #instance = Registry.registerIndex(this);
@@ -46,7 +44,7 @@ export class ControllerRegistryIndex implements RegistryIndex {
   ): EndpointDecorator {
     return (instanceOrCls: Class | ClassInstance, property?: string): void => {
       const adapter = ControllerRegistryIndex.getForRegister(getClass(instanceOrCls));
-      if (isClass(property, instanceOrCls)) {
+      if (isClass(instanceOrCls)) {
         adapter.registerInterceptorConfig(cls, config, extra);
       } else {
         adapter.registerEndpointInterceptorConfig(property!, cls, config, extra);
@@ -58,6 +56,8 @@ export class ControllerRegistryIndex implements RegistryIndex {
 
   store = new RegistryIndexStore(ControllerRegistryAdapter);
 
+  /** @private */ constructor(source: unknown) { Registry.validateConstructor(source); }
+
   async #bindContextParams<T>(instance: ClassInstance<T>): Promise<void> {
     const ctx = await DependencyRegistryIndex.getInstance(WebAsyncContext);
     const cls = getClass(instance);
@@ -85,27 +85,13 @@ export class ControllerRegistryIndex implements RegistryIndex {
     return this.store.get(cls).get();
   }
 
-  getEndpoint(cls: Class, method: string): EndpointConfig {
-    return this.getController(cls).endpoints.find(endpoint => endpoint.methodName === method)!;
-  }
-
   getEndpointById(id: string): EndpointConfig | undefined {
     return this.#endpointsById.get(id.replace(':', '#'));
   }
 
-  process(events: ChangeEvent<Class>[]): void {
-    for (const event of events) {
-      if ('current' in event) {
-        for (const endpoint of this.getController(event.current).endpoints) {
-          this.#endpointsById.set(`${event.current.name}#${endpoint.methodName}`, endpoint);
-        }
-      } else {
-        // Match by name
-        const toDelete = [...this.#endpointsById.values()].filter(endpoint => endpoint.class.name === event.previous.name);
-        for (const endpoint of toDelete) {
-          this.#endpointsById.delete(endpoint.id);
-        }
-      }
+  onCreate(cls: Class): void {
+    for (const endpoint of this.getController(cls).endpoints) {
+      this.#endpointsById.set(endpoint.id, endpoint);
     }
   }
 }

package/src/registry/types.ts

@@ -1,5 +1,5 @@
 import type { Any, Class, TypedFunction } from '@travetto/runtime';
-import type { SchemaClassConfig, SchemaParameterConfig } from '@travetto/schema';
+import type { SchemaClassConfig } from '@travetto/schema';
 
 import type { WebInterceptor } from '../types/interceptor.ts';
 import type { WebChainedFilter, WebFilter } from '../types/filter.ts';
@@ -177,16 +177,10 @@ export interface ControllerVisitor<T = unknown> {
   onControllerStart?(controller: ControllerConfig): Promise<unknown> | unknown;
   onControllerEnd?(controller: ControllerConfig): Promise<unknown> | unknown;
 
-  onEndpointStart?(endpoint: EndpointConfig, controller: ControllerConfig, methodParams: SchemaParameterConfig[]): Promise<unknown> | unknown;
-  onEndpointEnd?(endpoint: EndpointConfig, controller: ControllerConfig, methodParams: SchemaParameterConfig[]): Promise<unknown> | unknown;
+  onEndpointStart?(endpoint: EndpointConfig, controller: ControllerConfig): Promise<unknown> | unknown;
+  onEndpointEnd?(endpoint: EndpointConfig, controller: ControllerConfig): Promise<unknown> | unknown;
 
   onSchema?(schema: SchemaClassConfig): Promise<unknown> | unknown;
 
-  onControllerAdd?(cls: Class): Promise<unknown> | unknown;
-  onControllerRemove?(cls: Class): Promise<unknown> | unknown;
-
-  onSchemaAdd?(cls: Class): Promise<boolean> | boolean;
-  onSchemaRemove?(cls: Class): Promise<boolean> | boolean;
-
   onComplete?(): T | Promise<T>;
 }

package/src/registry/visitor.ts

@@ -33,15 +33,14 @@ export class ControllerVisitUtil {
         continue;
       }
 
-      const { parameters: params, returnType } = endpointSchema;
-      await visitor.onEndpointStart?.(endpoint, controller, params);
-      if (returnType) {
-        await this.#onSchemaEvent(visitor, returnType.type);
+      await visitor.onEndpointStart?.(endpoint, controller);
+      if (endpointSchema.returnType) {
+        await this.#onSchemaEvent(visitor, endpointSchema.returnType.type);
       }
-      for (const param of params) {
+      for (const param of endpointSchema.parameters) {
         await this.#onSchemaEvent(visitor, param.type);
       }
-      await visitor.onEndpointEnd?.(endpoint, controller, params);
+      await visitor.onEndpointEnd?.(endpoint, controller);
     }
     await visitor.onControllerEnd?.(controller);
   }

package/src/router/base.ts

@@ -1,7 +1,6 @@
 import { Class, toConcrete } from '@travetto/runtime';
 import { DependencyRegistryIndex, Injectable } from '@travetto/di';
 import { ControllerRegistryIndex } from '@travetto/web';
-import { Registry } from '@travetto/registry';
 
 import { ControllerConfig, EndpointConfig } from '../registry/types.ts';
 import type { WebRouter } from '../types/dispatch.ts';
@@ -17,7 +16,6 @@ import { EndpointUtil } from '../util/endpoint.ts';
 @Injectable()
 export abstract class BaseWebRouter implements WebRouter {
 
-  #cleanup = new Map<string, Function>();
   #interceptors: WebInterceptor[];
 
   async #register(cls: Class): Promise<void> {
@@ -30,8 +28,7 @@ export abstract class BaseWebRouter implements WebRouter {
       endpoint.filter = EndpointUtil.createEndpointHandler(this.#interceptors, endpoint, config);
     }
 
-    const fn = await this.register(endpoints, config);
-    this.#cleanup.set(cls.Ⲑid, fn);
+    await this.register(endpoints, config);
   };
 
   /**
@@ -48,22 +45,8 @@ export abstract class BaseWebRouter implements WebRouter {
     for (const cls of ControllerRegistryIndex.getClasses()) {
       await this.#register(cls);
     }
-
-    // Listen for updates
-    Registry.onClassChange(async event => {
-      const targetCls = 'current' in event ? event.current : event.previous;
-      console.debug('Registry event', { type: event.type, target: targetCls.Ⲑid });
-
-      if ('previous' in event) {
-        this.#cleanup.get(event.previous.Ⲑid)?.();
-        this.#cleanup.delete(event.previous.Ⲑid);
-      }
-      if ('current' in event) {
-        await this.#register(event.current);
-      }
-    }, ControllerRegistryIndex);
   }
 
-  abstract register(endpoints: EndpointConfig[], controller: ControllerConfig): Promise<() => void>;
+  abstract register(endpoints: EndpointConfig[], controller: ControllerConfig): Promise<void>;
   abstract dispatch(ctx: WebFilterContext): Promise<WebResponse>;
 }

package/src/router/standard.ts

@@ -26,19 +26,13 @@ export class StandardWebRouter extends BaseWebRouter {
   #cache = new Map<Function, EndpointConfig>();
   raw = router();
 
-  async register(endpoints: EndpointConfig[]): Promise<() => void> {
+  async register(endpoints: EndpointConfig[]): Promise<void> {
     for (const endpoint of endpoints) {
       const fullPath = endpoint.fullPath.replace(/[*][^*]+/g, '*'); // Flatten wildcards
       const handler = (): void => { };
       this.#cache.set(handler, endpoint);
       this.raw[HTTP_METHODS[endpoint.httpMethod ?? DEFAULT_HTTP_METHOD].lower](fullPath, handler);
     }
-
-    return (): void => {
-      for (const endpoint of endpoints ?? []) {
-        this.raw.off(endpoint.httpMethod ?? DEFAULT_HTTP_METHOD, endpoint.fullPath);
-      }
-    };
   }
 
   /**

package/src/types/dispatch.ts

@@ -19,5 +19,5 @@ export interface WebRouter extends WebDispatcher {
   /**
    * Register a controller with the prepared endpoints
    */
-  register(endpoints: EndpointConfig[], controller: ControllerConfig): Promise<() => void>;
+  register(endpoints: EndpointConfig[], controller: ControllerConfig): Promise<void>;
 }

package/src/types/response.ts

@@ -12,10 +12,10 @@ export interface WebResponseContext {
 export class WebResponse<B = unknown> extends BaseWebMessage<B, WebResponseContext> {
 
   /**
-    * Build the redirect
-    * @param location Location to redirect to
-    * @param statusCode Status code
-    */
+   * Build the redirect
+   * @param location Location to redirect to
+   * @param statusCode Status code
+   */
   static redirect(location: string, statusCode = 302): WebResponse<undefined> {
     return new WebResponse({ context: { httpStatusCode: statusCode }, headers: { Location: location } });
   }

package/src/util/body.ts

@@ -1,7 +1,7 @@
 import { TextDecoder } from 'node:util';
 import { Readable } from 'node:stream';
 
-import { Any, BinaryUtil, castTo, hasToJSON, Util } from '@travetto/runtime';
+import { Any, BinaryUtil, castTo, hasToJSON, JSONUtil, Util } from '@travetto/runtime';
 
 import { WebBinaryBody, WebMessage } from '../types/message.ts';
 import { WebHeaders } from '../types/headers.ts';
@@ -160,7 +160,7 @@ export class WebBodyUtil {
   static parseBody(type: string, body: string): unknown {
     switch (type) {
       case 'text': return body;
-      case 'json': return JSON.parse(body);
+      case 'json': return JSONUtil.parseSafe(body);
       case 'form': return Object.fromEntries(new URLSearchParams(body));
     }
   }

package/src/util/endpoint.ts

@@ -1,7 +1,6 @@
-import { asConstructable, castKey, castTo, Class, Runtime, TypedObject } from '@travetto/runtime';
+import { asConstructable, castKey, castTo, Class, TypedObject } from '@travetto/runtime';
 import { BindUtil, SchemaParameterConfig, SchemaRegistryIndex, SchemaValidator, ValidationResultError } from '@travetto/schema';
 import { DependencyRegistryIndex } from '@travetto/di';
-import { RetargettingProxy } from '@travetto/registry';
 
 import { WebChainedFilter, WebChainedContext, WebFilter } from '../types/filter.ts';
 import { WebResponse } from '../types/response.ts';
@@ -240,10 +239,6 @@ export class EndpointUtil {
 
     config.instance = await DependencyRegistryIndex.getInstance(config.class);
 
-    if (Runtime.dynamic) {
-      config.instance = RetargettingProxy.unwrap(config.instance);
-    }
-
     // Filter out conditional endpoints
     const endpoints = (await Promise.all(
       config.endpoints.map(endpoint => Promise.resolve(endpoint.conditional?.() ?? true).then(value => value ? endpoint : undefined))

package/support/test/dispatch-util.ts

@@ -1,7 +1,7 @@
 import { buffer } from 'node:stream/consumers';
 import { Readable } from 'node:stream';
 
-import { AppError, BinaryUtil, castTo } from '@travetto/runtime';
+import { AppError, BinaryUtil, castTo, JSONUtil } from '@travetto/runtime';
 import { BindUtil } from '@travetto/schema';
 
 import { WebResponse } from '../../src/types/response.ts';
@@ -51,7 +51,7 @@ export class WebTestDispatchUtil {
 
     if (text) {
       switch (response.headers.get('Content-Type')) {
-        case 'application/json': result = JSON.parse(castTo(text)); break;
+        case 'application/json': result = JSONUtil.parseSafe(castTo(text)); break;
         case 'text/plain': result = text; break;
       }
     }

package/support/test/suite/standard.ts

@@ -1,19 +1,13 @@
 import assert from 'node:assert';
 
-import { Test, Suite, BeforeAll } from '@travetto/test';
-import { Registry } from '@travetto/registry';
+import { Test, Suite } from '@travetto/test';
 
 import { BaseWebSuite } from './base.ts';
-import { TestController } from './controller.ts';
+import './controller.ts'; // Ensure imported
 
 @Suite()
 export abstract class StandardWebServerSuite extends BaseWebSuite {
 
-  @BeforeAll()
-  async init() {
-    Registry.process([{ type: 'added', curr: TestController }]);
-  }
-
   @Test()
   async getJSON() {
     const response = await this.request({ context: { httpMethod: 'GET', path: '/test/json' } });