@vastblast/capnweb 0.5.2 → 0.5.3

package/dist/index.d.cts

@@ -12,6 +12,8 @@ import { IncomingMessage, ServerResponse, OutgoingHttpHeaders, OutgoingHttpHeade
 // accept `WorkerEntrypoint` from `cloudflare:workers`, not any other class with the same shape)
 declare const __RPC_STUB_BRAND: '__RPC_STUB_BRAND';
 declare const __RPC_TARGET_BRAND: '__RPC_TARGET_BRAND';
+// Distinguishes mapper placeholders from regular values so param unwrapping can accept them.
+declare const __RPC_MAP_VALUE_BRAND: unique symbol;
 interface RpcTargetBranded {
   [__RPC_TARGET_BRAND]: never;
 }
@@ -66,6 +68,11 @@ interface StubBase<T = unknown> extends Disposable {
   onRpcBroken(callback: (error: any) => void): void;
 }
 
+// Marker carried by map() callback inputs. This lets primitive placeholders flow through params.
+interface MapValuePlaceholder<T> {
+  [__RPC_MAP_VALUE_BRAND]: T;
+}
+
 // Types that can be passed over RPC.
 // The reason for using a generic type here is to build a serializable subset of structured
 // cloneable composite types. This allows types defined with the "interface" keyword to pass the
@@ -143,7 +150,12 @@ type UnstubifyInner<T> =
 
 // You can put promises anywhere in the params and they'll be resolved before delivery.
 // (This also covers RpcPromise, because it's defined as being a Promise.)
-type Unstubify<T> = UnstubifyInner<T> | Promise<UnstubifyInner<T>>;
+// Map placeholders are also allowed so primitive map callback inputs can be forwarded directly
+// into RPC params.
+type Unstubify<T> =
+  UnstubifyInner<T> |
+  Promise<UnstubifyInner<T>> |
+  MapValuePlaceholder<UnstubifyInner<T>>;
 
 type UnstubifyAll<A extends readonly unknown[]> = { [I in keyof A]: Unstubify<A[I]> };
 
@@ -187,27 +199,24 @@ type TupleIndexKeys<T extends ReadonlyArray<unknown>> =
   Extract<keyof T, `${number}`>;
 type MapCallbackValue<T> =
   // `Omit` removes call signatures, so re-intersect callable provider behavior.
-  T extends unknown ? Omit<Result<T>, keyof Promise<unknown>> & MaybeCallableProvider<T> : never;
+  T extends unknown
+    ? Omit<Result<T>, keyof Promise<unknown>> & MaybeCallableProvider<T> & MapValuePlaceholder<T>
+    : never;
 type InvalidNativePromiseInMapResult<T, Seen = never> =
   T extends unknown ? InvalidNativePromiseInMapResultImpl<T, Seen> : never;
 type InvalidNativePromiseInMapResultImpl<T, Seen> =
   [T] extends [Seen] ? never :
   // RpcPromise is modeled as Promise & StubBase, so allow promise-like stub values.
   T extends StubBase<any> ? never
-  // Native promises cannot be represented in map recordings.
-  : T extends Promise<unknown> ? T
+  // Native thenables cannot be represented in map recordings, even when typed as PromiseLike.
+  : T extends PromiseLike<unknown> ? T
   : T extends Map<infer K, infer V>
     ? InvalidNativePromiseInMapResult<K, Seen | T> | InvalidNativePromiseInMapResult<V, Seen | T>
   : T extends Set<infer V> ? InvalidNativePromiseInMapResult<V, Seen | T>
-  : T extends [] ? never
-  : T extends [infer Head, ...infer Tail]
-    ? InvalidNativePromiseInMapResult<Head, Seen | T>
-      | InvalidNativePromiseInMapResult<Tail[number], Seen | T>
   : T extends readonly [] ? never
   : T extends readonly [infer Head, ...infer Tail]
     ? InvalidNativePromiseInMapResult<Head, Seen | T>
       | InvalidNativePromiseInMapResult<Tail[number], Seen | T>
-  : T extends Array<infer V> ? InvalidNativePromiseInMapResult<V, Seen | T>
   : T extends ReadonlyArray<infer V> ? InvalidNativePromiseInMapResult<V, Seen | T>
   : T extends { [key: string | number]: unknown }
     ? InvalidNativePromiseInMapResult<T[Extract<keyof T, string | number>], Seen | T>

package/dist/index.d.ts

@@ -12,6 +12,8 @@ import { IncomingMessage, ServerResponse, OutgoingHttpHeaders, OutgoingHttpHeade
 // accept `WorkerEntrypoint` from `cloudflare:workers`, not any other class with the same shape)
 declare const __RPC_STUB_BRAND: '__RPC_STUB_BRAND';
 declare const __RPC_TARGET_BRAND: '__RPC_TARGET_BRAND';
+// Distinguishes mapper placeholders from regular values so param unwrapping can accept them.
+declare const __RPC_MAP_VALUE_BRAND: unique symbol;
 interface RpcTargetBranded {
   [__RPC_TARGET_BRAND]: never;
 }
@@ -66,6 +68,11 @@ interface StubBase<T = unknown> extends Disposable {
   onRpcBroken(callback: (error: any) => void): void;
 }
 
+// Marker carried by map() callback inputs. This lets primitive placeholders flow through params.
+interface MapValuePlaceholder<T> {
+  [__RPC_MAP_VALUE_BRAND]: T;
+}
+
 // Types that can be passed over RPC.
 // The reason for using a generic type here is to build a serializable subset of structured
 // cloneable composite types. This allows types defined with the "interface" keyword to pass the
@@ -143,7 +150,12 @@ type UnstubifyInner<T> =
 
 // You can put promises anywhere in the params and they'll be resolved before delivery.
 // (This also covers RpcPromise, because it's defined as being a Promise.)
-type Unstubify<T> = UnstubifyInner<T> | Promise<UnstubifyInner<T>>;
+// Map placeholders are also allowed so primitive map callback inputs can be forwarded directly
+// into RPC params.
+type Unstubify<T> =
+  UnstubifyInner<T> |
+  Promise<UnstubifyInner<T>> |
+  MapValuePlaceholder<UnstubifyInner<T>>;
 
 type UnstubifyAll<A extends readonly unknown[]> = { [I in keyof A]: Unstubify<A[I]> };
 
@@ -187,27 +199,24 @@ type TupleIndexKeys<T extends ReadonlyArray<unknown>> =
   Extract<keyof T, `${number}`>;
 type MapCallbackValue<T> =
   // `Omit` removes call signatures, so re-intersect callable provider behavior.
-  T extends unknown ? Omit<Result<T>, keyof Promise<unknown>> & MaybeCallableProvider<T> : never;
+  T extends unknown
+    ? Omit<Result<T>, keyof Promise<unknown>> & MaybeCallableProvider<T> & MapValuePlaceholder<T>
+    : never;
 type InvalidNativePromiseInMapResult<T, Seen = never> =
   T extends unknown ? InvalidNativePromiseInMapResultImpl<T, Seen> : never;
 type InvalidNativePromiseInMapResultImpl<T, Seen> =
   [T] extends [Seen] ? never :
   // RpcPromise is modeled as Promise & StubBase, so allow promise-like stub values.
   T extends StubBase<any> ? never
-  // Native promises cannot be represented in map recordings.
-  : T extends Promise<unknown> ? T
+  // Native thenables cannot be represented in map recordings, even when typed as PromiseLike.
+  : T extends PromiseLike<unknown> ? T
   : T extends Map<infer K, infer V>
     ? InvalidNativePromiseInMapResult<K, Seen | T> | InvalidNativePromiseInMapResult<V, Seen | T>
   : T extends Set<infer V> ? InvalidNativePromiseInMapResult<V, Seen | T>
-  : T extends [] ? never
-  : T extends [infer Head, ...infer Tail]
-    ? InvalidNativePromiseInMapResult<Head, Seen | T>
-      | InvalidNativePromiseInMapResult<Tail[number], Seen | T>
   : T extends readonly [] ? never
   : T extends readonly [infer Head, ...infer Tail]
     ? InvalidNativePromiseInMapResult<Head, Seen | T>
       | InvalidNativePromiseInMapResult<Tail[number], Seen | T>
-  : T extends Array<infer V> ? InvalidNativePromiseInMapResult<V, Seen | T>
   : T extends ReadonlyArray<infer V> ? InvalidNativePromiseInMapResult<V, Seen | T>
   : T extends { [key: string | number]: unknown }
     ? InvalidNativePromiseInMapResult<T[Extract<keyof T, string | number>], Seen | T>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vastblast/capnweb",
-  "version": "0.5.2",
+  "version": "0.5.3",
   "description": "JavaScript/TypeScript-native RPC library with Promise Pipelining",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",