aontu 0.29.0 → 0.30.2

package/dist/val/TypeFuncVal.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"TypeFuncVal.js","sourceRoot":"","sources":["../../src/val/TypeFuncVal.ts"],"names":[],"mappings":";AAAA,yDAAyD;;;AAYzD,gCAAmC;AAEnC,wCAImB;AAGnB,+CAA2C;AAG3C,MAAM,WAAY,SAAQ,yBAAW;IAKnC,YACE,IAAa,EACb,GAAkB;QAElB,KAAK,CAAC,IAAI,EAAE,GAAG,CAAC,CAAA;QARlB,eAAU,GAAG,IAAI,CAAA;QAUf,qCAAqC;QACrC,IAAI,CAAC,IAAI,CAAC,IAAI,GAAG,KAAK,CAAA;QACtB,IAAI,CAAC,IAAI,CAAC,IAAI,GAAG,KAAK,CAAA;IACxB,CAAC;IAGD,IAAI,CAAC,IAAkB,EAAE,IAAa;QACpC,OAAO,IAAI,WAAW,CAAC,IAAI,CAAC,CAAA;IAC9B,CAAC;IAED,QAAQ;QACN,OAAO,MAAM,CAAA;IACf,CAAC;IAGD,OAAO,CAAC,GAAiB,EAAE,IAAW;QACpC,IAAI,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,IAAI,IAAA,gBAAU,EAAC,GAAG,EAAE,KAAK,EAAE,IAAI,CAAC,CAAA;QACjD,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC;YACf,GAAG,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;YAEpB,IAAA,cAAI,EAAC,GAAG,EAAE,CAAC,IAAiC,EAAE,GAAQ,EAAE,EAAE;gBACxD,GAAG,CAAC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAA;gBACpB,OAAO,GAAG,CAAA;YACZ,CAAC,CAAC,CAAA;QACJ,CAAC;QAED,OAAO,GAAG,CAAA;IACZ,CAAC;CACF;AAIC,kCAAW"}

package/dist/val/UpperFuncVal.d.ts

@@ -0,0 +1,12 @@
+import type { Val, ValSpec } from '../type';
+import { AontuContext } from '../ctx';
+import { FuncBaseVal } from './FuncBaseVal';
+declare class UpperFuncVal extends FuncBaseVal {
+    isUpperFunc: boolean;
+    constructor(spec: ValSpec, ctx?: AontuContext);
+    make(_ctx: AontuContext, spec: ValSpec): Val;
+    funcname(): string;
+    resolve(ctx: AontuContext | undefined, args: Val[]): Val;
+    superior(): Val;
+}
+export { UpperFuncVal, };

package/dist/val/UpperFuncVal.js

@@ -0,0 +1,40 @@
+"use strict";
+/* Copyright (c) 2021-2025 Richard Rodger, MIT License */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.UpperFuncVal = void 0;
+const err_1 = require("../err");
+const ScalarKindVal_1 = require("../val/ScalarKindVal");
+const valutil_1 = require("../val/valutil");
+const FuncBaseVal_1 = require("./FuncBaseVal");
+class UpperFuncVal extends FuncBaseVal_1.FuncBaseVal {
+    constructor(spec, ctx) {
+        super(spec, ctx);
+        this.isUpperFunc = true;
+    }
+    make(_ctx, spec) {
+        return new UpperFuncVal(spec);
+    }
+    funcname() {
+        return 'upper';
+    }
+    resolve(ctx, args) {
+        const oldpeg = args?.[0].peg;
+        const peg = 'string' === typeof oldpeg ? oldpeg.toUpperCase() :
+            'number' === typeof oldpeg ? Math.ceil(oldpeg) :
+                undefined;
+        const out = this.place(null == peg ?
+            (0, err_1.makeNilErr)(ctx, 'invalid-arg', this) :
+            (0, valutil_1.makeScalar)(peg));
+        return out;
+    }
+    superior() {
+        const arg = this.peg?.[0];
+        return arg?.isScalar ?
+            this.place(new ScalarKindVal_1.ScalarKindVal({
+                peg: arg.kind
+            })) :
+            super.superior();
+    }
+}
+exports.UpperFuncVal = UpperFuncVal;
+//# sourceMappingURL=UpperFuncVal.js.map

package/dist/val/UpperFuncVal.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"UpperFuncVal.js","sourceRoot":"","sources":["../../src/val/UpperFuncVal.ts"],"names":[],"mappings":";AAAA,yDAAyD;;;AAYzD,gCAAmC;AAInC,wDAAoD;AACpD,4CAA2C;AAI3C,+CAA2C;AAG3C,MAAM,YAAa,SAAQ,yBAAW;IAGpC,YACE,IAAa,EACb,GAAkB;QAElB,KAAK,CAAC,IAAI,EAAE,GAAG,CAAC,CAAA;QANlB,gBAAW,GAAG,IAAI,CAAA;IAOlB,CAAC;IAGD,IAAI,CAAC,IAAkB,EAAE,IAAa;QACpC,OAAO,IAAI,YAAY,CAAC,IAAI,CAAC,CAAA;IAC/B,CAAC;IAED,QAAQ;QACN,OAAO,OAAO,CAAA;IAChB,CAAC;IAGD,OAAO,CAAC,GAA6B,EAAE,IAAW;QAChD,MAAM,MAAM,GAAG,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,CAAA;QAC5B,MAAM,GAAG,GAAG,QAAQ,KAAK,OAAO,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC,CAAC;YAC7D,QAAQ,KAAK,OAAO,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;gBAC9C,SAAS,CAAA;QACb,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CACpB,IAAI,IAAI,GAAG,CAAC,CAAC;YACX,IAAA,gBAAU,EAAC,GAAG,EAAE,aAAa,EAAE,IAAI,CAAC,CAAC,CAAC;YACtC,IAAA,oBAAU,EAAC,GAAG,CAAC,CAClB,CAAA;QACD,OAAO,GAAG,CAAA;IACZ,CAAC;IAGD,QAAQ;QACN,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAA;QACzB,OAAO,GAAG,EAAE,QAAQ,CAAC,CAAC;YACpB,IAAI,CAAC,KAAK,CAAC,IAAI,6BAAa,CAAC;gBAC3B,GAAG,EAAE,GAAG,CAAC,IAAI;aACd,CAAC,CAAC,CAAC,CAAC;YACL,KAAK,CAAC,QAAQ,EAAE,CAAA;IACpB,CAAC;CACF;AAIC,oCAAY"}

package/dist/val/Val.d.ts

@@ -0,0 +1,89 @@
+import { inspect } from 'node:util';
+import type { AontuContext } from '../ctx';
+import { Site } from '../site';
+type ValMark = {
+    type: boolean;
+    hide: boolean;
+    [name: `_${string}`]: boolean;
+};
+type ValSpec = {
+    peg?: any;
+    mark?: Partial<ValMark>;
+    kind?: any;
+    row?: number;
+    col?: number;
+    url?: string;
+    path?: string[];
+    id?: number;
+    src?: string;
+    why?: string;
+    msg?: string;
+    err?: any[] | any;
+    absolute?: boolean;
+    prefix?: boolean;
+};
+declare const DONE = -1;
+declare const SPREAD: unique symbol;
+declare abstract class Val {
+    #private;
+    isVal: boolean;
+    isTop: boolean;
+    isNil: boolean;
+    isMap: boolean;
+    isList: boolean;
+    isScalar: boolean;
+    isScalarKind: boolean;
+    isRef: boolean;
+    isPref: boolean;
+    isVar: boolean;
+    isBag: boolean;
+    isNumber: boolean;
+    isInteger: boolean;
+    isString: boolean;
+    isBoolean: boolean;
+    isConjunct: boolean;
+    isDisjunct: boolean;
+    isJunction: boolean;
+    isOp: boolean;
+    isPlusOp: boolean;
+    isFunc: boolean;
+    isCloseFunc: boolean;
+    isCopyFunc: boolean;
+    isHideFunc: boolean;
+    isMoveFunc: boolean;
+    isKeyFunc: boolean;
+    isLowerFunc: boolean;
+    isOpenFunc: boolean;
+    isPathFunc: boolean;
+    isPrefFunc: boolean;
+    isSuperFunc: boolean;
+    isTypeFunc: boolean;
+    isUpperFunc: boolean;
+    id: number;
+    dc: number;
+    path: string[];
+    site: Site;
+    mark: ValMark;
+    peg: any;
+    err: any[];
+    explain: any[] | null;
+    uh: number[];
+    deps?: any;
+    constructor(spec: ValSpec, ctx?: AontuContext);
+    ctx(): any;
+    get done(): boolean;
+    same(peer: Val): boolean;
+    clone(ctx: AontuContext, spec?: ValSpec): Val;
+    place(v: Val): Val;
+    unify(_peer: Val, _ctx: AontuContext): Val;
+    get canon(): string;
+    errcanon(): string;
+    gen(_ctx: AontuContext): any;
+    notdone(): void;
+    abstract superior(): Val;
+    [inspect.custom](_d: number, _o: any, _inspect: any): string;
+    inspection(_inspect: Function): string;
+}
+declare function empty(o: any): boolean;
+export type { ValMark, ValSpec, };
+export { Val, DONE, SPREAD, empty };

package/dist/val/Val.js

@@ -0,0 +1,186 @@
+"use strict";
+/* Copyright (c) 2022-2025 Richard Rodger, MIT License */
+var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
+    if (kind === "m") throw new TypeError("Private method is not writable");
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
+    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _Val_ctx;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SPREAD = exports.DONE = exports.Val = void 0;
+exports.empty = empty;
+const node_util_1 = require("node:util");
+const site_1 = require("../site");
+// import { AontuError, descErr, makeNilErr } from '../err'
+// import { AontuError } from '../err'
+const DONE = -1;
+exports.DONE = DONE;
+const SPREAD = Symbol('spread');
+exports.SPREAD = SPREAD;
+let ID = 1000;
+class Val {
+    // TODO: Site needed in ctor
+    constructor(spec, ctx) {
+        this.isVal = true;
+        this.isTop = false;
+        this.isNil = false;
+        this.isMap = false;
+        this.isList = false;
+        this.isScalar = false;
+        this.isScalarKind = false;
+        this.isRef = false;
+        this.isPref = false;
+        this.isVar = false;
+        this.isBag = false;
+        this.isNumber = false;
+        this.isInteger = false;
+        this.isString = false;
+        this.isBoolean = false;
+        this.isConjunct = false;
+        this.isDisjunct = false;
+        this.isJunction = false;
+        this.isOp = false;
+        this.isPlusOp = false;
+        this.isFunc = false;
+        this.isCloseFunc = false;
+        this.isCopyFunc = false;
+        this.isHideFunc = false;
+        this.isMoveFunc = false;
+        this.isKeyFunc = false;
+        this.isLowerFunc = false;
+        this.isOpenFunc = false;
+        this.isPathFunc = false;
+        this.isPrefFunc = false;
+        this.isSuperFunc = false;
+        this.isTypeFunc = false;
+        this.isUpperFunc = false;
+        this.dc = 0;
+        this.path = [];
+        this.site = new site_1.Site();
+        // Map of boolean flags.
+        this.mark = { type: false, hide: false };
+        // Actual native value.
+        this.peg = undefined;
+        // TODO: used for top level result - not great
+        // err: Omit<any[], "push"> = []
+        this.err = [];
+        this.explain = null;
+        _Val_ctx.set(this, void 0);
+        __classPrivateFieldSet(this, _Val_ctx, ctx, "f");
+        this.peg = spec?.peg;
+        if (Array.isArray(this.peg)) {
+            let spread = this.peg[SPREAD];
+            this.peg = this.peg.filter(n => undefined !== n);
+            this.peg[SPREAD] = spread;
+        }
+        this.path = ctx?.path || [];
+        // TODO: make this work
+        // this.id = spec?.id ?? (ctx ? ++ctx.vc : ++ID)
+        this.id = ++ID;
+        this.uh = [];
+        this.mark.type = !!spec.mark?.type;
+        this.mark.hide = !!spec.mark?.hide;
+        // console.log('BV', this.id, this.constructor.name, this.peg?.canon)
+    }
+    ctx() {
+        return __classPrivateFieldGet(this, _Val_ctx, "f");
+    }
+    get done() {
+        return this.dc === DONE;
+    }
+    same(peer) {
+        return null == peer ? false : this.id === peer.id;
+    }
+    clone(ctx, spec) {
+        let cloneCtx;
+        let cut = this.path.indexOf('&');
+        cut = -1 < cut ? cut + 1 : ctx.path.length;
+        cloneCtx = ctx.clone({
+            path: ctx.path.concat(this.path.slice(cut))
+        });
+        let fullspec = {
+            peg: this.peg,
+            mark: { type: this.mark.type, hide: this.mark.hide },
+            ...(spec ?? {})
+        };
+        let out = new this
+            .constructor(fullspec, cloneCtx);
+        out.site.row = spec?.row ?? this.site.row ?? -1;
+        out.site.col = spec?.col ?? this.site.col ?? -1;
+        out.site.url = spec?.url ?? this.site.url ?? '';
+        // TODO: should not be needed - update all VAL ctors to handle spec.mark
+        out.mark.type = this.mark.type && (fullspec.mark?.type ?? true);
+        out.mark.hide = this.mark.hide && (fullspec.mark?.hide ?? true);
+        return out;
+    }
+    place(v) {
+        v.site.row = this.site.row;
+        v.site.col = this.site.col;
+        v.site.url = this.site.url;
+        return v;
+    }
+    // NOTE: MUST not mutate! Val immutability is a critical assumption.
+    unify(_peer, _ctx) { return this; }
+    // TODO: indicate marks in some way that is ignored by reparse.
+    // Need an annotation/taggins syntax? a:{}/type ?
+    get canon() { return ''; }
+    errcanon() {
+        return 0 === this.err.length ? '' : `<ERRS:${this.err.length}>`;
+    }
+    gen(_ctx) {
+        return undefined;
+    }
+    notdone() {
+        this.dc = DONE === this.dc ? DONE : this.dc + 1;
+    }
+    [(_Val_ctx = new WeakMap(), node_util_1.inspect.custom)](_d, _o, _inspect) {
+        let s = ['<' + this.constructor.name.replace(/Val$/, '') + '/' + this.id];
+        s.push('/' + this.path.join('.') + '/');
+        s.push([
+            DONE === this.dc ? 'D' : 'd' + this.dc,
+            ...Object.entries(this.mark).filter(n => n[1]).map(n => n[0]).sort()
+        ].filter(n => null != n).join(','));
+        let insp = this.inspection(node_util_1.inspect);
+        if (null != insp && '' != insp) {
+            s.push('/' + insp);
+        }
+        s.push('/');
+        if ('object' === typeof this.peg) {
+            s.push(inspectpeg(this.peg));
+        }
+        else if ('function' === typeof this.peg) {
+            s.push(this.peg.name);
+        }
+        else {
+            s.push(this.peg);
+        }
+        s.push('>');
+        const out = s.join('');
+        return out;
+    }
+    inspection(_inspect) {
+        return '';
+    }
+}
+exports.Val = Val;
+function inspectpeg(peg) {
+    return pretty(!Array.isArray(peg) ? (0, node_util_1.inspect)(peg) :
+        ('[' + peg.map(n => (0, node_util_1.inspect)(n)).join(',\n') + ']'));
+}
+function pretty(s) {
+    return ((String(s))
+        .replace(/\[Object: null prototype\]/g, '')
+        .replace(/\s+/g, ''));
+}
+function empty(o) {
+    return ((Array.isArray(o) && 0 === o.length)
+        || (null != o && 'object' === typeof o && 0 === Object.keys(o).length)
+        || false);
+}
+//# sourceMappingURL=Val.js.map

package/dist/val/Val.js.map

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

package/dist/val/VarVal.d.ts

@@ -0,0 +1,13 @@
+import type { Val, ValSpec } from '../type';
+import { AontuContext } from '../ctx';
+import { FeatureVal } from './FeatureVal';
+declare class VarVal extends FeatureVal {
+    isVar: boolean;
+    constructor(spec: ValSpec, ctx?: AontuContext);
+    unify(peer: Val, ctx: AontuContext): Val;
+    same(peer: Val): boolean;
+    clone(ctx: AontuContext, spec?: ValSpec): Val;
+    get canon(): string;
+    gen(ctx?: AontuContext): undefined;
+}
+export { VarVal, };

package/dist/val/VarVal.js

@@ -0,0 +1,109 @@
+"use strict";
+/* Copyright (c) 2021-2023 Richard Rodger, MIT License */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.VarVal = void 0;
+const type_1 = require("../type");
+const err_1 = require("../err");
+const StringVal_1 = require("./StringVal");
+const FeatureVal_1 = require("./FeatureVal");
+const NullVal_1 = require("./NullVal");
+const BooleanVal_1 = require("./BooleanVal");
+const NumberVal_1 = require("./NumberVal");
+const IntegerVal_1 = require("./IntegerVal");
+const utility_1 = require("../utility");
+// TODO: KEY, SELF, PARENT are reserved names - error
+class VarVal extends FeatureVal_1.FeatureVal {
+    constructor(spec, ctx) {
+        super(spec, ctx);
+        this.isVar = true;
+    }
+    unify(peer, ctx) {
+        const te = ctx.explain && (0, utility_1.explainOpen)(ctx, ctx.explain, 'Var', this, peer);
+        let out;
+        let nameVal;
+        if (this.peg.isVal) {
+            // $.a.b.c - convert path to absolute
+            // if (this.peg instanceof RefVal) {
+            if (this.peg.isRef) {
+                this.peg.absolute = true;
+                nameVal = this.peg;
+            }
+            else {
+                nameVal = this.peg.unify(peer, ctx.clone({ explain: (0, utility_1.ec)(te, 'PEG') }));
+            }
+        }
+        else {
+            // TODO: how to pass row+col?
+            nameVal = new StringVal_1.StringVal({ peg: '' + this.peg }, ctx);
+        }
+        // if (!(nameVal instanceof RefVal) && DONE === nameVal.dc) {
+        if (!(nameVal.isRef) && type_1.DONE === nameVal.dc) {
+            if (nameVal instanceof StringVal_1.StringVal) {
+                let found = ctx.vars[nameVal.peg];
+                if (undefined === found) {
+                    out = (0, err_1.makeNilErr)(ctx, 'unknown_var', this, peer);
+                }
+                // TODO: support complex values
+                const ft = typeof found;
+                if (null === found) {
+                    out = this.place(new NullVal_1.NullVal({ peg: null }));
+                }
+                else if ('string' === ft) {
+                    out = new StringVal_1.StringVal({ peg: found });
+                }
+                else if ('boolean' === ft) {
+                    out = new BooleanVal_1.BooleanVal({ peg: found });
+                }
+                else if ('number' === ft) {
+                    out = Number.isInteger(found) ?
+                        new IntegerVal_1.IntegerVal({ peg: found }) :
+                        new NumberVal_1.NumberVal({ peg: found });
+                }
+                else if ('object' === ft && found.isVal) {
+                    out = found;
+                }
+                else {
+                    out = (0, err_1.makeNilErr)(ctx, 'invalid_var_kind', this, peer);
+                }
+            }
+            else {
+                out = (0, err_1.makeNilErr)(ctx, 'var[' + typeof nameVal + ']', this, peer);
+            }
+        }
+        else {
+            out = nameVal;
+        }
+        (0, utility_1.explainClose)(te, out);
+        return out;
+    }
+    same(peer) {
+        return null == peer ? false : peer instanceof VarVal && this.peg === peer.peg;
+    }
+    clone(ctx, spec) {
+        let out = super.clone(ctx, spec);
+        return out;
+    }
+    get canon() {
+        return '$' + (this.peg?.isVal ? this.peg.canon : '' + this.peg);
+    }
+    gen(ctx) {
+        // Unresolved var cannot be generated, so always an error.
+        let nil = (0, err_1.makeNilErr)(ctx, 'var', this, undefined);
+        // TODO: refactor to use Site
+        nil.path = this.path;
+        nil.site.url = this.site.url;
+        nil.site.row = this.site.row;
+        nil.site.col = this.site.col;
+        (0, err_1.descErr)(nil, ctx);
+        if (ctx) {
+            // ctx.err.push(nil)
+            ctx.adderr(nil);
+        }
+        else {
+            throw new err_1.AontuError(nil.msg);
+        }
+        return undefined;
+    }
+}
+exports.VarVal = VarVal;
+//# sourceMappingURL=VarVal.js.map

package/dist/val/VarVal.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"VarVal.js","sourceRoot":"","sources":["../../src/val/VarVal.ts"],"names":[],"mappings":";AAAA,yDAAyD;;;AASzD,kCAEgB;AAEhB,gCAIe;AAQf,2CAAuC;AAEvC,6CAAyC;AACzC,uCAAmC;AACnC,6CAAyC;AACzC,2CAAuC;AACvC,6CAAyC;AAGzC,wCAImB;AAGnB,qDAAqD;AAErD,MAAM,MAAO,SAAQ,uBAAU;IAG7B,YACE,IAAa,EACb,GAAkB;QAElB,KAAK,CAAC,IAAI,EAAE,GAAG,CAAC,CAAA;QANlB,UAAK,GAAG,IAAI,CAAA;IAOZ,CAAC;IAGD,KAAK,CAAC,IAAS,EAAE,GAAiB;QAChC,MAAM,EAAE,GAAG,GAAG,CAAC,OAAO,IAAI,IAAA,qBAAW,EAAC,GAAG,EAAE,GAAG,CAAC,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,CAAC,CAAA;QAE1E,IAAI,GAAQ,CAAA;QAEZ,IAAI,OAAO,CAAA;QAEX,IAAI,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC;YACnB,qCAAqC;YACrC,oCAAoC;YACpC,IAAI,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC;gBACnB,IAAI,CAAC,GAAG,CAAC,QAAQ,GAAG,IAAI,CAAA;gBACxB,OAAO,GAAG,IAAI,CAAC,GAAG,CAAA;YACpB,CAAC;iBACI,CAAC;gBACJ,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,GAAG,CAAC,KAAK,CAAC,EAAE,OAAO,EAAE,IAAA,YAAE,EAAC,EAAE,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC,CAAA;YACvE,CAAC;QACH,CAAC;aACI,CAAC;YACJ,6BAA6B;YAC7B,OAAO,GAAG,IAAI,qBAAS,CAAC,EAAE,GAAG,EAAE,EAAE,GAAG,IAAI,CAAC,GAAG,EAAE,EAAE,GAAG,CAAC,CAAA;QACtD,CAAC;QAED,6DAA6D;QAC7D,IAAI,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,WAAI,KAAK,OAAO,CAAC,EAAE,EAAE,CAAC;YAC5C,IAAI,OAAO,YAAY,qBAAS,EAAE,CAAC;gBACjC,IAAI,KAAK,GAAG,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA;gBACjC,IAAI,SAAS,KAAK,KAAK,EAAE,CAAC;oBACxB,GAAG,GAAG,IAAA,gBAAU,EAAC,GAAG,EAAE,aAAa,EAAE,IAAI,EAAE,IAAI,CAAC,CAAA;gBAClD,CAAC;gBAED,+BAA+B;gBAC/B,MAAM,EAAE,GAAG,OAAO,KAAK,CAAA;gBACvB,IAAI,IAAI,KAAK,KAAK,EAAE,CAAC;oBACnB,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,iBAAO,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC,CAAA;gBAC9C,CAAC;qBACI,IAAI,QAAQ,KAAK,EAAE,EAAE,CAAC;oBACzB,GAAG,GAAG,IAAI,qBAAS,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,CAAA;gBACrC,CAAC;qBACI,IAAI,SAAS,KAAK,EAAE,EAAE,CAAC;oBAC1B,GAAG,GAAG,IAAI,uBAAU,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,CAAA;gBACtC,CAAC;qBACI,IAAI,QAAQ,KAAK,EAAE,EAAE,CAAC;oBACzB,GAAG,GAAG,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC;wBAC7B,IAAI,uBAAU,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;wBAChC,IAAI,qBAAS,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,CAAA;gBACjC,CAAC;qBACI,IAAI,QAAQ,KAAK,EAAE,IAAI,KAAK,CAAC,KAAK,EAAE,CAAC;oBACxC,GAAG,GAAG,KAAK,CAAA;gBACb,CAAC;qBACI,CAAC;oBACJ,GAAG,GAAG,IAAA,gBAAU,EAAC,GAAG,EAAE,kBAAkB,EAAE,IAAI,EAAE,IAAI,CAAC,CAAA;gBACvD,CAAC;YACH,CAAC;iBACI,CAAC;gBACJ,GAAG,GAAG,IAAA,gBAAU,EAAC,GAAG,EAAE,MAAM,GAAG,OAAO,OAAO,GAAG,GAAG,EAAE,IAAI,EAAE,IAAI,CAAC,CAAA;YAClE,CAAC;QACH,CAAC;aACI,CAAC;YACJ,GAAG,GAAG,OAAO,CAAA;QACf,CAAC;QAED,IAAA,sBAAY,EAAC,EAAE,EAAE,GAAG,CAAC,CAAA;QAErB,OAAO,GAAG,CAAA;IACZ,CAAC;IAGD,IAAI,CAAC,IAAS;QACZ,OAAO,IAAI,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,YAAY,MAAM,IAAI,IAAI,CAAC,GAAG,KAAK,IAAI,CAAC,GAAG,CAAA;IAC/E,CAAC;IAGD,KAAK,CAAC,GAAiB,EAAE,IAAc;QACrC,IAAI,GAAG,GAAI,KAAK,CAAC,KAAK,CAAC,GAAG,EAAE,IAAI,CAAY,CAAA;QAC5C,OAAO,GAAG,CAAA;IACZ,CAAC;IAGD,IAAI,KAAK;QACP,OAAO,GAAG,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,GAAG,IAAI,CAAC,GAAG,CAAC,CAAA;IACjE,CAAC;IAGD,GAAG,CAAC,GAAkB;QACpB,0DAA0D;QAC1D,IAAI,GAAG,GAAG,IAAA,gBAAU,EAClB,GAAG,EACH,KAAK,EACL,IAAI,EACJ,SAAS,CACV,CAAA;QAED,6BAA6B;QAC7B,GAAG,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAA;QACpB,GAAG,CAAC,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAA;QAC5B,GAAG,CAAC,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAA;QAC5B,GAAG,CAAC,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAA;QAE5B,IAAA,aAAO,EAAC,GAAG,EAAE,GAAG,CAAC,CAAA;QAEjB,IAAI,GAAG,EAAE,CAAC;YACR,oBAAoB;YACpB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;QACjB,CAAC;aACI,CAAC;YACJ,MAAM,IAAI,gBAAU,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;QAC/B,CAAC;QAED,OAAO,SAAS,CAAA;IAClB,CAAC;CACF;AAIC,wBAAM"}

package/dist/val/top.d.ts

@@ -0,0 +1,2 @@
+import { TopVal } from './TopVal';
+export declare function top(): TopVal;

package/dist/val/top.js

@@ -0,0 +1,10 @@
+"use strict";
+/* Copyright (c) 2025 Richard Rodger, MIT License */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.top = top;
+const TopVal_1 = require("./TopVal");
+const TOP = new TopVal_1.TopVal({});
+function top() {
+    return TOP;
+}
+//# sourceMappingURL=top.js.map

package/dist/val/top.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"top.js","sourceRoot":"","sources":["../../src/val/top.ts"],"names":[],"mappings":";AAAA,oDAAoD;;AAQpD,kBAEC;AAPD,qCAAiC;AAEjC,MAAM,GAAG,GAAG,IAAI,eAAM,CAAC,EAAE,CAAC,CAAA;AAG1B,SAAgB,GAAG;IACjB,OAAO,GAAG,CAAA;AACZ,CAAC"}

package/dist/val/valutil.d.ts

@@ -0,0 +1,2 @@
+import { ScalarVal } from './ScalarVal';
+export declare function makeScalar(scalar: any): ScalarVal;

package/dist/val/valutil.js

@@ -0,0 +1,30 @@
+"use strict";
+/* Copyright (c) 2021-2025 Richard Rodger, MIT License */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.makeScalar = makeScalar;
+const err_1 = require("../err");
+const NumberVal_1 = require("./NumberVal");
+const StringVal_1 = require("./StringVal");
+const BooleanVal_1 = require("./BooleanVal");
+const NullVal_1 = require("./NullVal");
+// TODO: move to FuncBaseVal
+function makeScalar(scalar) {
+    const st = typeof scalar;
+    const spec = { peg: scalar };
+    if ('number' === st) {
+        return new NumberVal_1.NumberVal(spec);
+    }
+    else if ('string' === st) {
+        return new StringVal_1.StringVal(spec);
+    }
+    else if ('boolean' === st) {
+        return new BooleanVal_1.BooleanVal(spec);
+    }
+    else if (null === scalar) {
+        return new NullVal_1.NullVal(spec);
+    }
+    else {
+        throw new err_1.AontuError('Not a scalar: ' + scalar);
+    }
+}
+//# sourceMappingURL=valutil.js.map

package/dist/val/valutil.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"valutil.js","sourceRoot":"","sources":["../../src/val/valutil.ts"],"names":[],"mappings":";AAAA,yDAAyD;;AAWzD,gCAmBC;AA5BD,gCAAmC;AAEnC,2CAAuC;AACvC,2CAAuC;AACvC,6CAAyC;AACzC,uCAAmC;AAGnC,4BAA4B;AAC5B,SAAgB,UAAU,CAAC,MAAW;IACpC,MAAM,EAAE,GAAG,OAAO,MAAM,CAAA;IACxB,MAAM,IAAI,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,CAAA;IAE5B,IAAI,QAAQ,KAAK,EAAE,EAAE,CAAC;QACpB,OAAO,IAAI,qBAAS,CAAC,IAAI,CAAC,CAAA;IAC5B,CAAC;SACI,IAAI,QAAQ,KAAK,EAAE,EAAE,CAAC;QACzB,OAAO,IAAI,qBAAS,CAAC,IAAI,CAAC,CAAA;IAC5B,CAAC;SACI,IAAI,SAAS,KAAK,EAAE,EAAE,CAAC;QAC1B,OAAO,IAAI,uBAAU,CAAC,IAAI,CAAC,CAAA;IAC7B,CAAC;SACI,IAAI,IAAI,KAAK,MAAM,EAAE,CAAC;QACzB,OAAO,IAAI,iBAAO,CAAC,IAAI,CAAC,CAAA;IAC1B,CAAC;SACI,CAAC;QACJ,MAAM,IAAI,gBAAU,CAAC,gBAAgB,GAAG,MAAM,CAAC,CAAA;IACjD,CAAC;AACH,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aontu",
-  "version": "0.29.0",
+  "version": "0.30.2",
   "main": "dist/aontu.js",
   "type": "commonjs",
   "browser": "dist/aontu.min.js",
@@ -16,62 +16,44 @@
     "url": "git://github.com/rjrodger/aontu.git"
   },
   "scripts": {
-    "test": "npm run version && jest --coverage",
-    "test-pure": "npm run version && jest --coverage --config jest.config.pure.js",
-    "test-some": "npm run version && jest -t",
-    "test-some-pure": "npm run version && jest --config jest.config.pure.js -t",
-    "test-watch": "npm run version && jest --coverage --watchAll",
-    "test-web": "npm run build-web && browserify -i util -o test/web.js -e test/entry.js -im -t aliasify && open test/web.html",
-    "watch": "tsc -w -d",
-    "prettier": "prettier --write --no-semi --single-quote *.ts test/*.js",
-    "build": "tsc -d",
-    "build-web": "tsc -d && npm run build-browser",
-    "build-browser": "cp dist/aontu.js dist/aontu.min.js && browserify -o dist/aontu.min.js -e dist/aontu.js -s Aontu -im -i assert -p tinyify -t aliasify",
-    "clean": "rm -rf dist node_modules yarn.lock package-lock.json",
+    "test": "node --enable-source-maps --test \"dist-test/**/*.test.js\"",
+    "test-some": "node --enable-source-maps --test-name-pattern=\"$npm_config_pattern\" --test \"dist-test/**/*.test.js\"",
+    "watch": "tsc --build src test -w",
+    "build": "tsc --build src test",
+    "clean": "rm -rf dist dist-test node_modules yarn.lock package-lock.json",
     "reset": "npm run clean && npm i && npm run build && npm test",
     "version": "node -r fs -e \"v=require('./package.json').version;s=fs.readFileSync('./aontu.ts').toString();if(!s.includes('VERSION = \\''+v+'\\'')){s=s.replace(/VERSION = '.*?'/,'VERSION = \\''+v+'\\'');fs.writeFileSync('./aontu.ts',s)}\"",
     "repo-tag": "REPO_VERSION=`node -e \"console.log(require('./package').version)\"` && echo TAG: v$REPO_VERSION && git commit -a -m v$REPO_VERSION && git push && git tag v$REPO_VERSION && git push --tags;",
     "repo-publish": "npm run clean && npm i && npm run repo-publish-quick",
-    "repo-publish-quick": "npm run prettier && npm run build && npm run test && npm run repo-tag && npm publish --registry https://registry.npmjs.org "
+    "repo-publish-quick": "npm run build && npm run test && npm run repo-tag && npm publish --registry https://registry.npmjs.org "
   },
   "license": "MIT",
   "engines": {
-    "node": ">=16"
+    "node": ">=22"
   },
   "files": [
-    "aontu.ts",
-    "lib",
-    "dist/aontu.*",
-    "dist/lib",
+    "src",
+    "dist",
     "LICENSE"
   ],
   "dependencies": {
-    "@jsonic/directive": "^1.1.0",
-    "@jsonic/expr": "^1.3.0",
-    "jsonic": "^2.16.0",
-    "@jsonic/multisource": "^1.9.0",
-    "@jsonic/path": "^1.4.0"
+    "@jsonic/directive": "^1.2.0",
+    "@jsonic/expr": "^2.0.0",
+    "@jsonic/multisource": "^2.1.0",
+    "@jsonic/path": "^1.5.1",
+    "jsonic": "^2.18.0"
   },
   "devDependencies": {
-    "@types/jest": "^30.0.0",
-    "@types/node": "^24.3.0",
-    "aliasify": "^2.1.0",
-    "browserify": "^17.0.1",
-    "es-jest": "^2.1.0",
-    "esbuild": "^0.25.9",
-    "jest": "^30.1.3",
-    "prettier": "^3.6.2",
-    "serve": "^14.2.4",
-    "tinyify": "^4.0.0",
-    "ts-jest": "^29.4.1",
-    "typescript": "^5.9.2"
+    "@hapi/code": "^9.0.3",
+    "@types/node": "^24.10.1",
+    "memfs": "^4.51.0",
+    "typescript": "^5.9.3"
   },
   "aliasify": {
     "aliases": {
       "@jsonic/multisource/resolver/file": "@jsonic/multisource/dist/resolver/file.js",
       "@jsonic/multisource/resolver/pkg": "@jsonic/multisource/dist/resolver/pkg.js",
-      "@jsonic/multisource/resolver/mem": "@jsonic/multisource/dist/resolver/mem.js",
-      "@jsonic/jsonic-next/debug": "@jsonic/jsonic-next/dist/debug.js"
+      "@jsonic/multisource/resolver/mem": "@jsonic/multisource/dist/resolver/mem.js"
     }
   }
 }