@graphprotocol/grc-20 0.13.0 → 0.14.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (65) hide show
  1. package/README.md +54 -25
  2. package/dist/src/core/account.d.ts.map +1 -1
  3. package/dist/src/core/account.js +10 -4
  4. package/dist/src/core/account.js.map +1 -1
  5. package/dist/src/core/account.test.js +2 -2
  6. package/dist/src/core/account.test.js.map +1 -1
  7. package/dist/src/core/blocks/data.d.ts.map +1 -1
  8. package/dist/src/core/blocks/data.js +6 -3
  9. package/dist/src/core/blocks/data.js.map +1 -1
  10. package/dist/src/core/blocks/data.test.js +1 -1
  11. package/dist/src/core/blocks/data.test.js.map +1 -1
  12. package/dist/src/core/blocks/text.d.ts.map +1 -1
  13. package/dist/src/core/blocks/text.js +6 -3
  14. package/dist/src/core/blocks/text.js.map +1 -1
  15. package/dist/src/core/blocks/text.test.js +1 -1
  16. package/dist/src/core/blocks/text.test.js.map +1 -1
  17. package/dist/src/graph/create-entity.d.ts +6 -8
  18. package/dist/src/graph/create-entity.d.ts.map +1 -1
  19. package/dist/src/graph/create-entity.js +99 -49
  20. package/dist/src/graph/create-entity.js.map +1 -1
  21. package/dist/src/graph/create-entity.test.js +232 -19
  22. package/dist/src/graph/create-entity.test.js.map +1 -1
  23. package/dist/src/graph/create-image.d.ts.map +1 -1
  24. package/dist/src/graph/create-image.js +13 -4
  25. package/dist/src/graph/create-image.js.map +1 -1
  26. package/dist/src/graph/create-image.test.js +4 -4
  27. package/dist/src/graph/create-image.test.js.map +1 -1
  28. package/dist/src/graph/create-relation.test.js +2 -2
  29. package/dist/src/graph/create-relation.test.js.map +1 -1
  30. package/dist/src/graph/create-type.test.js +2 -2
  31. package/dist/src/graph/create-type.test.js.map +1 -1
  32. package/dist/src/graph/index.d.ts +1 -0
  33. package/dist/src/graph/index.d.ts.map +1 -1
  34. package/dist/src/graph/index.js +1 -0
  35. package/dist/src/graph/index.js.map +1 -1
  36. package/dist/src/graph/serialize.d.ts +5 -0
  37. package/dist/src/graph/serialize.d.ts.map +1 -0
  38. package/dist/src/graph/serialize.js +13 -0
  39. package/dist/src/graph/serialize.js.map +1 -0
  40. package/dist/src/graph/serialize.test.d.ts +2 -0
  41. package/dist/src/graph/serialize.test.d.ts.map +1 -0
  42. package/dist/src/graph/serialize.test.js +49 -0
  43. package/dist/src/graph/serialize.test.js.map +1 -0
  44. package/dist/src/graph/update-entity.d.ts +4 -4
  45. package/dist/src/graph/update-entity.d.ts.map +1 -1
  46. package/dist/src/graph/update-entity.js +43 -11
  47. package/dist/src/graph/update-entity.js.map +1 -1
  48. package/dist/src/graph/update-entity.test.js +5 -7
  49. package/dist/src/graph/update-entity.test.js.map +1 -1
  50. package/dist/src/ipfs.test.js +6 -3
  51. package/dist/src/ipfs.test.js.map +1 -1
  52. package/dist/src/proto/edit.d.ts +1 -1
  53. package/dist/src/proto/edit.d.ts.map +1 -1
  54. package/dist/src/proto/edit.js +56 -22
  55. package/dist/src/proto/edit.js.map +1 -1
  56. package/dist/src/proto/edit.test.js +15 -2
  57. package/dist/src/proto/edit.test.js.map +1 -1
  58. package/dist/src/proto/gen/src/proto/ipfs_pb.d.ts +111 -2
  59. package/dist/src/proto/gen/src/proto/ipfs_pb.d.ts.map +1 -1
  60. package/dist/src/proto/gen/src/proto/ipfs_pb.js +150 -3
  61. package/dist/src/proto/gen/src/proto/ipfs_pb.js.map +1 -1
  62. package/dist/src/types.d.ts +40 -3
  63. package/dist/src/types.d.ts.map +1 -1
  64. package/dist/src/types.js.map +1 -1
  65. package/package.json +1 -1
package/README.md CHANGED
@@ -82,30 +82,58 @@ const { id: restaurantId, ops: createRestaurantOps } = Graph.createEntity({
82
82
  description: 'description of the entity',
83
83
  types: […listOfTypeIds],
84
84
  cover: imageId,
85
- values: {
86
- // value property like text, number, url, time, point, checkbox
87
- [propertyId]: {
88
- type: 'TEXT', // TEXT | NUMBER | URL | TIME | POINT | CHECKBOX,
89
- value: 'value of the property',
90
- },
91
- },
85
+ values: [
86
+ {
87
+ property: propertyId,
88
+ value: 'value of the property'
89
+ }
90
+ ],
92
91
  relations: {
93
92
  // relation property
94
93
  [propertyId]: {
95
- to: 'id of the entity',
94
+ toEntity: 'id of the entity',
96
95
  id: 'id of the relation', // optional
97
96
  position: positionString, // optional
98
- values: {
99
- [propertyId]: {
100
- type: 'TEXT', // TEXT | NUMBER | URL | TIME | POINT | CHECKBOX,
101
- value: 'value of the property',
102
- },
103
- },
97
+ values: [
98
+ {
99
+ property: propertyId,
100
+ value: 'value of the property'
101
+ }
102
+ ],
104
103
  },
105
104
  },
106
105
  });
107
106
  ```
108
107
 
108
+ #### Serializing values
109
+
110
+ All values are serialized to a string. The SDK provides helper functions for serializing values to the correct format.
111
+
112
+ ```ts
113
+ import { Graph } from '@graphprotocol/grc-20';
114
+
115
+ const { id: personId, ops: createPersonOps } = Graph.createEntity({
116
+ values: [
117
+ {
118
+ property: someNumberPropertyId,
119
+ value: Graph.serializeNumber(42),
120
+ },
121
+ {
122
+ property: someCheckboxPropertyId,
123
+ value: Graph.serializeCheckbox(true),
124
+ },
125
+ {
126
+ property: someDatePropertyId,
127
+ value: Graph.serializeDate(new Date()),
128
+ },
129
+ {
130
+ property: somePointPropertyId,
131
+ value: Graph.serializePoint([1, 2]),
132
+ },
133
+ ]
134
+ });
135
+ ```
136
+
109
137
  #### Example Flow
110
138
 
111
139
  ```ts
@@ -148,12 +176,12 @@ const { id: restaurantId, ops: createRestaurantOps } = Graph.createEntity({
148
176
  description: 'A restaurant serving fusion cuisine',
149
177
  cover: restaurantCoverId,
150
178
  types: [restaurantTypeId],
151
- values: {
152
- [WEBSITE_PROPERTY]: {
153
- type: 'URL',
179
+ values: [
180
+ {
181
+ property: WEBSITE_PROPERTY,
154
182
  value: 'https://example.com',
155
183
  },
156
- },
184
+ ],
157
185
  });
158
186
  ops.push(...createRestaurantOps);
159
187
 
@@ -168,15 +196,16 @@ const { id: personId, ops: createPersonOps } = Graph.createEntity({
168
196
  name: 'Jane Doe',
169
197
  types: [personTypeId],
170
198
  cover: personCoverId,
171
- values: {
172
- [agePropertyId]: {
173
- type: 'NUMBER',
174
- value: 42,
199
+ values: [
200
+ {
201
+ property: agePropertyId,
202
+ value: serializeNumber(42),
175
203
  },
176
- [likesPropertyId]: {
177
- to: restaurantId,
204
+ {
205
+ property: likesPropertyId,
206
+ value: restaurantId,
178
207
  },
179
- },
208
+ ],
180
209
  });
181
210
  ops.push(...createPersonOps);
182
211
  ```
@@ -1 +1 @@
1
- {"version":3,"file":"account.d.ts","sourceRoot":"","sources":["../../../src/core/account.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAKH,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,aAAa,CAAC;AAKtC,KAAK,qBAAqB,GAAG;IAC3B,SAAS,EAAE,MAAM,CAAC;IAClB,GAAG,EAAE,EAAE,EAAE,CAAC;CACX,CAAC;AAEF;;;;;;;;;;;;;GAaG;AACH,wBAAgB,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,qBAAqB,CAoC3D"}
1
+ {"version":3,"file":"account.d.ts","sourceRoot":"","sources":["../../../src/core/account.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAKH,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,aAAa,CAAC;AAKtC,KAAK,qBAAqB,GAAG;IAC3B,SAAS,EAAE,MAAM,CAAC;IAClB,GAAG,EAAE,EAAE,EAAE,CAAC;CACX,CAAC;AAEF;;;;;;;;;;;;;GAaG;AACH,wBAAgB,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,qBAAqB,CA0C3D"}
@@ -30,10 +30,16 @@ export function make(address) {
30
30
  const ops = [];
31
31
  const { ops: entityOps } = createEntity({
32
32
  id: accountId,
33
- values: {
34
- [ADDRESS_PROPERTY]: checkedAddress,
35
- [NAME_PROPERTY]: checkedAddress,
36
- },
33
+ values: [
34
+ {
35
+ property: ADDRESS_PROPERTY,
36
+ value: checkedAddress,
37
+ },
38
+ {
39
+ property: NAME_PROPERTY,
40
+ value: checkedAddress,
41
+ },
42
+ ],
37
43
  });
38
44
  ops.push(...entityOps);
39
45
  // Types -> Account
@@ -1 +1 @@
1
- {"version":3,"file":"account.js","sourceRoot":"","sources":["../../../src/core/account.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAEpC,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAC/D,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,YAAY,EAAE,gBAAgB,EAAE,aAAa,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAOlH;;;;;;;;;;;;;GAaG;AACH,MAAM,UAAU,IAAI,CAAC,OAAe;IAClC,MAAM,SAAS,GAAG,QAAQ,EAAE,CAAC;IAC7B,MAAM,cAAc,GAAW,kBAAkB,CAAC,OAAO,CAAC,CAAC;IAE3D,MAAM,GAAG,GAAS,EAAE,CAAC;IAErB,MAAM,EAAE,GAAG,EAAE,SAAS,EAAE,GAAG,YAAY,CAAC;QACtC,EAAE,EAAE,SAAS;QACb,MAAM,EAAE;YACN,CAAC,gBAAgB,CAAC,EAAE,cAAc;YAClC,CAAC,aAAa,CAAC,EAAE,cAAc;SAChC;KACF,CAAC,CAAC;IACH,GAAG,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC,CAAC;IAEvB,mBAAmB;IACnB,MAAM,EAAE,GAAG,EAAE,UAAU,EAAE,GAAG,cAAc,CAAC;QACzC,UAAU,EAAE,SAAS;QACrB,IAAI,EAAE,cAAc;QACpB,QAAQ,EAAE,YAAY;KACvB,CAAC,CAAC;IACH,GAAG,CAAC,IAAI,CAAC,GAAG,UAAU,CAAC,CAAC;IAExB,sBAAsB;IACtB,gEAAgE;IAChE,MAAM,EAAE,GAAG,EAAE,UAAU,EAAE,GAAG,cAAc,CAAC;QACzC,UAAU,EAAE,SAAS;QACrB,IAAI,EAAE,gBAAgB;QACtB,QAAQ,EAAE,QAAQ;KACnB,CAAC,CAAC;IACH,GAAG,CAAC,IAAI,CAAC,GAAG,UAAU,CAAC,CAAC;IAExB,OAAO;QACL,SAAS;QACT,GAAG;KACJ,CAAC;AACJ,CAAC"}
1
+ {"version":3,"file":"account.js","sourceRoot":"","sources":["../../../src/core/account.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAEpC,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAC/D,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,YAAY,EAAE,gBAAgB,EAAE,aAAa,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAOlH;;;;;;;;;;;;;GAaG;AACH,MAAM,UAAU,IAAI,CAAC,OAAe;IAClC,MAAM,SAAS,GAAG,QAAQ,EAAE,CAAC;IAC7B,MAAM,cAAc,GAAW,kBAAkB,CAAC,OAAO,CAAC,CAAC;IAE3D,MAAM,GAAG,GAAS,EAAE,CAAC;IAErB,MAAM,EAAE,GAAG,EAAE,SAAS,EAAE,GAAG,YAAY,CAAC;QACtC,EAAE,EAAE,SAAS;QACb,MAAM,EAAE;YACN;gBACE,QAAQ,EAAE,gBAAgB;gBAC1B,KAAK,EAAE,cAAc;aACtB;YACD;gBACE,QAAQ,EAAE,aAAa;gBACvB,KAAK,EAAE,cAAc;aACtB;SACF;KACF,CAAC,CAAC;IACH,GAAG,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC,CAAC;IAEvB,mBAAmB;IACnB,MAAM,EAAE,GAAG,EAAE,UAAU,EAAE,GAAG,cAAc,CAAC;QACzC,UAAU,EAAE,SAAS;QACrB,IAAI,EAAE,cAAc;QACpB,QAAQ,EAAE,YAAY;KACvB,CAAC,CAAC;IACH,GAAG,CAAC,IAAI,CAAC,GAAG,UAAU,CAAC,CAAC;IAExB,sBAAsB;IACtB,gEAAgE;IAChE,MAAM,EAAE,GAAG,EAAE,UAAU,EAAE,GAAG,cAAc,CAAC;QACzC,UAAU,EAAE,SAAS;QACrB,IAAI,EAAE,gBAAgB;QACtB,QAAQ,EAAE,QAAQ;KACnB,CAAC,CAAC;IACH,GAAG,CAAC,IAAI,CAAC,GAAG,UAAU,CAAC,CAAC;IAExB,OAAO;QACL,SAAS;QACT,GAAG;KACJ,CAAC;AACJ,CAAC"}
@@ -8,12 +8,12 @@ it('should generate ops for an account entity', () => {
8
8
  const [entityOp, accountTypeOp, networkOp] = ops;
9
9
  expect(entityOp?.type).toBe('UPDATE_ENTITY');
10
10
  if (entityOp?.type === 'UPDATE_ENTITY' && entityOp?.entity.values?.[0]) {
11
- expect(entityOp.entity.values[0].propertyId).toBe(SystemIds.ADDRESS_PROPERTY);
11
+ expect(entityOp.entity.values[0].property).toBe(SystemIds.ADDRESS_PROPERTY);
12
12
  expect(entityOp.entity.values[0].value).toBe(ZERO_ADDRESS);
13
13
  expect(entityOp.entity.id).toBe(Id(accountId));
14
14
  }
15
15
  if (entityOp?.type === 'UPDATE_ENTITY' && entityOp?.entity.values?.[1]) {
16
- expect(entityOp.entity.values[1].propertyId).toBe(SystemIds.NAME_PROPERTY);
16
+ expect(entityOp.entity.values[1].property).toBe(SystemIds.NAME_PROPERTY);
17
17
  expect(entityOp.entity.values[1].value).toBe(ZERO_ADDRESS);
18
18
  expect(entityOp.entity.id).toBe(Id(accountId));
19
19
  }
@@ -1 +1 @@
1
- {"version":3,"file":"account.test.js","sourceRoot":"","sources":["../../../src/core/account.test.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"account.test.js","sourceRoot":"","sources":["../../../src/core/account.test.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"data.d.ts","sourceRoot":"","sources":["../../../../src/core/blocks/data.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAMH,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,gBAAgB,CAAC;AAGzC,KAAK,mBAAmB,GAAG,OAAO,GAAG,YAAY,GAAG,KAAK,CAAC;AAa1D,KAAK,eAAe,GAAG;IACrB,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,mBAAmB,CAAC;IAChC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,CAAC;AAEF;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,IAAI,CAAC,EAAE,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE,eAAe,GAAG,EAAE,EAAE,CAqClF"}
1
+ {"version":3,"file":"data.d.ts","sourceRoot":"","sources":["../../../../src/core/blocks/data.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAMH,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,gBAAgB,CAAC;AAGzC,KAAK,mBAAmB,GAAG,OAAO,GAAG,YAAY,GAAG,KAAK,CAAC;AAa1D,KAAK,eAAe,GAAG;IACrB,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,mBAAmB,CAAC;IAChC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,CAAC;AAEF;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,IAAI,CAAC,EAAE,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE,eAAe,GAAG,EAAE,EAAE,CAwClF"}
@@ -61,9 +61,12 @@ export function make({ fromId, sourceType, position, name }) {
61
61
  if (name) {
62
62
  const { ops: nameOps } = updateEntity({
63
63
  id: newBlockId,
64
- values: {
65
- [NAME_PROPERTY]: name,
66
- },
64
+ values: [
65
+ {
66
+ property: NAME_PROPERTY,
67
+ value: name,
68
+ },
69
+ ],
67
70
  });
68
71
  ops.push(...nameOps);
69
72
  }
@@ -1 +1 @@
1
- {"version":3,"file":"data.js","sourceRoot":"","sources":["../../../../src/core/blocks/data.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAChE,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAC5D,OAAO,EAAE,EAAE,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAEhD,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,8BAA8B,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAIrH,SAAS,eAAe,CAAC,UAA+B;IACtD,QAAQ,UAAU,EAAE,CAAC;QACnB,KAAK,YAAY;YACf,OAAO,SAAS,CAAC,sBAAsB,CAAC;QAC1C,KAAK,KAAK;YACR,OAAO,SAAS,CAAC,sBAAsB,CAAC;QAC1C,KAAK,OAAO;YACV,OAAO,SAAS,CAAC,iBAAiB,CAAC;IACvC,CAAC;AACH,CAAC;AASD;;;;;;;;;;;;;;;;GAgBG;AACH,MAAM,UAAU,IAAI,CAAC,EAAE,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,IAAI,EAAmB;IAC1E,MAAM,UAAU,GAAG,QAAQ,EAAE,CAAC;IAE9B,MAAM,GAAG,GAAS,EAAE,CAAC;IACrB,MAAM,EAAE,GAAG,EAAE,gBAAgB,EAAE,GAAG,cAAc,CAAC;QAC/C,UAAU,EAAE,UAAU;QACtB,IAAI,EAAE,cAAc;QACpB,QAAQ,EAAE,UAAU;KACrB,CAAC,CAAC;IACH,GAAG,CAAC,IAAI,CAAC,GAAG,gBAAgB,CAAC,CAAC;IAE9B,MAAM,EAAE,GAAG,EAAE,sBAAsB,EAAE,GAAG,cAAc,CAAC;QACrD,UAAU,EAAE,UAAU;QACtB,IAAI,EAAE,8BAA8B;QACpC,QAAQ,EAAE,eAAe,CAAC,UAAU,CAAC;KACtC,CAAC,CAAC;IACH,GAAG,CAAC,IAAI,CAAC,GAAG,sBAAsB,CAAC,CAAC;IAEpC,MAAM,EAAE,GAAG,EAAE,oBAAoB,EAAE,GAAG,cAAc,CAAC;QACnD,UAAU,EAAE,EAAE,CAAC,MAAM,CAAC;QACtB,IAAI,EAAE,MAAM;QACZ,QAAQ,EAAE,EAAE,CAAC,UAAU,CAAC;QACxB,QAAQ;KACT,CAAC,CAAC;IACH,GAAG,CAAC,IAAI,CAAC,GAAG,oBAAoB,CAAC,CAAC;IAElC,IAAI,IAAI,EAAE,CAAC;QACT,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,YAAY,CAAC;YACpC,EAAE,EAAE,UAAU;YACd,MAAM,EAAE;gBACN,CAAC,aAAa,CAAC,EAAE,IAAI;aACtB;SACF,CAAC,CAAC;QACH,GAAG,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,CAAC;IACvB,CAAC;IAED,OAAO,GAAG,CAAC;AACb,CAAC"}
1
+ {"version":3,"file":"data.js","sourceRoot":"","sources":["../../../../src/core/blocks/data.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAChE,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAC5D,OAAO,EAAE,EAAE,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAEhD,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,8BAA8B,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAIrH,SAAS,eAAe,CAAC,UAA+B;IACtD,QAAQ,UAAU,EAAE,CAAC;QACnB,KAAK,YAAY;YACf,OAAO,SAAS,CAAC,sBAAsB,CAAC;QAC1C,KAAK,KAAK;YACR,OAAO,SAAS,CAAC,sBAAsB,CAAC;QAC1C,KAAK,OAAO;YACV,OAAO,SAAS,CAAC,iBAAiB,CAAC;IACvC,CAAC;AACH,CAAC;AASD;;;;;;;;;;;;;;;;GAgBG;AACH,MAAM,UAAU,IAAI,CAAC,EAAE,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,IAAI,EAAmB;IAC1E,MAAM,UAAU,GAAG,QAAQ,EAAE,CAAC;IAE9B,MAAM,GAAG,GAAS,EAAE,CAAC;IACrB,MAAM,EAAE,GAAG,EAAE,gBAAgB,EAAE,GAAG,cAAc,CAAC;QAC/C,UAAU,EAAE,UAAU;QACtB,IAAI,EAAE,cAAc;QACpB,QAAQ,EAAE,UAAU;KACrB,CAAC,CAAC;IACH,GAAG,CAAC,IAAI,CAAC,GAAG,gBAAgB,CAAC,CAAC;IAE9B,MAAM,EAAE,GAAG,EAAE,sBAAsB,EAAE,GAAG,cAAc,CAAC;QACrD,UAAU,EAAE,UAAU;QACtB,IAAI,EAAE,8BAA8B;QACpC,QAAQ,EAAE,eAAe,CAAC,UAAU,CAAC;KACtC,CAAC,CAAC;IACH,GAAG,CAAC,IAAI,CAAC,GAAG,sBAAsB,CAAC,CAAC;IAEpC,MAAM,EAAE,GAAG,EAAE,oBAAoB,EAAE,GAAG,cAAc,CAAC;QACnD,UAAU,EAAE,EAAE,CAAC,MAAM,CAAC;QACtB,IAAI,EAAE,MAAM;QACZ,QAAQ,EAAE,EAAE,CAAC,UAAU,CAAC;QACxB,QAAQ;KACT,CAAC,CAAC;IACH,GAAG,CAAC,IAAI,CAAC,GAAG,oBAAoB,CAAC,CAAC;IAElC,IAAI,IAAI,EAAE,CAAC;QACT,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,YAAY,CAAC;YACpC,EAAE,EAAE,UAAU;YACd,MAAM,EAAE;gBACN;oBACE,QAAQ,EAAE,aAAa;oBACvB,KAAK,EAAE,IAAI;iBACZ;aACF;SACF,CAAC,CAAC;QACH,GAAG,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,CAAC;IACvB,CAAC;IAED,OAAO,GAAG,CAAC;AACb,CAAC"}
@@ -51,7 +51,7 @@ it('should generate ops for a data block entity with a name', () => {
51
51
  }
52
52
  expect(blockNameOp?.type).toBe('UPDATE_ENTITY');
53
53
  if (blockNameOp?.type === 'UPDATE_ENTITY' && blockNameOp?.entity.values?.[0]) {
54
- expect(blockNameOp.entity.values[0].propertyId).toBe(SystemIds.NAME_PROPERTY);
54
+ expect(blockNameOp.entity.values[0].property).toBe(SystemIds.NAME_PROPERTY);
55
55
  expect(blockNameOp.entity.values[0].value).toBe('test-name');
56
56
  }
57
57
  });
@@ -1 +1 @@
1
- {"version":3,"file":"data.test.js","sourceRoot":"","sources":["../../../../src/core/blocks/data.test.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"data.test.js","sourceRoot":"","sources":["../../../../src/core/blocks/data.test.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"text.d.ts","sourceRoot":"","sources":["../../../../src/core/blocks/text.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAKH,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,gBAAgB,CAAC;AAGzC,KAAK,eAAe,GAAG;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAE3E;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,IAAI,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,eAAe,GAAG,EAAE,EAAE,CA6BtE"}
1
+ {"version":3,"file":"text.d.ts","sourceRoot":"","sources":["../../../../src/core/blocks/text.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAKH,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,gBAAgB,CAAC;AAGzC,KAAK,eAAe,GAAG;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAE3E;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,IAAI,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,eAAe,GAAG,EAAE,EAAE,CAgCtE"}
@@ -35,9 +35,12 @@ export function make({ fromId, text, position }) {
35
35
  ops.push(...textBlockTypeOps);
36
36
  const { ops: textBlockMarkdownTextOps } = updateEntity({
37
37
  id: newBlockId,
38
- values: {
39
- [MARKDOWN_CONTENT]: text,
40
- },
38
+ values: [
39
+ {
40
+ property: MARKDOWN_CONTENT,
41
+ value: text,
42
+ },
43
+ ],
41
44
  });
42
45
  ops.push(...textBlockMarkdownTextOps);
43
46
  const { ops: textBlockRelationOps } = createRelation({
@@ -1 +1 @@
1
- {"version":3,"file":"text.js","sourceRoot":"","sources":["../../../../src/core/blocks/text.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAChE,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAC5D,OAAO,EAAE,EAAE,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAE3C,OAAO,EAAE,MAAM,EAAE,gBAAgB,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAIxF;;;;;;;;;;;;;;;GAeG;AACH,MAAM,UAAU,IAAI,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAmB;IAC9D,MAAM,UAAU,GAAG,QAAQ,EAAE,CAAC;IAE9B,MAAM,GAAG,GAAS,EAAE,CAAC;IAErB,MAAM,EAAE,GAAG,EAAE,gBAAgB,EAAE,GAAG,cAAc,CAAC;QAC/C,UAAU,EAAE,UAAU;QACtB,IAAI,EAAE,cAAc;QACpB,QAAQ,EAAE,UAAU;KACrB,CAAC,CAAC;IACH,GAAG,CAAC,IAAI,CAAC,GAAG,gBAAgB,CAAC,CAAC;IAE9B,MAAM,EAAE,GAAG,EAAE,wBAAwB,EAAE,GAAG,YAAY,CAAC;QACrD,EAAE,EAAE,UAAU;QACd,MAAM,EAAE;YACN,CAAC,gBAAgB,CAAC,EAAE,IAAI;SACzB;KACF,CAAC,CAAC;IACH,GAAG,CAAC,IAAI,CAAC,GAAG,wBAAwB,CAAC,CAAC;IAEtC,MAAM,EAAE,GAAG,EAAE,oBAAoB,EAAE,GAAG,cAAc,CAAC;QACnD,UAAU,EAAE,EAAE,CAAC,MAAM,CAAC;QACtB,IAAI,EAAE,MAAM;QACZ,QAAQ,EAAE,UAAU;QACpB,QAAQ;KACT,CAAC,CAAC;IACH,GAAG,CAAC,IAAI,CAAC,GAAG,oBAAoB,CAAC,CAAC;IAElC,OAAO,GAAG,CAAC;AACb,CAAC"}
1
+ {"version":3,"file":"text.js","sourceRoot":"","sources":["../../../../src/core/blocks/text.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAChE,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAC5D,OAAO,EAAE,EAAE,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAE3C,OAAO,EAAE,MAAM,EAAE,gBAAgB,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAIxF;;;;;;;;;;;;;;;GAeG;AACH,MAAM,UAAU,IAAI,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAmB;IAC9D,MAAM,UAAU,GAAG,QAAQ,EAAE,CAAC;IAE9B,MAAM,GAAG,GAAS,EAAE,CAAC;IAErB,MAAM,EAAE,GAAG,EAAE,gBAAgB,EAAE,GAAG,cAAc,CAAC;QAC/C,UAAU,EAAE,UAAU;QACtB,IAAI,EAAE,cAAc;QACpB,QAAQ,EAAE,UAAU;KACrB,CAAC,CAAC;IACH,GAAG,CAAC,IAAI,CAAC,GAAG,gBAAgB,CAAC,CAAC;IAE9B,MAAM,EAAE,GAAG,EAAE,wBAAwB,EAAE,GAAG,YAAY,CAAC;QACrD,EAAE,EAAE,UAAU;QACd,MAAM,EAAE;YACN;gBACE,QAAQ,EAAE,gBAAgB;gBAC1B,KAAK,EAAE,IAAI;aACZ;SACF;KACF,CAAC,CAAC;IACH,GAAG,CAAC,IAAI,CAAC,GAAG,wBAAwB,CAAC,CAAC;IAEtC,MAAM,EAAE,GAAG,EAAE,oBAAoB,EAAE,GAAG,cAAc,CAAC;QACnD,UAAU,EAAE,EAAE,CAAC,MAAM,CAAC;QACtB,IAAI,EAAE,MAAM;QACZ,QAAQ,EAAE,UAAU;QACpB,QAAQ;KACT,CAAC,CAAC;IACH,GAAG,CAAC,IAAI,CAAC,GAAG,oBAAoB,CAAC,CAAC;IAElC,OAAO,GAAG,CAAC;AACb,CAAC"}
@@ -16,7 +16,7 @@ it('should generate ops for a text block entity', () => {
16
16
  }
17
17
  expect(blockMarkdownTextOp?.type).toBe('UPDATE_ENTITY');
18
18
  if (blockMarkdownTextOp?.type === 'UPDATE_ENTITY' && blockMarkdownTextOp?.entity.values?.[0]) {
19
- expect(blockMarkdownTextOp.entity.values[0].propertyId).toBe(SystemIds.MARKDOWN_CONTENT);
19
+ expect(blockMarkdownTextOp.entity.values[0].property).toBe(SystemIds.MARKDOWN_CONTENT);
20
20
  expect(blockMarkdownTextOp.entity.values[0].value).toBe('test-text');
21
21
  }
22
22
  expect(blockRelationOp?.type).toBe('CREATE_RELATION');
@@ -1 +1 @@
1
- {"version":3,"file":"text.test.js","sourceRoot":"","sources":["../../../../src/core/blocks/text.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AACpC,OAAO,EAAE,EAAE,EAAE,MAAM,aAAa,CAAC;AACjC,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC,EAAE,CAAC,6CAA6C,EAAE,GAAG,EAAE;IACrD,MAAM,GAAG,GAAG,IAAI,CAAC;QACf,MAAM,EAAE,sCAAsC;QAC9C,IAAI,EAAE,WAAW;QACjB,QAAQ,EAAE,eAAe;KAC1B,CAAC,CAAC;IAEH,MAAM,CAAC,WAAW,EAAE,mBAAmB,EAAE,eAAe,CAAC,GAAG,GAAG,CAAC;IAEhE,MAAM,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;IAClD,IAAI,WAAW,EAAE,IAAI,KAAK,iBAAiB,EAAE,CAAC;QAC5C,MAAM,CAAC,WAAW,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;QAClE,MAAM,CAAC,WAAW,EAAE,QAAQ,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;IACpE,CAAC;IAED,MAAM,CAAC,mBAAmB,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;IACxD,IAAI,mBAAmB,EAAE,IAAI,KAAK,eAAe,IAAI,mBAAmB,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC7F,MAAM,CAAC,mBAAmB,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAC;QACzF,MAAM,CAAC,mBAAmB,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IACvE,CAAC;IAED,MAAM,CAAC,eAAe,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;IACtD,IAAI,eAAe,EAAE,IAAI,KAAK,iBAAiB,EAAE,CAAC;QAChD,MAAM,CAAC,eAAe,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QAC9D,MAAM,CAAC,eAAe,EAAE,QAAQ,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,sCAAsC,CAAC,CAAC,CAAC;IAChG,CAAC;IAED,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAC7B,CAAC,CAAC,CAAC"}
1
+ {"version":3,"file":"text.test.js","sourceRoot":"","sources":["../../../../src/core/blocks/text.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AACpC,OAAO,EAAE,EAAE,EAAE,MAAM,aAAa,CAAC;AACjC,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC,EAAE,CAAC,6CAA6C,EAAE,GAAG,EAAE;IACrD,MAAM,GAAG,GAAG,IAAI,CAAC;QACf,MAAM,EAAE,sCAAsC;QAC9C,IAAI,EAAE,WAAW;QACjB,QAAQ,EAAE,eAAe;KAC1B,CAAC,CAAC;IAEH,MAAM,CAAC,WAAW,EAAE,mBAAmB,EAAE,eAAe,CAAC,GAAG,GAAG,CAAC;IAEhE,MAAM,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;IAClD,IAAI,WAAW,EAAE,IAAI,KAAK,iBAAiB,EAAE,CAAC;QAC5C,MAAM,CAAC,WAAW,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;QAClE,MAAM,CAAC,WAAW,EAAE,QAAQ,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;IACpE,CAAC;IAED,MAAM,CAAC,mBAAmB,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;IACxD,IAAI,mBAAmB,EAAE,IAAI,KAAK,eAAe,IAAI,mBAAmB,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC7F,MAAM,CAAC,mBAAmB,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAC;QACvF,MAAM,CAAC,mBAAmB,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IACvE,CAAC;IAED,MAAM,CAAC,eAAe,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;IACtD,IAAI,eAAe,EAAE,IAAI,KAAK,iBAAiB,EAAE,CAAC;QAChD,MAAM,CAAC,eAAe,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QAC9D,MAAM,CAAC,eAAe,EAAE,QAAQ,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,sCAAsC,CAAC,CAAC,CAAC;IAChG,CAAC;IAED,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAC7B,CAAC,CAAC,CAAC"}
@@ -12,12 +12,12 @@ import type { CreateResult, EntityParams } from '../types.js';
12
12
  * description: 'description of the entity',
13
13
  * cover: imageEntityId,
14
14
  * types: [typeEntityId1, typeEntityId2],
15
- * values: {
16
- * // value property like text, number, url, time, point, checkbox
17
- * [propertyId]: {
18
- * value: 'value of the property',
15
+ * values: [
16
+ * {
17
+ * property: propertyId,
18
+ * value: 'value of the property'
19
19
  * }
20
- * },
20
+ * ],
21
21
  * relations: {
22
22
  * [relationPropertyId]: {
23
23
  * to: 'id of the entity',
@@ -33,9 +33,7 @@ import type { CreateResult, EntityParams } from '../types.js';
33
33
  * entityDescription: 'description of the relation entity', // optional
34
34
  * entityCover: 'id of the cover', // optional
35
35
  * entityValues: { // optional values for the relation entity
36
- * [propertyId]: {
37
- * value: 'value of the property',
38
- * },
36
+ * [propertyId]: { value: 'value of the property' },
39
37
  * },
40
38
  * entityRelations: {
41
39
  * [relationPropertyId]: {
@@ -1 +1 @@
1
- {"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;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAoDG;AACH,eAAO,MAAM,YAAY,GAAI,yEAQ1B,YAAY,KAAG,YAuHjB,CAAC"}
1
+ {"version":3,"file":"create-entity.d.ts","sourceRoot":"","sources":["../../../src/graph/create-entity.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,YAAY,EAA2C,MAAM,aAAa,CAAC;AAGvG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkDG;AACH,eAAO,MAAM,YAAY,GAAI,yEAQ1B,YAAY,KAAG,YA8KjB,CAAC"}
@@ -14,12 +14,12 @@ import { createRelation } from './create-relation.js';
14
14
  * description: 'description of the entity',
15
15
  * cover: imageEntityId,
16
16
  * types: [typeEntityId1, typeEntityId2],
17
- * values: {
18
- * // value property like text, number, url, time, point, checkbox
19
- * [propertyId]: {
20
- * value: 'value of the property',
17
+ * values: [
18
+ * {
19
+ * property: propertyId,
20
+ * value: 'value of the property'
21
21
  * }
22
- * },
22
+ * ],
23
23
  * relations: {
24
24
  * [relationPropertyId]: {
25
25
  * to: 'id of the entity',
@@ -35,9 +35,7 @@ import { createRelation } from './create-relation.js';
35
35
  * entityDescription: 'description of the relation entity', // optional
36
36
  * entityCover: 'id of the cover', // optional
37
37
  * entityValues: { // optional values for the relation entity
38
- * [propertyId]: {
39
- * value: 'value of the property',
40
- * },
38
+ * [propertyId]: { value: 'value of the property' },
41
39
  * },
42
40
  * entityRelations: {
43
41
  * [relationPropertyId]: {
@@ -59,44 +57,64 @@ export const createEntity = ({ id: providedId, name, description, cover, values,
59
57
  assertValid(providedId, '`id` in `createEntity`');
60
58
  if (cover)
61
59
  assertValid(cover, '`cover` in `createEntity`');
62
- for (const [key] of Object.entries(values ?? {})) {
63
- assertValid(key, '`values` in `createEntity`');
64
- }
65
- // we only assert Ids one level deep for a better experience here, but multiple levels deep are
66
- // asserted since we use createRelation and createEntity internally
67
- for (const [key, relationEntry] of Object.entries(relations ?? {})) {
68
- assertValid(key, '`relations` in `createEntity`');
69
- if (Array.isArray(relationEntry)) {
70
- for (const relation of relationEntry) {
71
- assertValid(relation.toEntity, '`toEntity` in `relations` in `createEntity`');
72
- if (relation.toSpace)
73
- assertValid(relation.toSpace, '`toSpace` in `relations` in `createEntity`');
74
- if (relation.fromSpace)
75
- assertValid(relation.fromSpace, '`fromSpace` in `relations` in `createEntity`');
76
- if (relation.fromVersion)
77
- assertValid(relation.fromVersion, '`fromVersion` in `relations` in `createEntity`');
78
- if (relation.toVersion)
79
- assertValid(relation.toVersion, '`toVersion` in `relations` in `createEntity`');
80
- if (relation.entityId)
81
- assertValid(relation.entityId, '`entityId` in `relations` in `createEntity`');
82
- if (relation.entityCover)
83
- assertValid(relation.entityCover, '`entityCover` in `relations` in `createEntity`');
60
+ for (const valueEntry of values ?? []) {
61
+ assertValid(valueEntry.property, '`values` in `createEntity`');
62
+ if (valueEntry.options) {
63
+ const optionsParam = valueEntry.options;
64
+ switch (optionsParam.type) {
65
+ case 'text':
66
+ if (optionsParam.language) {
67
+ assertValid(optionsParam.language, '`language` in `options` in `values` in `createEntity`');
68
+ }
69
+ break;
70
+ case 'number':
71
+ break;
72
+ case 'time':
73
+ if (optionsParam.timezone) {
74
+ assertValid(optionsParam.timezone, '`timezone` in `options` in `values` in `createEntity`');
75
+ }
76
+ break;
77
+ default:
78
+ // @ts-expect-error - we only support text, number, and time options
79
+ throw new Error(`Invalid option type: ${optionsParam.type}`);
84
80
  }
85
81
  }
86
- else {
87
- assertValid(relationEntry.toEntity, '`toEntity` in `relations` in `createEntity`');
88
- if (relationEntry.toSpace)
89
- assertValid(relationEntry.toSpace, '`toSpace` in `relations` in `createEntity`');
90
- if (relationEntry.fromSpace)
91
- assertValid(relationEntry.fromSpace, '`fromSpace` in `relations` in `createEntity`');
92
- if (relationEntry.fromVersion)
93
- assertValid(relationEntry.fromVersion, '`fromVersion` in `relations` in `createEntity`');
94
- if (relationEntry.toVersion)
95
- assertValid(relationEntry.toVersion, '`toVersion` in `relations` in `createEntity`');
96
- if (relationEntry.entityId)
97
- assertValid(relationEntry.entityId, '`entityId` in `relations` in `createEntity`');
98
- if (relationEntry.entityCover)
99
- assertValid(relationEntry.entityCover, '`entityCover` in `relations` in `createEntity`');
82
+ // we only assert Ids one level deep for a better experience here, but multiple levels deep are
83
+ // asserted since we use createRelation and createEntity internally
84
+ for (const [key, relationEntry] of Object.entries(relations ?? {})) {
85
+ assertValid(key, '`relations` in `createEntity`');
86
+ if (Array.isArray(relationEntry)) {
87
+ for (const relation of relationEntry) {
88
+ assertValid(relation.toEntity, '`toEntity` in `relations` in `createEntity`');
89
+ if (relation.toSpace)
90
+ assertValid(relation.toSpace, '`toSpace` in `relations` in `createEntity`');
91
+ if (relation.fromSpace)
92
+ assertValid(relation.fromSpace, '`fromSpace` in `relations` in `createEntity`');
93
+ if (relation.fromVersion)
94
+ assertValid(relation.fromVersion, '`fromVersion` in `relations` in `createEntity`');
95
+ if (relation.toVersion)
96
+ assertValid(relation.toVersion, '`toVersion` in `relations` in `createEntity`');
97
+ if (relation.entityId)
98
+ assertValid(relation.entityId, '`entityId` in `relations` in `createEntity`');
99
+ if (relation.entityCover)
100
+ assertValid(relation.entityCover, '`entityCover` in `relations` in `createEntity`');
101
+ }
102
+ }
103
+ else {
104
+ assertValid(relationEntry.toEntity, '`toEntity` in `relations` in `createEntity`');
105
+ if (relationEntry.toSpace)
106
+ assertValid(relationEntry.toSpace, '`toSpace` in `relations` in `createEntity`');
107
+ if (relationEntry.fromSpace)
108
+ assertValid(relationEntry.fromSpace, '`fromSpace` in `relations` in `createEntity`');
109
+ if (relationEntry.fromVersion)
110
+ assertValid(relationEntry.fromVersion, '`fromVersion` in `relations` in `createEntity`');
111
+ if (relationEntry.toVersion)
112
+ assertValid(relationEntry.toVersion, '`toVersion` in `relations` in `createEntity`');
113
+ if (relationEntry.entityId)
114
+ assertValid(relationEntry.entityId, '`entityId` in `relations` in `createEntity`');
115
+ if (relationEntry.entityCover)
116
+ assertValid(relationEntry.entityCover, '`entityCover` in `relations` in `createEntity`');
117
+ }
100
118
  }
101
119
  }
102
120
  for (const typeId of types ?? []) {
@@ -107,20 +125,52 @@ export const createEntity = ({ id: providedId, name, description, cover, values,
107
125
  const newValues = [];
108
126
  if (name) {
109
127
  newValues.push({
110
- propertyId: NAME_PROPERTY,
128
+ property: NAME_PROPERTY,
111
129
  value: name,
112
130
  });
113
131
  }
114
132
  if (description) {
115
133
  newValues.push({
116
- propertyId: DESCRIPTION_PROPERTY,
134
+ property: DESCRIPTION_PROPERTY,
117
135
  value: description,
118
136
  });
119
137
  }
120
- for (const [key, value] of Object.entries(values ?? {})) {
138
+ for (const valueEntry of values ?? []) {
139
+ let options = undefined;
140
+ if (valueEntry.options) {
141
+ const optionsParam = valueEntry.options;
142
+ switch (optionsParam.type) {
143
+ case 'text':
144
+ options = {
145
+ text: {
146
+ language: optionsParam.language,
147
+ },
148
+ };
149
+ break;
150
+ case 'number':
151
+ options = {
152
+ number: {
153
+ format: optionsParam.format,
154
+ unit: optionsParam.unit,
155
+ },
156
+ };
157
+ break;
158
+ case 'time':
159
+ options = {
160
+ time: {
161
+ format: optionsParam.format,
162
+ timezone: optionsParam.timezone,
163
+ hasDate: optionsParam.hasDate,
164
+ hasTime: optionsParam.hasTime,
165
+ },
166
+ };
167
+ break;
168
+ }
169
+ }
121
170
  newValues.push({
122
- propertyId: Id(key),
123
- value,
171
+ property: Id(valueEntry.property),
172
+ value: valueEntry.value,
173
+ options,
124
174
  });
125
175
  }
126
176
  const op = {
@@ -1 +1 @@
1
- {"version":3,"file":"create-entity.js","sourceRoot":"","sources":["../../../src/graph/create-entity.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,oBAAoB,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAC5G,OAAO,EAAE,EAAE,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAErD,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAEtD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAoDG;AACH,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,EAC3B,EAAE,EAAE,UAAU,EACd,IAAI,EACJ,WAAW,EACX,KAAK,EACL,MAAM,EACN,SAAS,EACT,KAAK,GACQ,EAAgB,EAAE;IAC/B,IAAI,UAAU;QAAE,WAAW,CAAC,UAAU,EAAE,wBAAwB,CAAC,CAAC;IAClE,IAAI,KAAK;QAAE,WAAW,CAAC,KAAK,EAAE,2BAA2B,CAAC,CAAC;IAC3D,KAAK,MAAM,CAAC,GAAG,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,IAAI,EAAE,CAAC,EAAE,CAAC;QACjD,WAAW,CAAC,GAAG,EAAE,4BAA4B,CAAC,CAAC;IACjD,CAAC;IACD,+FAA+F;IAC/F,mEAAmE;IACnE,KAAK,MAAM,CAAC,GAAG,EAAE,aAAa,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,SAAS,IAAI,EAAE,CAAC,EAAE,CAAC;QACnE,WAAW,CAAC,GAAG,EAAE,+BAA+B,CAAC,CAAC;QAClD,IAAI,KAAK,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,CAAC;YACjC,KAAK,MAAM,QAAQ,IAAI,aAAa,EAAE,CAAC;gBACrC,WAAW,CAAC,QAAQ,CAAC,QAAQ,EAAE,6CAA6C,CAAC,CAAC;gBAC9E,IAAI,QAAQ,CAAC,OAAO;oBAAE,WAAW,CAAC,QAAQ,CAAC,OAAO,EAAE,4CAA4C,CAAC,CAAC;gBAClG,IAAI,QAAQ,CAAC,SAAS;oBAAE,WAAW,CAAC,QAAQ,CAAC,SAAS,EAAE,8CAA8C,CAAC,CAAC;gBACxG,IAAI,QAAQ,CAAC,WAAW;oBAAE,WAAW,CAAC,QAAQ,CAAC,WAAW,EAAE,gDAAgD,CAAC,CAAC;gBAC9G,IAAI,QAAQ,CAAC,SAAS;oBAAE,WAAW,CAAC,QAAQ,CAAC,SAAS,EAAE,8CAA8C,CAAC,CAAC;gBACxG,IAAI,QAAQ,CAAC,QAAQ;oBAAE,WAAW,CAAC,QAAQ,CAAC,QAAQ,EAAE,6CAA6C,CAAC,CAAC;gBACrG,IAAI,QAAQ,CAAC,WAAW;oBAAE,WAAW,CAAC,QAAQ,CAAC,WAAW,EAAE,gDAAgD,CAAC,CAAC;YAChH,CAAC;QACH,CAAC;aAAM,CAAC;YACN,WAAW,CAAC,aAAa,CAAC,QAAQ,EAAE,6CAA6C,CAAC,CAAC;YACnF,IAAI,aAAa,CAAC,OAAO;gBAAE,WAAW,CAAC,aAAa,CAAC,OAAO,EAAE,4CAA4C,CAAC,CAAC;YAC5G,IAAI,aAAa,CAAC,SAAS;gBAAE,WAAW,CAAC,aAAa,CAAC,SAAS,EAAE,8CAA8C,CAAC,CAAC;YAClH,IAAI,aAAa,CAAC,WAAW;gBAC3B,WAAW,CAAC,aAAa,CAAC,WAAW,EAAE,gDAAgD,CAAC,CAAC;YAC3F,IAAI,aAAa,CAAC,SAAS;gBAAE,WAAW,CAAC,aAAa,CAAC,SAAS,EAAE,8CAA8C,CAAC,CAAC;YAClH,IAAI,aAAa,CAAC,QAAQ;gBAAE,WAAW,CAAC,aAAa,CAAC,QAAQ,EAAE,6CAA6C,CAAC,CAAC;YAC/G,IAAI,aAAa,CAAC,WAAW;gBAC3B,WAAW,CAAC,aAAa,CAAC,WAAW,EAAE,gDAAgD,CAAC,CAAC;QAC7F,CAAC;IACH,CAAC;IACD,KAAK,MAAM,MAAM,IAAI,KAAK,IAAI,EAAE,EAAE,CAAC;QACjC,WAAW,CAAC,MAAM,EAAE,2BAA2B,CAAC,CAAC;IACnD,CAAC;IAED,MAAM,EAAE,GAAG,UAAU,IAAI,QAAQ,EAAE,CAAC;IACpC,IAAI,GAAG,GAAc,EAAE,CAAC;IAExB,MAAM,SAAS,GAAiB,EAAE,CAAC;IACnC,IAAI,IAAI,EAAE,CAAC;QACT,SAAS,CAAC,IAAI,CAAC;YACb,UAAU,EAAE,aAAa;YACzB,KAAK,EAAE,IAAI;SACZ,CAAC,CAAC;IACL,CAAC;IACD,IAAI,WAAW,EAAE,CAAC;QAChB,SAAS,CAAC,IAAI,CAAC;YACb,UAAU,EAAE,oBAAoB;YAChC,KAAK,EAAE,WAAW;SACnB,CAAC,CAAC;IACL,CAAC;IACD,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,IAAI,EAAE,CAAC,EAAE,CAAC;QACxD,SAAS,CAAC,IAAI,CAAC;YACb,UAAU,EAAE,EAAE,CAAC,GAAG,CAAC;YACnB,KAAK;SACN,CAAC,CAAC;IACL,CAAC;IAED,MAAM,EAAE,GAAmB;QACzB,IAAI,EAAE,eAAe;QACrB,MAAM,EAAE;YACN,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC;YACV,MAAM,EAAE,SAAS;SAClB;KACF,CAAC;IACF,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAEb,IAAI,KAAK,EAAE,CAAC;QACV,GAAG,CAAC,IAAI,CAAC;YACP,IAAI,EAAE,iBAAiB;YACvB,QAAQ,EAAE;gBACR,EAAE,EAAE,QAAQ,EAAE;gBACd,MAAM,EAAE,QAAQ,EAAE;gBAClB,UAAU,EAAE,EAAE,CAAC,EAAE,CAAC;gBAClB,QAAQ,EAAE,EAAE,CAAC,KAAK,CAAC;gBACnB,IAAI,EAAE,cAAc;aACrB;SACF,CAAC,CAAC;IACL,CAAC;IAED,IAAI,KAAK,EAAE,CAAC;QACV,KAAK,MAAM,MAAM,IAAI,KAAK,EAAE,CAAC;YAC3B,GAAG,CAAC,IAAI,CAAC;gBACP,IAAI,EAAE,iBAAiB;gBACvB,QAAQ,EAAE;oBACR,EAAE,EAAE,QAAQ,EAAE;oBACd,MAAM,EAAE,QAAQ,EAAE;oBAClB,UAAU,EAAE,EAAE,CAAC,EAAE,CAAC;oBAClB,QAAQ,EAAE,EAAE,CAAC,MAAM,CAAC;oBACpB,IAAI,EAAE,cAAc;iBACrB;aACF,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED,KAAK,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,SAAS,IAAI,EAAE,CAAC,EAAE,CAAC;QAC9D,MAAM,gBAAgB,GAAG,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;QAChE,KAAK,MAAM,QAAQ,IAAI,gBAAgB,EAAE,CAAC;YACxC,MAAM,gBAAgB,GAAG,QAAQ,CAAC,EAAE,IAAI,QAAQ,EAAE,CAAC;YACnD,MAAM,EAAE,GAAG,EAAE,WAAW,EAAE,GAAG,cAAc,CAAC;gBAC1C,UAAU,EAAE,EAAE;gBACd,QAAQ,EAAE,QAAQ,CAAC,QAAQ;gBAC3B,IAAI,EAAE,EAAE,CAAC,MAAM,CAAC;gBAChB,QAAQ,EAAE,QAAQ,CAAC,QAAQ;gBAC3B,OAAO,EAAE,QAAQ,CAAC,OAAO;gBACzB,QAAQ,EAAE,gBAAgB;gBAC1B,UAAU,EAAE,QAAQ,CAAC,UAAU;gBAC/B,iBAAiB,EAAE,QAAQ,CAAC,iBAAiB;gBAC7C,WAAW,EAAE,QAAQ,CAAC,WAAW;gBACjC,YAAY,EAAE,QAAQ,CAAC,YAAY;gBACnC,eAAe,EAAE,QAAQ,CAAC,eAAe;gBACzC,WAAW,EAAE,QAAQ,CAAC,WAAW;aAClC,CAAC,CAAC;YACH,GAAG,GAAG,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;QAChC,CAAC;IACH,CAAC;IAED,OAAO,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC;AAC7B,CAAC,CAAC"}
1
+ {"version":3,"file":"create-entity.js","sourceRoot":"","sources":["../../../src/graph/create-entity.ts"],"names":[],"mappings":"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"}