@interop/was-client 0.99.1 → 0.100.0

package/dist/internal/conditional.js

@@ -173,17 +173,17 @@ export function readEtag(response) {
  * the server.
  *
  * @param options {object}
- * @param options.path {string}                       the resource path written
+ * @param options.url {string}                        the resource URL written
  * @param options.current {ResponseLike | null}       the pre-read document
  * @param [options.precondition] {WritePrecondition}  the caller's precondition
  * @returns {void}
  */
-export function assertPreconditionAgainstPreRead({ path, current, precondition }) {
+export function assertPreconditionAgainstPreRead({ url, current, precondition }) {
     if (precondition === undefined) {
         return;
     }
     if (precondition.ifNoneMatch && current !== null) {
-        throw new PreconditionFailedError(`Cannot create the document at "${path}": create-if-absent was ` +
+        throw new PreconditionFailedError(`Cannot create the document at "${url}": create-if-absent was ` +
             'requested (ifNoneMatch), but a document is already stored there. ' +
             'Re-read it and write an update instead.', { status: 412 });
     }
@@ -191,14 +191,14 @@ export function assertPreconditionAgainstPreRead({ path, current, precondition }
         return;
     }
     if (current === null) {
-        throw new PreconditionFailedError(`Cannot update the document at "${path}": an ifMatch validator was ` +
+        throw new PreconditionFailedError(`Cannot update the document at "${url}": an ifMatch validator was ` +
             'supplied, but no current document is readable there -- it was ' +
             'deleted, or it is not readable with this capability (WAS masks ' +
             'unauthorized reads as 404). Re-read the resource before retrying.', { status: 412 });
     }
     const etag = readEtag(current);
     if (etag !== undefined && etag !== precondition.ifMatch) {
-        throw new PreconditionFailedError(`Cannot update the document at "${path}": its current version ` +
+        throw new PreconditionFailedError(`Cannot update the document at "${url}": its current version ` +
             `(${etag}) is not the one the write was pinned to ` +
             `(${precondition.ifMatch}) -- another writer changed it. Re-read the ` +
             'resource, rebase the change, and retry.', { status: 412 });

package/dist/internal/conditional.js.map

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

package/dist/internal/grant.d.ts

@@ -1,35 +1,21 @@
-/*!
- * Copyright (c) 2026 Interop Alliance. All rights reserved.
- */
-/**
- * The delegation primitive shared by `was.grant()` and the `space`/`collection`
- * grant sugar. Maps `GrantOptions` onto `zcapClient.delegate(...)`, normalizing
- * action verbs to uppercase so a lowercase grant (`'get'`) still validates on
- * the server (which matches actions case-sensitively against `'GET'`).
- *
- * An unparented grant whose target lies in the server's Space tree is delegated
- * from that **Space's** root capability, with the target carried as an
- * attenuated `invocationTarget`, rather than from the target's own root
- * capability. Both forms grant the same access (the server verifies WAS routes
- * with target attenuation allowed), but only a Space-rooted chain can be revoked
- * -- revocation is Space-scoped, and the endpoint requires the chain to root
- * exactly in the Space (see `revoke.ts`).
- */
 import type { ClientContext } from './request.js';
 import type { GrantOptions, IDelegatedZcap, IZcap } from '../types.js';
 /**
  * Delegates a capability per `GrantOptions`, returning the signed zcap to hand
  * off out-of-band. An explicit `capability` (re-delegation of a parent zcap)
- * always wins; otherwise a Space-tree target is rooted at its Space, so the
- * resulting capability is revocable via `space.revoke()` / `was.revoke()`.
+ * always wins; otherwise a grant naming its `spaceUrl` is rooted at that
+ * Space, so the resulting capability is revocable via `space.revoke()` /
+ * `was.revoke()`; otherwise ezcap roots it at the target's own root
+ * capability.
  *
  * @param context {ClientContext}
  * @param options {GrantOptions}
  * @returns {Promise<IDelegatedZcap>}
  * @throws {ValidationError}   when neither `target` nor `capability` is given,
- *   so the delegation names nothing to grant
+ *   so the delegation names nothing to grant; or when `spaceUrl` is given
+ *   and `target` does not lie at or beneath it
  */
-export declare function delegateGrant(context: ClientContext, { to, actions, expires, target, capability }: GrantOptions): Promise<IDelegatedZcap>;
+export declare function delegateGrant(context: ClientContext, { to, actions, expires, target, capability, spaceUrl }: GrantOptions): Promise<IDelegatedZcap>;
 /**
  * Whether a capability permits `action`, matched case-insensitively against
  * its `allowedAction` (a single verb or a list). A capability that states no
@@ -49,18 +35,21 @@ export declare function allowsAction({ zcap, action }: {
 /**
  * The scoped-grant sugar shared by `Space.grant` and `Collection.grant`:
  * delegates per `GrantOptions` with the grant `target` prefilled from the
- * handle's `path` (and the handle's bound `capability`, if any, as the parent
- * for re-delegation). Explicit options win over both prefills.
+ * handle's `url`, the rooting `spaceUrl` from the handle's Space, and the
+ * handle's bound `capability`, if any, as the parent for re-delegation.
+ * Explicit options win over every prefill.
  *
  * @param context {ClientContext}
  * @param options {object}
- * @param options.path {string}           the handle's path (target fallback)
+ * @param options.url {string}            the handle's URL (target fallback)
+ * @param options.spaceUrl {string}       the handle's Space (rooting fallback)
  * @param options.options {GrantOptions}  the caller's grant options
  * @param [options.capability] {IZcap}    the handle's bound capability
  * @returns {Promise<IDelegatedZcap>}
  */
-export declare function delegateGrantAt(context: ClientContext, { path, options, capability }: {
-    path: string;
+export declare function delegateGrantAt(context: ClientContext, { url, spaceUrl, options, capability }: {
+    url: string;
+    spaceUrl: string;
     options: GrantOptions;
     capability?: IZcap;
 }): Promise<IDelegatedZcap>;

package/dist/internal/grant.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"grant.d.ts","sourceRoot":"","sources":["../../src/internal/grant.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH;;;;;;;;;;;;;GAaG;AACH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAA;AAIjD,OAAO,KAAK,EAAE,YAAY,EAAE,cAAc,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AAgCtE;;;;;;;;;;;GAWG;AACH,wBAAsB,aAAa,CACjC,OAAO,EAAE,aAAa,EACtB,EAAE,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,EAAE,YAAY,GACzD,OAAO,CAAC,cAAc,CAAC,CAuBzB;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,YAAY,CAAC,EAC3B,IAAI,EACJ,MAAM,EACP,EAAE;IACD,IAAI,CAAC,EAAE,KAAK,CAAA;IACZ,MAAM,EAAE,MAAM,CAAA;CACf,GAAG,OAAO,CAWV;AAED;;;;;;;;;;;;GAYG;AACH,wBAAsB,eAAe,CACnC,OAAO,EAAE,aAAa,EACtB,EACE,IAAI,EACJ,OAAO,EACP,UAAU,EACX,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,YAAY,CAAC;IAAC,UAAU,CAAC,EAAE,KAAK,CAAA;CAAE,GAC7D,OAAO,CAAC,cAAc,CAAC,CAMzB"}
+{"version":3,"file":"grant.d.ts","sourceRoot":"","sources":["../../src/internal/grant.ts"],"names":[],"mappings":"AA0BA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAA;AAIjD,OAAO,KAAK,EAAE,YAAY,EAAE,cAAc,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AAyEtE;;;;;;;;;;;;;;GAcG;AACH,wBAAsB,aAAa,CACjC,OAAO,EAAE,aAAa,EACtB,EAAE,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,EAAE,YAAY,GACnE,OAAO,CAAC,cAAc,CAAC,CAsBzB;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,YAAY,CAAC,EAC3B,IAAI,EACJ,MAAM,EACP,EAAE;IACD,IAAI,CAAC,EAAE,KAAK,CAAA;IACZ,MAAM,EAAE,MAAM,CAAA;CACf,GAAG,OAAO,CAWV;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAsB,eAAe,CACnC,OAAO,EAAE,aAAa,EACtB,EACE,GAAG,EACH,QAAQ,EACR,OAAO,EACP,UAAU,EACX,EAAE;IACD,GAAG,EAAE,MAAM,CAAA;IACX,QAAQ,EAAE,MAAM,CAAA;IAChB,OAAO,EAAE,YAAY,CAAA;IACrB,UAAU,CAAC,EAAE,KAAK,CAAA;CACnB,GACA,OAAO,CAAC,cAAc,CAAC,CAOzB"}

package/dist/internal/grant.js

@@ -1,42 +1,106 @@
-import { parseSpaceTarget, spacePath, toUrl } from './paths.js';
+/*!
+ * Copyright (c) 2026 Interop Alliance. All rights reserved.
+ */
+/**
+ * The delegation primitive shared by `was.grant()` and the `space`/`collection`
+ * grant sugar. Maps `GrantOptions` onto `zcapClient.delegate(...)`, normalizing
+ * action verbs to uppercase so a lowercase grant (`'get'`) still validates on
+ * the server (which matches actions case-sensitively against `'GET'`).
+ *
+ * An unparented grant that names its Space (`spaceUrl`, which the scoped sugar
+ * fills from the handle) is delegated from that **Space's** root capability,
+ * with the target carried as an attenuated `invocationTarget`, rather than
+ * from the target's own root capability. Both forms grant the same access (the
+ * server verifies WAS routes with target attenuation allowed), but only a
+ * Space-rooted chain can be revoked -- revocation is Space-scoped, and the
+ * endpoint requires the chain to root exactly in the Space (see `revoke.ts`).
+ *
+ * A bare `was.grant({ target })` without `spaceUrl` is the other mode, kept
+ * on purpose: it delegates from the target's own root capability (ezcap's
+ * default). It is the shape for a server at the basic conformance level,
+ * which may serve fixed collections, or resources alone, with no Space
+ * container to root a chain in. Such a grant cannot be revoked through a
+ * Space's revocation endpoint; that is a limitation of that conformance
+ * level, not of the client.
+ */
+import { isValidTarget } from '@interop/zcap';
+import { canonicalSpaceUrl } from './paths.js';
 import { rootCapabilityId } from './revoke.js';
 import { ValidationError } from '../errors.js';
 /**
- * The root capability id (`urn:zcap:root:<encoded target>`) of the Space
- * containing `target`, or `undefined` when `target` is not a URL beneath this
- * server's `/space` tree (e.g. a `/kms` target, or another origin) -- in which
- * case the caller lets ezcap default to the target's own root capability.
+ * Roots a grant in its Space: the root capability id
+ * (`urn:zcap:root:<encoded Space URL>`) to parent it on, after checking that
+ * `target` lies at or beneath the Space, and the target to delegate. A chain
+ * rooted in one Space cannot delegate a target outside it, and the server
+ * would refuse the capability at invocation, so the mismatch is refused here
+ * by name.
+ *
+ * The Space itself may be named in either form. The bare (slash-less) form
+ * is accepted as the target, as `parseSpaceTarget` accepts it, and is
+ * delegated in canonical form: the server verifies a Space-rooted chain
+ * against the canonical Space URL, under which the bare form is not an
+ * attenuation of the Space but a sibling of it.
  *
  * The id is returned as a string, which `zcapClient.delegate(...)` accepts for a
  * root parent capability. (Its sibling `request(...)` does not, for a non-`https:`
  * target -- hence the object form in `revoke.ts`.)
  *
  * @param options {object}
- * @param options.baseUrl {string}   the client's server base URL
- * @param options.target {string}      the absolute grant target URL
- * @returns {string | undefined}
+ * @param options.spaceUrl {string}   the Space to root the grant in
+ * @param options.target {string}     the absolute grant target URL
+ * @returns {{ parent: string, target: string }}
+ * @throws {ValidationError}   when `target` is not at or beneath `spaceUrl`,
+ *   or its path is rewritten by URL normalization (a dot segment)
  */
-function spaceRootCapabilityId({ baseUrl, target }) {
-    const parsed = parseSpaceTarget({ baseUrl, target });
-    if (parsed === null) {
-        return undefined;
+function spaceRooted({ spaceUrl, target }) {
+    const canonical = canonicalSpaceUrl(spaceUrl);
+    // The check runs against the canonical Space URL, the base the server
+    // verifies the chain against, so what passes here is what the server
+    // accepts. The bare form is the one exception, matched exactly: as a base
+    // it would also admit `{space}?x`, which the server refuses.
+    const bare = canonical.slice(0, -1);
+    if (target !== bare &&
+        !isValidTarget({
+            invocationTarget: target,
+            baseInvocationTarget: canonical,
+            allowTargetAttenuation: true
+        })) {
+        throw new ValidationError(`Grant target "${target}" is not at or beneath the Space ` +
+            `"${canonical}" the grant would be rooted in.`);
+    }
+    // The prefix check reads the raw string, so a dot segment (`{space}../x`)
+    // passes it while naming a path outside the Space once a URL parser
+    // normalizes it. The server resolves the request URL that way, so such a
+    // target can never be invoked. Refuse a target whose path does not survive
+    // normalization unchanged. The query, if any, is left as given.
+    const origin = new URL(canonical).origin;
+    const rawPath = target.slice(origin.length).replace(/[?#].*$/, '');
+    if (target !== bare && new URL(target).pathname !== rawPath) {
+        throw new ValidationError(`Grant target "${target}" has a path that URL normalization rewrites ` +
+            '(a dot segment or an unencoded character); give the target in its ' +
+            'normalized form.');
     }
-    const spaceUrl = toUrl({ baseUrl, path: spacePath(parsed.spaceId) });
-    return rootCapabilityId(spaceUrl);
+    return {
+        parent: rootCapabilityId(canonical),
+        target: target === bare ? canonical : target
+    };
 }
 /**
  * Delegates a capability per `GrantOptions`, returning the signed zcap to hand
  * off out-of-band. An explicit `capability` (re-delegation of a parent zcap)
- * always wins; otherwise a Space-tree target is rooted at its Space, so the
- * resulting capability is revocable via `space.revoke()` / `was.revoke()`.
+ * always wins; otherwise a grant naming its `spaceUrl` is rooted at that
+ * Space, so the resulting capability is revocable via `space.revoke()` /
+ * `was.revoke()`; otherwise ezcap roots it at the target's own root
+ * capability.
  *
  * @param context {ClientContext}
  * @param options {GrantOptions}
  * @returns {Promise<IDelegatedZcap>}
  * @throws {ValidationError}   when neither `target` nor `capability` is given,
- *   so the delegation names nothing to grant
+ *   so the delegation names nothing to grant; or when `spaceUrl` is given
+ *   and `target` does not lie at or beneath it
  */
-export async function delegateGrant(context, { to, actions, expires, target, capability }) {
+export async function delegateGrant(context, { to, actions, expires, target, capability, spaceUrl }) {
     // The scoped sugar always prefills `target`, so this only catches a direct
     // `was.grant()`. Without either member ezcap has no invocation target and no
     // parent to take one from, and rejects the call with a bare `TypeError` a
@@ -45,16 +109,15 @@ export async function delegateGrant(context, { to, actions, expires, target, cap
         throw new ValidationError('A grant needs a `target` (the invocationTarget URL to grant) or a ' +
             '`capability` (the parent capability to attenuate); neither was given.');
     }
-    const parent = capability ??
-        (target === undefined
-            ? undefined
-            : spaceRootCapabilityId({ baseUrl: context.baseUrl, target }));
+    const rooted = capability === undefined && target !== undefined && spaceUrl !== undefined
+        ? spaceRooted({ spaceUrl, target })
+        : { parent: capability, target };
     return context.zcapClient.delegate({
         controller: to,
-        invocationTarget: target,
+        invocationTarget: rooted.target,
         allowedActions: actions.map(action => action.toUpperCase()),
         expires,
-        capability: parent
+        capability: rooted.parent
     });
 }
 /**
@@ -84,20 +147,23 @@ export function allowsAction({ zcap, action }) {
 /**
  * The scoped-grant sugar shared by `Space.grant` and `Collection.grant`:
  * delegates per `GrantOptions` with the grant `target` prefilled from the
- * handle's `path` (and the handle's bound `capability`, if any, as the parent
- * for re-delegation). Explicit options win over both prefills.
+ * handle's `url`, the rooting `spaceUrl` from the handle's Space, and the
+ * handle's bound `capability`, if any, as the parent for re-delegation.
+ * Explicit options win over every prefill.
  *
  * @param context {ClientContext}
  * @param options {object}
- * @param options.path {string}           the handle's path (target fallback)
+ * @param options.url {string}            the handle's URL (target fallback)
+ * @param options.spaceUrl {string}       the handle's Space (rooting fallback)
  * @param options.options {GrantOptions}  the caller's grant options
  * @param [options.capability] {IZcap}    the handle's bound capability
  * @returns {Promise<IDelegatedZcap>}
  */
-export async function delegateGrantAt(context, { path, options, capability }) {
+export async function delegateGrantAt(context, { url, spaceUrl, options, capability }) {
     return delegateGrant(context, {
         ...options,
-        target: options.target ?? toUrl({ baseUrl: context.baseUrl, path }),
+        target: options.target ?? url,
+        spaceUrl: options.spaceUrl ?? spaceUrl,
         capability: options.capability ?? capability
     });
 }

package/dist/internal/grant.js.map

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

package/dist/internal/meta.d.ts

@@ -9,7 +9,7 @@ import type { IZcap, ResourceMetadataCustom, ResourceMetadataCustomInput } from
  *
  * @param context {ClientContext}
  * @param options {object}
- * @param options.metaPath {string}   the `/meta` sub-resource path
+ * @param options.metaUrl {string}   the `/meta` sub-resource URL
  * @param options.codec {Promise<ResourceCodec>}   the resolving codec, awaited
  *   concurrently with the read
  * @param options.subject {string}   the metadata's owner as it reads in the
@@ -27,8 +27,8 @@ import type { IZcap, ResourceMetadataCustom, ResourceMetadataCustomInput } from
  */
 export declare function readMeta<Metadata extends {
     custom?: ResourceMetadataCustom;
-}>(context: ClientContext, { metaPath, codec: codecPromise, subject, slot, capability, onStored }: {
-    metaPath: string;
+}>(context: ClientContext, { metaUrl, codec: codecPromise, subject, slot, capability, onStored }: {
+    metaUrl: string;
     codec: Promise<ResourceCodec>;
     subject: string;
     slot: MetaReadSlot;
@@ -50,7 +50,7 @@ export declare function readMeta<Metadata extends {
  *
  * @param context {ClientContext}
  * @param options {object}
- * @param options.metaPath {string}   the `meta` sub-resource path
+ * @param options.metaUrl {string}   the `meta` sub-resource URL
  * @param options.codec {Promise<ResourceCodec>}   the resolving codec
  * @param options.custom {ResourceMetadataCustomInput}   the user-writable
  *   properties, as a full replacement
@@ -61,8 +61,8 @@ export declare function readMeta<Metadata extends {
  * @param [options.capability] {IZcap}
  * @returns {Promise<{ etag?: string }>}   the metadata's new ETag
  */
-export declare function writeMeta(context: ClientContext, { metaPath, codec: codecPromise, custom, slot, ifMatch, ifNoneMatch, capability }: {
-    metaPath: string;
+export declare function writeMeta(context: ClientContext, { metaUrl, codec: codecPromise, custom, slot, ifMatch, ifNoneMatch, capability }: {
+    metaUrl: string;
     codec: Promise<ResourceCodec>;
     custom: ResourceMetadataCustomInput;
     slot: MetaWriteSlot;
@@ -136,13 +136,13 @@ export declare function patchCustom(handle: {
  *
  * @param context {ClientContext}
  * @param options {object}
- * @param options.spaceId {string}
+ * @param options.spaceUrl {string}
  * @param options.collectionId {string}
  * @param [options.capability] {IZcap}   capability attached to the request
  * @returns {Promise<{ metadata: StoredCollectionMetadata; etag?: string } | null>}
  */
 export declare function readCollectionMetadata(context: ClientContext, options: {
-    spaceId: string;
+    spaceUrl: string;
     collectionId: string;
     capability?: IZcap;
 }): Promise<{

package/dist/internal/meta.d.ts.map

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

package/dist/internal/meta.js

@@ -17,13 +17,13 @@
  * left as stored, because the codec that would decode it is itself resolved
  * from the same object's `encryption` member. It lives here rather than beside
  * the Collection Metadata helpers in `describe.ts` so those stay free of the
- * transport layer; the request shape (path, capability, null-unwrap,
+ * transport layer; the request shape (URL, capability, null-unwrap,
  * validator) is still stated in one place, shared by `Collection`'s read and
  * write paths and by the codec resolver's descriptor discovery.
  */
 import { NotFoundError, WasServerError } from '../errors.js';
 import { compareAndSwap } from './cas.js';
-import { collectionMeta } from './paths.js';
+import { collectionMetaUrl } from './paths.js';
 import { readDataWithEtag, send } from './request.js';
 import { readEtag, writeHeaders } from './conditional.js';
 import { withCodec } from './withCodec.js';
@@ -34,7 +34,7 @@ import { withCodec } from './withCodec.js';
  *
  * @param context {ClientContext}
  * @param options {object}
- * @param options.metaPath {string}   the `/meta` sub-resource path
+ * @param options.metaUrl {string}   the `/meta` sub-resource URL
  * @param options.codec {Promise<ResourceCodec>}   the resolving codec, awaited
  *   concurrently with the read
  * @param options.subject {string}   the metadata's owner as it reads in the
@@ -50,11 +50,11 @@ import { withCodec } from './withCodec.js';
  *   decode fails: a read that throws is no baseline
  * @returns {Promise<(Metadata & { etag?: string }) | null>}
  */
-export async function readMeta(context, { metaPath, codec: codecPromise, subject, slot, capability, onStored }) {
+export async function readMeta(context, { metaUrl, codec: codecPromise, subject, slot, capability, onStored }) {
     // The metadata GET does not depend on the codec (only its `custom` decode
     // below does), so the two overlap.
     const [codec, response] = await withCodec(codecPromise, send(context, {
-        path: metaPath,
+        url: metaUrl,
         method: 'GET',
         capability,
         read: true
@@ -100,7 +100,7 @@ export async function readMeta(context, { metaPath, codec: codecPromise, subject
  *
  * @param context {ClientContext}
  * @param options {object}
- * @param options.metaPath {string}   the `meta` sub-resource path
+ * @param options.metaUrl {string}   the `meta` sub-resource URL
  * @param options.codec {Promise<ResourceCodec>}   the resolving codec
  * @param options.custom {ResourceMetadataCustomInput}   the user-writable
  *   properties, as a full replacement
@@ -111,11 +111,11 @@ export async function readMeta(context, { metaPath, codec: codecPromise, subject
  * @param [options.capability] {IZcap}
  * @returns {Promise<{ etag?: string }>}   the metadata's new ETag
  */
-export async function writeMeta(context, { metaPath, codec: codecPromise, custom, slot, ifMatch, ifNoneMatch, capability }) {
+export async function writeMeta(context, { metaUrl, codec: codecPromise, custom, slot, ifMatch, ifNoneMatch, capability }) {
     const codec = await codecPromise;
     const { custom: encoded } = await codec.encodeMeta({ custom, slot });
     const response = await send(context, {
-        path: metaPath,
+        url: metaUrl,
         method: 'PUT',
         capability,
         json: { custom: encoded },
@@ -205,14 +205,17 @@ export async function patchCustom(handle, patch, { operation = 'Metadata update'
  *
  * @param context {ClientContext}
  * @param options {object}
- * @param options.spaceId {string}
+ * @param options.spaceUrl {string}
  * @param options.collectionId {string}
  * @param [options.capability] {IZcap}   capability attached to the request
  * @returns {Promise<{ metadata: StoredCollectionMetadata; etag?: string } | null>}
  */
 export async function readCollectionMetadata(context, options) {
     const read = await readDataWithEtag(context, {
-        path: collectionMeta(options.spaceId, options.collectionId),
+        url: collectionMetaUrl({
+            spaceUrl: options.spaceUrl,
+            collectionId: options.collectionId
+        }),
         capability: options.capability
     });
     if (read === null) {

package/dist/internal/meta.js.map

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