aontu 0.11.0 → 0.13.0

package/aontu.ts

@@ -1,12 +1,14 @@
-/* Copyright (c) 2021-2022 Richard Rodger, MIT License */
+/* Copyright (c) 2021-2023 Richard Rodger, MIT License */
 
 import type { Val, Options } from './lib/type'
 
-import { Lang, includeFileResolver } from './lib/lang'
+// import { Lang, includeFileResolver } from './lib/lang'
+import { Lang } from './lib/lang'
 import { Unify, Context } from './lib/unify'
 import { Nil } from './lib/val/Nil'
 import { descErr } from './lib/err'
 
+// TODO: exclude tests from dist!!!
 // TODO: propogate property path and url properly over unification, and multisource
 
 /*
@@ -36,10 +38,9 @@ also trace deps into top val and watch via model
  */
 function Aontu(src: string | Partial<Options>, popts?: Partial<Options>): Val {
   let opts = util.options(src, popts)
-
-  let lang = new Lang(opts)
   let deps = {}
-  let val = lang.parse(opts.src, { deps: deps })
+
+  let val = util.parse(opts, { deps })
   let uni = new Unify(val as unknown as Val)
   let res = uni.res
   let err = uni.err
@@ -64,13 +65,19 @@ const util = {
       ...{
         src: '',
         print: 0,
-        resolver: includeFileResolver,
+        // resolver: includeFileResolver,
       },
       ...srcopts,
       ...(popts || {}),
     }
     return opts
   },
+
+  parse(opts: Options, ctx: { deps: any }): Val {
+    let lang = new Lang(opts)
+    let val = lang.parse(opts.src, { deps: ctx.deps })
+    return val
+  },
 }
 
 export { Aontu, Val, Nil, Lang, Context, util }

package/dist/aontu.d.ts

@@ -5,6 +5,9 @@ import { Nil } from './lib/val/Nil';
 declare function Aontu(src: string | Partial<Options>, popts?: Partial<Options>): Val;
 declare const util: {
     options: (src: string | Partial<Options>, popts?: Partial<Options>) => Options;
+    parse(opts: Options, ctx: {
+        deps: any;
+    }): Val;
 };
 export { Aontu, Val, Nil, Lang, Context, util };
 export default Aontu;

package/dist/aontu.js

@@ -1,7 +1,8 @@
 "use strict";
-/* Copyright (c) 2021-2022 Richard Rodger, MIT License */
+/* Copyright (c) 2021-2023 Richard Rodger, MIT License */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.util = exports.Context = exports.Lang = exports.Nil = exports.Aontu = void 0;
+// import { Lang, includeFileResolver } from './lib/lang'
 const lang_1 = require("./lib/lang");
 Object.defineProperty(exports, "Lang", { enumerable: true, get: function () { return lang_1.Lang; } });
 const unify_1 = require("./lib/unify");
@@ -9,6 +10,7 @@ Object.defineProperty(exports, "Context", { enumerable: true, get: function () {
 const Nil_1 = require("./lib/val/Nil");
 Object.defineProperty(exports, "Nil", { enumerable: true, get: function () { return Nil_1.Nil; } });
 const err_1 = require("./lib/err");
+// TODO: exclude tests from dist!!!
 // TODO: propogate property path and url properly over unification, and multisource
 /*
 NEXT:
@@ -33,9 +35,8 @@ also trace deps into top val and watch via model
  */
 function Aontu(src, popts) {
     let opts = util.options(src, popts);
-    let lang = new lang_1.Lang(opts);
     let deps = {};
-    let val = lang.parse(opts.src, { deps: deps });
+    let val = util.parse(opts, { deps });
     let uni = new unify_1.Unify(val);
     let res = uni.res;
     let err = uni.err;
@@ -53,13 +54,18 @@ const util = {
             ...{
                 src: '',
                 print: 0,
-                resolver: lang_1.includeFileResolver,
+                // resolver: includeFileResolver,
             },
             ...srcopts,
             ...(popts || {}),
         };
         return opts;
     },
+    parse(opts, ctx) {
+        let lang = new lang_1.Lang(opts);
+        let val = lang.parse(opts.src, { deps: ctx.deps });
+        return val;
+    },
 };
 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;;;AAIzD,qCAAsD;AAuE5B,qFAvEjB,WAAI,OAuEiB;AAtE9B,uCAA4C;AAsEZ,wFAtEhB,eAAO,OAsEgB;AArEvC,uCAAmC;AAqEd,oFArEZ,SAAG,OAqEY;AApExB,mCAAmC;AAEnC,mFAAmF;AAEnF;;;;;EAKE;AAEF,wBAAwB;AAExB,sBAAsB;AACtB,gDAAgD;AAEhD,wCAAwC;AACxC,uBAAuB;AACvB,uBAAuB;AACvB,uBAAuB;AACvB,uBAAuB;AACvB,eAAe;AACf,kBAAkB;AAClB,KAAK;AAEL;;;GAGG;AACH,SAAS,KAAK,CAAC,GAA8B,EAAE,KAAwB;IACrE,IAAI,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,KAAK,CAAC,CAAA;IAEnC,IAAI,IAAI,GAAG,IAAI,WAAI,CAAC,IAAI,CAAC,CAAA;IACzB,IAAI,IAAI,GAAG,EAAE,CAAA;IACb,IAAI,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAA;IAC9C,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,CAAC,CAAA;IAEhB,GAAG,CAAC,IAAI,GAAG,IAAI,CAAA;IACf,GAAG,CAAC,GAAG,GAAG,GAAG,CAAA;IAEb,OAAO,GAAG,CAAA;AACZ,CAAC;AAuBQ,sBAAK;AArBd,MAAM,IAAI,GAAG;IACX,OAAO,EAAE,CACP,GAA8B,EAC9B,KAAwB,EACf,EAAE;QACX,mDAAmD;QACnD,IAAI,OAAO,GAAqB,QAAQ,KAAK,OAAO,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,GAAG,CAAA;QAEvE,IAAI,IAAI,GAAY;YAClB,GAAG;gBACD,GAAG,EAAE,EAAE;gBACP,KAAK,EAAE,CAAC;gBACR,QAAQ,EAAE,0BAAmB;aAC9B;YACD,GAAG,OAAO;YACV,GAAG,CAAC,KAAK,IAAI,EAAE,CAAC;SACjB,CAAA;QACD,OAAO,IAAI,CAAA;IACb,CAAC;CACF,CAAA;AAEwC,oBAAI;AAC7C,kBAAe,KAAK,CAAA"}
+{"version":3,"file":"aontu.js","sourceRoot":"","sources":["../aontu.ts"],"names":[],"mappings":";AAAA,yDAAyD;;;AAIzD,yDAAyD;AACzD,qCAAiC;AA6EP,qFA7EjB,WAAI,OA6EiB;AA5E9B,uCAA4C;AA4EZ,wFA5EhB,eAAO,OA4EgB;AA3EvC,uCAAmC;AA2Ed,oFA3EZ,SAAG,OA2EY;AA1ExB,mCAAmC;AAEnC,mCAAmC;AACnC,mFAAmF;AAEnF;;;;;EAKE;AAEF,wBAAwB;AAExB,sBAAsB;AACtB,gDAAgD;AAEhD,wCAAwC;AACxC,uBAAuB;AACvB,uBAAuB;AACvB,uBAAuB;AACvB,uBAAuB;AACvB,eAAe;AACf,kBAAkB;AAClB,KAAK;AAEL;;;GAGG;AACH,SAAS,KAAK,CAAC,GAA8B,EAAE,KAAwB;IACrE,IAAI,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,KAAK,CAAC,CAAA;IACnC,IAAI,IAAI,GAAG,EAAE,CAAA;IAEb,IAAI,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,CAAC,CAAA;IACpC,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,CAAC,CAAA;IAEhB,GAAG,CAAC,IAAI,GAAG,IAAI,CAAA;IACf,GAAG,CAAC,GAAG,GAAG,GAAG,CAAA;IAEb,OAAO,GAAG,CAAA;AACZ,CAAC;AA6BQ,sBAAK;AA3Bd,MAAM,IAAI,GAAG;IACX,OAAO,EAAE,CACP,GAA8B,EAC9B,KAAwB,EACf,EAAE;QACX,mDAAmD;QACnD,IAAI,OAAO,GAAqB,QAAQ,KAAK,OAAO,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,GAAG,CAAA;QAEvE,IAAI,IAAI,GAAY;YAClB,GAAG;gBACD,GAAG,EAAE,EAAE;gBACP,KAAK,EAAE,CAAC;gBACR,iCAAiC;aAClC;YACD,GAAG,OAAO;YACV,GAAG,CAAC,KAAK,IAAI,EAAE,CAAC;SACjB,CAAA;QACD,OAAO,IAAI,CAAA;IACb,CAAC;IAED,KAAK,CAAC,IAAa,EAAE,GAAkB;QACrC,IAAI,IAAI,GAAG,IAAI,WAAI,CAAC,IAAI,CAAC,CAAA;QACzB,IAAI,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,CAAC,CAAA;QAClD,OAAO,GAAG,CAAA;IACZ,CAAC;CACF,CAAA;AAEwC,oBAAI;AAC7C,kBAAe,KAAK,CAAA"}