aontu 0.29.0 → 0.30.1

package/dist/aontu.d.ts

@@ -1,16 +1,20 @@
-import type { Val, Options, FST } from './lib/type';
-import { Lang } from './lib/lang';
-import { Context } from './lib/unify';
-import { Nil } from './lib/val/Nil';
-declare function Aontu(src: string | Partial<Options>, popts?: Partial<Options>): Val;
-declare function prepareOptions(src: string | Partial<Options>, popts?: Partial<Options>): Options;
-declare function parse(opts: Options, ctx: {
-    deps: any;
-    fs?: FST;
-}): Val;
+import type { Val, AontuOptions } from './type';
+import { Lang } from './lang';
+import { AontuContext, AontuContextConfig } from './ctx';
+import { formatExplain } from './utility';
+import { AontuError } from './err';
+declare class Aontu {
+    opts: AontuOptions;
+    lang: Lang;
+    constructor(popts?: AontuOptions);
+    ctx(cfg?: AontuContextConfig): AontuContext;
+    parse(src: string, opts?: AontuOptions, ac?: AontuContext): Val | undefined;
+    unify(src: string | Val, opts?: AontuOptions, ac?: AontuContext | any): Val;
+    generate(src: string, opts?: any, ac?: AontuContext): any;
+}
+declare function runparse(src: string, lang: Lang, ctx: AontuContext): Val;
 declare const util: {
-    parse: typeof parse;
-    options: typeof prepareOptions;
+    runparse: typeof runparse;
 };
-export { Aontu, Val, Nil, Lang, Context, parse, util };
+export { Aontu, AontuOptions, AontuContext, AontuError, Val, Lang, runparse, util, formatExplain };
 export default Aontu;

package/dist/aontu.js

@@ -1,72 +1,157 @@
 "use strict";
-/* Copyright (c) 2021-2024 Richard Rodger, MIT License */
+/* Copyright (c) 2021-2025 Richard Rodger, MIT License */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.util = exports.Context = exports.Lang = exports.Nil = void 0;
-exports.Aontu = Aontu;
-exports.parse = parse;
-const lang_1 = require("./lib/lang");
+exports.formatExplain = exports.util = exports.Lang = exports.AontuError = exports.AontuContext = exports.Aontu = void 0;
+exports.runparse = runparse;
+const lang_1 = require("./lang");
 Object.defineProperty(exports, "Lang", { enumerable: true, get: function () { return lang_1.Lang; } });
-const unify_1 = require("./lib/unify");
-Object.defineProperty(exports, "Context", { enumerable: true, get: function () { return unify_1.Context; } });
-const Nil_1 = require("./lib/val/Nil");
-Object.defineProperty(exports, "Nil", { enumerable: true, get: function () { return Nil_1.Nil; } });
-const MapVal_1 = require("./lib/val/MapVal");
-const err_1 = require("./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, popts) {
-    // 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_1.MapVal({ peg: {} });
+const unify_1 = require("./unify");
+const ctx_1 = require("./ctx");
+Object.defineProperty(exports, "AontuContext", { enumerable: true, get: function () { return ctx_1.AontuContext; } });
+const MapVal_1 = require("./val/MapVal");
+const utility_1 = require("./utility");
+Object.defineProperty(exports, "formatExplain", { enumerable: true, get: function () { return utility_1.formatExplain; } });
+const err_1 = require("./err");
+Object.defineProperty(exports, "AontuError", { enumerable: true, get: function () { return err_1.AontuError; } });
+class Aontu {
+    constructor(popts) {
+        this.opts = popts ?? {};
+        this.lang = new lang_1.Lang(this.opts);
+    }
+    // Create a new context.
+    ctx(cfg) {
+        cfg = cfg ?? {};
+        const ac = new ctx_1.AontuContext(cfg);
+        return ac;
+    }
+    // Parse source into a matching Val AST, not yet unified.
+    parse(src, opts, ac) {
+        let out;
+        let errs = [];
+        if (null == src) {
+            src = '';
+        }
+        ac = ac ?? this.ctx();
+        ac.addopts({ ...(opts ?? {}), src });
+        if ('string' !== typeof src) {
+            out = (0, err_1.makeNilErr)(ac, 'parse_bad_src');
+            errs.push(out);
+        }
+        if (0 === errs.length) {
+            out = runparse(src, this.lang, ac);
+            out.deps = ac.deps;
+            ac.root = out;
+        }
+        handleErrors(errs, out, ac);
+        return out;
+    }
+    // Unify source or Val, returning a fully unified Val.
+    unify(src, opts, ac) {
+        let out;
+        let errs = [];
+        ac = ac ?? this.ctx();
+        ac.addopts({ ...(opts ?? {}), src });
+        let pval;
+        if (null == src) {
+            src = '';
+        }
+        if ('string' === typeof src) {
+            pval = this.parse(src, undefined, ac);
+        }
+        else if (src && src.isVal) {
+            pval = src;
+        }
+        else {
+            out = (0, err_1.makeNilErr)(ac, 'unify_no_src');
+            errs.push(out);
+        }
+        if (null != pval && 0 === errs.length) {
+            let uni = new unify_1.Unify(pval, this.lang, ac, src);
+            errs = uni.err;
+            out = uni.res;
+            if (null == out) {
+                out = (0, err_1.makeNilErr)(ac, 'unify_no_res');
+                if (0 === errs.length) {
+                    errs = [out];
+                }
+            }
+            out.deps = pval.deps;
+            out.err = errs;
+            ac.root = out;
+        }
+        handleErrors(errs, out, ac);
+        return out;
+    }
+    // Generate output structure from source, which must parse and fully unify.
+    generate(src, opts, ac) {
+        try {
+            let out = undefined;
+            ac = ac ?? this.ctx();
+            ac.addopts({ ...(opts ?? {}), src });
+            let pval = this.parse(src, undefined, ac);
+            if (undefined !== pval && 0 === pval.err.length) {
+                let uval = this.unify(pval, undefined, ac);
+                if (undefined !== uval && 0 === uval.err.length) {
+                    out = uval.isNil ? (ac.adderr(uval), undefined) : uval.gen(ac);
+                    if (0 < ac.err.length) {
+                        if (!ac.collect) {
+                            throw new err_1.AontuError(ac.errmsg(), ac.err);
+                        }
+                        out = undefined;
+                    }
+                }
+            }
+            return out;
+        }
+        catch (err) {
+            if (err instanceof err_1.AontuError || true === err.aontu) {
+                throw err;
+            }
+            const unex = new err_1.AontuError('Aontu: unexpected error: ' + err.message);
+            Object.assign(unex, err);
+            unex.stack = err.stack;
+            throw unex;
+        }
     }
-    let uni = new unify_1.Unify(val);
-    let res = uni.res;
-    let err = uni.err;
-    (0, err_1.descErr)(uni.err, { src: opts.src, fs: opts.fs });
-    res.deps = deps;
-    res.err = err;
-    return res;
 }
-function prepareOptions(src, popts) {
-    // Convert convenience first param into Options.src
-    let srcopts = 'string' === typeof src ? { src } : src;
-    let opts = {
-        ...{
-            src: '',
-            print: 0,
-        },
-        ...srcopts,
-        ...(popts || {}),
-    };
-    return opts;
+exports.Aontu = Aontu;
+// Either throw an exception or add collected errors to result.
+function handleErrors(errs, out, ac) {
+    errs.map((err) => ac.adderr(err));
+    if (out) {
+        out.err.map((err) => ac.adderr(err));
+    }
+    if (0 < ac.err.length) {
+        if (ac.collect) {
+            if (out) {
+                out.err = ac.err;
+            }
+        }
+        else {
+            throw new err_1.AontuError(ac.errmsg(), ac.err);
+        }
+    }
 }
-function parse(opts, ctx) {
-    let lang = new lang_1.Lang(opts);
-    let val = lang.parse(opts.src, { deps: ctx.deps });
+// Perform parse of source code (minor customizations over Lang.parse).
+function runparse(src, lang, ctx) {
+    const popts = {
+        // src: ctx.src,
+        deps: ctx.deps,
+        fs: ctx.fs,
+        path: ctx.opts.path
+    };
+    let val;
+    const tsrc = src.trim().replace(/^(\n\s*)+/, '');
+    if ('string' === typeof src && '' !== tsrc) {
+        val = lang.parse(src, popts);
+    }
+    if (undefined === val) {
+        val = new MapVal_1.MapVal({ peg: {} });
+    }
     return val;
 }
 const util = {
-    parse,
-    options: prepareOptions,
+    runparse,
 };
 exports.util = util;
 exports.default = Aontu;

package/dist/aontu.js.map

@@ -1 +1 @@
-{"version":3,"file":"aontu.js","sourceRoot":"","sources":["../aontu.ts"],"names":[],"mappings":";AAAA,yDAAyD;;;AAyFhD,sBAAK;AAA2B,sBAAK;AArF9C,qCAAiC;AAqFP,qFArFjB,WAAI,OAqFiB;AApF9B,uCAA4C;AAoFZ,wFApFhB,eAAO,OAoFgB;AAnFvC,uCAAmC;AAmFd,oFAnFZ,SAAG,OAmFY;AAlFxB,6CAAyC;AACzC,mCAAmC;AAEnC,6DAA6D;AAE7D,mCAAmC;AACnC,mFAAmF;AAEnF;;;;;EAKE;AAEF,wBAAwB;AAExB,sBAAsB;AACtB,gDAAgD;AAEhD,qDAAqD;AAErD;;;GAGG;AACH,SAAS,KAAK,CAAC,GAA8B,EAAE,KAAwB;IACrE,iDAAiD;IAEjD,IAAI,IAAI,GAAG,cAAc,CAAC,GAAG,EAAE,KAAK,CAAC,CAAA;IAErC,IAAI,IAAI,GAAG,EAAE,CAAA;IAEb,yBAAyB;IACzB,IAAI,GAAG,GAAG,KAAK,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,CAAC,CAAA;IAE/B,IAAI,IAAI,IAAI,GAAG,EAAE,CAAC;QAChB,GAAG,GAAG,IAAI,eAAM,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,CAAA;IAC/B,CAAC;IAED,IAAI,GAAG,GAAG,IAAI,aAAK,CAAC,GAAqB,CAAC,CAAA;IAC1C,IAAI,GAAG,GAAG,GAAG,CAAC,GAAG,CAAA;IACjB,IAAI,GAAG,GAAG,GAAG,CAAC,GAAG,CAAA;IAEjB,IAAA,aAAO,EAAC,GAAG,CAAC,GAAG,EAAE,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,CAAA;IAEhD,GAAG,CAAC,IAAI,GAAG,IAAI,CAAA;IACf,GAAG,CAAC,GAAG,GAAG,GAAG,CAAA;IAEb,OAAO,GAAG,CAAA;AACZ,CAAC;AAED,SAAS,cAAc,CACrB,GAA8B,EAC9B,KAAwB;IAExB,mDAAmD;IACnD,IAAI,OAAO,GAAqB,QAAQ,KAAK,OAAO,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,GAAG,CAAA;IAEvE,IAAI,IAAI,GAAY;QAClB,GAAG;YACD,GAAG,EAAE,EAAE;YACP,KAAK,EAAE,CAAC;SACT;QACD,GAAG,OAAO;QACV,GAAG,CAAC,KAAK,IAAI,EAAE,CAAC;KACjB,CAAA;IAED,OAAO,IAAI,CAAA;AACb,CAAC;AAED,SAAS,KAAK,CAAC,IAAa,EAAE,GAA4B;IACxD,IAAI,IAAI,GAAG,IAAI,WAAI,CAAC,IAAI,CAAC,CAAA;IACzB,IAAI,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,CAAC,CAAA;IAClD,OAAO,GAAG,CAAA;AACZ,CAAC;AAED,MAAM,IAAI,GAAG;IACX,KAAK;IACL,OAAO,EAAE,cAAc;CACxB,CAAA;AAE+C,oBAAI;AAEpD,kBAAe,KAAK,CAAA"}
+{"version":3,"file":"aontu.js","sourceRoot":"","sources":["../src/aontu.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aontu",
-  "version": "0.29.0",
+  "version": "0.30.1",
   "main": "dist/aontu.js",
   "type": "commonjs",
   "browser": "dist/aontu.min.js",
@@ -16,27 +16,20 @@
     "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",
@@ -46,32 +39,23 @@
     "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"
     }
   }
 }

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":";AAAA,yDAAyD;;AAiFvD,0BAAO;AA9ET,mCAA6B;AAM7B,MAAM,EAAE,MAAM,EAAE,GAAG,aAAI,CAAA;AAGvB,yBAAyB;AACzB,SAAS,OAAO,CACd,GAAe,EACf,MAAmB;;IAEnB,IAAI,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,KAAK,EAAE,CAAC;QACf,kBAAkB;QAElB,IAAI,IAAI,IAAI,GAAG,CAAC,GAAG,IAAI,EAAE,KAAK,GAAG,CAAC,GAAG,EAAE,CAAC;YACtC,IAAI,EAAE,GAAQ,GAAG,CAAC,OAAO,CAAA;YACzB,IAAI,EAAE,GAAQ,GAAG,CAAC,SAAS,CAAA;YAE3B,IAAI,KAAK,GAAG,UAAU,CAAC,EAAE,EAAE,MAAM,CAAC,CAAA;YAClC,IAAI,KAAK,GAAG,UAAU,CAAC,EAAE,EAAE,MAAM,CAAC,CAAA;YAElC,IAAI,OAAO,GAAG,CAAC,CAAC,IAAG,MAAA,GAAG,CAAC,IAAI,0CAAE,MAAM,CAAA,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAA;YAC9D,IAAI,OAAO,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,CAAA;YAEhD,GAAG,CAAC,GAAG,GAAG;gBACR,MAAM,CAAC;oBACL,KAAK,EAAE,IAAI;oBACX,IAAI,EAAE,OAAO;oBACb,IAAI,EAAE,GAAG,CAAC,GAAG;oBACb,GAAG,EAAE,SAAS;wBACZ,OAAO;wBACP,UAAU,GAAG,OAAO,GAAG,QAAQ,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC;iBAC5D,CAAC;gBAEF,CAAC,IAAI,IAAI,EAAE,IAAI,MAAM,CAAC;oBACpB,KAAK,EAAE,IAAI;oBACX,GAAG,EAAE,SAAS,GAAG,OAAO,GAAG,UAAU,GAAG,EAAE,CAAC,KAAK;wBAC9C,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,eAAe,GAAG,EAAE,CAAC,KAAK,CAAC;oBAChD,IAAI,EAAE,aAAa,GAAG,EAAE,CAAC,KAAK;oBAC9B,IAAI,EAAE,MAAA,EAAE,CAAC,GAAG,0CAAE,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,GAAG,EAAE,EAAE,CAAC;oBAC9C,GAAG,EAAE,KAAK;oBACV,GAAG,EAAE,EAAE,CAAC,GAAG;oBACX,GAAG,EAAE,EAAE,CAAC,GAAG;iBACZ,CAAC,CAAC;gBAEH,CAAC,IAAI,IAAI,EAAE,IAAI,MAAM,CAAC;oBACpB,KAAK,EAAE,IAAI;oBACX,GAAG,EAAE,SAAS,GAAG,OAAO,GAAG,UAAU,GAAG,EAAE,CAAC,KAAK,GAAG,eAAe,GAAG,EAAE,CAAC,KAAK;oBAC7E,IAAI,EAAE,aAAa,GAAG,EAAE,CAAC,KAAK;oBAC9B,IAAI,EAAE,MAAA,EAAE,CAAC,GAAG,0CAAE,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,GAAG,EAAE,EAAE,CAAC;oBAC9C,GAAG,EAAE,KAAK;oBACV,GAAG,EAAE,EAAE,CAAC,GAAG;oBACX,GAAG,EAAE,EAAE,CAAC,GAAG;iBACZ,CAAC,CAAC;aAGJ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,IAAI,CAAC,IAAI,KAAK,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAEpD,CAAC;QACD,OAAO,GAAG,CAAA;IACZ,CAAC;SACI,CAAC;QACJ,OAAO,GAAG,CAAC,GAAG,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,CAAA;IAChD,CAAC;AACH,CAAC;AAGD,SAAS,UAAU,CAAC,CAAM,EAAE,MAAmB;;IAC7C,IAAI,GAAG,GAAG,IAAI,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,GAAG,CAAC,CAAC;QAClD,CAAA,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,EAAE,0CAAE,UAAU,CAAC,CAAC,CAAC,GAAG,CAAC,EAAC,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;IAC5E,OAAO,GAAG,CAAA;AACZ,CAAC"}

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, };