solc-typed-ast 9.1.3 → 10.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/ast/ast_node_factory.d.ts +0 -7
- package/dist/ast/ast_node_factory.d.ts.map +1 -1
- package/dist/ast/ast_node_factory.js +0 -12
- package/dist/ast/ast_node_factory.js.map +1 -1
- package/dist/bin/compile.js +233 -267
- package/dist/bin/compile.js.map +1 -1
- package/dist/compile/import_resolver.d.ts +6 -3
- package/dist/compile/import_resolver.d.ts.map +1 -1
- package/dist/compile/import_resolver.js +26 -7
- package/dist/compile/import_resolver.js.map +1 -1
- package/dist/compile/inference/imports.d.ts.map +1 -1
- package/dist/compile/inference/imports.js +10 -7
- package/dist/compile/inference/imports.js.map +1 -1
- package/dist/compile/utils.d.ts +8 -3
- package/dist/compile/utils.d.ts.map +1 -1
- package/dist/compile/utils.js +20 -10
- package/dist/compile/utils.js.map +1 -1
- package/package.json +16 -17
|
@@ -14,7 +14,6 @@ import { Assignment } from "./implementation/expression/assignment";
|
|
|
14
14
|
import { BinaryOperation } from "./implementation/expression/binary_operation";
|
|
15
15
|
import { Conditional } from "./implementation/expression/conditional";
|
|
16
16
|
import { ElementaryTypeNameExpression } from "./implementation/expression/elementary_type_name_expression";
|
|
17
|
-
import { Expression } from "./implementation/expression/expression";
|
|
18
17
|
import { FunctionCall } from "./implementation/expression/function_call";
|
|
19
18
|
import { FunctionCallOptions } from "./implementation/expression/function_call_options";
|
|
20
19
|
import { Identifier } from "./implementation/expression/identifier";
|
|
@@ -48,7 +47,6 @@ import { InlineAssembly } from "./implementation/statement/inline_assembly";
|
|
|
48
47
|
import { PlaceholderStatement } from "./implementation/statement/placeholder_statement";
|
|
49
48
|
import { Return } from "./implementation/statement/return";
|
|
50
49
|
import { RevertStatement } from "./implementation/statement/revert_statement";
|
|
51
|
-
import { Statement } from "./implementation/statement/statement";
|
|
52
50
|
import { Throw } from "./implementation/statement/throw";
|
|
53
51
|
import { TryCatchClause } from "./implementation/statement/try_catch_clause";
|
|
54
52
|
import { TryStatement } from "./implementation/statement/try_statement";
|
|
@@ -59,7 +57,6 @@ import { ArrayTypeName } from "./implementation/type/array_type_name";
|
|
|
59
57
|
import { ElementaryTypeName } from "./implementation/type/elementary_type_name";
|
|
60
58
|
import { FunctionTypeName } from "./implementation/type/function_type_name";
|
|
61
59
|
import { Mapping } from "./implementation/type/mapping";
|
|
62
|
-
import { TypeName } from "./implementation/type/type_name";
|
|
63
60
|
import { UserDefinedTypeName } from "./implementation/type/user_defined_type_name";
|
|
64
61
|
/**
|
|
65
62
|
* When applied to following tuple type:
|
|
@@ -93,7 +90,6 @@ export declare class ASTNodeFactory {
|
|
|
93
90
|
makeBinaryOperation(...args: Specific<ConstructorParameters<typeof BinaryOperation>>): BinaryOperation;
|
|
94
91
|
makeConditional(...args: Specific<ConstructorParameters<typeof Conditional>>): Conditional;
|
|
95
92
|
makeElementaryTypeNameExpression(...args: Specific<ConstructorParameters<typeof ElementaryTypeNameExpression>>): ElementaryTypeNameExpression;
|
|
96
|
-
makeExpression(...args: Specific<ConstructorParameters<typeof Expression>>): Expression;
|
|
97
93
|
makeFunctionCallOptions(...args: Specific<ConstructorParameters<typeof FunctionCallOptions>>): FunctionCallOptions;
|
|
98
94
|
makeFunctionCall(...args: Specific<ConstructorParameters<typeof FunctionCall>>): FunctionCall;
|
|
99
95
|
makeIdentifier(...args: Specific<ConstructorParameters<typeof Identifier>>): Identifier;
|
|
@@ -128,7 +124,6 @@ export declare class ASTNodeFactory {
|
|
|
128
124
|
makePlaceholderStatement(...args: Specific<ConstructorParameters<typeof PlaceholderStatement>>): PlaceholderStatement;
|
|
129
125
|
makeReturn(...args: Specific<ConstructorParameters<typeof Return>>): Return;
|
|
130
126
|
makeRevertStatement(...args: Specific<ConstructorParameters<typeof RevertStatement>>): RevertStatement;
|
|
131
|
-
makeStatement(...args: Specific<ConstructorParameters<typeof Statement>>): Statement;
|
|
132
127
|
makeThrow(...args: Specific<ConstructorParameters<typeof Throw>>): Throw;
|
|
133
128
|
makeTryCatchClause(...args: Specific<ConstructorParameters<typeof TryCatchClause>>): TryCatchClause;
|
|
134
129
|
makeTryStatement(...args: Specific<ConstructorParameters<typeof TryStatement>>): TryStatement;
|
|
@@ -138,9 +133,7 @@ export declare class ASTNodeFactory {
|
|
|
138
133
|
makeElementaryTypeName(...args: Specific<ConstructorParameters<typeof ElementaryTypeName>>): ElementaryTypeName;
|
|
139
134
|
makeFunctionTypeName(...args: Specific<ConstructorParameters<typeof FunctionTypeName>>): FunctionTypeName;
|
|
140
135
|
makeMapping(...args: Specific<ConstructorParameters<typeof Mapping>>): Mapping;
|
|
141
|
-
makeTypeName(...args: Specific<ConstructorParameters<typeof TypeName>>): TypeName;
|
|
142
136
|
makeUserDefinedTypeName(...args: Specific<ConstructorParameters<typeof UserDefinedTypeName>>): UserDefinedTypeName;
|
|
143
|
-
makeNode(...args: Specific<ConstructorParameters<typeof ASTNode>>): ASTNode;
|
|
144
137
|
makeIdentifierFor(target: VariableDeclaration | ContractDefinition | FunctionDefinition | StructDefinition | ErrorDefinition | EventDefinition | EnumDefinition | UserDefinedValueTypeDefinition | ImportDirective): Identifier;
|
|
145
138
|
makeUnfinalized<T extends ASTNode>(type: ASTNodeConstructor<T>, ...args: Specific<ConstructorParameters<typeof type>>): T;
|
|
146
139
|
make<T extends ASTNode>(type: ASTNodeConstructor<T>, ...args: Specific<ConstructorParameters<typeof type>>): T;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ast_node_factory.d.ts","sourceRoot":"","sources":["../../src/ast/ast_node_factory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AACzD,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAE5D,OAAO,EAAE,kBAAkB,EAAE,MAAM,kDAAkD,CAAC;AACtF,OAAO,EAAE,cAAc,EAAE,MAAM,8CAA8C,CAAC;AAC9E,OAAO,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AACpE,OAAO,EAAE,eAAe,EAAE,MAAM,+CAA+C,CAAC;AAChF,OAAO,EAAE,eAAe,EAAE,MAAM,+CAA+C,CAAC;AAChF,OAAO,EAAE,kBAAkB,EAAE,MAAM,kDAAkD,CAAC;AACtF,OAAO,EAAE,kBAAkB,EAAE,MAAM,kDAAkD,CAAC;AACtF,OAAO,EAAE,gBAAgB,EAAE,MAAM,gDAAgD,CAAC;AAClF,OAAO,EAAE,8BAA8B,EAAE,MAAM,iEAAiE,CAAC;AACjH,OAAO,EAAE,mBAAmB,EAAE,MAAM,mDAAmD,CAAC;AACxF,OAAO,EAAE,UAAU,EAAE,MAAM,wCAAwC,CAAC;AACpE,OAAO,EAAE,eAAe,EAAE,MAAM,8CAA8C,CAAC;AAC/E,OAAO,EAAE,WAAW,EAAE,MAAM,yCAAyC,CAAC;AACtE,OAAO,EAAE,4BAA4B,EAAE,MAAM,6DAA6D,CAAC;
|
|
1
|
+
{"version":3,"file":"ast_node_factory.d.ts","sourceRoot":"","sources":["../../src/ast/ast_node_factory.ts"],"names":[],"mappings":"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"}
|
|
@@ -687,9 +687,6 @@ class ASTNodeFactory {
|
|
|
687
687
|
makeElementaryTypeNameExpression(...args) {
|
|
688
688
|
return this.make(elementary_type_name_expression_1.ElementaryTypeNameExpression, ...args);
|
|
689
689
|
}
|
|
690
|
-
makeExpression(...args) {
|
|
691
|
-
return this.make(expression_1.Expression, ...args);
|
|
692
|
-
}
|
|
693
690
|
makeFunctionCallOptions(...args) {
|
|
694
691
|
return this.make(function_call_options_1.FunctionCallOptions, ...args);
|
|
695
692
|
}
|
|
@@ -792,9 +789,6 @@ class ASTNodeFactory {
|
|
|
792
789
|
makeRevertStatement(...args) {
|
|
793
790
|
return this.make(revert_statement_1.RevertStatement, ...args);
|
|
794
791
|
}
|
|
795
|
-
makeStatement(...args) {
|
|
796
|
-
return this.make(statement_1.Statement, ...args);
|
|
797
|
-
}
|
|
798
792
|
makeThrow(...args) {
|
|
799
793
|
return this.make(throw_1.Throw, ...args);
|
|
800
794
|
}
|
|
@@ -822,15 +816,9 @@ class ASTNodeFactory {
|
|
|
822
816
|
makeMapping(...args) {
|
|
823
817
|
return this.make(mapping_1.Mapping, ...args);
|
|
824
818
|
}
|
|
825
|
-
makeTypeName(...args) {
|
|
826
|
-
return this.make(type_name_1.TypeName, ...args);
|
|
827
|
-
}
|
|
828
819
|
makeUserDefinedTypeName(...args) {
|
|
829
820
|
return this.make(user_defined_type_name_1.UserDefinedTypeName, ...args);
|
|
830
821
|
}
|
|
831
|
-
makeNode(...args) {
|
|
832
|
-
return this.make(ast_node_1.ASTNode, ...args);
|
|
833
|
-
}
|
|
834
822
|
makeIdentifierFor(target) {
|
|
835
823
|
let typeString;
|
|
836
824
|
if (target instanceof variable_declaration_1.VariableDeclaration) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ast_node_factory.js","sourceRoot":"","sources":["../../src/ast/ast_node_factory.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"ast_node_factory.js","sourceRoot":"","sources":["../../src/ast/ast_node_factory.ts"],"names":[],"mappings":"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"}
|
package/dist/bin/compile.js
CHANGED
|
@@ -4,9 +4,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
5
5
|
};
|
|
6
6
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
7
|
+
const commander_1 = require("commander");
|
|
7
8
|
const fs_extra_1 = __importDefault(require("fs-extra"));
|
|
8
|
-
const minimist_1 = __importDefault(require("minimist"));
|
|
9
|
-
const path_1 = __importDefault(require("path"));
|
|
10
9
|
const __1 = require("..");
|
|
11
10
|
var CompileMode;
|
|
12
11
|
(function (CompileMode) {
|
|
@@ -15,307 +14,274 @@ var CompileMode;
|
|
|
15
14
|
CompileMode["Json"] = "json";
|
|
16
15
|
})(CompileMode || (CompileMode = {}));
|
|
17
16
|
const compileModes = Object.values(CompileMode);
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
"tree",
|
|
27
|
-
"source",
|
|
28
|
-
"locate-compiler-cache"
|
|
29
|
-
],
|
|
30
|
-
number: ["depth"],
|
|
31
|
-
string: [
|
|
32
|
-
"mode",
|
|
33
|
-
"compiler-version",
|
|
34
|
-
"path-remapping",
|
|
35
|
-
"xpath",
|
|
36
|
-
"compiler-settings",
|
|
37
|
-
"compiler-kind"
|
|
38
|
-
],
|
|
39
|
-
default: {
|
|
40
|
-
depth: Number.MAX_SAFE_INTEGER,
|
|
41
|
-
mode: CompileMode.Auto,
|
|
42
|
-
"compiler-version": "auto",
|
|
43
|
-
"compiler-kind": __1.CompilerKind.WASM
|
|
44
|
-
}
|
|
45
|
-
};
|
|
46
|
-
(async function () {
|
|
47
|
-
const args = (0, minimist_1.default)(process.argv.slice(2), cli);
|
|
48
|
-
if (args.version) {
|
|
49
|
-
const { version } = require("../../package.json");
|
|
50
|
-
console.log(version);
|
|
17
|
+
function terminate(message, exitCode = 0) {
|
|
18
|
+
if (message !== undefined) {
|
|
19
|
+
if (exitCode === 0) {
|
|
20
|
+
console.log(message);
|
|
21
|
+
}
|
|
22
|
+
else {
|
|
23
|
+
console.error(message);
|
|
24
|
+
}
|
|
51
25
|
}
|
|
52
|
-
|
|
26
|
+
process.exit(exitCode);
|
|
27
|
+
}
|
|
28
|
+
function error(message) {
|
|
29
|
+
terminate(message, 1);
|
|
30
|
+
}
|
|
31
|
+
(async () => {
|
|
32
|
+
const { version } = require("../../package.json");
|
|
33
|
+
const program = new commander_1.Command();
|
|
34
|
+
program
|
|
35
|
+
.name("sol-ast-compile")
|
|
36
|
+
.description("Compiles Solidity input and prints typed AST.")
|
|
37
|
+
.version(version, "-v, --version", "Print package version.")
|
|
38
|
+
.helpOption("-h, --help", "Print help message.");
|
|
39
|
+
program.argument("[file(s)]", "Either one or more Solidity files, one JSON compiler output file.");
|
|
40
|
+
program
|
|
41
|
+
.option("--solidity-versions", "Print information about supported Solidity versions.")
|
|
42
|
+
.option("--stdin", "Read input from STDIN instead of files.")
|
|
43
|
+
.option("--mode <mode>", `One of the following input modes: ${CompileMode.Sol} (Solidity source), ${CompileMode.Json} (JSON compiler artifact), ${CompileMode.Auto} (try to detect by file extension)`, CompileMode.Auto)
|
|
44
|
+
.option("--compiler-version <compilerVersion>", `Solc version to use: ${__1.LatestCompilerVersion} (exact SemVer version specifier), auto (try to detect suitable compiler version)`, "auto")
|
|
45
|
+
.option("--compiler-kind <compilerKind>", `Type of Solidity compiler to use. Currently supported values are ${__1.CompilerKind.WASM} and ${__1.CompilerKind.Native}.`, __1.CompilerKind.WASM)
|
|
46
|
+
.option("--path-remapping <pathRemapping>", "Path remapping input for Solc.")
|
|
47
|
+
.option("--base-path <basePath>", "Base path for compiler to look for files Solc.")
|
|
48
|
+
.option("--include-path <includePath...>", "Include paths for compiler to additinally look for files. Supports multiple entries.")
|
|
49
|
+
.option("--compiler-settings <compilerSettings>", `Additional settings passed to the solc compiler in the form of a JSON string (e.g. '{"optimizer": {"enabled": true, "runs": 200}}'). Note the double quotes. For more details see https://docs.soliditylang.org/en/latest/using-the-compiler.html#input-description.`)
|
|
50
|
+
.option("--raw", "Print raw Solc compilation output.")
|
|
51
|
+
.option("--with-sources", 'When used with "raw", adds "source" property with source files content to the compiler artifact.')
|
|
52
|
+
.option("--tree", "Print short tree of parent-child relations in AST.")
|
|
53
|
+
.option("--source", "Print source code, assembled from Solc-generated AST.")
|
|
54
|
+
.option("--xpath <xpath>", "XPath selector to perform for each source unit.")
|
|
55
|
+
.option("--depth <depth>", 'Number of children for each of AST node to print. Minimum value is 0. Not affects "raw", "tree" and "source".', `${Number.MAX_SAFE_INTEGER}`)
|
|
56
|
+
.option("--locate-compiler-cache", "Print location of cache directory, that is used to store downloaded compilers.");
|
|
57
|
+
program.parse(process.argv);
|
|
58
|
+
const args = program.args;
|
|
59
|
+
const options = program.opts();
|
|
60
|
+
if (options.solidityVersions) {
|
|
53
61
|
const message = [
|
|
54
62
|
"Latest supported version: " + __1.LatestCompilerVersion,
|
|
55
63
|
"",
|
|
56
64
|
`All supported versions (${__1.CompilerVersions.length} total):`,
|
|
57
65
|
...__1.CompilerVersions
|
|
58
66
|
].join("\n");
|
|
59
|
-
|
|
67
|
+
terminate(message);
|
|
60
68
|
}
|
|
61
|
-
|
|
62
|
-
|
|
69
|
+
if (options.locateCompilerCache) {
|
|
70
|
+
terminate(__1.CACHE_DIR);
|
|
63
71
|
}
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
Default value: ${cli.default["compiler-version"]}
|
|
86
|
-
--compiler-kind What type of Solidity compiler to use. Currently supported values are 'wasm' and 'native'.
|
|
87
|
-
Default value: ${cli.default["compiler-kind"]}
|
|
88
|
-
--path-remapping Path remapping input for Solc.
|
|
89
|
-
--compiler-settings Additional settings passed to the solc compiler in the form of a
|
|
90
|
-
JSON string (e.g. '{"optimizer": {"enabled": true, "runs": 200}}').
|
|
91
|
-
Note the double quotes. For more details see https://docs.soliditylang.org/en/latest/using-the-compiler.html#input-description.
|
|
92
|
-
--raw Print raw Solc compilation output.
|
|
93
|
-
--with-sources When used with "raw", adds "source" property with
|
|
94
|
-
source files content to the compiler artifact.
|
|
95
|
-
--tree Print short tree of parent-child relations in AST.
|
|
96
|
-
--source Print source code, assembled from Solc-generated AST.
|
|
97
|
-
--xpath XPath selector to perform for each source unit.
|
|
98
|
-
--depth Number of children for each of AST node to print.
|
|
99
|
-
Minimum value is 0. Not affects "raw", "tree" and "source".
|
|
100
|
-
Default value: ${cli.default.depth}
|
|
101
|
-
--locate-compiler-cache Print location of cache directory, that is used to store downloaded compilers.
|
|
102
|
-
`;
|
|
103
|
-
console.log(message);
|
|
72
|
+
if (options.help || (!args.length && !options.stdin)) {
|
|
73
|
+
terminate(program.helpInformation());
|
|
74
|
+
}
|
|
75
|
+
const stdin = options.stdin;
|
|
76
|
+
const mode = options.mode;
|
|
77
|
+
const compilerKind = options.compilerKind;
|
|
78
|
+
if (!__1.PossibleCompilerKinds.has(compilerKind)) {
|
|
79
|
+
error(`Invalid compiler kind "${compilerKind}". Possible values: ${[
|
|
80
|
+
...__1.PossibleCompilerKinds.values()
|
|
81
|
+
].join(", ")}.`);
|
|
82
|
+
}
|
|
83
|
+
if (!compileModes.includes(mode)) {
|
|
84
|
+
error(`Invalid mode "${mode}". Possible values: ${compileModes.join(", ")}.`);
|
|
85
|
+
}
|
|
86
|
+
const compilerVersion = options.compilerVersion;
|
|
87
|
+
if (!(compilerVersion === "auto" || (0, __1.isExact)(compilerVersion))) {
|
|
88
|
+
const message = [
|
|
89
|
+
`Invalid compiler version "${compilerVersion}".`,
|
|
90
|
+
'Possible values: "auto" or exact version string.'
|
|
91
|
+
].join(" ");
|
|
92
|
+
error(message);
|
|
104
93
|
}
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
94
|
+
const pathOptions = {
|
|
95
|
+
remapping: options.pathRemapping ? options.pathRemapping.split(";") : [],
|
|
96
|
+
basePath: options.basePath,
|
|
97
|
+
includePath: options.includePath
|
|
98
|
+
};
|
|
99
|
+
let compilerSettings = undefined;
|
|
100
|
+
if (options.compilerSettings) {
|
|
101
|
+
try {
|
|
102
|
+
compilerSettings = JSON.parse(options.compilerSettings);
|
|
113
103
|
}
|
|
114
|
-
|
|
115
|
-
|
|
104
|
+
catch (e) {
|
|
105
|
+
error(`Invalid compiler settings '${options.compilerSettings}'. Compiler settings must be a valid JSON object (${e}).`);
|
|
116
106
|
}
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
107
|
+
}
|
|
108
|
+
const compilationOutput = [__1.CompilationOutput.ALL];
|
|
109
|
+
let result;
|
|
110
|
+
try {
|
|
111
|
+
if (stdin) {
|
|
112
|
+
if (mode === "auto") {
|
|
113
|
+
error('Mode "auto" is not supported for the input from STDIN. Explicitly specify "mode" as "sol" or "json" instead.');
|
|
114
|
+
}
|
|
115
|
+
const fileName = "stdin";
|
|
116
|
+
const content = await fs_extra_1.default.readFile(process.stdin.fd, { encoding: "utf-8" });
|
|
117
|
+
result =
|
|
118
|
+
mode === "json"
|
|
119
|
+
? await (0, __1.compileJsonData)(fileName, JSON.parse(content), compilerVersion, compilationOutput, compilerSettings, compilerKind)
|
|
120
|
+
: await (0, __1.compileSourceString)(fileName, content, compilerVersion, pathOptions, compilationOutput, compilerSettings, compilerKind);
|
|
124
121
|
}
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
122
|
+
else {
|
|
123
|
+
const fileNames = args;
|
|
124
|
+
const singleFileName = fileNames[0];
|
|
125
|
+
const iSingleFileName = singleFileName.toLowerCase();
|
|
126
|
+
let isSol;
|
|
127
|
+
let isJson;
|
|
128
|
+
if (mode === "auto") {
|
|
129
|
+
isSol = iSingleFileName.endsWith(".sol");
|
|
130
|
+
isJson = iSingleFileName.endsWith(".json");
|
|
132
131
|
}
|
|
133
|
-
|
|
134
|
-
|
|
132
|
+
else {
|
|
133
|
+
isSol = mode === "sol";
|
|
134
|
+
isJson = mode === "json";
|
|
135
135
|
}
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
if (mode === "auto") {
|
|
142
|
-
throw new Error('Mode "auto" is not supported for the input from STDIN. Explicitly specify "mode" as "sol" or "json" instead.');
|
|
143
|
-
}
|
|
144
|
-
const fileName = "stdin";
|
|
145
|
-
const content = await fs_extra_1.default.readFile(0, { encoding: "utf-8" });
|
|
146
|
-
result =
|
|
147
|
-
mode === "json"
|
|
148
|
-
? await (0, __1.compileJsonData)(fileName, JSON.parse(content), compilerVersion, compilationOutput, compilerSettings, compilerKind)
|
|
149
|
-
: await (0, __1.compileSourceString)(fileName, content, compilerVersion, pathRemapping, compilationOutput, compilerSettings, compilerKind);
|
|
136
|
+
if (isSol) {
|
|
137
|
+
result = await (0, __1.compileSol)(fileNames, compilerVersion, pathOptions, compilationOutput, compilerSettings, compilerKind);
|
|
138
|
+
}
|
|
139
|
+
else if (isJson) {
|
|
140
|
+
result = await (0, __1.compileJson)(singleFileName, compilerVersion, compilationOutput, compilerSettings, compilerKind);
|
|
150
141
|
}
|
|
151
142
|
else {
|
|
152
|
-
|
|
153
|
-
const singleFileName = fileNames[0];
|
|
154
|
-
const iSingleFileName = singleFileName.toLowerCase();
|
|
155
|
-
let isSol;
|
|
156
|
-
let isJson;
|
|
157
|
-
if (mode === "auto") {
|
|
158
|
-
isSol = iSingleFileName.endsWith(".sol");
|
|
159
|
-
isJson = iSingleFileName.endsWith(".json");
|
|
160
|
-
}
|
|
161
|
-
else {
|
|
162
|
-
isSol = mode === "sol";
|
|
163
|
-
isJson = mode === "json";
|
|
164
|
-
}
|
|
165
|
-
if (isSol) {
|
|
166
|
-
result = await (0, __1.compileSol)(fileNames, compilerVersion, pathRemapping, compilationOutput, compilerSettings, compilerKind);
|
|
167
|
-
}
|
|
168
|
-
else if (isJson) {
|
|
169
|
-
result = await (0, __1.compileJson)(singleFileName, compilerVersion, compilationOutput, compilerSettings, compilerKind);
|
|
170
|
-
}
|
|
171
|
-
else {
|
|
172
|
-
throw new Error("Unable to auto-detect mode by the file name: " + singleFileName);
|
|
173
|
-
}
|
|
143
|
+
error("Unable to auto-detect mode by the file name: " + singleFileName);
|
|
174
144
|
}
|
|
175
145
|
}
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
146
|
+
}
|
|
147
|
+
catch (e) {
|
|
148
|
+
if (e instanceof __1.CompileFailedError) {
|
|
149
|
+
console.error("Compile errors encountered:");
|
|
150
|
+
for (const failure of e.failures) {
|
|
151
|
+
console.error(failure.compilerVersion
|
|
152
|
+
? `SolcJS ${failure.compilerVersion}:`
|
|
153
|
+
: "Unknown compiler:");
|
|
154
|
+
for (const error of failure.errors) {
|
|
155
|
+
console.error(error);
|
|
186
156
|
}
|
|
187
|
-
process.exit(1);
|
|
188
157
|
}
|
|
189
|
-
|
|
158
|
+
error("Unable to compile due to errors above.");
|
|
190
159
|
}
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
data.sources[key]
|
|
160
|
+
error(e.message);
|
|
161
|
+
}
|
|
162
|
+
const { data, files } = result;
|
|
163
|
+
if (options.raw) {
|
|
164
|
+
if (options.withSources && files.size > 0) {
|
|
165
|
+
if (!data.sources) {
|
|
166
|
+
data.sources = {};
|
|
167
|
+
}
|
|
168
|
+
for (const [key, value] of files) {
|
|
169
|
+
if (!data.sources[key]) {
|
|
170
|
+
data.sources[key] = {};
|
|
202
171
|
}
|
|
172
|
+
data.sources[key].source = value;
|
|
203
173
|
}
|
|
204
|
-
const output = JSON.stringify(data, undefined, 4);
|
|
205
|
-
console.log(output);
|
|
206
|
-
process.exit(0);
|
|
207
174
|
}
|
|
208
|
-
const
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
175
|
+
const output = JSON.stringify(data, undefined, 4);
|
|
176
|
+
terminate(output);
|
|
177
|
+
}
|
|
178
|
+
const separator = "-".repeat(60);
|
|
179
|
+
const depth = parseInt(options.depth);
|
|
180
|
+
const reader = new __1.ASTReader();
|
|
181
|
+
const units = reader.read(data, __1.ASTKind.Any, files);
|
|
182
|
+
if (options.tree) {
|
|
183
|
+
const INDENT = "| ";
|
|
184
|
+
const encoderVersion = result.compilerVersion
|
|
185
|
+
? (0, __1.getABIEncoderVersion)(units, result.compilerVersion)
|
|
186
|
+
: undefined;
|
|
187
|
+
const walker = (node) => {
|
|
188
|
+
const level = node.getParents().length;
|
|
189
|
+
const indent = INDENT.repeat(level);
|
|
190
|
+
let message = node.type + " #" + node.id;
|
|
191
|
+
if (node instanceof __1.SourceUnit) {
|
|
192
|
+
message += " -> " + node.absolutePath;
|
|
193
|
+
}
|
|
194
|
+
else if (node instanceof __1.ContractDefinition) {
|
|
195
|
+
message += " -> " + node.kind + " " + node.name;
|
|
196
|
+
const interfaceId = encoderVersion ? node.interfaceId(encoderVersion) : undefined;
|
|
197
|
+
if (interfaceId !== undefined) {
|
|
198
|
+
message += ` [id: ${interfaceId}]`;
|
|
223
199
|
}
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
200
|
+
}
|
|
201
|
+
else if (node instanceof __1.FunctionDefinition) {
|
|
202
|
+
const signature = node.vScope instanceof __1.ContractDefinition &&
|
|
203
|
+
(node.visibility === __1.FunctionVisibility.Public ||
|
|
204
|
+
node.visibility === __1.FunctionVisibility.External) &&
|
|
205
|
+
encoderVersion
|
|
206
|
+
? node.canonicalSignature(encoderVersion)
|
|
207
|
+
: undefined;
|
|
208
|
+
if (signature && encoderVersion) {
|
|
209
|
+
const selector = node.canonicalSignatureHash(encoderVersion);
|
|
210
|
+
message += ` -> ${signature} [selector: ${selector}]`;
|
|
232
211
|
}
|
|
233
|
-
else
|
|
234
|
-
|
|
235
|
-
(node.visibility === __1.FunctionVisibility.Public ||
|
|
236
|
-
node.visibility === __1.FunctionVisibility.External) &&
|
|
237
|
-
encoderVersion
|
|
238
|
-
? node.canonicalSignature(encoderVersion)
|
|
239
|
-
: undefined;
|
|
240
|
-
if (signature && encoderVersion) {
|
|
241
|
-
const selector = node.canonicalSignatureHash(encoderVersion);
|
|
242
|
-
message += ` -> ${signature} [selector: ${selector}]`;
|
|
243
|
-
}
|
|
244
|
-
else {
|
|
245
|
-
message += ` -> ${node.kind}`;
|
|
246
|
-
}
|
|
212
|
+
else {
|
|
213
|
+
message += ` -> ${node.kind}`;
|
|
247
214
|
}
|
|
248
|
-
|
|
249
|
-
|
|
250
|
-
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
}
|
|
260
|
-
}
|
|
261
|
-
else {
|
|
262
|
-
message +=
|
|
263
|
-
node.name === ""
|
|
264
|
-
? ` -> ${node.typeString}`
|
|
265
|
-
: ` -> ${node.typeString} ${node.name}`;
|
|
215
|
+
}
|
|
216
|
+
else if (node instanceof __1.VariableDeclaration) {
|
|
217
|
+
if (node.stateVariable) {
|
|
218
|
+
message += ` -> ${node.typeString} ${node.visibility} ${node.name}`;
|
|
219
|
+
if (node.visibility === __1.StateVariableVisibility.Public) {
|
|
220
|
+
const signature = encoderVersion
|
|
221
|
+
? node.getterCanonicalSignature(encoderVersion)
|
|
222
|
+
: undefined;
|
|
223
|
+
const selector = encoderVersion
|
|
224
|
+
? node.getterCanonicalSignatureHash(encoderVersion)
|
|
225
|
+
: undefined;
|
|
226
|
+
message += ` [getter: ${signature}, selector: ${selector}]`;
|
|
266
227
|
}
|
|
267
228
|
}
|
|
268
|
-
|
|
269
|
-
|
|
270
|
-
|
|
271
|
-
|
|
272
|
-
|
|
229
|
+
else {
|
|
230
|
+
message +=
|
|
231
|
+
node.name === ""
|
|
232
|
+
? ` -> ${node.typeString}`
|
|
233
|
+
: ` -> ${node.typeString} ${node.name}`;
|
|
234
|
+
}
|
|
273
235
|
}
|
|
274
|
-
|
|
236
|
+
console.log(indent + message);
|
|
237
|
+
};
|
|
238
|
+
for (const unit of units) {
|
|
239
|
+
unit.walk(walker);
|
|
240
|
+
console.log();
|
|
275
241
|
}
|
|
276
|
-
|
|
277
|
-
|
|
278
|
-
|
|
279
|
-
|
|
280
|
-
|
|
281
|
-
|
|
282
|
-
|
|
283
|
-
|
|
284
|
-
|
|
285
|
-
|
|
286
|
-
|
|
287
|
-
|
|
288
|
-
|
|
289
|
-
|
|
242
|
+
terminate();
|
|
243
|
+
}
|
|
244
|
+
if (options.xpath) {
|
|
245
|
+
const selector = options.xpath;
|
|
246
|
+
const formatter = new __1.ASTNodeFormatter();
|
|
247
|
+
for (const unit of units) {
|
|
248
|
+
const xp = new __1.XPath(unit);
|
|
249
|
+
const queryResult = xp.query(selector);
|
|
250
|
+
const output = queryResult instanceof Array
|
|
251
|
+
? queryResult.map((value) => formatter.format(value, depth)).join("\n")
|
|
252
|
+
: formatter.format(queryResult, depth);
|
|
253
|
+
console.log(unit.sourceEntryKey);
|
|
254
|
+
console.log(separator);
|
|
255
|
+
console.log(output);
|
|
290
256
|
}
|
|
291
|
-
|
|
292
|
-
|
|
293
|
-
|
|
294
|
-
|
|
295
|
-
|
|
296
|
-
|
|
297
|
-
targetCompilerVersion = compilerVersion;
|
|
298
|
-
}
|
|
299
|
-
else {
|
|
300
|
-
targetCompilerVersion = __1.LatestCompilerVersion;
|
|
301
|
-
}
|
|
302
|
-
const formatter = new __1.PrettyFormatter(4, 0);
|
|
303
|
-
const writer = new __1.ASTWriter(__1.DefaultASTWriterMapping, formatter, targetCompilerVersion);
|
|
304
|
-
for (const unit of units) {
|
|
305
|
-
console.log("// " + separator);
|
|
306
|
-
console.log("// " + unit.absolutePath);
|
|
307
|
-
console.log("// " + separator);
|
|
308
|
-
console.log(writer.write(unit));
|
|
309
|
-
}
|
|
310
|
-
process.exit(0);
|
|
257
|
+
terminate();
|
|
258
|
+
}
|
|
259
|
+
if (options.source) {
|
|
260
|
+
let targetCompilerVersion;
|
|
261
|
+
if (result.compilerVersion) {
|
|
262
|
+
targetCompilerVersion = result.compilerVersion;
|
|
311
263
|
}
|
|
264
|
+
else if (compilerVersion !== "auto") {
|
|
265
|
+
targetCompilerVersion = compilerVersion;
|
|
266
|
+
}
|
|
267
|
+
else {
|
|
268
|
+
targetCompilerVersion = __1.LatestCompilerVersion;
|
|
269
|
+
}
|
|
270
|
+
const formatter = new __1.PrettyFormatter(4, 0);
|
|
271
|
+
const writer = new __1.ASTWriter(__1.DefaultASTWriterMapping, formatter, targetCompilerVersion);
|
|
312
272
|
for (const unit of units) {
|
|
313
|
-
console.log(
|
|
273
|
+
console.log("// " + separator);
|
|
274
|
+
console.log("// " + unit.absolutePath);
|
|
275
|
+
console.log("// " + separator);
|
|
276
|
+
console.log(writer.write(unit));
|
|
314
277
|
}
|
|
315
|
-
|
|
278
|
+
terminate();
|
|
279
|
+
}
|
|
280
|
+
for (const unit of units) {
|
|
281
|
+
console.log(unit.print(depth));
|
|
316
282
|
}
|
|
317
|
-
|
|
318
|
-
|
|
319
|
-
|
|
283
|
+
terminate();
|
|
284
|
+
})().catch((e) => {
|
|
285
|
+
error(e.message);
|
|
320
286
|
});
|
|
321
287
|
//# sourceMappingURL=compile.js.map
|
package/dist/bin/compile.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compile.js","sourceRoot":"","sources":["../../src/bin/compile.ts"],"names":[],"mappings":";;;;;;AACA,wDAA2B;AAC3B,
|
|
1
|
+
{"version":3,"file":"compile.js","sourceRoot":"","sources":["../../src/bin/compile.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,14 +1,17 @@
|
|
|
1
1
|
export interface ImportResolver {
|
|
2
2
|
resolve(fileName: string): string | undefined;
|
|
3
3
|
}
|
|
4
|
+
export declare type Remapping = [string, string, string];
|
|
4
5
|
export declare class FileSystemResolver implements ImportResolver {
|
|
6
|
+
basePath?: string;
|
|
7
|
+
includePaths?: string[];
|
|
8
|
+
constructor(basePath?: string, includePaths?: string[]);
|
|
5
9
|
resolve(fileName: string): string | undefined;
|
|
6
10
|
}
|
|
7
|
-
export declare type Remapping = [string, string, string];
|
|
8
11
|
export declare class LocalNpmResolver implements ImportResolver {
|
|
9
|
-
|
|
12
|
+
basePath?: string;
|
|
10
13
|
inferedRemappings?: Map<string, Remapping>;
|
|
11
|
-
constructor(
|
|
14
|
+
constructor(basePath?: string, inferedRemappings?: Map<string, Remapping>);
|
|
12
15
|
resolve(fileName: string): string | undefined;
|
|
13
16
|
}
|
|
14
17
|
//# sourceMappingURL=import_resolver.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"import_resolver.d.ts","sourceRoot":"","sources":["../../src/compile/import_resolver.ts"],"names":[],"mappings":"AAMA,MAAM,WAAW,cAAc;IAC3B,OAAO,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;CACjD;AAED,qBAAa,kBAAmB,YAAW,cAAc;IACrD,
|
|
1
|
+
{"version":3,"file":"import_resolver.d.ts","sourceRoot":"","sources":["../../src/compile/import_resolver.ts"],"names":[],"mappings":"AAMA,MAAM,WAAW,cAAc;IAC3B,OAAO,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;CACjD;AAED,oBAAY,SAAS,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;AAEjD,qBAAa,kBAAmB,YAAW,cAAc;IACrD,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;gBAEZ,QAAQ,CAAC,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,MAAM,EAAE;IAKtD,OAAO,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;CAuBhD;AAED,qBAAa,gBAAiB,YAAW,cAAc;IACnD,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,iBAAiB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;gBAE/B,QAAQ,CAAC,EAAE,MAAM,EAAE,iBAAiB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC;IAKzE,OAAO,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;CA8ChD"}
|
|
@@ -9,19 +9,37 @@ const path_1 = __importDefault(require("path"));
|
|
|
9
9
|
const misc_1 = require("../misc");
|
|
10
10
|
const findUpSync = require("findup-sync");
|
|
11
11
|
class FileSystemResolver {
|
|
12
|
+
constructor(basePath, includePaths) {
|
|
13
|
+
this.basePath = basePath;
|
|
14
|
+
this.includePaths = includePaths;
|
|
15
|
+
}
|
|
12
16
|
resolve(fileName) {
|
|
13
|
-
|
|
17
|
+
const prefixes = [this.basePath ? this.basePath : ""].concat(this.includePaths ? this.includePaths : []);
|
|
18
|
+
for (const prefix of prefixes) {
|
|
19
|
+
let candidate;
|
|
20
|
+
if (prefix) {
|
|
21
|
+
const relative = path_1.default.relative(prefix, fileName);
|
|
22
|
+
candidate = path_1.default.join(prefix, relative.startsWith("../") ? fileName : relative);
|
|
23
|
+
}
|
|
24
|
+
else {
|
|
25
|
+
candidate = fileName;
|
|
26
|
+
}
|
|
27
|
+
if (fs_extra_1.default.existsSync(candidate)) {
|
|
28
|
+
return candidate;
|
|
29
|
+
}
|
|
30
|
+
}
|
|
31
|
+
return undefined;
|
|
14
32
|
}
|
|
15
33
|
}
|
|
16
34
|
exports.FileSystemResolver = FileSystemResolver;
|
|
17
35
|
class LocalNpmResolver {
|
|
18
|
-
constructor(
|
|
19
|
-
this.
|
|
36
|
+
constructor(basePath, inferedRemappings) {
|
|
37
|
+
this.basePath = basePath;
|
|
20
38
|
this.inferedRemappings = inferedRemappings;
|
|
21
39
|
}
|
|
22
40
|
resolve(fileName) {
|
|
23
|
-
(0, misc_1.assert)(this.
|
|
24
|
-
let currentDir = this.
|
|
41
|
+
(0, misc_1.assert)(this.basePath !== undefined, "LocalNpmResolver: base path is not set");
|
|
42
|
+
let currentDir = this.basePath;
|
|
25
43
|
const normalizedFileName = path_1.default.normalize(fileName);
|
|
26
44
|
while (true) {
|
|
27
45
|
const modulesPath = findUpSync("node_modules/", { cwd: currentDir });
|
|
@@ -33,8 +51,9 @@ class LocalNpmResolver {
|
|
|
33
51
|
if (this.inferedRemappings) {
|
|
34
52
|
const [prefix] = normalizedFileName.split("/");
|
|
35
53
|
/**
|
|
36
|
-
* If the normalized paths
|
|
37
|
-
*
|
|
54
|
+
* If the normalized paths are starting with
|
|
55
|
+
* a proper directory name X (not "." or ".."),
|
|
56
|
+
* then we can infer a remapping from X to "modulesPath/X/"
|
|
38
57
|
*/
|
|
39
58
|
if (prefix && prefix !== "." && prefix !== "..") {
|
|
40
59
|
const remapping = ["", prefix, path_1.default.join(modulesPath, prefix)];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"import_resolver.js","sourceRoot":"","sources":["../../src/compile/import_resolver.ts"],"names":[],"mappings":";;;;;;AAAA,wDAA2B;AAC3B,gDAAwB;AACxB,kCAAiC;AAEjC,MAAM,UAAU,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"import_resolver.js","sourceRoot":"","sources":["../../src/compile/import_resolver.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"imports.d.ts","sourceRoot":"","sources":["../../../src/compile/inference/imports.ts"],"names":[],"mappings":"AAEA,OAAO,EAAyB,cAAc,EAAE,SAAS,EAAE,MAAM,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"imports.d.ts","sourceRoot":"","sources":["../../../src/compile/inference/imports.ts"],"names":[],"mappings":"AAEA,OAAO,EAAyB,cAAc,EAAE,SAAS,EAAE,MAAM,IAAI,CAAC;AA2GtE;;;;;GAKG;AACH,wBAAsB,YAAY,CAC9B,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAC1B,UAAU,EAAE,SAAS,EAAE,EACvB,SAAS,EAAE,cAAc,EAAE,EAC3B,OAAO,cAAoB,GAC5B,OAAO,CAAC,IAAI,CAAC,CAuDf"}
|
|
@@ -72,6 +72,15 @@ function computeSourceUnitName(importerSourceUnit, imported, remappings) {
|
|
|
72
72
|
}
|
|
73
73
|
return applyRemappings(remappings, imported);
|
|
74
74
|
}
|
|
75
|
+
async function resolveSourceUnitName(sourceUnitName, resolvers) {
|
|
76
|
+
for (const resolver of resolvers) {
|
|
77
|
+
const resolvedPath = resolver.resolve(sourceUnitName);
|
|
78
|
+
if (resolvedPath !== undefined) {
|
|
79
|
+
return fs_extra_1.default.readFile(resolvedPath, "utf-8");
|
|
80
|
+
}
|
|
81
|
+
}
|
|
82
|
+
return undefined;
|
|
83
|
+
}
|
|
75
84
|
/**
|
|
76
85
|
* Given a partial map `files` from **source unit names** to file contents, a list of
|
|
77
86
|
* `remappings` and a list of `ImportResolver`s - `resolvers`, find all
|
|
@@ -95,13 +104,7 @@ async function findAllFiles(files, remappings, resolvers, visited = new Set()) {
|
|
|
95
104
|
let content = files.get(sourceUnitName);
|
|
96
105
|
// Missing contents - try and fill them in from the resolvers
|
|
97
106
|
if (content === undefined) {
|
|
98
|
-
|
|
99
|
-
const resolvedPath = resolver.resolve(sourceUnitName);
|
|
100
|
-
if (resolvedPath !== undefined) {
|
|
101
|
-
content = await fs_extra_1.default.readFile(resolvedPath, "utf-8");
|
|
102
|
-
break;
|
|
103
|
-
}
|
|
104
|
-
}
|
|
107
|
+
content = await resolveSourceUnitName(sourceUnitName, resolvers);
|
|
105
108
|
if (content === undefined) {
|
|
106
109
|
throw new __1.CompileInferenceError(`Couldn't find ${sourceUnitName}`);
|
|
107
110
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"imports.js","sourceRoot":"","sources":["../../../src/compile/inference/imports.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"imports.js","sourceRoot":"","sources":["../../../src/compile/inference/imports.ts"],"names":[],"mappings":"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"}
|
package/dist/compile/utils.d.ts
CHANGED
|
@@ -1,6 +1,11 @@
|
|
|
1
1
|
import { CompilerVersionSelectionStrategy } from "./compiler_selection";
|
|
2
2
|
import { CompilationOutput, CompilerKind } from "./constants";
|
|
3
3
|
import { Remapping } from "./import_resolver";
|
|
4
|
+
export interface PathOptions {
|
|
5
|
+
remapping?: string[];
|
|
6
|
+
basePath?: string;
|
|
7
|
+
includePath?: string[];
|
|
8
|
+
}
|
|
4
9
|
export interface MemoryStorage {
|
|
5
10
|
[path: string]: {
|
|
6
11
|
source: string | undefined;
|
|
@@ -25,9 +30,9 @@ export declare class CompileFailedError extends Error {
|
|
|
25
30
|
export declare function parsePathRemapping(remapping: string[]): Remapping[];
|
|
26
31
|
export declare function compile(files: Map<string, string>, remapping: string[], version: string, compilationOutput?: CompilationOutput[], compilerSettings?: any, kind?: CompilerKind): Promise<any>;
|
|
27
32
|
export declare function detectCompileErrors(data: any): string[];
|
|
28
|
-
export declare function compileSourceString(fileName: string, sourceCode: string, version: string | CompilerVersionSelectionStrategy,
|
|
29
|
-
export declare function compileSol(fileName: string, version: string | CompilerVersionSelectionStrategy,
|
|
30
|
-
export declare function compileSol(fileNames: string[], version: string | CompilerVersionSelectionStrategy,
|
|
33
|
+
export declare function compileSourceString(fileName: string, sourceCode: string, version: string | CompilerVersionSelectionStrategy, pathOptions?: PathOptions, compilationOutput?: CompilationOutput[], compilerSettings?: any, kind?: CompilerKind): Promise<CompileResult>;
|
|
34
|
+
export declare function compileSol(fileName: string, version: string | CompilerVersionSelectionStrategy, pathOptions?: PathOptions, compilationOutput?: CompilationOutput[], compilerSettings?: any, kind?: CompilerKind): Promise<CompileResult>;
|
|
35
|
+
export declare function compileSol(fileNames: string[], version: string | CompilerVersionSelectionStrategy, pathOptions?: PathOptions, compilationOutput?: CompilationOutput[], compilerSettings?: any, kind?: CompilerKind): Promise<CompileResult>;
|
|
31
36
|
export declare function compileJsonData(fileName: string, data: any, version: string | CompilerVersionSelectionStrategy, compilationOutput?: CompilationOutput[], compilerSettings?: any, kind?: CompilerKind): Promise<CompileResult>;
|
|
32
37
|
export declare function compileJson(fileName: string, version: string | CompilerVersionSelectionStrategy, compilationOutput?: CompilationOutput[], compilerSettings?: any, kind?: CompilerKind): Promise<CompileResult>;
|
|
33
38
|
//# sourceMappingURL=utils.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/compile/utils.ts"],"names":[],"mappings":"AAIA,OAAO,EACH,gCAAgC,EAInC,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC9D,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAI9C,MAAM,WAAW,aAAa;IAC1B,CAAC,IAAI,EAAE,MAAM,GAAG;QACZ,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;KAC9B,CAAC;CACL;AAED,MAAM,WAAW,aAAa;IAC1B,IAAI,EAAE,GAAG,CAAC;IACV,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC3B,kBAAkB,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;CAC9C;AAED,MAAM,WAAW,cAAc;IAC3B,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,eAAe,CAAC,EAAE,MAAM,CAAC;CAC5B;AAED,qBAAa,qBAAsB,SAAQ,KAAK;CAAG;AAEnD,qBAAa,kBAAmB,SAAQ,KAAK;IACzC,QAAQ,EAAE,cAAc,EAAE,CAAC;gBAEf,OAAO,EAAE,cAAc,EAAE;CAWxC;AAiBD,wBAAgB,kBAAkB,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,SAAS,EAAE,CAanE;AA4BD,wBAAsB,OAAO,CACzB,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAC1B,SAAS,EAAE,MAAM,EAAE,EACnB,OAAO,EAAE,MAAM,EACf,iBAAiB,GAAE,iBAAiB,EAA4B,EAChE,gBAAgB,CAAC,EAAE,GAAG,EACtB,IAAI,eAAoB,GACzB,OAAO,CAAC,GAAG,CAAC,CAgBd;AAED,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,GAAG,GAAG,MAAM,EAAE,CA0BvD;AAED,wBAAsB,mBAAmB,CACrC,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,MAAM,GAAG,gCAAgC,EAClD,
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/compile/utils.ts"],"names":[],"mappings":"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"}
|
package/dist/compile/utils.js
CHANGED
|
@@ -94,11 +94,13 @@ function detectCompileErrors(data) {
|
|
|
94
94
|
return errors;
|
|
95
95
|
}
|
|
96
96
|
exports.detectCompileErrors = detectCompileErrors;
|
|
97
|
-
async function compileSourceString(fileName, sourceCode, version,
|
|
98
|
-
const
|
|
97
|
+
async function compileSourceString(fileName, sourceCode, version, pathOptions = {}, compilationOutput = [constants_1.CompilationOutput.ALL], compilerSettings, kind) {
|
|
98
|
+
const basePath = pathOptions.basePath === undefined ? path_1.default.dirname(fileName) : pathOptions.basePath;
|
|
99
|
+
const includePath = pathOptions.includePath;
|
|
100
|
+
const remapping = pathOptions.remapping || [];
|
|
99
101
|
const inferredRemappings = new Map();
|
|
100
|
-
const fsResolver = new _1.FileSystemResolver();
|
|
101
|
-
const npmResolver = new _1.LocalNpmResolver(
|
|
102
|
+
const fsResolver = new _1.FileSystemResolver(basePath, includePath);
|
|
103
|
+
const npmResolver = new _1.LocalNpmResolver(basePath, inferredRemappings);
|
|
102
104
|
const resolvers = [fsResolver, npmResolver];
|
|
103
105
|
const parsedRemapping = parsePathRemapping(remapping);
|
|
104
106
|
const files = new Map([[fileName, sourceCode]]);
|
|
@@ -121,20 +123,28 @@ async function compileSourceString(fileName, sourceCode, version, remapping, com
|
|
|
121
123
|
throw new CompileFailedError(failures);
|
|
122
124
|
}
|
|
123
125
|
exports.compileSourceString = compileSourceString;
|
|
124
|
-
async function compileSol(input, version,
|
|
126
|
+
async function compileSol(input, version, pathOptions = {}, compilationOutput = [constants_1.CompilationOutput.ALL], compilerSettings, kind) {
|
|
125
127
|
const fileNames = typeof input === "string" ? [input] : input;
|
|
126
128
|
(0, misc_1.assert)(fileNames.length > 0, "There must be at least one file to compile");
|
|
127
129
|
const inferredRemappings = new Map();
|
|
128
|
-
const fsResolver = new _1.FileSystemResolver();
|
|
129
|
-
const npmResolver = new _1.LocalNpmResolver(
|
|
130
|
+
const fsResolver = new _1.FileSystemResolver(pathOptions.basePath, pathOptions.includePath);
|
|
131
|
+
const npmResolver = new _1.LocalNpmResolver(pathOptions.basePath, inferredRemappings);
|
|
130
132
|
const resolvers = [fsResolver, npmResolver];
|
|
133
|
+
const remapping = pathOptions.remapping || [];
|
|
131
134
|
const parsedRemapping = parsePathRemapping(remapping);
|
|
132
135
|
const files = new Map();
|
|
133
136
|
const visited = new Set();
|
|
137
|
+
const isDynamicBasePath = pathOptions.basePath === undefined;
|
|
134
138
|
for (const fileName of fileNames) {
|
|
135
|
-
const
|
|
136
|
-
|
|
137
|
-
|
|
139
|
+
const resolvedFileName = fsResolver.resolve(fileName);
|
|
140
|
+
(0, misc_1.assert)(resolvedFileName !== undefined, `Unable to find "${resolvedFileName}"`);
|
|
141
|
+
const sourceCode = await fs_extra_1.default.readFile(resolvedFileName, "utf-8");
|
|
142
|
+
if (isDynamicBasePath) {
|
|
143
|
+
const basePath = path_1.default.dirname(resolvedFileName);
|
|
144
|
+
fsResolver.basePath = basePath;
|
|
145
|
+
npmResolver.basePath = basePath;
|
|
146
|
+
}
|
|
147
|
+
files.set(resolvedFileName, sourceCode);
|
|
138
148
|
await (0, inference_1.findAllFiles)(files, parsedRemapping, resolvers, visited);
|
|
139
149
|
}
|
|
140
150
|
const compilerVersionStrategy = getCompilerVersionStrategy([...files.values()], version);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/compile/utils.ts"],"names":[],"mappings":";;;;;;AAAA,wDAA2B;AAC3B,gDAAwB;AACxB,wBAAgF;AAChF,kCAAiC;AACjC,6DAK8B;AAC9B,2CAA8D;AAE9D,2CAA2C;AAC3C,mCAA8C;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/compile/utils.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "solc-typed-ast",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "10.0.0",
|
|
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": [
|
|
@@ -28,37 +28,36 @@
|
|
|
28
28
|
"prepare": "npm run build"
|
|
29
29
|
},
|
|
30
30
|
"dependencies": {
|
|
31
|
-
"axios": "^0.
|
|
31
|
+
"axios": "^0.27.2",
|
|
32
|
+
"commander": "^9.2.0",
|
|
32
33
|
"findup-sync": "^5.0.0",
|
|
33
|
-
"fs-extra": "^10.0
|
|
34
|
+
"fs-extra": "^10.1.0",
|
|
34
35
|
"jsel": "^1.1.6",
|
|
35
|
-
"
|
|
36
|
-
"semver": "^7.3.5",
|
|
36
|
+
"semver": "^7.3.7",
|
|
37
37
|
"solc": "^0.8.13",
|
|
38
38
|
"src-location": "^1.1.0",
|
|
39
|
-
"web3-eth-abi": "^1.7.
|
|
39
|
+
"web3-eth-abi": "^1.7.3"
|
|
40
40
|
},
|
|
41
41
|
"devDependencies": {
|
|
42
42
|
"@types/fs-extra": "^9.0.13",
|
|
43
|
-
"@types/
|
|
44
|
-
"@types/
|
|
45
|
-
"@types/node": "^16.11.26",
|
|
43
|
+
"@types/mocha": "^9.1.1",
|
|
44
|
+
"@types/node": "^16.11.33",
|
|
46
45
|
"@types/semver": "^7.3.9",
|
|
47
|
-
"@typescript-eslint/eslint-plugin": "^5.
|
|
48
|
-
"@typescript-eslint/parser": "^5.
|
|
46
|
+
"@typescript-eslint/eslint-plugin": "^5.22.0",
|
|
47
|
+
"@typescript-eslint/parser": "^5.22.0",
|
|
49
48
|
"codecov": "^3.8.3",
|
|
50
|
-
"eslint": "^8.
|
|
49
|
+
"eslint": "^8.14.0",
|
|
51
50
|
"eslint-config-prettier": "^8.5.0",
|
|
52
51
|
"eslint-plugin-prettier": "^4.0.0",
|
|
53
|
-
"expect": "^
|
|
54
|
-
"mocha": "^
|
|
52
|
+
"expect": "^28.0.2",
|
|
53
|
+
"mocha": "^10.0.0",
|
|
55
54
|
"nyc": "^15.1.0",
|
|
56
55
|
"peggy": "^1.2.0",
|
|
57
|
-
"prettier": "2.6.
|
|
56
|
+
"prettier": "2.6.2",
|
|
58
57
|
"ts-node": "^10.7.0",
|
|
59
58
|
"ts-pegjs": "^1.2.2",
|
|
60
|
-
"typedoc": "^0.22.
|
|
61
|
-
"typescript": "^4.6.
|
|
59
|
+
"typedoc": "^0.22.15",
|
|
60
|
+
"typescript": "^4.6.4"
|
|
62
61
|
},
|
|
63
62
|
"homepage": "https://consensys.github.io/solc-typed-ast",
|
|
64
63
|
"bugs": "https://github.com/ConsenSys/solc-typed-ast/issues",
|