@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
|
@@ -0,0 +1,209 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Shared query compilation utilities.
|
|
3
|
+
*
|
|
4
|
+
* These functions are used by both the runtime query builder (`Ad4mModel`) and
|
|
5
|
+
* the compile-time SHACL generator (`decorators.ts`).
|
|
6
|
+
*
|
|
7
|
+
* All output uses native SPARQL syntax.
|
|
8
|
+
*/
|
|
9
|
+
|
|
10
|
+
import type { WhereCondition, Where, ModelMetadata } from "./types";
|
|
11
|
+
import { escapeQueryString } from "../utils";
|
|
12
|
+
|
|
13
|
+
/**
|
|
14
|
+
* Format a JavaScript value for embedding in a query expression.
|
|
15
|
+
*
|
|
16
|
+
* - Strings are single-quoted with backslash / quote / newline escaping
|
|
17
|
+
* - Numbers and booleans are passed through as-is
|
|
18
|
+
* - Arrays are recursed
|
|
19
|
+
*/
|
|
20
|
+
export function formatQueryValue(value: any): string {
|
|
21
|
+
if (typeof value === 'string') {
|
|
22
|
+
// Escape backslashes first, then single quotes and other special characters
|
|
23
|
+
const escaped = value
|
|
24
|
+
.replace(/\\/g, '\\\\') // Backslash -> \\
|
|
25
|
+
.replace(/'/g, "\\'") // Single quote -> \'
|
|
26
|
+
.replace(/"/g, '\\"') // Double quote -> \"
|
|
27
|
+
.replace(/\n/g, '\\n') // Newline -> \n
|
|
28
|
+
.replace(/\r/g, '\\r') // Carriage return -> \r
|
|
29
|
+
.replace(/\t/g, '\\t'); // Tab -> \t
|
|
30
|
+
return `'${escaped}'`;
|
|
31
|
+
} else if (typeof value === 'number' || typeof value === 'boolean') {
|
|
32
|
+
return String(value);
|
|
33
|
+
} else if (Array.isArray(value)) {
|
|
34
|
+
return `[${value.map(v => formatQueryValue(v)).join(', ')}]`;
|
|
35
|
+
} else {
|
|
36
|
+
return String(value);
|
|
37
|
+
}
|
|
38
|
+
}
|
|
39
|
+
|
|
40
|
+
/**
|
|
41
|
+
* Compile a single Where condition for a property into a SPARQL triple pattern
|
|
42
|
+
* that can be embedded in a getter's WHERE clause.
|
|
43
|
+
*
|
|
44
|
+
* The generated pattern operates on `?target` — e.g.:
|
|
45
|
+
* `?target <pred> <value> .`
|
|
46
|
+
* `FILTER EXISTS { ?target <pred> ?_v0 }`
|
|
47
|
+
*
|
|
48
|
+
* @param predicate - The predicate URI for the property
|
|
49
|
+
* @param condition - The Where condition value
|
|
50
|
+
* @param opts - Optional settings (e.g. `resolveLanguage`)
|
|
51
|
+
* @returns A single SPARQL condition string
|
|
52
|
+
*/
|
|
53
|
+
export function buildWhereCondition(
|
|
54
|
+
predicate: string,
|
|
55
|
+
condition: WhereCondition,
|
|
56
|
+
opts?: { resolveLanguage?: string; varIndex?: number },
|
|
57
|
+
): string {
|
|
58
|
+
const escapedPredicate = escapeQueryString(predicate);
|
|
59
|
+
// For literal-resolved properties, we match against the raw IRI (which is a literal: URI)
|
|
60
|
+
// For language-resolved properties, we match against the plain URI
|
|
61
|
+
// For literal-resolved properties, values are stored as IRIs like <literal:string:VALUE>
|
|
62
|
+
// For language-resolved properties, values are plain URIs
|
|
63
|
+
const isLiteral = !opts?.resolveLanguage || opts.resolveLanguage === 'literal';
|
|
64
|
+
|
|
65
|
+
const varSuffix = opts?.varIndex ?? 0;
|
|
66
|
+
|
|
67
|
+
function formatValue(v: any): string {
|
|
68
|
+
if (typeof v === 'string') {
|
|
69
|
+
return isLiteral
|
|
70
|
+
? `<literal:string:${escapeQueryString(v)}>`
|
|
71
|
+
: `<${escapeQueryString(v)}>`;
|
|
72
|
+
}
|
|
73
|
+
// Numbers/booleans — also stored as literal:string: in AD4M
|
|
74
|
+
return `<literal:string:${v}>`;
|
|
75
|
+
}
|
|
76
|
+
|
|
77
|
+
/**
|
|
78
|
+
* For literal properties, generate a FILTER-based match that handles both
|
|
79
|
+
* the raw value and the literal-encoded value. This mirrors the Rust
|
|
80
|
+
* `build_projection_where_patterns` approach which uses:
|
|
81
|
+
* FILTER(STR(?var) = "value" || STR(?var) = "literal:string:encodedValue")
|
|
82
|
+
* This is more robust than exact IRI matching because it handles edge cases
|
|
83
|
+
* where the stored format might vary.
|
|
84
|
+
*/
|
|
85
|
+
function formatLiteralFilter(varName: string, v: any): string {
|
|
86
|
+
const raw = escapeQueryString(String(v));
|
|
87
|
+
const encoded = encodeURIComponent(String(v))
|
|
88
|
+
.replace(/!/g, '%21')
|
|
89
|
+
.replace(/'/g, '%27')
|
|
90
|
+
.replace(/\(/g, '%28')
|
|
91
|
+
.replace(/\)/g, '%29')
|
|
92
|
+
.replace(/\*/g, '%2A');
|
|
93
|
+
if (typeof v === 'string') {
|
|
94
|
+
return `FILTER(STR(${varName}) = "${raw}" || STR(${varName}) = "literal:string:${encoded}")`;
|
|
95
|
+
} else if (typeof v === 'number') {
|
|
96
|
+
return `FILTER(STR(${varName}) = "${v}" || STR(${varName}) = "literal:number:${v}")`;
|
|
97
|
+
} else if (typeof v === 'boolean') {
|
|
98
|
+
return `FILTER(STR(${varName}) = "${v}" || STR(${varName}) = "literal:boolean:${v}")`;
|
|
99
|
+
}
|
|
100
|
+
return `FILTER(STR(${varName}) = "${raw}")`;
|
|
101
|
+
}
|
|
102
|
+
|
|
103
|
+
if (Array.isArray(condition)) {
|
|
104
|
+
// Array values → FILTER IN
|
|
105
|
+
if (isLiteral) {
|
|
106
|
+
const varName = `?_wc${varSuffix}`;
|
|
107
|
+
const inValues = (condition as any[]).flatMap(v => {
|
|
108
|
+
const raw = escapeQueryString(String(v));
|
|
109
|
+
const encoded = encodeURIComponent(String(v))
|
|
110
|
+
.replace(/!/g, '%21').replace(/'/g, '%27')
|
|
111
|
+
.replace(/\(/g, '%28').replace(/\)/g, '%29').replace(/\*/g, '%2A');
|
|
112
|
+
return [`"${raw}"`, `"literal:string:${encoded}"`];
|
|
113
|
+
}).join(', ');
|
|
114
|
+
return `?target <${escapedPredicate}> ${varName} . FILTER(STR(${varName}) IN (${inValues}))`;
|
|
115
|
+
}
|
|
116
|
+
const formattedValues = (condition as any[]).map(formatValue).join(', ');
|
|
117
|
+
return `FILTER EXISTS { ?target <${escapedPredicate}> ?_val . FILTER(?_val IN (${formattedValues})) }`;
|
|
118
|
+
} else if (typeof condition === 'object' && condition !== null) {
|
|
119
|
+
// Operator object
|
|
120
|
+
const ops = condition as any;
|
|
121
|
+
const parts: string[] = [];
|
|
122
|
+
|
|
123
|
+
if (ops.not !== undefined) {
|
|
124
|
+
if (Array.isArray(ops.not)) {
|
|
125
|
+
const formattedValues = ops.not.map((v: any) => formatValue(v)).join(', ');
|
|
126
|
+
// FILTER NOT EXISTS here is scoped to a specific predicate, not a global scan,
|
|
127
|
+
// so O(N²) behavior is bounded by the number of values for this property.
|
|
128
|
+
parts.push(
|
|
129
|
+
`FILTER NOT EXISTS { ?target <${escapedPredicate}> ?_nval . FILTER(?_nval IN (${formattedValues})) }`,
|
|
130
|
+
);
|
|
131
|
+
} else {
|
|
132
|
+
// FILTER NOT EXISTS here is scoped to a specific predicate, not a global scan,
|
|
133
|
+
// so O(N²) behavior is bounded by the number of values for this property.
|
|
134
|
+
parts.push(
|
|
135
|
+
`FILTER NOT EXISTS { ?target <${escapedPredicate}> ${formatValue(ops.not)} }`,
|
|
136
|
+
);
|
|
137
|
+
}
|
|
138
|
+
}
|
|
139
|
+
|
|
140
|
+
// Comparison operators — ensure property exists
|
|
141
|
+
const hasComparisonOps =
|
|
142
|
+
ops.gt !== undefined || ops.gte !== undefined ||
|
|
143
|
+
ops.lt !== undefined || ops.lte !== undefined ||
|
|
144
|
+
ops.between !== undefined || ops.contains !== undefined;
|
|
145
|
+
if (hasComparisonOps) {
|
|
146
|
+
parts.push(
|
|
147
|
+
`FILTER EXISTS { ?target <${escapedPredicate}> ?_cmp }`,
|
|
148
|
+
);
|
|
149
|
+
}
|
|
150
|
+
|
|
151
|
+
return parts.join(' ');
|
|
152
|
+
} else {
|
|
153
|
+
// Simple equality
|
|
154
|
+
if (isLiteral) {
|
|
155
|
+
// Use FILTER matching (mirrors Rust build_projection_where_patterns)
|
|
156
|
+
// to handle both raw values and literal-encoded IRIs robustly.
|
|
157
|
+
const varName = `?_wc${varSuffix}`;
|
|
158
|
+
return `?target <${escapedPredicate}> ${varName} . ${formatLiteralFilter(varName, condition)}`;
|
|
159
|
+
}
|
|
160
|
+
return `?target <${escapedPredicate}> ${formatValue(condition)} .`;
|
|
161
|
+
}
|
|
162
|
+
}
|
|
163
|
+
|
|
164
|
+
/**
|
|
165
|
+
* Compile a full `Where` clause to an array of SPARQL condition strings.
|
|
166
|
+
*
|
|
167
|
+
* When `metadata` is provided, property names are resolved to predicates
|
|
168
|
+
* using the model's property metadata. When `metadata` is `null`, property
|
|
169
|
+
* names are treated as raw predicate URIs.
|
|
170
|
+
*
|
|
171
|
+
* Only handles **regular properties** — special fields (`id`, `author`,
|
|
172
|
+
* `timestamp`) and relation fields are skipped (they are only relevant at
|
|
173
|
+
* runtime query time, not for compile-time getter generation).
|
|
174
|
+
*/
|
|
175
|
+
export function compileWhereClause(
|
|
176
|
+
where: Where,
|
|
177
|
+
metadata: ModelMetadata | null,
|
|
178
|
+
): string[] {
|
|
179
|
+
const conditions: string[] = [];
|
|
180
|
+
|
|
181
|
+
for (const [propertyName, condition] of Object.entries(where)) {
|
|
182
|
+
// Skip special fields that don't apply at compile time
|
|
183
|
+
if (['id', 'author', 'timestamp'].includes(propertyName)) continue;
|
|
184
|
+
|
|
185
|
+
let predicate: string;
|
|
186
|
+
let resolveLanguage: string | undefined;
|
|
187
|
+
|
|
188
|
+
if (metadata) {
|
|
189
|
+
const propMeta = metadata.properties[propertyName];
|
|
190
|
+
if (propMeta) {
|
|
191
|
+
predicate = propMeta.predicate;
|
|
192
|
+
resolveLanguage = propMeta.resolveLanguage;
|
|
193
|
+
} else {
|
|
194
|
+
// Property not found in metadata — treat name as raw predicate URI
|
|
195
|
+
predicate = propertyName;
|
|
196
|
+
}
|
|
197
|
+
} else {
|
|
198
|
+
// No metadata — treat name as raw predicate URI
|
|
199
|
+
predicate = propertyName;
|
|
200
|
+
}
|
|
201
|
+
|
|
202
|
+
const cond = buildWhereCondition(predicate, condition, { resolveLanguage, varIndex: conditions.length });
|
|
203
|
+
if (cond) {
|
|
204
|
+
conditions.push(cond);
|
|
205
|
+
}
|
|
206
|
+
}
|
|
207
|
+
|
|
208
|
+
return conditions;
|
|
209
|
+
}
|
|
@@ -22,7 +22,7 @@ import {
|
|
|
22
22
|
SHACLPropertyShape,
|
|
23
23
|
ConformanceCondition,
|
|
24
24
|
} from "../shacl/SHACLShape";
|
|
25
|
-
import { compileWhereClause } from "./
|
|
25
|
+
import { compileWhereClause } from "./query-utils";
|
|
26
26
|
|
|
27
27
|
// ============================================================================
|
|
28
28
|
// Test models
|
|
@@ -65,7 +65,7 @@ class ParentWithRelations extends Ad4mModel {
|
|
|
65
65
|
unfilteredItems: string[] = [];
|
|
66
66
|
|
|
67
67
|
@HasMany({
|
|
68
|
-
getter: "
|
|
68
|
+
getter: "SELECT ?target WHERE { ?target <test://custom> ?source . }",
|
|
69
69
|
})
|
|
70
70
|
customItems: string[] = [];
|
|
71
71
|
}
|
|
@@ -93,8 +93,8 @@ describe("buildConformanceFilter()", () => {
|
|
|
93
93
|
expect(reqCond!.predicate).toBe("test://name");
|
|
94
94
|
expect(reqCond!.value).toBeUndefined();
|
|
95
95
|
|
|
96
|
-
// Getter string should be a
|
|
97
|
-
expect(result!.getter).toContain("
|
|
96
|
+
// Getter string should be a SPARQL expression
|
|
97
|
+
expect(result!.getter).toContain("SELECT ?target WHERE");
|
|
98
98
|
expect(result!.getter).toContain("test://has_flagged");
|
|
99
99
|
expect(result!.getter).toContain("test://type");
|
|
100
100
|
expect(result!.getter).toContain("test://flagged_type");
|
|
@@ -130,7 +130,7 @@ describe("buildConformanceFilter()", () => {
|
|
|
130
130
|
@Property({
|
|
131
131
|
through: "test://computed",
|
|
132
132
|
required: true,
|
|
133
|
-
getter: "
|
|
133
|
+
getter: "SELECT ?target WHERE { ?target <test://custom> ?source . } LIMIT 1",
|
|
134
134
|
})
|
|
135
135
|
computed: string = "";
|
|
136
136
|
}
|
|
@@ -148,7 +148,7 @@ describe("buildConformanceFilter()", () => {
|
|
|
148
148
|
// ============================================================================
|
|
149
149
|
|
|
150
150
|
describe("SHACL shape getter serialization", () => {
|
|
151
|
-
const testGetter = "
|
|
151
|
+
const testGetter = "SELECT ?target WHERE { <Base> <test://pred> ?target . ?target <test://type> <test://flag> . }";
|
|
152
152
|
const testConditions: ConformanceCondition[] = [
|
|
153
153
|
{ type: "flag", predicate: "test://type", value: "test://flag" },
|
|
154
154
|
{ type: "required", predicate: "test://name" },
|
|
@@ -170,7 +170,7 @@ describe("SHACL shape getter serialization", () => {
|
|
|
170
170
|
// Verify getter link exists
|
|
171
171
|
const getterLink = links.find(l => l.predicate === "ad4m://getter");
|
|
172
172
|
expect(getterLink).toBeDefined();
|
|
173
|
-
expect(getterLink!.target).toBe(`literal
|
|
173
|
+
expect(getterLink!.target).toBe(`literal:string:${testGetter}`);
|
|
174
174
|
|
|
175
175
|
// Verify conditions link exists
|
|
176
176
|
const conditionsLink = links.find(l => l.predicate === "ad4m://conformanceConditions");
|
|
@@ -270,11 +270,18 @@ describe("generateSHACL() relation getter population", () => {
|
|
|
270
270
|
it("should use explicit getter when provided (ignoring auto-generation)", () => {
|
|
271
271
|
const { shape } = (ParentWithRelations as any).generateSHACL();
|
|
272
272
|
|
|
273
|
-
// Getter-only relations have no predicate
|
|
273
|
+
// Getter-only relations have no `through` predicate but must still
|
|
274
|
+
// appear in the SHACL shape so the executor can find the getter; the
|
|
275
|
+
// writer synthesises a deterministic IRI for `sh:path`.
|
|
274
276
|
const customProp = shape.properties.find(
|
|
275
277
|
(p: SHACLPropertyShape) => p.name === "customItems"
|
|
276
278
|
);
|
|
277
|
-
expect(customProp).
|
|
279
|
+
expect(customProp).toBeDefined();
|
|
280
|
+
expect(customProp!.getter).toBe(
|
|
281
|
+
"SELECT ?target WHERE { ?target <test://custom> ?source . }"
|
|
282
|
+
);
|
|
283
|
+
expect(customProp!.path).toBeDefined();
|
|
284
|
+
expect(customProp!.path).toContain("ad4m://getter/");
|
|
278
285
|
});
|
|
279
286
|
|
|
280
287
|
it("should survive full round-trip: generateSHACL → toLinks → fromLinks", () => {
|
|
@@ -299,11 +306,15 @@ describe("generateSHACL() relation getter population", () => {
|
|
|
299
306
|
expect(flaggedProp!.conformanceConditions).toBeDefined();
|
|
300
307
|
expect(flaggedProp!.conformanceConditions!.length).toBeGreaterThan(0);
|
|
301
308
|
|
|
302
|
-
//
|
|
309
|
+
// Getter-only relations now round-trip too — the synthesised path
|
|
310
|
+
// lets the SHACL graph carry the entry through links/fromLinks.
|
|
303
311
|
const customProp = reconstructed.properties.find(
|
|
304
312
|
(p: SHACLPropertyShape) => p.name === "customItems"
|
|
305
313
|
);
|
|
306
|
-
expect(customProp).
|
|
314
|
+
expect(customProp).toBeDefined();
|
|
315
|
+
expect(customProp!.getter).toBe(
|
|
316
|
+
"SELECT ?target WHERE { ?target <test://custom> ?source . }"
|
|
317
|
+
);
|
|
307
318
|
});
|
|
308
319
|
});
|
|
309
320
|
|
|
@@ -338,7 +349,7 @@ describe("Ad4mModel.getModelMetadata() relation filtering fields", () => {
|
|
|
338
349
|
|
|
339
350
|
// Explicit getter provided via decorator (getter-only, no predicate)
|
|
340
351
|
expect(metadata.relations.customItems.getter).toBe(
|
|
341
|
-
"
|
|
352
|
+
"SELECT ?target WHERE { ?target <test://custom> ?source . }"
|
|
342
353
|
);
|
|
343
354
|
expect(metadata.relations.customItems.predicate).toBe("");
|
|
344
355
|
|
|
@@ -388,7 +399,7 @@ describe("Relation decorator validation", () => {
|
|
|
388
399
|
@Model({ name: "InvalidGetterTarget" })
|
|
389
400
|
class _Invalid extends Ad4mModel {
|
|
390
401
|
@HasMany({
|
|
391
|
-
getter: "
|
|
402
|
+
getter: "SELECT ?target WHERE { ?target ?p ?source . }",
|
|
392
403
|
target: () => FlaggedTarget,
|
|
393
404
|
})
|
|
394
405
|
items: string[] = [];
|
|
@@ -401,7 +412,7 @@ describe("Relation decorator validation", () => {
|
|
|
401
412
|
@Model({ name: "InvalidGetterThrough" })
|
|
402
413
|
class _Invalid extends Ad4mModel {
|
|
403
414
|
@HasMany({
|
|
404
|
-
getter: "
|
|
415
|
+
getter: "SELECT ?target WHERE { ?target ?p ?source . }",
|
|
405
416
|
through: "test://pred",
|
|
406
417
|
})
|
|
407
418
|
items: string[] = [];
|
|
@@ -414,7 +425,7 @@ describe("Relation decorator validation", () => {
|
|
|
414
425
|
@Model({ name: "ValidGetterOnly" })
|
|
415
426
|
class _Valid extends Ad4mModel {
|
|
416
427
|
@HasMany({
|
|
417
|
-
getter: "
|
|
428
|
+
getter: "SELECT ?target WHERE { ?target ?p ?source . }",
|
|
418
429
|
})
|
|
419
430
|
items: string[] = [];
|
|
420
431
|
}
|
|
@@ -551,7 +562,7 @@ describe("where clause validation", () => {
|
|
|
551
562
|
class _Invalid extends Ad4mModel {
|
|
552
563
|
@HasMany({
|
|
553
564
|
where: { status: "active" },
|
|
554
|
-
getter: "
|
|
565
|
+
getter: "SELECT ?target WHERE { ?target ?p ?source . }",
|
|
555
566
|
})
|
|
556
567
|
items: string[] = [];
|
|
557
568
|
}
|
|
@@ -574,7 +585,13 @@ describe("where clause validation", () => {
|
|
|
574
585
|
});
|
|
575
586
|
|
|
576
587
|
describe("where clause compilation", () => {
|
|
577
|
-
|
|
588
|
+
// Under the source-of-truth refactor the SHACL writer no longer inlines
|
|
589
|
+
// `where` conditions into the relation's SPARQL getter. Instead it emits
|
|
590
|
+
// `ad4m://whereFilter` + `ad4m://wherePredicates` triples that the
|
|
591
|
+
// Rust executor evaluates as a post-getter pass at query time. These
|
|
592
|
+
// tests assert that contract on the writer side.
|
|
593
|
+
|
|
594
|
+
it("should emit whereFilter and wherePredicates on the relation shape", () => {
|
|
578
595
|
@Model({ name: "WhereTarget" })
|
|
579
596
|
class WhereTarget extends Ad4mModel {
|
|
580
597
|
@Property({ through: "test://status", required: true })
|
|
@@ -595,13 +612,11 @@ describe("where clause compilation", () => {
|
|
|
595
612
|
(p: SHACLPropertyShape) => p.name === "items"
|
|
596
613
|
);
|
|
597
614
|
expect(itemsProp).toBeDefined();
|
|
598
|
-
expect(itemsProp!.
|
|
599
|
-
expect(itemsProp!.
|
|
600
|
-
expect(itemsProp!.getter).toContain("test://status");
|
|
601
|
-
expect(itemsProp!.getter).toContain("active");
|
|
615
|
+
expect(itemsProp!.whereFilter).toEqual({ status: "active" });
|
|
616
|
+
expect(itemsProp!.wherePredicates).toEqual({ status: "test://status" });
|
|
602
617
|
});
|
|
603
618
|
|
|
604
|
-
it("should
|
|
619
|
+
it("should set whereFilter alongside an auto-derived conformance getter when target is provided", () => {
|
|
605
620
|
@Model({ name: "WhereOverrideParent" })
|
|
606
621
|
class WhereOverrideParent extends Ad4mModel {
|
|
607
622
|
@HasMany(() => FlaggedTarget, {
|
|
@@ -616,16 +631,15 @@ describe("where clause compilation", () => {
|
|
|
616
631
|
(p: SHACLPropertyShape) => p.name === "flaggedItems"
|
|
617
632
|
);
|
|
618
633
|
expect(prop).toBeDefined();
|
|
634
|
+
// whereFilter / wherePredicates carry the post-getter filter; type
|
|
635
|
+
// filtering stays on the auto-derived conformance getter.
|
|
636
|
+
expect(prop!.whereFilter).toEqual({ name: "specific" });
|
|
637
|
+
expect(prop!.wherePredicates).toEqual({ name: "test://name" });
|
|
619
638
|
expect(prop!.getter).toBeDefined();
|
|
620
|
-
|
|
621
|
-
expect(prop!.getter).toContain("test://name");
|
|
622
|
-
expect(prop!.getter).toContain("specific");
|
|
623
|
-
// Should NOT contain the auto-derived flag condition
|
|
624
|
-
// (where overrides auto-conformance)
|
|
625
|
-
expect(prop!.getter).not.toContain("test://flagged_type");
|
|
639
|
+
expect(prop!.getter).toContain("test://flagged_type");
|
|
626
640
|
});
|
|
627
641
|
|
|
628
|
-
it("should
|
|
642
|
+
it("should emit whereFilter with a not operator unchanged", () => {
|
|
629
643
|
@Model({ name: "WhereNotTarget" })
|
|
630
644
|
class WhereNotTarget extends Ad4mModel {
|
|
631
645
|
@Property({ through: "test://status" })
|
|
@@ -646,13 +660,11 @@ describe("where clause compilation", () => {
|
|
|
646
660
|
(p: SHACLPropertyShape) => p.name === "items"
|
|
647
661
|
);
|
|
648
662
|
expect(prop).toBeDefined();
|
|
649
|
-
expect(prop!.
|
|
650
|
-
|
|
651
|
-
expect(prop!.getter).toContain("test://status");
|
|
652
|
-
expect(prop!.getter).toContain("archived");
|
|
663
|
+
expect(prop!.whereFilter).toEqual({ status: { not: "archived" } });
|
|
664
|
+
expect(prop!.wherePredicates).toEqual({ status: "test://status" });
|
|
653
665
|
});
|
|
654
666
|
|
|
655
|
-
it("should
|
|
667
|
+
it("should emit whereFilter with array (IN) values unchanged", () => {
|
|
656
668
|
@Model({ name: "WhereArrayTarget" })
|
|
657
669
|
class WhereArrayTarget extends Ad4mModel {
|
|
658
670
|
@Property({ through: "test://category" })
|
|
@@ -673,13 +685,11 @@ describe("where clause compilation", () => {
|
|
|
673
685
|
(p: SHACLPropertyShape) => p.name === "items"
|
|
674
686
|
);
|
|
675
687
|
expect(prop).toBeDefined();
|
|
676
|
-
expect(prop!.
|
|
677
|
-
expect(prop!.
|
|
678
|
-
expect(prop!.getter).toContain("food");
|
|
679
|
-
expect(prop!.getter).toContain("drink");
|
|
688
|
+
expect(prop!.whereFilter).toEqual({ category: ["food", "drink"] });
|
|
689
|
+
expect(prop!.wherePredicates).toEqual({ category: "test://category" });
|
|
680
690
|
});
|
|
681
691
|
|
|
682
|
-
it("should
|
|
692
|
+
it("should emit whereFilter without wherePredicates when target metadata is absent", () => {
|
|
683
693
|
@Model({ name: "WhereNoTargetParent" })
|
|
684
694
|
class WhereNoTargetParent extends Ad4mModel {
|
|
685
695
|
@HasMany({
|
|
@@ -694,12 +704,13 @@ describe("where clause compilation", () => {
|
|
|
694
704
|
(p: SHACLPropertyShape) => p.name === "items"
|
|
695
705
|
);
|
|
696
706
|
expect(prop).toBeDefined();
|
|
697
|
-
expect(prop!.
|
|
698
|
-
|
|
699
|
-
|
|
707
|
+
expect(prop!.whereFilter).toEqual({ "test://status": "active" });
|
|
708
|
+
// Without target metadata the writer cannot resolve property→predicate;
|
|
709
|
+
// the executor falls back to interpreting keys as raw IRIs.
|
|
710
|
+
expect(prop!.wherePredicates).toBeUndefined();
|
|
700
711
|
});
|
|
701
712
|
|
|
702
|
-
it("should set both
|
|
713
|
+
it("should set both whereFilter and sh:class when target is present", () => {
|
|
703
714
|
@Model({ name: "WherePlusClassParent" })
|
|
704
715
|
class WherePlusClassParent extends Ad4mModel {
|
|
705
716
|
@HasMany(() => FlaggedTarget, {
|
|
@@ -714,15 +725,12 @@ describe("where clause compilation", () => {
|
|
|
714
725
|
(p: SHACLPropertyShape) => p.name === "flaggedItems"
|
|
715
726
|
);
|
|
716
727
|
expect(prop).toBeDefined();
|
|
717
|
-
|
|
718
|
-
expect(prop!.getter).toBeDefined();
|
|
719
|
-
expect(prop!.getter).toContain("specific");
|
|
720
|
-
// sh:class still set (target is present)
|
|
728
|
+
expect(prop!.whereFilter).toEqual({ name: "specific" });
|
|
721
729
|
expect(prop!.class).toBeDefined();
|
|
722
730
|
expect(prop!.class).toContain("FlaggedTarget");
|
|
723
731
|
});
|
|
724
732
|
|
|
725
|
-
it("should round-trip
|
|
733
|
+
it("should round-trip whereFilter and wherePredicates through toLinks/fromLinks", () => {
|
|
726
734
|
@Model({ name: "WhereRoundTripTarget" })
|
|
727
735
|
class WhereRoundTripTarget extends Ad4mModel {
|
|
728
736
|
@Property({ through: "test://status", required: true })
|
|
@@ -749,9 +757,8 @@ describe("where clause compilation", () => {
|
|
|
749
757
|
(p: SHACLPropertyShape) => p.name === "items"
|
|
750
758
|
);
|
|
751
759
|
expect(prop).toBeDefined();
|
|
752
|
-
expect(prop!.
|
|
753
|
-
expect(prop!.
|
|
754
|
-
expect(prop!.getter).toContain("active");
|
|
760
|
+
expect(prop!.whereFilter).toEqual({ status: "active" });
|
|
761
|
+
expect(prop!.wherePredicates).toEqual({ status: "test://status" });
|
|
755
762
|
});
|
|
756
763
|
});
|
|
757
764
|
|
|
@@ -760,7 +767,7 @@ describe("where clause compilation", () => {
|
|
|
760
767
|
// ============================================================================
|
|
761
768
|
|
|
762
769
|
describe("compileWhereClause()", () => {
|
|
763
|
-
it("should compile simple equality to
|
|
770
|
+
it("should compile simple equality to SPARQL condition", () => {
|
|
764
771
|
const conditions = compileWhereClause(
|
|
765
772
|
{ status: "active" },
|
|
766
773
|
{ properties: { status: { name: "status", predicate: "test://status", required: false, readOnly: false } }, relations: {}, className: "Test" }
|
|
@@ -776,7 +783,7 @@ describe("compileWhereClause()", () => {
|
|
|
776
783
|
{ properties: { status: { name: "status", predicate: "test://status", required: false, readOnly: false } }, relations: {}, className: "Test" }
|
|
777
784
|
);
|
|
778
785
|
expect(conditions).toHaveLength(1);
|
|
779
|
-
expect(conditions[0]).toContain("
|
|
786
|
+
expect(conditions[0]).toContain("NOT EXISTS"); // negation
|
|
780
787
|
expect(conditions[0]).toContain("archived");
|
|
781
788
|
});
|
|
782
789
|
|
package/src/model/sdna.ts
CHANGED
|
@@ -89,7 +89,7 @@ export function buildSDNA(
|
|
|
89
89
|
// Optional properties (required: false) are excluded — they should
|
|
90
90
|
// remain unset (undefined) until explicitly assigned.
|
|
91
91
|
const effectiveInitial = initial
|
|
92
|
-
?? (required && writable && !flag && through ? "literal
|
|
92
|
+
?? (required && writable && !flag && through ? "literal:string:" : undefined);
|
|
93
93
|
|
|
94
94
|
if (effectiveInitial) {
|
|
95
95
|
constructorActions.push({
|