aontu 0.12.0 → 0.13.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (72) hide show
  1. package/aontu.ts +9 -3
  2. package/dist/aontu.d.ts +3 -0
  3. package/dist/aontu.js +7 -2
  4. package/dist/aontu.js.map +1 -1
  5. package/dist/aontu.min.js +1 -1
  6. package/dist/lib/err.js +1 -1
  7. package/dist/lib/err.js.map +1 -1
  8. package/dist/lib/lang.js +80 -32
  9. package/dist/lib/lang.js.map +1 -1
  10. package/dist/lib/op/disjunct.js +2 -2
  11. package/dist/lib/op/disjunct.js.map +1 -1
  12. package/dist/lib/op/op.js +1 -1
  13. package/dist/lib/op/op.js.map +1 -1
  14. package/dist/lib/op/unite.js +36 -6
  15. package/dist/lib/op/unite.js.map +1 -1
  16. package/dist/lib/type.d.ts +10 -8
  17. package/dist/lib/type.js +2 -27
  18. package/dist/lib/type.js.map +1 -1
  19. package/dist/lib/unify.d.ts +7 -4
  20. package/dist/lib/unify.js +17 -28
  21. package/dist/lib/unify.js.map +1 -1
  22. package/dist/lib/val/ConjunctVal.d.ts +7 -4
  23. package/dist/lib/val/ConjunctVal.js +62 -31
  24. package/dist/lib/val/ConjunctVal.js.map +1 -1
  25. package/dist/lib/val/DisjunctVal.d.ts +5 -2
  26. package/dist/lib/val/DisjunctVal.js +15 -7
  27. package/dist/lib/val/DisjunctVal.js.map +1 -1
  28. package/dist/lib/val/ListVal.d.ts +5 -2
  29. package/dist/lib/val/ListVal.js +39 -19
  30. package/dist/lib/val/ListVal.js.map +1 -1
  31. package/dist/lib/val/MapVal.d.ts +5 -2
  32. package/dist/lib/val/MapVal.js +59 -30
  33. package/dist/lib/val/MapVal.js.map +1 -1
  34. package/dist/lib/val/Nil.d.ts +3 -2
  35. package/dist/lib/val/Nil.js +19 -5
  36. package/dist/lib/val/Nil.js.map +1 -1
  37. package/dist/lib/val/PrefVal.d.ts +6 -2
  38. package/dist/lib/val/PrefVal.js +18 -8
  39. package/dist/lib/val/PrefVal.js.map +1 -1
  40. package/dist/lib/val/RefVal.d.ts +11 -5
  41. package/dist/lib/val/RefVal.js +187 -39
  42. package/dist/lib/val/RefVal.js.map +1 -1
  43. package/dist/lib/val/ValBase.d.ts +10 -9
  44. package/dist/lib/val/ValBase.js +25 -6
  45. package/dist/lib/val/ValBase.js.map +1 -1
  46. package/dist/lib/val/VarVal.d.ts +14 -0
  47. package/dist/lib/val/VarVal.js +68 -0
  48. package/dist/lib/val/VarVal.js.map +1 -0
  49. package/dist/lib/val.d.ts +42 -8
  50. package/dist/lib/val.js +64 -18
  51. package/dist/lib/val.js.map +1 -1
  52. package/lib/err.ts +1 -1
  53. package/lib/lang.ts +91 -38
  54. package/lib/op/disjunct.ts +10 -3
  55. package/lib/op/op.ts +1 -1
  56. package/lib/op/unite.ts +44 -4
  57. package/lib/type.ts +12 -40
  58. package/lib/unify.ts +70 -28
  59. package/lib/val/ConjunctVal.ts +83 -46
  60. package/lib/val/DisjunctVal.ts +35 -12
  61. package/lib/val/ListVal.ts +57 -22
  62. package/lib/val/MapVal.ts +82 -51
  63. package/lib/val/Nil.ts +29 -9
  64. package/lib/val/PrefVal.ts +38 -14
  65. package/lib/val/RefVal.ts +254 -55
  66. package/lib/val/ValBase.ts +33 -28
  67. package/lib/val/VarVal.ts +139 -0
  68. package/lib/val.ts +116 -25
  69. package/package.json +8 -8
  70. package/dist/lib/common.d.ts +0 -8
  71. package/dist/lib/common.js +0 -3
  72. package/dist/lib/common.js.map +0 -1
package/aontu.ts CHANGED
@@ -8,6 +8,7 @@ import { Unify, Context } from './lib/unify'
8
8
  import { Nil } from './lib/val/Nil'
9
9
  import { descErr } from './lib/err'
10
10
 
11
+ // TODO: exclude tests from dist!!!
11
12
  // TODO: propogate property path and url properly over unification, and multisource
12
13
 
13
14
  /*
@@ -37,10 +38,9 @@ also trace deps into top val and watch via model
37
38
  */
38
39
  function Aontu(src: string | Partial<Options>, popts?: Partial<Options>): Val {
39
40
  let opts = util.options(src, popts)
40
-
41
- let lang = new Lang(opts)
42
41
  let deps = {}
43
- let val = lang.parse(opts.src, { deps: deps })
42
+
43
+ let val = util.parse(opts, { deps })
44
44
  let uni = new Unify(val as unknown as Val)
45
45
  let res = uni.res
46
46
  let err = uni.err
@@ -72,6 +72,12 @@ const util = {
72
72
  }
73
73
  return opts
74
74
  },
75
+
76
+ parse(opts: Options, ctx: { deps: any }): Val {
77
+ let lang = new Lang(opts)
78
+ let val = lang.parse(opts.src, { deps: ctx.deps })
79
+ return val
80
+ },
75
81
  }
76
82
 
77
83
  export { Aontu, Val, Nil, Lang, Context, util }
package/dist/aontu.d.ts CHANGED
@@ -5,6 +5,9 @@ import { Nil } from './lib/val/Nil';
5
5
  declare function Aontu(src: string | Partial<Options>, popts?: Partial<Options>): Val;
6
6
  declare const util: {
7
7
  options: (src: string | Partial<Options>, popts?: Partial<Options>) => Options;
8
+ parse(opts: Options, ctx: {
9
+ deps: any;
10
+ }): Val;
8
11
  };
9
12
  export { Aontu, Val, Nil, Lang, Context, util };
10
13
  export default Aontu;
package/dist/aontu.js CHANGED
@@ -10,6 +10,7 @@ Object.defineProperty(exports, "Context", { enumerable: true, get: function () {
10
10
  const Nil_1 = require("./lib/val/Nil");
11
11
  Object.defineProperty(exports, "Nil", { enumerable: true, get: function () { return Nil_1.Nil; } });
12
12
  const err_1 = require("./lib/err");
13
+ // TODO: exclude tests from dist!!!
13
14
  // TODO: propogate property path and url properly over unification, and multisource
14
15
  /*
15
16
  NEXT:
@@ -34,9 +35,8 @@ also trace deps into top val and watch via model
34
35
  */
35
36
  function Aontu(src, popts) {
36
37
  let opts = util.options(src, popts);
37
- let lang = new lang_1.Lang(opts);
38
38
  let deps = {};
39
- let val = lang.parse(opts.src, { deps: deps });
39
+ let val = util.parse(opts, { deps });
40
40
  let uni = new unify_1.Unify(val);
41
41
  let res = uni.res;
42
42
  let err = uni.err;
@@ -61,6 +61,11 @@ const util = {
61
61
  };
62
62
  return opts;
63
63
  },
64
+ parse(opts, ctx) {
65
+ let lang = new lang_1.Lang(opts);
66
+ let val = lang.parse(opts.src, { deps: ctx.deps });
67
+ return val;
68
+ },
64
69
  };
65
70
  exports.util = util;
66
71
  exports.default = Aontu;
package/dist/aontu.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"aontu.js","sourceRoot":"","sources":["../aontu.ts"],"names":[],"mappings":";AAAA,yDAAyD;;;AAIzD,yDAAyD;AACzD,qCAAiC;AAuEP,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,iCAAiC;aAClC;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"}
1
+ {"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"}