@travetto/web 8.0.0-alpha.0 → 8.0.0-alpha.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/web",
-  "version": "8.0.0-alpha.0",
+  "version": "8.0.0-alpha.10",
   "type": "module",
   "description": "Declarative support for creating Web Applications",
   "keywords": [
@@ -26,18 +26,18 @@
     "directory": "module/web"
   },
   "dependencies": {
-    "@travetto/config": "^8.0.0-alpha.0",
-    "@travetto/context": "^8.0.0-alpha.0",
-    "@travetto/di": "^8.0.0-alpha.0",
-    "@travetto/registry": "^8.0.0-alpha.0",
-    "@travetto/runtime": "^8.0.0-alpha.0",
-    "@travetto/schema": "^8.0.0-alpha.0",
+    "@travetto/config": "^8.0.0-alpha.9",
+    "@travetto/context": "^8.0.0-alpha.9",
+    "@travetto/di": "^8.0.0-alpha.9",
+    "@travetto/registry": "^8.0.0-alpha.9",
+    "@travetto/runtime": "^8.0.0-alpha.9",
+    "@travetto/schema": "^8.0.0-alpha.9",
     "find-my-way": "^9.5.0"
   },
   "peerDependencies": {
-    "@travetto/cli": "^8.0.0-alpha.0",
-    "@travetto/test": "^8.0.0-alpha.0",
-    "@travetto/transformer": "^8.0.0-alpha.0"
+    "@travetto/cli": "^8.0.0-alpha.14",
+    "@travetto/test": "^8.0.0-alpha.9",
+    "@travetto/transformer": "^8.0.0-alpha.4"
   },
   "peerDependenciesMeta": {
     "@travetto/transformer": {

package/src/context.ts

@@ -1,5 +1,5 @@
 import { AsyncContextValue, type AsyncContext } from '@travetto/context';
-import { Inject, Injectable } from '@travetto/di';
+import { Inject, Injectable, PostConstruct } from '@travetto/di';
 import { RuntimeError, castTo, type Class } from '@travetto/runtime';
 
 import { WebRequest } from './types/request.ts';
@@ -20,7 +20,8 @@ export class WebAsyncContext {
     return this.#request.get()!;
   }
 
-  postConstruct(): void {
+  @PostConstruct()
+  exposeContext(): void {
     this.registerSource(WebRequest, () => this.#request.get());
   }
 

package/src/decorator/controller.ts

@@ -12,6 +12,6 @@ import { ControllerRegistryIndex } from '../registry/registry-index.ts';
 export function Controller(path: string) {
   return function <T>(cls: Class<T>): void {
     ControllerRegistryIndex.getForRegister(cls).register({ basePath: path, class: cls, });
-    DependencyRegistryIndex.getForRegister(cls).registerClass();
+    DependencyRegistryIndex.registerClass(cls);
   };
 }

package/src/interceptor/body.ts

@@ -1,4 +1,4 @@
-import { Injectable, Inject, DependencyRegistryIndex } from '@travetto/di';
+import { Injectable, Inject, DependencyRegistryIndex, PostConstruct } from '@travetto/di';
 import { Config } from '@travetto/config';
 import { toConcrete } from '@travetto/runtime';
 import { Ignore } from '@travetto/schema';
@@ -63,7 +63,8 @@ export class BodyInterceptor implements WebInterceptor<WebBodyConfig> {
   @Inject()
   config: WebBodyConfig;
 
-  async postConstruct(): Promise<void> {
+  @PostConstruct()
+  async loadParsers(): Promise<void> {
     // Load all the parser types
     const instances = await DependencyRegistryIndex.getInstances(toConcrete<BodyContentParser>());
     for (const instance of instances) {

package/src/interceptor/cookie.ts

@@ -1,4 +1,4 @@
-import { Injectable, Inject } from '@travetto/di';
+import { Injectable, Inject, PostConstruct } from '@travetto/di';
 import { Config } from '@travetto/config';
 import { Secret } from '@travetto/schema';
 import { type AsyncContext, AsyncContextValue } from '@travetto/context';
@@ -78,7 +78,8 @@ export class CookieInterceptor implements WebInterceptor<CookieConfig> {
   @Inject()
   context: AsyncContext;
 
-  postConstruct(): void {
+  @PostConstruct()
+  exposeContext(): void {
     this.webAsyncContext.registerSource(CookieJar, () => this.#cookieJar.get());
     this.keyGrip ??= new KeyGrip(this.config.keys ?? []);
   }

package/src/registry/registry-adapter.ts

@@ -58,7 +58,7 @@ function combineEndpointConfigs(controller: ControllerConfig, base: EndpointConf
 function computeParameterLocation(endpoint: EndpointConfig, param: SchemaParameterConfig): EndpointParamLocation {
   const name = param?.name;
   if (!SchemaRegistryIndex.has(param.type)) {
-    if ((param.type === String || param.type === Number) && name && endpoint.path.includes(`:${name}`)) {
+    if ((param.type === String || param.type === Number) && name && endpoint.fullPath.includes(`:${name}`)) {
       return 'path';
     } else if (param.binary) {
       return 'body';

package/src/registry/registry-index.ts

@@ -74,10 +74,10 @@ export class ControllerRegistryIndex implements RegistryIndex {
    * @param target Controller class
    */
   bindContextParamsOnPostConstruct(cls: Class): void {
-    DependencyRegistryIndex.registerClassMetadata(cls, {
-      postConstruct: {
-        ContextParam: (instance: ClassInstance) => this.#bindContextParams(instance)
-      }
+    const bind = (instance: ClassInstance): Promise<void> => this.#bindContextParams(instance);
+    DependencyRegistryIndex.registerPostConstruct(cls, {
+      operation(this: ClassInstance): Promise<void> { return bind(this); },
+      priority: 100
     });
   }
 

package/src/router/base.ts

@@ -1,5 +1,5 @@
 import { type Class, toConcrete } from '@travetto/runtime';
-import { DependencyRegistryIndex, Injectable } from '@travetto/di';
+import { DependencyRegistryIndex, Injectable, PostConstruct } from '@travetto/di';
 import { ControllerRegistryIndex } from '@travetto/web';
 
 import type { ControllerConfig, EndpointConfig } from '../registry/types.ts';
@@ -34,7 +34,8 @@ export abstract class BaseWebRouter implements WebRouter {
   /**
    * Initialize router, encapsulating common patterns for standard router setup
    */
-  async postConstruct(): Promise<void> {
+  @PostConstruct()
+  async registerRoutes(): Promise<void> {
 
     this.#interceptors = await DependencyRegistryIndex.getInstances(toConcrete<WebInterceptor>());
     this.#interceptors = EndpointUtil.orderInterceptors(this.#interceptors);

package/support/test/suite/controller.ts

@@ -98,4 +98,12 @@ export class TestController {
   notFound() {
     throw new RuntimeError('Uh-oh', { category: 'general' });
   }
+}
+
+@Controller('/users/:userId')
+class ParentParamController {
+  @Get('/')
+  async getUser(userId: string) {
+    return { userId };
+  }
 }

package/support/test/suite/standard.ts

@@ -168,4 +168,10 @@ export abstract class StandardWebServerSuite extends BaseWebSuite {
     const response = await this.request<{ path: string }>({ context: { httpMethod: 'GET', path: '/test/fun/1/2/3/4' } });
     assert(response.body?.path === '1/2/3/4');
   }
+
+  @Test()
+  async testInheritedPathParam() {
+    const response = await this.request<{ userId: string }>({ context: { httpMethod: 'GET', path: '/users/1234' } });
+    assert(response.body?.userId === '1234');
+  }
 }