@altopelago/aeon-aes 0.11.0 → 0.12.1

package/README.md

@@ -1,6 +1,6 @@
 # @altopelago/aeon-aes
 
-Assignment Event Stream emission and supporting AEON path utilities.
+Assignment Event Stream emission, portable projection, and Telex v1 codec.
 
 ## Installation
 
@@ -25,21 +25,45 @@ if (result.errors.length === 0) {
 - emits Assignment Events from AEON source or parsed syntax
 - formats and works with canonical AEON paths
 - exposes event-level data used by AEOS validation, finalization, and tooling
+- parses, validates, encodes, and canonicalizes `telex.aes` v1 streams
+- splits compact Telex datatypes into `datatype`, `generics`, and `clarifiers`
 
 ## API
 
 - `emitAssignmentEvents(input, options?)`
+- `projectPortableEvents(events)` emits the default body-only portable
+  projection
+- `adaptTypeScriptAssignmentEventsToPortableAes(events, options?)` returns the
+  named `aeon.typescript.assignment-events.v0-to-aes.events.v1` compatibility
+  result and its conversion report; optional exact `sourceBytes` derive a
+  SHA-256 origin and convert native UTF-16 ranges to UTF-8 byte spans;
+  `includeHeaders: true` selects `aeon.document.v1`
+- `parseTelex(input, options?)`
+- `encodeTelex(records, options?)`
+- `canonicalizeTelex(input, options?)`
+- `validateTelex(input, options?)`
+- `validateTelexRecords(records, options?)`
 - canonical path helpers
 - Assignment Event Stream types
+  - emitted native events carry `sourcePlane: 'header' | 'body'`; consumers
+    must not infer control-plane identity from an `aeon:` key prefix
+- reconstructed candidate AES types:
+  - `CandidateAES`
+  - `CandidateAssignmentEvent`
+  - `CandidateAttributeEntry`
+  - `CandidateValue`
 
 ## When To Use It
 
-Use this package when you need direct access to emitted AEON assignment events.
+Use this package when you need direct access to assignment events or the
+encoding-neutral portable AES/Telex boundary.
 If you want the stable application-facing entry point, prefer `@altopelago/aeon-core`.
 
 ## Notes
 
 - AES is the structural event layer between parsing and downstream validation.
+- Candidate AES types describe reconstructed validation input for speculative
+  post-commit state. They do not define substrate materialization policy.
 - This package does not materialize application objects.
 - Schema validation belongs in `@altopelago/aeos-core`.
 - JSON or map materialization belongs in `@altopelago/aeon-finalize`.

package/dist/candidate.d.ts

@@ -0,0 +1,26 @@
+import type { Span } from '@altopelago/aeon-lexer';
+import type { AssignmentEvent, AttributeEntry } from './events.js';
+/**
+ * Reconstructed AES candidate input.
+ *
+ * Candidate events are used by storage engines and orchestrators that need to
+ * validate a speculative post-commit state but do not have source-document
+ * lexer spans for every reconstructed binding. The shape intentionally mirrors
+ * AssignmentEvent while allowing tuple spans and candidate-local value nodes.
+ */
+export type CandidateSpan = Span | readonly [number, number];
+export type CandidateValue = AssignmentEvent['value'] | (Readonly<Record<string, unknown>> & {
+    readonly type: string;
+    readonly span?: CandidateSpan;
+});
+export interface CandidateAttributeEntry extends Omit<AttributeEntry, 'value' | 'annotations'> {
+    readonly value: CandidateValue;
+    readonly annotations?: ReadonlyMap<string, CandidateAttributeEntry>;
+}
+export interface CandidateAssignmentEvent extends Omit<AssignmentEvent, 'value' | 'span' | 'annotations'> {
+    readonly value: CandidateValue;
+    readonly span: CandidateSpan;
+    readonly annotations?: ReadonlyMap<string, CandidateAttributeEntry>;
+}
+export type CandidateAES = readonly CandidateAssignmentEvent[];
+//# sourceMappingURL=candidate.d.ts.map

package/dist/candidate.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"candidate.d.ts","sourceRoot":"","sources":["../src/candidate.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,wBAAwB,CAAC;AACnD,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAEnE;;;;;;;GAOG;AACH,MAAM,MAAM,aAAa,GAAG,IAAI,GAAG,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;AAE7D,MAAM,MAAM,cAAc,GACpB,eAAe,CAAC,OAAO,CAAC,GACxB,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GAAG;IACnC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,IAAI,CAAC,EAAE,aAAa,CAAC;CACjC,CAAC,CAAC;AAEP,MAAM,WAAW,uBAAwB,SAAQ,IAAI,CAAC,cAAc,EAAE,OAAO,GAAG,aAAa,CAAC;IAC1F,QAAQ,CAAC,KAAK,EAAE,cAAc,CAAC;IAC/B,QAAQ,CAAC,WAAW,CAAC,EAAE,WAAW,CAAC,MAAM,EAAE,uBAAuB,CAAC,CAAC;CACvE;AAED,MAAM,WAAW,wBAAyB,SAAQ,IAAI,CAAC,eAAe,EAAE,OAAO,GAAG,MAAM,GAAG,aAAa,CAAC;IACrG,QAAQ,CAAC,KAAK,EAAE,cAAc,CAAC;IAC/B,QAAQ,CAAC,IAAI,EAAE,aAAa,CAAC;IAC7B,QAAQ,CAAC,WAAW,CAAC,EAAE,WAAW,CAAC,MAAM,EAAE,uBAAuB,CAAC,CAAC;CACvE;AAED,MAAM,MAAM,YAAY,GAAG,SAAS,wBAAwB,EAAE,CAAC"}

package/dist/candidate.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=candidate.js.map

package/dist/candidate.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"candidate.js","sourceRoot":"","sources":["../src/candidate.ts"],"names":[],"mappings":""}

package/dist/datatype.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"datatype.d.ts","sourceRoot":"","sources":["../src/datatype.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAE9D,wBAAgB,wBAAwB,CAAC,QAAQ,EAAE,cAAc,GAAG,MAAM,CAYzE"}
+{"version":3,"file":"datatype.d.ts","sourceRoot":"","sources":["../src/datatype.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAE9D,wBAAgB,wBAAwB,CAAC,QAAQ,EAAE,cAAc,GAAG,MAAM,CASzE"}

package/dist/datatype.js

@@ -3,12 +3,12 @@ export function formatDatatypeAnnotation(datatype) {
     const generics = datatype.genericArgs.length > 0
         ? `<${datatype.genericArgs.join(', ')}>`
         : '';
-    const radixBase = datatype.radixBase != null
-        ? `[${datatype.radixBase}]`
+    const clarifiers = datatype.clarifiers.length > 0
+        ? `[${datatype.clarifiers.map(formatClarifierValue).join(', ')}]`
         : '';
-    const separators = datatype.separators.length > 0
-        ? datatype.separators.map((separator) => `[${separator}]`).join('')
-        : '';
-    return `${name}${generics}${radixBase}${separators}`;
+    return `${name}${generics}${clarifiers}`;
+}
+function formatClarifierValue(value) {
+    return typeof value === 'string' ? JSON.stringify(value) : String(value);
 }
 //# sourceMappingURL=datatype.js.map

package/dist/datatype.js.map

@@ -1 +1 @@
-{"version":3,"file":"datatype.js","sourceRoot":"","sources":["../src/datatype.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,wBAAwB,CAAC,QAAwB;IAC7D,MAAM,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC;IAC3B,MAAM,QAAQ,GAAG,QAAQ,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC;QAC5C,CAAC,CAAC,IAAI,QAAQ,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG;QACxC,CAAC,CAAC,EAAE,CAAC;IACT,MAAM,SAAS,GAAG,QAAQ,CAAC,SAAS,IAAI,IAAI;QACxC,CAAC,CAAC,IAAI,QAAQ,CAAC,SAAS,GAAG;QAC3B,CAAC,CAAC,EAAE,CAAC;IACT,MAAM,UAAU,GAAG,QAAQ,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC;QAC7C,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,IAAI,SAAS,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC;QACnE,CAAC,CAAC,EAAE,CAAC;IACT,OAAO,GAAG,IAAI,GAAG,QAAQ,GAAG,SAAS,GAAG,UAAU,EAAE,CAAC;AACzD,CAAC"}
+{"version":3,"file":"datatype.js","sourceRoot":"","sources":["../src/datatype.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,wBAAwB,CAAC,QAAwB;IAC7D,MAAM,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC;IAC3B,MAAM,QAAQ,GAAG,QAAQ,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC;QAC5C,CAAC,CAAC,IAAI,QAAQ,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG;QACxC,CAAC,CAAC,EAAE,CAAC;IACT,MAAM,UAAU,GAAG,QAAQ,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC;QAC7C,CAAC,CAAC,IAAI,QAAQ,CAAC,UAAU,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG;QACjE,CAAC,CAAC,EAAE,CAAC;IACT,OAAO,GAAG,IAAI,GAAG,QAAQ,GAAG,UAAU,EAAE,CAAC;AAC7C,CAAC;AAED,SAAS,oBAAoB,CAAC,KAAsB;IAChD,OAAO,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;AAC7E,CAAC"}

package/dist/events.d.ts

@@ -15,6 +15,10 @@ export interface AssignmentEvent {
     readonly normalizedPath?: string;
     /** Local key name (e.g., "host") */
     readonly key: string;
+    /** Source document plane; independent of the textual key prefix. */
+    readonly sourcePlane?: 'header' | 'body';
+    /** Optional structural occurrence identity from the source binding. */
+    readonly structuralId?: string | null;
     /** Original AST value node - NOT evaluated or transformed */
     readonly value: Value;
     /** Source location of the binding */
@@ -28,9 +32,12 @@ export interface AssignmentEvent {
  * Attribute entry
  */
 export interface AttributeEntry {
+    readonly structuralId?: string | null;
     readonly value: Value;
     readonly datatype?: string;
     readonly annotations?: ReadonlyMap<string, AttributeEntry>;
+    /** Native UTF-16 source range retained for explicit portable conversion. */
+    readonly span?: Span;
 }
 /**
  * Event emission result

package/dist/events.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"events.d.ts","sourceRoot":"","sources":["../src/events.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,wBAAwB,CAAC;AACnD,OAAO,KAAK,EAAE,KAAK,EAAE,cAAc,EAAa,MAAM,yBAAyB,CAAC;AAChF,OAAO,EACH,KAAK,aAAa,EAElB,KAAK,oBAAoB,EACzB,mBAAmB,EAEtB,MAAM,YAAY,CAAC;AAGpB;;;;;;GAMG;AACH,MAAM,WAAW,eAAe;IAC5B,6DAA6D;IAC7D,QAAQ,CAAC,IAAI,EAAE,aAAa,CAAC;IAC7B,sFAAsF;IACtF,QAAQ,CAAC,cAAc,CAAC,EAAE,MAAM,CAAC;IACjC,oCAAoC;IACpC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,6DAA6D;IAC7D,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC;IACtB,qCAAqC;IACrC,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC;IACpB,+CAA+C;IAC/C,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAC3B,4BAA4B;IAC5B,QAAQ,CAAC,WAAW,CAAC,EAAE,WAAW,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;CAC9D;AAED;;GAEG;AACH,MAAM,WAAW,cAAc;IAC3B,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC;IACtB,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,WAAW,CAAC,EAAE,WAAW,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;CAC9D;AAED;;;;;GAKG;AACH,MAAM,WAAW,mBAAmB;IAChC,QAAQ,CAAC,MAAM,EAAE,SAAS,eAAe,EAAE,CAAC;IAC5C,QAAQ,CAAC,MAAM,EAAE,SAAS,CAAC,kBAAkB,GAAG,mBAAmB,CAAC,EAAE,CAAC;CAC1E;AAED;;GAEG;AACH,qBAAa,kBAAmB,SAAQ,KAAK;IACzC,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC;IACpB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAEtB,YAAY,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,GAAE,MAAsB,EAKpE;CACJ;AAED;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACjC;;;OAGG;IACH,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC;CAC/B;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,UAAU,CACtB,QAAQ,EAAE,oBAAoB,EAC9B,OAAO,GAAE,oBAAyB,GACnC,mBAAmB,CAyBrB;AAyDD,OAAO,EAAE,cAAc,EAAE,CAAC"}
+{"version":3,"file":"events.d.ts","sourceRoot":"","sources":["../src/events.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,wBAAwB,CAAC;AACnD,OAAO,KAAK,EAAE,KAAK,EAAE,cAAc,EAAa,MAAM,yBAAyB,CAAC;AAChF,OAAO,EACH,KAAK,aAAa,EAElB,KAAK,oBAAoB,EACzB,mBAAmB,EAEtB,MAAM,YAAY,CAAC;AAGpB;;;;;;GAMG;AACH,MAAM,WAAW,eAAe;IAC5B,6DAA6D;IAC7D,QAAQ,CAAC,IAAI,EAAE,aAAa,CAAC;IAC7B,sFAAsF;IACtF,QAAQ,CAAC,cAAc,CAAC,EAAE,MAAM,CAAC;IACjC,oCAAoC;IACpC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,oEAAoE;IACpE,QAAQ,CAAC,WAAW,CAAC,EAAE,QAAQ,GAAG,MAAM,CAAC;IACzC,uEAAuE;IACvE,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACtC,6DAA6D;IAC7D,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC;IACtB,qCAAqC;IACrC,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC;IACpB,+CAA+C;IAC/C,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAC3B,4BAA4B;IAC5B,QAAQ,CAAC,WAAW,CAAC,EAAE,WAAW,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;CAC9D;AAED;;GAEG;AACH,MAAM,WAAW,cAAc;IAC3B,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACtC,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC;IACtB,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,WAAW,CAAC,EAAE,WAAW,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;IAC3D,4EAA4E;IAC5E,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC;CACxB;AAED;;;;;GAKG;AACH,MAAM,WAAW,mBAAmB;IAChC,QAAQ,CAAC,MAAM,EAAE,SAAS,eAAe,EAAE,CAAC;IAC5C,QAAQ,CAAC,MAAM,EAAE,SAAS,CAAC,kBAAkB,GAAG,mBAAmB,CAAC,EAAE,CAAC;CAC1E;AAED;;GAEG;AACH,qBAAa,kBAAmB,SAAQ,KAAK;IACzC,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC;IACpB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAEtB,YAAY,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,GAAE,MAAsB,EAKpE;CACJ;AAED;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACjC;;;OAGG;IACH,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC;CAC/B;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,UAAU,CACtB,QAAQ,EAAE,oBAAoB,EAC9B,OAAO,GAAE,oBAAyB,GACnC,mBAAmB,CAyBrB;AA6DD,OAAO,EAAE,cAAc,EAAE,CAAC"}

package/dist/events.js

@@ -58,6 +58,8 @@ function createEvent(cb) {
         path: cb.path,
         normalizedPath: formatNormalizedPath(cb.path),
         key: binding.key,
+        sourcePlane: cb.sourcePlane,
+        ...(binding.structuralId !== null ? { structuralId: binding.structuralId } : {}),
         value: binding.value,
         span: cb.span,
     };
@@ -80,7 +82,9 @@ function buildAnnotations(attributes) {
     for (const attr of attributes) {
         for (const [key, entry] of attr.entries) {
             const attrEntry = {
+                ...(entry.structuralId !== null ? { structuralId: entry.structuralId } : {}),
                 value: entry.value,
+                ...(entry.span !== undefined ? { span: entry.span } : {}),
             };
             if (entry.datatype) {
                 attrEntry.datatype = formatDatatypeAnnotation(entry.datatype);

package/dist/events.js.map

@@ -1 +1 @@
-{"version":3,"file":"events.js","sourceRoot":"","sources":["../src/events.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"events.js","sourceRoot":"","sources":["../src/events.ts"],"names":[],"mappings":"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"}

package/dist/index.d.ts

@@ -5,7 +5,10 @@
  */
 export * from './paths.js';
 export * from './events.js';
+export * from './candidate.js';
 export * from './references.js';
 export * from './modes.js';
 export * from './resolve.js';
+export * from './portable.js';
+export * from './telex.js';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,cAAc,YAAY,CAAC;AAC3B,cAAc,aAAa,CAAC;AAC5B,cAAc,iBAAiB,CAAC;AAChC,cAAc,YAAY,CAAC;AAC3B,cAAc,cAAc,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,cAAc,YAAY,CAAC;AAC3B,cAAc,aAAa,CAAC;AAC5B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,iBAAiB,CAAC;AAChC,cAAc,YAAY,CAAC;AAC3B,cAAc,cAAc,CAAC;AAC7B,cAAc,eAAe,CAAC;AAC9B,cAAc,YAAY,CAAC"}

package/dist/index.js

@@ -5,7 +5,10 @@
  */
 export * from './paths.js';
 export * from './events.js';
+export * from './candidate.js';
 export * from './references.js';
 export * from './modes.js';
 export * from './resolve.js';
+export * from './portable.js';
+export * from './telex.js';
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,cAAc,YAAY,CAAC;AAC3B,cAAc,aAAa,CAAC;AAC5B,cAAc,iBAAiB,CAAC;AAChC,cAAc,YAAY,CAAC;AAC3B,cAAc,cAAc,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,cAAc,YAAY,CAAC;AAC3B,cAAc,aAAa,CAAC;AAC5B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,iBAAiB,CAAC;AAChC,cAAc,YAAY,CAAC;AAC3B,cAAc,cAAc,CAAC;AAC7B,cAAc,eAAe,CAAC;AAC9B,cAAc,YAAY,CAAC"}

package/dist/modes.d.ts

@@ -60,12 +60,6 @@ export declare class HeaderConflictError extends ModeEnforcementError {
 export declare class DatatypeLiteralMismatchError extends ModeEnforcementError {
     constructor(span: Span, path: string, datatype: string, actualKind: string, expectedKinds: readonly string[]);
 }
-export declare class InvalidCustomDatatypeBracketShapeError extends ModeEnforcementError {
-    constructor(span: Span, path: string, datatype: string, actualKind: string);
-}
-export declare class IncompatibleCustomDatatypeAdornmentsError extends ModeEnforcementError {
-    constructor(span: Span, path: string, datatype: string, actualKind: string);
-}
 /**
  * Error: Custom datatype is not permitted by typed-mode datatype policy
  */

package/dist/modes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"modes.d.ts","sourceRoot":"","sources":["../src/modes.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"modes.d.ts","sourceRoot":"","sources":["../src/modes.ts"],"names":[],"mappings":"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"}

package/dist/modes.js

@@ -12,6 +12,7 @@
  * - No reference resolution
  * - Fail-closed by default
  */
+import { formatDatatypeAnnotation } from './datatype.js';
 import { formatPath } from './paths.js';
 import { formatReferenceTargetPath } from './reference-target.js';
 /**
@@ -71,18 +72,6 @@ export class DatatypeLiteralMismatchError extends ModeEnforcementError {
         this.name = 'DatatypeLiteralMismatchError';
     }
 }
-export class InvalidCustomDatatypeBracketShapeError extends ModeEnforcementError {
-    constructor(span, path, datatype, actualKind) {
-        super(`Datatype/literal mismatch at '${path}': datatype ':${datatype}' has bracket specs incompatible with both SeparatorLiteral and RadixLiteral, got ${actualKind}`, span, 'DATATYPE_LITERAL_MISMATCH', path);
-        this.name = 'InvalidCustomDatatypeBracketShapeError';
-    }
-}
-export class IncompatibleCustomDatatypeAdornmentsError extends ModeEnforcementError {
-    constructor(span, path, datatype, actualKind) {
-        super(`Datatype/literal mismatch at '${path}': datatype ':${datatype}' combines incompatible generic and bracket constraints, got ${actualKind}`, span, 'DATATYPE_LITERAL_MISMATCH', path);
-        this.name = 'IncompatibleCustomDatatypeAdornmentsError';
-    }
-}
 /**
  * Error: Custom datatype is not permitted by typed-mode datatype policy
  */
@@ -187,18 +176,9 @@ export function enforceMode(events, header, options = {}) {
             errors.push(new DatatypeLiteralMismatchError(event.span, formatPath(event.path), event.datatype, actualKind, expectedKinds));
         }
         if (!expectedKinds) {
-            const customShape = classifyCustomDatatypeShape(event.datatype);
-            if (customShape === 'invalid_both' && (actualKind === 'SeparatorLiteral' || actualKind === 'RadixLiteral')) {
-                errors.push(new InvalidCustomDatatypeBracketShapeError(event.span, formatPath(event.path), event.datatype, actualKind));
-            }
-            else {
-                const customExpectedKinds = expectedKindsForCustomDatatype(event.datatype, customShape);
-                if (customExpectedKinds && customExpectedKinds.length === 0) {
-                    errors.push(new IncompatibleCustomDatatypeAdornmentsError(event.span, formatPath(event.path), event.datatype, actualKind));
-                }
-                else if (customExpectedKinds && !customExpectedKinds.includes(actualKind)) {
-                    errors.push(new DatatypeLiteralMismatchError(event.span, formatPath(event.path), event.datatype, actualKind, customExpectedKinds));
-                }
+            const customExpectedKinds = expectedKindsForCustomDatatype(event.datatype);
+            if (customExpectedKinds && !customExpectedKinds.includes(actualKind)) {
+                errors.push(new DatatypeLiteralMismatchError(event.span, formatPath(event.path), event.datatype, actualKind, customExpectedKinds));
             }
         }
         errors.push(...validateAnnotationEntries(event.annotations, formatPath(event.path), event.span, events, pathToIndex, mode, datatypePolicy));
@@ -215,16 +195,17 @@ function defaultDatatypePolicyForMode(mode) {
     return mode === 'strict' ? 'reserved_only' : 'allow_custom';
 }
 function shouldSkipHeaderEvent(event, header) {
+    if (event.sourcePlane !== undefined) {
+        return event.sourcePlane === 'header';
+    }
     if (!header) {
         return false;
     }
-    return isHeaderEvent(event);
-}
-function isHeaderEvent(event) {
-    return event.path.segments.length >= 2
-        && event.path.segments[0]?.type === 'root'
-        && event.path.segments[1]?.type === 'member'
-        && event.path.segments[1].key.startsWith('aeon:');
+    const segment = event.path.segments[1];
+    return event.path.segments[0]?.type === 'root'
+        && segment?.type === 'member'
+        && segment.key.startsWith('aeon:')
+        && header.fields.has(segment.key.slice('aeon:'.length));
 }
 // Legacy export for backward compatibility
 export function validateMode(_mode) {
@@ -259,7 +240,7 @@ function resolvedValueKind(value) {
         return value.trimticks ? 'TrimtickStringLiteral' : 'StringLiteral';
     }
     if (value.type === 'DateTimeLiteral') {
-        return value.raw.includes('&') ? 'ZRUTDateTimeLiteral' : 'DateTimeLiteral';
+        return value.raw.includes('&') ? 'WTCDateTimeLiteral' : 'DateTimeLiteral';
     }
     if (value.type === 'SeparatorLiteral') {
         return 'SeparatorLiteral';
@@ -297,18 +278,9 @@ function validateAnonymousTypedValues(value, ownerPath, span, events, pathToInde
                     errors.push(new DatatypeLiteralMismatchError(value.span, ownerPath, datatype, actualKind, expectedKinds));
                 }
                 else if (!expectedKinds) {
-                    const customShape = classifyCustomDatatypeShape(datatype);
-                    if (customShape === 'invalid_both' && (actualKind === 'SeparatorLiteral' || actualKind === 'RadixLiteral')) {
-                        errors.push(new InvalidCustomDatatypeBracketShapeError(value.span, ownerPath, datatype, actualKind));
-                    }
-                    else {
-                        const customExpectedKinds = expectedKindsForCustomDatatype(datatype, customShape);
-                        if (customExpectedKinds && customExpectedKinds.length === 0) {
-                            errors.push(new IncompatibleCustomDatatypeAdornmentsError(value.span, ownerPath, datatype, actualKind));
-                        }
-                        else if (customExpectedKinds && !customExpectedKinds.includes(actualKind)) {
-                            errors.push(new DatatypeLiteralMismatchError(value.span, ownerPath, datatype, actualKind, customExpectedKinds));
-                        }
+                    const customExpectedKinds = expectedKindsForCustomDatatype(datatype);
+                    if (customExpectedKinds && !customExpectedKinds.includes(actualKind)) {
+                        errors.push(new DatatypeLiteralMismatchError(value.span, ownerPath, datatype, actualKind, customExpectedKinds));
                     }
                 }
             }
@@ -422,18 +394,9 @@ function validateAnnotationEntries(annotations, ownerPath, span, events, pathToI
                     errors.push(new DatatypeLiteralMismatchError(span, attrPath, entry.datatype, actualKind, expectedKinds));
                 }
                 if (!expectedKinds) {
-                    const customShape = classifyCustomDatatypeShape(entry.datatype);
-                    if (customShape === 'invalid_both' && (actualKind === 'SeparatorLiteral' || actualKind === 'RadixLiteral')) {
-                        errors.push(new InvalidCustomDatatypeBracketShapeError(span, attrPath, entry.datatype, actualKind));
-                    }
-                    else {
-                        const customExpectedKinds = expectedKindsForCustomDatatype(entry.datatype, customShape);
-                        if (customExpectedKinds && customExpectedKinds.length === 0) {
-                            errors.push(new IncompatibleCustomDatatypeAdornmentsError(span, attrPath, entry.datatype, actualKind));
-                        }
-                        else if (customExpectedKinds && !customExpectedKinds.includes(actualKind)) {
-                            errors.push(new DatatypeLiteralMismatchError(span, attrPath, entry.datatype, actualKind, customExpectedKinds));
-                        }
+                    const customExpectedKinds = expectedKindsForCustomDatatype(entry.datatype);
+                    if (customExpectedKinds && !customExpectedKinds.includes(actualKind)) {
+                        errors.push(new DatatypeLiteralMismatchError(span, attrPath, entry.datatype, actualKind, customExpectedKinds));
                     }
                 }
             }
@@ -475,9 +438,10 @@ function validateNodeHeadDatatypes(value, ownerPath, span, mode) {
 function formatTypeAnnotation(datatype) {
     const name = datatype.name;
     const generics = datatype.genericArgs.length > 0 ? `<${datatype.genericArgs.join(', ')}>` : '';
-    const radixBase = datatype.radixBase != null ? `[${datatype.radixBase}]` : '';
-    const separators = datatype.separators.map((separator) => `[${separator}]`).join('');
-    return `${name}${generics}${radixBase}${separators}`;
+    const clarifiers = datatype.clarifiers.length > 0
+        ? `[${datatype.clarifiers.map((value) => typeof value === 'string' ? JSON.stringify(value) : String(value)).join(', ')}]`
+        : '';
+    return `${name}${generics}${clarifiers}`;
 }
 function isAttrSegment(segment) {
     return typeof segment === 'object' && segment !== null && segment.type === 'attr';
@@ -589,7 +553,11 @@ function buildAnnotationMap(attributes) {
     const result = new Map();
     for (const attribute of attributes) {
         for (const [key, entry] of attribute.entries) {
-            const mapped = { value: entry.value };
+            const mapped = {
+                ...(entry.structuralId !== null ? { structuralId: entry.structuralId } : {}),
+                value: entry.value,
+                ...(entry.datatype ? { datatype: formatDatatypeAnnotation(entry.datatype) } : {}),
+            };
             const nested = buildAnnotationMap(entry.attributes);
             if (nested) {
                 mapped.annotations = nested;
@@ -629,13 +597,13 @@ function expectedKindsForReservedDatatype(datatype) {
         return ['TimeLiteral'];
     if (base === 'datetime')
         return ['DateTimeLiteral'];
-    if (base === 'zrut')
-        return ['ZRUTDateTimeLiteral'];
+    if (base === 'wtc')
+        return ['WTCDateTimeLiteral'];
     if (SEPARATOR_TYPES.has(base))
         return ['SeparatorLiteral'];
     if (base === 'sansa')
         return ['SansaAddressLiteral'];
-    if (base === 'tuple')
+    if (base === 'tuple' || base === 'triple')
         return ['TupleLiteral'];
     if (base === 'list')
         return ['ListNode'];
@@ -681,83 +649,11 @@ export function datatypeHasGenericArgs(datatype) {
     }
     return false;
 }
-function expectedKindsForCustomDatatype(datatype, customShape) {
-    let expectedKinds = null;
+function expectedKindsForCustomDatatype(datatype) {
     if (datatypeHasGenericArgs(datatype)) {
-        expectedKinds = ['ListNode', 'TupleLiteral'];
-    }
-    const bracketKinds = expectedKindsForCustomDatatypeShape(customShape);
-    if (bracketKinds === null) {
-        return expectedKinds;
-    }
-    if (expectedKinds === null) {
-        return bracketKinds;
+        return ['ListNode', 'TupleLiteral'];
     }
-    const combined = expectedKinds.filter((kind) => bracketKinds.includes(kind));
-    return combined;
-}
-function expectedKindsForCustomDatatypeShape(customShape) {
-    if (customShape === 'none' || customShape === 'invalid_both')
-        return null;
-    if (customShape === 'both')
-        return ['SeparatorLiteral', 'RadixLiteral'];
-    if (customShape === 'separator')
-        return ['SeparatorLiteral'];
-    return ['RadixLiteral'];
-}
-function classifyCustomDatatypeShape(datatype) {
-    const specs = bracketSpecs(datatype);
-    if (specs.length === 0)
-        return 'none';
-    const separatorOk = specs.every(isValidSeparatorSpec);
-    const radixOk = specs.length === 1 && isValidRadixBaseSpec(specs[0]);
-    if (separatorOk && radixOk)
-        return 'both';
-    if (separatorOk)
-        return 'separator';
-    if (radixOk)
-        return 'radix';
-    return 'invalid_both';
-}
-function bracketSpecs(datatype) {
-    const specs = [];
-    let genericDepth = 0;
-    let bracketStart = -1;
-    for (let index = 0; index < datatype.length; index += 1) {
-        const char = datatype[index];
-        if (char === '<') {
-            genericDepth += 1;
-            continue;
-        }
-        if (char === '>') {
-            genericDepth = Math.max(0, genericDepth - 1);
-            continue;
-        }
-        if (genericDepth > 0) {
-            continue;
-        }
-        if (char === '[') {
-            bracketStart = index + 1;
-            continue;
-        }
-        if (char === ']' && bracketStart >= 0) {
-            specs.push(datatype.slice(bracketStart, index));
-            bracketStart = -1;
-        }
-    }
-    if (datatypeBase(datatype) === 'radix' && specs.length > 0) {
-        return specs.slice(1);
-    }
-    return specs;
-}
-function isValidSeparatorSpec(spec) {
-    return /^[A-Za-z0-9!#$%&*+\-.:;=?@^_|~<>]$/.test(spec);
-}
-function isValidRadixBaseSpec(spec) {
-    if (!/^[1-9]\d*$/.test(spec))
-        return false;
-    const value = Number(spec);
-    return Number.isInteger(value) && value >= 2 && value <= 64;
+    return null;
 }
 const NUMERIC_TYPES = new Set([
     'number',
@@ -778,6 +674,7 @@ const NUMERIC_TYPES = new Set([
 ]);
 const RADIX_TYPES = new Set([
     'radix',
+    'decimal',
     'radix2',
     'radix6',
     'radix8',