solc-typed-ast 10.0.0 → 10.1.2
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/bin/compile.js +0 -0
- package/dist/compile/constants.d.ts.map +1 -1
- package/dist/compile/constants.js +2 -1
- package/dist/compile/constants.js.map +1 -1
- package/dist/compile/inference/imports.d.ts +3 -2
- package/dist/compile/inference/imports.d.ts.map +1 -1
- package/dist/compile/inference/imports.js +12 -6
- package/dist/compile/inference/imports.js.map +1 -1
- package/dist/compile/utils.d.ts +21 -0
- package/dist/compile/utils.d.ts.map +1 -1
- package/dist/compile/utils.js +32 -6
- package/dist/compile/utils.js.map +1 -1
- package/package.json +9 -9
package/dist/bin/compile.js
CHANGED
|
File without changes
|
|
@@ -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,UAgB9B,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;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"}
|
|
@@ -3,7 +3,8 @@ import { ImportResolver, Remapping } from "..";
|
|
|
3
3
|
* Given a partial map `files` from **source unit names** to file contents, a list of
|
|
4
4
|
* `remappings` and a list of `ImportResolver`s - `resolvers`, find all
|
|
5
5
|
* files that are imported from the starting set `files` but are
|
|
6
|
-
* **missing** in `files` and add them into the files map.
|
|
6
|
+
* **missing** in `files` and add them into the `files` map. Also for each imported file
|
|
7
|
+
* add a mapping from its source unit name to the actual file name in `fileNames`.
|
|
7
8
|
*/
|
|
8
|
-
export declare function findAllFiles(files: Map<string, string>, remappings: Remapping[], resolvers: ImportResolver[], visited?: Set<string>): Promise<void>;
|
|
9
|
+
export declare function findAllFiles(files: Map<string, string>, fileNames: Map<string, string>, remappings: Remapping[], resolvers: ImportResolver[], visited?: Set<string>): Promise<void>;
|
|
9
10
|
//# sourceMappingURL=imports.d.ts.map
|
|
@@ -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;AA6GtE;;;;;;GAMG;AACH,wBAAsB,YAAY,CAC9B,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAC1B,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAC9B,UAAU,EAAE,SAAS,EAAE,EACvB,SAAS,EAAE,cAAc,EAAE,EAC3B,OAAO,cAAoB,GAC5B,OAAO,CAAC,IAAI,CAAC,CA4Df"}
|
|
@@ -76,7 +76,8 @@ async function resolveSourceUnitName(sourceUnitName, resolvers) {
|
|
|
76
76
|
for (const resolver of resolvers) {
|
|
77
77
|
const resolvedPath = resolver.resolve(sourceUnitName);
|
|
78
78
|
if (resolvedPath !== undefined) {
|
|
79
|
-
|
|
79
|
+
const contents = await fs_extra_1.default.readFile(resolvedPath, "utf-8");
|
|
80
|
+
return [contents, resolvedPath];
|
|
80
81
|
}
|
|
81
82
|
}
|
|
82
83
|
return undefined;
|
|
@@ -85,9 +86,10 @@ async function resolveSourceUnitName(sourceUnitName, resolvers) {
|
|
|
85
86
|
* Given a partial map `files` from **source unit names** to file contents, a list of
|
|
86
87
|
* `remappings` and a list of `ImportResolver`s - `resolvers`, find all
|
|
87
88
|
* files that are imported from the starting set `files` but are
|
|
88
|
-
* **missing** in `files` and add them into the files map.
|
|
89
|
+
* **missing** in `files` and add them into the `files` map. Also for each imported file
|
|
90
|
+
* add a mapping from its source unit name to the actual file name in `fileNames`.
|
|
89
91
|
*/
|
|
90
|
-
async function findAllFiles(files, remappings, resolvers, visited = new Set()) {
|
|
92
|
+
async function findAllFiles(files, fileNames, remappings, resolvers, visited = new Set()) {
|
|
91
93
|
/**
|
|
92
94
|
* Queue of source unit names to process
|
|
93
95
|
*/
|
|
@@ -102,13 +104,17 @@ async function findAllFiles(files, remappings, resolvers, visited = new Set()) {
|
|
|
102
104
|
}
|
|
103
105
|
visited.add(sourceUnitName);
|
|
104
106
|
let content = files.get(sourceUnitName);
|
|
105
|
-
|
|
107
|
+
/**
|
|
108
|
+
* Missing contents - try and fill them in from the resolvers
|
|
109
|
+
*/
|
|
106
110
|
if (content === undefined) {
|
|
107
|
-
|
|
108
|
-
if (
|
|
111
|
+
const result = await resolveSourceUnitName(sourceUnitName, resolvers);
|
|
112
|
+
if (result === undefined) {
|
|
109
113
|
throw new __1.CompileInferenceError(`Couldn't find ${sourceUnitName}`);
|
|
110
114
|
}
|
|
115
|
+
content = result[0];
|
|
111
116
|
files.set(sourceUnitName, content);
|
|
117
|
+
fileNames.set(sourceUnitName, result[1]);
|
|
112
118
|
}
|
|
113
119
|
let flds;
|
|
114
120
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"imports.js","sourceRoot":"","sources":["../../../src/compile/inference/imports.ts"],"names":[],"mappings":";;;;;;AAAA,wDAA2B;AAC3B,+BAA0C;AAC1C,0BAAsE;AACtE,6BAA+B;AAC/B,mFAKyC;AAEzC;;;GAGG;AACH,SAAS,eAAe,CAAC,UAAuB,EAAE,IAAY;IAC1D,KAAK,MAAM,CAAC,EAAE,MAAM,EAAE,aAAa,CAAC,IAAI,UAAU,EAAE;QAChD,IAAI,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE;YACzB,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;SAC9C;KACJ;IAED,OAAO,IAAI,CAAC;AAChB,CAAC;AAED;;;;GAIG;AACH,SAAS,wBAAwB,CAAC,IAAY;IAC1C,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;AAC3D,CAAC;AAED;;;;;;GAMG;AACH,SAAS,2BAA2B,CAAC,QAAgB,EAAE,QAAgB;IACnE,QAAQ,GAAG,IAAA,gBAAS,EAAC,QAAQ,CAAC,CAAC;IAE/B,MAAM,gBAAgB,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC;IAErE,IAAI,MAAM,GAAG,IAAA,cAAO,EAAC,QAAQ,CAAC,CAAC;IAC/B,IAAI,gBAAgB,GAAG,CAAC,CAAC;IAEzB,OACI,gBAAgB,GAAG,gBAAgB,CAAC,MAAM;QAC1C,gBAAgB,CAAC,gBAAgB,CAAC,KAAK,IAAI,EAC7C;QACE,MAAM,GAAG,IAAA,cAAO,EAAC,MAAM,CAAC,CAAC;QAEzB,gBAAgB,EAAE,CAAC;KACtB;IAED,yGAAyG;IACzG,0FAA0F;IAC1F,yBAAyB;IACzB,IAAI,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;QAC7C,MAAM,GAAG,EAAE,CAAC;KACf;IAED,IAAA,UAAM,EAAC,MAAM,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,kBAAkB,MAAM,EAAE,CAAC,CAAC;IAE3E,MAAM,MAAM,GAAG,gBAAgB,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAElE,OAAO,MAAM,KAAK,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,GAAG,GAAG,GAAG,MAAM,CAAC;AAC1D,CAAC;AAED;;;;;;;;;GASG;AACH,SAAS,qBAAqB,CAC1B,kBAA0B,EAC1B,QAAgB,EAChB,UAAuB;IAEvB,IAAI,wBAAwB,CAAC,QAAQ,CAAC,EAAE;QACpC,OAAO,2BAA2B,CAAC,kBAAkB,EAAE,QAAQ,CAAC,CAAC;KACpE;IAED,OAAO,eAAe,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;AACjD,CAAC;AAED,KAAK,UAAU,qBAAqB,CAChC,cAAsB,EACtB,SAA2B;IAE3B,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE;QAC9B,MAAM,YAAY,GAAG,QAAQ,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;QAEtD,IAAI,YAAY,KAAK,SAAS,EAAE;YAC5B,
|
|
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
|
@@ -12,9 +12,30 @@ export interface MemoryStorage {
|
|
|
12
12
|
};
|
|
13
13
|
}
|
|
14
14
|
export interface CompileResult {
|
|
15
|
+
/**
|
|
16
|
+
* Raw compiler JSON output
|
|
17
|
+
*/
|
|
15
18
|
data: any;
|
|
19
|
+
/**
|
|
20
|
+
* Compiler version used
|
|
21
|
+
*/
|
|
16
22
|
compilerVersion?: string;
|
|
23
|
+
/**
|
|
24
|
+
* Map from file-names (either passed in by caller, or source unit names of imported files)
|
|
25
|
+
* to the contents of the respective files.
|
|
26
|
+
*/
|
|
17
27
|
files: Map<string, string>;
|
|
28
|
+
/**
|
|
29
|
+
* Map from file-names appearing in the `files` map, to the
|
|
30
|
+
* actual resolved paths on disk (if any).
|
|
31
|
+
*
|
|
32
|
+
* For `compileJSONData()` this maps each unit absolutePath to itself as no resolution is done.
|
|
33
|
+
*
|
|
34
|
+
*/
|
|
35
|
+
resolvedFileNames: Map<string, string>;
|
|
36
|
+
/**
|
|
37
|
+
* Map from file-names to the remapping inferred to resolve that given file-name
|
|
38
|
+
*/
|
|
18
39
|
inferredRemappings: Map<string, Remapping>;
|
|
19
40
|
}
|
|
20
41
|
export interface CompileFailure {
|
|
@@ -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,WAAW;IACxB,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;IACrB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;CAC1B;AAED,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;
|
|
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
|
@@ -19,7 +19,7 @@ class CompileFailedError extends Error {
|
|
|
19
19
|
constructor(entries) {
|
|
20
20
|
super();
|
|
21
21
|
this.failures = entries;
|
|
22
|
-
const formattedErrorStr = entries.map((entry) => `==== ${entry.compilerVersion}
|
|
22
|
+
const formattedErrorStr = entries.map((entry) => `==== ${entry.compilerVersion} ====:\n ${entry.errors.join("\n")}\n`);
|
|
23
23
|
this.message = `Compiler Errors: ${formattedErrorStr}`;
|
|
24
24
|
}
|
|
25
25
|
}
|
|
@@ -104,7 +104,8 @@ async function compileSourceString(fileName, sourceCode, version, pathOptions =
|
|
|
104
104
|
const resolvers = [fsResolver, npmResolver];
|
|
105
105
|
const parsedRemapping = parsePathRemapping(remapping);
|
|
106
106
|
const files = new Map([[fileName, sourceCode]]);
|
|
107
|
-
|
|
107
|
+
const resolvedFileNames = new Map([[fileName, fileName]]);
|
|
108
|
+
await (0, inference_1.findAllFiles)(files, resolvedFileNames, parsedRemapping, resolvers);
|
|
108
109
|
const compilerVersionStrategy = getCompilerVersionStrategy([...files.values()], version);
|
|
109
110
|
const failures = [];
|
|
110
111
|
for (const compilerVersion of compilerVersionStrategy.select()) {
|
|
@@ -115,6 +116,7 @@ async function compileSourceString(fileName, sourceCode, version, pathOptions =
|
|
|
115
116
|
data,
|
|
116
117
|
compilerVersion,
|
|
117
118
|
files,
|
|
119
|
+
resolvedFileNames,
|
|
118
120
|
inferredRemappings
|
|
119
121
|
};
|
|
120
122
|
}
|
|
@@ -133,11 +135,12 @@ async function compileSol(input, version, pathOptions = {}, compilationOutput =
|
|
|
133
135
|
const remapping = pathOptions.remapping || [];
|
|
134
136
|
const parsedRemapping = parsePathRemapping(remapping);
|
|
135
137
|
const files = new Map();
|
|
138
|
+
const resolvedFileNames = new Map();
|
|
136
139
|
const visited = new Set();
|
|
137
140
|
const isDynamicBasePath = pathOptions.basePath === undefined;
|
|
138
141
|
for (const fileName of fileNames) {
|
|
139
142
|
const resolvedFileName = fsResolver.resolve(fileName);
|
|
140
|
-
(0, misc_1.assert)(resolvedFileName !== undefined, `Unable to find "${
|
|
143
|
+
(0, misc_1.assert)(resolvedFileName !== undefined, `Unable to find "${fileName}"`);
|
|
141
144
|
const sourceCode = await fs_extra_1.default.readFile(resolvedFileName, "utf-8");
|
|
142
145
|
if (isDynamicBasePath) {
|
|
143
146
|
const basePath = path_1.default.dirname(resolvedFileName);
|
|
@@ -145,7 +148,16 @@ async function compileSol(input, version, pathOptions = {}, compilationOutput =
|
|
|
145
148
|
npmResolver.basePath = basePath;
|
|
146
149
|
}
|
|
147
150
|
files.set(resolvedFileName, sourceCode);
|
|
148
|
-
|
|
151
|
+
/**
|
|
152
|
+
* Add self-mapping as we need every key in `files`
|
|
153
|
+
* to also be defined in `resolvedFileNames`
|
|
154
|
+
*/
|
|
155
|
+
resolvedFileNames.set(resolvedFileName, resolvedFileName);
|
|
156
|
+
/**
|
|
157
|
+
* Set the resolved path for every file passed in by the caller as well
|
|
158
|
+
*/
|
|
159
|
+
resolvedFileNames.set(fileName, resolvedFileName);
|
|
160
|
+
await (0, inference_1.findAllFiles)(files, resolvedFileNames, parsedRemapping, resolvers, visited);
|
|
149
161
|
}
|
|
150
162
|
const compilerVersionStrategy = getCompilerVersionStrategy([...files.values()], version);
|
|
151
163
|
const failures = [];
|
|
@@ -157,6 +169,7 @@ async function compileSol(input, version, pathOptions = {}, compilationOutput =
|
|
|
157
169
|
data,
|
|
158
170
|
compilerVersion,
|
|
159
171
|
files,
|
|
172
|
+
resolvedFileNames,
|
|
160
173
|
inferredRemappings
|
|
161
174
|
};
|
|
162
175
|
}
|
|
@@ -171,6 +184,7 @@ async function compileJsonData(fileName, data, version, compilationOutput = [con
|
|
|
171
184
|
throw new Error(`Unable to find required properties in "${fileName}"`);
|
|
172
185
|
}
|
|
173
186
|
const sources = data.sources;
|
|
187
|
+
const resolvedFileNames = new Map(Object.keys(sources).map((x) => [x, x]));
|
|
174
188
|
if (consistentlyContainsOneOf(sources, "ast", "legacyAST", "AST")) {
|
|
175
189
|
const compilerVersion = undefined;
|
|
176
190
|
const errors = detectCompileErrors(data);
|
|
@@ -178,7 +192,13 @@ async function compileJsonData(fileName, data, version, compilationOutput = [con
|
|
|
178
192
|
throw new CompileFailedError([{ compilerVersion, errors }]);
|
|
179
193
|
}
|
|
180
194
|
fillFilesFromSources(files, sources);
|
|
181
|
-
return {
|
|
195
|
+
return {
|
|
196
|
+
data,
|
|
197
|
+
compilerVersion,
|
|
198
|
+
files,
|
|
199
|
+
resolvedFileNames,
|
|
200
|
+
inferredRemappings: new Map()
|
|
201
|
+
};
|
|
182
202
|
}
|
|
183
203
|
if (consistentlyContainsOneOf(sources, "source")) {
|
|
184
204
|
for (const [fileName, fileData] of Object.entries(sources)) {
|
|
@@ -190,7 +210,13 @@ async function compileJsonData(fileName, data, version, compilationOutput = [con
|
|
|
190
210
|
const compileData = await compile(files, [], compilerVersion, compilationOutput, compilerSettings, kind);
|
|
191
211
|
const errors = detectCompileErrors(compileData);
|
|
192
212
|
if (errors.length === 0) {
|
|
193
|
-
return {
|
|
213
|
+
return {
|
|
214
|
+
data: compileData,
|
|
215
|
+
compilerVersion,
|
|
216
|
+
files,
|
|
217
|
+
resolvedFileNames,
|
|
218
|
+
inferredRemappings: new Map()
|
|
219
|
+
};
|
|
194
220
|
}
|
|
195
221
|
failures.push({ compilerVersion, errors });
|
|
196
222
|
}
|
|
@@ -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": "10.
|
|
3
|
+
"version": "10.1.2",
|
|
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": [
|
|
@@ -17,7 +17,7 @@
|
|
|
17
17
|
"build-type-parser": "tspegjs -o src/types/typeStrings/typeString_parser.ts --custom-header-file src/types/typeStrings/typeString_parser_header.ts --cache src/types/typeStrings/typeString_grammar.pegjs",
|
|
18
18
|
"build-file-level-definitions-parser": "tspegjs -o src/compile/inference/file_level_definitions_parser.ts --custom-header-file src/compile/inference/file_level_definitions_parser_header.ts --cache src/compile/inference/file_level_definitions.pegjs",
|
|
19
19
|
"build-parsers": "npm run build-type-parser && npm run build-file-level-definitions-parser",
|
|
20
|
-
"build": "npm run clean && npm run build-parsers && npm run transpile",
|
|
20
|
+
"build": "npm run clean && npm run build-parsers && npm run transpile && chmod u+x dist/bin/compile.js",
|
|
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",
|
|
@@ -34,27 +34,27 @@
|
|
|
34
34
|
"fs-extra": "^10.1.0",
|
|
35
35
|
"jsel": "^1.1.6",
|
|
36
36
|
"semver": "^7.3.7",
|
|
37
|
-
"solc": "
|
|
37
|
+
"solc": "0.8.14-fixed",
|
|
38
38
|
"src-location": "^1.1.0",
|
|
39
39
|
"web3-eth-abi": "^1.7.3"
|
|
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.
|
|
44
|
+
"@types/node": "^16.11.36",
|
|
45
45
|
"@types/semver": "^7.3.9",
|
|
46
|
-
"@typescript-eslint/eslint-plugin": "^5.
|
|
47
|
-
"@typescript-eslint/parser": "^5.
|
|
46
|
+
"@typescript-eslint/eslint-plugin": "^5.26.0",
|
|
47
|
+
"@typescript-eslint/parser": "^5.26.0",
|
|
48
48
|
"codecov": "^3.8.3",
|
|
49
|
-
"eslint": "^8.
|
|
49
|
+
"eslint": "^8.16.0",
|
|
50
50
|
"eslint-config-prettier": "^8.5.0",
|
|
51
51
|
"eslint-plugin-prettier": "^4.0.0",
|
|
52
|
-
"expect": "^28.0
|
|
52
|
+
"expect": "^28.1.0",
|
|
53
53
|
"mocha": "^10.0.0",
|
|
54
54
|
"nyc": "^15.1.0",
|
|
55
55
|
"peggy": "^1.2.0",
|
|
56
56
|
"prettier": "2.6.2",
|
|
57
|
-
"ts-node": "^10.
|
|
57
|
+
"ts-node": "^10.8.0",
|
|
58
58
|
"ts-pegjs": "^1.2.2",
|
|
59
59
|
"typedoc": "^0.22.15",
|
|
60
60
|
"typescript": "^4.6.4"
|