@coasys/ad4m 0.13.0-test-1 → 0.13.0-test-3
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 +2377 -849
- package/lib/index.js +2354 -846
- package/lib/src/Literal.js +6 -5
- package/lib/src/agent/AgentClient.d.ts +5 -1
- package/lib/src/agent/AgentClient.js +48 -2
- package/lib/src/expression/ExpressionRef.js +2 -2
- package/lib/src/index.d.ts +0 -1
- package/lib/src/index.js +0 -1
- package/lib/src/language/Language.d.ts +26 -176
- package/lib/src/language/Language.js +28 -2
- package/lib/src/model/Ad4mModel.d.ts +52 -28
- package/lib/src/model/Ad4mModel.js +255 -118
- package/lib/src/model/Ad4mModel.test.js +1727 -537
- package/lib/src/model/ModelQueryBuilder.d.ts +67 -34
- package/lib/src/model/ModelQueryBuilder.js +208 -79
- package/lib/src/model/Subject.js +6 -6
- package/lib/src/model/decorators.d.ts +14 -8
- package/lib/src/model/decorators.js +41 -14
- package/lib/src/model/hydration-batch.d.ts +34 -0
- package/lib/src/model/hydration-batch.js +147 -0
- package/lib/src/model/hydration-batching.test.d.ts +7 -0
- package/lib/src/model/hydration-batching.test.js +456 -0
- package/lib/src/model/hydration.d.ts +4 -3
- package/lib/src/model/hydration.js +365 -86
- package/lib/src/model/index.d.ts +4 -1
- package/lib/src/model/index.js +4 -1
- package/lib/src/model/json-schema.js +2 -2
- package/lib/src/model/query-cache.d.ts +30 -0
- package/lib/src/model/query-cache.js +66 -0
- package/lib/src/model/query-cache.test.d.ts +1 -0
- package/lib/src/model/query-cache.test.js +43 -0
- package/lib/src/model/query-common.d.ts +1 -1
- package/lib/src/model/query-common.js +1 -1
- package/lib/src/model/query-sparql-batch.d.ts +17 -0
- package/lib/src/model/query-sparql-batch.js +260 -0
- package/lib/src/model/query-sparql.d.ts +124 -0
- package/lib/src/model/query-sparql.js +767 -0
- package/lib/src/model/query-sparql.test.d.ts +1 -0
- package/lib/src/model/query-sparql.test.js +495 -0
- package/lib/src/model/{surreal-utils.d.ts → query-utils.d.ts} +12 -9
- package/lib/src/model/{surreal-utils.js → query-utils.js} +43 -27
- package/lib/src/model/relation-filtering.test.js +15 -15
- package/lib/src/model/sdna.js +1 -1
- package/lib/src/model/shacl-gen.js +42 -18
- package/lib/src/model/subscription-delta.test.d.ts +24 -0
- package/lib/src/model/subscription-delta.test.js +180 -0
- package/lib/src/model/subscription-pool.d.ts +39 -0
- package/lib/src/model/subscription-pool.js +165 -0
- package/lib/src/model/types.d.ts +52 -4
- package/lib/src/model/types.js +1 -1
- package/lib/src/perspectives/PerspectiveClient.d.ts +3 -17
- package/lib/src/perspectives/PerspectiveClient.js +42 -66
- package/lib/src/perspectives/PerspectiveClient.test.d.ts +1 -0
- package/lib/src/perspectives/PerspectiveClient.test.js +169 -0
- package/lib/src/perspectives/PerspectiveProxy.d.ts +54 -30
- package/lib/src/perspectives/PerspectiveProxy.js +239 -177
- package/lib/src/perspectives/PerspectiveResolver.d.ts +0 -1
- package/lib/src/perspectives/PerspectiveResolver.js +0 -11
- package/lib/src/perspectives/WakerSubscriptionManager.d.ts +3 -3
- package/lib/src/perspectives/WakerSubscriptionManager.js +7 -8
- package/lib/src/runtime/RuntimeResolver.d.ts +11 -0
- package/lib/src/runtime/RuntimeResolver.js +56 -0
- package/lib/src/schema.gql +11 -1
- package/lib/src/shacl/SHACLFlow.d.ts +1 -1
- package/lib/src/shacl/SHACLFlow.js +9 -9
- package/lib/src/shacl/SHACLShape.d.ts +1 -1
- package/lib/src/shacl/SHACLShape.js +38 -38
- package/lib/src/typeDefs.js +11 -1
- package/lib/src/utils.d.ts +6 -6
- package/lib/src/utils.js +6 -6
- package/package.json +1 -1
- package/src/Ad4mClient.test.ts +56 -1
- package/src/Literal.test.ts +10 -5
- package/src/Literal.ts +6 -5
- package/src/agent/AgentClient.ts +53 -1
- package/src/expression/ExpressionRef.ts +2 -2
- package/src/index.ts +0 -1
- package/src/language/Language.ts +55 -231
- package/src/model/Ad4mModel.test.ts +1709 -572
- package/src/model/Ad4mModel.ts +274 -120
- package/src/model/ModelQueryBuilder.ts +234 -87
- package/src/model/Subject.ts +6 -6
- package/src/model/decorators.ts +51 -22
- package/src/model/hydration-batch.ts +205 -0
- package/src/model/hydration-batching.test.ts +563 -0
- package/src/model/hydration.ts +349 -84
- package/src/model/index.ts +4 -1
- package/src/model/json-schema.ts +2 -2
- package/src/model/query-cache.test.ts +54 -0
- package/src/model/query-cache.ts +79 -0
- package/src/model/query-common.ts +1 -1
- package/src/model/query-sparql-batch.ts +301 -0
- package/src/model/query-sparql.test.ts +568 -0
- package/src/model/query-sparql.ts +820 -0
- package/src/model/{surreal-utils.ts → query-utils.ts} +44 -27
- package/src/model/relation-filtering.test.ts +15 -15
- package/src/model/sdna.ts +1 -1
- package/src/model/shacl-gen.ts +42 -17
- package/src/model/subscription-delta.test.ts +207 -0
- package/src/model/subscription-pool.ts +211 -0
- package/src/model/types.ts +53 -4
- package/src/perspectives/PerspectiveClient.test.ts +204 -0
- package/src/perspectives/PerspectiveClient.ts +41 -68
- package/src/perspectives/PerspectiveProxy.ts +244 -181
- package/src/perspectives/PerspectiveResolver.ts +0 -8
- package/src/perspectives/WakerSubscriptionManager.ts +8 -9
- package/src/runtime/RuntimeResolver.ts +43 -0
- package/src/shacl/SHACLFlow.ts +9 -9
- package/src/shacl/SHACLShape.ts +39 -39
- package/src/utils.ts +6 -6
- package/lib/src/model/query-surreal.d.ts +0 -44
- package/lib/src/model/query-surreal.js +0 -249
- package/src/language/LanguageContext.ts +0 -37
- package/src/model/query-surreal.ts +0 -280
- package/tsconfig-browser.json +0 -82
|
@@ -1,18 +1,20 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* Shared
|
|
2
|
+
* Shared query compilation utilities.
|
|
3
3
|
*
|
|
4
4
|
* These functions are used by both the runtime query builder (`Ad4mModel`) and
|
|
5
5
|
* the compile-time SHACL generator (`decorators.ts`).
|
|
6
|
+
*
|
|
7
|
+
* All output uses native SPARQL syntax.
|
|
6
8
|
*/
|
|
7
|
-
import {
|
|
9
|
+
import { escapeQueryString } from "../utils";
|
|
8
10
|
/**
|
|
9
|
-
* Format a JavaScript value for embedding in a
|
|
11
|
+
* Format a JavaScript value for embedding in a query expression.
|
|
10
12
|
*
|
|
11
13
|
* - Strings are single-quoted with backslash / quote / newline escaping
|
|
12
14
|
* - Numbers and booleans are passed through as-is
|
|
13
15
|
* - Arrays are recursed
|
|
14
16
|
*/
|
|
15
|
-
export function
|
|
17
|
+
export function formatQueryValue(value) {
|
|
16
18
|
if (typeof value === 'string') {
|
|
17
19
|
// Escape backslashes first, then single quotes and other special characters
|
|
18
20
|
const escaped = value
|
|
@@ -28,33 +30,45 @@ export function formatSurrealValue(value) {
|
|
|
28
30
|
return String(value);
|
|
29
31
|
}
|
|
30
32
|
else if (Array.isArray(value)) {
|
|
31
|
-
return `[${value.map(v =>
|
|
33
|
+
return `[${value.map(v => formatQueryValue(v)).join(', ')}]`;
|
|
32
34
|
}
|
|
33
35
|
else {
|
|
34
36
|
return String(value);
|
|
35
37
|
}
|
|
36
38
|
}
|
|
37
39
|
/**
|
|
38
|
-
* Compile a single Where condition for a property into a
|
|
39
|
-
*
|
|
40
|
+
* Compile a single Where condition for a property into a SPARQL triple pattern
|
|
41
|
+
* that can be embedded in a getter's WHERE clause.
|
|
40
42
|
*
|
|
41
|
-
*
|
|
42
|
-
*
|
|
43
|
+
* The generated pattern operates on `?target` — e.g.:
|
|
44
|
+
* `?target <pred> <value> .`
|
|
45
|
+
* `FILTER EXISTS { ?target <pred> ?_v0 }`
|
|
43
46
|
*
|
|
44
47
|
* @param predicate - The predicate URI for the property
|
|
45
48
|
* @param condition - The Where condition value
|
|
46
49
|
* @param opts - Optional settings (e.g. `resolveLanguage`)
|
|
47
|
-
* @returns A single
|
|
50
|
+
* @returns A single SPARQL condition string
|
|
48
51
|
*/
|
|
49
52
|
export function buildWhereCondition(predicate, condition, opts) {
|
|
50
|
-
const escapedPredicate =
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
53
|
+
const escapedPredicate = escapeQueryString(predicate);
|
|
54
|
+
// For literal-resolved properties, we match against the raw IRI (which is a literal: URI)
|
|
55
|
+
// For language-resolved properties, we match against the plain URI
|
|
56
|
+
// For literal-resolved properties, values are stored as IRIs like <literal:string:VALUE>
|
|
57
|
+
// For language-resolved properties, values are plain URIs
|
|
58
|
+
const isLiteral = !opts?.resolveLanguage || opts.resolveLanguage === 'literal';
|
|
59
|
+
function formatValue(v) {
|
|
60
|
+
if (typeof v === 'string') {
|
|
61
|
+
return isLiteral
|
|
62
|
+
? `<literal:string:${escapeQueryString(v)}>`
|
|
63
|
+
: `<${escapeQueryString(v)}>`;
|
|
64
|
+
}
|
|
65
|
+
// Numbers/booleans — also stored as literal:string: in AD4M
|
|
66
|
+
return `<literal:string:${v}>`;
|
|
67
|
+
}
|
|
54
68
|
if (Array.isArray(condition)) {
|
|
55
|
-
// Array values → IN
|
|
56
|
-
const formattedValues = condition.map(
|
|
57
|
-
return `
|
|
69
|
+
// Array values → FILTER IN
|
|
70
|
+
const formattedValues = condition.map(formatValue).join(', ');
|
|
71
|
+
return `FILTER EXISTS { ?target <${escapedPredicate}> ?_val . FILTER(?_val IN (${formattedValues})) }`;
|
|
58
72
|
}
|
|
59
73
|
else if (typeof condition === 'object' && condition !== null) {
|
|
60
74
|
// Operator object
|
|
@@ -62,31 +76,33 @@ export function buildWhereCondition(predicate, condition, opts) {
|
|
|
62
76
|
const parts = [];
|
|
63
77
|
if (ops.not !== undefined) {
|
|
64
78
|
if (Array.isArray(ops.not)) {
|
|
65
|
-
const formattedValues = ops.not.map((v) =>
|
|
66
|
-
|
|
79
|
+
const formattedValues = ops.not.map((v) => formatValue(v)).join(', ');
|
|
80
|
+
// FILTER NOT EXISTS here is scoped to a specific predicate, not a global scan,
|
|
81
|
+
// so O(N²) behavior is bounded by the number of values for this property.
|
|
82
|
+
parts.push(`FILTER NOT EXISTS { ?target <${escapedPredicate}> ?_nval . FILTER(?_nval IN (${formattedValues})) }`);
|
|
67
83
|
}
|
|
68
84
|
else {
|
|
69
|
-
|
|
85
|
+
// FILTER NOT EXISTS here is scoped to a specific predicate, not a global scan,
|
|
86
|
+
// so O(N²) behavior is bounded by the number of values for this property.
|
|
87
|
+
parts.push(`FILTER NOT EXISTS { ?target <${escapedPredicate}> ${formatValue(ops.not)} }`);
|
|
70
88
|
}
|
|
71
89
|
}
|
|
72
|
-
// Comparison operators — ensure property exists
|
|
73
|
-
// may be post-filtered in JS at runtime, but the SurrealQL condition
|
|
74
|
-
// is valid for compile-time getter generation too).
|
|
90
|
+
// Comparison operators — ensure property exists
|
|
75
91
|
const hasComparisonOps = ops.gt !== undefined || ops.gte !== undefined ||
|
|
76
92
|
ops.lt !== undefined || ops.lte !== undefined ||
|
|
77
93
|
ops.between !== undefined || ops.contains !== undefined;
|
|
78
94
|
if (hasComparisonOps) {
|
|
79
|
-
parts.push(`
|
|
95
|
+
parts.push(`FILTER EXISTS { ?target <${escapedPredicate}> ?_cmp }`);
|
|
80
96
|
}
|
|
81
|
-
return parts.join('
|
|
97
|
+
return parts.join(' ');
|
|
82
98
|
}
|
|
83
99
|
else {
|
|
84
100
|
// Simple equality
|
|
85
|
-
return
|
|
101
|
+
return `?target <${escapedPredicate}> ${formatValue(condition)} .`;
|
|
86
102
|
}
|
|
87
103
|
}
|
|
88
104
|
/**
|
|
89
|
-
* Compile a full `Where` clause to an array of
|
|
105
|
+
* Compile a full `Where` clause to an array of SPARQL condition strings.
|
|
90
106
|
*
|
|
91
107
|
* When `metadata` is provided, property names are resolved to predicates
|
|
92
108
|
* using the model's property metadata. When `metadata` is `null`, property
|
|
@@ -20,7 +20,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
20
20
|
import { Ad4mModel } from "./Ad4mModel";
|
|
21
21
|
import { Model, Property, Flag, HasMany, Optional, buildConformanceFilter, } from "./decorators";
|
|
22
22
|
import { SHACLShape, } from "../shacl/SHACLShape";
|
|
23
|
-
import { compileWhereClause } from "./
|
|
23
|
+
import { compileWhereClause } from "./query-utils";
|
|
24
24
|
// ============================================================================
|
|
25
25
|
// Test models
|
|
26
26
|
// ============================================================================
|
|
@@ -88,7 +88,7 @@ __decorate([
|
|
|
88
88
|
], ParentWithRelations.prototype, "unfilteredItems", void 0);
|
|
89
89
|
__decorate([
|
|
90
90
|
HasMany({
|
|
91
|
-
getter: "
|
|
91
|
+
getter: "SELECT ?target WHERE { ?target <test://custom> ?source . }",
|
|
92
92
|
}),
|
|
93
93
|
__metadata("design:type", Array)
|
|
94
94
|
], ParentWithRelations.prototype, "customItems", void 0);
|
|
@@ -113,8 +113,8 @@ describe("buildConformanceFilter()", () => {
|
|
|
113
113
|
expect(reqCond).toBeDefined();
|
|
114
114
|
expect(reqCond.predicate).toBe("test://name");
|
|
115
115
|
expect(reqCond.value).toBeUndefined();
|
|
116
|
-
// Getter string should be a
|
|
117
|
-
expect(result.getter).toContain("
|
|
116
|
+
// Getter string should be a SPARQL expression
|
|
117
|
+
expect(result.getter).toContain("SELECT ?target WHERE");
|
|
118
118
|
expect(result.getter).toContain("test://has_flagged");
|
|
119
119
|
expect(result.getter).toContain("test://type");
|
|
120
120
|
expect(result.getter).toContain("test://flagged_type");
|
|
@@ -161,7 +161,7 @@ describe("buildConformanceFilter()", () => {
|
|
|
161
161
|
Property({
|
|
162
162
|
through: "test://computed",
|
|
163
163
|
required: true,
|
|
164
|
-
getter: "
|
|
164
|
+
getter: "SELECT ?target WHERE { ?target <test://custom> ?source . } LIMIT 1",
|
|
165
165
|
}),
|
|
166
166
|
__metadata("design:type", String)
|
|
167
167
|
], CustomGetterTarget.prototype, "computed", void 0);
|
|
@@ -179,7 +179,7 @@ describe("buildConformanceFilter()", () => {
|
|
|
179
179
|
// SHACL serialization round-trip tests
|
|
180
180
|
// ============================================================================
|
|
181
181
|
describe("SHACL shape getter serialization", () => {
|
|
182
|
-
const testGetter = "
|
|
182
|
+
const testGetter = "SELECT ?target WHERE { <Base> <test://pred> ?target . ?target <test://type> <test://flag> . }";
|
|
183
183
|
const testConditions = [
|
|
184
184
|
{ type: "flag", predicate: "test://type", value: "test://flag" },
|
|
185
185
|
{ type: "required", predicate: "test://name" },
|
|
@@ -198,7 +198,7 @@ describe("SHACL shape getter serialization", () => {
|
|
|
198
198
|
// Verify getter link exists
|
|
199
199
|
const getterLink = links.find(l => l.predicate === "ad4m://getter");
|
|
200
200
|
expect(getterLink).toBeDefined();
|
|
201
|
-
expect(getterLink.target).toBe(`literal
|
|
201
|
+
expect(getterLink.target).toBe(`literal:string:${testGetter}`);
|
|
202
202
|
// Verify conditions link exists
|
|
203
203
|
const conditionsLink = links.find(l => l.predicate === "ad4m://conformanceConditions");
|
|
204
204
|
expect(conditionsLink).toBeDefined();
|
|
@@ -321,7 +321,7 @@ describe("Ad4mModel.getModelMetadata() relation filtering fields", () => {
|
|
|
321
321
|
it("should expose explicit getter on relations with custom getter", () => {
|
|
322
322
|
const metadata = ParentWithRelations.getModelMetadata();
|
|
323
323
|
// Explicit getter provided via decorator (getter-only, no predicate)
|
|
324
|
-
expect(metadata.relations.customItems.getter).toBe("
|
|
324
|
+
expect(metadata.relations.customItems.getter).toBe("SELECT ?target WHERE { ?target <test://custom> ?source . }");
|
|
325
325
|
expect(metadata.relations.customItems.predicate).toBe("");
|
|
326
326
|
// Auto-generated getter is NOT in decorator metadata (it's in the SHACL shape)
|
|
327
327
|
expect(metadata.relations.flaggedItems.getter).toBeUndefined();
|
|
@@ -364,7 +364,7 @@ describe("Relation decorator validation", () => {
|
|
|
364
364
|
};
|
|
365
365
|
__decorate([
|
|
366
366
|
HasMany({
|
|
367
|
-
getter: "
|
|
367
|
+
getter: "SELECT ?target WHERE { ?target ?p ?source . }",
|
|
368
368
|
target: () => FlaggedTarget,
|
|
369
369
|
}),
|
|
370
370
|
__metadata("design:type", Array)
|
|
@@ -384,7 +384,7 @@ describe("Relation decorator validation", () => {
|
|
|
384
384
|
};
|
|
385
385
|
__decorate([
|
|
386
386
|
HasMany({
|
|
387
|
-
getter: "
|
|
387
|
+
getter: "SELECT ?target WHERE { ?target ?p ?source . }",
|
|
388
388
|
through: "test://pred",
|
|
389
389
|
}),
|
|
390
390
|
__metadata("design:type", Array)
|
|
@@ -404,7 +404,7 @@ describe("Relation decorator validation", () => {
|
|
|
404
404
|
};
|
|
405
405
|
__decorate([
|
|
406
406
|
HasMany({
|
|
407
|
-
getter: "
|
|
407
|
+
getter: "SELECT ?target WHERE { ?target ?p ?source . }",
|
|
408
408
|
}),
|
|
409
409
|
__metadata("design:type", Array)
|
|
410
410
|
], _Valid.prototype, "items", void 0);
|
|
@@ -541,7 +541,7 @@ describe("where clause validation", () => {
|
|
|
541
541
|
__decorate([
|
|
542
542
|
HasMany({
|
|
543
543
|
where: { status: "active" },
|
|
544
|
-
getter: "
|
|
544
|
+
getter: "SELECT ?target WHERE { ?target ?p ?source . }",
|
|
545
545
|
}),
|
|
546
546
|
__metadata("design:type", Array)
|
|
547
547
|
], _Invalid.prototype, "items", void 0);
|
|
@@ -573,7 +573,7 @@ describe("where clause validation", () => {
|
|
|
573
573
|
});
|
|
574
574
|
});
|
|
575
575
|
describe("where clause compilation", () => {
|
|
576
|
-
it("should compile where clause to
|
|
576
|
+
it("should compile where clause to SPARQL getter", () => {
|
|
577
577
|
let WhereTarget = class WhereTarget extends Ad4mModel {
|
|
578
578
|
constructor() {
|
|
579
579
|
super(...arguments);
|
|
@@ -810,7 +810,7 @@ describe("where clause compilation", () => {
|
|
|
810
810
|
// compileWhereClause() unit tests
|
|
811
811
|
// ============================================================================
|
|
812
812
|
describe("compileWhereClause()", () => {
|
|
813
|
-
it("should compile simple equality to
|
|
813
|
+
it("should compile simple equality to SPARQL condition", () => {
|
|
814
814
|
const conditions = compileWhereClause({ status: "active" }, { properties: { status: { name: "status", predicate: "test://status", required: false, readOnly: false } }, relations: {}, className: "Test" });
|
|
815
815
|
expect(conditions).toHaveLength(1);
|
|
816
816
|
expect(conditions[0]).toContain("test://status");
|
|
@@ -819,7 +819,7 @@ describe("compileWhereClause()", () => {
|
|
|
819
819
|
it("should compile not operator", () => {
|
|
820
820
|
const conditions = compileWhereClause({ status: { not: "archived" } }, { properties: { status: { name: "status", predicate: "test://status", required: false, readOnly: false } }, relations: {}, className: "Test" });
|
|
821
821
|
expect(conditions).toHaveLength(1);
|
|
822
|
-
expect(conditions[0]).toContain("
|
|
822
|
+
expect(conditions[0]).toContain("NOT EXISTS"); // negation
|
|
823
823
|
expect(conditions[0]).toContain("archived");
|
|
824
824
|
});
|
|
825
825
|
it("should compile array values to IN clause", () => {
|
package/lib/src/model/sdna.js
CHANGED
|
@@ -73,7 +73,7 @@ export function buildSDNA(subjectName, obj, properties, allRelationsMeta) {
|
|
|
73
73
|
// Optional properties (required: false) are excluded — they should
|
|
74
74
|
// remain unset (undefined) until explicitly assigned.
|
|
75
75
|
const effectiveInitial = initial
|
|
76
|
-
?? (required && writable && !flag && through ? "literal
|
|
76
|
+
?? (required && writable && !flag && through ? "literal:string:" : undefined);
|
|
77
77
|
if (effectiveInitial) {
|
|
78
78
|
constructorActions.push({
|
|
79
79
|
action: "addLink",
|
|
@@ -7,8 +7,8 @@
|
|
|
7
7
|
* decorators.ts stays focused on decorator registration logic.
|
|
8
8
|
*/
|
|
9
9
|
import { SHACLShape } from "../shacl/SHACLShape";
|
|
10
|
-
import {
|
|
11
|
-
import { compileWhereClause } from "./
|
|
10
|
+
import { escapeQueryString } from "../utils";
|
|
11
|
+
import { compileWhereClause } from "./query-utils";
|
|
12
12
|
import { propertyNameToSetterName } from "./util";
|
|
13
13
|
/**
|
|
14
14
|
* Build a SHACL shape for a model class.
|
|
@@ -131,7 +131,7 @@ export function buildSHACL(subjectName, target, properties, allRelationsMeta, co
|
|
|
131
131
|
// ── Constructor / Destructor entries ────────────────────────────
|
|
132
132
|
const effectiveInitial = propMeta.initial
|
|
133
133
|
?? (propMeta.required && propMeta.writable && !propMeta.flag && propMeta.through
|
|
134
|
-
? "literal
|
|
134
|
+
? "literal:string:" : undefined);
|
|
135
135
|
if (effectiveInitial) {
|
|
136
136
|
constructorActions.push({
|
|
137
137
|
action: "addLink",
|
|
@@ -182,7 +182,7 @@ export function buildSHACL(subjectName, target, properties, allRelationsMeta, co
|
|
|
182
182
|
// ── Build Getter (conformance filter) ───────────────────────────
|
|
183
183
|
// Priority chain:
|
|
184
184
|
// 1. Explicit getter string → use verbatim
|
|
185
|
-
// 2. `where` clause → compile DSL to
|
|
185
|
+
// 2. `where` clause → compile DSL to SPARQL getter
|
|
186
186
|
// 3. target + filter !== false → auto-derive from shape
|
|
187
187
|
if (relMeta.getter) {
|
|
188
188
|
relShape.getter = relMeta.getter;
|
|
@@ -195,8 +195,8 @@ export function buildSHACL(subjectName, target, properties, allRelationsMeta, co
|
|
|
195
195
|
: null;
|
|
196
196
|
const conditions = compileWhereClause(relMeta.where, targetMetadata);
|
|
197
197
|
if (conditions.length > 0) {
|
|
198
|
-
const escapedPredicate =
|
|
199
|
-
relShape.getter = `
|
|
198
|
+
const escapedPredicate = escapeQueryString(relMeta.predicate);
|
|
199
|
+
relShape.getter = `SELECT ?target WHERE { <Base> <${escapedPredicate}> ?target . ${conditions.join(' ')} }`;
|
|
200
200
|
}
|
|
201
201
|
}
|
|
202
202
|
catch (e) {
|
|
@@ -204,18 +204,42 @@ export function buildSHACL(subjectName, target, properties, allRelationsMeta, co
|
|
|
204
204
|
}
|
|
205
205
|
}
|
|
206
206
|
else if (relMeta.target && relMeta.filter !== false) {
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
207
|
+
// Lazy conformance filter: store deferred reference,
|
|
208
|
+
// resolve on first access via a getter on relShape
|
|
209
|
+
const targetThunk = relMeta.target;
|
|
210
|
+
const predicate = relMeta.predicate;
|
|
211
|
+
let resolved = false;
|
|
212
|
+
let cachedGetter;
|
|
213
|
+
let cachedConditions;
|
|
214
|
+
const resolveFilter = () => {
|
|
215
|
+
if (resolved)
|
|
216
|
+
return;
|
|
217
|
+
resolved = true;
|
|
218
|
+
try {
|
|
219
|
+
const TargetClass = targetThunk();
|
|
220
|
+
const filter = conformanceFilterFn(predicate, TargetClass);
|
|
221
|
+
if (filter) {
|
|
222
|
+
cachedGetter = filter.getter;
|
|
223
|
+
cachedConditions = filter.conformanceConditions;
|
|
224
|
+
}
|
|
213
225
|
}
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
226
|
+
catch (e) {
|
|
227
|
+
// Target class may not be available yet
|
|
228
|
+
}
|
|
229
|
+
};
|
|
230
|
+
// Define lazy getters that resolve on first access
|
|
231
|
+
Object.defineProperty(relShape, 'getter', {
|
|
232
|
+
get() { resolveFilter(); return cachedGetter; },
|
|
233
|
+
set(v) { resolved = true; cachedGetter = v; },
|
|
234
|
+
enumerable: true,
|
|
235
|
+
configurable: true,
|
|
236
|
+
});
|
|
237
|
+
Object.defineProperty(relShape, 'conformanceConditions', {
|
|
238
|
+
get() { resolveFilter(); return cachedConditions; },
|
|
239
|
+
set(v) { resolved = true; cachedConditions = v; },
|
|
240
|
+
enumerable: true,
|
|
241
|
+
configurable: true,
|
|
242
|
+
});
|
|
219
243
|
}
|
|
220
244
|
// ── sh:class — target shape reference ───────────────────────────
|
|
221
245
|
if (relMeta.target) {
|
|
@@ -233,7 +257,7 @@ export function buildSHACL(subjectName, target, properties, allRelationsMeta, co
|
|
|
233
257
|
shape.addProperty(relShape);
|
|
234
258
|
}
|
|
235
259
|
// Always set constructor and destructor actions on the shape, even
|
|
236
|
-
// when empty. An empty array serialises to `literal
|
|
260
|
+
// when empty. An empty array serialises to `literal:string:[]`
|
|
237
261
|
// which the Rust executor parses as a valid (no-op) command list,
|
|
238
262
|
// avoiding "No SHACL constructor found" errors for models whose
|
|
239
263
|
// properties are all optional and have no @Flag.
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Tests for the delta fast-path logic used in subscription-pool.ts.
|
|
3
|
+
*
|
|
4
|
+
* The delta optimisation in pooledSubscribe's onResult handler:
|
|
5
|
+
* 1. Checks if new rows are a strict superset of previous rows
|
|
6
|
+
* 2. Extracts added rows (new triples not in prev set)
|
|
7
|
+
* 3. Verifies ALL added rows have source URIs not already in previous results
|
|
8
|
+
* 4. If condition 3 fails (existing source got new links), falls back to full rehydration
|
|
9
|
+
*
|
|
10
|
+
* These tests validate the detection logic in isolation.
|
|
11
|
+
*/
|
|
12
|
+
type Row = {
|
|
13
|
+
source: string;
|
|
14
|
+
predicate: string;
|
|
15
|
+
target: string;
|
|
16
|
+
};
|
|
17
|
+
/**
|
|
18
|
+
* Replicates the delta-path eligibility check from subscription-pool.ts
|
|
19
|
+
*/
|
|
20
|
+
declare function detectDeltaPath(prevArr: Row[], newArr: Row[]): {
|
|
21
|
+
useDelta: boolean;
|
|
22
|
+
addedRows: Row[];
|
|
23
|
+
reason?: string;
|
|
24
|
+
};
|
|
@@ -0,0 +1,180 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Tests for the delta fast-path logic used in subscription-pool.ts.
|
|
3
|
+
*
|
|
4
|
+
* The delta optimisation in pooledSubscribe's onResult handler:
|
|
5
|
+
* 1. Checks if new rows are a strict superset of previous rows
|
|
6
|
+
* 2. Extracts added rows (new triples not in prev set)
|
|
7
|
+
* 3. Verifies ALL added rows have source URIs not already in previous results
|
|
8
|
+
* 4. If condition 3 fails (existing source got new links), falls back to full rehydration
|
|
9
|
+
*
|
|
10
|
+
* These tests validate the detection logic in isolation.
|
|
11
|
+
*/
|
|
12
|
+
/**
|
|
13
|
+
* Replicates the delta-path eligibility check from subscription-pool.ts
|
|
14
|
+
*/
|
|
15
|
+
function detectDeltaPath(prevArr, newArr) {
|
|
16
|
+
if (newArr.length <= prevArr.length) {
|
|
17
|
+
return { useDelta: false, addedRows: [], reason: 'no growth' };
|
|
18
|
+
}
|
|
19
|
+
if (newArr.length - prevArr.length > 5) {
|
|
20
|
+
return { useDelta: false, addedRows: [], reason: 'delta too large' };
|
|
21
|
+
}
|
|
22
|
+
const prevSources = new Set(prevArr.map(r => `${r.source}|${r.predicate}|${r.target}`));
|
|
23
|
+
const addedRows = newArr.filter(r => !prevSources.has(`${r.source}|${r.predicate}|${r.target}`));
|
|
24
|
+
const newSources = new Set(newArr.map(r => `${r.source}|${r.predicate}|${r.target}`));
|
|
25
|
+
const removedRows = prevArr.filter(r => !newSources.has(`${r.source}|${r.predicate}|${r.target}`));
|
|
26
|
+
if (removedRows.length > 0) {
|
|
27
|
+
return { useDelta: false, addedRows, reason: 'rows removed' };
|
|
28
|
+
}
|
|
29
|
+
// Key check: all added rows must have NEW source URIs
|
|
30
|
+
const prevSourceIds = new Set(prevArr.map(r => r.source));
|
|
31
|
+
const allNewSources = addedRows.every(r => !prevSourceIds.has(r.source));
|
|
32
|
+
if (!allNewSources) {
|
|
33
|
+
return { useDelta: false, addedRows, reason: 'existing source got new links' };
|
|
34
|
+
}
|
|
35
|
+
return { useDelta: true, addedRows };
|
|
36
|
+
}
|
|
37
|
+
describe('delta fast-path detection', () => {
|
|
38
|
+
const prev = [
|
|
39
|
+
{ source: 'a', predicate: 'p1', target: 't1' },
|
|
40
|
+
{ source: 'a', predicate: 'p2', target: 't2' },
|
|
41
|
+
{ source: 'b', predicate: 'p1', target: 't3' },
|
|
42
|
+
];
|
|
43
|
+
it('appends genuinely new items via delta path', () => {
|
|
44
|
+
const next = [
|
|
45
|
+
...prev,
|
|
46
|
+
{ source: 'c', predicate: 'p1', target: 't4' },
|
|
47
|
+
];
|
|
48
|
+
const result = detectDeltaPath(prev, next);
|
|
49
|
+
expect(result.useDelta).toBe(true);
|
|
50
|
+
expect(result.addedRows).toHaveLength(1);
|
|
51
|
+
expect(result.addedRows[0].source).toBe('c');
|
|
52
|
+
});
|
|
53
|
+
it('falls back when existing source gets new links', () => {
|
|
54
|
+
const next = [
|
|
55
|
+
...prev,
|
|
56
|
+
{ source: 'a', predicate: 'p3', target: 't5' }, // source 'a' already exists
|
|
57
|
+
];
|
|
58
|
+
const result = detectDeltaPath(prev, next);
|
|
59
|
+
expect(result.useDelta).toBe(false);
|
|
60
|
+
expect(result.reason).toBe('existing source got new links');
|
|
61
|
+
});
|
|
62
|
+
it('falls back when rows are removed (even if new ones added)', () => {
|
|
63
|
+
const next = [
|
|
64
|
+
{ source: 'a', predicate: 'p1', target: 't1' },
|
|
65
|
+
{ source: 'a', predicate: 'p2', target: 't2' },
|
|
66
|
+
// source 'b' row removed, two new sources added so length grows
|
|
67
|
+
{ source: 'c', predicate: 'p1', target: 't4' },
|
|
68
|
+
{ source: 'd', predicate: 'p1', target: 't5' },
|
|
69
|
+
];
|
|
70
|
+
const result = detectDeltaPath(prev, next);
|
|
71
|
+
expect(result.useDelta).toBe(false);
|
|
72
|
+
expect(result.reason).toBe('rows removed');
|
|
73
|
+
});
|
|
74
|
+
it('falls back when delta is too large (>5 new rows)', () => {
|
|
75
|
+
const next = [
|
|
76
|
+
...prev,
|
|
77
|
+
...Array.from({ length: 6 }, (_, i) => ({
|
|
78
|
+
source: `new${i}`, predicate: 'p1', target: `t${10 + i}`,
|
|
79
|
+
})),
|
|
80
|
+
];
|
|
81
|
+
const result = detectDeltaPath(prev, next);
|
|
82
|
+
expect(result.useDelta).toBe(false);
|
|
83
|
+
expect(result.reason).toBe('delta too large');
|
|
84
|
+
});
|
|
85
|
+
it('falls back when no growth', () => {
|
|
86
|
+
const result = detectDeltaPath(prev, prev);
|
|
87
|
+
expect(result.useDelta).toBe(false);
|
|
88
|
+
expect(result.reason).toBe('no growth');
|
|
89
|
+
});
|
|
90
|
+
it('handles multiple new sources in one delta', () => {
|
|
91
|
+
const next = [
|
|
92
|
+
...prev,
|
|
93
|
+
{ source: 'c', predicate: 'p1', target: 't4' },
|
|
94
|
+
{ source: 'd', predicate: 'p1', target: 't5' },
|
|
95
|
+
];
|
|
96
|
+
const result = detectDeltaPath(prev, next);
|
|
97
|
+
expect(result.useDelta).toBe(true);
|
|
98
|
+
expect(result.addedRows).toHaveLength(2);
|
|
99
|
+
});
|
|
100
|
+
// ── Test #8: Rapid successive additions ──
|
|
101
|
+
it('handles 10 items added in quick succession without duplicates', () => {
|
|
102
|
+
let current = [...prev];
|
|
103
|
+
for (let i = 0; i < 10; i++) {
|
|
104
|
+
const next = [...current, { source: `rapid-${i}`, predicate: 'p1', target: `t-rapid-${i}` }];
|
|
105
|
+
const result = detectDeltaPath(current, next);
|
|
106
|
+
// Each individual addition should be eligible for delta
|
|
107
|
+
expect(result.useDelta).toBe(true);
|
|
108
|
+
expect(result.addedRows).toHaveLength(1);
|
|
109
|
+
expect(result.addedRows[0].source).toBe(`rapid-${i}`);
|
|
110
|
+
current = next;
|
|
111
|
+
}
|
|
112
|
+
});
|
|
113
|
+
// ── Test #9: Addition + removal in same batch ──
|
|
114
|
+
it('falls back when one item added and another removed simultaneously', () => {
|
|
115
|
+
const next = [
|
|
116
|
+
{ source: 'a', predicate: 'p1', target: 't1' },
|
|
117
|
+
{ source: 'a', predicate: 'p2', target: 't2' },
|
|
118
|
+
// source 'b' removed, source 'c' added
|
|
119
|
+
{ source: 'c', predicate: 'p1', target: 't4' },
|
|
120
|
+
{ source: 'd', predicate: 'p1', target: 't5' },
|
|
121
|
+
];
|
|
122
|
+
const result = detectDeltaPath(prev, next);
|
|
123
|
+
expect(result.useDelta).toBe(false);
|
|
124
|
+
expect(result.reason).toBe('rows removed');
|
|
125
|
+
});
|
|
126
|
+
// ── Test #10: Delta with nested relations (detection only) ──
|
|
127
|
+
it('delta path detects new items correctly even when sources have complex URIs', () => {
|
|
128
|
+
const next = [
|
|
129
|
+
...prev,
|
|
130
|
+
{ source: 'flux://post/123/comment/456', predicate: 'flux://belongs_to', target: 'flux://post/123' },
|
|
131
|
+
];
|
|
132
|
+
const result = detectDeltaPath(prev, next);
|
|
133
|
+
expect(result.useDelta).toBe(true);
|
|
134
|
+
expect(result.addedRows).toHaveLength(1);
|
|
135
|
+
expect(result.addedRows[0].source).toBe('flux://post/123/comment/456');
|
|
136
|
+
});
|
|
137
|
+
// ── Test #11: Empty previous result + new items ──
|
|
138
|
+
it('handles empty previous array with new items arriving', () => {
|
|
139
|
+
const empty = [];
|
|
140
|
+
const next = [
|
|
141
|
+
{ source: 'x', predicate: 'p1', target: 't1' },
|
|
142
|
+
];
|
|
143
|
+
const result = detectDeltaPath(empty, next);
|
|
144
|
+
expect(result.useDelta).toBe(true);
|
|
145
|
+
expect(result.addedRows).toHaveLength(1);
|
|
146
|
+
});
|
|
147
|
+
it('handles empty previous with no new items', () => {
|
|
148
|
+
const result = detectDeltaPath([], []);
|
|
149
|
+
expect(result.useDelta).toBe(false);
|
|
150
|
+
expect(result.reason).toBe('no growth');
|
|
151
|
+
});
|
|
152
|
+
// ── Test #12: Source URI with special characters ──
|
|
153
|
+
it('handles URIs with encoded characters, fragments, and query params', () => {
|
|
154
|
+
const specialPrev = [
|
|
155
|
+
{ source: 'flux://item%20one', predicate: 'p1', target: 't1' },
|
|
156
|
+
{ source: 'flux://item#section', predicate: 'p2', target: 't2' },
|
|
157
|
+
{ source: 'flux://item?key=val&foo=bar', predicate: 'p3', target: 't3' },
|
|
158
|
+
];
|
|
159
|
+
const specialNext = [
|
|
160
|
+
...specialPrev,
|
|
161
|
+
{ source: 'flux://new%C3%A9item', predicate: 'p1', target: 't4' },
|
|
162
|
+
];
|
|
163
|
+
const result = detectDeltaPath(specialPrev, specialNext);
|
|
164
|
+
expect(result.useDelta).toBe(true);
|
|
165
|
+
expect(result.addedRows).toHaveLength(1);
|
|
166
|
+
expect(result.addedRows[0].source).toBe('flux://new%C3%A9item');
|
|
167
|
+
});
|
|
168
|
+
it('correctly identifies existing source with special chars getting new links', () => {
|
|
169
|
+
const specialPrev = [
|
|
170
|
+
{ source: 'flux://item#section', predicate: 'p1', target: 't1' },
|
|
171
|
+
];
|
|
172
|
+
const specialNext = [
|
|
173
|
+
...specialPrev,
|
|
174
|
+
{ source: 'flux://item#section', predicate: 'p2', target: 't2' },
|
|
175
|
+
];
|
|
176
|
+
const result = detectDeltaPath(specialPrev, specialNext);
|
|
177
|
+
expect(result.useDelta).toBe(false);
|
|
178
|
+
expect(result.reason).toBe('existing source got new links');
|
|
179
|
+
});
|
|
180
|
+
});
|
|
@@ -0,0 +1,39 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Subscription Pool — deduplicates identical SPARQL subscriptions.
|
|
3
|
+
*
|
|
4
|
+
* When multiple UI components subscribe to the same SPARQL query on the same
|
|
5
|
+
* perspective, the pool shares a single `subscribeQuery()` call and distributes
|
|
6
|
+
* results to all registered callbacks. Hydration happens once per result set,
|
|
7
|
+
* then is shared across all subscribers.
|
|
8
|
+
*
|
|
9
|
+
* Key: `perspectiveUUID + sparqlQuery`
|
|
10
|
+
*/
|
|
11
|
+
import type { PerspectiveProxy } from "../perspectives/PerspectiveProxy";
|
|
12
|
+
type HydrateCallback = (rawResult: any) => Promise<any>;
|
|
13
|
+
type ResultCallback = (hydratedResult: any) => void;
|
|
14
|
+
export interface PooledSubscription {
|
|
15
|
+
/** The initial (hydrated) result */
|
|
16
|
+
initialResult: any;
|
|
17
|
+
/** Unsubscribe this particular callback from the pool */
|
|
18
|
+
dispose: () => void;
|
|
19
|
+
}
|
|
20
|
+
/**
|
|
21
|
+
* Subscribe to a SPARQL query, sharing the underlying subscription
|
|
22
|
+
* with any other subscribers using the same perspective + query.
|
|
23
|
+
*
|
|
24
|
+
* @param perspective - The perspective proxy
|
|
25
|
+
* @param sparqlQuery - The SPARQL query text
|
|
26
|
+
* @param hydrate - Async function that takes raw SPARQL results and returns hydrated results
|
|
27
|
+
* @param onResult - Callback for subsequent result updates (hydrated)
|
|
28
|
+
* @returns PooledSubscription with initial result and dispose function
|
|
29
|
+
*/
|
|
30
|
+
export declare function pooledSubscribe(perspective: PerspectiveProxy, sparqlQuery: string, hydrate: HydrateCallback, onResult: ResultCallback): Promise<PooledSubscription>;
|
|
31
|
+
/**
|
|
32
|
+
* Clear the entire pool (for testing).
|
|
33
|
+
*/
|
|
34
|
+
export declare function clearSubscriptionPool(): void;
|
|
35
|
+
/**
|
|
36
|
+
* Get the current pool size (for testing).
|
|
37
|
+
*/
|
|
38
|
+
export declare function subscriptionPoolSize(): number;
|
|
39
|
+
export {};
|