@coasys/ad4m 0.12.1-dev → 0.13.0-postmessage-ws-proxy.3

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