@coasys/ad4m 0.13.0-test-6 → 0.13.0-test-8
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/lib/index.cjs +1103 -747
- package/lib/index.js +1090 -747
- package/lib/src/Ad4mClient.d.ts +4 -1
- package/lib/src/Ad4mClient.js +2 -2
- package/lib/src/agent/AgentClient.js +17 -0
- package/lib/src/ai/AIClient.js +1 -1
- package/lib/src/apiClient.d.ts +5 -1
- package/lib/src/apiClient.js +14 -6
- package/lib/src/generated/rest/AIModelLoadingStatus.d.ts +7 -0
- package/lib/src/generated/rest/AIModelLoadingStatus.js +2 -0
- package/lib/src/generated/rest/AddAgentInfosRequest.d.ts +3 -0
- package/lib/src/generated/rest/AddAgentInfosRequest.js +2 -0
- package/lib/src/generated/rest/AddLinkExpressionRequest.d.ts +6 -0
- package/lib/src/generated/rest/AddLinkExpressionRequest.js +1 -0
- package/lib/src/generated/rest/AddLinkRequest.d.ts +6 -0
- package/lib/src/generated/rest/AddLinkRequest.js +1 -0
- package/lib/src/generated/rest/AddLinksBulkRequest.d.ts +6 -0
- package/lib/src/generated/rest/AddLinksBulkRequest.js +1 -0
- package/lib/src/generated/rest/AddSdnaRequest.d.ts +6 -0
- package/lib/src/generated/rest/AddSdnaRequest.js +2 -0
- package/lib/src/generated/rest/ApplyTemplateRequest.d.ts +4 -0
- package/lib/src/generated/rest/ApplyTemplateRequest.js +2 -0
- package/lib/src/generated/rest/AuthInfoInput.d.ts +10 -0
- package/lib/src/generated/rest/AuthInfoInput.js +1 -0
- package/lib/src/generated/rest/BroadcastRequest.d.ts +6 -0
- package/lib/src/generated/rest/BroadcastRequest.js +1 -0
- package/lib/src/generated/rest/CapabilityInput.d.ts +5 -0
- package/lib/src/generated/rest/CapabilityInput.js +1 -0
- package/lib/src/generated/rest/CommitBatchRequest.d.ts +3 -0
- package/lib/src/generated/rest/CommitBatchRequest.js +2 -0
- package/lib/src/generated/rest/ComputeLogEntry.d.ts +9 -0
- package/lib/src/generated/rest/ComputeLogEntry.js +2 -0
- package/lib/src/generated/rest/CreateExpressionRequest.d.ts +4 -0
- package/lib/src/generated/rest/CreateExpressionRequest.js +2 -0
- package/lib/src/generated/rest/CreatePerspectiveRequest.d.ts +3 -0
- package/lib/src/generated/rest/CreatePerspectiveRequest.js +2 -0
- package/lib/src/generated/rest/CreateSubjectRequest.d.ts +6 -0
- package/lib/src/generated/rest/CreateSubjectRequest.js +2 -0
- package/lib/src/generated/rest/CreateUserRequest.d.ts +4 -0
- package/lib/src/generated/rest/CreateUserRequest.js +2 -0
- package/lib/src/generated/rest/CreateUserResponse.d.ts +5 -0
- package/lib/src/generated/rest/CreateUserResponse.js +2 -0
- package/lib/src/generated/rest/DecoratedExpressionProof.d.ts +6 -0
- package/lib/src/generated/rest/DecoratedExpressionProof.js +2 -0
- package/lib/src/generated/rest/DecoratedLinkExpression.d.ts +10 -0
- package/lib/src/generated/rest/DecoratedLinkExpression.js +1 -0
- package/lib/src/generated/rest/DisposeQueryRequest.d.ts +3 -0
- package/lib/src/generated/rest/DisposeQueryRequest.js +2 -0
- package/lib/src/generated/rest/EmailTestRequest.d.ts +6 -0
- package/lib/src/generated/rest/EmailTestRequest.js +2 -0
- package/lib/src/generated/rest/EmbedRequest.d.ts +4 -0
- package/lib/src/generated/rest/EmbedRequest.js +2 -0
- package/lib/src/generated/rest/EntanglementProofInput.d.ts +6 -0
- package/lib/src/generated/rest/EntanglementProofInput.js +2 -0
- package/lib/src/generated/rest/EntanglementProofPreflightRequest.d.ts +4 -0
- package/lib/src/generated/rest/EntanglementProofPreflightRequest.js +2 -0
- package/lib/src/generated/rest/ExecuteCommandsRequest.d.ts +4 -0
- package/lib/src/generated/rest/ExecuteCommandsRequest.js +2 -0
- package/lib/src/generated/rest/ExportRequest.d.ts +5 -0
- package/lib/src/generated/rest/ExportRequest.js +2 -0
- package/lib/src/generated/rest/ExpressionManyRequest.d.ts +3 -0
- package/lib/src/generated/rest/ExpressionManyRequest.js +2 -0
- package/lib/src/generated/rest/ExpressionProof.d.ts +4 -0
- package/lib/src/generated/rest/ExpressionProof.js +2 -0
- package/lib/src/generated/rest/ExpressionProofInput.d.ts +6 -0
- package/lib/src/generated/rest/ExpressionProofInput.js +2 -0
- package/lib/src/generated/rest/FriendSendMessageRequest.d.ts +3 -0
- package/lib/src/generated/rest/FriendSendMessageRequest.js +2 -0
- package/lib/src/generated/rest/FriendsListRequest.d.ts +3 -0
- package/lib/src/generated/rest/FriendsListRequest.js +2 -0
- package/lib/src/generated/rest/GenerateAgentRequest.d.ts +3 -0
- package/lib/src/generated/rest/GenerateAgentRequest.js +2 -0
- package/lib/src/generated/rest/GenerateJwtRequest.d.ts +4 -0
- package/lib/src/generated/rest/GenerateJwtRequest.js +2 -0
- package/lib/src/generated/rest/GetSubjectDataRequest.d.ts +4 -0
- package/lib/src/generated/rest/GetSubjectDataRequest.js +2 -0
- package/lib/src/generated/rest/HostingInfoResponse.d.ts +5 -0
- package/lib/src/generated/rest/HostingInfoResponse.js +2 -0
- package/lib/src/generated/rest/HostingWalletResponse.d.ts +4 -0
- package/lib/src/generated/rest/HostingWalletResponse.js +2 -0
- package/lib/src/generated/rest/ImportAgentRequest.d.ts +6 -0
- package/lib/src/generated/rest/ImportAgentRequest.js +2 -0
- package/lib/src/generated/rest/ImportRequest.d.ts +4 -0
- package/lib/src/generated/rest/ImportRequest.js +2 -0
- package/lib/src/generated/rest/JoinNeighbourhoodRequest.d.ts +3 -0
- package/lib/src/generated/rest/JoinNeighbourhoodRequest.js +2 -0
- package/lib/src/generated/rest/KeepAliveQueryRequest.d.ts +3 -0
- package/lib/src/generated/rest/KeepAliveQueryRequest.js +2 -0
- package/lib/src/generated/rest/LanguageMetaInput.d.ts +6 -0
- package/lib/src/generated/rest/LanguageMetaInput.js +2 -0
- package/lib/src/generated/rest/Link.d.ts +5 -0
- package/lib/src/generated/rest/Link.js +2 -0
- package/lib/src/generated/rest/LinkExpression.d.ts +10 -0
- package/lib/src/generated/rest/LinkExpression.js +1 -0
- package/lib/src/generated/rest/LinkExpressionInput.d.ts +10 -0
- package/lib/src/generated/rest/LinkExpressionInput.js +1 -0
- package/lib/src/generated/rest/LinkInput.d.ts +5 -0
- package/lib/src/generated/rest/LinkInput.js +2 -0
- package/lib/src/generated/rest/LinkLanguageTemplatesRequest.d.ts +3 -0
- package/lib/src/generated/rest/LinkLanguageTemplatesRequest.js +2 -0
- package/lib/src/generated/rest/LinkMutationRequest.d.ts +12 -0
- package/lib/src/generated/rest/LinkMutationRequest.js +1 -0
- package/lib/src/generated/rest/LinkMutationResponse.d.ts +9 -0
- package/lib/src/generated/rest/LinkMutationResponse.js +1 -0
- package/lib/src/generated/rest/LinkMutations.d.ts +6 -0
- package/lib/src/generated/rest/LinkMutations.js +1 -0
- package/lib/src/generated/rest/LinkMutationsRequest.d.ts +5 -0
- package/lib/src/generated/rest/LinkMutationsRequest.js +1 -0
- package/lib/src/generated/rest/LinkStatus.d.ts +1 -0
- package/lib/src/generated/rest/LinkStatus.js +2 -0
- package/lib/src/generated/rest/LinkUpdateInput.d.ts +5 -0
- package/lib/src/generated/rest/LinkUpdateInput.js +1 -0
- package/lib/src/generated/rest/LockAgentRequest.d.ts +3 -0
- package/lib/src/generated/rest/LockAgentRequest.js +2 -0
- package/lib/src/generated/rest/LoginUserRequest.d.ts +5 -0
- package/lib/src/generated/rest/LoginUserRequest.js +2 -0
- package/lib/src/generated/rest/ModelType.d.ts +1 -0
- package/lib/src/generated/rest/ModelType.js +2 -0
- package/lib/src/generated/rest/NotificationGrantRequest.d.ts +3 -0
- package/lib/src/generated/rest/NotificationGrantRequest.js +2 -0
- package/lib/src/generated/rest/NotificationInput.d.ts +10 -0
- package/lib/src/generated/rest/NotificationInput.js +2 -0
- package/lib/src/generated/rest/OpenLinkRequest.d.ts +3 -0
- package/lib/src/generated/rest/OpenLinkRequest.js +2 -0
- package/lib/src/generated/rest/PermitCapabilityRequest.d.ts +3 -0
- package/lib/src/generated/rest/PermitCapabilityRequest.js +2 -0
- package/lib/src/generated/rest/PerspectiveInput.d.ts +4 -0
- package/lib/src/generated/rest/PerspectiveInput.js +1 -0
- package/lib/src/generated/rest/PromptRequest.d.ts +4 -0
- package/lib/src/generated/rest/PromptRequest.js +2 -0
- package/lib/src/generated/rest/PublicPerspectiveInput.d.ts +4 -0
- package/lib/src/generated/rest/PublicPerspectiveInput.js +1 -0
- package/lib/src/generated/rest/PublishLanguageRequest.d.ts +5 -0
- package/lib/src/generated/rest/PublishLanguageRequest.js +1 -0
- package/lib/src/generated/rest/PublishNeighbourhoodRequest.d.ts +6 -0
- package/lib/src/generated/rest/PublishNeighbourhoodRequest.js +1 -0
- package/lib/src/generated/rest/QueryRequest.d.ts +7 -0
- package/lib/src/generated/rest/QueryRequest.js +2 -0
- package/lib/src/generated/rest/RemoveLinkRequest.d.ts +5 -0
- package/lib/src/generated/rest/RemoveLinkRequest.js +1 -0
- package/lib/src/generated/rest/RemoveLinksBulkRequest.d.ts +5 -0
- package/lib/src/generated/rest/RemoveLinksBulkRequest.js +1 -0
- package/lib/src/generated/rest/RequestCapabilityRequest.d.ts +4 -0
- package/lib/src/generated/rest/RequestCapabilityRequest.js +1 -0
- package/lib/src/generated/rest/RequestPaymentRequest.d.ts +3 -0
- package/lib/src/generated/rest/RequestPaymentRequest.js +2 -0
- package/lib/src/generated/rest/RequestVerificationRequest.d.ts +4 -0
- package/lib/src/generated/rest/RequestVerificationRequest.js +2 -0
- package/lib/src/generated/rest/ResourceInput.d.ts +4 -0
- package/lib/src/generated/rest/ResourceInput.js +2 -0
- package/lib/src/generated/rest/SetDefaultModelRequest.d.ts +4 -0
- package/lib/src/generated/rest/SetDefaultModelRequest.js +1 -0
- package/lib/src/generated/rest/SetFreeHostingEnabledRequest.d.ts +3 -0
- package/lib/src/generated/rest/SetFreeHostingEnabledRequest.js +2 -0
- package/lib/src/generated/rest/SetHotWalletAddressRequest.d.ts +3 -0
- package/lib/src/generated/rest/SetHotWalletAddressRequest.js +2 -0
- package/lib/src/generated/rest/SetMultiUserRequest.d.ts +3 -0
- package/lib/src/generated/rest/SetMultiUserRequest.js +2 -0
- package/lib/src/generated/rest/SetOnlineStatusRequest.d.ts +5 -0
- package/lib/src/generated/rest/SetOnlineStatusRequest.js +1 -0
- package/lib/src/generated/rest/SetStatusRequest.d.ts +3 -0
- package/lib/src/generated/rest/SetStatusRequest.js +2 -0
- package/lib/src/generated/rest/SetUserFreeAccessRequest.d.ts +4 -0
- package/lib/src/generated/rest/SetUserFreeAccessRequest.js +2 -0
- package/lib/src/generated/rest/SignMessageRequest.d.ts +3 -0
- package/lib/src/generated/rest/SignMessageRequest.js +2 -0
- package/lib/src/generated/rest/SignalRequest.d.ts +6 -0
- package/lib/src/generated/rest/SignalRequest.js +1 -0
- package/lib/src/generated/rest/SubscribeQueryRequest.d.ts +3 -0
- package/lib/src/generated/rest/SubscribeQueryRequest.js +2 -0
- package/lib/src/generated/rest/SubscribeQueryResponse.d.ts +4 -0
- package/lib/src/generated/rest/SubscribeQueryResponse.js +2 -0
- package/lib/src/generated/rest/TrustedAgentsRequest.d.ts +3 -0
- package/lib/src/generated/rest/TrustedAgentsRequest.js +2 -0
- package/lib/src/generated/rest/UnlockAgentRequest.d.ts +4 -0
- package/lib/src/generated/rest/UnlockAgentRequest.js +2 -0
- package/lib/src/generated/rest/UpdateLinkRequest.d.ts +7 -0
- package/lib/src/generated/rest/UpdateLinkRequest.js +1 -0
- package/lib/src/generated/rest/UpdatePerspectiveRequest.d.ts +3 -0
- package/lib/src/generated/rest/UpdatePerspectiveRequest.js +2 -0
- package/lib/src/generated/rest/UpdateProfileRequest.d.ts +5 -0
- package/lib/src/generated/rest/UpdateProfileRequest.js +1 -0
- package/lib/src/generated/rest/UserStatistics.d.ts +9 -0
- package/lib/src/generated/rest/UserStatistics.js +2 -0
- package/lib/src/generated/rest/VerificationRequestResult.d.ts +6 -0
- package/lib/src/generated/rest/VerificationRequestResult.js +2 -0
- package/lib/src/generated/rest/VerifyEmailRequest.d.ts +6 -0
- package/lib/src/generated/rest/VerifyEmailRequest.js +2 -0
- package/lib/src/generated/rest/VerifySignatureRequest.d.ts +5 -0
- package/lib/src/generated/rest/VerifySignatureRequest.js +2 -0
- package/lib/src/generated/rest/WriteSettingsRequest.d.ts +3 -0
- package/lib/src/generated/rest/WriteSettingsRequest.js +2 -0
- package/lib/src/generated/rest/index.d.ts +73 -0
- package/lib/src/generated/rest/index.js +8 -0
- package/lib/src/generated/rest/routes.d.ts +587 -0
- package/lib/src/generated/rest/routes.js +3 -0
- package/lib/src/index.d.ts +4 -0
- package/lib/src/index.js +4 -0
- package/lib/src/model/Ad4mModel.d.ts +30 -21
- package/lib/src/model/Ad4mModel.js +93 -316
- package/lib/src/model/Ad4mModel.test.js +1536 -535
- package/lib/src/model/ModelQueryBuilder.d.ts +5 -10
- package/lib/src/model/ModelQueryBuilder.js +136 -47
- package/lib/src/model/Subject.js +6 -6
- package/lib/src/model/decorators.d.ts +7 -4
- package/lib/src/model/decorators.js +0 -7
- 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/query-cache.test.d.ts +1 -0
- package/lib/src/model/query-cache.test.js +43 -0
- 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 +0 -10
- package/lib/src/model/query-sparql.js +10 -15
- package/lib/src/model/query-sparql.test.d.ts +1 -0
- package/lib/src/model/query-sparql.test.js +230 -0
- package/lib/src/model/relation-filtering.test.js +15 -15
- package/lib/src/model/shacl-gen.js +120 -47
- 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 +140 -4
- package/lib/src/neighbourhood/NeighbourhoodProxy.test.js +33 -33
- package/lib/src/perspectives/PerspectiveClient.d.ts +13 -4
- package/lib/src/perspectives/PerspectiveClient.js +22 -6
- package/lib/src/perspectives/PerspectiveClient.test.d.ts +1 -0
- package/lib/src/perspectives/PerspectiveClient.test.js +224 -0
- package/lib/src/perspectives/PerspectiveProxy.d.ts +27 -7
- package/lib/src/perspectives/PerspectiveProxy.js +60 -12
- package/lib/src/perspectives/PerspectiveProxy.test.d.ts +1 -0
- package/lib/src/perspectives/PerspectiveProxy.test.js +34 -0
- 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.js +5 -4
- package/lib/src/restClient.d.ts +52 -0
- package/lib/src/restClient.js +227 -0
- package/lib/src/runtime/RuntimeResolver.d.ts +28 -1
- package/lib/src/runtime/RuntimeResolver.js +197 -4
- package/lib/src/schema.gql +27 -1
- package/lib/src/shacl/NodeExpression.d.ts +44 -0
- package/lib/src/shacl/NodeExpression.js +39 -0
- package/lib/src/shacl/SHACLShape.d.ts +23 -0
- package/lib/src/shacl/SHACLShape.js +115 -1
- package/lib/src/shacl/builders.d.ts +58 -0
- package/lib/src/shacl/builders.js +76 -0
- package/lib/src/shacl/index.d.ts +36 -0
- package/lib/src/shacl/index.js +33 -0
- package/package.json +1 -1
- package/src/Ad4mClient.ts +7 -2
- package/src/agent/AgentClient.ts +23 -0
- package/src/ai/AIClient.ts +1 -1
- package/src/apiClient.ts +17 -6
- package/src/index.ts +4 -0
- package/src/model/Ad4mModel.test.ts +274 -72
- package/src/model/Ad4mModel.ts +141 -350
- package/src/model/ModelQueryBuilder.ts +131 -56
- package/src/model/decorators.ts +7 -13
- package/src/model/query-sparql.test.ts +35 -19
- package/src/model/query-sparql.ts +10 -16
- package/src/model/relation-filtering.test.ts +46 -39
- package/src/model/shacl-gen.ts +128 -54
- package/src/model/shacl-roundtrip.test.ts +197 -0
- package/src/model/types-typed-query.test.ts +360 -0
- package/src/model/types.ts +196 -4
- package/src/perspectives/PerspectiveClient.ts +24 -8
- package/src/perspectives/PerspectiveProxy.test.ts +85 -1
- package/src/perspectives/PerspectiveProxy.ts +65 -20
- package/src/perspectives/SparqlBindings.ts +79 -0
- package/src/perspectives/WakerSubscriptionManager.ts +5 -4
- package/src/shacl/NodeExpression.ts +54 -0
- package/src/shacl/SHACLShape.test.ts +172 -0
- package/src/shacl/SHACLShape.ts +173 -1
- package/src/shacl/builders.ts +86 -0
- package/src/shacl/index.ts +72 -0
|
@@ -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", () => {
|
|
@@ -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 { escapeQueryString } from "../utils";
|
|
11
|
-
import { compileWhereClause } from "./query-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) {
|
|
@@ -112,9 +109,19 @@ export function buildSHACL(subjectName, target, properties, allRelationsMeta, co
|
|
|
112
109
|
if (propMeta.writable !== undefined) {
|
|
113
110
|
propShape.writable = propMeta.writable;
|
|
114
111
|
}
|
|
115
|
-
if (propMeta.resolveLanguage) {
|
|
112
|
+
if (propMeta.resolveLanguage != null) {
|
|
116
113
|
propShape.resolveLanguage = propMeta.resolveLanguage;
|
|
117
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
|
+
}
|
|
121
|
+
// Serializable transform expression (SHACL-AF Node Expression)
|
|
122
|
+
if (propMeta.transform) {
|
|
123
|
+
propShape.transform = propMeta.transform;
|
|
124
|
+
}
|
|
118
125
|
// ── Setter actions ──────────────────────────────────────────────
|
|
119
126
|
if (propMeta.prologSetter) {
|
|
120
127
|
console.warn(`[SHACL Generation] Custom Prolog setter for property '${propName}' in class '${subjectName}' is not yet supported. ` +
|
|
@@ -153,63 +160,82 @@ export function buildSHACL(subjectName, target, properties, allRelationsMeta, co
|
|
|
153
160
|
shape.addProperty(propShape);
|
|
154
161
|
}
|
|
155
162
|
// ── Convert relations to SHACL property shapes ─────────────────────
|
|
156
|
-
for (const relName in
|
|
157
|
-
const relMeta =
|
|
158
|
-
|
|
163
|
+
for (const relName in allRelationsMeta) {
|
|
164
|
+
const relMeta = allRelationsMeta[relName];
|
|
165
|
+
// Getter-only relations (no `through`) have no real link predicate
|
|
166
|
+
// but still need a SHACL property entry so the executor can find
|
|
167
|
+
// the getter expression. Synthesize a deterministic IRI so the
|
|
168
|
+
// SHACL graph is well-formed; the predicate is never used to match
|
|
169
|
+
// links because the getter is the sole source of values. Use
|
|
170
|
+
// slash separators so the result is a valid IRI (colons in the
|
|
171
|
+
// authority confuse strict SPARQL IRI parsers).
|
|
172
|
+
if (!relMeta.predicate && !relMeta.getter)
|
|
159
173
|
continue;
|
|
174
|
+
const synthesizedPath = relMeta.predicate
|
|
175
|
+
|| `ad4m://getter/${subjectName}/${relName}`;
|
|
160
176
|
const relShape = {
|
|
161
177
|
name: relName,
|
|
162
|
-
path:
|
|
178
|
+
path: synthesizedPath,
|
|
163
179
|
};
|
|
164
180
|
// Relations typically contain IRIs
|
|
165
181
|
relShape.nodeKind = 'IRI';
|
|
182
|
+
// Encode relation kind so the executor can derive direction and
|
|
183
|
+
// scalar-vs-collection rendering without consulting the JS class.
|
|
184
|
+
relShape.relationKind = relMeta.kind;
|
|
185
|
+
// Scalar relations cap at 1.
|
|
186
|
+
if (relMeta.kind === 'hasOne' || relMeta.kind === 'belongsToOne') {
|
|
187
|
+
relShape.maxCount = 1;
|
|
188
|
+
}
|
|
189
|
+
else if (relMeta.maxCount !== undefined) {
|
|
190
|
+
relShape.maxCount = relMeta.maxCount;
|
|
191
|
+
}
|
|
192
|
+
// Encode opt-out of type filtering (default true; only emit when false).
|
|
193
|
+
if (relMeta.filter === false) {
|
|
194
|
+
relShape.filter = false;
|
|
195
|
+
}
|
|
166
196
|
// AD4M-specific metadata
|
|
167
197
|
if (relMeta.local !== undefined) {
|
|
168
198
|
relShape.local = relMeta.local;
|
|
169
199
|
}
|
|
170
|
-
// Adder
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
200
|
+
// Adder / Remover actions — only meaningful for relations backed
|
|
201
|
+
// by a real link predicate. Getter-only relations are read-only.
|
|
202
|
+
if (relMeta.predicate) {
|
|
203
|
+
relShape.adder = [{
|
|
204
|
+
action: "addLink",
|
|
205
|
+
source: "this",
|
|
206
|
+
predicate: relMeta.predicate,
|
|
207
|
+
target: "value",
|
|
208
|
+
...(relMeta.local && { local: true })
|
|
209
|
+
}];
|
|
210
|
+
relShape.remover = [{
|
|
211
|
+
action: "removeLink",
|
|
212
|
+
source: "this",
|
|
213
|
+
predicate: relMeta.predicate,
|
|
214
|
+
target: "value",
|
|
215
|
+
...(relMeta.local && { local: true })
|
|
216
|
+
}];
|
|
217
|
+
}
|
|
186
218
|
// ── Build Getter (conformance filter) ───────────────────────────
|
|
187
219
|
// Priority chain:
|
|
188
220
|
// 1. Explicit getter string → use verbatim
|
|
189
|
-
// 2.
|
|
190
|
-
//
|
|
221
|
+
// 2. target + filter !== false → auto-derive conformance getter
|
|
222
|
+
// from the shape. Where-clause filtering is applied as a
|
|
223
|
+
// post-getter pass via `whereFilter` / `wherePredicates`, which
|
|
224
|
+
// use `parse_literal_value` and so transparently handle
|
|
225
|
+
// `literal:json:` envelopes that simple FILTER(STR(?x) = ...)
|
|
226
|
+
// comparisons can't.
|
|
191
227
|
if (relMeta.getter) {
|
|
192
228
|
relShape.getter = relMeta.getter;
|
|
193
229
|
}
|
|
194
|
-
else if (relMeta.
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
? TargetClass.getModelMetadata?.() ?? null
|
|
199
|
-
: null;
|
|
200
|
-
const conditions = compileWhereClause(relMeta.where, targetMetadata);
|
|
201
|
-
if (conditions.length > 0) {
|
|
202
|
-
const escapedPredicate = escapeQueryString(relMeta.predicate);
|
|
203
|
-
relShape.getter = `SELECT ?target WHERE { <Base> <${escapedPredicate}> ?target . ${conditions.join(' ')} }`;
|
|
204
|
-
}
|
|
205
|
-
}
|
|
206
|
-
catch (e) {
|
|
207
|
-
// Target metadata may not be available yet
|
|
208
|
-
}
|
|
209
|
-
}
|
|
210
|
-
else if (relMeta.target && relMeta.filter !== false) {
|
|
230
|
+
else if (relMeta.target
|
|
231
|
+
&& relMeta.filter !== false
|
|
232
|
+
&& relMeta.kind !== 'belongsToOne'
|
|
233
|
+
&& relMeta.kind !== 'belongsToMany') {
|
|
211
234
|
// Lazy conformance filter: store deferred reference,
|
|
212
|
-
// resolve on first access via a getter on relShape
|
|
235
|
+
// resolve on first access via a getter on relShape.
|
|
236
|
+
// Skipped for reverse relations (belongsTo*) because the
|
|
237
|
+
// auto-derived getter assumes forward direction; the executor's
|
|
238
|
+
// `resolve_reverse_relations` already populates these correctly.
|
|
213
239
|
const targetThunk = relMeta.target;
|
|
214
240
|
const predicate = relMeta.predicate;
|
|
215
241
|
let resolved = false;
|
|
@@ -246,6 +272,8 @@ export function buildSHACL(subjectName, target, properties, allRelationsMeta, co
|
|
|
246
272
|
});
|
|
247
273
|
}
|
|
248
274
|
// ── sh:class — target shape reference ───────────────────────────
|
|
275
|
+
// Also emit ad4m:targetClassName so the executor can look up the
|
|
276
|
+
// target class shape through its in-memory cache by bare name.
|
|
249
277
|
if (relMeta.target) {
|
|
250
278
|
try {
|
|
251
279
|
const TargetClass = relMeta.target();
|
|
@@ -253,9 +281,54 @@ export function buildSHACL(subjectName, target, properties, allRelationsMeta, co
|
|
|
253
281
|
if (targetSHACL?.shape?.nodeShapeUri) {
|
|
254
282
|
relShape.class = targetSHACL.shape.nodeShapeUri;
|
|
255
283
|
}
|
|
284
|
+
if (targetSHACL?.name) {
|
|
285
|
+
relShape.targetClassName = targetSHACL.name;
|
|
286
|
+
}
|
|
287
|
+
else {
|
|
288
|
+
const targetProto = TargetClass.prototype;
|
|
289
|
+
if (targetProto?.className) {
|
|
290
|
+
relShape.targetClassName = targetProto.className;
|
|
291
|
+
}
|
|
292
|
+
}
|
|
293
|
+
}
|
|
294
|
+
catch (e) {
|
|
295
|
+
// Target class resolution failed (typically a circular
|
|
296
|
+
// decorator dependency). Since the executor no longer
|
|
297
|
+
// receives target metadata over the wire, dropping the
|
|
298
|
+
// reference here would turn a transient build-time issue
|
|
299
|
+
// into a permanent broken-include at query time. Log
|
|
300
|
+
// loudly so the failure is discoverable.
|
|
301
|
+
console.warn(`[shacl-gen] Failed to resolve target class for relation `
|
|
302
|
+
+ `"${subjectName}.${relName}": ${e instanceof Error ? e.message : String(e)}`);
|
|
303
|
+
}
|
|
304
|
+
}
|
|
305
|
+
// ── Where-clause metadata for post-getter filtering ─────────────
|
|
306
|
+
// The executor uses these to apply where conditions against the
|
|
307
|
+
// target class without needing the target's ModelMetadata at query time.
|
|
308
|
+
if (relMeta.where) {
|
|
309
|
+
relShape.whereFilter = relMeta.where;
|
|
310
|
+
try {
|
|
311
|
+
const TargetClass = relMeta.target?.();
|
|
312
|
+
const targetMetadata = TargetClass
|
|
313
|
+
? TargetClass.getModelMetadata?.() ?? null
|
|
314
|
+
: null;
|
|
315
|
+
if (targetMetadata?.properties) {
|
|
316
|
+
const predicates = {};
|
|
317
|
+
for (const propName of Object.keys(relMeta.where)) {
|
|
318
|
+
if (['id', 'author', 'timestamp'].includes(propName))
|
|
319
|
+
continue;
|
|
320
|
+
const propMeta = targetMetadata.properties[propName];
|
|
321
|
+
if (propMeta?.predicate) {
|
|
322
|
+
predicates[propName] = propMeta.predicate;
|
|
323
|
+
}
|
|
324
|
+
}
|
|
325
|
+
if (Object.keys(predicates).length > 0) {
|
|
326
|
+
relShape.wherePredicates = predicates;
|
|
327
|
+
}
|
|
328
|
+
}
|
|
256
329
|
}
|
|
257
330
|
catch (e) {
|
|
258
|
-
// Target
|
|
331
|
+
// Target metadata may not be available yet
|
|
259
332
|
}
|
|
260
333
|
}
|
|
261
334
|
shape.addProperty(relShape);
|
|
@@ -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
|
+
});
|
|
@@ -0,0 +1,39 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Subscription Pool — deduplicates identical SPARQL subscriptions.
|
|
3
|
+
*
|
|
4
|
+
* When multiple UI components subscribe to the same SPARQL query on the same
|
|
5
|
+
* perspective, the pool shares a single `subscribeQuery()` call and distributes
|
|
6
|
+
* results to all registered callbacks. Hydration happens once per result set,
|
|
7
|
+
* then is shared across all subscribers.
|
|
8
|
+
*
|
|
9
|
+
* Key: `perspectiveUUID + sparqlQuery`
|
|
10
|
+
*/
|
|
11
|
+
import type { PerspectiveProxy } from "../perspectives/PerspectiveProxy";
|
|
12
|
+
type HydrateCallback = (rawResult: any) => Promise<any>;
|
|
13
|
+
type ResultCallback = (hydratedResult: any) => void;
|
|
14
|
+
export interface PooledSubscription {
|
|
15
|
+
/** The initial (hydrated) result */
|
|
16
|
+
initialResult: any;
|
|
17
|
+
/** Unsubscribe this particular callback from the pool */
|
|
18
|
+
dispose: () => void;
|
|
19
|
+
}
|
|
20
|
+
/**
|
|
21
|
+
* Subscribe to a SPARQL query, sharing the underlying subscription
|
|
22
|
+
* with any other subscribers using the same perspective + query.
|
|
23
|
+
*
|
|
24
|
+
* @param perspective - The perspective proxy
|
|
25
|
+
* @param sparqlQuery - The SPARQL query text
|
|
26
|
+
* @param hydrate - Async function that takes raw SPARQL results and returns hydrated results
|
|
27
|
+
* @param onResult - Callback for subsequent result updates (hydrated)
|
|
28
|
+
* @returns PooledSubscription with initial result and dispose function
|
|
29
|
+
*/
|
|
30
|
+
export declare function pooledSubscribe(perspective: PerspectiveProxy, sparqlQuery: string, hydrate: HydrateCallback, onResult: ResultCallback): Promise<PooledSubscription>;
|
|
31
|
+
/**
|
|
32
|
+
* Clear the entire pool (for testing).
|
|
33
|
+
*/
|
|
34
|
+
export declare function clearSubscriptionPool(): void;
|
|
35
|
+
/**
|
|
36
|
+
* Get the current pool size (for testing).
|
|
37
|
+
*/
|
|
38
|
+
export declare function subscriptionPoolSize(): number;
|
|
39
|
+
export {};
|