@coasys/ad4m 0.13.0-test-6 → 0.13.0-test-8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (279) hide show
  1. package/lib/index.cjs +1103 -747
  2. package/lib/index.js +1090 -747
  3. package/lib/src/Ad4mClient.d.ts +4 -1
  4. package/lib/src/Ad4mClient.js +2 -2
  5. package/lib/src/agent/AgentClient.js +17 -0
  6. package/lib/src/ai/AIClient.js +1 -1
  7. package/lib/src/apiClient.d.ts +5 -1
  8. package/lib/src/apiClient.js +14 -6
  9. package/lib/src/generated/rest/AIModelLoadingStatus.d.ts +7 -0
  10. package/lib/src/generated/rest/AIModelLoadingStatus.js +2 -0
  11. package/lib/src/generated/rest/AddAgentInfosRequest.d.ts +3 -0
  12. package/lib/src/generated/rest/AddAgentInfosRequest.js +2 -0
  13. package/lib/src/generated/rest/AddLinkExpressionRequest.d.ts +6 -0
  14. package/lib/src/generated/rest/AddLinkExpressionRequest.js +1 -0
  15. package/lib/src/generated/rest/AddLinkRequest.d.ts +6 -0
  16. package/lib/src/generated/rest/AddLinkRequest.js +1 -0
  17. package/lib/src/generated/rest/AddLinksBulkRequest.d.ts +6 -0
  18. package/lib/src/generated/rest/AddLinksBulkRequest.js +1 -0
  19. package/lib/src/generated/rest/AddSdnaRequest.d.ts +6 -0
  20. package/lib/src/generated/rest/AddSdnaRequest.js +2 -0
  21. package/lib/src/generated/rest/ApplyTemplateRequest.d.ts +4 -0
  22. package/lib/src/generated/rest/ApplyTemplateRequest.js +2 -0
  23. package/lib/src/generated/rest/AuthInfoInput.d.ts +10 -0
  24. package/lib/src/generated/rest/AuthInfoInput.js +1 -0
  25. package/lib/src/generated/rest/BroadcastRequest.d.ts +6 -0
  26. package/lib/src/generated/rest/BroadcastRequest.js +1 -0
  27. package/lib/src/generated/rest/CapabilityInput.d.ts +5 -0
  28. package/lib/src/generated/rest/CapabilityInput.js +1 -0
  29. package/lib/src/generated/rest/CommitBatchRequest.d.ts +3 -0
  30. package/lib/src/generated/rest/CommitBatchRequest.js +2 -0
  31. package/lib/src/generated/rest/ComputeLogEntry.d.ts +9 -0
  32. package/lib/src/generated/rest/ComputeLogEntry.js +2 -0
  33. package/lib/src/generated/rest/CreateExpressionRequest.d.ts +4 -0
  34. package/lib/src/generated/rest/CreateExpressionRequest.js +2 -0
  35. package/lib/src/generated/rest/CreatePerspectiveRequest.d.ts +3 -0
  36. package/lib/src/generated/rest/CreatePerspectiveRequest.js +2 -0
  37. package/lib/src/generated/rest/CreateSubjectRequest.d.ts +6 -0
  38. package/lib/src/generated/rest/CreateSubjectRequest.js +2 -0
  39. package/lib/src/generated/rest/CreateUserRequest.d.ts +4 -0
  40. package/lib/src/generated/rest/CreateUserRequest.js +2 -0
  41. package/lib/src/generated/rest/CreateUserResponse.d.ts +5 -0
  42. package/lib/src/generated/rest/CreateUserResponse.js +2 -0
  43. package/lib/src/generated/rest/DecoratedExpressionProof.d.ts +6 -0
  44. package/lib/src/generated/rest/DecoratedExpressionProof.js +2 -0
  45. package/lib/src/generated/rest/DecoratedLinkExpression.d.ts +10 -0
  46. package/lib/src/generated/rest/DecoratedLinkExpression.js +1 -0
  47. package/lib/src/generated/rest/DisposeQueryRequest.d.ts +3 -0
  48. package/lib/src/generated/rest/DisposeQueryRequest.js +2 -0
  49. package/lib/src/generated/rest/EmailTestRequest.d.ts +6 -0
  50. package/lib/src/generated/rest/EmailTestRequest.js +2 -0
  51. package/lib/src/generated/rest/EmbedRequest.d.ts +4 -0
  52. package/lib/src/generated/rest/EmbedRequest.js +2 -0
  53. package/lib/src/generated/rest/EntanglementProofInput.d.ts +6 -0
  54. package/lib/src/generated/rest/EntanglementProofInput.js +2 -0
  55. package/lib/src/generated/rest/EntanglementProofPreflightRequest.d.ts +4 -0
  56. package/lib/src/generated/rest/EntanglementProofPreflightRequest.js +2 -0
  57. package/lib/src/generated/rest/ExecuteCommandsRequest.d.ts +4 -0
  58. package/lib/src/generated/rest/ExecuteCommandsRequest.js +2 -0
  59. package/lib/src/generated/rest/ExportRequest.d.ts +5 -0
  60. package/lib/src/generated/rest/ExportRequest.js +2 -0
  61. package/lib/src/generated/rest/ExpressionManyRequest.d.ts +3 -0
  62. package/lib/src/generated/rest/ExpressionManyRequest.js +2 -0
  63. package/lib/src/generated/rest/ExpressionProof.d.ts +4 -0
  64. package/lib/src/generated/rest/ExpressionProof.js +2 -0
  65. package/lib/src/generated/rest/ExpressionProofInput.d.ts +6 -0
  66. package/lib/src/generated/rest/ExpressionProofInput.js +2 -0
  67. package/lib/src/generated/rest/FriendSendMessageRequest.d.ts +3 -0
  68. package/lib/src/generated/rest/FriendSendMessageRequest.js +2 -0
  69. package/lib/src/generated/rest/FriendsListRequest.d.ts +3 -0
  70. package/lib/src/generated/rest/FriendsListRequest.js +2 -0
  71. package/lib/src/generated/rest/GenerateAgentRequest.d.ts +3 -0
  72. package/lib/src/generated/rest/GenerateAgentRequest.js +2 -0
  73. package/lib/src/generated/rest/GenerateJwtRequest.d.ts +4 -0
  74. package/lib/src/generated/rest/GenerateJwtRequest.js +2 -0
  75. package/lib/src/generated/rest/GetSubjectDataRequest.d.ts +4 -0
  76. package/lib/src/generated/rest/GetSubjectDataRequest.js +2 -0
  77. package/lib/src/generated/rest/HostingInfoResponse.d.ts +5 -0
  78. package/lib/src/generated/rest/HostingInfoResponse.js +2 -0
  79. package/lib/src/generated/rest/HostingWalletResponse.d.ts +4 -0
  80. package/lib/src/generated/rest/HostingWalletResponse.js +2 -0
  81. package/lib/src/generated/rest/ImportAgentRequest.d.ts +6 -0
  82. package/lib/src/generated/rest/ImportAgentRequest.js +2 -0
  83. package/lib/src/generated/rest/ImportRequest.d.ts +4 -0
  84. package/lib/src/generated/rest/ImportRequest.js +2 -0
  85. package/lib/src/generated/rest/JoinNeighbourhoodRequest.d.ts +3 -0
  86. package/lib/src/generated/rest/JoinNeighbourhoodRequest.js +2 -0
  87. package/lib/src/generated/rest/KeepAliveQueryRequest.d.ts +3 -0
  88. package/lib/src/generated/rest/KeepAliveQueryRequest.js +2 -0
  89. package/lib/src/generated/rest/LanguageMetaInput.d.ts +6 -0
  90. package/lib/src/generated/rest/LanguageMetaInput.js +2 -0
  91. package/lib/src/generated/rest/Link.d.ts +5 -0
  92. package/lib/src/generated/rest/Link.js +2 -0
  93. package/lib/src/generated/rest/LinkExpression.d.ts +10 -0
  94. package/lib/src/generated/rest/LinkExpression.js +1 -0
  95. package/lib/src/generated/rest/LinkExpressionInput.d.ts +10 -0
  96. package/lib/src/generated/rest/LinkExpressionInput.js +1 -0
  97. package/lib/src/generated/rest/LinkInput.d.ts +5 -0
  98. package/lib/src/generated/rest/LinkInput.js +2 -0
  99. package/lib/src/generated/rest/LinkLanguageTemplatesRequest.d.ts +3 -0
  100. package/lib/src/generated/rest/LinkLanguageTemplatesRequest.js +2 -0
  101. package/lib/src/generated/rest/LinkMutationRequest.d.ts +12 -0
  102. package/lib/src/generated/rest/LinkMutationRequest.js +1 -0
  103. package/lib/src/generated/rest/LinkMutationResponse.d.ts +9 -0
  104. package/lib/src/generated/rest/LinkMutationResponse.js +1 -0
  105. package/lib/src/generated/rest/LinkMutations.d.ts +6 -0
  106. package/lib/src/generated/rest/LinkMutations.js +1 -0
  107. package/lib/src/generated/rest/LinkMutationsRequest.d.ts +5 -0
  108. package/lib/src/generated/rest/LinkMutationsRequest.js +1 -0
  109. package/lib/src/generated/rest/LinkStatus.d.ts +1 -0
  110. package/lib/src/generated/rest/LinkStatus.js +2 -0
  111. package/lib/src/generated/rest/LinkUpdateInput.d.ts +5 -0
  112. package/lib/src/generated/rest/LinkUpdateInput.js +1 -0
  113. package/lib/src/generated/rest/LockAgentRequest.d.ts +3 -0
  114. package/lib/src/generated/rest/LockAgentRequest.js +2 -0
  115. package/lib/src/generated/rest/LoginUserRequest.d.ts +5 -0
  116. package/lib/src/generated/rest/LoginUserRequest.js +2 -0
  117. package/lib/src/generated/rest/ModelType.d.ts +1 -0
  118. package/lib/src/generated/rest/ModelType.js +2 -0
  119. package/lib/src/generated/rest/NotificationGrantRequest.d.ts +3 -0
  120. package/lib/src/generated/rest/NotificationGrantRequest.js +2 -0
  121. package/lib/src/generated/rest/NotificationInput.d.ts +10 -0
  122. package/lib/src/generated/rest/NotificationInput.js +2 -0
  123. package/lib/src/generated/rest/OpenLinkRequest.d.ts +3 -0
  124. package/lib/src/generated/rest/OpenLinkRequest.js +2 -0
  125. package/lib/src/generated/rest/PermitCapabilityRequest.d.ts +3 -0
  126. package/lib/src/generated/rest/PermitCapabilityRequest.js +2 -0
  127. package/lib/src/generated/rest/PerspectiveInput.d.ts +4 -0
  128. package/lib/src/generated/rest/PerspectiveInput.js +1 -0
  129. package/lib/src/generated/rest/PromptRequest.d.ts +4 -0
  130. package/lib/src/generated/rest/PromptRequest.js +2 -0
  131. package/lib/src/generated/rest/PublicPerspectiveInput.d.ts +4 -0
  132. package/lib/src/generated/rest/PublicPerspectiveInput.js +1 -0
  133. package/lib/src/generated/rest/PublishLanguageRequest.d.ts +5 -0
  134. package/lib/src/generated/rest/PublishLanguageRequest.js +1 -0
  135. package/lib/src/generated/rest/PublishNeighbourhoodRequest.d.ts +6 -0
  136. package/lib/src/generated/rest/PublishNeighbourhoodRequest.js +1 -0
  137. package/lib/src/generated/rest/QueryRequest.d.ts +7 -0
  138. package/lib/src/generated/rest/QueryRequest.js +2 -0
  139. package/lib/src/generated/rest/RemoveLinkRequest.d.ts +5 -0
  140. package/lib/src/generated/rest/RemoveLinkRequest.js +1 -0
  141. package/lib/src/generated/rest/RemoveLinksBulkRequest.d.ts +5 -0
  142. package/lib/src/generated/rest/RemoveLinksBulkRequest.js +1 -0
  143. package/lib/src/generated/rest/RequestCapabilityRequest.d.ts +4 -0
  144. package/lib/src/generated/rest/RequestCapabilityRequest.js +1 -0
  145. package/lib/src/generated/rest/RequestPaymentRequest.d.ts +3 -0
  146. package/lib/src/generated/rest/RequestPaymentRequest.js +2 -0
  147. package/lib/src/generated/rest/RequestVerificationRequest.d.ts +4 -0
  148. package/lib/src/generated/rest/RequestVerificationRequest.js +2 -0
  149. package/lib/src/generated/rest/ResourceInput.d.ts +4 -0
  150. package/lib/src/generated/rest/ResourceInput.js +2 -0
  151. package/lib/src/generated/rest/SetDefaultModelRequest.d.ts +4 -0
  152. package/lib/src/generated/rest/SetDefaultModelRequest.js +1 -0
  153. package/lib/src/generated/rest/SetFreeHostingEnabledRequest.d.ts +3 -0
  154. package/lib/src/generated/rest/SetFreeHostingEnabledRequest.js +2 -0
  155. package/lib/src/generated/rest/SetHotWalletAddressRequest.d.ts +3 -0
  156. package/lib/src/generated/rest/SetHotWalletAddressRequest.js +2 -0
  157. package/lib/src/generated/rest/SetMultiUserRequest.d.ts +3 -0
  158. package/lib/src/generated/rest/SetMultiUserRequest.js +2 -0
  159. package/lib/src/generated/rest/SetOnlineStatusRequest.d.ts +5 -0
  160. package/lib/src/generated/rest/SetOnlineStatusRequest.js +1 -0
  161. package/lib/src/generated/rest/SetStatusRequest.d.ts +3 -0
  162. package/lib/src/generated/rest/SetStatusRequest.js +2 -0
  163. package/lib/src/generated/rest/SetUserFreeAccessRequest.d.ts +4 -0
  164. package/lib/src/generated/rest/SetUserFreeAccessRequest.js +2 -0
  165. package/lib/src/generated/rest/SignMessageRequest.d.ts +3 -0
  166. package/lib/src/generated/rest/SignMessageRequest.js +2 -0
  167. package/lib/src/generated/rest/SignalRequest.d.ts +6 -0
  168. package/lib/src/generated/rest/SignalRequest.js +1 -0
  169. package/lib/src/generated/rest/SubscribeQueryRequest.d.ts +3 -0
  170. package/lib/src/generated/rest/SubscribeQueryRequest.js +2 -0
  171. package/lib/src/generated/rest/SubscribeQueryResponse.d.ts +4 -0
  172. package/lib/src/generated/rest/SubscribeQueryResponse.js +2 -0
  173. package/lib/src/generated/rest/TrustedAgentsRequest.d.ts +3 -0
  174. package/lib/src/generated/rest/TrustedAgentsRequest.js +2 -0
  175. package/lib/src/generated/rest/UnlockAgentRequest.d.ts +4 -0
  176. package/lib/src/generated/rest/UnlockAgentRequest.js +2 -0
  177. package/lib/src/generated/rest/UpdateLinkRequest.d.ts +7 -0
  178. package/lib/src/generated/rest/UpdateLinkRequest.js +1 -0
  179. package/lib/src/generated/rest/UpdatePerspectiveRequest.d.ts +3 -0
  180. package/lib/src/generated/rest/UpdatePerspectiveRequest.js +2 -0
  181. package/lib/src/generated/rest/UpdateProfileRequest.d.ts +5 -0
  182. package/lib/src/generated/rest/UpdateProfileRequest.js +1 -0
  183. package/lib/src/generated/rest/UserStatistics.d.ts +9 -0
  184. package/lib/src/generated/rest/UserStatistics.js +2 -0
  185. package/lib/src/generated/rest/VerificationRequestResult.d.ts +6 -0
  186. package/lib/src/generated/rest/VerificationRequestResult.js +2 -0
  187. package/lib/src/generated/rest/VerifyEmailRequest.d.ts +6 -0
  188. package/lib/src/generated/rest/VerifyEmailRequest.js +2 -0
  189. package/lib/src/generated/rest/VerifySignatureRequest.d.ts +5 -0
  190. package/lib/src/generated/rest/VerifySignatureRequest.js +2 -0
  191. package/lib/src/generated/rest/WriteSettingsRequest.d.ts +3 -0
  192. package/lib/src/generated/rest/WriteSettingsRequest.js +2 -0
  193. package/lib/src/generated/rest/index.d.ts +73 -0
  194. package/lib/src/generated/rest/index.js +8 -0
  195. package/lib/src/generated/rest/routes.d.ts +587 -0
  196. package/lib/src/generated/rest/routes.js +3 -0
  197. package/lib/src/index.d.ts +4 -0
  198. package/lib/src/index.js +4 -0
  199. package/lib/src/model/Ad4mModel.d.ts +30 -21
  200. package/lib/src/model/Ad4mModel.js +93 -316
  201. package/lib/src/model/Ad4mModel.test.js +1536 -535
  202. package/lib/src/model/ModelQueryBuilder.d.ts +5 -10
  203. package/lib/src/model/ModelQueryBuilder.js +136 -47
  204. package/lib/src/model/Subject.js +6 -6
  205. package/lib/src/model/decorators.d.ts +7 -4
  206. package/lib/src/model/decorators.js +0 -7
  207. package/lib/src/model/hydration-batch.d.ts +34 -0
  208. package/lib/src/model/hydration-batch.js +147 -0
  209. package/lib/src/model/hydration-batching.test.d.ts +7 -0
  210. package/lib/src/model/hydration-batching.test.js +456 -0
  211. package/lib/src/model/query-cache.test.d.ts +1 -0
  212. package/lib/src/model/query-cache.test.js +43 -0
  213. package/lib/src/model/query-sparql-batch.d.ts +17 -0
  214. package/lib/src/model/query-sparql-batch.js +260 -0
  215. package/lib/src/model/query-sparql.d.ts +0 -10
  216. package/lib/src/model/query-sparql.js +10 -15
  217. package/lib/src/model/query-sparql.test.d.ts +1 -0
  218. package/lib/src/model/query-sparql.test.js +230 -0
  219. package/lib/src/model/relation-filtering.test.js +15 -15
  220. package/lib/src/model/shacl-gen.js +120 -47
  221. package/lib/src/model/subscription-delta.test.d.ts +24 -0
  222. package/lib/src/model/subscription-delta.test.js +180 -0
  223. package/lib/src/model/subscription-pool.d.ts +39 -0
  224. package/lib/src/model/subscription-pool.js +165 -0
  225. package/lib/src/model/types.d.ts +140 -4
  226. package/lib/src/neighbourhood/NeighbourhoodProxy.test.js +33 -33
  227. package/lib/src/perspectives/PerspectiveClient.d.ts +13 -4
  228. package/lib/src/perspectives/PerspectiveClient.js +22 -6
  229. package/lib/src/perspectives/PerspectiveClient.test.d.ts +1 -0
  230. package/lib/src/perspectives/PerspectiveClient.test.js +224 -0
  231. package/lib/src/perspectives/PerspectiveProxy.d.ts +27 -7
  232. package/lib/src/perspectives/PerspectiveProxy.js +60 -12
  233. package/lib/src/perspectives/PerspectiveProxy.test.d.ts +1 -0
  234. package/lib/src/perspectives/PerspectiveProxy.test.js +34 -0
  235. package/lib/src/perspectives/PerspectiveResolver.d.ts +0 -1
  236. package/lib/src/perspectives/PerspectiveResolver.js +0 -11
  237. package/lib/src/perspectives/SparqlBindings.d.ts +47 -0
  238. package/lib/src/perspectives/SparqlBindings.js +65 -0
  239. package/lib/src/perspectives/WakerSubscriptionManager.js +5 -4
  240. package/lib/src/restClient.d.ts +52 -0
  241. package/lib/src/restClient.js +227 -0
  242. package/lib/src/runtime/RuntimeResolver.d.ts +28 -1
  243. package/lib/src/runtime/RuntimeResolver.js +197 -4
  244. package/lib/src/schema.gql +27 -1
  245. package/lib/src/shacl/NodeExpression.d.ts +44 -0
  246. package/lib/src/shacl/NodeExpression.js +39 -0
  247. package/lib/src/shacl/SHACLShape.d.ts +23 -0
  248. package/lib/src/shacl/SHACLShape.js +115 -1
  249. package/lib/src/shacl/builders.d.ts +58 -0
  250. package/lib/src/shacl/builders.js +76 -0
  251. package/lib/src/shacl/index.d.ts +36 -0
  252. package/lib/src/shacl/index.js +33 -0
  253. package/package.json +1 -1
  254. package/src/Ad4mClient.ts +7 -2
  255. package/src/agent/AgentClient.ts +23 -0
  256. package/src/ai/AIClient.ts +1 -1
  257. package/src/apiClient.ts +17 -6
  258. package/src/index.ts +4 -0
  259. package/src/model/Ad4mModel.test.ts +274 -72
  260. package/src/model/Ad4mModel.ts +141 -350
  261. package/src/model/ModelQueryBuilder.ts +131 -56
  262. package/src/model/decorators.ts +7 -13
  263. package/src/model/query-sparql.test.ts +35 -19
  264. package/src/model/query-sparql.ts +10 -16
  265. package/src/model/relation-filtering.test.ts +46 -39
  266. package/src/model/shacl-gen.ts +128 -54
  267. package/src/model/shacl-roundtrip.test.ts +197 -0
  268. package/src/model/types-typed-query.test.ts +360 -0
  269. package/src/model/types.ts +196 -4
  270. package/src/perspectives/PerspectiveClient.ts +24 -8
  271. package/src/perspectives/PerspectiveProxy.test.ts +85 -1
  272. package/src/perspectives/PerspectiveProxy.ts +65 -20
  273. package/src/perspectives/SparqlBindings.ts +79 -0
  274. package/src/perspectives/WakerSubscriptionManager.ts +5 -4
  275. package/src/shacl/NodeExpression.ts +54 -0
  276. package/src/shacl/SHACLShape.test.ts +172 -0
  277. package/src/shacl/SHACLShape.ts +173 -1
  278. package/src/shacl/builders.ts +86 -0
  279. package/src/shacl/index.ts +72 -0
@@ -8,8 +8,6 @@
8
8
  */
9
9
  import { SHACLShape } from "../shacl/SHACLShape";
10
10
  import type { SHACLPropertyShape, ConformanceCondition } from "../shacl/SHACLShape";
11
- import { escapeQueryString } from "../utils";
12
- import { compileWhereClause } from "./query-utils";
13
11
  import { propertyNameToSetterName } from "./util";
14
12
  import type { PropertyMetadataEntry, RelationMetadataEntry, Ad4mModelLike } from "./decorators";
15
13
 
@@ -41,9 +39,6 @@ export function buildSHACL(
41
39
 
42
40
  // ── Determine namespace from first property or relation ─────────────
43
41
  let namespace = "ad4m://";
44
- const relations = Object.fromEntries(
45
- Object.entries(allRelationsMeta).filter(([, r]) => r.kind === 'hasMany' || r.kind === 'belongsToMany')
46
- );
47
42
 
48
43
  // Try properties first
49
44
  if (Object.keys(properties).length > 0) {
@@ -56,8 +51,8 @@ export function buildSHACL(
56
51
  }
57
52
  }
58
53
  // Fall back to relations if no properties
59
- else if (Object.keys(relations).length > 0) {
60
- const firstRel = relations[Object.keys(relations)[0]];
54
+ else if (Object.keys(allRelationsMeta).length > 0) {
55
+ const firstRel = allRelationsMeta[Object.keys(allRelationsMeta)[0]];
61
56
  if (firstRel.predicate) {
62
57
  const match = firstRel.predicate.match(/^([^:]+:\/\/)/);
63
58
  if (match) {
@@ -142,10 +137,22 @@ export function buildSHACL(
142
137
  propShape.writable = propMeta.writable;
143
138
  }
144
139
 
145
- if (propMeta.resolveLanguage) {
140
+ if (propMeta.resolveLanguage != null) {
146
141
  propShape.resolveLanguage = propMeta.resolveLanguage;
147
142
  }
148
143
 
144
+ // Explicit getter SPARQL — the executor evaluates this when
145
+ // hydrating the property, in addition to (or instead of)
146
+ // reading raw links via `propMeta.through`.
147
+ if (propMeta.getter) {
148
+ propShape.getter = propMeta.getter;
149
+ }
150
+
151
+ // Serializable transform expression (SHACL-AF Node Expression)
152
+ if (propMeta.transform) {
153
+ propShape.transform = propMeta.transform;
154
+ }
155
+
149
156
  // ── Setter actions ──────────────────────────────────────────────
150
157
  if (propMeta.prologSetter) {
151
158
  console.warn(
@@ -190,71 +197,91 @@ export function buildSHACL(
190
197
  }
191
198
 
192
199
  // ── Convert relations to SHACL property shapes ─────────────────────
193
- for (const relName in relations) {
194
- const relMeta = relations[relName];
195
-
196
- if (!relMeta.predicate) continue;
200
+ for (const relName in allRelationsMeta) {
201
+ const relMeta = allRelationsMeta[relName];
202
+
203
+ // Getter-only relations (no `through`) have no real link predicate
204
+ // but still need a SHACL property entry so the executor can find
205
+ // the getter expression. Synthesize a deterministic IRI so the
206
+ // SHACL graph is well-formed; the predicate is never used to match
207
+ // links because the getter is the sole source of values. Use
208
+ // slash separators so the result is a valid IRI (colons in the
209
+ // authority confuse strict SPARQL IRI parsers).
210
+ if (!relMeta.predicate && !relMeta.getter) continue;
211
+ const synthesizedPath = relMeta.predicate
212
+ || `ad4m://getter/${subjectName}/${relName}`;
197
213
 
198
214
  const relShape: SHACLPropertyShape = {
199
215
  name: relName,
200
- path: relMeta.predicate,
216
+ path: synthesizedPath,
201
217
  };
202
218
 
203
219
  // Relations typically contain IRIs
204
220
  relShape.nodeKind = 'IRI';
205
221
 
222
+ // Encode relation kind so the executor can derive direction and
223
+ // scalar-vs-collection rendering without consulting the JS class.
224
+ relShape.relationKind = relMeta.kind;
225
+
226
+ // Scalar relations cap at 1.
227
+ if (relMeta.kind === 'hasOne' || relMeta.kind === 'belongsToOne') {
228
+ relShape.maxCount = 1;
229
+ } else if (relMeta.maxCount !== undefined) {
230
+ relShape.maxCount = relMeta.maxCount;
231
+ }
232
+
233
+ // Encode opt-out of type filtering (default true; only emit when false).
234
+ if (relMeta.filter === false) {
235
+ relShape.filter = false;
236
+ }
237
+
206
238
  // AD4M-specific metadata
207
239
  if (relMeta.local !== undefined) {
208
240
  relShape.local = relMeta.local;
209
241
  }
210
242
 
211
- // Adder action
212
- relShape.adder = [{
213
- action: "addLink",
214
- source: "this",
215
- predicate: relMeta.predicate,
216
- target: "value",
217
- ...(relMeta.local && { local: true })
218
- }];
219
-
220
- // Remover action
221
- relShape.remover = [{
222
- action: "removeLink",
223
- source: "this",
224
- predicate: relMeta.predicate,
225
- target: "value",
226
- ...(relMeta.local && { local: true })
227
- }];
243
+ // Adder / Remover actions — only meaningful for relations backed
244
+ // by a real link predicate. Getter-only relations are read-only.
245
+ if (relMeta.predicate) {
246
+ relShape.adder = [{
247
+ action: "addLink",
248
+ source: "this",
249
+ predicate: relMeta.predicate,
250
+ target: "value",
251
+ ...(relMeta.local && { local: true })
252
+ }];
253
+
254
+ relShape.remover = [{
255
+ action: "removeLink",
256
+ source: "this",
257
+ predicate: relMeta.predicate,
258
+ target: "value",
259
+ ...(relMeta.local && { local: true })
260
+ }];
261
+ }
228
262
 
229
263
  // ── Build Getter (conformance filter) ───────────────────────────
230
264
  // Priority chain:
231
265
  // 1. Explicit getter string → use verbatim
232
- // 2. `where` clause → compile DSL to SPARQL getter
233
- // 3. target + filter !== false → auto-derive from shape
266
+ // 2. target + filter !== false → auto-derive conformance getter
267
+ // from the shape. Where-clause filtering is applied as a
268
+ // post-getter pass via `whereFilter` / `wherePredicates`, which
269
+ // use `parse_literal_value` and so transparently handle
270
+ // `literal:json:` envelopes that simple FILTER(STR(?x) = ...)
271
+ // comparisons can't.
234
272
  if (relMeta.getter) {
235
273
  relShape.getter = relMeta.getter;
236
- } else if (relMeta.where) {
237
- try {
238
- const TargetClass = relMeta.target?.();
239
- const targetMetadata = TargetClass
240
- ? (TargetClass as any).getModelMetadata?.() ?? null
241
- : null;
242
-
243
- const conditions = compileWhereClause(
244
- relMeta.where,
245
- targetMetadata,
246
- );
247
-
248
- if (conditions.length > 0) {
249
- const escapedPredicate = escapeQueryString(relMeta.predicate);
250
- relShape.getter = `SELECT ?target WHERE { <Base> <${escapedPredicate}> ?target . ${conditions.join(' ')} }`;
251
- }
252
- } catch (e) {
253
- // Target metadata may not be available yet
254
- }
255
- } else if (relMeta.target && relMeta.filter !== false) {
274
+ } else if (
275
+ relMeta.target
276
+ && relMeta.filter !== false
277
+ && relMeta.kind !== 'belongsToOne'
278
+ && relMeta.kind !== 'belongsToMany'
279
+ ) {
256
280
  // Lazy conformance filter: store deferred reference,
257
- // resolve on first access via a getter on relShape
281
+ // resolve on first access via a getter on relShape.
282
+ // Skipped for reverse relations (belongsTo*) because the
283
+ // auto-derived getter assumes forward direction; the executor's
284
+ // `resolve_reverse_relations` already populates these correctly.
258
285
  const targetThunk = relMeta.target;
259
286
  const predicate = relMeta.predicate;
260
287
  let resolved = false;
@@ -292,6 +319,8 @@ export function buildSHACL(
292
319
  }
293
320
 
294
321
  // ── sh:class — target shape reference ───────────────────────────
322
+ // Also emit ad4m:targetClassName so the executor can look up the
323
+ // target class shape through its in-memory cache by bare name.
295
324
  if (relMeta.target) {
296
325
  try {
297
326
  const TargetClass = relMeta.target();
@@ -299,8 +328,53 @@ export function buildSHACL(
299
328
  if (targetSHACL?.shape?.nodeShapeUri) {
300
329
  relShape.class = targetSHACL.shape.nodeShapeUri;
301
330
  }
331
+ if (targetSHACL?.name) {
332
+ relShape.targetClassName = targetSHACL.name;
333
+ } else {
334
+ const targetProto = (TargetClass as any).prototype;
335
+ if (targetProto?.className) {
336
+ relShape.targetClassName = targetProto.className;
337
+ }
338
+ }
339
+ } catch (e) {
340
+ // Target class resolution failed (typically a circular
341
+ // decorator dependency). Since the executor no longer
342
+ // receives target metadata over the wire, dropping the
343
+ // reference here would turn a transient build-time issue
344
+ // into a permanent broken-include at query time. Log
345
+ // loudly so the failure is discoverable.
346
+ console.warn(
347
+ `[shacl-gen] Failed to resolve target class for relation `
348
+ + `"${subjectName}.${relName}": ${e instanceof Error ? e.message : String(e)}`
349
+ );
350
+ }
351
+ }
352
+
353
+ // ── Where-clause metadata for post-getter filtering ─────────────
354
+ // The executor uses these to apply where conditions against the
355
+ // target class without needing the target's ModelMetadata at query time.
356
+ if (relMeta.where) {
357
+ relShape.whereFilter = relMeta.where;
358
+ try {
359
+ const TargetClass = relMeta.target?.();
360
+ const targetMetadata = TargetClass
361
+ ? (TargetClass as any).getModelMetadata?.() ?? null
362
+ : null;
363
+ if (targetMetadata?.properties) {
364
+ const predicates: Record<string, string> = {};
365
+ for (const propName of Object.keys(relMeta.where)) {
366
+ if (['id', 'author', 'timestamp'].includes(propName)) continue;
367
+ const propMeta = targetMetadata.properties[propName];
368
+ if (propMeta?.predicate) {
369
+ predicates[propName] = propMeta.predicate;
370
+ }
371
+ }
372
+ if (Object.keys(predicates).length > 0) {
373
+ relShape.wherePredicates = predicates;
374
+ }
375
+ }
302
376
  } catch (e) {
303
- // Target class may not be available yet
377
+ // Target metadata may not be available yet
304
378
  }
305
379
  }
306
380
 
@@ -0,0 +1,197 @@
1
+ /**
2
+ * Decorator → SHACL writer round-trip tests.
3
+ *
4
+ * Spec R11 gate on the TypeScript side: any field a decorator sets must
5
+ * survive into the SHACL graph produced by `generateSHACL()`. These tests
6
+ * compare against the SHACL link emission (the format the Rust executor
7
+ * stores and reads), not against `getModelMetadata()` — which is the
8
+ * dying shape transport, not the source of truth.
9
+ */
10
+ import { Ad4mModel } from "./Ad4mModel";
11
+ import {
12
+ Model,
13
+ Property,
14
+ Flag,
15
+ HasMany,
16
+ HasOne,
17
+ BelongsToOne,
18
+ BelongsToMany,
19
+ } from "./decorators";
20
+
21
+ function flatten(
22
+ shape: any,
23
+ ): Array<{ source: string; predicate: string; target: string }> {
24
+ return shape.toLinks().map((l: any) => ({
25
+ source: l.source,
26
+ predicate: l.predicate,
27
+ target: l.target,
28
+ }));
29
+ }
30
+
31
+ function findLinkTarget(
32
+ links: any[],
33
+ source: string,
34
+ predicate: string,
35
+ ): string | undefined {
36
+ return links.find((l) => l.source === source && l.predicate === predicate)
37
+ ?.target;
38
+ }
39
+
40
+ describe("Decorators → SHACL writer round-trip", () => {
41
+ it("emits ad4m:relationKind for every relation kind", () => {
42
+ @Model({ name: "Target" })
43
+ class Target extends Ad4mModel {}
44
+
45
+ @Model({ name: "Holder" })
46
+ class Holder extends Ad4mModel {
47
+ @HasMany({ through: "ns://hm", target: () => Target })
48
+ hmRel: string[] = [];
49
+
50
+ @HasOne({ through: "ns://ho", target: () => Target })
51
+ hoRel: string = "";
52
+
53
+ @BelongsToOne({ through: "ns://bto", target: () => Target })
54
+ btoRel: string = "";
55
+
56
+ @BelongsToMany({ through: "ns://btm", target: () => Target })
57
+ btmRel: string[] = [];
58
+ }
59
+
60
+ const { shape } = Holder.generateSHACL();
61
+ const links = flatten(shape);
62
+ const propUri = (name: string) => `ns://Holder.${name}`;
63
+
64
+ expect(findLinkTarget(links, propUri("hmRel"), "ad4m://relationKind")).toBe(
65
+ "literal:string:hasMany",
66
+ );
67
+ expect(findLinkTarget(links, propUri("hoRel"), "ad4m://relationKind")).toBe(
68
+ "literal:string:hasOne",
69
+ );
70
+ expect(
71
+ findLinkTarget(links, propUri("btoRel"), "ad4m://relationKind"),
72
+ ).toBe("literal:string:belongsToOne");
73
+ expect(
74
+ findLinkTarget(links, propUri("btmRel"), "ad4m://relationKind"),
75
+ ).toBe("literal:string:belongsToMany");
76
+ });
77
+
78
+ it("emits maxCount=1 for scalar relations", () => {
79
+ @Model({ name: "Target2" })
80
+ class Target2 extends Ad4mModel {}
81
+
82
+ @Model({ name: "Holder2" })
83
+ class Holder2 extends Ad4mModel {
84
+ @HasOne({ through: "ns://ho", target: () => Target2 })
85
+ hoRel: string = "";
86
+
87
+ @BelongsToOne({ through: "ns://bto", target: () => Target2 })
88
+ btoRel: string = "";
89
+ }
90
+
91
+ const { shape } = Holder2.generateSHACL();
92
+ const links = flatten(shape);
93
+
94
+ expect(findLinkTarget(links, "ns://Holder2.hoRel", "sh://maxCount")).toBe(
95
+ "literal:1^^xsd:integer",
96
+ );
97
+ expect(findLinkTarget(links, "ns://Holder2.btoRel", "sh://maxCount")).toBe(
98
+ "literal:1^^xsd:integer",
99
+ );
100
+ });
101
+
102
+ it("emits ad4m:targetClassName for relations with a target", () => {
103
+ @Model({ name: "Ingredient" })
104
+ class Ingredient extends Ad4mModel {}
105
+
106
+ @Model({ name: "Recipe" })
107
+ class Recipe extends Ad4mModel {
108
+ @HasMany({ through: "ns://ing", target: () => Ingredient })
109
+ ingredients: string[] = [];
110
+ }
111
+
112
+ const { shape } = Recipe.generateSHACL();
113
+ const links = flatten(shape);
114
+
115
+ expect(
116
+ findLinkTarget(
117
+ links,
118
+ "ns://Recipe.ingredients",
119
+ "ad4m://targetClassName",
120
+ ),
121
+ ).toBe("literal:string:Ingredient");
122
+ });
123
+
124
+ it("emits sh:hasValue for @Flag properties", () => {
125
+ @Model({ name: "Channel" })
126
+ class Channel extends Ad4mModel {
127
+ @Flag({ through: "ns://type", value: "ns://Channel" })
128
+ type: string = "";
129
+ }
130
+
131
+ const { shape } = Channel.generateSHACL();
132
+ const links = flatten(shape);
133
+
134
+ const hasValue = findLinkTarget(
135
+ links,
136
+ "ns://Channel.type",
137
+ "sh://hasValue",
138
+ );
139
+ expect(hasValue).toBeDefined();
140
+ // Writer emits literal:<value> for URI-style flags.
141
+ expect(hasValue).toContain("ns://Channel");
142
+ });
143
+
144
+ it("encodes ad4m:filter=false when explicitly disabled", () => {
145
+ @Model({ name: "Tag" })
146
+ class Tag extends Ad4mModel {}
147
+
148
+ @Model({ name: "Doc" })
149
+ class Doc extends Ad4mModel {
150
+ @HasMany({ through: "ns://tag", target: () => Tag, filter: false })
151
+ tags: string[] = [];
152
+ }
153
+
154
+ const { shape } = Doc.generateSHACL();
155
+ const links = flatten(shape);
156
+
157
+ expect(findLinkTarget(links, "ns://Doc.tags", "ad4m://filter")).toBe(
158
+ "literal:false",
159
+ );
160
+ });
161
+
162
+ it("does not emit ad4m:filter when defaulted to true", () => {
163
+ @Model({ name: "Tag2" })
164
+ class Tag2 extends Ad4mModel {}
165
+
166
+ @Model({ name: "Doc2" })
167
+ class Doc2 extends Ad4mModel {
168
+ @HasMany({ through: "ns://tag", target: () => Tag2 })
169
+ tags: string[] = [];
170
+ }
171
+
172
+ const { shape } = Doc2.generateSHACL();
173
+ const links = flatten(shape);
174
+
175
+ expect(
176
+ findLinkTarget(links, "ns://Doc2.tags", "ad4m://filter"),
177
+ ).toBeUndefined();
178
+ });
179
+
180
+ it("emits scalar property predicates", () => {
181
+ @Model({ name: "Profile" })
182
+ class Profile extends Ad4mModel {
183
+ @Property({ through: "ns://name", resolveLanguage: "literal" })
184
+ name: string = "";
185
+ }
186
+
187
+ const { shape } = Profile.generateSHACL();
188
+ const links = flatten(shape);
189
+
190
+ expect(findLinkTarget(links, "ns://Profile.name", "sh://path")).toBe(
191
+ "ns://name",
192
+ );
193
+ expect(
194
+ findLinkTarget(links, "ns://Profile.name", "ad4m://resolveLanguage"),
195
+ ).toBe("literal:string:literal");
196
+ });
197
+ });