aontu 0.29.0 → 0.30.2

package/aontu.ts

@@ -1,92 +0,0 @@
-/* Copyright (c) 2021-2024 Richard Rodger, MIT License */
-
-import type { Val, Options, FST } from './lib/type'
-
-import { Lang } from './lib/lang'
-import { Unify, Context } from './lib/unify'
-import { Nil } from './lib/val/Nil'
-import { MapVal } from './lib/val/MapVal'
-import { descErr } from './lib/err'
-
-// TODO: BUG: foo: { bar: {} } zed: {} puts zed a wrong level
-
-// TODO: exclude tests from dist!!!
-// TODO: propogate property path and url properly over unification, and multisource
-
-/*
-NEXT:
-inject path from multisource into Vals when created
-report via nil error
-also trace deps into top val and watch via model
-*/
-
-// TODO: error reporting
-
-// TODO: debug tracing
-// TODO: providers - e.g source files from paths
-
-// TODO: Aontu should return final generated version?
-
-/* `Aontu('a:1') => opts={src:'a:1',print:0,...}`
- * `Aontu('a:1',{print:1}) => opts={src:'a:1',print:1,...}`
- * `Aontu({src:'a:1'},{src:'a:2'}) => opts={src:'a:2',print:0,...}`
- */
-function Aontu(src: string | Partial<Options>, popts?: Partial<Options>): Val {
-  // TODO: review: why is an undefined src allowed?
-
-  let opts = prepareOptions(src, popts)
-
-  let deps = {}
-
-  // TODO: handle empty src
-  let val = parse(opts, { deps })
-
-  if (null == val) {
-    val = new MapVal({ peg: {} })
-  }
-
-  let uni = new Unify(val as unknown as Val)
-  let res = uni.res
-  let err = uni.err
-
-  descErr(uni.err, { src: opts.src, fs: opts.fs })
-
-  res.deps = deps
-  res.err = err
-
-  return res
-}
-
-function prepareOptions(
-  src: string | Partial<Options>,
-  popts?: Partial<Options>,
-): Options {
-  // Convert convenience first param into Options.src
-  let srcopts: Partial<Options> = 'string' === typeof src ? { src } : src
-
-  let opts: Options = {
-    ...{
-      src: '',
-      print: 0,
-    },
-    ...srcopts,
-    ...(popts || {}),
-  }
-
-  return opts
-}
-
-function parse(opts: Options, ctx: { deps: any; fs?: FST }): Val {
-  let lang = new Lang(opts)
-  let val = lang.parse(opts.src, { deps: ctx.deps })
-  return val
-}
-
-const util = {
-  parse,
-  options: prepareOptions,
-}
-
-export { Aontu, Val, Nil, Lang, Context, parse, util }
-
-export default Aontu

package/dist/lib/err.d.ts

@@ -1,4 +0,0 @@
-import { ErrContext } from './type';
-import { Nil } from './val/Nil';
-declare function descErr<NILS extends Nil | Nil[]>(err: NILS | any, errctx?: ErrContext): any;
-export { descErr };

package/dist/lib/err.js

@@ -1,61 +0,0 @@
-"use strict";
-/* Copyright (c) 2021-2025 Richard Rodger, MIT License */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.descErr = descErr;
-const jsonic_1 = require("jsonic");
-const { errmsg } = jsonic_1.util;
-// TODO: move to utility?
-function descErr(err, errctx) {
-    var _a, _b, _c;
-    if (err === null || err === void 0 ? void 0 : err.isNil) {
-        // console.trace()
-        if (null == err.msg || '' === err.msg) {
-            let v1 = err.primary;
-            let v2 = err.secondary;
-            let v1src = resolveSrc(v1, errctx);
-            let v2src = resolveSrc(v2, errctx);
-            let valpath = (0 < ((_a = err.path) === null || _a === void 0 ? void 0 : _a.length) ? err.path.join('.') : '');
-            let attempt = (null == v2 ? 'resolve' : 'unify');
-            err.msg = [
-                errmsg({
-                    color: true,
-                    name: 'aontu',
-                    code: err.why,
-                    msg: 'Cannot ' +
-                        attempt +
-                        ' path $.' + valpath + ' value' + (null == v2 ? '' : 's'),
-                }),
-                (null != v1 && errmsg({
-                    color: true,
-                    msg: 'Cannot ' + attempt + ' value: ' + v1.canon +
-                        (null == v2 ? '' : ' with value: ' + v2.canon),
-                    smsg: 'value was: ' + v1.canon,
-                    file: (_b = v1.url) === null || _b === void 0 ? void 0 : _b.replace(process.cwd() + '/', ''),
-                    src: v1src,
-                    row: v1.row,
-                    col: v1.col,
-                })),
-                (null != v2 && errmsg({
-                    color: true,
-                    msg: 'Cannot ' + attempt + ' value: ' + v2.canon + ' with value: ' + v1.canon,
-                    smsg: 'value was: ' + v2.canon,
-                    file: (_c = v2.url) === null || _c === void 0 ? void 0 : _c.replace(process.cwd() + '/', ''),
-                    src: v2src,
-                    row: v2.row,
-                    col: v2.col,
-                })),
-            ].filter(n => null != n && false !== n).join('\n');
-        }
-        return err;
-    }
-    else {
-        return err.map((n) => descErr(n, errctx));
-    }
-}
-function resolveSrc(v, errctx) {
-    var _a;
-    let src = null == v || null == v.url ? errctx === null || errctx === void 0 ? void 0 : errctx.src :
-        ((_a = errctx === null || errctx === void 0 ? void 0 : errctx.fs) === null || _a === void 0 ? void 0 : _a.existsSync(v.url)) ? errctx.fs.readFileSync(v.url, 'utf8') : '';
-    return src;
-}
-//# sourceMappingURL=err.js.map

package/dist/lib/err.js.map

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

package/dist/lib/lang.d.ts

@@ -1,15 +0,0 @@
-import { Jsonic } from 'jsonic';
-import type { Val, Options } from './type';
-declare class Site {
-    row: number;
-    col: number;
-    url: string;
-    constructor(val: Val);
-}
-declare class Lang {
-    jsonic: Jsonic;
-    options: Options;
-    constructor(options?: Partial<Options>);
-    parse(src: string, opts?: Partial<Options>): Val;
-}
-export { Lang, Site, };

package/dist/lib/lang.js

@@ -1,409 +0,0 @@
-"use strict";
-/* Copyright (c) 2021-2023 Richard Rodger, MIT License */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Site = exports.Lang = void 0;
-const jsonic_1 = require("jsonic");
-const debug_1 = require("jsonic/debug");
-const multisource_1 = require("@jsonic/multisource");
-const file_1 = require("@jsonic/multisource/resolver/file");
-const pkg_1 = require("@jsonic/multisource/resolver/pkg");
-const mem_1 = require("@jsonic/multisource/resolver/mem");
-const expr_1 = require("@jsonic/expr");
-const path_1 = require("@jsonic/path");
-const DisjunctVal_1 = require("./val/DisjunctVal");
-const ConjunctVal_1 = require("./val/ConjunctVal");
-const ListVal_1 = require("./val/ListVal");
-const MapVal_1 = require("./val/MapVal");
-const Nil_1 = require("./val/Nil");
-const PrefVal_1 = require("./val/PrefVal");
-const RefVal_1 = require("./val/RefVal");
-const VarVal_1 = require("./val/VarVal");
-const PlusVal_1 = require("./val/PlusVal");
-const NullVal_1 = require("./val/NullVal");
-const val_1 = require("./val");
-class Site {
-    // static NONE = new Site(TOP)
-    constructor(val) {
-        this.row = -1;
-        this.col = -1;
-        this.url = '';
-        // TODO: logic to select most meaningful site if val has no site,
-        // but has peg children that do.
-        this.row = val.row;
-        this.col = val.col;
-        this.url = val.url;
-    }
-}
-exports.Site = Site;
-let AontuJsonic = function aontu(jsonic) {
-    jsonic.use(path_1.Path);
-    // TODO: refactor Val constructor
-    // let addsite = (v: Val, p: string[]) => (v.path = [...(p || [])], v)
-    let addsite = (v, r, ctx) => {
-        v.row = null == r.o0 ? -1 : r.o0.rI;
-        v.col = null == r.o0 ? -1 : r.o0.cI;
-        v.url = ctx.meta.multisource ? ctx.meta.multisource.path : '';
-        v.path = r.k ? [...(r.k.path || [])] : [];
-        return v;
-    };
-    jsonic.options({
-        value: {
-            def: {
-                // NOTE: specify with functions as jsonic/deep will
-                // remove class prototype as options are assumed plain
-                // (except for functions).
-                // TODO: jsonic should be able to pass context into these
-                'string': {
-                    val: (r, ctx) => addsite(new val_1.ScalarTypeVal({ peg: String }), r, ctx)
-                },
-                'number': {
-                    val: (r, ctx) => addsite(new val_1.ScalarTypeVal({ peg: Number }), r, ctx)
-                },
-                'integer': {
-                    val: (r, ctx) => addsite(new val_1.ScalarTypeVal({ peg: val_1.Integer }), r, ctx)
-                },
-                'boolean': {
-                    val: (r, ctx) => addsite(new val_1.ScalarTypeVal({ peg: Boolean }), r, ctx)
-                },
-                'nil': {
-                    val: (r, ctx) => addsite(new Nil_1.Nil('literal'), r, ctx)
-                },
-                // TODO: FIX: need a TOP instance to hold path
-                'top': { val: () => val_1.TOP },
-            }
-        },
-        map: {
-            merge: (prev, curr, _r, ctx) => {
-                let pval = prev;
-                let cval = curr;
-                if ((pval === null || pval === void 0 ? void 0 : pval.isVal) && (cval === null || cval === void 0 ? void 0 : cval.isVal)) {
-                    // TODO: test multi element conjuncts work
-                    if (pval instanceof ConjunctVal_1.ConjunctVal && cval instanceof ConjunctVal_1.ConjunctVal) {
-                        pval.append(cval);
-                        return pval;
-                    }
-                    else if (pval instanceof ConjunctVal_1.ConjunctVal) {
-                        pval.append(cval);
-                        return pval;
-                    }
-                    // else if (cval instanceof ConjunctVal) {
-                    //   cval.append(pval)
-                    //   return cval
-                    // }
-                    else {
-                        return addsite(new ConjunctVal_1.ConjunctVal({ peg: [pval, cval] }), prev, ctx);
-                    }
-                }
-                // Handle defered conjuncts, where MapVal does not yet
-                // exist, by creating ConjunctVal later.
-                else {
-                    prev.___merge = (prev.___merge || []);
-                    prev.___merge.push(curr);
-                    return prev;
-                }
-            }
-        }
-    });
-    let opmap = {
-        'conjunct-infix': (r, ctx, _op, terms) => addsite(new ConjunctVal_1.ConjunctVal({ peg: terms }), r, ctx),
-        'disjunct-infix': (r, ctx, _op, terms) => addsite(new DisjunctVal_1.DisjunctVal({ peg: terms }), r, ctx),
-        'dot-prefix': (r, ctx, _op, terms) => {
-            return addsite(new RefVal_1.RefVal({ peg: terms, prefix: true }), r, ctx);
-        },
-        'dot-infix': (r, ctx, _op, terms) => {
-            return addsite(new RefVal_1.RefVal({ peg: terms }), r, ctx);
-        },
-        'star-prefix': (r, ctx, _op, terms) => addsite(new PrefVal_1.PrefVal({ peg: terms[0] }), r, ctx),
-        'dollar-prefix': (r, ctx, _op, terms) => {
-            // $.a.b absolute path
-            if (terms[0] instanceof RefVal_1.RefVal) {
-                terms[0].absolute = true;
-                return terms[0];
-            }
-            return addsite(new VarVal_1.VarVal({ peg: terms[0] }), r, ctx);
-        },
-        'plus-infix': (r, ctx, _op, terms) => {
-            return addsite(new PlusVal_1.PlusVal({ peg: [terms[0], terms[1]] }), r, ctx);
-        },
-        'negative-prefix': (r, ctx, _op, terms) => {
-            let val = terms[0];
-            val.peg = -1 * val.peg;
-            return addsite(val, r, ctx);
-        },
-        'positive-prefix': (r, ctx, _op, terms) => {
-            let val = terms[0];
-            return addsite(val, r, ctx);
-        },
-        'plain-paren': (r, ctx, _op, terms) => {
-            let val = terms[0];
-            return addsite(val, r, ctx);
-        },
-    };
-    jsonic
-        .use(expr_1.Expr, {
-        op: {
-            // disjunct > conjunct: c & b | a -> c & (b | a)
-            'conjunct': {
-                infix: true, src: '&', left: 14000000, right: 15000000
-            },
-            'disjunct': {
-                infix: true, src: '|', left: 16000000, right: 17000000
-            },
-            'plus-infix': {
-                src: '+',
-                infix: true,
-                left: 20000000,
-                right: 21000000,
-            },
-            'dollar-prefix': {
-                src: '$',
-                prefix: true,
-                right: 31000000,
-            },
-            'dot-infix': {
-                src: '.',
-                infix: true,
-                left: 25000000,
-                right: 24000000,
-            },
-            'dot-prefix': {
-                src: '.',
-                prefix: true,
-                right: 24000000,
-            },
-            'star': {
-                src: '*',
-                prefix: true,
-                right: 24000000,
-            },
-            addition: null,
-            subtraction: null,
-            multiplication: null,
-            division: null,
-            remainder: null,
-        },
-        evaluate: (r, ctx, op, terms) => {
-            // console.log('EVAL', op.name, terms)
-            let val = opmap[op.name](r, ctx, op, terms);
-            return val;
-        }
-    });
-    let CJ = jsonic.token['#E&'];
-    let CL = jsonic.token.CL;
-    jsonic.rule('val', (rs) => {
-        rs
-            .open([{ s: [CJ, CL], p: 'map', b: 2, n: { pk: 1 }, g: 'spread' }])
-            .bc((r, ctx) => {
-            let valnode = r.node;
-            let valtype = typeof valnode;
-            if ('string' === valtype) {
-                valnode = addsite(new val_1.StringVal({ peg: r.node }), r, ctx);
-            }
-            else if ('number' === valtype) {
-                if (Number.isInteger(r.node)) {
-                    valnode = addsite(new val_1.IntegerVal({ peg: r.node }), r, ctx);
-                }
-                else {
-                    valnode = addsite(new val_1.NumberVal({ peg: r.node }), r, ctx);
-                }
-            }
-            else if ('boolean' === valtype) {
-                valnode = addsite(new val_1.BooleanVal({ peg: r.node }), r, ctx);
-            }
-            else if (null === valnode) {
-                valnode = addsite(new NullVal_1.NullVal({ peg: r.node }), r, ctx);
-            }
-            if (null != valnode && 'object' === typeof valnode) {
-                let st = r.o0;
-                valnode.row = st.rI;
-                valnode.col = st.cI;
-                valnode.url = ctx.meta.multisource && ctx.meta.multisource.path;
-            }
-            // else { ERROR? }
-            r.node = valnode;
-            return undefined;
-        })
-            .close([{ s: [CJ, CL], b: 2, g: 'spread,json,more' }]);
-        return rs;
-    });
-    jsonic.rule('map', (rs) => {
-        rs
-            .open([{ s: [CJ, CL], p: 'pair', b: 2, g: 'spread' }])
-            .bc((r, ctx) => {
-            let mo = r.node;
-            //  Handle defered conjuncts, e.g. `{x:1 @"foo"}`
-            if (mo.___merge) {
-                let mop = { ...mo };
-                delete mop.___merge;
-                // TODO: needs addpath?
-                let mopv = new MapVal_1.MapVal({ peg: mop });
-                r.node =
-                    addsite(new ConjunctVal_1.ConjunctVal({ peg: [mopv, ...mo.___merge] }), r, ctx);
-            }
-            else {
-                r.node = addsite(new MapVal_1.MapVal({ peg: mo }), r, ctx);
-            }
-            return undefined;
-        })
-            .close([{ s: [CJ, CL], b: 2, g: 'spread,json,more' }]);
-        return rs;
-    });
-    jsonic.rule('list', (rs) => {
-        rs.bc((r, ctx) => {
-            r.node = addsite(new ListVal_1.ListVal({ peg: r.node }), r, ctx);
-            return undefined;
-        });
-        return rs;
-    });
-    jsonic.rule('pair', (rs) => {
-        rs
-            .open([{
-                s: [CJ, CL], p: 'val',
-                u: { spread: true },
-                g: 'spread'
-            }])
-            // NOTE: manually adjust path - @jsonic/path ignores as not pair:true
-            .ao((r) => {
-            if (0 < r.d && r.u.spread) {
-                r.child.k.path = [...r.k.path, '&'];
-                r.child.k.key = '&';
-            }
-        })
-            .bc((rule) => {
-            // TRAVERSE PARENTS TO GET PATH
-            if (rule.u.spread) {
-                rule.node[MapVal_1.MapVal.SPREAD] =
-                    (rule.node[MapVal_1.MapVal.SPREAD] || { o: rule.o0.src, v: [] });
-                rule.node[MapVal_1.MapVal.SPREAD].v.push(rule.child.node);
-            }
-            return undefined;
-        })
-            .close([
-            { s: [CJ, CL], c: (r) => r.lte('dmap', 1), r: 'pair', b: 2, g: 'spread,json,pair' },
-            { s: [CJ, CL], b: 2, g: 'spread,json,more' }
-        ]);
-        return rs;
-    });
-    jsonic.rule('elem', (rs) => {
-        rs
-            // PPP
-            .open([{ s: [CJ, CL], p: 'val', u: { spread: true }, n: { pk: 1 }, g: 'spread' }])
-            .bc((rule) => {
-            // TRAVERSE PARENTS TO GET PATH
-            if (rule.u.spread) {
-                rule.node[ListVal_1.ListVal.SPREAD] =
-                    (rule.node[ListVal_1.ListVal.SPREAD] || { o: rule.o0.src, v: [] });
-                rule.node[ListVal_1.ListVal.SPREAD].v.push(rule.child.node);
-            }
-            return undefined;
-        })
-            .close([{ s: [CJ, CL], r: 'elem', b: 2, g: 'spread,json,more' }]);
-        return rs;
-    });
-};
-// const includeFileResolver = makeFileResolver((spec: any) => {
-//   return 'string' === typeof spec ? spec : spec?.peg
-// })
-function makeModelResolver(options) {
-    var _a, _b;
-    const useRequire = options.require || require;
-    let memResolver = (0, mem_1.makeMemResolver)({
-        ...(((_a = options.resolver) === null || _a === void 0 ? void 0 : _a.mem) || {})
-    });
-    // let fileResolver = makeFileResolver({
-    //   ...(options.resolver?.file || {})
-    // })
-    // TODO: make this consistent with other resolvers
-    let fileResolver = (0, file_1.makeFileResolver)((spec) => {
-        return 'string' === typeof spec ? spec : spec === null || spec === void 0 ? void 0 : spec.peg;
-    });
-    let pkgResolver = (0, pkg_1.makePkgResolver)({
-        require: useRequire,
-        ...(((_b = options.resolver) === null || _b === void 0 ? void 0 : _b.pkg) || {})
-    });
-    return function ModelResolver(spec, popts, rule, ctx, jsonic) {
-        let path = 'string' === typeof spec ? spec : spec === null || spec === void 0 ? void 0 : spec.peg;
-        let search = [];
-        let res = memResolver(path, popts, rule, ctx, jsonic);
-        res.path = path;
-        if (res.found) {
-            return res;
-        }
-        search = search.concat(res.search);
-        res = fileResolver(path, popts, rule, ctx, jsonic);
-        res.path = path;
-        if (res.found) {
-            return res;
-        }
-        search = search.concat(res.search);
-        res = pkgResolver(path, popts, rule, ctx, jsonic);
-        res.path = path;
-        if (res.found) {
-            return res;
-        }
-        res.search = search.concat(res.search);
-        return res;
-    };
-}
-class Lang {
-    constructor(options) {
-        this.options = {
-            src: '',
-            print: -1,
-            debug: false,
-            trace: false,
-        };
-        this.options = Object.assign({}, this.options, options);
-        const modelResolver = makeModelResolver(this.options);
-        this.jsonic = jsonic_1.Jsonic.make();
-        if (this.options.debug) {
-            this.jsonic.use(debug_1.Debug, {
-                trace: this.options.trace
-            });
-        }
-        this.jsonic
-            .use(AontuJsonic)
-            .use(multisource_1.MultiSource, {
-            // resolver: options?.resolver || includeFileResolver
-            resolver: (options === null || options === void 0 ? void 0 : options.resolver) || modelResolver
-        });
-    }
-    parse(src, opts) {
-        // JSONIC-UPDATE - check meta
-        let jm = {
-            fs: opts === null || opts === void 0 ? void 0 : opts.fs,
-            fileName: this.options.path,
-            multisource: {
-                path: this.options.path,
-                deps: (opts && opts.deps) || undefined
-            }
-        };
-        // Pass through Jsonic debug log value
-        if (opts && null != opts.log && Number.isInteger(opts.log)) {
-            jm.log = opts.log;
-        }
-        // jm.log = -1
-        let val;
-        try {
-            val = this.jsonic(src, jm);
-        }
-        catch (e) {
-            if (e instanceof jsonic_1.JsonicError || 'JsonicError' === e.constructor.name) {
-                val = new Nil_1.Nil({
-                    why: 'parse',
-                    err: new Nil_1.Nil({
-                        why: 'syntax',
-                        msg: e.message,
-                        err: e,
-                    })
-                });
-            }
-            else {
-                throw e;
-            }
-        }
-        return val;
-    }
-}
-exports.Lang = Lang;
-//# sourceMappingURL=lang.js.map

package/dist/lib/lang.js.map

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

package/dist/lib/op/disjunct.d.ts

@@ -1,3 +0,0 @@
-import { Operation } from './op';
-declare const disjunct: Operation;
-export { disjunct };

package/dist/lib/op/disjunct.js

@@ -1,28 +0,0 @@
-"use strict";
-/* Copyright (c) 2021-2023 Richard Rodger, MIT License */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.disjunct = void 0;
-const DisjunctVal_1 = require("../val/DisjunctVal");
-const ValBase_1 = require("../val/ValBase");
-const disjunct = (ctx, a, b) => {
-    let peers = [];
-    let origsites = [];
-    // origsites.push(append(peers, a))
-    // origsites.push(append(peers, b))
-    let out = new DisjunctVal_1.DisjunctVal({ peg: peers }, ctx, origsites);
-    return out;
-};
-exports.disjunct = disjunct;
-function append(peers, v) {
-    // let origsite: Site = Site.NONE
-    if (v.isDisjunctVal) {
-        peers.push(...v.peg);
-        // origsite = v.site
-    }
-    // TODO: handle no-error Nil (drop) and error Nil (keep and become)
-    else if (v instanceof ValBase_1.ValBase) {
-        peers.push(v);
-    }
-    // return origsite
-}
-//# sourceMappingURL=disjunct.js.map

package/dist/lib/op/disjunct.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"disjunct.js","sourceRoot":"","sources":["../../../lib/op/disjunct.ts"],"names":[],"mappings":";AAAA,yDAAyD;;;AAWzD,oDAAgD;AAOhD,4CAAwC;AAIxC,MAAM,QAAQ,GAAc,CAAC,GAAa,EAAE,CAAO,EAAE,CAAO,EAAE,EAAE;IAC9D,IAAI,KAAK,GAAU,EAAE,CAAA;IACrB,IAAI,SAAS,GAAW,EAAE,CAAA;IAC1B,mCAAmC;IACnC,mCAAmC;IACnC,IAAI,GAAG,GAAG,IAAI,yBAAW,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE,GAAG,EAAE,SAAS,CAAC,CAAA;IACzD,OAAO,GAAG,CAAA;AACZ,CAAC,CAAA;AAoBC,4BAAQ;AAjBV,SAAS,MAAM,CAAC,KAAY,EAAE,CAAO;IACnC,iCAAiC;IAEjC,IAAI,CAAC,CAAC,aAAa,EAAE,CAAC;QACpB,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAA;QACpB,oBAAoB;IACtB,CAAC;IAED,mEAAmE;SAC9D,IAAI,CAAC,YAAY,iBAAO,EAAE,CAAC;QAC9B,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;IACf,CAAC;IAED,kBAAkB;AACpB,CAAC"}

package/dist/lib/op/op.d.ts

@@ -1,6 +0,0 @@
-import { Context } from '../unify';
-import { Val } from '../type';
-import { disjunct } from './disjunct';
-import { unite } from './unite';
-type Operation = (ctx: Context, a?: Val, b?: Val, whence?: string) => Val;
-export { Operation, disjunct, unite, };