Fix typings for queries

proofcarryingdata · Sep 10, 2024 · 6a84de7 · 6a84de7
1 parent b8a4315
commit 6a84de7
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 8 deletions.
diff --git a/packages/app-connector/src/rpc_client.ts b/packages/app-connector/src/rpc_client.ts
@@ -13,7 +13,7 @@ import {
   RPCMessageType,
   SubscriptionUpdateResult
 } from "@parcnet/client-rpc";
-import { PodspecProofRequest } from "@parcnet/podspec";
+import { EntriesSchema, PodspecProofRequest } from "@parcnet/podspec";
 import { GPCProof, GPCRevealedClaims } from "@pcd/gpc";
 import { EventEmitter } from "eventemitter3";
 import { z, ZodFunction, ZodTuple, ZodTypeAny } from "zod";
@@ -115,7 +115,9 @@ export class ParcnetRPCConnector implements ParcnetRPC, ParcnetEvents {
     this.#emitter = new EventEmitter();
 
     this.pod = {
-      query: async (query: PODQuery): Promise<string[]> => {
+      query: async <E extends EntriesSchema>(
+        query: PODQuery<E>
+      ): Promise<string[]> => {
         return this.#typedInvoke(
           "pod.query",
           [query],
@@ -136,7 +138,9 @@ export class ParcnetRPCConnector implements ParcnetRPC, ParcnetEvents {
           ParcnetRPCSchema.shape.pod.shape.delete
         );
       },
-      subscribe: async (query: PODQuery): Promise<string> => {
+      subscribe: async <E extends EntriesSchema>(
+        query: PODQuery<E>
+      ): Promise<string> => {
         return this.#typedInvoke(
           "pod.subscribe",
           [query],

diff --git a/packages/client-rpc/src/rpc_interfaces.ts b/packages/client-rpc/src/rpc_interfaces.ts
@@ -11,7 +11,7 @@ import { GPCBoundConfig, GPCProof, GPCRevealedClaims } from "@pcd/gpc";
  * These interfaces are implemented in rpc_client.ts.
  */
 
-export type PODQuery = PODSchema<EntriesSchema>;
+export type PODQuery<E extends EntriesSchema> = PODSchema<E>;
 
 export interface SubscriptionUpdateResult {
   subscriptionId: string;
@@ -46,10 +46,10 @@ export interface ParcnetIdentityRPC {
 
 export interface ParcnetPODRPC {
   // Returns array of serialized PODs
-  query: (query: PODQuery) => Promise<string[]>;
+  query: <E extends EntriesSchema>(query: PODQuery<E>) => Promise<string[]>;
   insert: (serializedPod: string) => Promise<void>;
   delete: (signature: string) => Promise<void>;
-  subscribe: (query: PODQuery) => Promise<string>;
+  subscribe: <E extends EntriesSchema>(query: PODQuery<E>) => Promise<string>;
   unsubscribe: (subscriptionId: string) => Promise<void>;
 }
 

diff --git a/packages/podspec/src/schemas/entries.ts b/packages/podspec/src/schemas/entries.ts
@@ -10,7 +10,7 @@ export type EntriesSchema = Record<string, EntrySchema>;
  * Schema for a tuple of entries.
  */
 export type EntriesTupleSchema<E extends EntriesSchema> = {
-  entries: (keyof E)[];
+  entries: (keyof E & string)[];
   isMemberOf?: PODValue[][];
   isNotMemberOf?: PODValue[][];
 };
diff --git a/packages/podspec/src/schemas/pod.ts b/packages/podspec/src/schemas/pod.ts
@@ -5,7 +5,7 @@ import { EntriesSchema } from "./entries.js";
  * Schema for a tuple of entries.
  */
 export type PODTupleSchema<E extends EntriesSchema> = {
-  entries: (keyof (E & { $signerPublicKey: never }))[];
+  entries: (keyof (E & { $signerPublicKey: never }) & string)[];
   isMemberOf?: PODValue[][];
   isNotMemberOf?: PODValue[][];
 };