feat: add solidity-style sources compilation #5
Conversation
| const parentPathOf = (str) => (m = /(.*)\/(?!\/)(.*)\.huff/g.exec(str)) && m[1]; | ||
| const recurse = (filename, parentPath) => { | ||
| const fileName = normalizePath(filename) | ||
| const relativePath = path.join(parentPath || '', fileName); |
There was a problem hiding this comment.
You can make the interface to this method a tiny bit clearer by hoisting this || to instead be a default parameter for parentPath
| @@ -734,20 +734,86 @@ parser.getFileContents = (originalFilename, partialPath) => { | |||
| return { filedata, raw }; | |||
| }; | |||
|
|
|||
| const normalizePath = (str) => path.join('', str); | |||
There was a problem hiding this comment.
This is far from a clean codebase, but think we can help it out by putting some of these smaller helper functions into their own namespace.
| let imported = []; | ||
| let test = formatted.match(grammar.topLevel.IMPORT); | ||
| while (test !== null) { | ||
| const importStatement = formatted.match(grammar.topLevel.IMPORT); |
There was a problem hiding this comment.
Your test variable will always be up to date, and you don't need to recompute the regex match.
| while (test !== null) { | ||
| const importStatement = formatted.match(grammar.topLevel.IMPORT); | ||
| const empty = ' '.repeat(importStatement[0].length); | ||
| formatted = empty + formatted.slice(importStatement[0].length); |
There was a problem hiding this comment.
If you make the recurse function return the parsed file data, with import statements replaced with the data of the underlying file they refer to, you can replace empty with the return of recurse(importedFilename, parentPathOf(relativePath)), getting rid of quite a few ... and a reduce.
i.e. have your recurse aggregate all imports into one source string, and return that.
Description
Added ability to provide a sources object in place of a path in the filesystem.
Sources object has file names as keys and file data as values.
Changes
src/parser.js
src/parser.spec.js
src/runtime.js
src/runtime.spec.js
Sorry for the messy commits.