@graphprotocol/grc-20 0.11.4 → 0.12.0

package/dist/src/graph/create-entity.d.ts

@@ -1,8 +1,4 @@
-import type { CreateResult, DefaultProperties, PropertiesParam } from '../types.js';
-type CreateEntityParams = DefaultProperties & {
-    properties?: PropertiesParam;
-    types?: Array<string>;
-};
+import type { CreateResult, EntityParams } from '../types.js';
 /**
  * Creates an entity with the given name, description, cover, properties, and types.
  * All IDs passed to this function (cover, types, property IDs, relation IDs, etc.) are validated.
@@ -11,39 +7,46 @@ type CreateEntityParams = DefaultProperties & {
  * @example
  * ```ts
  * const { id, ops } = createEntity({
+ *   id: entityId, // optional and will be generated if not provided
  *   name: 'name of the entity',
  *   description: 'description of the entity',
  *   cover: imageEntityId,
  *   types: [typeEntityId1, typeEntityId2],
- *   id: entityId, // optional and will be generated if not provided
- *   properties: {
+ *   values: {
  *     // value property like text, number, url, time, point, checkbox
  *     [propertyId]: {
- *       type: 'TEXT', // TEXT | NUMBER | URL | TIME | POINT | CHECKBOX,
  *       value: 'value of the property',
- *     },
- *     // relation property
- *     [propertyId]: {
+ *     }
+ *   },
+ *   relations: {
+ *     [relationId]: {
  *       to: 'id of the entity',
- *       relationId: 'id of the relation', // optional
+ *       id: 'id of the relation', // optional
+ *       toSpace: 'id of the to space', // optional
  *       position: positionString, // optional
- *       properties: { // optional properties for the relation
+ *       entityId: 'id of the relation entity', // optional and will be generated if not provided
+ *       entityName: 'name of the relation entity', // optional
+ *       entityDescription: 'description of the relation entity', // optional
+ *       entityCover: 'id of the cover', // optional
+ *       entityValues: { // optional values for the relation entity
  *         [propertyId]: {
- *           type: 'TEXT', // TEXT | NUMBER | URL | TIME | POINT | CHECKBOX,
  *           value: 'value of the property',
  *         },
- *         [propertyId]: {
+ *       },
+ *       entityRelations: {
+ *         [relationId]: {
  *           to: 'id of the entity',
+ *           id: 'id of the relation', // optional
+ *           position: positionString, // optional
  *         },
  *       },
  *     },
  *   },
  * });
  * ```
- * @param params – {@link CreateEntityParams}
+ * @param params – {@link EntityParams}
  * @returns – {@link CreateResult}
  * @throws Will throw an error if any provided ID is invalid
  */
-export declare const createEntity: ({ id: providedId, name, description, cover, properties, types }: CreateEntityParams) => CreateResult;
-export {};
+export declare const createEntity: ({ id: providedId, name, description, cover, values, relations, types, }: EntityParams) => CreateResult;
 //# sourceMappingURL=create-entity.d.ts.map

package/dist/src/graph/create-entity.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"create-entity.d.ts","sourceRoot":"","sources":["../../../src/graph/create-entity.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,YAAY,EAAE,iBAAiB,EAAM,eAAe,EAAE,MAAM,aAAa,CAAC;AAGxF,KAAK,kBAAkB,GAAG,iBAAiB,GAAG;IAC5C,UAAU,CAAC,EAAE,eAAe,CAAC;IAC7B,KAAK,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;CACvB,CAAC;AAEF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAwCG;AACH,eAAO,MAAM,YAAY,GAAI,iEAAiE,kBAAkB,KAAG,YA2BlH,CAAC"}
+{"version":3,"file":"create-entity.d.ts","sourceRoot":"","sources":["../../../src/graph/create-entity.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,YAAY,EAA6B,MAAM,aAAa,CAAC;AAGzF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgDG;AACH,eAAO,MAAM,YAAY,GAAI,yEAQ1B,YAAY,KAAG,YA4FjB,CAAC"}

package/dist/src/graph/create-entity.js

@@ -1,8 +1,6 @@
-import { TYPES_PROPERTY } from '../core/ids/system.js';
-import { assertValid, generate } from '../id.js';
-import { Relation } from '../relation.js';
-import { createDefaultProperties } from './helpers/create-default-properties.js';
-import { createProperties } from './helpers/create-properties.js';
+import { COVER_PROPERTY, DESCRIPTION_PROPERTY, NAME_PROPERTY, TYPES_PROPERTY } from '../core/ids/system.js';
+import { Id, assertValid, generate, toBase64 } from '../id.js';
+import { createRelation } from './create-relation.js';
 /**
  * Creates an entity with the given name, description, cover, properties, and types.
  * All IDs passed to this function (cover, types, property IDs, relation IDs, etc.) are validated.
@@ -11,60 +9,131 @@ import { createProperties } from './helpers/create-properties.js';
  * @example
  * ```ts
  * const { id, ops } = createEntity({
+ *   id: entityId, // optional and will be generated if not provided
  *   name: 'name of the entity',
  *   description: 'description of the entity',
  *   cover: imageEntityId,
  *   types: [typeEntityId1, typeEntityId2],
- *   id: entityId, // optional and will be generated if not provided
- *   properties: {
+ *   values: {
  *     // value property like text, number, url, time, point, checkbox
  *     [propertyId]: {
- *       type: 'TEXT', // TEXT | NUMBER | URL | TIME | POINT | CHECKBOX,
  *       value: 'value of the property',
- *     },
- *     // relation property
- *     [propertyId]: {
+ *     }
+ *   },
+ *   relations: {
+ *     [relationId]: {
  *       to: 'id of the entity',
- *       relationId: 'id of the relation', // optional
+ *       id: 'id of the relation', // optional
+ *       toSpace: 'id of the to space', // optional
  *       position: positionString, // optional
- *       properties: { // optional properties for the relation
+ *       entityId: 'id of the relation entity', // optional and will be generated if not provided
+ *       entityName: 'name of the relation entity', // optional
+ *       entityDescription: 'description of the relation entity', // optional
+ *       entityCover: 'id of the cover', // optional
+ *       entityValues: { // optional values for the relation entity
  *         [propertyId]: {
- *           type: 'TEXT', // TEXT | NUMBER | URL | TIME | POINT | CHECKBOX,
  *           value: 'value of the property',
  *         },
- *         [propertyId]: {
+ *       },
+ *       entityRelations: {
+ *         [relationId]: {
  *           to: 'id of the entity',
+ *           id: 'id of the relation', // optional
+ *           position: positionString, // optional
  *         },
  *       },
  *     },
  *   },
  * });
  * ```
- * @param params – {@link CreateEntityParams}
+ * @param params – {@link EntityParams}
  * @returns – {@link CreateResult}
  * @throws Will throw an error if any provided ID is invalid
  */
-export const createEntity = ({ id: providedId, name, description, cover, properties, types }) => {
+export const createEntity = ({ id: providedId, name, description, cover, values, relations, types, }) => {
     if (providedId) {
         assertValid(providedId, '`id` in `createEntity`');
     }
     const id = providedId ?? generate();
-    const ops = [];
-    ops.push(...createDefaultProperties({ entityId: id, name, description, cover }));
-    // add property "Types" to the provided types
+    let ops = [];
+    const newValues = [];
+    if (name) {
+        newValues.push({
+            propertyId: toBase64(NAME_PROPERTY),
+            value: name,
+        });
+    }
+    if (description) {
+        newValues.push({
+            propertyId: toBase64(DESCRIPTION_PROPERTY),
+            value: description,
+        });
+    }
+    for (const [key, value] of Object.entries(values ?? {})) {
+        newValues.push({
+            propertyId: toBase64(Id(key)),
+            value: value.value,
+        });
+    }
+    const op = {
+        type: 'UPDATE_ENTITY',
+        entity: {
+            id: toBase64(id),
+            values: newValues,
+        },
+    };
+    ops.push(op);
+    if (cover) {
+        assertValid(cover);
+        ops.push({
+            type: 'CREATE_RELATION',
+            relation: {
+                id: toBase64(generate()),
+                entity: toBase64(generate()),
+                fromEntity: toBase64(id),
+                toEntity: toBase64(cover),
+                type: toBase64(COVER_PROPERTY),
+            },
+        });
+    }
     if (types) {
         for (const typeId of types) {
             assertValid(typeId);
-            const typeRelationOp = Relation.make({
-                fromId: id,
-                relationTypeId: TYPES_PROPERTY,
-                toId: typeId,
+            ops.push({
+                type: 'CREATE_RELATION',
+                relation: {
+                    id: toBase64(generate()),
+                    entity: toBase64(generate()),
+                    fromEntity: toBase64(id),
+                    toEntity: toBase64(typeId),
+                    type: toBase64(TYPES_PROPERTY),
+                },
             });
-            ops.push(typeRelationOp);
         }
     }
-    if (properties) {
-        ops.push(...createProperties({ entityId: id, properties }));
+    for (const [typeId, value] of Object.entries(relations ?? {})) {
+        const relationsEntries = Array.isArray(value) ? value : [value];
+        for (const relation of relationsEntries) {
+            const relationId = relation.relationId ?? generate();
+            assertValid(relationId);
+            const relationEntityId = relation.id ?? generate();
+            assertValid(relationEntityId);
+            const { ops: relationOps } = createRelation({
+                fromEntity: id,
+                toEntity: relation.toEntity,
+                type: Id(typeId),
+                position: relation.position,
+                toSpace: relation.toSpace,
+                entityId: relationEntityId,
+                entityName: relation.entityName,
+                entityDescription: relation.entityDescription,
+                entityCover: relation.entityCover,
+                entityValues: relation.entityValues,
+                entityRelations: relation.entityRelations,
+                entityTypes: relation.entityTypes,
+            });
+            ops = ops.concat(relationOps);
+        }
     }
     return { id, ops };
 };

package/dist/src/graph/create-entity.js.map

@@ -1 +1 @@
-{"version":3,"file":"create-entity.js","sourceRoot":"","sources":["../../../src/graph/create-entity.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AACjD,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAE1C,OAAO,EAAE,uBAAuB,EAAE,MAAM,wCAAwC,CAAC;AACjF,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAMlE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAwCG;AACH,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,EAAE,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,WAAW,EAAE,KAAK,EAAE,UAAU,EAAE,KAAK,EAAsB,EAAgB,EAAE;IAChI,IAAI,UAAU,EAAE,CAAC;QACf,WAAW,CAAC,UAAU,EAAE,wBAAwB,CAAC,CAAC;IACpD,CAAC;IACD,MAAM,EAAE,GAAG,UAAU,IAAI,QAAQ,EAAE,CAAC;IACpC,MAAM,GAAG,GAAc,EAAE,CAAC;IAE1B,GAAG,CAAC,IAAI,CAAC,GAAG,uBAAuB,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;IAEjF,6CAA6C;IAC7C,IAAI,KAAK,EAAE,CAAC;QACV,KAAK,MAAM,MAAM,IAAI,KAAK,EAAE,CAAC;YAC3B,WAAW,CAAC,MAAM,CAAC,CAAC;YACpB,MAAM,cAAc,GAAG,QAAQ,CAAC,IAAI,CAAC;gBACnC,MAAM,EAAE,EAAE;gBACV,cAAc,EAAE,cAAc;gBAC9B,IAAI,EAAE,MAAM;aACb,CAAC,CAAC;YACH,GAAG,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QAC3B,CAAC;IACH,CAAC;IAED,IAAI,UAAU,EAAE,CAAC;QACf,GAAG,CAAC,IAAI,CAAC,GAAG,gBAAgB,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC;IAC9D,CAAC;IAED,OAAO,EAAE,EAAE,EAAE,GAAG,EAAE,CAAC;AACrB,CAAC,CAAC"}
+{"version":3,"file":"create-entity.js","sourceRoot":"","sources":["../../../src/graph/create-entity.ts"],"names":[],"mappings":"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"}

package/dist/src/graph/create-entity.test.js

@@ -1,19 +1,23 @@
 import { describe, expect, it } from 'vitest';
-import { AUTHORS_PROPERTY, CLAIM_TYPE, DISCLAIMER_PROPERTY, NEWS_STORY_TYPE, ROLES_PROPERTY, WEB_URL_PROPERTY, } from '../core/ids/content.js';
-import { NAME_PROPERTY, TYPES_PROPERTY } from '../core/ids/system.js';
-import { Id, generate } from '../id.js';
+import { CLAIM_TYPE, NEWS_STORY_TYPE } from '../core/ids/content.js';
+import { COVER_PROPERTY, DESCRIPTION_PROPERTY, NAME_PROPERTY, TYPES_PROPERTY } from '../core/ids/system.js';
+import { Id, toBase64 } from '../id.js';
 import { createEntity } from './create-entity.js';
 describe('createEntity', () => {
-    const someAuthorId = Id('M5uDP7nCw3nvfQPUryn9gx');
-    const someRoleId = Id('GscJ2GELQjmLoaVrYyR3xm');
-    const someRoleId2 = Id('VdTsW1mGiy1XSooJaBBLc4');
-    const coverId = Id('6wMJ7P1AHpu8EWFX3roMye');
+    const coverId = Id('30145d36-d5a5-4244-be59-3d111d879ba5');
     it('creates a basic entity without properties', async () => {
         const entity = createEntity({});
         expect(entity).toBeDefined();
         expect(typeof entity.id).toBe('string');
         expect(entity.ops).toBeDefined();
-        expect(entity.ops).toHaveLength(0);
+        expect(entity.ops).toHaveLength(1); // One UPDATE_ENTITY op
+        expect(entity.ops[0]).toMatchObject({
+            type: 'UPDATE_ENTITY',
+            entity: {
+                id: toBase64(entity.id),
+                values: [],
+            },
+        });
     });
     it('creates an entity with types', async () => {
         const entity = createEntity({
@@ -21,276 +25,128 @@ describe('createEntity', () => {
         });
         expect(entity).toBeDefined();
         expect(typeof entity.id).toBe('string');
-        expect(entity.ops).toHaveLength(2);
-        // Check first type relation
-        expect(entity.ops[0]?.type).toBe('CREATE_RELATION');
-        if (entity.ops[0]?.type === 'CREATE_RELATION') {
-            expect(entity.ops[0]).toMatchObject({
-                relation: {
-                    fromEntity: entity.id,
-                    id: entity.ops[0].relation?.id,
-                    index: entity.ops[0].relation?.index,
-                    toEntity: CLAIM_TYPE,
-                    type: TYPES_PROPERTY,
-                },
-                type: 'CREATE_RELATION',
-            });
-        }
-        // Check second type relation
-        expect(entity.ops[1]?.type).toBe('CREATE_RELATION');
-        if (entity.ops[1]?.type === 'CREATE_RELATION') {
-            expect(entity.ops[1]).toMatchObject({
-                relation: {
-                    fromEntity: entity.id,
-                    id: entity.ops[1]?.relation?.id,
-                    index: entity.ops[1]?.relation?.index,
-                    toEntity: NEWS_STORY_TYPE,
-                    type: TYPES_PROPERTY,
-                },
-                type: 'CREATE_RELATION',
-            });
-        }
-    });
-    it('creates an entity with only triple attributes', async () => {
-        const entity = createEntity({
-            name: 'Test Entity',
-            properties: {
-                [DISCLAIMER_PROPERTY]: { value: 'Test Entity', type: 'TEXT' },
-                [WEB_URL_PROPERTY]: { value: 'https://example.com', type: 'URL' },
-            },
-        });
-        expect(entity).toBeDefined();
-        expect(typeof entity.id).toBe('string');
-        expect(entity.ops).toHaveLength(3);
-        // Check triples
-        expect(entity.ops[0]?.type).toBe('SET_TRIPLE');
+        expect(entity.ops).toHaveLength(3); // One UPDATE_ENTITY + two CREATE_RELATION ops
+        // Check UPDATE_ENTITY op
         expect(entity.ops[0]).toMatchObject({
-            triple: {
-                attribute: NAME_PROPERTY,
-                entity: entity.id,
-                value: {
-                    type: 'TEXT',
-                    value: 'Test Entity',
-                },
+            type: 'UPDATE_ENTITY',
+            entity: {
+                id: toBase64(entity.id),
+                values: [],
             },
-            type: 'SET_TRIPLE',
         });
-        expect(entity.ops[1]?.type).toBe('SET_TRIPLE');
+        // Check first type relation
         expect(entity.ops[1]).toMatchObject({
-            triple: {
-                attribute: DISCLAIMER_PROPERTY,
-                entity: entity.id,
-                value: { type: 'TEXT', value: 'Test Entity' },
+            type: 'CREATE_RELATION',
+            relation: {
+                fromEntity: toBase64(entity.id),
+                toEntity: toBase64(CLAIM_TYPE),
+                type: toBase64(TYPES_PROPERTY),
             },
-            type: 'SET_TRIPLE',
         });
-        expect(entity.ops[2]?.type).toBe('SET_TRIPLE');
+        // Check second type relation
         expect(entity.ops[2]).toMatchObject({
-            triple: {
-                attribute: WEB_URL_PROPERTY,
-                entity: entity.id,
-                value: { type: 'URL', value: 'https://example.com' },
+            type: 'CREATE_RELATION',
+            relation: {
+                fromEntity: toBase64(entity.id),
+                toEntity: toBase64(NEWS_STORY_TYPE),
+                type: toBase64(TYPES_PROPERTY),
             },
-            type: 'SET_TRIPLE',
         });
     });
-    it('creates an entity with relations', async () => {
+    it('creates an entity with name and description', async () => {
         const entity = createEntity({
-            properties: {
-                [AUTHORS_PROPERTY]: { to: someAuthorId },
-                [ROLES_PROPERTY]: [{ to: someRoleId }, { to: someRoleId2 }],
-            },
+            name: 'Test Entity',
+            description: 'Test Description',
         });
         expect(entity).toBeDefined();
         expect(typeof entity.id).toBe('string');
-        expect(entity.ops).toHaveLength(3);
-        // Check relations
-        expect(entity.ops[0]?.type).toBe('CREATE_RELATION');
-        if (entity.ops[0]?.type === 'CREATE_RELATION') {
-            expect(entity.ops[0]).toMatchObject({
-                relation: {
-                    fromEntity: entity.id,
-                    id: entity.ops[0]?.relation?.id,
-                    index: entity.ops[0]?.relation?.index,
-                    toEntity: someAuthorId,
-                    type: AUTHORS_PROPERTY,
-                },
-                type: 'CREATE_RELATION',
-            });
-        }
-        expect(entity.ops[1]?.type).toBe('CREATE_RELATION');
-        if (entity.ops[1]?.type === 'CREATE_RELATION') {
-            expect(entity.ops[1]).toMatchObject({
-                relation: {
-                    fromEntity: entity.id,
-                    id: entity.ops[1]?.relation?.id,
-                    index: entity.ops[1]?.relation?.index,
-                    toEntity: someRoleId,
-                    type: ROLES_PROPERTY,
-                },
-                type: 'CREATE_RELATION',
-            });
-        }
-        expect(entity.ops[2]?.type).toBe('CREATE_RELATION');
-        if (entity.ops[2]?.type === 'CREATE_RELATION') {
-            expect(entity.ops[2]).toMatchObject({
-                relation: {
-                    fromEntity: entity.id,
-                    id: entity.ops[2]?.relation?.id,
-                    index: entity.ops[2]?.relation?.index,
-                    toEntity: someRoleId2,
-                    type: ROLES_PROPERTY,
-                },
-                type: 'CREATE_RELATION',
-            });
-        }
-    });
-    it('creates an entity with custom relation ids', async () => {
-        const authorRelationId = generate();
-        const firstRoleRelationId = generate();
-        const entity = createEntity({
-            properties: {
-                [AUTHORS_PROPERTY]: { to: someAuthorId, relationId: authorRelationId },
-                [ROLES_PROPERTY]: [{ to: someRoleId, relationId: firstRoleRelationId }, { to: someRoleId2 }],
+        expect(entity.ops).toHaveLength(1);
+        expect(entity.ops[0]).toMatchObject({
+            type: 'UPDATE_ENTITY',
+            entity: {
+                id: toBase64(entity.id),
+                values: [
+                    {
+                        propertyId: toBase64(NAME_PROPERTY),
+                        value: 'Test Entity',
+                    },
+                    {
+                        propertyId: toBase64(DESCRIPTION_PROPERTY),
+                        value: 'Test Description',
+                    },
+                ],
             },
         });
-        expect(entity.ops[0]?.type).toBe('CREATE_RELATION');
-        if (entity.ops[0]?.type === 'CREATE_RELATION') {
-            expect(entity.ops[0]).toMatchObject({
-                relation: {
-                    fromEntity: entity.id,
-                    id: authorRelationId,
-                    index: entity.ops[0]?.relation?.index,
-                    toEntity: someAuthorId,
-                    type: AUTHORS_PROPERTY,
-                },
-                type: 'CREATE_RELATION',
-            });
-        }
-        expect(entity.ops[1]?.type).toBe('CREATE_RELATION');
-        if (entity.ops[1]?.type === 'CREATE_RELATION') {
-            expect(entity.ops[1]).toMatchObject({
-                relation: {
-                    fromEntity: entity.id,
-                    id: firstRoleRelationId,
-                    index: entity.ops[1]?.relation?.index,
-                    toEntity: someRoleId,
-                    type: ROLES_PROPERTY,
-                },
-                type: 'CREATE_RELATION',
-            });
-        }
     });
-    it('creates an entity with a nested properties', async () => {
-        const authorRelationId = generate();
-        const roleRelationId = generate();
-        const newsStoryRelationId = generate();
+    it('creates an entity with cover', async () => {
         const entity = createEntity({
-            properties: {
-                [AUTHORS_PROPERTY]: {
-                    to: someAuthorId,
-                    relationId: authorRelationId,
-                    properties: {
-                        [ROLES_PROPERTY]: {
-                            to: someRoleId,
-                            relationId: roleRelationId,
-                            properties: {
-                                [NEWS_STORY_TYPE]: {
-                                    to: someRoleId2,
-                                    relationId: newsStoryRelationId,
-                                },
-                                [WEB_URL_PROPERTY]: {
-                                    value: 'https://example.com',
-                                    type: 'URL',
-                                },
-                            },
-                        },
-                    },
-                },
+            cover: coverId,
+        });
+        expect(entity).toBeDefined();
+        expect(typeof entity.id).toBe('string');
+        expect(entity.ops).toHaveLength(2);
+        // Check UPDATE_ENTITY op
+        expect(entity.ops[0]).toMatchObject({
+            type: 'UPDATE_ENTITY',
+            entity: {
+                id: toBase64(entity.id),
+                values: [],
+            },
+        });
+        // Check cover relation
+        expect(entity.ops[1]).toMatchObject({
+            type: 'CREATE_RELATION',
+            relation: {
+                fromEntity: toBase64(entity.id),
+                toEntity: toBase64(coverId),
+                type: toBase64(COVER_PROPERTY),
             },
         });
-        expect(entity.ops[0]?.type).toBe('CREATE_RELATION');
-        if (entity.ops[0]?.type === 'CREATE_RELATION') {
-            expect(entity.ops[0]).toMatchObject({
-                relation: {
-                    fromEntity: entity.id,
-                    id: authorRelationId,
-                    index: entity.ops[0]?.relation?.index,
-                    toEntity: someAuthorId,
-                    type: AUTHORS_PROPERTY,
-                },
-                type: 'CREATE_RELATION',
-            });
-        }
-        expect(entity.ops[1]?.type).toBe('CREATE_RELATION');
-        if (entity.ops[1]?.type === 'CREATE_RELATION') {
-            expect(entity.ops[1]).toMatchObject({
-                relation: {
-                    fromEntity: entity.id,
-                    id: roleRelationId,
-                    index: entity.ops[1]?.relation?.index,
-                    toEntity: someRoleId,
-                    type: ROLES_PROPERTY,
-                },
-                type: 'CREATE_RELATION',
-            });
-        }
-        expect(entity.ops[2]?.type).toBe('CREATE_RELATION');
-        if (entity.ops[2]?.type === 'CREATE_RELATION') {
-            expect(entity.ops[2]).toMatchObject({
-                relation: {
-                    fromEntity: entity.id,
-                    id: newsStoryRelationId,
-                    index: entity.ops[2]?.relation?.index,
-                    toEntity: someRoleId2,
-                    type: NEWS_STORY_TYPE,
-                },
-                type: 'CREATE_RELATION',
-            });
-        }
-        expect(entity.ops[3]?.type).toBe('SET_TRIPLE');
-        if (entity.ops[3]?.type === 'SET_TRIPLE') {
-            expect(entity.ops[3]).toMatchObject({
-                triple: {
-                    attribute: WEB_URL_PROPERTY,
-                    entity: entity.id,
-                    value: { type: 'URL', value: 'https://example.com' },
-                },
-                type: 'SET_TRIPLE',
-            });
-        }
     });
-    it('creates an entity with types, triples, and relations', async () => {
+    it('creates an entity with custom values', async () => {
+        const customPropertyId = Id('fa269fd3-de98-49cf-90c4-4235d905a67c');
         const entity = createEntity({
-            name: 'Yummy Coffee',
-            description: 'A delicious coffee shop with great food and great coffee',
-            cover: coverId,
-            types: [CLAIM_TYPE, NEWS_STORY_TYPE],
-            properties: {
-                [DISCLAIMER_PROPERTY]: { value: 'Test Entity', type: 'TEXT' },
-                [WEB_URL_PROPERTY]: { value: 'https://example.com', type: 'URL' },
-                [AUTHORS_PROPERTY]: { to: someAuthorId },
-                [ROLES_PROPERTY]: { to: someRoleId },
+            values: {
+                [customPropertyId]: {
+                    value: 'custom value',
+                },
             },
         });
         expect(entity).toBeDefined();
         expect(typeof entity.id).toBe('string');
-        expect(entity.ops).toHaveLength(9);
+        expect(entity.ops).toHaveLength(1);
+        expect(entity.ops[0]).toMatchObject({
+            type: 'UPDATE_ENTITY',
+            entity: {
+                id: toBase64(entity.id),
+                values: [
+                    {
+                        propertyId: toBase64(customPropertyId),
+                        value: 'custom value',
+                    },
+                ],
+            },
+        });
     });
     it('creates an entity with a provided id', async () => {
+        const providedId = Id('b1dc6e5c-63e1-43ba-b3d4-755b251a4ea1');
         const entity = createEntity({
-            id: Id('WeUPYRkhnQLmHPH4S1ioc4'),
-            name: 'Yummy Coffee',
+            id: providedId,
+            name: 'Test Entity',
         });
         expect(entity).toBeDefined();
-        expect(entity.id).toBe('WeUPYRkhnQLmHPH4S1ioc4');
+        expect(entity.id).toBe(providedId);
         expect(entity.ops).toHaveLength(1);
         expect(entity.ops[0]).toMatchObject({
-            type: 'SET_TRIPLE',
-            triple: {
-                attribute: NAME_PROPERTY,
-                entity: entity.id,
-                value: { type: 'TEXT', value: 'Yummy Coffee' },
+            type: 'UPDATE_ENTITY',
+            entity: {
+                id: toBase64(providedId),
+                values: [
+                    {
+                        propertyId: toBase64(NAME_PROPERTY),
+                        value: 'Test Entity',
+                    },
+                ],
             },
         });
     });