@coasys/ad4m 0.12.0 → 0.13.0-postmessage-ws-proxy.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 (388) hide show
  1. package/README.md +2 -25
  2. package/jest-setup.ts +1 -1
  3. package/lib/index.cjs +7444 -13939
  4. package/lib/index.js +5322 -11888
  5. package/lib/src/Ad4mClient.d.ts +9 -3
  6. package/lib/src/Ad4mClient.js +40 -13
  7. package/lib/src/Literal.js +6 -5
  8. package/lib/src/agent/Agent.js +26 -272
  9. package/lib/src/agent/AgentClient.d.ts +33 -21
  10. package/lib/src/agent/AgentClient.js +180 -373
  11. package/lib/src/agent/AgentStatus.js +2 -37
  12. package/lib/src/ai/AIClient.d.ts +12 -4
  13. package/lib/src/ai/AIClient.js +81 -285
  14. package/lib/src/ai/AITypes.d.ts +55 -0
  15. package/lib/src/ai/AITypes.js +18 -0
  16. package/lib/src/ai/Tasks.js +10 -133
  17. package/lib/src/apiClient.d.ts +53 -0
  18. package/lib/src/apiClient.js +234 -0
  19. package/lib/src/cache/PersistentCache.d.ts +40 -0
  20. package/lib/src/cache/PersistentCache.js +139 -0
  21. package/lib/src/expression/Expression.d.ts +1 -1
  22. package/lib/src/expression/Expression.js +13 -122
  23. package/lib/src/expression/ExpressionClient.d.ts +11 -3
  24. package/lib/src/expression/ExpressionClient.js +120 -75
  25. package/lib/src/expression/ExpressionRef.js +4 -27
  26. package/lib/src/generated/api/AIModelLoadingStatus.d.ts +7 -0
  27. package/lib/src/generated/api/AIModelLoadingStatus.js +2 -0
  28. package/lib/src/generated/api/AddLinkExpressionRequest.d.ts +6 -0
  29. package/lib/src/generated/api/AddLinkExpressionRequest.js +1 -0
  30. package/lib/src/generated/api/AddLinkRequest.d.ts +6 -0
  31. package/lib/src/generated/api/AddLinkRequest.js +1 -0
  32. package/lib/src/generated/api/AddLinksBulkRequest.d.ts +6 -0
  33. package/lib/src/generated/api/AddLinksBulkRequest.js +1 -0
  34. package/lib/src/generated/api/AddSdnaRequest.d.ts +6 -0
  35. package/lib/src/generated/api/AddSdnaRequest.js +2 -0
  36. package/lib/src/generated/api/ApplyTemplateRequest.d.ts +4 -0
  37. package/lib/src/generated/api/ApplyTemplateRequest.js +2 -0
  38. package/lib/src/generated/api/AuthInfoInput.d.ts +10 -0
  39. package/lib/src/generated/api/AuthInfoInput.js +1 -0
  40. package/lib/src/generated/api/CapabilityInput.d.ts +5 -0
  41. package/lib/src/generated/api/CapabilityInput.js +1 -0
  42. package/lib/src/generated/api/CommitBatchRequest.d.ts +3 -0
  43. package/lib/src/generated/api/CommitBatchRequest.js +2 -0
  44. package/lib/src/generated/api/ComputeLogEntry.d.ts +9 -0
  45. package/lib/src/generated/api/ComputeLogEntry.js +2 -0
  46. package/lib/src/generated/api/CreateExpressionRequest.d.ts +4 -0
  47. package/lib/src/generated/api/CreateExpressionRequest.js +2 -0
  48. package/lib/src/generated/api/CreatePerspectiveRequest.d.ts +3 -0
  49. package/lib/src/generated/api/CreatePerspectiveRequest.js +2 -0
  50. package/lib/src/generated/api/CreateSubjectRequest.d.ts +6 -0
  51. package/lib/src/generated/api/CreateSubjectRequest.js +2 -0
  52. package/lib/src/generated/api/EmbedRequest.d.ts +4 -0
  53. package/lib/src/generated/api/EmbedRequest.js +2 -0
  54. package/lib/src/generated/api/EntanglementProofInput.d.ts +6 -0
  55. package/lib/src/generated/api/EntanglementProofInput.js +2 -0
  56. package/lib/src/generated/api/ExecuteCommandsRequest.d.ts +4 -0
  57. package/lib/src/generated/api/ExecuteCommandsRequest.js +2 -0
  58. package/lib/src/generated/api/ExportRequest.d.ts +5 -0
  59. package/lib/src/generated/api/ExportRequest.js +2 -0
  60. package/lib/src/generated/api/ExpressionManyRequest.d.ts +3 -0
  61. package/lib/src/generated/api/ExpressionManyRequest.js +2 -0
  62. package/lib/src/generated/api/ExpressionProof.d.ts +4 -0
  63. package/lib/src/generated/api/ExpressionProof.js +2 -0
  64. package/lib/src/generated/api/ExpressionProofInput.d.ts +6 -0
  65. package/lib/src/generated/api/ExpressionProofInput.js +2 -0
  66. package/lib/src/generated/api/FriendSendMessageRequest.d.ts +3 -0
  67. package/lib/src/generated/api/FriendSendMessageRequest.js +2 -0
  68. package/lib/src/generated/api/FriendsListRequest.d.ts +3 -0
  69. package/lib/src/generated/api/FriendsListRequest.js +2 -0
  70. package/lib/src/generated/api/GenerateAgentRequest.d.ts +3 -0
  71. package/lib/src/generated/api/GenerateAgentRequest.js +2 -0
  72. package/lib/src/generated/api/GenerateJwtRequest.d.ts +4 -0
  73. package/lib/src/generated/api/GenerateJwtRequest.js +2 -0
  74. package/lib/src/generated/api/GetSubjectDataRequest.d.ts +4 -0
  75. package/lib/src/generated/api/GetSubjectDataRequest.js +2 -0
  76. package/lib/src/generated/api/ImportAgentRequest.d.ts +6 -0
  77. package/lib/src/generated/api/ImportAgentRequest.js +2 -0
  78. package/lib/src/generated/api/ImportRequest.d.ts +4 -0
  79. package/lib/src/generated/api/ImportRequest.js +2 -0
  80. package/lib/src/generated/api/JoinNeighbourhoodRequest.d.ts +3 -0
  81. package/lib/src/generated/api/JoinNeighbourhoodRequest.js +2 -0
  82. package/lib/src/generated/api/LanguageMetaInput.d.ts +6 -0
  83. package/lib/src/generated/api/LanguageMetaInput.js +2 -0
  84. package/lib/src/generated/api/Link.d.ts +5 -0
  85. package/lib/src/generated/api/Link.js +2 -0
  86. package/lib/src/generated/api/LinkExpression.d.ts +10 -0
  87. package/lib/src/generated/api/LinkExpression.js +1 -0
  88. package/lib/src/generated/api/LinkExpressionInput.d.ts +10 -0
  89. package/lib/src/generated/api/LinkExpressionInput.js +1 -0
  90. package/lib/src/generated/api/LinkInput.d.ts +5 -0
  91. package/lib/src/generated/api/LinkInput.js +2 -0
  92. package/lib/src/generated/api/LinkLanguageTemplatesRequest.d.ts +3 -0
  93. package/lib/src/generated/api/LinkLanguageTemplatesRequest.js +2 -0
  94. package/lib/src/generated/api/LinkMutations.d.ts +6 -0
  95. package/lib/src/generated/api/LinkMutations.js +1 -0
  96. package/lib/src/generated/api/LinkStatus.d.ts +1 -0
  97. package/lib/src/generated/api/LinkStatus.js +2 -0
  98. package/lib/src/generated/api/LockAgentRequest.d.ts +3 -0
  99. package/lib/src/generated/api/LockAgentRequest.js +2 -0
  100. package/lib/src/generated/api/ModelType.d.ts +1 -0
  101. package/lib/src/generated/api/ModelType.js +2 -0
  102. package/lib/src/generated/api/NotificationInput.d.ts +10 -0
  103. package/lib/src/generated/api/NotificationInput.js +2 -0
  104. package/lib/src/generated/api/OpenLinkRequest.d.ts +3 -0
  105. package/lib/src/generated/api/OpenLinkRequest.js +2 -0
  106. package/lib/src/generated/api/PermitCapabilityRequest.d.ts +3 -0
  107. package/lib/src/generated/api/PermitCapabilityRequest.js +2 -0
  108. package/lib/src/generated/api/PerspectiveInput.d.ts +4 -0
  109. package/lib/src/generated/api/PerspectiveInput.js +1 -0
  110. package/lib/src/generated/api/PromptRequest.d.ts +4 -0
  111. package/lib/src/generated/api/PromptRequest.js +2 -0
  112. package/lib/src/generated/api/PublishLanguageRequest.d.ts +5 -0
  113. package/lib/src/generated/api/PublishLanguageRequest.js +1 -0
  114. package/lib/src/generated/api/PublishNeighbourhoodRequest.d.ts +6 -0
  115. package/lib/src/generated/api/PublishNeighbourhoodRequest.js +1 -0
  116. package/lib/src/generated/api/QueryRequest.d.ts +7 -0
  117. package/lib/src/generated/api/QueryRequest.js +2 -0
  118. package/lib/src/generated/api/RemoveLinkRequest.d.ts +5 -0
  119. package/lib/src/generated/api/RemoveLinkRequest.js +1 -0
  120. package/lib/src/generated/api/RemoveLinksBulkRequest.d.ts +5 -0
  121. package/lib/src/generated/api/RemoveLinksBulkRequest.js +1 -0
  122. package/lib/src/generated/api/ResourceInput.d.ts +4 -0
  123. package/lib/src/generated/api/ResourceInput.js +2 -0
  124. package/lib/src/generated/api/SetDefaultModelRequest.d.ts +4 -0
  125. package/lib/src/generated/api/SetDefaultModelRequest.js +1 -0
  126. package/lib/src/generated/api/SetFreeHostingEnabledRequest.d.ts +3 -0
  127. package/lib/src/generated/api/SetFreeHostingEnabledRequest.js +2 -0
  128. package/lib/src/generated/api/SetMultiUserRequest.d.ts +3 -0
  129. package/lib/src/generated/api/SetMultiUserRequest.js +2 -0
  130. package/lib/src/generated/api/SetStatusRequest.d.ts +3 -0
  131. package/lib/src/generated/api/SetStatusRequest.js +2 -0
  132. package/lib/src/generated/api/SignMessageRequest.d.ts +3 -0
  133. package/lib/src/generated/api/SignMessageRequest.js +2 -0
  134. package/lib/src/generated/api/TrustedAgentsRequest.d.ts +3 -0
  135. package/lib/src/generated/api/TrustedAgentsRequest.js +2 -0
  136. package/lib/src/generated/api/UnlockAgentRequest.d.ts +4 -0
  137. package/lib/src/generated/api/UnlockAgentRequest.js +2 -0
  138. package/lib/src/generated/api/UpdateLinkRequest.d.ts +7 -0
  139. package/lib/src/generated/api/UpdateLinkRequest.js +1 -0
  140. package/lib/src/generated/api/UpdatePerspectiveRequest.d.ts +3 -0
  141. package/lib/src/generated/api/UpdatePerspectiveRequest.js +2 -0
  142. package/lib/src/generated/api/UserStatistics.d.ts +9 -0
  143. package/lib/src/generated/api/UserStatistics.js +2 -0
  144. package/lib/src/generated/api/VerificationRequestResult.d.ts +6 -0
  145. package/lib/src/generated/api/VerificationRequestResult.js +2 -0
  146. package/lib/src/generated/api/VerifySignatureRequest.d.ts +5 -0
  147. package/lib/src/generated/api/VerifySignatureRequest.js +2 -0
  148. package/lib/src/generated/api/WriteSettingsRequest.d.ts +3 -0
  149. package/lib/src/generated/api/WriteSettingsRequest.js +2 -0
  150. package/lib/src/generated/api/index.d.ts +42 -0
  151. package/lib/src/generated/api/index.js +7 -0
  152. package/lib/src/index.d.ts +7 -2
  153. package/lib/src/index.js +7 -2
  154. package/lib/src/jestSetup.d.ts +0 -1
  155. package/lib/src/jestSetup.js +1 -1
  156. package/lib/src/language/Icon.js +2 -21
  157. package/lib/src/language/Language.d.ts +26 -176
  158. package/lib/src/language/Language.js +32 -72
  159. package/lib/src/language/LanguageClient.d.ts +2 -2
  160. package/lib/src/language/LanguageClient.js +15 -105
  161. package/lib/src/language/LanguageHandle.js +2 -41
  162. package/lib/src/language/LanguageMeta.js +4 -75
  163. package/lib/src/language/LanguageRef.js +2 -25
  164. package/lib/src/links/Links.js +14 -111
  165. package/lib/src/model/Ad4mModel.d.ts +150 -62
  166. package/lib/src/model/Ad4mModel.js +689 -417
  167. package/lib/src/model/Ad4mModel.test.js +1434 -688
  168. package/lib/src/model/ModelQueryBuilder.d.ts +59 -38
  169. package/lib/src/model/ModelQueryBuilder.js +317 -153
  170. package/lib/src/model/Subject.js +6 -6
  171. package/lib/src/model/decorators.d.ts +36 -8
  172. package/lib/src/model/decorators.js +41 -14
  173. package/lib/src/model/hydration-batch.d.ts +34 -0
  174. package/lib/src/model/hydration-batch.js +147 -0
  175. package/lib/src/model/hydration-batching.test.d.ts +7 -0
  176. package/lib/src/model/hydration-batching.test.js +456 -0
  177. package/lib/src/model/hydration.d.ts +3 -92
  178. package/lib/src/model/hydration.js +3 -691
  179. package/lib/src/model/index.d.ts +3 -4
  180. package/lib/src/model/index.js +3 -4
  181. package/lib/src/model/json-schema.js +2 -2
  182. package/lib/src/model/model-manifest.d.ts +41 -0
  183. package/lib/src/model/model-manifest.js +11 -0
  184. package/lib/src/model/query-cache.d.ts +30 -0
  185. package/lib/src/model/query-cache.js +66 -0
  186. package/lib/src/model/query-cache.test.d.ts +1 -0
  187. package/lib/src/model/query-cache.test.js +43 -0
  188. package/lib/src/model/query-common.d.ts +1 -1
  189. package/lib/src/model/query-common.js +1 -1
  190. package/lib/src/model/query-sparql-batch.d.ts +17 -0
  191. package/lib/src/model/query-sparql-batch.js +260 -0
  192. package/lib/src/model/query-sparql.d.ts +51 -0
  193. package/lib/src/model/query-sparql.js +466 -0
  194. package/lib/src/model/query-sparql.test.d.ts +1 -0
  195. package/lib/src/model/query-sparql.test.js +312 -0
  196. package/lib/src/model/{surreal-utils.d.ts → query-utils.d.ts} +13 -9
  197. package/lib/src/model/query-utils.js +189 -0
  198. package/lib/src/model/relation-filtering.test.js +15 -15
  199. package/lib/src/model/sdna.js +1 -1
  200. package/lib/src/model/shacl-gen.js +46 -18
  201. package/lib/src/model/subscription-delta.test.d.ts +24 -0
  202. package/lib/src/model/subscription-delta.test.js +180 -0
  203. package/lib/src/model/subscription-pool.d.ts +39 -0
  204. package/lib/src/model/subscription-pool.js +165 -0
  205. package/lib/src/model/types.d.ts +60 -5
  206. package/lib/src/model/types.js +5 -2
  207. package/lib/src/neighbourhood/Neighbourhood.js +4 -32
  208. package/lib/src/neighbourhood/NeighbourhoodClient.d.ts +3 -3
  209. package/lib/src/neighbourhood/NeighbourhoodClient.js +40 -203
  210. package/lib/src/perspectives/LinkQuery.js +2 -42
  211. package/lib/src/perspectives/Perspective.d.ts +1 -1
  212. package/lib/src/perspectives/Perspective.js +10 -52
  213. package/lib/src/perspectives/PerspectiveClient.d.ts +22 -32
  214. package/lib/src/perspectives/PerspectiveClient.js +189 -454
  215. package/lib/src/perspectives/PerspectiveClient.test.d.ts +1 -0
  216. package/lib/src/perspectives/PerspectiveClient.test.js +224 -0
  217. package/lib/src/perspectives/PerspectiveDiff.js +4 -31
  218. package/lib/src/perspectives/PerspectiveHandle.js +3 -43
  219. package/lib/src/perspectives/PerspectiveProxy.d.ts +156 -78
  220. package/lib/src/perspectives/PerspectiveProxy.js +474 -389
  221. package/lib/src/perspectives/PerspectiveResolver.d.ts +0 -1
  222. package/lib/src/perspectives/PerspectiveResolver.js +0 -11
  223. package/lib/src/perspectives/WakerSubscriptionManager.d.ts +3 -3
  224. package/lib/src/perspectives/WakerSubscriptionManager.js +12 -12
  225. package/lib/src/runtime/RuntimeClient.d.ts +34 -6
  226. package/lib/src/runtime/RuntimeClient.js +131 -362
  227. package/lib/src/runtime/RuntimeResolver.d.ts +28 -1
  228. package/lib/src/runtime/RuntimeResolver.js +197 -4
  229. package/lib/src/runtime/RuntimeTypes.d.ts +101 -0
  230. package/lib/src/runtime/RuntimeTypes.js +45 -0
  231. package/lib/src/schema.gql +27 -1
  232. package/lib/src/shacl/SHACLFlow.d.ts +1 -1
  233. package/lib/src/shacl/SHACLFlow.js +9 -9
  234. package/lib/src/shacl/SHACLShape.d.ts +8 -1
  235. package/lib/src/shacl/SHACLShape.js +57 -38
  236. package/lib/src/shacl/SHACLShape.test.js +82 -0
  237. package/lib/src/typeDefs.js +3 -602
  238. package/lib/src/utils.d.ts +6 -6
  239. package/lib/src/utils.js +6 -6
  240. package/package.json +6 -18
  241. package/rollup.config.js +0 -7
  242. package/src/Ad4mClient.test.ts +1192 -1288
  243. package/src/Ad4mClient.ts +46 -15
  244. package/src/Literal.test.ts +10 -5
  245. package/src/Literal.ts +6 -5
  246. package/src/agent/Agent.ts +0 -99
  247. package/src/agent/AgentClient.ts +238 -465
  248. package/src/agent/AgentStatus.ts +0 -12
  249. package/src/ai/AIClient.ts +96 -296
  250. package/src/ai/AITypes.ts +66 -0
  251. package/src/ai/Tasks.ts +0 -52
  252. package/src/apiClient.ts +287 -0
  253. package/src/cache/PersistentCache.ts +145 -0
  254. package/src/cache/cache.test.ts +713 -0
  255. package/src/expression/Expression.ts +3 -43
  256. package/src/expression/ExpressionClient.ts +148 -77
  257. package/src/expression/ExpressionRef.ts +2 -8
  258. package/src/generated/api/AIModelLoadingStatus.ts +3 -0
  259. package/src/generated/api/AddLinkExpressionRequest.ts +4 -0
  260. package/src/generated/api/AddLinkRequest.ts +4 -0
  261. package/src/generated/api/AddLinksBulkRequest.ts +4 -0
  262. package/src/generated/api/AddSdnaRequest.ts +3 -0
  263. package/src/generated/api/ApplyTemplateRequest.ts +3 -0
  264. package/src/generated/api/AuthInfoInput.ts +4 -0
  265. package/src/generated/api/CapabilityInput.ts +4 -0
  266. package/src/generated/api/CommitBatchRequest.ts +3 -0
  267. package/src/generated/api/ComputeLogEntry.ts +3 -0
  268. package/src/generated/api/CreateExpressionRequest.ts +3 -0
  269. package/src/generated/api/CreatePerspectiveRequest.ts +3 -0
  270. package/src/generated/api/CreateSubjectRequest.ts +3 -0
  271. package/src/generated/api/EmbedRequest.ts +3 -0
  272. package/src/generated/api/EntanglementProofInput.ts +3 -0
  273. package/src/generated/api/ExecuteCommandsRequest.ts +3 -0
  274. package/src/generated/api/ExportRequest.ts +3 -0
  275. package/src/generated/api/ExpressionManyRequest.ts +3 -0
  276. package/src/generated/api/ExpressionProof.ts +3 -0
  277. package/src/generated/api/ExpressionProofInput.ts +3 -0
  278. package/src/generated/api/FriendSendMessageRequest.ts +3 -0
  279. package/src/generated/api/FriendsListRequest.ts +3 -0
  280. package/src/generated/api/GenerateAgentRequest.ts +3 -0
  281. package/src/generated/api/GenerateJwtRequest.ts +3 -0
  282. package/src/generated/api/GetSubjectDataRequest.ts +3 -0
  283. package/src/generated/api/ImportAgentRequest.ts +3 -0
  284. package/src/generated/api/ImportRequest.ts +3 -0
  285. package/src/generated/api/JoinNeighbourhoodRequest.ts +3 -0
  286. package/src/generated/api/LanguageMetaInput.ts +3 -0
  287. package/src/generated/api/Link.ts +3 -0
  288. package/src/generated/api/LinkExpression.ts +6 -0
  289. package/src/generated/api/LinkExpressionInput.ts +6 -0
  290. package/src/generated/api/LinkInput.ts +3 -0
  291. package/src/generated/api/LinkLanguageTemplatesRequest.ts +3 -0
  292. package/src/generated/api/LinkMutations.ts +5 -0
  293. package/src/generated/api/LinkStatus.ts +3 -0
  294. package/src/generated/api/LockAgentRequest.ts +3 -0
  295. package/src/generated/api/ModelType.ts +3 -0
  296. package/src/generated/api/NotificationInput.ts +3 -0
  297. package/src/generated/api/OpenLinkRequest.ts +3 -0
  298. package/src/generated/api/PermitCapabilityRequest.ts +3 -0
  299. package/src/generated/api/PerspectiveInput.ts +4 -0
  300. package/src/generated/api/PromptRequest.ts +3 -0
  301. package/src/generated/api/PublishLanguageRequest.ts +4 -0
  302. package/src/generated/api/PublishNeighbourhoodRequest.ts +4 -0
  303. package/src/generated/api/QueryRequest.ts +6 -0
  304. package/src/generated/api/RemoveLinkRequest.ts +4 -0
  305. package/src/generated/api/RemoveLinksBulkRequest.ts +4 -0
  306. package/src/generated/api/ResourceInput.ts +3 -0
  307. package/src/generated/api/SetDefaultModelRequest.ts +4 -0
  308. package/src/generated/api/SetFreeHostingEnabledRequest.ts +3 -0
  309. package/src/generated/api/SetMultiUserRequest.ts +3 -0
  310. package/src/generated/api/SetStatusRequest.ts +3 -0
  311. package/src/generated/api/SignMessageRequest.ts +3 -0
  312. package/src/generated/api/TrustedAgentsRequest.ts +3 -0
  313. package/src/generated/api/UnlockAgentRequest.ts +3 -0
  314. package/src/generated/api/UpdateLinkRequest.ts +5 -0
  315. package/src/generated/api/UpdatePerspectiveRequest.ts +3 -0
  316. package/src/generated/api/UserStatistics.ts +3 -0
  317. package/src/generated/api/VerificationRequestResult.ts +3 -0
  318. package/src/generated/api/VerifySignatureRequest.ts +3 -0
  319. package/src/generated/api/WriteSettingsRequest.ts +3 -0
  320. package/src/generated/api/index.ts +49 -0
  321. package/src/index.ts +7 -2
  322. package/src/jestSetup.ts +1 -1
  323. package/src/language/Icon.ts +0 -4
  324. package/src/language/Language.ts +51 -248
  325. package/src/language/LanguageClient.ts +21 -132
  326. package/src/language/LanguageHandle.ts +0 -14
  327. package/src/language/LanguageMeta.ts +0 -29
  328. package/src/language/LanguageRef.ts +0 -7
  329. package/src/links/Links.ts +0 -37
  330. package/src/model/Ad4mModel.test.ts +1690 -777
  331. package/src/model/Ad4mModel.ts +749 -477
  332. package/src/model/ModelQueryBuilder.ts +356 -171
  333. package/src/model/decorators.ts +71 -22
  334. package/src/model/hydration.ts +3 -772
  335. package/src/model/index.ts +3 -4
  336. package/src/model/json-schema.ts +2 -2
  337. package/src/model/query-cache.test.ts +54 -0
  338. package/src/model/query-cache.ts +79 -0
  339. package/src/model/query-common.ts +1 -1
  340. package/src/model/query-sparql.test.ts +376 -0
  341. package/src/model/query-sparql.ts +504 -0
  342. package/src/model/query-utils.ts +209 -0
  343. package/src/model/relation-filtering.test.ts +15 -15
  344. package/src/model/sdna.ts +1 -1
  345. package/src/model/shacl-gen.ts +47 -17
  346. package/src/model/types.ts +65 -5
  347. package/src/neighbourhood/Neighbourhood.ts +0 -9
  348. package/src/neighbourhood/NeighbourhoodClient.ts +42 -207
  349. package/src/neighbourhood/NeighbourhoodProxy.test.ts +34 -36
  350. package/src/perspectives/LinkQuery.ts +0 -15
  351. package/src/perspectives/Perspective.ts +1 -12
  352. package/src/perspectives/PerspectiveClient.test.ts +262 -0
  353. package/src/perspectives/PerspectiveClient.ts +254 -468
  354. package/src/perspectives/PerspectiveDiff.ts +0 -8
  355. package/src/perspectives/PerspectiveHandle.ts +1 -12
  356. package/src/perspectives/PerspectiveProxy.test.ts +125 -0
  357. package/src/perspectives/PerspectiveProxy.ts +522 -434
  358. package/src/perspectives/WakerSubscriptionManager.ts +13 -13
  359. package/src/runtime/RuntimeClient.ts +166 -369
  360. package/src/runtime/RuntimeTypes.ts +144 -0
  361. package/src/shacl/SHACLFlow.ts +9 -9
  362. package/src/shacl/SHACLShape.test.ts +94 -0
  363. package/src/shacl/SHACLShape.ts +66 -39
  364. package/src/typeDefs.ts +3 -5
  365. package/src/utils.ts +6 -6
  366. package/tsconfig.json +3 -7
  367. package/lib/src/model/query-surreal.d.ts +0 -44
  368. package/lib/src/model/query-surreal.js +0 -249
  369. package/lib/src/model/surreal-utils.js +0 -128
  370. package/shims/reflect-metadata.ts +0 -0
  371. package/shims/type-graphql.ts +0 -75
  372. package/src/PubSub.ts +0 -17
  373. package/src/agent/AgentResolver.ts +0 -263
  374. package/src/ai/AIResolver.ts +0 -372
  375. package/src/buildSchema.ts +0 -43
  376. package/src/expression/ExpressionResolver.ts +0 -64
  377. package/src/language/LanguageContext.ts +0 -37
  378. package/src/language/LanguageResolver.ts +0 -98
  379. package/src/model/Subject.ts +0 -159
  380. package/src/model/prolog-facts.ts +0 -145
  381. package/src/model/query-prolog.ts +0 -148
  382. package/src/model/query-surreal.ts +0 -280
  383. package/src/model/surreal-utils.ts +0 -147
  384. package/src/neighbourhood/NeighbourhoodResolver.ts +0 -100
  385. package/src/perspectives/PerspectiveResolver.ts +0 -372
  386. package/src/runtime/RuntimeResolver.ts +0 -617
  387. package/src/unwrapApolloResult.ts +0 -16
  388. package/tsconfig-browser.json +0 -82
@@ -9,7 +9,7 @@ import type { Ad4mModel } from "./Ad4mModel";
9
9
  import type { PerspectiveProxy } from "../perspectives/PerspectiveProxy";
10
10
  import type {
11
11
  Where, Order, IncludeMap, Query,
12
- AllInstancesResult, ResultsWithTotalCount, PaginationResult,
12
+ ResultsWithTotalCount, PaginationResult,
13
13
  } from "./types";
14
14
 
15
15
  /** Query builder for Ad4mModel queries.
@@ -38,7 +38,6 @@ export class ModelQueryBuilder<T extends Ad4mModel> {
38
38
  private modelClassName: string | null = null;
39
39
  private ctor: typeof Ad4mModel;
40
40
  private currentSubscription?: any;
41
- private useSurrealDBFlag: boolean = true;
42
41
 
43
42
  constructor(perspective: PerspectiveProxy, ctor: typeof Ad4mModel, query?: Query) {
44
43
  this.perspective = perspective;
@@ -51,7 +50,7 @@ export class ModelQueryBuilder<T extends Ad4mModel> {
51
50
  *
52
51
  * This method:
53
52
  * 1. Stops the keepalive signals to the subscription
54
- * 2. Unsubscribes from GraphQL subscription updates
53
+ * 2. Unsubscribes from subscription updates
55
54
  * 3. Notifies the backend to clean up subscription resources
56
55
  * 4. Clears the subscription reference
57
56
  *
@@ -224,6 +223,29 @@ export class ModelQueryBuilder<T extends Ad4mModel> {
224
223
  return this;
225
224
  }
226
225
 
226
+ /**
227
+ * Controls whether SPARQL property getters are evaluated during hydration.
228
+ *
229
+ * By default, collection queries evaluate property getters (deepQuery=true).
230
+ * Call `.deepQuery(false)` to skip getter evaluation for performance.
231
+ *
232
+ * @param enabled - Whether to evaluate property getters (default: true)
233
+ * @returns The query builder for chaining
234
+ *
235
+ * @example
236
+ * ```typescript
237
+ * const messages = await Message.query(perspective)
238
+ * .parent(channel)
239
+ * .deepQuery(false) // skip property getters for performance
240
+ * .limit(30)
241
+ * .get();
242
+ * ```
243
+ */
244
+ deepQuery(enabled: boolean = true): ModelQueryBuilder<T> {
245
+ this.queryParams.deepQuery = enabled;
246
+ return this;
247
+ }
248
+
227
249
  /**
228
250
  * Specifies which relations to eager-load (hydrate into model instances).
229
251
  *
@@ -261,32 +283,10 @@ export class ModelQueryBuilder<T extends Ad4mModel> {
261
283
  }
262
284
 
263
285
  /**
264
- * Enables or disables SurrealDB query path.
265
- *
266
- * @param enabled - Whether to use SurrealDB (default: true, 10-100x faster) or Prolog (legacy)
267
- * @returns The query builder for chaining
268
- *
269
- * @example
270
- * ```typescript
271
- * // Use SurrealDB (default)
272
- * const recipes = await Recipe.query(perspective)
273
- * .where({ category: "Dessert" })
274
- * .useSurrealDB(true)
275
- * .get();
276
- *
277
- * // Use Prolog (legacy)
278
- * const recipesProlog = await Recipe.query(perspective)
279
- * .where({ category: "Dessert" })
280
- * .useSurrealDB(false)
281
- * .get();
282
- * ```
283
- *
284
- * @remarks
285
- * Note: Subscriptions (subscribe(), countSubscribe(), paginateSubscribe()) default to SurrealDB live queries
286
- * if useSurrealDB(true) is set (default).
286
+ * Sets the query engine to use.
287
+ * @deprecated Prolog engine has been removed. All queries use SPARQL/Rust.
287
288
  */
288
- useSurrealDB(enabled: boolean = true): ModelQueryBuilder<T> {
289
- this.useSurrealDBFlag = enabled;
289
+ engine(_eng: 'sparql' | 'prolog'): ModelQueryBuilder<T> {
290
290
  return this;
291
291
  }
292
292
 
@@ -303,17 +303,21 @@ export class ModelQueryBuilder<T extends Ad4mModel> {
303
303
  * ```
304
304
  */
305
305
  async get(): Promise<T[]> {
306
- let results: T[];
307
- if (this.useSurrealDBFlag) {
308
- const surrealQuery = await this.ctor.queryToSurrealQL(this.perspective, this.queryParams);
309
- const result = await this.perspective.querySurrealDB(surrealQuery);
310
- ({ results } = await this.ctor.instancesFromSurrealResult(this.perspective, this.queryParams, result) as { results: T[] });
311
- } else {
312
- const query = await this.ctor.queryToProlog(this.perspective, this.queryParams, this.modelClassName);
313
- const result = await this.perspective.infer(query);
314
- ({ results } = await this.ctor.instancesFromPrologResult(this.perspective, this.queryParams, result) as { results: T[] });
315
- }
306
+ return await this.executeSparqlQuery();
307
+ }
308
+
309
+ /**
310
+ * Executes the query once using SPARQL and returns the results.
311
+ */
312
+ async getSparql(): Promise<T[]> {
313
+ return this.executeSparqlQuery();
314
+ }
316
315
 
316
+ /**
317
+ * Shared query execution logic — routes through the executor-side modelQuery endpoint.
318
+ */
319
+ private async executeSparqlQuery(): Promise<T[]> {
320
+ const { results } = await (this.ctor as any).executeModelQuery(this.perspective, this.queryParams, this.modelClassName);
317
321
  return results;
318
322
  }
319
323
 
@@ -332,8 +336,10 @@ export class ModelQueryBuilder<T extends Ad4mModel> {
332
336
  * ```
333
337
  */
334
338
  async first(): Promise<T | null> {
339
+ const savedLimit = this.queryParams.limit;
335
340
  this.queryParams.limit = 1;
336
341
  const results = await this.get();
342
+ this.queryParams.limit = savedLimit;
337
343
  return results[0] ?? null;
338
344
  }
339
345
 
@@ -341,7 +347,7 @@ export class ModelQueryBuilder<T extends Ad4mModel> {
341
347
  * Subscribes to the query and receives updates when results change.
342
348
  *
343
349
  * This method:
344
- * 1. Creates and initializes a SurrealDB live query subscription (default)
350
+ * 1. Creates and initializes a SPARQL live query subscription (default)
345
351
  * 2. Sets up the callback to process future updates
346
352
  * 3. Returns the initial results immediately
347
353
  *
@@ -364,9 +370,6 @@ export class ModelQueryBuilder<T extends Ad4mModel> {
364
370
  * builder.dispose();
365
371
  * ```
366
372
  *
367
- * @remarks
368
- * By default, this uses SurrealDB live queries for real-time updates.
369
- * Prolog subscriptions remain available via `.useSurrealDB(false)`.
370
373
  */
371
374
  async subscribe(callback: (results: T[]) => void): Promise<T[]> {
372
375
  // Clean up any existing subscription
@@ -374,45 +377,127 @@ export class ModelQueryBuilder<T extends Ad4mModel> {
374
377
 
375
378
  const ctor = this.ctor;
376
379
 
377
- if (this.useSurrealDBFlag) {
378
- const surrealQuery = await ctor.queryToSurrealQL(this.perspective, this.queryParams);
379
- this.currentSubscription = await this.perspective.subscribeSurrealDB(surrealQuery);
380
-
381
- const processResults = async (result: any) => {
382
- const { results } = await ctor.instancesFromSurrealResult(this.perspective, this.queryParams, result);
383
- callback(results as T[]);
384
- };
385
-
386
- this.currentSubscription.onResult(processResults);
387
-
388
- // Process initial result
389
- const { results } = await ctor.instancesFromSurrealResult(
390
- this.perspective,
391
- this.queryParams,
392
- this.currentSubscription.result
393
- );
394
- // Also invoke callback with initial results so subscribers see them
395
- callback(results as T[]);
396
- return results as T[];
397
- } else {
398
- const query = await ctor.queryToProlog(this.perspective, this.queryParams, this.modelClassName);
399
- this.currentSubscription = await this.perspective.subscribeInfer(query);
400
-
401
- const processResults = async (result: AllInstancesResult) => {
402
- const { results } = await ctor.instancesFromPrologResult(this.perspective, this.queryParams, result);
403
- callback(results as T[]);
404
- };
405
-
406
- this.currentSubscription.onResult(processResults);
407
- const { results } = await ctor.instancesFromPrologResult(
408
- this.perspective,
409
- this.queryParams,
410
- this.currentSubscription.result
411
- );
412
- // Also invoke callback with initial results so subscribers see them
413
- callback(results as T[]);
414
- return results as T[];
380
+ // Build the model query params (className, queryJson, shapeJson)
381
+ const { className, queryJson, shapeJson } = (ctor as any).prepareModelQueryParams(
382
+ this.queryParams, this.modelClassName
383
+ );
384
+
385
+ // Register model subscription via Rust — this builds trigger SPARQL internally,
386
+ // registers the subscription, and runs the initial query in one call.
387
+ const { subscriptionId, result: initialModelResult } = await this.perspective.modelSubscribe(
388
+ className, queryJson, shapeJson
389
+ );
390
+
391
+ // Convert JSON instances to model class instances
392
+ const parseResults = (raw: any): T[] => {
393
+ return (ctor as any).parseModelResult(this.perspective, raw, this.queryParams.include, this.queryParams.properties);
394
+ };
395
+
396
+ // Resolve non-literal (file-language) properties — handles both raw URI strings
397
+ // and already-resolved FileData objects returned by the Rust executor.
398
+ const resolveAndReturn = async (instances: T[]): Promise<T[]> => {
399
+ await (ctor as any).resolveNonLiteralProps(this.perspective, instances);
400
+ return instances;
401
+ };
402
+
403
+ // Parse initial results (with non-literal resolution)
404
+ const initialResults = await resolveAndReturn(parseResults(initialModelResult));
405
+
406
+ // Track last emitted result fingerprint to suppress duplicate callbacks
407
+ let lastResultFingerprint: string | null = null;
408
+ const buildFingerprint = (results: any[]) => {
409
+ if (results.length === 0) return '0:';
410
+ return JSON.stringify(results, (_, v) =>
411
+ typeof v === 'function' ? undefined : v
412
+ );
413
+ };
414
+ lastResultFingerprint = buildFingerprint(initialResults);
415
+
416
+ // Listen for subscription updates via the same GraphQL subscription channel.
417
+ // When Rust re-runs the model query and finds changed results, it pushes them.
418
+ const unsubscribe = this.perspective.client.subscribeToQueryUpdates(
419
+ subscriptionId,
420
+ (rawResult: any) => {
421
+ try {
422
+ const parsed = parseResults(rawResult);
423
+ console.debug(`[ModelQueryBuilder.subscribe] Update received for ${subscriptionId}: ${parsed.length} instances`);
424
+ resolveAndReturn(parsed).then((results) => {
425
+ const fp = buildFingerprint(results);
426
+ if (fp === lastResultFingerprint) {
427
+ console.debug(`[ModelQueryBuilder.subscribe] Fingerprint unchanged, skipping callback`);
428
+ return;
429
+ }
430
+ console.debug(`[ModelQueryBuilder.subscribe] Fingerprint changed, calling callback with ${results.length} results`);
431
+ lastResultFingerprint = fp;
432
+ callback(results);
433
+ }).catch((e) => {
434
+ console.error('Model subscription update resolve error:', e);
435
+ });
436
+ } catch (e) {
437
+ console.error('Model subscription update parse error:', e);
438
+ }
439
+ },
440
+ );
441
+
442
+ // Set up keepalive with recovery — uses setTimeout loop so we can
443
+ // break out and resubscribe when the server evicts the subscription.
444
+ let disposed = false;
445
+ let keepaliveTimer: ReturnType<typeof setTimeout> | undefined;
446
+ let resubscribeAttempts = 0;
447
+ const MAX_RESUBSCRIBE_ATTEMPTS = 5;
448
+ const keepaliveLoop = async () => {
449
+ if (disposed) return;
450
+ try {
451
+ await this.perspective.client.keepAliveQuery(this.perspective.uuid, subscriptionId);
452
+ resubscribeAttempts = 0; // Reset on success
453
+ } catch (e: any) {
454
+ console.warn(`Model subscription keepalive failed for ${subscriptionId}:`, e);
455
+ if (!disposed && resubscribeAttempts < MAX_RESUBSCRIBE_ATTEMPTS) {
456
+ resubscribeAttempts++;
457
+ const backoffMs = Math.min(1000 * Math.pow(2, resubscribeAttempts), 60000);
458
+ console.warn(`Resubscribing (attempt ${resubscribeAttempts}/${MAX_RESUBSCRIBE_ATTEMPTS}, backoff ${backoffMs}ms)...`);
459
+ await new Promise(r => setTimeout(r, backoffMs));
460
+ try {
461
+ unsubscribe();
462
+ await this.subscribe(callback);
463
+ } catch (resubErr) {
464
+ console.error('Model subscription resubscribe failed:', resubErr);
465
+ }
466
+ } else if (resubscribeAttempts >= MAX_RESUBSCRIBE_ATTEMPTS) {
467
+ console.error(`Model subscription ${subscriptionId}: max resubscribe attempts reached, giving up.`);
468
+ }
469
+ return; // new subscription owns its own keepalive loop
470
+ }
471
+ if (!disposed) {
472
+ keepaliveTimer = setTimeout(keepaliveLoop, 30000);
473
+ }
474
+ };
475
+ keepaliveTimer = setTimeout(keepaliveLoop, 30000);
476
+
477
+ // Store dispose function
478
+ this.currentSubscription = {
479
+ dispose: () => {
480
+ disposed = true;
481
+ if (keepaliveTimer) clearTimeout(keepaliveTimer);
482
+ unsubscribe();
483
+ this.perspective.client.disposeQuerySubscription(this.perspective.uuid, subscriptionId).catch(() => {});
484
+ },
485
+ };
486
+
487
+ // Take snapshots for dirty tracking
488
+ for (const inst of initialResults) {
489
+ (inst as any).takeSnapshot?.(this.queryParams.include);
415
490
  }
491
+
492
+ return initialResults;
493
+ }
494
+
495
+ /**
496
+ * Subscribes to the query and receives updates using SPARQL.
497
+ * @deprecated Use subscribe() instead — now routes through Rust model subscription.
498
+ */
499
+ async subscribeSparql(callback: (results: T[]) => void): Promise<T[]> {
500
+ return this.subscribe(callback);
416
501
  }
417
502
 
418
503
  /**
@@ -428,26 +513,23 @@ export class ModelQueryBuilder<T extends Ad4mModel> {
428
513
  * ```
429
514
  */
430
515
  async count(): Promise<number> {
431
- if (this.useSurrealDBFlag) {
432
- const surrealQuery = await this.ctor.queryToSurrealQL(this.perspective, this.queryParams);
433
- const result = await this.perspective.querySurrealDB(surrealQuery);
434
- // Use instancesFromSurrealResult to apply JS-level filtering for advanced where conditions
435
- // (e.g., gt, gte, lt, lte, between, contains on properties and author/timestamp)
436
- // This ensures count() returns the same number as get().length
437
- const { totalCount } = await this.ctor.instancesFromSurrealResult(this.perspective, this.queryParams, result);
438
- return totalCount;
439
- } else {
440
- const query = await this.ctor.countQueryToProlog(this.perspective, this.queryParams, this.modelClassName);
441
- const result = await this.perspective.infer(query);
442
- return result?.[0]?.TotalCount || 0;
443
- }
516
+ const { totalCount } = await (this.ctor as any).executeModelQuery(this.perspective, { ...this.queryParams, limit: 0 }, this.modelClassName);
517
+ return totalCount;
518
+ }
519
+
520
+ /**
521
+ * Gets the total count of matching entities using SPARQL.
522
+ * Delegates to count().
523
+ */
524
+ async countSparql(): Promise<number> {
525
+ return await this.count();
444
526
  }
445
527
 
446
528
  /**
447
529
  * Subscribes to count updates for matching entities.
448
530
  *
449
531
  * This method:
450
- * 1. Creates and initializes a SurrealDB live query subscription for the count (default)
532
+ * 1. Creates and initializes a SPARQL live query subscription for the count (default)
451
533
  * 2. Sets up the callback to process future count updates
452
534
  * 3. Returns the initial count immediately
453
535
  *
@@ -470,45 +552,89 @@ export class ModelQueryBuilder<T extends Ad4mModel> {
470
552
  * builder.dispose();
471
553
  * ```
472
554
  *
473
- * @remarks
474
- * By default, this uses SurrealDB live queries for real-time updates.
475
- * Prolog subscriptions remain available via `.useSurrealDB(false)`.
476
555
  */
477
556
  async countSubscribe(callback: (count: number) => void): Promise<number> {
478
557
  // Clean up any existing subscription
479
558
  this.dispose();
480
559
 
481
- if (this.useSurrealDBFlag) {
482
- const surrealQuery = await this.ctor.queryToSurrealQL(this.perspective, this.queryParams);
483
- this.currentSubscription = await this.perspective.subscribeSurrealDB(surrealQuery);
484
-
485
- const processResults = async (result: any) => {
486
- const { totalCount } = await this.ctor.instancesFromSurrealResult(this.perspective, this.queryParams, result);
487
- callback(totalCount);
488
- };
560
+ const countParams = { ...this.queryParams, limit: 0 };
561
+ const { className, queryJson, shapeJson } = (this.ctor as any).prepareModelQueryParams(
562
+ countParams, this.modelClassName
563
+ );
564
+
565
+ const { subscriptionId, result: initialModelResult } = await this.perspective.modelSubscribe(
566
+ className, queryJson, shapeJson
567
+ );
568
+
569
+ const parseCount = (raw: any): number => {
570
+ const data = typeof raw === 'string' ? JSON.parse(raw) : raw;
571
+ return data.totalCount ?? 0;
572
+ };
573
+
574
+ const initialCount = parseCount(initialModelResult);
575
+
576
+ const unsubscribe = this.perspective.client.subscribeToQueryUpdates(
577
+ subscriptionId,
578
+ (rawResult: any) => {
579
+ try {
580
+ callback(parseCount(rawResult));
581
+ } catch (e) {
582
+ console.error('Count subscription update parse error:', e);
583
+ }
584
+ },
585
+ );
586
+
587
+ let disposed = false;
588
+ let keepaliveTimer: ReturnType<typeof setTimeout> | undefined;
589
+ let resubscribeAttempts = 0;
590
+ const MAX_RESUBSCRIBE_ATTEMPTS = 5;
591
+ const keepaliveLoop = async () => {
592
+ if (disposed) return;
593
+ try {
594
+ await this.perspective.client.keepAliveQuery(this.perspective.uuid, subscriptionId);
595
+ resubscribeAttempts = 0;
596
+ } catch (e: any) {
597
+ console.warn(`Count subscription keepalive failed for ${subscriptionId}:`, e);
598
+ if (!disposed && resubscribeAttempts < MAX_RESUBSCRIBE_ATTEMPTS) {
599
+ resubscribeAttempts++;
600
+ const backoffMs = Math.min(1000 * Math.pow(2, resubscribeAttempts), 60000);
601
+ console.warn(`Count resubscribing (attempt ${resubscribeAttempts}/${MAX_RESUBSCRIBE_ATTEMPTS}, backoff ${backoffMs}ms)...`);
602
+ await new Promise(r => setTimeout(r, backoffMs));
603
+ try {
604
+ unsubscribe();
605
+ await this.countSubscribe(callback);
606
+ } catch (resubErr) {
607
+ console.error('Count subscription resubscribe failed:', resubErr);
608
+ }
609
+ } else if (resubscribeAttempts >= MAX_RESUBSCRIBE_ATTEMPTS) {
610
+ console.error(`Count subscription ${subscriptionId}: max resubscribe attempts reached, giving up.`);
611
+ }
612
+ return;
613
+ }
614
+ if (!disposed) {
615
+ keepaliveTimer = setTimeout(keepaliveLoop, 30000);
616
+ }
617
+ };
618
+ keepaliveTimer = setTimeout(keepaliveLoop, 30000);
619
+
620
+ this.currentSubscription = {
621
+ dispose: () => {
622
+ disposed = true;
623
+ if (keepaliveTimer) clearTimeout(keepaliveTimer);
624
+ unsubscribe();
625
+ this.perspective.client.disposeQuerySubscription(this.perspective.uuid, subscriptionId).catch(() => {});
626
+ },
627
+ };
628
+
629
+ return initialCount;
630
+ }
489
631
 
490
- this.currentSubscription.onResult(processResults);
491
- const { totalCount } = await this.ctor.instancesFromSurrealResult(
492
- this.perspective,
493
- this.queryParams,
494
- this.currentSubscription.result
495
- );
496
- callback(totalCount);
497
- return totalCount;
498
- } else {
499
- const query = await this.ctor.countQueryToProlog(this.perspective, this.queryParams, this.modelClassName);
500
- this.currentSubscription = await this.perspective.subscribeInfer(query);
501
-
502
- const processResults = async (result: any) => {
503
- const newCount = result?.[0]?.TotalCount || 0;
504
- callback(newCount);
505
- };
506
-
507
- this.currentSubscription.onResult(processResults);
508
- const initialCount = this.currentSubscription.result?.[0]?.TotalCount || 0;
509
- callback(initialCount);
510
- return initialCount;
511
- }
632
+ /**
633
+ * Subscribes to count updates using SPARQL.
634
+ * @deprecated Use countSubscribe() instead — now routes through Rust model subscription.
635
+ */
636
+ async countSubscribeSparql(callback: (count: number) => void): Promise<number> {
637
+ return this.countSubscribe(callback);
512
638
  }
513
639
 
514
640
  /**
@@ -528,24 +654,23 @@ export class ModelQueryBuilder<T extends Ad4mModel> {
528
654
  */
529
655
  async paginate(pageSize: number, pageNumber: number): Promise<PaginationResult<T>> {
530
656
  const paginationQuery = { ...(this.queryParams || {}), limit: pageSize, offset: pageSize * (pageNumber - 1), count: true };
531
- if (this.useSurrealDBFlag) {
532
- const surrealQuery = await this.ctor.queryToSurrealQL(this.perspective, paginationQuery);
533
- const result = await this.perspective.querySurrealDB(surrealQuery);
534
- const { results, totalCount } = (await this.ctor.instancesFromSurrealResult(this.perspective, paginationQuery, result)) as ResultsWithTotalCount<T>;
535
- return { results, totalCount, pageSize, pageNumber };
536
- } else {
537
- const prologQuery = await this.ctor.queryToProlog(this.perspective, paginationQuery, this.modelClassName);
538
- const result = await this.perspective.infer(prologQuery);
539
- const { results, totalCount } = (await this.ctor.instancesFromPrologResult(this.perspective, paginationQuery, result)) as ResultsWithTotalCount<T>;
540
- return { results, totalCount, pageSize, pageNumber };
541
- }
657
+ const { results, totalCount } = await (this.ctor as any).executeModelQuery(this.perspective, paginationQuery, this.modelClassName);
658
+ return { results, totalCount, pageSize, pageNumber };
659
+ }
660
+
661
+ /**
662
+ * Gets a page of results using SPARQL.
663
+ * Delegates to paginate().
664
+ */
665
+ async paginateSparql(pageSize: number, pageNumber: number): Promise<PaginationResult<T>> {
666
+ return await this.paginate(pageSize, pageNumber);
542
667
  }
543
668
 
544
669
  /**
545
670
  * Subscribes to paginated results updates.
546
671
  *
547
672
  * This method:
548
- * 1. Creates and initializes a SurrealDB live query subscription for the paginated results (default)
673
+ * 1. Creates and initializes a SPARQL live query subscription for the paginated results (default)
549
674
  * 2. Sets up the callback to process future page updates
550
675
  * 3. Returns the initial page immediately
551
676
  *
@@ -570,9 +695,6 @@ export class ModelQueryBuilder<T extends Ad4mModel> {
570
695
  * builder.dispose();
571
696
  * ```
572
697
  *
573
- * @remarks
574
- * By default, this uses SurrealDB live queries for real-time updates.
575
- * Prolog subscriptions remain available via `.useSurrealDB(false)`.
576
698
  */
577
699
  async paginateSubscribe(
578
700
  pageSize: number,
@@ -582,36 +704,99 @@ export class ModelQueryBuilder<T extends Ad4mModel> {
582
704
  // Clean up any existing subscription
583
705
  this.dispose();
584
706
 
585
- const paginationQuery = { ...(this.queryParams || {}), limit: pageSize, offset: pageSize * (pageNumber - 1), count: true };
586
-
587
- if (this.useSurrealDBFlag) {
588
- const surrealQuery = await this.ctor.queryToSurrealQL(this.perspective, paginationQuery);
589
- this.currentSubscription = await this.perspective.subscribeSurrealDB(surrealQuery);
707
+ const ctor = this.ctor;
590
708
 
591
- const processResults = async (result: any) => {
592
- const { results, totalCount } = (await this.ctor.instancesFromSurrealResult(this.perspective, paginationQuery, result)) as ResultsWithTotalCount<T>;
593
- callback({ results, totalCount, pageSize, pageNumber });
594
- };
709
+ // Subscribe to the full result set (no limit/offset) so the subscription
710
+ // detects changes anywhere in the dataset. Rust builds trigger SPARQL
711
+ // from the shape predicates.
712
+ const subscriptionParams = { ...(this.queryParams || {}) };
713
+ delete subscriptionParams.limit;
714
+ delete subscriptionParams.offset;
715
+ const { className, queryJson, shapeJson } = (ctor as any).prepareModelQueryParams(
716
+ subscriptionParams, this.modelClassName
717
+ );
718
+
719
+ const { subscriptionId } = await this.perspective.modelSubscribe(
720
+ className, queryJson, shapeJson
721
+ );
722
+
723
+ // Build the paginated query for Rust endpoint (count: true fetches both results and totalCount in one call)
724
+ const paginatedQuery = {
725
+ ...(this.queryParams || {}),
726
+ limit: pageSize,
727
+ offset: pageSize * (pageNumber - 1),
728
+ count: true,
729
+ };
730
+
731
+ const processResults = async () => {
732
+ const { results, totalCount } = await (ctor as any).executeModelQuery(this.perspective, paginatedQuery, this.modelClassName);
733
+ callback({ results, totalCount, pageSize, pageNumber });
734
+ };
735
+
736
+ const unsubscribe = this.perspective.client.subscribeToQueryUpdates(
737
+ subscriptionId,
738
+ (rawResult: any) => {
739
+ console.debug(`[ModelQueryBuilder.paginateSubscribe] Update received for ${subscriptionId}, re-fetching paginated data...`);
740
+ processResults().catch(e => console.error('Paginate subscription error:', e));
741
+ },
742
+ );
743
+
744
+ let disposed = false;
745
+ let keepaliveTimer: ReturnType<typeof setTimeout> | undefined;
746
+ let resubscribeAttempts = 0;
747
+ const MAX_RESUBSCRIBE_ATTEMPTS = 5;
748
+ const keepaliveLoop = async () => {
749
+ if (disposed) return;
750
+ try {
751
+ await this.perspective.client.keepAliveQuery(this.perspective.uuid, subscriptionId);
752
+ resubscribeAttempts = 0;
753
+ } catch (e: any) {
754
+ console.warn(`Paginate subscription keepalive failed for ${subscriptionId}:`, e);
755
+ if (!disposed && resubscribeAttempts < MAX_RESUBSCRIBE_ATTEMPTS) {
756
+ resubscribeAttempts++;
757
+ const backoffMs = Math.min(1000 * Math.pow(2, resubscribeAttempts), 60000);
758
+ console.warn(`Paginate resubscribing (attempt ${resubscribeAttempts}/${MAX_RESUBSCRIBE_ATTEMPTS}, backoff ${backoffMs}ms)...`);
759
+ await new Promise(r => setTimeout(r, backoffMs));
760
+ try {
761
+ unsubscribe();
762
+ await this.paginateSubscribe(pageSize, pageNumber, callback);
763
+ } catch (resubErr) {
764
+ console.error('Paginate subscription resubscribe failed:', resubErr);
765
+ }
766
+ } else if (resubscribeAttempts >= MAX_RESUBSCRIBE_ATTEMPTS) {
767
+ console.error(`Paginate subscription ${subscriptionId}: max resubscribe attempts reached, giving up.`);
768
+ }
769
+ return;
770
+ }
771
+ if (!disposed) {
772
+ keepaliveTimer = setTimeout(keepaliveLoop, 30000);
773
+ }
774
+ };
775
+ keepaliveTimer = setTimeout(keepaliveLoop, 30000);
776
+
777
+ this.currentSubscription = {
778
+ dispose: () => {
779
+ disposed = true;
780
+ if (keepaliveTimer) clearTimeout(keepaliveTimer);
781
+ unsubscribe();
782
+ this.perspective.client.disposeQuerySubscription(this.perspective.uuid, subscriptionId).catch(() => {});
783
+ },
784
+ };
785
+
786
+ // Initial fetch (single call with count: true)
787
+ const { results, totalCount } = await (ctor as any).executeModelQuery(this.perspective, paginatedQuery, this.modelClassName);
788
+ return { results, totalCount, pageSize, pageNumber };
789
+ }
595
790
 
596
- this.currentSubscription.onResult(processResults);
597
- const { results, totalCount } = (await this.ctor.instancesFromSurrealResult(this.perspective, paginationQuery, this.currentSubscription.result)) as ResultsWithTotalCount<T>;
598
- const initialPage = { results, totalCount, pageSize, pageNumber };
599
- callback(initialPage);
600
- return initialPage;
601
- } else {
602
- const prologQuery = await this.ctor.queryToProlog(this.perspective, paginationQuery, this.modelClassName);
603
- this.currentSubscription = await this.perspective.subscribeInfer(prologQuery);
604
-
605
- const processResults = async (r: AllInstancesResult) => {
606
- const { results, totalCount } = (await this.ctor.instancesFromPrologResult(this.perspective, this.queryParams, r)) as ResultsWithTotalCount<T>;
607
- callback({ results, totalCount, pageSize, pageNumber });
608
- };
609
-
610
- this.currentSubscription.onResult(processResults);
611
- const { results, totalCount } = (await this.ctor.instancesFromPrologResult(this.perspective, paginationQuery, this.currentSubscription.result)) as ResultsWithTotalCount<T>;
612
- const initialPrologPage = { results, totalCount, pageSize, pageNumber };
613
- callback(initialPrologPage);
614
- return initialPrologPage;
615
- }
791
+ /**
792
+ * Subscribes to paginated results updates using SPARQL.
793
+ * Delegates to paginateSubscribe().
794
+ */
795
+ async paginateSubscribeSparql(
796
+ pageSize: number,
797
+ pageNumber: number,
798
+ callback: (results: PaginationResult<T>) => void
799
+ ): Promise<PaginationResult<T>> {
800
+ return await this.paginateSubscribe(pageSize, pageNumber, callback);
616
801
  }
617
802
  }