@ontrails/core 1.0.0-beta.13 → 1.0.0-beta.15

package/dist/topo.js

@@ -2,30 +2,42 @@
  * Application entry point — scans module exports to build a topology graph.
  */
 import { ValidationError } from './errors.js';
-import { isProvision } from './provision.js';
+import { getLateBoundSignalRef, parseLateBoundSignalMarker, } from './internal/signal-ref.js';
+import { isResource } from './resource.js';
 const isRegistrable = (value) => {
     if (typeof value !== 'object' || value === null) {
         return false;
     }
     const { kind } = value;
-    return kind === 'trail' || kind === 'signal';
+    return kind === 'contour' || kind === 'trail' || kind === 'signal';
 };
 // ---------------------------------------------------------------------------
 // Topo implementation
 // ---------------------------------------------------------------------------
-const createTopo = (name, trails, signals, provisions) => ({
+const createTopo = (identity, contours, trails, signals, resources) => ({
+    contourCount: contours.size,
+    contourIds() {
+        return [...contours.keys()];
+    },
+    contours,
     count: trails.size,
     get(id) {
         return trails.get(id);
     },
-    getProvision(id) {
-        return provisions.get(id);
+    getContour(contourName) {
+        return contours.get(contourName);
+    },
+    getResource(id) {
+        return resources.get(id);
     },
     has(id) {
         return trails.has(id);
     },
-    hasProvision(id) {
-        return provisions.has(id);
+    hasContour(contourName) {
+        return contours.has(contourName);
+    },
+    hasResource(id) {
+        return resources.has(id);
     },
     ids() {
         return [...trails.keys()];
@@ -33,48 +45,153 @@ const createTopo = (name, trails, signals, provisions) => ({
     list() {
         return [...trails.values()];
     },
-    listProvisions() {
-        return [...provisions.values()];
+    listContours() {
+        return [...contours.values()];
+    },
+    listResources() {
+        return [...resources.values()];
     },
     listSignals() {
         return [...signals.values()];
     },
-    name,
-    provisionCount: provisions.size,
-    provisionIds() {
-        return [...provisions.keys()];
+    name: identity.name,
+    ...(identity.version !== undefined && { version: identity.version }),
+    ...(identity.description !== undefined && {
+        description: identity.description,
+    }),
+    resourceCount: resources.size,
+    resourceIds() {
+        return [...resources.keys()];
     },
-    provisions,
+    resources,
     signals,
     trails,
 });
 // ---------------------------------------------------------------------------
 // topo()
 // ---------------------------------------------------------------------------
+const registerUnique = (collection, id, value, duplicateMessage) => {
+    const existing = collection.get(id);
+    if (existing === value) {
+        return;
+    }
+    if (existing !== undefined) {
+        throw new ValidationError(duplicateMessage);
+    }
+    collection.set(id, value);
+};
+const registerContour = (contour, contours) => {
+    registerUnique(contours, contour.name, contour, `Duplicate contour name: "${contour.name}"`);
+};
+const registerResourceValue = (resource, resources) => {
+    registerUnique(resources, resource.id, resource, `Duplicate resource ID: "${resource.id}"`);
+};
+const registerSignal = (signal, signals) => {
+    registerUnique(signals, signal.id, signal, `Duplicate signal ID: "${signal.id}"`);
+};
+const registerResourceSignals = (resource, signals) => {
+    for (const derived of resource.signals ?? []) {
+        registerSignal(derived, signals);
+    }
+};
+const registerTrail = (trail, trails) => {
+    registerUnique(trails, trail.id, trail, `Duplicate trail ID: "${trail.id}"`);
+};
+const registerLateBoundSignalId = (byToken, signal) => {
+    const ref = getLateBoundSignalRef(signal);
+    if (!ref) {
+        return;
+    }
+    const ids = byToken.get(ref.token) ?? new Set();
+    ids.add(signal.id);
+    byToken.set(ref.token, ids);
+};
+const collectLateBoundSignalIdsByToken = (resources) => {
+    const byToken = new Map();
+    for (const resource of resources.values()) {
+        for (const signal of resource.signals ?? []) {
+            registerLateBoundSignalId(byToken, signal);
+        }
+    }
+    return new Map([...byToken.entries()].map(([token, ids]) => [token, [...ids]]));
+};
+const resolveLateBoundSignalId = (trailId, signalId, lateBoundSignalIdsByToken) => {
+    const marker = parseLateBoundSignalMarker(signalId);
+    if (!marker) {
+        return signalId;
+    }
+    const matches = lateBoundSignalIdsByToken.get(marker.token) ?? [];
+    if (matches.length === 1) {
+        return matches[0] ?? signalId;
+    }
+    if (matches.length === 0) {
+        // Intentional throw: split-topo composition (where a trail and the
+        // store that backs its signals live in different topos) is not yet
+        // supported. Failing loudly here surfaces the case at assembly time
+        // instead of silently producing a trail with an unresolved store
+        // reference that would misbehave at runtime.
+        throw new ValidationError(`Trail "${trailId}" references store-derived signal "${marker.displayId}", but no resource bound in this topo exposes it. ` +
+            'This usually means the store that backs this signal is not bound in this topo. ' +
+            `Bind the store via resource() in the same topo() call as "${trailId}", or compose this topo with the topo that binds the store. ` +
+            'Splitting a trail and its backing store across independent topos is not yet supported.');
+    }
+    throw new ValidationError(`Trail "${trailId}" references late-bound signal "${marker.displayId}" but it resolves to multiple bound resource signals: ${matches.join(', ')}. Use canonical scoped ids when the same store definition is bound more than once.`);
+};
+const resolveTrailSignalIds = (trailId, signalIds, lateBoundSignalIdsByToken) => {
+    let changed = false;
+    const ids = Object.freeze(signalIds.map((signalId) => {
+        const resolved = resolveLateBoundSignalId(trailId, signalId, lateBoundSignalIdsByToken);
+        changed ||= resolved !== signalId;
+        return resolved;
+    }));
+    return { changed, ids };
+};
+const finalizeTrailSignals = (trails, resources) => {
+    const lateBoundSignalIdsByToken = collectLateBoundSignalIdsByToken(resources);
+    const finalized = new Map();
+    for (const trail of trails.values()) {
+        const resolvedFires = resolveTrailSignalIds(trail.id, trail.fires ?? [], lateBoundSignalIdsByToken);
+        const resolvedOn = resolveTrailSignalIds(trail.id, trail.on ?? [], lateBoundSignalIdsByToken);
+        if (!resolvedFires.changed && !resolvedOn.changed) {
+            finalized.set(trail.id, trail);
+            continue;
+        }
+        finalized.set(trail.id, Object.freeze({
+            ...trail,
+            fires: resolvedFires.ids,
+            on: resolvedOn.ids,
+        }));
+    }
+    return finalized;
+};
 /** Register a single registrable value into the appropriate map. */
-const register = (value, trails, signals, provisions) => {
-    const { id } = value;
-    const registrars = {
-        provision: () => {
-            if (provisions.has(id)) {
-                throw new ValidationError(`Duplicate provision ID: "${id}"`);
-            }
-            provisions.set(id, value);
-        },
-        signal: () => {
-            if (signals.has(id)) {
-                throw new ValidationError(`Duplicate signal ID: "${id}"`);
-            }
-            signals.set(id, value);
-        },
-        trail: () => {
-            if (trails.has(id)) {
-                throw new ValidationError(`Duplicate trail ID: "${id}"`);
-            }
-            trails.set(id, value);
-        },
-    };
-    registrars[value.kind]?.();
+const register = (value, contours, trails, signals, resources) => {
+    switch (value.kind) {
+        case 'contour': {
+            registerContour(value, contours);
+            break;
+        }
+        case 'resource': {
+            registerResourceValue(value, resources);
+            break;
+        }
+        case 'signal': {
+            registerSignal(value, signals);
+            break;
+        }
+        case 'trail': {
+            registerTrail(value, trails);
+            break;
+        }
+        default: {
+            throw new ValidationError('Unsupported registrable value in topo()');
+        }
+    }
+};
+const registerTrailContours = (trail, contours, trails, signals, resources) => {
+    for (const contour of trail.contours ?? []) {
+        register(contour, contours, trails, signals, resources);
+    }
 };
 const markUniqueObject = (value, seenValues) => {
     if (typeof value !== 'object' || value === null) {
@@ -86,27 +203,39 @@ const markUniqueObject = (value, seenValues) => {
     seenValues.add(value);
     return true;
 };
-const registerModuleValue = (value, trails, signals, provisions) => {
-    if (isProvision(value) || isRegistrable(value)) {
-        register(value, trails, signals, provisions);
+const registerModuleValue = (value, contours, trails, signals, resources) => {
+    if (isResource(value) || isRegistrable(value)) {
+        register(value, contours, trails, signals, resources);
+    }
+    if (isResource(value)) {
+        registerResourceSignals(value, signals);
+    }
+    if (typeof value === 'object' &&
+        value !== null &&
+        value.kind === 'trail') {
+        registerTrailContours(value, contours, trails, signals, resources);
     }
 };
-const registerModuleValues = (mod, trails, signals, provisions) => {
+const registerModuleValues = (mod, contours, trails, signals, resources) => {
     const seenValues = new WeakSet();
     for (const value of Object.values(mod)) {
         if (!markUniqueObject(value, seenValues)) {
             continue;
         }
-        registerModuleValue(value, trails, signals, provisions);
+        registerModuleValue(value, contours, trails, signals, resources);
     }
 };
-export const topo = (name, ...modules) => {
+export const topo = (nameOrIdentity, ...modules) => {
+    const identity = typeof nameOrIdentity === 'string'
+        ? { name: nameOrIdentity }
+        : nameOrIdentity;
+    const contours = new Map();
     const trails = new Map();
     const signals = new Map();
-    const provisions = new Map();
+    const resources = new Map();
     for (const mod of modules) {
-        registerModuleValues(mod, trails, signals, provisions);
+        registerModuleValues(mod, contours, trails, signals, resources);
     }
-    return createTopo(name, trails, signals, provisions);
+    return createTopo(identity, contours, finalizeTrailSignals(trails, resources), signals, resources);
 };
 //# sourceMappingURL=topo.js.map

package/dist/topo.js.map

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

package/dist/trail.d.ts

@@ -1,8 +1,11 @@
 import type { z } from 'zod';
+import type { AnyContour } from './contour.js';
 import type { FieldOverride } from './derive.js';
 import type { Result } from './result.js';
-import type { AnyProvision } from './provision.js';
-import type { Implementation, PermitRequirement, TrailContext } from './types.js';
+import type { AnyResource } from './resource.js';
+import type { AnySignal } from './signal.js';
+import type { TrailsError } from './errors.js';
+import type { Detour, Implementation, PermitRequirement, TrailContext } from './types.js';
 /**
  * A named example for documentation and testing.
  *
@@ -17,53 +20,115 @@ export interface TrailExample<I, O> {
     readonly description?: string | undefined;
     /** The input value — fields with schema defaults may be omitted */
     readonly input: Partial<I>;
-    /** Expected output for success-path examples */
+    /** Expected output for success-path examples (deep equality) */
     readonly expected?: O | undefined;
+    /** Partial output assertion — declared fields must match, others ignored */
+    readonly expectedMatch?: Partial<O> | undefined;
     /** Error class name for error-path examples */
     readonly error?: string | undefined;
 }
+/**
+ * The input type received by a trail's blaze function.
+ *
+ * When a trail declares `crossInput`, the runtime merges those fields into
+ * the input object before calling blaze. This type makes the compiler aware
+ * of the merged shape so developers can access crossInput fields without a
+ * cast. Falls back to plain `I` when `CI` is `never` (the default).
+ */
+export type BlazeInput<I, CI> = [CI] extends [never] ? I : I & CI;
 /** Everything needed to define a trail (minus the id) */
-export interface TrailSpec<I, O> {
+export interface TrailSpec<I, O, CI = never> {
     /** Zod schema for validating input */
     readonly input: z.ZodType<I>;
     /** Zod schema for validating output (optional — some trails are fire-and-forget) */
     readonly output?: z.ZodType<O> | undefined;
     /** The pure function that does the work (sync or async authoring) */
-    readonly blaze: Implementation<I, O>;
+    readonly blaze: Implementation<BlazeInput<I, CI>, O>;
     /** Human-readable description */
     readonly description?: string | undefined;
+    /** Declared operational shape for governance, derivation, and agent guidance. */
+    readonly pattern?: string | undefined;
     /** Named examples for docs and testing */
     readonly examples?: readonly TrailExample<I, O>[] | undefined;
     /** What this trail does to the world: read, write (default), or destroy */
     readonly intent?: 'read' | 'write' | 'destroy' | undefined;
     /** Trail is idempotent (safe to retry) */
     readonly idempotent?: boolean | undefined;
+    /** Whether trailheads expose this trail by default. */
+    readonly visibility?: TrailVisibility | undefined;
     /** Arbitrary meta for tooling and filtering */
     readonly meta?: Readonly<Record<string, unknown>> | undefined;
-    /** Named sets of downstream trail IDs that may be invoked */
-    readonly detours?: Readonly<Record<string, readonly string[]>> | undefined;
+    /** Recovery paths activated when blaze fails with a matching error class. */
+    readonly detours?: readonly Detour<I, O, TrailsError>[] | undefined;
     /** Per-field overrides for deriveFields() (labels, hints, options) */
     readonly fields?: Readonly<Record<string, FieldOverride>> | undefined;
-    /** IDs of downstream trails this trail may invoke via ctx.cross() */
-    readonly crosses?: readonly string[] | undefined;
-    /** Provisions this trail may access via provision.from(ctx) */
-    readonly provisions?: readonly AnyProvision[] | undefined;
+    /** Contours this trail operates on. */
+    readonly contours?: readonly AnyContour[] | undefined;
+    /** IDs or trail objects of downstream trails this trail may invoke via ctx.cross() */
+    readonly crosses?: readonly (string | AnyTrail)[] | undefined;
+    /**
+     * Composition-only input schema — merged with `input` for `ctx.cross()` calls,
+     * invisible to public trailheads (CLI, MCP, HTTP).
+     *
+     * Fields here are available in the blaze but are not derived into CLI flags,
+     * MCP tool parameters, or HTTP request bodies. Use for data that only makes
+     * sense when one trail crosses another (e.g. `forkedFrom`).
+     */
+    readonly crossInput?: z.ZodType<CI> | undefined;
+    /** Resources this trail may access via resource.from(ctx) */
+    readonly resources?: readonly AnyResource[] | undefined;
+    /**
+     * Signals this trail emits via `ctx.fire()`.
+     *
+     * Accepts either a string id or a `Signal` value. Both forms are
+     * normalized to the signal's id at trail definition time, so
+     * `trail.fires` is always `readonly string[]`.
+     *
+     * Note: `crosses` also accepts trail objects (normalized to IDs),
+     * following the same pattern as signal references here.
+     */
+    readonly fires?: readonly (string | AnySignal)[] | undefined;
+    /**
+     * Signals that activate this trail (framework auto-subscribes).
+     *
+     * Accepts either a string id or a `Signal` value. Both forms are
+     * normalized to the signal's id at trail definition time.
+     */
+    readonly on?: readonly (string | AnySignal)[] | undefined;
     /** Auth requirement: scopes object, 'public', or omitted (undeclared) */
     readonly permit?: PermitRequirement | undefined;
+    /** Primary input fields and their order. CLI projects as positional args. */
+    readonly args?: readonly string[] | false | undefined;
 }
 /** Intent describes what a trail does to the world */
 export type Intent = 'read' | 'write' | 'destroy';
+/** Whether trailheads expose a trail by default. */
+export type TrailVisibility = 'public' | 'internal';
 /** A fully-defined trail — the unit of work in the Trails system */
-export interface Trail<I, O> extends Omit<TrailSpec<I, O>, 'blaze' | 'crosses' | 'intent' | 'provisions'> {
+export interface Trail<I, O, CI = never> extends Omit<TrailSpec<I, O, CI>, 'args' | 'blaze' | 'contours' | 'crosses' | 'crossInput' | 'detours' | 'fires' | 'intent' | 'on' | 'resources'> {
     readonly kind: 'trail';
     readonly id: string;
-    readonly blaze: Implementation<I, O>;
+    readonly blaze: Implementation<BlazeInput<I, CI>, O>;
+    /** Contours this trail operates on (always present, default []). */
+    readonly contours: readonly AnyContour[];
     /** IDs of downstream trails this trail may invoke via ctx.cross() (always present, default []) */
     readonly crosses: readonly string[];
-    /** Provisions this trail may access via provision.from(ctx) (always present, default []) */
-    readonly provisions: readonly AnyProvision[];
+    /** Composition-only input schema, merged with `input` for ctx.cross() calls (optional) */
+    readonly crossInput?: z.ZodType<CI> | undefined;
+    /** Recovery paths activated when blaze fails with a matching error (always present, default []). */
+    readonly detours: readonly Detour<I, O, TrailsError>[];
+    /** Resources this trail may access via resource.from(ctx) (always present, default []) */
+    readonly resources: readonly AnyResource[];
+    /** IDs of signals this trail emits via ctx.fire() (always present, default []) */
+    readonly fires: readonly string[];
+    /** IDs of signals that activate this trail (always present, default []) */
+    readonly on: readonly string[];
     /** What this trail does to the world (always present, default 'write') */
     readonly intent: Intent;
+    /** Whether trailheads expose this trail by default (always present, default 'public'). */
+    readonly visibility: TrailVisibility;
+    /** Primary input fields and their order (always present, default undefined) */
+    readonly args?: readonly string[] | false | undefined;
 }
 /**
  * Create a trail definition.
@@ -87,10 +152,12 @@ export interface Trail<I, O> extends Omit<TrailSpec<I, O>, 'blaze' | 'crosses' |
  * });
  * ```
  */
-export declare function trail<I, O>(id: string, spec: TrailSpec<I, O>): Trail<I, O>;
-export declare function trail<I, O>(spec: TrailSpec<I, O> & {
+export declare function trail<I, O, CI = never>(id: string, spec: TrailSpec<I, O, CI>): Trail<I, O, CI>;
+export declare function trail<I, O, CI = never>(spec: TrailSpec<I, O, CI> & {
     readonly id: string;
-}): Trail<I, O>;
-export type AnyTrail = Trail<any, any>;
+}): Trail<I, O, CI>;
+export type AnyTrail = Omit<Trail<any, any, any>, 'blaze'> & {
+    readonly blaze: Implementation<any, any>;
+};
 export type { Implementation, TrailContext, Result };
 //# sourceMappingURL=trail.d.ts.map

package/dist/trail.d.ts.map

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

package/dist/trail.js

@@ -1,3 +1,54 @@
+import { createLateBoundSignalMarker, getLateBoundSignalRef, } from './internal/signal-ref.js';
+// ---------------------------------------------------------------------------
+// Factory
+// ---------------------------------------------------------------------------
+/**
+ * Canonical scoped-signal id shape: `<scope>:<table>.<event>`.
+ *
+ * Matches exactly one `:` separating a non-empty scope from a non-empty
+ * dotted tail of at least two segments (e.g. `identity:users.created`).
+ * The scope forbids only `:` and whitespace so resource ids may contain
+ * dots for namespacing (e.g. `demo.store:gists.created`). Tail segments
+ * forbid both `:` and `.` so strings like `foo:bar` (no dot) or
+ * `a:b.c.d` stay unambiguous.
+ */
+const SCOPED_SIGNAL_ID = /^[^:\s]+:[^:.\s]+(?:\.[^:.\s]+)+$/;
+const normalizeSignalRef = (entry) => {
+    if (typeof entry === 'string') {
+        return entry;
+    }
+    const ref = getLateBoundSignalRef(entry);
+    if (!ref) {
+        return entry.id;
+    }
+    // Already-scoped canonical ids (e.g. "identity:users.created") must pass
+    // through unchanged. Rewriting them to a bare marker token collapses
+    // multi-binding cases where the same store definition is bound under two
+    // separate resources: both bindings share the late-bound token, so the
+    // caller's explicit choice of scope would be lost and topo resolution
+    // would throw an ambiguity error.
+    //
+    // Use a strict predicate that matches the canonical scoped shape
+    // `<scope>:<table>.<event>` (exactly one `:` separating a non-empty scope
+    // from a non-empty dotted tail of at least two segments). A looser
+    // `includes(':')` check would let unscoped ids that happen to contain `:`
+    // slip past markerization and then fail to resolve at topo finalization.
+    if (SCOPED_SIGNAL_ID.test(entry.id)) {
+        return entry.id;
+    }
+    return createLateBoundSignalMarker(ref, entry.id);
+};
+/** Normalize a crosses entry — trail objects are reduced to their id. */
+const normalizeCrossRef = (entry) => typeof entry === 'string' ? entry : entry.id;
+/** Freeze and normalize all collection fields from a trail spec. */
+const normalizeCollections = (spec) => ({
+    args: Array.isArray(spec.args) ? Object.freeze([...spec.args]) : spec.args,
+    contours: Object.freeze([...(spec.contours ?? [])]),
+    detours: Object.freeze([...(spec.detours ?? [])]),
+    fires: Object.freeze((spec.fires ?? []).map(normalizeSignalRef)),
+    on: Object.freeze((spec.on ?? []).map(normalizeSignalRef)),
+    resources: Object.freeze([...(spec.resources ?? [])]),
+});
 export function trail(idOrSpec, maybeSpec) {
     const resolved = typeof idOrSpec === 'string'
         ? { id: idOrSpec, spec: maybeSpec }
@@ -5,16 +56,20 @@ export function trail(idOrSpec, maybeSpec) {
     if (!resolved.spec) {
         throw new TypeError('trail() requires a spec when an id is provided');
     }
-    const { blaze, crosses: rawCrosses, intent: rawIntent, provisions: rawProvisions, ...spec } = resolved.spec;
-    const provisions = Object.freeze([...(rawProvisions ?? [])]);
+    const { blaze, crossInput, crosses: rawCrosses, intent: rawIntent, visibility: rawVisibility, 
+    // Destructure away fields handled by normalizeCollections
+    args: _a, contours: _c, detours: _d, fires: _f, on: _o, resources: _r, ...spec } = resolved.spec;
+    const collections = normalizeCollections(resolved.spec);
     return Object.freeze({
         ...spec,
+        ...collections,
         blaze: async (input, ctx) => await blaze(input, ctx),
-        crosses: Object.freeze([...(rawCrosses ?? [])]),
+        crossInput,
+        crosses: Object.freeze((rawCrosses ?? []).map(normalizeCrossRef)),
         id: resolved.id,
         intent: rawIntent ?? 'write',
         kind: 'trail',
-        provisions,
+        visibility: rawVisibility ?? 'public',
     });
 }
 //# sourceMappingURL=trail.js.map

package/dist/trail.js.map

@@ -1 +1 @@
-{"version":3,"file":"trail.js","sourceRoot":"","sources":["../src/trail.ts"],"names":[],"mappings":"AA0HA,MAAM,UAAU,KAAK,CACnB,QAA8D,EAC9D,SAA2B;IAE3B,MAAM,QAAQ,GACZ,OAAO,QAAQ,KAAK,QAAQ;QAC1B,CAAC,CAAC,EAAE,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE;QACnC,CAAC,CAAC,EAAE,EAAE,EAAE,QAAQ,CAAC,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;IAE1C,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;QACnB,MAAM,IAAI,SAAS,CAAC,gDAAgD,CAAC,CAAC;IACxE,CAAC;IAED,MAAM,EACJ,KAAK,EACL,OAAO,EAAE,UAAU,EACnB,MAAM,EAAE,SAAS,EACjB,UAAU,EAAE,aAAa,EACzB,GAAG,IAAI,EACR,GAAG,QAAQ,CAAC,IAAI,CAAC;IAClB,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,aAAa,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;IAE7D,OAAO,MAAM,CAAC,MAAM,CAAC;QACnB,GAAG,IAAI;QACP,KAAK,EAAE,KAAK,EAAE,KAAQ,EAAE,GAAiB,EAAE,EAAE,CAAC,MAAM,KAAK,CAAC,KAAK,EAAE,GAAG,CAAC;QACrE,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC,CAAC;QAC/C,EAAE,EAAE,QAAQ,CAAC,EAAE;QACf,MAAM,EAAE,SAAS,IAAI,OAAO;QAC5B,IAAI,EAAE,OAAgB;QACtB,UAAU;KACX,CAAC,CAAC;AACL,CAAC"}
+{"version":3,"file":"trail.js","sourceRoot":"","sources":["../src/trail.ts"],"names":[],"mappings":"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"}