@owlmeans/server-entrypoint 0.1.18-rc.8 → 0.1.18-rc.9

package/README.md

@@ -23,16 +23,16 @@ Typical pattern — define entrypoints separately, elevate with handlers:
 import { elevate, guard } from '@owlmeans/server-app'
 import { handleBody, handleParams } from '@owlmeans/server-app'
 
-const appModules = [
+const appEntrypoints = [
   entrypoint(route('project-create', '/projects', backend(RouteMethod.POST)), guard('auth')),
   entrypoint(route('project-get', '/projects/:id', backend())),
 ]
 
-elevate(appModules, 'project-create', handleBody(async (payload, ctx) => {
+elevate(appEntrypoints, 'project-create', handleBody(async (payload, ctx) => {
   return await ctx.project().create(payload)
 }))
 
-elevate(appModules, 'project-get', handleParams(async (params, ctx) => {
+elevate(appEntrypoints, 'project-get', handleParams(async (params, ctx) => {
   return await ctx.project().get(params.id)
 }))
 ```
@@ -41,7 +41,7 @@ elevate(appModules, 'project-get', handleParams(async (params, ctx) => {
 
 ### `elevate<R>(entrypoints, alias, handler?, opts?): ServerEntrypoint<R>[]`
 
-Mutates `entrypoints` in-place: finds the entrypoint with `alias` and attaches `handler`. Throws if the alias is not found or already elevated (unless `opts.force` is true).
+Replaces the element carrying `alias` with its elevated counterpart, in place, attaching `handler`. Elevating the same alias again just replaces it again; guards passed here are added to the ones the entrypoint declared. Throws when no entrypoint carries the alias.
 
 ### `entrypoint<R>(commonEntrypoint, handler?, opts?): ServerEntrypoint<R>`
 
@@ -54,7 +54,8 @@ Returns `EntrypointOptions` that require the named guard service to pass before
 ### `ServerEntrypoint<R>`
 
 Extends `CommonEntrypoint` with:
-- `route: ServerRouteModel<R>` — resolved server route
+- `route: ServerRouteModel<R>` — the server route declaration; `route.match(request, entrypoint.mount())`
+  answers whether a request hits it
 - `handle: RefedEntrypointHandler<R>` — the attached handler
 
 ### `RefedEntrypointHandler<R>`

package/agent-meta/manifest.json

@@ -1,8 +1,8 @@
 {
   "schemaVersion": 2,
   "package": "@owlmeans/server-entrypoint",
-  "version": "0.1.18-rc.7",
-  "generatedAt": "2026-08-24T21:14:00.127Z",
+  "version": "0.1.18-rc.9",
+  "generatedAt": "2026-09-01T16:28:56.991Z",
   "canonicalRepo": "https://github.com/owlmeans/common",
   "entries": [
     {

package/agent-meta/skills/server-entrypoint/SKILL.md

@@ -1,6 +1,6 @@
 ---
 name: server-entrypoint
-description: How to use @owlmeans/server-entrypoint — server-side entrypoint helpers extending @owlmeans/entrypoint with handler attachment, request lifecycle hooks. Auto-invoked when importing server-entrypoint types. Also covers the deprecated @owlmeans/server-module reexport shim.
+description: How to use @owlmeans/server-entrypoint — server-side entrypoints extending @owlmeans/entrypoint with handler attachment, intermediates and mount(). Auto-invoked when importing server-entrypoint types.
 user-invocable: false
 ---
 <!-- AUTO-GENERATED — do not edit. Regenerate via sync-agent-meta. -->
@@ -8,16 +8,19 @@ user-invocable: false
 # @owlmeans/server-entrypoint
 
 **Layer:** Server
-**Install:** `"@owlmeans/server-entrypoint": "^0.1.18-rc.7"` in `dependencies`
+**Install:** `"@owlmeans/server-entrypoint": "^0.1.18-rc.9"` in `dependencies`
 
 ## Key Exports
 
 | Export | Description |
 |--------|-------------|
-| `ServerEntrypoint` types | Server entrypoint interface (handler + lifecycle) |
-| `EntrypointOptions` | Options for elevating with handler, fixer, intermediate |
+| `ServerEntrypoint<R>` | Server entrypoint interface — a `ServerRouteModel` plus a `handle` |
+| `entrypoint(arg, handler?, opts?)` | Build a server entrypoint from a route model or an existing declaration |
+| `elevate(entrypoints, alias, handler?, opts?)` | Attach a handler (or just guards) to a declared entrypoint |
+| `guard(alias, opts?)` | Require a guard, returning server entrypoint options |
+| `EntrypointOptions<R>` | Options for elevating: `handler`, `fixer`, `intermediate`, `routeOptions`, guards/gates/filter |
 | `EntrypointRef` / `RefedEntrypointHandler` | Handler reference pattern |
-| Helpers | Attach handlers, hook into request lifecycle |
+| `FixerService` | Per-entrypoint error rendering (`handle(reply, error)`) |
 
 ## Usage
 
@@ -27,6 +30,23 @@ Most app code uses `elevate()` from `@owlmeans/server-app` (which builds on this
 import type { ServerEntrypoint } from '@owlmeans/server-entrypoint'
 ```
 
+Elevating is **idempotent** — elevating the same alias again simply replaces the element once more,
+and an intermediate stays intermediate unless the new call says otherwise. Guards passed at
+elevation are **unioned** with the ones the declaration already carries, so what the entrypoint
+declared still applies.
+
+## What a server registers
+
+`mount()` is the address a server binds: `base` plus every ancestor's segment, then this one. The
+declaration itself only ever states the segment it contributes, so composing the rest takes the
+context the entrypoint is registered in — which is why route registration happens after `init()`,
+never at declaration time.
+
+```typescript
+server.route({ url: entrypoint.mount(), method, handler })
+entrypoint.route.match(request, entrypoint.mount())   // intermediates test the same mount
+```
+
 ## Cross-Service URL Generation
 
 Use `makeSecurityHelper` from `@owlmeans/config` to build URLs pointing at other services (OAuth redirect URIs, webhook callbacks, etc.):
@@ -34,7 +54,7 @@ Use `makeSecurityHelper` from `@owlmeans/config` to build URLs pointing at other
 ```typescript
 import { makeSecurityHelper } from '@owlmeans/config'
 const helper = makeSecurityHelper<Config, Context>(ctx)
-const url = helper.makeUrl(route, '/callback')
+const url = helper.makeUrl(entrypoint.address(), '/callback')
 ```
 
 ## Depends On

package/build/entrypoint.d.ts

@@ -1,6 +1,6 @@
 import type { ServerRouteModel } from '@owlmeans/server-route';
 import type { ServerEntrypoint, EntrypointOptions, RefedEntrypointHandler } from './types.js';
 import type { CommonEntrypoint } from '@owlmeans/entrypoint';
-import type { CommonRouteModel } from '@owlmeans/route';
-export declare const entrypoint: <R>(arg: CommonEntrypoint | ServerRouteModel<R> | CommonRouteModel, handler?: RefedEntrypointHandler<R>, opts?: EntrypointOptions<R>) => ServerEntrypoint<R>;
+import type { RouteModel } from '@owlmeans/route';
+export declare const entrypoint: <R>(arg: CommonEntrypoint | ServerRouteModel<R> | RouteModel, handler?: RefedEntrypointHandler<R>, opts?: EntrypointOptions<R>) => ServerEntrypoint<R>;
 //# sourceMappingURL=entrypoint.d.ts.map

package/build/entrypoint.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"entrypoint.d.ts","sourceRoot":"","sources":["../src/entrypoint.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AAC9D,OAAO,KAAK,EAAE,gBAAgB,EAAE,iBAAiB,EAAiB,sBAAsB,EAAE,MAAM,YAAY,CAAA;AAG5G,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;AAC5D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAA;AAIvD,eAAO,MAAM,UAAU,GAAI,CAAC,OACrB,gBAAgB,GAAG,gBAAgB,CAAC,CAAC,CAAC,GAAG,gBAAgB,YAAY,sBAAsB,CAAC,CAAC,CAAC,SAAS,iBAAiB,CAAC,CAAC,CAAC,KAC/H,gBAAgB,CAAC,CAAC,CAuCpB,CAAA"}
+{"version":3,"file":"entrypoint.d.ts","sourceRoot":"","sources":["../src/entrypoint.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AAC9D,OAAO,KAAK,EAAE,gBAAgB,EAAE,iBAAiB,EAAiB,sBAAsB,EAAE,MAAM,YAAY,CAAA;AAG5G,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;AAC5D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAEjD,eAAO,MAAM,UAAU,GAAI,CAAC,EAC1B,KAAK,gBAAgB,GAAG,gBAAgB,CAAC,CAAC,CAAC,GAAG,UAAU,EAAE,UAAU,sBAAsB,CAAC,CAAC,CAAC,EAAE,OAAO,iBAAiB,CAAC,CAAC,CAAC,KACzH,gBAAgB,CAAC,CAAC,CAmCpB,CAAA"}

package/build/entrypoint.js

@@ -1,15 +1,19 @@
 import { isEntrypoint, makeCommonEntrypoint } from './utils/entrypoint.js';
 import { isServerRouteModel, route } from '@owlmeans/server-route';
-import { prependBase } from '@owlmeans/route/utils';
 export const entrypoint = (arg, handler, opts) => {
     const entrypointHandle = { ref: undefined };
     let _entrypoint;
     if (isEntrypoint(arg)) {
-        const routeModel = route(arg.route, opts?.intermediate ?? false, opts?.routeOptions);
+        // Elevating the same alias again is legal, so an intermediate route stays intermediate unless
+        // this call says otherwise.
+        const intermediate = opts?.intermediate
+            ?? (isServerRouteModel(arg.route) ? arg.route.isIntermediate() : false);
+        const routeModel = route(arg.route, intermediate, opts?.routeOptions);
         _entrypoint = arg;
         _entrypoint.route = routeModel;
         _entrypoint.filter = opts?.filter ?? arg.filter;
-        _entrypoint.guards = [...(arg.guards ?? []), ...(opts?.guards ?? [])];
+        // Elevating adds guards, it never swaps them: what the entrypoint declared still applies.
+        _entrypoint.guards = [...new Set([...(arg.guards ?? []), ...(opts?.guards ?? [])])];
         _entrypoint.gate = opts?.gate ?? arg.gate;
         _entrypoint.gateParams = opts?.gateParams ?? arg.gateParams;
     }
@@ -22,16 +26,10 @@ export const entrypoint = (arg, handler, opts) => {
         _entrypoint = makeCommonEntrypoint(_route, { ...opts });
         _entrypoint.route = _route;
     }
-    _entrypoint.fixer = opts?.fixer;
+    _entrypoint.fixer = opts?.fixer ?? _entrypoint.fixer;
     if (handler != null) {
         _entrypoint.handle = handler(entrypointHandle);
     }
-    _entrypoint.reinitializeContext = (context) => {
-        const newEntrypoint = entrypoint(arg, handler, opts);
-        newEntrypoint.ctx = context;
-        return newEntrypoint;
-    };
-    _entrypoint.getPath = () => prependBase(_entrypoint.route.route);
     entrypointHandle.ref = _entrypoint;
     return _entrypoint;
 };

package/build/entrypoint.js.map

@@ -1 +1 @@
-{"version":3,"file":"entrypoint.js","sourceRoot":"","sources":["../src/entrypoint.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAA;AAC1E,OAAO,EAAE,kBAAkB,EAAE,KAAK,EAAE,MAAM,wBAAwB,CAAA;AAIlE,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAA;AAEnD,MAAM,CAAC,MAAM,UAAU,GAAG,CACxB,GAA8D,EAAE,OAAmC,EAAE,IAA2B,EAC3G,EAAE;IACvB,MAAM,gBAAgB,GAAqB,EAAE,GAAG,EAAE,SAAS,EAAE,CAAA;IAE7D,IAAI,WAAgC,CAAA;IAEpC,IAAI,YAAY,CAAC,GAAG,CAAC,EAAE,CAAC;QACtB,MAAM,UAAU,GAAG,KAAK,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,EAAE,YAAY,IAAI,KAAK,EAAE,IAAI,EAAE,YAAY,CAAC,CAAA;QACpF,WAAW,GAAG,GAA0B,CAAA;QACxC,WAAW,CAAC,KAAK,GAAG,UAAU,CAAA;QAC9B,WAAW,CAAC,MAAM,GAAG,IAAI,EAAE,MAAM,IAAI,GAAG,CAAC,MAAM,CAAA;QAC/C,WAAW,CAAC,MAAM,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,IAAI,EAAE,CAAC,EAAE,GAAG,CAAC,IAAI,EAAE,MAAM,IAAI,EAAE,CAAC,CAAC,CAAA;QACrE,WAAW,CAAC,IAAI,GAAG,IAAI,EAAE,IAAI,IAAI,GAAG,CAAC,IAAI,CAAA;QACzC,WAAW,CAAC,UAAU,GAAG,IAAI,EAAE,UAAU,IAAI,GAAG,CAAC,UAAU,CAAA;IAC7D,CAAC;SAAM,IAAI,kBAAkB,CAAC,GAAG,CAAC,EAAE,CAAC;QACnC,WAAW,GAAG,oBAAoB,CAAC,GAAG,EAAE,EAAE,GAAG,IAAI,EAAE,CAAwB,CAAA;QAC3E,WAAW,CAAC,KAAK,GAAG,GAAG,CAAA;IACzB,CAAC;SAAM,CAAC;QACN,MAAM,MAAM,GAAG,KAAK,CAAC,GAAG,EAAE,IAAI,EAAE,YAAY,IAAI,KAAK,EAAE,IAAI,EAAE,YAAY,CAAC,CAAA;QAC1E,WAAW,GAAG,oBAAoB,CAAC,MAAM,EAAE,EAAE,GAAG,IAAI,EAAE,CAAwB,CAAA;QAC9E,WAAW,CAAC,KAAK,GAAG,MAAM,CAAA;IAC5B,CAAC;IAED,WAAW,CAAC,KAAK,GAAG,IAAI,EAAE,KAAK,CAAA;IAC/B,IAAI,OAAO,IAAI,IAAI,EAAE,CAAC;QACpB,WAAW,CAAC,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAA;IAChD,CAAC;IAED,WAAW,CAAC,mBAAmB,GAAG,CAAI,OAA0B,EAAE,EAAE;QAClE,MAAM,aAAa,GAAG,UAAU,CAAC,GAAG,EAAE,OAAO,EAAE,IAAI,CAAC,CAAA;QACpD,aAAa,CAAC,GAAG,GAAG,OAAO,CAAA;QAE3B,OAAO,aAAkB,CAAA;IAC3B,CAAC,CAAA;IAED,WAAW,CAAC,OAAO,GAAG,GAAG,EAAE,CAAC,WAAW,CAAC,WAAW,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;IAEhE,gBAAgB,CAAC,GAAG,GAAG,WAAW,CAAA;IAElC,OAAO,WAAW,CAAA;AACpB,CAAC,CAAA"}
+{"version":3,"file":"entrypoint.js","sourceRoot":"","sources":["../src/entrypoint.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAA;AAC1E,OAAO,EAAE,kBAAkB,EAAE,KAAK,EAAE,MAAM,wBAAwB,CAAA;AAIlE,MAAM,CAAC,MAAM,UAAU,GAAG,CACxB,GAAwD,EAAE,OAAmC,EAAE,IAA2B,EACrG,EAAE;IACvB,MAAM,gBAAgB,GAAqB,EAAE,GAAG,EAAE,SAAS,EAAE,CAAA;IAE7D,IAAI,WAAgC,CAAA;IAEpC,IAAI,YAAY,CAAC,GAAG,CAAC,EAAE,CAAC;QACtB,8FAA8F;QAC9F,4BAA4B;QAC5B,MAAM,YAAY,GAAG,IAAI,EAAE,YAAY;eAClC,CAAC,kBAAkB,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA;QACzE,MAAM,UAAU,GAAG,KAAK,CAAC,GAAG,CAAC,KAAK,EAAE,YAAY,EAAE,IAAI,EAAE,YAAY,CAAC,CAAA;QACrE,WAAW,GAAG,GAA0B,CAAA;QACxC,WAAW,CAAC,KAAK,GAAG,UAAU,CAAA;QAC9B,WAAW,CAAC,MAAM,GAAG,IAAI,EAAE,MAAM,IAAI,GAAG,CAAC,MAAM,CAAA;QAC/C,0FAA0F;QAC1F,WAAW,CAAC,MAAM,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,IAAI,EAAE,CAAC,EAAE,GAAG,CAAC,IAAI,EAAE,MAAM,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAA;QACnF,WAAW,CAAC,IAAI,GAAG,IAAI,EAAE,IAAI,IAAI,GAAG,CAAC,IAAI,CAAA;QACzC,WAAW,CAAC,UAAU,GAAG,IAAI,EAAE,UAAU,IAAI,GAAG,CAAC,UAAU,CAAA;IAC7D,CAAC;SAAM,IAAI,kBAAkB,CAAC,GAAG,CAAC,EAAE,CAAC;QACnC,WAAW,GAAG,oBAAoB,CAAC,GAAG,EAAE,EAAE,GAAG,IAAI,EAAE,CAAwB,CAAA;QAC3E,WAAW,CAAC,KAAK,GAAG,GAAG,CAAA;IACzB,CAAC;SAAM,CAAC;QACN,MAAM,MAAM,GAAG,KAAK,CAAC,GAAG,EAAE,IAAI,EAAE,YAAY,IAAI,KAAK,EAAE,IAAI,EAAE,YAAY,CAAC,CAAA;QAC1E,WAAW,GAAG,oBAAoB,CAAC,MAAM,EAAE,EAAE,GAAG,IAAI,EAAE,CAAwB,CAAA;QAC9E,WAAW,CAAC,KAAK,GAAG,MAAM,CAAA;IAC5B,CAAC;IAED,WAAW,CAAC,KAAK,GAAG,IAAI,EAAE,KAAK,IAAI,WAAW,CAAC,KAAK,CAAA;IACpD,IAAI,OAAO,IAAI,IAAI,EAAE,CAAC;QACpB,WAAW,CAAC,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAA;IAChD,CAAC;IAED,gBAAgB,CAAC,GAAG,GAAG,WAAW,CAAA;IAElC,OAAO,WAAW,CAAA;AACpB,CAAC,CAAA"}

package/build/helper.d.ts

@@ -1,5 +1,12 @@
 import type { ServerEntrypoint, EntrypointOptions, RefedEntrypointHandler } from './types.js';
 import type { CommonEntrypoint } from '@owlmeans/entrypoint';
+/**
+ * Replace the entrypoint declared under `alias` with its elevated counterpart. Elevating is
+ * idempotent — calling it again simply replaces the element once more, and the guards it brings
+ * are added to the ones already declared.
+ *
+ * @throws {SyntaxError} when no entrypoint carries the alias
+ */
 export declare const elevate: <R>(entrypoints: (CommonEntrypoint | ServerEntrypoint<R>)[], alias: string, handler?: RefedEntrypointHandler<R> | boolean | EntrypointOptions<R>, opts?: boolean | EntrypointOptions<R>) => ServerEntrypoint<R>[];
 export declare const guard: <R>(guard: string, opts?: EntrypointOptions<R>) => EntrypointOptions<R>;
 //# sourceMappingURL=helper.d.ts.map

package/build/helper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"helper.d.ts","sourceRoot":"","sources":["../src/helper.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,sBAAsB,EAAE,MAAM,YAAY,CAAA;AAI7F,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;AAE5D,eAAO,MAAM,OAAO,GAAI,CAAC,eACV,CAAC,gBAAgB,GAAG,gBAAgB,CAAC,CAAC,CAAC,CAAC,EAAE,SAChD,MAAM,YACH,sBAAsB,CAAC,CAAC,CAAC,GAAG,OAAO,GAAG,iBAAiB,CAAC,CAAC,CAAC,SAC7D,OAAO,GAAG,iBAAiB,CAAC,CAAC,CAAC,KACpC,gBAAgB,CAAC,CAAC,CAAC,EAuBrB,CAAA;AAED,eAAO,MAAM,KAAK,GAAI,CAAC,SAAS,MAAM,SAAS,iBAAiB,CAAC,CAAC,CAAC,KAAG,iBAAiB,CAAC,CAAC,CACjD,CAAA"}
+{"version":3,"file":"helper.d.ts","sourceRoot":"","sources":["../src/helper.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,sBAAsB,EAAE,MAAM,YAAY,CAAA;AAG7F,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;AAE5D;;;;;;GAMG;AACH,eAAO,MAAM,OAAO,GAAI,CAAC,EACvB,aAAa,CAAC,gBAAgB,GAAG,gBAAgB,CAAC,CAAC,CAAC,CAAC,EAAE,EACvD,OAAO,MAAM,EACb,UAAU,sBAAsB,CAAC,CAAC,CAAC,GAAG,OAAO,GAAG,iBAAiB,CAAC,CAAC,CAAC,EACpE,OAAO,OAAO,GAAG,iBAAiB,CAAC,CAAC,CAAC,KACpC,gBAAgB,CAAC,CAAC,CAAC,EAmBrB,CAAA;AAED,eAAO,MAAM,KAAK,GAAI,CAAC,EAAE,OAAO,MAAM,EAAE,OAAO,iBAAiB,CAAC,CAAC,CAAC,KAAG,iBAAiB,CAAC,CAAC,CACjD,CAAA"}

package/build/helper.js

@@ -1,6 +1,12 @@
 import { entrypoint } from './entrypoint.js';
-import { isServerRouteModel } from '@owlmeans/server-route';
 import { createBasicGuard } from './utils/helper.js';
+/**
+ * Replace the entrypoint declared under `alias` with its elevated counterpart. Elevating is
+ * idempotent — calling it again simply replaces the element once more, and the guards it brings
+ * are added to the ones already declared.
+ *
+ * @throws {SyntaxError} when no entrypoint carries the alias
+ */
 export const elevate = (entrypoints, alias, handler, opts) => {
     const idx = entrypoints.findIndex(({ route }) => route.route.alias === alias);
     if (idx === -1) {
@@ -14,10 +20,6 @@ export const elevate = (entrypoints, alias, handler, opts) => {
         opts = handler;
         handler = undefined;
     }
-    const force = typeof opts === 'object' && opts.force;
-    if (isServerRouteModel(entrypoints[idx].route) && !force) {
-        throw new SyntaxError(`Entrypoint with alias ${alias} is already elevated`);
-    }
     entrypoints[idx] = entrypoint(entrypoints[idx], handler, typeof opts === 'boolean' ? { intermediate: opts } : opts);
     return entrypoints;
 };

package/build/helper.js.map

@@ -1 +1 @@
-{"version":3,"file":"helper.js","sourceRoot":"","sources":["../src/helper.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAC5C,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAA;AAC3D,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAA;AAGpD,MAAM,CAAC,MAAM,OAAO,GAAG,CACrB,WAAuD,EACvD,KAAa,EACb,OAAoE,EACpE,IAAqC,EACd,EAAE;IACzB,MAAM,GAAG,GAAG,WAAW,CAAC,SAAS,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,KAAK,KAAK,CAAC,CAAA;IAC7E,IAAI,GAAG,KAAK,CAAC,CAAC,EAAE,CAAC;QACf,MAAM,IAAI,WAAW,CAAC,yBAAyB,KAAK,cAAc,CAAC,CAAA;IACrE,CAAC;IACD,IAAI,OAAO,OAAO,KAAK,SAAS,EAAE,CAAC;QACjC,IAAI,GAAG,OAAO,CAAA;QACd,OAAO,GAAG,SAAS,CAAA;IACrB,CAAC;IACD,IAAI,OAAO,OAAO,KAAK,QAAQ,IAAI,OAAO,OAAO,KAAK,UAAU,EAAE,CAAC;QACjE,IAAI,GAAG,OAAO,CAAA;QACd,OAAO,GAAG,SAAS,CAAA;IACrB,CAAC;IACD,MAAM,KAAK,GAAG,OAAO,IAAI,KAAK,QAAQ,IAAI,IAAI,CAAC,KAAK,CAAA;IACpD,IAAI,kBAAkB,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;QACzD,MAAM,IAAI,WAAW,CAAC,yBAAyB,KAAK,sBAAsB,CAAC,CAAA;IAC7E,CAAC;IAED,WAAW,CAAC,GAAG,CAAC,GAAG,UAAU,CAC3B,WAAW,CAAC,GAAG,CAAC,EAAE,OAAO,EAAE,OAAO,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,CACrF,CAAA;IAED,OAAO,WAAoC,CAAA;AAC7C,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,KAAK,GAAG,CAAI,KAAa,EAAE,IAA2B,EAAwB,EAAE,CAC3F,CAAC,EAAE,GAAG,gBAAgB,CAAC,KAAK,EAAE,IAAI,CAAC,EAAE,CAAC,CAAA"}
+{"version":3,"file":"helper.js","sourceRoot":"","sources":["../src/helper.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAC5C,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAA;AAGpD;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,OAAO,GAAG,CACrB,WAAuD,EACvD,KAAa,EACb,OAAoE,EACpE,IAAqC,EACd,EAAE;IACzB,MAAM,GAAG,GAAG,WAAW,CAAC,SAAS,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,KAAK,KAAK,CAAC,CAAA;IAC7E,IAAI,GAAG,KAAK,CAAC,CAAC,EAAE,CAAC;QACf,MAAM,IAAI,WAAW,CAAC,yBAAyB,KAAK,cAAc,CAAC,CAAA;IACrE,CAAC;IACD,IAAI,OAAO,OAAO,KAAK,SAAS,EAAE,CAAC;QACjC,IAAI,GAAG,OAAO,CAAA;QACd,OAAO,GAAG,SAAS,CAAA;IACrB,CAAC;IACD,IAAI,OAAO,OAAO,KAAK,QAAQ,IAAI,OAAO,OAAO,KAAK,UAAU,EAAE,CAAC;QACjE,IAAI,GAAG,OAAO,CAAA;QACd,OAAO,GAAG,SAAS,CAAA;IACrB,CAAC;IAED,WAAW,CAAC,GAAG,CAAC,GAAG,UAAU,CAC3B,WAAW,CAAC,GAAG,CAAC,EAAE,OAAO,EAAE,OAAO,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,CACrF,CAAA;IAED,OAAO,WAAoC,CAAA;AAC7C,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,KAAK,GAAG,CAAI,KAAa,EAAE,IAA2B,EAAwB,EAAE,CAC3F,CAAC,EAAE,GAAG,gBAAgB,CAAC,KAAK,EAAE,IAAI,CAAC,EAAE,CAAC,CAAA"}

package/build/types.d.ts

@@ -7,10 +7,6 @@ export interface ServerEntrypoint<R> extends CommonEntrypoint {
     handle: EntrypointHandler;
 }
 export interface EntrypointOptions<R> extends CommonEntrypointOptions {
-    /**
-     * Force entrypoint to be elevated even if it is already elevated
-     */
-    force?: boolean;
     fixer?: string;
     intermediate?: boolean;
     routeOptions?: ServerRouteOptions<R>;

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,gBAAgB,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAA;AAClF,OAAO,KAAK,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAA;AACxG,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAA;AAEhD,MAAM,WAAW,gBAAgB,CAAC,CAAC,CAAE,SAAQ,gBAAgB;IAC3D,KAAK,EAAE,gBAAgB,CAAC,CAAC,CAAC,CAAA;IAC1B,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,iBAAiB,CAAA;CAC1B;AAED,MAAM,WAAW,iBAAiB,CAAC,CAAC,CAAE,SAAQ,uBAAuB;IACnE;;OAEG;IACH,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,YAAY,CAAC,EAAE,OAAO,CAAA;IACtB,YAAY,CAAC,EAAE,kBAAkB,CAAC,CAAC,CAAC,CAAA;CACrC;AAED,MAAM,WAAW,YAAa,SAAQ,OAAO;IAC3C,MAAM,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,KAAK,KAAK,IAAI,CAAA;CAC5C;AAED,MAAM,WAAW,aAAa,CAAC,CAAC;IAC9B,GAAG,CAAC,EAAE,gBAAgB,CAAC,CAAC,CAAC,CAAA;CAC1B;AAED,MAAM,WAAW,sBAAsB,CAAC,CAAC,GAAG,EAAE;IAC5C,CAAC,GAAG,EAAE,aAAa,CAAC,CAAC,CAAC,GAAG,iBAAiB,CAAA;CAC3C"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAA;AAClF,OAAO,KAAK,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAA;AACxG,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAA;AAEhD,MAAM,WAAW,gBAAgB,CAAC,CAAC,CAAE,SAAQ,gBAAgB;IAC3D,KAAK,EAAE,gBAAgB,CAAC,CAAC,CAAC,CAAA;IAC1B,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,iBAAiB,CAAA;CAC1B;AAED,MAAM,WAAW,iBAAiB,CAAC,CAAC,CAAE,SAAQ,uBAAuB;IACnE,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,YAAY,CAAC,EAAE,OAAO,CAAA;IACtB,YAAY,CAAC,EAAE,kBAAkB,CAAC,CAAC,CAAC,CAAA;CACrC;AAED,MAAM,WAAW,YAAa,SAAQ,OAAO;IAC3C,MAAM,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,KAAK,KAAK,IAAI,CAAA;CAC5C;AAED,MAAM,WAAW,aAAa,CAAC,CAAC;IAC9B,GAAG,CAAC,EAAE,gBAAgB,CAAC,CAAC,CAAC,CAAA;CAC1B;AAED,MAAM,WAAW,sBAAsB,CAAC,CAAC,GAAG,EAAE;IAC5C,CAAC,GAAG,EAAE,aAAa,CAAC,CAAC,CAAC,GAAG,iBAAiB,CAAA;CAC3C"}

package/package.json

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

package/src/entrypoint.ts

@@ -3,23 +3,26 @@ import type { ServerEntrypoint, EntrypointOptions, EntrypointRef, RefedEntrypoin
 import { isEntrypoint, makeCommonEntrypoint } from './utils/entrypoint.js'
 import { isServerRouteModel, route } from '@owlmeans/server-route'
 import type { CommonEntrypoint } from '@owlmeans/entrypoint'
-import type { CommonRouteModel } from '@owlmeans/route'
-import type { BasicContext } from '@owlmeans/context'
-import { prependBase } from '@owlmeans/route/utils'
+import type { RouteModel } from '@owlmeans/route'
 
 export const entrypoint = <R>(
-  arg: CommonEntrypoint | ServerRouteModel<R> | CommonRouteModel, handler?: RefedEntrypointHandler<R>, opts?: EntrypointOptions<R>
+  arg: CommonEntrypoint | ServerRouteModel<R> | RouteModel, handler?: RefedEntrypointHandler<R>, opts?: EntrypointOptions<R>
 ): ServerEntrypoint<R> => {
   const entrypointHandle: EntrypointRef<R> = { ref: undefined }
 
   let _entrypoint: ServerEntrypoint<R>
 
   if (isEntrypoint(arg)) {
-    const routeModel = route(arg.route, opts?.intermediate ?? false, opts?.routeOptions)
+    // Elevating the same alias again is legal, so an intermediate route stays intermediate unless
+    // this call says otherwise.
+    const intermediate = opts?.intermediate
+      ?? (isServerRouteModel(arg.route) ? arg.route.isIntermediate() : false)
+    const routeModel = route(arg.route, intermediate, opts?.routeOptions)
     _entrypoint = arg as ServerEntrypoint<R>
     _entrypoint.route = routeModel
     _entrypoint.filter = opts?.filter ?? arg.filter
-    _entrypoint.guards = [...(arg.guards ?? []), ...(opts?.guards ?? [])]
+    // Elevating adds guards, it never swaps them: what the entrypoint declared still applies.
+    _entrypoint.guards = [...new Set([...(arg.guards ?? []), ...(opts?.guards ?? [])])]
     _entrypoint.gate = opts?.gate ?? arg.gate
     _entrypoint.gateParams = opts?.gateParams ?? arg.gateParams
   } else if (isServerRouteModel(arg)) {
@@ -31,20 +34,11 @@ export const entrypoint = <R>(
     _entrypoint.route = _route
   }
 
-  _entrypoint.fixer = opts?.fixer
+  _entrypoint.fixer = opts?.fixer ?? _entrypoint.fixer
   if (handler != null) {
     _entrypoint.handle = handler(entrypointHandle)
   }
 
-  _entrypoint.reinitializeContext = <T>(context: BasicContext<any>) => {
-    const newEntrypoint = entrypoint(arg, handler, opts)
-    newEntrypoint.ctx = context
-
-    return newEntrypoint as T
-  }
-
-  _entrypoint.getPath = () => prependBase(_entrypoint.route.route)
-
   entrypointHandle.ref = _entrypoint
 
   return _entrypoint

package/src/helper.ts

@@ -1,9 +1,15 @@
 import type { ServerEntrypoint, EntrypointOptions, RefedEntrypointHandler } from './types.js'
 import { entrypoint } from './entrypoint.js'
-import { isServerRouteModel } from '@owlmeans/server-route'
 import { createBasicGuard } from './utils/helper.js'
 import type { CommonEntrypoint } from '@owlmeans/entrypoint'
 
+/**
+ * Replace the entrypoint declared under `alias` with its elevated counterpart. Elevating is
+ * idempotent — calling it again simply replaces the element once more, and the guards it brings
+ * are added to the ones already declared.
+ *
+ * @throws {SyntaxError} when no entrypoint carries the alias
+ */
 export const elevate = <R>(
   entrypoints: (CommonEntrypoint | ServerEntrypoint<R>)[],
   alias: string,
@@ -22,10 +28,6 @@ export const elevate = <R>(
     opts = handler
     handler = undefined
   }
-  const force = typeof opts === 'object' && opts.force
-  if (isServerRouteModel(entrypoints[idx].route) && !force) {
-    throw new SyntaxError(`Entrypoint with alias ${alias} is already elevated`)
-  }
 
   entrypoints[idx] = entrypoint(
     entrypoints[idx], handler, typeof opts === 'boolean' ? { intermediate: opts } : opts

package/src/types.ts

@@ -9,10 +9,6 @@ export interface ServerEntrypoint<R> extends CommonEntrypoint {
 }
 
 export interface EntrypointOptions<R> extends CommonEntrypointOptions {
-  /**
-   * Force entrypoint to be elevated even if it is already elevated
-   */
-  force?: boolean
   fixer?: string
   intermediate?: boolean
   routeOptions?: ServerRouteOptions<R>