@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.
- package/README.md +2 -25
- package/jest-setup.ts +1 -1
- package/lib/index.cjs +8677 -15318
- package/lib/index.js +14507 -21223
- package/lib/src/Ad4mClient.d.ts +9 -3
- package/lib/src/Ad4mClient.js +40 -13
- package/lib/src/Literal.js +6 -5
- package/lib/src/agent/Agent.js +26 -272
- package/lib/src/agent/AgentClient.d.ts +33 -21
- package/lib/src/agent/AgentClient.js +180 -374
- package/lib/src/agent/AgentStatus.js +2 -37
- package/lib/src/ai/AIClient.d.ts +12 -4
- package/lib/src/ai/AIClient.js +81 -285
- package/lib/src/ai/AITypes.d.ts +55 -0
- package/lib/src/ai/AITypes.js +18 -0
- package/lib/src/ai/Tasks.js +10 -133
- package/lib/src/apiClient.d.ts +53 -0
- package/lib/src/apiClient.js +234 -0
- package/lib/src/cache/PersistentCache.d.ts +40 -0
- package/lib/src/cache/PersistentCache.js +139 -0
- package/lib/src/expression/Expression.d.ts +1 -1
- package/lib/src/expression/Expression.js +13 -122
- package/lib/src/expression/ExpressionClient.d.ts +11 -3
- package/lib/src/expression/ExpressionClient.js +120 -75
- package/lib/src/expression/ExpressionRef.js +4 -27
- package/lib/src/generated/api/AIModelLoadingStatus.d.ts +7 -0
- package/lib/src/generated/api/AIModelLoadingStatus.js +2 -0
- package/lib/src/generated/api/AddLinkExpressionRequest.d.ts +6 -0
- package/lib/src/generated/api/AddLinkExpressionRequest.js +1 -0
- package/lib/src/generated/api/AddLinkRequest.d.ts +6 -0
- package/lib/src/generated/api/AddLinkRequest.js +1 -0
- package/lib/src/generated/api/AddLinksBulkRequest.d.ts +6 -0
- package/lib/src/generated/api/AddLinksBulkRequest.js +1 -0
- package/lib/src/generated/api/AddSdnaRequest.d.ts +6 -0
- package/lib/src/generated/api/AddSdnaRequest.js +2 -0
- package/lib/src/generated/api/ApplyTemplateRequest.d.ts +4 -0
- package/lib/src/generated/api/ApplyTemplateRequest.js +2 -0
- package/lib/src/generated/api/AuthInfoInput.d.ts +10 -0
- package/lib/src/generated/api/AuthInfoInput.js +1 -0
- package/lib/src/generated/api/CapabilityInput.d.ts +5 -0
- package/lib/src/generated/api/CapabilityInput.js +1 -0
- package/lib/src/generated/api/CommitBatchRequest.d.ts +3 -0
- package/lib/src/generated/api/CommitBatchRequest.js +2 -0
- package/lib/src/generated/api/ComputeLogEntry.d.ts +9 -0
- package/lib/src/generated/api/ComputeLogEntry.js +2 -0
- package/lib/src/generated/api/CreateExpressionRequest.d.ts +4 -0
- package/lib/src/generated/api/CreateExpressionRequest.js +2 -0
- package/lib/src/generated/api/CreatePerspectiveRequest.d.ts +3 -0
- package/lib/src/generated/api/CreatePerspectiveRequest.js +2 -0
- package/lib/src/generated/api/CreateSubjectRequest.d.ts +6 -0
- package/lib/src/generated/api/CreateSubjectRequest.js +2 -0
- package/lib/src/generated/api/EmbedRequest.d.ts +4 -0
- package/lib/src/generated/api/EmbedRequest.js +2 -0
- package/lib/src/generated/api/EntanglementProofInput.d.ts +6 -0
- package/lib/src/generated/api/EntanglementProofInput.js +2 -0
- package/lib/src/generated/api/ExecuteCommandsRequest.d.ts +4 -0
- package/lib/src/generated/api/ExecuteCommandsRequest.js +2 -0
- package/lib/src/generated/api/ExportRequest.d.ts +5 -0
- package/lib/src/generated/api/ExportRequest.js +2 -0
- package/lib/src/generated/api/ExpressionManyRequest.d.ts +3 -0
- package/lib/src/generated/api/ExpressionManyRequest.js +2 -0
- package/lib/src/generated/api/ExpressionProof.d.ts +4 -0
- package/lib/src/generated/api/ExpressionProof.js +2 -0
- package/lib/src/generated/api/ExpressionProofInput.d.ts +6 -0
- package/lib/src/generated/api/ExpressionProofInput.js +2 -0
- package/lib/src/generated/api/FriendSendMessageRequest.d.ts +3 -0
- package/lib/src/generated/api/FriendSendMessageRequest.js +2 -0
- package/lib/src/generated/api/FriendsListRequest.d.ts +3 -0
- package/lib/src/generated/api/FriendsListRequest.js +2 -0
- package/lib/src/generated/api/GenerateAgentRequest.d.ts +3 -0
- package/lib/src/generated/api/GenerateAgentRequest.js +2 -0
- package/lib/src/generated/api/GenerateJwtRequest.d.ts +4 -0
- package/lib/src/generated/api/GenerateJwtRequest.js +2 -0
- package/lib/src/generated/api/GetSubjectDataRequest.d.ts +4 -0
- package/lib/src/generated/api/GetSubjectDataRequest.js +2 -0
- package/lib/src/generated/api/ImportAgentRequest.d.ts +6 -0
- package/lib/src/generated/api/ImportAgentRequest.js +2 -0
- package/lib/src/generated/api/ImportRequest.d.ts +4 -0
- package/lib/src/generated/api/ImportRequest.js +2 -0
- package/lib/src/generated/api/JoinNeighbourhoodRequest.d.ts +3 -0
- package/lib/src/generated/api/JoinNeighbourhoodRequest.js +2 -0
- package/lib/src/generated/api/LanguageMetaInput.d.ts +6 -0
- package/lib/src/generated/api/LanguageMetaInput.js +2 -0
- package/lib/src/generated/api/Link.d.ts +5 -0
- package/lib/src/generated/api/Link.js +2 -0
- package/lib/src/generated/api/LinkExpression.d.ts +10 -0
- package/lib/src/generated/api/LinkExpression.js +1 -0
- package/lib/src/generated/api/LinkExpressionInput.d.ts +10 -0
- package/lib/src/generated/api/LinkExpressionInput.js +1 -0
- package/lib/src/generated/api/LinkInput.d.ts +5 -0
- package/lib/src/generated/api/LinkInput.js +2 -0
- package/lib/src/generated/api/LinkLanguageTemplatesRequest.d.ts +3 -0
- package/lib/src/generated/api/LinkLanguageTemplatesRequest.js +2 -0
- package/lib/src/generated/api/LinkMutations.d.ts +6 -0
- package/lib/src/generated/api/LinkMutations.js +1 -0
- package/lib/src/generated/api/LinkStatus.d.ts +1 -0
- package/lib/src/generated/api/LinkStatus.js +2 -0
- package/lib/src/generated/api/LockAgentRequest.d.ts +3 -0
- package/lib/src/generated/api/LockAgentRequest.js +2 -0
- package/lib/src/generated/api/ModelType.d.ts +1 -0
- package/lib/src/generated/api/ModelType.js +2 -0
- package/lib/src/generated/api/NotificationInput.d.ts +10 -0
- package/lib/src/generated/api/NotificationInput.js +2 -0
- package/lib/src/generated/api/OpenLinkRequest.d.ts +3 -0
- package/lib/src/generated/api/OpenLinkRequest.js +2 -0
- package/lib/src/generated/api/PermitCapabilityRequest.d.ts +3 -0
- package/lib/src/generated/api/PermitCapabilityRequest.js +2 -0
- package/lib/src/generated/api/PerspectiveInput.d.ts +4 -0
- package/lib/src/generated/api/PerspectiveInput.js +1 -0
- package/lib/src/generated/api/PromptRequest.d.ts +4 -0
- package/lib/src/generated/api/PromptRequest.js +2 -0
- package/lib/src/generated/api/PublishLanguageRequest.d.ts +5 -0
- package/lib/src/generated/api/PublishLanguageRequest.js +1 -0
- package/lib/src/generated/api/PublishNeighbourhoodRequest.d.ts +6 -0
- package/lib/src/generated/api/PublishNeighbourhoodRequest.js +1 -0
- package/lib/src/generated/api/QueryRequest.d.ts +7 -0
- package/lib/src/generated/api/QueryRequest.js +2 -0
- package/lib/src/generated/api/RemoveLinkRequest.d.ts +5 -0
- package/lib/src/generated/api/RemoveLinkRequest.js +1 -0
- package/lib/src/generated/api/RemoveLinksBulkRequest.d.ts +5 -0
- package/lib/src/generated/api/RemoveLinksBulkRequest.js +1 -0
- package/lib/src/generated/api/ResourceInput.d.ts +4 -0
- package/lib/src/generated/api/ResourceInput.js +2 -0
- package/lib/src/generated/api/SetDefaultModelRequest.d.ts +4 -0
- package/lib/src/generated/api/SetDefaultModelRequest.js +1 -0
- package/lib/src/generated/api/SetFreeHostingEnabledRequest.d.ts +3 -0
- package/lib/src/generated/api/SetFreeHostingEnabledRequest.js +2 -0
- package/lib/src/generated/api/SetMultiUserRequest.d.ts +3 -0
- package/lib/src/generated/api/SetMultiUserRequest.js +2 -0
- package/lib/src/generated/api/SetStatusRequest.d.ts +3 -0
- package/lib/src/generated/api/SetStatusRequest.js +2 -0
- package/lib/src/generated/api/SignMessageRequest.d.ts +3 -0
- package/lib/src/generated/api/SignMessageRequest.js +2 -0
- package/lib/src/generated/api/TrustedAgentsRequest.d.ts +3 -0
- package/lib/src/generated/api/TrustedAgentsRequest.js +2 -0
- package/lib/src/generated/api/UnlockAgentRequest.d.ts +4 -0
- package/lib/src/generated/api/UnlockAgentRequest.js +2 -0
- package/lib/src/generated/api/UpdateLinkRequest.d.ts +7 -0
- package/lib/src/generated/api/UpdateLinkRequest.js +1 -0
- package/lib/src/generated/api/UpdatePerspectiveRequest.d.ts +3 -0
- package/lib/src/generated/api/UpdatePerspectiveRequest.js +2 -0
- package/lib/src/generated/api/UserStatistics.d.ts +9 -0
- package/lib/src/generated/api/UserStatistics.js +2 -0
- package/lib/src/generated/api/VerificationRequestResult.d.ts +6 -0
- package/lib/src/generated/api/VerificationRequestResult.js +2 -0
- package/lib/src/generated/api/VerifySignatureRequest.d.ts +5 -0
- package/lib/src/generated/api/VerifySignatureRequest.js +2 -0
- package/lib/src/generated/api/WriteSettingsRequest.d.ts +3 -0
- package/lib/src/generated/api/WriteSettingsRequest.js +2 -0
- package/lib/src/generated/api/index.d.ts +42 -0
- package/lib/src/generated/api/index.js +7 -0
- package/lib/src/index.d.ts +8 -2
- package/lib/src/index.js +8 -2
- package/lib/src/jestSetup.d.ts +0 -1
- package/lib/src/jestSetup.js +1 -1
- package/lib/src/language/Icon.js +2 -21
- package/lib/src/language/Language.d.ts +26 -176
- package/lib/src/language/Language.js +32 -72
- package/lib/src/language/LanguageClient.d.ts +2 -2
- package/lib/src/language/LanguageClient.js +15 -105
- package/lib/src/language/LanguageHandle.js +2 -41
- package/lib/src/language/LanguageMeta.js +4 -75
- package/lib/src/language/LanguageRef.js +2 -25
- package/lib/src/links/Links.js +14 -111
- package/lib/src/model/Ad4mModel.d.ts +143 -63
- package/lib/src/model/Ad4mModel.js +583 -425
- package/lib/src/model/Ad4mModel.test.js +1434 -688
- package/lib/src/model/ModelQueryBuilder.d.ts +61 -45
- package/lib/src/model/ModelQueryBuilder.js +315 -157
- package/lib/src/model/Subject.js +6 -6
- package/lib/src/model/decorators.d.ts +36 -8
- package/lib/src/model/decorators.js +41 -14
- package/lib/src/model/hydration-batch.d.ts +34 -0
- package/lib/src/model/hydration-batch.js +147 -0
- package/lib/src/model/hydration-batching.test.d.ts +7 -0
- package/lib/src/model/hydration-batching.test.js +456 -0
- package/lib/src/model/hydration.d.ts +3 -92
- package/lib/src/model/hydration.js +3 -691
- package/lib/src/model/index.d.ts +3 -4
- package/lib/src/model/index.js +3 -4
- package/lib/src/model/json-schema.js +2 -2
- package/lib/src/model/model-manifest.d.ts +41 -0
- package/lib/src/model/model-manifest.js +11 -0
- package/lib/src/model/query-cache.d.ts +30 -0
- package/lib/src/model/query-cache.js +66 -0
- package/lib/src/model/query-cache.test.d.ts +1 -0
- package/lib/src/model/query-cache.test.js +43 -0
- package/lib/src/model/query-common.d.ts +1 -1
- package/lib/src/model/query-common.js +1 -1
- package/lib/src/model/query-sparql-batch.d.ts +17 -0
- package/lib/src/model/query-sparql-batch.js +260 -0
- package/lib/src/model/query-sparql.d.ts +51 -0
- package/lib/src/model/query-sparql.js +466 -0
- package/lib/src/model/query-sparql.test.d.ts +1 -0
- package/lib/src/model/query-sparql.test.js +312 -0
- package/lib/src/model/{surreal-utils.d.ts → query-utils.d.ts} +13 -9
- package/lib/src/model/query-utils.js +189 -0
- package/lib/src/model/relation-filtering.test.js +15 -15
- package/lib/src/model/sdna.js +1 -1
- package/lib/src/model/shacl-gen.js +154 -57
- package/lib/src/model/subscription-delta.test.d.ts +24 -0
- package/lib/src/model/subscription-delta.test.js +180 -0
- package/lib/src/model/subscription-pool.d.ts +39 -0
- package/lib/src/model/subscription-pool.js +165 -0
- package/lib/src/model/types.d.ts +195 -5
- package/lib/src/model/types.js +5 -2
- package/lib/src/neighbourhood/Neighbourhood.js +4 -32
- package/lib/src/neighbourhood/NeighbourhoodClient.d.ts +3 -3
- package/lib/src/neighbourhood/NeighbourhoodClient.js +40 -203
- package/lib/src/perspectives/LinkQuery.js +2 -42
- package/lib/src/perspectives/Perspective.d.ts +1 -1
- package/lib/src/perspectives/Perspective.js +10 -52
- package/lib/src/perspectives/PerspectiveClient.d.ts +22 -32
- package/lib/src/perspectives/PerspectiveClient.js +188 -454
- package/lib/src/perspectives/PerspectiveClient.test.d.ts +1 -0
- package/lib/src/perspectives/PerspectiveClient.test.js +224 -0
- package/lib/src/perspectives/PerspectiveDiff.js +4 -31
- package/lib/src/perspectives/PerspectiveHandle.js +3 -43
- package/lib/src/perspectives/PerspectiveProxy.d.ts +157 -78
- package/lib/src/perspectives/PerspectiveProxy.js +475 -389
- package/lib/src/perspectives/PerspectiveResolver.d.ts +0 -1
- package/lib/src/perspectives/PerspectiveResolver.js +0 -11
- package/lib/src/perspectives/SparqlBindings.d.ts +47 -0
- package/lib/src/perspectives/SparqlBindings.js +65 -0
- package/lib/src/perspectives/WakerSubscriptionManager.d.ts +3 -3
- package/lib/src/perspectives/WakerSubscriptionManager.js +12 -12
- package/lib/src/runtime/RuntimeClient.d.ts +8 -6
- package/lib/src/runtime/RuntimeClient.js +97 -454
- package/lib/src/runtime/RuntimeResolver.d.ts +14 -0
- package/lib/src/runtime/RuntimeResolver.js +84 -0
- package/lib/src/runtime/RuntimeTypes.d.ts +101 -0
- package/lib/src/runtime/RuntimeTypes.js +45 -0
- package/lib/src/schema.gql +14 -1
- package/lib/src/shacl/SHACLFlow.d.ts +1 -1
- package/lib/src/shacl/SHACLFlow.js +9 -9
- package/lib/src/shacl/SHACLShape.d.ts +26 -1
- package/lib/src/shacl/SHACLShape.js +140 -38
- package/lib/src/shacl/SHACLShape.test.js +82 -0
- package/lib/src/typeDefs.js +3 -615
- package/lib/src/utils.d.ts +6 -6
- package/lib/src/utils.js +6 -6
- package/package.json +9 -24
- package/rollup.config.js +0 -7
- package/src/Ad4mClient.test.ts +1192 -1288
- package/src/Ad4mClient.ts +46 -15
- package/src/Literal.test.ts +10 -5
- package/src/Literal.ts +6 -5
- package/src/agent/Agent.ts +0 -99
- package/src/agent/AgentClient.ts +238 -467
- package/src/agent/AgentStatus.ts +0 -12
- package/src/ai/AIClient.ts +96 -296
- package/src/ai/AITypes.ts +66 -0
- package/src/ai/Tasks.ts +0 -52
- package/src/apiClient.ts +287 -0
- package/src/cache/PersistentCache.ts +145 -0
- package/src/cache/cache.test.ts +713 -0
- package/src/expression/Expression.ts +3 -43
- package/src/expression/ExpressionClient.ts +148 -77
- package/src/expression/ExpressionRef.ts +2 -8
- package/src/generated/api/AIModelLoadingStatus.ts +3 -0
- package/src/generated/api/AddLinkExpressionRequest.ts +4 -0
- package/src/generated/api/AddLinkRequest.ts +4 -0
- package/src/generated/api/AddLinksBulkRequest.ts +4 -0
- package/src/generated/api/AddSdnaRequest.ts +3 -0
- package/src/generated/api/ApplyTemplateRequest.ts +3 -0
- package/src/generated/api/AuthInfoInput.ts +4 -0
- package/src/generated/api/CapabilityInput.ts +4 -0
- package/src/generated/api/CommitBatchRequest.ts +3 -0
- package/src/generated/api/ComputeLogEntry.ts +3 -0
- package/src/generated/api/CreateExpressionRequest.ts +3 -0
- package/src/generated/api/CreatePerspectiveRequest.ts +3 -0
- package/src/generated/api/CreateSubjectRequest.ts +3 -0
- package/src/generated/api/EmbedRequest.ts +3 -0
- package/src/generated/api/EntanglementProofInput.ts +3 -0
- package/src/generated/api/ExecuteCommandsRequest.ts +3 -0
- package/src/generated/api/ExportRequest.ts +3 -0
- package/src/generated/api/ExpressionManyRequest.ts +3 -0
- package/src/generated/api/ExpressionProof.ts +3 -0
- package/src/generated/api/ExpressionProofInput.ts +3 -0
- package/src/generated/api/FriendSendMessageRequest.ts +3 -0
- package/src/generated/api/FriendsListRequest.ts +3 -0
- package/src/generated/api/GenerateAgentRequest.ts +3 -0
- package/src/generated/api/GenerateJwtRequest.ts +3 -0
- package/src/generated/api/GetSubjectDataRequest.ts +3 -0
- package/src/generated/api/ImportAgentRequest.ts +3 -0
- package/src/generated/api/ImportRequest.ts +3 -0
- package/src/generated/api/JoinNeighbourhoodRequest.ts +3 -0
- package/src/generated/api/LanguageMetaInput.ts +3 -0
- package/src/generated/api/Link.ts +3 -0
- package/src/generated/api/LinkExpression.ts +6 -0
- package/src/generated/api/LinkExpressionInput.ts +6 -0
- package/src/generated/api/LinkInput.ts +3 -0
- package/src/generated/api/LinkLanguageTemplatesRequest.ts +3 -0
- package/src/generated/api/LinkMutations.ts +5 -0
- package/src/generated/api/LinkStatus.ts +3 -0
- package/src/generated/api/LockAgentRequest.ts +3 -0
- package/src/generated/api/ModelType.ts +3 -0
- package/src/generated/api/NotificationInput.ts +3 -0
- package/src/generated/api/OpenLinkRequest.ts +3 -0
- package/src/generated/api/PermitCapabilityRequest.ts +3 -0
- package/src/generated/api/PerspectiveInput.ts +4 -0
- package/src/generated/api/PromptRequest.ts +3 -0
- package/src/generated/api/PublishLanguageRequest.ts +4 -0
- package/src/generated/api/PublishNeighbourhoodRequest.ts +4 -0
- package/src/generated/api/QueryRequest.ts +6 -0
- package/src/generated/api/RemoveLinkRequest.ts +4 -0
- package/src/generated/api/RemoveLinksBulkRequest.ts +4 -0
- package/src/generated/api/ResourceInput.ts +3 -0
- package/src/generated/api/SetDefaultModelRequest.ts +4 -0
- package/src/generated/api/SetFreeHostingEnabledRequest.ts +3 -0
- package/src/generated/api/SetMultiUserRequest.ts +3 -0
- package/src/generated/api/SetStatusRequest.ts +3 -0
- package/src/generated/api/SignMessageRequest.ts +3 -0
- package/src/generated/api/TrustedAgentsRequest.ts +3 -0
- package/src/generated/api/UnlockAgentRequest.ts +3 -0
- package/src/generated/api/UpdateLinkRequest.ts +5 -0
- package/src/generated/api/UpdatePerspectiveRequest.ts +3 -0
- package/src/generated/api/UserStatistics.ts +3 -0
- package/src/generated/api/VerificationRequestResult.ts +3 -0
- package/src/generated/api/VerifySignatureRequest.ts +3 -0
- package/src/generated/api/WriteSettingsRequest.ts +3 -0
- package/src/generated/api/index.ts +49 -0
- package/src/index.ts +8 -2
- package/src/jestSetup.ts +1 -1
- package/src/language/Icon.ts +0 -4
- package/src/language/Language.ts +51 -248
- package/src/language/LanguageClient.ts +21 -132
- package/src/language/LanguageHandle.ts +0 -14
- package/src/language/LanguageMeta.ts +0 -29
- package/src/language/LanguageRef.ts +0 -7
- package/src/links/Links.ts +0 -37
- package/src/model/Ad4mModel.test.ts +1664 -792
- package/src/model/Ad4mModel.ts +664 -499
- package/src/model/ModelQueryBuilder.ts +362 -183
- package/src/model/decorators.ts +71 -22
- package/src/model/hydration.ts +3 -772
- package/src/model/index.ts +3 -4
- package/src/model/json-schema.ts +2 -2
- package/src/model/query-cache.test.ts +54 -0
- package/src/model/query-cache.ts +79 -0
- package/src/model/query-common.ts +1 -1
- package/src/model/query-sparql.test.ts +376 -0
- package/src/model/query-sparql.ts +504 -0
- package/src/model/query-utils.ts +209 -0
- package/src/model/relation-filtering.test.ts +60 -53
- package/src/model/sdna.ts +1 -1
- package/src/model/shacl-gen.ts +163 -64
- package/src/model/shacl-roundtrip.test.ts +197 -0
- package/src/model/types-typed-query.test.ts +360 -0
- package/src/model/types.ts +256 -5
- package/src/neighbourhood/Neighbourhood.ts +0 -9
- package/src/neighbourhood/NeighbourhoodClient.ts +42 -207
- package/src/neighbourhood/NeighbourhoodProxy.test.ts +34 -36
- package/src/perspectives/LinkQuery.ts +0 -15
- package/src/perspectives/Perspective.ts +1 -12
- package/src/perspectives/PerspectiveClient.test.ts +262 -0
- package/src/perspectives/PerspectiveClient.ts +252 -468
- package/src/perspectives/PerspectiveDiff.ts +0 -8
- package/src/perspectives/PerspectiveHandle.ts +1 -12
- package/src/perspectives/PerspectiveProxy.test.ts +125 -0
- package/src/perspectives/PerspectiveProxy.ts +522 -434
- package/src/perspectives/SparqlBindings.ts +79 -0
- package/src/perspectives/WakerSubscriptionManager.ts +13 -13
- package/src/runtime/RuntimeClient.ts +118 -461
- package/src/runtime/RuntimeTypes.ts +144 -0
- package/src/shacl/SHACLFlow.ts +9 -9
- package/src/shacl/SHACLShape.test.ts +204 -0
- package/src/shacl/SHACLShape.ts +191 -39
- package/src/typeDefs.ts +3 -5
- package/src/utils.ts +6 -6
- package/tsconfig.json +3 -7
- package/lib/src/model/query-surreal.d.ts +0 -44
- package/lib/src/model/query-surreal.js +0 -249
- package/lib/src/model/surreal-utils.js +0 -128
- package/shims/reflect-metadata.ts +0 -0
- package/shims/type-graphql.ts +0 -75
- package/src/PubSub.ts +0 -17
- package/src/agent/AgentResolver.ts +0 -263
- package/src/ai/AIResolver.ts +0 -372
- package/src/buildSchema.ts +0 -43
- package/src/expression/ExpressionResolver.ts +0 -64
- package/src/language/LanguageContext.ts +0 -37
- package/src/language/LanguageResolver.ts +0 -98
- package/src/model/Subject.ts +0 -159
- package/src/model/prolog-facts.ts +0 -145
- package/src/model/query-prolog.ts +0 -148
- package/src/model/query-surreal.ts +0 -280
- package/src/model/surreal-utils.ts +0 -147
- package/src/neighbourhood/NeighbourhoodResolver.ts +0 -100
- package/src/perspectives/PerspectiveResolver.ts +0 -372
- package/src/runtime/RuntimeResolver.ts +0 -691
- package/src/unwrapApolloResult.ts +0 -16
- package/tsconfig-browser.json +0 -82
|
@@ -28,7 +28,6 @@ export class ModelQueryBuilder {
|
|
|
28
28
|
constructor(perspective, ctor, query) {
|
|
29
29
|
this.queryParams = {};
|
|
30
30
|
this.modelClassName = null;
|
|
31
|
-
this.useSurrealDBFlag = true;
|
|
32
31
|
this.perspective = perspective;
|
|
33
32
|
this.ctor = ctor;
|
|
34
33
|
if (query)
|
|
@@ -39,7 +38,7 @@ export class ModelQueryBuilder {
|
|
|
39
38
|
*
|
|
40
39
|
* This method:
|
|
41
40
|
* 1. Stops the keepalive signals to the subscription
|
|
42
|
-
* 2. Unsubscribes from
|
|
41
|
+
* 2. Unsubscribes from subscription updates
|
|
43
42
|
* 3. Notifies the backend to clean up subscription resources
|
|
44
43
|
* 4. Clears the subscription reference
|
|
45
44
|
*
|
|
@@ -201,6 +200,28 @@ export class ModelQueryBuilder {
|
|
|
201
200
|
this.queryParams.properties = properties;
|
|
202
201
|
return this;
|
|
203
202
|
}
|
|
203
|
+
/**
|
|
204
|
+
* Controls whether SPARQL property getters are evaluated during hydration.
|
|
205
|
+
*
|
|
206
|
+
* By default, collection queries evaluate property getters (deepQuery=true).
|
|
207
|
+
* Call `.deepQuery(false)` to skip getter evaluation for performance.
|
|
208
|
+
*
|
|
209
|
+
* @param enabled - Whether to evaluate property getters (default: true)
|
|
210
|
+
* @returns The query builder for chaining
|
|
211
|
+
*
|
|
212
|
+
* @example
|
|
213
|
+
* ```typescript
|
|
214
|
+
* const messages = await Message.query(perspective)
|
|
215
|
+
* .parent(channel)
|
|
216
|
+
* .deepQuery(false) // skip property getters for performance
|
|
217
|
+
* .limit(30)
|
|
218
|
+
* .get();
|
|
219
|
+
* ```
|
|
220
|
+
*/
|
|
221
|
+
deepQuery(enabled = true) {
|
|
222
|
+
this.queryParams.deepQuery = enabled;
|
|
223
|
+
return this;
|
|
224
|
+
}
|
|
204
225
|
/**
|
|
205
226
|
* Specifies which relations to eager-load (hydrate into model instances).
|
|
206
227
|
*
|
|
@@ -235,35 +256,6 @@ export class ModelQueryBuilder {
|
|
|
235
256
|
this.modelClassName = className;
|
|
236
257
|
return this;
|
|
237
258
|
}
|
|
238
|
-
/**
|
|
239
|
-
* Enables or disables SurrealDB query path.
|
|
240
|
-
*
|
|
241
|
-
* @param enabled - Whether to use SurrealDB (default: true, 10-100x faster) or Prolog (legacy)
|
|
242
|
-
* @returns The query builder for chaining
|
|
243
|
-
*
|
|
244
|
-
* @example
|
|
245
|
-
* ```typescript
|
|
246
|
-
* // Use SurrealDB (default)
|
|
247
|
-
* const recipes = await Recipe.query(perspective)
|
|
248
|
-
* .where({ category: "Dessert" })
|
|
249
|
-
* .useSurrealDB(true)
|
|
250
|
-
* .get();
|
|
251
|
-
*
|
|
252
|
-
* // Use Prolog (legacy)
|
|
253
|
-
* const recipesProlog = await Recipe.query(perspective)
|
|
254
|
-
* .where({ category: "Dessert" })
|
|
255
|
-
* .useSurrealDB(false)
|
|
256
|
-
* .get();
|
|
257
|
-
* ```
|
|
258
|
-
*
|
|
259
|
-
* @remarks
|
|
260
|
-
* Note: Subscriptions (subscribe(), countSubscribe(), paginateSubscribe()) default to SurrealDB live queries
|
|
261
|
-
* if useSurrealDB(true) is set (default).
|
|
262
|
-
*/
|
|
263
|
-
useSurrealDB(enabled = true) {
|
|
264
|
-
this.useSurrealDBFlag = enabled;
|
|
265
|
-
return this;
|
|
266
|
-
}
|
|
267
259
|
/**
|
|
268
260
|
* Executes the query once and returns the results.
|
|
269
261
|
*
|
|
@@ -277,17 +269,19 @@ export class ModelQueryBuilder {
|
|
|
277
269
|
* ```
|
|
278
270
|
*/
|
|
279
271
|
async get() {
|
|
280
|
-
|
|
281
|
-
|
|
282
|
-
|
|
283
|
-
|
|
284
|
-
|
|
285
|
-
|
|
286
|
-
|
|
287
|
-
|
|
288
|
-
|
|
289
|
-
|
|
290
|
-
|
|
272
|
+
return await this.executeSparqlQuery();
|
|
273
|
+
}
|
|
274
|
+
/**
|
|
275
|
+
* Executes the query once using SPARQL and returns the results.
|
|
276
|
+
*/
|
|
277
|
+
async getSparql() {
|
|
278
|
+
return this.executeSparqlQuery();
|
|
279
|
+
}
|
|
280
|
+
/**
|
|
281
|
+
* Shared query execution logic — routes through the executor-side modelQuery endpoint.
|
|
282
|
+
*/
|
|
283
|
+
async executeSparqlQuery() {
|
|
284
|
+
const { results } = await this.ctor.executeModelQuery(this.perspective, this.queryParams, this.modelClassName);
|
|
291
285
|
return results;
|
|
292
286
|
}
|
|
293
287
|
/**
|
|
@@ -305,15 +299,17 @@ export class ModelQueryBuilder {
|
|
|
305
299
|
* ```
|
|
306
300
|
*/
|
|
307
301
|
async first() {
|
|
302
|
+
const savedLimit = this.queryParams.limit;
|
|
308
303
|
this.queryParams.limit = 1;
|
|
309
304
|
const results = await this.get();
|
|
305
|
+
this.queryParams.limit = savedLimit;
|
|
310
306
|
return results[0] ?? null;
|
|
311
307
|
}
|
|
312
308
|
/**
|
|
313
309
|
* Subscribes to the query and receives updates when results change.
|
|
314
310
|
*
|
|
315
311
|
* This method:
|
|
316
|
-
* 1. Creates and initializes a
|
|
312
|
+
* 1. Creates and initializes a SPARQL live query subscription (default)
|
|
317
313
|
* 2. Sets up the callback to process future updates
|
|
318
314
|
* 3. Returns the initial results immediately
|
|
319
315
|
*
|
|
@@ -336,41 +332,120 @@ export class ModelQueryBuilder {
|
|
|
336
332
|
* builder.dispose();
|
|
337
333
|
* ```
|
|
338
334
|
*
|
|
339
|
-
* @remarks
|
|
340
|
-
* By default, this uses SurrealDB live queries for real-time updates.
|
|
341
|
-
* Prolog subscriptions remain available via `.useSurrealDB(false)`.
|
|
342
335
|
*/
|
|
343
336
|
async subscribe(callback) {
|
|
344
337
|
// Clean up any existing subscription
|
|
345
338
|
this.dispose();
|
|
346
339
|
const ctor = this.ctor;
|
|
347
|
-
|
|
348
|
-
|
|
349
|
-
|
|
350
|
-
|
|
351
|
-
|
|
352
|
-
|
|
353
|
-
|
|
354
|
-
|
|
355
|
-
|
|
356
|
-
|
|
357
|
-
|
|
358
|
-
|
|
359
|
-
|
|
360
|
-
|
|
361
|
-
|
|
362
|
-
|
|
363
|
-
|
|
364
|
-
|
|
365
|
-
|
|
366
|
-
|
|
367
|
-
|
|
368
|
-
|
|
369
|
-
|
|
370
|
-
|
|
371
|
-
|
|
372
|
-
|
|
340
|
+
// Build the model query params (className, queryJson). The executor
|
|
341
|
+
// resolves the shape from the perspective's SHACL triples.
|
|
342
|
+
const { className, queryJson } = ctor.prepareModelQueryParams(this.queryParams, this.modelClassName);
|
|
343
|
+
// Register model subscription via Rust — this builds trigger SPARQL internally,
|
|
344
|
+
// registers the subscription, and runs the initial query in one call.
|
|
345
|
+
const { subscriptionId, result: initialModelResult } = await this.perspective.modelSubscribe(className, queryJson);
|
|
346
|
+
// Convert JSON instances to model class instances
|
|
347
|
+
const parseResults = (raw) => {
|
|
348
|
+
return ctor.parseModelResult(this.perspective, raw, this.queryParams.include, this.queryParams.properties);
|
|
349
|
+
};
|
|
350
|
+
// Resolve non-literal (file-language) properties — handles both raw URI strings
|
|
351
|
+
// and already-resolved FileData objects returned by the Rust executor.
|
|
352
|
+
const resolveAndReturn = async (instances) => {
|
|
353
|
+
await ctor.resolveNonLiteralProps(this.perspective, instances);
|
|
354
|
+
return instances;
|
|
355
|
+
};
|
|
356
|
+
// Parse initial results (with non-literal resolution)
|
|
357
|
+
const initialResults = await resolveAndReturn(parseResults(initialModelResult));
|
|
358
|
+
// Track last emitted result fingerprint to suppress duplicate callbacks
|
|
359
|
+
let lastResultFingerprint = null;
|
|
360
|
+
const buildFingerprint = (results) => {
|
|
361
|
+
if (results.length === 0)
|
|
362
|
+
return '0:';
|
|
363
|
+
return JSON.stringify(results, (_, v) => typeof v === 'function' ? undefined : v);
|
|
364
|
+
};
|
|
365
|
+
lastResultFingerprint = buildFingerprint(initialResults);
|
|
366
|
+
// Listen for subscription updates via the same GraphQL subscription channel.
|
|
367
|
+
// When Rust re-runs the model query and finds changed results, it pushes them.
|
|
368
|
+
const unsubscribe = this.perspective.client.subscribeToQueryUpdates(subscriptionId, (rawResult) => {
|
|
369
|
+
try {
|
|
370
|
+
const parsed = parseResults(rawResult);
|
|
371
|
+
console.debug(`[ModelQueryBuilder.subscribe] Update received for ${subscriptionId}: ${parsed.length} instances`);
|
|
372
|
+
resolveAndReturn(parsed).then((results) => {
|
|
373
|
+
const fp = buildFingerprint(results);
|
|
374
|
+
if (fp === lastResultFingerprint) {
|
|
375
|
+
console.debug(`[ModelQueryBuilder.subscribe] Fingerprint unchanged, skipping callback`);
|
|
376
|
+
return;
|
|
377
|
+
}
|
|
378
|
+
console.debug(`[ModelQueryBuilder.subscribe] Fingerprint changed, calling callback with ${results.length} results`);
|
|
379
|
+
lastResultFingerprint = fp;
|
|
380
|
+
callback(results);
|
|
381
|
+
}).catch((e) => {
|
|
382
|
+
console.error('Model subscription update resolve error:', e);
|
|
383
|
+
});
|
|
384
|
+
}
|
|
385
|
+
catch (e) {
|
|
386
|
+
console.error('Model subscription update parse error:', e);
|
|
387
|
+
}
|
|
388
|
+
});
|
|
389
|
+
// Set up keepalive with recovery — uses setTimeout loop so we can
|
|
390
|
+
// break out and resubscribe when the server evicts the subscription.
|
|
391
|
+
let disposed = false;
|
|
392
|
+
let keepaliveTimer;
|
|
393
|
+
let resubscribeAttempts = 0;
|
|
394
|
+
const MAX_RESUBSCRIBE_ATTEMPTS = 5;
|
|
395
|
+
const keepaliveLoop = async () => {
|
|
396
|
+
if (disposed)
|
|
397
|
+
return;
|
|
398
|
+
try {
|
|
399
|
+
await this.perspective.client.keepAliveQuery(this.perspective.uuid, subscriptionId);
|
|
400
|
+
resubscribeAttempts = 0; // Reset on success
|
|
401
|
+
}
|
|
402
|
+
catch (e) {
|
|
403
|
+
console.warn(`Model subscription keepalive failed for ${subscriptionId}:`, e);
|
|
404
|
+
if (!disposed && resubscribeAttempts < MAX_RESUBSCRIBE_ATTEMPTS) {
|
|
405
|
+
resubscribeAttempts++;
|
|
406
|
+
const backoffMs = Math.min(1000 * Math.pow(2, resubscribeAttempts), 60000);
|
|
407
|
+
console.warn(`Resubscribing (attempt ${resubscribeAttempts}/${MAX_RESUBSCRIBE_ATTEMPTS}, backoff ${backoffMs}ms)...`);
|
|
408
|
+
await new Promise(r => setTimeout(r, backoffMs));
|
|
409
|
+
try {
|
|
410
|
+
unsubscribe();
|
|
411
|
+
await this.subscribe(callback);
|
|
412
|
+
}
|
|
413
|
+
catch (resubErr) {
|
|
414
|
+
console.error('Model subscription resubscribe failed:', resubErr);
|
|
415
|
+
}
|
|
416
|
+
}
|
|
417
|
+
else if (resubscribeAttempts >= MAX_RESUBSCRIBE_ATTEMPTS) {
|
|
418
|
+
console.error(`Model subscription ${subscriptionId}: max resubscribe attempts reached, giving up.`);
|
|
419
|
+
}
|
|
420
|
+
return; // new subscription owns its own keepalive loop
|
|
421
|
+
}
|
|
422
|
+
if (!disposed) {
|
|
423
|
+
keepaliveTimer = setTimeout(keepaliveLoop, 30000);
|
|
424
|
+
}
|
|
425
|
+
};
|
|
426
|
+
keepaliveTimer = setTimeout(keepaliveLoop, 30000);
|
|
427
|
+
// Store dispose function
|
|
428
|
+
this.currentSubscription = {
|
|
429
|
+
dispose: () => {
|
|
430
|
+
disposed = true;
|
|
431
|
+
if (keepaliveTimer)
|
|
432
|
+
clearTimeout(keepaliveTimer);
|
|
433
|
+
unsubscribe();
|
|
434
|
+
this.perspective.client.disposeQuerySubscription(this.perspective.uuid, subscriptionId).catch(() => { });
|
|
435
|
+
},
|
|
436
|
+
};
|
|
437
|
+
// Take snapshots for dirty tracking
|
|
438
|
+
for (const inst of initialResults) {
|
|
439
|
+
inst.takeSnapshot?.(this.queryParams.include);
|
|
373
440
|
}
|
|
441
|
+
return initialResults;
|
|
442
|
+
}
|
|
443
|
+
/**
|
|
444
|
+
* Subscribes to the query and receives updates using SPARQL.
|
|
445
|
+
* @deprecated Use subscribe() instead — now routes through Rust model subscription.
|
|
446
|
+
*/
|
|
447
|
+
async subscribeSparql(callback) {
|
|
448
|
+
return this.subscribe(callback);
|
|
374
449
|
}
|
|
375
450
|
/**
|
|
376
451
|
* Gets the total count of matching entities.
|
|
@@ -385,26 +460,21 @@ export class ModelQueryBuilder {
|
|
|
385
460
|
* ```
|
|
386
461
|
*/
|
|
387
462
|
async count() {
|
|
388
|
-
|
|
389
|
-
|
|
390
|
-
|
|
391
|
-
|
|
392
|
-
|
|
393
|
-
|
|
394
|
-
|
|
395
|
-
|
|
396
|
-
|
|
397
|
-
else {
|
|
398
|
-
const query = await this.ctor.countQueryToProlog(this.perspective, this.queryParams, this.modelClassName);
|
|
399
|
-
const result = await this.perspective.infer(query);
|
|
400
|
-
return result?.[0]?.TotalCount || 0;
|
|
401
|
-
}
|
|
463
|
+
const { totalCount } = await this.ctor.executeModelQuery(this.perspective, { ...this.queryParams, limit: 0 }, this.modelClassName);
|
|
464
|
+
return totalCount;
|
|
465
|
+
}
|
|
466
|
+
/**
|
|
467
|
+
* Gets the total count of matching entities using SPARQL.
|
|
468
|
+
* Delegates to count().
|
|
469
|
+
*/
|
|
470
|
+
async countSparql() {
|
|
471
|
+
return await this.count();
|
|
402
472
|
}
|
|
403
473
|
/**
|
|
404
474
|
* Subscribes to count updates for matching entities.
|
|
405
475
|
*
|
|
406
476
|
* This method:
|
|
407
|
-
* 1. Creates and initializes a
|
|
477
|
+
* 1. Creates and initializes a SPARQL live query subscription for the count (default)
|
|
408
478
|
* 2. Sets up the callback to process future count updates
|
|
409
479
|
* 3. Returns the initial count immediately
|
|
410
480
|
*
|
|
@@ -427,37 +497,79 @@ export class ModelQueryBuilder {
|
|
|
427
497
|
* builder.dispose();
|
|
428
498
|
* ```
|
|
429
499
|
*
|
|
430
|
-
* @remarks
|
|
431
|
-
* By default, this uses SurrealDB live queries for real-time updates.
|
|
432
|
-
* Prolog subscriptions remain available via `.useSurrealDB(false)`.
|
|
433
500
|
*/
|
|
434
501
|
async countSubscribe(callback) {
|
|
435
502
|
// Clean up any existing subscription
|
|
436
503
|
this.dispose();
|
|
437
|
-
|
|
438
|
-
|
|
439
|
-
|
|
440
|
-
|
|
441
|
-
|
|
442
|
-
|
|
443
|
-
|
|
444
|
-
|
|
445
|
-
|
|
446
|
-
|
|
447
|
-
|
|
448
|
-
|
|
449
|
-
|
|
450
|
-
|
|
451
|
-
|
|
452
|
-
|
|
453
|
-
|
|
454
|
-
|
|
455
|
-
|
|
456
|
-
|
|
457
|
-
|
|
458
|
-
|
|
459
|
-
|
|
460
|
-
|
|
504
|
+
const countParams = { ...this.queryParams, limit: 0 };
|
|
505
|
+
const { className, queryJson } = this.ctor.prepareModelQueryParams(countParams, this.modelClassName);
|
|
506
|
+
const { subscriptionId, result: initialModelResult } = await this.perspective.modelSubscribe(className, queryJson);
|
|
507
|
+
const parseCount = (raw) => {
|
|
508
|
+
const data = typeof raw === 'string' ? JSON.parse(raw) : raw;
|
|
509
|
+
return data.totalCount ?? 0;
|
|
510
|
+
};
|
|
511
|
+
const initialCount = parseCount(initialModelResult);
|
|
512
|
+
const unsubscribe = this.perspective.client.subscribeToQueryUpdates(subscriptionId, (rawResult) => {
|
|
513
|
+
try {
|
|
514
|
+
callback(parseCount(rawResult));
|
|
515
|
+
}
|
|
516
|
+
catch (e) {
|
|
517
|
+
console.error('Count subscription update parse error:', e);
|
|
518
|
+
}
|
|
519
|
+
});
|
|
520
|
+
let disposed = false;
|
|
521
|
+
let keepaliveTimer;
|
|
522
|
+
let resubscribeAttempts = 0;
|
|
523
|
+
const MAX_RESUBSCRIBE_ATTEMPTS = 5;
|
|
524
|
+
const keepaliveLoop = async () => {
|
|
525
|
+
if (disposed)
|
|
526
|
+
return;
|
|
527
|
+
try {
|
|
528
|
+
await this.perspective.client.keepAliveQuery(this.perspective.uuid, subscriptionId);
|
|
529
|
+
resubscribeAttempts = 0;
|
|
530
|
+
}
|
|
531
|
+
catch (e) {
|
|
532
|
+
console.warn(`Count subscription keepalive failed for ${subscriptionId}:`, e);
|
|
533
|
+
if (!disposed && resubscribeAttempts < MAX_RESUBSCRIBE_ATTEMPTS) {
|
|
534
|
+
resubscribeAttempts++;
|
|
535
|
+
const backoffMs = Math.min(1000 * Math.pow(2, resubscribeAttempts), 60000);
|
|
536
|
+
console.warn(`Count resubscribing (attempt ${resubscribeAttempts}/${MAX_RESUBSCRIBE_ATTEMPTS}, backoff ${backoffMs}ms)...`);
|
|
537
|
+
await new Promise(r => setTimeout(r, backoffMs));
|
|
538
|
+
try {
|
|
539
|
+
unsubscribe();
|
|
540
|
+
await this.countSubscribe(callback);
|
|
541
|
+
}
|
|
542
|
+
catch (resubErr) {
|
|
543
|
+
console.error('Count subscription resubscribe failed:', resubErr);
|
|
544
|
+
}
|
|
545
|
+
}
|
|
546
|
+
else if (resubscribeAttempts >= MAX_RESUBSCRIBE_ATTEMPTS) {
|
|
547
|
+
console.error(`Count subscription ${subscriptionId}: max resubscribe attempts reached, giving up.`);
|
|
548
|
+
}
|
|
549
|
+
return;
|
|
550
|
+
}
|
|
551
|
+
if (!disposed) {
|
|
552
|
+
keepaliveTimer = setTimeout(keepaliveLoop, 30000);
|
|
553
|
+
}
|
|
554
|
+
};
|
|
555
|
+
keepaliveTimer = setTimeout(keepaliveLoop, 30000);
|
|
556
|
+
this.currentSubscription = {
|
|
557
|
+
dispose: () => {
|
|
558
|
+
disposed = true;
|
|
559
|
+
if (keepaliveTimer)
|
|
560
|
+
clearTimeout(keepaliveTimer);
|
|
561
|
+
unsubscribe();
|
|
562
|
+
this.perspective.client.disposeQuerySubscription(this.perspective.uuid, subscriptionId).catch(() => { });
|
|
563
|
+
},
|
|
564
|
+
};
|
|
565
|
+
return initialCount;
|
|
566
|
+
}
|
|
567
|
+
/**
|
|
568
|
+
* Subscribes to count updates using SPARQL.
|
|
569
|
+
* @deprecated Use countSubscribe() instead — now routes through Rust model subscription.
|
|
570
|
+
*/
|
|
571
|
+
async countSubscribeSparql(callback) {
|
|
572
|
+
return this.countSubscribe(callback);
|
|
461
573
|
}
|
|
462
574
|
/**
|
|
463
575
|
* Gets a page of results with pagination metadata.
|
|
@@ -476,24 +588,21 @@ export class ModelQueryBuilder {
|
|
|
476
588
|
*/
|
|
477
589
|
async paginate(pageSize, pageNumber) {
|
|
478
590
|
const paginationQuery = { ...(this.queryParams || {}), limit: pageSize, offset: pageSize * (pageNumber - 1), count: true };
|
|
479
|
-
|
|
480
|
-
|
|
481
|
-
|
|
482
|
-
|
|
483
|
-
|
|
484
|
-
|
|
485
|
-
|
|
486
|
-
|
|
487
|
-
|
|
488
|
-
const { results, totalCount } = (await this.ctor.instancesFromPrologResult(this.perspective, paginationQuery, result));
|
|
489
|
-
return { results, totalCount, pageSize, pageNumber };
|
|
490
|
-
}
|
|
591
|
+
const { results, totalCount } = await this.ctor.executeModelQuery(this.perspective, paginationQuery, this.modelClassName);
|
|
592
|
+
return { results, totalCount, pageSize, pageNumber };
|
|
593
|
+
}
|
|
594
|
+
/**
|
|
595
|
+
* Gets a page of results using SPARQL.
|
|
596
|
+
* Delegates to paginate().
|
|
597
|
+
*/
|
|
598
|
+
async paginateSparql(pageSize, pageNumber) {
|
|
599
|
+
return await this.paginate(pageSize, pageNumber);
|
|
491
600
|
}
|
|
492
601
|
/**
|
|
493
602
|
* Subscribes to paginated results updates.
|
|
494
603
|
*
|
|
495
604
|
* This method:
|
|
496
|
-
* 1. Creates and initializes a
|
|
605
|
+
* 1. Creates and initializes a SPARQL live query subscription for the paginated results (default)
|
|
497
606
|
* 2. Sets up the callback to process future page updates
|
|
498
607
|
* 3. Returns the initial page immediately
|
|
499
608
|
*
|
|
@@ -518,39 +627,88 @@ export class ModelQueryBuilder {
|
|
|
518
627
|
* builder.dispose();
|
|
519
628
|
* ```
|
|
520
629
|
*
|
|
521
|
-
* @remarks
|
|
522
|
-
* By default, this uses SurrealDB live queries for real-time updates.
|
|
523
|
-
* Prolog subscriptions remain available via `.useSurrealDB(false)`.
|
|
524
630
|
*/
|
|
525
631
|
async paginateSubscribe(pageSize, pageNumber, callback) {
|
|
526
632
|
// Clean up any existing subscription
|
|
527
633
|
this.dispose();
|
|
528
|
-
const
|
|
529
|
-
|
|
530
|
-
|
|
531
|
-
|
|
532
|
-
|
|
533
|
-
|
|
534
|
-
|
|
535
|
-
|
|
536
|
-
|
|
537
|
-
|
|
538
|
-
|
|
539
|
-
|
|
540
|
-
|
|
541
|
-
|
|
542
|
-
|
|
543
|
-
|
|
544
|
-
|
|
545
|
-
const
|
|
546
|
-
|
|
547
|
-
|
|
548
|
-
|
|
549
|
-
|
|
550
|
-
|
|
551
|
-
|
|
552
|
-
|
|
553
|
-
|
|
554
|
-
|
|
634
|
+
const ctor = this.ctor;
|
|
635
|
+
// Subscribe to the full result set (no limit/offset) so the subscription
|
|
636
|
+
// detects changes anywhere in the dataset. Rust builds trigger SPARQL
|
|
637
|
+
// from the shape predicates.
|
|
638
|
+
const subscriptionParams = { ...(this.queryParams || {}) };
|
|
639
|
+
delete subscriptionParams.limit;
|
|
640
|
+
delete subscriptionParams.offset;
|
|
641
|
+
const { className, queryJson } = ctor.prepareModelQueryParams(subscriptionParams, this.modelClassName);
|
|
642
|
+
const { subscriptionId } = await this.perspective.modelSubscribe(className, queryJson);
|
|
643
|
+
// Build the paginated query for Rust endpoint (count: true fetches both results and totalCount in one call)
|
|
644
|
+
const paginatedQuery = {
|
|
645
|
+
...(this.queryParams || {}),
|
|
646
|
+
limit: pageSize,
|
|
647
|
+
offset: pageSize * (pageNumber - 1),
|
|
648
|
+
count: true,
|
|
649
|
+
};
|
|
650
|
+
const processResults = async () => {
|
|
651
|
+
const { results, totalCount } = await ctor.executeModelQuery(this.perspective, paginatedQuery, this.modelClassName);
|
|
652
|
+
callback({ results, totalCount, pageSize, pageNumber });
|
|
653
|
+
};
|
|
654
|
+
const unsubscribe = this.perspective.client.subscribeToQueryUpdates(subscriptionId, (rawResult) => {
|
|
655
|
+
console.debug(`[ModelQueryBuilder.paginateSubscribe] Update received for ${subscriptionId}, re-fetching paginated data...`);
|
|
656
|
+
processResults().catch(e => console.error('Paginate subscription error:', e));
|
|
657
|
+
});
|
|
658
|
+
let disposed = false;
|
|
659
|
+
let keepaliveTimer;
|
|
660
|
+
let resubscribeAttempts = 0;
|
|
661
|
+
const MAX_RESUBSCRIBE_ATTEMPTS = 5;
|
|
662
|
+
const keepaliveLoop = async () => {
|
|
663
|
+
if (disposed)
|
|
664
|
+
return;
|
|
665
|
+
try {
|
|
666
|
+
await this.perspective.client.keepAliveQuery(this.perspective.uuid, subscriptionId);
|
|
667
|
+
resubscribeAttempts = 0;
|
|
668
|
+
}
|
|
669
|
+
catch (e) {
|
|
670
|
+
console.warn(`Paginate subscription keepalive failed for ${subscriptionId}:`, e);
|
|
671
|
+
if (!disposed && resubscribeAttempts < MAX_RESUBSCRIBE_ATTEMPTS) {
|
|
672
|
+
resubscribeAttempts++;
|
|
673
|
+
const backoffMs = Math.min(1000 * Math.pow(2, resubscribeAttempts), 60000);
|
|
674
|
+
console.warn(`Paginate resubscribing (attempt ${resubscribeAttempts}/${MAX_RESUBSCRIBE_ATTEMPTS}, backoff ${backoffMs}ms)...`);
|
|
675
|
+
await new Promise(r => setTimeout(r, backoffMs));
|
|
676
|
+
try {
|
|
677
|
+
unsubscribe();
|
|
678
|
+
await this.paginateSubscribe(pageSize, pageNumber, callback);
|
|
679
|
+
}
|
|
680
|
+
catch (resubErr) {
|
|
681
|
+
console.error('Paginate subscription resubscribe failed:', resubErr);
|
|
682
|
+
}
|
|
683
|
+
}
|
|
684
|
+
else if (resubscribeAttempts >= MAX_RESUBSCRIBE_ATTEMPTS) {
|
|
685
|
+
console.error(`Paginate subscription ${subscriptionId}: max resubscribe attempts reached, giving up.`);
|
|
686
|
+
}
|
|
687
|
+
return;
|
|
688
|
+
}
|
|
689
|
+
if (!disposed) {
|
|
690
|
+
keepaliveTimer = setTimeout(keepaliveLoop, 30000);
|
|
691
|
+
}
|
|
692
|
+
};
|
|
693
|
+
keepaliveTimer = setTimeout(keepaliveLoop, 30000);
|
|
694
|
+
this.currentSubscription = {
|
|
695
|
+
dispose: () => {
|
|
696
|
+
disposed = true;
|
|
697
|
+
if (keepaliveTimer)
|
|
698
|
+
clearTimeout(keepaliveTimer);
|
|
699
|
+
unsubscribe();
|
|
700
|
+
this.perspective.client.disposeQuerySubscription(this.perspective.uuid, subscriptionId).catch(() => { });
|
|
701
|
+
},
|
|
702
|
+
};
|
|
703
|
+
// Initial fetch (single call with count: true)
|
|
704
|
+
const { results, totalCount } = await ctor.executeModelQuery(this.perspective, paginatedQuery, this.modelClassName);
|
|
705
|
+
return { results, totalCount, pageSize, pageNumber };
|
|
706
|
+
}
|
|
707
|
+
/**
|
|
708
|
+
* Subscribes to paginated results updates using SPARQL.
|
|
709
|
+
* Delegates to paginateSubscribe().
|
|
710
|
+
*/
|
|
711
|
+
async paginateSubscribeSparql(pageSize, pageNumber, callback) {
|
|
712
|
+
return await this.paginateSubscribe(pageSize, pageNumber, callback);
|
|
555
713
|
}
|
|
556
714
|
}
|
package/lib/src/model/Subject.js
CHANGED
|
@@ -55,12 +55,12 @@ export class Subject {
|
|
|
55
55
|
Object.defineProperty(this, p, {
|
|
56
56
|
configurable: true,
|
|
57
57
|
get: async () => {
|
|
58
|
-
// Use
|
|
58
|
+
// Use SPARQL for data queries
|
|
59
59
|
try {
|
|
60
|
-
return await __classPrivateFieldGet(this, _Subject_perspective, "f").
|
|
60
|
+
return await __classPrivateFieldGet(this, _Subject_perspective, "f").getPropertyValueViaSparql(__classPrivateFieldGet(this, _Subject_baseExpression, "f"), __classPrivateFieldGet(this, _Subject_subjectClassName, "f"), p);
|
|
61
61
|
}
|
|
62
62
|
catch (err) {
|
|
63
|
-
console.warn(`Failed to get property ${p} via
|
|
63
|
+
console.warn(`Failed to get property ${p} via SPARQL:`, err);
|
|
64
64
|
return undefined;
|
|
65
65
|
}
|
|
66
66
|
}
|
|
@@ -94,12 +94,12 @@ export class Subject {
|
|
|
94
94
|
Object.defineProperty(this, c, {
|
|
95
95
|
configurable: true,
|
|
96
96
|
get: async () => {
|
|
97
|
-
// Use
|
|
97
|
+
// Use SPARQL for data queries
|
|
98
98
|
try {
|
|
99
|
-
return await __classPrivateFieldGet(this, _Subject_perspective, "f").
|
|
99
|
+
return await __classPrivateFieldGet(this, _Subject_perspective, "f").getRelationValuesViaSparql(__classPrivateFieldGet(this, _Subject_baseExpression, "f"), __classPrivateFieldGet(this, _Subject_subjectClassName, "f"), c);
|
|
100
100
|
}
|
|
101
101
|
catch (err) {
|
|
102
|
-
console.warn(`Failed to get relation ${c} via
|
|
102
|
+
console.warn(`Failed to get relation ${c} via SPARQL:`, err);
|
|
103
103
|
return [];
|
|
104
104
|
}
|
|
105
105
|
}
|