@agoric/async-flow 0.1.1-dev-a9e951a.0 → 0.1.1-dev-607ed82.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/async-flow",
-  "version": "0.1.1-dev-a9e951a.0+a9e951a",
+  "version": "0.1.1-dev-607ed82.0+607ed82",
   "description": "Upgrade async functions at await points by replay",
   "type": "module",
   "repository": "https://github.com/Agoric/agoric-sdk",
@@ -24,10 +24,10 @@
   "author": "Agoric",
   "license": "Apache-2.0",
   "dependencies": {
-    "@agoric/base-zone": "0.1.1-dev-a9e951a.0+a9e951a",
-    "@agoric/internal": "0.3.3-dev-a9e951a.0+a9e951a",
-    "@agoric/store": "0.9.3-dev-a9e951a.0+a9e951a",
-    "@agoric/vow": "0.1.1-dev-a9e951a.0+a9e951a",
+    "@agoric/base-zone": "0.1.1-dev-607ed82.0+607ed82",
+    "@agoric/internal": "0.3.3-dev-607ed82.0+607ed82",
+    "@agoric/store": "0.9.3-dev-607ed82.0+607ed82",
+    "@agoric/vow": "0.1.1-dev-607ed82.0+607ed82",
     "@endo/common": "^1.2.5",
     "@endo/errors": "^1.2.5",
     "@endo/eventual-send": "^1.2.5",
@@ -37,8 +37,8 @@
     "@endo/promise-kit": "^1.1.5"
   },
   "devDependencies": {
-    "@agoric/swingset-liveslots": "0.10.3-dev-a9e951a.0+a9e951a",
-    "@agoric/zone": "0.2.3-dev-a9e951a.0+a9e951a",
+    "@agoric/swingset-liveslots": "0.10.3-dev-607ed82.0+607ed82",
+    "@agoric/zone": "0.2.3-dev-607ed82.0+607ed82",
     "@endo/env-options": "^1.1.6",
     "@endo/ses-ava": "^1.2.5",
     "ava": "^5.3.0",
@@ -63,5 +63,5 @@
   "typeCoverage": {
     "atLeast": 77.1
   },
-  "gitHead": "a9e951a4f18457787d1d21b11e1a57d4f06339bb"
+  "gitHead": "607ed82dddecb1296b2c9507a55cd2c73be3537e"
 }

package/src/types.d.ts

@@ -68,9 +68,11 @@ export type GuestInterface<T> = {
     ? (...args: Parameters<T[K]>) => Promise<R>
     : T[K] extends HostAsyncFuncWrapper
       ? GuestOf<T[K]>
-      : T[K] extends object
-        ? GuestInterface<T[K]>
-        : T[K];
+      : T[K] extends (...args: any[]) => infer R
+        ? T[K]
+        : T[K] extends object
+          ? GuestInterface<T[K]>
+          : T[K];
 };
 
 /**

package/test/types.test-d.ts

@@ -1,8 +1,13 @@
 import { expectType } from 'tsd';
-import type { Zone } from '@agoric/base-zone';
 import type { Vow, VowTools } from '@agoric/vow';
-import type { HostOf, GuestOf } from '../src/types.js';
+import type {
+  HostOf,
+  GuestOf,
+  HostInterface,
+  GuestInterface,
+} from '../src/types.js';
 
+const castable: unknown = null;
 const vt: VowTools = null as any;
 
 const sumVow = (a: number, b: number) => vt.asVow(() => a + b);
@@ -10,13 +15,59 @@ const sumVow = (a: number, b: number) => vt.asVow(() => a + b);
 const sumPromise = (a: number, b: number) => Promise.resolve(a + b);
 
 expectType<(p1: number, p2: number) => Promise<number>>(
-  null as unknown as GuestOf<typeof sumVow>,
+  castable as GuestOf<typeof sumVow>,
 );
 
 expectType<(p1: number, p2: number) => Vow<number>>(
-  null as unknown as HostOf<typeof sumPromise>,
+  castable as HostOf<typeof sumPromise>,
 );
 expectType<(p1: number, p2: number) => Vow<void>>(
   // @ts-expect-error incompatible return type
-  null as unknown as HostOf<typeof sumPromise>,
+  castable as HostOf<typeof sumPromise>,
+);
+
+// Test HostInterface and GuestInterface with an exoClass object
+type ExoAPIBase = {
+  getValue: () => number;
+  setValue: (value: number) => void;
+  getCopyData: () => Record<string, number>[];
+  // TODO include `getRemote() => Guarded<...>`, since durable exos are passable
+};
+type ExoGuestAPI = ExoAPIBase & {
+  getValueAsync: () => Promise<number>;
+};
+
+type ExoHostAPI = ExoAPIBase & {
+  getValueAsync: () => Vow<number>;
+};
+
+expectType<
+  ExoAPIBase & {
+    getValueAsync: () => Vow<number>;
+  }
+>(castable as HostInterface<ExoGuestAPI>);
+expectType<
+  ExoAPIBase & {
+    getValueAsync: () => Promise<number>;
+  }
+>(castable as GuestInterface<ExoHostAPI>);
+
+// Test HostInterface and GuestInterface with classKit (nested) objects
+expectType<{
+  facet: ExoAPIBase & {
+    getValueAsync: () => Vow<number>;
+  };
+}>(
+  castable as HostInterface<{
+    facet: ExoGuestAPI;
+  }>,
+);
+expectType<{
+  facet: ExoAPIBase & {
+    getValueAsync: () => Promise<number>;
+  };
+}>(
+  castable as GuestInterface<{
+    facet: ExoHostAPI;
+  }>,
 );