@owlmeans/route 0.1.18-rc.5 → 0.1.18-rc.7

package/README.md

@@ -1,13 +1,18 @@
 # @owlmeans/route
 
-Route model factory and type definitions for OwlMeans modules.
+Route model factory and type definitions for OwlMeans entrypoints.
 
 ## Overview
 
-- `route()` creates a `CommonRouteModel` used as the first argument to `module()`
+- `route()` creates a `RouteModel` used as the first argument to `entrypoint()`
 - `frontend()` / `backend()` / `socket()` helpers set the route's `AppType` and parent
 - `RouteMethod` enum covers HTTP verbs; `RouteProtocols` covers `http`/`ws`
-- This package is a dependency of `@owlmeans/module` — you rarely use it directly unless defining module-level routes
+- This package is a dependency of `@owlmeans/entrypoint` — you rarely use it directly unless defining entrypoint-level routes
+
+A `RouteDeclaration` is plain, immutable data: its `path` is the segment the route contributes under
+its parent, and it is never rewritten. Where the route actually answers — the full path, the mount
+under a service base, the host and scheme — is computed on demand from the declaration plus the
+context that asks, so the same declaration serves a server and a browser alike.
 
 ## Installation
 
@@ -17,33 +22,33 @@ bun add @owlmeans/route
 
 ## Usage
 
-Define routes for modules (typically via `@owlmeans/server-app` re-exports):
+Define routes for entrypoints (typically via `@owlmeans/server-app` re-exports):
 
 ```typescript
 import { route, frontend, backend, socket, RouteMethod } from '@owlmeans/route'
-import { module } from '@owlmeans/module'
+import { entrypoint } from '@owlmeans/entrypoint'
 
 // Backend REST route
-const createRoute = module(
+const createEntrypoint = entrypoint(
   route('story-create', '/stories', backend('api', RouteMethod.POST))
 )
 
 // Frontend client route nested under parent
-const storyRoute = module(
+const storyEntrypoint = entrypoint(
   route('story-view', '/stories/:id', frontend('app'))
 )
 
 // WebSocket route
-const wsRoute = module(
+const wsEntrypoint = entrypoint(
   route('story-ws', '/stories/stream', socket('api'))
 )
 ```
 
 ## API
 
-### `route(alias, path, opts?): CommonRouteModel`
+### `route(alias, path, opts?): RouteModel`
 
-Creates a route model. `opts` can be a `RouteOptions` object or the result of `frontend()`, `backend()`, or `socket()`.
+Creates a route model. `path` is the segment this route contributes under its parent. `opts` can be a `RouteOptions` object or the result of `frontend()`, `backend()`, or `socket()`.
 
 ### `frontend(parent?, sticky?): Partial<RouteOptions>`
 
@@ -69,9 +74,28 @@ enum RouteMethod { GET, POST, PATCH, PUT, DELETE }
 enum RouteProtocols { WEB = 'http', SOCKET = 'ws' }
 ```
 
+The protocol also selects the transport that carries a call to an entrypoint on this route.
+
+### Types
+
+- `RouteDeclaration` — the plain, immutable data a `route()` call produces: `alias`, `path`,
+  `parent`, `method`, `protocol`, `secure`, plus the service coordinates
+- `RouteModel` — `{ route: RouteDeclaration }`, the model an entrypoint carries
+- `RouteAddress` — `{ host, port?, base?, secure, protocol }`, where a route answers once its
+  service has been picked
+
+### `@owlmeans/route/utils`
+
+The pure functions the entrypoint accessors are built on. Each takes a context and a declaration:
+
+- `resolveService(ctx, route)` / `isLocalRoute(ctx, route)`
+- `resolvePath(ctx, route)` — the route's segment under every ancestor's
+- `resolveMount(ctx, route)` — that path under the service base
+- `resolveAddress(ctx, route)` — host, port, scheme and protocol
+
 ## Related Packages
 
-- [`@owlmeans/module`](../module) — `module()` takes a `CommonRouteModel` as first argument
+- [`@owlmeans/entrypoint`](../entrypoint) — `entrypoint()` takes a `RouteModel` as first argument
 - [`@owlmeans/server-app`](../server-app) — re-exports `route` as `broute` (backend) alongside `route`
 
 <!-- owlmeans:agent-guidance:start -->

package/agent-meta/manifest.json

@@ -1,8 +1,8 @@
 {
   "schemaVersion": 2,
   "package": "@owlmeans/route",
-  "version": "0.1.18-rc.0",
-  "generatedAt": "2026-08-16T22:20:50.511Z",
+  "version": "0.1.18-rc.7",
+  "generatedAt": "2026-09-01T16:28:56.994Z",
   "canonicalRepo": "https://github.com/owlmeans/common",
   "entries": [
     {

package/agent-meta/skills/route/SKILL.md

@@ -1,6 +1,6 @@
 ---
 name: route
-description: How to use @owlmeans/route — route() helper for declaring URL paths, frontend() marker for React routes, RouteMethod enum, and route model types. Auto-invoked when importing route helpers or defining a module's URL path.
+description: How to use @owlmeans/route — route() for declaring URL segments, frontend()/backend()/socket() markers, RouteMethod and RouteProtocols enums, and the address helpers under ./utils. Auto-invoked when importing route helpers or defining an entrypoint's URL path.
 user-invocable: false
 ---
 <!-- AUTO-GENERATED — do not edit. Regenerate via sync-agent-meta. -->
@@ -8,21 +8,50 @@ user-invocable: false
 # @owlmeans/route
 
 **Layer:** Core
-**Install:** `"@owlmeans/route": "^0.1.18-rc.0"` in `dependencies`
+**Install:** `"@owlmeans/route": "^0.1.18-rc.7"` in `dependencies`
 
 ## Key Exports
 
 | Export | Description |
 |--------|-------------|
-| `route(alias, path, options?)` | Define a route — path is relative to `parent` |
-| `frontend(options?)` | Mark a route as a React page (web only) |
-| `RouteMethod` | enum of GET, POST, PUT, DELETE, PATCH |
-| `Route` types | Resolved route shape |
-| Constants | Default route aliases |
+| `route(alias, path, options?)` | Build a route model — `path` is the segment contributed under `parent` |
+| `frontend(options?, default?)` | Mark a route as a React page (web only) |
+| `backend(options?, method?)` | Mark a route as a backend endpoint |
+| `socket(options?, secondary?)` | A backend route answering over `RouteProtocols.SOCKET` |
+| `service(alias, options?)` | Point a route at a named service |
+| `RouteMethod` | enum of GET, POST, PUT, PATCH, DELETE |
+| `RouteProtocols` | enum of WEB (`http`), SOCKET (`ws`) |
+| `RouteDeclaration` | The immutable declaration `route()` produces |
+| `RouteModel` | `{ route }` — the model wrapping a declaration |
+| `RouteAddress` | `{ host, port, base, secure, protocol }` — where a route answers |
+| `CommonServiceRoute` / `ResolvedServiceRoute` | A service entry, and one that knows its host |
+| `normalizePath(path)`, `SEP`, `PARAM` | Path primitives |
+
+## Declaration and model
+
+`route()` returns a `RouteModel` that does nothing but **wrap an immutable `RouteDeclaration`**. The
+declaration is plain data an application ships in its contract package: `path` stays the segment this
+route contributes under its parent and is never rewritten, and the model carries no state of its own.
+Where the route answers is worked out on demand, against the context that asks — which is what lets
+the same declaration serve a client and a server at once.
 
 ## Subpath Exports
 
-- `./utils` — path manipulation helpers
+- `./utils` — the computed address helpers, all taking `(context, declaration)`
+
+| Helper | Answers |
+|--------|---------|
+| `resolvePath` | Every ancestor's segment, then this one |
+| `resolveMount` | `base` + the full path — what a server mounts and a client requests |
+| `resolveService` | The service the declaration answers on: the one it names, else the default of its app type, else the first of that type |
+| `resolveAddress` | The `RouteAddress`; a hop over a service's INTERNAL host is never TLS |
+| `isLocalRoute` | Does the route belong to the service the asking context IS? |
+| `getParentRoute` | The parent declaration, with parentship-cycle detection |
+| `overrideParams` / `prependBase` | Fill blanks in a declaration; prefix a path with its base |
+| `isServiceRoute` / `isServiceRouteResolved` | Guards for service entries |
+
+Application code rarely calls these directly — `@owlmeans/entrypoint` exposes them as `path()`,
+`mount()`, `service()`, `address()` and `isLocal()` on the entrypoint itself.
 
 ## Usage
 
@@ -46,5 +75,6 @@ entrypoint(
 
 ## Depends On
 
+- `@owlmeans/context` — `AppType`, and the entrypoint registry the address helpers walk
 - `@owlmeans/error` — route errors
 - `@owlmeans/i18n` — translatable errors

package/build/helper.d.ts

@@ -1,8 +1,8 @@
 import { AppType } from '@owlmeans/context';
 import { RouteMethod } from './consts.js';
-import type { CommonRouteModel, RouteOptions } from './types.js';
+import type { RouteModel, RouteOptions } from './types.js';
 import type { CreateRouteSignature } from './utils/types.js';
-export declare const route: CreateRouteSignature<CommonRouteModel>;
+export declare const route: CreateRouteSignature<RouteModel>;
 export declare const normalizePath: (path: string) => string;
 export declare const rtype: (type: AppType, opts?: RouteOptions | string) => Partial<RouteOptions>;
 export declare const backend: (opts?: RouteOptions | string | null, method?: RouteOptions | RouteMethod) => Partial<RouteOptions>;

package/build/helper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"helper.d.ts","sourceRoot":"","sources":["../src/helper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAA;AAC3C,OAAO,EAAE,WAAW,EAAuB,MAAM,aAAa,CAAA;AAE9D,OAAO,KAAK,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAChE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAA;AAE5D,eAAO,MAAM,KAAK,EAAE,oBAAoB,CAAC,gBAAgB,CACT,CAAA;AAEhD,eAAO,MAAM,aAAa,SAAU,MAAM,KAAG,MAM5C,CAAA;AAED,eAAO,MAAM,KAAK,SAAU,OAAO,SAAS,YAAY,GAAG,MAAM,KAAG,OAAO,CAAC,YAAY,CAEvF,CAAA;AAED,eAAO,MAAM,OAAO,UAAW,YAAY,GAAG,MAAM,GAAG,IAAI,WAAW,YAAY,GAAG,WAAW,KAAG,OAAO,CAAC,YAAY,CAQtH,CAAA;AAED,eAAO,MAAM,OAAO,YAAa,MAAM,SAAS,OAAO,CAAC,YAAY,CAAC,KAAG,OAAO,CAAC,YAAY,CAI3F,CAAA;AAED,eAAO,MAAM,MAAM,UAAW,YAAY,GAAG,MAAM,GAAG,IAAI,cAAc,YAAY,KAAG,OAAO,CAAC,YAAY,CAM1G,CAAA;AAED,eAAO,MAAM,QAAQ,UAAW,YAAY,GAAG,MAAM,GAAG,IAAI,QAAQ,YAAY,GAAG,OAAO,KAAG,OAAO,CAAC,YAAY,CAQhH,CAAA"}
+{"version":3,"file":"helper.d.ts","sourceRoot":"","sources":["../src/helper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAA;AAC3C,OAAO,EAAE,WAAW,EAAuB,MAAM,aAAa,CAAA;AAE9D,OAAO,KAAK,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAC1D,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAA;AAE5D,eAAO,MAAM,KAAK,EAAE,oBAAoB,CAAC,UAAU,CACH,CAAA;AAEhD,eAAO,MAAM,aAAa,GAAI,MAAM,MAAM,KAAG,MAM5C,CAAA;AAED,eAAO,MAAM,KAAK,GAAI,MAAM,OAAO,EAAE,OAAO,YAAY,GAAG,MAAM,KAAG,OAAO,CAAC,YAAY,CAEvF,CAAA;AAED,eAAO,MAAM,OAAO,GAAI,OAAO,YAAY,GAAG,MAAM,GAAG,IAAI,EAAE,SAAS,YAAY,GAAG,WAAW,KAAG,OAAO,CAAC,YAAY,CAQtH,CAAA;AAED,eAAO,MAAM,OAAO,GAAI,SAAS,MAAM,EAAE,OAAO,OAAO,CAAC,YAAY,CAAC,KAAG,OAAO,CAAC,YAAY,CAI3F,CAAA;AAED,eAAO,MAAM,MAAM,GAAI,OAAO,YAAY,GAAG,MAAM,GAAG,IAAI,EAAE,YAAY,YAAY,KAAG,OAAO,CAAC,YAAY,CAM1G,CAAA;AAED,eAAO,MAAM,QAAQ,GAAI,OAAO,YAAY,GAAG,MAAM,GAAG,IAAI,EAAE,MAAM,YAAY,GAAG,OAAO,KAAG,OAAO,CAAC,YAAY,CAQhH,CAAA"}

package/build/helper.js.map

@@ -1 +1 @@
-{"version":3,"file":"helper.js","sourceRoot":"","sources":["../src/helper.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"helper.js","sourceRoot":"","sources":["../src/helper.ts"],"names":[],"mappings":"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"}

package/build/model.d.ts

@@ -1,5 +1,5 @@
-import type { CommonRoute, CommonRouteModel } from './types.js';
+import type { RouteDeclaration, RouteModel } from './types.js';
 import type { CreateRouteSignature } from './utils/types.js';
-export declare const makeRouteModel: (route: CommonRoute) => CommonRouteModel;
-export declare const createRoute: CreateRouteSignature<CommonRoute>;
+export declare const makeRouteModel: (route: RouteDeclaration) => RouteModel;
+export declare const createRoute: CreateRouteSignature<RouteDeclaration>;
 //# sourceMappingURL=model.d.ts.map

package/build/model.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../src/model.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAA;AAC/D,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAA;AAI5D,eAAO,MAAM,cAAc,UAAW,WAAW,KAAG,gBAOnD,CAAA;AAED,eAAO,MAAM,WAAW,EAAE,oBAAoB,CAAC,WAAW,CAUzD,CAAA"}
+{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../src/model.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,UAAU,EAAE,MAAM,YAAY,CAAA;AAC9D,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAA;AAG5D,eAAO,MAAM,cAAc,GAAI,OAAO,gBAAgB,KAAG,UAAyB,CAAA;AAElF,eAAO,MAAM,WAAW,EAAE,oBAAoB,CAAC,gBAAgB,CAS9D,CAAA"}

package/build/model.js

@@ -1,18 +1,10 @@
-import { resolve } from './utils/route.js';
 import { AppType } from '@owlmeans/context';
-export const makeRouteModel = (route) => {
-    const model = {
-        route,
-        resolve: ctx => resolve(route)(ctx)
-    };
-    return model;
-};
+export const makeRouteModel = (route) => ({ route });
 export const createRoute = (alias, path, opts) => {
     const route = {
         alias,
         type: AppType.Backend,
         path,
-        resolved: false,
         ...(typeof opts === 'string' ? { parent: opts } : opts)
     };
     return route;

package/build/model.js.map

@@ -1 +1 @@
-{"version":3,"file":"model.js","sourceRoot":"","sources":["../src/model.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAA;AAC1C,OAAO,EAAE,OAAO,EAA6B,MAAM,mBAAmB,CAAA;AAEtE,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,KAAkB,EAAoB,EAAE;IACrE,MAAM,KAAK,GAAqB;QAC9B,KAAK;QACL,OAAO,EAAE,GAAG,CAAC,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,GAA2C,CAAC;KAC5E,CAAA;IAED,OAAO,KAAK,CAAA;AACd,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,WAAW,GAAsC,CAAC,KAAK,EAAE,IAAI,EAAE,IAAK,EAAE,EAAE;IACnF,MAAM,KAAK,GAAgB;QACzB,KAAK;QACL,IAAI,EAAE,OAAO,CAAC,OAAO;QACrB,IAAI;QACJ,QAAQ,EAAE,KAAK;QACf,GAAG,CAAC,OAAO,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;KACxD,CAAA;IAED,OAAO,KAAK,CAAA;AACd,CAAC,CAAA"}
+{"version":3,"file":"model.js","sourceRoot":"","sources":["../src/model.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAA;AAE3C,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,KAAuB,EAAc,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAA;AAElF,MAAM,CAAC,MAAM,WAAW,GAA2C,CAAC,KAAK,EAAE,IAAI,EAAE,IAAK,EAAE,EAAE;IACxF,MAAM,KAAK,GAAqB;QAC9B,KAAK;QACL,IAAI,EAAE,OAAO,CAAC,OAAO;QACrB,IAAI;QACJ,GAAG,CAAC,OAAO,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;KACxD,CAAA;IAED,OAAO,KAAK,CAAA;AACd,CAAC,CAAA"}

package/build/types.d.ts

@@ -1,6 +1,20 @@
-import type { AppType, BasicContext, BasicConfig } from '@owlmeans/context';
+import type { AppType } from '@owlmeans/context';
 import type { RouteProtocols, RouteMethod } from './consts';
-export interface CommonRoute extends BasicRoute {
+export interface BasicRoute {
+    type: AppType;
+    service?: string;
+    host?: string;
+    port?: number;
+    base?: string;
+    internalHost?: string;
+    internalPort?: number;
+}
+/**
+ * The plain, declarative half of a route — what a `route()` call produces and what an application
+ * ships in its contract package. It is never rewritten: `path` stays the segment this route
+ * contributes under its parent, and the address is worked out on demand against a context.
+ */
+export interface RouteDeclaration extends BasicRoute {
     alias: string;
     path: string;
     parent?: string;
@@ -14,22 +28,24 @@ export interface CommonServiceRoute extends BasicRoute {
     service: string;
     default?: boolean;
 }
-export interface BasicRoute {
-    type: AppType;
-    service?: string;
-    host?: string;
-    port?: number;
-    base?: string;
-    resolved: boolean;
-}
 export interface ResolvedServiceRoute extends CommonServiceRoute {
     host: string;
-    resolved: true;
 }
-export interface CommonRouteModel {
-    route: CommonRoute;
-    resolve: <C extends BasicConfig, T extends BasicContext<C>>(context: T) => Promise<CommonRoute>;
+/** Where a route actually answers, once its service has been picked. */
+export interface RouteAddress {
+    host: string;
+    port?: number;
+    base?: string;
+    secure: boolean;
+    protocol: RouteProtocols;
+}
+/**
+ * The model wrapping a declaration. It carries no resolution state of its own — every address
+ * question is answered from the declaration plus the context that asks.
+ */
+export interface RouteModel {
+    route: RouteDeclaration;
 }
-export interface RouteOptions extends Partial<CommonRoute> {
+export interface RouteOptions extends Partial<RouteDeclaration> {
 }
 //# sourceMappingURL=types.d.ts.map

package/build/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAC3E,OAAO,KAAK,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,UAAU,CAAA;AAE3D,MAAM,WAAW,WAAY,SAAQ,UAAU;IAC7C,KAAK,EAAE,MAAM,CAAA;IACb,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,MAAM,CAAC,EAAE,WAAW,CAAA;IACpB,QAAQ,CAAC,EAAE,cAAc,CAAA;IACzB,MAAM,CAAC,EAAE,OAAO,CAAA;CACjB;AAED,MAAM,WAAW,kBAAmB,SAAQ,UAAU;IACpD,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,OAAO,EAAE,MAAM,CAAA;IACf,OAAO,CAAC,EAAE,OAAO,CAAA;CAClB;AAED,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,OAAO,CAAA;IACb,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,QAAQ,EAAE,OAAO,CAAA;CAClB;AAED,MAAM,WAAW,oBAAqB,SAAQ,kBAAkB;IAC9D,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,EAAE,IAAI,CAAA;CACf;AAED,MAAM,WAAW,gBAAgB;IAC/B,KAAK,EAAE,WAAW,CAAA;IAClB,OAAO,EAAE,CAAC,CAAC,SAAS,WAAW,EAAE,CAAC,SAAS,YAAY,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,KAAK,OAAO,CAAC,WAAW,CAAC,CAAA;CAChG;AAED,MAAM,WAAW,YAAa,SAAQ,OAAO,CAAC,WAAW,CAAC;CACzD"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAA;AAChD,OAAO,KAAK,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,UAAU,CAAA;AAE3D,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,OAAO,CAAA;IACb,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,YAAY,CAAC,EAAE,MAAM,CAAA;CACtB;AAED;;;;GAIG;AACH,MAAM,WAAW,gBAAiB,SAAQ,UAAU;IAClD,KAAK,EAAE,MAAM,CAAA;IACb,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,MAAM,CAAC,EAAE,WAAW,CAAA;IACpB,QAAQ,CAAC,EAAE,cAAc,CAAA;IACzB,MAAM,CAAC,EAAE,OAAO,CAAA;CACjB;AAED,MAAM,WAAW,kBAAmB,SAAQ,UAAU;IACpD,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,OAAO,EAAE,MAAM,CAAA;IACf,OAAO,CAAC,EAAE,OAAO,CAAA;CAClB;AAED,MAAM,WAAW,oBAAqB,SAAQ,kBAAkB;IAC9D,IAAI,EAAE,MAAM,CAAA;CACb;AAED,wEAAwE;AACxE,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,MAAM,EAAE,OAAO,CAAA;IACf,QAAQ,EAAE,cAAc,CAAA;CACzB;AAED;;;GAGG;AACH,MAAM,WAAW,UAAU;IACzB,KAAK,EAAE,gBAAgB,CAAA;CACxB;AAED,MAAM,WAAW,YAAa,SAAQ,OAAO,CAAC,gBAAgB,CAAC;CAC9D"}

package/build/utils/route.d.ts

@@ -1,9 +1,29 @@
 import type { BasicConfig, BasicContext } from '@owlmeans/context';
-import type { CommonRoute } from '../types.js';
+import type { RouteAddress, RouteDeclaration, ResolvedServiceRoute } from '../types.js';
 type Config = BasicConfig;
-export declare const getParentRoute: <C extends Config, T extends BasicContext<C>>(context: T, route: CommonRoute) => Promise<CommonRoute | null>;
-export declare const overrideParams: (route: CommonRoute, overrides?: Partial<CommonRoute>, filter?: string[]) => void;
-export declare const resolve: <C extends Config, T extends BasicContext<C>>(route: CommonRoute) => (context: T) => Promise<CommonRoute>;
-export declare const prependBase: (route: CommonRoute) => string;
+export declare const getParentRoute: <C extends Config, T extends BasicContext<C>>(context: T, route: RouteDeclaration) => RouteDeclaration | null;
+export declare const overrideParams: (route: RouteDeclaration, overrides?: Partial<RouteDeclaration>, filter?: string[]) => void;
+/**
+ * Pick the service route this declaration answers on: the one it names, else the default of its
+ * app type, else the first of its app type.
+ *
+ * @throws {SyntaxError}
+ */
+export declare const resolveService: <C extends Config, T extends BasicContext<C>>(context: T, route: RouteDeclaration) => ResolvedServiceRoute;
+/**
+ * The full path: every ancestor's declared segment, then this one. Walks the parent chain through
+ * the context, so a declaration always states only what it contributes.
+ */
+export declare const resolvePath: <C extends Config, T extends BasicContext<C>>(context: T, route: RouteDeclaration) => string;
+/** `base` + the full path — what a server mounts and a client requests. */
+export declare const resolveMount: <C extends Config, T extends BasicContext<C>>(context: T, route: RouteDeclaration) => string;
+/**
+ * Where the route answers. A backend caller reaching a service over its INTERNAL host is inside the
+ * cluster, so that hop is never TLS.
+ */
+export declare const resolveAddress: <C extends Config, T extends BasicContext<C>>(context: T, route: RouteDeclaration) => RouteAddress;
+/** Does this route belong to the service the asking context IS? */
+export declare const isLocalRoute: <C extends Config, T extends BasicContext<C>>(context: T, route: RouteDeclaration) => boolean;
+export declare const prependBase: (route: RouteDeclaration, path: string) => string;
 export {};
 //# sourceMappingURL=route.d.ts.map

package/build/utils/route.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"route.d.ts","sourceRoot":"","sources":["../../src/utils/route.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,YAAY,EAAc,MAAM,mBAAmB,CAAA;AAC9E,OAAO,KAAK,EAAE,WAAW,EAAwC,MAAM,aAAa,CAAA;AAKpF,KAAK,MAAM,GAAG,WAAW,CAAA;AAEzB,eAAO,MAAM,cAAc,GAAU,CAAC,SAAS,MAAM,EAAE,CAAC,SAAS,YAAY,CAAC,CAAC,CAAC,WAAW,CAAC,SAAS,WAAW,KAAG,OAAO,CAAC,WAAW,GAAG,IAAI,CAkB5I,CAAA;AAED,eAAO,MAAM,cAAc,UAAW,WAAW,cAAc,OAAO,CAAC,WAAW,CAAC,WAAW,MAAM,EAAE,SAOrG,CAAA;AAED,eAAO,MAAM,OAAO,GAAI,CAAC,SAAS,MAAM,EAAE,CAAC,SAAS,YAAY,CAAC,CAAC,CAAC,SAAS,WAAW,eAAqB,CAAC,yBA8D5G,CAAA;AAcD,eAAO,MAAM,WAAW,UAAW,WAAW,WAO7C,CAAA"}
+{"version":3,"file":"route.d.ts","sourceRoot":"","sources":["../../src/utils/route.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,YAAY,EAAc,MAAM,mBAAmB,CAAA;AAC9E,OAAO,KAAK,EAAE,YAAY,EAAE,gBAAgB,EAAkC,oBAAoB,EAAE,MAAM,aAAa,CAAA;AAKvH,KAAK,MAAM,GAAG,WAAW,CAAA;AAWzB,eAAO,MAAM,cAAc,GAAI,CAAC,SAAS,MAAM,EAAE,CAAC,SAAS,YAAY,CAAC,CAAC,CAAC,EACxE,SAAS,CAAC,EAAE,OAAO,gBAAgB,KAClC,gBAAgB,GAAG,IAWrB,CAAA;AAED,eAAO,MAAM,cAAc,GAAI,OAAO,gBAAgB,EAAE,YAAY,OAAO,CAAC,gBAAgB,CAAC,EAAE,SAAS,MAAM,EAAE,SAO/G,CAAA;AAED;;;;;GAKG;AACH,eAAO,MAAM,cAAc,GAAI,CAAC,SAAS,MAAM,EAAE,CAAC,SAAS,YAAY,CAAC,CAAC,CAAC,EACxE,SAAS,CAAC,EAAE,OAAO,gBAAgB,KAClC,oBA4BF,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,WAAW,GAAI,CAAC,SAAS,MAAM,EAAE,CAAC,SAAS,YAAY,CAAC,CAAC,CAAC,EACrE,SAAS,CAAC,EAAE,OAAO,gBAAgB,KAClC,MASF,CAAA;AAED,2EAA2E;AAC3E,eAAO,MAAM,YAAY,GAAI,CAAC,SAAS,MAAM,EAAE,CAAC,SAAS,YAAY,CAAC,CAAC,CAAC,EACtE,SAAS,CAAC,EAAE,OAAO,gBAAgB,KAClC,MAOF,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,cAAc,GAAI,CAAC,SAAS,MAAM,EAAE,CAAC,SAAS,YAAY,CAAC,CAAC,CAAC,EACxE,SAAS,CAAC,EAAE,OAAO,gBAAgB,KAClC,YAYF,CAAA;AAED,mEAAmE;AACnE,eAAO,MAAM,YAAY,GAAI,CAAC,SAAS,MAAM,EAAE,CAAC,SAAS,YAAY,CAAC,CAAC,CAAC,EACtE,SAAS,CAAC,EAAE,OAAO,gBAAgB,KAClC,OAAyE,CAAA;AAgB5E,eAAO,MAAM,WAAW,GAAI,OAAO,gBAAgB,EAAE,MAAM,MAAM,WAGvD,CAAA"}

package/build/utils/route.js

@@ -1,24 +1,17 @@
 import { isServiceRoute, isServiceRouteResolved } from './service.js';
 import { normalizePath } from '../helper.js';
-import { SEP } from '../consts.js';
-export const getParentRoute = async (context, route) => {
-    if (route.parent != null) {
-        const parent = context.module(route.parent);
-        assertCycle(context, route, parent.route.route);
-        if (parent.route == null) {
-            throw new SyntaxError('Parent module doesn\'t provide a route');
-        }
-        if (!parent.route.route.resolved) {
-            if (parent.resolve != null) {
-                await parent.resolve();
-            }
-            else {
-                return await parent.route.resolve(context);
-            }
-        }
-        return parent.route.route;
+import { RouteProtocols, SEP } from '../consts.js';
+const carrier = (context, alias) => context.entrypoint(alias);
+export const getParentRoute = (context, route) => {
+    if (route.parent == null) {
+        return null;
+    }
+    const parent = carrier(context, route.parent);
+    if (parent.route == null) {
+        throw new SyntaxError('Parent entrypoint doesn\'t provide a route');
     }
-    return null;
+    assertCycle(context, route, parent.route.route);
+    return parent.route.route;
 };
 export const overrideParams = (route, overrides, filter) => {
     Object.entries(overrides ?? {}).forEach(([key, value]) => {
@@ -28,59 +21,72 @@ export const overrideParams = (route, overrides, filter) => {
         }
     });
 };
-export const resolve = (route) => async (context) => {
-    if (route.resolved)
-        return route;
-    route.resolved = true;
+/**
+ * Pick the service route this declaration answers on: the one it names, else the default of its
+ * app type, else the first of its app type.
+ *
+ * @throws {SyntaxError}
+ */
+export const resolveService = (context, route) => {
     if (context.cfg.services == null) {
         throw new SyntaxError('Services aren\'t configured to resolve routes');
     }
-    const firstGuessService = context.cfg.services[route.service ?? context.cfg.service];
-    if (firstGuessService != null && !isServiceRoute(firstGuessService)) {
+    const named = context.cfg.services[route.service ?? context.cfg.service];
+    if (named != null && !isServiceRoute(named)) {
         throw new SyntaxError('Service is not a valid service route');
     }
-    const service = firstGuessService?.type === route.type ? firstGuessService
-        : Object.values(context.cfg.services).find((service) => {
-            const _service = service;
-            return _service.default === true && _service.type === route.type;
-        }) ?? Object.values(context.cfg.services).find((service) => {
-            const _service = service;
-            return _service.type === route.type;
-        });
+    const service = named?.type === route.type ? named
+        : Object.values(context.cfg.services).find((candidate) => {
+            const _candidate = candidate;
+            return _candidate.default === true && _candidate.type === route.type;
+        }) ?? Object.values(context.cfg.services).find((candidate) => candidate.type === route.type);
     if (!isServiceRoute(service)) {
         throw new SyntaxError('Service is not a valid service route');
     }
-    if (!service.resolved && service.host != null) {
-        service.resolved = true;
-    }
     if (!isServiceRouteResolved(service)) {
         throw new SyntaxError('Service route is not resolved');
     }
-    overrideParams(route, service, ['host', 'port', 'service', 'base']);
-    // Internal host access is non secure only
-    // it's required for server side client routes
-    if ("internalHost" in route) {
-        if (route.internalHost === route.host) {
-            route.secure = false;
-        }
-    }
-    else if ("internalHost" in service) {
-        if (service.internalHost === route.host) {
-            route.secure = false;
-        }
-    }
-    const parent = await getParentRoute(context, route);
-    if (parent != null) {
-        route.path = (parent.path.startsWith(SEP) ? SEP : '')
-            + normalizePath(normalizePath(parent.path) + SEP + normalizePath(route.path));
+    return service;
+};
+/**
+ * The full path: every ancestor's declared segment, then this one. Walks the parent chain through
+ * the context, so a declaration always states only what it contributes.
+ */
+export const resolvePath = (context, route) => {
+    const parent = getParentRoute(context, route);
+    if (parent == null) {
+        return route.path;
     }
-    // Moved base resolution to the final service
-    // if (parent == null && route.base != null && route.base.trim() !== '') {
-    //   route.path = SEP + normalizePath(route.base) + SEP + normalizePath(route.path)
-    //   // route.path = route.base.startsWith(SEP) ? SEP + route.path : route.path
-    // }
-    return route;
+    const parentPath = resolvePath(context, parent);
+    return (parentPath.startsWith(SEP) ? SEP : '')
+        + normalizePath(normalizePath(parentPath) + SEP + normalizePath(route.path));
+};
+/** `base` + the full path — what a server mounts and a client requests. */
+export const resolveMount = (context, route) => {
+    const path = resolvePath(context, route);
+    const base = route.base ?? resolveService(context, route).base;
+    return base != null && base.trim() !== ''
+        ? SEP + normalizePath(base) + SEP + normalizePath(path)
+        : path;
 };
+/**
+ * Where the route answers. A backend caller reaching a service over its INTERNAL host is inside the
+ * cluster, so that hop is never TLS.
+ */
+export const resolveAddress = (context, route) => {
+    const service = resolveService(context, route);
+    const host = route.host ?? service.host;
+    const internalHost = route.internalHost ?? service.internalHost;
+    return {
+        host,
+        port: route.port ?? service.port,
+        base: route.base ?? service.base,
+        secure: internalHost != null && internalHost === host ? false : route.secure ?? true,
+        protocol: route.protocol ?? RouteProtocols.WEB,
+    };
+};
+/** Does this route belong to the service the asking context IS? */
+export const isLocalRoute = (context, route) => (route.service ?? context.cfg.service) === context.cfg.service;
 /**
  * @throws {SyntaxError}
  */
@@ -89,15 +95,10 @@ const assertCycle = (context, route, parent) => {
         if (parent.parent === route.alias) {
             throw new SyntaxError(`Route parentship cycle detected. Parent: ${parent.alias} has his child as ancestor ${route.alias}`);
         }
-        parent = context.module(parent.parent).route.route;
-    }
-};
-export const prependBase = (route) => {
-    let path = route.path;
-    if (route.base != null && route.base.trim() !== '') {
-        path = SEP + normalizePath(route.base) + SEP + normalizePath(route.path);
-        // route.path = route.base.startsWith(SEP) ? SEP + route.path : route.path
+        parent = carrier(context, parent.parent).route.route;
     }
-    return path;
 };
+export const prependBase = (route, path) => route.base != null && route.base.trim() !== ''
+    ? SEP + normalizePath(route.base) + SEP + normalizePath(path)
+    : path;
 //# sourceMappingURL=route.js.map

package/build/utils/route.js.map

@@ -1 +1 @@
-{"version":3,"file":"route.js","sourceRoot":"","sources":["../../src/utils/route.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"route.js","sourceRoot":"","sources":["../../src/utils/route.ts"],"names":[],"mappings":"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"}

package/build/utils/service.d.ts

@@ -1,4 +1,5 @@
 import type { ResolvedServiceRoute, CommonServiceRoute } from '../types.js';
 export declare const isServiceRoute: (obj?: Object) => obj is CommonServiceRoute;
+/** A service route is usable exactly when it knows the host it answers on. */
 export declare const isServiceRouteResolved: (route: CommonServiceRoute) => route is ResolvedServiceRoute;
 //# sourceMappingURL=service.d.ts.map

package/build/utils/service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../src/utils/service.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,oBAAoB,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAA;AAE3E,eAAO,MAAM,cAAc,SAAU,MAAM,KAAG,GAAG,IAAI,kBAEM,CAAA;AAE3D,eAAO,MAAM,sBAAsB,UAAW,kBAAkB,KAAG,KAAK,IAAI,oBACnD,CAAA"}
+{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../src/utils/service.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,oBAAoB,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAA;AAE3E,eAAO,MAAM,cAAc,GAAI,MAAM,MAAM,KAAG,GAAG,IAAI,kBAEM,CAAA;AAE3D,8EAA8E;AAC9E,eAAO,MAAM,sBAAsB,GAAI,OAAO,kBAAkB,KAAG,KAAK,IAAI,oBAC5B,CAAA"}

package/build/utils/service.js

@@ -1,5 +1,6 @@
 import { AppType } from '@owlmeans/context';
 export const isServiceRoute = (obj) => obj != null && ('type' in obj) && ('service' in obj)
     && (Object.values(AppType).includes(obj.type));
-export const isServiceRouteResolved = (route) => route.resolved === true;
+/** A service route is usable exactly when it knows the host it answers on. */
+export const isServiceRouteResolved = (route) => route.host != null && route.host.trim() !== '';
 //# sourceMappingURL=service.js.map

package/build/utils/service.js.map

@@ -1 +1 @@
-{"version":3,"file":"service.js","sourceRoot":"","sources":["../../src/utils/service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAA;AAG3C,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,GAAY,EAA6B,EAAE,CACxE,GAAG,IAAI,IAAI,IAAI,CAAC,MAAM,IAAI,GAAG,CAAC,IAAI,CAAC,SAAS,IAAI,GAAG,CAAC;OACjD,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAe,CAAC,CAAC,CAAA;AAE3D,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,KAAyB,EAAiC,EAAE,CACjG,KAAK,CAAC,QAAQ,KAAK,IAAI,CAAA"}
+{"version":3,"file":"service.js","sourceRoot":"","sources":["../../src/utils/service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAA;AAG3C,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,GAAY,EAA6B,EAAE,CACxE,GAAG,IAAI,IAAI,IAAI,CAAC,MAAM,IAAI,GAAG,CAAC,IAAI,CAAC,SAAS,IAAI,GAAG,CAAC;OACjD,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAe,CAAC,CAAC,CAAA;AAE3D,8EAA8E;AAC9E,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,KAAyB,EAAiC,EAAE,CACjG,KAAK,CAAC,IAAI,IAAI,IAAI,IAAI,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@owlmeans/route",
-  "version": "0.1.18-rc.5",
+  "version": "0.1.18-rc.7",
   "license": "MIT",
   "type": "module",
   "scripts": {
@@ -28,7 +28,7 @@
     }
   },
   "dependencies": {
-    "@owlmeans/context": "^0.1.18-rc.5"
+    "@owlmeans/context": "^0.1.18-rc.7"
   },
   "devDependencies": {
     "@owlmeans/dep-config": "workspace:*",

package/src/helper.ts

@@ -1,10 +1,10 @@
 import { AppType } from '@owlmeans/context'
 import { RouteMethod, RouteProtocols, SEP } from './consts.js'
 import { createRoute, makeRouteModel } from './model.js'
-import type { CommonRouteModel, RouteOptions } from './types.js'
+import type { RouteModel, RouteOptions } from './types.js'
 import type { CreateRouteSignature } from './utils/types.js'
 
-export const route: CreateRouteSignature<CommonRouteModel> = (alias, path, opts?) =>
+export const route: CreateRouteSignature<RouteModel> = (alias, path, opts?) =>
   makeRouteModel(createRoute(alias, path, opts))
 
 export const normalizePath = (path: string): string => {

package/src/model.ts

@@ -1,23 +1,14 @@
-import type { CommonRoute, CommonRouteModel } from './types.js'
+import type { RouteDeclaration, RouteModel } from './types.js'
 import type { CreateRouteSignature } from './utils/types.js'
-import { resolve } from './utils/route.js'
-import { AppType, BasicConfig, BasicContext } from '@owlmeans/context'
+import { AppType } from '@owlmeans/context'
 
-export const makeRouteModel = (route: CommonRoute): CommonRouteModel => {
-  const model: CommonRouteModel = {
-    route,
-    resolve: ctx => resolve(route)(ctx as unknown as BasicContext<BasicConfig>)
-  }
-
-  return model
-}
+export const makeRouteModel = (route: RouteDeclaration): RouteModel => ({ route })
 
-export const createRoute: CreateRouteSignature<CommonRoute> = (alias, path, opts?) => {
-  const route: CommonRoute = {
+export const createRoute: CreateRouteSignature<RouteDeclaration> = (alias, path, opts?) => {
+  const route: RouteDeclaration = {
     alias,
     type: AppType.Backend,
     path,
-    resolved: false,
     ...(typeof opts === 'string' ? { parent: opts } : opts)
   }
 

package/src/types.ts

@@ -1,7 +1,22 @@
-import type { AppType, BasicContext, BasicConfig } from '@owlmeans/context'
+import type { AppType } from '@owlmeans/context'
 import type { RouteProtocols, RouteMethod } from './consts'
 
-export interface CommonRoute extends BasicRoute {
+export interface BasicRoute {
+  type: AppType
+  service?: string
+  host?: string
+  port?: number
+  base?: string
+  internalHost?: string
+  internalPort?: number
+}
+
+/**
+ * The plain, declarative half of a route — what a `route()` call produces and what an application
+ * ships in its contract package. It is never rewritten: `path` stays the segment this route
+ * contributes under its parent, and the address is worked out on demand against a context.
+ */
+export interface RouteDeclaration extends BasicRoute {
   alias: string
   path: string
   parent?: string
@@ -17,24 +32,26 @@ export interface CommonServiceRoute extends BasicRoute {
   default?: boolean
 }
 
-export interface BasicRoute {
-  type: AppType
-  service?: string
-  host?: string
-  port?: number
-  base?: string
-  resolved: boolean
+export interface ResolvedServiceRoute extends CommonServiceRoute {
+  host: string
 }
 
-export interface ResolvedServiceRoute extends CommonServiceRoute {
+/** Where a route actually answers, once its service has been picked. */
+export interface RouteAddress {
   host: string
-  resolved: true
+  port?: number
+  base?: string
+  secure: boolean
+  protocol: RouteProtocols
 }
 
-export interface CommonRouteModel {
-  route: CommonRoute
-  resolve: <C extends BasicConfig, T extends BasicContext<C>>(context: T) => Promise<CommonRoute>
+/**
+ * The model wrapping a declaration. It carries no resolution state of its own — every address
+ * question is answered from the declaration plus the context that asks.
+ */
+export interface RouteModel {
+  route: RouteDeclaration
 }
 
-export interface RouteOptions extends Partial<CommonRoute> {
+export interface RouteOptions extends Partial<RouteDeclaration> {
 }

package/src/utils/route.ts

@@ -1,121 +1,151 @@
 import type { BasicConfig, BasicContext, Contextual } from '@owlmeans/context'
-import type { CommonRoute, CommonRouteModel, CommonServiceRoute } from '../types.js'
+import type { RouteAddress, RouteDeclaration, RouteModel, CommonServiceRoute, ResolvedServiceRoute } from '../types.js'
 import { isServiceRoute, isServiceRouteResolved } from './service.js'
 import { normalizePath } from '../helper.js'
-import { SEP } from '../consts.js'
+import { RouteProtocols, SEP } from '../consts.js'
 
 type Config = BasicConfig
 
-export const getParentRoute = async <C extends Config, T extends BasicContext<C>>(context: T, route: CommonRoute): Promise<CommonRoute | null> => {
-  if (route.parent != null) {
-    const parent = context.module<Contextual & { _module: true, route: CommonRouteModel, resolve?: () => Promise<void> }>(route.parent)
-    assertCycle<C, T>(context, route, parent.route.route)
-    if (parent.route == null) {
-      throw new SyntaxError('Parent module doesn\'t provide a route')
-    }
-    if (!parent.route.route.resolved) {
-      if (parent.resolve != null) {
-        await parent.resolve()
-      } else {
-        return await parent.route.resolve<C, T>(context)
-      }
-    }
-    return parent.route.route
+/** What an entrypoint looks like from the route layer: something that carries a route model. */
+interface RouteCarrier extends Contextual {
+  _entrypoint: true
+  route: RouteModel
+}
+
+const carrier = <C extends Config, T extends BasicContext<C>>(context: T, alias: string): RouteCarrier =>
+  context.entrypoint<RouteCarrier>(alias)
+
+export const getParentRoute = <C extends Config, T extends BasicContext<C>>(
+  context: T, route: RouteDeclaration
+): RouteDeclaration | null => {
+  if (route.parent == null) {
+    return null
   }
+  const parent = carrier<C, T>(context, route.parent)
+  if (parent.route == null) {
+    throw new SyntaxError('Parent entrypoint doesn\'t provide a route')
+  }
+  assertCycle<C, T>(context, route, parent.route.route)
 
-  return null
+  return parent.route.route
 }
 
-export const overrideParams = (route: CommonRoute, overrides?: Partial<CommonRoute>, filter?: string[]) => {
+export const overrideParams = (route: RouteDeclaration, overrides?: Partial<RouteDeclaration>, filter?: string[]) => {
   Object.entries(overrides ?? {}).forEach(([key, value]) => {
-    if (route[key as keyof CommonRoute] == null
+    if (route[key as keyof RouteDeclaration] == null
       && (filter == null || filter.includes(key))) {
-      (route[key as keyof CommonRoute] as CommonRoute[keyof CommonRoute]) = value
+      (route[key as keyof RouteDeclaration] as RouteDeclaration[keyof RouteDeclaration]) = value
     }
   })
 }
 
-export const resolve = <C extends Config, T extends BasicContext<C>>(route: CommonRoute) => async (context: T) => {
-  if (route.resolved) return route
-  route.resolved = true
-
+/**
+ * Pick the service route this declaration answers on: the one it names, else the default of its
+ * app type, else the first of its app type.
+ *
+ * @throws {SyntaxError}
+ */
+export const resolveService = <C extends Config, T extends BasicContext<C>>(
+  context: T, route: RouteDeclaration
+): ResolvedServiceRoute => {
   if (context.cfg.services == null) {
     throw new SyntaxError('Services aren\'t configured to resolve routes')
   }
 
-  const firstGuessService = context.cfg.services[route.service ?? context.cfg.service]
-  if (firstGuessService != null && !isServiceRoute(firstGuessService)) {
+  const named = context.cfg.services[route.service ?? context.cfg.service]
+  if (named != null && !isServiceRoute(named)) {
     throw new SyntaxError('Service is not a valid service route')
   }
-  const service = firstGuessService?.type === route.type ? firstGuessService
+
+  const service = named?.type === route.type ? named
     : Object.values(context.cfg.services).find<CommonServiceRoute>(
-      (service): service is CommonServiceRoute => {
-        const _service = service as CommonServiceRoute
-        return _service.default === true && _service.type === route.type
+      (candidate): candidate is CommonServiceRoute => {
+        const _candidate = candidate as CommonServiceRoute
+        return _candidate.default === true && _candidate.type === route.type
       }
     ) ?? Object.values(context.cfg.services).find<CommonServiceRoute>(
-      (service): service is CommonServiceRoute => {
-        const _service = service as CommonServiceRoute
-        return _service.type === route.type
-      }
+      (candidate): candidate is CommonServiceRoute => (candidate as CommonServiceRoute).type === route.type
     )
+
   if (!isServiceRoute(service)) {
     throw new SyntaxError('Service is not a valid service route')
   }
-  if (!service.resolved && service.host != null) {
-    service.resolved = true
-  }
   if (!isServiceRouteResolved(service)) {
     throw new SyntaxError('Service route is not resolved')
   }
 
-  overrideParams(route, service, ['host', 'port', 'service', 'base'])
+  return service
+}
 
-  // Internal host access is non secure only
-  // it's required for server side client routes
-  if ("internalHost" in route) {
-    if (route.internalHost === route.host) {
-      route.secure = false
-    }
-  } else if ("internalHost" in service) {
-    if (service.internalHost === route.host) {
-      route.secure = false
-    }
+/**
+ * The full path: every ancestor's declared segment, then this one. Walks the parent chain through
+ * the context, so a declaration always states only what it contributes.
+ */
+export const resolvePath = <C extends Config, T extends BasicContext<C>>(
+  context: T, route: RouteDeclaration
+): string => {
+  const parent = getParentRoute<C, T>(context, route)
+  if (parent == null) {
+    return route.path
   }
-  
+  const parentPath = resolvePath<C, T>(context, parent)
 
-  const parent = await getParentRoute<C, T>(context, route)
-  if (parent != null) {
-    route.path = (parent.path.startsWith(SEP) ? SEP : '')
-      + normalizePath(normalizePath(parent.path) + SEP + normalizePath(route.path))
-  }
+  return (parentPath.startsWith(SEP) ? SEP : '')
+    + normalizePath(normalizePath(parentPath) + SEP + normalizePath(route.path))
+}
 
-  // Moved base resolution to the final service
-  // if (parent == null && route.base != null && route.base.trim() !== '') {
-  //   route.path = SEP + normalizePath(route.base) + SEP + normalizePath(route.path)
-  //   // route.path = route.base.startsWith(SEP) ? SEP + route.path : route.path
-  // }
+/** `base` + the full path — what a server mounts and a client requests. */
+export const resolveMount = <C extends Config, T extends BasicContext<C>>(
+  context: T, route: RouteDeclaration
+): string => {
+  const path = resolvePath<C, T>(context, route)
+  const base = route.base ?? resolveService<C, T>(context, route).base
 
-  return route
+  return base != null && base.trim() !== ''
+    ? SEP + normalizePath(base) + SEP + normalizePath(path)
+    : path
 }
 
+/**
+ * Where the route answers. A backend caller reaching a service over its INTERNAL host is inside the
+ * cluster, so that hop is never TLS.
+ */
+export const resolveAddress = <C extends Config, T extends BasicContext<C>>(
+  context: T, route: RouteDeclaration
+): RouteAddress => {
+  const service = resolveService<C, T>(context, route)
+  const host = route.host ?? service.host
+  const internalHost = route.internalHost ?? service.internalHost
+
+  return {
+    host,
+    port: route.port ?? service.port,
+    base: route.base ?? service.base,
+    secure: internalHost != null && internalHost === host ? false : route.secure ?? true,
+    protocol: route.protocol ?? RouteProtocols.WEB,
+  }
+}
+
+/** Does this route belong to the service the asking context IS? */
+export const isLocalRoute = <C extends Config, T extends BasicContext<C>>(
+  context: T, route: RouteDeclaration
+): boolean => (route.service ?? context.cfg.service) === context.cfg.service
+
 /**
  * @throws {SyntaxError}
  */
-const assertCycle = <C extends BasicConfig, T extends BasicContext<C>>(context: T, route: CommonRoute, parent: CommonRoute) => {
+const assertCycle = <C extends BasicConfig, T extends BasicContext<C>>(
+  context: T, route: RouteDeclaration, parent: RouteDeclaration
+) => {
   while (parent.parent != null) {
     if (parent.parent === route.alias) {
       throw new SyntaxError(`Route parentship cycle detected. Parent: ${parent.alias} has his child as ancestor ${route.alias}`)
     }
-    parent = context.module<Contextual & { _module: true, route: CommonRouteModel }>(parent.parent).route.route
+    parent = carrier<C, T>(context, parent.parent).route.route
   }
 }
 
-export const prependBase = (route: CommonRoute) => {
-  let path = route.path
-  if (route.base != null && route.base.trim() !== '') {
-    path = SEP + normalizePath(route.base) + SEP + normalizePath(route.path)
-    // route.path = route.base.startsWith(SEP) ? SEP + route.path : route.path
-  }
-  return path
-}
+export const prependBase = (route: RouteDeclaration, path: string) =>
+  route.base != null && route.base.trim() !== ''
+    ? SEP + normalizePath(route.base) + SEP + normalizePath(path)
+    : path

package/src/utils/service.ts

@@ -5,5 +5,6 @@ export const isServiceRoute = (obj?: Object): obj is CommonServiceRoute =>
   obj != null && ('type' in obj) && ('service' in obj)
   && (Object.values(AppType).includes(obj.type as AppType))
 
+/** A service route is usable exactly when it knows the host it answers on. */
 export const isServiceRouteResolved = (route: CommonServiceRoute): route is ResolvedServiceRoute =>
-  route.resolved === true
+  route.host != null && route.host.trim() !== ''