Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| ad365a65a9 | |||
| 6214780244 | |||
| 3ace783a59 | |||
| fe162251fc |
Generated
+6
-6
@@ -1,15 +1,15 @@
|
|||||||
{
|
{
|
||||||
"name": "@arbiter/evidence-dsl",
|
"name": "@arbiter/evidence-dsl",
|
||||||
"version": "1.4.0",
|
"version": "1.6.0",
|
||||||
"lockfileVersion": 3,
|
"lockfileVersion": 3,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"name": "@arbiter/evidence-dsl",
|
"name": "@arbiter/evidence-dsl",
|
||||||
"version": "1.4.0",
|
"version": "1.6.0",
|
||||||
"license": "ISC",
|
"license": "ISC",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@arbiter/core": "^1.0.3"
|
"@arbiter/core": "^1.0.4"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@rigor/core": "^3.1.0",
|
"@rigor/core": "^3.1.0",
|
||||||
@@ -17,9 +17,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@arbiter/core": {
|
"node_modules/@arbiter/core": {
|
||||||
"version": "1.0.3",
|
"version": "1.0.4",
|
||||||
"resolved": "https://hub.kl1.tenere.ai/api/packages/Arbiter/npm/%40arbiter%2Fcore/-/1.0.3/core-1.0.3.tgz",
|
"resolved": "https://hub.kl1.tenere.ai/api/packages/Arbiter/npm/%40arbiter%2Fcore/-/1.0.4/core-1.0.4.tgz",
|
||||||
"integrity": "sha512-MCXxyeWBoYjEJMrdO8N8q9uEdX7JgDvwRH39D+8x65zFz+JCNWIQ8H4DgsP2rgF+yzv/cdVH4BX9PfFt6i0ftQ==",
|
"integrity": "sha512-1zXy3mZACjwELptsV8QpYvZJmMU7BhUQ4FsKNfp3/oJDwjfMqAImcAF3mJ+HNZpQnLQXScmELTwow5VduvN27g==",
|
||||||
"license": "ISC",
|
"license": "ISC",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@tenere/pltc-core": "^0.6.3",
|
"@tenere/pltc-core": "^0.6.3",
|
||||||
|
|||||||
+2
-2
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@arbiter/evidence-dsl",
|
"name": "@arbiter/evidence-dsl",
|
||||||
"version": "1.4.0",
|
"version": "1.8.0",
|
||||||
"description": "Evidence DSL v2 compiler: translates the natural Evidence DSL (ADR-000) into @arbiter/core relation configurations.",
|
"description": "Evidence DSL v2 compiler: translates the natural Evidence DSL (ADR-000) into @arbiter/core relation configurations.",
|
||||||
"license": "ISC",
|
"license": "ISC",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
@@ -24,7 +24,7 @@
|
|||||||
"generate:parser": "node scripts/generate-parser.js"
|
"generate:parser": "node scripts/generate-parser.js"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@arbiter/core": "^1.0.3"
|
"@arbiter/core": "^1.0.4"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@rigor/core": "^3.1.0",
|
"@rigor/core": "^3.1.0",
|
||||||
|
|||||||
@@ -486,15 +486,22 @@ export class RuleGenerator {
|
|||||||
reverse: false
|
reverse: false
|
||||||
};
|
};
|
||||||
|
|
||||||
// Subject-scoped (unary) call: the predicate call's args omit the
|
// Unary predicate calls check the relation as a self-edge on the call's
|
||||||
// evidence's object parameter (user_risk(user, 1) inside a binary
|
// subject entity (the graph stores unary facts as self-edges). The subject
|
||||||
// evidence) → check the relation on the subject itself.
|
// entity may be the evidence's SUBJECT or its OBJECT parameter — mark the
|
||||||
|
// matching rewrite flag.
|
||||||
const evidenceParams = (evidence && evidence.params) || [];
|
const evidenceParams = (evidence && evidence.params) || [];
|
||||||
const objectVar = evidenceParams[1] && evidenceParams[1].name;
|
const objectVar = evidenceParams[1] && evidenceParams[1].name;
|
||||||
const argName = a => a && (a.name !== undefined ? a.name : a.value);
|
const argName = a => a && (a.name !== undefined ? a.name : a.value);
|
||||||
if (objectVar !== undefined && !(predicate.arguments || []).some(a => argName(a) === objectVar)) {
|
const args = predicate.arguments || [];
|
||||||
|
if (objectVar !== undefined) {
|
||||||
|
const hasObjectArg = args.some(a => argName(a) === objectVar);
|
||||||
|
if (args.length === 1 && argName(args[0]) === objectVar) {
|
||||||
|
rule._subjectIsObject = true;
|
||||||
|
} else if (!hasObjectArg) {
|
||||||
rule._subjectAsObject = true;
|
rule._subjectAsObject = true;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return rule;
|
return rule;
|
||||||
}
|
}
|
||||||
@@ -1082,7 +1089,6 @@ export class RuleGenerator {
|
|||||||
const out = [];
|
const out = [];
|
||||||
for (let idx = 0; idx < steps.length; idx++) {
|
for (let idx = 0; idx < steps.length; idx++) {
|
||||||
const step = steps[idx];
|
const step = steps[idx];
|
||||||
const isLast = idx === steps.length - 1;
|
|
||||||
const stepName = typeof step === 'string' ? step : step.relation;
|
const stepName = typeof step === 'string' ? step : step.relation;
|
||||||
if (stepName && this.evidenceNames.has(stepName)) {
|
if (stepName && this.evidenceNames.has(stepName)) {
|
||||||
if (stack.has(stepName)) {
|
if (stack.has(stepName)) {
|
||||||
@@ -1105,17 +1111,13 @@ export class RuleGenerator {
|
|||||||
out.push(...this._expandChainSteps(resolved.steps, refStack));
|
out.push(...this._expandChainSteps(resolved.steps, refStack));
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
if (isLast) {
|
// Condition step: inline the evidence's config as a rule step. As the
|
||||||
// Condition-gated final hop: inline the evidence's config as a
|
// FINAL step the engine verifies it at (intermediate, object); as an
|
||||||
// rule step the engine evaluates at (intermediate, object).
|
// INTERMEDIATE step the engine EXPANDS it from the current node
|
||||||
|
// (rule-based reachability) and continues from each discovered node.
|
||||||
out.push({ rule: this._deepCloneRule(resolved), conditionStep: true });
|
out.push({ rule: this._deepCloneRule(resolved), conditionStep: true });
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
this.errors.push(`Chain step '${stepName}' references an evidence with type '${resolved.type || 'logical'}'. ` +
|
|
||||||
'Only the final chain step may reference a defeasible/logical evidence (a condition-gated hop); intermediate steps must be edge traversals.');
|
|
||||||
out.push(step);
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
out.push(step);
|
out.push(step);
|
||||||
}
|
}
|
||||||
@@ -1280,16 +1282,23 @@ export class RuleGenerator {
|
|||||||
reverse: false
|
reverse: false
|
||||||
};
|
};
|
||||||
|
|
||||||
// Subject-scoped (unary) predicate call: the call's variable args omit the
|
// Unary predicate calls check the relation as a self-edge on the call's
|
||||||
// evidence's object parameter (banned(user) inside can_open(user, doc)).
|
// subject entity (the graph stores unary facts as self-edges). The subject
|
||||||
// Mark _subjectAsObject so the engine checks the relation on the subject
|
// entity may be the evidence's SUBJECT or its OBJECT parameter:
|
||||||
// itself — the unary fact's self-edge — instead of (subject, object).
|
// banned(user) in can_open(user, doc) -> self-edge on the user
|
||||||
|
// trusted(other) in peer_trusted(user, other) -> self-edge on the other
|
||||||
|
// Mark _subjectAsObject (subject-as-object on the subject entity) or
|
||||||
|
// _subjectIsObject (the subject entity IS the object parameter) so the
|
||||||
|
// engine rewrites the pair accordingly.
|
||||||
const evidenceParams = (evidence && evidence.params) || [];
|
const evidenceParams = (evidence && evidence.params) || [];
|
||||||
const objectVar = evidenceParams[1] && evidenceParams[1].name;
|
const objectVar = evidenceParams[1] && evidenceParams[1].name;
|
||||||
|
const argName = a => a && (a.name !== undefined ? a.name : a.value);
|
||||||
if (objectVar !== undefined) {
|
if (objectVar !== undefined) {
|
||||||
const hasObjectArg = (expression.args || []).some(a =>
|
const args = expression.args || [];
|
||||||
a && a.type === 'Variable' && a.name === objectVar);
|
const hasObjectArg = args.some(a => a && a.type === 'Variable' && a.name === objectVar);
|
||||||
if (!hasObjectArg) {
|
if (args.length === 1 && argName(args[0]) === objectVar) {
|
||||||
|
rule._subjectIsObject = true;
|
||||||
|
} else if (!hasObjectArg) {
|
||||||
rule._subjectAsObject = true;
|
rule._subjectAsObject = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -248,6 +248,13 @@ BehaviorAnnotation
|
|||||||
= "BEHAVES" __ "AS" __ behavior:("edge" / "transitive" / "hierarchical" / "symmetrical_graph") {
|
= "BEHAVES" __ "AS" __ behavior:("edge" / "transitive" / "hierarchical" / "symmetrical_graph") {
|
||||||
return { type: "BehaviorAnnotation", behavior };
|
return { type: "BehaviorAnnotation", behavior };
|
||||||
}
|
}
|
||||||
|
/ "BEHAVES" __ "{" _ behavior:(TTLBehavior) _ "}" {
|
||||||
|
// Fact-level freshness: `fact balance(user, amount) BEHAVES { ttl 1h }`
|
||||||
|
// declares the relation's value-freshness window, which the runtime uses
|
||||||
|
// as the provider-result cache TTL. The behavior is wrapped like the
|
||||||
|
// `BEHAVES AS` form so consumers read `behavior.behaviorType`.
|
||||||
|
return { type: "BehaviorAnnotation", behavior };
|
||||||
|
}
|
||||||
|
|
||||||
FactProperty
|
FactProperty
|
||||||
= "transitive" { return "transitive"; }
|
= "transitive" { return "transitive"; }
|
||||||
|
|||||||
+124
-62
@@ -490,39 +490,46 @@ function peg$parse(input, options) {
|
|||||||
function peg$f29(behavior) {
|
function peg$f29(behavior) {
|
||||||
return { type: "BehaviorAnnotation", behavior };
|
return { type: "BehaviorAnnotation", behavior };
|
||||||
}
|
}
|
||||||
function peg$f30() { return "transitive"; }
|
function peg$f30(behavior) {
|
||||||
function peg$f31() { return "symmetrical"; }
|
// Fact-level freshness: `fact balance(user, amount) BEHAVES { ttl 1h }`
|
||||||
function peg$f32(value) { return value; }
|
// declares the relation's value-freshness window, which the runtime uses
|
||||||
function peg$f33(b) { return b; }
|
// as the provider-result cache TTL. The behavior is wrapped like the
|
||||||
function peg$f34(direction, period) {
|
// `BEHAVES AS` form so consumers read `behavior.behaviorType`.
|
||||||
|
return { type: "BehaviorAnnotation", behavior };
|
||||||
|
}
|
||||||
|
function peg$f31() { return "transitive"; }
|
||||||
|
function peg$f32() { return "symmetrical"; }
|
||||||
|
function peg$f33(value) { return value; }
|
||||||
|
function peg$f34(b) { return b; }
|
||||||
|
function peg$f35(direction, period) {
|
||||||
return { type: "Behavior", behaviorType: "decay", direction, period };
|
return { type: "Behavior", behaviorType: "decay", direction, period };
|
||||||
}
|
}
|
||||||
function peg$f35(mode, confidence) {
|
function peg$f36(mode, confidence) {
|
||||||
return { type: "Behavior", behaviorType: "blur", mode, confidence: confidence ? confidence[1] : null };
|
return { type: "Behavior", behaviorType: "blur", mode, confidence: confidence ? confidence[1] : null };
|
||||||
}
|
}
|
||||||
function peg$f36(duration) {
|
function peg$f37(duration) {
|
||||||
return { type: "Behavior", behaviorType: "ttl", duration };
|
return { type: "Behavior", behaviorType: "ttl", duration };
|
||||||
}
|
}
|
||||||
function peg$f37(directive) { return directive; }
|
function peg$f38(directive) { return directive; }
|
||||||
function peg$f38(head, tail) { return buildLeftAssoc(head, tail); }
|
|
||||||
function peg$f39(head, tail) { return buildLeftAssoc(head, tail); }
|
function peg$f39(head, tail) { return buildLeftAssoc(head, tail); }
|
||||||
function peg$f40(head, typeName) {
|
function peg$f40(head, tail) { return buildLeftAssoc(head, tail); }
|
||||||
|
function peg$f41(head, typeName) {
|
||||||
return { type: "BinaryExpression", operator: "is", left: head, right: typeName };
|
return { type: "BinaryExpression", operator: "is", left: head, right: typeName };
|
||||||
}
|
}
|
||||||
function peg$f41(head, tail) { return buildLeftAssoc(head, tail); }
|
function peg$f42(head, tail) { return buildLeftAssoc(head, tail); }
|
||||||
function peg$f42(head, right) {
|
function peg$f43(head, right) {
|
||||||
return { type: "BinaryExpression", operator: "within", left: head, right };
|
return { type: "BinaryExpression", operator: "within", left: head, right };
|
||||||
}
|
}
|
||||||
function peg$f43(head, tail) { return buildLeftAssoc(head, tail); }
|
|
||||||
function peg$f44(head, tail) { return buildLeftAssoc(head, tail); }
|
function peg$f44(head, tail) { return buildLeftAssoc(head, tail); }
|
||||||
function peg$f45(operator, operand) { return { type: "UnaryExpression", operator: "NOT", operand }; }
|
function peg$f45(head, tail) { return buildLeftAssoc(head, tail); }
|
||||||
function peg$f46(primary, binding) {
|
function peg$f46(operator, operand) { return { type: "UnaryExpression", operator: "NOT", operand }; }
|
||||||
|
function peg$f47(primary, binding) {
|
||||||
if (binding) {
|
if (binding) {
|
||||||
return { type: "BindingAccess", expression: primary, binding };
|
return { type: "BindingAccess", expression: primary, binding };
|
||||||
}
|
}
|
||||||
return primary;
|
return primary;
|
||||||
}
|
}
|
||||||
function peg$f47(head, tail) {
|
function peg$f48(head, tail) {
|
||||||
return tail.reduce((obj, part) => {
|
return tail.reduce((obj, part) => {
|
||||||
return {
|
return {
|
||||||
type: "AttributeAccess",
|
type: "AttributeAccess",
|
||||||
@@ -532,31 +539,31 @@ function peg$parse(input, options) {
|
|||||||
};
|
};
|
||||||
}, head);
|
}, head);
|
||||||
}
|
}
|
||||||
function peg$f48(expr) { return expr; }
|
function peg$f49(expr) { return expr; }
|
||||||
function peg$f49(name, args) {
|
function peg$f50(name, args) {
|
||||||
return { type: "PredicateCall", name, args: args || [], challenge: true };
|
return { type: "PredicateCall", name, args: args || [], challenge: true };
|
||||||
}
|
}
|
||||||
function peg$f50(name, args) {
|
function peg$f51(name, args) {
|
||||||
return { type: "PredicateCall", name, args: args || [] };
|
return { type: "PredicateCall", name, args: args || [] };
|
||||||
}
|
}
|
||||||
function peg$f51(name) { return { type: "Variable", name }; }
|
function peg$f52(name) { return { type: "Variable", name }; }
|
||||||
function peg$f52(head, tail) {
|
|
||||||
return [head, ...tail.map(t => t[3])];
|
|
||||||
}
|
|
||||||
function peg$f53(head, tail) {
|
function peg$f53(head, tail) {
|
||||||
return [head, ...tail.map(t => t[3])];
|
return [head, ...tail.map(t => t[3])];
|
||||||
}
|
}
|
||||||
function peg$f54(chars) {
|
function peg$f54(head, tail) {
|
||||||
return { type: "Literal", value: JSON.parse(text()) };
|
return [head, ...tail.map(t => t[3])];
|
||||||
}
|
}
|
||||||
function peg$f55(chars) {
|
function peg$f55(chars) {
|
||||||
|
return { type: "Literal", value: JSON.parse(text()) };
|
||||||
|
}
|
||||||
|
function peg$f56(chars) {
|
||||||
return { type: "Literal", value: JSON.parse("\"" + chars.map(c => c[0] === '\\' ? c[1] : c[1]).join('') + "\"") };
|
return { type: "Literal", value: JSON.parse("\"" + chars.map(c => c[0] === '\\' ? c[1] : c[1]).join('') + "\"") };
|
||||||
}
|
}
|
||||||
function peg$f56(value) { return { type: "Literal", value: parseFloat(text()) }; }
|
function peg$f57(value) { return { type: "Literal", value: parseFloat(text()) }; }
|
||||||
function peg$f57(value) { return { type: "Literal", value: parseInt(text(), 10) }; }
|
function peg$f58(value) { return { type: "Literal", value: parseInt(text(), 10) }; }
|
||||||
function peg$f58(value) { return { type: "Literal", value: value === "true" }; }
|
function peg$f59(value) { return { type: "Literal", value: value === "true" }; }
|
||||||
function peg$f59(value) { return { type: "Literal", value: text(), unit: text().slice(-1) }; }
|
function peg$f60(value) { return { type: "Literal", value: text(), unit: text().slice(-1) }; }
|
||||||
function peg$f60(name) { return name; }
|
function peg$f61(name) { return name; }
|
||||||
let peg$currPos = options.peg$currPos | 0;
|
let peg$currPos = options.peg$currPos | 0;
|
||||||
let peg$savedPos = peg$currPos;
|
let peg$savedPos = peg$currPos;
|
||||||
const peg$posDetailsCache = [{ line: 1, column: 1 }];
|
const peg$posDetailsCache = [{ line: 1, column: 1 }];
|
||||||
@@ -2456,7 +2463,7 @@ function peg$parse(input, options) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function peg$parseBehaviorAnnotation() {
|
function peg$parseBehaviorAnnotation() {
|
||||||
let s0, s1, s2, s3, s4, s5;
|
let s0, s1, s2, s3, s4, s5, s6, s7;
|
||||||
|
|
||||||
s0 = peg$currPos;
|
s0 = peg$currPos;
|
||||||
if (input.substr(peg$currPos, 7) === peg$c28) {
|
if (input.substr(peg$currPos, 7) === peg$c28) {
|
||||||
@@ -2536,6 +2543,61 @@ function peg$parse(input, options) {
|
|||||||
peg$currPos = s0;
|
peg$currPos = s0;
|
||||||
s0 = peg$FAILED;
|
s0 = peg$FAILED;
|
||||||
}
|
}
|
||||||
|
if (s0 === peg$FAILED) {
|
||||||
|
s0 = peg$currPos;
|
||||||
|
if (input.substr(peg$currPos, 7) === peg$c28) {
|
||||||
|
s1 = peg$c28;
|
||||||
|
peg$currPos += 7;
|
||||||
|
} else {
|
||||||
|
s1 = peg$FAILED;
|
||||||
|
if (peg$silentFails === 0) { peg$fail(peg$e34); }
|
||||||
|
}
|
||||||
|
if (s1 !== peg$FAILED) {
|
||||||
|
s2 = peg$parse__();
|
||||||
|
if (s2 !== peg$FAILED) {
|
||||||
|
if (input.charCodeAt(peg$currPos) === 123) {
|
||||||
|
s3 = peg$c2;
|
||||||
|
peg$currPos++;
|
||||||
|
} else {
|
||||||
|
s3 = peg$FAILED;
|
||||||
|
if (peg$silentFails === 0) { peg$fail(peg$e3); }
|
||||||
|
}
|
||||||
|
if (s3 !== peg$FAILED) {
|
||||||
|
s4 = peg$parse_();
|
||||||
|
s5 = peg$parseTTLBehavior();
|
||||||
|
if (s5 !== peg$FAILED) {
|
||||||
|
s6 = peg$parse_();
|
||||||
|
if (input.charCodeAt(peg$currPos) === 125) {
|
||||||
|
s7 = peg$c3;
|
||||||
|
peg$currPos++;
|
||||||
|
} else {
|
||||||
|
s7 = peg$FAILED;
|
||||||
|
if (peg$silentFails === 0) { peg$fail(peg$e4); }
|
||||||
|
}
|
||||||
|
if (s7 !== peg$FAILED) {
|
||||||
|
peg$savedPos = s0;
|
||||||
|
s0 = peg$f30(s5);
|
||||||
|
} else {
|
||||||
|
peg$currPos = s0;
|
||||||
|
s0 = peg$FAILED;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
peg$currPos = s0;
|
||||||
|
s0 = peg$FAILED;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
peg$currPos = s0;
|
||||||
|
s0 = peg$FAILED;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
peg$currPos = s0;
|
||||||
|
s0 = peg$FAILED;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
peg$currPos = s0;
|
||||||
|
s0 = peg$FAILED;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return s0;
|
return s0;
|
||||||
}
|
}
|
||||||
@@ -2553,7 +2615,7 @@ function peg$parse(input, options) {
|
|||||||
}
|
}
|
||||||
if (s1 !== peg$FAILED) {
|
if (s1 !== peg$FAILED) {
|
||||||
peg$savedPos = s0;
|
peg$savedPos = s0;
|
||||||
s1 = peg$f30();
|
s1 = peg$f31();
|
||||||
}
|
}
|
||||||
s0 = s1;
|
s0 = s1;
|
||||||
if (s0 === peg$FAILED) {
|
if (s0 === peg$FAILED) {
|
||||||
@@ -2567,7 +2629,7 @@ function peg$parse(input, options) {
|
|||||||
}
|
}
|
||||||
if (s1 !== peg$FAILED) {
|
if (s1 !== peg$FAILED) {
|
||||||
peg$savedPos = s0;
|
peg$savedPos = s0;
|
||||||
s1 = peg$f31();
|
s1 = peg$f32();
|
||||||
}
|
}
|
||||||
s0 = s1;
|
s0 = s1;
|
||||||
}
|
}
|
||||||
@@ -2592,7 +2654,7 @@ function peg$parse(input, options) {
|
|||||||
s3 = peg$parseInteger();
|
s3 = peg$parseInteger();
|
||||||
if (s3 !== peg$FAILED) {
|
if (s3 !== peg$FAILED) {
|
||||||
peg$savedPos = s0;
|
peg$savedPos = s0;
|
||||||
s0 = peg$f32(s3);
|
s0 = peg$f33(s3);
|
||||||
} else {
|
} else {
|
||||||
peg$currPos = s0;
|
peg$currPos = s0;
|
||||||
s0 = peg$FAILED;
|
s0 = peg$FAILED;
|
||||||
@@ -2650,7 +2712,7 @@ function peg$parse(input, options) {
|
|||||||
}
|
}
|
||||||
if (s7 !== peg$FAILED) {
|
if (s7 !== peg$FAILED) {
|
||||||
peg$savedPos = s0;
|
peg$savedPos = s0;
|
||||||
s0 = peg$f33(s5);
|
s0 = peg$f34(s5);
|
||||||
} else {
|
} else {
|
||||||
peg$currPos = s0;
|
peg$currPos = s0;
|
||||||
s0 = peg$FAILED;
|
s0 = peg$FAILED;
|
||||||
@@ -2762,7 +2824,7 @@ function peg$parse(input, options) {
|
|||||||
}
|
}
|
||||||
if (s5 !== peg$FAILED) {
|
if (s5 !== peg$FAILED) {
|
||||||
peg$savedPos = s0;
|
peg$savedPos = s0;
|
||||||
s0 = peg$f34(s3, s5);
|
s0 = peg$f35(s3, s5);
|
||||||
} else {
|
} else {
|
||||||
peg$currPos = s0;
|
peg$currPos = s0;
|
||||||
s0 = peg$FAILED;
|
s0 = peg$FAILED;
|
||||||
@@ -2870,7 +2932,7 @@ function peg$parse(input, options) {
|
|||||||
s4 = null;
|
s4 = null;
|
||||||
}
|
}
|
||||||
peg$savedPos = s0;
|
peg$savedPos = s0;
|
||||||
s0 = peg$f35(s3, s4);
|
s0 = peg$f36(s3, s4);
|
||||||
} else {
|
} else {
|
||||||
peg$currPos = s0;
|
peg$currPos = s0;
|
||||||
s0 = peg$FAILED;
|
s0 = peg$FAILED;
|
||||||
@@ -2904,7 +2966,7 @@ function peg$parse(input, options) {
|
|||||||
s3 = peg$parseDuration();
|
s3 = peg$parseDuration();
|
||||||
if (s3 !== peg$FAILED) {
|
if (s3 !== peg$FAILED) {
|
||||||
peg$savedPos = s0;
|
peg$savedPos = s0;
|
||||||
s0 = peg$f36(s3);
|
s0 = peg$f37(s3);
|
||||||
} else {
|
} else {
|
||||||
peg$currPos = s0;
|
peg$currPos = s0;
|
||||||
s0 = peg$FAILED;
|
s0 = peg$FAILED;
|
||||||
@@ -2953,7 +3015,7 @@ function peg$parse(input, options) {
|
|||||||
}
|
}
|
||||||
if (s3 !== peg$FAILED) {
|
if (s3 !== peg$FAILED) {
|
||||||
peg$savedPos = s0;
|
peg$savedPos = s0;
|
||||||
s0 = peg$f37(s3);
|
s0 = peg$f38(s3);
|
||||||
} else {
|
} else {
|
||||||
peg$currPos = s0;
|
peg$currPos = s0;
|
||||||
s0 = peg$FAILED;
|
s0 = peg$FAILED;
|
||||||
@@ -3027,7 +3089,7 @@ function peg$parse(input, options) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
peg$savedPos = s0;
|
peg$savedPos = s0;
|
||||||
s0 = peg$f38(s1, s2);
|
s0 = peg$f39(s1, s2);
|
||||||
} else {
|
} else {
|
||||||
peg$currPos = s0;
|
peg$currPos = s0;
|
||||||
s0 = peg$FAILED;
|
s0 = peg$FAILED;
|
||||||
@@ -3093,7 +3155,7 @@ function peg$parse(input, options) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
peg$savedPos = s0;
|
peg$savedPos = s0;
|
||||||
s0 = peg$f39(s1, s2);
|
s0 = peg$f40(s1, s2);
|
||||||
} else {
|
} else {
|
||||||
peg$currPos = s0;
|
peg$currPos = s0;
|
||||||
s0 = peg$FAILED;
|
s0 = peg$FAILED;
|
||||||
@@ -3122,7 +3184,7 @@ function peg$parse(input, options) {
|
|||||||
s5 = peg$parseTypeName();
|
s5 = peg$parseTypeName();
|
||||||
if (s5 !== peg$FAILED) {
|
if (s5 !== peg$FAILED) {
|
||||||
peg$savedPos = s0;
|
peg$savedPos = s0;
|
||||||
s0 = peg$f40(s1, s5);
|
s0 = peg$f41(s1, s5);
|
||||||
} else {
|
} else {
|
||||||
peg$currPos = s0;
|
peg$currPos = s0;
|
||||||
s0 = peg$FAILED;
|
s0 = peg$FAILED;
|
||||||
@@ -3266,7 +3328,7 @@ function peg$parse(input, options) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
peg$savedPos = s0;
|
peg$savedPos = s0;
|
||||||
s0 = peg$f41(s1, s2);
|
s0 = peg$f42(s1, s2);
|
||||||
} else {
|
} else {
|
||||||
peg$currPos = s0;
|
peg$currPos = s0;
|
||||||
s0 = peg$FAILED;
|
s0 = peg$FAILED;
|
||||||
@@ -3296,7 +3358,7 @@ function peg$parse(input, options) {
|
|||||||
s5 = peg$parseDuration();
|
s5 = peg$parseDuration();
|
||||||
if (s5 !== peg$FAILED) {
|
if (s5 !== peg$FAILED) {
|
||||||
peg$savedPos = s0;
|
peg$savedPos = s0;
|
||||||
s0 = peg$f42(s1, s5);
|
s0 = peg$f43(s1, s5);
|
||||||
} else {
|
} else {
|
||||||
peg$currPos = s0;
|
peg$currPos = s0;
|
||||||
s0 = peg$FAILED;
|
s0 = peg$FAILED;
|
||||||
@@ -3377,7 +3439,7 @@ function peg$parse(input, options) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
peg$savedPos = s0;
|
peg$savedPos = s0;
|
||||||
s0 = peg$f43(s1, s2);
|
s0 = peg$f44(s1, s2);
|
||||||
} else {
|
} else {
|
||||||
peg$currPos = s0;
|
peg$currPos = s0;
|
||||||
s0 = peg$FAILED;
|
s0 = peg$FAILED;
|
||||||
@@ -3443,7 +3505,7 @@ function peg$parse(input, options) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
peg$savedPos = s0;
|
peg$savedPos = s0;
|
||||||
s0 = peg$f44(s1, s2);
|
s0 = peg$f45(s1, s2);
|
||||||
} else {
|
} else {
|
||||||
peg$currPos = s0;
|
peg$currPos = s0;
|
||||||
s0 = peg$FAILED;
|
s0 = peg$FAILED;
|
||||||
@@ -3478,7 +3540,7 @@ function peg$parse(input, options) {
|
|||||||
s3 = peg$parseUnary();
|
s3 = peg$parseUnary();
|
||||||
if (s3 !== peg$FAILED) {
|
if (s3 !== peg$FAILED) {
|
||||||
peg$savedPos = s0;
|
peg$savedPos = s0;
|
||||||
s0 = peg$f45(s1, s3);
|
s0 = peg$f46(s1, s3);
|
||||||
} else {
|
} else {
|
||||||
peg$currPos = s0;
|
peg$currPos = s0;
|
||||||
s0 = peg$FAILED;
|
s0 = peg$FAILED;
|
||||||
@@ -3512,7 +3574,7 @@ function peg$parse(input, options) {
|
|||||||
s2 = null;
|
s2 = null;
|
||||||
}
|
}
|
||||||
peg$savedPos = s0;
|
peg$savedPos = s0;
|
||||||
s0 = peg$f46(s1, s2);
|
s0 = peg$f47(s1, s2);
|
||||||
} else {
|
} else {
|
||||||
peg$currPos = s0;
|
peg$currPos = s0;
|
||||||
s0 = peg$FAILED;
|
s0 = peg$FAILED;
|
||||||
@@ -3583,7 +3645,7 @@ function peg$parse(input, options) {
|
|||||||
}
|
}
|
||||||
if (s2 !== peg$FAILED) {
|
if (s2 !== peg$FAILED) {
|
||||||
peg$savedPos = s0;
|
peg$savedPos = s0;
|
||||||
s0 = peg$f47(s1, s2);
|
s0 = peg$f48(s1, s2);
|
||||||
} else {
|
} else {
|
||||||
peg$currPos = s0;
|
peg$currPos = s0;
|
||||||
s0 = peg$FAILED;
|
s0 = peg$FAILED;
|
||||||
@@ -3630,7 +3692,7 @@ function peg$parse(input, options) {
|
|||||||
}
|
}
|
||||||
if (s5 !== peg$FAILED) {
|
if (s5 !== peg$FAILED) {
|
||||||
peg$savedPos = s0;
|
peg$savedPos = s0;
|
||||||
s0 = peg$f48(s3);
|
s0 = peg$f49(s3);
|
||||||
} else {
|
} else {
|
||||||
peg$currPos = s0;
|
peg$currPos = s0;
|
||||||
s0 = peg$FAILED;
|
s0 = peg$FAILED;
|
||||||
@@ -3694,7 +3756,7 @@ function peg$parse(input, options) {
|
|||||||
}
|
}
|
||||||
if (s8 !== peg$FAILED) {
|
if (s8 !== peg$FAILED) {
|
||||||
peg$savedPos = s0;
|
peg$savedPos = s0;
|
||||||
s0 = peg$f49(s2, s6);
|
s0 = peg$f50(s2, s6);
|
||||||
} else {
|
} else {
|
||||||
peg$currPos = s0;
|
peg$currPos = s0;
|
||||||
s0 = peg$FAILED;
|
s0 = peg$FAILED;
|
||||||
@@ -3744,7 +3806,7 @@ function peg$parse(input, options) {
|
|||||||
}
|
}
|
||||||
if (s6 !== peg$FAILED) {
|
if (s6 !== peg$FAILED) {
|
||||||
peg$savedPos = s0;
|
peg$savedPos = s0;
|
||||||
s0 = peg$f50(s1, s4);
|
s0 = peg$f51(s1, s4);
|
||||||
} else {
|
} else {
|
||||||
peg$currPos = s0;
|
peg$currPos = s0;
|
||||||
s0 = peg$FAILED;
|
s0 = peg$FAILED;
|
||||||
@@ -3768,7 +3830,7 @@ function peg$parse(input, options) {
|
|||||||
s1 = peg$parseIdentifier();
|
s1 = peg$parseIdentifier();
|
||||||
if (s1 !== peg$FAILED) {
|
if (s1 !== peg$FAILED) {
|
||||||
peg$savedPos = s0;
|
peg$savedPos = s0;
|
||||||
s1 = peg$f51(s1);
|
s1 = peg$f52(s1);
|
||||||
}
|
}
|
||||||
s0 = s1;
|
s0 = s1;
|
||||||
|
|
||||||
@@ -3832,7 +3894,7 @@ function peg$parse(input, options) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
peg$savedPos = s0;
|
peg$savedPos = s0;
|
||||||
s0 = peg$f52(s1, s2);
|
s0 = peg$f53(s1, s2);
|
||||||
} else {
|
} else {
|
||||||
peg$currPos = s0;
|
peg$currPos = s0;
|
||||||
s0 = peg$FAILED;
|
s0 = peg$FAILED;
|
||||||
@@ -3898,7 +3960,7 @@ function peg$parse(input, options) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
peg$savedPos = s0;
|
peg$savedPos = s0;
|
||||||
s0 = peg$f53(s1, s2);
|
s0 = peg$f54(s1, s2);
|
||||||
} else {
|
} else {
|
||||||
peg$currPos = s0;
|
peg$currPos = s0;
|
||||||
s0 = peg$FAILED;
|
s0 = peg$FAILED;
|
||||||
@@ -4083,7 +4145,7 @@ function peg$parse(input, options) {
|
|||||||
}
|
}
|
||||||
if (s3 !== peg$FAILED) {
|
if (s3 !== peg$FAILED) {
|
||||||
peg$savedPos = s0;
|
peg$savedPos = s0;
|
||||||
s0 = peg$f54(s2);
|
s0 = peg$f55(s2);
|
||||||
} else {
|
} else {
|
||||||
peg$currPos = s0;
|
peg$currPos = s0;
|
||||||
s0 = peg$FAILED;
|
s0 = peg$FAILED;
|
||||||
@@ -4245,7 +4307,7 @@ function peg$parse(input, options) {
|
|||||||
}
|
}
|
||||||
if (s3 !== peg$FAILED) {
|
if (s3 !== peg$FAILED) {
|
||||||
peg$savedPos = s0;
|
peg$savedPos = s0;
|
||||||
s0 = peg$f55(s2);
|
s0 = peg$f56(s2);
|
||||||
} else {
|
} else {
|
||||||
peg$currPos = s0;
|
peg$currPos = s0;
|
||||||
s0 = peg$FAILED;
|
s0 = peg$FAILED;
|
||||||
@@ -4340,7 +4402,7 @@ function peg$parse(input, options) {
|
|||||||
}
|
}
|
||||||
if (s1 !== peg$FAILED) {
|
if (s1 !== peg$FAILED) {
|
||||||
peg$savedPos = s0;
|
peg$savedPos = s0;
|
||||||
s1 = peg$f56(s1);
|
s1 = peg$f57(s1);
|
||||||
}
|
}
|
||||||
s0 = s1;
|
s0 = s1;
|
||||||
peg$silentFails--;
|
peg$silentFails--;
|
||||||
@@ -4381,7 +4443,7 @@ function peg$parse(input, options) {
|
|||||||
}
|
}
|
||||||
if (s1 !== peg$FAILED) {
|
if (s1 !== peg$FAILED) {
|
||||||
peg$savedPos = s0;
|
peg$savedPos = s0;
|
||||||
s1 = peg$f57(s1);
|
s1 = peg$f58(s1);
|
||||||
}
|
}
|
||||||
s0 = s1;
|
s0 = s1;
|
||||||
peg$silentFails--;
|
peg$silentFails--;
|
||||||
@@ -4416,7 +4478,7 @@ function peg$parse(input, options) {
|
|||||||
}
|
}
|
||||||
if (s1 !== peg$FAILED) {
|
if (s1 !== peg$FAILED) {
|
||||||
peg$savedPos = s0;
|
peg$savedPos = s0;
|
||||||
s1 = peg$f58(s1);
|
s1 = peg$f59(s1);
|
||||||
}
|
}
|
||||||
s0 = s1;
|
s0 = s1;
|
||||||
peg$silentFails--;
|
peg$silentFails--;
|
||||||
@@ -4477,7 +4539,7 @@ function peg$parse(input, options) {
|
|||||||
}
|
}
|
||||||
if (s1 !== peg$FAILED) {
|
if (s1 !== peg$FAILED) {
|
||||||
peg$savedPos = s0;
|
peg$savedPos = s0;
|
||||||
s1 = peg$f59(s1);
|
s1 = peg$f60(s1);
|
||||||
}
|
}
|
||||||
s0 = s1;
|
s0 = s1;
|
||||||
peg$silentFails--;
|
peg$silentFails--;
|
||||||
@@ -4545,7 +4607,7 @@ function peg$parse(input, options) {
|
|||||||
}
|
}
|
||||||
if (s2 !== peg$FAILED) {
|
if (s2 !== peg$FAILED) {
|
||||||
peg$savedPos = s0;
|
peg$savedPos = s0;
|
||||||
s0 = peg$f60(s2);
|
s0 = peg$f61(s2);
|
||||||
} else {
|
} else {
|
||||||
peg$currPos = s0;
|
peg$currPos = s0;
|
||||||
s0 = peg$FAILED;
|
s0 = peg$FAILED;
|
||||||
|
|||||||
+325
-50
@@ -1,6 +1,6 @@
|
|||||||
import { DSLCompiler } from '../DSLCompiler.js';
|
import { DSLCompiler } from '../DSLCompiler.js';
|
||||||
|
|
||||||
const PRIMITIVE_TYPES = new Set(['string', 'number', 'boolean']);
|
const VALUE_TYPES = new Set(['string', 'number', 'boolean', 'timestamp', 'duration', 'object', 'any']);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* DSLRuntime — higher-order wrapper combining the Evidence DSL with an
|
* DSLRuntime — higher-order wrapper combining the Evidence DSL with an
|
||||||
@@ -12,13 +12,19 @@ const PRIMITIVE_TYPES = new Set(['string', 'number', 'boolean']);
|
|||||||
* check). A raw Arbiter accepts untyped inserts; this wrapper adds the
|
* check). A raw Arbiter accepts untyped inserts; this wrapper adds the
|
||||||
* DSL-informed layer:
|
* DSL-informed layer:
|
||||||
*
|
*
|
||||||
* - addNode / updateNodeData / addRelation / updateRelation validate their
|
* - schema introspection: getSchema() exposes the compiled type system
|
||||||
* arguments against the compiled schema — known types, known relations,
|
* (entity types/fields, facts, evidence, dependencies, providers);
|
||||||
* matching param types, typed field values — before mutating the arbiter.
|
* - typed mutations: addNode / updateNodeData / addRelation / updateRelation
|
||||||
* - check() validates the request, derives the injectable facts the
|
* validate their arguments against the compiled schema — known types,
|
||||||
* evidence requires (its partial-graph requirements), retrieves the
|
* known relations, matching param types, typed field values — before
|
||||||
* missing facts through caller-provided data callbacks, injects them into
|
* mutating the arbiter; removeNode / removeRelation pass through;
|
||||||
* a partial graph, then delegates to the arbiter.
|
* - per-relation data retrieval: registerFact(relation, asyncFn) registers a
|
||||||
|
* provider that retrieves the missing partial-graph edges for a fact; a
|
||||||
|
* bounded retrieval loop runs providers to a fixed point so a provider's
|
||||||
|
* edges can satisfy another required fact;
|
||||||
|
* - DSL-informed check: derives the evidence's injectable facts, retrieves
|
||||||
|
* them via providers, injects them into a partial graph, and delegates to
|
||||||
|
* the arbiter; require() throws on denial for middleware use.
|
||||||
*
|
*
|
||||||
* Trust boundary follows the core: caller-supplied evidence (partial graph /
|
* Trust boundary follows the core: caller-supplied evidence (partial graph /
|
||||||
* provider results) is trusted, never policed; only structure is validated.
|
* provider results) is trusted, never policed; only structure is validated.
|
||||||
@@ -41,8 +47,21 @@ export class DSLRuntime {
|
|||||||
this.strictTypes = options.policy?.strictTypes !== false;
|
this.strictTypes = options.policy?.strictTypes !== false;
|
||||||
this.program = null;
|
this.program = null;
|
||||||
this.types = new Map(); // typeName -> { fields: Map(field -> {type,isArray}) }
|
this.types = new Map(); // typeName -> { fields: Map(field -> {type,isArray}) }
|
||||||
this.relations = new Map(); // relation -> { kind: 'fact'|'evidence', params, injectable }
|
this.relations = new Map(); // relation -> { kind: 'fact'|'evidence', params, injectable, ttlMs }
|
||||||
this.dependsOn = new Map(); // evidence relation -> Set(fact relations)
|
this.dependsOn = new Map(); // evidence relation -> Set(fact relations)
|
||||||
|
|
||||||
|
// Provider-result cache: relation|subject|object -> { edges, fetchedAt }.
|
||||||
|
// Provider retrieval is a data-store read (balance lookups, session
|
||||||
|
// checks, etc.) — caching results with a time expiry avoids hammering the
|
||||||
|
// underlying store on every check. The clock is injectable (default wall
|
||||||
|
// clock) and drives cache freshness, mirroring the core's unpinned-clock
|
||||||
|
// contract.
|
||||||
|
this.providerCache = new Map();
|
||||||
|
this.clock = typeof options.clock === 'function' ? options.clock : (() => Date.now());
|
||||||
|
// Default provider-result TTL in ms (0 disables caching).
|
||||||
|
this.defaultProviderCacheTTL = options.policy?.providerCacheTTL ?? options.providerCacheTTL ?? 30_000;
|
||||||
|
// Per-fact overrides (ms). DSL-declared ttl behaviors are indexed here too.
|
||||||
|
this.factTTLs = new Map(Object.entries(options.factTTLs || {}));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -62,6 +81,43 @@ export class DSLRuntime {
|
|||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
// Schema introspection
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A serializable snapshot of the compiled type system: entity types with
|
||||||
|
* typed fields, facts, evidence (with their dependencies), and registered
|
||||||
|
* providers. Callers can use this to render forms, build clients, or audit
|
||||||
|
* a compiled program without reaching into the internal Maps.
|
||||||
|
*/
|
||||||
|
getSchema() {
|
||||||
|
const types = [...this.types.entries()].map(([name, { fields }]) => ({
|
||||||
|
name,
|
||||||
|
fields: [...fields.entries()].map(([fieldName, f]) => ({
|
||||||
|
name: fieldName,
|
||||||
|
type: f.type,
|
||||||
|
isArray: f.isArray
|
||||||
|
}))
|
||||||
|
}));
|
||||||
|
const facts = [...this.relations.entries()]
|
||||||
|
.filter(([, r]) => r.kind === 'fact')
|
||||||
|
.map(([name, r]) => ({ name, params: r.params, injectable: r.injectable }));
|
||||||
|
const evidence = [...this.relations.entries()]
|
||||||
|
.filter(([, r]) => r.kind === 'evidence')
|
||||||
|
.map(([name, r]) => ({
|
||||||
|
name,
|
||||||
|
params: r.params,
|
||||||
|
dependsOn: [...(this.dependsOn.get(name) || [])]
|
||||||
|
}));
|
||||||
|
return { types, facts, evidence, providers: this.registeredFacts() };
|
||||||
|
}
|
||||||
|
|
||||||
|
/** All relation names declared by the program (facts + evidence). */
|
||||||
|
relationNames() {
|
||||||
|
return [...this.relations.keys()];
|
||||||
|
}
|
||||||
|
|
||||||
_indexSchema() {
|
_indexSchema() {
|
||||||
this.types.clear();
|
this.types.clear();
|
||||||
this.relations.clear();
|
this.relations.clear();
|
||||||
@@ -76,10 +132,12 @@ export class DSLRuntime {
|
|||||||
}
|
}
|
||||||
|
|
||||||
for (const fact of this.program.facts || []) {
|
for (const fact of this.program.facts || []) {
|
||||||
|
const ttlMs = this._ttlFromBehavior(fact.behavior);
|
||||||
this.relations.set(fact.name, {
|
this.relations.set(fact.name, {
|
||||||
kind: 'fact',
|
kind: 'fact',
|
||||||
params: (fact.params || []).map(p => ({ name: p.name, type: p.paramType, isArray: !!p.isArray })),
|
params: (fact.params || []).map(p => ({ name: p.name, type: p.paramType, isArray: !!p.isArray })),
|
||||||
injectable: !!fact.injectable
|
injectable: !!fact.injectable,
|
||||||
|
ttlMs
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -136,12 +194,149 @@ export class DSLRuntime {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
// Provider registration (per-relation data retrieval)
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Register (or replace) an async provider for a relation name. When a check
|
||||||
|
* needs that relation's facts and they are not in the graph, the provider is
|
||||||
|
* invoked to retrieve the missing partial-graph edges.
|
||||||
|
*
|
||||||
|
* @param {string} relation - fact relation name
|
||||||
|
* @param {Function} provider - async (subject, object, ctx) => edges
|
||||||
|
*/
|
||||||
|
registerFact(relation, provider) {
|
||||||
|
if (typeof provider !== 'function') {
|
||||||
|
throw new Error(`DSLRuntime: provider for '${relation}' must be a function`);
|
||||||
|
}
|
||||||
|
this.factProviders[relation] = provider;
|
||||||
|
// A new provider supersedes any cached retrieval for this fact.
|
||||||
|
this.invalidateProviderCache(relation);
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Remove a registered provider. */
|
||||||
|
unregisterFact(relation) {
|
||||||
|
delete this.factProviders[relation];
|
||||||
|
this.invalidateProviderCache(relation);
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Relation names that currently have a registered provider. */
|
||||||
|
registeredFacts() {
|
||||||
|
return Object.keys(this.factProviders);
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
// Provider-result caching
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Set a per-fact provider-result TTL (ms). Overrides the policy default and
|
||||||
|
* the DSL-declared ttl behavior for that fact.
|
||||||
|
*/
|
||||||
|
setFactTTL(relation, ms) {
|
||||||
|
this.factTTLs.set(relation, ms);
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** The effective provider-result TTL (ms) for a fact: DSL > per-fact > policy default. */
|
||||||
|
_ttlFor(relation) {
|
||||||
|
if (this.factTTLs.has(relation)) return this.factTTLs.get(relation);
|
||||||
|
const meta = this.relations.get(relation);
|
||||||
|
if (meta && meta.ttlMs != null) return meta.ttlMs;
|
||||||
|
return this.defaultProviderCacheTTL;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Invalidate cached provider results — all, or for a single relation.
|
||||||
|
* Callers use this when the underlying data store changes out-of-band.
|
||||||
|
*/
|
||||||
|
invalidateProviderCache(relation) {
|
||||||
|
if (relation === undefined) {
|
||||||
|
this.providerCache.clear();
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
const prefix = `${relation}\u0000`;
|
||||||
|
for (const key of [...this.providerCache.keys()]) {
|
||||||
|
if (key.startsWith(prefix)) this.providerCache.delete(key);
|
||||||
|
}
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
_providerCacheKey(relation, subject, object) {
|
||||||
|
return `${relation}\u0000${subject}\u0000${object}`;
|
||||||
|
}
|
||||||
|
|
||||||
|
_providerCacheGet(relation, subject, object) {
|
||||||
|
const ttl = this._ttlFor(relation);
|
||||||
|
if (ttl <= 0) return null;
|
||||||
|
const entry = this.providerCache.get(this._providerCacheKey(relation, subject, object));
|
||||||
|
if (!entry) return null;
|
||||||
|
if (this.clock() - entry.fetchedAt >= ttl) {
|
||||||
|
this.providerCache.delete(this._providerCacheKey(relation, subject, object));
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
return entry;
|
||||||
|
}
|
||||||
|
|
||||||
|
_providerCacheSet(relation, subject, object, edges) {
|
||||||
|
const ttl = this._ttlFor(relation);
|
||||||
|
if (ttl <= 0) return;
|
||||||
|
this.providerCache.set(this._providerCacheKey(relation, subject, object), {
|
||||||
|
edges,
|
||||||
|
fetchedAt: this.clock()
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Convert a DSL `BEHAVES { ttl <duration> }` behavior (or `BEHAVES AS`) into ms. */
|
||||||
|
_ttlFromBehavior(behavior) {
|
||||||
|
if (!behavior || typeof behavior !== 'object') return null;
|
||||||
|
const b = behavior.behavior || behavior;
|
||||||
|
if (b && b.behaviorType === 'ttl' && b.duration) {
|
||||||
|
const n = parseInt(String(b.duration.value), 10);
|
||||||
|
const mult = { h: 3600_000, d: 86_400_000, w: 604_800_000, m: 60_000 }[b.duration.unit];
|
||||||
|
if (!Number.isNaN(n) && mult) return n * mult;
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Normalize a provider result (boolean / number / { possibility, value } /
|
||||||
|
* array of edge objects) into an array of partial-graph edge objects. The
|
||||||
|
* destination follows the DSL fact's declared shape: unary and value-carrying
|
||||||
|
* facts are self-edges on the subject; binary entity facts go subject → object.
|
||||||
|
*/
|
||||||
|
_normalizeProviderEdges(result, factMeta, user, object) {
|
||||||
|
const edges = Array.isArray(result) ? result : [result];
|
||||||
|
const secondParamType = factMeta.params[1] && factMeta.params[1].type;
|
||||||
|
const defaultDst = factMeta.params.length >= 2 && this._isValueType(secondParamType)
|
||||||
|
? user
|
||||||
|
: (factMeta.params.length >= 2 ? object : user);
|
||||||
|
const out = [];
|
||||||
|
for (const edge of edges) {
|
||||||
|
const normalized = typeof edge === 'boolean' || typeof edge === 'number'
|
||||||
|
? { src: user, dst: defaultDst, possibility: edge === true ? 1 : edge }
|
||||||
|
: {
|
||||||
|
...(edge.relation ? { relation: edge.relation } : {}),
|
||||||
|
src: edge.src ?? user,
|
||||||
|
dst: edge.dst ?? defaultDst,
|
||||||
|
possibility: edge.possibility ?? 1,
|
||||||
|
...(edge.value !== undefined ? { value: edge.value } : {}),
|
||||||
|
...(edge.reliability !== undefined ? { reliability: edge.reliability } : {})
|
||||||
|
};
|
||||||
|
out.push(normalized);
|
||||||
|
}
|
||||||
|
return out;
|
||||||
|
}
|
||||||
|
|
||||||
// ---------------------------------------------------------------------------
|
// ---------------------------------------------------------------------------
|
||||||
// Schema validation helpers
|
// Schema validation helpers
|
||||||
// ---------------------------------------------------------------------------
|
// ---------------------------------------------------------------------------
|
||||||
|
|
||||||
_isPrimitive(typeName) {
|
_isValueType(typeName) {
|
||||||
return PRIMITIVE_TYPES.has(typeName);
|
return VALUE_TYPES.has(typeName);
|
||||||
}
|
}
|
||||||
|
|
||||||
_nodeType(key) {
|
_nodeType(key) {
|
||||||
@@ -158,7 +353,7 @@ export class DSLRuntime {
|
|||||||
}
|
}
|
||||||
|
|
||||||
_checkNodeType(key, expectedType, position) {
|
_checkNodeType(key, expectedType, position) {
|
||||||
if (this._isPrimitive(expectedType)) return; // value positions are validated separately
|
if (this._isValueType(expectedType)) return; // value positions are validated separately
|
||||||
const actual = this._nodeType(key);
|
const actual = this._nodeType(key);
|
||||||
if (actual === null) {
|
if (actual === null) {
|
||||||
this._checkNodeExists(key, position);
|
this._checkNodeExists(key, position);
|
||||||
@@ -184,7 +379,9 @@ export class DSLRuntime {
|
|||||||
const ok = type === 'string' ? typeof value === 'string'
|
const ok = type === 'string' ? typeof value === 'string'
|
||||||
: type === 'number' ? typeof value === 'number'
|
: type === 'number' ? typeof value === 'number'
|
||||||
: type === 'boolean' ? typeof value === 'boolean'
|
: type === 'boolean' ? typeof value === 'boolean'
|
||||||
: true; // entity-typed fields accept any key
|
: (type === 'timestamp' || type === 'duration')
|
||||||
|
? (typeof value === 'number' || typeof value === 'string')
|
||||||
|
: true; // object / any / entity-typed fields accept any value
|
||||||
if (!ok) {
|
if (!ok) {
|
||||||
throw new Error(`DSLRuntime: field '${path}' must be ${type}, got ${typeof value}`);
|
throw new Error(`DSLRuntime: field '${path}' must be ${type}, got ${typeof value}`);
|
||||||
}
|
}
|
||||||
@@ -207,6 +404,8 @@ export class DSLRuntime {
|
|||||||
} else if (this.strictTypes) {
|
} else if (this.strictTypes) {
|
||||||
throw new Error(`DSLRuntime: unknown type '${typeName}'`);
|
throw new Error(`DSLRuntime: unknown type '${typeName}'`);
|
||||||
}
|
}
|
||||||
|
// A graph mutation can make previously-retrieved facts stale.
|
||||||
|
this.invalidateProviderCache();
|
||||||
return this.arbiter.addNode(key, typeName, data);
|
return this.arbiter.addNode(key, typeName, data);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -221,9 +420,19 @@ export class DSLRuntime {
|
|||||||
if (data[name] !== undefined) this._checkFieldValue(field, data[name], `${typeName}.${name}`);
|
if (data[name] !== undefined) this._checkFieldValue(field, data[name], `${typeName}.${name}`);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
this.invalidateProviderCache();
|
||||||
return this.arbiter.updateNodeData(key, data);
|
return this.arbiter.updateNodeData(key, data);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** Remove a node (passthrough to the arbiter's node manager). */
|
||||||
|
removeNode(key) {
|
||||||
|
this.invalidateProviderCache();
|
||||||
|
if (this.arbiter.nodeManager && typeof this.arbiter.nodeManager.removeNode === 'function') {
|
||||||
|
return this.arbiter.nodeManager.removeNode(key);
|
||||||
|
}
|
||||||
|
return this.arbiter.removeNode?.(key);
|
||||||
|
}
|
||||||
|
|
||||||
_relationOrThrow(relation) {
|
_relationOrThrow(relation) {
|
||||||
const meta = this.relations.get(relation);
|
const meta = this.relations.get(relation);
|
||||||
if (!meta) {
|
if (!meta) {
|
||||||
@@ -243,6 +452,7 @@ export class DSLRuntime {
|
|||||||
if (meta) {
|
if (meta) {
|
||||||
this._validateRelationEndpoints(relation, meta, src, dst, attrs);
|
this._validateRelationEndpoints(relation, meta, src, dst, attrs);
|
||||||
}
|
}
|
||||||
|
this.invalidateProviderCache();
|
||||||
return this.arbiter.addRelation(src, relation, dst, attrs);
|
return this.arbiter.addRelation(src, relation, dst, attrs);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -254,10 +464,17 @@ export class DSLRuntime {
|
|||||||
if (meta) {
|
if (meta) {
|
||||||
this._validateRelationEndpoints(relation, meta, src, dst, attrs);
|
this._validateRelationEndpoints(relation, meta, src, dst, attrs);
|
||||||
}
|
}
|
||||||
|
this.invalidateProviderCache();
|
||||||
this.arbiter.removeRelation(src, relation, dst);
|
this.arbiter.removeRelation(src, relation, dst);
|
||||||
return this.arbiter.addRelation(src, relation, dst, attrs);
|
return this.arbiter.addRelation(src, relation, dst, attrs);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** Remove a relation edge (passthrough to the arbiter). */
|
||||||
|
removeRelation(src, relation, dst) {
|
||||||
|
this.invalidateProviderCache();
|
||||||
|
return this.arbiter.removeRelation(src, relation, dst);
|
||||||
|
}
|
||||||
|
|
||||||
_validateRelationEndpoints(relation, meta, src, dst, attrs) {
|
_validateRelationEndpoints(relation, meta, src, dst, attrs) {
|
||||||
const params = meta.params;
|
const params = meta.params;
|
||||||
if (params.length === 0) {
|
if (params.length === 0) {
|
||||||
@@ -265,14 +482,14 @@ export class DSLRuntime {
|
|||||||
}
|
}
|
||||||
// First param is always the subject (entity).
|
// First param is always the subject (entity).
|
||||||
const subjectType = params[0].type;
|
const subjectType = params[0].type;
|
||||||
if (this._isPrimitive(subjectType)) {
|
if (this._isValueType(subjectType)) {
|
||||||
throw new Error(`DSLRuntime: relation '${relation}' subject param must be an entity type, got '${subjectType}'`);
|
throw new Error(`DSLRuntime: relation '${relation}' subject param must be an entity type, got '${subjectType}'`);
|
||||||
}
|
}
|
||||||
this._checkNodeType(src, subjectType, 'subject');
|
this._checkNodeType(src, subjectType, 'subject');
|
||||||
|
|
||||||
if (params.length >= 2) {
|
if (params.length >= 2) {
|
||||||
const secondType = params[1].type;
|
const secondType = params[1].type;
|
||||||
if (this._isPrimitive(secondType)) {
|
if (this._isValueType(secondType)) {
|
||||||
// Value-carrying fact (e.g. session(user, token: string)): the value
|
// Value-carrying fact (e.g. session(user, token: string)): the value
|
||||||
// lives on the edge's `value` field; the graph edge is a self-edge on
|
// lives on the edge's `value` field; the graph edge is a self-edge on
|
||||||
// the subject so the value is discoverable by value extraction.
|
// the subject so the value is discoverable by value extraction.
|
||||||
@@ -313,6 +530,13 @@ export class DSLRuntime {
|
|||||||
* evidence's injectable facts, inject them into a partial graph, and delegate
|
* evidence's injectable facts, inject them into a partial graph, and delegate
|
||||||
* to the arbiter.
|
* to the arbiter.
|
||||||
*
|
*
|
||||||
|
* Providers run in a bounded fixed-point loop: each round invokes the
|
||||||
|
* provider for every required fact whose edges are not yet in the partial
|
||||||
|
* graph. Because a provider may return edges for relations other than its
|
||||||
|
* own name, an edge injected in one round can satisfy another required fact
|
||||||
|
* (or unblock another provider) in a later round. The loop stops when a
|
||||||
|
* round injects no new relation or the round budget is exhausted.
|
||||||
|
*
|
||||||
* @param {string} user - subject key
|
* @param {string} user - subject key
|
||||||
* @param {string} relation - evidence (or fact) relation name
|
* @param {string} relation - evidence (or fact) relation name
|
||||||
* @param {string} object - object key
|
* @param {string} object - object key
|
||||||
@@ -320,71 +544,107 @@ export class DSLRuntime {
|
|||||||
* @param {object} options.partialGraph - caller-supplied partial graph edges
|
* @param {object} options.partialGraph - caller-supplied partial graph edges
|
||||||
* ({ relations: [{ src, relation, dst, possibility, value }], nodes, challenges })
|
* ({ relations: [{ src, relation, dst, possibility, value }], nodes, challenges })
|
||||||
* @param {object} options.factProviders - per-call provider overrides
|
* @param {object} options.factProviders - per-call provider overrides
|
||||||
|
* (merged over registered providers)
|
||||||
|
* @param {number} options.maxProviderRounds - fixed-point loop budget (default 3)
|
||||||
* @returns {object} core check result extended with { requiredFacts, providedFacts, missingFacts }
|
* @returns {object} core check result extended with { requiredFacts, providedFacts, missingFacts }
|
||||||
*/
|
*/
|
||||||
async check(user, relation, object, options = {}) {
|
async check(user, relation, object, options = {}) {
|
||||||
const meta = this.relations.get(relation);
|
const meta = this.relations.get(relation);
|
||||||
if (!meta) {
|
if (!meta) {
|
||||||
if (this.strictTypes) throw new Error(`DSLRuntime: unknown relation '${relation}'`);
|
if (this.strictTypes) throw new Error(`DSLRuntime: unknown relation '${relation}'`);
|
||||||
} else if (meta.kind === 'evidence') {
|
} else if (meta.params.length === 2) {
|
||||||
if (meta.params.length === 2) {
|
|
||||||
this._checkNodeType(user, meta.params[0].type, 'subject');
|
this._checkNodeType(user, meta.params[0].type, 'subject');
|
||||||
this._checkNodeType(object, meta.params[1].type, 'object');
|
this._checkNodeType(object, meta.params[1].type, 'object');
|
||||||
}
|
} else if (meta.params.length === 1) {
|
||||||
|
this._checkNodeType(user, meta.params[0].type, 'subject');
|
||||||
}
|
}
|
||||||
|
|
||||||
const required = this.requiredFacts(relation);
|
// Retrieval set: for an evidence, the injectable facts it depends on; for
|
||||||
const providers = options.factProviders || this.factProviders;
|
// a direct FACT check, the fact itself is the retrieval target (its
|
||||||
const injectedRelations = [];
|
// provider, if registered, supplies the edge — checking `owns` directly
|
||||||
const missingFacts = [];
|
// must consult the `owns` provider, not only evidence-mediated checks).
|
||||||
|
const required = new Set(this.requiredFacts(relation));
|
||||||
|
if (meta && meta.kind === 'fact') required.add(relation);
|
||||||
|
const requiredList = [...required];
|
||||||
|
const providers = { ...this.factProviders, ...(options.factProviders || {}) };
|
||||||
|
const maxRounds = options.maxProviderRounds ?? 3;
|
||||||
const partialRelations = [];
|
const partialRelations = [];
|
||||||
|
const injectedRelations = []; // { relation, edges, round }
|
||||||
|
const missingFacts = [];
|
||||||
|
const satisfied = new Set(); // facts whose edges are in the partial graph
|
||||||
|
|
||||||
if (options.partialGraph && Array.isArray(options.partialGraph.relations)) {
|
if (options.partialGraph && Array.isArray(options.partialGraph.relations)) {
|
||||||
partialRelations.push(...options.partialGraph.relations);
|
for (const rel of options.partialGraph.relations) {
|
||||||
|
partialRelations.push(rel);
|
||||||
|
if (rel && rel.relation) satisfied.add(rel.relation);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
for (const fact of required) {
|
// Fixed-point provider retrieval loop.
|
||||||
|
for (let round = 1; round <= maxRounds; round++) {
|
||||||
|
let newRelationsThisRound = 0;
|
||||||
|
for (const fact of requiredList) {
|
||||||
|
if (satisfied.has(fact)) continue;
|
||||||
const factMeta = this.relations.get(fact);
|
const factMeta = this.relations.get(fact);
|
||||||
const provider = providers[fact];
|
const provider = providers[fact];
|
||||||
|
|
||||||
|
// Provider-result cache: reuse fresh edges without re-invoking the
|
||||||
|
// data store. A cached entry stores the NORMALIZED edges. Per-check
|
||||||
|
// provider overrides are one-off observations — they bypass the cache
|
||||||
|
// entirely (no read, no write) so a fresh override is never masked by
|
||||||
|
// a cached registered-provider result, nor does it pollute the cache.
|
||||||
|
const isPerCheckOverride = !!(options.factProviders && fact in options.factProviders);
|
||||||
|
const cacheHit = isPerCheckOverride ? null : this._providerCacheGet(fact, user, object);
|
||||||
|
let edges = null;
|
||||||
|
let fromCache = false;
|
||||||
|
if (cacheHit) {
|
||||||
|
edges = cacheHit.edges;
|
||||||
|
fromCache = true;
|
||||||
|
} else if (typeof provider === 'function') {
|
||||||
let result = null;
|
let result = null;
|
||||||
let error = null;
|
let error = null;
|
||||||
if (typeof provider === 'function') {
|
|
||||||
try {
|
try {
|
||||||
result = await provider(user, object, { relation: fact, params: factMeta.params, runtime: this, options });
|
result = await provider(user, object, {
|
||||||
|
relation: fact,
|
||||||
|
params: factMeta.params,
|
||||||
|
runtime: this,
|
||||||
|
options,
|
||||||
|
round,
|
||||||
|
alreadyInjected: [...satisfied]
|
||||||
|
});
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
error = err;
|
error = err;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
if (error) {
|
if (error) {
|
||||||
missingFacts.push({ relation: fact, reason: error.message });
|
missingFacts.push({ relation: fact, reason: error.message });
|
||||||
|
satisfied.add(fact);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
if (result === false || result === null || result === undefined) {
|
if (result === false || result === null || result === undefined) {
|
||||||
missingFacts.push({ relation: fact, reason: 'not_provided' });
|
missingFacts.push({ relation: fact, reason: 'not_provided' });
|
||||||
|
satisfied.add(fact);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
const edges = Array.isArray(result) ? result : [result];
|
edges = this._normalizeProviderEdges(result, factMeta, user, object);
|
||||||
// Resolve the edge destination the same way the DSL declares the fact:
|
if (!isPerCheckOverride) this._providerCacheSet(fact, user, object, edges);
|
||||||
// - unary fact (1 param) -> self-edge on the subject
|
} else {
|
||||||
// - value fact (2nd param value) -> self-edge on the subject carrying the value
|
missingFacts.push({ relation: fact, reason: 'no_provider' });
|
||||||
// - binary entity fact -> subject → object
|
satisfied.add(fact);
|
||||||
const secondParamType = factMeta.params[1] && factMeta.params[1].type;
|
continue;
|
||||||
const defaultDst = factMeta.params.length >= 2 && this._isPrimitive(secondParamType)
|
|
||||||
? user
|
|
||||||
: (factMeta.params.length >= 2 ? object : user);
|
|
||||||
for (const edge of edges) {
|
|
||||||
const normalized = typeof edge === 'boolean' || typeof edge === 'number'
|
|
||||||
? { src: user, dst: defaultDst, possibility: edge === true ? 1 : edge }
|
|
||||||
: {
|
|
||||||
src: edge.src ?? user,
|
|
||||||
dst: edge.dst ?? defaultDst,
|
|
||||||
possibility: edge.possibility ?? 1,
|
|
||||||
...(edge.value !== undefined ? { value: edge.value } : {}),
|
|
||||||
...(edge.reliability !== undefined ? { reliability: edge.reliability } : {})
|
|
||||||
};
|
|
||||||
partialRelations.push({ relation: fact, ...normalized });
|
|
||||||
}
|
}
|
||||||
injectedRelations.push({ relation: fact, edges: edges.length });
|
|
||||||
|
// A provider may return edges for relations other than its own; the
|
||||||
|
// injected relation names satisfy those facts too (fixed point).
|
||||||
|
for (const normalized of edges) {
|
||||||
|
const injectedRelation = normalized.relation ?? fact;
|
||||||
|
partialRelations.push({ relation: injectedRelation, ...normalized });
|
||||||
|
satisfied.add(injectedRelation);
|
||||||
|
}
|
||||||
|
injectedRelations.push({ relation: fact, edges: edges.length, round, cacheHit: fromCache });
|
||||||
|
newRelationsThisRound += edges.length;
|
||||||
|
satisfied.add(fact);
|
||||||
|
}
|
||||||
|
if (newRelationsThisRound === 0) break;
|
||||||
}
|
}
|
||||||
|
|
||||||
const checkOptions = { ...options };
|
const checkOptions = { ...options };
|
||||||
@@ -399,9 +659,24 @@ export class DSLRuntime {
|
|||||||
|
|
||||||
return {
|
return {
|
||||||
...result,
|
...result,
|
||||||
requiredFacts: required,
|
requiredFacts: requiredList,
|
||||||
providedFacts: injectedRelations.map(r => r.relation),
|
providedFacts: injectedRelations.map(r => r.relation),
|
||||||
missingFacts
|
missingFacts
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Check and throw on denial — convenience for middleware / guards.
|
||||||
|
* @returns {object} the check result on success.
|
||||||
|
* @throws {Error} with `.result` attached when the decision denies.
|
||||||
|
*/
|
||||||
|
async require(user, relation, object, options = {}) {
|
||||||
|
const result = await this.check(user, relation, object, options);
|
||||||
|
if (result.possibility <= 0) {
|
||||||
|
const error = new Error(`DSLRuntime: authorization denied for '${relation}' (${result.reason || 'denied'})`);
|
||||||
|
error.result = result;
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
|
return result;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -98,4 +98,32 @@ describe('Chain condition step (logical evidence as final hop)', () => {
|
|||||||
// max over paths: min(0.5,0.7)=0.5, min(1.0,0.8)=0.8 -> 0.8
|
// max over paths: min(0.5,0.7)=0.5, min(1.0,0.8)=0.8 -> 0.8
|
||||||
assert.equal(arb.check('u:1', 'can_via', 'doc:9').possibility, 0.8);
|
assert.equal(arb.check('u:1', 'can_via', 'doc:9').possibility, 0.8);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('expands an INTERMEDIATE condition step via rule-based reachability', () => {
|
||||||
|
const { arb, result } = compile(`
|
||||||
|
definition Employee { id: string }
|
||||||
|
definition Doc { id: string }
|
||||||
|
fact peer(user: Employee, other: Employee)
|
||||||
|
fact trusted(other: Employee)
|
||||||
|
fact can_read(user: Employee, doc: Doc)
|
||||||
|
evidence peer_trusted(user: Employee, other: Employee) { WHEN peer(user, other) UNLESS trusted(other) }
|
||||||
|
evidence can_access(user: Employee, doc: Doc) { peer_trusted(user, *p) { can_read(p, doc) } }
|
||||||
|
`);
|
||||||
|
assert.ok(result.success, JSON.stringify(result.errors));
|
||||||
|
const steps = arb.relationConfigs.get('can_access').steps;
|
||||||
|
assert.equal(steps[0].conditionStep, true);
|
||||||
|
assert.equal(steps[0].rule.type, 'logical');
|
||||||
|
|
||||||
|
arb.addNode('u:1', 'Employee'); arb.addNode('p:1', 'Employee'); arb.addNode('p:2', 'Employee'); arb.addNode('doc:9', 'Doc');
|
||||||
|
arb.addRelation('u:1', 'peer', 'p:1', { possibility: 1.0 });
|
||||||
|
arb.addRelation('u:1', 'peer', 'p:2', { possibility: 1.0 });
|
||||||
|
arb.addRelation('p:1', 'trusted', 'p:1', { possibility: 1.0 }); // p:1 filtered
|
||||||
|
arb.addRelation('p:1', 'can_read', 'doc:9', { possibility: 0.9 });
|
||||||
|
arb.addRelation('p:2', 'can_read', 'doc:9', { possibility: 0.7 });
|
||||||
|
// only untrusted peer p:2 survives the intermediate condition -> 0.7
|
||||||
|
assert.equal(arb.check('u:1', 'can_access', 'doc:9').possibility, 0.7);
|
||||||
|
// trusting p:2 too removes all intermediates -> 0
|
||||||
|
arb.addRelation('p:2', 'trusted', 'p:2', { possibility: 1.0 });
|
||||||
|
assert.equal(arb.check('u:1', 'can_access', 'doc:9').possibility, 0);
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -0,0 +1,176 @@
|
|||||||
|
/**
|
||||||
|
* tests/DSLRuntimeCache.test.js — provider-result caching with time expiry.
|
||||||
|
*
|
||||||
|
* Registered providers retrieve missing facts from a data store; caching the
|
||||||
|
* retrieval avoids hammering the store on repeated checks. TTL resolution:
|
||||||
|
* DSL-declared `BEHAVES { ttl <duration> }` on a fact > per-fact setFactTTL >
|
||||||
|
* policy default (30s). Per-check factProviders are cache-transparent (one-off
|
||||||
|
* observations: no cache read, no cache write). Registering a provider or
|
||||||
|
* mutating the graph invalidates the cache.
|
||||||
|
*/
|
||||||
|
import { describe, it } from 'node:test';
|
||||||
|
import assert from 'node:assert/strict';
|
||||||
|
import { Arbiter } from '@arbiter/core';
|
||||||
|
import { DSLRuntime } from '../src/runtime/DSLRuntime.js';
|
||||||
|
|
||||||
|
const BASE_DSL = `
|
||||||
|
definition Employee { id: string }
|
||||||
|
definition Doc { id: string }
|
||||||
|
fact *owns(user: Employee, doc: Doc)
|
||||||
|
evidence can_read(user: Employee, doc: Doc) { owns(user, doc) }
|
||||||
|
`;
|
||||||
|
|
||||||
|
function makeRuntime(options = {}) {
|
||||||
|
let t = 0;
|
||||||
|
const clock = () => t;
|
||||||
|
const rt = new DSLRuntime(new Arbiter(), { clock, ...options }).compile(BASE_DSL, 'rt-cache');
|
||||||
|
rt._test_advance = (ms) => { t += ms; };
|
||||||
|
return rt;
|
||||||
|
}
|
||||||
|
|
||||||
|
describe('DSLRuntime provider-result caching', () => {
|
||||||
|
it('reuses a registered provider result within the TTL', async () => {
|
||||||
|
const rt = makeRuntime();
|
||||||
|
rt.addNode('u:1', 'Employee', {});
|
||||||
|
rt.addNode('doc:9', 'Doc', {});
|
||||||
|
let calls = 0;
|
||||||
|
rt.registerFact('owns', async () => { calls++; return 0.9; });
|
||||||
|
await rt.check('u:1', 'can_read', 'doc:9');
|
||||||
|
await rt.check('u:1', 'can_read', 'doc:9');
|
||||||
|
assert.equal(calls, 1, 'provider should be invoked once within TTL');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('re-invokes the provider after the TTL expires', async () => {
|
||||||
|
const rt = makeRuntime();
|
||||||
|
rt.setFactTTL('owns', 100);
|
||||||
|
rt.addNode('u:1', 'Employee', {});
|
||||||
|
rt.addNode('doc:9', 'Doc', {});
|
||||||
|
let calls = 0;
|
||||||
|
let value = 0.9;
|
||||||
|
rt.registerFact('owns', async () => { calls++; return value; });
|
||||||
|
const first = await rt.check('u:1', 'can_read', 'doc:9');
|
||||||
|
assert.equal(first.possibility, 0.9);
|
||||||
|
rt._test_advance(50);
|
||||||
|
await rt.check('u:1', 'can_read', 'doc:9'); // within TTL -> cached
|
||||||
|
assert.equal(calls, 1);
|
||||||
|
rt._test_advance(60); // past TTL (110 total)
|
||||||
|
value = 0.4;
|
||||||
|
const after = await rt.check('u:1', 'can_read', 'doc:9');
|
||||||
|
assert.equal(calls, 2);
|
||||||
|
assert.equal(after.possibility, 0.4);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('per-check factProviders override the cache (fresh observation)', async () => {
|
||||||
|
const rt = makeRuntime();
|
||||||
|
rt.addNode('u:1', 'Employee', {});
|
||||||
|
rt.addNode('doc:9', 'Doc', {});
|
||||||
|
rt.registerFact('owns', async () => 0.9);
|
||||||
|
await rt.check('u:1', 'can_read', 'doc:9');
|
||||||
|
// Per-check override is cache-transparent: it must NOT be masked by the
|
||||||
|
// cached 0.9, and it must NOT overwrite the cached value.
|
||||||
|
const over = await rt.check('u:1', 'can_read', 'doc:9', {
|
||||||
|
factProviders: { owns: async () => 0.2 }
|
||||||
|
});
|
||||||
|
assert.equal(over.possibility, 0.2);
|
||||||
|
const next = await rt.check('u:1', 'can_read', 'doc:9');
|
||||||
|
assert.equal(next.possibility, 0.9, 'registered provider cache untouched by per-check override');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('registerFact invalidates the cached result for that relation', async () => {
|
||||||
|
const rt = makeRuntime();
|
||||||
|
rt.addNode('u:1', 'Employee', {});
|
||||||
|
rt.addNode('doc:9', 'Doc', {});
|
||||||
|
rt.registerFact('owns', async () => 0.9);
|
||||||
|
await rt.check('u:1', 'can_read', 'doc:9');
|
||||||
|
rt.registerFact('owns', async () => 0.3); // re-register -> cache invalidated
|
||||||
|
const res = await rt.check('u:1', 'can_read', 'doc:9');
|
||||||
|
assert.equal(res.possibility, 0.3);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('invalidates cached results on graph mutations', async () => {
|
||||||
|
const rt = makeRuntime();
|
||||||
|
rt.addNode('u:1', 'Employee', {});
|
||||||
|
rt.addNode('doc:9', 'Doc', {});
|
||||||
|
let calls = 0;
|
||||||
|
rt.registerFact('owns', async () => { calls++; return 0.9; });
|
||||||
|
await rt.check('u:1', 'can_read', 'doc:9');
|
||||||
|
assert.equal(calls, 1);
|
||||||
|
rt.addRelation('u:1', 'owns', 'doc:9', { possibility: 1.0 }); // mutation clears cache
|
||||||
|
const res = await rt.check('u:1', 'can_read', 'doc:9');
|
||||||
|
assert.equal(calls, 2, 'graph mutation should invalidate the provider cache');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('invalidateProviderCache() clears all or per relation', async () => {
|
||||||
|
const dsl = `
|
||||||
|
definition Employee { id: string }
|
||||||
|
definition Doc { id: string }
|
||||||
|
fact *owns(user: Employee, doc: Doc)
|
||||||
|
fact *banned(user: Employee)
|
||||||
|
evidence can_read(user: Employee, doc: Doc) { owns(user, doc) }
|
||||||
|
evidence can_open(user: Employee, doc: Doc) { WHEN can_read(user, doc) UNLESS banned(user) }
|
||||||
|
`;
|
||||||
|
const rt = new DSLRuntime(new Arbiter()).compile(dsl, 'rt-cache2');
|
||||||
|
rt.addNode('u:1', 'Employee', {});
|
||||||
|
rt.addNode('doc:9', 'Doc', {});
|
||||||
|
let ownsCalls = 0, bannedCalls = 0;
|
||||||
|
rt.registerFact('owns', async () => { ownsCalls++; return 0.9; });
|
||||||
|
rt.registerFact('banned', async () => { bannedCalls++; return 0; });
|
||||||
|
await rt.check('u:1', 'can_open', 'doc:9');
|
||||||
|
assert.equal(ownsCalls, 1);
|
||||||
|
assert.equal(bannedCalls, 1);
|
||||||
|
// Invalidate a non-dependency relation: can_open's cache (owns+banned) survives.
|
||||||
|
rt.invalidateProviderCache('does_not_exist');
|
||||||
|
await rt.check('u:1', 'can_open', 'doc:9');
|
||||||
|
assert.equal(ownsCalls, 1);
|
||||||
|
assert.equal(bannedCalls, 1);
|
||||||
|
// Invalidate owns only: banned survives, owns re-fetched.
|
||||||
|
rt.invalidateProviderCache('owns');
|
||||||
|
await rt.check('u:1', 'can_open', 'doc:9');
|
||||||
|
assert.equal(ownsCalls, 2, 'owns cache cleared by per-relation invalidation');
|
||||||
|
assert.equal(bannedCalls, 1, 'banned cache survives per-relation invalidation');
|
||||||
|
// Clear all.
|
||||||
|
rt.invalidateProviderCache();
|
||||||
|
await rt.check('u:1', 'can_open', 'doc:9');
|
||||||
|
assert.equal(bannedCalls, 2, 'full invalidation clears every relation');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('policy default TTL applies when no per-fact TTL is set', async () => {
|
||||||
|
const rt = makeRuntime({ policy: { providerCacheTTL: 50 } });
|
||||||
|
rt.addNode('u:1', 'Employee', {});
|
||||||
|
rt.addNode('doc:9', 'Doc', {});
|
||||||
|
let calls = 0;
|
||||||
|
rt.registerFact('owns', async () => { calls++; return 0.9; });
|
||||||
|
await rt.check('u:1', 'can_read', 'doc:9');
|
||||||
|
rt._test_advance(40);
|
||||||
|
await rt.check('u:1', 'can_read', 'doc:9');
|
||||||
|
assert.equal(calls, 1, 'within 50ms policy TTL -> cached');
|
||||||
|
rt._test_advance(20);
|
||||||
|
await rt.check('u:1', 'can_read', 'doc:9');
|
||||||
|
assert.equal(calls, 2, 'past 50ms policy TTL -> re-invoked');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('uses the DSL-declared fact TTL (BEHAVES { ttl X })', async () => {
|
||||||
|
const dsl = `
|
||||||
|
definition Employee { id: string }
|
||||||
|
definition Doc { id: string }
|
||||||
|
fact *balance(user: Employee, amount: number) BEHAVES { ttl 1h }
|
||||||
|
evidence can_spend(user: Employee, doc: Doc) { balance(user, 1) }
|
||||||
|
`;
|
||||||
|
let t = 0;
|
||||||
|
const rt = new DSLRuntime(new Arbiter(), { clock: () => t }).compile(dsl, 'rt-dsl-ttl');
|
||||||
|
// The DSL declares a 1h TTL for the balance fact.
|
||||||
|
assert.equal(rt.relations.get('balance').ttlMs, 3600_000);
|
||||||
|
rt.addNode('u:1', 'Employee', {});
|
||||||
|
rt.addNode('doc:9', 'Doc', {});
|
||||||
|
let calls = 0;
|
||||||
|
rt.registerFact('balance', async () => { calls++; return { possibility: 1.0, value: 50 }; });
|
||||||
|
await rt.check('u:1', 'can_spend', 'doc:9');
|
||||||
|
assert.equal(calls, 1);
|
||||||
|
t += 60 * 60 * 1000 - 1; // just under 1h
|
||||||
|
await rt.check('u:1', 'can_spend', 'doc:9');
|
||||||
|
assert.equal(calls, 1, 'cached within DSL-declared 1h TTL');
|
||||||
|
t += 2;
|
||||||
|
await rt.check('u:1', 'can_spend', 'doc:9');
|
||||||
|
assert.equal(calls, 2, 're-invoked past the DSL-declared 1h TTL');
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,168 @@
|
|||||||
|
/**
|
||||||
|
* tests/DSLRuntimeExt.test.js — extended DSLRuntime capabilities:
|
||||||
|
* - schema introspection (getSchema)
|
||||||
|
* - per-relation provider registration (registerFact/unregisterFact)
|
||||||
|
* - provider merging (registered + per-check overrides)
|
||||||
|
* - bounded fixed-point provider retrieval loop (edges satisfy other facts)
|
||||||
|
* - require() throw-on-deny
|
||||||
|
* - removal passthroughs and fact-relation check validation
|
||||||
|
* - timestamp/duration field typing
|
||||||
|
*/
|
||||||
|
import { describe, it } from 'node:test';
|
||||||
|
import assert from 'node:assert/strict';
|
||||||
|
import { Arbiter } from '@arbiter/core';
|
||||||
|
import { DSLRuntime } from '../src/runtime/DSLRuntime.js';
|
||||||
|
|
||||||
|
const BASE_DSL = `
|
||||||
|
definition Employee { id: string level: number active: boolean }
|
||||||
|
definition Doc { id: string created: timestamp }
|
||||||
|
fact *owns(user: Employee, doc: Doc)
|
||||||
|
fact *banned(user: Employee)
|
||||||
|
evidence can_read(user: Employee, doc: Doc) { owns(user, doc) }
|
||||||
|
evidence can_open(user: Employee, doc: Doc) { WHEN can_read(user, doc) UNLESS banned(user) }
|
||||||
|
`;
|
||||||
|
|
||||||
|
function makeRuntime() {
|
||||||
|
return new DSLRuntime(new Arbiter()).compile(BASE_DSL, 'rt-ext');
|
||||||
|
}
|
||||||
|
|
||||||
|
describe('DSLRuntime extended', () => {
|
||||||
|
it('exposes a serializable schema snapshot', () => {
|
||||||
|
const rt = makeRuntime();
|
||||||
|
const schema = rt.getSchema();
|
||||||
|
assert.ok(Array.isArray(schema.types));
|
||||||
|
const employee = schema.types.find(t => t.name === 'Employee');
|
||||||
|
assert.ok(employee);
|
||||||
|
assert.ok(employee.fields.some(f => f.name === 'level' && f.type === 'number'));
|
||||||
|
const owns = schema.facts.find(f => f.name === 'owns');
|
||||||
|
assert.equal(owns.injectable, true);
|
||||||
|
assert.equal(owns.params[1].type, 'Doc');
|
||||||
|
const can_open = schema.evidence.find(e => e.name === 'can_open');
|
||||||
|
assert.ok(can_open.dependsOn.includes('owns'));
|
||||||
|
assert.deepEqual(schema.providers, []);
|
||||||
|
assert.ok(rt.relationNames().includes('owns') && rt.relationNames().includes('can_read'));
|
||||||
|
});
|
||||||
|
|
||||||
|
it('registers, lists, and unregisters per-relation providers', () => {
|
||||||
|
const rt = makeRuntime();
|
||||||
|
rt.registerFact('owns', async () => 0.8);
|
||||||
|
assert.deepEqual(rt.registeredFacts(), ['owns']);
|
||||||
|
rt.registerFact('banned', async () => 0);
|
||||||
|
assert.deepEqual(rt.registeredFacts().sort(), ['banned', 'owns']);
|
||||||
|
rt.unregisterFact('banned');
|
||||||
|
assert.deepEqual(rt.registeredFacts(), ['owns']);
|
||||||
|
assert.throws(() => rt.registerFact('owns', 'not a function'), /must be a function/);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('merges registered providers with per-check overrides', async () => {
|
||||||
|
const rt = makeRuntime();
|
||||||
|
rt.registerFact('owns', async () => 0.5);
|
||||||
|
rt.registerFact('banned', async () => 0);
|
||||||
|
rt.addNode('u:1', 'Employee', {});
|
||||||
|
rt.addNode('doc:9', 'Doc', {});
|
||||||
|
// registered owns (0.5) wins over nothing; per-check banned overrides
|
||||||
|
const res = await rt.check('u:1', 'can_open', 'doc:9', {
|
||||||
|
factProviders: { banned: async () => 0 }
|
||||||
|
});
|
||||||
|
assert.equal(res.possibility, 0.5);
|
||||||
|
assert.deepEqual(res.providedFacts.sort(), ['banned', 'owns']);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('runs providers to a fixed point when edges satisfy other required facts', async () => {
|
||||||
|
// can_open needs owns (injectable). A registered owns provider returns an
|
||||||
|
// edge for a DIFFERENT injectable fact that can_open also requires via
|
||||||
|
// composition — here we add a transitive requirement to prove the loop.
|
||||||
|
const dsl = `
|
||||||
|
definition Employee { id: string }
|
||||||
|
definition Doc { id: string }
|
||||||
|
fact *owns(user: Employee, doc: Doc)
|
||||||
|
fact *granted(user: Employee, doc: Doc)
|
||||||
|
evidence base_read(user: Employee, doc: Doc) { owns(user, doc) }
|
||||||
|
evidence can_open(user: Employee, doc: Doc) { WHEN base_read(user, doc) UNLESS granted(user, doc) }
|
||||||
|
`;
|
||||||
|
const rt = new DSLRuntime(new Arbiter()).compile(dsl, 'rt-loop');
|
||||||
|
rt.addNode('u:1', 'Employee', {});
|
||||||
|
rt.addNode('doc:9', 'Doc', {});
|
||||||
|
let ownsCalls = 0;
|
||||||
|
let grantedCalls = 0;
|
||||||
|
rt.registerFact('owns', async () => {
|
||||||
|
ownsCalls++;
|
||||||
|
// First round the owns provider also supplies the granted edge (a
|
||||||
|
// fixed-point dependency: granted needs owns to have been retrieved).
|
||||||
|
return [
|
||||||
|
{ src: 'u:1', relation: 'owns', dst: 'doc:9', possibility: 0.9 },
|
||||||
|
{ src: 'u:1', relation: 'granted', dst: 'doc:9', possibility: 0 }
|
||||||
|
];
|
||||||
|
});
|
||||||
|
rt.registerFact('granted', async () => { grantedCalls++; return 0; });
|
||||||
|
const res = await rt.check('u:1', 'can_open', 'doc:9', { maxProviderRounds: 3 });
|
||||||
|
assert.equal(res.possibility, 0.9);
|
||||||
|
// granted was satisfied by the owns provider's extra edge, so its own
|
||||||
|
// provider was never needed in a later round.
|
||||||
|
assert.equal(grantedCalls, 0);
|
||||||
|
assert.ok(ownsCalls >= 1);
|
||||||
|
assert.deepEqual(res.providedFacts, ['owns']);
|
||||||
|
assert.deepEqual(res.missingFacts, []);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('require() throws on denial and returns the result on grant', async () => {
|
||||||
|
const rt = makeRuntime();
|
||||||
|
rt.addNode('u:1', 'Employee', {});
|
||||||
|
rt.addNode('doc:9', 'Doc', {});
|
||||||
|
rt.registerFact('owns', async () => 0.9);
|
||||||
|
const ok = await rt.require('u:1', 'can_read', 'doc:9');
|
||||||
|
assert.equal(ok.possibility, 0.9);
|
||||||
|
rt.registerFact('owns', async () => 0);
|
||||||
|
await assert.rejects(
|
||||||
|
() => rt.require('u:1', 'can_read', 'doc:9'),
|
||||||
|
(err) => err.result && err.result.possibility === 0 && /denied/.test(err.message)
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('passes through node/relation removal', () => {
|
||||||
|
const rt = makeRuntime();
|
||||||
|
rt.addNode('u:1', 'Employee', {});
|
||||||
|
rt.addNode('doc:9', 'Doc', {});
|
||||||
|
rt.addRelation('u:1', 'owns', 'doc:9', { possibility: 1.0 });
|
||||||
|
rt.removeRelation('u:1', 'owns', 'doc:9');
|
||||||
|
assert.equal(rt.arbiter.check('u:1', 'owns', 'doc:9').possibility, 0);
|
||||||
|
rt.removeNode('u:1');
|
||||||
|
assert.equal(rt.arbiter.nodeIdByKey.has('u:1'), false);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('validates fact-relation check endpoints like evidence', async () => {
|
||||||
|
const rt = makeRuntime();
|
||||||
|
rt.addNode('u:1', 'Employee', {});
|
||||||
|
rt.addNode('doc:9', 'Doc', {});
|
||||||
|
// can_read is evidence; owns is a fact — checking a fact still validates.
|
||||||
|
await assert.rejects(() => rt.check('u:1', 'owns', 'u:1', {}), /expected 'Doc'/);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('accepts timestamp field values and rejects mistyped ones', () => {
|
||||||
|
const rt = makeRuntime();
|
||||||
|
rt.addNode('doc:9', 'Doc', { created: 1720000000000 });
|
||||||
|
rt.updateNodeData('doc:9', { created: '2026-08-03T00:00:00Z' });
|
||||||
|
assert.throws(() => rt.addNode('doc:8', 'Doc', { created: {} }), /must be timestamp/);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('direct FACT checks consult the registered provider', async () => {
|
||||||
|
const rt = makeRuntime();
|
||||||
|
rt.addNode('u:1', 'Employee', {});
|
||||||
|
rt.addNode('doc:9', 'Doc', {});
|
||||||
|
let calls = 0;
|
||||||
|
rt.registerFact('owns', async () => { calls++; return 0.9; });
|
||||||
|
// Checking the fact directly (not via an evidence) must retrieve it.
|
||||||
|
const res = await rt.check('u:1', 'owns', 'doc:9');
|
||||||
|
assert.equal(res.possibility, 0.9);
|
||||||
|
assert.equal(calls, 1);
|
||||||
|
assert.deepEqual(res.requiredFacts, ['owns']);
|
||||||
|
assert.deepEqual(res.providedFacts, ['owns']);
|
||||||
|
// Without a provider and without an edge, it reports the missing fact.
|
||||||
|
const rt2 = new DSLRuntime(new Arbiter()).compile(BASE_DSL, 'rt-fact-miss');
|
||||||
|
rt2.addNode('u:1', 'Employee', {});
|
||||||
|
rt2.addNode('doc:9', 'Doc', {});
|
||||||
|
const missed = await rt2.check('u:1', 'owns', 'doc:9');
|
||||||
|
assert.equal(missed.possibility, 0);
|
||||||
|
assert.deepEqual(missed.missingFacts, [{ relation: 'owns', reason: 'no_provider' }]);
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -33,8 +33,11 @@ const FACTS = `
|
|||||||
fact owner(group: Group, doc: Doc)
|
fact owner(group: Group, doc: Doc)
|
||||||
fact granted(user: Employee, doc: Doc)
|
fact granted(user: Employee, doc: Doc)
|
||||||
fact group_perm(group: Group, doc: Doc)
|
fact group_perm(group: Group, doc: Doc)
|
||||||
fact banned(user: Employee)
|
|
||||||
fact group_banned(group: Group)
|
fact group_banned(group: Group)
|
||||||
|
fact banned(user: Employee)
|
||||||
|
fact peer(user: Employee, other: Employee)
|
||||||
|
fact trusted(other: Employee)
|
||||||
|
fact doc_read(user: Employee, doc: Doc)
|
||||||
fact mfa(user: Employee)
|
fact mfa(user: Employee)
|
||||||
`;
|
`;
|
||||||
|
|
||||||
@@ -142,6 +145,20 @@ function buildProgram(kind, ps) {
|
|||||||
oracle = Math.min(pm, pv * (1 - pb));
|
oracle = Math.min(pm, pv * (1 - pb));
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
case 'chain_intermediate_condition': {
|
||||||
|
// peer_trusted (a defeasible evidence) as an INTERMEDIATE chain step:
|
||||||
|
// the engine expands it from the source (peer edges filtered by the
|
||||||
|
// trusted defeater) then continues to can_read. Oracle = min of the
|
||||||
|
// surviving peer leg and the read leg.
|
||||||
|
const [pp, pt, pr] = ps;
|
||||||
|
evidence = `evidence peer_trusted(user: Employee, other: Employee) { WHEN peer(user, other) UNLESS trusted(other) }
|
||||||
|
evidence can_via(user: Employee, doc: Doc) { peer_trusted(user, *p) { doc_read(p, doc) } }`;
|
||||||
|
edges.push({ src: 'u:1', relation: 'peer', dst: 'p:1', possibility: pp });
|
||||||
|
edges.push({ src: 'p:1', relation: 'trusted', dst: 'p:1', possibility: pt });
|
||||||
|
edges.push({ src: 'p:1', relation: 'doc_read', dst: 'doc:9', possibility: pr });
|
||||||
|
oracle = Math.min(pp * (1 - pt), pr);
|
||||||
|
break;
|
||||||
|
}
|
||||||
default:
|
default:
|
||||||
throw new Error(`unknown construct: ${kind}`);
|
throw new Error(`unknown construct: ${kind}`);
|
||||||
}
|
}
|
||||||
@@ -162,6 +179,10 @@ function runCheck({ kind, ps }) {
|
|||||||
arbiter.addNode('u:1', 'Employee');
|
arbiter.addNode('u:1', 'Employee');
|
||||||
arbiter.addNode('g:1', 'Group');
|
arbiter.addNode('g:1', 'Group');
|
||||||
arbiter.addNode('doc:9', 'Doc');
|
arbiter.addNode('doc:9', 'Doc');
|
||||||
|
for (const e of edges) {
|
||||||
|
arbiter.addNode(e.src, e.dst === 'doc:9' ? 'Doc' : 'Employee');
|
||||||
|
arbiter.addNode(e.dst, e.dst === 'doc:9' ? 'Doc' : 'Employee');
|
||||||
|
}
|
||||||
const compiler = new DSLCompiler(arbiter);
|
const compiler = new DSLCompiler(arbiter);
|
||||||
const compiled = compiler.compile(dsl, 'oracle');
|
const compiled = compiler.compile(dsl, 'oracle');
|
||||||
if (!compiled.success) {
|
if (!compiled.success) {
|
||||||
@@ -178,7 +199,7 @@ function runCheck({ kind, ps }) {
|
|||||||
|
|
||||||
const CONSTRUCTS = ['direct', 'chain', 'tuple_to_userset', 'fusion_min', 'fusion_max',
|
const CONSTRUCTS = ['direct', 'chain', 'tuple_to_userset', 'fusion_min', 'fusion_max',
|
||||||
'when_unless', 'never_always', 'requires_when', 'composition', 'chain_step_composition',
|
'when_unless', 'never_always', 'requires_when', 'composition', 'chain_step_composition',
|
||||||
'chain_condition_step'];
|
'chain_condition_step', 'chain_intermediate_condition'];
|
||||||
|
|
||||||
describe('DSL generative oracle parity (rigor)', () => {
|
describe('DSL generative oracle parity (rigor)', () => {
|
||||||
it('generated legal DSL compiles and every check matches the oracle', async () => {
|
it('generated legal DSL compiles and every check matches the oracle', async () => {
|
||||||
@@ -220,6 +241,10 @@ describe('DSL generative oracle parity (rigor)', () => {
|
|||||||
arbiter.addNode('u:1', 'Employee');
|
arbiter.addNode('u:1', 'Employee');
|
||||||
arbiter.addNode('g:1', 'Group');
|
arbiter.addNode('g:1', 'Group');
|
||||||
arbiter.addNode('doc:9', 'Doc');
|
arbiter.addNode('doc:9', 'Doc');
|
||||||
|
for (const e of edges) {
|
||||||
|
arbiter.addNode(e.src, e.dst === 'doc:9' ? 'Doc' : 'Employee');
|
||||||
|
arbiter.addNode(e.dst, e.dst === 'doc:9' ? 'Doc' : 'Employee');
|
||||||
|
}
|
||||||
const compiled = new DSLCompiler(arbiter).compile(dsl, 'sweep');
|
const compiled = new DSLCompiler(arbiter).compile(dsl, 'sweep');
|
||||||
assert.ok(compiled.success, `${kind} compile failed: ${(compiled.errors || []).join('; ')}`);
|
assert.ok(compiled.success, `${kind} compile failed: ${(compiled.errors || []).join('; ')}`);
|
||||||
for (const e of edges) arbiter.addRelation(e.src, e.relation, e.dst, { possibility: e.possibility });
|
for (const e of edges) arbiter.addRelation(e.src, e.relation, e.dst, { possibility: e.possibility });
|
||||||
|
|||||||
Reference in New Issue
Block a user