re-implement filters

Author: nikgraf

apps/events/src/components/event.tsx

@@ -13,7 +13,7 @@ export const Event = ({ spaceId, entityId }: { spaceId: string; entityId: string
     space: spaceId,
   });
 
-  console.log({ component: 'Event', isPending, isError, data });
+  // console.log({ component: 'Event', isPending, isError, data });
 
   return (
     <div>

apps/events/src/components/playground.tsx

@@ -11,9 +11,10 @@ export const Playground = ({ spaceId }: { spaceId: string }) => {
         jobOffers: {},
       },
     },
-    // filter: {
-    //   or: [{ name: { startsWith: 'test' } }, { name: { startsWith: 'ETH' } }],
-    // },
+    filter: {
+      or: [{ name: { startsWith: 'My' } }, { name: { startsWith: 'ETH' } }],
+    },
+    // filter: { name: { startsWith: 'My Test Event' } },
     first: 100,
     space: spaceId,
   });

packages/hypergraph-react/src/internal/translate-filter-to-graphql.ts

@@ -1,6 +1,6 @@
 import { Graph } from '@graphprotocol/grc-20';
-import { type Entity, TypeUtils } from '@graphprotocol/hypergraph';
-import { PropertyIdSymbol } from '@graphprotocol/hypergraph/constants';
+import { Constants, type Entity } from '@graphprotocol/hypergraph';
+import * as Option from 'effect/Option';
 import type * as Schema from 'effect/Schema';
 import * as SchemaAST from 'effect/SchemaAST';
 
@@ -72,17 +72,19 @@ export function translateFilterToGraphql<S extends Schema.Schema.AnyNoContext>(
     if (!propertySignature) continue;
 
     // find the property id for the field
-    const propertyId = SchemaAST.getAnnotation<string>(PropertyIdSymbol)(propertySignature.type);
-    if (!propertyId) continue;
+    const propertyId = SchemaAST.getAnnotation<string>(Constants.PropertyIdSymbol)(propertySignature.type);
+    const propertyType = SchemaAST.getAnnotation<string>(Constants.PropertyTypeSymbol)(propertySignature.type);
+
+    if (!Option.isSome(propertyId) || !Option.isSome(propertyType)) continue;
 
     if (
-      TypeUtils.isStringOrOptionalStringType(type.fields[fieldName]) &&
+      propertyType.value === 'string' &&
       (fieldFilter.is || fieldFilter.startsWith || fieldFilter.endsWith || fieldFilter.contains)
     ) {
       graphqlFilter.push({
         values: {
           some: {
-            propertyId: { is: propertyId },
+            propertyId: { is: propertyId.value },
             string: fieldFilter.is
               ? { is: fieldFilter.is }
               : fieldFilter.startsWith
@@ -95,25 +97,22 @@ export function translateFilterToGraphql<S extends Schema.Schema.AnyNoContext>(
       });
     }
 
-    if (TypeUtils.isBooleanOrOptionalBooleanType(type.fields[fieldName]) && fieldFilter.is) {
+    if (propertyType.value === 'boolean' && fieldFilter.is) {
       graphqlFilter.push({
         values: {
           some: {
-            propertyId: { is: propertyId },
+            propertyId: { is: propertyId.value },
             boolean: { is: fieldFilter.is },
           },
         },
       });
     }
 
-    if (
-      TypeUtils.isNumberOrOptionalNumberType(type.fields[fieldName]) &&
-      (fieldFilter.is || fieldFilter.greaterThan || fieldFilter.lessThan)
-    ) {
+    if (propertyType.value === 'number' && (fieldFilter.is || fieldFilter.greaterThan || fieldFilter.lessThan)) {
       graphqlFilter.push({
         values: {
           some: {
-            propertyId: { is: propertyId },
+            propertyId: { is: propertyId.value },
             number: fieldFilter.is
               ? { is: Graph.serializeNumber(fieldFilter.is) }
               : fieldFilter.greaterThan

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

@@ -204,19 +204,16 @@ export const parseResult = <S extends Schema.Schema.AnyNoContext>(queryData: Ent
     ...convertRelations(queryEntity, ast),
   };
 
-  console.log('rawEntity', rawEntity);
-
   const decodeResult = decode({
     ...rawEntity,
     __deleted: false,
     // __version: queryEntity.currentVersion.versionId,
     __version: '',
   });
 
-  console.log('decodeResult', decodeResult);
-
   if (Either.isRight(decodeResult)) {
     return {
+      // injecting the schema to the entity to be able to access it in the preparePublish function
       data: { ...decodeResult.right, __schema: type } as Entity.Entity<S>,
       invalidEntity: null,
     };

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

@@ -227,7 +227,7 @@ export const parseResult = <S extends Schema.Schema.AnyNoContext>(queryData: Ent
     });
 
     if (Either.isRight(decodeResult)) {
-      // TODO: do we need __schema here?
+      // injecting the schema to the entity to be able to access it in the preparePublish function
       data.push({ ...decodeResult.right, __schema: type });
     } else {
       invalidEntities.push(rawEntity);
@@ -267,13 +267,16 @@ export const useQueryPublic = <S extends Schema.Schema.AnyNoContext>(type: S, pa
         queryDocument = entitiesQueryDocumentLevel2;
       }
 
+      const filterResult = filter ? translateFilterToGraphql(filter, type) : {};
+      console.log('filterResult', filterResult);
+
       const result = await request<EntityQueryResult>(`${Graph.TESTNET_API_ORIGIN}/graphql`, queryDocument, {
         spaceId: space,
         typeIds,
         relationTypeIdsLevel1: relationTypeIds.level1,
         relationTypeIdsLevel2: relationTypeIds.level2,
         first,
-        filter: filter ? translateFilterToGraphql(filter, type) : {},
+        filter: filterResult,
       });
       return result;
     },

packages/hypergraph-react/src/prepare-publish.ts

@@ -7,7 +7,7 @@ import {
   type RelationsParam,
 } from '@graphprotocol/grc-20';
 import type { Entity } from '@graphprotocol/hypergraph';
-import { store, TypeUtils } from '@graphprotocol/hypergraph';
+import { store } from '@graphprotocol/hypergraph';
 import type * as Schema from 'effect/Schema';
 import request, { gql } from 'graphql-request';