feat!: update ucanto to invocation spec compatible result type

packages/client/test/api.ts

@@ -3,10 +3,7 @@ import * as API from '@ucanto/interface'
 
 import type { DID, Link, Await, Result as SyncResult } from '@ucanto/interface'
 export type { DID, Link, SyncResult }
-type Result<
-  T extends unknown = unknown,
-  X extends { error: true } = Error & { error: true }
-> = Await<API.Result<T, X>>
+type Result<T extends {} = {}, X extends {} = Error> = Await<API.Result<T, X>>
 
 export interface StorageProvider {
   /**
@@ -34,20 +31,20 @@ export interface StorageProvider {
     group: DID,
     link: Link,
     proof: Link
-  ): Result<null, UnknownDIDError | DoesNotHasError>
+  ): Result<{}, UnknownDIDError | DoesNotHasError>
 }
 
 export interface TokenStore {
   /**
    * Revokes set of UCANS. CID corresponds to the link been revoked and
    * proof is the CID of the revocation.
    */
-  revoke(token: Link, revocation: TokenEntry): Result<null, RevokeError>
+  revoke(token: Link, revocation: TokenEntry): Result<{}, RevokeError>
 
   /**
    * Adds bunch of proofs for later queries.
    */
-  insert(tokens: IterableIterator<TokenEntry>): Result<null, InsertError>
+  insert(tokens: IterableIterator<TokenEntry>): Result<{}, InsertError>
 
   /**
    * You give it named set of CIDs and it gives you back named set of
@@ -185,13 +182,9 @@ export interface DoesNotHasError extends RangeError {
 export interface UnknownDIDError extends RangeError {
   readonly name: 'UnknownDIDError'
   did: DID | null
-
-  error: true
 }
 
 export interface InvalidInvocation extends Error {
   readonly name: 'InvalidInvocation'
   link: Link
-
-  error: true
 }

packages/client/test/client.spec.js

@@ -152,7 +152,7 @@ const channel = HTTP.open({
           return Receipt.issue({
             ran: invocation.cid,
             issuer: w3,
-            result: result?.error ? { error: result } : { ok: result },
+            result,
           })
         }
         case 'store/remove': {
@@ -162,7 +162,7 @@ const channel = HTTP.open({
           return Receipt.issue({
             ran: invocation.cid,
             issuer: w3,
-            result: result?.error ? { error: result } : { ok: result },
+            result,
           })
         }
       }
@@ -219,7 +219,6 @@ test('execute', async () => {
 
   assert.deepEqual(e1.out, {
     error: {
-      error: true,
       name: 'UnknownDIDError',
       message: `DID ${alice.did()} has no account`,
       did: alice.did(),
@@ -264,7 +263,6 @@ test('execute with delegations', async () => {
 
   assert.deepEqual(e1.out, {
     error: {
-      error: true,
       name: 'UnknownDIDError',
       message: `DID ${bob.did()} has no account`,
       did: bob.did(),

packages/client/test/service.js

@@ -62,18 +62,22 @@ class StorageService {
       /** @type {any} */ (ucan).cid
     )
     if (!result.error) {
-      if (result.status === 'in-s3') {
+      if (result.ok.status === 'in-s3') {
         return {
-          with: capability.with,
-          link: capability.nb.link,
-          status: the('done'),
+          ok: {
+            with: capability.with,
+            link: capability.nb.link,
+            status: the('done'),
+          },
         }
       } else {
         return {
-          with: capability.with,
-          link: capability.nb.link,
-          status: the('upload'),
-          url: 'http://localhost:9090/',
+          ok: {
+            with: capability.with,
+            link: capability.nb.link,
+            status: the('upload'),
+            url: 'http://localhost:9090/',
+          },
         }
       }
     } else {
@@ -93,10 +97,10 @@ class StorageService {
       capability.nb.link,
       /** @type {any} */ (ucan).link
     )
-    if (remove?.error) {
+    if (remove.error) {
       return remove
     } else {
-      return capability
+      return { ok: capability }
     }
   }
 }

packages/client/test/services/account.js

@@ -69,9 +69,9 @@ const unlink = (model, member, group, proof) => {
     if (account === resolve(model, member)) {
       model.delete(member)
     }
-    return {}
+    return { ok: {} }
   } else {
-    return new UnknownDIDError('Unknown DID', group)
+    return { error: new UnknownDIDError('Unknown DID', group) }
   }
 }
 
@@ -98,7 +98,7 @@ const associate = (accounts, from, to, proof, create) => {
       accounts.set(to, { account, proof })
       accounts.set(from, { account, proof })
     } else {
-      return new UnknownDIDError('Unknown did', to)
+      return { error: new UnknownDIDError('Unknown did', to) }
     }
   } else if (toAccount) {
     accounts.set(from, { account: toAccount, proof })
@@ -110,7 +110,7 @@ const associate = (accounts, from, to, proof, create) => {
     accounts.set(fromAccount, { account, proof })
   }
 
-  return {}
+  return { ok: {} }
 }
 
 /**
@@ -147,9 +147,6 @@ export class UnknownDIDError extends RangeError {
     super(message)
     this.did = did
   }
-  get error() {
-    return /** @type {true} */ (true)
-  }
   get name() {
     return the('UnknownDIDError')
   }
@@ -159,7 +156,6 @@ export class UnknownDIDError extends RangeError {
       name: this.name,
       message: this.message,
       did: this.did,
-      error: true,
     }
   }
 }

packages/client/test/services/storage.js

@@ -6,7 +6,7 @@ import { the } from './util.js'
  * @param {Partial<Model> & { accounts: API.AccessProvider }} config
  * @returns {API.StorageProvider}
  */
-export const create = (config) => new StoreProvider(config)
+export const create = config => new StoreProvider(config)
 
 /**
  * @typedef {{
@@ -43,9 +43,11 @@ export const add = async ({ accounts, groups, cars }, group, link, proof) => {
     const links = groups.get(group) || new Map()
     links.set(`${link}`, link)
     groups.set(group, links)
-    return { status: cars.get(`${link}`) ? the('in-s3') : the('not-in-s3') }
+    return {
+      ok: { status: cars.get(`${link}`) ? the('in-s3') : the('not-in-s3') },
+    }
   } else {
-    return new UnknownDIDError(`DID ${group} has no account`, group)
+    return { error: new UnknownDIDError(`DID ${group} has no account`, group) }
   }
 }
 
@@ -60,10 +62,10 @@ export const remove = async ({ accounts, groups }, group, link, proof) => {
   if (account) {
     const links = groups.get(group)
     return links && links.get(`${link}`)
-      ? null
-      : new DoesNotHasError(group, link)
+      ? { ok: {} }
+      : { error: new DoesNotHasError(group, link) }
   } else {
-    return new UnknownDIDError(`DID ${group} has no account`, group)
+    return { error: new UnknownDIDError(`DID ${group} has no account`, group) }
   }
 }
 

packages/client/test/services/tokens.js

@@ -5,7 +5,7 @@ import { the, unreachable } from './util.js'
  * @param {Map<string, API.Found|API.RevokedError|API.ExpiredError>} store
  * @returns {API.TokenStore}
  */
-export const create = (store) => new TokenService(store)
+export const create = store => new TokenService(store)
 
 /**
  * @implements {API.TokenStore}
@@ -41,7 +41,7 @@ class TokenService {
           return unreachable`Record has unexpected state ${record}`
       }
     }
-    return null
+    return { ok: {} }
   }
   /**
    * @template {Record<string, API.Link>} Query
@@ -80,7 +80,7 @@ class TokenService {
         return unreachable`record has unknown state ${record}`
     }
 
-    return null
+    return { ok: {} }
   }
 
   async gc() {

packages/core/package.json

@@ -91,6 +91,10 @@
     "./dag": {
       "types": "./dist/src/dag.d.ts",
       "import": "./src/dag.js"
+    },
+    "./result": {
+      "types": "./dist/src/result.d.ts",
+      "import": "./src/result.js"
     }
   },
   "c8": {

packages/core/src/lib.js

@@ -18,3 +18,4 @@ export { sha256 } from 'multiformats/hashes/sha2'
 export * as UCAN from '@ipld/dag-ucan'
 export * as DID from '@ipld/dag-ucan/did'
 export * as Signature from '@ipld/dag-ucan/signature'
+export * from './result.js'

packages/core/src/receipt.js

@@ -184,7 +184,7 @@ class ReceptBuilder {
    * @param {object} options
    * @param {API.Signer<API.DID, SigAlg>} options.issuer
    * @param {Ran|ReturnType<Ran['link']>} options.ran
-   * @param {API.ReceiptResult<Ok, Error>} options.result
+   * @param {API.Result<Ok, Error>} options.result
    * @param {API.EffectsModel} [options.fx]
    * @param {API.Proof[]} [options.proofs]
    * @param {Record<string, unknown>} [options.meta]
@@ -252,7 +252,7 @@ const NOFX = Object.freeze({ fork: Object.freeze([]) })
  * @param {object} options
  * @param {API.Signer<API.DID, SigAlg>} options.issuer
  * @param {Ran|ReturnType<Ran['link']>} options.ran
- * @param {API.ReceiptResult<Ok, Error>} options.result
+ * @param {API.Result<Ok, Error>} options.result
  * @param {API.EffectsModel} [options.fx]
  * @param {API.Proof[]} [options.proofs]
  * @param {Record<string, unknown>} [options.meta]

packages/core/src/result.js

@@ -0,0 +1,51 @@
+import * as API from '@ucanto/interface'
+
+/**
+ * @template {{}|string|boolean|number} T
+ * @param {T} value
+ * @returns {{ok: T, value?:undefined}}
+ */
+export const ok = value => {
+  if (value == null) {
+    throw new TypeError(`ok(${value}) is not allowed, consider ok({}) instead`)
+  } else {
+    return { ok: value }
+  }
+}
+
+/**
+ * @template {{}|string|boolean|number} X
+ * @param {X} cause
+ * @returns {{ok?:undefined, error:X}}
+ */
+export const error = cause => {
+  if (cause == null) {
+    throw new TypeError(
+      `error(${cause}) is not allowed, consider passing an error instead`
+    )
+  } else {
+    return { error: cause }
+  }
+}
+
+/**
+ * @param {string} message
+ * @returns {{error:API.Failure, ok?:undefined}}
+ */
+export const fail = message => ({ error: new Failure(message) })
+
+/**
+ * @implements {API.Failure}
+ */
+export class Failure extends Error {
+  describe() {
+    return this.toString()
+  }
+  get message() {
+    return this.describe()
+  }
+  toJSON() {
+    const { name, message, stack } = this
+    return { name, message, stack }
+  }
+}