aontu 0.29.0 → 0.30.2

package/dist/lib/op/op.js

@@ -1,9 +0,0 @@
-"use strict";
-/* Copyright (c) 2021-2023 Richard Rodger, MIT License. */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.unite = exports.disjunct = void 0;
-const disjunct_1 = require("./disjunct");
-Object.defineProperty(exports, "disjunct", { enumerable: true, get: function () { return disjunct_1.disjunct; } });
-const unite_1 = require("./unite");
-Object.defineProperty(exports, "unite", { enumerable: true, get: function () { return unite_1.unite; } });
-//# sourceMappingURL=op.js.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"op.js","sourceRoot":"","sources":["../../../lib/op/op.ts"],"names":[],"mappings":";AAAA,0DAA0D;;;AAM1D,yCAAqC;AAQnC,yFARO,mBAAQ,OAQP;AAPV,mCAA+B;AAQ7B,sFARO,aAAK,OAQP"}

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

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

package/dist/lib/op/unite.js

@@ -1,100 +0,0 @@
-"use strict";
-/* Copyright (c) 2021-2023 Richard Rodger, MIT License */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.unite = void 0;
-const type_1 = require("../type");
-const Nil_1 = require("../val/Nil");
-const val_1 = require("../val");
-let uc = 0;
-// Vals should only have to unify downwards (in .unify) over Vals they understand.
-// and for complex Vals, TOP, which means self unify if not yet done
-const unite = (ctx, a, b, whence) => {
-    let out = a;
-    let why = 'u';
-    // console.log('AA OP unite  IN', a?.canon, b?.canon,
-    //   'W', whence,
-    //   'E', 0 < ctx?.err?.length ? ctx.err.map((e: Val) => e.canon) : '')
-    let unified = false;
-    if (b && (val_1.TOP === a || !a)) {
-        //console.log('Utb', b.canon)
-        out = b;
-        why = 'b';
-    }
-    else if (a && (val_1.TOP === b || !b)) {
-        //console.log('Uta', a.canon)
-        out = a;
-        why = 'a';
-    }
-    else if (a && b && val_1.TOP !== b) {
-        if (a.isNil) {
-            out = update(a, b);
-            why = 'an';
-        }
-        else if (b.isNil) {
-            out = update(b, a);
-            why = 'bn';
-        }
-        else if (a.isConjunctVal) {
-            // console.log('Q', a.canon, b.canon)
-            out = a.unify(b, ctx);
-            unified = true;
-            why = 'acj';
-        }
-        else if (b.isConjunctVal ||
-            b.isDisjunctVal ||
-            b.isRefVal ||
-            b.isPrefVal) {
-            // console.log('U', a.canon, b.canon)
-            // return b.unify(a, ctx)
-            out = b.unify(a, ctx);
-            unified = true;
-            // console.log('UO', out.canon)
-            why = 'bv';
-        }
-        // Exactly equal scalars.
-        else if (a.constructor === b.constructor && a.peg === b.peg) {
-            out = update(a, b);
-            why = 'up';
-        }
-        else {
-            // console.log('QQQ')
-            out = a.unify(b, ctx);
-            unified = true;
-            why = 'ab';
-        }
-    }
-    if (!out || !out.unify) {
-        out = Nil_1.Nil.make(ctx, 'unite', a, b);
-        why += 'N';
-    }
-    if (type_1.DONE !== out.done && !unified) {
-        out = out.unify(val_1.TOP, ctx);
-        why += 'T';
-    }
-    // console.log('AA OP unite OUT', a?.canon, b?.canon, '->', out && out.canon,
-    //   0 < ctx?.err?.length ? ctx.err.map((e: Val) => e.canon) : '')
-    uc++;
-    // TODO: KEEP THIS! print in debug mode! push to ctx.log?
-    /*
-    console.log(
-      'U',
-      ('' + ctx.cc).padStart(2),
-      ('' + uc).padStart(4),
-      (whence || '').substring(0, 16).padEnd(16),
-      why.padEnd(6),
-      ctx.path.join('.').padEnd(16),
-      (a || '').constructor.name.substring(0, 3),
-      '&',
-      (b || '').constructor.name.substring(0, 3),
-      '|',
-      '  '.repeat(ctx.path.length),
-      a?.canon, '&', b?.canon, '->', out.canon)
-    */
-    return out;
-};
-exports.unite = unite;
-function update(x, _y) {
-    // TODO: update x with y.site
-    return x;
-}
-//# sourceMappingURL=unite.js.map

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

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

package/dist/lib/type.d.ts

@@ -1,49 +0,0 @@
-import * as Fs from 'node:fs';
-import { Resolver } from '@jsonic/multisource';
-import { Context } from './unify';
-type FST = typeof Fs;
-type Options = {
-    src: string;
-    print: number;
-    resolver?: Resolver;
-    base?: string;
-    path?: string;
-    debug?: boolean;
-    trace?: boolean;
-    fs?: FST;
-    deps?: any;
-    log?: any;
-};
-interface Val {
-    isVal: boolean;
-    id: number;
-    done: number;
-    path: string[];
-    row: number;
-    col: number;
-    url: string;
-    top: boolean;
-    peg: any;
-    err: any[];
-    deps?: any;
-    same(peer: Val): boolean;
-    clone(spec?: ValSpec, ctx?: Context): Val;
-    unify(peer: Val, ctx?: Context): Val;
-    get canon(): string;
-    gen(ctx?: Context): any;
-}
-type ValSpec = {
-    peg?: any;
-    [name: string]: any;
-} | null;
-type ValMap = {
-    [key: string]: Val;
-};
-type ValList = Val[];
-declare const DONE = -1;
-type ErrContext = {
-    src?: string;
-    fs?: FST;
-};
-export type { Val, ValSpec, ValMap, ValList, Options, ErrContext, FST, };
-export { DONE, Resolver, };

package/dist/lib/type.js

@@ -1,7 +0,0 @@
-"use strict";
-/* Copyright (c) 2022-2023 Richard Rodger, MIT License */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.DONE = void 0;
-const DONE = -1;
-exports.DONE = DONE;
-//# sourceMappingURL=type.js.map

package/dist/lib/type.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"type.js","sourceRoot":"","sources":["../../lib/type.ts"],"names":[],"mappings":";AAAA,yDAAyD;;;AAwEzD,MAAM,IAAI,GAAG,CAAC,CAAC,CAAA;AAmBb,oBAAI"}

package/dist/lib/unify.d.ts

@@ -1,38 +0,0 @@
-import type { Val } from './type';
-import { FST } from './type';
-import { Lang } from './lang';
-import { Nil } from '../lib/val/Nil';
-type Path = string[];
-declare class Context {
-    root: Val;
-    path: Path;
-    err: Nil[];
-    vc: number;
-    cc: number;
-    var: Record<string, Val>;
-    src?: string;
-    fs?: FST;
-    constructor(cfg: {
-        root: Val;
-        path?: Path;
-        err?: Nil[];
-        vc?: number;
-        cc?: number;
-        var?: Record<string, Val>;
-    });
-    clone(cfg: {
-        root?: Val;
-        path?: Path;
-        err?: Nil[];
-    }): Context;
-    descend(key: string): Context;
-}
-declare class Unify {
-    root: Val;
-    res: Val;
-    err: Nil[];
-    cc: number;
-    lang: Lang;
-    constructor(root: Val | string, lang?: Lang, ctx?: Context);
-}
-export { Context, Path, Unify, };

package/dist/lib/unify.js

@@ -1,67 +0,0 @@
-"use strict";
-/* Copyright (c) 2021-2023 Richard Rodger, MIT License */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Unify = exports.Context = void 0;
-const type_1 = require("./type");
-const val_1 = require("./val");
-const lang_1 = require("./lang");
-const op_1 = require("./op/op");
-class Context {
-    constructor(cfg) {
-        this.cc = -1;
-        this.var = {};
-        this.root = cfg.root;
-        this.path = cfg.path || [];
-        this.err = cfg.err || [];
-        // Multiple unify passes will keep incrementing Val counter.
-        this.vc = null == cfg.vc ? 1000000000 : cfg.vc;
-        this.cc = null == cfg.cc ? this.cc : cfg.cc;
-        this.var = cfg.var || this.var;
-    }
-    clone(cfg) {
-        return new Context({
-            root: cfg.root || this.root,
-            path: cfg.path,
-            err: cfg.err || this.err,
-            vc: this.vc,
-            cc: this.cc,
-            var: { ...this.var },
-        });
-    }
-    descend(key) {
-        return this.clone({
-            root: this.root,
-            path: this.path.concat(key),
-        });
-    }
-}
-exports.Context = Context;
-class Unify {
-    constructor(root, lang, ctx) {
-        this.lang = lang || new lang_1.Lang();
-        if ('string' === typeof root) {
-            root = this.lang.parse(root);
-        }
-        this.cc = 0;
-        this.root = root;
-        this.res = root;
-        this.err = root.err || [];
-        let res = root;
-        // Only unify if no syntax errors
-        if (!root.nil) {
-            ctx = ctx || new Context({
-                root: res,
-                err: this.err,
-            });
-            let maxdc = 9; // 99
-            for (; this.cc < maxdc && type_1.DONE !== res.done; this.cc++) {
-                ctx.cc = this.cc;
-                res = (0, op_1.unite)(ctx, res, val_1.TOP);
-                ctx = ctx.clone({ root: res });
-            }
-        }
-        this.res = res;
-    }
-}
-exports.Unify = Unify;
-//# sourceMappingURL=unify.js.map

package/dist/lib/unify.js.map

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

package/dist/lib/utility.d.ts

@@ -1,3 +0,0 @@
-import type { Val } from './type';
-declare function formatPath(path: Val | string[], absolute?: boolean): string;
-export { formatPath };

package/dist/lib/utility.js

@@ -1,16 +0,0 @@
-"use strict";
-/* Copyright (c) 2023 Richard Rodger, MIT License */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.formatPath = formatPath;
-function formatPath(path, absolute) {
-    let parts;
-    if (Array.isArray(path)) {
-        parts = path;
-    }
-    else {
-        parts = path.path;
-    }
-    let pathstr = (0 < parts.length && false !== absolute ? '$.' : '') + parts.join('.');
-    return pathstr;
-}
-//# sourceMappingURL=utility.js.map

package/dist/lib/utility.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"utility.js","sourceRoot":"","sources":["../../lib/utility.ts"],"names":[],"mappings":";AAAA,oDAAoD;;AAqBlD,gCAAU;AAfZ,SAAS,UAAU,CAAC,IAAoB,EAAE,QAAkB;IAC1D,IAAI,KAAe,CAAA;IACnB,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;QACxB,KAAK,GAAG,IAAI,CAAA;IACd,CAAC;SACI,CAAC;QACJ,KAAK,GAAG,IAAI,CAAC,IAAI,CAAA;IACnB,CAAC;IAED,IAAI,OAAO,GAAG,CAAC,CAAC,GAAG,KAAK,CAAC,MAAM,IAAI,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IAEpF,OAAO,OAAO,CAAA;AAChB,CAAC"}

package/dist/lib/val/ConjunctVal.d.ts

@@ -1,17 +0,0 @@
-import type { Val, ValSpec } from '../type';
-import { Context } from '../unify';
-import { ValBase } from '../val/ValBase';
-declare class ConjunctVal extends ValBase {
-    isBinaryOp: boolean;
-    isConjunctVal: boolean;
-    constructor(spec: {
-        peg: Val[];
-    }, ctx?: Context);
-    append(peer: Val): ConjunctVal;
-    unify(peer: Val, ctx: Context): Val;
-    clone(spec?: ValSpec, ctx?: Context): Val;
-    get canon(): any;
-    gen(ctx?: Context): undefined;
-}
-declare function norm(terms: Val[]): Val[];
-export { norm, ConjunctVal, };

package/dist/lib/val/ConjunctVal.js

@@ -1,171 +0,0 @@
-"use strict";
-/* Copyright (c) 2021-2023 Richard Rodger, MIT License */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ConjunctVal = void 0;
-exports.norm = norm;
-const type_1 = require("../type");
-const err_1 = require("../err");
-const op_1 = require("../op/op");
-const val_1 = require("../val");
-// import { DisjunctVal } from '../val/DisjunctVal'
-const ListVal_1 = require("../val/ListVal");
-const MapVal_1 = require("../val/MapVal");
-const Nil_1 = require("../val/Nil");
-// import { PrefVal } from '../val/PrefVal'
-const RefVal_1 = require("../val/RefVal");
-const ValBase_1 = require("../val/ValBase");
-// TODO: move main logic to op/conjunct
-class ConjunctVal extends ValBase_1.ValBase {
-    constructor(spec, ctx) {
-        super(spec, ctx);
-        this.isBinaryOp = true;
-        this.isConjunctVal = true;
-        // console.log('NEWCJ')
-        // console.trace()
-    }
-    // NOTE: mutation!
-    append(peer) {
-        this.peg.push(peer);
-        return this;
-    }
-    unify(peer, ctx) {
-        const mark = (Math.random() * 1e7) % 1e6 | 0;
-        let done = true;
-        // Unify each term of conjunct against peer
-        let upeer = [];
-        for (let vI = 0; vI < this.peg.length; vI++) {
-            upeer[vI] = (0, op_1.unite)(ctx, this.peg[vI], peer, 'cj-own' + mark);
-            // let prevdone = done
-            done = done && (type_1.DONE === upeer[vI].done);
-            if (upeer[vI] instanceof Nil_1.Nil) {
-                return Nil_1.Nil.make(ctx, '&peer[' + upeer[vI].canon + ',' + peer.canon + ']', this.peg[vI], peer);
-            }
-        }
-        upeer = norm(upeer);
-        upeer.sort((a, b) => {
-            return (a.constructor.name === b.constructor.name) ? 0 :
-                (a.constructor.name < b.constructor.name ? -1 : 1);
-        });
-        // Unify terms against each other
-        let outvals = [];
-        let val;
-        // for (let pI = 0; pI < upeer.length; pI++) {
-        //   let pt = upeer[pI]
-        //   for (let qI = pI; qI < upeer.length; qI++) {
-        //     let qt = upeer[pI]
-        //     let pq = unite(ctx, pt, qt, 'cj-pq')
-        //   }
-        // }
-        let t0 = upeer[0];
-        next_term: for (let pI = 0; pI < upeer.length; pI++) {
-            // console.log('CJ TERM t0', pI, t0.done, t0.canon)
-            if (type_1.DONE !== t0.done) {
-                let u0 = (0, op_1.unite)(ctx, t0, val_1.TOP, 'cj-peer-t0');
-                if (type_1.DONE !== u0.done
-                    // Maps and Lists are still unified so that path refs will work
-                    // TODO: || ListVal - test!
-                    && !(u0 instanceof MapVal_1.MapVal
-                        || u0 instanceof ListVal_1.ListVal
-                        || u0 instanceof RefVal_1.RefVal)) {
-                    outvals.push(u0);
-                    continue next_term;
-                }
-                else {
-                    t0 = u0;
-                }
-            }
-            let t1 = upeer[pI + 1];
-            if (null == t1) {
-                outvals.push(t0);
-            }
-            // Can't unite with a RefVal, unless also a RefVal with same path.
-            else if (t0 instanceof RefVal_1.RefVal && !(t1 instanceof RefVal_1.RefVal)) {
-                outvals.push(t0);
-                t0 = t1;
-            }
-            else if (t1 instanceof RefVal_1.RefVal && !(t0 instanceof RefVal_1.RefVal)) {
-                outvals.push(t0);
-                t0 = t1;
-            }
-            else {
-                val = (0, op_1.unite)(ctx, t0, t1, 'cj-peer-t0t1');
-                done = done && type_1.DONE === val.done;
-                // Unite was just a conjunt anyway, so discard.
-                if (val instanceof ConjunctVal) {
-                    outvals.push(t0);
-                    t0 = t1;
-                }
-                else if (val instanceof Nil_1.Nil) {
-                    return val;
-                }
-                else {
-                    t0 = val;
-                }
-                // TODO: t0 should become this to avoid unnecessary repasses
-                // outvals.push(val)
-                // pI++
-            }
-        }
-        let out;
-        if (0 === outvals.length) {
-            // Empty conjuncts evaporate.
-            out = val_1.TOP;
-        }
-        // TODO: corrects CV[CV[1&/x]] issue above, but swaps term order!
-        else if (1 === outvals.length) {
-            out = outvals[0];
-        }
-        else {
-            out = new ConjunctVal({ peg: outvals }, ctx);
-        }
-        out.done = done ? type_1.DONE : this.done + 1;
-        return out;
-    }
-    clone(spec, ctx) {
-        let out = super.clone(spec, ctx);
-        out.peg = this.peg.map((entry) => entry.clone(null, ctx));
-        return out;
-    }
-    // TODO: need a well-defined val order so conjunt canon is always the same
-    get canon() {
-        return this.peg.map((v) => {
-            return v.isBinaryOp && Array.isArray(v.peg) && 1 < v.peg.length ?
-                '(' + v.canon + ')' : v.canon;
-        }).join('&');
-    }
-    gen(ctx) {
-        // Unresolved conjunct cannot be generated, so always an error.
-        let nil = Nil_1.Nil.make(ctx, 'conjunct', this, // (formatPath(this.peg, this.absolute) as any),
-        undefined);
-        // TODO: refactor to use Site
-        nil.path = this.path;
-        nil.url = this.url;
-        nil.row = this.row;
-        nil.col = this.col;
-        (0, err_1.descErr)(nil, ctx);
-        if (ctx) {
-            ctx.err.push(nil);
-        }
-        else {
-            throw new Error(nil.msg);
-        }
-        return undefined;
-    }
-}
-exports.ConjunctVal = ConjunctVal;
-// Normalize Conjuct:
-// - flatten child conjuncts
-function norm(terms) {
-    let expand = [];
-    for (let tI = 0, pI = 0; tI < terms.length; tI++, pI++) {
-        if (terms[tI] instanceof ConjunctVal) {
-            expand.push(...terms[tI].peg);
-            pI += terms[tI].peg.length - 1;
-        }
-        else {
-            expand[pI] = terms[tI];
-        }
-    }
-    return expand;
-}
-//# sourceMappingURL=ConjunctVal.js.map

package/dist/lib/val/ConjunctVal.js.map

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

package/dist/lib/val/DisjunctVal.d.ts

@@ -1,17 +0,0 @@
-import type { Val, ValSpec } from '../type';
-import { Context } from '../unify';
-import { Site } from '../lang';
-import { ValBase } from '../val/ValBase';
-declare class DisjunctVal extends ValBase {
-    isDisjunctVal: boolean;
-    isBinaryOp: boolean;
-    constructor(spec: {
-        peg: Val[];
-    }, ctx?: Context, _sites?: Site[]);
-    append(peer: Val): DisjunctVal;
-    unify(peer: Val, ctx: Context): Val;
-    clone(spec?: ValSpec, ctx?: Context): Val;
-    get canon(): any;
-    gen(ctx?: Context): any;
-}
-export { DisjunctVal, };

package/dist/lib/val/DisjunctVal.js

@@ -1,95 +0,0 @@
-"use strict";
-/* Copyright (c) 2021-2023 Richard Rodger, MIT License */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.DisjunctVal = void 0;
-const type_1 = require("../type");
-const op_1 = require("../op/op");
-// import { TOP } from '../val'
-// import { ConjunctVal } from '../val/ConjunctVal'
-// import { ListVal } from '../val/ListVal'
-// import { MapVal } from '../val/MapVal'
-const Nil_1 = require("../val/Nil");
-const PrefVal_1 = require("../val/PrefVal");
-// import { RefVal } from '../val/RefVal'
-const ValBase_1 = require("../val/ValBase");
-// TODO: move main logic to op/disjunct
-class DisjunctVal extends ValBase_1.ValBase {
-    // TODO: sites from normalization of orginal Disjuncts, as well as child pegs
-    constructor(spec, ctx, _sites) {
-        super(spec, ctx);
-        this.isDisjunctVal = true;
-        this.isBinaryOp = true;
-    }
-    // NOTE: mutation!
-    append(peer) {
-        this.peg.push(peer);
-        return this;
-    }
-    unify(peer, ctx) {
-        let done = true;
-        let oval = [];
-        // Conjunction (&) distributes over disjunction (|)
-        for (let vI = 0; vI < this.peg.length; vI++) {
-            //oval[vI] = this.peg[vI].unify(peer, ctx)
-            oval[vI] = (0, op_1.unite)(ctx, this.peg[vI], peer);
-            done = done && type_1.DONE === oval[vI].done;
-        }
-        // Remove duplicates, and normalize
-        if (1 < oval.length) {
-            for (let vI = 0; vI < oval.length; vI++) {
-                if (oval[vI] instanceof DisjunctVal) {
-                    oval.splice(vI, 1, ...oval[vI].peg);
-                }
-            }
-            // TODO: not an error Nil!
-            let remove = new Nil_1.Nil();
-            for (let vI = 0; vI < oval.length; vI++) {
-                for (let kI = vI + 1; kI < oval.length; kI++) {
-                    if (oval[kI].same(oval[vI])) {
-                        oval[kI] = remove;
-                    }
-                }
-            }
-            oval = oval.filter(v => !(v instanceof Nil_1.Nil));
-        }
-        let out;
-        if (1 == oval.length) {
-            out = oval[0];
-        }
-        else if (0 == oval.length) {
-            return Nil_1.Nil.make(ctx, '|:empty', this);
-        }
-        else {
-            out = new DisjunctVal({ peg: oval }, ctx);
-        }
-        out.done = done ? type_1.DONE : this.done + 1;
-        return out;
-    }
-    clone(spec, ctx) {
-        let out = super.clone(spec, ctx);
-        out.peg = this.peg.map((entry) => entry.clone(null, ctx));
-        return out;
-    }
-    get canon() {
-        return this.peg.map((v) => {
-            return v.isBinaryOp && Array.isArray(v.peg) && 1 < v.peg.length ?
-                '(' + v.canon + ')' : v.canon;
-        }).join('|');
-    }
-    gen(ctx) {
-        // TODO: this is not right - unresolved Disjuncts eval to undef
-        if (0 < this.peg.length) {
-            let vals = this.peg.filter((v) => v instanceof PrefVal_1.PrefVal);
-            vals = 0 === vals.length ? this.peg : vals;
-            let val = vals[0];
-            for (let vI = 1; vI < this.peg.length; vI++) {
-                let valnext = val.unify(this.peg[vI], ctx);
-                val = valnext;
-            }
-            return val.gen(ctx);
-        }
-        return undefined;
-    }
-}
-exports.DisjunctVal = DisjunctVal;
-//# sourceMappingURL=DisjunctVal.js.map

package/dist/lib/val/DisjunctVal.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"DisjunctVal.js","sourceRoot":"","sources":["../../../lib/val/DisjunctVal.ts"],"names":[],"mappings":";AAAA,yDAAyD;;;AASzD,kCAEgB;AAYhB,iCAEiB;AAKjB,+BAA+B;AAC/B,mDAAmD;AACnD,2CAA2C;AAC3C,yCAAyC;AACzC,oCAAgC;AAChC,4CAAwC;AACxC,yCAAyC;AACzC,4CAAwC;AAKxC,uCAAuC;AACvC,MAAM,WAAY,SAAQ,iBAAO;IAI/B,6EAA6E;IAC7E,YACE,IAEC,EACD,GAAa,EACb,MAAe;QAEf,KAAK,CAAC,IAAI,EAAE,GAAG,CAAC,CAAA;QAXlB,kBAAa,GAAG,IAAI,CAAA;QACpB,eAAU,GAAG,IAAI,CAAA;IAWjB,CAAC;IAED,kBAAkB;IAClB,MAAM,CAAC,IAAS;QACd,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QACnB,OAAO,IAAI,CAAA;IACb,CAAC;IAED,KAAK,CAAC,IAAS,EAAE,GAAY;QAC3B,IAAI,IAAI,GAAG,IAAI,CAAA;QAEf,IAAI,IAAI,GAAU,EAAE,CAAA;QAEpB,mDAAmD;QACnD,KAAK,IAAI,EAAE,GAAG,CAAC,EAAE,EAAE,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,EAAE,EAAE,EAAE,CAAC;YAC5C,0CAA0C;YAC1C,IAAI,CAAC,EAAE,CAAC,GAAG,IAAA,UAAK,EAAC,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,IAAI,CAAC,CAAA;YACzC,IAAI,GAAG,IAAI,IAAI,WAAI,KAAK,IAAI,CAAC,EAAE,CAAC,CAAC,IAAI,CAAA;QACvC,CAAC;QAED,mCAAmC;QACnC,IAAI,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC;YACpB,KAAK,IAAI,EAAE,GAAG,CAAC,EAAE,EAAE,GAAG,IAAI,CAAC,MAAM,EAAE,EAAE,EAAE,EAAE,CAAC;gBACxC,IAAI,IAAI,CAAC,EAAE,CAAC,YAAY,WAAW,EAAE,CAAC;oBACpC,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC,EAAE,GAAG,IAAI,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,CAAA;gBACrC,CAAC;YACH,CAAC;YAED,0BAA0B;YAC1B,IAAI,MAAM,GAAG,IAAI,SAAG,EAAE,CAAA;YACtB,KAAK,IAAI,EAAE,GAAG,CAAC,EAAE,EAAE,GAAG,IAAI,CAAC,MAAM,EAAE,EAAE,EAAE,EAAE,CAAC;gBACxC,KAAK,IAAI,EAAE,GAAG,EAAE,GAAG,CAAC,EAAE,EAAE,GAAG,IAAI,CAAC,MAAM,EAAE,EAAE,EAAE,EAAE,CAAC;oBAC7C,IAAI,IAAI,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC;wBAC5B,IAAI,CAAC,EAAE,CAAC,GAAG,MAAM,CAAA;oBACnB,CAAC;gBACH,CAAC;YACH,CAAC;YAED,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,YAAY,SAAG,CAAC,CAAC,CAAA;QAC9C,CAAC;QAED,IAAI,GAAQ,CAAA;QAEZ,IAAI,CAAC,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YACrB,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,CAAA;QACf,CAAC;aACI,IAAI,CAAC,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YAC1B,OAAO,SAAG,CAAC,IAAI,CAAC,GAAG,EAAE,SAAS,EAAE,IAAI,CAAC,CAAA;QACvC,CAAC;aACI,CAAC;YACJ,GAAG,GAAG,IAAI,WAAW,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE,GAAG,CAAC,CAAA;QAC3C,CAAC;QAED,GAAG,CAAC,IAAI,GAAG,IAAI,CAAC,CAAC,CAAC,WAAI,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,CAAA;QAEtC,OAAO,GAAG,CAAA;IACZ,CAAC;IAGD,KAAK,CAAC,IAAc,EAAE,GAAa;QACjC,IAAI,GAAG,GAAI,KAAK,CAAC,KAAK,CAAC,IAAI,EAAE,GAAG,CAAiB,CAAA;QACjD,GAAG,CAAC,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,KAAU,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,CAAA;QAC9D,OAAO,GAAG,CAAA;IACZ,CAAC;IAGD,IAAI,KAAK;QACP,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAM,EAAE,EAAE;YAC7B,OAAQ,CAAS,CAAC,UAAU,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;gBACxE,GAAG,GAAG,CAAC,CAAC,KAAK,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAA;QACjC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IACd,CAAC;IAGD,GAAG,CAAC,GAAa;QAEf,+DAA+D;QAC/D,IAAI,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC;YAExB,IAAI,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,YAAY,iBAAO,CAAC,CAAA;YAE5D,IAAI,GAAG,CAAC,KAAK,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAA;YAE1C,IAAI,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,CAAA;YAEjB,KAAK,IAAI,EAAE,GAAG,CAAC,EAAE,EAAE,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,EAAE,EAAE,EAAE,CAAC;gBAC5C,IAAI,OAAO,GAAG,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,GAAG,CAAC,CAAA;gBAC1C,GAAG,GAAG,OAAO,CAAA;YACf,CAAC;YAED,OAAO,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;QACrB,CAAC;QAED,OAAO,SAAS,CAAA;IAClB,CAAC;CACF;AAOC,kCAAW"}