2 Commits

Author SHA1 Message Date
John Dvorak 3ace783a59 feat: intermediate chain condition steps + _subjectIsObject unary scoping
CI / publish (push) Successful in 10s
CI / test (push) Successful in 19s
- _expandChainSteps: a logical/defeasible evidence referenced by a chain step
  is now a condition step ({ rule, conditionStep }) at ANY position. As the
  FINAL step the engine verifies it at (intermediate, object); as an
  INTERMEDIATE step the engine expands it from the current node (rule-based
  reachability: base edges' destinations filtered by the rule's
  defeaters/requirements) and continues traversal from each discovered node.
- buildPredicateRule / buildDirectRule: unary predicate calls whose subject
  entity IS the evidence's object parameter (trusted(other) inside
  peer_trusted(user, other)) are marked _subjectIsObject (was: only subject-var
  calls got _subjectAsObject). Requires @arbiter/core@^1.0.4.

Tests: ChainConditionStep intermediate expansion; oracle campaign gains a
chain_intermediate_condition construct (oracle = min(peer*(1-trusted), read)).
2026-08-03 13:36:16 -07:00
John Dvorak fe162251fc feat: DSLRuntime schema introspection, per-relation providers, retrieval loop
CI / publish (push) Successful in 10s
CI / test (push) Successful in 20s
The higher-order DSL+Core wrapper now covers the full contract the DSL
informs, beyond the typed mutations already present:

- getSchema(): serializable introspection of the compiled type system —
  entity types/fields, facts (params + injectable flag), evidence (with
  transitive dependsOn), and registered providers. relationNames() lists all
  declared relations. (The DSL's type system was always present; this exposes
  it programmatically.)
- registerFact(relation, fn) / unregisterFact / registeredFacts: per-relation
  async providers that retrieve missing partial-graph edges; per-check
  factProviders merge OVER registered ones.
- Bounded fixed-point provider retrieval loop (maxProviderRounds): each round
  invokes providers for required facts whose edges are not yet injected. A
  provider may return edges for relations other than its own — those satisfy
  the other required facts and can unblock later rounds.
- check() now type-validates FACT relations too (not just evidence); edge
  normalization preserves a provider edge's own relation name.
- removeNode / removeRelation passthroughs; require() throws on denial for
  middleware.
- Field typing extended to the DSL's full value-type universe
  (timestamp/duration accept number or string; object/any accept anything).

Tests: DSLRuntimeExt (schema, registration, merge, fixed-point, require,
removal, fact-check validation, timestamp typing).
2026-08-03 12:45:16 -07:00
7 changed files with 444 additions and 92 deletions
+6 -6
View File
@@ -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
View File
@@ -1,6 +1,6 @@
{ {
"name": "@arbiter/evidence-dsl", "name": "@arbiter/evidence-dsl",
"version": "1.4.0", "version": "1.6.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",
+31 -22
View File
@@ -486,14 +486,21 @@ 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 || [];
rule._subjectAsObject = true; 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;
}
} }
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,15 +1111,11 @@ 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
out.push({ rule: this._deepCloneRule(resolved), conditionStep: true }); // (rule-based reachability) and continues from each discovered node.
continue; out.push({ rule: this._deepCloneRule(resolved), conditionStep: true });
}
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; continue;
} }
} }
@@ -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;
} }
} }
+203 -60
View File
@@ -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.
@@ -62,6 +68,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();
@@ -136,12 +179,43 @@ 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;
return this;
}
/** Remove a registered provider. */
unregisterFact(relation) {
delete this.factProviders[relation];
return this;
}
/** Relation names that currently have a registered provider. */
registeredFacts() {
return Object.keys(this.factProviders);
}
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
// 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 +232,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 +258,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}`);
} }
@@ -224,6 +300,14 @@ export class DSLRuntime {
return this.arbiter.updateNodeData(key, data); return this.arbiter.updateNodeData(key, data);
} }
/** Remove a node (passthrough to the arbiter's node manager). */
removeNode(key) {
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) {
@@ -258,6 +342,11 @@ export class DSLRuntime {
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) {
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 +354,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 +402,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 +416,103 @@ 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); const required = this.requiredFacts(relation);
const providers = options.factProviders || this.factProviders; const providers = { ...this.factProviders, ...(options.factProviders || {}) };
const injectedRelations = []; const maxRounds = options.maxProviderRounds ?? 3;
const missingFacts = [];
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.
const factMeta = this.relations.get(fact); for (let round = 1; round <= maxRounds; round++) {
const provider = providers[fact]; let newRelationsThisRound = 0;
let result = null; for (const fact of required) {
let error = null; if (satisfied.has(fact)) continue;
if (typeof provider === 'function') { const factMeta = this.relations.get(fact);
const provider = providers[fact];
if (typeof provider !== 'function') {
missingFacts.push({ relation: fact, reason: 'no_provider' });
satisfied.add(fact);
continue;
}
let result = null;
let error = null;
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) {
missingFacts.push({ relation: fact, reason: error.message });
satisfied.add(fact);
continue;
}
if (result === false || result === null || result === undefined) {
missingFacts.push({ relation: fact, reason: 'not_provided' });
satisfied.add(fact);
continue;
}
const edges = Array.isArray(result) ? result : [result];
// Resolve the edge destination the same way the DSL declares the fact:
// - unary fact (1 param) -> self-edge on the subject
// - value fact (2nd param value) -> self-edge on the subject carrying the value
// - binary entity fact -> subject → object
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);
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 } : {})
};
// A provider may return edges for relations other than its own; the
// injected relation names satisfy those facts too (fixed point).
const injectedRelation = normalized.relation ?? fact;
partialRelations.push({ relation: injectedRelation, ...normalized });
satisfied.add(injectedRelation);
}
injectedRelations.push({ relation: fact, edges: edges.length, round });
newRelationsThisRound += edges.length;
satisfied.add(fact);
} }
if (error) { if (newRelationsThisRound === 0) break;
missingFacts.push({ relation: fact, reason: error.message });
continue;
}
if (result === false || result === null || result === undefined) {
missingFacts.push({ relation: fact, reason: 'not_provided' });
continue;
}
const edges = Array.isArray(result) ? result : [result];
// Resolve the edge destination the same way the DSL declares the fact:
// - unary fact (1 param) -> self-edge on the subject
// - value fact (2nd param value) -> self-edge on the subject carrying the value
// - binary entity fact -> subject → object
const secondParamType = factMeta.params[1] && factMeta.params[1].type;
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 });
} }
const checkOptions = { ...options }; const checkOptions = { ...options };
@@ -404,4 +532,19 @@ export class DSLRuntime {
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;
}
} }
+28
View File
@@ -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);
});
}); });
+147
View File
@@ -0,0 +1,147 @@
/**
* 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/);
});
});
+27 -2
View File
@@ -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 });