@coasys/ad4m 0.13.0-test-3 → 0.13.0-test-5

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 (337) hide show
  1. package/README.md +2 -25
  2. package/jest-setup.ts +1 -1
  3. package/lib/index.cjs +6717 -15519
  4. package/lib/index.js +4811 -13662
  5. package/lib/src/Ad4mClient.d.ts +7 -3
  6. package/lib/src/Ad4mClient.js +39 -13
  7. package/lib/src/agent/Agent.js +26 -272
  8. package/lib/src/agent/AgentClient.d.ts +10 -21
  9. package/lib/src/agent/AgentClient.js +75 -427
  10. package/lib/src/agent/AgentStatus.js +2 -37
  11. package/lib/src/ai/AIClient.d.ts +12 -4
  12. package/lib/src/ai/AIClient.js +81 -285
  13. package/lib/src/ai/AITypes.d.ts +55 -0
  14. package/lib/src/ai/AITypes.js +18 -0
  15. package/lib/src/ai/Tasks.js +10 -133
  16. package/lib/src/apiClient.d.ts +52 -0
  17. package/lib/src/apiClient.js +231 -0
  18. package/lib/src/expression/Expression.d.ts +1 -1
  19. package/lib/src/expression/Expression.js +13 -122
  20. package/lib/src/expression/ExpressionClient.d.ts +3 -3
  21. package/lib/src/expression/ExpressionClient.js +13 -76
  22. package/lib/src/expression/ExpressionRef.js +2 -25
  23. package/lib/src/generated/api/AIModelLoadingStatus.d.ts +7 -0
  24. package/lib/src/generated/api/AIModelLoadingStatus.js +2 -0
  25. package/lib/src/generated/api/AddLinkExpressionRequest.d.ts +6 -0
  26. package/lib/src/generated/api/AddLinkExpressionRequest.js +1 -0
  27. package/lib/src/generated/api/AddLinkRequest.d.ts +6 -0
  28. package/lib/src/generated/api/AddLinkRequest.js +1 -0
  29. package/lib/src/generated/api/AddLinksBulkRequest.d.ts +6 -0
  30. package/lib/src/generated/api/AddLinksBulkRequest.js +1 -0
  31. package/lib/src/generated/api/AddSdnaRequest.d.ts +6 -0
  32. package/lib/src/generated/api/AddSdnaRequest.js +2 -0
  33. package/lib/src/generated/api/ApplyTemplateRequest.d.ts +4 -0
  34. package/lib/src/generated/api/ApplyTemplateRequest.js +2 -0
  35. package/lib/src/generated/api/AuthInfoInput.d.ts +10 -0
  36. package/lib/src/generated/api/AuthInfoInput.js +1 -0
  37. package/lib/src/generated/api/CapabilityInput.d.ts +5 -0
  38. package/lib/src/generated/api/CapabilityInput.js +1 -0
  39. package/lib/src/generated/api/CommitBatchRequest.d.ts +3 -0
  40. package/lib/src/generated/api/CommitBatchRequest.js +2 -0
  41. package/lib/src/generated/api/ComputeLogEntry.d.ts +9 -0
  42. package/lib/src/generated/api/ComputeLogEntry.js +2 -0
  43. package/lib/src/generated/api/CreateExpressionRequest.d.ts +4 -0
  44. package/lib/src/generated/api/CreateExpressionRequest.js +2 -0
  45. package/lib/src/generated/api/CreatePerspectiveRequest.d.ts +3 -0
  46. package/lib/src/generated/api/CreatePerspectiveRequest.js +2 -0
  47. package/lib/src/generated/api/CreateSubjectRequest.d.ts +6 -0
  48. package/lib/src/generated/api/CreateSubjectRequest.js +2 -0
  49. package/lib/src/generated/api/EmbedRequest.d.ts +4 -0
  50. package/lib/src/generated/api/EmbedRequest.js +2 -0
  51. package/lib/src/generated/api/EntanglementProofInput.d.ts +6 -0
  52. package/lib/src/generated/api/EntanglementProofInput.js +2 -0
  53. package/lib/src/generated/api/ExecuteCommandsRequest.d.ts +4 -0
  54. package/lib/src/generated/api/ExecuteCommandsRequest.js +2 -0
  55. package/lib/src/generated/api/ExportRequest.d.ts +5 -0
  56. package/lib/src/generated/api/ExportRequest.js +2 -0
  57. package/lib/src/generated/api/ExpressionManyRequest.d.ts +3 -0
  58. package/lib/src/generated/api/ExpressionManyRequest.js +2 -0
  59. package/lib/src/generated/api/ExpressionProof.d.ts +4 -0
  60. package/lib/src/generated/api/ExpressionProof.js +2 -0
  61. package/lib/src/generated/api/ExpressionProofInput.d.ts +6 -0
  62. package/lib/src/generated/api/ExpressionProofInput.js +2 -0
  63. package/lib/src/generated/api/FriendSendMessageRequest.d.ts +3 -0
  64. package/lib/src/generated/api/FriendSendMessageRequest.js +2 -0
  65. package/lib/src/generated/api/FriendsListRequest.d.ts +3 -0
  66. package/lib/src/generated/api/FriendsListRequest.js +2 -0
  67. package/lib/src/generated/api/GenerateAgentRequest.d.ts +3 -0
  68. package/lib/src/generated/api/GenerateAgentRequest.js +2 -0
  69. package/lib/src/generated/api/GenerateJwtRequest.d.ts +4 -0
  70. package/lib/src/generated/api/GenerateJwtRequest.js +2 -0
  71. package/lib/src/generated/api/GetSubjectDataRequest.d.ts +4 -0
  72. package/lib/src/generated/api/GetSubjectDataRequest.js +2 -0
  73. package/lib/src/generated/api/ImportAgentRequest.d.ts +6 -0
  74. package/lib/src/generated/api/ImportAgentRequest.js +2 -0
  75. package/lib/src/generated/api/ImportRequest.d.ts +4 -0
  76. package/lib/src/generated/api/ImportRequest.js +2 -0
  77. package/lib/src/generated/api/JoinNeighbourhoodRequest.d.ts +3 -0
  78. package/lib/src/generated/api/JoinNeighbourhoodRequest.js +2 -0
  79. package/lib/src/generated/api/LanguageMetaInput.d.ts +6 -0
  80. package/lib/src/generated/api/LanguageMetaInput.js +2 -0
  81. package/lib/src/generated/api/Link.d.ts +5 -0
  82. package/lib/src/generated/api/Link.js +2 -0
  83. package/lib/src/generated/api/LinkExpression.d.ts +10 -0
  84. package/lib/src/generated/api/LinkExpression.js +1 -0
  85. package/lib/src/generated/api/LinkExpressionInput.d.ts +10 -0
  86. package/lib/src/generated/api/LinkExpressionInput.js +1 -0
  87. package/lib/src/generated/api/LinkInput.d.ts +5 -0
  88. package/lib/src/generated/api/LinkInput.js +2 -0
  89. package/lib/src/generated/api/LinkLanguageTemplatesRequest.d.ts +3 -0
  90. package/lib/src/generated/api/LinkLanguageTemplatesRequest.js +2 -0
  91. package/lib/src/generated/api/LinkMutations.d.ts +6 -0
  92. package/lib/src/generated/api/LinkMutations.js +1 -0
  93. package/lib/src/generated/api/LinkStatus.d.ts +1 -0
  94. package/lib/src/generated/api/LinkStatus.js +2 -0
  95. package/lib/src/generated/api/LockAgentRequest.d.ts +3 -0
  96. package/lib/src/generated/api/LockAgentRequest.js +2 -0
  97. package/lib/src/generated/api/ModelType.d.ts +1 -0
  98. package/lib/src/generated/api/ModelType.js +2 -0
  99. package/lib/src/generated/api/NotificationInput.d.ts +10 -0
  100. package/lib/src/generated/api/NotificationInput.js +2 -0
  101. package/lib/src/generated/api/OpenLinkRequest.d.ts +3 -0
  102. package/lib/src/generated/api/OpenLinkRequest.js +2 -0
  103. package/lib/src/generated/api/PermitCapabilityRequest.d.ts +3 -0
  104. package/lib/src/generated/api/PermitCapabilityRequest.js +2 -0
  105. package/lib/src/generated/api/PerspectiveInput.d.ts +4 -0
  106. package/lib/src/generated/api/PerspectiveInput.js +1 -0
  107. package/lib/src/generated/api/PromptRequest.d.ts +4 -0
  108. package/lib/src/generated/api/PromptRequest.js +2 -0
  109. package/lib/src/generated/api/PublishLanguageRequest.d.ts +5 -0
  110. package/lib/src/generated/api/PublishLanguageRequest.js +1 -0
  111. package/lib/src/generated/api/PublishNeighbourhoodRequest.d.ts +6 -0
  112. package/lib/src/generated/api/PublishNeighbourhoodRequest.js +1 -0
  113. package/lib/src/generated/api/QueryRequest.d.ts +7 -0
  114. package/lib/src/generated/api/QueryRequest.js +2 -0
  115. package/lib/src/generated/api/RemoveLinkRequest.d.ts +5 -0
  116. package/lib/src/generated/api/RemoveLinkRequest.js +1 -0
  117. package/lib/src/generated/api/RemoveLinksBulkRequest.d.ts +5 -0
  118. package/lib/src/generated/api/RemoveLinksBulkRequest.js +1 -0
  119. package/lib/src/generated/api/ResourceInput.d.ts +4 -0
  120. package/lib/src/generated/api/ResourceInput.js +2 -0
  121. package/lib/src/generated/api/SetDefaultModelRequest.d.ts +4 -0
  122. package/lib/src/generated/api/SetDefaultModelRequest.js +1 -0
  123. package/lib/src/generated/api/SetFreeHostingEnabledRequest.d.ts +3 -0
  124. package/lib/src/generated/api/SetFreeHostingEnabledRequest.js +2 -0
  125. package/lib/src/generated/api/SetMultiUserRequest.d.ts +3 -0
  126. package/lib/src/generated/api/SetMultiUserRequest.js +2 -0
  127. package/lib/src/generated/api/SetStatusRequest.d.ts +3 -0
  128. package/lib/src/generated/api/SetStatusRequest.js +2 -0
  129. package/lib/src/generated/api/SignMessageRequest.d.ts +3 -0
  130. package/lib/src/generated/api/SignMessageRequest.js +2 -0
  131. package/lib/src/generated/api/TrustedAgentsRequest.d.ts +3 -0
  132. package/lib/src/generated/api/TrustedAgentsRequest.js +2 -0
  133. package/lib/src/generated/api/UnlockAgentRequest.d.ts +4 -0
  134. package/lib/src/generated/api/UnlockAgentRequest.js +2 -0
  135. package/lib/src/generated/api/UpdateLinkRequest.d.ts +7 -0
  136. package/lib/src/generated/api/UpdateLinkRequest.js +1 -0
  137. package/lib/src/generated/api/UpdatePerspectiveRequest.d.ts +3 -0
  138. package/lib/src/generated/api/UpdatePerspectiveRequest.js +2 -0
  139. package/lib/src/generated/api/UserStatistics.d.ts +9 -0
  140. package/lib/src/generated/api/UserStatistics.js +2 -0
  141. package/lib/src/generated/api/VerificationRequestResult.d.ts +6 -0
  142. package/lib/src/generated/api/VerificationRequestResult.js +2 -0
  143. package/lib/src/generated/api/VerifySignatureRequest.d.ts +5 -0
  144. package/lib/src/generated/api/VerifySignatureRequest.js +2 -0
  145. package/lib/src/generated/api/WriteSettingsRequest.d.ts +3 -0
  146. package/lib/src/generated/api/WriteSettingsRequest.js +2 -0
  147. package/lib/src/generated/api/index.d.ts +42 -0
  148. package/lib/src/generated/api/index.js +7 -0
  149. package/lib/src/index.d.ts +6 -1
  150. package/lib/src/index.js +6 -1
  151. package/lib/src/jestSetup.d.ts +0 -1
  152. package/lib/src/jestSetup.js +1 -1
  153. package/lib/src/language/Icon.js +2 -21
  154. package/lib/src/language/Language.d.ts +1 -1
  155. package/lib/src/language/Language.js +10 -76
  156. package/lib/src/language/LanguageClient.d.ts +2 -2
  157. package/lib/src/language/LanguageClient.js +15 -105
  158. package/lib/src/language/LanguageHandle.js +2 -41
  159. package/lib/src/language/LanguageMeta.js +4 -75
  160. package/lib/src/language/LanguageRef.js +2 -25
  161. package/lib/src/links/Links.js +14 -111
  162. package/lib/src/model/Ad4mModel.d.ts +76 -44
  163. package/lib/src/model/Ad4mModel.js +635 -479
  164. package/lib/src/model/Ad4mModel.test.js +371 -815
  165. package/lib/src/model/ModelQueryBuilder.d.ts +15 -27
  166. package/lib/src/model/ModelQueryBuilder.js +163 -224
  167. package/lib/src/model/decorators.d.ts +22 -0
  168. package/lib/src/model/decorators.js +7 -0
  169. package/lib/src/model/hydration.d.ts +3 -93
  170. package/lib/src/model/hydration.js +3 -970
  171. package/lib/src/model/index.d.ts +0 -4
  172. package/lib/src/model/index.js +0 -4
  173. package/lib/src/model/model-manifest.d.ts +41 -0
  174. package/lib/src/model/model-manifest.js +11 -0
  175. package/lib/src/model/query-sparql.d.ts +4 -67
  176. package/lib/src/model/query-sparql.js +26 -322
  177. package/lib/src/model/query-sparql.test.js +35 -218
  178. package/lib/src/model/query-utils.d.ts +1 -0
  179. package/lib/src/model/query-utils.js +46 -1
  180. package/lib/src/model/shacl-gen.js +4 -0
  181. package/lib/src/model/types.d.ts +51 -43
  182. package/lib/src/model/types.js +4 -1
  183. package/lib/src/neighbourhood/Neighbourhood.js +4 -32
  184. package/lib/src/neighbourhood/NeighbourhoodClient.d.ts +3 -3
  185. package/lib/src/neighbourhood/NeighbourhoodClient.js +40 -203
  186. package/lib/src/perspectives/LinkQuery.js +2 -42
  187. package/lib/src/perspectives/Perspective.d.ts +1 -1
  188. package/lib/src/perspectives/Perspective.js +10 -52
  189. package/lib/src/perspectives/PerspectiveClient.d.ts +13 -17
  190. package/lib/src/perspectives/PerspectiveClient.js +179 -429
  191. package/lib/src/perspectives/PerspectiveClient.test.js +55 -0
  192. package/lib/src/perspectives/PerspectiveDiff.js +4 -31
  193. package/lib/src/perspectives/PerspectiveHandle.js +3 -43
  194. package/lib/src/perspectives/PerspectiveProxy.d.ts +106 -71
  195. package/lib/src/perspectives/PerspectiveProxy.js +289 -310
  196. package/lib/src/runtime/RuntimeClient.d.ts +6 -6
  197. package/lib/src/runtime/RuntimeClient.js +93 -467
  198. package/lib/src/runtime/RuntimeTypes.d.ts +101 -0
  199. package/lib/src/runtime/RuntimeTypes.js +45 -0
  200. package/lib/src/shacl/SHACLShape.d.ts +7 -0
  201. package/lib/src/shacl/SHACLShape.js +19 -0
  202. package/lib/src/shacl/SHACLShape.test.js +82 -0
  203. package/lib/src/typeDefs.js +3 -628
  204. package/package.json +6 -18
  205. package/rollup.config.js +0 -7
  206. package/src/Ad4mClient.test.ts +1179 -1340
  207. package/src/Ad4mClient.ts +40 -15
  208. package/src/agent/Agent.ts +0 -99
  209. package/src/agent/AgentClient.ts +112 -526
  210. package/src/agent/AgentStatus.ts +0 -12
  211. package/src/ai/AIClient.ts +96 -296
  212. package/src/ai/AITypes.ts +66 -0
  213. package/src/ai/Tasks.ts +0 -52
  214. package/src/apiClient.ts +283 -0
  215. package/src/expression/Expression.ts +3 -43
  216. package/src/expression/ExpressionClient.ts +14 -77
  217. package/src/expression/ExpressionRef.ts +0 -6
  218. package/src/generated/api/AIModelLoadingStatus.ts +3 -0
  219. package/src/generated/api/AddLinkExpressionRequest.ts +4 -0
  220. package/src/generated/api/AddLinkRequest.ts +4 -0
  221. package/src/generated/api/AddLinksBulkRequest.ts +4 -0
  222. package/src/generated/api/AddSdnaRequest.ts +3 -0
  223. package/src/generated/api/ApplyTemplateRequest.ts +3 -0
  224. package/src/generated/api/AuthInfoInput.ts +4 -0
  225. package/src/generated/api/CapabilityInput.ts +4 -0
  226. package/src/generated/api/CommitBatchRequest.ts +3 -0
  227. package/src/generated/api/ComputeLogEntry.ts +3 -0
  228. package/src/generated/api/CreateExpressionRequest.ts +3 -0
  229. package/src/generated/api/CreatePerspectiveRequest.ts +3 -0
  230. package/src/generated/api/CreateSubjectRequest.ts +3 -0
  231. package/src/generated/api/EmbedRequest.ts +3 -0
  232. package/src/generated/api/EntanglementProofInput.ts +3 -0
  233. package/src/generated/api/ExecuteCommandsRequest.ts +3 -0
  234. package/src/generated/api/ExportRequest.ts +3 -0
  235. package/src/generated/api/ExpressionManyRequest.ts +3 -0
  236. package/src/generated/api/ExpressionProof.ts +3 -0
  237. package/src/generated/api/ExpressionProofInput.ts +3 -0
  238. package/src/generated/api/FriendSendMessageRequest.ts +3 -0
  239. package/src/generated/api/FriendsListRequest.ts +3 -0
  240. package/src/generated/api/GenerateAgentRequest.ts +3 -0
  241. package/src/generated/api/GenerateJwtRequest.ts +3 -0
  242. package/src/generated/api/GetSubjectDataRequest.ts +3 -0
  243. package/src/generated/api/ImportAgentRequest.ts +3 -0
  244. package/src/generated/api/ImportRequest.ts +3 -0
  245. package/src/generated/api/JoinNeighbourhoodRequest.ts +3 -0
  246. package/src/generated/api/LanguageMetaInput.ts +3 -0
  247. package/src/generated/api/Link.ts +3 -0
  248. package/src/generated/api/LinkExpression.ts +6 -0
  249. package/src/generated/api/LinkExpressionInput.ts +6 -0
  250. package/src/generated/api/LinkInput.ts +3 -0
  251. package/src/generated/api/LinkLanguageTemplatesRequest.ts +3 -0
  252. package/src/generated/api/LinkMutations.ts +5 -0
  253. package/src/generated/api/LinkStatus.ts +3 -0
  254. package/src/generated/api/LockAgentRequest.ts +3 -0
  255. package/src/generated/api/ModelType.ts +3 -0
  256. package/src/generated/api/NotificationInput.ts +3 -0
  257. package/src/generated/api/OpenLinkRequest.ts +3 -0
  258. package/src/generated/api/PermitCapabilityRequest.ts +3 -0
  259. package/src/generated/api/PerspectiveInput.ts +4 -0
  260. package/src/generated/api/PromptRequest.ts +3 -0
  261. package/src/generated/api/PublishLanguageRequest.ts +4 -0
  262. package/src/generated/api/PublishNeighbourhoodRequest.ts +4 -0
  263. package/src/generated/api/QueryRequest.ts +6 -0
  264. package/src/generated/api/RemoveLinkRequest.ts +4 -0
  265. package/src/generated/api/RemoveLinksBulkRequest.ts +4 -0
  266. package/src/generated/api/ResourceInput.ts +3 -0
  267. package/src/generated/api/SetDefaultModelRequest.ts +4 -0
  268. package/src/generated/api/SetFreeHostingEnabledRequest.ts +3 -0
  269. package/src/generated/api/SetMultiUserRequest.ts +3 -0
  270. package/src/generated/api/SetStatusRequest.ts +3 -0
  271. package/src/generated/api/SignMessageRequest.ts +3 -0
  272. package/src/generated/api/TrustedAgentsRequest.ts +3 -0
  273. package/src/generated/api/UnlockAgentRequest.ts +3 -0
  274. package/src/generated/api/UpdateLinkRequest.ts +5 -0
  275. package/src/generated/api/UpdatePerspectiveRequest.ts +3 -0
  276. package/src/generated/api/UserStatistics.ts +3 -0
  277. package/src/generated/api/VerificationRequestResult.ts +3 -0
  278. package/src/generated/api/VerifySignatureRequest.ts +3 -0
  279. package/src/generated/api/WriteSettingsRequest.ts +3 -0
  280. package/src/generated/api/index.ts +49 -0
  281. package/src/index.ts +6 -1
  282. package/src/jestSetup.ts +1 -1
  283. package/src/language/Icon.ts +0 -4
  284. package/src/language/Language.ts +2 -23
  285. package/src/language/LanguageClient.ts +21 -132
  286. package/src/language/LanguageHandle.ts +0 -14
  287. package/src/language/LanguageMeta.ts +0 -29
  288. package/src/language/LanguageRef.ts +0 -7
  289. package/src/links/Links.ts +0 -37
  290. package/src/model/Ad4mModel.test.ts +766 -1173
  291. package/src/model/Ad4mModel.ts +664 -529
  292. package/src/model/ModelQueryBuilder.ts +203 -251
  293. package/src/model/decorators.ts +29 -0
  294. package/src/model/hydration.ts +3 -1037
  295. package/src/model/index.ts +0 -4
  296. package/src/model/query-sparql.test.ts +34 -242
  297. package/src/model/query-sparql.ts +27 -337
  298. package/src/model/query-utils.ts +47 -2
  299. package/src/model/shacl-gen.ts +5 -0
  300. package/src/model/types.ts +55 -44
  301. package/src/neighbourhood/Neighbourhood.ts +0 -9
  302. package/src/neighbourhood/NeighbourhoodClient.ts +42 -207
  303. package/src/neighbourhood/NeighbourhoodProxy.test.ts +34 -36
  304. package/src/perspectives/LinkQuery.ts +0 -15
  305. package/src/perspectives/Perspective.ts +1 -12
  306. package/src/perspectives/PerspectiveClient.test.ts +206 -148
  307. package/src/perspectives/PerspectiveClient.ts +247 -442
  308. package/src/perspectives/PerspectiveDiff.ts +0 -8
  309. package/src/perspectives/PerspectiveHandle.ts +1 -12
  310. package/src/perspectives/PerspectiveProxy.test.ts +41 -0
  311. package/src/perspectives/PerspectiveProxy.ts +331 -348
  312. package/src/runtime/RuntimeClient.ts +112 -474
  313. package/src/runtime/RuntimeTypes.ts +144 -0
  314. package/src/shacl/SHACLShape.test.ts +94 -0
  315. package/src/shacl/SHACLShape.ts +27 -0
  316. package/src/typeDefs.ts +3 -5
  317. package/tsconfig.json +3 -7
  318. package/shims/reflect-metadata.ts +0 -0
  319. package/shims/type-graphql.ts +0 -75
  320. package/src/PubSub.ts +0 -17
  321. package/src/agent/AgentResolver.ts +0 -263
  322. package/src/ai/AIResolver.ts +0 -372
  323. package/src/buildSchema.ts +0 -43
  324. package/src/expression/ExpressionResolver.ts +0 -64
  325. package/src/language/LanguageResolver.ts +0 -98
  326. package/src/model/Subject.ts +0 -159
  327. package/src/model/hydration-batch.ts +0 -205
  328. package/src/model/hydration-batching.test.ts +0 -563
  329. package/src/model/prolog-facts.ts +0 -145
  330. package/src/model/query-prolog.ts +0 -148
  331. package/src/model/query-sparql-batch.ts +0 -301
  332. package/src/model/subscription-delta.test.ts +0 -207
  333. package/src/model/subscription-pool.ts +0 -211
  334. package/src/neighbourhood/NeighbourhoodResolver.ts +0 -100
  335. package/src/perspectives/PerspectiveResolver.ts +0 -364
  336. package/src/runtime/RuntimeResolver.ts +0 -749
  337. package/src/unwrapApolloResult.ts +0 -16
@@ -9,11 +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
13
  } from "./types";
14
- import { groupSPARQLResults, hasJsOnlyWhereFilters, parseSparqlCount } from "./query-sparql";
15
- import { getRelationsMetadata } from "./decorators";
16
- import { pooledSubscribe } from "./subscription-pool";
17
14
 
18
15
  /** Query builder for Ad4mModel queries.
19
16
  * Allows building queries with a fluent interface and either running them once
@@ -41,7 +38,6 @@ export class ModelQueryBuilder<T extends Ad4mModel> {
41
38
  private modelClassName: string | null = null;
42
39
  private ctor: typeof Ad4mModel;
43
40
  private currentSubscription?: any;
44
- private engineFlag: 'sparql' | 'prolog' = 'sparql';
45
41
 
46
42
  constructor(perspective: PerspectiveProxy, ctor: typeof Ad4mModel, query?: Query) {
47
43
  this.perspective = perspective;
@@ -54,7 +50,7 @@ export class ModelQueryBuilder<T extends Ad4mModel> {
54
50
  *
55
51
  * This method:
56
52
  * 1. Stops the keepalive signals to the subscription
57
- * 2. Unsubscribes from GraphQL subscription updates
53
+ * 2. Unsubscribes from subscription updates
58
54
  * 3. Notifies the backend to clean up subscription resources
59
55
  * 4. Clears the subscription reference
60
56
  *
@@ -228,25 +224,25 @@ export class ModelQueryBuilder<T extends Ad4mModel> {
228
224
  }
229
225
 
230
226
  /**
231
- * Opts in to evaluating SPARQL property getters during collection hydration.
227
+ * Controls whether SPARQL property getters are evaluated during hydration.
232
228
  *
233
- * By default, collection queries skip getter evaluation for performance.
234
- * Call `.deepQuery()` when you need getter-backed properties in the result set.
229
+ * By default, collection queries evaluate property getters (deepQuery=true).
230
+ * Call `.deepQuery(false)` to skip getter evaluation for performance.
235
231
  *
232
+ * @param enabled - Whether to evaluate property getters (default: true)
236
233
  * @returns The query builder for chaining
237
234
  *
238
235
  * @example
239
236
  * ```typescript
240
237
  * const messages = await Message.query(perspective)
241
238
  * .parent(channel)
242
- * .deepQuery()
239
+ * .deepQuery(false) // skip property getters for performance
243
240
  * .limit(30)
244
241
  * .get();
245
- * // messages[i].replyingTo is populated
246
242
  * ```
247
243
  */
248
- deepQuery(): ModelQueryBuilder<T> {
249
- (this.queryParams as any).deepQuery = true;
244
+ deepQuery(enabled: boolean = true): ModelQueryBuilder<T> {
245
+ this.queryParams.deepQuery = enabled;
250
246
  return this;
251
247
  }
252
248
 
@@ -288,9 +284,9 @@ export class ModelQueryBuilder<T extends Ad4mModel> {
288
284
 
289
285
  /**
290
286
  * Sets the query engine to use.
287
+ * @deprecated Prolog engine has been removed. All queries use SPARQL/Rust.
291
288
  */
292
- engine(eng: 'sparql' | 'prolog'): ModelQueryBuilder<T> {
293
- this.engineFlag = eng;
289
+ engine(_eng: 'sparql' | 'prolog'): ModelQueryBuilder<T> {
294
290
  return this;
295
291
  }
296
292
 
@@ -307,16 +303,7 @@ export class ModelQueryBuilder<T extends Ad4mModel> {
307
303
  * ```
308
304
  */
309
305
  async get(): Promise<T[]> {
310
- let results: T[];
311
- if (this.engineFlag === 'sparql') {
312
- results = await this.executeSparqlQuery();
313
- } else {
314
- const query = await this.ctor.queryToProlog(this.perspective, this.queryParams, this.modelClassName);
315
- const result = await this.perspective.infer(query);
316
- ({ results } = await this.ctor.instancesFromPrologResult(this.perspective, this.queryParams, result) as { results: T[] });
317
- }
318
-
319
- return results;
306
+ return await this.executeSparqlQuery();
320
307
  }
321
308
 
322
309
  /**
@@ -327,24 +314,13 @@ export class ModelQueryBuilder<T extends Ad4mModel> {
327
314
  }
328
315
 
329
316
  /**
330
- * Shared SPARQL query execution logic used by both get() and getSparql().
317
+ * Shared query execution logic — routes through the executor-side modelQuery endpoint.
331
318
  */
332
319
  private async executeSparqlQuery(): Promise<T[]> {
333
- const sparqlQuery = await this.ctor.queryToSPARQL(this.perspective, this.queryParams);
334
- const rawResult = await this.perspective.querySparql(sparqlQuery);
335
- const { results } = await this.processSparqlResult(rawResult);
320
+ const { results } = await (this.ctor as any).executeModelQuery(this.perspective, this.queryParams, this.modelClassName);
336
321
  return results;
337
322
  }
338
323
 
339
- /**
340
- * Groups raw SPARQL results and hydrates them into model instances.
341
- * Centralises the repeated groupSPARQLResults → instancesFromQueryResult pipeline.
342
- */
343
- private async processSparqlResult(rawResult: any, queryOverride?: Query, computeTotalCount: boolean = false): Promise<{ results: T[], totalCount: number }> {
344
- const grouped = groupSPARQLResults(Array.isArray(rawResult) ? rawResult : []);
345
- return await this.ctor.instancesFromQueryResult(this.perspective, queryOverride || this.queryParams, grouped, computeTotalCount) as { results: T[], totalCount: number };
346
- }
347
-
348
324
  /**
349
325
  * Returns the first matching instance, or `null` if none match.
350
326
  *
@@ -392,9 +368,6 @@ export class ModelQueryBuilder<T extends Ad4mModel> {
392
368
  * builder.dispose();
393
369
  * ```
394
370
  *
395
- * @remarks
396
- * By default, this uses SPARQL live queries for real-time updates.
397
- * Prolog subscriptions remain available via `.useSPARQL(false)`.
398
371
  */
399
372
  async subscribe(callback: (results: T[]) => void): Promise<T[]> {
400
373
  // Clean up any existing subscription
@@ -402,83 +375,90 @@ export class ModelQueryBuilder<T extends Ad4mModel> {
402
375
 
403
376
  const ctor = this.ctor;
404
377
 
405
- if (this.engineFlag === 'sparql') {
406
- const sparqlQuery = await ctor.queryToSPARQL(this.perspective, this.queryParams);
407
-
408
- // Track last emitted result fingerprint to suppress duplicate callbacks
409
- let lastResultFingerprint: string | null = null;
410
-
411
- const buildFingerprint = (results: any[]) => {
412
- if (results.length === 0) return '0:';
413
- // Must include relation data (e.g. tags) — not just id/timestamp.
414
- // Otherwise @HasMany changes on existing instances are suppressed as duplicates.
415
- return JSON.stringify(results, (_, v) =>
416
- typeof v === 'function' ? undefined : v
417
- );
418
- };
419
-
420
- const hydrate = async (rawResult: any) => {
421
- const { results } = await this.processSparqlResult(rawResult);
422
- return results;
423
- };
424
-
425
- const pooled = await pooledSubscribe(
426
- this.perspective,
427
- sparqlQuery,
428
- hydrate,
429
- (hydratedResults: T[]) => {
430
- const fp = buildFingerprint(hydratedResults);
431
- if (fp === lastResultFingerprint) return;
432
- lastResultFingerprint = fp;
433
- callback(hydratedResults);
434
- },
435
- );
378
+ // Build the model query params (className, queryJson, shapeJson)
379
+ const { className, queryJson, shapeJson } = (ctor as any).prepareModelQueryParams(
380
+ this.queryParams, this.modelClassName
381
+ );
436
382
 
437
- // Store dispose function as subscription
438
- this.currentSubscription = { dispose: pooled.dispose };
383
+ // Register model subscription via Rust — this builds trigger SPARQL internally,
384
+ // registers the subscription, and runs the initial query in one call.
385
+ const { subscriptionId, result: initialModelResult } = await this.perspective.modelSubscribe(
386
+ className, queryJson, shapeJson
387
+ );
439
388
 
440
- const initialResults = pooled.initialResult as T[];
441
- lastResultFingerprint = buildFingerprint(initialResults);
442
- return initialResults;
443
- } else {
444
- const query = await ctor.queryToProlog(this.perspective, this.queryParams, this.modelClassName);
445
- this.currentSubscription = await this.perspective.subscribeInfer(query);
446
-
447
- const processResults = async (result: AllInstancesResult) => {
448
- const { results } = await ctor.instancesFromPrologResult(this.perspective, this.queryParams, result);
449
- callback(results as T[]);
450
- };
451
-
452
- this.currentSubscription.onResult(processResults);
453
- const { results } = await ctor.instancesFromPrologResult(
454
- this.perspective,
455
- this.queryParams,
456
- this.currentSubscription.result
457
- );
458
- // Initial results returned via Promise only — callback is for subsequent updates
459
- return results as T[];
389
+ // Convert JSON instances to model class instances
390
+ const parseResults = (raw: any): T[] => {
391
+ return (ctor as any).parseModelResult(this.perspective, raw, this.queryParams.include, this.queryParams.properties);
392
+ };
393
+
394
+ // Parse initial results
395
+ const initialResults = parseResults(initialModelResult);
396
+
397
+ // Track last emitted result fingerprint to suppress duplicate callbacks
398
+ let lastResultFingerprint: string | null = null;
399
+ const buildFingerprint = (results: any[]) => {
400
+ if (results.length === 0) return '0:';
401
+ return JSON.stringify(results, (_, v) =>
402
+ typeof v === 'function' ? undefined : v
403
+ );
404
+ };
405
+ lastResultFingerprint = buildFingerprint(initialResults);
406
+
407
+ // Listen for subscription updates via the same GraphQL subscription channel.
408
+ // When Rust re-runs the model query and finds changed results, it pushes them.
409
+ const unsubscribe = this.perspective.client.subscribeToQueryUpdates(
410
+ subscriptionId,
411
+ (rawResult: any) => {
412
+ // Skip delayed #init# messages — initial data was already returned
413
+ // synchronously from modelSubscribe(). Late init messages contain stale
414
+ // data that would overwrite real subscription updates.
415
+ if (rawResult && rawResult.isInit) return;
416
+ try {
417
+ const results = parseResults(rawResult);
418
+ const fp = buildFingerprint(results);
419
+ if (fp === lastResultFingerprint) return;
420
+ lastResultFingerprint = fp;
421
+ callback(results);
422
+ } catch (e) {
423
+ console.error('Model subscription update parse error:', e);
424
+ }
425
+ },
426
+ );
427
+
428
+ // Set up keepalive with failure tracking
429
+ let keepaliveFailures = 0;
430
+ const keepaliveTimer = setInterval(() => {
431
+ this.perspective.client.keepAliveQuery(this.perspective.uuid, subscriptionId).then(() => {
432
+ keepaliveFailures = 0;
433
+ }).catch((e: any) => {
434
+ keepaliveFailures++;
435
+ console.warn(`Model subscription keepalive failed (attempt ${keepaliveFailures}) for ${subscriptionId}:`, e);
436
+ });
437
+ }, 30000);
438
+
439
+ // Store dispose function
440
+ this.currentSubscription = {
441
+ dispose: () => {
442
+ clearInterval(keepaliveTimer);
443
+ unsubscribe();
444
+ this.perspective.client.disposeQuerySubscription(this.perspective.uuid, subscriptionId).catch(() => {});
445
+ },
446
+ };
447
+
448
+ // Take snapshots for dirty tracking
449
+ for (const inst of initialResults) {
450
+ (inst as any).takeSnapshot?.(this.queryParams.include);
460
451
  }
452
+
453
+ return initialResults;
461
454
  }
462
455
 
463
456
  /**
464
457
  * Subscribes to the query and receives updates using SPARQL.
458
+ * @deprecated Use subscribe() instead — now routes through Rust model subscription.
465
459
  */
466
460
  async subscribeSparql(callback: (results: T[]) => void): Promise<T[]> {
467
- this.dispose();
468
-
469
- const sparqlQuery = await this.ctor.queryToSPARQL(this.perspective, this.queryParams);
470
- this.currentSubscription = await this.perspective.subscribeQuery(sparqlQuery);
471
-
472
- const processResults = async (result: any) => {
473
- const { results } = await this.processSparqlResult(result);
474
- callback(results as T[]);
475
- };
476
-
477
- this.currentSubscription.onResult(processResults);
478
-
479
- const { results } = await this.processSparqlResult(this.currentSubscription.result);
480
- // Initial results returned via Promise only — callback is for subsequent updates
481
- return results as T[];
461
+ return this.subscribe(callback);
482
462
  }
483
463
 
484
464
  /**
@@ -494,39 +474,16 @@ export class ModelQueryBuilder<T extends Ad4mModel> {
494
474
  * ```
495
475
  */
496
476
  async count(): Promise<number> {
497
- if (this.engineFlag === 'sparql') {
498
- // When query has JS-only where filters, fall back to full hydration
499
- const metadata = this.ctor.getModelMetadata();
500
- const allRelMeta = getRelationsMetadata(this.ctor as any);
501
- if (hasJsOnlyWhereFilters(metadata, allRelMeta, this.queryParams.where)) {
502
- const sparqlQuery = await this.ctor.queryToSPARQL(this.perspective, this.queryParams);
503
- const rawResult = await this.perspective.querySparql(sparqlQuery);
504
- const { totalCount } = await this.processSparqlResult(rawResult, undefined, true);
505
- return totalCount;
506
- }
507
- // Use efficient COUNT query — no hydration
508
- const countSparql = await this.ctor.countQueryToSPARQL(this.perspective, this.queryParams);
509
- const countResult = await this.perspective.querySparql(countSparql);
510
- return parseSparqlCount(countResult) ?? 0;
511
- } else {
512
- const query = await this.ctor.countQueryToProlog(this.perspective, this.queryParams, this.modelClassName);
513
- const result = await this.perspective.infer(query);
514
- return result?.[0]?.TotalCount || 0;
515
- }
477
+ const { totalCount } = await (this.ctor as any).executeModelQuery(this.perspective, { ...this.queryParams, limit: 0 }, this.modelClassName);
478
+ return totalCount;
516
479
  }
517
480
 
518
481
  /**
519
482
  * Gets the total count of matching entities using SPARQL.
520
- * Delegates to count() with SPARQL engine forced.
483
+ * Delegates to count().
521
484
  */
522
485
  async countSparql(): Promise<number> {
523
- const prev = this.engineFlag;
524
- this.engineFlag = 'sparql';
525
- try {
526
- return await this.count();
527
- } finally {
528
- this.engineFlag = prev;
529
- }
486
+ return await this.count();
530
487
  }
531
488
 
532
489
  /**
@@ -556,61 +513,66 @@ export class ModelQueryBuilder<T extends Ad4mModel> {
556
513
  * builder.dispose();
557
514
  * ```
558
515
  *
559
- * @remarks
560
- * By default, this uses SPARQL live queries for real-time updates.
561
- * Prolog subscriptions remain available via `.useSPARQL(false)`.
562
516
  */
563
517
  async countSubscribe(callback: (count: number) => void): Promise<number> {
564
518
  // Clean up any existing subscription
565
519
  this.dispose();
566
520
 
567
- if (this.engineFlag === 'sparql') {
568
- const sparqlQuery = await this.ctor.queryToSPARQL(this.perspective, this.queryParams);
569
- this.currentSubscription = await this.perspective.subscribeQuery(sparqlQuery);
521
+ const countParams = { ...this.queryParams, limit: 0 };
522
+ const { className, queryJson, shapeJson } = (this.ctor as any).prepareModelQueryParams(
523
+ countParams, this.modelClassName
524
+ );
570
525
 
571
- const processResults = async (result: any) => {
572
- const { totalCount } = await this.processSparqlResult(result, undefined, true);
573
- callback(totalCount);
574
- };
526
+ const { subscriptionId, result: initialModelResult } = await this.perspective.modelSubscribe(
527
+ className, queryJson, shapeJson
528
+ );
575
529
 
576
- this.currentSubscription.onResult(processResults);
577
- const { totalCount } = await this.processSparqlResult(this.currentSubscription.result, undefined, true);
578
- // Initial count returned via Promise — callback for updates only
579
- return totalCount;
580
- } else {
581
- const query = await this.ctor.countQueryToProlog(this.perspective, this.queryParams, this.modelClassName);
582
- this.currentSubscription = await this.perspective.subscribeInfer(query);
583
-
584
- const processResults = async (result: any) => {
585
- const newCount = result?.[0]?.TotalCount || 0;
586
- callback(newCount);
587
- };
588
-
589
- this.currentSubscription.onResult(processResults);
590
- const initialCount = this.currentSubscription.result?.[0]?.TotalCount || 0;
591
- // Initial count returned via Promise — callback for subsequent updates only
592
- return initialCount;
593
- }
530
+ const parseCount = (raw: any): number => {
531
+ const data = typeof raw === 'string' ? JSON.parse(raw) : raw;
532
+ return data.totalCount ?? 0;
533
+ };
534
+
535
+ const initialCount = parseCount(initialModelResult);
536
+
537
+ const unsubscribe = this.perspective.client.subscribeToQueryUpdates(
538
+ subscriptionId,
539
+ (rawResult: any) => {
540
+ if (rawResult && rawResult.isInit) return;
541
+ try {
542
+ callback(parseCount(rawResult));
543
+ } catch (e) {
544
+ console.error('Count subscription update parse error:', e);
545
+ }
546
+ },
547
+ );
548
+
549
+ let keepaliveFailures = 0;
550
+ const keepaliveTimer = setInterval(() => {
551
+ this.perspective.client.keepAliveQuery(this.perspective.uuid, subscriptionId).then(() => {
552
+ keepaliveFailures = 0;
553
+ }).catch((e: any) => {
554
+ keepaliveFailures++;
555
+ console.warn(`Count subscription keepalive failed (attempt ${keepaliveFailures}) for ${subscriptionId}:`, e);
556
+ });
557
+ }, 30000);
558
+
559
+ this.currentSubscription = {
560
+ dispose: () => {
561
+ clearInterval(keepaliveTimer);
562
+ unsubscribe();
563
+ this.perspective.client.disposeQuerySubscription(this.perspective.uuid, subscriptionId).catch(() => {});
564
+ },
565
+ };
566
+
567
+ return initialCount;
594
568
  }
595
569
 
596
570
  /**
597
571
  * Subscribes to count updates using SPARQL.
572
+ * @deprecated Use countSubscribe() instead — now routes through Rust model subscription.
598
573
  */
599
574
  async countSubscribeSparql(callback: (count: number) => void): Promise<number> {
600
- this.dispose();
601
-
602
- const sparqlQuery = await this.ctor.queryToSPARQL(this.perspective, this.queryParams);
603
- this.currentSubscription = await this.perspective.subscribeQuery(sparqlQuery);
604
-
605
- const processResults = async (result: any) => {
606
- const { totalCount } = await this.processSparqlResult(result, undefined, true);
607
- callback(totalCount);
608
- };
609
-
610
- this.currentSubscription.onResult(processResults);
611
- const { totalCount } = await this.processSparqlResult(this.currentSubscription.result, undefined, true);
612
- // Initial count returned via Promise — callback for updates only
613
- return totalCount;
575
+ return this.countSubscribe(callback);
614
576
  }
615
577
 
616
578
  /**
@@ -630,31 +592,16 @@ export class ModelQueryBuilder<T extends Ad4mModel> {
630
592
  */
631
593
  async paginate(pageSize: number, pageNumber: number): Promise<PaginationResult<T>> {
632
594
  const paginationQuery = { ...(this.queryParams || {}), limit: pageSize, offset: pageSize * (pageNumber - 1), count: true };
633
- if (this.engineFlag === 'sparql') {
634
- const sparqlQuery = await this.ctor.queryToSPARQL(this.perspective, paginationQuery);
635
- const result = await this.perspective.querySparql(sparqlQuery);
636
- const { results, totalCount } = await this.processSparqlResult(result, paginationQuery, true) as ResultsWithTotalCount<T>;
637
- return { results, totalCount, pageSize, pageNumber };
638
- } else {
639
- const prologQuery = await this.ctor.queryToProlog(this.perspective, paginationQuery, this.modelClassName);
640
- const result = await this.perspective.infer(prologQuery);
641
- const { results, totalCount } = (await this.ctor.instancesFromPrologResult(this.perspective, paginationQuery, result)) as ResultsWithTotalCount<T>;
642
- return { results, totalCount, pageSize, pageNumber };
643
- }
595
+ const { results, totalCount } = await (this.ctor as any).executeModelQuery(this.perspective, paginationQuery, this.modelClassName);
596
+ return { results, totalCount, pageSize, pageNumber };
644
597
  }
645
598
 
646
599
  /**
647
600
  * Gets a page of results using SPARQL.
648
- * Delegates to paginate() with SPARQL engine forced.
601
+ * Delegates to paginate().
649
602
  */
650
603
  async paginateSparql(pageSize: number, pageNumber: number): Promise<PaginationResult<T>> {
651
- const prev = this.engineFlag;
652
- this.engineFlag = 'sparql';
653
- try {
654
- return await this.paginate(pageSize, pageNumber);
655
- } finally {
656
- this.engineFlag = prev;
657
- }
604
+ return await this.paginate(pageSize, pageNumber);
658
605
  }
659
606
 
660
607
  /**
@@ -686,9 +633,6 @@ export class ModelQueryBuilder<T extends Ad4mModel> {
686
633
  * builder.dispose();
687
634
  * ```
688
635
  *
689
- * @remarks
690
- * By default, this uses SPARQL live queries for real-time updates.
691
- * Prolog subscriptions remain available via `.useSPARQL(false)`.
692
636
  */
693
637
  async paginateSubscribe(
694
638
  pageSize: number,
@@ -698,67 +642,75 @@ export class ModelQueryBuilder<T extends Ad4mModel> {
698
642
  // Clean up any existing subscription
699
643
  this.dispose();
700
644
 
701
- const paginationQuery = { ...(this.queryParams || {}), limit: pageSize, offset: pageSize * (pageNumber - 1), count: true };
645
+ const ctor = this.ctor;
702
646
 
703
- if (this.engineFlag === 'sparql') {
704
- // Subscribe to the FULL result set (no LIMIT/OFFSET) so the subscription
705
- // detects changes anywhere in the dataset (e.g. new items beyond current page).
706
- // Pagination is applied in JS when processing each update.
707
- const subscriptionParams = { ...(this.queryParams || {}) };
708
- delete subscriptionParams.limit;
709
- delete subscriptionParams.offset;
710
- const sparqlQuery = await this.ctor.queryToSPARQL(this.perspective, subscriptionParams);
711
- this.currentSubscription = await this.perspective.subscribeQuery(sparqlQuery);
712
-
713
- // Query for processSparqlResult has NO limit/offset — gets all results, totalCount via count:true
714
- const fullQuery = { ...(this.queryParams || {}), count: true };
715
-
716
- const processResults = async (result: any) => {
717
- const { results: allResults, totalCount } = await this.processSparqlResult(result, fullQuery, true) as ResultsWithTotalCount<T>;
718
- const start = pageSize * (pageNumber - 1);
719
- const results = allResults.slice(start, start + pageSize);
720
- callback({ results, totalCount, pageSize, pageNumber });
721
- };
722
-
723
- this.currentSubscription.onResult(processResults);
724
- const { results: allResults, totalCount } = await this.processSparqlResult(this.currentSubscription.result, fullQuery, true) as ResultsWithTotalCount<T>;
725
- const start = pageSize * (pageNumber - 1);
726
- const results = allResults.slice(start, start + pageSize);
727
- const initialPage = { results, totalCount, pageSize, pageNumber };
728
- // Initial page returned via Promise — callback for subsequent updates only
729
- return initialPage;
730
- } else {
731
- const prologQuery = await this.ctor.queryToProlog(this.perspective, paginationQuery, this.modelClassName);
732
- this.currentSubscription = await this.perspective.subscribeInfer(prologQuery);
733
-
734
- const processResults = async (r: AllInstancesResult) => {
735
- const { results, totalCount } = (await this.ctor.instancesFromPrologResult(this.perspective, this.queryParams, r)) as ResultsWithTotalCount<T>;
736
- callback({ results, totalCount, pageSize, pageNumber });
737
- };
738
-
739
- this.currentSubscription.onResult(processResults);
740
- const { results, totalCount } = (await this.ctor.instancesFromPrologResult(this.perspective, paginationQuery, this.currentSubscription.result)) as ResultsWithTotalCount<T>;
741
- const initialPrologPage = { results, totalCount, pageSize, pageNumber };
742
- // Initial page returned via Promise — callback for subsequent updates only
743
- return initialPrologPage;
744
- }
647
+ // Subscribe to the full result set (no limit/offset) so the subscription
648
+ // detects changes anywhere in the dataset. Rust builds trigger SPARQL
649
+ // from the shape predicates.
650
+ const subscriptionParams = { ...(this.queryParams || {}) };
651
+ delete subscriptionParams.limit;
652
+ delete subscriptionParams.offset;
653
+ const { className, queryJson, shapeJson } = (ctor as any).prepareModelQueryParams(
654
+ subscriptionParams, this.modelClassName
655
+ );
656
+
657
+ const { subscriptionId } = await this.perspective.modelSubscribe(
658
+ className, queryJson, shapeJson
659
+ );
660
+
661
+ // Build the paginated query for Rust endpoint (count: true fetches both results and totalCount in one call)
662
+ const paginatedQuery = {
663
+ ...(this.queryParams || {}),
664
+ limit: pageSize,
665
+ offset: pageSize * (pageNumber - 1),
666
+ count: true,
667
+ };
668
+
669
+ const processResults = async () => {
670
+ const { results, totalCount } = await (ctor as any).executeModelQuery(this.perspective, paginatedQuery, this.modelClassName);
671
+ callback({ results, totalCount, pageSize, pageNumber });
672
+ };
673
+
674
+ const unsubscribe = this.perspective.client.subscribeToQueryUpdates(
675
+ subscriptionId,
676
+ (rawResult: any) => {
677
+ if (rawResult && rawResult.isInit) return;
678
+ processResults().catch(e => console.error('Paginate subscription error:', e));
679
+ },
680
+ );
681
+
682
+ let keepaliveFailures = 0;
683
+ const keepaliveTimer = setInterval(() => {
684
+ this.perspective.client.keepAliveQuery(this.perspective.uuid, subscriptionId).then(() => {
685
+ keepaliveFailures = 0;
686
+ }).catch((e: any) => {
687
+ keepaliveFailures++;
688
+ console.warn(`Paginate subscription keepalive failed (attempt ${keepaliveFailures}) for ${subscriptionId}:`, e);
689
+ });
690
+ }, 30000);
691
+
692
+ this.currentSubscription = {
693
+ dispose: () => {
694
+ clearInterval(keepaliveTimer);
695
+ unsubscribe();
696
+ this.perspective.client.disposeQuerySubscription(this.perspective.uuid, subscriptionId).catch(() => {});
697
+ },
698
+ };
699
+
700
+ // Initial fetch (single call with count: true)
701
+ const { results, totalCount } = await (ctor as any).executeModelQuery(this.perspective, paginatedQuery, this.modelClassName);
702
+ return { results, totalCount, pageSize, pageNumber };
745
703
  }
746
704
 
747
705
  /**
748
706
  * Subscribes to paginated results updates using SPARQL.
749
- * Delegates to paginateSubscribe() with SPARQL engine forced.
707
+ * Delegates to paginateSubscribe().
750
708
  */
751
709
  async paginateSubscribeSparql(
752
710
  pageSize: number,
753
711
  pageNumber: number,
754
712
  callback: (results: PaginationResult<T>) => void
755
713
  ): Promise<PaginationResult<T>> {
756
- const prev = this.engineFlag;
757
- this.engineFlag = 'sparql';
758
- try {
759
- return await this.paginateSubscribe(pageSize, pageNumber, callback);
760
- } finally {
761
- this.engineFlag = prev;
762
- }
714
+ return await this.paginateSubscribe(pageSize, pageNumber, callback);
763
715
  }
764
716
  }
@@ -279,6 +279,26 @@ export interface PropertyOptions {
279
279
  * The function takes the raw value as input and returns the transformed value.
280
280
  */
281
281
  transform?: (value: any) => any;
282
+
283
+ /**
284
+ * Allowed values for this property (enum constraint).
285
+ * Maps to SHACL `sh:in`. Each entry has a `value` (the stored RDF term)
286
+ * and an optional `label` (human-readable display name).
287
+ *
288
+ * @example
289
+ * ```typescript
290
+ * @Property({
291
+ * through: "task://status",
292
+ * options: [
293
+ * { value: "task://todo", label: "To Do" },
294
+ * { value: "task://doing", label: "Doing" },
295
+ * { value: "task://done", label: "Done" },
296
+ * ]
297
+ * })
298
+ * status: string = "task://todo";
299
+ * ```
300
+ */
301
+ options?: Array<{ value: string; label?: string }>;
282
302
  }
283
303
 
284
304
 
@@ -838,8 +858,17 @@ export function HasMany(
838
858
  first: (() => Ad4mModelLike) | RelationOptions,
839
859
  second?: Omit<RelationOptions, 'target'>,
840
860
  ): PropertyDecorator {
861
+ const explicitThrough = typeof first === 'function' ? second?.through : (first as RelationOptions).through;
841
862
  const opts = resolveRelationArgs(first, second);
842
863
  return function <T>(target: T, key: keyof T) {
864
+ if (!explicitThrough && !opts.getter) {
865
+ const className = ((target as any).constructor?.name) ?? 'unknown';
866
+ console.warn(
867
+ `@HasMany on ${className}.${String(key)} has no 'through' predicate — defaulting to 'ad4m://has_child'. ` +
868
+ `Add { through: 'ad4m://has_child' } to silence this warning, or use a semantic predicate ` +
869
+ `like { through: 'myns://has_${String(key)}' } for efficient targeted queries.`
870
+ );
871
+ }
843
872
  // --- relation registry ---
844
873
  const ctor = (target as any).constructor;
845
874
  if (!relationRegistry.has(ctor)) relationRegistry.set(ctor, {});