@coasys/ad4m 0.13.0-test-interpretation-1 → 0.13.0-test-model-layer
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 +2409 -625
- package/lib/index.js +2406 -626
- package/lib/src/Literal.js +8 -0
- package/lib/src/ai/AIClient.js +6 -3
- package/lib/src/apiClient.d.ts +40 -4
- package/lib/src/apiClient.js +149 -9
- package/lib/src/generated/api/RunInterpretationRequest.d.ts +16 -0
- package/lib/src/index.d.ts +3 -1
- package/lib/src/index.js +2 -0
- package/lib/src/model/Ad4mModel.d.ts +34 -16
- package/lib/src/model/Ad4mModel.js +302 -63
- package/lib/src/model/Ad4mModel.test.js +480 -735
- package/lib/src/model/ModelQueryBuilder.js +2 -2
- package/lib/src/model/decorators.d.ts +199 -12
- package/lib/src/model/decorators.js +88 -32
- package/lib/src/model/json-schema.js +7 -21
- package/lib/src/model/model-manifest.d.ts +41 -0
- package/lib/src/model/model-manifest.js +11 -0
- package/lib/src/model/query-common.d.ts +2 -2
- package/lib/src/model/query-sparql.d.ts +62 -0
- package/lib/src/model/query-sparql.js +78 -15
- package/lib/src/model/query-sparql.test.js +92 -10
- package/lib/src/model/query-utils.d.ts +7 -2
- package/lib/src/model/query-utils.js +21 -11
- package/lib/src/model/shacl-gen.js +77 -15
- package/lib/src/model/types.d.ts +32 -8
- package/lib/src/neighbourhood/NeighbourhoodProxy.test.js +33 -33
- package/lib/src/perspectives/AutoProcessor.d.ts +198 -2
- package/lib/src/perspectives/FlowInstance.d.ts +187 -0
- package/lib/src/perspectives/FlowInstance.js +336 -0
- package/lib/src/perspectives/FlowModels.d.ts +94 -0
- package/lib/src/perspectives/FlowModels.js +182 -0
- package/lib/src/perspectives/InterpretationModels.d.ts +41 -3
- package/lib/src/perspectives/InterpretationModels.js +60 -26
- package/lib/src/perspectives/PerspectiveClient.d.ts +88 -7
- package/lib/src/perspectives/PerspectiveClient.js +138 -11
- package/lib/src/perspectives/PerspectiveProxy.d.ts +150 -57
- package/lib/src/perspectives/PerspectiveProxy.js +411 -287
- package/lib/src/perspectives/SparqlBindings.d.ts +24 -3
- package/lib/src/perspectives/SparqlBindings.js +57 -6
- package/lib/src/shacl/SHACLFlow.d.ts +273 -47
- package/lib/src/shacl/SHACLFlow.js +397 -88
- package/lib/src/shacl/SHACLShape.d.ts +19 -3
- package/lib/src/shacl/SHACLShape.js +30 -1
- package/lib/src/shacl/SHACLShape.test.js +82 -0
- package/lib/src/shacl/index.d.ts +1 -1
- package/lib/src/shacl/index.js +1 -1
- package/package.json +3 -3
- package/src/Literal.ts +7 -0
- package/src/ai/AIClient.ts +6 -3
- package/src/apiClient.test.ts +227 -0
- package/src/apiClient.ts +185 -9
- package/src/generated/api/RunInterpretationRequest.ts +19 -3
- package/src/index.ts +3 -1
- package/src/model/Ad4mModel.test.ts +729 -22
- package/src/model/Ad4mModel.ts +305 -66
- package/src/model/ModelQueryBuilder.ts +2 -2
- package/src/model/decorators.ts +278 -44
- package/src/model/json-schema.ts +10 -25
- package/src/model/query-common.ts +2 -2
- package/src/model/query-sparql.test.ts +114 -13
- package/src/model/query-sparql.ts +83 -14
- package/src/model/query-utils.ts +22 -12
- package/src/model/relation-filtering.test.ts +70 -20
- package/src/model/shacl-gen.ts +78 -13
- package/src/model/shacl-roundtrip.test.ts +134 -2
- package/src/model/types.ts +30 -8
- package/src/perspectives/AutoProcessor.ts +204 -2
- package/src/perspectives/FlowInstance.ts +369 -0
- package/src/perspectives/FlowModels.ts +157 -0
- package/src/perspectives/InterpretationModels.ts +91 -21
- package/src/perspectives/PerspectiveClient.test.ts +67 -6
- package/src/perspectives/PerspectiveClient.ts +190 -14
- package/src/perspectives/PerspectiveProxy.test.ts +406 -0
- package/src/perspectives/PerspectiveProxy.ts +494 -308
- package/src/perspectives/SparqlBindings.test.ts +134 -0
- package/src/perspectives/SparqlBindings.ts +57 -6
- package/src/perspectives/shacl-rpc.test.ts +258 -0
- package/src/shacl/SHACLFlow.test.ts +762 -35
- package/src/shacl/SHACLFlow.ts +680 -112
- package/src/shacl/SHACLShape.test.ts +30 -4
- package/src/shacl/SHACLShape.ts +59 -6
- package/src/shacl/index.ts +1 -1
- package/lib/src/generated/rest/AIModelLoadingStatus.d.ts +0 -7
- package/lib/src/generated/rest/AIModelLoadingStatus.js +0 -2
- package/lib/src/generated/rest/AddAgentInfosRequest.d.ts +0 -3
- package/lib/src/generated/rest/AddAgentInfosRequest.js +0 -2
- package/lib/src/generated/rest/AddLinkExpressionRequest.d.ts +0 -6
- package/lib/src/generated/rest/AddLinkExpressionRequest.js +0 -1
- package/lib/src/generated/rest/AddLinkRequest.d.ts +0 -6
- package/lib/src/generated/rest/AddLinkRequest.js +0 -1
- package/lib/src/generated/rest/AddLinksBulkRequest.d.ts +0 -6
- package/lib/src/generated/rest/AddLinksBulkRequest.js +0 -1
- package/lib/src/generated/rest/AddSdnaRequest.d.ts +0 -6
- package/lib/src/generated/rest/AddSdnaRequest.js +0 -2
- package/lib/src/generated/rest/ApplyTemplateRequest.d.ts +0 -4
- package/lib/src/generated/rest/ApplyTemplateRequest.js +0 -2
- package/lib/src/generated/rest/AuthInfoInput.d.ts +0 -10
- package/lib/src/generated/rest/AuthInfoInput.js +0 -1
- package/lib/src/generated/rest/BroadcastRequest.d.ts +0 -6
- package/lib/src/generated/rest/BroadcastRequest.js +0 -1
- package/lib/src/generated/rest/CapabilityInput.d.ts +0 -5
- package/lib/src/generated/rest/CapabilityInput.js +0 -1
- package/lib/src/generated/rest/CommitBatchRequest.d.ts +0 -3
- package/lib/src/generated/rest/CommitBatchRequest.js +0 -2
- package/lib/src/generated/rest/ComputeLogEntry.d.ts +0 -9
- package/lib/src/generated/rest/ComputeLogEntry.js +0 -2
- package/lib/src/generated/rest/CreateExpressionRequest.d.ts +0 -4
- package/lib/src/generated/rest/CreateExpressionRequest.js +0 -2
- package/lib/src/generated/rest/CreatePerspectiveRequest.d.ts +0 -3
- package/lib/src/generated/rest/CreatePerspectiveRequest.js +0 -2
- package/lib/src/generated/rest/CreateSubjectRequest.d.ts +0 -6
- package/lib/src/generated/rest/CreateSubjectRequest.js +0 -2
- package/lib/src/generated/rest/CreateUserRequest.d.ts +0 -4
- package/lib/src/generated/rest/CreateUserRequest.js +0 -2
- package/lib/src/generated/rest/CreateUserResponse.d.ts +0 -5
- package/lib/src/generated/rest/CreateUserResponse.js +0 -2
- package/lib/src/generated/rest/DecoratedExpressionProof.d.ts +0 -6
- package/lib/src/generated/rest/DecoratedExpressionProof.js +0 -2
- package/lib/src/generated/rest/DecoratedLinkExpression.d.ts +0 -10
- package/lib/src/generated/rest/DecoratedLinkExpression.js +0 -1
- package/lib/src/generated/rest/DisposeQueryRequest.d.ts +0 -3
- package/lib/src/generated/rest/DisposeQueryRequest.js +0 -2
- package/lib/src/generated/rest/EmailTestRequest.d.ts +0 -6
- package/lib/src/generated/rest/EmailTestRequest.js +0 -2
- package/lib/src/generated/rest/EmbedRequest.d.ts +0 -4
- package/lib/src/generated/rest/EmbedRequest.js +0 -2
- package/lib/src/generated/rest/EntanglementProofInput.d.ts +0 -6
- package/lib/src/generated/rest/EntanglementProofInput.js +0 -2
- package/lib/src/generated/rest/EntanglementProofPreflightRequest.d.ts +0 -4
- package/lib/src/generated/rest/EntanglementProofPreflightRequest.js +0 -2
- package/lib/src/generated/rest/ExecuteCommandsRequest.d.ts +0 -4
- package/lib/src/generated/rest/ExecuteCommandsRequest.js +0 -2
- package/lib/src/generated/rest/ExportRequest.d.ts +0 -5
- package/lib/src/generated/rest/ExportRequest.js +0 -2
- package/lib/src/generated/rest/ExpressionManyRequest.d.ts +0 -3
- package/lib/src/generated/rest/ExpressionManyRequest.js +0 -2
- package/lib/src/generated/rest/ExpressionProof.d.ts +0 -4
- package/lib/src/generated/rest/ExpressionProof.js +0 -2
- package/lib/src/generated/rest/ExpressionProofInput.d.ts +0 -6
- package/lib/src/generated/rest/ExpressionProofInput.js +0 -2
- package/lib/src/generated/rest/FriendSendMessageRequest.d.ts +0 -3
- package/lib/src/generated/rest/FriendSendMessageRequest.js +0 -2
- package/lib/src/generated/rest/FriendsListRequest.d.ts +0 -3
- package/lib/src/generated/rest/FriendsListRequest.js +0 -2
- package/lib/src/generated/rest/GenerateAgentRequest.d.ts +0 -3
- package/lib/src/generated/rest/GenerateAgentRequest.js +0 -2
- package/lib/src/generated/rest/GenerateJwtRequest.d.ts +0 -4
- package/lib/src/generated/rest/GenerateJwtRequest.js +0 -2
- package/lib/src/generated/rest/GetSubjectDataRequest.d.ts +0 -4
- package/lib/src/generated/rest/GetSubjectDataRequest.js +0 -2
- package/lib/src/generated/rest/HostingInfoResponse.d.ts +0 -5
- package/lib/src/generated/rest/HostingInfoResponse.js +0 -2
- package/lib/src/generated/rest/HostingWalletResponse.d.ts +0 -4
- package/lib/src/generated/rest/HostingWalletResponse.js +0 -2
- package/lib/src/generated/rest/ImportAgentRequest.d.ts +0 -6
- package/lib/src/generated/rest/ImportAgentRequest.js +0 -2
- package/lib/src/generated/rest/ImportRequest.d.ts +0 -4
- package/lib/src/generated/rest/ImportRequest.js +0 -2
- package/lib/src/generated/rest/JoinNeighbourhoodRequest.d.ts +0 -3
- package/lib/src/generated/rest/JoinNeighbourhoodRequest.js +0 -2
- package/lib/src/generated/rest/KeepAliveQueryRequest.d.ts +0 -3
- package/lib/src/generated/rest/KeepAliveQueryRequest.js +0 -2
- package/lib/src/generated/rest/LanguageMetaInput.d.ts +0 -6
- package/lib/src/generated/rest/LanguageMetaInput.js +0 -2
- package/lib/src/generated/rest/Link.d.ts +0 -5
- package/lib/src/generated/rest/Link.js +0 -2
- package/lib/src/generated/rest/LinkExpression.d.ts +0 -10
- package/lib/src/generated/rest/LinkExpression.js +0 -1
- package/lib/src/generated/rest/LinkExpressionInput.d.ts +0 -10
- package/lib/src/generated/rest/LinkExpressionInput.js +0 -1
- package/lib/src/generated/rest/LinkInput.d.ts +0 -5
- package/lib/src/generated/rest/LinkInput.js +0 -2
- package/lib/src/generated/rest/LinkLanguageTemplatesRequest.d.ts +0 -3
- package/lib/src/generated/rest/LinkLanguageTemplatesRequest.js +0 -2
- package/lib/src/generated/rest/LinkMutationRequest.d.ts +0 -12
- package/lib/src/generated/rest/LinkMutationRequest.js +0 -1
- package/lib/src/generated/rest/LinkMutationResponse.d.ts +0 -9
- package/lib/src/generated/rest/LinkMutationResponse.js +0 -1
- package/lib/src/generated/rest/LinkMutations.d.ts +0 -6
- package/lib/src/generated/rest/LinkMutations.js +0 -1
- package/lib/src/generated/rest/LinkMutationsRequest.d.ts +0 -5
- package/lib/src/generated/rest/LinkMutationsRequest.js +0 -1
- package/lib/src/generated/rest/LinkStatus.d.ts +0 -1
- package/lib/src/generated/rest/LinkStatus.js +0 -2
- package/lib/src/generated/rest/LinkUpdateInput.d.ts +0 -5
- package/lib/src/generated/rest/LinkUpdateInput.js +0 -1
- package/lib/src/generated/rest/LockAgentRequest.d.ts +0 -3
- package/lib/src/generated/rest/LockAgentRequest.js +0 -2
- package/lib/src/generated/rest/LoginUserRequest.d.ts +0 -5
- package/lib/src/generated/rest/LoginUserRequest.js +0 -2
- package/lib/src/generated/rest/ModelType.d.ts +0 -1
- package/lib/src/generated/rest/ModelType.js +0 -2
- package/lib/src/generated/rest/NotificationGrantRequest.d.ts +0 -3
- package/lib/src/generated/rest/NotificationGrantRequest.js +0 -2
- package/lib/src/generated/rest/NotificationInput.d.ts +0 -10
- package/lib/src/generated/rest/NotificationInput.js +0 -2
- package/lib/src/generated/rest/OpenLinkRequest.d.ts +0 -3
- package/lib/src/generated/rest/OpenLinkRequest.js +0 -2
- package/lib/src/generated/rest/PermitCapabilityRequest.d.ts +0 -3
- package/lib/src/generated/rest/PermitCapabilityRequest.js +0 -2
- package/lib/src/generated/rest/PerspectiveInput.d.ts +0 -4
- package/lib/src/generated/rest/PerspectiveInput.js +0 -1
- package/lib/src/generated/rest/PromptRequest.d.ts +0 -4
- package/lib/src/generated/rest/PromptRequest.js +0 -2
- package/lib/src/generated/rest/PublicPerspectiveInput.d.ts +0 -4
- package/lib/src/generated/rest/PublicPerspectiveInput.js +0 -1
- package/lib/src/generated/rest/PublishLanguageRequest.d.ts +0 -5
- package/lib/src/generated/rest/PublishLanguageRequest.js +0 -1
- package/lib/src/generated/rest/PublishNeighbourhoodRequest.d.ts +0 -6
- package/lib/src/generated/rest/PublishNeighbourhoodRequest.js +0 -1
- package/lib/src/generated/rest/QueryRequest.d.ts +0 -7
- package/lib/src/generated/rest/QueryRequest.js +0 -2
- package/lib/src/generated/rest/RemoveLinkRequest.d.ts +0 -5
- package/lib/src/generated/rest/RemoveLinkRequest.js +0 -1
- package/lib/src/generated/rest/RemoveLinksBulkRequest.d.ts +0 -5
- package/lib/src/generated/rest/RemoveLinksBulkRequest.js +0 -1
- package/lib/src/generated/rest/RequestCapabilityRequest.d.ts +0 -4
- package/lib/src/generated/rest/RequestCapabilityRequest.js +0 -1
- package/lib/src/generated/rest/RequestPaymentRequest.d.ts +0 -3
- package/lib/src/generated/rest/RequestPaymentRequest.js +0 -2
- package/lib/src/generated/rest/RequestVerificationRequest.d.ts +0 -4
- package/lib/src/generated/rest/RequestVerificationRequest.js +0 -2
- package/lib/src/generated/rest/ResourceInput.d.ts +0 -4
- package/lib/src/generated/rest/ResourceInput.js +0 -2
- package/lib/src/generated/rest/SetDefaultModelRequest.d.ts +0 -4
- package/lib/src/generated/rest/SetDefaultModelRequest.js +0 -1
- package/lib/src/generated/rest/SetFreeHostingEnabledRequest.d.ts +0 -3
- package/lib/src/generated/rest/SetFreeHostingEnabledRequest.js +0 -2
- package/lib/src/generated/rest/SetHotWalletAddressRequest.d.ts +0 -3
- package/lib/src/generated/rest/SetHotWalletAddressRequest.js +0 -2
- package/lib/src/generated/rest/SetMultiUserRequest.d.ts +0 -3
- package/lib/src/generated/rest/SetMultiUserRequest.js +0 -2
- package/lib/src/generated/rest/SetOnlineStatusRequest.d.ts +0 -5
- package/lib/src/generated/rest/SetOnlineStatusRequest.js +0 -1
- package/lib/src/generated/rest/SetStatusRequest.d.ts +0 -3
- package/lib/src/generated/rest/SetStatusRequest.js +0 -2
- package/lib/src/generated/rest/SetUserFreeAccessRequest.d.ts +0 -4
- package/lib/src/generated/rest/SetUserFreeAccessRequest.js +0 -2
- package/lib/src/generated/rest/SignMessageRequest.d.ts +0 -3
- package/lib/src/generated/rest/SignMessageRequest.js +0 -2
- package/lib/src/generated/rest/SignalRequest.d.ts +0 -6
- package/lib/src/generated/rest/SignalRequest.js +0 -1
- package/lib/src/generated/rest/SubscribeQueryRequest.d.ts +0 -3
- package/lib/src/generated/rest/SubscribeQueryRequest.js +0 -2
- package/lib/src/generated/rest/SubscribeQueryResponse.d.ts +0 -4
- package/lib/src/generated/rest/SubscribeQueryResponse.js +0 -2
- package/lib/src/generated/rest/TrustedAgentsRequest.d.ts +0 -3
- package/lib/src/generated/rest/TrustedAgentsRequest.js +0 -2
- package/lib/src/generated/rest/UnlockAgentRequest.d.ts +0 -4
- package/lib/src/generated/rest/UnlockAgentRequest.js +0 -2
- package/lib/src/generated/rest/UpdateLinkRequest.d.ts +0 -7
- package/lib/src/generated/rest/UpdateLinkRequest.js +0 -1
- package/lib/src/generated/rest/UpdatePerspectiveRequest.d.ts +0 -3
- package/lib/src/generated/rest/UpdatePerspectiveRequest.js +0 -2
- package/lib/src/generated/rest/UpdateProfileRequest.d.ts +0 -5
- package/lib/src/generated/rest/UpdateProfileRequest.js +0 -1
- package/lib/src/generated/rest/UserStatistics.d.ts +0 -9
- package/lib/src/generated/rest/UserStatistics.js +0 -2
- package/lib/src/generated/rest/VerificationRequestResult.d.ts +0 -6
- package/lib/src/generated/rest/VerificationRequestResult.js +0 -2
- package/lib/src/generated/rest/VerifyEmailRequest.d.ts +0 -6
- package/lib/src/generated/rest/VerifyEmailRequest.js +0 -2
- package/lib/src/generated/rest/VerifySignatureRequest.d.ts +0 -5
- package/lib/src/generated/rest/VerifySignatureRequest.js +0 -2
- package/lib/src/generated/rest/WriteSettingsRequest.d.ts +0 -3
- package/lib/src/generated/rest/WriteSettingsRequest.js +0 -2
- package/lib/src/generated/rest/index.d.ts +0 -73
- package/lib/src/generated/rest/index.js +0 -8
- package/lib/src/generated/rest/routes.d.ts +0 -587
- package/lib/src/generated/rest/routes.js +0 -3
- package/lib/src/model/query-surreal.d.ts +0 -44
- package/lib/src/model/query-surreal.js +0 -249
- package/lib/src/model/surreal-utils.d.ts +0 -42
- package/lib/src/model/surreal-utils.js +0 -128
- package/lib/src/perspectives/PerspectiveProxy.test.d.ts +0 -1
- package/lib/src/perspectives/PerspectiveProxy.test.js +0 -34
- package/lib/src/restClient.d.ts +0 -52
- package/lib/src/restClient.js +0 -227
|
@@ -185,6 +185,13 @@ export class SHACLShape {
|
|
|
185
185
|
if (prop.writable !== undefined) {
|
|
186
186
|
turtle += ` ad4m:writable ${prop.writable} ;\n`;
|
|
187
187
|
}
|
|
188
|
+
// Interpreter dedup key: `toLinks()` and `toJSON()` preserve
|
|
189
|
+
// `identity`; a Turtle export must too or the round-trip through
|
|
190
|
+
// Turtle silently drops the interpretation-dedup marker
|
|
191
|
+
// (CodeRabbit #881 review).
|
|
192
|
+
if (prop.identity !== undefined) {
|
|
193
|
+
turtle += ` ad4m:identity ${prop.identity} ;\n`;
|
|
194
|
+
}
|
|
188
195
|
// Remove trailing semicolon and close bracket
|
|
189
196
|
turtle = turtle.slice(0, -2) + '\n';
|
|
190
197
|
turtle += isLast ? ` ] .\n` : ` ] ;\n`;
|
|
@@ -267,6 +274,13 @@ export class SHACLShape {
|
|
|
267
274
|
target: prop.path
|
|
268
275
|
});
|
|
269
276
|
// Constraints
|
|
277
|
+
if (prop.ordering) {
|
|
278
|
+
links.push({
|
|
279
|
+
source: propShapeId,
|
|
280
|
+
predicate: "ad4m://ordering",
|
|
281
|
+
target: `literal:string:${prop.ordering}`
|
|
282
|
+
});
|
|
283
|
+
}
|
|
270
284
|
if (prop.datatype) {
|
|
271
285
|
links.push({
|
|
272
286
|
source: propShapeId,
|
|
@@ -513,6 +527,10 @@ export class SHACLShape {
|
|
|
513
527
|
const datatypeLink = links.find(l => l.source === propShapeId && l.predicate === "sh://datatype");
|
|
514
528
|
if (datatypeLink)
|
|
515
529
|
prop.datatype = datatypeLink.target;
|
|
530
|
+
const orderingLink = links.find(l => l.source === propShapeId && l.predicate === "ad4m://ordering");
|
|
531
|
+
if (orderingLink) {
|
|
532
|
+
prop.ordering = orderingLink.target.replace(/^literal:\/\/string:|^literal:string:/, '');
|
|
533
|
+
}
|
|
516
534
|
const nodeKindLink = links.find(l => l.source === propShapeId && l.predicate === "sh://nodeKind");
|
|
517
535
|
if (nodeKindLink) {
|
|
518
536
|
prop.nodeKind = nodeKindLink.target.replace('sh://', '');
|
|
@@ -574,10 +592,15 @@ export class SHACLShape {
|
|
|
574
592
|
val = val.substring(8);
|
|
575
593
|
prop.writable = val === 'true';
|
|
576
594
|
}
|
|
595
|
+
// The general language selector (e.g. "literal" or a custom address).
|
|
577
596
|
const resolveLangLink = links.find(l => l.source === propShapeId && l.predicate === "ad4m://resolveLanguage");
|
|
578
597
|
if (resolveLangLink) {
|
|
579
598
|
prop.resolveLanguage = resolveLangLink.target.replace(/^literal:\/\/string:|^literal:string:/, '');
|
|
580
599
|
}
|
|
600
|
+
// Storage mode is derived from `resolveLanguage` alone:
|
|
601
|
+
// - unset → deterministic typed literal (fast path)
|
|
602
|
+
// - "literal" → signed envelope on the built-in literal language
|
|
603
|
+
// - <address> → expression on that custom language
|
|
581
604
|
// Parse action arrays
|
|
582
605
|
const setterLink = links.find(l => l.source === propShapeId && l.predicate === "ad4m://setter");
|
|
583
606
|
if (setterLink) {
|
|
@@ -745,6 +768,11 @@ export class SHACLShape {
|
|
|
745
768
|
transform: p.transform,
|
|
746
769
|
interpretation_hint: p.interpretationHint,
|
|
747
770
|
identity: p.identity,
|
|
771
|
+
// The backend reads the ordering declaration back from the
|
|
772
|
+
// `ad4m://ordering` link that `parse_shacl_to_links` writes from this
|
|
773
|
+
// field. `ensureSubjectClass` ships `toJSON()`, so omitting it here
|
|
774
|
+
// leaves `@HasMany({ ordering })` inert no matter what `toLinks()` does.
|
|
775
|
+
ordering: p.ordering,
|
|
748
776
|
})),
|
|
749
777
|
constructor_actions: this.constructor_actions,
|
|
750
778
|
destructor_actions: this.destructor_actions,
|
|
@@ -776,7 +804,7 @@ export class SHACLShape {
|
|
|
776
804
|
hasValue: p.has_value,
|
|
777
805
|
local: p.local,
|
|
778
806
|
writable: p.writable,
|
|
779
|
-
resolveLanguage: p.resolve_language,
|
|
807
|
+
resolveLanguage: p.resolve_language ?? p.resolveLanguage,
|
|
780
808
|
setter: p.setter,
|
|
781
809
|
adder: p.adder,
|
|
782
810
|
remover: p.remover,
|
|
@@ -792,6 +820,7 @@ export class SHACLShape {
|
|
|
792
820
|
transform: p.transform,
|
|
793
821
|
interpretationHint: p.interpretation_hint,
|
|
794
822
|
identity: p.identity,
|
|
823
|
+
ordering: p.ordering,
|
|
795
824
|
});
|
|
796
825
|
}
|
|
797
826
|
if (json.constructor_actions) {
|
|
@@ -333,4 +333,86 @@ describe('SHACLShape', () => {
|
|
|
333
333
|
expect(prop.remover).toEqual(original.properties[0].remover);
|
|
334
334
|
});
|
|
335
335
|
});
|
|
336
|
+
describe('sh:in round-trip', () => {
|
|
337
|
+
it('preserves sh:in enum values through toLinks() → fromLinks()', () => {
|
|
338
|
+
const original = new SHACLShape('test://Model');
|
|
339
|
+
original.addProperty({
|
|
340
|
+
name: 'status',
|
|
341
|
+
path: 'test://status',
|
|
342
|
+
datatype: 'xsd:string',
|
|
343
|
+
in: [
|
|
344
|
+
{ value: 'active', label: 'Active' },
|
|
345
|
+
{ value: 'inactive', label: 'Inactive' },
|
|
346
|
+
{ value: 'archived' },
|
|
347
|
+
],
|
|
348
|
+
});
|
|
349
|
+
const links = original.toLinks();
|
|
350
|
+
// Verify sh:in link was created
|
|
351
|
+
const inLink = links.find(l => l.predicate === 'sh://in');
|
|
352
|
+
expect(inLink).toBeDefined();
|
|
353
|
+
expect(inLink.target).toContain('literal:string:');
|
|
354
|
+
// Reconstruct and verify
|
|
355
|
+
const reconstructed = SHACLShape.fromLinks(links, 'test://ModelShape');
|
|
356
|
+
expect(reconstructed.properties[0].in).toBeDefined();
|
|
357
|
+
expect(reconstructed.properties[0].in).toEqual([
|
|
358
|
+
{ value: 'active', label: 'Active' },
|
|
359
|
+
{ value: 'inactive', label: 'Inactive' },
|
|
360
|
+
{ value: 'archived' },
|
|
361
|
+
]);
|
|
362
|
+
});
|
|
363
|
+
it('handles sh:in with special characters in values', () => {
|
|
364
|
+
const original = new SHACLShape('test://Model');
|
|
365
|
+
original.addProperty({
|
|
366
|
+
name: 'category',
|
|
367
|
+
path: 'test://category',
|
|
368
|
+
in: [
|
|
369
|
+
{ value: 'food & drink', label: 'Food & Drink' },
|
|
370
|
+
{ value: 'arts/crafts' },
|
|
371
|
+
],
|
|
372
|
+
});
|
|
373
|
+
const links = original.toLinks();
|
|
374
|
+
const reconstructed = SHACLShape.fromLinks(links, 'test://ModelShape');
|
|
375
|
+
expect(reconstructed.properties[0].in).toEqual(original.properties[0].in);
|
|
376
|
+
});
|
|
377
|
+
it('handles sh:in with empty array (no link created)', () => {
|
|
378
|
+
const original = new SHACLShape('test://Model');
|
|
379
|
+
original.addProperty({
|
|
380
|
+
name: 'field',
|
|
381
|
+
path: 'test://field',
|
|
382
|
+
in: [],
|
|
383
|
+
});
|
|
384
|
+
const links = original.toLinks();
|
|
385
|
+
const inLink = links.find(l => l.predicate === 'sh://in');
|
|
386
|
+
expect(inLink).toBeUndefined();
|
|
387
|
+
});
|
|
388
|
+
it('handles sh:in with literal://string: prefix variant', () => {
|
|
389
|
+
// fromLinks should handle both `literal:string:` and `literal://string:` prefixes
|
|
390
|
+
const links = [
|
|
391
|
+
{ source: 'test://ModelShape', predicate: 'sh://targetClass', target: 'test://Model' },
|
|
392
|
+
{ source: 'test://ModelShape', predicate: 'sh://property', target: 'test://Model.status' },
|
|
393
|
+
{ source: 'test://Model.status', predicate: 'sh://path', target: 'test://status' },
|
|
394
|
+
{ source: 'test://Model.status', predicate: 'sh://in', target: 'literal://string:[{"value":"a"},{"value":"b"}]' },
|
|
395
|
+
];
|
|
396
|
+
const reconstructed = SHACLShape.fromLinks(links, 'test://ModelShape');
|
|
397
|
+
expect(reconstructed.properties[0].in).toEqual([
|
|
398
|
+
{ value: 'a' },
|
|
399
|
+
{ value: 'b' },
|
|
400
|
+
]);
|
|
401
|
+
});
|
|
402
|
+
it('preserves sh:in through toJSON() → fromJSON()', () => {
|
|
403
|
+
const original = new SHACLShape('test://Model');
|
|
404
|
+
original.addProperty({
|
|
405
|
+
name: 'priority',
|
|
406
|
+
path: 'test://priority',
|
|
407
|
+
in: [
|
|
408
|
+
{ value: 'high', label: 'High' },
|
|
409
|
+
{ value: 'medium', label: 'Medium' },
|
|
410
|
+
{ value: 'low', label: 'Low' },
|
|
411
|
+
],
|
|
412
|
+
});
|
|
413
|
+
const json = original.toJSON();
|
|
414
|
+
const reconstructed = SHACLShape.fromJSON(json);
|
|
415
|
+
expect(reconstructed.properties[0].in).toEqual(original.properties[0].in);
|
|
416
|
+
});
|
|
417
|
+
});
|
|
336
418
|
});
|
package/lib/src/shacl/index.d.ts
CHANGED
|
@@ -21,7 +21,7 @@ export { focus, literal, path, exists, ifExpr, concat, coalesce, fn, };
|
|
|
21
21
|
* ```typescript
|
|
22
22
|
* @Property({
|
|
23
23
|
* through: 'we://image',
|
|
24
|
-
* resolveLanguage:
|
|
24
|
+
* resolveLanguage: 'literal',
|
|
25
25
|
* transform: fileToDataUri,
|
|
26
26
|
* })
|
|
27
27
|
* avatar?: string;
|
package/lib/src/shacl/index.js
CHANGED
|
@@ -20,7 +20,7 @@ export { focus, literal, path, exists, ifExpr, concat, coalesce, fn, };
|
|
|
20
20
|
* ```typescript
|
|
21
21
|
* @Property({
|
|
22
22
|
* through: 'we://image',
|
|
23
|
-
* resolveLanguage:
|
|
23
|
+
* resolveLanguage: 'literal',
|
|
24
24
|
* transform: fileToDataUri,
|
|
25
25
|
* })
|
|
26
26
|
* avatar?: string;
|
package/package.json
CHANGED
|
@@ -33,13 +33,13 @@
|
|
|
33
33
|
"dependencies": {
|
|
34
34
|
"@holochain/client": "0.16.0",
|
|
35
35
|
"base64-js": "*",
|
|
36
|
-
"pako": "
|
|
36
|
+
"pako": "^2.1.0"
|
|
37
37
|
},
|
|
38
38
|
"devDependencies": {
|
|
39
39
|
"@rollup/plugin-commonjs": "^20.0.0",
|
|
40
40
|
"@rollup/plugin-node-resolve": "^13.0.4",
|
|
41
41
|
"@types/jest": "^29",
|
|
42
|
-
"@types/node": "
|
|
42
|
+
"@types/node": "^24",
|
|
43
43
|
"concat-md": "^0.5.0",
|
|
44
44
|
"cross-fetch": "^3.1.4",
|
|
45
45
|
"honkit": "^4.0.0",
|
|
@@ -61,5 +61,5 @@
|
|
|
61
61
|
"pako": "2.1.0"
|
|
62
62
|
}
|
|
63
63
|
},
|
|
64
|
-
"version": "0.13.0-test-
|
|
64
|
+
"version": "0.13.0-test-model-layer"
|
|
65
65
|
}
|
package/src/Literal.ts
CHANGED
|
@@ -73,6 +73,13 @@ export class Literal {
|
|
|
73
73
|
return parseFloat(numberString)
|
|
74
74
|
}
|
|
75
75
|
|
|
76
|
+
if(body.startsWith("boolean:")) {
|
|
77
|
+
const boolString = decodeURIComponent(body.substring(8))
|
|
78
|
+
if (boolString === "true") return true
|
|
79
|
+
if (boolString === "false") return false
|
|
80
|
+
throw new Error(`Can't parse boolean literal: ${boolString}`)
|
|
81
|
+
}
|
|
82
|
+
|
|
76
83
|
if(body.startsWith("json:")) {
|
|
77
84
|
const json = body.substring(5)
|
|
78
85
|
return JSON.parse(decodeURIComponent(json))
|
package/src/ai/AIClient.ts
CHANGED
|
@@ -83,9 +83,12 @@ export class AIClient {
|
|
|
83
83
|
const aiEmbed = await this.#apiClient.call<string>('ai.embed', { modelId, text });
|
|
84
84
|
|
|
85
85
|
const compressed = base64js.toByteArray(aiEmbed);
|
|
86
|
-
//
|
|
87
|
-
//
|
|
88
|
-
|
|
86
|
+
// NB: pako v1 accepts `{ to: 'string' }`, pako v2 wants `{ toText: true }`,
|
|
87
|
+
// pako v3 also drops that overload from its bundled types. Call the
|
|
88
|
+
// version-agnostic form (returns Uint8Array) and decode explicitly so
|
|
89
|
+
// this works regardless of which pako major the lockfile pins.
|
|
90
|
+
const inflated = pako.inflate(compressed);
|
|
91
|
+
const decompressed = JSON.parse(new TextDecoder('utf-8').decode(inflated));
|
|
89
92
|
|
|
90
93
|
return decompressed;
|
|
91
94
|
}
|
|
@@ -0,0 +1,227 @@
|
|
|
1
|
+
import { ApiClient } from "./apiClient"
|
|
2
|
+
|
|
3
|
+
/**
|
|
4
|
+
* Unit tests for ApiClient AbortSignal support.
|
|
5
|
+
*
|
|
6
|
+
* Uses a fake WebSocket implementation injected via the constructor so
|
|
7
|
+
* we can drive open / send / message / close transitions deterministically
|
|
8
|
+
* without spinning up a real server.
|
|
9
|
+
*/
|
|
10
|
+
|
|
11
|
+
type AnyMsg = Record<string, unknown>
|
|
12
|
+
|
|
13
|
+
class FakeWebSocket {
|
|
14
|
+
static OPEN = 1
|
|
15
|
+
static CONNECTING = 0
|
|
16
|
+
static CLOSING = 2
|
|
17
|
+
static CLOSED = 3
|
|
18
|
+
|
|
19
|
+
readyState = FakeWebSocket.CONNECTING
|
|
20
|
+
sent: string[] = []
|
|
21
|
+
onopen: ((ev?: unknown) => void) | null = null
|
|
22
|
+
onmessage: ((ev: { data: string }) => void) | null = null
|
|
23
|
+
onerror: ((ev: unknown) => void) | null = null
|
|
24
|
+
onclose: ((ev?: unknown) => void) | null = null
|
|
25
|
+
|
|
26
|
+
static last: FakeWebSocket | null = null
|
|
27
|
+
|
|
28
|
+
constructor(public url: string) {
|
|
29
|
+
FakeWebSocket.last = this
|
|
30
|
+
// Defer "open" so callers can attach handlers first.
|
|
31
|
+
setTimeout(() => {
|
|
32
|
+
this.readyState = FakeWebSocket.OPEN
|
|
33
|
+
this.onopen?.()
|
|
34
|
+
}, 0)
|
|
35
|
+
}
|
|
36
|
+
|
|
37
|
+
send(data: string) {
|
|
38
|
+
this.sent.push(data)
|
|
39
|
+
}
|
|
40
|
+
|
|
41
|
+
close() {
|
|
42
|
+
this.readyState = FakeWebSocket.CLOSED
|
|
43
|
+
this.onclose?.()
|
|
44
|
+
}
|
|
45
|
+
|
|
46
|
+
// Test helper — simulate a server-sent message.
|
|
47
|
+
serverPush(msg: AnyMsg) {
|
|
48
|
+
this.onmessage?.({ data: JSON.stringify(msg) })
|
|
49
|
+
}
|
|
50
|
+
}
|
|
51
|
+
|
|
52
|
+
function lastSent(ws: FakeWebSocket): AnyMsg | undefined {
|
|
53
|
+
if (ws.sent.length === 0) return undefined
|
|
54
|
+
return JSON.parse(ws.sent[ws.sent.length - 1]) as AnyMsg
|
|
55
|
+
}
|
|
56
|
+
|
|
57
|
+
function flushMicrotasks() {
|
|
58
|
+
return new Promise((r) => setTimeout(r, 0))
|
|
59
|
+
}
|
|
60
|
+
|
|
61
|
+
describe('ApiClient AbortSignal support', () => {
|
|
62
|
+
it('rejects immediately with AbortError if signal is already aborted', async () => {
|
|
63
|
+
const client = new ApiClient(
|
|
64
|
+
'http://localhost:1234',
|
|
65
|
+
undefined,
|
|
66
|
+
FakeWebSocket as unknown as new (url: string) => WebSocket,
|
|
67
|
+
)
|
|
68
|
+
const controller = new AbortController()
|
|
69
|
+
controller.abort()
|
|
70
|
+
|
|
71
|
+
let caught: unknown
|
|
72
|
+
try {
|
|
73
|
+
await client.call('agent.get', {}, { signal: controller.signal })
|
|
74
|
+
} catch (e) {
|
|
75
|
+
caught = e
|
|
76
|
+
}
|
|
77
|
+
expect(caught).toBeInstanceOf(DOMException)
|
|
78
|
+
expect((caught as DOMException).name).toBe('AbortError')
|
|
79
|
+
// No socket should have been opened — the fast-path bailed before _ready.
|
|
80
|
+
expect(FakeWebSocket.last).toBeNull()
|
|
81
|
+
|
|
82
|
+
client.closeAll()
|
|
83
|
+
})
|
|
84
|
+
|
|
85
|
+
it('sends request.cancel and rejects with AbortError when signal fires mid-flight', async () => {
|
|
86
|
+
const client = new ApiClient(
|
|
87
|
+
'http://localhost:1234',
|
|
88
|
+
undefined,
|
|
89
|
+
FakeWebSocket as unknown as new (url: string) => WebSocket,
|
|
90
|
+
)
|
|
91
|
+
const controller = new AbortController()
|
|
92
|
+
const promise = client.call('perspective.querySparql', { uuid: 'u', engine: 'sparql', query: 'SELECT * WHERE { ?s ?p ?o }' }, { signal: controller.signal })
|
|
93
|
+
|
|
94
|
+
// Wait for socket open + send.
|
|
95
|
+
await flushMicrotasks()
|
|
96
|
+
const ws = FakeWebSocket.last
|
|
97
|
+
expect(ws).not.toBeNull()
|
|
98
|
+
// First send should be the actual RPC request.
|
|
99
|
+
const sentReq = JSON.parse(ws!.sent[0]) as AnyMsg
|
|
100
|
+
expect(sentReq.type).toBe('perspective.querySparql')
|
|
101
|
+
const origId = sentReq.id as string
|
|
102
|
+
|
|
103
|
+
// Now abort.
|
|
104
|
+
controller.abort()
|
|
105
|
+
|
|
106
|
+
// Last sent message should be request.cancel pointing at orig id.
|
|
107
|
+
const cancelMsg = lastSent(ws!)
|
|
108
|
+
expect(cancelMsg).toBeDefined()
|
|
109
|
+
expect(cancelMsg!.type).toBe('request.cancel')
|
|
110
|
+
const params = cancelMsg!.params as { targetId: string }
|
|
111
|
+
expect(params.targetId).toBe(origId)
|
|
112
|
+
|
|
113
|
+
// The promise should now reject with AbortError.
|
|
114
|
+
let caught: unknown
|
|
115
|
+
try { await promise } catch (e) { caught = e }
|
|
116
|
+
expect(caught).toBeInstanceOf(DOMException)
|
|
117
|
+
expect((caught as DOMException).name).toBe('AbortError')
|
|
118
|
+
|
|
119
|
+
client.closeAll()
|
|
120
|
+
})
|
|
121
|
+
|
|
122
|
+
it('late server reply after abort does not resolve or reject the original promise twice', async () => {
|
|
123
|
+
const client = new ApiClient(
|
|
124
|
+
'http://localhost:1234',
|
|
125
|
+
undefined,
|
|
126
|
+
FakeWebSocket as unknown as new (url: string) => WebSocket,
|
|
127
|
+
)
|
|
128
|
+
const events: AnyMsg[] = []
|
|
129
|
+
client.subscribe((m) => events.push(m as AnyMsg))
|
|
130
|
+
|
|
131
|
+
const controller = new AbortController()
|
|
132
|
+
const promise = client.call('perspective.querySparql', { uuid: 'u', engine: 'sparql', query: 'q' }, { signal: controller.signal })
|
|
133
|
+
|
|
134
|
+
await flushMicrotasks()
|
|
135
|
+
const ws = FakeWebSocket.last!
|
|
136
|
+
const sentReq = JSON.parse(ws.sent[0]) as AnyMsg
|
|
137
|
+
const origId = sentReq.id as string
|
|
138
|
+
|
|
139
|
+
controller.abort()
|
|
140
|
+
let caught: unknown
|
|
141
|
+
try { await promise } catch (e) { caught = e }
|
|
142
|
+
expect((caught as DOMException).name).toBe('AbortError')
|
|
143
|
+
|
|
144
|
+
// Now the server (oblivious to cancellation) ships a late reply.
|
|
145
|
+
// It must NOT trigger a double-settle (no unhandled rejection from
|
|
146
|
+
// the test, no resolve thrown — the promise is already settled).
|
|
147
|
+
// Because we delete the entry from _pendingCalls on abort, the
|
|
148
|
+
// late reply with the same id will be routed to subscribers
|
|
149
|
+
// instead.
|
|
150
|
+
ws.serverPush({ id: origId, result: '[]' })
|
|
151
|
+
|
|
152
|
+
// Subscribers should have received the late reply (it's routed
|
|
153
|
+
// because the id is no longer in _pendingCalls).
|
|
154
|
+
const lateReply = events.find((e) => e.id === origId)
|
|
155
|
+
expect(lateReply).toBeDefined()
|
|
156
|
+
expect(lateReply!.result).toBe('[]')
|
|
157
|
+
|
|
158
|
+
client.closeAll()
|
|
159
|
+
})
|
|
160
|
+
|
|
161
|
+
it('successful resolution removes the abort listener (no leak)', async () => {
|
|
162
|
+
const client = new ApiClient(
|
|
163
|
+
'http://localhost:1234',
|
|
164
|
+
undefined,
|
|
165
|
+
FakeWebSocket as unknown as new (url: string) => WebSocket,
|
|
166
|
+
)
|
|
167
|
+
const controller = new AbortController()
|
|
168
|
+
let listenerCount = 0
|
|
169
|
+
const orig = controller.signal.addEventListener.bind(controller.signal)
|
|
170
|
+
controller.signal.addEventListener = ((type: string, listener: any, opts?: any) => {
|
|
171
|
+
listenerCount++
|
|
172
|
+
return orig(type as any, listener, opts)
|
|
173
|
+
}) as typeof controller.signal.addEventListener
|
|
174
|
+
|
|
175
|
+
const promise = client.call('agent.get', {}, { signal: controller.signal })
|
|
176
|
+
await flushMicrotasks()
|
|
177
|
+
const ws = FakeWebSocket.last!
|
|
178
|
+
const sentReq = JSON.parse(ws.sent[0]) as AnyMsg
|
|
179
|
+
const origId = sentReq.id as string
|
|
180
|
+
|
|
181
|
+
// Resolve the call.
|
|
182
|
+
ws.serverPush({ id: origId, result: { did: 'did:test' } })
|
|
183
|
+
const result = await promise
|
|
184
|
+
expect((result as { did: string }).did).toBe('did:test')
|
|
185
|
+
|
|
186
|
+
// After resolution, firing the controller should not trigger any
|
|
187
|
+
// abort handler (the listener was removed in cleanup()). The
|
|
188
|
+
// simplest detection: confirm the abort doesn't cause a stray
|
|
189
|
+
// request.cancel message on the wire — i.e. no new send beyond
|
|
190
|
+
// the original.
|
|
191
|
+
const sendCountBefore = ws.sent.length
|
|
192
|
+
controller.abort()
|
|
193
|
+
// Give microtasks a chance.
|
|
194
|
+
await flushMicrotasks()
|
|
195
|
+
expect(ws.sent.length).toBe(sendCountBefore)
|
|
196
|
+
// Two listeners were registered in total: one in _readyOrAbort
|
|
197
|
+
// (connection phase) and one in call() (in-flight phase). Both
|
|
198
|
+
// were removed via cleanup — the "no extra send" check above
|
|
199
|
+
// confirms no stale handler remains.
|
|
200
|
+
expect(listenerCount).toBe(2)
|
|
201
|
+
|
|
202
|
+
client.closeAll()
|
|
203
|
+
})
|
|
204
|
+
|
|
205
|
+
it('passes through normal call signatures (no options) without regression', async () => {
|
|
206
|
+
const client = new ApiClient(
|
|
207
|
+
'http://localhost:1234',
|
|
208
|
+
undefined,
|
|
209
|
+
FakeWebSocket as unknown as new (url: string) => WebSocket,
|
|
210
|
+
)
|
|
211
|
+
const promise = client.call('agent.get', { foo: 'bar' })
|
|
212
|
+
await flushMicrotasks()
|
|
213
|
+
const ws = FakeWebSocket.last!
|
|
214
|
+
const sentReq = JSON.parse(ws.sent[0]) as AnyMsg
|
|
215
|
+
expect(sentReq.type).toBe('agent.get')
|
|
216
|
+
expect(sentReq.params).toEqual({ foo: 'bar' })
|
|
217
|
+
ws.serverPush({ id: sentReq.id, result: { did: 'd' } })
|
|
218
|
+
const result = await promise
|
|
219
|
+
expect((result as { did: string }).did).toBe('d')
|
|
220
|
+
|
|
221
|
+
client.closeAll()
|
|
222
|
+
})
|
|
223
|
+
|
|
224
|
+
beforeEach(() => {
|
|
225
|
+
FakeWebSocket.last = null
|
|
226
|
+
})
|
|
227
|
+
})
|