@dxos/echo 0.8.4-main.3c1ae3b → 0.8.4-main.3eb6e50203

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 (452) hide show
  1. package/README.md +1 -2
  2. package/dist/lib/neutral/Annotation.mjs +35 -0
  3. package/dist/lib/neutral/Database.mjs +45 -0
  4. package/dist/lib/neutral/Entity.mjs +51 -0
  5. package/dist/lib/{browser → neutral}/Err.mjs +4 -3
  6. package/dist/lib/{browser → neutral}/Filter.mjs +9 -8
  7. package/dist/lib/{browser → neutral}/Format.mjs +4 -5
  8. package/dist/lib/neutral/JsonSchema.mjs +19 -0
  9. package/dist/lib/{browser → neutral}/Key.mjs +2 -3
  10. package/dist/lib/{node-esm → neutral}/Obj.mjs +40 -19
  11. package/dist/lib/neutral/Order.mjs +12 -0
  12. package/dist/lib/neutral/Query.mjs +26 -0
  13. package/dist/lib/neutral/QueryResult.mjs +2 -0
  14. package/dist/lib/neutral/Ref.mjs +22 -0
  15. package/dist/lib/neutral/Relation.mjs +84 -0
  16. package/dist/lib/neutral/SchemaRegistry.mjs +2 -0
  17. package/dist/lib/neutral/Tag.mjs +25 -0
  18. package/dist/lib/neutral/Type.mjs +47 -0
  19. package/dist/lib/{browser/chunk-FGFQWIZE.mjs → neutral/chunk-4L6DOFXP.mjs} +1 -3
  20. package/dist/lib/neutral/chunk-4L6DOFXP.mjs.map +7 -0
  21. package/dist/lib/{browser/chunk-RP4JV7FD.mjs → neutral/chunk-7WE7SBA2.mjs} +4 -5
  22. package/dist/lib/neutral/chunk-7WE7SBA2.mjs.map +7 -0
  23. package/dist/lib/neutral/chunk-7YWDDFPH.mjs +251 -0
  24. package/dist/lib/neutral/chunk-7YWDDFPH.mjs.map +7 -0
  25. package/dist/lib/{browser/chunk-INHXFXY5.mjs → neutral/chunk-ANHVGJI4.mjs} +2 -3
  26. package/dist/lib/{node-esm/chunk-AJEMYSIR.mjs.map → neutral/chunk-ANHVGJI4.mjs.map} +1 -1
  27. package/dist/lib/neutral/chunk-B4FLOYG7.mjs +130 -0
  28. package/dist/lib/neutral/chunk-B4FLOYG7.mjs.map +7 -0
  29. package/dist/lib/{browser/chunk-O6FOICWT.mjs → neutral/chunk-EXAYCLIM.mjs} +8 -9
  30. package/dist/lib/neutral/chunk-EXAYCLIM.mjs.map +7 -0
  31. package/dist/lib/{browser/chunk-V7TON6BX.mjs → neutral/chunk-F6BTBXL7.mjs} +28 -8
  32. package/dist/lib/neutral/chunk-F6BTBXL7.mjs.map +7 -0
  33. package/dist/lib/neutral/chunk-HQXQWXLH.mjs +269 -0
  34. package/dist/lib/neutral/chunk-HQXQWXLH.mjs.map +7 -0
  35. package/dist/lib/{browser/chunk-CGS2ULMK.mjs → neutral/chunk-J5LGTIGS.mjs} +1 -2
  36. package/dist/lib/{node-esm/chunk-NHYOREKX.mjs → neutral/chunk-KB7RIVLK.mjs} +11 -6
  37. package/dist/lib/neutral/chunk-KB7RIVLK.mjs.map +7 -0
  38. package/dist/lib/neutral/chunk-MXQJZCPY.mjs +51 -0
  39. package/dist/lib/neutral/chunk-MXQJZCPY.mjs.map +7 -0
  40. package/dist/lib/{browser/chunk-3B2G6BW4.mjs → neutral/chunk-N2QNHMT5.mjs} +3 -4
  41. package/dist/lib/{browser/chunk-3B2G6BW4.mjs.map → neutral/chunk-N2QNHMT5.mjs.map} +1 -1
  42. package/dist/lib/{browser/chunk-JG4GH6LN.mjs → neutral/chunk-OMUPQMLR.mjs} +1 -3
  43. package/dist/lib/neutral/chunk-OMUPQMLR.mjs.map +7 -0
  44. package/dist/lib/{browser/chunk-AGOWBKY6.mjs → neutral/chunk-RCBBZLVM.mjs} +61 -13
  45. package/dist/lib/neutral/chunk-RCBBZLVM.mjs.map +7 -0
  46. package/dist/lib/{node-esm/chunk-6OTQZKHX.mjs → neutral/chunk-RIMHNJ3E.mjs} +30 -37
  47. package/dist/lib/neutral/chunk-RIMHNJ3E.mjs.map +7 -0
  48. package/dist/lib/{node-esm/chunk-BYL2NPEA.mjs → neutral/chunk-ROKO4RKJ.mjs} +9 -4
  49. package/dist/lib/{node-esm/chunk-BYL2NPEA.mjs.map → neutral/chunk-ROKO4RKJ.mjs.map} +3 -3
  50. package/dist/lib/{browser/chunk-ESLW4N7S.mjs → neutral/chunk-TMLVKIMX.mjs} +3 -4
  51. package/dist/lib/neutral/chunk-TMLVKIMX.mjs.map +7 -0
  52. package/dist/lib/{browser/chunk-P2B4BASR.mjs → neutral/chunk-UMECVTXM.mjs} +4 -5
  53. package/dist/lib/{node-esm/chunk-LDXRA5TC.mjs.map → neutral/chunk-UMECVTXM.mjs.map} +1 -1
  54. package/dist/lib/{browser/chunk-6XVZF5VJ.mjs → neutral/chunk-VJ2H5MOJ.mjs} +1991 -1010
  55. package/dist/lib/neutral/chunk-VJ2H5MOJ.mjs.map +7 -0
  56. package/dist/lib/{browser/chunk-5IN7XBIQ.mjs → neutral/chunk-VYEWMV5U.mjs} +3 -4
  57. package/dist/lib/{browser/chunk-5IN7XBIQ.mjs.map → neutral/chunk-VYEWMV5U.mjs.map} +1 -1
  58. package/dist/lib/{browser/chunk-MYCCGG2T.mjs → neutral/chunk-X2MPMYYN.mjs} +1 -3
  59. package/dist/lib/{browser/chunk-MYCCGG2T.mjs.map → neutral/chunk-X2MPMYYN.mjs.map} +1 -1
  60. package/dist/lib/{browser/chunk-ZIM3Y4ZK.mjs → neutral/chunk-XAJMXQ4H.mjs} +17 -12
  61. package/dist/lib/neutral/chunk-XAJMXQ4H.mjs.map +7 -0
  62. package/dist/lib/neutral/chunk-YPIP3WGI.mjs +97 -0
  63. package/dist/lib/neutral/chunk-YPIP3WGI.mjs.map +7 -0
  64. package/dist/lib/{browser → neutral}/index.mjs +27 -28
  65. package/dist/lib/{node-esm → neutral}/internal/index.mjs +141 -26
  66. package/dist/lib/neutral/meta.json +1 -0
  67. package/dist/lib/{browser → neutral}/testing/index.mjs +67 -61
  68. package/dist/lib/neutral/testing/index.mjs.map +7 -0
  69. package/dist/types/src/Annotation.d.ts +23 -1
  70. package/dist/types/src/Annotation.d.ts.map +1 -1
  71. package/dist/types/src/Database.d.ts +90 -53
  72. package/dist/types/src/Database.d.ts.map +1 -1
  73. package/dist/types/src/Entity.d.ts +111 -5
  74. package/dist/types/src/Entity.d.ts.map +1 -1
  75. package/dist/types/src/Entity.test.d.ts +2 -0
  76. package/dist/types/src/Entity.test.d.ts.map +1 -0
  77. package/dist/types/src/Err.d.ts +55 -16
  78. package/dist/types/src/Err.d.ts.map +1 -1
  79. package/dist/types/src/Obj.d.ts +348 -76
  80. package/dist/types/src/Obj.d.ts.map +1 -1
  81. package/dist/types/src/Obj.test.d.ts +2 -0
  82. package/dist/types/src/Obj.test.d.ts.map +1 -0
  83. package/dist/types/src/Order.d.ts +5 -0
  84. package/dist/types/src/Order.d.ts.map +1 -1
  85. package/dist/types/src/Query.d.ts +21 -3
  86. package/dist/types/src/Query.d.ts.map +1 -1
  87. package/dist/types/src/QueryResult.d.ts +0 -4
  88. package/dist/types/src/QueryResult.d.ts.map +1 -1
  89. package/dist/types/src/Ref.d.ts +7 -7
  90. package/dist/types/src/Ref.d.ts.map +1 -1
  91. package/dist/types/src/Relation.d.ts +236 -19
  92. package/dist/types/src/Relation.d.ts.map +1 -1
  93. package/dist/types/src/Relation.test.d.ts +2 -0
  94. package/dist/types/src/Relation.test.d.ts.map +1 -0
  95. package/dist/types/src/SchemaRegistry.d.ts +11 -0
  96. package/dist/types/src/SchemaRegistry.d.ts.map +1 -1
  97. package/dist/types/src/Tag.d.ts +6 -6
  98. package/dist/types/src/Tag.d.ts.map +1 -1
  99. package/dist/types/src/Type.d.ts +213 -50
  100. package/dist/types/src/Type.d.ts.map +1 -1
  101. package/dist/types/src/Type.test.d.ts +2 -0
  102. package/dist/types/src/Type.test.d.ts.map +1 -0
  103. package/dist/types/src/hierarchy.test.d.ts +2 -0
  104. package/dist/types/src/hierarchy.test.d.ts.map +1 -0
  105. package/dist/types/src/internal/annotations/annotations.d.ts +24 -26
  106. package/dist/types/src/internal/annotations/annotations.d.ts.map +1 -1
  107. package/dist/types/src/internal/annotations/util.d.ts +12 -0
  108. package/dist/types/src/internal/annotations/util.d.ts.map +1 -1
  109. package/dist/types/src/internal/api/annotations.d.ts +23 -0
  110. package/dist/types/src/internal/api/annotations.d.ts.map +1 -0
  111. package/dist/types/src/internal/api/entity.d.ts +13 -0
  112. package/dist/types/src/internal/api/entity.d.ts.map +1 -0
  113. package/dist/types/src/internal/api/index.d.ts +15 -0
  114. package/dist/types/src/internal/api/index.d.ts.map +1 -0
  115. package/dist/types/src/internal/api/meta.d.ts +42 -0
  116. package/dist/types/src/internal/api/meta.d.ts.map +1 -0
  117. package/dist/types/src/internal/api/sorting.d.ts +24 -0
  118. package/dist/types/src/internal/api/sorting.d.ts.map +1 -0
  119. package/dist/types/src/internal/api/version.d.ts +42 -0
  120. package/dist/types/src/internal/api/version.d.ts.map +1 -0
  121. package/dist/types/src/internal/entities/entity.d.ts +13 -3
  122. package/dist/types/src/internal/entities/entity.d.ts.map +1 -1
  123. package/dist/types/src/internal/entities/index.d.ts +1 -1
  124. package/dist/types/src/internal/entities/index.d.ts.map +1 -1
  125. package/dist/types/src/internal/entities/model.d.ts +17 -8
  126. package/dist/types/src/internal/entities/model.d.ts.map +1 -1
  127. package/dist/types/src/internal/entities/object.d.ts +8 -1
  128. package/dist/types/src/internal/entities/object.d.ts.map +1 -1
  129. package/dist/types/src/internal/entities/relation.d.ts +8 -1
  130. package/dist/types/src/internal/entities/relation.d.ts.map +1 -1
  131. package/dist/types/src/internal/formats/select.d.ts +2 -2
  132. package/dist/types/src/internal/formats/select.d.ts.map +1 -1
  133. package/dist/types/src/internal/index.d.ts +2 -1
  134. package/dist/types/src/internal/index.d.ts.map +1 -1
  135. package/dist/types/src/internal/json-schema/json-schema-normalize.d.ts.map +1 -1
  136. package/dist/types/src/internal/json-schema/json-schema-type.d.ts +130 -29
  137. package/dist/types/src/internal/json-schema/json-schema-type.d.ts.map +1 -1
  138. package/dist/types/src/internal/json-schema/json-schema.d.ts +2 -1
  139. package/dist/types/src/internal/json-schema/json-schema.d.ts.map +1 -1
  140. package/dist/types/src/internal/object/clone.d.ts +8 -0
  141. package/dist/types/src/internal/object/clone.d.ts.map +1 -0
  142. package/dist/types/src/internal/object/create-object.d.ts +1 -1
  143. package/dist/types/src/internal/object/index.d.ts +3 -0
  144. package/dist/types/src/internal/object/index.d.ts.map +1 -1
  145. package/dist/types/src/internal/object/json-serializer.d.ts +13 -7
  146. package/dist/types/src/internal/object/json-serializer.d.ts.map +1 -1
  147. package/dist/types/src/internal/object/schema-validator.d.ts +1 -14
  148. package/dist/types/src/internal/object/schema-validator.d.ts.map +1 -1
  149. package/dist/types/src/internal/object/set-value.d.ts +7 -0
  150. package/dist/types/src/internal/object/set-value.d.ts.map +1 -0
  151. package/dist/types/src/internal/object/set-value.test.d.ts +2 -0
  152. package/dist/types/src/internal/object/set-value.test.d.ts.map +1 -0
  153. package/dist/types/src/internal/object/snapshot.d.ts +6 -0
  154. package/dist/types/src/internal/object/snapshot.d.ts.map +1 -0
  155. package/dist/types/src/internal/object/typed-object.d.ts +7 -13
  156. package/dist/types/src/internal/object/typed-object.d.ts.map +1 -1
  157. package/dist/types/src/internal/proxy/change-context.d.ts +55 -0
  158. package/dist/types/src/internal/proxy/change-context.d.ts.map +1 -0
  159. package/dist/types/src/internal/proxy/change.test.d.ts +2 -0
  160. package/dist/types/src/internal/proxy/change.test.d.ts.map +1 -0
  161. package/dist/types/src/internal/proxy/define-hidden-property.d.ts +5 -0
  162. package/dist/types/src/internal/proxy/define-hidden-property.d.ts.map +1 -0
  163. package/dist/types/src/internal/proxy/errors.d.ts +19 -0
  164. package/dist/types/src/internal/proxy/errors.d.ts.map +1 -0
  165. package/dist/types/src/internal/proxy/event-batch.d.ts +10 -0
  166. package/dist/types/src/internal/proxy/event-batch.d.ts.map +1 -0
  167. package/dist/types/src/internal/proxy/index.d.ts +11 -0
  168. package/dist/types/src/internal/proxy/index.d.ts.map +1 -1
  169. package/dist/types/src/internal/proxy/json-serializer.d.ts +6 -0
  170. package/dist/types/src/internal/proxy/json-serializer.d.ts.map +1 -0
  171. package/dist/types/src/internal/proxy/make-object.d.ts +2 -4
  172. package/dist/types/src/internal/proxy/make-object.d.ts.map +1 -1
  173. package/dist/types/src/internal/proxy/ownership.d.ts +57 -0
  174. package/dist/types/src/internal/proxy/ownership.d.ts.map +1 -0
  175. package/dist/types/src/internal/proxy/proxy-types.d.ts +18 -0
  176. package/dist/types/src/internal/proxy/proxy-types.d.ts.map +1 -0
  177. package/dist/types/src/internal/proxy/proxy-utils.d.ts +47 -0
  178. package/dist/types/src/internal/proxy/proxy-utils.d.ts.map +1 -0
  179. package/dist/types/src/internal/proxy/reactive-array.d.ts +8 -0
  180. package/dist/types/src/internal/proxy/reactive-array.d.ts.map +1 -0
  181. package/dist/types/src/internal/proxy/reactive.d.ts +39 -0
  182. package/dist/types/src/internal/proxy/reactive.d.ts.map +1 -0
  183. package/dist/types/src/internal/proxy/schema-validator.d.ts +15 -0
  184. package/dist/types/src/internal/proxy/schema-validator.d.ts.map +1 -0
  185. package/dist/types/src/internal/proxy/symbols.d.ts +3 -0
  186. package/dist/types/src/internal/proxy/symbols.d.ts.map +1 -0
  187. package/dist/types/src/internal/proxy/typed-handler.d.ts +16 -12
  188. package/dist/types/src/internal/proxy/typed-handler.d.ts.map +1 -1
  189. package/dist/types/src/internal/ref/ref-array.d.ts +4 -4
  190. package/dist/types/src/internal/ref/ref-array.d.ts.map +1 -1
  191. package/dist/types/src/internal/ref/ref.d.ts +30 -8
  192. package/dist/types/src/internal/ref/ref.d.ts.map +1 -1
  193. package/dist/types/src/internal/schema/compose.d.ts +2 -1
  194. package/dist/types/src/internal/schema/compose.d.ts.map +1 -1
  195. package/dist/types/src/internal/schema/echo-schema.d.ts +16 -3
  196. package/dist/types/src/internal/schema/echo-schema.d.ts.map +1 -1
  197. package/dist/types/src/internal/schema/index.d.ts +0 -1
  198. package/dist/types/src/internal/schema/index.d.ts.map +1 -1
  199. package/dist/types/src/internal/schema/persistent-schema.d.ts +9 -7
  200. package/dist/types/src/internal/schema/persistent-schema.d.ts.map +1 -1
  201. package/dist/types/src/internal/types/base.d.ts +5 -16
  202. package/dist/types/src/internal/types/base.d.ts.map +1 -1
  203. package/dist/types/src/internal/types/entity.d.ts +27 -2
  204. package/dist/types/src/internal/types/entity.d.ts.map +1 -1
  205. package/dist/types/src/internal/types/meta.d.ts +6 -14
  206. package/dist/types/src/internal/types/meta.d.ts.map +1 -1
  207. package/dist/types/src/internal/types/typename.d.ts +8 -0
  208. package/dist/types/src/internal/types/typename.d.ts.map +1 -1
  209. package/dist/types/src/testing/test-schema.d.ts +101 -205
  210. package/dist/types/src/testing/test-schema.d.ts.map +1 -1
  211. package/dist/types/src/testing/util.d.ts +6 -1
  212. package/dist/types/src/testing/util.d.ts.map +1 -1
  213. package/dist/types/tsconfig.tsbuildinfo +1 -1
  214. package/package.json +38 -115
  215. package/src/Annotation.ts +32 -4
  216. package/src/Database.ts +170 -125
  217. package/src/Entity.test.ts +22 -0
  218. package/src/Entity.ts +173 -7
  219. package/src/Err.ts +22 -2
  220. package/src/Obj.test.ts +442 -0
  221. package/src/Obj.ts +471 -254
  222. package/src/Order.ts +10 -0
  223. package/src/Query.test.ts +120 -1
  224. package/src/Query.ts +53 -8
  225. package/src/QueryResult.ts +1 -4
  226. package/src/Ref.ts +3 -3
  227. package/src/Relation.test.ts +82 -0
  228. package/src/Relation.ts +367 -28
  229. package/src/SchemaRegistry.ts +13 -0
  230. package/src/Tag.ts +1 -1
  231. package/src/Type.test.ts +52 -0
  232. package/src/Type.ts +322 -88
  233. package/src/hierarchy.test.ts +33 -0
  234. package/src/internal/README.md +31 -16
  235. package/src/internal/annotations/annotations.test.ts +6 -6
  236. package/src/internal/annotations/annotations.ts +48 -49
  237. package/src/internal/annotations/util.ts +13 -0
  238. package/src/internal/api/annotations.ts +60 -0
  239. package/src/internal/api/entity.ts +29 -0
  240. package/src/internal/api/index.ts +19 -0
  241. package/src/internal/api/meta.ts +88 -0
  242. package/src/internal/api/sorting.ts +53 -0
  243. package/src/internal/api/version.ts +96 -0
  244. package/src/internal/entities/entity.ts +36 -19
  245. package/src/internal/entities/index.ts +1 -1
  246. package/src/internal/entities/model.ts +21 -12
  247. package/src/internal/entities/object.ts +21 -8
  248. package/src/internal/entities/relation.ts +23 -7
  249. package/src/internal/formats/format.test.ts +1 -1
  250. package/src/internal/formats/select.ts +1 -1
  251. package/src/internal/formats/types.ts +1 -1
  252. package/src/internal/index.ts +2 -1
  253. package/src/internal/json-schema/json-schema-normalize.ts +4 -2
  254. package/src/internal/json-schema/json-schema-type.ts +30 -31
  255. package/src/internal/json-schema/json-schema.test.ts +17 -17
  256. package/src/internal/json-schema/json-schema.ts +14 -10
  257. package/src/internal/object/clone.ts +48 -0
  258. package/src/internal/object/create-object.ts +2 -2
  259. package/src/internal/object/index.ts +3 -0
  260. package/src/internal/object/inspect.ts +3 -3
  261. package/src/internal/object/json-serializer.test.ts +6 -2
  262. package/src/internal/object/json-serializer.ts +37 -70
  263. package/src/internal/object/schema-validator.test.ts +3 -7
  264. package/src/internal/object/schema-validator.ts +2 -240
  265. package/src/internal/object/set-value.test.ts +281 -0
  266. package/src/internal/object/set-value.ts +165 -0
  267. package/src/internal/object/snapshot.ts +93 -0
  268. package/src/internal/object/typed-object.test.ts +11 -11
  269. package/src/internal/object/typed-object.ts +8 -72
  270. package/src/internal/proxy/change-context.ts +138 -0
  271. package/src/internal/proxy/change.test.ts +519 -0
  272. package/src/internal/proxy/define-hidden-property.ts +14 -0
  273. package/src/internal/proxy/errors.ts +42 -0
  274. package/src/internal/proxy/event-batch.ts +44 -0
  275. package/src/internal/proxy/handler.test.ts +30 -80
  276. package/src/internal/proxy/index.ts +11 -0
  277. package/src/internal/proxy/json-serializer.ts +87 -0
  278. package/src/internal/proxy/make-object.ts +44 -51
  279. package/src/internal/proxy/ownership.ts +253 -0
  280. package/src/internal/proxy/proxy-types.ts +23 -0
  281. package/src/internal/proxy/proxy-utils.ts +150 -0
  282. package/src/internal/proxy/reactive-array.ts +71 -0
  283. package/src/internal/proxy/reactive.ts +69 -0
  284. package/src/internal/proxy/schema-validator.ts +244 -0
  285. package/src/internal/proxy/schema.test.ts +23 -15
  286. package/src/internal/proxy/symbols.ts +7 -0
  287. package/src/internal/proxy/typed-handler.test.ts +247 -35
  288. package/src/internal/proxy/typed-handler.ts +274 -57
  289. package/src/internal/proxy/typed-object.test.ts +37 -26
  290. package/src/internal/ref/ref-array.ts +4 -4
  291. package/src/internal/ref/ref.test.ts +1 -1
  292. package/src/internal/ref/ref.ts +88 -41
  293. package/src/internal/schema/compose.test.ts +3 -3
  294. package/src/internal/schema/compose.ts +13 -9
  295. package/src/internal/schema/echo-schema.ts +51 -12
  296. package/src/internal/schema/index.ts +0 -1
  297. package/src/internal/schema/persistent-schema.ts +5 -5
  298. package/src/internal/types/base.ts +6 -20
  299. package/src/internal/types/entity.ts +35 -4
  300. package/src/internal/types/meta.ts +13 -24
  301. package/src/internal/types/typename.ts +10 -0
  302. package/src/testing/api.test.ts +31 -5
  303. package/src/testing/test-schema.ts +44 -30
  304. package/src/testing/util.ts +22 -15
  305. package/dist/lib/browser/Annotation.mjs +0 -31
  306. package/dist/lib/browser/Database.mjs +0 -14
  307. package/dist/lib/browser/Entity.mjs +0 -20
  308. package/dist/lib/browser/JsonSchema.mjs +0 -18
  309. package/dist/lib/browser/Obj.mjs +0 -83
  310. package/dist/lib/browser/Order.mjs +0 -11
  311. package/dist/lib/browser/Query.mjs +0 -25
  312. package/dist/lib/browser/QueryResult.mjs +0 -3
  313. package/dist/lib/browser/Ref.mjs +0 -21
  314. package/dist/lib/browser/Relation.mjs +0 -33
  315. package/dist/lib/browser/SchemaRegistry.mjs +0 -3
  316. package/dist/lib/browser/Tag.mjs +0 -25
  317. package/dist/lib/browser/Type.mjs +0 -38
  318. package/dist/lib/browser/chunk-6XVZF5VJ.mjs.map +0 -7
  319. package/dist/lib/browser/chunk-AGOWBKY6.mjs.map +0 -7
  320. package/dist/lib/browser/chunk-BD6MRI4M.mjs +0 -113
  321. package/dist/lib/browser/chunk-BD6MRI4M.mjs.map +0 -7
  322. package/dist/lib/browser/chunk-DOPKE2FQ.mjs +0 -32
  323. package/dist/lib/browser/chunk-DOPKE2FQ.mjs.map +0 -7
  324. package/dist/lib/browser/chunk-ESLW4N7S.mjs.map +0 -7
  325. package/dist/lib/browser/chunk-F4YF6C3O.mjs +0 -363
  326. package/dist/lib/browser/chunk-F4YF6C3O.mjs.map +0 -7
  327. package/dist/lib/browser/chunk-FGFQWIZE.mjs.map +0 -7
  328. package/dist/lib/browser/chunk-INHXFXY5.mjs.map +0 -7
  329. package/dist/lib/browser/chunk-JG4GH6LN.mjs.map +0 -7
  330. package/dist/lib/browser/chunk-NFH3POTD.mjs +0 -37
  331. package/dist/lib/browser/chunk-NFH3POTD.mjs.map +0 -7
  332. package/dist/lib/browser/chunk-O6FOICWT.mjs.map +0 -7
  333. package/dist/lib/browser/chunk-P2B4BASR.mjs.map +0 -7
  334. package/dist/lib/browser/chunk-QHC3ZYNC.mjs +0 -152
  335. package/dist/lib/browser/chunk-QHC3ZYNC.mjs.map +0 -7
  336. package/dist/lib/browser/chunk-QU7PWSZD.mjs +0 -62
  337. package/dist/lib/browser/chunk-QU7PWSZD.mjs.map +0 -7
  338. package/dist/lib/browser/chunk-RP4JV7FD.mjs.map +0 -7
  339. package/dist/lib/browser/chunk-V7TON6BX.mjs.map +0 -7
  340. package/dist/lib/browser/chunk-WABSVOOX.mjs +0 -303
  341. package/dist/lib/browser/chunk-WABSVOOX.mjs.map +0 -7
  342. package/dist/lib/browser/chunk-XRHHSMHJ.mjs +0 -39
  343. package/dist/lib/browser/chunk-XRHHSMHJ.mjs.map +0 -7
  344. package/dist/lib/browser/chunk-ZIM3Y4ZK.mjs.map +0 -7
  345. package/dist/lib/browser/internal/index.mjs +0 -347
  346. package/dist/lib/browser/meta.json +0 -1
  347. package/dist/lib/browser/testing/index.mjs.map +0 -7
  348. package/dist/lib/node-esm/Annotation.mjs +0 -31
  349. package/dist/lib/node-esm/Annotation.mjs.map +0 -7
  350. package/dist/lib/node-esm/Database.mjs +0 -14
  351. package/dist/lib/node-esm/Database.mjs.map +0 -7
  352. package/dist/lib/node-esm/Entity.mjs +0 -20
  353. package/dist/lib/node-esm/Entity.mjs.map +0 -7
  354. package/dist/lib/node-esm/Err.mjs +0 -11
  355. package/dist/lib/node-esm/Err.mjs.map +0 -7
  356. package/dist/lib/node-esm/Filter.mjs +0 -60
  357. package/dist/lib/node-esm/Filter.mjs.map +0 -7
  358. package/dist/lib/node-esm/Format.mjs +0 -67
  359. package/dist/lib/node-esm/Format.mjs.map +0 -7
  360. package/dist/lib/node-esm/JsonSchema.mjs +0 -18
  361. package/dist/lib/node-esm/JsonSchema.mjs.map +0 -7
  362. package/dist/lib/node-esm/Key.mjs +0 -13
  363. package/dist/lib/node-esm/Key.mjs.map +0 -7
  364. package/dist/lib/node-esm/Obj.mjs.map +0 -7
  365. package/dist/lib/node-esm/Order.mjs +0 -11
  366. package/dist/lib/node-esm/Order.mjs.map +0 -7
  367. package/dist/lib/node-esm/Query.mjs +0 -25
  368. package/dist/lib/node-esm/Query.mjs.map +0 -7
  369. package/dist/lib/node-esm/QueryResult.mjs +0 -3
  370. package/dist/lib/node-esm/QueryResult.mjs.map +0 -7
  371. package/dist/lib/node-esm/Ref.mjs +0 -21
  372. package/dist/lib/node-esm/Ref.mjs.map +0 -7
  373. package/dist/lib/node-esm/Relation.mjs +0 -33
  374. package/dist/lib/node-esm/Relation.mjs.map +0 -7
  375. package/dist/lib/node-esm/SchemaRegistry.mjs +0 -3
  376. package/dist/lib/node-esm/SchemaRegistry.mjs.map +0 -7
  377. package/dist/lib/node-esm/Tag.mjs +0 -25
  378. package/dist/lib/node-esm/Tag.mjs.map +0 -7
  379. package/dist/lib/node-esm/Type.mjs +0 -38
  380. package/dist/lib/node-esm/Type.mjs.map +0 -7
  381. package/dist/lib/node-esm/chunk-5M5P2DCR.mjs +0 -32
  382. package/dist/lib/node-esm/chunk-5M5P2DCR.mjs.map +0 -7
  383. package/dist/lib/node-esm/chunk-6OTQZKHX.mjs.map +0 -7
  384. package/dist/lib/node-esm/chunk-76LEDWHO.mjs +0 -152
  385. package/dist/lib/node-esm/chunk-76LEDWHO.mjs.map +0 -7
  386. package/dist/lib/node-esm/chunk-AGHZH33D.mjs +0 -9
  387. package/dist/lib/node-esm/chunk-AGHZH33D.mjs.map +0 -7
  388. package/dist/lib/node-esm/chunk-AJEMYSIR.mjs +0 -22
  389. package/dist/lib/node-esm/chunk-BJACR7QG.mjs +0 -363
  390. package/dist/lib/node-esm/chunk-BJACR7QG.mjs.map +0 -7
  391. package/dist/lib/node-esm/chunk-CCMFPJUT.mjs +0 -74
  392. package/dist/lib/node-esm/chunk-CCMFPJUT.mjs.map +0 -7
  393. package/dist/lib/node-esm/chunk-D5BW7KHR.mjs +0 -39
  394. package/dist/lib/node-esm/chunk-D5BW7KHR.mjs.map +0 -7
  395. package/dist/lib/node-esm/chunk-DJX53IQ3.mjs +0 -2924
  396. package/dist/lib/node-esm/chunk-DJX53IQ3.mjs.map +0 -7
  397. package/dist/lib/node-esm/chunk-FWTPV5QD.mjs +0 -94
  398. package/dist/lib/node-esm/chunk-FWTPV5QD.mjs.map +0 -7
  399. package/dist/lib/node-esm/chunk-HLUDHPFO.mjs +0 -403
  400. package/dist/lib/node-esm/chunk-HLUDHPFO.mjs.map +0 -7
  401. package/dist/lib/node-esm/chunk-HSLMI22Q.mjs +0 -11
  402. package/dist/lib/node-esm/chunk-HSLMI22Q.mjs.map +0 -7
  403. package/dist/lib/node-esm/chunk-JYZSF62S.mjs +0 -113
  404. package/dist/lib/node-esm/chunk-JYZSF62S.mjs.map +0 -7
  405. package/dist/lib/node-esm/chunk-KUX5JEL2.mjs +0 -57
  406. package/dist/lib/node-esm/chunk-KUX5JEL2.mjs.map +0 -7
  407. package/dist/lib/node-esm/chunk-LDXRA5TC.mjs +0 -288
  408. package/dist/lib/node-esm/chunk-MOWUEW5P.mjs +0 -15
  409. package/dist/lib/node-esm/chunk-MOWUEW5P.mjs.map +0 -7
  410. package/dist/lib/node-esm/chunk-NHYOREKX.mjs.map +0 -7
  411. package/dist/lib/node-esm/chunk-QVZZHCDS.mjs +0 -9
  412. package/dist/lib/node-esm/chunk-QVZZHCDS.mjs.map +0 -7
  413. package/dist/lib/node-esm/chunk-W3OLV7MG.mjs +0 -41
  414. package/dist/lib/node-esm/chunk-W3OLV7MG.mjs.map +0 -7
  415. package/dist/lib/node-esm/chunk-W5AQXKVF.mjs +0 -38
  416. package/dist/lib/node-esm/chunk-W5AQXKVF.mjs.map +0 -7
  417. package/dist/lib/node-esm/chunk-YNBFXTDG.mjs +0 -24
  418. package/dist/lib/node-esm/chunk-YNBFXTDG.mjs.map +0 -7
  419. package/dist/lib/node-esm/chunk-Z53QIBP2.mjs +0 -151
  420. package/dist/lib/node-esm/chunk-Z53QIBP2.mjs.map +0 -7
  421. package/dist/lib/node-esm/index.mjs +0 -85
  422. package/dist/lib/node-esm/index.mjs.map +0 -7
  423. package/dist/lib/node-esm/internal/index.mjs.map +0 -7
  424. package/dist/lib/node-esm/meta.json +0 -1
  425. package/dist/lib/node-esm/testing/index.mjs +0 -360
  426. package/dist/lib/node-esm/testing/index.mjs.map +0 -7
  427. package/dist/types/src/internal/entities/expando.d.ts +0 -16
  428. package/dist/types/src/internal/entities/expando.d.ts.map +0 -1
  429. package/dist/types/src/internal/schema/snapshot.d.ts +0 -6
  430. package/dist/types/src/internal/schema/snapshot.d.ts.map +0 -1
  431. package/src/internal/entities/expando.ts +0 -23
  432. package/src/internal/schema/snapshot.ts +0 -25
  433. /package/dist/lib/{browser → neutral}/Annotation.mjs.map +0 -0
  434. /package/dist/lib/{browser → neutral}/Database.mjs.map +0 -0
  435. /package/dist/lib/{browser → neutral}/Entity.mjs.map +0 -0
  436. /package/dist/lib/{browser → neutral}/Err.mjs.map +0 -0
  437. /package/dist/lib/{browser → neutral}/Filter.mjs.map +0 -0
  438. /package/dist/lib/{browser → neutral}/Format.mjs.map +0 -0
  439. /package/dist/lib/{browser → neutral}/JsonSchema.mjs.map +0 -0
  440. /package/dist/lib/{browser → neutral}/Key.mjs.map +0 -0
  441. /package/dist/lib/{browser → neutral}/Obj.mjs.map +0 -0
  442. /package/dist/lib/{browser → neutral}/Order.mjs.map +0 -0
  443. /package/dist/lib/{browser → neutral}/Query.mjs.map +0 -0
  444. /package/dist/lib/{browser → neutral}/QueryResult.mjs.map +0 -0
  445. /package/dist/lib/{browser → neutral}/Ref.mjs.map +0 -0
  446. /package/dist/lib/{browser → neutral}/Relation.mjs.map +0 -0
  447. /package/dist/lib/{browser → neutral}/SchemaRegistry.mjs.map +0 -0
  448. /package/dist/lib/{browser → neutral}/Tag.mjs.map +0 -0
  449. /package/dist/lib/{browser → neutral}/Type.mjs.map +0 -0
  450. /package/dist/lib/{browser/chunk-CGS2ULMK.mjs.map → neutral/chunk-J5LGTIGS.mjs.map} +0 -0
  451. /package/dist/lib/{browser → neutral}/index.mjs.map +0 -0
  452. /package/dist/lib/{browser → neutral}/internal/index.mjs.map +0 -0
@@ -7,7 +7,6 @@ import type * as Schema from 'effect/Schema';
7
7
  import { raise } from '@dxos/debug';
8
8
  import { assertArgument, failedInvariant } from '@dxos/invariant';
9
9
  import { ObjectId } from '@dxos/keys';
10
- import { defineHiddenProperty } from '@dxos/live-object';
11
10
 
12
11
  import { getSchemaDXN, getTypeAnnotation, setTypename } from '../annotations';
13
12
  import {
@@ -18,6 +17,7 @@ import {
18
17
  assertObjectModel,
19
18
  getObjectDXN,
20
19
  } from '../entities';
20
+ import { defineHiddenProperty } from '../proxy';
21
21
  import { EntityKind, KindId, MetaId, setSchema } from '../types';
22
22
 
23
23
  import { attachedTypedObjectInspector } from './inspect';
@@ -41,7 +41,7 @@ export type CreateObjectProps<T> = T extends { id: string } ? Omit<T, 'id' | Kin
41
41
  * const Contact = Schema.Struct({
42
42
  * name: Schema.String,
43
43
  * email: Schema.String,
44
- * }).pipe(Type.Obj({
44
+ * }).pipe(Type.object({
45
45
  * typename: 'example.com/type/Person',
46
46
  * version: '0.1.0',
47
47
  * }))
@@ -8,4 +8,7 @@ export * from './deleted';
8
8
  export * from './ids';
9
9
  export * from './json-serializer';
10
10
  export * from './schema-validator';
11
+ export * from './set-value';
12
+ export * from './snapshot';
11
13
  export * from './typed-object';
14
+ export * from './clone';
@@ -7,7 +7,7 @@ import type { InspectOptionsStylized, inspect as inspectFn } from 'node:util';
7
7
  import { type CustomInspectFunction, inspectCustom } from '@dxos/debug';
8
8
 
9
9
  import { getTypeDXN } from '../annotations';
10
- import { ATTR_META, ATTR_TYPE, type AnyEchoObject, MetaId } from '../types';
10
+ import { ATTR_META, ATTR_TYPE, type AnyEntity, MetaId } from '../types';
11
11
 
12
12
  /*
13
13
  * @internal
@@ -27,8 +27,8 @@ export const attachedTypedObjectInspector = (obj: any) => {
27
27
  };
28
28
 
29
29
  // NOTE: KEEP as function.
30
- const typedObjectInspectFunction: CustomInspectFunction<AnyEchoObject> = function (
31
- this: AnyEchoObject,
30
+ const typedObjectInspectFunction: CustomInspectFunction<AnyEntity> = function (
31
+ this: AnyEntity,
32
32
  depth: number,
33
33
  options: InspectOptionsStylized,
34
34
  inspect: typeof inspectFn,
@@ -6,12 +6,14 @@ import { describe, expect, test } from 'vitest';
6
6
 
7
7
  import { DXN } from '@dxos/keys';
8
8
 
9
+ import * as Obj from '../../Obj';
9
10
  import { TestSchema } from '../../testing';
10
11
  import { getSchemaDXN, getSchemaTypename, getTypeDXN, getTypename } from '../annotations';
12
+ import { getMetaChecked } from '../api';
11
13
  import { RelationSourceId, RelationTargetId, getObjectDXN } from '../entities';
12
14
  import { makeObject } from '../proxy';
13
15
  import { Ref, StaticRefResolver } from '../ref';
14
- import { ATTR_TYPE, EntityKind, KindId, MetaId, TypeId, getMeta, getSchema } from '../types';
16
+ import { ATTR_TYPE, EntityKind, KindId, MetaId, TypeId, getSchema } from '../types';
15
17
 
16
18
  import { createObject } from './create-object';
17
19
  import { objectFromJSON, objectToJSON } from './json-serializer';
@@ -19,7 +21,9 @@ import { objectFromJSON, objectToJSON } from './json-serializer';
19
21
  describe('Object JSON serializer', () => {
20
22
  test('should serialize and deserialize object', async () => {
21
23
  const contact = makeObject(TestSchema.Person, { name: 'Alice' });
22
- getMeta(contact).keys.push({ id: '12345', source: 'example.com' });
24
+ Obj.change(contact, (c) => {
25
+ getMetaChecked(c).keys.push({ id: '12345', source: 'example.com' });
26
+ });
23
27
 
24
28
  const task = createObject(TestSchema.Task, {
25
29
  title: 'Fix the tests',
@@ -5,12 +5,12 @@
5
5
  import * as Schema from 'effect/Schema';
6
6
 
7
7
  import { raise } from '@dxos/debug';
8
- import { type EncodedReference, type ObjectMeta, isEncodedReference } from '@dxos/echo-protocol';
8
+ import { type EncodedReference, ObjectStructure, isEncodedReference } from '@dxos/echo-protocol';
9
9
  import { assertArgument, invariant } from '@dxos/invariant';
10
10
  import { DXN, ObjectId } from '@dxos/keys';
11
- import { defineHiddenProperty } from '@dxos/live-object';
12
11
  import { assumeType, deepMapValues, visitValues } from '@dxos/util';
13
12
 
13
+ import type * as Obj from '../../Obj';
14
14
  import { getTypeDXN, setTypename } from '../annotations';
15
15
  import {
16
16
  ATTR_DELETED,
@@ -25,19 +25,24 @@ import {
25
25
  SelfDXNId,
26
26
  assertObjectModel,
27
27
  } from '../entities';
28
+ import { attachTypedJsonSerializer, defineHiddenProperty, typedJsonSerializer } from '../proxy';
28
29
  import { Ref, type RefResolver, refFromEncodedReference, setRefResolver } from '../ref';
29
30
  import {
30
31
  ATTR_META,
32
+ ATTR_PARENT,
31
33
  ATTR_TYPE,
32
- type AnyEchoObject,
34
+ type AnyEntity,
33
35
  EntityKind,
34
36
  KindId,
35
37
  MetaId,
36
38
  ObjectMetaSchema,
37
- TypeId,
39
+ ParentId,
38
40
  setSchema,
39
41
  } from '../types';
40
42
 
43
+ // Re-export for backward compatibility.
44
+ export { attachTypedJsonSerializer };
45
+
41
46
  type DeepReplaceRef<T> =
42
47
  T extends Ref<any>
43
48
  ? EncodedReference
@@ -54,7 +59,7 @@ type SerializedObject<T extends { id: string }> = {
54
59
  /**
55
60
  * Converts object to it's JSON representation.
56
61
  */
57
- export const objectToJSON = <T extends AnyEchoObject>(obj: T): SerializedObject<T> => {
62
+ export const objectToJSON = <T extends AnyEntity>(obj: T): SerializedObject<T> => {
58
63
  const typename = getTypeDXN(obj)?.toString();
59
64
  invariant(typename && typeof typename === 'string');
60
65
  return typedJsonSerializer.call(obj);
@@ -69,7 +74,7 @@ export const objectToJSON = <T extends AnyEchoObject>(obj: T): SerializedObject<
69
74
  export const objectFromJSON = async (
70
75
  jsonData: unknown,
71
76
  { refResolver, dxn }: { refResolver?: RefResolver; dxn?: DXN } = {},
72
- ): Promise<AnyEchoObject> => {
77
+ ): Promise<AnyEntity> => {
73
78
  assumeType<ObjectJSON>(jsonData);
74
79
  assertArgument(typeof jsonData === 'object' && jsonData !== null, 'jsonData', 'expect object');
75
80
  assertArgument(typeof jsonData[ATTR_TYPE] === 'string', 'jsonData[ATTR_TYPE]', 'expected object to have a type');
@@ -101,8 +106,8 @@ export const objectFromJSON = async (
101
106
  const sourceDxn: DXN = DXN.parse(jsonData[ATTR_RELATION_SOURCE] ?? raise(new TypeError('Missing relation source')));
102
107
  const targetDxn: DXN = DXN.parse(jsonData[ATTR_RELATION_TARGET] ?? raise(new TypeError('Missing relation target')));
103
108
 
104
- const source = (await refResolver?.resolve(sourceDxn)) as AnyEchoObject | undefined;
105
- const target = (await refResolver?.resolve(targetDxn)) as AnyEchoObject | undefined;
109
+ const source = (await refResolver?.resolve(sourceDxn)) as AnyEntity | undefined;
110
+ const target = (await refResolver?.resolve(targetDxn)) as AnyEntity | undefined;
106
111
 
107
112
  defineHiddenProperty(obj, KindId, EntityKind.Relation);
108
113
  defineHiddenProperty(obj, RelationSourceDXNId, sourceDxn);
@@ -117,6 +122,16 @@ export const objectFromJSON = async (
117
122
  const meta = await ObjectMetaSchema.pipe(Schema.decodeUnknownPromise)(jsonData[ATTR_META]);
118
123
  invariant(Array.isArray(meta.keys));
119
124
  defineHiddenProperty(obj, MetaId, meta);
125
+ } else {
126
+ defineHiddenProperty(obj, MetaId, {
127
+ keys: [],
128
+ });
129
+ }
130
+
131
+ if (jsonData[ATTR_PARENT]) {
132
+ const parentDxn = DXN.parse(jsonData[ATTR_PARENT]);
133
+ const parent = (await refResolver?.resolve(parentDxn)) as Obj.Unknown | undefined;
134
+ defineHiddenProperty(obj, ParentId, parent);
120
135
  }
121
136
 
122
137
  if (dxn) {
@@ -153,7 +168,7 @@ const decodeGeneric = (jsonData: unknown, options: { refResolver?: RefResolver }
153
168
  });
154
169
  };
155
170
 
156
- export const setRefResolverOnData = (obj: AnyEchoObject, refResolver: RefResolver) => {
171
+ export const setRefResolverOnData = (obj: AnyEntity, refResolver: RefResolver) => {
157
172
  const visitor = (value: unknown) => {
158
173
  if (Ref.isRef(value)) {
159
174
  setRefResolver(value, refResolver);
@@ -165,66 +180,18 @@ export const setRefResolverOnData = (obj: AnyEchoObject, refResolver: RefResolve
165
180
  visitor(obj);
166
181
  };
167
182
 
168
- export const attachTypedJsonSerializer = (obj: any) => {
169
- const descriptor = Object.getOwnPropertyDescriptor(obj, 'toJSON');
170
- if (descriptor) {
171
- return;
172
- }
173
-
174
- Object.defineProperty(obj, 'toJSON', {
175
- value: typedJsonSerializer,
176
- writable: false,
177
- enumerable: false,
178
- // Setting `configurable` to false breaks proxy invariants, should be fixable.
179
- configurable: true,
180
- });
181
- };
182
-
183
- // NOTE: KEEP as function.
184
- const typedJsonSerializer = function (this: any) {
185
- const { id, ...rest } = this;
186
- const result: any = {
187
- id,
183
+ /**
184
+ * Convert ObjectStructure to JSON data for indexing.
185
+ * Different from {@link objectToJSON} as it takes the internal {@link ObjectStructure} representation directly
186
+ */
187
+ export const objectStructureToJson = (objectId: string, structure: ObjectStructure): Obj.JSON => {
188
+ return {
189
+ ...structure.data,
190
+ id: objectId,
191
+ [ATTR_TYPE]: (ObjectStructure.getTypeReference(structure)?.['/'] ?? '') as DXN.String,
192
+ [ATTR_DELETED]: ObjectStructure.isDeleted(structure),
193
+ [ATTR_PARENT]: ObjectStructure.getParent(structure)?.['/'] as DXN.String | undefined,
194
+ [ATTR_RELATION_SOURCE]: ObjectStructure.getRelationSource(structure)?.['/'] as DXN.String | undefined,
195
+ [ATTR_RELATION_TARGET]: ObjectStructure.getRelationTarget(structure)?.['/'] as DXN.String | undefined,
188
196
  };
189
-
190
- if (this[TypeId]) {
191
- result[ATTR_TYPE] = this[TypeId].toString();
192
- }
193
-
194
- if (this[MetaId]) {
195
- result[ATTR_META] = serializeMeta(this[MetaId]);
196
- }
197
-
198
- if (this[SelfDXNId]) {
199
- result[ATTR_SELF_DXN] = this[SelfDXNId].toString();
200
- }
201
-
202
- if (this[RelationSourceDXNId]) {
203
- const sourceDXN = this[RelationSourceDXNId];
204
- invariant(sourceDXN instanceof DXN);
205
- result[ATTR_RELATION_SOURCE] = sourceDXN.toString();
206
- }
207
- if (this[RelationTargetDXNId]) {
208
- const targetDXN = this[RelationTargetDXNId];
209
- invariant(targetDXN instanceof DXN);
210
- result[ATTR_RELATION_TARGET] = targetDXN.toString();
211
- }
212
-
213
- Object.assign(result, serializeData(rest));
214
- return result;
215
- };
216
-
217
- const serializeData = (data: unknown) => {
218
- return deepMapValues(data, (value, recurse) => {
219
- if (Ref.isRef(value)) {
220
- // TODO(dmaretskyi): Should this be configurable?
221
- return value.noInline().encode();
222
- }
223
-
224
- return recurse(value);
225
- });
226
- };
227
-
228
- const serializeMeta = (meta: ObjectMeta) => {
229
- return deepMapValues(meta, (value, recurse) => recurse(value));
230
197
  };
@@ -27,9 +27,7 @@ describe('schema-validator', () => {
27
27
  const TestSchema: Schema.Schema.AnyNoContext = Schema.Struct({
28
28
  name: Schema.String.annotations({ [annotationId]: annotationValue }),
29
29
  parent: Schema.optional(Schema.suspend(() => TestSchema.annotations({ [annotationId]: annotationValue }))),
30
- friends: Schema.suspend(() =>
31
- Schema.mutable(Schema.Array(TestSchema.annotations({ [annotationId]: annotationValue }))),
32
- ),
30
+ friends: Schema.suspend(() => Schema.Array(TestSchema.annotations({ [annotationId]: annotationValue }))),
33
31
  });
34
32
  expect(SchemaValidator.hasTypeAnnotation(TestSchema, 'name', annotationId)).to.be.true;
35
33
  expect(SchemaValidator.hasTypeAnnotation(TestSchema, 'parent', annotationId)).to.be.true;
@@ -41,7 +39,7 @@ describe('schema-validator', () => {
41
39
  const Person: Schema.Schema.AnyNoContext = Schema.Struct({
42
40
  name: Schema.String,
43
41
  parent: Schema.optional(Schema.suspend(() => Person)),
44
- friends: Schema.suspend(() => Schema.mutable(Schema.Array(Person))),
42
+ friends: Schema.suspend(() => Schema.Array(Person)),
45
43
  });
46
44
  expect(SchemaValidator.hasTypeAnnotation(Person, 'name', annotationId)).to.be.false;
47
45
  expect(SchemaValidator.hasTypeAnnotation(Person, 'parent', annotationId)).to.be.false;
@@ -87,9 +85,7 @@ describe('schema-validator', () => {
87
85
  const annotationValue = 'bar';
88
86
  const Person: Schema.Schema.AnyNoContext = Schema.Struct({
89
87
  parent: Schema.optional(Schema.suspend(() => Person.annotations({ [annotationId]: annotationValue }))),
90
- friends: Schema.suspend(() =>
91
- Schema.mutable(Schema.Array(Person.annotations({ [annotationId]: annotationValue }))),
92
- ),
88
+ friends: Schema.suspend(() => Schema.Array(Person.annotations({ [annotationId]: annotationValue }))),
93
89
  });
94
90
  expect(SchemaValidator.getPropertySchema(Person, ['parent']).ast.annotations[annotationId]).to.eq(
95
91
  annotationValue,
@@ -2,243 +2,5 @@
2
2
  // Copyright 2024 DXOS.org
3
3
  //
4
4
 
5
- import * as Schema from 'effect/Schema';
6
- import * as SchemaAST from 'effect/SchemaAST';
7
-
8
- import { invariant } from '@dxos/invariant';
9
- import { log } from '@dxos/log';
10
-
11
- import { SchemaId } from '../types';
12
-
13
- // TODO(burdon): Reconcile with @dxos/effect visit().
14
-
15
- export class SchemaValidator {
16
- /**
17
- * Recursively check that schema specifies constructions we can handle.
18
- * Validates there are no ambiguous discriminated union types.
19
- */
20
- public static validateSchema(schema: Schema.Schema.AnyNoContext): void {
21
- const visitAll = (nodes: SchemaAST.AST[]) => nodes.forEach((node) => this.validateSchema(Schema.make(node)));
22
- if (SchemaAST.isUnion(schema.ast)) {
23
- const typeAstList = schema.ast.types.filter((type) => SchemaAST.isTypeLiteral(type)) as SchemaAST.TypeLiteral[];
24
- // Check we can handle a discriminated union.
25
- if (typeAstList.length > 1) {
26
- getTypeDiscriminators(typeAstList);
27
- }
28
- visitAll(typeAstList);
29
- } else if (SchemaAST.isTupleType(schema.ast)) {
30
- const positionalTypes = schema.ast.elements.map((t) => t.type);
31
- const allTypes = positionalTypes.concat(schema.ast.rest.map((t) => t.type));
32
- visitAll(allTypes);
33
- } else if (SchemaAST.isTypeLiteral(schema.ast)) {
34
- visitAll(SchemaAST.getPropertySignatures(schema.ast).map((p) => p.type));
35
- }
36
- }
37
-
38
- public static hasTypeAnnotation(
39
- rootObjectSchema: Schema.Schema.AnyNoContext,
40
- property: string,
41
- annotation: symbol,
42
- ): boolean {
43
- try {
44
- let type = this.getPropertySchema(rootObjectSchema, [property]);
45
- if (SchemaAST.isTupleType(type.ast)) {
46
- type = this.getPropertySchema(rootObjectSchema, [property, '0']);
47
- }
48
-
49
- return type.ast.annotations[annotation] != null;
50
- } catch {
51
- return false;
52
- }
53
- }
54
-
55
- public static getPropertySchema(
56
- rootObjectSchema: Schema.Schema.AnyNoContext,
57
- propertyPath: KeyPath,
58
- getProperty: (path: KeyPath) => any = () => null,
59
- ): Schema.Schema.AnyNoContext {
60
- let schema: Schema.Schema.AnyNoContext = rootObjectSchema;
61
- for (let i = 0; i < propertyPath.length; i++) {
62
- const propertyName = propertyPath[i];
63
- const tupleAst = unwrapArray(schema.ast);
64
- if (tupleAst != null) {
65
- schema = getArrayElementSchema(tupleAst, propertyName);
66
- } else {
67
- const propertyType = getPropertyType(schema.ast, propertyName.toString(), (propertyName) =>
68
- getProperty([...propertyPath.slice(0, i), propertyName]),
69
- );
70
- if (propertyType == null) {
71
- log.warn('unknown property', { path: propertyPath, property: propertyName });
72
- continue;
73
- }
74
-
75
- schema = Schema.make(propertyType).annotations(propertyType.annotations);
76
- }
77
- }
78
-
79
- return schema;
80
- }
81
-
82
- public static getTargetPropertySchema(target: any, prop: string | symbol): Schema.Schema.AnyNoContext {
83
- const schema: Schema.Schema.AnyNoContext | undefined = (target as any)[SchemaId];
84
- invariant(schema, 'target has no schema');
85
- const arrayAst = unwrapArray(schema.ast);
86
- if (arrayAst != null) {
87
- return getArrayElementSchema(arrayAst, prop);
88
- }
89
-
90
- const propertyType = getPropertyType(schema.ast, prop.toString(), (prop) => target[prop]);
91
- if (propertyType == null) {
92
- return Schema.Any; // TODO(burdon): HACK.
93
- }
94
-
95
- invariant(propertyType, `invalid property: ${prop.toString()}`);
96
- return Schema.make(propertyType);
97
- }
98
- }
99
-
100
- /**
101
- * Tuple AST is used both for:
102
- * fixed-length tuples ([string, number]) in which case AST will be { elements: [Schema.String, Schema.Number] }
103
- * variable-length arrays (Array<string | number>) in which case AST will be { rest: [Schema.Union(Schema.String, Schema.Number)] }
104
- */
105
- const getArrayElementSchema = (
106
- tupleAst: SchemaAST.TupleType,
107
- property: string | symbol | number,
108
- ): Schema.Schema.AnyNoContext => {
109
- const elementIndex = typeof property === 'string' ? parseInt(property, 10) : Number.NaN;
110
- if (Number.isNaN(elementIndex)) {
111
- invariant(property === 'length', `invalid array property: ${String(property)}`);
112
- return Schema.Number;
113
- }
114
- if (elementIndex < tupleAst.elements.length) {
115
- const elementType = tupleAst.elements[elementIndex].type;
116
- return Schema.make(elementType).annotations(elementType.annotations);
117
- }
118
-
119
- const restType = tupleAst.rest;
120
- return Schema.make(restType[0].type).annotations(restType[0].annotations);
121
- };
122
-
123
- const flattenUnion = (typeAst: SchemaAST.AST): SchemaAST.AST[] =>
124
- SchemaAST.isUnion(typeAst) ? typeAst.types.flatMap(flattenUnion) : [typeAst];
125
-
126
- const getProperties = (
127
- typeAst: SchemaAST.AST,
128
- getTargetPropertyFn: (propertyName: string) => any,
129
- ): SchemaAST.PropertySignature[] => {
130
- const astCandidates = flattenUnion(typeAst);
131
- const typeAstList = astCandidates.filter((type) => SchemaAST.isTypeLiteral(type)) as SchemaAST.TypeLiteral[];
132
- if (typeAstList.length === 0) {
133
- return [];
134
- }
135
- if (typeAstList.length === 1) {
136
- return SchemaAST.getPropertySignatures(typeAstList[0]);
137
- }
138
-
139
- const typeDiscriminators = getTypeDiscriminators(typeAstList);
140
- const targetPropertyValue = getTargetPropertyFn(String(typeDiscriminators[0].name));
141
- const typeIndex = typeDiscriminators.findIndex((p) => targetPropertyValue === (p.type as SchemaAST.Literal).literal);
142
- invariant(typeIndex !== -1, 'discriminator field not set on target');
143
- return SchemaAST.getPropertySignatures(typeAstList[typeIndex]);
144
- };
145
-
146
- const getPropertyType = (
147
- ast: SchemaAST.AST,
148
- propertyName: string,
149
- getTargetPropertyFn: (propertyName: string) => any,
150
- ): SchemaAST.AST | null => {
151
- const anyOrObject = unwrapAst(
152
- ast,
153
- (candidate) => SchemaAST.isAnyKeyword(candidate) || SchemaAST.isObjectKeyword(candidate),
154
- );
155
- if (anyOrObject != null) {
156
- return ast;
157
- }
158
-
159
- const typeOrDiscriminatedUnion = unwrapAst(ast, (t) => {
160
- return SchemaAST.isTypeLiteral(t) || (SchemaAST.isUnion(t) && t.types.some((t) => SchemaAST.isTypeLiteral(t)));
161
- });
162
- if (typeOrDiscriminatedUnion == null) {
163
- return null;
164
- }
165
-
166
- const targetProperty = getProperties(typeOrDiscriminatedUnion, getTargetPropertyFn).find(
167
- (p) => p.name === propertyName,
168
- );
169
- if (targetProperty != null) {
170
- return unwrapAst(targetProperty.type);
171
- }
172
-
173
- const indexSignatureType = unwrapAst(ast, SchemaAST.isTypeLiteral);
174
- if (
175
- indexSignatureType &&
176
- SchemaAST.isTypeLiteral(indexSignatureType) &&
177
- indexSignatureType.indexSignatures.length > 0
178
- ) {
179
- return unwrapAst(indexSignatureType.indexSignatures[0].type);
180
- }
181
-
182
- return null;
183
- };
184
-
185
- const getTypeDiscriminators = (typeAstList: SchemaAST.TypeLiteral[]): SchemaAST.PropertySignature[] => {
186
- const discriminatorPropCandidates = typeAstList
187
- .flatMap(SchemaAST.getPropertySignatures)
188
- .filter((p) => SchemaAST.isLiteral(p.type));
189
- const propertyName = discriminatorPropCandidates[0].name;
190
- const isValidDiscriminator = discriminatorPropCandidates.every((p) => p.name === propertyName && !p.isOptional);
191
- const everyTypeHasDiscriminator = discriminatorPropCandidates.length === typeAstList.length;
192
- const isDiscriminatedUnion = isValidDiscriminator && everyTypeHasDiscriminator;
193
- invariant(isDiscriminatedUnion, 'type ambiguity: every type in a union must have a single unique-literal field');
194
- return discriminatorPropCandidates;
195
- };
196
-
197
- /**
198
- * Used to check that rootAst is for a type matching the provided predicate.
199
- * That's not always straightforward because types of optionality and recursive types.
200
- * const Task = Schema.Struct({
201
- * ...,
202
- * previous?: Schema.optional(Schema.suspend(() => Task)),
203
- * });
204
- * Here the AST for `previous` field is going to be Union(Suspend(Type), Undefined).
205
- * SchemaAST.isTypeLiteral(field) will return false, but unwrapAst(field, (ast) => SchemaAST.isTypeLiteral(ast))
206
- * will return true.
207
- */
208
- const unwrapAst = (rootAst: SchemaAST.AST, predicate?: (ast: SchemaAST.AST) => boolean): SchemaAST.AST | null => {
209
- let ast: SchemaAST.AST | undefined = rootAst;
210
- while (ast != null) {
211
- if (predicate?.(ast)) {
212
- return ast;
213
- }
214
-
215
- if (SchemaAST.isUnion(ast)) {
216
- const next: any = ast.types.find((t) => (predicate != null && predicate(t)) || SchemaAST.isSuspend(t));
217
- if (next != null) {
218
- ast = next;
219
- continue;
220
- }
221
- }
222
-
223
- if (SchemaAST.isSuspend(ast)) {
224
- ast = ast.f();
225
- } else {
226
- return predicate == null ? ast : null;
227
- }
228
- }
229
-
230
- return null;
231
- };
232
-
233
- const unwrapArray = (ast: SchemaAST.AST) => unwrapAst(ast, SchemaAST.isTupleType) as SchemaAST.TupleType | null;
234
-
235
- export const checkIdNotPresentOnSchema = (schema: Schema.Schema<any, any, any>) => {
236
- invariant(SchemaAST.isTypeLiteral(schema.ast));
237
- const idProperty = SchemaAST.getPropertySignatures(schema.ast).find((prop) => prop.name === 'id');
238
- if (idProperty != null) {
239
- throw new Error('"id" property name is reserved');
240
- }
241
- };
242
-
243
- // TODO(burdon): Reconcile with JsonPath.
244
- type KeyPath = readonly (string | number)[];
5
+ // Re-export from proxy for backward compatibility.
6
+ export { SchemaValidator, checkIdNotPresentOnSchema } from '../proxy';