@coasys/ad4m 0.13.0-test-7 → 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 +1109 -828
- package/lib/index.js +1096 -828
- 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 -36
- package/lib/src/model/Ad4mModel.js +93 -382
- package/lib/src/model/Ad4mModel.test.js +735 -480
- package/lib/src/model/ModelQueryBuilder.d.ts +5 -10
- package/lib/src/model/ModelQueryBuilder.js +142 -62
- package/lib/src/model/decorators.d.ts +7 -4
- package/lib/src/model/decorators.js +0 -7
- 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.js +10 -92
- package/lib/src/model/query-surreal.d.ts +44 -0
- package/lib/src/model/query-surreal.js +249 -0
- package/lib/src/model/shacl-gen.js +120 -47
- package/lib/src/model/surreal-utils.d.ts +42 -0
- package/lib/src/model/surreal-utils.js +128 -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/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/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/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/SHACLShape.test.js +0 -82
- 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 +11 -8
- 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 +140 -420
- package/src/model/ModelQueryBuilder.ts +136 -71
- 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
- package/lib/src/model/model-manifest.d.ts +0 -41
- package/lib/src/model/model-manifest.js +0 -11
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { Ad4mModel } from "./Ad4mModel";
|
|
2
2
|
import { isIncludeProjection } from "./types";
|
|
3
3
|
import { Model, Property, Optional, ReadOnly, HasMany, HasOne, Flag } from "./decorators";
|
|
4
|
+
import { path } from "../shacl/builders";
|
|
4
5
|
|
|
5
6
|
describe("Ad4mModel.getModelMetadata()", () => {
|
|
6
7
|
it("should extract basic model metadata with className", () => {
|
|
@@ -79,24 +80,23 @@ describe("Ad4mModel.getModelMetadata()", () => {
|
|
|
79
80
|
expect(metadata.relations.local.local).toBe(true);
|
|
80
81
|
});
|
|
81
82
|
|
|
82
|
-
it("should
|
|
83
|
+
it("should support NodeExpression transforms in properties", () => {
|
|
84
|
+
// Transforms are now NodeExpression objects, not callable functions
|
|
85
|
+
// The fileToDataUri and other builders are exported from @coasys/ad4m
|
|
86
|
+
const transform = path("test://prefix");
|
|
87
|
+
|
|
83
88
|
@Model({ name: "TransformModel" })
|
|
84
89
|
class TransformModel extends Ad4mModel {
|
|
85
|
-
@Optional({
|
|
90
|
+
@Optional({
|
|
86
91
|
through: "test://data",
|
|
87
|
-
transform
|
|
92
|
+
transform
|
|
88
93
|
})
|
|
89
94
|
data: string = "";
|
|
90
95
|
}
|
|
91
96
|
|
|
92
97
|
const metadata = TransformModel.getModelMetadata();
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
expect(typeof metadata.properties.data.transform).toBe("function");
|
|
96
|
-
|
|
97
|
-
// Test the transform function
|
|
98
|
-
const transformed = metadata.properties.data.transform!("test");
|
|
99
|
-
expect(transformed).toBe("TEST");
|
|
98
|
+
expect(metadata.properties.data).toBeDefined();
|
|
99
|
+
expect(metadata.properties.data.transform).toEqual(transform);
|
|
100
100
|
});
|
|
101
101
|
|
|
102
102
|
it("should extract custom getter and setter from property metadata", () => {
|
|
@@ -645,8 +645,7 @@ describe("Ad4mModel query methods (modelQuery integration)", () => {
|
|
|
645
645
|
jest.clearAllMocks();
|
|
646
646
|
});
|
|
647
647
|
|
|
648
|
-
it("
|
|
649
|
-
// modelQuery returns already-hydrated instances from the Rust executor
|
|
648
|
+
it("routes findAll() through modelQuery", async () => {
|
|
650
649
|
mockPerspective.modelQuery.mockResolvedValue({
|
|
651
650
|
instances: [
|
|
652
651
|
{ id: "literal:recipe1", name: "Pasta", rating: 5, ingredients: ["pasta"] }
|
|
@@ -654,7 +653,7 @@ describe("Ad4mModel query methods (modelQuery integration)", () => {
|
|
|
654
653
|
totalCount: 1
|
|
655
654
|
});
|
|
656
655
|
|
|
657
|
-
const results = await Recipe.findAll(mockPerspective
|
|
656
|
+
const results = await Recipe.findAll(mockPerspective);
|
|
658
657
|
|
|
659
658
|
expect(mockPerspective.modelQuery).toHaveBeenCalledTimes(1);
|
|
660
659
|
expect(mockPerspective.infer).not.toHaveBeenCalled();
|
|
@@ -662,21 +661,6 @@ describe("Ad4mModel query methods (modelQuery integration)", () => {
|
|
|
662
661
|
expect(results[0].name).toBe("Pasta");
|
|
663
662
|
});
|
|
664
663
|
|
|
665
|
-
it("should route through modelQuery when engine is 'prolog' in findAll() (prolog is now no-op)", async () => {
|
|
666
|
-
mockPerspective.modelQuery.mockResolvedValue({
|
|
667
|
-
instances: [
|
|
668
|
-
{ id: "literal:recipe1", name: "Pasta", rating: 5, ingredients: ["pasta"] }
|
|
669
|
-
],
|
|
670
|
-
totalCount: 1
|
|
671
|
-
});
|
|
672
|
-
|
|
673
|
-
const results = await Recipe.findAll(mockPerspective, {}, false);
|
|
674
|
-
|
|
675
|
-
expect(mockPerspective.modelQuery).toHaveBeenCalledTimes(1);
|
|
676
|
-
expect(mockPerspective.infer).not.toHaveBeenCalled();
|
|
677
|
-
expect(results).toHaveLength(1);
|
|
678
|
-
});
|
|
679
|
-
|
|
680
664
|
it("should use SPARQL when engine is 'sparql' in findAllAndCount()", async () => {
|
|
681
665
|
mockPerspective.modelQuery.mockResolvedValue({
|
|
682
666
|
instances: [
|
|
@@ -737,7 +721,7 @@ describe("Ad4mModel query methods (modelQuery integration)", () => {
|
|
|
737
721
|
expect(count).toBe(10);
|
|
738
722
|
});
|
|
739
723
|
|
|
740
|
-
it("
|
|
724
|
+
it("routes ModelQueryBuilder.get() through modelQuery", async () => {
|
|
741
725
|
mockPerspective.modelQuery.mockResolvedValue({
|
|
742
726
|
instances: [
|
|
743
727
|
{ id: "literal:recipe1", name: "Pasta", rating: 5, ingredients: ["pasta"] }
|
|
@@ -747,7 +731,6 @@ describe("Ad4mModel query methods (modelQuery integration)", () => {
|
|
|
747
731
|
|
|
748
732
|
const results = await Recipe.query(mockPerspective)
|
|
749
733
|
.where({ name: "Pasta" })
|
|
750
|
-
.engine('sparql')
|
|
751
734
|
.get();
|
|
752
735
|
|
|
753
736
|
expect(mockPerspective.modelQuery).toHaveBeenCalledTimes(1);
|
|
@@ -756,26 +739,7 @@ describe("Ad4mModel query methods (modelQuery integration)", () => {
|
|
|
756
739
|
expect(results[0].name).toBe("Pasta");
|
|
757
740
|
});
|
|
758
741
|
|
|
759
|
-
it("
|
|
760
|
-
mockPerspective.modelQuery.mockResolvedValue({
|
|
761
|
-
instances: [
|
|
762
|
-
{ id: "literal:recipe1", name: "Pasta", rating: 5, ingredients: ["pasta"] }
|
|
763
|
-
],
|
|
764
|
-
totalCount: 1
|
|
765
|
-
});
|
|
766
|
-
|
|
767
|
-
const results = await Recipe.query(mockPerspective)
|
|
768
|
-
.where({ name: "Pasta" })
|
|
769
|
-
.engine('prolog')
|
|
770
|
-
.get();
|
|
771
|
-
|
|
772
|
-
// engine('prolog') is now a no-op — everything goes through modelQuery
|
|
773
|
-
expect(mockPerspective.modelQuery).toHaveBeenCalledTimes(1);
|
|
774
|
-
expect(mockPerspective.infer).not.toHaveBeenCalled();
|
|
775
|
-
expect(results).toHaveLength(1);
|
|
776
|
-
});
|
|
777
|
-
|
|
778
|
-
it("should use SPARQL when engine is 'sparql' in ModelQueryBuilder.count()", async () => {
|
|
742
|
+
it("routes ModelQueryBuilder.count() through modelQuery", async () => {
|
|
779
743
|
mockPerspective.modelQuery.mockResolvedValue({
|
|
780
744
|
instances: [],
|
|
781
745
|
totalCount: 3
|
|
@@ -783,7 +747,6 @@ describe("Ad4mModel query methods (modelQuery integration)", () => {
|
|
|
783
747
|
|
|
784
748
|
const count = await Recipe.query(mockPerspective)
|
|
785
749
|
.where({ rating: { gt: 4 } })
|
|
786
|
-
.engine('sparql')
|
|
787
750
|
.count();
|
|
788
751
|
|
|
789
752
|
expect(mockPerspective.modelQuery).toHaveBeenCalledTimes(1);
|
|
@@ -791,7 +754,7 @@ describe("Ad4mModel query methods (modelQuery integration)", () => {
|
|
|
791
754
|
expect(count).toBe(3);
|
|
792
755
|
});
|
|
793
756
|
|
|
794
|
-
it("
|
|
757
|
+
it("routes ModelQueryBuilder.paginate() through modelQuery", async () => {
|
|
795
758
|
mockPerspective.modelQuery.mockResolvedValue({
|
|
796
759
|
instances: [
|
|
797
760
|
{ id: "literal:recipe1", name: "Pasta", rating: 5, ingredients: ["pasta"] }
|
|
@@ -801,7 +764,6 @@ describe("Ad4mModel query methods (modelQuery integration)", () => {
|
|
|
801
764
|
|
|
802
765
|
const page = await Recipe.query(mockPerspective)
|
|
803
766
|
.where({ rating: { gt: 3 } })
|
|
804
|
-
.engine('sparql')
|
|
805
767
|
.paginate(10, 1);
|
|
806
768
|
|
|
807
769
|
expect(mockPerspective.modelQuery).toHaveBeenCalledTimes(1);
|
|
@@ -917,7 +879,6 @@ describe("Ad4mModel.count() with advanced where conditions", () => {
|
|
|
917
879
|
// Count recipes with rating > 3 using ModelQueryBuilder
|
|
918
880
|
const count = await Recipe.query(mockPerspective)
|
|
919
881
|
.where({ rating: { gt: 3 } })
|
|
920
|
-
.engine('sparql')
|
|
921
882
|
.count();
|
|
922
883
|
|
|
923
884
|
expect(count).toBe(2);
|
|
@@ -936,7 +897,6 @@ describe("Ad4mModel.count() with advanced where conditions", () => {
|
|
|
936
897
|
// Count using ModelQueryBuilder
|
|
937
898
|
const count = await Recipe.query(mockPerspective)
|
|
938
899
|
.where({ timestamp: { between: [startTimestamp, endTimestamp] } })
|
|
939
|
-
.engine('sparql')
|
|
940
900
|
.count();
|
|
941
901
|
|
|
942
902
|
expect(count).toBe(3);
|
|
@@ -1330,8 +1290,8 @@ describe("ModelQueryBuilder subscribe callback timing", () => {
|
|
|
1330
1290
|
const mockPerspective = {
|
|
1331
1291
|
uuid: "test-uuid",
|
|
1332
1292
|
client: mockClient,
|
|
1333
|
-
modelSubscribe: jest.fn().mockImplementation(async (className: string, queryJson: string
|
|
1334
|
-
return mockClient.modelSubscribe("test-uuid", className, queryJson
|
|
1293
|
+
modelSubscribe: jest.fn().mockImplementation(async (className: string, queryJson: string) => {
|
|
1294
|
+
return mockClient.modelSubscribe("test-uuid", className, queryJson);
|
|
1335
1295
|
}),
|
|
1336
1296
|
getLinks: jest.fn().mockResolvedValue([]),
|
|
1337
1297
|
modelQuery: jest.fn().mockResolvedValue({ instances: [], totalCount: 0 }),
|
|
@@ -1388,8 +1348,8 @@ describe("ModelQueryBuilder paginateSubscribe", () => {
|
|
|
1388
1348
|
const mockPerspective = {
|
|
1389
1349
|
uuid: "test-uuid",
|
|
1390
1350
|
client: mockClient,
|
|
1391
|
-
modelSubscribe: jest.fn().mockImplementation(async (className: string, queryJson: string
|
|
1392
|
-
return mockClient.modelSubscribe("test-uuid", className, queryJson
|
|
1351
|
+
modelSubscribe: jest.fn().mockImplementation(async (className: string, queryJson: string) => {
|
|
1352
|
+
return mockClient.modelSubscribe("test-uuid", className, queryJson);
|
|
1393
1353
|
}),
|
|
1394
1354
|
modelQuery: jest.fn().mockResolvedValue({ instances: [{ id: "item1", type: "test://paginate" }], totalCount: 42 }),
|
|
1395
1355
|
} as any;
|
|
@@ -1445,8 +1405,8 @@ describe("ModelQueryBuilder paginateSubscribe", () => {
|
|
|
1445
1405
|
const mockPerspective = {
|
|
1446
1406
|
uuid: "test-uuid",
|
|
1447
1407
|
client: mockClient,
|
|
1448
|
-
modelSubscribe: jest.fn().mockImplementation(async (className: string, queryJson: string
|
|
1449
|
-
return mockClient.modelSubscribe("test-uuid", className, queryJson
|
|
1408
|
+
modelSubscribe: jest.fn().mockImplementation(async (className: string, queryJson: string) => {
|
|
1409
|
+
return mockClient.modelSubscribe("test-uuid", className, queryJson);
|
|
1450
1410
|
}),
|
|
1451
1411
|
modelQuery: jest.fn().mockImplementation(async () => {
|
|
1452
1412
|
modelQueryCallCount++;
|
|
@@ -1487,6 +1447,177 @@ describe("ModelQueryBuilder paginateSubscribe", () => {
|
|
|
1487
1447
|
});
|
|
1488
1448
|
});
|
|
1489
1449
|
|
|
1450
|
+
// ============================================================================
|
|
1451
|
+
// Subscription keepalive recovery tests
|
|
1452
|
+
// ============================================================================
|
|
1453
|
+
|
|
1454
|
+
describe("ModelQueryBuilder keepalive recovery", () => {
|
|
1455
|
+
beforeEach(() => jest.useFakeTimers());
|
|
1456
|
+
afterEach(() => jest.useRealTimers());
|
|
1457
|
+
|
|
1458
|
+
/**
|
|
1459
|
+
* Helper: build a mock perspective whose keepAliveQuery rejects after
|
|
1460
|
+
* `failAfter` successful calls, simulating a server-side subscription
|
|
1461
|
+
* eviction (returns "Subscription not found"). On resubscribe (a second
|
|
1462
|
+
* modelSubscribe call) it returns a *new* subscription ID.
|
|
1463
|
+
*/
|
|
1464
|
+
function buildMocks(failAfter = 0) {
|
|
1465
|
+
let keepaliveCallCount = 0;
|
|
1466
|
+
let modelSubscribeCallCount = 0;
|
|
1467
|
+
|
|
1468
|
+
const mockClient = {
|
|
1469
|
+
modelSubscribe: jest.fn().mockImplementation(async () => {
|
|
1470
|
+
modelSubscribeCallCount++;
|
|
1471
|
+
return {
|
|
1472
|
+
subscriptionId: `sub-${modelSubscribeCallCount}`,
|
|
1473
|
+
result: { instances: [], totalCount: 0 },
|
|
1474
|
+
};
|
|
1475
|
+
}),
|
|
1476
|
+
subscribeToQueryUpdates: jest.fn().mockImplementation((_id: string, _cb: any) => {
|
|
1477
|
+
return () => {};
|
|
1478
|
+
}),
|
|
1479
|
+
keepAliveQuery: jest.fn().mockImplementation(async () => {
|
|
1480
|
+
keepaliveCallCount++;
|
|
1481
|
+
if (keepaliveCallCount > failAfter) {
|
|
1482
|
+
throw new Error("RPC error 500: Subscription not found");
|
|
1483
|
+
}
|
|
1484
|
+
return true;
|
|
1485
|
+
}),
|
|
1486
|
+
disposeQuerySubscription: jest.fn().mockResolvedValue(true),
|
|
1487
|
+
};
|
|
1488
|
+
|
|
1489
|
+
const mockPerspective = {
|
|
1490
|
+
uuid: "test-uuid",
|
|
1491
|
+
client: mockClient,
|
|
1492
|
+
modelSubscribe: jest.fn().mockImplementation(
|
|
1493
|
+
async (className: string, queryJson: string) =>
|
|
1494
|
+
mockClient.modelSubscribe("test-uuid", className, queryJson)
|
|
1495
|
+
),
|
|
1496
|
+
modelQuery: jest.fn().mockResolvedValue({ instances: [], totalCount: 0 }),
|
|
1497
|
+
getLinks: jest.fn().mockResolvedValue([]),
|
|
1498
|
+
} as any;
|
|
1499
|
+
|
|
1500
|
+
return { mockClient, mockPerspective, getKeepaliveCount: () => keepaliveCallCount, getSubscribeCount: () => modelSubscribeCallCount };
|
|
1501
|
+
}
|
|
1502
|
+
|
|
1503
|
+
it("subscribe: resubscribes when keepalive gets 'Subscription not found'", async () => {
|
|
1504
|
+
const { mockClient, mockPerspective, getSubscribeCount } = buildMocks(/* failAfter */ 1);
|
|
1505
|
+
|
|
1506
|
+
const { Ad4mModel, Model, Flag, Property } = require("./index");
|
|
1507
|
+
|
|
1508
|
+
@Model({ name: "KeepaliveRecoveryTest" })
|
|
1509
|
+
class KeepaliveRecoveryTest extends Ad4mModel {
|
|
1510
|
+
@Flag({ through: "test://type", value: "test://ka" })
|
|
1511
|
+
type: string = "test://ka";
|
|
1512
|
+
@Property({ through: "test://name" })
|
|
1513
|
+
name: string = "";
|
|
1514
|
+
}
|
|
1515
|
+
|
|
1516
|
+
const builder = KeepaliveRecoveryTest.query(mockPerspective);
|
|
1517
|
+
await builder.subscribe(() => {});
|
|
1518
|
+
|
|
1519
|
+
// Initial subscription
|
|
1520
|
+
expect(getSubscribeCount()).toBe(1);
|
|
1521
|
+
|
|
1522
|
+
// First keepalive at 30s — succeeds (failAfter=1)
|
|
1523
|
+
await jest.advanceTimersByTimeAsync(30_000);
|
|
1524
|
+
expect(mockClient.keepAliveQuery).toHaveBeenCalledTimes(1);
|
|
1525
|
+
|
|
1526
|
+
// Second keepalive at 60s — fails → should trigger resubscribe
|
|
1527
|
+
await jest.advanceTimersByTimeAsync(30_000);
|
|
1528
|
+
expect(mockClient.keepAliveQuery).toHaveBeenCalledTimes(2);
|
|
1529
|
+
|
|
1530
|
+
// Allow exponential backoff (2000ms for first retry) + microtask queue to settle
|
|
1531
|
+
await jest.advanceTimersByTimeAsync(2500);
|
|
1532
|
+
|
|
1533
|
+
// A second modelSubscribe call means recovery happened
|
|
1534
|
+
expect(getSubscribeCount()).toBe(2);
|
|
1535
|
+
|
|
1536
|
+
// Clean up
|
|
1537
|
+
builder.dispose();
|
|
1538
|
+
});
|
|
1539
|
+
|
|
1540
|
+
it("countSubscribe: resubscribes when keepalive gets 'Subscription not found'", async () => {
|
|
1541
|
+
const { mockClient, mockPerspective, getSubscribeCount } = buildMocks(0); // fail immediately
|
|
1542
|
+
|
|
1543
|
+
const { Ad4mModel, Model, Flag, Property } = require("./index");
|
|
1544
|
+
|
|
1545
|
+
@Model({ name: "CountKeepaliveTest" })
|
|
1546
|
+
class CountKeepaliveTest extends Ad4mModel {
|
|
1547
|
+
@Flag({ through: "test://type", value: "test://cka" })
|
|
1548
|
+
type: string = "test://cka";
|
|
1549
|
+
@Property({ through: "test://name" })
|
|
1550
|
+
name: string = "";
|
|
1551
|
+
}
|
|
1552
|
+
|
|
1553
|
+
const builder = CountKeepaliveTest.query(mockPerspective);
|
|
1554
|
+
await builder.countSubscribe(() => {});
|
|
1555
|
+
|
|
1556
|
+
expect(getSubscribeCount()).toBe(1);
|
|
1557
|
+
|
|
1558
|
+
// First keepalive at 30s — fails immediately → should trigger resubscribe
|
|
1559
|
+
await jest.advanceTimersByTimeAsync(30_000);
|
|
1560
|
+
// Allow exponential backoff (2000ms for first retry) + microtask queue to settle
|
|
1561
|
+
await jest.advanceTimersByTimeAsync(2500);
|
|
1562
|
+
|
|
1563
|
+
expect(getSubscribeCount()).toBe(2);
|
|
1564
|
+
|
|
1565
|
+
builder.dispose();
|
|
1566
|
+
});
|
|
1567
|
+
|
|
1568
|
+
it("paginateSubscribe: resubscribes when keepalive gets 'Subscription not found'", async () => {
|
|
1569
|
+
const { mockClient, mockPerspective, getSubscribeCount } = buildMocks(0);
|
|
1570
|
+
|
|
1571
|
+
const { Ad4mModel, Model, Flag, Property } = require("./index");
|
|
1572
|
+
|
|
1573
|
+
@Model({ name: "PaginateKeepaliveTest" })
|
|
1574
|
+
class PaginateKeepaliveTest extends Ad4mModel {
|
|
1575
|
+
@Flag({ through: "test://type", value: "test://pka" })
|
|
1576
|
+
type: string = "test://pka";
|
|
1577
|
+
@Property({ through: "test://name" })
|
|
1578
|
+
name: string = "";
|
|
1579
|
+
}
|
|
1580
|
+
|
|
1581
|
+
const builder = PaginateKeepaliveTest.query(mockPerspective);
|
|
1582
|
+
await builder.paginateSubscribe(10, 1, () => {});
|
|
1583
|
+
|
|
1584
|
+
expect(getSubscribeCount()).toBe(1);
|
|
1585
|
+
|
|
1586
|
+
await jest.advanceTimersByTimeAsync(30_000);
|
|
1587
|
+
// Allow exponential backoff (2000ms for first retry) + microtask queue to settle
|
|
1588
|
+
await jest.advanceTimersByTimeAsync(2500);
|
|
1589
|
+
|
|
1590
|
+
expect(getSubscribeCount()).toBe(2);
|
|
1591
|
+
|
|
1592
|
+
builder.dispose();
|
|
1593
|
+
});
|
|
1594
|
+
|
|
1595
|
+
it("subscribe: stops retrying after dispose()", async () => {
|
|
1596
|
+
const { mockClient, mockPerspective } = buildMocks(Infinity); // keepalive always succeeds
|
|
1597
|
+
|
|
1598
|
+
const { Ad4mModel, Model, Flag, Property } = require("./index");
|
|
1599
|
+
|
|
1600
|
+
@Model({ name: "DisposeTest" })
|
|
1601
|
+
class DisposeTest extends Ad4mModel {
|
|
1602
|
+
@Flag({ through: "test://type", value: "test://disp" })
|
|
1603
|
+
type: string = "test://disp";
|
|
1604
|
+
@Property({ through: "test://name" })
|
|
1605
|
+
name: string = "";
|
|
1606
|
+
}
|
|
1607
|
+
|
|
1608
|
+
const builder = DisposeTest.query(mockPerspective);
|
|
1609
|
+
await builder.subscribe(() => {});
|
|
1610
|
+
|
|
1611
|
+
builder.dispose();
|
|
1612
|
+
|
|
1613
|
+
// Advance well past multiple keepalive intervals
|
|
1614
|
+
await jest.advanceTimersByTimeAsync(120_000);
|
|
1615
|
+
|
|
1616
|
+
// No keepalive calls should have happened after dispose
|
|
1617
|
+
expect(mockClient.keepAliveQuery).toHaveBeenCalledTimes(0);
|
|
1618
|
+
});
|
|
1619
|
+
});
|
|
1620
|
+
|
|
1490
1621
|
// ============================================================================
|
|
1491
1622
|
// Performance Optimisation Tests
|
|
1492
1623
|
// ============================================================================
|
|
@@ -1650,7 +1781,7 @@ describe("deepQuery — getter evaluation", () => {
|
|
|
1650
1781
|
let sparqlCalls: string[];
|
|
1651
1782
|
const mockPerspective: any = {
|
|
1652
1783
|
uuid: "test-uuid",
|
|
1653
|
-
modelQuery: jest.fn(async (className: string, queryJson: string
|
|
1784
|
+
modelQuery: jest.fn(async (className: string, queryJson: string) => {
|
|
1654
1785
|
// Return a basic result for the single-instance getData() path
|
|
1655
1786
|
const query = JSON.parse(queryJson);
|
|
1656
1787
|
const id = query?.where?.id;
|
|
@@ -1662,7 +1793,7 @@ describe("deepQuery — getter evaluation", () => {
|
|
|
1662
1793
|
}
|
|
1663
1794
|
return { instances: [], totalCount: 0 };
|
|
1664
1795
|
}),
|
|
1665
|
-
evaluateGetters: jest.fn(async (className: string, instanceIds: string[],
|
|
1796
|
+
evaluateGetters: jest.fn(async (className: string, instanceIds: string[], propertyNames?: string[]) => {
|
|
1666
1797
|
// Return empty results by default — tests can override this mock
|
|
1667
1798
|
const result: Record<string, Record<string, any>> = {};
|
|
1668
1799
|
return result;
|
|
@@ -1719,7 +1850,7 @@ describe("deepQuery — getter evaluation", () => {
|
|
|
1719
1850
|
|
|
1720
1851
|
// Should make exactly 1 RPC call via perspective.evaluateGetters
|
|
1721
1852
|
expect(mockPerspective.evaluateGetters).toHaveBeenCalledTimes(1);
|
|
1722
|
-
const [className, instanceIds,
|
|
1853
|
+
const [className, instanceIds, propertyNames] = mockPerspective.evaluateGetters.mock.calls[0];
|
|
1723
1854
|
expect(className).toBe("DeepQueryTestMessage");
|
|
1724
1855
|
expect(instanceIds).toEqual(["flux://msg-0", "flux://msg-1"]);
|
|
1725
1856
|
expect(propertyNames).toEqual(["replyingTo"]);
|
|
@@ -1733,7 +1864,7 @@ describe("deepQuery — getter evaluation", () => {
|
|
|
1733
1864
|
await DeepQueryTestMessage.evaluateGetters(instances, mockPerspective);
|
|
1734
1865
|
|
|
1735
1866
|
expect(mockPerspective.evaluateGetters).toHaveBeenCalledTimes(1);
|
|
1736
|
-
const [className, instanceIds,
|
|
1867
|
+
const [className, instanceIds, propertyNames] = mockPerspective.evaluateGetters.mock.calls[0];
|
|
1737
1868
|
expect(className).toBe("DeepQueryTestMessage");
|
|
1738
1869
|
expect(instanceIds).toEqual(["flux://msg-0", "flux://msg-1"]);
|
|
1739
1870
|
expect(propertyNames).toBeUndefined();
|
|
@@ -2083,7 +2214,7 @@ describe("IncludeProjection type guard and key splitting", () => {
|
|
|
2083
2214
|
expect(qi.include?.comments).toBe(true);
|
|
2084
2215
|
});
|
|
2085
2216
|
|
|
2086
|
-
it("
|
|
2217
|
+
it("tags projection with targetClassName when relation target is registered", async () => {
|
|
2087
2218
|
await Post.findAll(mockPerspective, {
|
|
2088
2219
|
include: {
|
|
2089
2220
|
$signalCount: { from: "signals", count: true },
|
|
@@ -2093,12 +2224,11 @@ describe("IncludeProjection type guard and key splitting", () => {
|
|
|
2093
2224
|
const [, queryJson] = mockPerspective.modelQuery.mock.calls[0];
|
|
2094
2225
|
const qi = JSON.parse(queryJson);
|
|
2095
2226
|
|
|
2096
|
-
//
|
|
2097
|
-
|
|
2098
|
-
expect(qi.projections?.$signalCount?.targetShape?.className).toBe("Signal");
|
|
2227
|
+
// targetClassName drives the executor's cache lookup for the target shape.
|
|
2228
|
+
expect(qi.projections?.$signalCount?.targetClassName).toBe("Signal");
|
|
2099
2229
|
});
|
|
2100
2230
|
|
|
2101
|
-
it("leaves
|
|
2231
|
+
it("leaves targetClassName absent when relation has no target decorator", async () => {
|
|
2102
2232
|
await Post.findAll(mockPerspective, {
|
|
2103
2233
|
include: {
|
|
2104
2234
|
$commentCount: { from: "comments", count: true },
|
|
@@ -2108,8 +2238,8 @@ describe("IncludeProjection type guard and key splitting", () => {
|
|
|
2108
2238
|
const [, queryJson] = mockPerspective.modelQuery.mock.calls[0];
|
|
2109
2239
|
const qi = JSON.parse(queryJson);
|
|
2110
2240
|
|
|
2111
|
-
// 'comments' HasMany has no target() thunk → no
|
|
2112
|
-
expect(qi.projections?.$commentCount?.
|
|
2241
|
+
// 'comments' HasMany has no target() thunk → no targetClassName
|
|
2242
|
+
expect(qi.projections?.$commentCount?.targetClassName).toBeUndefined();
|
|
2113
2243
|
});
|
|
2114
2244
|
|
|
2115
2245
|
// --- result passthrough ---
|
|
@@ -2126,4 +2256,76 @@ describe("IncludeProjection type guard and key splitting", () => {
|
|
|
2126
2256
|
|
|
2127
2257
|
expect((results[0] as any).$signalCount).toBe(7);
|
|
2128
2258
|
});
|
|
2259
|
+
|
|
2260
|
+
// --- hydration of non-count projections ---
|
|
2261
|
+
|
|
2262
|
+
it("passes through scalar non-count projection value hydrated by Rust", async () => {
|
|
2263
|
+
// Rust hydrates projection targets in-process and returns full JSON objects.
|
|
2264
|
+
// The TS layer receives an already-hydrated object and passes it through.
|
|
2265
|
+
mockPerspective.modelQuery.mockResolvedValueOnce({
|
|
2266
|
+
instances: [{ id: "post://1", title: "Hello", $mySignal: { id: "signal://abc", signalTypeId: "type1" } }],
|
|
2267
|
+
totalCount: 1,
|
|
2268
|
+
});
|
|
2269
|
+
|
|
2270
|
+
const results = await Post.findAll(mockPerspective, {
|
|
2271
|
+
include: { $mySignal: { from: "signals", limit: 1 } },
|
|
2272
|
+
});
|
|
2273
|
+
|
|
2274
|
+
const mySignal = (results[0] as any).$mySignal;
|
|
2275
|
+
expect(mySignal).toMatchObject({ id: "signal://abc", signalTypeId: "type1" });
|
|
2276
|
+
});
|
|
2277
|
+
|
|
2278
|
+
it("passes through array non-count projection values hydrated by Rust", async () => {
|
|
2279
|
+
// Rust hydrates all IRIs in the list and returns full JSON objects.
|
|
2280
|
+
mockPerspective.modelQuery.mockResolvedValueOnce({
|
|
2281
|
+
instances: [{
|
|
2282
|
+
id: "post://1", title: "Hello",
|
|
2283
|
+
$recentSignals: [
|
|
2284
|
+
{ id: "signal://a", signalTypeId: "type1" },
|
|
2285
|
+
{ id: "signal://b", signalTypeId: "type2" },
|
|
2286
|
+
],
|
|
2287
|
+
}],
|
|
2288
|
+
totalCount: 1,
|
|
2289
|
+
});
|
|
2290
|
+
|
|
2291
|
+
const results = await Post.findAll(mockPerspective, {
|
|
2292
|
+
include: { $recentSignals: { from: "signals" } },
|
|
2293
|
+
});
|
|
2294
|
+
|
|
2295
|
+
const sigs = (results[0] as any).$recentSignals;
|
|
2296
|
+
expect(Array.isArray(sigs)).toBe(true);
|
|
2297
|
+
expect(sigs).toHaveLength(2);
|
|
2298
|
+
expect(sigs[0]).toMatchObject({ id: "signal://a", signalTypeId: "type1" });
|
|
2299
|
+
expect(sigs[1]).toMatchObject({ id: "signal://b", signalTypeId: "type2" });
|
|
2300
|
+
});
|
|
2301
|
+
|
|
2302
|
+
it("passes through raw IRI when Rust cannot hydrate the projection target", async () => {
|
|
2303
|
+
// When the target cannot be resolved, Rust keeps the raw IRI string.
|
|
2304
|
+
mockPerspective.modelQuery.mockResolvedValueOnce({
|
|
2305
|
+
instances: [{ id: "post://1", title: "Hello", $mySignal: "signal://unknown" }],
|
|
2306
|
+
totalCount: 1,
|
|
2307
|
+
});
|
|
2308
|
+
|
|
2309
|
+
const results = await Post.findAll(mockPerspective, {
|
|
2310
|
+
include: { $mySignal: { from: "signals", limit: 1 } },
|
|
2311
|
+
});
|
|
2312
|
+
|
|
2313
|
+
// Raw IRI preserved when no matching target instance exists in the store.
|
|
2314
|
+
expect((results[0] as any).$mySignal).toBe("signal://unknown");
|
|
2315
|
+
});
|
|
2316
|
+
|
|
2317
|
+
it("does NOT attempt hydration for count projections (they return numbers)", async () => {
|
|
2318
|
+
mockPerspective.modelQuery.mockResolvedValueOnce({
|
|
2319
|
+
instances: [{ id: "post://1", $signalCount: 5 }],
|
|
2320
|
+
totalCount: 1,
|
|
2321
|
+
});
|
|
2322
|
+
|
|
2323
|
+
const results = await Post.findAll(mockPerspective, {
|
|
2324
|
+
include: { $signalCount: { from: "signals", count: true } },
|
|
2325
|
+
});
|
|
2326
|
+
|
|
2327
|
+
// Only one modelQuery call — no follow-up findAll for count projections.
|
|
2328
|
+
expect(mockPerspective.modelQuery).toHaveBeenCalledTimes(1);
|
|
2329
|
+
expect((results[0] as any).$signalCount).toBe(5);
|
|
2330
|
+
});
|
|
2129
2331
|
});
|