cleanup

Author: nikgraf

packages/hypergraph-react/src/hooks/use-create-entity.ts

@@ -15,5 +15,5 @@ export function useCreateEntity<const S extends Schema.Schema.AnyNoContext>(type
       throw new Error('Space not found or not ready');
     };
   }
-  return Entity.createNew(handle, type);
+  return Entity.create(handle, type);
 }

packages/hypergraph/src/entity/create.ts

@@ -1,14 +1,13 @@
 import type { DocHandle } from '@automerge/automerge-repo';
 import * as Option from 'effect/Option';
-import * as Schema from 'effect/Schema';
+import type * as Schema from 'effect/Schema';
 import * as SchemaAST from 'effect/SchemaAST';
 import { PropertyIdSymbol } from '../constants.js';
 import { generateId } from '../utils/generateId.js';
 import { isRelation } from '../utils/isRelation.js';
-import { isRelationField } from '../utils/isRelationField.js';
 import { encodeToGrc20Json } from './entity.js';
 import { findOne } from './findOne.js';
-import type { AnyNoContext, DocumentContent, DocumentRelation, Entity, Insert } from './types.js';
+import type { DocumentContent, DocumentRelation, Entity } from './types.js';
 
 /**
  * Type utility to transform relation fields to accept string arrays instead of their typed values
@@ -26,59 +25,7 @@ type WithRelationsAsStringArrays<T> = {
       : T[K];
 };
 
-/**
- * Creates an entity model of given type and stores it in the repo.
- */
-export const create = <const S extends AnyNoContext>(handle: DocHandle<DocumentContent>, type: S) => {
-  // TODO: what's the right way to get the name of the type?
-  // @ts-expect-error name is defined
-  const typeName = type.name;
-  const encode = Schema.encodeSync(type.insert);
-
-  return (data: Readonly<Schema.Schema.Type<Insert<S>>>): Entity<S> => {
-    const entityId = generateId();
-    const encoded = encode(data);
-
-    const relations: Record<string, DocumentRelation> = {};
-
-    for (const [propertyName, field] of Object.entries(type.fields)) {
-      if (isRelationField(field) && encoded[propertyName]) {
-        for (const toEntityId of encoded[propertyName]) {
-          const relationId = generateId();
-          relations[relationId] = {
-            from: entityId,
-            to: toEntityId,
-            fromTypeName: typeName,
-            fromPropertyName: propertyName,
-            __deleted: false,
-          };
-        }
-        // we create the relation object in the repo, so we don't need it in the entity
-        delete encoded[propertyName];
-      }
-    }
-
-    // apply changes to the repo -> adds the entity to the repo entities document
-    handle.change((doc) => {
-      doc.entities ??= {};
-      doc.entities[entityId] = {
-        ...encoded,
-        '@@types@@': [typeName],
-        __deleted: false,
-        __version: '',
-      };
-      doc.relations ??= {};
-      // merge relations with existing relations
-      for (const [relationId, relation] of Object.entries(relations)) {
-        doc.relations[relationId] = relation;
-      }
-    });
-
-    return findOne(handle, type)(entityId) as Entity<S>;
-  };
-};
-
-export const createNew = <const S extends Schema.Schema.AnyNoContext>(handle: DocHandle<DocumentContent>, type: S) => {
+export const create = <const S extends Schema.Schema.AnyNoContext>(handle: DocHandle<DocumentContent>, type: S) => {
   return (data: Readonly<WithRelationsAsStringArrays<Schema.Schema.Type<S>>>): Entity<S> => {
     const entityId = generateId();
     const encoded = encodeToGrc20Json(type, { ...data, id: entityId });

packages/hypergraph/src/entity/findMany.ts

@@ -444,13 +444,6 @@ export function subscribeToFindMany<const S extends Schema.Schema.AnyNoContext>(
     return query.data;
   };
 
-  // const allTypes = new Set<S>();
-  // for (const [_key, field] of Object.entries(type.fields)) {
-  //   if (isRelationField(field)) {
-  //     allTypes.add(field as S);
-  //   }
-  // }
-
   const subscribe = (callback: () => void) => {
     let cacheEntry = decodedEntitiesCache.get(canonicalize(typeIds));
 

packages/hypergraph/src/entity/getEntityRelations.ts

@@ -4,6 +4,7 @@ import * as SchemaAST from 'effect/SchemaAST';
 import { PropertyIdSymbol, RelationSchemaSymbol } from '../constants.js';
 import { isRelation } from '../utils/isRelation.js';
 import { decodeFromGrc20Json } from './entity.js';
+import { hasValidTypesProperty } from './hasValidTypesProperty.js';
 import type { DocumentContent, Entity } from './types.js';
 
 export const getEntityRelations = <const S extends Schema.Schema.AnyNoContext>(
@@ -38,8 +39,7 @@ export const getEntityRelations = <const S extends Schema.Schema.AnyNoContext>(
 
         const relationEntity = doc.entities?.[relation.to];
         const decodedRelationEntity = { ...decodeFromGrc20Json(schema.value, { ...relationEntity, id: relation.to }) };
-        // TODO: should we check if the relation entity is valid?
-        // if (!hasValidTypesProperty(relationEntity)) continue;
+        if (!hasValidTypesProperty(relationEntity)) continue;
 
         relationEntities.push({ ...decodedRelationEntity, id: relation.to, _relation: { id: relationId } });
       }

packages/hypergraph/src/utils/index.ts

@@ -4,6 +4,5 @@ export * from './base58.js';
 export * from './generateId.js';
 export * from './hexBytesAddressUtils.js';
 export * from './isRelation.js';
-export * from './isRelationField.js';
 export * from './jsc.js';
 export * from './stringToUint8Array.js';