solc-typed-ast 9.1.0 → 9.1.1
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/compile/import_resolver.d.ts +2 -1
- package/dist/compile/import_resolver.d.ts.map +1 -1
- package/dist/compile/import_resolver.js +15 -2
- package/dist/compile/import_resolver.js.map +1 -1
- package/dist/compile/utils.d.ts +1 -0
- package/dist/compile/utils.d.ts.map +1 -1
- package/dist/compile/utils.js +20 -6
- package/dist/compile/utils.js.map +1 -1
- package/package.json +1 -1
|
@@ -7,7 +7,8 @@ export declare class FileSystemResolver implements ImportResolver {
|
|
|
7
7
|
export declare type Remapping = [string, string, string];
|
|
8
8
|
export declare class LocalNpmResolver implements ImportResolver {
|
|
9
9
|
baseDir?: string;
|
|
10
|
-
|
|
10
|
+
inferedRemappings?: Map<string, Remapping>;
|
|
11
|
+
constructor(baseDir?: string, inferedRemappings?: Map<string, Remapping>);
|
|
11
12
|
resolve(fileName: string): string | undefined;
|
|
12
13
|
}
|
|
13
14
|
//# 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,OAAO,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;CAGhD;AAED,oBAAY,SAAS,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;AAEjD,qBAAa,gBAAiB,YAAW,cAAc;IACnD,OAAO,CAAC,EAAE,MAAM,CAAC;
|
|
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,OAAO,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;CAGhD;AAED,oBAAY,SAAS,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;AAEjD,qBAAa,gBAAiB,YAAW,cAAc;IACnD,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,iBAAiB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;gBAE/B,OAAO,CAAC,EAAE,MAAM,EAAE,iBAAiB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC;IAKxE,OAAO,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;CA6ChD"}
|
|
@@ -15,19 +15,32 @@ class FileSystemResolver {
|
|
|
15
15
|
}
|
|
16
16
|
exports.FileSystemResolver = FileSystemResolver;
|
|
17
17
|
class LocalNpmResolver {
|
|
18
|
-
constructor(baseDir) {
|
|
18
|
+
constructor(baseDir, inferedRemappings) {
|
|
19
19
|
this.baseDir = baseDir;
|
|
20
|
+
this.inferedRemappings = inferedRemappings;
|
|
20
21
|
}
|
|
21
22
|
resolve(fileName) {
|
|
22
23
|
(0, misc_1.assert)(this.baseDir !== undefined, "LocalNpmResolver: base directory is not set");
|
|
23
24
|
let currentDir = this.baseDir;
|
|
25
|
+
const normalizedFileName = path_1.default.normalize(fileName);
|
|
24
26
|
while (true) {
|
|
25
27
|
const modulesPath = findUpSync("node_modules/", { cwd: currentDir });
|
|
26
28
|
if (modulesPath === null) {
|
|
27
29
|
break;
|
|
28
30
|
}
|
|
29
|
-
const modulePath = path_1.default.join(modulesPath,
|
|
31
|
+
const modulePath = path_1.default.join(modulesPath, normalizedFileName);
|
|
30
32
|
if (fs_extra_1.default.existsSync(modulePath)) {
|
|
33
|
+
if (this.inferedRemappings) {
|
|
34
|
+
const [prefix] = normalizedFileName.split("/");
|
|
35
|
+
/**
|
|
36
|
+
* If the normalized paths begins with a proper directory name X (not "." or ".."),
|
|
37
|
+
* then we can infer a remapping from X to modulesPath/X/
|
|
38
|
+
*/
|
|
39
|
+
if (prefix && prefix !== "." && prefix !== "..") {
|
|
40
|
+
const remapping = ["", prefix, path_1.default.join(modulesPath, prefix)];
|
|
41
|
+
this.inferedRemappings.set(fileName, remapping);
|
|
42
|
+
}
|
|
43
|
+
}
|
|
31
44
|
return modulePath;
|
|
32
45
|
}
|
|
33
46
|
const oldDir = currentDir;
|
|
@@ -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;AAM1C,MAAa,kBAAkB;IAC3B,OAAO,CAAC,QAAgB;QACpB,OAAO,kBAAG,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC;IAC3D,CAAC;CACJ;AAJD,gDAIC;AAID,MAAa,gBAAgB;
|
|
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;AAM1C,MAAa,kBAAkB;IAC3B,OAAO,CAAC,QAAgB;QACpB,OAAO,kBAAG,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC;IAC3D,CAAC;CACJ;AAJD,gDAIC;AAID,MAAa,gBAAgB;IAIzB,YAAY,OAAgB,EAAE,iBAA0C;QACpE,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,CAAC;IAC/C,CAAC;IAED,OAAO,CAAC,QAAgB;QACpB,IAAA,aAAM,EAAC,IAAI,CAAC,OAAO,KAAK,SAAS,EAAE,6CAA6C,CAAC,CAAC;QAElF,IAAI,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC;QAE9B,MAAM,kBAAkB,GAAG,cAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;QAEpD,OAAO,IAAI,EAAE;YACT,MAAM,WAAW,GAAG,UAAU,CAAC,eAAe,EAAE,EAAE,GAAG,EAAE,UAAU,EAAE,CAAC,CAAC;YAErE,IAAI,WAAW,KAAK,IAAI,EAAE;gBACtB,MAAM;aACT;YAED,MAAM,UAAU,GAAG,cAAI,CAAC,IAAI,CAAC,WAAW,EAAE,kBAAkB,CAAC,CAAC;YAE9D,IAAI,kBAAG,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE;gBAC5B,IAAI,IAAI,CAAC,iBAAiB,EAAE;oBACxB,MAAM,CAAC,MAAM,CAAC,GAAG,kBAAkB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;oBAE/C;;;uBAGG;oBACH,IAAI,MAAM,IAAI,MAAM,KAAK,GAAG,IAAI,MAAM,KAAK,IAAI,EAAE;wBAC7C,MAAM,SAAS,GAAc,CAAC,EAAE,EAAE,MAAM,EAAE,cAAI,CAAC,IAAI,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC,CAAC;wBAE1E,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;qBACnD;iBACJ;gBAED,OAAO,UAAU,CAAC;aACrB;YAED,MAAM,MAAM,GAAG,UAAU,CAAC;YAE1B,UAAU,GAAG,cAAI,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;YAEzC,IAAI,MAAM,KAAK,UAAU,EAAE;gBACvB,MAAM;aACT;SACJ;QAED,OAAO,SAAS,CAAC;IACrB,CAAC;CACJ;AAtDD,4CAsDC"}
|
package/dist/compile/utils.d.ts
CHANGED
|
@@ -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;
|
|
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
|
@@ -96,7 +96,10 @@ function detectCompileErrors(data) {
|
|
|
96
96
|
exports.detectCompileErrors = detectCompileErrors;
|
|
97
97
|
async function compileSourceString(fileName, sourceCode, version, remapping, compilationOutput = [constants_1.CompilationOutput.ALL], compilerSettings, kind) {
|
|
98
98
|
const fileDir = path_1.default.dirname(fileName);
|
|
99
|
-
const
|
|
99
|
+
const inferredRemappings = new Map();
|
|
100
|
+
const fsResolver = new _1.FileSystemResolver();
|
|
101
|
+
const npmResolver = new _1.LocalNpmResolver(fileDir, inferredRemappings);
|
|
102
|
+
const resolvers = [fsResolver, npmResolver];
|
|
100
103
|
const parsedRemapping = parsePathRemapping(remapping);
|
|
101
104
|
const files = new Map([[fileName, sourceCode]]);
|
|
102
105
|
await (0, inference_1.findAllFiles)(files, parsedRemapping, resolvers);
|
|
@@ -106,7 +109,12 @@ async function compileSourceString(fileName, sourceCode, version, remapping, com
|
|
|
106
109
|
const data = await compile(files, remapping, compilerVersion, compilationOutput, compilerSettings, kind);
|
|
107
110
|
const errors = detectCompileErrors(data);
|
|
108
111
|
if (errors.length === 0) {
|
|
109
|
-
return {
|
|
112
|
+
return {
|
|
113
|
+
data,
|
|
114
|
+
compilerVersion,
|
|
115
|
+
files,
|
|
116
|
+
inferredRemappings
|
|
117
|
+
};
|
|
110
118
|
}
|
|
111
119
|
failures.push({ compilerVersion, errors });
|
|
112
120
|
}
|
|
@@ -116,8 +124,9 @@ exports.compileSourceString = compileSourceString;
|
|
|
116
124
|
async function compileSol(input, version, remapping, compilationOutput = [constants_1.CompilationOutput.ALL], compilerSettings, kind) {
|
|
117
125
|
const fileNames = typeof input === "string" ? [input] : input;
|
|
118
126
|
(0, misc_1.assert)(fileNames.length > 0, "There must be at least one file to compile");
|
|
127
|
+
const inferredRemappings = new Map();
|
|
119
128
|
const fsResolver = new _1.FileSystemResolver();
|
|
120
|
-
const npmResolver = new _1.LocalNpmResolver();
|
|
129
|
+
const npmResolver = new _1.LocalNpmResolver(undefined, inferredRemappings);
|
|
121
130
|
const resolvers = [fsResolver, npmResolver];
|
|
122
131
|
const parsedRemapping = parsePathRemapping(remapping);
|
|
123
132
|
const files = new Map();
|
|
@@ -134,7 +143,12 @@ async function compileSol(input, version, remapping, compilationOutput = [consta
|
|
|
134
143
|
const data = await compile(files, remapping, compilerVersion, compilationOutput, compilerSettings, kind);
|
|
135
144
|
const errors = detectCompileErrors(data);
|
|
136
145
|
if (errors.length === 0) {
|
|
137
|
-
return {
|
|
146
|
+
return {
|
|
147
|
+
data,
|
|
148
|
+
compilerVersion,
|
|
149
|
+
files,
|
|
150
|
+
inferredRemappings
|
|
151
|
+
};
|
|
138
152
|
}
|
|
139
153
|
failures.push({ compilerVersion, errors });
|
|
140
154
|
}
|
|
@@ -154,7 +168,7 @@ async function compileJsonData(fileName, data, version, compilationOutput = [con
|
|
|
154
168
|
throw new CompileFailedError([{ compilerVersion, errors }]);
|
|
155
169
|
}
|
|
156
170
|
fillFilesFromSources(files, sources);
|
|
157
|
-
return { data, compilerVersion, files };
|
|
171
|
+
return { data, compilerVersion, files, inferredRemappings: new Map() };
|
|
158
172
|
}
|
|
159
173
|
if (consistentlyContainsOneOf(sources, "source")) {
|
|
160
174
|
for (const [fileName, fileData] of Object.entries(sources)) {
|
|
@@ -166,7 +180,7 @@ async function compileJsonData(fileName, data, version, compilationOutput = [con
|
|
|
166
180
|
const compileData = await compile(files, [], compilerVersion, compilationOutput, compilerSettings, kind);
|
|
167
181
|
const errors = detectCompileErrors(compileData);
|
|
168
182
|
if (errors.length === 0) {
|
|
169
|
-
return { data: compileData, compilerVersion, files };
|
|
183
|
+
return { data: compileData, compilerVersion, files, inferredRemappings: new Map() };
|
|
170
184
|
}
|
|
171
185
|
failures.push({ compilerVersion, errors });
|
|
172
186
|
}
|
|
@@ -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": "9.1.
|
|
3
|
+
"version": "9.1.1",
|
|
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": [
|