@coasys/ad4m 0.13.0-test-3 → 0.13.0-test-5
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 +6717 -15519
- package/lib/index.js +4811 -13662
- package/lib/src/Ad4mClient.d.ts +7 -3
- package/lib/src/Ad4mClient.js +39 -13
- package/lib/src/agent/Agent.js +26 -272
- package/lib/src/agent/AgentClient.d.ts +10 -21
- package/lib/src/agent/AgentClient.js +75 -427
- 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 +52 -0
- package/lib/src/apiClient.js +231 -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 +3 -3
- package/lib/src/expression/ExpressionClient.js +13 -76
- package/lib/src/expression/ExpressionRef.js +2 -25
- 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 +6 -1
- package/lib/src/index.js +6 -1
- 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 +1 -1
- package/lib/src/language/Language.js +10 -76
- 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 +76 -44
- package/lib/src/model/Ad4mModel.js +635 -479
- package/lib/src/model/Ad4mModel.test.js +371 -815
- package/lib/src/model/ModelQueryBuilder.d.ts +15 -27
- package/lib/src/model/ModelQueryBuilder.js +163 -224
- package/lib/src/model/decorators.d.ts +22 -0
- package/lib/src/model/decorators.js +7 -0
- package/lib/src/model/hydration.d.ts +3 -93
- package/lib/src/model/hydration.js +3 -970
- package/lib/src/model/index.d.ts +0 -4
- package/lib/src/model/index.js +0 -4
- package/lib/src/model/model-manifest.d.ts +41 -0
- package/lib/src/model/model-manifest.js +11 -0
- package/lib/src/model/query-sparql.d.ts +4 -67
- package/lib/src/model/query-sparql.js +26 -322
- package/lib/src/model/query-sparql.test.js +35 -218
- package/lib/src/model/query-utils.d.ts +1 -0
- package/lib/src/model/query-utils.js +46 -1
- package/lib/src/model/shacl-gen.js +4 -0
- package/lib/src/model/types.d.ts +51 -43
- package/lib/src/model/types.js +4 -1
- 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 +13 -17
- package/lib/src/perspectives/PerspectiveClient.js +179 -429
- package/lib/src/perspectives/PerspectiveClient.test.js +55 -0
- package/lib/src/perspectives/PerspectiveDiff.js +4 -31
- package/lib/src/perspectives/PerspectiveHandle.js +3 -43
- package/lib/src/perspectives/PerspectiveProxy.d.ts +106 -71
- package/lib/src/perspectives/PerspectiveProxy.js +289 -310
- package/lib/src/runtime/RuntimeClient.d.ts +6 -6
- package/lib/src/runtime/RuntimeClient.js +93 -467
- package/lib/src/runtime/RuntimeTypes.d.ts +101 -0
- package/lib/src/runtime/RuntimeTypes.js +45 -0
- package/lib/src/shacl/SHACLShape.d.ts +7 -0
- package/lib/src/shacl/SHACLShape.js +19 -0
- package/lib/src/shacl/SHACLShape.test.js +82 -0
- package/lib/src/typeDefs.js +3 -628
- package/package.json +6 -18
- package/rollup.config.js +0 -7
- package/src/Ad4mClient.test.ts +1179 -1340
- package/src/Ad4mClient.ts +40 -15
- package/src/agent/Agent.ts +0 -99
- package/src/agent/AgentClient.ts +112 -526
- 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 +283 -0
- package/src/expression/Expression.ts +3 -43
- package/src/expression/ExpressionClient.ts +14 -77
- package/src/expression/ExpressionRef.ts +0 -6
- 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 +6 -1
- package/src/jestSetup.ts +1 -1
- package/src/language/Icon.ts +0 -4
- package/src/language/Language.ts +2 -23
- 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 +766 -1173
- package/src/model/Ad4mModel.ts +664 -529
- package/src/model/ModelQueryBuilder.ts +203 -251
- package/src/model/decorators.ts +29 -0
- package/src/model/hydration.ts +3 -1037
- package/src/model/index.ts +0 -4
- package/src/model/query-sparql.test.ts +34 -242
- package/src/model/query-sparql.ts +27 -337
- package/src/model/query-utils.ts +47 -2
- package/src/model/shacl-gen.ts +5 -0
- package/src/model/types.ts +55 -44
- 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 +206 -148
- package/src/perspectives/PerspectiveClient.ts +247 -442
- package/src/perspectives/PerspectiveDiff.ts +0 -8
- package/src/perspectives/PerspectiveHandle.ts +1 -12
- package/src/perspectives/PerspectiveProxy.test.ts +41 -0
- package/src/perspectives/PerspectiveProxy.ts +331 -348
- package/src/runtime/RuntimeClient.ts +112 -474
- package/src/runtime/RuntimeTypes.ts +144 -0
- package/src/shacl/SHACLShape.test.ts +94 -0
- package/src/shacl/SHACLShape.ts +27 -0
- package/src/typeDefs.ts +3 -5
- package/tsconfig.json +3 -7
- 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/LanguageResolver.ts +0 -98
- package/src/model/Subject.ts +0 -159
- package/src/model/hydration-batch.ts +0 -205
- package/src/model/hydration-batching.test.ts +0 -563
- package/src/model/prolog-facts.ts +0 -145
- package/src/model/query-prolog.ts +0 -148
- package/src/model/query-sparql-batch.ts +0 -301
- package/src/model/subscription-delta.test.ts +0 -207
- package/src/model/subscription-pool.ts +0 -211
- package/src/neighbourhood/NeighbourhoodResolver.ts +0 -100
- package/src/perspectives/PerspectiveResolver.ts +0 -364
- package/src/runtime/RuntimeResolver.ts +0 -749
- package/src/unwrapApolloResult.ts +0 -16
package/src/model/index.ts
CHANGED
|
@@ -9,10 +9,7 @@
|
|
|
9
9
|
export * from "./types";
|
|
10
10
|
export * from "./Ad4mModel";
|
|
11
11
|
export * from "./decorators";
|
|
12
|
-
export * from "./Subject";
|
|
13
12
|
export * from "./query-common";
|
|
14
|
-
export * from "./query-prolog";
|
|
15
|
-
export * from "./prolog-facts";
|
|
16
13
|
export * from "./json-schema";
|
|
17
14
|
export * from "./query-utils";
|
|
18
15
|
export * from "./query-sparql";
|
|
@@ -21,4 +18,3 @@ export * from "./ModelQueryBuilder";
|
|
|
21
18
|
export * from "./sdna";
|
|
22
19
|
export * from "./shacl-gen";
|
|
23
20
|
export * from "./query-cache";
|
|
24
|
-
export * from "./subscription-pool";
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { buildSPARQLOrderLimitOffset, buildSPARQLQuery,
|
|
1
|
+
import { buildSPARQLOrderLimitOffset, buildSPARQLQuery, buildPaginationSubquery, hasJsOnlyWhereFilters } from './query-sparql';
|
|
2
2
|
|
|
3
3
|
// Minimal stubs for ModelMetadata — buildSPARQLOrderLimitOffset only uses the query arg
|
|
4
4
|
const emptyMetadata: any = { properties: {}, relations: {} };
|
|
@@ -49,11 +49,11 @@ describe('hasJsOnlyWhereFilters', () => {
|
|
|
49
49
|
expect(hasJsOnlyWhereFilters(richMetadata, emptyRelations, { category: 'some://uri' })).toBe(false);
|
|
50
50
|
});
|
|
51
51
|
|
|
52
|
-
it('returns true when where has author filter
|
|
52
|
+
it('returns true when where has author filter', () => {
|
|
53
53
|
expect(hasJsOnlyWhereFilters(richMetadata, emptyRelations, { author: 'did:key:abc' })).toBe(true);
|
|
54
54
|
});
|
|
55
55
|
|
|
56
|
-
it('returns true when where has timestamp filter
|
|
56
|
+
it('returns true when where has timestamp filter', () => {
|
|
57
57
|
expect(hasJsOnlyWhereFilters(richMetadata, emptyRelations, { timestamp: { gt: 100 } })).toBe(true);
|
|
58
58
|
});
|
|
59
59
|
|
|
@@ -67,8 +67,8 @@ describe('hasJsOnlyWhereFilters', () => {
|
|
|
67
67
|
describe('buildSPARQLQuery — SPARQL-level pagination via subquery', () => {
|
|
68
68
|
const modelClass: any = {};
|
|
69
69
|
|
|
70
|
-
it('includes LIMIT/OFFSET in a pagination subquery when query has them
|
|
71
|
-
const query = { limit: 10, offset: 0, where: { category: 'some://uri' }
|
|
70
|
+
it('includes LIMIT/OFFSET in a pagination subquery when query has them and no JS-only filters', () => {
|
|
71
|
+
const query = { limit: 10, offset: 0, where: { category: 'some://uri' } };
|
|
72
72
|
const sparql = buildSPARQLQuery(richMetadata, emptyRelations, query, modelClass);
|
|
73
73
|
// SPARQL should contain LIMIT inside the pagination subquery
|
|
74
74
|
expect(sparql).toContain('LIMIT 10');
|
|
@@ -78,21 +78,10 @@ describe('buildSPARQLQuery — SPARQL-level pagination via subquery', () => {
|
|
|
78
78
|
expect(sparql).toContain('SELECT DISTINCT ?source');
|
|
79
79
|
});
|
|
80
80
|
|
|
81
|
-
it('does NOT
|
|
82
|
-
|
|
81
|
+
it('does NOT include LIMIT/OFFSET when JS-only where filters exist', () => {
|
|
82
|
+
// author is a JS-only filter
|
|
83
|
+
const query = { limit: 10, offset: 0, where: { author: 'did:key:abc' } };
|
|
83
84
|
const sparql = buildSPARQLQuery(richMetadata, emptyRelations, query, modelClass);
|
|
84
|
-
// Without ORDER BY, SPARQL pagination is not used — JS-level slicing handles it
|
|
85
|
-
expect(sparql).not.toContain('LIMIT');
|
|
86
|
-
expect(sparql).not.toContain('OFFSET');
|
|
87
|
-
// No subquery needed
|
|
88
|
-
expect(sparql).not.toContain('SELECT DISTINCT');
|
|
89
|
-
});
|
|
90
|
-
|
|
91
|
-
it('does NOT include LIMIT/OFFSET when JS-only where filters exist (literal gt operator)', () => {
|
|
92
|
-
// gt on a literal-stored property is JS-only, so pagination must not be pushed to SPARQL
|
|
93
|
-
const meta: any = { properties: { rating: { name: 'rating', predicate: 'flux://rating', required: true, resolveLanguage: 'literal' } }, relations: {} };
|
|
94
|
-
const query = { limit: 10, offset: 0, where: { rating: { gt: 3 } } };
|
|
95
|
-
const sparql = buildSPARQLQuery(meta, emptyRelations, query, modelClass);
|
|
96
85
|
expect(sparql).not.toContain('LIMIT');
|
|
97
86
|
expect(sparql).not.toContain('OFFSET');
|
|
98
87
|
});
|
|
@@ -164,7 +153,6 @@ describe('buildSPARQLQuery — structural correctness', () => {
|
|
|
164
153
|
offset: 0,
|
|
165
154
|
parent: { id: 'flux://channel-123', predicate: 'flux://has_message' },
|
|
166
155
|
where: { category: 'some://uri' },
|
|
167
|
-
order: { name: 'ASC' as const },
|
|
168
156
|
};
|
|
169
157
|
const sparql = buildSPARQLQuery(richMetadata, emptyRelations, query, modelClass);
|
|
170
158
|
expect(sparql).toContain('<flux://channel-123>');
|
|
@@ -263,31 +251,23 @@ describe('buildSPARQLQuery — IRI correctness', () => {
|
|
|
263
251
|
describe('SPARQL-level pagination', () => {
|
|
264
252
|
const modelClass: any = {};
|
|
265
253
|
|
|
266
|
-
it('includes LIMIT in SPARQL when query specifies limit
|
|
267
|
-
const query = { limit: 30
|
|
268
|
-
const sparql = buildSPARQLQuery(
|
|
254
|
+
it('includes LIMIT in SPARQL when query specifies limit', () => {
|
|
255
|
+
const query = { limit: 30 };
|
|
256
|
+
const sparql = buildSPARQLQuery(emptyMetadata, emptyRelations, query, modelClass);
|
|
269
257
|
expect(sparql).toContain('LIMIT 30');
|
|
270
258
|
expect(sparql).toContain('SELECT DISTINCT ?source');
|
|
271
259
|
});
|
|
272
260
|
|
|
273
|
-
it('
|
|
274
|
-
const query = { limit:
|
|
261
|
+
it('includes OFFSET in SPARQL when query specifies offset > 0', () => {
|
|
262
|
+
const query = { limit: 20, offset: 40 };
|
|
275
263
|
const sparql = buildSPARQLQuery(emptyMetadata, emptyRelations, query, modelClass);
|
|
276
|
-
// Without ORDER BY, SPARQL-level pagination is not used
|
|
277
|
-
expect(sparql).not.toContain('LIMIT');
|
|
278
|
-
expect(sparql).not.toContain('SELECT DISTINCT');
|
|
279
|
-
});
|
|
280
|
-
|
|
281
|
-
it('includes OFFSET in SPARQL when query specifies offset > 0 with order', () => {
|
|
282
|
-
const query = { limit: 20, offset: 40, order: { name: 'ASC' as const } };
|
|
283
|
-
const sparql = buildSPARQLQuery(richMetadata, emptyRelations, query, modelClass);
|
|
284
264
|
expect(sparql).toContain('LIMIT 20');
|
|
285
265
|
expect(sparql).toContain('OFFSET 40');
|
|
286
266
|
});
|
|
287
267
|
|
|
288
268
|
it('does NOT include OFFSET when offset is 0', () => {
|
|
289
|
-
const query = { limit: 10, offset: 0
|
|
290
|
-
const sparql = buildSPARQLQuery(
|
|
269
|
+
const query = { limit: 10, offset: 0 };
|
|
270
|
+
const sparql = buildSPARQLQuery(emptyMetadata, emptyRelations, query, modelClass);
|
|
291
271
|
expect(sparql).toContain('LIMIT 10');
|
|
292
272
|
expect(sparql).not.toContain('OFFSET');
|
|
293
273
|
});
|
|
@@ -299,41 +279,16 @@ describe('SPARQL-level pagination', () => {
|
|
|
299
279
|
expect(sparql).toContain('LIMIT 10');
|
|
300
280
|
});
|
|
301
281
|
|
|
302
|
-
it('uses SAMPLE() aggregate for ORDER BY variables in pagination subquery (SPARQL 1.1 compliance)', () => {
|
|
303
|
-
const query = { limit: 5, order: { name: 'ASC' as const } };
|
|
304
|
-
const sparql = buildSPARQLQuery(richMetadata, emptyRelations, query, modelClass);
|
|
305
|
-
// Must use SAMPLE() to aggregate the order variable under GROUP BY
|
|
306
|
-
expect(sparql).toMatch(/SAMPLE\(/);
|
|
307
|
-
expect(sparql).toMatch(/AS \?pg_sort_0/);
|
|
308
|
-
expect(sparql).toContain('GROUP BY ?source');
|
|
309
|
-
expect(sparql).toContain('ORDER BY ASC(?pg_sort_0)');
|
|
310
|
-
});
|
|
311
|
-
|
|
312
|
-
it('omits GROUP BY when ORDER BY is present (uses SAMPLE() aggregate instead)', () => {
|
|
313
|
-
// When ORDER BY is present, GROUP BY ?source is used with SAMPLE() aggregates.
|
|
314
|
-
// The old redundant GROUP BY (without ORDER BY) no longer applies because
|
|
315
|
-
// SPARQL-level pagination is only used when ORDER BY is present.
|
|
316
|
-
const query = { limit: 10, order: { name: 'ASC' as const } };
|
|
317
|
-
const sparql = buildSPARQLQuery(richMetadata, emptyRelations, query, modelClass);
|
|
318
|
-
expect(sparql).toContain('GROUP BY ?source');
|
|
319
|
-
expect(sparql).toContain('SAMPLE(');
|
|
320
|
-
expect(sparql).toContain('SELECT DISTINCT ?source');
|
|
321
|
-
expect(sparql).toContain('LIMIT 10');
|
|
322
|
-
});
|
|
323
|
-
|
|
324
282
|
it('does NOT default to ORDER BY timestamp when paginating without explicit order', () => {
|
|
325
283
|
const query = { limit: 30 };
|
|
326
284
|
const sparql = buildSPARQLQuery(emptyMetadata, emptyRelations, query, modelClass);
|
|
327
285
|
expect(sparql).not.toContain('ORDER BY');
|
|
328
286
|
expect(sparql).not.toContain('pg_minTs');
|
|
329
|
-
expect(sparql).not.toContain('GRAPH ?pg_g');
|
|
330
287
|
});
|
|
331
288
|
|
|
332
|
-
it('does NOT push pagination to SPARQL when JS-only where filters exist (
|
|
333
|
-
|
|
334
|
-
const
|
|
335
|
-
const query = { limit: 10, where: { rating: { gt: 5 } } };
|
|
336
|
-
const sparql = buildSPARQLQuery(meta, emptyRelations, query, modelClass);
|
|
289
|
+
it('does NOT push pagination to SPARQL when JS-only where filters exist (author)', () => {
|
|
290
|
+
const query = { limit: 10, where: { author: 'did:key:abc' } };
|
|
291
|
+
const sparql = buildSPARQLQuery(emptyMetadata, emptyRelations, query, modelClass);
|
|
337
292
|
expect(sparql).not.toContain('LIMIT');
|
|
338
293
|
expect(sparql).not.toContain('OFFSET');
|
|
339
294
|
});
|
|
@@ -351,41 +306,13 @@ describe('SPARQL-level pagination', () => {
|
|
|
351
306
|
});
|
|
352
307
|
|
|
353
308
|
it('wraps pagination in a subquery (outer SELECT fetches all links for the page)', () => {
|
|
354
|
-
const query = { limit: 5, offset: 10
|
|
355
|
-
const sparql = buildSPARQLQuery(
|
|
309
|
+
const query = { limit: 5, offset: 10 };
|
|
310
|
+
const sparql = buildSPARQLQuery(emptyMetadata, emptyRelations, query, modelClass);
|
|
356
311
|
expect(sparql).toContain('SELECT ?source ?predicate ?target ?author ?timestamp');
|
|
357
312
|
expect(sparql).toContain('SELECT DISTINCT ?source');
|
|
358
313
|
expect(sparql).toContain('LIMIT 5');
|
|
359
314
|
expect(sparql).toContain('OFFSET 10');
|
|
360
315
|
});
|
|
361
|
-
|
|
362
|
-
it('does NOT wrap pagination in a subquery when no ORDER BY (JS slicing preserves natural order)', () => {
|
|
363
|
-
const query = { limit: 5, offset: 10 };
|
|
364
|
-
const sparql = buildSPARQLQuery(emptyMetadata, emptyRelations, query, modelClass);
|
|
365
|
-
// Should be a plain SELECT without subquery
|
|
366
|
-
expect(sparql).toContain('SELECT ?source ?predicate ?target ?author ?timestamp');
|
|
367
|
-
expect(sparql).not.toContain('SELECT DISTINCT');
|
|
368
|
-
expect(sparql).not.toContain('LIMIT');
|
|
369
|
-
expect(sparql).not.toContain('OFFSET');
|
|
370
|
-
});
|
|
371
|
-
|
|
372
|
-
describe('buildSPARQLCountQuery', () => {
|
|
373
|
-
it('returns a COUNT(DISTINCT ?source) query', () => {
|
|
374
|
-
const query = { parent: { id: 'flux://ch-1', predicate: 'flux://has_child' } };
|
|
375
|
-
const countSparql = buildSPARQLCountQuery(emptyMetadata, emptyRelations, query, modelClass);
|
|
376
|
-
expect(countSparql).toContain('COUNT(DISTINCT ?source)');
|
|
377
|
-
expect(countSparql).toContain('?count');
|
|
378
|
-
expect(countSparql).toContain('<flux://ch-1>');
|
|
379
|
-
});
|
|
380
|
-
|
|
381
|
-
it('does NOT include LIMIT/OFFSET (counts full result set)', () => {
|
|
382
|
-
const query = { limit: 10, offset: 20, parent: { id: 'flux://ch-1', predicate: 'flux://has_child' } };
|
|
383
|
-
const countSparql = buildSPARQLCountQuery(emptyMetadata, emptyRelations, query, modelClass);
|
|
384
|
-
expect(countSparql).not.toContain('LIMIT');
|
|
385
|
-
expect(countSparql).not.toContain('OFFSET');
|
|
386
|
-
expect(countSparql).toContain('COUNT(DISTINCT ?source)');
|
|
387
|
-
});
|
|
388
|
-
});
|
|
389
316
|
});
|
|
390
317
|
|
|
391
318
|
describe('buildSPARQLQuery — set-difference patterns', () => {
|
|
@@ -410,159 +337,24 @@ describe('buildSPARQLQuery — set-difference patterns', () => {
|
|
|
410
337
|
});
|
|
411
338
|
});
|
|
412
339
|
|
|
413
|
-
|
|
414
|
-
// buildSPARQLWhereFilters — author / timestamp SPARQL push
|
|
415
|
-
// ─────────────────────────────────────────────────────────────
|
|
416
|
-
describe('buildSPARQLQuery — author/timestamp SPARQL filter push', () => {
|
|
340
|
+
describe('buildSPARQLQuery — RDF 1.2 reifier patterns', () => {
|
|
417
341
|
const modelClass: any = {};
|
|
418
342
|
|
|
419
|
-
it('
|
|
420
|
-
const query = {
|
|
421
|
-
const sparql = buildSPARQLQuery(
|
|
422
|
-
expect(sparql).toContain('
|
|
423
|
-
expect(sparql).toContain('
|
|
424
|
-
|
|
425
|
-
|
|
426
|
-
|
|
427
|
-
const query = { where: { author: ['did:key:zABC', 'did:key:zDEF'] } };
|
|
428
|
-
const sparql = buildSPARQLQuery(emptyMetadata, emptyRelations, query, modelClass);
|
|
429
|
-
expect(sparql).toContain('STR(?author) IN');
|
|
430
|
-
expect(sparql).toContain('"did:key:zABC"');
|
|
431
|
-
expect(sparql).toContain('"did:key:zDEF"');
|
|
432
|
-
});
|
|
433
|
-
|
|
434
|
-
it('pushes author NOT into SPARQL FILTER', () => {
|
|
435
|
-
const query = { where: { author: { not: 'did:key:zABC' } } };
|
|
436
|
-
const sparql = buildSPARQLQuery(emptyMetadata, emptyRelations, query, modelClass);
|
|
437
|
-
expect(sparql).toContain('STR(?author) != "did:key:zABC"');
|
|
438
|
-
});
|
|
439
|
-
|
|
440
|
-
it('pushes timestamp gt/lt into SPARQL FILTER', () => {
|
|
441
|
-
const query = { where: { timestamp: { gt: 1000, lt: 9000 } } };
|
|
442
|
-
const sparql = buildSPARQLQuery(emptyMetadata, emptyRelations, query, modelClass);
|
|
443
|
-
expect(sparql).toContain('?timestamp > 1000');
|
|
444
|
-
expect(sparql).toContain('?timestamp < 9000');
|
|
445
|
-
});
|
|
446
|
-
|
|
447
|
-
it('pushes timestamp between into SPARQL FILTER', () => {
|
|
448
|
-
const query = { where: { timestamp: { between: [100, 200] as [number, number] } } };
|
|
449
|
-
const sparql = buildSPARQLQuery(emptyMetadata, emptyRelations, query, modelClass);
|
|
450
|
-
expect(sparql).toContain('?timestamp >= 100');
|
|
451
|
-
expect(sparql).toContain('?timestamp <= 200');
|
|
452
|
-
});
|
|
453
|
-
|
|
454
|
-
it('pushes timestamp equality into SPARQL FILTER', () => {
|
|
455
|
-
const query = { where: { timestamp: 1714000000000 } };
|
|
456
|
-
const sparql = buildSPARQLQuery(emptyMetadata, emptyRelations, query, modelClass);
|
|
457
|
-
expect(sparql).toContain('?timestamp = 1714000000000');
|
|
458
|
-
});
|
|
459
|
-
});
|
|
460
|
-
|
|
461
|
-
// ─────────────────────────────────────────────────────────────
|
|
462
|
-
// buildSPARQLGroupedCountQuery
|
|
463
|
-
// ─────────────────────────────────────────────────────────────
|
|
464
|
-
describe('buildSPARQLGroupedCountQuery', () => {
|
|
465
|
-
const signalMetadata: any = {
|
|
466
|
-
properties: {
|
|
467
|
-
signalTypeId: {
|
|
468
|
-
name: 'signalTypeId',
|
|
469
|
-
predicate: 'flux://signalTypeId',
|
|
470
|
-
required: true,
|
|
471
|
-
resolveLanguage: 'literal',
|
|
472
|
-
},
|
|
473
|
-
},
|
|
474
|
-
relations: {},
|
|
475
|
-
};
|
|
476
|
-
|
|
477
|
-
it('selects ?parent and COUNT(DISTINCT ?source)', () => {
|
|
478
|
-
const sparql = buildSPARQLGroupedCountQuery(signalMetadata, emptyRelations, 'flux://has-signal', ['flux://post/1'], undefined);
|
|
479
|
-
expect(sparql).toContain('SELECT ?parent (COUNT(DISTINCT ?source) AS ?count)');
|
|
480
|
-
});
|
|
481
|
-
|
|
482
|
-
it('groups by ?parent', () => {
|
|
483
|
-
const sparql = buildSPARQLGroupedCountQuery(signalMetadata, emptyRelations, 'flux://has-signal', ['flux://post/1'], undefined);
|
|
484
|
-
expect(sparql).toContain('GROUP BY ?parent');
|
|
485
|
-
});
|
|
486
|
-
|
|
487
|
-
it('includes parent → child join with the supplied predicate', () => {
|
|
488
|
-
const sparql = buildSPARQLGroupedCountQuery(signalMetadata, emptyRelations, 'flux://has-signal', ['flux://post/1', 'flux://post/2'], undefined);
|
|
489
|
-
expect(sparql).toContain('?parent <flux://has-signal> ?source');
|
|
490
|
-
});
|
|
491
|
-
|
|
492
|
-
it('includes FILTER(?parent IN (...)) for the supplied parent IDs', () => {
|
|
493
|
-
const sparql = buildSPARQLGroupedCountQuery(signalMetadata, emptyRelations, 'flux://has-signal', ['flux://post/1', 'flux://post/2'], undefined);
|
|
494
|
-
expect(sparql).toContain('?parent IN (<flux://post/1>, <flux://post/2>)');
|
|
495
|
-
});
|
|
496
|
-
|
|
497
|
-
it('includes the full named graph block (GRAPH ?linkGraph + author + timestamp)', () => {
|
|
498
|
-
const sparql = buildSPARQLGroupedCountQuery(signalMetadata, emptyRelations, 'flux://has-signal', ['flux://post/1'], undefined);
|
|
499
|
-
expect(sparql).toContain('GRAPH ?linkGraph');
|
|
500
|
-
expect(sparql).toContain('?linkGraph <ad4m://ontology/author> ?author');
|
|
501
|
-
expect(sparql).toContain('?linkGraph <ad4m://ontology/timestamp> ?timestamp');
|
|
502
|
-
});
|
|
503
|
-
|
|
504
|
-
it('includes conformance join for required properties', () => {
|
|
505
|
-
const sparql = buildSPARQLGroupedCountQuery(signalMetadata, emptyRelations, 'flux://has-signal', ['flux://post/1'], undefined);
|
|
506
|
-
expect(sparql).toContain('<flux://signalTypeId>');
|
|
507
|
-
});
|
|
508
|
-
|
|
509
|
-
it('applies a where clause filter (author equality) via SPARQL FILTER', () => {
|
|
510
|
-
const sparql = buildSPARQLGroupedCountQuery(signalMetadata, emptyRelations, 'flux://has-signal', ['flux://post/1'], { author: 'did:key:zABC' });
|
|
511
|
-
expect(sparql).toContain('STR(?author) = "did:key:zABC"');
|
|
512
|
-
});
|
|
513
|
-
|
|
514
|
-
it('applies a where clause filter (required property equality) via parse_literal', () => {
|
|
515
|
-
const sparql = buildSPARQLGroupedCountQuery(signalMetadata, emptyRelations, 'flux://has-signal', ['flux://post/1'], { signalTypeId: 'like' });
|
|
516
|
-
expect(sparql).toContain('parse_literal');
|
|
517
|
-
expect(sparql).toContain('"like"');
|
|
518
|
-
});
|
|
519
|
-
});
|
|
520
|
-
|
|
521
|
-
// ─────────────────────────────────────────────────────────────
|
|
522
|
-
// parseSparqlGroupedCount
|
|
523
|
-
// ─────────────────────────────────────────────────────────────
|
|
524
|
-
describe('parseSparqlGroupedCount', () => {
|
|
525
|
-
it('returns an empty map for empty input', () => {
|
|
526
|
-
expect(parseSparqlGroupedCount([]).size).toBe(0);
|
|
527
|
-
});
|
|
528
|
-
|
|
529
|
-
it('returns an empty map for non-array input', () => {
|
|
530
|
-
expect(parseSparqlGroupedCount(null as any).size).toBe(0);
|
|
531
|
-
});
|
|
532
|
-
|
|
533
|
-
it('parses RDF binding objects ({ parent: { value: ... }, count: { value: ... } })', () => {
|
|
534
|
-
const rows = [
|
|
535
|
-
{ parent: { value: 'flux://post/1' }, count: { value: '3' } },
|
|
536
|
-
{ parent: { value: 'flux://post/2' }, count: { value: '0' } },
|
|
537
|
-
];
|
|
538
|
-
const map = parseSparqlGroupedCount(rows);
|
|
539
|
-
expect(map.get('flux://post/1')).toBe(3);
|
|
540
|
-
expect(map.get('flux://post/2')).toBe(0);
|
|
541
|
-
});
|
|
542
|
-
|
|
543
|
-
it('parses plain string/number values (non-RDF binding format)', () => {
|
|
544
|
-
const rows = [
|
|
545
|
-
{ parent: 'flux://post/1', count: 5 },
|
|
546
|
-
{ parent: 'flux://post/2', count: '2' },
|
|
547
|
-
];
|
|
548
|
-
const map = parseSparqlGroupedCount(rows);
|
|
549
|
-
expect(map.get('flux://post/1')).toBe(5);
|
|
550
|
-
expect(map.get('flux://post/2')).toBe(2);
|
|
343
|
+
it('uses rdf:reifies instead of GRAPH for link metadata', () => {
|
|
344
|
+
const query = { limit: 10 };
|
|
345
|
+
const sparql = buildSPARQLQuery(richMetadata, emptyRelations, query, modelClass);
|
|
346
|
+
expect(sparql).toContain('<http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies>');
|
|
347
|
+
expect(sparql).toContain('<http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<(');
|
|
348
|
+
expect(sparql).toContain('?_reifier');
|
|
349
|
+
expect(sparql).not.toContain('GRAPH');
|
|
350
|
+
expect(sparql).not.toContain('?linkGraph');
|
|
551
351
|
});
|
|
552
352
|
|
|
553
|
-
it('
|
|
554
|
-
const
|
|
555
|
-
|
|
556
|
-
|
|
557
|
-
|
|
558
|
-
];
|
|
559
|
-
const map = parseSparqlGroupedCount(rows);
|
|
560
|
-
expect(map.size).toBe(1);
|
|
561
|
-
expect(map.get('flux://post/3')).toBe(1);
|
|
353
|
+
it('binds author and timestamp on the reifier node', () => {
|
|
354
|
+
const query = {};
|
|
355
|
+
const sparql = buildSPARQLQuery(richMetadata, emptyRelations, query, modelClass);
|
|
356
|
+
expect(sparql).toContain('?_reifier <ad4m://ontology/author> ?author');
|
|
357
|
+
expect(sparql).toContain('?_reifier <ad4m://ontology/timestamp> ?timestamp');
|
|
562
358
|
});
|
|
563
359
|
|
|
564
|
-
it('skips rows with NaN count', () => {
|
|
565
|
-
const rows = [{ parent: { value: 'flux://post/1' }, count: { value: 'not-a-number' } }];
|
|
566
|
-
expect(parseSparqlGroupedCount(rows).size).toBe(0);
|
|
567
|
-
});
|
|
568
360
|
});
|