@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
|
@@ -20,7 +20,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
20
20
|
import { Ad4mModel } from "./Ad4mModel";
|
|
21
21
|
import { Model, Property, Flag, HasMany, Optional, buildConformanceFilter, } from "./decorators";
|
|
22
22
|
import { SHACLShape, } from "../shacl/SHACLShape";
|
|
23
|
-
import { compileWhereClause } from "./
|
|
23
|
+
import { compileWhereClause } from "./query-utils";
|
|
24
24
|
// ============================================================================
|
|
25
25
|
// Test models
|
|
26
26
|
// ============================================================================
|
|
@@ -88,7 +88,7 @@ __decorate([
|
|
|
88
88
|
], ParentWithRelations.prototype, "unfilteredItems", void 0);
|
|
89
89
|
__decorate([
|
|
90
90
|
HasMany({
|
|
91
|
-
getter: "
|
|
91
|
+
getter: "SELECT ?target WHERE { ?target <test://custom> ?source . }",
|
|
92
92
|
}),
|
|
93
93
|
__metadata("design:type", Array)
|
|
94
94
|
], ParentWithRelations.prototype, "customItems", void 0);
|
|
@@ -113,8 +113,8 @@ describe("buildConformanceFilter()", () => {
|
|
|
113
113
|
expect(reqCond).toBeDefined();
|
|
114
114
|
expect(reqCond.predicate).toBe("test://name");
|
|
115
115
|
expect(reqCond.value).toBeUndefined();
|
|
116
|
-
// Getter string should be a
|
|
117
|
-
expect(result.getter).toContain("
|
|
116
|
+
// Getter string should be a SPARQL expression
|
|
117
|
+
expect(result.getter).toContain("SELECT ?target WHERE");
|
|
118
118
|
expect(result.getter).toContain("test://has_flagged");
|
|
119
119
|
expect(result.getter).toContain("test://type");
|
|
120
120
|
expect(result.getter).toContain("test://flagged_type");
|
|
@@ -161,7 +161,7 @@ describe("buildConformanceFilter()", () => {
|
|
|
161
161
|
Property({
|
|
162
162
|
through: "test://computed",
|
|
163
163
|
required: true,
|
|
164
|
-
getter: "
|
|
164
|
+
getter: "SELECT ?target WHERE { ?target <test://custom> ?source . } LIMIT 1",
|
|
165
165
|
}),
|
|
166
166
|
__metadata("design:type", String)
|
|
167
167
|
], CustomGetterTarget.prototype, "computed", void 0);
|
|
@@ -179,7 +179,7 @@ describe("buildConformanceFilter()", () => {
|
|
|
179
179
|
// SHACL serialization round-trip tests
|
|
180
180
|
// ============================================================================
|
|
181
181
|
describe("SHACL shape getter serialization", () => {
|
|
182
|
-
const testGetter = "
|
|
182
|
+
const testGetter = "SELECT ?target WHERE { <Base> <test://pred> ?target . ?target <test://type> <test://flag> . }";
|
|
183
183
|
const testConditions = [
|
|
184
184
|
{ type: "flag", predicate: "test://type", value: "test://flag" },
|
|
185
185
|
{ type: "required", predicate: "test://name" },
|
|
@@ -198,7 +198,7 @@ describe("SHACL shape getter serialization", () => {
|
|
|
198
198
|
// Verify getter link exists
|
|
199
199
|
const getterLink = links.find(l => l.predicate === "ad4m://getter");
|
|
200
200
|
expect(getterLink).toBeDefined();
|
|
201
|
-
expect(getterLink.target).toBe(`literal
|
|
201
|
+
expect(getterLink.target).toBe(`literal:string:${testGetter}`);
|
|
202
202
|
// Verify conditions link exists
|
|
203
203
|
const conditionsLink = links.find(l => l.predicate === "ad4m://conformanceConditions");
|
|
204
204
|
expect(conditionsLink).toBeDefined();
|
|
@@ -321,7 +321,7 @@ describe("Ad4mModel.getModelMetadata() relation filtering fields", () => {
|
|
|
321
321
|
it("should expose explicit getter on relations with custom getter", () => {
|
|
322
322
|
const metadata = ParentWithRelations.getModelMetadata();
|
|
323
323
|
// Explicit getter provided via decorator (getter-only, no predicate)
|
|
324
|
-
expect(metadata.relations.customItems.getter).toBe("
|
|
324
|
+
expect(metadata.relations.customItems.getter).toBe("SELECT ?target WHERE { ?target <test://custom> ?source . }");
|
|
325
325
|
expect(metadata.relations.customItems.predicate).toBe("");
|
|
326
326
|
// Auto-generated getter is NOT in decorator metadata (it's in the SHACL shape)
|
|
327
327
|
expect(metadata.relations.flaggedItems.getter).toBeUndefined();
|
|
@@ -364,7 +364,7 @@ describe("Relation decorator validation", () => {
|
|
|
364
364
|
};
|
|
365
365
|
__decorate([
|
|
366
366
|
HasMany({
|
|
367
|
-
getter: "
|
|
367
|
+
getter: "SELECT ?target WHERE { ?target ?p ?source . }",
|
|
368
368
|
target: () => FlaggedTarget,
|
|
369
369
|
}),
|
|
370
370
|
__metadata("design:type", Array)
|
|
@@ -384,7 +384,7 @@ describe("Relation decorator validation", () => {
|
|
|
384
384
|
};
|
|
385
385
|
__decorate([
|
|
386
386
|
HasMany({
|
|
387
|
-
getter: "
|
|
387
|
+
getter: "SELECT ?target WHERE { ?target ?p ?source . }",
|
|
388
388
|
through: "test://pred",
|
|
389
389
|
}),
|
|
390
390
|
__metadata("design:type", Array)
|
|
@@ -404,7 +404,7 @@ describe("Relation decorator validation", () => {
|
|
|
404
404
|
};
|
|
405
405
|
__decorate([
|
|
406
406
|
HasMany({
|
|
407
|
-
getter: "
|
|
407
|
+
getter: "SELECT ?target WHERE { ?target ?p ?source . }",
|
|
408
408
|
}),
|
|
409
409
|
__metadata("design:type", Array)
|
|
410
410
|
], _Valid.prototype, "items", void 0);
|
|
@@ -541,7 +541,7 @@ describe("where clause validation", () => {
|
|
|
541
541
|
__decorate([
|
|
542
542
|
HasMany({
|
|
543
543
|
where: { status: "active" },
|
|
544
|
-
getter: "
|
|
544
|
+
getter: "SELECT ?target WHERE { ?target ?p ?source . }",
|
|
545
545
|
}),
|
|
546
546
|
__metadata("design:type", Array)
|
|
547
547
|
], _Invalid.prototype, "items", void 0);
|
|
@@ -573,7 +573,7 @@ describe("where clause validation", () => {
|
|
|
573
573
|
});
|
|
574
574
|
});
|
|
575
575
|
describe("where clause compilation", () => {
|
|
576
|
-
it("should compile where clause to
|
|
576
|
+
it("should compile where clause to SPARQL getter", () => {
|
|
577
577
|
let WhereTarget = class WhereTarget extends Ad4mModel {
|
|
578
578
|
constructor() {
|
|
579
579
|
super(...arguments);
|
|
@@ -810,7 +810,7 @@ describe("where clause compilation", () => {
|
|
|
810
810
|
// compileWhereClause() unit tests
|
|
811
811
|
// ============================================================================
|
|
812
812
|
describe("compileWhereClause()", () => {
|
|
813
|
-
it("should compile simple equality to
|
|
813
|
+
it("should compile simple equality to SPARQL condition", () => {
|
|
814
814
|
const conditions = compileWhereClause({ status: "active" }, { properties: { status: { name: "status", predicate: "test://status", required: false, readOnly: false } }, relations: {}, className: "Test" });
|
|
815
815
|
expect(conditions).toHaveLength(1);
|
|
816
816
|
expect(conditions[0]).toContain("test://status");
|
|
@@ -819,7 +819,7 @@ describe("compileWhereClause()", () => {
|
|
|
819
819
|
it("should compile not operator", () => {
|
|
820
820
|
const conditions = compileWhereClause({ status: { not: "archived" } }, { properties: { status: { name: "status", predicate: "test://status", required: false, readOnly: false } }, relations: {}, className: "Test" });
|
|
821
821
|
expect(conditions).toHaveLength(1);
|
|
822
|
-
expect(conditions[0]).toContain("
|
|
822
|
+
expect(conditions[0]).toContain("NOT EXISTS"); // negation
|
|
823
823
|
expect(conditions[0]).toContain("archived");
|
|
824
824
|
});
|
|
825
825
|
it("should compile array values to IN clause", () => {
|
package/lib/src/model/sdna.js
CHANGED
|
@@ -73,7 +73,7 @@ export function buildSDNA(subjectName, obj, properties, allRelationsMeta) {
|
|
|
73
73
|
// Optional properties (required: false) are excluded — they should
|
|
74
74
|
// remain unset (undefined) until explicitly assigned.
|
|
75
75
|
const effectiveInitial = initial
|
|
76
|
-
?? (required && writable && !flag && through ? "literal
|
|
76
|
+
?? (required && writable && !flag && through ? "literal:string:" : undefined);
|
|
77
77
|
if (effectiveInitial) {
|
|
78
78
|
constructorActions.push({
|
|
79
79
|
action: "addLink",
|
|
@@ -7,8 +7,6 @@
|
|
|
7
7
|
* decorators.ts stays focused on decorator registration logic.
|
|
8
8
|
*/
|
|
9
9
|
import { SHACLShape } from "../shacl/SHACLShape";
|
|
10
|
-
import { escapeSurrealString } from "../utils";
|
|
11
|
-
import { compileWhereClause } from "./surreal-utils";
|
|
12
10
|
import { propertyNameToSetterName } from "./util";
|
|
13
11
|
/**
|
|
14
12
|
* Build a SHACL shape for a model class.
|
|
@@ -25,7 +23,6 @@ export function buildSHACL(subjectName, target, properties, allRelationsMeta, co
|
|
|
25
23
|
const obj = target.prototype;
|
|
26
24
|
// ── Determine namespace from first property or relation ─────────────
|
|
27
25
|
let namespace = "ad4m://";
|
|
28
|
-
const relations = Object.fromEntries(Object.entries(allRelationsMeta).filter(([, r]) => r.kind === 'hasMany' || r.kind === 'belongsToMany'));
|
|
29
26
|
// Try properties first
|
|
30
27
|
if (Object.keys(properties).length > 0) {
|
|
31
28
|
const firstProp = properties[Object.keys(properties)[0]];
|
|
@@ -37,8 +34,8 @@ export function buildSHACL(subjectName, target, properties, allRelationsMeta, co
|
|
|
37
34
|
}
|
|
38
35
|
}
|
|
39
36
|
// Fall back to relations if no properties
|
|
40
|
-
else if (Object.keys(
|
|
41
|
-
const firstRel =
|
|
37
|
+
else if (Object.keys(allRelationsMeta).length > 0) {
|
|
38
|
+
const firstRel = allRelationsMeta[Object.keys(allRelationsMeta)[0]];
|
|
42
39
|
if (firstRel.predicate) {
|
|
43
40
|
const match = firstRel.predicate.match(/^([^:]+:\/\/)/);
|
|
44
41
|
if (match) {
|
|
@@ -101,6 +98,10 @@ export function buildSHACL(subjectName, target, properties, allRelationsMeta, co
|
|
|
101
98
|
if (propMeta.flag && propMeta.initial) {
|
|
102
99
|
propShape.hasValue = propMeta.initial;
|
|
103
100
|
}
|
|
101
|
+
// sh:in — allowed values (enum constraint)
|
|
102
|
+
if (propMeta.options && propMeta.options.length > 0) {
|
|
103
|
+
propShape.in = propMeta.options;
|
|
104
|
+
}
|
|
104
105
|
// AD4M-specific metadata
|
|
105
106
|
if (propMeta.local !== undefined) {
|
|
106
107
|
propShape.local = propMeta.local;
|
|
@@ -111,6 +112,12 @@ export function buildSHACL(subjectName, target, properties, allRelationsMeta, co
|
|
|
111
112
|
if (propMeta.resolveLanguage) {
|
|
112
113
|
propShape.resolveLanguage = propMeta.resolveLanguage;
|
|
113
114
|
}
|
|
115
|
+
// Explicit getter SPARQL — the executor evaluates this when
|
|
116
|
+
// hydrating the property, in addition to (or instead of)
|
|
117
|
+
// reading raw links via `propMeta.through`.
|
|
118
|
+
if (propMeta.getter) {
|
|
119
|
+
propShape.getter = propMeta.getter;
|
|
120
|
+
}
|
|
114
121
|
// ── Setter actions ──────────────────────────────────────────────
|
|
115
122
|
if (propMeta.prologSetter) {
|
|
116
123
|
console.warn(`[SHACL Generation] Custom Prolog setter for property '${propName}' in class '${subjectName}' is not yet supported. ` +
|
|
@@ -131,7 +138,7 @@ export function buildSHACL(subjectName, target, properties, allRelationsMeta, co
|
|
|
131
138
|
// ── Constructor / Destructor entries ────────────────────────────
|
|
132
139
|
const effectiveInitial = propMeta.initial
|
|
133
140
|
?? (propMeta.required && propMeta.writable && !propMeta.flag && propMeta.through
|
|
134
|
-
? "literal
|
|
141
|
+
? "literal:string:" : undefined);
|
|
135
142
|
if (effectiveInitial) {
|
|
136
143
|
constructorActions.push({
|
|
137
144
|
action: "addLink",
|
|
@@ -149,75 +156,120 @@ export function buildSHACL(subjectName, target, properties, allRelationsMeta, co
|
|
|
149
156
|
shape.addProperty(propShape);
|
|
150
157
|
}
|
|
151
158
|
// ── Convert relations to SHACL property shapes ─────────────────────
|
|
152
|
-
for (const relName in
|
|
153
|
-
const relMeta =
|
|
154
|
-
|
|
159
|
+
for (const relName in allRelationsMeta) {
|
|
160
|
+
const relMeta = allRelationsMeta[relName];
|
|
161
|
+
// Getter-only relations (no `through`) have no real link predicate
|
|
162
|
+
// but still need a SHACL property entry so the executor can find
|
|
163
|
+
// the getter expression. Synthesize a deterministic IRI so the
|
|
164
|
+
// SHACL graph is well-formed; the predicate is never used to match
|
|
165
|
+
// links because the getter is the sole source of values. Use
|
|
166
|
+
// slash separators so the result is a valid IRI (colons in the
|
|
167
|
+
// authority confuse strict SPARQL IRI parsers).
|
|
168
|
+
if (!relMeta.predicate && !relMeta.getter)
|
|
155
169
|
continue;
|
|
170
|
+
const synthesizedPath = relMeta.predicate
|
|
171
|
+
|| `ad4m://getter/${subjectName}/${relName}`;
|
|
156
172
|
const relShape = {
|
|
157
173
|
name: relName,
|
|
158
|
-
path:
|
|
174
|
+
path: synthesizedPath,
|
|
159
175
|
};
|
|
160
176
|
// Relations typically contain IRIs
|
|
161
177
|
relShape.nodeKind = 'IRI';
|
|
178
|
+
// Encode relation kind so the executor can derive direction and
|
|
179
|
+
// scalar-vs-collection rendering without consulting the JS class.
|
|
180
|
+
relShape.relationKind = relMeta.kind;
|
|
181
|
+
// Scalar relations cap at 1.
|
|
182
|
+
if (relMeta.kind === 'hasOne' || relMeta.kind === 'belongsToOne') {
|
|
183
|
+
relShape.maxCount = 1;
|
|
184
|
+
}
|
|
185
|
+
else if (relMeta.maxCount !== undefined) {
|
|
186
|
+
relShape.maxCount = relMeta.maxCount;
|
|
187
|
+
}
|
|
188
|
+
// Encode opt-out of type filtering (default true; only emit when false).
|
|
189
|
+
if (relMeta.filter === false) {
|
|
190
|
+
relShape.filter = false;
|
|
191
|
+
}
|
|
162
192
|
// AD4M-specific metadata
|
|
163
193
|
if (relMeta.local !== undefined) {
|
|
164
194
|
relShape.local = relMeta.local;
|
|
165
195
|
}
|
|
166
|
-
// Adder
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
196
|
+
// Adder / Remover actions — only meaningful for relations backed
|
|
197
|
+
// by a real link predicate. Getter-only relations are read-only.
|
|
198
|
+
if (relMeta.predicate) {
|
|
199
|
+
relShape.adder = [{
|
|
200
|
+
action: "addLink",
|
|
201
|
+
source: "this",
|
|
202
|
+
predicate: relMeta.predicate,
|
|
203
|
+
target: "value",
|
|
204
|
+
...(relMeta.local && { local: true })
|
|
205
|
+
}];
|
|
206
|
+
relShape.remover = [{
|
|
207
|
+
action: "removeLink",
|
|
208
|
+
source: "this",
|
|
209
|
+
predicate: relMeta.predicate,
|
|
210
|
+
target: "value",
|
|
211
|
+
...(relMeta.local && { local: true })
|
|
212
|
+
}];
|
|
213
|
+
}
|
|
182
214
|
// ── Build Getter (conformance filter) ───────────────────────────
|
|
183
215
|
// Priority chain:
|
|
184
216
|
// 1. Explicit getter string → use verbatim
|
|
185
|
-
// 2.
|
|
186
|
-
//
|
|
217
|
+
// 2. target + filter !== false → auto-derive conformance getter
|
|
218
|
+
// from the shape. Where-clause filtering is applied as a
|
|
219
|
+
// post-getter pass via `whereFilter` / `wherePredicates`, which
|
|
220
|
+
// use `parse_literal_value` and so transparently handle
|
|
221
|
+
// `literal:json:` envelopes that simple FILTER(STR(?x) = ...)
|
|
222
|
+
// comparisons can't.
|
|
187
223
|
if (relMeta.getter) {
|
|
188
224
|
relShape.getter = relMeta.getter;
|
|
189
225
|
}
|
|
190
|
-
else if (relMeta.
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
226
|
+
else if (relMeta.target
|
|
227
|
+
&& relMeta.filter !== false
|
|
228
|
+
&& relMeta.kind !== 'belongsToOne'
|
|
229
|
+
&& relMeta.kind !== 'belongsToMany') {
|
|
230
|
+
// Lazy conformance filter: store deferred reference,
|
|
231
|
+
// resolve on first access via a getter on relShape.
|
|
232
|
+
// Skipped for reverse relations (belongsTo*) because the
|
|
233
|
+
// auto-derived getter assumes forward direction; the executor's
|
|
234
|
+
// `resolve_reverse_relations` already populates these correctly.
|
|
235
|
+
const targetThunk = relMeta.target;
|
|
236
|
+
const predicate = relMeta.predicate;
|
|
237
|
+
let resolved = false;
|
|
238
|
+
let cachedGetter;
|
|
239
|
+
let cachedConditions;
|
|
240
|
+
const resolveFilter = () => {
|
|
241
|
+
if (resolved)
|
|
242
|
+
return;
|
|
243
|
+
resolved = true;
|
|
244
|
+
try {
|
|
245
|
+
const TargetClass = targetThunk();
|
|
246
|
+
const filter = conformanceFilterFn(predicate, TargetClass);
|
|
247
|
+
if (filter) {
|
|
248
|
+
cachedGetter = filter.getter;
|
|
249
|
+
cachedConditions = filter.conformanceConditions;
|
|
250
|
+
}
|
|
200
251
|
}
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
// Target metadata may not be available yet
|
|
204
|
-
}
|
|
205
|
-
}
|
|
206
|
-
else if (relMeta.target && relMeta.filter !== false) {
|
|
207
|
-
try {
|
|
208
|
-
const TargetClass = relMeta.target();
|
|
209
|
-
const filter = conformanceFilterFn(relMeta.predicate, TargetClass);
|
|
210
|
-
if (filter) {
|
|
211
|
-
relShape.getter = filter.getter;
|
|
212
|
-
relShape.conformanceConditions = filter.conformanceConditions;
|
|
252
|
+
catch (e) {
|
|
253
|
+
// Target class may not be available yet
|
|
213
254
|
}
|
|
214
|
-
}
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
255
|
+
};
|
|
256
|
+
// Define lazy getters that resolve on first access
|
|
257
|
+
Object.defineProperty(relShape, 'getter', {
|
|
258
|
+
get() { resolveFilter(); return cachedGetter; },
|
|
259
|
+
set(v) { resolved = true; cachedGetter = v; },
|
|
260
|
+
enumerable: true,
|
|
261
|
+
configurable: true,
|
|
262
|
+
});
|
|
263
|
+
Object.defineProperty(relShape, 'conformanceConditions', {
|
|
264
|
+
get() { resolveFilter(); return cachedConditions; },
|
|
265
|
+
set(v) { resolved = true; cachedConditions = v; },
|
|
266
|
+
enumerable: true,
|
|
267
|
+
configurable: true,
|
|
268
|
+
});
|
|
219
269
|
}
|
|
220
270
|
// ── sh:class — target shape reference ───────────────────────────
|
|
271
|
+
// Also emit ad4m:targetClassName so the executor can look up the
|
|
272
|
+
// target class shape through its in-memory cache by bare name.
|
|
221
273
|
if (relMeta.target) {
|
|
222
274
|
try {
|
|
223
275
|
const TargetClass = relMeta.target();
|
|
@@ -225,15 +277,60 @@ export function buildSHACL(subjectName, target, properties, allRelationsMeta, co
|
|
|
225
277
|
if (targetSHACL?.shape?.nodeShapeUri) {
|
|
226
278
|
relShape.class = targetSHACL.shape.nodeShapeUri;
|
|
227
279
|
}
|
|
280
|
+
if (targetSHACL?.name) {
|
|
281
|
+
relShape.targetClassName = targetSHACL.name;
|
|
282
|
+
}
|
|
283
|
+
else {
|
|
284
|
+
const targetProto = TargetClass.prototype;
|
|
285
|
+
if (targetProto?.className) {
|
|
286
|
+
relShape.targetClassName = targetProto.className;
|
|
287
|
+
}
|
|
288
|
+
}
|
|
289
|
+
}
|
|
290
|
+
catch (e) {
|
|
291
|
+
// Target class resolution failed (typically a circular
|
|
292
|
+
// decorator dependency). Since the executor no longer
|
|
293
|
+
// receives target metadata over the wire, dropping the
|
|
294
|
+
// reference here would turn a transient build-time issue
|
|
295
|
+
// into a permanent broken-include at query time. Log
|
|
296
|
+
// loudly so the failure is discoverable.
|
|
297
|
+
console.warn(`[shacl-gen] Failed to resolve target class for relation `
|
|
298
|
+
+ `"${subjectName}.${relName}": ${e instanceof Error ? e.message : String(e)}`);
|
|
299
|
+
}
|
|
300
|
+
}
|
|
301
|
+
// ── Where-clause metadata for post-getter filtering ─────────────
|
|
302
|
+
// The executor uses these to apply where conditions against the
|
|
303
|
+
// target class without needing the target's ModelMetadata at query time.
|
|
304
|
+
if (relMeta.where) {
|
|
305
|
+
relShape.whereFilter = relMeta.where;
|
|
306
|
+
try {
|
|
307
|
+
const TargetClass = relMeta.target?.();
|
|
308
|
+
const targetMetadata = TargetClass
|
|
309
|
+
? TargetClass.getModelMetadata?.() ?? null
|
|
310
|
+
: null;
|
|
311
|
+
if (targetMetadata?.properties) {
|
|
312
|
+
const predicates = {};
|
|
313
|
+
for (const propName of Object.keys(relMeta.where)) {
|
|
314
|
+
if (['id', 'author', 'timestamp'].includes(propName))
|
|
315
|
+
continue;
|
|
316
|
+
const propMeta = targetMetadata.properties[propName];
|
|
317
|
+
if (propMeta?.predicate) {
|
|
318
|
+
predicates[propName] = propMeta.predicate;
|
|
319
|
+
}
|
|
320
|
+
}
|
|
321
|
+
if (Object.keys(predicates).length > 0) {
|
|
322
|
+
relShape.wherePredicates = predicates;
|
|
323
|
+
}
|
|
324
|
+
}
|
|
228
325
|
}
|
|
229
326
|
catch (e) {
|
|
230
|
-
// Target
|
|
327
|
+
// Target metadata may not be available yet
|
|
231
328
|
}
|
|
232
329
|
}
|
|
233
330
|
shape.addProperty(relShape);
|
|
234
331
|
}
|
|
235
332
|
// Always set constructor and destructor actions on the shape, even
|
|
236
|
-
// when empty. An empty array serialises to `literal
|
|
333
|
+
// when empty. An empty array serialises to `literal:string:[]`
|
|
237
334
|
// which the Rust executor parses as a valid (no-op) command list,
|
|
238
335
|
// avoiding "No SHACL constructor found" errors for models whose
|
|
239
336
|
// properties are all optional and have no @Flag.
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Tests for the delta fast-path logic used in subscription-pool.ts.
|
|
3
|
+
*
|
|
4
|
+
* The delta optimisation in pooledSubscribe's onResult handler:
|
|
5
|
+
* 1. Checks if new rows are a strict superset of previous rows
|
|
6
|
+
* 2. Extracts added rows (new triples not in prev set)
|
|
7
|
+
* 3. Verifies ALL added rows have source URIs not already in previous results
|
|
8
|
+
* 4. If condition 3 fails (existing source got new links), falls back to full rehydration
|
|
9
|
+
*
|
|
10
|
+
* These tests validate the detection logic in isolation.
|
|
11
|
+
*/
|
|
12
|
+
type Row = {
|
|
13
|
+
source: string;
|
|
14
|
+
predicate: string;
|
|
15
|
+
target: string;
|
|
16
|
+
};
|
|
17
|
+
/**
|
|
18
|
+
* Replicates the delta-path eligibility check from subscription-pool.ts
|
|
19
|
+
*/
|
|
20
|
+
declare function detectDeltaPath(prevArr: Row[], newArr: Row[]): {
|
|
21
|
+
useDelta: boolean;
|
|
22
|
+
addedRows: Row[];
|
|
23
|
+
reason?: string;
|
|
24
|
+
};
|
|
@@ -0,0 +1,180 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Tests for the delta fast-path logic used in subscription-pool.ts.
|
|
3
|
+
*
|
|
4
|
+
* The delta optimisation in pooledSubscribe's onResult handler:
|
|
5
|
+
* 1. Checks if new rows are a strict superset of previous rows
|
|
6
|
+
* 2. Extracts added rows (new triples not in prev set)
|
|
7
|
+
* 3. Verifies ALL added rows have source URIs not already in previous results
|
|
8
|
+
* 4. If condition 3 fails (existing source got new links), falls back to full rehydration
|
|
9
|
+
*
|
|
10
|
+
* These tests validate the detection logic in isolation.
|
|
11
|
+
*/
|
|
12
|
+
/**
|
|
13
|
+
* Replicates the delta-path eligibility check from subscription-pool.ts
|
|
14
|
+
*/
|
|
15
|
+
function detectDeltaPath(prevArr, newArr) {
|
|
16
|
+
if (newArr.length <= prevArr.length) {
|
|
17
|
+
return { useDelta: false, addedRows: [], reason: 'no growth' };
|
|
18
|
+
}
|
|
19
|
+
if (newArr.length - prevArr.length > 5) {
|
|
20
|
+
return { useDelta: false, addedRows: [], reason: 'delta too large' };
|
|
21
|
+
}
|
|
22
|
+
const prevSources = new Set(prevArr.map(r => `${r.source}|${r.predicate}|${r.target}`));
|
|
23
|
+
const addedRows = newArr.filter(r => !prevSources.has(`${r.source}|${r.predicate}|${r.target}`));
|
|
24
|
+
const newSources = new Set(newArr.map(r => `${r.source}|${r.predicate}|${r.target}`));
|
|
25
|
+
const removedRows = prevArr.filter(r => !newSources.has(`${r.source}|${r.predicate}|${r.target}`));
|
|
26
|
+
if (removedRows.length > 0) {
|
|
27
|
+
return { useDelta: false, addedRows, reason: 'rows removed' };
|
|
28
|
+
}
|
|
29
|
+
// Key check: all added rows must have NEW source URIs
|
|
30
|
+
const prevSourceIds = new Set(prevArr.map(r => r.source));
|
|
31
|
+
const allNewSources = addedRows.every(r => !prevSourceIds.has(r.source));
|
|
32
|
+
if (!allNewSources) {
|
|
33
|
+
return { useDelta: false, addedRows, reason: 'existing source got new links' };
|
|
34
|
+
}
|
|
35
|
+
return { useDelta: true, addedRows };
|
|
36
|
+
}
|
|
37
|
+
describe('delta fast-path detection', () => {
|
|
38
|
+
const prev = [
|
|
39
|
+
{ source: 'a', predicate: 'p1', target: 't1' },
|
|
40
|
+
{ source: 'a', predicate: 'p2', target: 't2' },
|
|
41
|
+
{ source: 'b', predicate: 'p1', target: 't3' },
|
|
42
|
+
];
|
|
43
|
+
it('appends genuinely new items via delta path', () => {
|
|
44
|
+
const next = [
|
|
45
|
+
...prev,
|
|
46
|
+
{ source: 'c', predicate: 'p1', target: 't4' },
|
|
47
|
+
];
|
|
48
|
+
const result = detectDeltaPath(prev, next);
|
|
49
|
+
expect(result.useDelta).toBe(true);
|
|
50
|
+
expect(result.addedRows).toHaveLength(1);
|
|
51
|
+
expect(result.addedRows[0].source).toBe('c');
|
|
52
|
+
});
|
|
53
|
+
it('falls back when existing source gets new links', () => {
|
|
54
|
+
const next = [
|
|
55
|
+
...prev,
|
|
56
|
+
{ source: 'a', predicate: 'p3', target: 't5' }, // source 'a' already exists
|
|
57
|
+
];
|
|
58
|
+
const result = detectDeltaPath(prev, next);
|
|
59
|
+
expect(result.useDelta).toBe(false);
|
|
60
|
+
expect(result.reason).toBe('existing source got new links');
|
|
61
|
+
});
|
|
62
|
+
it('falls back when rows are removed (even if new ones added)', () => {
|
|
63
|
+
const next = [
|
|
64
|
+
{ source: 'a', predicate: 'p1', target: 't1' },
|
|
65
|
+
{ source: 'a', predicate: 'p2', target: 't2' },
|
|
66
|
+
// source 'b' row removed, two new sources added so length grows
|
|
67
|
+
{ source: 'c', predicate: 'p1', target: 't4' },
|
|
68
|
+
{ source: 'd', predicate: 'p1', target: 't5' },
|
|
69
|
+
];
|
|
70
|
+
const result = detectDeltaPath(prev, next);
|
|
71
|
+
expect(result.useDelta).toBe(false);
|
|
72
|
+
expect(result.reason).toBe('rows removed');
|
|
73
|
+
});
|
|
74
|
+
it('falls back when delta is too large (>5 new rows)', () => {
|
|
75
|
+
const next = [
|
|
76
|
+
...prev,
|
|
77
|
+
...Array.from({ length: 6 }, (_, i) => ({
|
|
78
|
+
source: `new${i}`, predicate: 'p1', target: `t${10 + i}`,
|
|
79
|
+
})),
|
|
80
|
+
];
|
|
81
|
+
const result = detectDeltaPath(prev, next);
|
|
82
|
+
expect(result.useDelta).toBe(false);
|
|
83
|
+
expect(result.reason).toBe('delta too large');
|
|
84
|
+
});
|
|
85
|
+
it('falls back when no growth', () => {
|
|
86
|
+
const result = detectDeltaPath(prev, prev);
|
|
87
|
+
expect(result.useDelta).toBe(false);
|
|
88
|
+
expect(result.reason).toBe('no growth');
|
|
89
|
+
});
|
|
90
|
+
it('handles multiple new sources in one delta', () => {
|
|
91
|
+
const next = [
|
|
92
|
+
...prev,
|
|
93
|
+
{ source: 'c', predicate: 'p1', target: 't4' },
|
|
94
|
+
{ source: 'd', predicate: 'p1', target: 't5' },
|
|
95
|
+
];
|
|
96
|
+
const result = detectDeltaPath(prev, next);
|
|
97
|
+
expect(result.useDelta).toBe(true);
|
|
98
|
+
expect(result.addedRows).toHaveLength(2);
|
|
99
|
+
});
|
|
100
|
+
// ── Test #8: Rapid successive additions ──
|
|
101
|
+
it('handles 10 items added in quick succession without duplicates', () => {
|
|
102
|
+
let current = [...prev];
|
|
103
|
+
for (let i = 0; i < 10; i++) {
|
|
104
|
+
const next = [...current, { source: `rapid-${i}`, predicate: 'p1', target: `t-rapid-${i}` }];
|
|
105
|
+
const result = detectDeltaPath(current, next);
|
|
106
|
+
// Each individual addition should be eligible for delta
|
|
107
|
+
expect(result.useDelta).toBe(true);
|
|
108
|
+
expect(result.addedRows).toHaveLength(1);
|
|
109
|
+
expect(result.addedRows[0].source).toBe(`rapid-${i}`);
|
|
110
|
+
current = next;
|
|
111
|
+
}
|
|
112
|
+
});
|
|
113
|
+
// ── Test #9: Addition + removal in same batch ──
|
|
114
|
+
it('falls back when one item added and another removed simultaneously', () => {
|
|
115
|
+
const next = [
|
|
116
|
+
{ source: 'a', predicate: 'p1', target: 't1' },
|
|
117
|
+
{ source: 'a', predicate: 'p2', target: 't2' },
|
|
118
|
+
// source 'b' removed, source 'c' added
|
|
119
|
+
{ source: 'c', predicate: 'p1', target: 't4' },
|
|
120
|
+
{ source: 'd', predicate: 'p1', target: 't5' },
|
|
121
|
+
];
|
|
122
|
+
const result = detectDeltaPath(prev, next);
|
|
123
|
+
expect(result.useDelta).toBe(false);
|
|
124
|
+
expect(result.reason).toBe('rows removed');
|
|
125
|
+
});
|
|
126
|
+
// ── Test #10: Delta with nested relations (detection only) ──
|
|
127
|
+
it('delta path detects new items correctly even when sources have complex URIs', () => {
|
|
128
|
+
const next = [
|
|
129
|
+
...prev,
|
|
130
|
+
{ source: 'flux://post/123/comment/456', predicate: 'flux://belongs_to', target: 'flux://post/123' },
|
|
131
|
+
];
|
|
132
|
+
const result = detectDeltaPath(prev, next);
|
|
133
|
+
expect(result.useDelta).toBe(true);
|
|
134
|
+
expect(result.addedRows).toHaveLength(1);
|
|
135
|
+
expect(result.addedRows[0].source).toBe('flux://post/123/comment/456');
|
|
136
|
+
});
|
|
137
|
+
// ── Test #11: Empty previous result + new items ──
|
|
138
|
+
it('handles empty previous array with new items arriving', () => {
|
|
139
|
+
const empty = [];
|
|
140
|
+
const next = [
|
|
141
|
+
{ source: 'x', predicate: 'p1', target: 't1' },
|
|
142
|
+
];
|
|
143
|
+
const result = detectDeltaPath(empty, next);
|
|
144
|
+
expect(result.useDelta).toBe(true);
|
|
145
|
+
expect(result.addedRows).toHaveLength(1);
|
|
146
|
+
});
|
|
147
|
+
it('handles empty previous with no new items', () => {
|
|
148
|
+
const result = detectDeltaPath([], []);
|
|
149
|
+
expect(result.useDelta).toBe(false);
|
|
150
|
+
expect(result.reason).toBe('no growth');
|
|
151
|
+
});
|
|
152
|
+
// ── Test #12: Source URI with special characters ──
|
|
153
|
+
it('handles URIs with encoded characters, fragments, and query params', () => {
|
|
154
|
+
const specialPrev = [
|
|
155
|
+
{ source: 'flux://item%20one', predicate: 'p1', target: 't1' },
|
|
156
|
+
{ source: 'flux://item#section', predicate: 'p2', target: 't2' },
|
|
157
|
+
{ source: 'flux://item?key=val&foo=bar', predicate: 'p3', target: 't3' },
|
|
158
|
+
];
|
|
159
|
+
const specialNext = [
|
|
160
|
+
...specialPrev,
|
|
161
|
+
{ source: 'flux://new%C3%A9item', predicate: 'p1', target: 't4' },
|
|
162
|
+
];
|
|
163
|
+
const result = detectDeltaPath(specialPrev, specialNext);
|
|
164
|
+
expect(result.useDelta).toBe(true);
|
|
165
|
+
expect(result.addedRows).toHaveLength(1);
|
|
166
|
+
expect(result.addedRows[0].source).toBe('flux://new%C3%A9item');
|
|
167
|
+
});
|
|
168
|
+
it('correctly identifies existing source with special chars getting new links', () => {
|
|
169
|
+
const specialPrev = [
|
|
170
|
+
{ source: 'flux://item#section', predicate: 'p1', target: 't1' },
|
|
171
|
+
];
|
|
172
|
+
const specialNext = [
|
|
173
|
+
...specialPrev,
|
|
174
|
+
{ source: 'flux://item#section', predicate: 'p2', target: 't2' },
|
|
175
|
+
];
|
|
176
|
+
const result = detectDeltaPath(specialPrev, specialNext);
|
|
177
|
+
expect(result.useDelta).toBe(false);
|
|
178
|
+
expect(result.reason).toBe('existing source got new links');
|
|
179
|
+
});
|
|
180
|
+
});
|