@astrale-os/kernel-dsl 0.2.0-beta.28 → 0.2.0-beta.29

package/dist/v1/builder/class/authoring.d.ts

@@ -43,6 +43,7 @@ export interface NodeClassInput {
     readonly data?: MediaType;
     readonly methods?: Readonly<Record<string, Method>>;
     readonly icon?: string;
+    /** Local observation Policies; inherited by no descendant and forbidden on abstract Classes. */
     readonly policies?: {
         readonly read?: Lazy<Policy>;
         readonly traverse?: Lazy<Policy>;
@@ -53,6 +54,7 @@ export interface EdgeClassOptions {
     readonly description?: string;
     readonly extends?: readonly EdgeClassReferenceInput[];
     readonly properties?: PropertyRecordInput;
+    /** Local observation Policies; inherited by no descendant and forbidden on abstract Classes. */
     readonly policies?: {
         readonly read?: Lazy<Policy>;
         readonly traverse?: Lazy<Policy>;

package/dist/v1/compiled/admission/semantics.js

@@ -178,6 +178,10 @@ function policyKey(value) {
 }
 function validateClassFacets(context) {
     for (const located of context.classes.values()) {
+        if (located.value.abstract &&
+            (located.value.policies.read !== undefined || located.value.policies.traverse !== undefined)) {
+            fail(`${located.pointer}/policies`, 'Abstract Classes cannot declare observation Policies.');
+        }
         for (const [index, property] of located.value.properties.entries()) {
             const path = `${located.pointer}/properties/${index}`;
             if (property.auto !== undefined) {
@@ -252,26 +256,7 @@ function edgeRefines(context, child, parent) {
     const direct = refine(0, 0) && refine(1, 1);
     if (direct)
         return true;
-    const reverse = refine(0, 1) && refine(1, 0);
-    return reverse && !hasEffectiveEdgePolicy(context, parent, new Set());
-}
-function hasEffectiveEdgePolicy(context, declaration, visited) {
-    if (declaration.policies.read !== undefined || declaration.policies.traverse !== undefined) {
-        return true;
-    }
-    for (const parentRef of declaration.extends) {
-        const key = Key.of(parentRef);
-        if (visited.has(key))
-            continue;
-        visited.add(key);
-        const parent = context.classes.get(key)?.value;
-        if (parent !== undefined &&
-            isCompiledEdge(parent) &&
-            hasEffectiveEdgePolicy(context, parent, visited)) {
-            return true;
-        }
-    }
-    return false;
+    return refine(0, 1) && refine(1, 0);
 }
 function endpointRefines(context, child, parent) {
     return child.accepts.every((accepted) => classSatisfiesAny(context, accepted, parent.accepts));

package/dist/v1/domain/projection/classes.js

@@ -1,4 +1,4 @@
-import { compareUnicode, Key, MethodKey as MethodKeyValue, PropertyKey as PropertyKeyValue, } from '../../addressing/index.js';
+import { Key, MethodKey as MethodKeyValue, PropertyKey as PropertyKeyValue, } from '../../addressing/index.js';
 import { acceptPropertyValues } from '../../language/class/property-values.js';
 import { appendPointer } from '../../language/value/syntax/pointer.js';
 import { createMethodCollection, createPropertyCollection } from '../namespace/member-collection.js';
@@ -24,16 +24,6 @@ export function createClasses(definitions, validation) {
             throw new TypeError(`Class ${key} extends a Class of another graph kind.`);
         }
         const shell = {};
-        const policies = Object.freeze({
-            read: Object.freeze(uniquePolicyRefs([
-                ...parents.flatMap((parent) => [...parent.policies.read]),
-                ...(definition.policies.read === undefined ? [] : [definition.policies.read]),
-            ])),
-            traverse: Object.freeze(uniquePolicyRefs([
-                ...parents.flatMap((parent) => [...parent.policies.traverse]),
-                ...(definition.policies.traverse === undefined ? [] : [definition.policies.traverse]),
-            ])),
-        });
         const effectiveProperties = new Map();
         const effectiveMethods = new Map();
         let inheritedData;
@@ -102,7 +92,7 @@ export function createClasses(definitions, validation) {
             abstract: definition.abstract,
             definition,
             extends: Object.freeze(parents),
-            policies,
+            policies: definition.policies,
             data: definition.kind === 'node' ? (ownData ?? inheritedData) : undefined,
             properties: createPropertyCollection(effectiveProperties.values()),
             methods: createMethodCollection(instanceMethods),
@@ -110,7 +100,6 @@ export function createClasses(definitions, validation) {
             self: Object.freeze({
                 data: definition.kind === 'node' ? ownData : undefined,
                 properties: createPropertyCollection(ownProperties),
-                policies: definition.policies,
                 methods: createMethodCollection(ownInstanceMethods),
                 static: Object.freeze({ methods: createMethodCollection(ownStaticMethods) }),
             }),
@@ -138,12 +127,6 @@ export function createClasses(definitions, validation) {
         resolve(definition.ref);
     return resolved;
 }
-function uniquePolicyRefs(values) {
-    const result = new Map();
-    for (const value of values)
-        result.set(Key.of(value), value);
-    return [...result.values()].sort((left, right) => compareUnicode(Key.of(left), Key.of(right)));
-}
 function validateProperties(abstract, properties, input) {
     if (abstract) {
         return [

package/dist/v1/language/class/resolved.d.ts

@@ -1,5 +1,5 @@
 import type { Value as PortableValue } from '@astrale-os/kernel-dsl/value';
-import type { ClassRef, DefinitionKey, Key, PolicyRef, PropertyKey } from '../../addressing/index.js';
+import type { ClassRef, DefinitionKey, Key, PropertyKey } from '../../addressing/index.js';
 import type { ResolvedMethodCollection } from '../callable/resolved.js';
 import type { StateTopology } from '../state/index.js';
 import type { Diagnostic } from '../validation/diagnostic.js';
@@ -25,11 +25,6 @@ export interface ResolvedData {
     readonly owner: ResolvedClass<'node'>;
     readonly definition: DataDefinition;
 }
-export interface ResolvedClassPolicies {
-    /** Effective read Policies for this Node or Edge Class. */
-    readonly read: readonly PolicyRef[];
-    readonly traverse: readonly PolicyRef[];
-}
 export type ResolvedPropertyCollection<ByKey extends Readonly<Record<PropertyKey, ResolvedProperty<unknown>>> = Readonly<Record<PropertyKey, ResolvedProperty<unknown>>>, ByName extends Readonly<Record<string, ResolvedProperty<unknown>>> = Readonly<Record<never, never>>> = Readonly<ByName> & Iterable<ByKey[keyof ByKey]> & {
     readonly byKey: ByKey;
     get<Key extends keyof ByKey>(key: Key): ByKey[Key];
@@ -47,8 +42,8 @@ export interface ResolvedClass<Kind extends ClassKind = ClassKind, Properties ex
     readonly abstract: boolean;
     readonly definition: Definition;
     readonly extends: Parents & readonly ResolvedClass<Kind>[];
-    /** Effective inherited Policy conjunction, deduplicated by exact Policy ref. */
-    readonly policies: ResolvedClassPolicies;
+    /** Local observation Policies; Class inheritance never contributes an attachment. */
+    readonly policies: Definition['policies'];
     readonly data: Kind extends 'node' ? ResolvedData | undefined : undefined;
     readonly properties: Properties;
     readonly methods: Kind extends 'node' ? InstanceMethods : ResolvedMethodCollection<Record<never, never>>;
@@ -58,8 +53,6 @@ export interface ResolvedClass<Kind extends ClassKind = ClassKind, Properties ex
     readonly self: {
         readonly data: Kind extends 'node' ? ResolvedData | undefined : undefined;
         readonly properties: SelfProperties;
-        /** Policies declared by this exact Class only. */
-        readonly policies: Definition['policies'];
         readonly methods: Kind extends 'node' ? SelfInstanceMethods : ResolvedMethodCollection<Record<never, never>>;
         readonly static: {
             readonly methods: Kind extends 'node' ? SelfStaticMethods : ResolvedMethodCollection<Record<never, never>>;

package/dist/v1/schema/validation/class.js

@@ -15,6 +15,10 @@ export function validateDefinitions(environment, analysis) {
         if (!sameRef(declaration.ref, ref)) {
             diagnostics.push(diagnostic('DV_REF_RESOLVES', `${pointer}/ref`, `Class ref must be exactly ${formatDefinitionRef(ref)}.`, formatDefinitionRef(declaration.ref)));
         }
+        if (declaration.abstract &&
+            (declaration.policies.read !== undefined || declaration.policies.traverse !== undefined)) {
+            diagnostics.push(diagnostic('DV_CLASS_ABSTRACT', `${pointer}/policies`, 'Abstract Classes cannot declare observation Policies.'));
+        }
         validateFacet(environment, declaration, pointer, diagnostics);
         validateParents(environment, ref, declaration.kind, declaration.extends, diagnostics);
         if (declaration.kind === 'edge') {
@@ -159,27 +163,7 @@ function edgeContractRefines(environment, child, parent) {
     const direct = refines(0, 0) && refines(1, 1);
     if (direct)
         return true;
-    const reverse = refines(0, 1) && refines(1, 0);
-    return reverse && !hasEffectiveEdgePolicy(environment, parent, new Set());
-}
-function hasEffectiveEdgePolicy(environment, declaration, visited) {
-    if (declaration.policies.read !== undefined || declaration.policies.traverse !== undefined) {
-        return true;
-    }
-    for (const parentRef of declaration.extends) {
-        const key = definitionRefIndex(parentRef);
-        if (visited.has(key))
-            continue;
-        visited.add(key);
-        const parent = environment.resolveAny(parentRef);
-        if (parent !== undefined &&
-            parent.ref.kind === 'class' &&
-            parent.declaration.kind === 'edge' &&
-            hasEffectiveEdgePolicy(environment, parent.declaration, visited)) {
-            return true;
-        }
-    }
-    return false;
+    return refines(0, 1) && refines(1, 0);
 }
 function endpointRefines(environment, child, parent) {
     return child.accepts.every((accepted) => classSatisfies(environment, accepted, parent.accepts));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astrale-os/kernel-dsl",
-  "version": "0.2.0-beta.28",
+  "version": "0.2.0-beta.29",
   "description": "Astrale Kernel DSL - Schema authoring, inference, and IR serialization",
   "license": "Apache-2.0",
   "repository": {