solc-typed-ast 10.1.1 → 10.1.4
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/README.md +1 -1
- package/dist/ast/implementation/declaration/error_definition.js +1 -1
- package/dist/ast/implementation/declaration/error_definition.js.map +1 -1
- package/dist/ast/implementation/declaration/event_definition.d.ts +5 -1
- package/dist/ast/implementation/declaration/event_definition.d.ts.map +1 -1
- package/dist/ast/implementation/declaration/event_definition.js +8 -2
- package/dist/ast/implementation/declaration/event_definition.js.map +1 -1
- package/dist/ast/implementation/declaration/function_definition.js +1 -1
- package/dist/ast/implementation/declaration/function_definition.js.map +1 -1
- package/dist/ast/implementation/declaration/modifier_definition.js +1 -1
- package/dist/ast/implementation/declaration/modifier_definition.js.map +1 -1
- package/dist/ast/implementation/declaration/variable_declaration.js +1 -1
- package/dist/ast/implementation/declaration/variable_declaration.js.map +1 -1
- package/dist/ast/legacy/function_definition_processor.d.ts +0 -1
- package/dist/ast/legacy/function_definition_processor.d.ts.map +1 -1
- package/dist/ast/legacy/function_definition_processor.js +2 -10
- package/dist/ast/legacy/function_definition_processor.js.map +1 -1
- package/dist/ast/modern/function_definition_processor.d.ts.map +1 -1
- package/dist/ast/modern/function_definition_processor.js +2 -1
- package/dist/ast/modern/function_definition_processor.js.map +1 -1
- package/dist/ast/sanity.d.ts.map +1 -1
- package/dist/ast/sanity.js +18 -18
- package/dist/ast/sanity.js.map +1 -1
- package/dist/ast/utils.d.ts +4 -1
- package/dist/ast/utils.d.ts.map +1 -1
- package/dist/ast/utils.js +25 -6
- package/dist/ast/utils.js.map +1 -1
- package/dist/bin/compile.js +12 -8
- package/dist/bin/compile.js.map +1 -1
- package/dist/compile/constants.d.ts.map +1 -1
- package/dist/compile/constants.js +3 -1
- package/dist/compile/constants.js.map +1 -1
- package/package.json +16 -17
package/README.md
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
[](https://github.com/ConsenSys/solc-typed-ast/actions/workflows/node.js.yaml)
|
|
2
2
|
[](https://codecov.io/gh/ConsenSys/solc-typed-ast)
|
|
3
3
|
[](https://consensys.github.io/solc-typed-ast/)
|
|
4
4
|
[](https://www.npmjs.com/package/solc-typed-ast)
|
|
@@ -34,7 +34,7 @@ class ErrorDefinition extends ast_node_1.ASTNode {
|
|
|
34
34
|
* applied to the canonical representation of the error signature.
|
|
35
35
|
*/
|
|
36
36
|
canonicalSignatureHash(encoderVersion) {
|
|
37
|
-
return (0, utils_1.
|
|
37
|
+
return (0, utils_1.encodeFuncSignature)(this.canonicalSignature(encoderVersion));
|
|
38
38
|
}
|
|
39
39
|
}
|
|
40
40
|
exports.ErrorDefinition = ErrorDefinition;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"error_definition.js","sourceRoot":"","sources":["../../../../src/ast/implementation/declaration/error_definition.ts"],"names":[],"mappings":";;;AACA,6CAAyC;AACzC,
|
|
1
|
+
{"version":3,"file":"error_definition.js","sourceRoot":"","sources":["../../../../src/ast/implementation/declaration/error_definition.ts"],"names":[],"mappings":";;;AACA,6CAAyC;AACzC,uCAAkD;AAMlD,MAAa,eAAgB,SAAQ,kBAAO;IAwBxC,YACI,EAAU,EACV,GAAW,EACX,IAAY,EACZ,UAAyB,EACzB,aAAgD,EAChD,YAAqB,EACrB,GAAS;QAET,KAAK,CAAC,EAAE,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;QAEpB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;QACnC,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QAEjC,IAAI,CAAC,WAAW,GAAG,UAAU,CAAC;QAE9B,IAAI,CAAC,cAAc,EAAE,CAAC;IAC1B,CAAC;IAED,IAAI,QAAQ;QACR,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,aAAa,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;IAChE,CAAC;IAED;;;OAGG;IACH,IAAI,MAAM;QACN,OAAO,IAAI,CAAC,MAAyC,CAAC;IAC1D,CAAC;IAED;;OAEG;IACH,kBAAkB,CAAC,cAAiC;QAChD,MAAM,IAAI,GAAG,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAClD,GAAG,CAAC,sBAAsB,CAAC,cAAc,CAAC,CAC7C,CAAC;QAEF,OAAO,IAAI,CAAC,IAAI,GAAG,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC;IAClD,CAAC;IAED;;;OAGG;IACH,sBAAsB,CAAC,cAAiC;QACpD,OAAO,IAAA,2BAAmB,EAAC,IAAI,CAAC,kBAAkB,CAAC,cAAc,CAAC,CAAC,CAAC;IACxE,CAAC;CACJ;AA1ED,0CA0EC"}
|
|
@@ -39,9 +39,13 @@ export declare class EventDefinition extends ASTNode {
|
|
|
39
39
|
*/
|
|
40
40
|
canonicalSignature(encoderVersion: ABIEncoderVersion): string;
|
|
41
41
|
/**
|
|
42
|
-
* Returns HEX string containing first
|
|
42
|
+
* Returns HEX string containing first 32 bytes of Keccak256 hash function
|
|
43
43
|
* applied to the canonical representation of the event signature.
|
|
44
44
|
*/
|
|
45
45
|
canonicalSignatureHash(encoderVersion: ABIEncoderVersion): string;
|
|
46
|
+
/**
|
|
47
|
+
* Returns 32 bytes of event topic hash or `undefined` if event is declared as anonymous.
|
|
48
|
+
*/
|
|
49
|
+
eventTopic(encoderVersion: ABIEncoderVersion): string | undefined;
|
|
46
50
|
}
|
|
47
51
|
//# sourceMappingURL=event_definition.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"event_definition.d.ts","sourceRoot":"","sources":["../../../../src/ast/implementation/declaration/event_definition.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAEzC,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AACvD,OAAO,EAAE,uBAAuB,EAAE,MAAM,kCAAkC,CAAC;AAC3E,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAE3D,qBAAa,eAAgB,SAAQ,OAAO;IACxC;;;OAGG;IACH,SAAS,EAAE,OAAO,CAAC;IAEnB;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;OAEG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IAEtB;;;;;OAKG;IACH,aAAa,CAAC,EAAE,MAAM,GAAG,uBAAuB,CAAC;IAEjD;;OAEG;IACH,WAAW,EAAE,aAAa,CAAC;gBAGvB,EAAE,EAAE,MAAM,EACV,GAAG,EAAE,MAAM,EACX,SAAS,EAAE,OAAO,EAClB,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,aAAa,EACzB,aAAa,CAAC,EAAE,MAAM,GAAG,uBAAuB,EAChD,YAAY,CAAC,EAAE,MAAM,EACrB,GAAG,CAAC,EAAE,GAAG;IAcb,IAAI,QAAQ,IAAI,SAAS,OAAO,EAAE,CAEjC;IAED;;OAEG;IACH,IAAI,MAAM,IAAI,kBAAkB,CAE/B;IAED;;OAEG;IACH,kBAAkB,CAAC,cAAc,EAAE,iBAAiB,GAAG,MAAM;IAQ7D;;;OAGG;IACH,sBAAsB,CAAC,cAAc,EAAE,iBAAiB,GAAG,MAAM;CAGpE"}
|
|
1
|
+
{"version":3,"file":"event_definition.d.ts","sourceRoot":"","sources":["../../../../src/ast/implementation/declaration/event_definition.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAEzC,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AACvD,OAAO,EAAE,uBAAuB,EAAE,MAAM,kCAAkC,CAAC;AAC3E,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAE3D,qBAAa,eAAgB,SAAQ,OAAO;IACxC;;;OAGG;IACH,SAAS,EAAE,OAAO,CAAC;IAEnB;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;OAEG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IAEtB;;;;;OAKG;IACH,aAAa,CAAC,EAAE,MAAM,GAAG,uBAAuB,CAAC;IAEjD;;OAEG;IACH,WAAW,EAAE,aAAa,CAAC;gBAGvB,EAAE,EAAE,MAAM,EACV,GAAG,EAAE,MAAM,EACX,SAAS,EAAE,OAAO,EAClB,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,aAAa,EACzB,aAAa,CAAC,EAAE,MAAM,GAAG,uBAAuB,EAChD,YAAY,CAAC,EAAE,MAAM,EACrB,GAAG,CAAC,EAAE,GAAG;IAcb,IAAI,QAAQ,IAAI,SAAS,OAAO,EAAE,CAEjC;IAED;;OAEG;IACH,IAAI,MAAM,IAAI,kBAAkB,CAE/B;IAED;;OAEG;IACH,kBAAkB,CAAC,cAAc,EAAE,iBAAiB,GAAG,MAAM;IAQ7D;;;OAGG;IACH,sBAAsB,CAAC,cAAc,EAAE,iBAAiB,GAAG,MAAM;IAIjE;;OAEG;IACH,UAAU,CAAC,cAAc,EAAE,iBAAiB,GAAG,MAAM,GAAG,SAAS;CAGpE"}
|
|
@@ -30,11 +30,17 @@ class EventDefinition extends ast_node_1.ASTNode {
|
|
|
30
30
|
return this.name + "(" + args.join(",") + ")";
|
|
31
31
|
}
|
|
32
32
|
/**
|
|
33
|
-
* Returns HEX string containing first
|
|
33
|
+
* Returns HEX string containing first 32 bytes of Keccak256 hash function
|
|
34
34
|
* applied to the canonical representation of the event signature.
|
|
35
35
|
*/
|
|
36
36
|
canonicalSignatureHash(encoderVersion) {
|
|
37
|
-
return (0, utils_1.
|
|
37
|
+
return (0, utils_1.encodeEventSignature)(this.canonicalSignature(encoderVersion));
|
|
38
|
+
}
|
|
39
|
+
/**
|
|
40
|
+
* Returns 32 bytes of event topic hash or `undefined` if event is declared as anonymous.
|
|
41
|
+
*/
|
|
42
|
+
eventTopic(encoderVersion) {
|
|
43
|
+
return this.anonymous ? undefined : this.canonicalSignatureHash(encoderVersion);
|
|
38
44
|
}
|
|
39
45
|
}
|
|
40
46
|
exports.EventDefinition = EventDefinition;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"event_definition.js","sourceRoot":"","sources":["../../../../src/ast/implementation/declaration/event_definition.ts"],"names":[],"mappings":";;;AACA,6CAAyC;AACzC,
|
|
1
|
+
{"version":3,"file":"event_definition.js","sourceRoot":"","sources":["../../../../src/ast/implementation/declaration/event_definition.ts"],"names":[],"mappings":";;;AACA,6CAAyC;AACzC,uCAAmD;AAKnD,MAAa,eAAgB,SAAQ,kBAAO;IA8BxC,YACI,EAAU,EACV,GAAW,EACX,SAAkB,EAClB,IAAY,EACZ,UAAyB,EACzB,aAAgD,EAChD,YAAqB,EACrB,GAAS;QAET,KAAK,CAAC,EAAE,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;QAEpB,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;QACnC,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QAEjC,IAAI,CAAC,WAAW,GAAG,UAAU,CAAC;QAE9B,IAAI,CAAC,cAAc,EAAE,CAAC;IAC1B,CAAC;IAED,IAAI,QAAQ;QACR,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,aAAa,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;IAChE,CAAC;IAED;;OAEG;IACH,IAAI,MAAM;QACN,OAAO,IAAI,CAAC,MAA4B,CAAC;IAC7C,CAAC;IAED;;OAEG;IACH,kBAAkB,CAAC,cAAiC;QAChD,MAAM,IAAI,GAAG,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAClD,GAAG,CAAC,sBAAsB,CAAC,cAAc,CAAC,CAC7C,CAAC;QAEF,OAAO,IAAI,CAAC,IAAI,GAAG,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC;IAClD,CAAC;IAED;;;OAGG;IACH,sBAAsB,CAAC,cAAiC;QACpD,OAAO,IAAA,4BAAoB,EAAC,IAAI,CAAC,kBAAkB,CAAC,cAAc,CAAC,CAAC,CAAC;IACzE,CAAC;IAED;;OAEG;IACH,UAAU,CAAC,cAAiC;QACxC,OAAO,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,sBAAsB,CAAC,cAAc,CAAC,CAAC;IACpF,CAAC;CACJ;AAxFD,0CAwFC"}
|
|
@@ -73,7 +73,7 @@ class FunctionDefinition extends ast_node_1.ASTNode {
|
|
|
73
73
|
*/
|
|
74
74
|
canonicalSignatureHash(encoderVersion) {
|
|
75
75
|
const signature = this.canonicalSignature(encoderVersion);
|
|
76
|
-
return signature ? (0, utils_1.
|
|
76
|
+
return signature ? (0, utils_1.encodeFuncSignature)(signature) : "";
|
|
77
77
|
}
|
|
78
78
|
}
|
|
79
79
|
exports.FunctionDefinition = FunctionDefinition;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"function_definition.js","sourceRoot":"","sources":["../../../../src/ast/implementation/declaration/function_definition.ts"],"names":[],"mappings":";;;AAAA,0CAA+D;AAC/D,4CAAsF;AACtF,6CAAyC;AACzC,+CAKyB;AACzB,
|
|
1
|
+
{"version":3,"file":"function_definition.js","sourceRoot":"","sources":["../../../../src/ast/implementation/declaration/function_definition.ts"],"names":[],"mappings":"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"}
|
|
@@ -37,7 +37,7 @@ class ModifierDefinition extends ast_node_1.ASTNode {
|
|
|
37
37
|
* applied to the canonical representation of the modifier signature.
|
|
38
38
|
*/
|
|
39
39
|
canonicalSignatureHash(encoderVersion) {
|
|
40
|
-
return (0, utils_1.
|
|
40
|
+
return (0, utils_1.encodeFuncSignature)(this.canonicalSignature(encoderVersion));
|
|
41
41
|
}
|
|
42
42
|
}
|
|
43
43
|
exports.ModifierDefinition = ModifierDefinition;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"modifier_definition.js","sourceRoot":"","sources":["../../../../src/ast/implementation/declaration/modifier_definition.ts"],"names":[],"mappings":";;;AACA,6CAAyC;AACzC,
|
|
1
|
+
{"version":3,"file":"modifier_definition.js","sourceRoot":"","sources":["../../../../src/ast/implementation/declaration/modifier_definition.ts"],"names":[],"mappings":";;;AACA,6CAAyC;AACzC,uCAAkD;AAOlD,MAAa,kBAAmB,SAAQ,kBAAO;IA+C3C,YACI,EAAU,EACV,GAAW,EACX,IAAY,EACZ,OAAgB,EAChB,UAAkB,EAClB,UAAyB,EACzB,iBAAqC,EACrC,IAAY,EACZ,aAAgD,EAChD,YAAqB,EACrB,GAAS;QAET,KAAK,CAAC,EAAE,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;QAEpB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;QACnC,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QAEjC,IAAI,CAAC,WAAW,GAAG,UAAU,CAAC;QAC9B,IAAI,CAAC,kBAAkB,GAAG,iBAAiB,CAAC;QAC5C,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QAElB,IAAI,CAAC,cAAc,EAAE,CAAC;IAC1B,CAAC;IAED,IAAI,QAAQ;QACR,OAAO,IAAI,CAAC,SAAS,CACjB,IAAI,CAAC,aAAa,EAClB,IAAI,CAAC,WAAW,EAChB,IAAI,CAAC,kBAAkB,EACvB,IAAI,CAAC,KAAK,CACb,CAAC;IACN,CAAC;IAED;;OAEG;IACH,IAAI,MAAM;QACN,OAAO,IAAI,CAAC,MAA4B,CAAC;IAC7C,CAAC;IAED;;OAEG;IACH,kBAAkB,CAAC,cAAiC;QAChD,MAAM,IAAI,GAAG,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAClD,GAAG,CAAC,sBAAsB,CAAC,cAAc,CAAC,CAC7C,CAAC;QAEF,OAAO,IAAI,CAAC,IAAI,GAAG,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC;IAClD,CAAC;IAED;;;OAGG;IACH,sBAAsB,CAAC,cAAiC;QACpD,OAAO,IAAA,2BAAmB,EAAC,IAAI,CAAC,kBAAkB,CAAC,cAAc,CAAC,CAAC,CAAC;IACxE,CAAC;CACJ;AA7GD,gDA6GC"}
|
|
@@ -109,7 +109,7 @@ class VariableDeclaration extends ast_node_1.ASTNode {
|
|
|
109
109
|
* corresponding to this state variable.
|
|
110
110
|
*/
|
|
111
111
|
getterCanonicalSignatureHash(encoderVersion) {
|
|
112
|
-
return (0, utils_2.
|
|
112
|
+
return (0, utils_2.encodeFuncSignature)(this.getterCanonicalSignature(encoderVersion));
|
|
113
113
|
}
|
|
114
114
|
}
|
|
115
115
|
exports.VariableDeclaration = VariableDeclaration;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"variable_declaration.js","sourceRoot":"","sources":["../../../../src/ast/implementation/declaration/variable_declaration.ts"],"names":[],"mappings":";;;AAAA,+CAA6C;AAC7C,0CAUwB;AACxB,4CAAiG;AACjG,6CAAyC;AACzC,+CAMyB;AACzB,
|
|
1
|
+
{"version":3,"file":"variable_declaration.js","sourceRoot":"","sources":["../../../../src/ast/implementation/declaration/variable_declaration.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,6 @@ import { FunctionDefinition } from "../implementation/declaration/function_defin
|
|
|
3
3
|
import { LegacyNodeProcessor } from "./node_processor";
|
|
4
4
|
export declare class LegacyFunctionDefinitionProcessor extends LegacyNodeProcessor<FunctionDefinition> {
|
|
5
5
|
process(reader: ASTReader, config: ASTReaderConfiguration, raw: any): ConstructorParameters<typeof FunctionDefinition>;
|
|
6
|
-
private detectFunctionKind;
|
|
7
6
|
private detectStateMutability;
|
|
8
7
|
private extract;
|
|
9
8
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"function_definition_processor.d.ts","sourceRoot":"","sources":["../../../src/ast/legacy/function_definition_processor.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,sBAAsB,EAAE,MAAM,eAAe,CAAC;AAElE,OAAO,EAAE,kBAAkB,EAAE,MAAM,mDAAmD,CAAC;
|
|
1
|
+
{"version":3,"file":"function_definition_processor.d.ts","sourceRoot":"","sources":["../../../src/ast/legacy/function_definition_processor.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,sBAAsB,EAAE,MAAM,eAAe,CAAC;AAElE,OAAO,EAAE,kBAAkB,EAAE,MAAM,mDAAmD,CAAC;AAOvF,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAEvD,qBAAa,iCAAkC,SAAQ,mBAAmB,CAAC,kBAAkB,CAAC;IAC1F,OAAO,CACH,MAAM,EAAE,SAAS,EACjB,MAAM,EAAE,sBAAsB,EAC9B,GAAG,EAAE,GAAG,GACT,qBAAqB,CAAC,OAAO,kBAAkB,CAAC;IAmDnD,OAAO,CAAC,qBAAqB;IAc7B,OAAO,CAAC,OAAO;CAoDlB"}
|
|
@@ -5,6 +5,7 @@ const constants_1 = require("../constants");
|
|
|
5
5
|
const modifier_invocation_1 = require("../implementation/meta/modifier_invocation");
|
|
6
6
|
const override_specifier_1 = require("../implementation/meta/override_specifier");
|
|
7
7
|
const structured_documentation_1 = require("../implementation/meta/structured_documentation");
|
|
8
|
+
const utils_1 = require("../utils");
|
|
8
9
|
const node_processor_1 = require("./node_processor");
|
|
9
10
|
class LegacyFunctionDefinitionProcessor extends node_processor_1.LegacyNodeProcessor {
|
|
10
11
|
process(reader, config, raw) {
|
|
@@ -16,7 +17,7 @@ class LegacyFunctionDefinitionProcessor extends node_processor_1.LegacyNodeProce
|
|
|
16
17
|
const visibility = attributes.visibility;
|
|
17
18
|
const virtual = "virtual" in attributes ? attributes.virtual : false;
|
|
18
19
|
const name = attributes.name;
|
|
19
|
-
const kind =
|
|
20
|
+
const kind = (0, utils_1.detectFunctionKind)(attributes);
|
|
20
21
|
const stateMutability = this.detectStateMutability(attributes);
|
|
21
22
|
const [structuredDocumentation, overrideSpecifier, parameters, returnParameters, modifiers, body] = this.extract(children);
|
|
22
23
|
let documentation;
|
|
@@ -46,15 +47,6 @@ class LegacyFunctionDefinitionProcessor extends node_processor_1.LegacyNodeProce
|
|
|
46
47
|
raw
|
|
47
48
|
];
|
|
48
49
|
}
|
|
49
|
-
detectFunctionKind(attributes) {
|
|
50
|
-
if (attributes.kind) {
|
|
51
|
-
return attributes.kind;
|
|
52
|
-
}
|
|
53
|
-
if (attributes.isConstructor) {
|
|
54
|
-
return constants_1.FunctionKind.Constructor;
|
|
55
|
-
}
|
|
56
|
-
return attributes.name === "" ? constants_1.FunctionKind.Fallback : constants_1.FunctionKind.Function;
|
|
57
|
-
}
|
|
58
50
|
detectStateMutability(attributes) {
|
|
59
51
|
if (attributes.stateMutability) {
|
|
60
52
|
return attributes.stateMutability;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"function_definition_processor.js","sourceRoot":"","sources":["../../../src/ast/legacy/function_definition_processor.ts"],"names":[],"mappings":";;;AAEA,
|
|
1
|
+
{"version":3,"file":"function_definition_processor.js","sourceRoot":"","sources":["../../../src/ast/legacy/function_definition_processor.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"function_definition_processor.d.ts","sourceRoot":"","sources":["../../../src/ast/modern/function_definition_processor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,sBAAsB,EAAE,MAAM,eAAe,CAAC;AAElE,OAAO,EAAE,kBAAkB,EAAE,MAAM,mDAAmD,CAAC;
|
|
1
|
+
{"version":3,"file":"function_definition_processor.d.ts","sourceRoot":"","sources":["../../../src/ast/modern/function_definition_processor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,sBAAsB,EAAE,MAAM,eAAe,CAAC;AAElE,OAAO,EAAE,kBAAkB,EAAE,MAAM,mDAAmD,CAAC;AAOvF,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAEvD,qBAAa,iCAAkC,SAAQ,mBAAmB,CAAC,kBAAkB,CAAC;IAC1F,OAAO,CACH,MAAM,EAAE,SAAS,EACjB,MAAM,EAAE,sBAAsB,EAC9B,GAAG,EAAE,GAAG,GACT,qBAAqB,CAAC,OAAO,kBAAkB,CAAC;CAkDtD"}
|
|
@@ -2,12 +2,13 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.ModernFunctionDefinitionProcessor = void 0;
|
|
4
4
|
const constants_1 = require("../constants");
|
|
5
|
+
const utils_1 = require("../utils");
|
|
5
6
|
const node_processor_1 = require("./node_processor");
|
|
6
7
|
class ModernFunctionDefinitionProcessor extends node_processor_1.ModernNodeProcessor {
|
|
7
8
|
process(reader, config, raw) {
|
|
8
9
|
const [id, src] = super.process(reader, config, raw);
|
|
9
10
|
const scope = raw.scope;
|
|
10
|
-
const kind = raw
|
|
11
|
+
const kind = (0, utils_1.detectFunctionKind)(raw);
|
|
11
12
|
const isConstructor = raw.isConstructor || raw.kind === constants_1.FunctionKind.Constructor;
|
|
12
13
|
const visibility = raw.visibility;
|
|
13
14
|
const virtual = "virtual" in raw ? raw.virtual : false;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"function_definition_processor.js","sourceRoot":"","sources":["../../../src/ast/modern/function_definition_processor.ts"],"names":[],"mappings":";;;AACA,4CAAyF;AAOzF,qDAAuD;AAEvD,MAAa,iCAAkC,SAAQ,oCAAuC;IAC1F,OAAO,CACH,MAAiB,EACjB,MAA8B,EAC9B,GAAQ;QAER,MAAM,CAAC,EAAE,EAAE,GAAG,CAAC,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC;QAErD,MAAM,KAAK,GAAW,GAAG,CAAC,KAAK,CAAC;QAChC,MAAM,IAAI,GAAiB,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"function_definition_processor.js","sourceRoot":"","sources":["../../../src/ast/modern/function_definition_processor.ts"],"names":[],"mappings":";;;AACA,4CAAyF;AAOzF,oCAA8C;AAC9C,qDAAuD;AAEvD,MAAa,iCAAkC,SAAQ,oCAAuC;IAC1F,OAAO,CACH,MAAiB,EACjB,MAA8B,EAC9B,GAAQ;QAER,MAAM,CAAC,EAAE,EAAE,GAAG,CAAC,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC;QAErD,MAAM,KAAK,GAAW,GAAG,CAAC,KAAK,CAAC;QAChC,MAAM,IAAI,GAAiB,IAAA,0BAAkB,EAAC,GAAG,CAAC,CAAC;QACnD,MAAM,aAAa,GAAY,GAAG,CAAC,aAAa,IAAI,GAAG,CAAC,IAAI,KAAK,wBAAY,CAAC,WAAW,CAAC;QAC1F,MAAM,UAAU,GAAuB,GAAG,CAAC,UAAU,CAAC;QACtD,MAAM,OAAO,GAAY,SAAS,IAAI,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC;QAChE,MAAM,IAAI,GAAW,GAAG,CAAC,IAAI,CAAC;QAC9B,MAAM,eAAe,GAA4B,GAAG,CAAC,eAAe,CAAC;QACrE,MAAM,YAAY,GAAuB,GAAG,CAAC,YAAY,CAAC;QAE1D,IAAI,aAA2D,CAAC;QAEhE,IAAI,GAAG,CAAC,aAAa,EAAE;YACnB,aAAa;gBACT,OAAO,GAAG,CAAC,aAAa,KAAK,QAAQ;oBACjC,CAAC,CAAC,GAAG,CAAC,aAAa;oBACnB,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC;SACvD;QAED,MAAM,iBAAiB,GAAG,GAAG,CAAC,SAAS;YACnC,CAAC,CAAE,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS,EAAE,MAAM,CAAuB;YAC9D,CAAC,CAAC,SAAS,CAAC;QAEhB,MAAM,UAAU,GAAG,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,UAAU,EAAE,MAAM,CAAkB,CAAC;QAC3E,MAAM,gBAAgB,GAAG,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,gBAAgB,EAAE,MAAM,CAAkB,CAAC;QACvF,MAAM,SAAS,GAAG,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC,SAAS,EAAE,MAAM,CAAyB,CAAC;QACrF,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC,CAAC,CAAE,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,MAAM,CAAW,CAAC,CAAC,CAAC,SAAS,CAAC;QAEhF,OAAO;YACH,EAAE;YACF,GAAG;YACH,KAAK;YACL,IAAI;YACJ,IAAI;YACJ,OAAO;YACP,UAAU;YACV,eAAe;YACf,aAAa;YACb,UAAU;YACV,gBAAgB;YAChB,SAAS;YACT,iBAAiB;YACjB,IAAI;YACJ,aAAa;YACb,YAAY;YACZ,GAAG;SACN,CAAC;IACN,CAAC;CACJ;AAvDD,8EAuDC"}
|
package/dist/ast/sanity.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sanity.d.ts","sourceRoot":"","sources":["../../src/ast/sanity.ts"],"names":[],"mappings":"AAAA,OAAO,EAGH,UAAU,EA0CV,UAAU,EAeb,MAAM,GAAG,CAAC;AAoBX;;GAEG;AACH,qBAAa,cAAe,SAAQ,KAAK;CAAG;
|
|
1
|
+
{"version":3,"file":"sanity.d.ts","sourceRoot":"","sources":["../../src/ast/sanity.ts"],"names":[],"mappings":"AAAA,OAAO,EAGH,UAAU,EA0CV,UAAU,EAeb,MAAM,GAAG,CAAC;AAoBX;;GAEG;AACH,qBAAa,cAAe,SAAQ,KAAK;CAAG;AAqP5C;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,SAAS,CAAC,IAAI,EAAE,UAAU,EAAE,GAAG,EAAE,UAAU,GAAG,IAAI,CAqVjE;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,MAAM,CAAC,IAAI,EAAE,UAAU,EAAE,GAAG,EAAE,UAAU,GAAG,OAAO,CAcjE"}
|
package/dist/ast/sanity.js
CHANGED
|
@@ -32,22 +32,22 @@ function checkVFieldCtx(node, prop, ctx) {
|
|
|
32
32
|
const val = node[prop];
|
|
33
33
|
if (val instanceof _1.ASTNode) {
|
|
34
34
|
if (!inCtx(val, ctx)) {
|
|
35
|
-
throw new Error(`Node ${(0, pretty_printing_1.pp)(node)} property ${prop} ${(0, pretty_printing_1.pp)(val)} not in expected context ${(0, pretty_printing_1.pp)(ctx)}. Instead in ${(0, pretty_printing_1.pp)(val.context)}`);
|
|
35
|
+
throw new Error(`Node ${(0, pretty_printing_1.pp)(node)} property ${String(prop)} ${(0, pretty_printing_1.pp)(val)} not in expected context ${(0, pretty_printing_1.pp)(ctx)}. Instead in ${(0, pretty_printing_1.pp)(val.context)}`);
|
|
36
36
|
}
|
|
37
37
|
}
|
|
38
38
|
else if (val instanceof Array) {
|
|
39
39
|
for (let idx = 0; idx < val.length; idx++) {
|
|
40
40
|
const el = val[idx];
|
|
41
41
|
if (!(el instanceof _1.ASTNode)) {
|
|
42
|
-
throw new Error(`Expected property ${prop}[${idx}] of ${(0, pretty_printing_1.pp)(node)} to be an ASTNode not ${el}`);
|
|
42
|
+
throw new Error(`Expected property ${String(prop)}[${idx}] of ${(0, pretty_printing_1.pp)(node)} to be an ASTNode not ${el}`);
|
|
43
43
|
}
|
|
44
44
|
if (!inCtx(val, ctx)) {
|
|
45
|
-
throw new Error(`Node ${(0, pretty_printing_1.pp)(node)} property ${prop}[${idx}] ${(0, pretty_printing_1.pp)(el)} not in expected context ${(0, pretty_printing_1.pp)(ctx)}. Instead in ${(0, pretty_printing_1.pp)(el.context)}`);
|
|
45
|
+
throw new Error(`Node ${(0, pretty_printing_1.pp)(node)} property ${String(prop)}[${idx}] ${(0, pretty_printing_1.pp)(el)} not in expected context ${(0, pretty_printing_1.pp)(ctx)}. Instead in ${(0, pretty_printing_1.pp)(el.context)}`);
|
|
46
46
|
}
|
|
47
47
|
}
|
|
48
48
|
}
|
|
49
49
|
else {
|
|
50
|
-
throw new Error(`Expected property ${prop} of ${(0, pretty_printing_1.pp)(node)} to be an ASTNode, not ${val}`);
|
|
50
|
+
throw new Error(`Expected property ${String(prop)} of ${(0, pretty_printing_1.pp)(node)} to be an ASTNode, not ${val}`);
|
|
51
51
|
}
|
|
52
52
|
}
|
|
53
53
|
/**
|
|
@@ -66,35 +66,35 @@ function checkFieldAndVFieldMatch(node, field, vField) {
|
|
|
66
66
|
const val2 = node[vField];
|
|
67
67
|
if (typeof val1 === "number") {
|
|
68
68
|
if (!(val2 instanceof _1.ASTNode)) {
|
|
69
|
-
throw new Error(`Expected property ${vField} of ${(0, pretty_printing_1.pp)(node)} to be an ASTNode when ${field} is a number, not ${val2}`);
|
|
69
|
+
throw new Error(`Expected property ${String(vField)} of ${(0, pretty_printing_1.pp)(node)} to be an ASTNode when ${String(field)} is a number, not ${val2}`);
|
|
70
70
|
}
|
|
71
71
|
if (val1 != val2.id) {
|
|
72
|
-
throw new InsaneASTError(`Node ${(0, pretty_printing_1.pp)(node)} property ${field} ${val1} differs from ${vField}.id ${(0, pretty_printing_1.pp)(val2)}`);
|
|
72
|
+
throw new InsaneASTError(`Node ${(0, pretty_printing_1.pp)(node)} property ${String(field)} ${val1} differs from ${String(vField)}.id ${(0, pretty_printing_1.pp)(val2)}`);
|
|
73
73
|
}
|
|
74
74
|
}
|
|
75
75
|
else if (val1 instanceof Array) {
|
|
76
76
|
if (!(val2 instanceof Array)) {
|
|
77
|
-
throw new Error(`Expected property ${vField} of ${(0, pretty_printing_1.pp)(node)} to be an array when ${vField} is an array, not ${val2}`);
|
|
77
|
+
throw new Error(`Expected property ${String(vField)} of ${(0, pretty_printing_1.pp)(node)} to be an array when ${String(vField)} is an array, not ${val2}`);
|
|
78
78
|
}
|
|
79
79
|
if (val1.length !== val2.length) {
|
|
80
|
-
throw new InsaneASTError(`Node ${(0, pretty_printing_1.pp)(node)} array properties ${field} and ${vField} have different lengths ${val1.length} != ${val2.length}`);
|
|
80
|
+
throw new InsaneASTError(`Node ${(0, pretty_printing_1.pp)(node)} array properties ${String(field)} and ${String(vField)} have different lengths ${val1.length} != ${val2.length}`);
|
|
81
81
|
}
|
|
82
82
|
for (let idx = 0; idx < val1.length; idx++) {
|
|
83
83
|
const el1 = val1[idx];
|
|
84
84
|
const el2 = val2[idx];
|
|
85
85
|
if (typeof el1 !== "number") {
|
|
86
|
-
throw new Error(`Expected property ${field}[${idx}] of ${(0, pretty_printing_1.pp)(node)} to be a number not ${el1}`);
|
|
86
|
+
throw new Error(`Expected property ${String(field)}[${idx}] of ${(0, pretty_printing_1.pp)(node)} to be a number not ${el1}`);
|
|
87
87
|
}
|
|
88
88
|
if (!(el2 instanceof _1.ASTNode)) {
|
|
89
|
-
throw new Error(`Expected property ${vField}[${idx}] of ${(0, pretty_printing_1.pp)(node)} to be a number not ${el2}`);
|
|
89
|
+
throw new Error(`Expected property ${String(vField)}[${idx}] of ${(0, pretty_printing_1.pp)(node)} to be a number not ${el2}`);
|
|
90
90
|
}
|
|
91
91
|
if (el1 != el2.id) {
|
|
92
|
-
throw new InsaneASTError(`Node ${(0, pretty_printing_1.pp)(node)} property ${field}[${idx}] ${el1} differs from ${vField}[${idx}].id ${(0, pretty_printing_1.pp)(el2)}`);
|
|
92
|
+
throw new InsaneASTError(`Node ${(0, pretty_printing_1.pp)(node)} property ${String(field)}[${idx}] ${el1} differs from ${String(vField)}[${idx}].id ${(0, pretty_printing_1.pp)(el2)}`);
|
|
93
93
|
}
|
|
94
94
|
}
|
|
95
95
|
}
|
|
96
96
|
else {
|
|
97
|
-
throw new Error(`Expected property ${field} of ${(0, pretty_printing_1.pp)(node)} to be a number or array of numbers not ${val1}`);
|
|
97
|
+
throw new Error(`Expected property ${String(field)} of ${(0, pretty_printing_1.pp)(node)} to be a number or array of numbers not ${val1}`);
|
|
98
98
|
}
|
|
99
99
|
}
|
|
100
100
|
/**
|
|
@@ -113,7 +113,7 @@ function checkDirectChildren(node, ...fields) {
|
|
|
113
113
|
}
|
|
114
114
|
if (val instanceof _1.ASTNode) {
|
|
115
115
|
if (!directChildren.has(val)) {
|
|
116
|
-
throw new InsaneASTError(`Field ${field} of node ${(0, pretty_printing_1.pp)(node)} is not a direct child: ${(0, pretty_printing_1.pp)(val)} child of ${(0, pretty_printing_1.pp)(val.parent)}`);
|
|
116
|
+
throw new InsaneASTError(`Field ${String(field)} of node ${(0, pretty_printing_1.pp)(node)} is not a direct child: ${(0, pretty_printing_1.pp)(val)} child of ${(0, pretty_printing_1.pp)(val.parent)}`);
|
|
117
117
|
}
|
|
118
118
|
computedChildren.add(val);
|
|
119
119
|
}
|
|
@@ -124,10 +124,10 @@ function checkDirectChildren(node, ...fields) {
|
|
|
124
124
|
continue;
|
|
125
125
|
}
|
|
126
126
|
if (!(el instanceof _1.ASTNode)) {
|
|
127
|
-
throw new Error(`Field ${field} of ${(0, pretty_printing_1.pp)(node)} is expected to be ASTNode, array or map with ASTNodes - instead array containing ${el}`);
|
|
127
|
+
throw new Error(`Field ${String(field)} of ${(0, pretty_printing_1.pp)(node)} is expected to be ASTNode, array or map with ASTNodes - instead array containing ${el}`);
|
|
128
128
|
}
|
|
129
129
|
if (!directChildren.has(el)) {
|
|
130
|
-
throw new InsaneASTError(`Field ${field}[${i}] of node ${(0, pretty_printing_1.pp)(node)} is not a direct child: ${(0, pretty_printing_1.pp)(el)} child of ${(0, pretty_printing_1.pp)(el.parent)}`);
|
|
130
|
+
throw new InsaneASTError(`Field ${String(field)}[${i}] of node ${(0, pretty_printing_1.pp)(node)} is not a direct child: ${(0, pretty_printing_1.pp)(el)} child of ${(0, pretty_printing_1.pp)(el.parent)}`);
|
|
131
131
|
}
|
|
132
132
|
computedChildren.add(el);
|
|
133
133
|
}
|
|
@@ -138,16 +138,16 @@ function checkDirectChildren(node, ...fields) {
|
|
|
138
138
|
continue;
|
|
139
139
|
}
|
|
140
140
|
if (!(v instanceof _1.ASTNode)) {
|
|
141
|
-
throw new Error(`Field ${field} of ${(0, pretty_printing_1.pp)(node)} is expected to be ASTNode, array or map with ASTNodes - instead map containing ${v}`);
|
|
141
|
+
throw new Error(`Field ${String(field)} of ${(0, pretty_printing_1.pp)(node)} is expected to be ASTNode, array or map with ASTNodes - instead map containing ${v}`);
|
|
142
142
|
}
|
|
143
143
|
if (!directChildren.has(v)) {
|
|
144
|
-
throw new InsaneASTError(`Field ${field}[${k}] of node ${(0, pretty_printing_1.pp)(node)} is not a direct child: ${(0, pretty_printing_1.pp)(v)} child of ${(0, pretty_printing_1.pp)(v.parent)}`);
|
|
144
|
+
throw new InsaneASTError(`Field ${String(field)}[${k}] of node ${(0, pretty_printing_1.pp)(node)} is not a direct child: ${(0, pretty_printing_1.pp)(v)} child of ${(0, pretty_printing_1.pp)(v.parent)}`);
|
|
145
145
|
}
|
|
146
146
|
computedChildren.add(v);
|
|
147
147
|
}
|
|
148
148
|
}
|
|
149
149
|
else {
|
|
150
|
-
throw new Error(`Field ${field} of ${(0, pretty_printing_1.pp)(node)} is neither an ASTNode nor an array of ASTNode or nulls: ${val}`);
|
|
150
|
+
throw new Error(`Field ${String(field)} of ${(0, pretty_printing_1.pp)(node)} is neither an ASTNode nor an array of ASTNode or nulls: ${val}`);
|
|
151
151
|
}
|
|
152
152
|
}
|
|
153
153
|
if (computedChildren.size < directChildren.size) {
|
package/dist/ast/sanity.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sanity.js","sourceRoot":"","sources":["../../src/ast/sanity.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"sanity.js","sourceRoot":"","sources":["../../src/ast/sanity.ts"],"names":[],"mappings":";;;AAAA,wBA4DW;AACX,6DAA6C;AAE7C;;GAEG;AACH,SAAS,KAAK,CAAC,GAAwB,EAAE,GAAe;IACpD,IAAI,GAAG,YAAY,UAAO,EAAE;QACxB,OAAO,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;KAC5B;IAED,KAAK,MAAM,IAAI,IAAI,GAAG,EAAE;QACpB,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,GAAG,CAAC,EAAE;YACnB,OAAO,KAAK,CAAC;SAChB;KACJ;IAED,OAAO,IAAI,CAAC;AAChB,CAAC;AAED;;GAEG;AACH,MAAa,cAAe,SAAQ,KAAK;CAAG;AAA5C,wCAA4C;AAE5C;;;;GAIG;AACH,SAAS,cAAc,CACnB,IAAO,EACP,IAAO,EACP,GAAe;IAEf,MAAM,GAAG,GAAS,IAAI,CAAC,IAAI,CAAC,CAAC;IAE7B,IAAI,GAAG,YAAY,UAAO,EAAE;QACxB,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE;YAClB,MAAM,IAAI,KAAK,CACX,QAAQ,IAAA,oBAAE,EAAC,IAAI,CAAC,aAAa,MAAM,CAAC,IAAI,CAAC,IAAI,IAAA,oBAAE,EAAC,GAAG,CAAC,4BAA4B,IAAA,oBAAE,EAC9E,GAAG,CACN,gBAAgB,IAAA,oBAAE,EAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CACrC,CAAC;SACL;KACJ;SAAM,IAAI,GAAG,YAAY,KAAK,EAAE;QAC7B,KAAK,IAAI,GAAG,GAAG,CAAC,EAAE,GAAG,GAAG,GAAG,CAAC,MAAM,EAAE,GAAG,EAAE,EAAE;YACvC,MAAM,EAAE,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC;YAEpB,IAAI,CAAC,CAAC,EAAE,YAAY,UAAO,CAAC,EAAE;gBAC1B,MAAM,IAAI,KAAK,CACX,qBAAqB,MAAM,CAAC,IAAI,CAAC,IAAI,GAAG,QAAQ,IAAA,oBAAE,EAC9C,IAAI,CACP,yBAAyB,EAAE,EAAE,CACjC,CAAC;aACL;YAED,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE;gBAClB,MAAM,IAAI,KAAK,CACX,QAAQ,IAAA,oBAAE,EAAC,IAAI,CAAC,aAAa,MAAM,CAAC,IAAI,CAAC,IAAI,GAAG,KAAK,IAAA,oBAAE,EACnD,EAAE,CACL,4BAA4B,IAAA,oBAAE,EAAC,GAAG,CAAC,gBAAgB,IAAA,oBAAE,EAAC,EAAE,CAAC,OAAO,CAAC,EAAE,CACvE,CAAC;aACL;SACJ;KACJ;SAAM;QACH,MAAM,IAAI,KAAK,CACX,qBAAqB,MAAM,CAAC,IAAI,CAAC,OAAO,IAAA,oBAAE,EAAC,IAAI,CAAC,0BAA0B,GAAG,EAAE,CAClF,CAAC;KACL;AACL,CAAC;AAED;;;;;;;;;;GAUG;AACH,SAAS,wBAAwB,CAC7B,IAAO,EACP,KAAS,EACT,MAAU;IAEV,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC;IACzB,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC;IAE1B,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE;QAC1B,IAAI,CAAC,CAAC,IAAI,YAAY,UAAO,CAAC,EAAE;YAC5B,MAAM,IAAI,KAAK,CACX,qBAAqB,MAAM,CAAC,MAAM,CAAC,OAAO,IAAA,oBAAE,EAAC,IAAI,CAAC,0BAA0B,MAAM,CAC9E,KAAK,CACR,qBAAqB,IAAI,EAAE,CAC/B,CAAC;SACL;QAED,IAAI,IAAI,IAAI,IAAI,CAAC,EAAE,EAAE;YACjB,MAAM,IAAI,cAAc,CACpB,QAAQ,IAAA,oBAAE,EAAC,IAAI,CAAC,aAAa,MAAM,CAAC,KAAK,CAAC,IAAI,IAAI,iBAAiB,MAAM,CACrE,MAAM,CACT,OAAO,IAAA,oBAAE,EAAC,IAAI,CAAC,EAAE,CACrB,CAAC;SACL;KACJ;SAAM,IAAI,IAAI,YAAY,KAAK,EAAE;QAC9B,IAAI,CAAC,CAAC,IAAI,YAAY,KAAK,CAAC,EAAE;YAC1B,MAAM,IAAI,KAAK,CACX,qBAAqB,MAAM,CAAC,MAAM,CAAC,OAAO,IAAA,oBAAE,EAAC,IAAI,CAAC,wBAAwB,MAAM,CAC5E,MAAM,CACT,qBAAqB,IAAI,EAAE,CAC/B,CAAC;SACL;QAED,IAAI,IAAI,CAAC,MAAM,KAAK,IAAI,CAAC,MAAM,EAAE;YAC7B,MAAM,IAAI,cAAc,CACpB,QAAQ,IAAA,oBAAE,EAAC,IAAI,CAAC,qBAAqB,MAAM,CAAC,KAAK,CAAC,QAAQ,MAAM,CAC5D,MAAM,CACT,2BAA2B,IAAI,CAAC,MAAM,OAAO,IAAI,CAAC,MAAM,EAAE,CAC9D,CAAC;SACL;QAED,KAAK,IAAI,GAAG,GAAG,CAAC,EAAE,GAAG,GAAG,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE,EAAE;YACxC,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC;YACtB,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC;YAEtB,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;gBACzB,MAAM,IAAI,KAAK,CACX,qBAAqB,MAAM,CAAC,KAAK,CAAC,IAAI,GAAG,QAAQ,IAAA,oBAAE,EAC/C,IAAI,CACP,uBAAuB,GAAG,EAAE,CAChC,CAAC;aACL;YAED,IAAI,CAAC,CAAC,GAAG,YAAY,UAAO,CAAC,EAAE;gBAC3B,MAAM,IAAI,KAAK,CACX,qBAAqB,MAAM,CAAC,MAAM,CAAC,IAAI,GAAG,QAAQ,IAAA,oBAAE,EAChD,IAAI,CACP,uBAAuB,GAAG,EAAE,CAChC,CAAC;aACL;YAED,IAAI,GAAG,IAAI,GAAG,CAAC,EAAE,EAAE;gBACf,MAAM,IAAI,cAAc,CACpB,QAAQ,IAAA,oBAAE,EAAC,IAAI,CAAC,aAAa,MAAM,CAC/B,KAAK,CACR,IAAI,GAAG,KAAK,GAAG,iBAAiB,MAAM,CAAC,MAAM,CAAC,IAAI,GAAG,QAAQ,IAAA,oBAAE,EAAC,GAAG,CAAC,EAAE,CAC1E,CAAC;aACL;SACJ;KACJ;SAAM;QACH,MAAM,IAAI,KAAK,CACX,qBAAqB,MAAM,CAAC,KAAK,CAAC,OAAO,IAAA,oBAAE,EACvC,IAAI,CACP,4CAA4C,IAAI,EAAE,CACtD,CAAC;KACL;AACL,CAAC;AAED;;;;;GAKG;AACH,SAAS,mBAAmB,CAAoB,IAAO,EAAE,GAAG,MAAsB;IAC9E,MAAM,cAAc,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC9C,MAAM,gBAAgB,GAAG,IAAI,GAAG,EAAW,CAAC;IAE5C,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE;QACxB,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC;QAExB,IAAI,GAAG,KAAK,SAAS,EAAE;YACnB,SAAS;SACZ;QAED,IAAI,GAAG,YAAY,UAAO,EAAE;YACxB,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;gBAC1B,MAAM,IAAI,cAAc,CACpB,SAAS,MAAM,CAAC,KAAK,CAAC,YAAY,IAAA,oBAAE,EAAC,IAAI,CAAC,2BAA2B,IAAA,oBAAE,EACnE,GAAG,CACN,aAAa,IAAA,oBAAE,EAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CACjC,CAAC;aACL;YAED,gBAAgB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;SAC7B;aAAM,IAAI,GAAG,YAAY,KAAK,EAAE;YAC7B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;gBACjC,MAAM,EAAE,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;gBAElB,IAAI,EAAE,KAAK,IAAI,EAAE;oBACb,SAAS;iBACZ;gBAED,IAAI,CAAC,CAAC,EAAE,YAAY,UAAO,CAAC,EAAE;oBAC1B,MAAM,IAAI,KAAK,CACX,SAAS,MAAM,CAAC,KAAK,CAAC,OAAO,IAAA,oBAAE,EAC3B,IAAI,CACP,qFAAqF,EAAE,EAAE,CAC7F,CAAC;iBACL;gBAED,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE;oBACzB,MAAM,IAAI,cAAc,CACpB,SAAS,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,aAAa,IAAA,oBAAE,EACtC,IAAI,CACP,2BAA2B,IAAA,oBAAE,EAAC,EAAE,CAAC,aAAa,IAAA,oBAAE,EAAC,EAAE,CAAC,MAAM,CAAC,EAAE,CACjE,CAAC;iBACL;gBAED,gBAAgB,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;aAC5B;SACJ;aAAM,IAAI,GAAG,YAAY,GAAG,EAAE;YAC3B,KAAK,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,GAAG,CAAC,OAAO,EAAE,EAAE;gBAChC,IAAI,CAAC,KAAK,IAAI,EAAE;oBACZ,SAAS;iBACZ;gBAED,IAAI,CAAC,CAAC,CAAC,YAAY,UAAO,CAAC,EAAE;oBACzB,MAAM,IAAI,KAAK,CACX,SAAS,MAAM,CAAC,KAAK,CAAC,OAAO,IAAA,oBAAE,EAC3B,IAAI,CACP,mFAAmF,CAAC,EAAE,CAC1F,CAAC;iBACL;gBAED,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE;oBACxB,MAAM,IAAI,cAAc,CACpB,SAAS,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,aAAa,IAAA,oBAAE,EACtC,IAAI,CACP,2BAA2B,IAAA,oBAAE,EAAC,CAAC,CAAC,aAAa,IAAA,oBAAE,EAAC,CAAC,CAAC,MAAM,CAAC,EAAE,CAC/D,CAAC;iBACL;gBAED,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;aAC3B;SACJ;aAAM;YACH,MAAM,IAAI,KAAK,CACX,SAAS,MAAM,CAAC,KAAK,CAAC,OAAO,IAAA,oBAAE,EAC3B,IAAI,CACP,4DAA4D,GAAG,EAAE,CACrE,CAAC;SACL;KACJ;IAED,IAAI,gBAAgB,CAAC,IAAI,GAAG,cAAc,CAAC,IAAI,EAAE;QAC7C,IAAI,YAAiC,CAAC;QAEtC,KAAK,MAAM,KAAK,IAAI,cAAc,EAAE;YAChC,IAAI,gBAAgB,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE;gBAC7B,SAAS;aACZ;YAED,YAAY,GAAG,KAAK,CAAC;YAErB,MAAM;SACT;QAED,MAAM,IAAI,cAAc,CACpB,UAAU,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,gDAAgD,IAAA,oBAAE,EACzE,YAAY,CACf,aAAa,CACjB,CAAC;KACL;AACL,CAAC;AAED;;;;;;;;;;;;;;GAcG;AACH,SAAgB,SAAS,CAAC,IAAgB,EAAE,GAAe;IACvD,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE;QACvC,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,GAAG,CAAC,EAAE;YACnB,MAAM,IAAI,cAAc,CACpB,SAAS,IAAA,oBAAE,EAAC,IAAI,CAAC,0BAA0B,GAAG,CAAC,EAAE,kBAAkB,GAAG,CAAC,EAAE,EAAE,CAC9E,CAAC;SACL;QAED,MAAM,iBAAiB,GAAG,IAAI,CAAC,QAAQ,CAAC;QAExC,KAAK,MAAM,KAAK,IAAI,iBAAiB,EAAE;YACnC,IAAI,KAAK,CAAC,MAAM,KAAK,IAAI,EAAE;gBACvB,MAAM,IAAI,cAAc,CACpB,SAAS,IAAA,oBAAE,EAAC,KAAK,CAAC,+BAA+B,IAAA,oBAAE,EAAC,IAAI,CAAC,QAAQ,IAAA,oBAAE,EAC/D,KAAK,CAAC,MAAM,CACf,EAAE,CACN,CAAC;aACL;SACJ;QAED,IACI,IAAI,YAAY,kBAAe;YAC/B,IAAI,YAAY,0BAAuB;YACvC,IAAI,YAAY,YAAS;YACzB,IAAI,YAAY,QAAK;YACrB,IAAI,YAAY,WAAQ;YACxB,IAAI,YAAY,iBAAc;YAC9B,IAAI,YAAY,uBAAoB;YACpC,IAAI,YAAY,QAAK;YACrB,IAAI,YAAY,qBAAkB;YAClC,IAAI,YAAY,UAAO,EACzB;YACE;;;eAGG;YACH,SAAS;SACZ;QAED,IAAI,IAAI,YAAY,aAAU,EAAE;YAC5B,KAAK,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,IAAI,CAAC,eAAe,EAAE;gBAC9C,MAAM,OAAO,GAAG,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;gBAElC,IAAI,OAAO,KAAK,SAAS,EAAE;oBACvB,MAAM,IAAI,cAAc,CACpB,mBAAmB,IAAI,IAAI,KAAK,yBAAyB,GAAG,CAAC,EAAE,EAAE,CACpE,CAAC;iBACL;gBAED,IAAI,OAAO,KAAK,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;oBAC7C,MAAM,IAAI,cAAc,CACpB,mBAAmB,IAAI,WAAW,KAAK,KAAK,IAAA,oBAAE,EAC1C,OAAO,CACV,2CAA2C,IAAA,oBAAE,EAC1C,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,IAAI,CAAC,CAClC,EAAE,CACN,CAAC;iBACL;aACJ;YAED,mBAAmB,CACf,IAAI,EACJ,mBAAmB,EACnB,mBAAmB,EACnB,YAAY,EACZ,QAAQ,EACR,UAAU,EACV,YAAY,EACZ,YAAY,EACZ,SAAS,EACT,wBAAwB,EACxB,qBAAqB,CACxB,CAAC;SACL;aAAM,IAAI,IAAI,YAAY,kBAAe,EAAE;YACxC;;;eAGG;YACH,IACI,IAAI,CAAC,cAAc,CAAC,MAAM,KAAK,CAAC;gBAChC,IAAI,CAAC,cAAc,CAAC,MAAM,KAAK,IAAI,CAAC,aAAa,CAAC,MAAM,EAC1D;gBACE,MAAM,IAAI,cAAc,CACpB,yBACI,IAAI,CAAC,aAAa,CAAC,MACvB,gCACI,IAAI,CAAC,cAAc,CAAC,MACxB,wBAAwB,IAAA,oBAAE,EAAC,IAAI,CAAC,EAAE,CACrC,CAAC;aACL;YAED,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;gBACjD,MAAM,GAAG,GAAG,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;gBAEtC,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE;oBAClB,MAAM,IAAI,cAAc,CACpB,mBAAmB,IAAA,oBAAE,EAAC,GAAG,CAAC,gBAAgB,IAAA,oBAAE,EACxC,IAAI,CACP,4BAA4B,IAAA,oBAAE,EAAC,GAAG,CAAC,EAAE,CACzC,CAAC;iBACL;aACJ;YAED,wBAAwB,CAAC,IAAI,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;YAClD,cAAc,CAAC,IAAI,EAAE,QAAQ,EAAE,GAAG,CAAC,CAAC;YAEpC,wBAAwB,CAAC,IAAI,EAAE,YAAY,EAAE,aAAa,CAAC,CAAC;YAC5D,cAAc,CAAC,IAAI,EAAE,aAAa,EAAE,GAAG,CAAC,CAAC;SAC5C;aAAM,IAAI,IAAI,YAAY,uBAAoB,EAAE;YAC7C,mBAAmB,CAAC,IAAI,EAAE,WAAW,EAAE,YAAY,CAAC,CAAC;SACxD;aAAM,IAAI,IAAI,YAAY,qBAAkB,EAAE;YAC3C,cAAc,CAAC,IAAI,EAAE,WAAW,EAAE,GAAG,CAAC,CAAC;YACvC,mBAAmB,CAAC,IAAI,EAAE,eAAe,EAAE,YAAY,CAAC,CAAC;SAC5D;aAAM,IAAI,IAAI,YAAY,oBAAiB,EAAE;YAC1C,mBAAmB,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;SAC3C;aAAM,IAAI,IAAI,YAAY,gBAAa,EAAE;YACtC,cAAc,CAAC,IAAI,EAAE,aAAa,EAAE,GAAG,CAAC,CAAC;YACzC,mBAAmB,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;SAC5C;aAAM,IAAI,IAAI,YAAY,oBAAiB,EAAE;YAC1C,mBAAmB,CAAC,IAAI,EAAE,cAAc,EAAE,eAAe,EAAE,WAAW,CAAC,CAAC;SAC3E;aAAM,IAAI,IAAI,YAAY,qBAAkB,EAAE;YAC3C,wBAAwB,CAAC,IAAI,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;YAClD,cAAc,CAAC,IAAI,EAAE,QAAQ,EAAE,GAAG,CAAC,CAAC;YAEpC,IAAI,IAAI,CAAC,MAAM,KAAK,IAAI,CAAC,MAAM,EAAE;gBAC7B,MAAM,IAAI,cAAc,CACpB,YAAY,IAAA,oBAAE,EAAC,IAAI,CAAC,WAAW,IAAA,oBAAE,EAAC,IAAI,CAAC,MAAM,CAAC,eAAe,IAAA,oBAAE,EAC3D,IAAI,CAAC,MAAM,CACd,SAAS,CACb,CAAC;aACL;YAED,wBAAwB,CAAC,IAAI,EAAE,yBAAyB,EAAE,0BAA0B,CAAC,CAAC;YACtF,cAAc,CAAC,IAAI,EAAE,0BAA0B,EAAE,GAAG,CAAC,CAAC;YAEtD,wBAAwB,CAAC,IAAI,EAAE,YAAY,EAAE,aAAa,CAAC,CAAC;YAC5D,cAAc,CAAC,IAAI,EAAE,aAAa,EAAE,GAAG,CAAC,CAAC;YAEzC,MAAM,MAAM,GAAoC;gBAC5C,eAAe;gBACf,wBAAwB;gBACxB,iBAAiB;gBACjB,YAAY;gBACZ,SAAS;gBACT,SAAS;gBACT,YAAY;gBACZ,qBAAqB;gBACrB,UAAU;gBACV,QAAQ;gBACR,wBAAwB;gBACxB,cAAc;aACjB,CAAC;YAEF,IAAI,IAAI,CAAC,aAAa,YAAY,0BAAuB,EAAE;gBACvD,cAAc,CAAC,IAAI,EAAE,eAAe,EAAE,GAAG,CAAC,CAAC;gBAE3C,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;aAChC;YAED,mBAAmB,CAAC,IAAI,EAAE,GAAG,MAAM,CAAC,CAAC;SACxC;aAAM,IAAI,IAAI,YAAY,iBAAc,EAAE;YACvC,cAAc,CAAC,IAAI,EAAE,QAAQ,EAAE,GAAG,CAAC,CAAC;YAEpC,mBAAmB,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;SACzC;aAAM,IAAI,IAAI,YAAY,kBAAe,EAAE;YACxC,cAAc,CAAC,IAAI,EAAE,QAAQ,EAAE,GAAG,CAAC,CAAC;YAEpC,MAAM,MAAM,GAAiC,CAAC,aAAa,CAAC,CAAC;YAE7D,IAAI,IAAI,CAAC,aAAa,YAAY,0BAAuB,EAAE;gBACvD,cAAc,CAAC,IAAI,EAAE,eAAe,EAAE,GAAG,CAAC,CAAC;gBAE3C,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;aAChC;YAED,mBAAmB,CAAC,IAAI,EAAE,GAAG,MAAM,CAAC,CAAC;SACxC;aAAM,IAAI,IAAI,YAAY,kBAAe,EAAE;YACxC,cAAc,CAAC,IAAI,EAAE,QAAQ,EAAE,GAAG,CAAC,CAAC;YAEpC,MAAM,MAAM,GAAiC,CAAC,aAAa,CAAC,CAAC;YAE7D,IAAI,IAAI,CAAC,aAAa,YAAY,0BAAuB,EAAE;gBACvD,cAAc,CAAC,IAAI,EAAE,eAAe,EAAE,GAAG,CAAC,CAAC;gBAE3C,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;aAChC;YAED,mBAAmB,CAAC,IAAI,EAAE,GAAG,MAAM,CAAC,CAAC;SACxC;aAAM,IAAI,IAAI,YAAY,qBAAkB,EAAE;YAC3C,wBAAwB,CAAC,IAAI,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;YAClD,cAAc,CAAC,IAAI,EAAE,QAAQ,EAAE,GAAG,CAAC,CAAC;YAEpC,MAAM,MAAM,GAAoC;gBAC5C,aAAa;gBACb,oBAAoB;gBACpB,YAAY;gBACZ,mBAAmB;gBACnB,OAAO;aACV,CAAC;YAEF,IAAI,IAAI,CAAC,aAAa,YAAY,0BAAuB,EAAE;gBACvD,cAAc,CAAC,IAAI,EAAE,eAAe,EAAE,GAAG,CAAC,CAAC;gBAE3C,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;aAChC;YAED,mBAAmB,CAAC,IAAI,EAAE,GAAG,MAAM,CAAC,CAAC;SACxC;aAAM,IAAI,IAAI,YAAY,qBAAkB,EAAE;YAC3C,cAAc,CAAC,IAAI,EAAE,QAAQ,EAAE,GAAG,CAAC,CAAC;YAEpC,MAAM,MAAM,GAAoC;gBAC5C,aAAa;gBACb,oBAAoB;gBACpB,OAAO;aACV,CAAC;YAEF,IAAI,IAAI,CAAC,aAAa,YAAY,0BAAuB,EAAE;gBACvD,cAAc,CAAC,IAAI,EAAE,eAAe,EAAE,GAAG,CAAC,CAAC;gBAE3C,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;aAChC;YAED,mBAAmB,CAAC,IAAI,EAAE,GAAG,MAAM,CAAC,CAAC;SACxC;aAAM,IAAI,IAAI,YAAY,mBAAgB,EAAE;YACzC,wBAAwB,CAAC,IAAI,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;YAClD,cAAc,CAAC,IAAI,EAAE,QAAQ,EAAE,GAAG,CAAC,CAAC;YAEpC,mBAAmB,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;SACzC;aAAM,IAAI,IAAI,YAAY,iCAA8B,EAAE;YACvD,cAAc,CAAC,IAAI,EAAE,QAAQ,EAAE,GAAG,CAAC,CAAC;YACpC,cAAc,CAAC,IAAI,EAAE,gBAAgB,EAAE,GAAG,CAAC,CAAC;YAE5C,mBAAmB,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;SAC/C;aAAM,IAAI,IAAI,YAAY,sBAAmB,EAAE;YAC5C,wBAAwB,CAAC,IAAI,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;YAClD,cAAc,CAAC,IAAI,EAAE,QAAQ,EAAE,GAAG,CAAC,CAAC;YAEpC,MAAM,MAAM,GAAqC;gBAC7C,OAAO;gBACP,oBAAoB;gBACpB,QAAQ;aACX,CAAC;YAEF,IAAI,IAAI,CAAC,aAAa,YAAY,0BAAuB,EAAE;gBACvD,cAAc,CAAC,IAAI,EAAE,eAAe,EAAE,GAAG,CAAC,CAAC;gBAE3C,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;aAChC;YAED,mBAAmB,CAAC,IAAI,EAAE,GAAG,MAAM,CAAC,CAAC;SACxC;aAAM,IAAI,IAAI,YAAY,QAAK,IAAI,IAAI,YAAY,iBAAc,EAAE;YAChE,mBAAmB,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;SAC5C;aAAM,IAAI,IAAI,YAAY,mBAAgB,EAAE;YACzC,mBAAmB,CAAC,IAAI,EAAE,YAAY,EAAE,OAAO,CAAC,CAAC;SACpD;aAAM,IAAI,IAAI,YAAY,gBAAa,EAAE;YACtC,mBAAmB,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;SAC3C;aAAM,IAAI,IAAI,YAAY,kBAAe,EAAE;YACxC,mBAAmB,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;SAC1C;aAAM,IAAI,IAAI,YAAY,sBAAmB,EAAE;YAC5C,mBAAmB,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;SAC5C;aAAM,IAAI,IAAI,YAAY,eAAY,EAAE;YACrC,mBAAmB,CACf,IAAI,EACJ,2BAA2B,EAC3B,iBAAiB,EACjB,YAAY,EACZ,OAAO,CACV,CAAC;SACL;aAAM,IAAI,IAAI,YAAY,cAAW,EAAE;YACpC,cAAc,CAAC,IAAI,EAAE,YAAY,EAAE,GAAG,CAAC,CAAC;YACxC,cAAc,CAAC,IAAI,EAAE,WAAW,EAAE,GAAG,CAAC,CAAC;YAEvC,IAAI,IAAI,CAAC,UAAU,KAAK,SAAS,EAAE;gBAC/B,cAAc,CAAC,IAAI,EAAE,YAAY,EAAE,GAAG,CAAC,CAAC;aAC3C;YAED,mBAAmB,CAAC,IAAI,EAAE,YAAY,EAAE,WAAW,EAAE,YAAY,CAAC,CAAC;SACtE;aAAM,IAAI,IAAI,YAAY,SAAM,EAAE;YAC/B,wBAAwB,CAAC,IAAI,EAAE,0BAA0B,EAAE,2BAA2B,CAAC,CAAC;YAExF,cAAc,CAAC,IAAI,EAAE,2BAA2B,EAAE,GAAG,CAAC,CAAC;YACvD,mBAAmB,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;SAC5C;aAAM,IAAI,IAAI,YAAY,iBAAc,EAAE;YACvC,mBAAmB,CAAC,IAAI,EAAE,aAAa,EAAE,QAAQ,CAAC,CAAC;SACtD;aAAM,IAAI,IAAI,YAAY,eAAY,EAAE;YACrC,mBAAmB,CAAC,IAAI,EAAE,eAAe,EAAE,UAAU,CAAC,CAAC;SAC1D;aAAM,IAAI,IAAI,YAAY,+BAA4B,EAAE;YACrD,mBAAmB,CAAC,IAAI,EAAE,eAAe,EAAE,eAAe,CAAC,CAAC;SAC/D;aAAM,IAAI,IAAI,YAAY,iBAAc,EAAE;YACvC,mBAAmB,CAAC,IAAI,EAAE,YAAY,EAAE,OAAO,CAAC,CAAC;SACpD;aAAM,IAAI,IAAI,YAAY,gBAAa,EAAE;YACtC,mBAAmB,CAAC,IAAI,EAAE,WAAW,EAAE,SAAS,CAAC,CAAC;SACrD;aAAM,IAAI,IAAI,YAAY,mBAAgB,EAAE;YACzC,mBAAmB,CAAC,IAAI,EAAE,iBAAiB,EAAE,uBAAuB,CAAC,CAAC;SACzE;aAAM,IAAI,IAAI,YAAY,UAAO,EAAE;YAChC,mBAAmB,CAAC,IAAI,EAAE,UAAU,EAAE,YAAY,CAAC,CAAC;SACvD;aAAM,IAAI,IAAI,YAAY,sBAAmB,EAAE;YAC5C,wBAAwB,CAAC,IAAI,EAAE,uBAAuB,EAAE,wBAAwB,CAAC,CAAC;YAClF,cAAc,CAAC,IAAI,EAAE,wBAAwB,EAAE,GAAG,CAAC,CAAC;YACpD,mBAAmB,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;SACrC;aAAM,IAAI,IAAI,YAAY,aAAU,EAAE;YACnC,mBAAmB,CAAC,IAAI,EAAE,eAAe,EAAE,gBAAgB,CAAC,CAAC;SAChE;aAAM,IAAI,IAAI,YAAY,kBAAe,EAAE;YACxC,mBAAmB,CAAC,IAAI,EAAE,iBAAiB,EAAE,kBAAkB,CAAC,CAAC;SACpE;aAAM,IAAI,IAAI,YAAY,cAAW,EAAE;YACpC,mBAAmB,CAAC,IAAI,EAAE,YAAY,EAAE,iBAAiB,EAAE,kBAAkB,CAAC,CAAC;SAClF;aAAM,IAAI,IAAI,YAAY,+BAA4B,EAAE;YACrD,IAAI,CAAC,CAAC,OAAO,IAAI,CAAC,QAAQ,KAAK,QAAQ,CAAC,EAAE;gBACtC,mBAAmB,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;aACzC;SACJ;aAAM,IAAI,IAAI,YAAY,eAAY,EAAE;YACrC,mBAAmB,CAAC,IAAI,EAAE,aAAa,EAAE,YAAY,CAAC,CAAC;SAC1D;aAAM,IAAI,IAAI,YAAY,sBAAmB,EAAE;YAC5C,mBAAmB,CAAC,IAAI,EAAE,aAAa,EAAE,aAAa,CAAC,CAAC;SAC3D;aAAM,IAAI,IAAI,YAAY,aAAU,IAAI,IAAI,YAAY,iBAAc,EAAE;YACrE,IAAI,IAAI,CAAC,qBAAqB,KAAK,IAAI,IAAI,IAAI,CAAC,sBAAsB,KAAK,SAAS,EAAE;gBAClF,wBAAwB,CAAC,IAAI,EAAE,uBAAuB,EAAE,wBAAwB,CAAC,CAAC;gBAClF,cAAc,CAAC,IAAI,EAAE,wBAAwB,EAAE,GAAG,CAAC,CAAC;aACvD;SACJ;aAAM,IAAI,IAAI,YAAY,cAAW,EAAE;YACpC,mBAAmB,CAAC,IAAI,EAAE,iBAAiB,EAAE,kBAAkB,CAAC,CAAC;SACpE;aAAM,IAAI,IAAI,YAAY,mBAAgB,EAAE;YACzC,mBAAmB,CAAC,IAAI,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,gBAAgB,CAAC,CAAC;SACtF;aAAM,IAAI,IAAI,YAAY,eAAY,EAAE;YACrC,IAAI,IAAI,CAAC,qBAAqB,KAAK,IAAI,IAAI,IAAI,CAAC,sBAAsB,KAAK,SAAS,EAAE;gBAClF,wBAAwB,CAAC,IAAI,EAAE,uBAAuB,EAAE,wBAAwB,CAAC,CAAC;gBAClF,cAAc,CAAC,IAAI,EAAE,wBAAwB,EAAE,GAAG,CAAC,CAAC;aACvD;YAED,mBAAmB,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;SAC5C;aAAM,IAAI,IAAI,YAAY,gBAAa,EAAE;YACtC,mBAAmB,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;SAC1C;aAAM,IAAI,IAAI,YAAY,kBAAe,EAAE;YACxC,mBAAmB,CAAC,IAAI,EAAE,qBAAqB,EAAE,aAAa,CAAC,CAAC;SACnE;aAAM,IAAI,IAAI,YAAY,iBAAc,EAAE;YACvC,cAAc,CAAC,IAAI,EAAE,gBAAgB,EAAE,GAAG,CAAC,CAAC;YAC5C,mBAAmB,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;SAC/C;aAAM;YACH,MAAM,IAAI,KAAK,CAAC,wBAAwB,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC,CAAC;SACpE;KACJ;AACL,CAAC;AArVD,8BAqVC;AAED;;;;;;;;;;GAUG;AACH,SAAgB,MAAM,CAAC,IAAgB,EAAE,GAAe;IACpD,IAAI;QACA,SAAS,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;KACxB;IAAC,OAAO,CAAC,EAAE;QACR,IAAI,CAAC,YAAY,cAAc,EAAE;YAC7B,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YAEjB,OAAO,KAAK,CAAC;SAChB;QAED,MAAM,CAAC,CAAC;KACX;IAED,OAAO,IAAI,CAAC;AAChB,CAAC;AAdD,wBAcC"}
|
package/dist/ast/utils.d.ts
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { FunctionKind } from "./constants";
|
|
1
2
|
export declare type SourceLocation = {
|
|
2
3
|
offset: number;
|
|
3
4
|
length: number;
|
|
@@ -18,7 +19,9 @@ export declare type SourceLocation = {
|
|
|
18
19
|
* @returns Return the parts into which s has been split.
|
|
19
20
|
*/
|
|
20
21
|
export declare function split(string: string, separator: string, openBrace: string, closeBrace: string): string[];
|
|
21
|
-
export declare function
|
|
22
|
+
export declare function encodeFuncSignature(signature: string, hexPrefix?: boolean): string;
|
|
23
|
+
export declare function encodeEventSignature(signature: string, hexPrefix?: boolean): string;
|
|
22
24
|
export declare function sequence(start?: number, step?: number): Generator<number, number, number>;
|
|
23
25
|
export declare function parseSourceLocation(range: string): SourceLocation;
|
|
26
|
+
export declare function detectFunctionKind(attributes: any): FunctionKind;
|
|
24
27
|
//# sourceMappingURL=utils.d.ts.map
|
package/dist/ast/utils.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/ast/utils.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/ast/utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAE3C,oBAAY,cAAc,GAAG;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,CAAA;CAAE,CAAC;AAErF;;;;;;;;;;;;;GAaG;AACH,wBAAgB,KAAK,CACjB,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,MAAM,GACnB,MAAM,EAAE,CA6CV;AAED,wBAAgB,mBAAmB,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,UAAQ,GAAG,MAAM,CAIhF;AAED,wBAAgB,oBAAoB,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,UAAQ,GAAG,MAAM,CAIjF;AAED,wBAAiB,QAAQ,CAAC,KAAK,SAAI,EAAE,IAAI,SAAI,GAAG,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAIhF;AAED,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,MAAM,GAAG,cAAc,CAQjE;AAED,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,GAAG,GAAG,YAAY,CAUhE"}
|
package/dist/ast/utils.js
CHANGED
|
@@ -1,7 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
2
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.parseSourceLocation = exports.sequence = exports.
|
|
4
|
-
const
|
|
6
|
+
exports.detectFunctionKind = exports.parseSourceLocation = exports.sequence = exports.encodeEventSignature = exports.encodeFuncSignature = exports.split = void 0;
|
|
7
|
+
const web3_eth_abi_1 = __importDefault(require("web3-eth-abi"));
|
|
8
|
+
const constants_1 = require("./constants");
|
|
5
9
|
/**
|
|
6
10
|
* Splits the string using the separator.
|
|
7
11
|
* If the string contains well formed parenthesized expressions
|
|
@@ -54,11 +58,16 @@ function split(string, separator, openBrace, closeBrace) {
|
|
|
54
58
|
return result;
|
|
55
59
|
}
|
|
56
60
|
exports.split = split;
|
|
57
|
-
function
|
|
58
|
-
const selector =
|
|
59
|
-
return hexPrefix ? selector : selector.
|
|
61
|
+
function encodeFuncSignature(signature, hexPrefix = false) {
|
|
62
|
+
const selector = web3_eth_abi_1.default.encodeFunctionSignature(signature);
|
|
63
|
+
return hexPrefix ? selector : selector.slice(2);
|
|
60
64
|
}
|
|
61
|
-
exports.
|
|
65
|
+
exports.encodeFuncSignature = encodeFuncSignature;
|
|
66
|
+
function encodeEventSignature(signature, hexPrefix = false) {
|
|
67
|
+
const selector = web3_eth_abi_1.default.encodeEventSignature(signature);
|
|
68
|
+
return hexPrefix ? selector : selector.slice(2);
|
|
69
|
+
}
|
|
70
|
+
exports.encodeEventSignature = encodeEventSignature;
|
|
62
71
|
function* sequence(start = 0, step = 1) {
|
|
63
72
|
while (true) {
|
|
64
73
|
yield (start += step);
|
|
@@ -73,4 +82,14 @@ function parseSourceLocation(range) {
|
|
|
73
82
|
return { offset, length, sourceIndex };
|
|
74
83
|
}
|
|
75
84
|
exports.parseSourceLocation = parseSourceLocation;
|
|
85
|
+
function detectFunctionKind(attributes) {
|
|
86
|
+
if (attributes.kind) {
|
|
87
|
+
return attributes.kind;
|
|
88
|
+
}
|
|
89
|
+
if (attributes.isConstructor) {
|
|
90
|
+
return constants_1.FunctionKind.Constructor;
|
|
91
|
+
}
|
|
92
|
+
return attributes.name === "" ? constants_1.FunctionKind.Fallback : constants_1.FunctionKind.Function;
|
|
93
|
+
}
|
|
94
|
+
exports.detectFunctionKind = detectFunctionKind;
|
|
76
95
|
//# sourceMappingURL=utils.js.map
|
package/dist/ast/utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/ast/utils.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/ast/utils.ts"],"names":[],"mappings":"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"}
|
package/dist/bin/compile.js
CHANGED
|
@@ -194,7 +194,7 @@ function error(message) {
|
|
|
194
194
|
else if (node instanceof __1.ContractDefinition) {
|
|
195
195
|
message += " -> " + node.kind + " " + node.name;
|
|
196
196
|
const interfaceId = encoderVersion ? node.interfaceId(encoderVersion) : undefined;
|
|
197
|
-
if (interfaceId
|
|
197
|
+
if (interfaceId) {
|
|
198
198
|
message += ` [id: ${interfaceId}]`;
|
|
199
199
|
}
|
|
200
200
|
}
|
|
@@ -213,16 +213,20 @@ function error(message) {
|
|
|
213
213
|
message += ` -> ${node.kind}`;
|
|
214
214
|
}
|
|
215
215
|
}
|
|
216
|
+
else if (node instanceof __1.ErrorDefinition || node instanceof __1.EventDefinition) {
|
|
217
|
+
if (encoderVersion) {
|
|
218
|
+
const signature = node.canonicalSignature(encoderVersion);
|
|
219
|
+
const selector = node.canonicalSignatureHash(encoderVersion);
|
|
220
|
+
message += ` -> ${signature} [selector: ${selector}]`;
|
|
221
|
+
}
|
|
222
|
+
}
|
|
216
223
|
else if (node instanceof __1.VariableDeclaration) {
|
|
217
224
|
if (node.stateVariable) {
|
|
218
225
|
message += ` -> ${node.typeString} ${node.visibility} ${node.name}`;
|
|
219
|
-
if (node.visibility === __1.StateVariableVisibility.Public
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
const selector = encoderVersion
|
|
224
|
-
? node.getterCanonicalSignatureHash(encoderVersion)
|
|
225
|
-
: undefined;
|
|
226
|
+
if (node.visibility === __1.StateVariableVisibility.Public &&
|
|
227
|
+
encoderVersion !== undefined) {
|
|
228
|
+
const signature = node.getterCanonicalSignature(encoderVersion);
|
|
229
|
+
const selector = node.getterCanonicalSignatureHash(encoderVersion);
|
|
226
230
|
message += ` [getter: ${signature}, selector: ${selector}]`;
|
|
227
231
|
}
|
|
228
232
|
}
|
package/dist/bin/compile.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compile.js","sourceRoot":"","sources":["../../src/bin/compile.ts"],"names":[],"mappings":";;;;;;AACA,yCAAoC;AACpC,wDAA2B;AAC3B,
|
|
1
|
+
{"version":3,"file":"compile.js","sourceRoot":"","sources":["../../src/bin/compile.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../src/compile/constants.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,kBAAkB,UAe9B,CAAC;AAEF,eAAO,MAAM,kBAAkB,UAmB9B,CAAC;AAEF,eAAO,MAAM,kBAAkB,UAc9B,CAAC;AAEF,eAAO,MAAM,kBAAkB,UAAkE,CAAC;AAElG,eAAO,MAAM,kBAAkB,
|
|
1
|
+
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../src/compile/constants.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,kBAAkB,UAe9B,CAAC;AAEF,eAAO,MAAM,kBAAkB,UAmB9B,CAAC;AAEF,eAAO,MAAM,kBAAkB,UAc9B,CAAC;AAEF,eAAO,MAAM,kBAAkB,UAAkE,CAAC;AAElG,eAAO,MAAM,kBAAkB,UAiB9B,CAAC;AAEF,eAAO,MAAM,cAAc,YAM1B,CAAC;AAEF,eAAO,MAAM,gBAAgB,UAM5B,CAAC;AAEF,eAAO,MAAM,qBAAqB,QAAgD,CAAC;AAEnF,oBAAY,YAAY;IACpB,IAAI,SAAS;IACb,MAAM,WAAW;CACpB;AAED;;;GAGG;AACH,oBAAY,iBAAiB;IACzB,GAAG,QAAQ;IACX,GAAG,QAAQ;IACX,MAAM,WAAW;IACjB,OAAO,YAAY;IACnB,QAAQ,aAAa;IACrB,EAAE,OAAO;IACT,YAAY,gBAAgB;IAC5B,cAAc,kBAAkB;IAChC,GAAG,QAAQ;IACX,YAAY,iBAAiB;IAC7B,mBAAmB,uBAAuB;IAC1C,YAAY,iBAAiB;IAC7B,mBAAmB,wBAAwB;IAC3C,oBAAoB,yBAAyB;IAC7C,sBAAsB,2BAA2B;IACjD,2BAA2B,gCAAgC;IAC3D,6BAA6B,kCAAkC;IAC/D,wCAAwC,6CAA6C;IACrF,qBAAqB,0BAA0B;IAC/C,gBAAgB,qBAAqB;IACrC,UAAU,eAAe;IACzB,UAAU,eAAe;IACzB,GAAG,MAAM;CACZ;AAED,eAAO,MAAM,qBAAqB,aAA+C,CAAC;AAElF,eAAO,MAAM,0BAA0B,aAAoD,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/compile/constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,kBAAkB,GAAG;IAC9B,QAAQ;IACR,QAAQ;IACR,QAAQ;IACR,QAAQ;IACR,QAAQ;IACR,QAAQ;IACR,QAAQ;IACR,QAAQ;IACR,QAAQ;IACR,QAAQ;IACR,QAAQ;IACR,QAAQ;IACR,QAAQ;IACR,QAAQ;CACX,CAAC;AAEW,QAAA,kBAAkB,GAAG;IAC9B,OAAO;IACP,OAAO;IACP,OAAO;IACP,OAAO;IACP,OAAO;IACP,OAAO;IACP,OAAO;IACP,OAAO;IACP,OAAO;IACP,OAAO;IACP,QAAQ;IACR,QAAQ;IACR,QAAQ;IACR,QAAQ;IACR,QAAQ;IACR,QAAQ;IACR,QAAQ;IACR,QAAQ;CACX,CAAC;AAEW,QAAA,kBAAkB,GAAG;IAC9B,OAAO;IACP,OAAO;IACP,OAAO;IACP,OAAO;IACP,OAAO;IACP,OAAO;IACP,OAAO;IACP,OAAO;IACP,OAAO;IACP,OAAO;IACP,QAAQ;IACR,QAAQ;IACR,QAAQ;CACX,CAAC;AAEW,QAAA,kBAAkB,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;AAErF,QAAA,kBAAkB,GAAG;IAC9B,OAAO;IACP,OAAO;IACP,OAAO;IACP,OAAO;IACP,OAAO;IACP,OAAO;IACP,OAAO;IACP,OAAO;IACP,OAAO;IACP,OAAO;IACP,QAAQ;IACR,QAAQ;IACR,QAAQ;IACR,QAAQ;CACX,CAAC;AAEW,QAAA,cAAc,GAAG;IAC1B,0BAAkB;IAClB,0BAAkB;IAClB,0BAAkB;IAClB,0BAAkB;IAClB,0BAAkB;CACrB,CAAC;AAEW,QAAA,gBAAgB,GAAG;IAC5B,GAAG,0BAAkB;IACrB,GAAG,0BAAkB;IACrB,GAAG,0BAAkB;IACrB,GAAG,0BAAkB;IACrB,GAAG,0BAAkB;CACxB,CAAC;AAEW,QAAA,qBAAqB,GAAG,wBAAgB,CAAC,wBAAgB,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;AAEnF,IAAY,YAGX;AAHD,WAAY,YAAY;IACpB,6BAAa,CAAA;IACb,iCAAiB,CAAA;AACrB,CAAC,EAHW,YAAY,GAAZ,oBAAY,KAAZ,oBAAY,QAGvB;AAED;;;GAGG;AACH,IAAY,iBAwBX;AAxBD,WAAY,iBAAiB;IACzB,gCAAW,CAAA;IACX,gCAAW,CAAA;IACX,sCAAiB,CAAA;IACjB,wCAAmB,CAAA;IACnB,0CAAqB,CAAA;IACrB,8BAAS,CAAA;IACT,iDAA4B,CAAA;IAC5B,qDAAgC,CAAA;IAChC,gCAAW,CAAA;IACX,kDAA6B,CAAA;IAC7B,+DAA0C,CAAA;IAC1C,kDAA6B,CAAA;IAC7B,gEAA2C,CAAA;IAC3C,kEAA6C,CAAA;IAC7C,sEAAiD,CAAA;IACjD,gFAA2D,CAAA;IAC3D,oFAA+D,CAAA;IAC/D,0GAAqF,CAAA;IACrF,oEAA+C,CAAA;IAC/C,0DAAqC,CAAA;IACrC,8CAAyB,CAAA;IACzB,8CAAyB,CAAA;IACzB,8BAAS,CAAA;AACb,CAAC,EAxBW,iBAAiB,GAAjB,yBAAiB,KAAjB,yBAAiB,QAwB5B;AAEY,QAAA,qBAAqB,GAAG,IAAI,GAAG,CAAS,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC;AAErE,QAAA,0BAA0B,GAAG,IAAI,GAAG,CAAS,MAAM,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC,CAAC"}
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/compile/constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,kBAAkB,GAAG;IAC9B,QAAQ;IACR,QAAQ;IACR,QAAQ;IACR,QAAQ;IACR,QAAQ;IACR,QAAQ;IACR,QAAQ;IACR,QAAQ;IACR,QAAQ;IACR,QAAQ;IACR,QAAQ;IACR,QAAQ;IACR,QAAQ;IACR,QAAQ;CACX,CAAC;AAEW,QAAA,kBAAkB,GAAG;IAC9B,OAAO;IACP,OAAO;IACP,OAAO;IACP,OAAO;IACP,OAAO;IACP,OAAO;IACP,OAAO;IACP,OAAO;IACP,OAAO;IACP,OAAO;IACP,QAAQ;IACR,QAAQ;IACR,QAAQ;IACR,QAAQ;IACR,QAAQ;IACR,QAAQ;IACR,QAAQ;IACR,QAAQ;CACX,CAAC;AAEW,QAAA,kBAAkB,GAAG;IAC9B,OAAO;IACP,OAAO;IACP,OAAO;IACP,OAAO;IACP,OAAO;IACP,OAAO;IACP,OAAO;IACP,OAAO;IACP,OAAO;IACP,OAAO;IACP,QAAQ;IACR,QAAQ;IACR,QAAQ;CACX,CAAC;AAEW,QAAA,kBAAkB,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;AAErF,QAAA,kBAAkB,GAAG;IAC9B,OAAO;IACP,OAAO;IACP,OAAO;IACP,OAAO;IACP,OAAO;IACP,OAAO;IACP,OAAO;IACP,OAAO;IACP,OAAO;IACP,OAAO;IACP,QAAQ;IACR,QAAQ;IACR,QAAQ;IACR,QAAQ;IACR,QAAQ;IACR,QAAQ;CACX,CAAC;AAEW,QAAA,cAAc,GAAG;IAC1B,0BAAkB;IAClB,0BAAkB;IAClB,0BAAkB;IAClB,0BAAkB;IAClB,0BAAkB;CACrB,CAAC;AAEW,QAAA,gBAAgB,GAAG;IAC5B,GAAG,0BAAkB;IACrB,GAAG,0BAAkB;IACrB,GAAG,0BAAkB;IACrB,GAAG,0BAAkB;IACrB,GAAG,0BAAkB;CACxB,CAAC;AAEW,QAAA,qBAAqB,GAAG,wBAAgB,CAAC,wBAAgB,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;AAEnF,IAAY,YAGX;AAHD,WAAY,YAAY;IACpB,6BAAa,CAAA;IACb,iCAAiB,CAAA;AACrB,CAAC,EAHW,YAAY,GAAZ,oBAAY,KAAZ,oBAAY,QAGvB;AAED;;;GAGG;AACH,IAAY,iBAwBX;AAxBD,WAAY,iBAAiB;IACzB,gCAAW,CAAA;IACX,gCAAW,CAAA;IACX,sCAAiB,CAAA;IACjB,wCAAmB,CAAA;IACnB,0CAAqB,CAAA;IACrB,8BAAS,CAAA;IACT,iDAA4B,CAAA;IAC5B,qDAAgC,CAAA;IAChC,gCAAW,CAAA;IACX,kDAA6B,CAAA;IAC7B,+DAA0C,CAAA;IAC1C,kDAA6B,CAAA;IAC7B,gEAA2C,CAAA;IAC3C,kEAA6C,CAAA;IAC7C,sEAAiD,CAAA;IACjD,gFAA2D,CAAA;IAC3D,oFAA+D,CAAA;IAC/D,0GAAqF,CAAA;IACrF,oEAA+C,CAAA;IAC/C,0DAAqC,CAAA;IACrC,8CAAyB,CAAA;IACzB,8CAAyB,CAAA;IACzB,8BAAS,CAAA;AACb,CAAC,EAxBW,iBAAiB,GAAjB,yBAAiB,KAAjB,yBAAiB,QAwB5B;AAEY,QAAA,qBAAqB,GAAG,IAAI,GAAG,CAAS,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC;AAErE,QAAA,0BAA0B,GAAG,IAAI,GAAG,CAAS,MAAM,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "solc-typed-ast",
|
|
3
|
-
"version": "10.1.
|
|
3
|
+
"version": "10.1.4",
|
|
4
4
|
"description": "A TypeScript library providing a normalized typed Solidity AST along with the utilities necessary to generate the AST (from Solc) and traverse/manipulate it.",
|
|
5
5
|
"keywords": [],
|
|
6
6
|
"files": [
|
|
@@ -21,7 +21,7 @@
|
|
|
21
21
|
"lint": "eslint src/ test/ --ext=ts",
|
|
22
22
|
"lint:fix": "eslint src/ test/ --ext=ts --fix",
|
|
23
23
|
"test": "NODE_OPTIONS='--max-old-space-size=2048' nyc mocha",
|
|
24
|
-
"coverage
|
|
24
|
+
"coverage": "nyc report",
|
|
25
25
|
"docs:render": "typedoc",
|
|
26
26
|
"docs:clear": "rm -rf docs/",
|
|
27
27
|
"docs:refresh": "npm run docs:clear && npm run docs:render",
|
|
@@ -29,35 +29,34 @@
|
|
|
29
29
|
},
|
|
30
30
|
"dependencies": {
|
|
31
31
|
"axios": "^0.27.2",
|
|
32
|
-
"commander": "^9.
|
|
32
|
+
"commander": "^9.3.0",
|
|
33
33
|
"findup-sync": "^5.0.0",
|
|
34
34
|
"fs-extra": "^10.1.0",
|
|
35
35
|
"jsel": "^1.1.6",
|
|
36
36
|
"semver": "^7.3.7",
|
|
37
|
-
"solc": "^0.8.
|
|
37
|
+
"solc": "^0.8.15",
|
|
38
38
|
"src-location": "^1.1.0",
|
|
39
|
-
"web3-eth-abi": "^1.7.
|
|
39
|
+
"web3-eth-abi": "^1.7.4"
|
|
40
40
|
},
|
|
41
41
|
"devDependencies": {
|
|
42
42
|
"@types/fs-extra": "^9.0.13",
|
|
43
43
|
"@types/mocha": "^9.1.1",
|
|
44
|
-
"@types/node": "^16.11.
|
|
45
|
-
"@types/semver": "^7.3.
|
|
46
|
-
"@typescript-eslint/eslint-plugin": "^5.
|
|
47
|
-
"@typescript-eslint/parser": "^5.
|
|
48
|
-
"
|
|
49
|
-
"eslint": "^8.14.0",
|
|
44
|
+
"@types/node": "^16.11.43",
|
|
45
|
+
"@types/semver": "^7.3.10",
|
|
46
|
+
"@typescript-eslint/eslint-plugin": "^5.30.4",
|
|
47
|
+
"@typescript-eslint/parser": "^5.30.4",
|
|
48
|
+
"eslint": "^8.19.0",
|
|
50
49
|
"eslint-config-prettier": "^8.5.0",
|
|
51
|
-
"eslint-plugin-prettier": "^4.
|
|
52
|
-
"expect": "^28.
|
|
50
|
+
"eslint-plugin-prettier": "^4.2.1",
|
|
51
|
+
"expect": "^28.1.1",
|
|
53
52
|
"mocha": "^10.0.0",
|
|
54
53
|
"nyc": "^15.1.0",
|
|
55
54
|
"peggy": "^1.2.0",
|
|
56
|
-
"prettier": "2.
|
|
57
|
-
"ts-node": "^10.
|
|
55
|
+
"prettier": "2.7.1",
|
|
56
|
+
"ts-node": "^10.8.2",
|
|
58
57
|
"ts-pegjs": "^1.2.2",
|
|
59
|
-
"typedoc": "^0.
|
|
60
|
-
"typescript": "^4.
|
|
58
|
+
"typedoc": "^0.23.5",
|
|
59
|
+
"typescript": "^4.7.4"
|
|
61
60
|
},
|
|
62
61
|
"homepage": "https://consensys.github.io/solc-typed-ast",
|
|
63
62
|
"bugs": "https://github.com/ConsenSys/solc-typed-ast/issues",
|