@owlmeans/client-entrypoint 0.1.18-rc.10 → 0.1.18-rc.12

package/README.md

@@ -5,8 +5,9 @@ Client-side entrypoint system: elevates route definitions into API-calling `Clie
 ## Overview
 
 - `elevate(entrypoints, alias, handler?, opts?)` — attaches a client handler to an entrypoint (mirrors server `elevate`)
-- `ClientEntrypoint<T>` has a `call(request?)` method that resolves the URL and makes an HTTP/WS request
-- `stab` — no-op handler for entrypoints that only need URL resolution (no logic)
+- `ClientEntrypoint<T>` exposes three explicit verbs: `call()` for the value, `invoke()` for the value
+  plus its outcome, and `url()` for the address
+- `stab` — no-op handler for entrypoints that only need a URL (no logic)
 - `provideRequest(alias, path)` — creates an `AbstractRequest` for programmatic entrypoint calls
 - `pickPerSchema(schema, obj)` — extracts fields from an object matching an AJV schema
 - Re-exported as `celevate` from `@owlmeans/server-app`
@@ -25,42 +26,60 @@ Define and elevate a client entrypoint for API calls:
 import { elevate, stab } from '@owlmeans/client-entrypoint'
 import type { ClientEntrypoint } from '@owlmeans/client-entrypoint'
 
-const appModules = [
+const appEntrypoints = [
   entrypoint(route('project-list', '/projects', frontend('base'))),
   entrypoint(route('project-create', '/projects', backend(RouteMethod.POST))),
 ]
 
-// Frontend navigation — just a stub, no network call
-elevate(appModules, 'project-list', stab)
+// Frontend navigation — a screen, addressed with url(); call()/invoke() throw on it
+elevate(appEntrypoints, 'project-list', stab)
 
 // Backend API call — call() makes a POST request
-elevate(appModules, 'project-create')
+elevate(appEntrypoints, 'project-create')
 ```
 
 Call an entrypoint from a service:
 
 ```typescript
 const agentEntrypoint = ctx.entrypoint<ClientEntrypoint<Project>>(agent.project.create)
-const [result] = await agentEntrypoint.call({
-  body: { prompt: payload.prompt, entity: req.auth?.entityId }
+const result = await agentEntrypoint.call({
+  body: { prompt: payload.prompt, entity: req.auth?.entitySlug }
 })
 ```
 
+Take the outcome when it decides what happens next, and build a link with `url()`:
+
+```typescript
+const { value, outcome } = await agentEntrypoint.invoke({ body: payload })
+
+const href = await ctx.entrypoint<ClientEntrypoint>('project-list')
+  .url({ params: { id: value.id } }, { absolute: true })
+```
+
 ## API
 
 ### `elevate<T, R>(entrypoints, alias, handler?, opts?): ClientEntrypoint<T, R>[]`
 
-Mutates `entrypoints` in-place and returns the array typed as `ClientEntrypoint`. The `handler` sets how `call()` behaves.
+Replaces the element carrying `alias` with its elevated counterpart, in place, and returns the array typed as `ClientEntrypoint`. The `handler` sets how `call()` behaves. 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.
 
 ### `stab: RefedEntrypointHandler`
 
-No-op handler for frontend-only entrypoints that just need URL resolution.
+No-op handler for frontend-only entrypoints that are addressed by URL rather than called.
 
 ### `ClientEntrypoint<T>` (type)
 
-- `call(request?)` — resolves URL, makes HTTP request, returns `[T, EntrypointOutcome]`
+- `call(request?)` — addresses the entrypoint over the wire and resolves to the value, throwing
+  whatever error the reply carried
+- `invoke(request?)` — the same round trip, resolving to `{ value, outcome }`
+- `url(request?, { absolute? })` — builds the URL this entrypoint addresses, with `:params` filled in
+  and the query appended; absolute when the route belongs to another service or `absolute` is asked for
 - `validate(request?)` — validates the request against the entrypoint filter schema
-- `getPath(partial?)` — returns the URL path (with or without path params)
+- `segment()` / `path()` / `mount()` — the segment this entrypoint contributes, that segment under its
+  ancestors, and the same path under the service base. All three are computed from the declaration
+  and the context on every call — nothing is written back into the route.
+
+An entrypoint carrying a renderer *is* a screen: it is addressed by URL, never called over the wire,
+so `call()` and `invoke()` throw and point the caller at `url()`.
 
 ### `provideRequest<T>(alias, path): AbstractRequest<T>`
 
@@ -70,10 +89,17 @@ Creates a minimal request object for programmatic `call()` invocations.
 
 Extracts only the keys present in the AJV schema from `obj`.
 
+### `@owlmeans/client-entrypoint/utils`
+
+The low-level pair the verbs are built on, for code that holds an entrypoint reference directly:
+
+- `entrypointUrl(ref, request, opts?)` — the address behind `url()`
+- `apiInvoke(ref, opts?)` — the round trip behind `invoke()`
+
 ## Related Packages
 
 - [`@owlmeans/entrypoint`](../entrypoint) — `CommonEntrypoint` base that gets elevated
-- [`@owlmeans/client`](../client) — `useNavigate` uses `ClientEntrypoint.call()`
+- [`@owlmeans/client`](../client) — `useNavigate` navigates by `ClientEntrypoint.url()`
 - [`@owlmeans/server-app`](../server-app) — re-exports `elevate` as `celevate`
 
 <!-- owlmeans:agent-guidance:start -->

package/agent-meta/manifest.json

@@ -1,8 +1,8 @@
 {
   "schemaVersion": 2,
   "package": "@owlmeans/client-entrypoint",
-  "version": "0.1.18-rc.10",
-  "generatedAt": "2026-09-01T12:04:42.724Z",
+  "version": "0.1.18-rc.12",
+  "generatedAt": "2026-09-01T17:39:40.760Z",
   "canonicalRepo": "https://github.com/owlmeans/common",
   "entries": [
     {

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

@@ -1,6 +1,6 @@
 ---
 name: client-entrypoint
-description: How to use @owlmeans/client-entrypoint — client-side entrypoint helpers extending @owlmeans/entrypoint with React component attachment and call helpers. Auto-invoked when importing client entrypoint helpers. Also covers the deprecated @owlmeans/client-module reexport shim.
+description: How to use @owlmeans/client-entrypoint — client-side entrypoints extending @owlmeans/entrypoint with the call/invoke/url verbs, React component attachment and elevation. Auto-invoked when importing client entrypoint helpers.
 user-invocable: false
 ---
 <!-- AUTO-GENERATED — do not edit. Regenerate via sync-agent-meta. -->
@@ -8,20 +8,24 @@ user-invocable: false
 # @owlmeans/client-entrypoint
 
 **Layer:** Client
-**Install:** `"@owlmeans/client-entrypoint": "^0.1.18-rc.10"` in `dependencies`
+**Install:** `"@owlmeans/client-entrypoint": "^0.1.18-rc.12"` in `dependencies`
 
 ## Key Exports
 
 | Export | Description |
 |--------|-------------|
-| `ClientEntrypoint<T>` types | Client entrypoint interface (handler component + call helpers) |
-| `EntrypointCall` / `EntrypointFilter` | Typed call and validation helpers |
+| `ClientEntrypoint<T, R>` | Client entrypoint interface — `call`, `invoke`, `url`, `validate`, `request` |
+| `entrypoint(arg, handler?, opts?)` | Build a client entrypoint from a route model or an existing declaration |
+| `elevate(entrypoints, alias, handler?, opts?)` | Make a declared entrypoint client-callable, optionally attaching a screen |
+| `EntrypointCall` / `EntrypointInvoke` / `EntrypointUrl` | The typed signatures of the three verbs |
+| `EntrypointReply<T>` | `{ value, outcome }` — what `invoke` resolves to |
 | `EntrypointRef` / `RefedEntrypointHandler` | Handler reference pattern |
-| Entrypoint helpers | Build client entrypoints; resolve callable references |
+| `provideRequest(alias, path)` / `pickPerSchema(obj, schema)` | Request construction helpers |
+| `ClientEntrypointError` / `ClientValidationError` | Typed client-side failures |
 
 ## Subpath Exports
 
-- `./utils`
+- `./utils` — `entrypointUrl(ref, req?, opts?)`, `apiInvoke(ref, opts?)`, `apiHandler(ref)`, `validate(ref)`
 
 ## Usage
 
@@ -31,20 +35,46 @@ Most app code uses `elevate()` from `@owlmeans/web-client` (which builds on this
 import type { ClientEntrypoint } from '@owlmeans/client-entrypoint'
 ```
 
-## URL Generation via Entrypoint Call
+Client-side callability is an **explicit opt-in**: a declaration only becomes callable from a client
+once a bare client `elevate` (or `celevate` on the server side) has been applied to it. Elevating is
+idempotent, and guards passed at elevation are added to the ones the declaration already carries.
 
-Entrypoints with a `handler` (React component) use `urlCall` internally — calling `.call()` returns a URL string. Use `{ full: true }` to get a fully-qualified URL via `makeSecurityHelper`:
+## The three verbs
+
+```typescript
+const ep = context.entrypoint<ClientEntrypoint<Project>>(manager.back.project.create)
+
+const project = await ep.call({ body })                  // the VALUE; the reply error is thrown
+const { value, outcome } = await ep.invoke({ body })     // value AND outcome
+```
+
+`call` is the default — it resolves to the value and throws whatever the reply carried, so a caller
+that only needs the result never inspects an outcome. Reach for `invoke` only where the outcome
+(`Ok`, `Accepted`, `Created`, `Finished`) decides what happens next.
+
+An entrypoint that carries a **renderer IS a screen**: it is addressed by URL, never called over the
+wire, and it throws from `call()`/`invoke()` saying so.
+
+## URL generation
+
+`url()` fills in `:params`, appends the query, and returns a **relative** path when the route belongs
+to the asking service — addressing an in-app target absolutely would turn navigation into a full page
+load. Ask for `{ absolute: true }` when the URL leaves the app (redirect URIs, webhook callbacks,
+anything pasted into another system), and a cross-service route is absolute regardless.
 
 ```typescript
 import type { ClientEntrypoint } from '@owlmeans/client-entrypoint'
 import { HOME } from '@owlmeans/context'
 
-const [url] = await context.entrypoint<ClientEntrypoint<string>>(HOME).call({ full: true }) ?? []
+const url = await context.entrypoint<ClientEntrypoint<string>>(HOME).url({}, { absolute: true })
 // Returns e.g. "https://app.example.com/"
 ```
 
-This is the preferred pattern for redirect URIs and navigation targets instead of manual `window.location` concatenation.
+This is the preferred pattern for redirect URIs and navigation targets instead of manual
+`window.location` concatenation. The underlying helper is `entrypointUrl(ref, req?, opts?)` from
+`./utils`, which packages building their own addressing (sockets, for instance) call directly.
 
 ## Depends On
 
 - `@owlmeans/entrypoint`, `@owlmeans/client-route`, `@owlmeans/client-context`
+- `@owlmeans/api` (the HTTP carrier), `@owlmeans/config` (`makeSecurityHelper` for absolute URLs)

package/build/entrypoint.d.ts

@@ -1,6 +1,6 @@
 import type { ClientRouteModel } from '@owlmeans/client-route';
 import type { ClientEntrypoint, ClientEntrypointOptions, RefedEntrypointHandler } from './types.js';
 import type { AbstractRequest, CommonEntrypoint } from '@owlmeans/entrypoint';
-import type { CommonRouteModel } from '@owlmeans/route';
-export declare const entrypoint: <T, R extends AbstractRequest = AbstractRequest>(arg: CommonEntrypoint | ClientRouteModel | CommonRouteModel, handler?: RefedEntrypointHandler<T, R> | ClientEntrypointOptions | boolean, opts?: ClientEntrypointOptions | boolean) => ClientEntrypoint<T, R>;
+import type { RouteModel } from '@owlmeans/route';
+export declare const entrypoint: <T, R extends AbstractRequest = AbstractRequest>(arg: CommonEntrypoint | ClientRouteModel | RouteModel, handler?: RefedEntrypointHandler<T, R> | ClientEntrypointOptions | boolean, opts?: ClientEntrypointOptions | boolean) => ClientEntrypoint<T, 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,uBAAuB,EAAiB,sBAAsB,EAAE,MAAM,YAAY,CAAA;AAClH,OAAO,KAAK,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;AAO7E,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAA;AAGvD,eAAO,MAAM,UAAU,GAAI,CAAC,EAAE,CAAC,SAAS,eAAe,GAAG,eAAe,OAClE,gBAAgB,GAAG,gBAAgB,GAAG,gBAAgB,YACjD,sBAAsB,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,uBAAuB,GAAG,OAAO,SACnE,uBAAuB,GAAG,OAAO,KACvC,gBAAgB,CAAC,CAAC,EAAE,CAAC,CA+DvB,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,uBAAuB,EAAiB,sBAAsB,EAAE,MAAM,YAAY,CAAA;AAClH,OAAO,KAAK,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;AAK7E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAGjD,eAAO,MAAM,UAAU,GAAI,CAAC,EAAE,CAAC,SAAS,eAAe,GAAG,eAAe,EACvE,KAAK,gBAAgB,GAAG,gBAAgB,GAAG,UAAU,EACrD,UAAU,sBAAsB,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,uBAAuB,GAAG,OAAO,EAC1E,OAAO,uBAAuB,GAAG,OAAO,KACvC,gBAAgB,CAAC,CAAC,EAAE,CAAC,CAoEvB,CAAA"}

package/build/entrypoint.js

@@ -1,8 +1,7 @@
 import { isEntrypoint, makeBasicEntrypoint, normalizeHelperParams, validate } from './utils/entrypoint.js';
 import { isClientRouteModel, route } from '@owlmeans/client-route';
-import { apiCall, apiHandler, urlCall } from './utils/handler.js';
+import { apiInvoke, apiHandler, entrypointUrl } from './utils/handler.js';
 import { AppType } from '@owlmeans/context';
-import { normalizePath } from '@owlmeans/route';
 import { provideRequest } from './helper.js';
 export const entrypoint = (arg, handler, opts) => {
     const entrypointHandle = { ref: undefined };
@@ -16,7 +15,8 @@ export const entrypoint = (arg, handler, opts) => {
         const routeModel = route(arg.route, opts?.routeOptions);
         _entrypoint = arg;
         _entrypoint.route = routeModel;
-        _entrypoint.guards = opts?.guards ?? arg.guards;
+        // Elevating adds guards, it never swaps them: what the entrypoint declared still applies.
+        _entrypoint.guards = [...new Set([...(arg.guards ?? []), ...(opts?.guards ?? [])])];
         _entrypoint.filter = opts?.filter ?? arg.filter;
         _entrypoint.gate = opts?.gate ?? arg.gate;
         _entrypoint.gateParams = opts?.gateParams ?? arg.gateParams;
@@ -32,13 +32,20 @@ export const entrypoint = (arg, handler, opts) => {
         _entrypoint = makeBasicEntrypoint(_route, { ...opts });
         _entrypoint.route = _route;
     }
-    _entrypoint.getPath = (partial) => partial === true ? normalizePath(_entrypoint.route.route.partialPath) : _entrypoint.route.route.path;
-    _entrypoint.call = handler != null ? urlCall(entrypointHandle, opts) : apiCall(entrypointHandle, opts);
+    _entrypoint.url = ((req, urlOpts) => entrypointUrl(entrypointHandle, req, urlOpts));
+    // An entrypoint carrying a renderer IS a screen: it is addressed by URL, never called over the
+    // wire. Saying so here turns what used to be a URL-shaped answer from `call()` into a report.
+    _entrypoint.invoke = (handler != null
+        ? (async () => {
+            throw new SyntaxError(`Entrypoint ${_entrypoint.alias} renders a screen - address it with url() instead of call()/invoke()`);
+        })
+        : apiInvoke(entrypointHandle, opts));
+    _entrypoint.call = (async (req) => (await _entrypoint.invoke(req)).value);
     _entrypoint.request = ((request) => {
         if (entrypointHandle.ref == null) {
             throw SyntaxError(`Try to request uninitialized entrypoint ${JSON.stringify(arg)}`);
         }
-        const _request = provideRequest(entrypointHandle.ref.getAlias(), entrypointHandle.ref.getPath());
+        const _request = provideRequest(entrypointHandle.ref.alias, entrypointHandle.ref.path());
         request != null && Object.entries(request).forEach(([key, value]) => {
             _request[key] = value;
         });
@@ -46,11 +53,6 @@ export const entrypoint = (arg, handler, opts) => {
     });
     _entrypoint.handle = _handler?.(entrypointHandle);
     _entrypoint.validate = validate(entrypointHandle);
-    _entrypoint.reinitializeContext = (context) => {
-        const newEntrypoint = entrypoint(_entrypoint.route, handler, opts);
-        newEntrypoint.ctx = context;
-        return newEntrypoint;
-    };
     entrypointHandle.ref = _entrypoint;
     return _entrypoint;
 };

package/build/entrypoint.js.map

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

package/build/errors.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../src/errors.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAA;AAEhD,qBAAa,qBAAsB,SAAQ,cAAc;IACvD,OAAuB,QAAQ,SAAsB;IAErD,YAAY,OAAO,EAAE,MAAM,EAE1B;CACF;AAED,qBAAa,qBAAsB,SAAQ,qBAAqB;IAC9D,OAAuB,QAAQ,SAAgD;IAE/E,YAAY,OAAO,EAAE,MAAM,EAG1B;CACF"}
+{"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../src/errors.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAA;AAEhD,qBAAa,qBAAsB,SAAQ,cAAc;IACvD,OAAuB,QAAQ,SAAsB;gBAEzC,OAAO,EAAE,MAAM;CAG5B;AAED,qBAAa,qBAAsB,SAAQ,qBAAqB;IAC9D,OAAuB,QAAQ,SAAgD;gBAEnE,OAAO,EAAE,MAAM;CAI5B"}

package/build/errors.js.map

@@ -1 +1 @@
-{"version":3,"file":"errors.js","sourceRoot":"","sources":["../src/errors.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAA;AAEhD,MAAM,OAAO,qBAAsB,SAAQ,cAAc;IAChD,MAAM,CAAU,QAAQ,GAAG,mBAAmB,CAAA;IAErD,YAAY,OAAe;QACzB,KAAK,CAAC,qBAAqB,CAAC,QAAQ,EAAE,iBAAiB,OAAO,EAAE,CAAC,CAAA;IACnE,CAAC;CACF;AAED,MAAM,OAAO,qBAAsB,SAAQ,qBAAqB;IACvD,MAAM,CAAU,QAAQ,GAAG,GAAG,qBAAqB,CAAC,QAAQ,YAAY,CAAA;IAE/E,YAAY,OAAe;QACzB,KAAK,CAAC,cAAc,OAAO,EAAE,CAAC,CAAA;QAC9B,IAAI,CAAC,IAAI,GAAG,qBAAqB,CAAC,QAAQ,CAAA;IAC5C,CAAC;CACF;AAGD,cAAc,CAAC,kBAAkB,CAAC,qBAAqB,CAAC,CAAA;AACxD,cAAc,CAAC,kBAAkB,CAAC,qBAAqB,CAAC,CAAA"}
+{"version":3,"file":"errors.js","sourceRoot":"","sources":["../src/errors.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAA;AAEhD,MAAM,OAAO,qBAAsB,SAAQ,cAAc;IAChD,MAAM,CAAU,QAAQ,GAAG,mBAAmB,CAAA;IAErD,YAAY,OAAe;QACzB,KAAK,CAAC,qBAAqB,CAAC,QAAQ,EAAE,iBAAiB,OAAO,EAAE,CAAC,CAAA;IACnE,CAAC;;AAGH,MAAM,OAAO,qBAAsB,SAAQ,qBAAqB;IACvD,MAAM,CAAU,QAAQ,GAAG,GAAG,qBAAqB,CAAC,QAAQ,YAAY,CAAA;IAE/E,YAAY,OAAe;QACzB,KAAK,CAAC,cAAc,OAAO,EAAE,CAAC,CAAA;QAC9B,IAAI,CAAC,IAAI,GAAG,qBAAqB,CAAC,QAAQ,CAAA;IAC5C,CAAC;;AAIH,cAAc,CAAC,kBAAkB,CAAC,qBAAqB,CAAC,CAAA;AACxD,cAAc,CAAC,kBAAkB,CAAC,qBAAqB,CAAC,CAAA"}

package/build/helper.d.ts

@@ -1,6 +1,13 @@
 import type { ClientEntrypoint, ClientEntrypointOptions, RefedEntrypointHandler } from './types.js';
 import type { AbstractRequest, CommonEntrypoint } from '@owlmeans/entrypoint';
 import type { JSONSchemaType } from "ajv";
+/**
+ * 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: <T = {}, R extends AbstractRequest = AbstractRequest>(entrypoints: (CommonEntrypoint | ClientEntrypoint<T, R>)[], alias: string, handler?: RefedEntrypointHandler<T, R> | ClientEntrypointOptions | boolean, opts?: ClientEntrypointOptions | boolean) => ClientEntrypoint<T, R>[];
 export declare const stab: RefedEntrypointHandler<{}>;
 export declare const provideRequest: <T extends {} = {}>(alias: string, path: string) => AbstractRequest<T>;

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,uBAAuB,EAAE,sBAAsB,EAAE,MAAM,YAAY,CAAA;AAGnG,OAAO,KAAK,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;AAE7E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,KAAK,CAAA;AAEzC,eAAO,MAAM,OAAO,GAAI,CAAC,GAAG,EAAE,EAAE,CAAC,SAAS,eAAe,GAAG,eAAe,eAC5D,CAAC,gBAAgB,GAAG,gBAAgB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,SACnD,MAAM,YACH,sBAAsB,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,uBAAuB,GAAG,OAAO,SACnE,uBAAuB,GAAG,OAAO,KACvC,gBAAgB,CAAC,CAAC,EAAE,CAAC,CAAC,EAcxB,CAAA;AAED,eAAO,MAAM,IAAI,EAAE,sBAAsB,CAAC,EAAE,CAE3C,CAAA;AAED,eAAO,MAAM,cAAc,GAAI,CAAC,SAAS,EAAE,GAAG,EAAE,SAAS,MAAM,QAAQ,MAAM,KAAG,eAAe,CAAC,CAAC,CAYhG,CAAA;AAED,eAAO,MAAM,aAAa,GAAI,CAAC,EAAE,CAAC,UAAU,CAAC,UAAU,cAAc,CAAC,CAAC,CAAC,KAAG,OAAO,CAAC,CAAC,CAQjF,CAAA"}
+{"version":3,"file":"helper.d.ts","sourceRoot":"","sources":["../src/helper.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,uBAAuB,EAAE,sBAAsB,EAAE,MAAM,YAAY,CAAA;AAEnG,OAAO,KAAK,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;AAE7E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,KAAK,CAAA;AAEzC;;;;;;GAMG;AACH,eAAO,MAAM,OAAO,GAAI,CAAC,GAAG,EAAE,EAAE,CAAC,SAAS,eAAe,GAAG,eAAe,EACzE,aAAa,CAAC,gBAAgB,GAAG,gBAAgB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EAC1D,OAAO,MAAM,EACb,UAAU,sBAAsB,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,uBAAuB,GAAG,OAAO,EAC1E,OAAO,uBAAuB,GAAG,OAAO,KACvC,gBAAgB,CAAC,CAAC,EAAE,CAAC,CAAC,EAWxB,CAAA;AAED,eAAO,MAAM,IAAI,EAAE,sBAAsB,CAAC,EAAE,CAE3C,CAAA;AAED,eAAO,MAAM,cAAc,GAAI,CAAC,SAAS,EAAE,GAAG,EAAE,EAAE,OAAO,MAAM,EAAE,MAAM,MAAM,KAAG,eAAe,CAAC,CAAC,CAYhG,CAAA;AAED,eAAO,MAAM,aAAa,GAAI,CAAC,EAAE,CAAC,EAAE,QAAQ,CAAC,EAAE,QAAQ,cAAc,CAAC,CAAC,CAAC,KAAG,OAAO,CAAC,CAAC,CAQjF,CAAA"}

package/build/helper.js

@@ -1,15 +1,18 @@
 import { entrypoint } from './entrypoint.js';
-import { isClientRouteModel } from '@owlmeans/client-route';
 import { normalizeHelperParams } from './utils/entrypoint.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) => {
     [handler, opts] = normalizeHelperParams(handler, opts);
     const idx = entrypoints.findIndex(({ route }) => route.route.alias === alias);
     if (idx === -1) {
         throw new SyntaxError(`Entrypoint with alias ${alias} not present`);
     }
-    if (isClientRouteModel(entrypoints[idx].route) && opts?.force !== true) {
-        throw new SyntaxError(`Entrypoint with alias ${alias} is already elevated`);
-    }
     entrypoints[idx] = entrypoint(entrypoints[idx], handler, 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;AAE3D,OAAO,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAA;AAG7D,MAAM,CAAC,MAAM,OAAO,GAAG,CACrB,WAA0D,EAC1D,KAAa,EACb,OAA0E,EAC1E,IAAwC,EACd,EAAE;IAC5B,CAAC,OAAO,EAAE,IAAI,CAAC,GAAG,qBAAqB,CAAC,OAAO,EAAE,IAAI,CAAC,CAAA;IAEtD,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,kBAAkB,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,IAAI,IAAI,EAAE,KAAK,KAAK,IAAI,EAAE,CAAC;QACvE,MAAM,IAAI,WAAW,CAAC,yBAAyB,KAAK,sBAAsB,CAAC,CAAA;IAC7E,CAAC;IAED,WAAW,CAAC,GAAG,CAAC,GAAG,UAAU,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,CAAA;IAE9D,OAAO,WAAuC,CAAA;AAChD,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,IAAI,GAA+B,GAAG,EAAE,CAAC,GAAG,EAAE;IACzD,OAAO,KAAK,CAAQ,CAAA;AACtB,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,cAAc,GAAG,CAAoB,KAAa,EAAE,IAAY,EAAsB,EAAE;IACnG,MAAM,OAAO,GAAG;QACd,KAAK;QACL,MAAM,EAAE,EAAE;QACV,OAAO,EAAE,EAAE;QACX,KAAK,EAAE,EAAE;QACT,IAAI;QACJ,QAAQ,EAAE,KAAK;QACf,MAAM,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,QAAQ,GAAG,IAAI;KACtC,CAAA;IAED,OAAO,OAAO,CAAA;AAChB,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,aAAa,GAAG,CAAO,MAAS,EAAE,MAAyB,EAAc,EAAE,CACtF,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,MAAM,CACnC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;IACX,IAAI,MAAM,CAAC,GAAc,CAAC,IAAI,IAAI,EAAE,CAAC;QACnC,GAAG,CAAC,GAAc,CAAC,GAAG,MAAM,CAAC,GAAc,CAA0B,CAAA;IACvE,CAAC;IACD,OAAO,GAAG,CAAA;AACZ,CAAC,EAAE,EAAgB,CACpB,CAAA"}
+{"version":3,"file":"helper.js","sourceRoot":"","sources":["../src/helper.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAE5C,OAAO,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAA;AAG7D;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,OAAO,GAAG,CACrB,WAA0D,EAC1D,KAAa,EACb,OAA0E,EAC1E,IAAwC,EACd,EAAE;IAC5B,CAAC,OAAO,EAAE,IAAI,CAAC,GAAG,qBAAqB,CAAC,OAAO,EAAE,IAAI,CAAC,CAAA;IAEtD,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;IAED,WAAW,CAAC,GAAG,CAAC,GAAG,UAAU,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,CAAA;IAE9D,OAAO,WAAuC,CAAA;AAChD,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,IAAI,GAA+B,GAAG,EAAE,CAAC,GAAG,EAAE;IACzD,OAAO,KAAK,CAAQ,CAAA;AACtB,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,cAAc,GAAG,CAAoB,KAAa,EAAE,IAAY,EAAsB,EAAE;IACnG,MAAM,OAAO,GAAG;QACd,KAAK;QACL,MAAM,EAAE,EAAE;QACV,OAAO,EAAE,EAAE;QACX,KAAK,EAAE,EAAE;QACT,IAAI;QACJ,QAAQ,EAAE,KAAK;QACf,MAAM,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,QAAQ,GAAG,IAAI;KACtC,CAAA;IAED,OAAO,OAAO,CAAA;AAChB,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,aAAa,GAAG,CAAO,MAAS,EAAE,MAAyB,EAAc,EAAE,CACtF,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,MAAM,CACnC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;IACX,IAAI,MAAM,CAAC,GAAc,CAAC,IAAI,IAAI,EAAE,CAAC;QACnC,GAAG,CAAC,GAAc,CAAC,GAAG,MAAM,CAAC,GAAc,CAA0B,CAAA;IACvE,CAAC;IACD,OAAO,GAAG,CAAA;AACZ,CAAC,EAAE,EAAgB,CACpB,CAAA"}

package/build/types.d.ts

@@ -1,26 +1,48 @@
 import type { ClientRouteModel, ClientRouteOptions } from '@owlmeans/client-route';
-import type { AbstractRequest, AbstractResponse, CommonEntrypoint, CommonEntrypointOptions, EntrypointHandler, EntrypointOutcome } from '@owlmeans/entrypoint';
+import type { AbstractRequest, CommonEntrypoint, CommonEntrypointOptions, EntrypointHandler, EntrypointOutcome } from '@owlmeans/entrypoint';
 export interface ClientEntrypoint<T = {}, R extends ClientRequest = ClientRequest> extends CommonEntrypoint {
     route: ClientRouteModel;
+    /**
+     * Address the entrypoint and resolve to what it answered. The reply's error is thrown, so a
+     * caller that only needs the value never inspects an outcome.
+     */
     call: EntrypointCall<T, R>;
+    /**
+     * The same round trip as {@link ClientEntrypoint.call}, resolving to the value AND the outcome.
+     * Use it only where the outcome decides what happens next.
+     */
+    invoke: EntrypointInvoke<T, R>;
+    /**
+     * Build the URL this entrypoint addresses, with `:params` filled in and the query appended.
+     * Absolute when the route belongs to another service, or when `absolute` is asked for.
+     */
+    url: EntrypointUrl<R>;
     validate: EntrypointFilter<R>;
-    getPath: (partial?: boolean) => string;
     request: (request?: Partial<R>) => R;
 }
 export interface EntrypointCall<T, Req extends ClientRequest = ClientRequest> {
-    <Type extends T, R extends Req = Req, P extends AbstractResponse<Type> = AbstractResponse<Type>>(req?: Partial<R>, res?: P): Promise<[Type, EntrypointOutcome]>;
+    <Type extends T, R extends Req = Req>(req?: Partial<R>): Promise<Type>;
+}
+export interface EntrypointInvoke<T, Req extends ClientRequest = ClientRequest> {
+    <Type extends T, R extends Req = Req>(req?: Partial<R>): Promise<EntrypointReply<Type>>;
+}
+export interface EntrypointReply<T> {
+    value: T;
+    outcome: EntrypointOutcome;
+}
+export interface EntrypointUrl<Req extends ClientRequest = ClientRequest> {
+    <R extends Req = Req>(req?: Partial<R>, opts?: EntrypointUrlOptions): Promise<string>;
+}
+export interface EntrypointUrlOptions {
+    /** Force a fully qualified URL even when the route belongs to the current service. */
+    absolute?: boolean;
 }
 export interface EntrypointFilter<Req extends AbstractRequest = AbstractRequest> {
     <R extends Req>(req?: Partial<R>): Promise<boolean>;
 }
 export interface ClientRequest<T extends {} = {}> extends AbstractRequest<T> {
-    full?: boolean;
 }
 export interface ClientEntrypointOptions extends CommonEntrypointOptions {
-    /**
-     * Force entrypoint to be elevated even if it is already elevated
-     */
-    force?: boolean;
     routeOptions?: ClientRouteOptions;
     validateOnCall?: boolean;
 }

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,eAAe,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,uBAAuB,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAA;AAE9J,MAAM,WAAW,gBAAgB,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,SAAS,aAAa,GAAG,aAAa,CAAE,SAAQ,gBAAgB;IACzG,KAAK,EAAE,gBAAgB,CAAA;IACvB,IAAI,EAAE,cAAc,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;IAC1B,QAAQ,EAAE,gBAAgB,CAAC,CAAC,CAAC,CAAA;IAC7B,OAAO,EAAE,CAAC,OAAO,CAAC,EAAE,OAAO,KAAK,MAAM,CAAA;IACtC,OAAO,EAAE,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA;CACrC;AAED,MAAM,WAAW,cAAc,CAAC,CAAC,EAAE,GAAG,SAAS,aAAa,GAAG,aAAa;IAC1E,CACE,IAAI,SAAS,CAAC,EAAE,CAAC,SAAS,GAAG,GAAG,GAAG,EAAE,CAAC,SAAS,gBAAgB,CAAC,IAAI,CAAC,GAAG,gBAAgB,CAAC,IAAI,CAAC,EAC9F,GAAG,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,CAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC,CAAA;CACjE;AAED,MAAM,WAAW,gBAAgB,CAAC,GAAG,SAAS,eAAe,GAAG,eAAe;IAC7E,CAAC,CAAC,SAAS,GAAG,EAAE,GAAG,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC,CAAA;CACpD;AAED,MAAM,WAAW,aAAa,CAAC,CAAC,SAAS,EAAE,GAAG,EAAE,CAAE,SAAQ,eAAe,CAAC,CAAC,CAAC;IAC1E,IAAI,CAAC,EAAE,OAAO,CAAA;CACf;AAED,MAAM,WAAW,uBAAwB,SAAQ,uBAAuB;IACtE;;OAEG;IACH,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,YAAY,CAAC,EAAE,kBAAkB,CAAA;IACjC,cAAc,CAAC,EAAE,OAAO,CAAA;CACzB;AAED,MAAM,WAAW,aAAa,CAAC,CAAC,EAAE,CAAC,SAAS,eAAe,GAAG,eAAe;IAC3E,GAAG,CAAC,EAAE,gBAAgB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;CAC7B;AAED,MAAM,WAAW,sBAAsB,CAAC,CAAC,EAAE,CAAC,SAAS,eAAe,GAAG,eAAe;IACpF,CAAC,GAAG,EAAE,aAAa,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,iBAAiB,CAAA;CAC9C"}
+{"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,eAAe,EAAE,gBAAgB,EAAE,uBAAuB,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAA;AAE5I,MAAM,WAAW,gBAAgB,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,SAAS,aAAa,GAAG,aAAa,CAAE,SAAQ,gBAAgB;IACzG,KAAK,EAAE,gBAAgB,CAAA;IACvB;;;OAGG;IACH,IAAI,EAAE,cAAc,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;IAC1B;;;OAGG;IACH,MAAM,EAAE,gBAAgB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;IAC9B;;;OAGG;IACH,GAAG,EAAE,aAAa,CAAC,CAAC,CAAC,CAAA;IACrB,QAAQ,EAAE,gBAAgB,CAAC,CAAC,CAAC,CAAA;IAC7B,OAAO,EAAE,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA;CACrC;AAED,MAAM,WAAW,cAAc,CAAC,CAAC,EAAE,GAAG,SAAS,aAAa,GAAG,aAAa;IAC1E,CAAC,IAAI,SAAS,CAAC,EAAE,CAAC,SAAS,GAAG,GAAG,GAAG,EAAE,GAAG,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;CACvE;AAED,MAAM,WAAW,gBAAgB,CAAC,CAAC,EAAE,GAAG,SAAS,aAAa,GAAG,aAAa;IAC5E,CAAC,IAAI,SAAS,CAAC,EAAE,CAAC,SAAS,GAAG,GAAG,GAAG,EAAE,GAAG,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,CAAA;CACxF;AAED,MAAM,WAAW,eAAe,CAAC,CAAC;IAChC,KAAK,EAAE,CAAC,CAAA;IACR,OAAO,EAAE,iBAAiB,CAAA;CAC3B;AAED,MAAM,WAAW,aAAa,CAAC,GAAG,SAAS,aAAa,GAAG,aAAa;IACtE,CAAC,CAAC,SAAS,GAAG,GAAG,GAAG,EAAE,GAAG,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,EAAE,oBAAoB,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;CACtF;AAED,MAAM,WAAW,oBAAoB;IACnC,sFAAsF;IACtF,QAAQ,CAAC,EAAE,OAAO,CAAA;CACnB;AAED,MAAM,WAAW,gBAAgB,CAAC,GAAG,SAAS,eAAe,GAAG,eAAe;IAC7E,CAAC,CAAC,SAAS,GAAG,EAAE,GAAG,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC,CAAA;CACpD;AAED,MAAM,WAAW,aAAa,CAAC,CAAC,SAAS,EAAE,GAAG,EAAE,CAAE,SAAQ,eAAe,CAAC,CAAC,CAAC;CAC3E;AAED,MAAM,WAAW,uBAAwB,SAAQ,uBAAuB;IACtE,YAAY,CAAC,EAAE,kBAAkB,CAAA;IACjC,cAAc,CAAC,EAAE,OAAO,CAAA;CACzB;AAED,MAAM,WAAW,aAAa,CAAC,CAAC,EAAE,CAAC,SAAS,eAAe,GAAG,eAAe;IAC3E,GAAG,CAAC,EAAE,gBAAgB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;CAC7B;AAED,MAAM,WAAW,sBAAsB,CAAC,CAAC,EAAE,CAAC,SAAS,eAAe,GAAG,eAAe;IACpF,CAAC,GAAG,EAAE,aAAa,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,iBAAiB,CAAA;CAC9C"}

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

@@ -1 +1 @@
-{"version":3,"file":"entrypoint.d.ts","sourceRoot":"","sources":["../../src/utils/entrypoint.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,gBAAgB,EAAE,uBAAuB,EAAE,MAAM,aAAa,CAAA;AAE5E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAC3D,OAAO,KAAK,EAAE,aAAa,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAA;AAGxE,OAAO,EAAE,UAAU,IAAI,mBAAmB,EAAE,MAAM,sBAAsB,CAAA;AACxE,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAA;AAKzD;;;GAGG;AACH,eAAO,MAAM,QAAQ,EAAE,CAAC,CAAC,EAAE,CAAC,SAAS,eAAe,GAAG,eAAe,EAAE,GAAG,EAAE,aAAa,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,gBAiClG,CAAA;AAEH,eAAO,MAAM,qBAAqB,GAAI,CAAC,EAAE,CAAC,SAAS,eAAe,GAAG,eAAe,YACxE,sBAAsB,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,uBAAuB,GAAG,OAAO,SACnE,uBAAuB,GAAG,OAAO,KACvC,CAAC,sBAAsB,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,SAAS,EAAE,uBAAuB,GAAG,SAAS,CAShF,CAAA"}
+{"version":3,"file":"entrypoint.d.ts","sourceRoot":"","sources":["../../src/utils/entrypoint.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,gBAAgB,EAAE,uBAAuB,EAAE,MAAM,aAAa,CAAA;AAE5E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAC3D,OAAO,KAAK,EAAE,aAAa,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAA;AAGxE,OAAO,EAAE,UAAU,IAAI,mBAAmB,EAAE,MAAM,sBAAsB,CAAA;AACxE,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAA;AAKzD;;;GAGG;AACH,eAAO,MAAM,QAAQ,EAAE,CAAC,CAAC,EAAE,CAAC,SAAS,eAAe,GAAG,eAAe,EAAE,GAAG,EAAE,aAAa,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,gBAiClG,CAAA;AAEH,eAAO,MAAM,qBAAqB,GAAI,CAAC,EAAE,CAAC,SAAS,eAAe,GAAG,eAAe,EAClF,UAAU,sBAAsB,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,uBAAuB,GAAG,OAAO,EAC1E,OAAO,uBAAuB,GAAG,OAAO,KACvC,CAAC,sBAAsB,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,SAAS,EAAE,uBAAuB,GAAG,SAAS,CAShF,CAAA"}

package/build/utils/handler.d.ts

@@ -1,6 +1,6 @@
 import type { AbstractRequest, EntrypointHandler } from '@owlmeans/entrypoint';
-import type { EntrypointCall, ClientEntrypointOptions, EntrypointRef, ClientRequest } from '../types.js';
+import type { EntrypointInvoke, EntrypointUrlOptions, ClientEntrypointOptions, EntrypointRef, ClientRequest } from '../types.js';
 export declare const apiHandler: <T, R extends AbstractRequest = AbstractRequest>(ref: EntrypointRef<T, R>) => EntrypointHandler;
-export declare const apiCall: <T, R extends AbstractRequest = AbstractRequest>(ref: EntrypointRef<T, R>, opts?: ClientEntrypointOptions) => EntrypointCall<T, R>;
-export declare const urlCall: <T, R extends ClientRequest = ClientRequest>(ref: EntrypointRef<T, R>, opts?: ClientEntrypointOptions) => EntrypointCall<T, R>;
+export declare const apiInvoke: <T, R extends AbstractRequest = AbstractRequest>(ref: EntrypointRef<T, R>, opts?: ClientEntrypointOptions) => EntrypointInvoke<T, R>;
+export declare const entrypointUrl: <T, R extends ClientRequest = ClientRequest>(ref: EntrypointRef<T, R>, req?: Partial<R>, opts?: EntrypointUrlOptions) => Promise<string>;
 //# sourceMappingURL=handler.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"handler.d.ts","sourceRoot":"","sources":["../../src/utils/handler.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,eAAe,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAA;AAE9E,OAAO,KAAK,EAAoB,cAAc,EAAE,uBAAuB,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAW1H,eAAO,MAAM,UAAU,EAAE,CACvB,CAAC,EAAE,CAAC,SAAS,eAAe,GAAG,eAAe,EAC9C,GAAG,EAAE,aAAa,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,iBA0B9B,CAAA;AAED,eAAO,MAAM,OAAO,EAAE,CACpB,CAAC,EAAE,CAAC,SAAS,eAAe,GAAG,eAAe,EAC9C,GAAG,EAAE,aAAa,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,IAAI,CAAC,EAAE,uBAAuB,KAAK,cAAc,CAAC,CAAC,EAAE,CAAC,CAyDvD,CAAA;AAE3B,eAAO,MAAM,OAAO,EAAE,CACpB,CAAC,EAAE,CAAC,SAAS,aAAa,GAAG,aAAa,EAC1C,GAAG,EAAE,aAAa,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,IAAI,CAAC,EAAE,uBAAuB,KAAK,cAAc,CAAC,CAAC,EAAE,CAAC,CA4BjF,CAAA"}
+{"version":3,"file":"handler.d.ts","sourceRoot":"","sources":["../../src/utils/handler.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,eAAe,EAAE,iBAAiB,EAAuB,MAAM,sBAAsB,CAAA;AAEnG,OAAO,KAAK,EAAoB,gBAAgB,EAAE,oBAAoB,EAAE,uBAAuB,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAWlJ,eAAO,MAAM,UAAU,EAAE,CACvB,CAAC,EAAE,CAAC,SAAS,eAAe,GAAG,eAAe,EAC9C,GAAG,EAAE,aAAa,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,iBAqC9B,CAAA;AAED,eAAO,MAAM,SAAS,EAAE,CACtB,CAAC,EAAE,CAAC,SAAS,eAAe,GAAG,eAAe,EAC9C,GAAG,EAAE,aAAa,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,IAAI,CAAC,EAAE,uBAAuB,KAAK,gBAAgB,CAAC,CAAC,EAAE,CAAC,CAoDvD,CAAA;AAE7B,eAAO,MAAM,aAAa,EAAE,CAC1B,CAAC,EAAE,CAAC,SAAS,aAAa,GAAG,aAAa,EAC1C,GAAG,EAAE,aAAa,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,EAAE,oBAAoB,KAAK,OAAO,CAAC,MAAM,CA6B3F,CAAA"}

package/build/utils/handler.js

@@ -1,5 +1,5 @@
 import { DEFAULT_KEY } from '@owlmeans/client-config';
-import { EntrypointOutcome, provideResponse } from '@owlmeans/entrypoint';
+import { EntrypointOutcome, provideResponse, transportAlias } from '@owlmeans/entrypoint';
 import { validate } from './entrypoint.js';
 import { extractParams } from '@owlmeans/client-route';
 import { PARAM } from '@owlmeans/route';
@@ -13,20 +13,28 @@ export const apiHandler = (ref) => async (req, res) => {
         throw new SyntaxError('No webService provided');
     }
     const ep = context.entrypoint(req.alias);
-    const route = await ep.route.resolve(context);
-    let alias = typeof context.cfg.webService === 'string'
+    // A route names the protocol it answers on, and a protocol may be carried by something other than
+    // HTTP — a queue, say. Whatever is bound under this protocol takes the call, so a consumer writes
+    // `ep.call(...)` and never learns which of them ran.
+    const transport = transportAlias(ep.route.route.protocol);
+    if (context.hasService(transport)) {
+        req.path = ep.path();
+        return context.service(transport).handle(req, res);
+    }
+    // Which web client carries this call is decided by the service the route answers on — the one it
+    // names, or the one the context picks for its app type when it names none.
+    const route = ep.service();
+    const alias = typeof context.cfg.webService === 'string'
         ? context.cfg.webService
-        : (route.service != null
-            ? context.cfg.webService[route.service] ?? context.cfg.webService[DEFAULT_KEY]
-            : context.cfg.webService[DEFAULT_KEY]);
+        : context.cfg.webService[route.service] ?? context.cfg.webService[DEFAULT_KEY];
     if (alias == null) {
         throw new SyntaxError(`Can't cast web service alias for ${ep.alias} entrypoint`);
     }
     const service = context.service(alias);
-    req.path = ep.getPath();
+    req.path = ep.path();
     return service.handler(req, res);
 };
-export const apiCall = (ref, opts) => (async (req, res) => {
+export const apiInvoke = (ref, opts) => (async (req) => {
     const ep = ref.ref;
     if (ep == null) {
         throw new SyntaxError('Try to make API call before the entrypoint is created');
@@ -35,9 +43,8 @@ export const apiCall = (ref, opts) => (async (req, res) => {
     if (ctx == null) {
         throw new SyntaxError(`No context provided in apiCall for ${ep.alias} entrypoint`);
     }
-    await ep.route.resolve(ctx);
     if (req?.canceled) {
-        return;
+        return { value: null, outcome: EntrypointOutcome.Ok };
     }
     const request = {
         alias: ep.alias,
@@ -47,7 +54,7 @@ export const apiCall = (ref, opts) => (async (req, res) => {
         query: req?.query ?? {},
         host: req?.host,
         base: req?.base,
-        path: ep.getPath(),
+        path: ep.path(),
         timeout: req?.timeout,
         signal: req?.signal,
     };
@@ -67,10 +74,6 @@ export const apiCall = (ref, opts) => (async (req, res) => {
             throw e;
         }
     }
-    if (res != null) {
-        await apiHandler(ref)(request, res);
-        return;
-    }
     const reply = provideResponse();
     if (ctx == null && ep.ctx == null) {
         throw new SyntaxError(`Use entrypoint ${ep.alias} without context`);
@@ -79,28 +82,31 @@ export const apiCall = (ref, opts) => (async (req, res) => {
     if (reply.error != null) {
         throw reply.error;
     }
-    return [reply.value ?? null, reply.outcome ?? EntrypointOutcome.Ok];
+    return { value: reply.value ?? null, outcome: reply.outcome ?? EntrypointOutcome.Ok };
 });
-export const urlCall = ref => async (req, res) => {
+export const entrypointUrl = async (ref, req, opts) => {
     const ep = ref.ref;
     if (ep == null) {
         throw new SyntaxError('Try to make URL before the entrypoint is created');
     }
     const ctx = ep.ctx;
     if (ctx == null) {
-        throw new SyntaxError(`No context provided in urlCall for ${ep.alias} entrypoint`);
+        throw new SyntaxError(`No context provided in entrypointUrl for ${ep.alias} entrypoint`);
     }
-    await ep.route.resolve(ctx);
-    const pathParams = extractParams(ep.getPath());
+    // The base is left off here: an in-service URL is addressed relative to it, and the absolute
+    // branch below has `makeUrl` prepend it.
+    const epPath = ep.path();
+    const pathParams = extractParams(epPath);
     let path = pathParams.reduce((p, param) => {
         return p.replace(`${PARAM}${param}`, `${req?.params?.[param]}`);
-    }, ep.getPath()) + (req?.query != null ? `?${stringify(req?.query)}` : '');
-    if (ep.route.route.service !== null && (ctx.cfg.service !== ep.route.route.service
-        || req?.full === true)) {
+    }, epPath) + (req?.query != null ? `?${stringify(req?.query)}` : '');
+    // Locality is a question about the RESOLVED service, not about what the declaration happens to
+    // name: a route that names no service belongs to the asking context, and addressing it absolutely
+    // would turn in-app navigation into a full page load.
+    if (!ep.isLocal() || opts?.absolute === true) {
         const helper = makeSecurityHelper(ctx);
-        path = helper.makeUrl(ep.route.route, path, { host: req?.host, base: req?.base, forceUnsecure: req?.unsecure });
+        path = helper.makeUrl(ep.address(), path, { host: req?.host, base: req?.base, forceUnsecure: req?.unsecure });
     }
-    res?.resolve(path, EntrypointOutcome.Ok);
-    return [path, EntrypointOutcome.Ok];
+    return path;
 };
 //# sourceMappingURL=handler.js.map

package/build/utils/handler.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@owlmeans/client-entrypoint",
-  "version": "0.1.18-rc.10",
+  "version": "0.1.18-rc.12",
   "license": "MIT",
   "type": "module",
   "scripts": {
@@ -28,15 +28,15 @@
     }
   },
   "dependencies": {
-    "@owlmeans/api": "^0.1.18-rc.9",
-    "@owlmeans/client-config": "^0.1.18-rc.8",
-    "@owlmeans/client-context": "^0.1.18-rc.9",
-    "@owlmeans/client-route": "^0.1.18-rc.9",
-    "@owlmeans/config": "^0.1.18-rc.8",
-    "@owlmeans/context": "^0.1.18-rc.6",
-    "@owlmeans/entrypoint": "^0.1.18-rc.8",
-    "@owlmeans/error": "^0.1.18-rc.6",
-    "@owlmeans/route": "^0.1.18-rc.6",
+    "@owlmeans/api": "^0.1.18-rc.12",
+    "@owlmeans/client-config": "^0.1.18-rc.11",
+    "@owlmeans/client-context": "^0.1.18-rc.12",
+    "@owlmeans/client-route": "^0.1.18-rc.12",
+    "@owlmeans/config": "^0.1.18-rc.11",
+    "@owlmeans/context": "^0.1.18-rc.7",
+    "@owlmeans/entrypoint": "^0.1.18-rc.10",
+    "@owlmeans/error": "^0.1.18-rc.7",
+    "@owlmeans/route": "^0.1.18-rc.8",
     "ajv-formats": "^3.0.1",
     "qs": "^6.13.0"
   },

package/src/entrypoint.ts

@@ -3,15 +3,13 @@ import type { ClientEntrypoint, ClientEntrypointOptions, EntrypointRef, RefedEnt
 import type { AbstractRequest, CommonEntrypoint } from '@owlmeans/entrypoint'
 import { isEntrypoint, makeBasicEntrypoint, normalizeHelperParams, validate } from './utils/entrypoint.js'
 import { isClientRouteModel, route } from '@owlmeans/client-route'
-import { apiCall, apiHandler, urlCall } from './utils/handler.js'
+import { apiInvoke, apiHandler, entrypointUrl } from './utils/handler.js'
 import { AppType } from '@owlmeans/context'
-import type { BasicContext } from '@owlmeans/context'
-import { normalizePath } from '@owlmeans/route'
-import type { CommonRouteModel } from '@owlmeans/route'
+import type { RouteModel } from '@owlmeans/route'
 import { provideRequest } from './helper.js'
 
 export const entrypoint = <T, R extends AbstractRequest = AbstractRequest>(
-  arg: CommonEntrypoint | ClientRouteModel | CommonRouteModel,
+  arg: CommonEntrypoint | ClientRouteModel | RouteModel,
   handler?: RefedEntrypointHandler<T, R> | ClientEntrypointOptions | boolean,
   opts?: ClientEntrypointOptions | boolean
 ): ClientEntrypoint<T, R> => {
@@ -30,7 +28,8 @@ export const entrypoint = <T, R extends AbstractRequest = AbstractRequest>(
     const routeModel = route(arg.route, opts?.routeOptions)
     _entrypoint = arg as ClientEntrypoint<T, R>
     _entrypoint.route = routeModel
-    _entrypoint.guards = opts?.guards ?? arg.guards
+    // Elevating adds guards, it never swaps them: what the entrypoint declared still applies.
+    _entrypoint.guards = [...new Set([...(arg.guards ?? []), ...(opts?.guards ?? [])])]
     _entrypoint.filter = opts?.filter ?? arg.filter
     _entrypoint.gate = opts?.gate ?? arg.gate
     _entrypoint.gateParams = opts?.gateParams ?? arg.gateParams
@@ -45,16 +44,27 @@ export const entrypoint = <T, R extends AbstractRequest = AbstractRequest>(
     _entrypoint.route = _route
   }
 
-  _entrypoint.getPath = (partial?: boolean) =>
-    partial === true ? normalizePath(_entrypoint.route.route.partialPath) : _entrypoint.route.route.path
+  _entrypoint.url = ((req?: Partial<R>, urlOpts?: { absolute?: boolean }) =>
+    entrypointUrl<T, R>(entrypointHandle, req as never, urlOpts)) as ClientEntrypoint<T, R>['url']
 
-  _entrypoint.call = handler != null ? urlCall<T, R>(entrypointHandle, opts) : apiCall<T, R>(entrypointHandle, opts)
+  // An entrypoint carrying a renderer IS a screen: it is addressed by URL, never called over the
+  // wire. Saying so here turns what used to be a URL-shaped answer from `call()` into a report.
+  _entrypoint.invoke = (handler != null
+    ? (async () => {
+      throw new SyntaxError(
+        `Entrypoint ${_entrypoint.alias} renders a screen - address it with url() instead of call()/invoke()`
+      )
+    })
+    : apiInvoke<T, R>(entrypointHandle, opts)) as ClientEntrypoint<T, R>['invoke']
+
+  _entrypoint.call = (async (req?: Partial<R>) =>
+    (await _entrypoint.invoke(req)).value) as ClientEntrypoint<T, R>['call']
 
   _entrypoint.request = ((request: R): R => {
     if (entrypointHandle.ref == null) {
       throw SyntaxError(`Try to request uninitialized entrypoint ${JSON.stringify(arg)}`)
     }
-    const _request = provideRequest(entrypointHandle.ref.getAlias(), entrypointHandle.ref.getPath()) as R
+    const _request = provideRequest(entrypointHandle.ref.alias, entrypointHandle.ref.path()) as R
 
     request != null && Object.entries(request).forEach(([key, value]) => {
       _request[key as keyof R] = value
@@ -67,13 +77,6 @@ export const entrypoint = <T, R extends AbstractRequest = AbstractRequest>(
 
   _entrypoint.validate = validate(entrypointHandle)
 
-  _entrypoint.reinitializeContext = <T>(context: BasicContext<any>) => {
-    const newEntrypoint = entrypoint(_entrypoint.route, handler, opts)
-    newEntrypoint.ctx = context
-
-    return newEntrypoint as T
-  }
-
   entrypointHandle.ref = _entrypoint
 
   return _entrypoint

package/src/helper.ts

@@ -1,10 +1,16 @@
 import type { ClientEntrypoint, ClientEntrypointOptions, RefedEntrypointHandler } from './types.js'
 import { entrypoint } from './entrypoint.js'
-import { isClientRouteModel } from '@owlmeans/client-route'
 import type { AbstractRequest, CommonEntrypoint } from '@owlmeans/entrypoint'
 import { normalizeHelperParams } from './utils/entrypoint.js'
 import type { JSONSchemaType } from "ajv"
 
+/**
+ * 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 = <T = {}, R extends AbstractRequest = AbstractRequest>(
   entrypoints: (CommonEntrypoint | ClientEntrypoint<T, R>)[],
   alias: string,
@@ -17,9 +23,6 @@ export const elevate = <T = {}, R extends AbstractRequest = AbstractRequest>(
   if (idx === -1) {
     throw new SyntaxError(`Entrypoint with alias ${alias} not present`)
   }
-  if (isClientRouteModel(entrypoints[idx].route) && opts?.force !== true) {
-    throw new SyntaxError(`Entrypoint with alias ${alias} is already elevated`)
-  }
 
   entrypoints[idx] = entrypoint(entrypoints[idx], handler, opts)
 

package/src/types.ts

@@ -1,18 +1,47 @@
 import type { ClientRouteModel, ClientRouteOptions } from '@owlmeans/client-route'
-import type { AbstractRequest, AbstractResponse, CommonEntrypoint, CommonEntrypointOptions, EntrypointHandler, EntrypointOutcome } from '@owlmeans/entrypoint'
+import type { AbstractRequest, CommonEntrypoint, CommonEntrypointOptions, EntrypointHandler, EntrypointOutcome } from '@owlmeans/entrypoint'
 
 export interface ClientEntrypoint<T = {}, R extends ClientRequest = ClientRequest> extends CommonEntrypoint {
   route: ClientRouteModel
+  /**
+   * Address the entrypoint and resolve to what it answered. The reply's error is thrown, so a
+   * caller that only needs the value never inspects an outcome.
+   */
   call: EntrypointCall<T, R>
+  /**
+   * The same round trip as {@link ClientEntrypoint.call}, resolving to the value AND the outcome.
+   * Use it only where the outcome decides what happens next.
+   */
+  invoke: EntrypointInvoke<T, R>
+  /**
+   * Build the URL this entrypoint addresses, with `:params` filled in and the query appended.
+   * Absolute when the route belongs to another service, or when `absolute` is asked for.
+   */
+  url: EntrypointUrl<R>
   validate: EntrypointFilter<R>
-  getPath: (partial?: boolean) => string
   request: (request?: Partial<R>) => R
 }
 
 export interface EntrypointCall<T, Req extends ClientRequest = ClientRequest> {
-  <
-    Type extends T, R extends Req = Req, P extends AbstractResponse<Type> = AbstractResponse<Type>
-  >(req?: Partial<R>, res?: P): Promise<[Type, EntrypointOutcome]>
+  <Type extends T, R extends Req = Req>(req?: Partial<R>): Promise<Type>
+}
+
+export interface EntrypointInvoke<T, Req extends ClientRequest = ClientRequest> {
+  <Type extends T, R extends Req = Req>(req?: Partial<R>): Promise<EntrypointReply<Type>>
+}
+
+export interface EntrypointReply<T> {
+  value: T
+  outcome: EntrypointOutcome
+}
+
+export interface EntrypointUrl<Req extends ClientRequest = ClientRequest> {
+  <R extends Req = Req>(req?: Partial<R>, opts?: EntrypointUrlOptions): Promise<string>
+}
+
+export interface EntrypointUrlOptions {
+  /** Force a fully qualified URL even when the route belongs to the current service. */
+  absolute?: boolean
 }
 
 export interface EntrypointFilter<Req extends AbstractRequest = AbstractRequest> {
@@ -20,14 +49,9 @@ export interface EntrypointFilter<Req extends AbstractRequest = AbstractRequest>
 }
 
 export interface ClientRequest<T extends {} = {}> extends AbstractRequest<T> {
-  full?: boolean
 }
 
 export interface ClientEntrypointOptions extends CommonEntrypointOptions {
-  /**
-   * Force entrypoint to be elevated even if it is already elevated
-   */
-  force?: boolean
   routeOptions?: ClientRouteOptions
   validateOnCall?: boolean
 }

package/src/utils/handler.ts

@@ -1,9 +1,9 @@
 import type { ApiClient } from '@owlmeans/api'
 import { DEFAULT_KEY } from '@owlmeans/client-config'
 import type { ClientConfig, ClientContext } from '@owlmeans/client-context'
-import type { AbstractRequest, EntrypointHandler } from '@owlmeans/entrypoint'
-import { EntrypointOutcome, provideResponse } from '@owlmeans/entrypoint'
-import type { ClientEntrypoint, EntrypointCall, ClientEntrypointOptions, EntrypointRef, ClientRequest } from '../types.js'
+import type { AbstractRequest, EntrypointHandler, EntrypointTransport } from '@owlmeans/entrypoint'
+import { EntrypointOutcome, provideResponse, transportAlias } from '@owlmeans/entrypoint'
+import type { ClientEntrypoint, EntrypointInvoke, EntrypointUrlOptions, ClientEntrypointOptions, EntrypointRef, ClientRequest } from '../types.js'
 import { validate } from './entrypoint.js'
 import { extractParams } from '@owlmeans/client-route'
 import { PARAM } from '@owlmeans/route'
@@ -25,13 +25,24 @@ export const apiHandler: <
   }
 
   const ep = context.entrypoint<ClientEntrypoint>(req.alias)
-  const route = await ep.route.resolve<Config, Context>(context)
 
-  let alias: string | undefined = typeof context.cfg.webService === 'string'
+  // A route names the protocol it answers on, and a protocol may be carried by something other than
+  // HTTP — a queue, say. Whatever is bound under this protocol takes the call, so a consumer writes
+  // `ep.call(...)` and never learns which of them ran.
+  const transport = transportAlias(ep.route.route.protocol)
+  if (context.hasService(transport)) {
+    req.path = ep.path()
+
+    return context.service<EntrypointTransport>(transport).handle(req, res)
+  }
+
+  // Which web client carries this call is decided by the service the route answers on — the one it
+  // names, or the one the context picks for its app type when it names none.
+  const route = ep.service()
+
+  const alias: string | undefined = typeof context.cfg.webService === 'string'
     ? context.cfg.webService
-    : (route.service != null
-      ? context.cfg.webService[route.service] ?? context.cfg.webService[DEFAULT_KEY]
-      : context.cfg.webService[DEFAULT_KEY])
+    : context.cfg.webService[route.service] ?? context.cfg.webService[DEFAULT_KEY]
 
   if (alias == null) {
     throw new SyntaxError(`Can't cast web service alias for ${ep.alias} entrypoint`)
@@ -39,15 +50,15 @@ export const apiHandler: <
 
   const service: ApiClient = context.service(alias)
 
-  req.path = ep.getPath()
+  req.path = ep.path()
 
   return service.handler(req, res as any)
 }
 
-export const apiCall: <
+export const apiInvoke: <
   T, R extends AbstractRequest = AbstractRequest
->(ref: EntrypointRef<T, R>, opts?: ClientEntrypointOptions) => EntrypointCall<T, R> =
-  (ref, opts) => (async (req, res) => {
+>(ref: EntrypointRef<T, R>, opts?: ClientEntrypointOptions) => EntrypointInvoke<T, R> =
+  (ref, opts) => (async (req) => {
     const ep = ref.ref
     if (ep == null) {
       throw new SyntaxError('Try to make API call before the entrypoint is created')
@@ -56,10 +67,9 @@ export const apiCall: <
     if (ctx == null) {
       throw new SyntaxError(`No context provided in apiCall for ${ep.alias} entrypoint`)
     }
-    await ep.route.resolve(ctx)
 
     if (req?.canceled) {
-      return
+      return { value: null, outcome: EntrypointOutcome.Ok }
     }
 
     const request: AbstractRequest = {
@@ -70,7 +80,7 @@ export const apiCall: <
       query: req?.query ?? {},
       host: req?.host,
       base: req?.base,
-      path: ep.getPath(),
+      path: ep.path(),
       timeout: req?.timeout,
       signal: req?.signal,
     }
@@ -89,10 +99,6 @@ export const apiCall: <
         throw e
       }
     }
-    if (res != null) {
-      await apiHandler(ref)(request, res)
-      return
-    }
     const reply = provideResponse<unknown>()
     if (ctx == null && ep.ctx == null) {
       throw new SyntaxError(`Use entrypoint ${ep.alias} without context`)
@@ -102,37 +108,38 @@ export const apiCall: <
       throw reply.error
     }
 
-    return [reply.value ?? null, reply.outcome ?? EntrypointOutcome.Ok]
-  }) as EntrypointCall<any>
+    return { value: reply.value ?? null, outcome: reply.outcome ?? EntrypointOutcome.Ok }
+  }) as EntrypointInvoke<any>
 
-export const urlCall: <
+export const entrypointUrl: <
   T, R extends ClientRequest = ClientRequest
->(ref: EntrypointRef<T, R>, opts?: ClientEntrypointOptions) => EntrypointCall<T, R> = ref => async (req, res) => {
+>(ref: EntrypointRef<T, R>, req?: Partial<R>, opts?: EntrypointUrlOptions) => Promise<string> = async (ref, req, opts) => {
   const ep = ref.ref
   if (ep == null) {
     throw new SyntaxError('Try to make URL before the entrypoint is created')
   }
   const ctx = ep.ctx
   if (ctx == null) {
-    throw new SyntaxError(`No context provided in urlCall for ${ep.alias} entrypoint`)
+    throw new SyntaxError(`No context provided in entrypointUrl for ${ep.alias} entrypoint`)
   }
-  await ep.route.resolve(ctx)
 
-  const pathParams = extractParams(ep.getPath())
+  // The base is left off here: an in-service URL is addressed relative to it, and the absolute
+  // branch below has `makeUrl` prepend it.
+  const epPath = ep.path()
+  const pathParams = extractParams(epPath)
   let path = pathParams.reduce((p, param) => {
     return p.replace(`${PARAM}${param}`, `${req?.params?.[param as keyof typeof req.params]}`)
-  }, ep.getPath()) + (req?.query != null ? `?${stringify(req?.query)}` : '')
+  }, epPath) + (req?.query != null ? `?${stringify(req?.query)}` : '')
 
-  if (ep.route.route.service !== null && (
-    ctx.cfg.service !== ep.route.route.service
-    || req?.full === true)) {
+  // Locality is a question about the RESOLVED service, not about what the declaration happens to
+  // name: a route that names no service belongs to the asking context, and addressing it absolutely
+  // would turn in-app navigation into a full page load.
+  if (!ep.isLocal() || opts?.absolute === true) {
     const helper = makeSecurityHelper(ctx)
     path = helper.makeUrl(
-      ep.route.route, path, { host: req?.host, base: req?.base, forceUnsecure: req?.unsecure }
+      ep.address(), path, { host: req?.host, base: req?.base, forceUnsecure: req?.unsecure }
     )
   }
 
-  res?.resolve(path as any, EntrypointOutcome.Ok)
-
-  return [path as any, EntrypointOutcome.Ok]
+  return path
 }