@taquito/michelson-encoder 12.1.0 → 13.0.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.
- package/dist/lib/schema/parameter.js +3 -3
- package/dist/lib/schema/parameter.js.map +1 -1
- package/dist/lib/schema/storage.js +33 -14
- package/dist/lib/schema/storage.js.map +1 -1
- package/dist/lib/tokens/bigmap.js +4 -1
- package/dist/lib/tokens/bigmap.js.map +1 -1
- package/dist/lib/tokens/bls12-381-fr.js +4 -1
- package/dist/lib/tokens/bls12-381-fr.js.map +1 -1
- package/dist/lib/tokens/bls12-381-g1.js +4 -1
- package/dist/lib/tokens/bls12-381-g1.js.map +1 -1
- package/dist/lib/tokens/bls12-381-g2.js +4 -1
- package/dist/lib/tokens/bls12-381-g2.js.map +1 -1
- package/dist/lib/tokens/chain-id.js +4 -1
- package/dist/lib/tokens/chain-id.js.map +1 -1
- package/dist/lib/tokens/chest-key.js +4 -1
- package/dist/lib/tokens/chest-key.js.map +1 -1
- package/dist/lib/tokens/chest.js +4 -1
- package/dist/lib/tokens/chest.js.map +1 -1
- package/dist/lib/tokens/comparable/address.js +15 -9
- package/dist/lib/tokens/comparable/address.js.map +1 -1
- package/dist/lib/tokens/comparable/bool.js +4 -1
- package/dist/lib/tokens/comparable/bool.js.map +1 -1
- package/dist/lib/tokens/comparable/bytes.js +4 -1
- package/dist/lib/tokens/comparable/bytes.js.map +1 -1
- package/dist/lib/tokens/comparable/int.js +4 -1
- package/dist/lib/tokens/comparable/int.js.map +1 -1
- package/dist/lib/tokens/comparable/key_hash.js +4 -1
- package/dist/lib/tokens/comparable/key_hash.js.map +1 -1
- package/dist/lib/tokens/comparable/mutez.js +4 -1
- package/dist/lib/tokens/comparable/mutez.js.map +1 -1
- package/dist/lib/tokens/comparable/nat.js +4 -1
- package/dist/lib/tokens/comparable/nat.js.map +1 -1
- package/dist/lib/tokens/comparable/string.js +4 -1
- package/dist/lib/tokens/comparable/string.js.map +1 -1
- package/dist/lib/tokens/comparable/timestamp.js +4 -1
- package/dist/lib/tokens/comparable/timestamp.js.map +1 -1
- package/dist/lib/tokens/comparable/tx_rollup_l2_address.js +88 -0
- package/dist/lib/tokens/comparable/tx_rollup_l2_address.js.map +1 -0
- package/dist/lib/tokens/constant.js +4 -1
- package/dist/lib/tokens/constant.js.map +1 -1
- package/dist/lib/tokens/contract.js +8 -2
- package/dist/lib/tokens/contract.js.map +1 -1
- package/dist/lib/tokens/key.js +4 -1
- package/dist/lib/tokens/key.js.map +1 -1
- package/dist/lib/tokens/lambda.js +4 -1
- package/dist/lib/tokens/lambda.js.map +1 -1
- package/dist/lib/tokens/list.js +4 -1
- package/dist/lib/tokens/list.js.map +1 -1
- package/dist/lib/tokens/map.js +4 -1
- package/dist/lib/tokens/map.js.map +1 -1
- package/dist/lib/tokens/never.js +4 -1
- package/dist/lib/tokens/never.js.map +1 -1
- package/dist/lib/tokens/operation.js +4 -1
- package/dist/lib/tokens/operation.js.map +1 -1
- package/dist/lib/tokens/option.js +2 -2
- package/dist/lib/tokens/option.js.map +1 -1
- package/dist/lib/tokens/or.js +5 -5
- package/dist/lib/tokens/or.js.map +1 -1
- package/dist/lib/tokens/pair.js +9 -3
- package/dist/lib/tokens/pair.js.map +1 -1
- package/dist/lib/tokens/sapling-state.js +4 -1
- package/dist/lib/tokens/sapling-state.js.map +1 -1
- package/dist/lib/tokens/sapling-transaction.js +4 -1
- package/dist/lib/tokens/sapling-transaction.js.map +1 -1
- package/dist/lib/tokens/set.js +4 -1
- package/dist/lib/tokens/set.js.map +1 -1
- package/dist/lib/tokens/signature.js +9 -2
- package/dist/lib/tokens/signature.js.map +1 -1
- package/dist/lib/tokens/ticket.js +4 -1
- package/dist/lib/tokens/ticket.js.map +1 -1
- package/dist/lib/tokens/token.js +24 -3
- package/dist/lib/tokens/token.js.map +1 -1
- package/dist/lib/tokens/tokens.js +2 -0
- package/dist/lib/tokens/tokens.js.map +1 -1
- package/dist/lib/tokens/unit.js +4 -1
- package/dist/lib/tokens/unit.js.map +1 -1
- package/dist/lib/version.js +2 -2
- package/dist/taquito-michelson-encoder.es6.js +301 -73
- package/dist/taquito-michelson-encoder.es6.js.map +1 -1
- package/dist/taquito-michelson-encoder.umd.js +300 -72
- package/dist/taquito-michelson-encoder.umd.js.map +1 -1
- package/dist/types/schema/parameter.d.ts +2 -2
- package/dist/types/schema/storage.d.ts +3 -3
- package/dist/types/schema/types.d.ts +1 -1
- package/dist/types/taquito-michelson-encoder.d.ts +1 -1
- package/dist/types/tokens/bigmap.d.ts +2 -2
- package/dist/types/tokens/bls12-381-fr.d.ts +2 -6
- package/dist/types/tokens/bls12-381-g1.d.ts +2 -2
- package/dist/types/tokens/bls12-381-g2.d.ts +2 -2
- package/dist/types/tokens/chain-id.d.ts +2 -2
- package/dist/types/tokens/chest-key.d.ts +2 -2
- package/dist/types/tokens/chest.d.ts +2 -2
- package/dist/types/tokens/comparable/address.d.ts +2 -2
- package/dist/types/tokens/comparable/bool.d.ts +3 -7
- package/dist/types/tokens/comparable/bytes.d.ts +2 -4
- package/dist/types/tokens/comparable/int.d.ts +2 -2
- package/dist/types/tokens/comparable/key_hash.d.ts +2 -2
- package/dist/types/tokens/comparable/mutez.d.ts +2 -2
- package/dist/types/tokens/comparable/nat.d.ts +2 -2
- package/dist/types/tokens/comparable/string.d.ts +2 -2
- package/dist/types/tokens/comparable/timestamp.d.ts +2 -2
- package/dist/types/tokens/comparable/tx_rollup_l2_address.d.ts +45 -0
- package/dist/types/tokens/constant.d.ts +2 -2
- package/dist/types/tokens/contract.d.ts +2 -2
- package/dist/types/tokens/key.d.ts +2 -2
- package/dist/types/tokens/lambda.d.ts +2 -2
- package/dist/types/tokens/list.d.ts +2 -2
- package/dist/types/tokens/map.d.ts +2 -2
- package/dist/types/tokens/never.d.ts +2 -2
- package/dist/types/tokens/operation.d.ts +2 -2
- package/dist/types/tokens/option.d.ts +3 -6
- package/dist/types/tokens/or.d.ts +3 -6
- package/dist/types/tokens/pair.d.ts +5 -11
- package/dist/types/tokens/sapling-state.d.ts +2 -2
- package/dist/types/tokens/sapling-transaction.d.ts +2 -4
- package/dist/types/tokens/set.d.ts +2 -2
- package/dist/types/tokens/signature.d.ts +6 -8
- package/dist/types/tokens/ticket.d.ts +2 -2
- package/dist/types/tokens/token.d.ts +11 -23
- package/dist/types/tokens/tokens.d.ts +2 -1
- package/dist/types/tokens/unit.d.ts +2 -2
- package/package.json +5 -6
|
@@ -42,11 +42,14 @@ class NatToken extends token_1.ComparableToken {
|
|
|
42
42
|
return null;
|
|
43
43
|
}
|
|
44
44
|
}
|
|
45
|
-
EncodeObject(val) {
|
|
45
|
+
EncodeObject(val, semantic) {
|
|
46
46
|
const err = this.isValid(val);
|
|
47
47
|
if (err) {
|
|
48
48
|
throw err;
|
|
49
49
|
}
|
|
50
|
+
if (semantic && semantic[NatToken.prim]) {
|
|
51
|
+
return semantic[NatToken.prim](val);
|
|
52
|
+
}
|
|
50
53
|
return { int: new bignumber_js_1.default(val).toFixed() };
|
|
51
54
|
}
|
|
52
55
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nat.js","sourceRoot":"","sources":["../../../../src/tokens/comparable/nat.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"nat.js","sourceRoot":"","sources":["../../../../src/tokens/comparable/nat.ts"],"names":[],"mappings":";;;AAAA,oCAMkB;AAClB,+CAAqC;AAGrC,MAAa,kBAAmB,SAAQ,4BAAoB;IAE1D,YAAmB,KAAU,EAAS,KAAe,EAAE,OAAe;QACpE,KAAK,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;QADZ,UAAK,GAAL,KAAK,CAAK;QAAS,UAAK,GAAL,KAAK,CAAU;QADrD,SAAI,GAAG,oBAAoB,CAAC;IAG5B,CAAC;CACF;AALD,gDAKC;AAED,MAAa,QAAS,SAAQ,uBAAe;IAG3C,YACY,GAAiD,EACjD,GAAW,EACX,GAAiB;QAE3B,KAAK,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;QAJX,QAAG,GAAH,GAAG,CAA8C;QACjD,QAAG,GAAH,GAAG,CAAQ;QACX,QAAG,GAAH,GAAG,CAAc;IAG7B,CAAC;IAEM,OAAO,CAAC,GAAQ;QACrB,OAAO,IAAI,sBAAS,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACjD,CAAC;IAEM,MAAM,CAAC,IAAW;QACvB,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAEvB,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAC9B,IAAI,GAAG,EAAE;YACP,MAAM,GAAG,CAAC;SACX;QAED,OAAO,EAAE,GAAG,EAAE,IAAI,sBAAS,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC;IAC/C,CAAC;IAEO,OAAO,CAAC,GAAQ;QACtB,MAAM,SAAS,GAAG,IAAI,sBAAS,CAAC,GAAG,CAAC,CAAC;QACrC,IAAI,SAAS,CAAC,KAAK,EAAE,EAAE;YACrB,OAAO,IAAI,kBAAkB,CAAC,GAAG,EAAE,IAAI,EAAE,0BAA0B,GAAG,EAAE,CAAC,CAAC;SAC3E;aAAM,IAAI,SAAS,CAAC,UAAU,EAAE,EAAE;YACjC,OAAO,IAAI,kBAAkB,CAAC,GAAG,EAAE,IAAI,EAAE,6BAA6B,GAAG,EAAE,CAAC,CAAC;SAC9E;aAAM;YACL,OAAO,IAAI,CAAC;SACb;IACH,CAAC;IAEM,YAAY,CAAC,GAAQ,EAAE,QAA2B;QACvD,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAC9B,IAAI,GAAG,EAAE;YACP,MAAM,GAAG,CAAC;SACX;QAED,IAAI,QAAQ,IAAI,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;YACvC,OAAO,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;SACrC;QAED,OAAO,EAAE,GAAG,EAAE,IAAI,sBAAS,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC;IAC/C,CAAC;IAED;;;OAGG;IACI,aAAa;QAClB,OAAO,QAAQ,CAAC,IAAI,CAAC;IACvB,CAAC;IAED,cAAc;QACZ,OAAO;YACL,eAAe,EAAE,QAAQ,CAAC,IAAI;YAC9B,MAAM,EAAE,QAAQ,CAAC,IAAI;SACtB,CAAC;IACJ,CAAC;IAEM,WAAW,CAAC,GAAoB;QACrC,OAAO;YACL,GAAG,EAAE,EAAE,GAAG,EAAE,MAAM,CAAC,GAAG,CAAC,EAAE;YACzB,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,CAAC,IAAI,EAAE;SAC9B,CAAC;IACJ,CAAC;IAEM,KAAK,CAAC,EAAE,GAAG,EAAO;QACvB,OAAO,IAAI,sBAAS,CAAC,GAAG,CAAC,CAAC;IAC5B,CAAC;IAED,OAAO,CAAC,IAAqB,EAAE,IAAqB;QAClD,MAAM,EAAE,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC;QACxB,MAAM,EAAE,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC;QACxB,IAAI,EAAE,KAAK,EAAE,EAAE;YACb,OAAO,CAAC,CAAC;SACV;QAED,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC1B,CAAC;IAED,mBAAmB,CAAC,WAAmB,EAAE,MAAe;QACtD,IAAI,QAAQ,CAAC,IAAI,KAAK,WAAW,EAAE;YACjC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SACnB;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;;AA3FH,4BA4FC;AA3FQ,aAAI,GAAU,KAAK,CAAC"}
|
|
@@ -29,7 +29,10 @@ class StringToken extends token_1.ComparableToken {
|
|
|
29
29
|
const val = args.pop();
|
|
30
30
|
return { string: val };
|
|
31
31
|
}
|
|
32
|
-
EncodeObject(val) {
|
|
32
|
+
EncodeObject(val, semantic) {
|
|
33
|
+
if (semantic && semantic[StringToken.prim]) {
|
|
34
|
+
return semantic[StringToken.prim](val);
|
|
35
|
+
}
|
|
33
36
|
return { string: val };
|
|
34
37
|
}
|
|
35
38
|
ToKey({ string }) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"string.js","sourceRoot":"","sources":["../../../../src/tokens/comparable/string.ts"],"names":[],"mappings":";;;AACA,
|
|
1
|
+
{"version":3,"file":"string.js","sourceRoot":"","sources":["../../../../src/tokens/comparable/string.ts"],"names":[],"mappings":";;;AACA,oCAAkF;AAElF,MAAa,WAAY,SAAQ,uBAAe;IAG9C,YACY,GAAiD,EACjD,GAAW,EACX,GAAiB;QAE3B,KAAK,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;QAJX,QAAG,GAAH,GAAG,CAA8C;QACjD,QAAG,GAAH,GAAG,CAAQ;QACX,QAAG,GAAH,GAAG,CAAc;IAG7B,CAAC;IAEM,OAAO,CAAC,GAAQ;QACrB,OAAO,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAClC,CAAC;IAED;;;OAGG;IACI,aAAa;QAClB,OAAO,WAAW,CAAC,IAAI,CAAC;IAC1B,CAAC;IAED,cAAc;QACZ,OAAO;YACL,eAAe,EAAE,WAAW,CAAC,IAAI;YACjC,MAAM,EAAE,WAAW,CAAC,IAAI;SACzB,CAAC;IACJ,CAAC;IAEM,MAAM,CAAC,IAAW;QACvB,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACvB,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC;IACzB,CAAC;IAEM,YAAY,CAAC,GAAQ,EAAE,QAA2B;QACvD,IAAI,QAAQ,IAAI,QAAQ,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE;YAC1C,OAAO,QAAQ,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;SACxC;QACD,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC;IACzB,CAAC;IAEM,KAAK,CAAC,EAAE,MAAM,EAAO;QAC1B,OAAO,MAAM,CAAC;IAChB,CAAC;IAEM,WAAW,CAAC,GAAW;QAC5B,OAAO;YACL,GAAG,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE;YACpB,IAAI,EAAE,EAAE,IAAI,EAAE,WAAW,CAAC,IAAI,EAAE;SACjC,CAAC;IACJ,CAAC;IAED,mBAAmB,CAAC,WAAmB,EAAE,MAAe;QACtD,IAAI,WAAW,CAAC,IAAI,KAAK,WAAW,EAAE;YACpC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SACnB;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;;AA1DH,kCA2DC;AA1DQ,gBAAI,GAAa,QAAQ,CAAC"}
|
|
@@ -24,7 +24,10 @@ class TimestampToken extends token_1.ComparableToken {
|
|
|
24
24
|
const val = args.pop();
|
|
25
25
|
return { string: val };
|
|
26
26
|
}
|
|
27
|
-
EncodeObject(val) {
|
|
27
|
+
EncodeObject(val, semantic) {
|
|
28
|
+
if (semantic && semantic[TimestampToken.prim]) {
|
|
29
|
+
return semantic[TimestampToken.prim](val);
|
|
30
|
+
}
|
|
28
31
|
return { string: val };
|
|
29
32
|
}
|
|
30
33
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"timestamp.js","sourceRoot":"","sources":["../../../../src/tokens/comparable/timestamp.ts"],"names":[],"mappings":";;;AACA,
|
|
1
|
+
{"version":3,"file":"timestamp.js","sourceRoot":"","sources":["../../../../src/tokens/comparable/timestamp.ts"],"names":[],"mappings":";;;AACA,oCAAkF;AAElF,MAAa,cAAe,SAAQ,uBAAe;IAGjD,YACY,GAAiD,EACjD,GAAW,EACX,GAAiB;QAE3B,KAAK,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;QAJX,QAAG,GAAH,GAAG,CAA8C;QACjD,QAAG,GAAH,GAAG,CAAQ;QACX,QAAG,GAAH,GAAG,CAAc;IAG7B,CAAC;IAEM,OAAO,CAAC,GAAsC;QACnD,IAAI,GAAG,CAAC,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE;YAC1C,OAAO,IAAI,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,CAAC,WAAW,EAAE,CAAC;SAC1D;aAAM,IAAI,GAAG,CAAC,MAAM,EAAE;YACrB,OAAO,IAAI,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,WAAW,EAAE,CAAC;SAC3C;aAAM,IAAI,GAAG,CAAC,GAAG,EAAE;YAClB,OAAO,IAAI,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,CAAC,WAAW,EAAE,CAAC;SACvD;IACH,CAAC;IAEM,MAAM,CAAC,IAAW;QACvB,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACvB,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC;IACzB,CAAC;IAEM,YAAY,CAAC,GAAQ,EAAE,QAA2B;QACvD,IAAI,QAAQ,IAAI,QAAQ,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE;YAC7C,OAAO,QAAQ,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;SAC3C;QACD,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC;IACzB,CAAC;IAED;;;OAGG;IACI,aAAa;QAClB,OAAO,cAAc,CAAC,IAAI,CAAC;IAC7B,CAAC;IAED,cAAc;QACZ,OAAO;YACL,eAAe,EAAE,cAAc,CAAC,IAAI;YACpC,MAAM,EAAE,cAAc,CAAC,IAAI;SAC5B,CAAC;IACJ,CAAC;IAEM,KAAK,CAAC,EAAE,MAAM,EAAO;QAC1B,OAAO,MAAM,CAAC;IAChB,CAAC;IAEM,WAAW,CAAC,GAAW;QAC5B,OAAO;YACL,GAAG,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE;YACpB,IAAI,EAAE,EAAE,IAAI,EAAE,cAAc,CAAC,IAAI,EAAE;SACpC,CAAC;IACJ,CAAC;IAED,mBAAmB,CAAC,WAAmB,EAAE,MAAe;QACtD,IAAI,cAAc,CAAC,IAAI,KAAK,WAAW,EAAE;YACvC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SACnB;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;;AAhEH,wCAiEC;AAhEQ,mBAAI,GAAgB,WAAW,CAAC"}
|
|
@@ -0,0 +1,88 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.TxRollupL2AddressToken = exports.TxRollupL2AddressValidationError = void 0;
|
|
4
|
+
const utils_1 = require("@taquito/utils");
|
|
5
|
+
const token_1 = require("../token");
|
|
6
|
+
class TxRollupL2AddressValidationError extends token_1.TokenValidationError {
|
|
7
|
+
constructor(value, token, message) {
|
|
8
|
+
super(value, token, message);
|
|
9
|
+
this.value = value;
|
|
10
|
+
this.token = token;
|
|
11
|
+
this.name = 'TxRollupL2AddressValidationError';
|
|
12
|
+
}
|
|
13
|
+
}
|
|
14
|
+
exports.TxRollupL2AddressValidationError = TxRollupL2AddressValidationError;
|
|
15
|
+
class TxRollupL2AddressToken extends token_1.ComparableToken {
|
|
16
|
+
constructor(val, idx, fac) {
|
|
17
|
+
super(val, idx, fac);
|
|
18
|
+
this.val = val;
|
|
19
|
+
this.idx = idx;
|
|
20
|
+
this.fac = fac;
|
|
21
|
+
}
|
|
22
|
+
ToBigMapKey(val) {
|
|
23
|
+
const decoded = utils_1.b58decodeL2Address(val);
|
|
24
|
+
return {
|
|
25
|
+
key: { bytes: decoded },
|
|
26
|
+
type: { prim: 'bytes' }
|
|
27
|
+
};
|
|
28
|
+
}
|
|
29
|
+
isValid(value) {
|
|
30
|
+
if (utils_1.validateAddress(value) !== utils_1.ValidationResult.VALID) {
|
|
31
|
+
throw new TxRollupL2AddressValidationError(value, this, `tx_rollup_l2_address is not valid: ${value}`);
|
|
32
|
+
}
|
|
33
|
+
return null;
|
|
34
|
+
}
|
|
35
|
+
Encode(args) {
|
|
36
|
+
const val = args.pop();
|
|
37
|
+
if (!val) {
|
|
38
|
+
throw new TxRollupL2AddressValidationError(val, this, `arg missing to encode: this -> "${val}"`);
|
|
39
|
+
}
|
|
40
|
+
// no need to test since method throws
|
|
41
|
+
this.isValid(val);
|
|
42
|
+
return { string: val };
|
|
43
|
+
}
|
|
44
|
+
EncodeObject(val, semantic) {
|
|
45
|
+
// no need to test since method throws
|
|
46
|
+
this.isValid(val);
|
|
47
|
+
if (semantic && semantic[TxRollupL2AddressToken.prim]) {
|
|
48
|
+
return semantic[TxRollupL2AddressToken.prim](val);
|
|
49
|
+
}
|
|
50
|
+
return { string: val };
|
|
51
|
+
}
|
|
52
|
+
Execute(val) {
|
|
53
|
+
if (val.string) {
|
|
54
|
+
return val.string;
|
|
55
|
+
}
|
|
56
|
+
if (!val.bytes) {
|
|
57
|
+
throw new TxRollupL2AddressValidationError(val, this, `value cannot be missing string and byte value. must have one ${JSON.stringify(val)}`);
|
|
58
|
+
}
|
|
59
|
+
return utils_1.encodeL2Address(val.bytes);
|
|
60
|
+
}
|
|
61
|
+
ExtractSchema() {
|
|
62
|
+
return TxRollupL2AddressToken.prim;
|
|
63
|
+
}
|
|
64
|
+
generateSchema() {
|
|
65
|
+
return {
|
|
66
|
+
__michelsonType: TxRollupL2AddressToken.prim,
|
|
67
|
+
schema: TxRollupL2AddressToken.prim
|
|
68
|
+
};
|
|
69
|
+
}
|
|
70
|
+
ToKey({ bytes, string }) {
|
|
71
|
+
if (string) {
|
|
72
|
+
return string;
|
|
73
|
+
}
|
|
74
|
+
if (!bytes) {
|
|
75
|
+
throw new TxRollupL2AddressValidationError(bytes, this, `value cannot be missing string and byte value. must have one: bytes = ${bytes}`);
|
|
76
|
+
}
|
|
77
|
+
return utils_1.encodeL2Address(bytes);
|
|
78
|
+
}
|
|
79
|
+
findAndReturnTokens(tokenToFind, tokens) {
|
|
80
|
+
if (TxRollupL2AddressToken.prim === tokenToFind) {
|
|
81
|
+
tokens.push(this);
|
|
82
|
+
}
|
|
83
|
+
return tokens;
|
|
84
|
+
}
|
|
85
|
+
}
|
|
86
|
+
exports.TxRollupL2AddressToken = TxRollupL2AddressToken;
|
|
87
|
+
TxRollupL2AddressToken.prim = 'tx_rollup_l2_address';
|
|
88
|
+
//# sourceMappingURL=tx_rollup_l2_address.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"tx_rollup_l2_address.js","sourceRoot":"","sources":["../../../../src/tokens/comparable/tx_rollup_l2_address.ts"],"names":[],"mappings":"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"}
|
|
@@ -38,7 +38,10 @@ class GlobalConstantToken extends token_1.Token {
|
|
|
38
38
|
Encode(args) {
|
|
39
39
|
throw new GlobalConstantEncodingError(args, this, `Unable to encode a script containing global constants. Please provide an expanded script to the Michelson-Encoder. The following global constant hash was encountered: ${this.val.args[0]['string']}.`);
|
|
40
40
|
}
|
|
41
|
-
EncodeObject(val) {
|
|
41
|
+
EncodeObject(val, semantic) {
|
|
42
|
+
if (semantic && semantic[GlobalConstantToken.prim]) {
|
|
43
|
+
return semantic[GlobalConstantToken.prim](val);
|
|
44
|
+
}
|
|
42
45
|
throw new GlobalConstantEncodingError(val, this, `Unable to encode a script containing global constants. Please provide an expanded script to the Michelson-Encoder. The following global constant hash was encountered: ${this.val.args[0]['string']}.`);
|
|
43
46
|
}
|
|
44
47
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constant.js","sourceRoot":"","sources":["../../../src/tokens/constant.ts"],"names":[],"mappings":";;;AACA,
|
|
1
|
+
{"version":3,"file":"constant.js","sourceRoot":"","sources":["../../../src/tokens/constant.ts"],"names":[],"mappings":";;;AACA,mCAAgG;AAEhG,MAAa,2BAA4B,SAAQ,4BAAoB;IAEnE,YAAmB,KAAU,EAAS,KAA0B,EAAE,OAAe;QAC/E,KAAK,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;QADZ,UAAK,GAAL,KAAK,CAAK;QAAS,UAAK,GAAL,KAAK,CAAqB;QADhE,SAAI,GAAG,6BAA6B,CAAC;IAGrC,CAAC;CACF;AALD,kEAKC;AAED,MAAa,2BAA4B,SAAQ,4BAAoB;IAEnE,YAAmB,KAAU,EAAS,KAA0B,EAAE,OAAe;QAC/E,KAAK,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;QADZ,UAAK,GAAL,KAAK,CAAK;QAAS,UAAK,GAAL,KAAK,CAAqB;QADhE,SAAI,GAAG,6BAA6B,CAAC;IAGrC,CAAC;CACF;AALD,kEAKC;AAED,MAAa,mBAAoB,SAAQ,aAAK;IAG5C,YACY,GAAkD,EAClD,GAAW,EACX,GAAiB;QAE3B,KAAK,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;QAJX,QAAG,GAAH,GAAG,CAA+C;QAClD,QAAG,GAAH,GAAG,CAAQ;QACX,QAAG,GAAH,GAAG,CAAc;IAG7B,CAAC;IAEM,OAAO,CAAC,GAAQ,EAAE,QAAmB;QAC1C,IAAI,QAAQ,IAAI,QAAQ,CAAC,mBAAmB,CAAC,IAAI,CAAC,EAAE;YAClD,OAAO,QAAQ,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC,GAAU,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;SACjE;aAAM;YACL,MAAM,IAAI,2BAA2B,CACnC,GAAG,EACH,IAAI,EACJ,6MAA6M,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CAC3O,CAAC;SACH;IACH,CAAC;IAEM,MAAM,CAAC,IAAW;QACvB,MAAM,IAAI,2BAA2B,CACnC,IAAI,EACJ,IAAI,EACJ,0KAA0K,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CACxM,CAAC;IACJ,CAAC;IAEM,YAAY,CAAC,GAAQ,EAAE,QAA2B;QACvD,IAAI,QAAQ,IAAI,QAAQ,CAAC,mBAAmB,CAAC,IAAI,CAAC,EAAE;YAClD,OAAO,QAAQ,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;SAChD;QACD,MAAM,IAAI,2BAA2B,CACnC,GAAG,EACH,IAAI,EACJ,0KAA0K,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CACxM,CAAC;IACJ,CAAC;IAED;;;OAGG;IACI,aAAa;QAClB,OAAO,mBAAmB,CAAC,IAAI,CAAC;IAClC,CAAC;IAED,cAAc;QACZ,OAAO;YACL,eAAe,EAAE,mBAAmB,CAAC,IAAI;YACzC,MAAM,EAAE;gBACN,IAAI,EAAE,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC;aACjC;SACF,CAAC;IACJ,CAAC;IAED,mBAAmB,CAAC,WAAmB,EAAE,MAAe;QACtD,IAAI,mBAAmB,CAAC,IAAI,KAAK,WAAW,EAAE;YAC5C,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SACnB;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;;AAhEH,kDAiEC;AAhEQ,wBAAI,GAAe,UAAU,CAAC"}
|
|
@@ -30,6 +30,9 @@ class ContractToken extends token_1.Token {
|
|
|
30
30
|
if (val.string) {
|
|
31
31
|
return val.string;
|
|
32
32
|
}
|
|
33
|
+
if (!val.bytes) {
|
|
34
|
+
throw new ContractValidationError(val, this, 'must contain bytes or string');
|
|
35
|
+
}
|
|
33
36
|
return utils_1.encodePubKey(val.bytes);
|
|
34
37
|
}
|
|
35
38
|
Encode(args) {
|
|
@@ -40,11 +43,14 @@ class ContractToken extends token_1.Token {
|
|
|
40
43
|
}
|
|
41
44
|
return { string: val };
|
|
42
45
|
}
|
|
43
|
-
EncodeObject(val) {
|
|
46
|
+
EncodeObject(val, semantic) {
|
|
44
47
|
const err = this.isValid(val);
|
|
45
48
|
if (err) {
|
|
46
49
|
throw err;
|
|
47
50
|
}
|
|
51
|
+
if (semantic && semantic[ContractToken.prim]) {
|
|
52
|
+
return semantic[ContractToken.prim](val);
|
|
53
|
+
}
|
|
48
54
|
return { string: val };
|
|
49
55
|
}
|
|
50
56
|
/**
|
|
@@ -59,7 +65,7 @@ class ContractToken extends token_1.Token {
|
|
|
59
65
|
return {
|
|
60
66
|
__michelsonType: ContractToken.prim,
|
|
61
67
|
schema: {
|
|
62
|
-
parameter: valueSchema.generateSchema(),
|
|
68
|
+
parameter: this.val.args[0] ? valueSchema.generateSchema() : {},
|
|
63
69
|
},
|
|
64
70
|
};
|
|
65
71
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"contract.js","sourceRoot":"","sources":["../../../src/tokens/contract.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"contract.js","sourceRoot":"","sources":["../../../src/tokens/contract.ts"],"names":[],"mappings":";;;AACA,0CAAiF;AAEjF,mCAAsF;AAEtF,MAAa,uBAAwB,SAAQ,4BAAoB;IAE/D,YAAmB,KAAU,EAAS,KAAoB,EAAE,OAAe;QACzE,KAAK,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;QADZ,UAAK,GAAL,KAAK,CAAK;QAAS,UAAK,GAAL,KAAK,CAAe;QAD1D,SAAI,GAAG,yBAAyB,CAAC;IAGjC,CAAC;CACF;AALD,0DAKC;AAED,MAAa,aAAc,SAAQ,aAAK;IAGtC,YACY,GAAiD,EACjD,GAAW,EACX,GAAiB;QAE3B,KAAK,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;QAJX,QAAG,GAAH,GAAG,CAA8C;QACjD,QAAG,GAAH,GAAG,CAAQ;QACX,QAAG,GAAH,GAAG,CAAc;IAG7B,CAAC;IAEO,OAAO,CAAC,KAAU;QACxB,wEAAwE;QACxE,IAAI,uBAAe,CAAC,KAAK,CAAC,KAAK,wBAAgB,CAAC,KAAK,EAAE;YACrD,OAAO,IAAI,uBAAuB,CAAC,KAAK,EAAE,IAAI,EAAE,+BAA+B,CAAC,CAAC;SAClF;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,OAAO,CAAC,GAAsC;QACnD,IAAI,GAAG,CAAC,MAAM,EAAE;YACd,OAAO,GAAG,CAAC,MAAM,CAAC;SACnB;QACD,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE;YACd,MAAM,IAAI,uBAAuB,CAAC,GAAG,EAAE,IAAI,EAAE,8BAA8B,CAAC,CAAA;SAC7E;QAED,OAAO,oBAAY,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IACjC,CAAC;IAEM,MAAM,CAAC,IAAW;QACvB,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACvB,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAC9B,IAAI,GAAG,EAAE;YACP,MAAM,GAAG,CAAC;SACX;QACD,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC;IACzB,CAAC;IAEM,YAAY,CAAC,GAAQ,EAAE,QAA2B;QACvD,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAC9B,IAAI,GAAG,EAAE;YACP,MAAM,GAAG,CAAC;SACX;QACD,IAAI,QAAQ,IAAI,QAAQ,CAAC,aAAa,CAAC,IAAI,CAAC,EAAE;YAC5C,OAAO,QAAQ,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;SAC1C;QACD,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC;IACzB,CAAC;IAED;;;OAGG;IACI,aAAa;QAClB,OAAO,aAAa,CAAC,IAAI,CAAC;IAC5B,CAAC;IAED,cAAc;QACZ,MAAM,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QAC1D,OAAO;YACL,eAAe,EAAE,aAAa,CAAC,IAAI;YACnC,MAAM,EAAE;gBACN,SAAS,EAAE,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC,EAAiB;aAC/E;SACF,CAAC;IACJ,CAAC;IAED,mBAAmB,CAAC,WAAmB,EAAE,MAAe;QACtD,IAAI,aAAa,CAAC,IAAI,KAAK,WAAW,EAAE;YACtC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SACnB;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;;AA1EH,sCA2EC;AA1EQ,kBAAI,GAAe,UAAU,CAAC"}
|
package/dist/lib/tokens/key.js
CHANGED
|
@@ -40,11 +40,14 @@ class KeyToken extends token_1.ComparableToken {
|
|
|
40
40
|
}
|
|
41
41
|
return { string: val };
|
|
42
42
|
}
|
|
43
|
-
EncodeObject(val) {
|
|
43
|
+
EncodeObject(val, semantic) {
|
|
44
44
|
const err = this.isValid(val);
|
|
45
45
|
if (err) {
|
|
46
46
|
throw err;
|
|
47
47
|
}
|
|
48
|
+
if (semantic && semantic[KeyToken.prim]) {
|
|
49
|
+
return semantic[KeyToken.prim](val);
|
|
50
|
+
}
|
|
48
51
|
return { string: val };
|
|
49
52
|
}
|
|
50
53
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"key.js","sourceRoot":"","sources":["../../../src/tokens/key.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"key.js","sourceRoot":"","sources":["../../../src/tokens/key.ts"],"names":[],"mappings":"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"}
|
|
@@ -27,7 +27,10 @@ class LambdaToken extends token_1.Token {
|
|
|
27
27
|
const val = args.pop();
|
|
28
28
|
return val;
|
|
29
29
|
}
|
|
30
|
-
EncodeObject(val) {
|
|
30
|
+
EncodeObject(val, semantic) {
|
|
31
|
+
if (semantic && semantic[LambdaToken.prim]) {
|
|
32
|
+
return semantic[LambdaToken.prim](val);
|
|
33
|
+
}
|
|
31
34
|
return val;
|
|
32
35
|
}
|
|
33
36
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lambda.js","sourceRoot":"","sources":["../../../src/tokens/lambda.ts"],"names":[],"mappings":";;;AACA,
|
|
1
|
+
{"version":3,"file":"lambda.js","sourceRoot":"","sources":["../../../src/tokens/lambda.ts"],"names":[],"mappings":";;;AACA,mCAAgE;AAEhE,MAAa,WAAY,SAAQ,aAAK;IAGpC,YACY,GAAiD,EACjD,GAAW,EACX,GAAiB;QAE3B,KAAK,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;QAJX,QAAG,GAAH,GAAG,CAA8C;QACjD,QAAG,GAAH,GAAG,CAAQ;QACX,QAAG,GAAH,GAAG,CAAc;IAG7B,CAAC;IAED,IAAI,WAAW;QACb,OAAO,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;IACtD,CAAC;IAED,IAAI,YAAY;QACd,OAAO,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC;IAC1D,CAAC;IAEM,OAAO,CAAC,GAAQ;QACrB,IAAI,GAAG,CAAC,MAAM,EAAE;YACd,OAAO,GAAG,CAAC,MAAM,CAAC;SACnB;aAAM;YACL,OAAO,GAAG,CAAC;SACZ;IACH,CAAC;IAEM,MAAM,CAAC,IAAW;QACvB,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACvB,OAAO,GAAG,CAAC;IACb,CAAC;IAEM,YAAY,CAAC,GAAQ,EAAE,QAA2B;QACvD,IAAI,QAAQ,IAAI,QAAQ,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE;YAC1C,OAAO,QAAQ,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;SACxC;QACD,OAAO,GAAG,CAAC;IACb,CAAC;IAED;;;OAGG;IACI,aAAa;QAClB,OAAO;YACL,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE;gBAClB,UAAU,EAAE,IAAI,CAAC,WAAW,CAAC,aAAa,EAAE;gBAC5C,OAAO,EAAE,IAAI,CAAC,YAAY,CAAC,aAAa,EAAE;aAC3C;SACF,CAAC;IACJ,CAAC;IAED,cAAc;QACZ,OAAO;YACL,eAAe,EAAE,WAAW,CAAC,IAAI;YACjC,MAAM,EAAE;gBACN,UAAU,EAAE,IAAI,CAAC,WAAW,CAAC,cAAc,EAAE;gBAC7C,OAAO,EAAE,IAAI,CAAC,YAAY,CAAC,cAAc,EAAE;aAC5C;SACF,CAAC;IACJ,CAAC;IAED,mBAAmB,CAAC,WAAmB,EAAE,MAAe;QACtD,IAAI,WAAW,CAAC,IAAI,KAAK,WAAW,EAAE;YACpC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SACnB;QACD,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,mBAAmB,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;QACtF,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,mBAAmB,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;QACtF,OAAO,MAAM,CAAC;IAChB,CAAC;;AArEH,kCAsEC;AArEQ,gBAAI,GAAa,QAAQ,CAAC"}
|
package/dist/lib/tokens/list.js
CHANGED
|
@@ -48,12 +48,15 @@ class ListToken extends token_1.Token {
|
|
|
48
48
|
return [...prev, schema.Execute(current, semantics)];
|
|
49
49
|
}, []);
|
|
50
50
|
}
|
|
51
|
-
EncodeObject(args) {
|
|
51
|
+
EncodeObject(args, semantic) {
|
|
52
52
|
const schema = this.createToken(this.val.args[0], 0);
|
|
53
53
|
const err = this.isValid(args);
|
|
54
54
|
if (err) {
|
|
55
55
|
throw err;
|
|
56
56
|
}
|
|
57
|
+
if (semantic && semantic[ListToken.prim]) {
|
|
58
|
+
return semantic[ListToken.prim](args);
|
|
59
|
+
}
|
|
57
60
|
return args.reduce((prev, current) => {
|
|
58
61
|
return [...prev, schema.EncodeObject(current)];
|
|
59
62
|
}, []);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"list.js","sourceRoot":"","sources":["../../../src/tokens/list.ts"],"names":[],"mappings":";;;AACA,
|
|
1
|
+
{"version":3,"file":"list.js","sourceRoot":"","sources":["../../../src/tokens/list.ts"],"names":[],"mappings":"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"}
|
package/dist/lib/tokens/map.js
CHANGED
|
@@ -53,12 +53,15 @@ class MapToken extends token_1.Token {
|
|
|
53
53
|
};
|
|
54
54
|
});
|
|
55
55
|
}
|
|
56
|
-
EncodeObject(args) {
|
|
56
|
+
EncodeObject(args, semantic) {
|
|
57
57
|
const val = args;
|
|
58
58
|
const err = this.isValid(val);
|
|
59
59
|
if (err) {
|
|
60
60
|
throw err;
|
|
61
61
|
}
|
|
62
|
+
if (semantic && semantic[MapToken.prim]) {
|
|
63
|
+
return semantic[MapToken.prim](val);
|
|
64
|
+
}
|
|
62
65
|
return Array.from(val.keys())
|
|
63
66
|
.sort((a, b) => this.KeySchema.compare(a, b))
|
|
64
67
|
.map((key) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"map.js","sourceRoot":"","sources":["../../../src/tokens/map.ts"],"names":[],"mappings":";;;AAAA,oDAAgD;AAEhD,
|
|
1
|
+
{"version":3,"file":"map.js","sourceRoot":"","sources":["../../../src/tokens/map.ts"],"names":[],"mappings":"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"}
|
package/dist/lib/tokens/never.js
CHANGED
|
@@ -22,7 +22,10 @@ class NeverToken extends token_1.Token {
|
|
|
22
22
|
const val = args.pop();
|
|
23
23
|
throw new NeverTokenError(val, this, 'Assigning a value to the type never is forbidden.');
|
|
24
24
|
}
|
|
25
|
-
EncodeObject(val) {
|
|
25
|
+
EncodeObject(val, semantic) {
|
|
26
|
+
if (semantic && semantic[NeverToken.prim]) {
|
|
27
|
+
return semantic[NeverToken.prim](val);
|
|
28
|
+
}
|
|
26
29
|
throw new NeverTokenError(val, this, 'Assigning a value to the type never is forbidden.');
|
|
27
30
|
}
|
|
28
31
|
Execute(val) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"never.js","sourceRoot":"","sources":["../../../src/tokens/never.ts"],"names":[],"mappings":";;;AACA,
|
|
1
|
+
{"version":3,"file":"never.js","sourceRoot":"","sources":["../../../src/tokens/never.ts"],"names":[],"mappings":";;;AACA,mCAAsF;AAEtF,MAAa,eAAgB,SAAQ,4BAAoB;IAEvD,YAAmB,KAAU,EAAS,KAAiB,EAAE,OAAe;QACtE,KAAK,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;QADZ,UAAK,GAAL,KAAK,CAAK;QAAS,UAAK,GAAL,KAAK,CAAY;QADvD,SAAI,GAAG,iBAAiB,CAAC;IAGzB,CAAC;CACF;AALD,0CAKC;AAED,MAAa,UAAW,SAAQ,aAAK;IAEnC,YACY,GAAiD,EACjD,GAAW,EACX,GAAiB;QAE3B,KAAK,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;QAJX,QAAG,GAAH,GAAG,CAA8C;QACjD,QAAG,GAAH,GAAG,CAAQ;QACX,QAAG,GAAH,GAAG,CAAc;IAG7B,CAAC;IACM,MAAM,CAAC,IAAW;QACvB,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACvB,MAAM,IAAI,eAAe,CAAC,GAAG,EAAE,IAAI,EAAE,mDAAmD,CAAC,CAAC;IAC5F,CAAC;IACM,YAAY,CAAC,GAAQ,EAAE,QAA2B;QACvD,IAAI,QAAQ,IAAI,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE;YACzC,OAAO,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;SACvC;QACD,MAAM,IAAI,eAAe,CAAC,GAAG,EAAE,IAAI,EAAE,mDAAmD,CAAC,CAAC;IAC5F,CAAC;IACM,OAAO,CAAC,GAAQ;QACrB,MAAM,IAAI,eAAe,CAAC,GAAG,EAAE,IAAI,EAAE,+CAA+C,CAAC,CAAC;IACxF,CAAC;IAED;;;OAGG;IACI,aAAa;QAClB,OAAO,UAAU,CAAC,IAAI,CAAC;IACzB,CAAC;IAED,cAAc;QACZ,OAAO;YACL,eAAe,EAAE,UAAU,CAAC,IAAI;YAChC,MAAM,EAAE,UAAU,CAAC,IAAI;SACxB,CAAC;IACJ,CAAC;IAED,mBAAmB,CAAC,WAAmB,EAAE,MAAe;QACtD,IAAI,UAAU,CAAC,IAAI,KAAK,WAAW,EAAE;YACnC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SACnB;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;;AA3CH,gCA4CC;AA3CQ,eAAI,GAAY,OAAO,CAAC"}
|
|
@@ -16,7 +16,10 @@ class OperationToken extends token_1.Token {
|
|
|
16
16
|
const val = args.pop();
|
|
17
17
|
return { string: val };
|
|
18
18
|
}
|
|
19
|
-
EncodeObject(val) {
|
|
19
|
+
EncodeObject(val, semantic) {
|
|
20
|
+
if (semantic && semantic[OperationToken.prim]) {
|
|
21
|
+
return semantic[OperationToken.prim](val);
|
|
22
|
+
}
|
|
20
23
|
return { string: val };
|
|
21
24
|
}
|
|
22
25
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"operation.js","sourceRoot":"","sources":["../../../src/tokens/operation.ts"],"names":[],"mappings":";;;AACA,
|
|
1
|
+
{"version":3,"file":"operation.js","sourceRoot":"","sources":["../../../src/tokens/operation.ts"],"names":[],"mappings":";;;AACA,mCAAgE;AAEhE,MAAa,cAAe,SAAQ,aAAK;IAGvC,YACY,GAAiD,EACjD,GAAW,EACX,GAAiB;QAE3B,KAAK,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;QAJX,QAAG,GAAH,GAAG,CAA8C;QACjD,QAAG,GAAH,GAAG,CAAQ;QACX,QAAG,GAAH,GAAG,CAAc;IAG7B,CAAC;IAEM,OAAO,CAAC,GAAQ;QACrB,OAAO,GAAG,CAAC,MAAM,CAAC;IACpB,CAAC;IAEM,MAAM,CAAC,GAAG,IAAW;QAC1B,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACvB,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC;IACzB,CAAC;IAEM,YAAY,CAAC,GAAQ,EAAE,QAA2B;QACvD,IAAI,QAAQ,IAAI,QAAQ,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE;YAC7C,OAAO,QAAQ,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;SAC3C;QACD,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC;IACzB,CAAC;IAED;;;OAGG;IACI,aAAa;QAClB,OAAO,cAAc,CAAC,IAAI,CAAC;IAC7B,CAAC;IAED,cAAc;QACZ,OAAO;YACL,eAAe,EAAE,cAAc,CAAC,IAAI;YACpC,MAAM,EAAE,cAAc,CAAC,IAAI;SAC5B,CAAC;IACJ,CAAC;IAED,mBAAmB,CAAC,WAAmB,EAAE,MAAe;QACtD,IAAI,cAAc,CAAC,IAAI,KAAK,WAAW,EAAE;YACvC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SACnB;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;;AA/CH,wCAgDC;AA/CQ,mBAAI,GAAgB,WAAW,CAAC"}
|
|
@@ -32,12 +32,12 @@ class OptionToken extends token_1.ComparableToken {
|
|
|
32
32
|
}
|
|
33
33
|
return { prim: 'Some', args: [this.schema().Encode(args)] };
|
|
34
34
|
}
|
|
35
|
-
EncodeObject(args) {
|
|
35
|
+
EncodeObject(args, semantic) {
|
|
36
36
|
const value = args;
|
|
37
37
|
if (value === undefined || value === null) {
|
|
38
38
|
return { prim: 'None' };
|
|
39
39
|
}
|
|
40
|
-
return { prim: 'Some', args: [this.schema().EncodeObject(value)] };
|
|
40
|
+
return { prim: 'Some', args: [this.schema().EncodeObject(value, semantic)] };
|
|
41
41
|
}
|
|
42
42
|
Execute(val, semantics) {
|
|
43
43
|
if (val.prim === 'None') {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"option.js","sourceRoot":"","sources":["../../../src/tokens/option.ts"],"names":[],"mappings":";;;AACA,
|
|
1
|
+
{"version":3,"file":"option.js","sourceRoot":"","sources":["../../../src/tokens/option.ts"],"names":[],"mappings":"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"}
|
package/dist/lib/tokens/or.js
CHANGED
|
@@ -79,7 +79,7 @@ class OrToken extends token_1.ComparableToken {
|
|
|
79
79
|
}
|
|
80
80
|
return newSig;
|
|
81
81
|
}
|
|
82
|
-
EncodeObject(args) {
|
|
82
|
+
EncodeObject(args, semantic) {
|
|
83
83
|
const label = Object.keys(args)[0];
|
|
84
84
|
const leftToken = this.createToken(this.val.args[0], this.idx);
|
|
85
85
|
let keyCount = 1;
|
|
@@ -88,20 +88,20 @@ class OrToken extends token_1.ComparableToken {
|
|
|
88
88
|
}
|
|
89
89
|
const rightToken = this.createToken(this.val.args[1], this.idx + keyCount);
|
|
90
90
|
if (String(leftToken.annot()) === String(label) && !(leftToken instanceof OrToken)) {
|
|
91
|
-
return { prim: 'Left', args: [leftToken.EncodeObject(args[label])] };
|
|
91
|
+
return { prim: 'Left', args: [leftToken.EncodeObject(args[label], semantic)] };
|
|
92
92
|
}
|
|
93
93
|
else if (String(rightToken.annot()) === String(label) && !(rightToken instanceof OrToken)) {
|
|
94
|
-
return { prim: 'Right', args: [rightToken.EncodeObject(args[label])] };
|
|
94
|
+
return { prim: 'Right', args: [rightToken.EncodeObject(args[label], semantic)] };
|
|
95
95
|
}
|
|
96
96
|
else {
|
|
97
97
|
if (leftToken instanceof OrToken) {
|
|
98
|
-
const val = leftToken.EncodeObject(args);
|
|
98
|
+
const val = leftToken.EncodeObject(args, semantic);
|
|
99
99
|
if (val) {
|
|
100
100
|
return { prim: 'Left', args: [val] };
|
|
101
101
|
}
|
|
102
102
|
}
|
|
103
103
|
if (rightToken instanceof OrToken) {
|
|
104
|
-
const val = rightToken.EncodeObject(args);
|
|
104
|
+
const val = rightToken.EncodeObject(args, semantic);
|
|
105
105
|
if (val) {
|
|
106
106
|
return { prim: 'Right', args: [val] };
|
|
107
107
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"or.js","sourceRoot":"","sources":["../../../src/tokens/or.ts"],"names":[],"mappings":";;;AACA,
|
|
1
|
+
{"version":3,"file":"or.js","sourceRoot":"","sources":["../../../src/tokens/or.ts"],"names":[],"mappings":"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"}
|
package/dist/lib/tokens/pair.js
CHANGED
|
@@ -57,7 +57,10 @@ class PairToken extends token_1.ComparableToken {
|
|
|
57
57
|
prim: PairToken.prim,
|
|
58
58
|
args: val,
|
|
59
59
|
}
|
|
60
|
-
: val
|
|
60
|
+
: val.prim ? val : {
|
|
61
|
+
prim: PairToken.prim,
|
|
62
|
+
args: val,
|
|
63
|
+
}, idx, fac);
|
|
61
64
|
}
|
|
62
65
|
args() {
|
|
63
66
|
// collapse comb pair
|
|
@@ -107,7 +110,7 @@ class PairToken extends token_1.ComparableToken {
|
|
|
107
110
|
ToKey(val) {
|
|
108
111
|
return this.Execute(val);
|
|
109
112
|
}
|
|
110
|
-
EncodeObject(args) {
|
|
113
|
+
EncodeObject(args, semantic) {
|
|
111
114
|
const [leftToken, rightToken] = this.tokens();
|
|
112
115
|
let leftValue;
|
|
113
116
|
if (leftToken instanceof PairToken && !leftToken.hasAnnotations()) {
|
|
@@ -125,7 +128,10 @@ class PairToken extends token_1.ComparableToken {
|
|
|
125
128
|
}
|
|
126
129
|
return {
|
|
127
130
|
prim: 'Pair',
|
|
128
|
-
args: [
|
|
131
|
+
args: [
|
|
132
|
+
leftToken.EncodeObject(leftValue, semantic),
|
|
133
|
+
rightToken.EncodeObject(rightValue, semantic),
|
|
134
|
+
],
|
|
129
135
|
};
|
|
130
136
|
}
|
|
131
137
|
traversal(getLeftValue, getRightValue) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pair.js","sourceRoot":"","sources":["../../../src/tokens/pair.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"pair.js","sourceRoot":"","sources":["../../../src/tokens/pair.ts"],"names":[],"mappings":"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"}
|