@coasys/ad4m 0.13.0-test-5 → 0.13.0-test-6
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 +610 -337
- package/lib/index.js +608 -338
- package/lib/src/Ad4mClient.d.ts +1 -1
- package/lib/src/Ad4mClient.js +2 -1
- package/lib/src/agent/AgentClient.d.ts +16 -0
- package/lib/src/agent/AgentClient.js +74 -4
- package/lib/src/cache/PersistentCache.d.ts +40 -0
- package/lib/src/cache/PersistentCache.js +139 -0
- package/lib/src/expression/ExpressionClient.d.ts +8 -0
- package/lib/src/expression/ExpressionClient.js +113 -5
- package/lib/src/index.d.ts +1 -0
- package/lib/src/index.js +1 -0
- package/lib/src/model/Ad4mModel.js +29 -57
- package/lib/src/model/Ad4mModel.test.js +688 -1434
- package/lib/src/model/ModelQueryBuilder.js +0 -9
- package/lib/src/model/Subject.js +6 -6
- package/lib/src/model/query-surreal.d.ts +44 -0
- package/lib/src/model/query-surreal.js +249 -0
- package/lib/src/model/relation-filtering.test.js +15 -15
- package/lib/src/model/surreal-utils.d.ts +42 -0
- package/lib/src/model/surreal-utils.js +128 -0
- package/lib/src/model/types.d.ts +0 -1
- package/lib/src/perspectives/PerspectiveClient.d.ts +0 -1
- package/lib/src/perspectives/PerspectiveClient.js +5 -13
- package/lib/src/perspectives/PerspectiveProxy.js +0 -3
- package/lib/src/perspectives/PerspectiveResolver.d.ts +1 -0
- package/lib/src/perspectives/PerspectiveResolver.js +11 -0
- package/lib/src/runtime/RuntimeResolver.d.ts +1 -28
- package/lib/src/runtime/RuntimeResolver.js +4 -197
- package/lib/src/schema.gql +1 -27
- package/lib/src/shacl/SHACLShape.test.js +0 -82
- package/package.json +1 -1
- package/src/Ad4mClient.test.ts +14 -4
- package/src/Ad4mClient.ts +2 -1
- package/src/agent/AgentClient.ts +84 -2
- package/src/cache/PersistentCache.ts +145 -0
- package/src/cache/cache.test.ts +713 -0
- package/src/expression/ExpressionClient.ts +137 -3
- package/src/index.ts +1 -0
- package/src/model/Ad4mModel.test.ts +1 -61
- package/src/model/Ad4mModel.ts +31 -57
- package/src/model/ModelQueryBuilder.ts +0 -6
- package/src/model/types.ts +1 -1
- package/src/perspectives/PerspectiveClient.ts +7 -17
- package/src/perspectives/PerspectiveProxy.ts +0 -3
- package/lib/src/model/hydration-batch.d.ts +0 -34
- package/lib/src/model/hydration-batch.js +0 -147
- package/lib/src/model/hydration-batching.test.d.ts +0 -7
- package/lib/src/model/hydration-batching.test.js +0 -456
- package/lib/src/model/model-manifest.d.ts +0 -41
- package/lib/src/model/model-manifest.js +0 -11
- package/lib/src/model/query-cache.test.d.ts +0 -1
- package/lib/src/model/query-cache.test.js +0 -43
- package/lib/src/model/query-sparql-batch.d.ts +0 -17
- package/lib/src/model/query-sparql-batch.js +0 -260
- package/lib/src/model/query-sparql.test.d.ts +0 -1
- package/lib/src/model/query-sparql.test.js +0 -312
- package/lib/src/model/subscription-delta.test.d.ts +0 -24
- package/lib/src/model/subscription-delta.test.js +0 -180
- package/lib/src/model/subscription-pool.d.ts +0 -39
- package/lib/src/model/subscription-pool.js +0 -165
- package/lib/src/perspectives/PerspectiveClient.test.d.ts +0 -1
- package/lib/src/perspectives/PerspectiveClient.test.js +0 -224
|
@@ -3,7 +3,6 @@ import { Link } from "../links/Links";
|
|
|
3
3
|
import { LinkQuery } from "../perspectives/LinkQuery";
|
|
4
4
|
import { makeRandomId } from "./util";
|
|
5
5
|
import { getPropertiesMetadata, getRelationsMetadata, buildConformanceFilter, setPropertyRegistryEntry, setRelationRegistryEntry, Model } from "./decorators";
|
|
6
|
-
import { compileWhereClause } from "./query-utils";
|
|
7
6
|
import { resolveParentPredicate } from "./query-common";
|
|
8
7
|
import { isArrayType, determinePredicate, determineNamespace, buildModelFromJSONSchema } from "./json-schema";
|
|
9
8
|
import { buildSPARQLQuery } from "./query-sparql";
|
|
@@ -761,7 +760,11 @@ export class Ad4mModel {
|
|
|
761
760
|
const allRelMeta = getRelationsMetadata(this);
|
|
762
761
|
enrichShapeForIncludes(metadata, query.include, allRelMeta);
|
|
763
762
|
}
|
|
764
|
-
// Pre-compute conformance getters
|
|
763
|
+
// Pre-compute conformance getters for Rust-side evaluation.
|
|
764
|
+
// Where clauses are NOT compiled into getter SPARQL because stored
|
|
765
|
+
// property values are signed expression envelopes (literal:json:...),
|
|
766
|
+
// not simple literal:string:X values. Instead, where clauses are
|
|
767
|
+
// attached as metadata for Rust-side post-evaluation filtering.
|
|
765
768
|
{
|
|
766
769
|
const allRelMeta = getRelationsMetadata(this);
|
|
767
770
|
for (const [relName, relMeta] of Object.entries(metadata.relations)) {
|
|
@@ -774,43 +777,31 @@ export class Ad4mModel {
|
|
|
774
777
|
try {
|
|
775
778
|
const TargetClass = meta.target();
|
|
776
779
|
const filter = buildConformanceFilter(meta.predicate, TargetClass);
|
|
777
|
-
|
|
778
|
-
|
|
779
|
-
|
|
780
|
-
//
|
|
781
|
-
let whereConditions = [];
|
|
780
|
+
if (filter) {
|
|
781
|
+
rel.getter = filter.getter;
|
|
782
|
+
}
|
|
783
|
+
// Attach where-clause metadata for Rust-side post-getter filtering
|
|
782
784
|
if (rel.where) {
|
|
783
785
|
try {
|
|
784
786
|
const targetMetadata = TargetClass.getModelMetadata?.() ?? null;
|
|
785
|
-
let allSparqlFilterable = true;
|
|
786
787
|
if (targetMetadata) {
|
|
788
|
+
const predicates = {};
|
|
787
789
|
for (const propName of Object.keys(rel.where)) {
|
|
788
790
|
if (['id', 'author', 'timestamp'].includes(propName))
|
|
789
791
|
continue;
|
|
790
792
|
const propMeta = targetMetadata.properties[propName];
|
|
791
|
-
if (propMeta?.
|
|
792
|
-
|
|
793
|
-
break;
|
|
793
|
+
if (propMeta?.predicate) {
|
|
794
|
+
predicates[propName] = propMeta.predicate;
|
|
794
795
|
}
|
|
795
796
|
}
|
|
796
|
-
|
|
797
|
-
|
|
798
|
-
|
|
797
|
+
if (Object.keys(predicates).length > 0) {
|
|
798
|
+
rel.whereFilter = rel.where;
|
|
799
|
+
rel.wherePredicates = predicates;
|
|
800
|
+
}
|
|
799
801
|
}
|
|
800
802
|
}
|
|
801
803
|
catch (_) { }
|
|
802
804
|
}
|
|
803
|
-
if (filter) {
|
|
804
|
-
let getter = filter.getter;
|
|
805
|
-
if (whereConditions.length > 0) {
|
|
806
|
-
getter = getter.replace(/ \}$/, ` ${whereConditions.join(' ')} }`);
|
|
807
|
-
}
|
|
808
|
-
rel.getter = getter;
|
|
809
|
-
}
|
|
810
|
-
else if (whereConditions.length > 0) {
|
|
811
|
-
const escapedPred = meta.predicate.replace(/[<>"{}|\\^`\u0000-\u0020]/g, '');
|
|
812
|
-
rel.getter = `SELECT ?target WHERE { <Base> <${escapedPred}> ?target . ${whereConditions.join(' ')} }`;
|
|
813
|
-
}
|
|
814
805
|
}
|
|
815
806
|
catch (_) { }
|
|
816
807
|
}
|
|
@@ -943,45 +934,33 @@ export class Ad4mModel {
|
|
|
943
934
|
try {
|
|
944
935
|
const TargetClass = meta.target();
|
|
945
936
|
const filter = buildConformanceFilter(meta.predicate, TargetClass);
|
|
946
|
-
|
|
947
|
-
|
|
948
|
-
|
|
949
|
-
//
|
|
950
|
-
|
|
937
|
+
if (filter) {
|
|
938
|
+
rel.getter = filter.getter;
|
|
939
|
+
}
|
|
940
|
+
// Attach where-clause metadata for Rust-side post-getter filtering.
|
|
941
|
+
// Property values are signed expression envelopes (literal:json:...)
|
|
942
|
+
// and cannot be matched by SPARQL FILTER on the raw IRI.
|
|
951
943
|
if (rel.where) {
|
|
952
944
|
try {
|
|
953
945
|
const targetMetadata = TargetClass.getModelMetadata?.() ?? null;
|
|
954
|
-
let allSparqlFilterable = true;
|
|
955
946
|
if (targetMetadata) {
|
|
947
|
+
const predicates = {};
|
|
956
948
|
for (const propName of Object.keys(rel.where)) {
|
|
957
949
|
if (['id', 'author', 'timestamp'].includes(propName))
|
|
958
950
|
continue;
|
|
959
951
|
const propMeta = targetMetadata.properties[propName];
|
|
960
|
-
if (propMeta?.
|
|
961
|
-
|
|
962
|
-
break;
|
|
952
|
+
if (propMeta?.predicate) {
|
|
953
|
+
predicates[propName] = propMeta.predicate;
|
|
963
954
|
}
|
|
964
955
|
}
|
|
965
|
-
|
|
966
|
-
|
|
967
|
-
|
|
956
|
+
if (Object.keys(predicates).length > 0) {
|
|
957
|
+
rel.whereFilter = rel.where;
|
|
958
|
+
rel.wherePredicates = predicates;
|
|
959
|
+
}
|
|
968
960
|
}
|
|
969
961
|
}
|
|
970
962
|
catch (_) { /* target metadata unavailable */ }
|
|
971
963
|
}
|
|
972
|
-
if (filter) {
|
|
973
|
-
let getter = filter.getter;
|
|
974
|
-
if (whereConditions.length > 0) {
|
|
975
|
-
// Append where conditions before the closing }
|
|
976
|
-
getter = getter.replace(/ \}$/, ` ${whereConditions.join(' ')} }`);
|
|
977
|
-
}
|
|
978
|
-
rel.getter = getter;
|
|
979
|
-
}
|
|
980
|
-
else if (whereConditions.length > 0) {
|
|
981
|
-
// No conformance filter but where clause exists — build getter from where alone
|
|
982
|
-
const escapedPred = meta.predicate.replace(/[<>"{}|\\^`\u0000-\u0020]/g, '');
|
|
983
|
-
rel.getter = `SELECT ?target WHERE { <Base> <${escapedPred}> ?target . ${whereConditions.join(' ')} }`;
|
|
984
|
-
}
|
|
985
964
|
}
|
|
986
965
|
catch (e) {
|
|
987
966
|
// Target class may not be available; skip silently
|
|
@@ -993,13 +972,6 @@ export class Ad4mModel {
|
|
|
993
972
|
// the TS decorators are the definitive source of truth.
|
|
994
973
|
const shapeJson = JSON.stringify(metadata);
|
|
995
974
|
const queryJson = JSON.stringify(queryInput);
|
|
996
|
-
// TEMP DEBUG: Log getters with where-clause filters to diagnose CI failure
|
|
997
|
-
for (const [relName, relMeta] of Object.entries(metadata.relations)) {
|
|
998
|
-
const rel = relMeta;
|
|
999
|
-
if (rel.where) {
|
|
1000
|
-
console.log(`[MODEL_QUERY_DEBUG] relation="${relName}" getter=${rel.getter ?? 'NONE'} where=${JSON.stringify(rel.where)}`);
|
|
1001
|
-
}
|
|
1002
|
-
}
|
|
1003
975
|
const result = await perspective.modelQuery(className, queryJson, shapeJson);
|
|
1004
976
|
// Convert JSON instances to model class instances, recursively constructing
|
|
1005
977
|
// class instances for any included relations resolved by Rust.
|