fix types

Author: nikgraf

packages/hypergraph-react/src/internal/convert-relations.ts

@@ -26,19 +26,31 @@ type RecursiveQueryEntity = {
   }[];
 };
 
+type RawEntityValue = string | boolean | number | unknown[] | Date | { id: string };
+type RawEntity = Record<string, RawEntityValue>;
+type NestedRawEntity = RawEntity & { _relation: { id: string } };
+
 export const convertRelations = <S extends Schema.Schema.AnyNoContext>(
   queryEntity: RecursiveQueryEntity,
   ast: SchemaAST.TypeLiteral,
 ) => {
-  const rawEntity: Record<string, string | boolean | number | unknown[] | Date> = {};
+  const rawEntity: RawEntity = {};
 
   for (const prop of ast.propertySignatures) {
     const result = SchemaAST.getAnnotation<string>(Constants.PropertyIdSymbol)(prop.type);
 
     if (Utils.isRelation(prop.type) && Option.isSome(result)) {
       rawEntity[String(prop.name)] = [];
 
-      const relationTransformation = prop.type.rest?.[0]?.type;
+      if (!SchemaAST.isTupleType(prop.type)) {
+        continue;
+      }
+      const relationType = prop.type;
+      const relationTransformation = relationType.rest[0]?.type;
+      if (!relationTransformation || !SchemaAST.isTypeLiteral(relationTransformation)) {
+        continue;
+      }
+
       const typeIds: string[] = SchemaAST.getAnnotation<string[]>(Constants.TypeIdsSymbol)(relationTransformation).pipe(
         Option.getOrElse(() => []),
       );
@@ -51,9 +63,7 @@ export const convertRelations = <S extends Schema.Schema.AnyNoContext>(
       );
       if (allRelationsWithTheCorrectPropertyTypeId) {
         for (const relationEntry of allRelationsWithTheCorrectPropertyTypeId) {
-          let nestedRawEntity:
-            | Record<string, string | boolean | number | unknown[] | Date>
-            | { _relation: { id: string } } = {
+          let nestedRawEntity: NestedRawEntity = {
             id: relationEntry.toEntity.id,
             _relation: {
               id: relationEntry.id,

packages/hypergraph-react/src/internal/get-relation-type-ids.ts

@@ -18,9 +18,15 @@ export const getRelationTypeIds = (
     if (!Utils.isRelation(prop.type)) continue;
 
     const result = SchemaAST.getAnnotation<string>(Constants.PropertyIdSymbol)(prop.type);
-    if (Option.isSome(result) && include?.[prop.name]) {
+    if (Option.isSome(result) && include?.[String(prop.name)]) {
       relationTypeIdsLevel1.push(result.value);
-      const relationTransformation = prop.type.rest?.[0]?.type;
+      if (!SchemaAST.isTupleType(prop.type)) {
+        continue;
+      }
+      const relationTransformation = prop.type.rest[0]?.type;
+      if (!relationTransformation || !SchemaAST.isTypeLiteral(relationTransformation)) {
+        continue;
+      }
       const typeIds2: string[] = SchemaAST.getAnnotation<string[]>(Constants.TypeIdsSymbol)(
         relationTransformation,
       ).pipe(Option.getOrElse(() => []));
@@ -31,7 +37,7 @@ export const getRelationTypeIds = (
         if (!Utils.isRelation(nestedProp.type)) continue;
 
         const nestedResult = SchemaAST.getAnnotation<string>(Constants.PropertyIdSymbol)(nestedProp.type);
-        if (Option.isSome(nestedResult) && include?.[prop.name][nestedProp.name]) {
+        if (Option.isSome(nestedResult) && include?.[String(prop.name)]?.[String(nestedProp.name)]) {
           relationTypeIdsLevel2.push(nestedResult.value);
         }
       }