fix type issues

Author: nikgraf

packages/hypergraph-react/src/internal/use-entity-public.tsx

@@ -1,5 +1,5 @@
 import { Graph } from '@graphprotocol/grc-20';
-import { Constants, type Entity } from '@graphprotocol/hypergraph';
+import { Constants, type Entity, Utils } from '@graphprotocol/hypergraph';
 import { useQuery as useQueryTanstack } from '@tanstack/react-query';
 import * as Either from 'effect/Either';
 import * as Option from 'effect/Option';
@@ -175,7 +175,7 @@ export const parseResult = <S extends Schema.Schema.AnyNoContext>(queryData: Ent
     return { data: null, invalidEntity: null };
   }
 
-  const schemaWithId = Schema.extend(Schema.Struct({ id: Schema.String }))(type);
+  const schemaWithId = Utils.addIdSchemaField(type);
   const decode = Schema.decodeUnknownEither(schemaWithId);
   const queryEntity = queryData.entity;
   let rawEntity: Record<string, string | boolean | number | unknown[] | Date> = {

packages/hypergraph-react/src/internal/use-query-public.tsx

@@ -1,6 +1,5 @@
 import { Graph } from '@graphprotocol/grc-20';
-import type { Entity } from '@graphprotocol/hypergraph';
-import { Constants } from '@graphprotocol/hypergraph';
+import { Constants, type Entity, Utils } from '@graphprotocol/hypergraph';
 import { useQuery as useQueryTanstack } from '@tanstack/react-query';
 import * as Either from 'effect/Either';
 import * as Option from 'effect/Option';
@@ -187,7 +186,7 @@ type EntityQueryResult = {
 };
 
 export const parseResult = <S extends Schema.Schema.AnyNoContext>(queryData: EntityQueryResult, type: S) => {
-  const schemaWithId = Schema.extend(Schema.Struct({ id: Schema.String }))(type);
+  const schemaWithId = Utils.addIdSchemaField(type);
   const decode = Schema.decodeUnknownEither(schemaWithId);
   const data: Entity.Entity<S>[] = [];
   const invalidEntities: Record<string, unknown>[] = [];
@@ -271,16 +270,15 @@ export const useQueryPublic = <S extends Schema.Schema.AnyNoContext>(type: S, pa
         queryDocument = entitiesQueryDocumentLevel2;
       }
 
-      const filterResult = filter ? translateFilterToGraphql(filter, type) : {};
-      console.log('filterResult', filterResult);
+      const filterParams = filter ? translateFilterToGraphql(filter, type) : {};
 
       const result = await request<EntityQueryResult>(`${Graph.TESTNET_API_ORIGIN}/graphql`, queryDocument, {
         spaceId: space,
         typeIds,
         relationTypeIdsLevel1: relationTypeIds.level1,
         relationTypeIdsLevel2: relationTypeIds.level2,
         first,
-        filter: filterResult,
+        filter: filterParams,
       });
       return result;
     },

packages/hypergraph/src/type/type.ts

@@ -57,10 +57,19 @@ export const Relation =
       Option.getOrElse(() => []),
     );
 
-    const schemaWithId = Schema.extend(schema)(
-      Schema.Struct({ id: Schema.String, _relation: Schema.Struct({ id: Schema.String }) }),
+    const schemaWithId = Schema.asSchema(
+      Schema.extend(schema)(
+        Schema.Struct({
+          id: Schema.String,
+          _relation: Schema.Struct({ id: Schema.String }),
+        }),
+      ),
       // manually adding the type ids to the schema since they get lost when extending the schema
-    ).pipe(Schema.annotations({ [TypeIdsSymbol]: typeIds }));
+    ).pipe(Schema.annotations({ [TypeIdsSymbol]: typeIds })) as Schema.Schema<
+      Schema.Schema.Type<S> & { readonly id: string; readonly _relation: { readonly id: string } },
+      Schema.Schema.Encoded<S> & { readonly id: string; readonly _relation: { readonly id: string } },
+      never
+    >;
 
     return Schema.Array(schemaWithId).pipe(
       Schema.annotations({

packages/hypergraph/src/utils/addIdSchemaField.ts

@@ -0,0 +1,8 @@
+import * as Schema from 'effect/Schema';
+
+export const addIdSchemaField = <S extends Schema.Schema.AnyNoContext>(schema: S) =>
+  Schema.asSchema(Schema.extend(Schema.Struct({ id: Schema.String }))(schema)) as Schema.Schema<
+    Schema.Schema.Type<S> & { readonly id: string },
+    Schema.Schema.Encoded<S> & { readonly id: string },
+    never
+  >;

packages/hypergraph/src/utils/index.ts

@@ -1,3 +1,4 @@
+export * from './addIdSchemaField.js';
 export * from './assertExhaustive.js';
 export * from './automergeId.js';
 export * from './base58.js';