fluencelabs/assemblyscript
1
0
Fork 0
mirror of https://github.com/fluencelabs/assemblyscript synced 2025-04-26 15:32:16 +00:00
Code Issues Projects Releases Wiki Activity

Clean up asc a bit

Browse Source
This commit is contained in:
dcodeIO 2018-02-12 18:54:17 +01:00
parent 2175e6fbdc
commit 9e9284955d
3 changed files with 179 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bin/asc
View File

@ -1,2 +1,4 @@
#!/usr/bin/env node #!/usr/bin/env node
process.exitCode = require("./asc.js").main(process.argv.slice(2)); const asc = module.exports = require("./asc.js");
if (process.argv[1] === __filename)
process.exitCode = asc.main(process.argv.slice(2));

247
bin/asc.js
View File

@ -1,5 +1,7 @@
const path = require("path"); //////////////////////// Compiler frontend for node.js /////////////////////////
const fs = require("fs"); const fs = require("fs");
const path = require("path");
const os = require("os"); const os = require("os");
// Use distribution files if present, otherwise run the sources directly // Use distribution files if present, otherwise run the sources directly
@ -10,29 +12,52 @@ try {
try { require("source-map-support").install(); } catch (e) {} // optional try { require("source-map-support").install(); } catch (e) {} // optional
} catch (e) { } catch (e) {
try { try {
require("ts-node").register({ project: require("path").join(__dirname, "..", "src") }); require("ts-node").register({
project: path.join(__dirname, "..", "src")
});
require("../src/glue/js"); require("../src/glue/js");
assemblyscript = require("../src"); assemblyscript = require("../src");
isDev = true; isDev = true;
} catch (e) { } catch (e) {
assemblyscript = require("./assemblyscript"); // last resort: browser bundle under node // last resort: browser bundle under node
assemblyscript = require("./assemblyscript");
isDev = false; isDev = false;
} }
} }
// Common constants /** Whether this is a webpack bundle or not. */
exports.isBundle = typeof BUNDLE_VERSION === "string";
const isBundle = typeof BUNDLE_VERSION === "string"; /** Whether asc runs the sources directly or not. */
const VERSION = exports.version = isBundle ? BUNDLE_VERSION : require("../package.json").version + (isDev ? "-dev" : ""); exports.isDev = isDev;
const OPTIONS = exports.options = require("./asc.json");
const SOURCEMAP_ROOT = "assemblyscript:///";
const LIBRARY_PREFIX = assemblyscript.LIBRARY_PREFIX;
const DEFAULT_OPTIMIZE_LEVEL = exports.defaultOptimizeLevel = 2;
const DEFAULT_SHRINK_LEVEL = exports.defaultShrinkLevel = 1;
const LIBRARY_FILES = exports.libraryFiles = isBundle ? BUNDLE_LIBRARY : {};
const DEFINITION_FILES = exports.definitionFiles = isBundle ? BUNDLE_DEFINITIONS : {};
function main(argv, options, callback) { /** AssemblyScript veresion. */
exports.version = exports.isBundle ? BUNDLE_VERSION
: require("../package.json").version;
/** Available options. */
exports.options = require("./asc.json");
/** Common root used in source maps. */
exports.sourceMapRoot = "assemblyscript:///";
/** Prefix used for library files. */
exports.libraryPrefix = assemblyscript.LIBRARY_PREFIX;
/** Default Binaryen optimization level. */
exports.defaultOptimizeLevel = 2;
/** Default Binaryen shrink level. */
exports.defaultShrinkLevel = 1;
/** Bundled library files, if any. */
exports.libraryFiles = exports.isBundle ? BUNDLE_LIBRARY : {};
/** Bundled definition files, if any. */
exports.definitionFiles = exports.isBundle ? BUNDLE_DEFINITIONS : {};
/** Runs the command line utility using the specified arguments array. */
exports.main = function main(argv, options, callback) {
if (typeof options === "function") { if (typeof options === "function") {
callback = options; callback = options;
options = {}; options = {};
@ -47,12 +72,17 @@ function main(argv, options, callback) {
const stats = options.stats || createStats(); const stats = options.stats || createStats();
// All of the above must be specified in browser environments // All of the above must be specified in browser environments
if (!stdout) throw Error("'options.stdout' must be specified"); if (!stdout)
if (!stderr) throw Error("'options.stderr' must be specified"); throw Error("'options.stdout' must be specified");
if (!stderr)
throw Error("'options.stderr' must be specified");
if (!fs.readFileSync) { if (!fs.readFileSync) {
if (readFile === readFileNode) throw Error("'options.readFile' must be specified"); if (readFile === readFileNode)
if (writeFile === writeFileNode) throw Error("'options.writeFile' must be specified"); throw Error("'options.readFile' must be specified");
if (listFiles === listFilesNode) throw Error("'options.listFiles' must be specified"); if (writeFile === writeFileNode)
throw Error("'options.writeFile' must be specified");
if (listFiles === listFilesNode)
throw Error("'options.listFiles' must be specified");
} }
const args = parseArguments(argv); const args = parseArguments(argv);
@ -70,15 +100,14 @@ function main(argv, options, callback) {
// Just print the version if requested // Just print the version if requested
if (args.version) { if (args.version) {
stdout.write("Version " + VERSION + os.EOL); stdout.write("Version " + exports.version + (isDev ? "-dev" : "") + os.EOL);
return callback(null); return callback(null);
} }
// Print the help message if requested or no source files are provided // Print the help message if requested or no source files are provided
if (args.help || args._.length < 1) { if (args.help || args._.length < 1) {
const opts = []; const opts = [];
Object.keys(OPTIONS).forEach(name => { Object.keys(exports.options).forEach(name => {
var option = OPTIONS[name]; var option = exports.options[name];
var text = " "; var text = " ";
text += "--" + name; text += "--" + name;
if (option.aliases && option.aliases[0].length === 1) if (option.aliases && option.aliases[0].length === 1)
@ -96,7 +125,7 @@ function main(argv, options, callback) {
}); });
(args.help ? stdout : stderr).write([ (args.help ? stdout : stderr).write([
"Version " + VERSION, "Version " + exports.version + (isDev ? "-dev" : ""),
"Syntax: asc [entryFile ...] [options]", "Syntax: asc [entryFile ...] [options]",
"", "",
"Examples: asc hello.ts", "Examples: asc hello.ts",
@ -109,7 +138,7 @@ function main(argv, options, callback) {
} }
// Set up base directory // Set up base directory
const baseDir = args.baseDir != null ? path.resolve(args.baseDir) : process.cwd(); const baseDir = args.baseDir ? path.resolve(args.baseDir) : process.cwd();
// Include standard library if --noLib isn't set // Include standard library if --noLib isn't set
const stdLibDir = path.join(__dirname, "..", "std", "assembly"); const stdLibDir = path.join(__dirname, "..", "std", "assembly");
@ -143,18 +172,23 @@ function main(argv, options, callback) {
sourcePath += ".ts"; sourcePath += ".ts";
stats.parseCount++; stats.parseCount++;
stats.parseTime += measure(() => parser = assemblyscript.parseFile(sourceText, sourcePath, parser, true)); stats.parseTime += measure(() => {
parser = assemblyscript.parseFile(sourceText, sourcePath, parser, true);
});
while ((sourcePath = parser.nextFile()) != null) { while ((sourcePath = parser.nextFile()) != null) {
let found = false; let found = false;
// Load library file if explicitly requested // Load library file if explicitly requested
if (sourcePath.startsWith(LIBRARY_PREFIX)) { if (sourcePath.startsWith(exports.libraryPrefix)) {
for (let i = 0, k = libDirs.length; i < k; ++i) { for (let i = 0, k = libDirs.length; i < k; ++i) {
if (LIBRARY_FILES.hasOwnProperty(sourcePath)) if (exports.libraryFiles.hasOwnProperty(sourcePath))
sourceText = LIBRARY_FILES[sourcePath]; sourceText = exports.libraryFiles[sourcePath];
else { else {
sourceText = readFile(path.join(libDirs[i], sourcePath.substring(LIBRARY_PREFIX.length) + ".ts")); sourceText = readFile(path.join(
libDirs[i],
sourcePath.substring(exports.libraryPrefix.length) + ".ts")
);
if (sourceText !== null) { if (sourceText !== null) {
sourcePath += ".ts"; sourcePath += ".ts";
break; break;
@ -169,25 +203,31 @@ function main(argv, options, callback) {
sourceText = readFile(path.join(baseDir, sourcePath, "index.ts")); sourceText = readFile(path.join(baseDir, sourcePath, "index.ts"));
if (sourceText === null) { if (sourceText === null) {
for (let i = 0, k = libDirs.length; i < k; ++i) { for (let i = 0, k = libDirs.length; i < k; ++i) {
if (LIBRARY_FILES.hasOwnProperty(LIBRARY_PREFIX + sourcePath)) const dir = libDirs[i];
sourceText = LIBRARY_FILES[LIBRARY_PREFIX + sourcePath]; const key = exports.libraryPrefix + sourcePath;
if (exports.libraryFiles.hasOwnProperty(key))
sourceText = exports.libraryFiles[key];
else { else {
sourceText = readFile(path.join(libDirs[i], sourcePath + ".ts")); sourceText = readFile(path.join(dir, sourcePath + ".ts"));
if (sourceText !== null) { if (sourceText !== null) {
sourcePath = LIBRARY_PREFIX + sourcePath + ".ts"; sourcePath = exports.libraryPrefix + sourcePath + ".ts";
break; break;
} }
} }
} }
if (sourceText === null) if (sourceText === null)
return callback(Error("Import file '" + sourcePath + ".ts' not found.")); return callback(
Error("Import file '" + sourcePath + ".ts' not found.")
);
} else } else
sourcePath += "/index.ts"; sourcePath += "/index.ts";
} else } else
sourcePath += ".ts"; sourcePath += ".ts";
} }
stats.parseCount++; stats.parseCount++;
stats.parseTime += measure(() => assemblyscript.parseFile(sourceText, sourcePath, parser)); stats.parseTime += measure(() => {
assemblyscript.parseFile(sourceText, sourcePath, parser);
});
} }
if (checkDiagnostics(parser, stderr)) if (checkDiagnostics(parser, stderr))
return callback(Error("Parse error")); return callback(Error("Parse error"));
@ -196,10 +236,17 @@ function main(argv, options, callback) {
// Include (other) library components // Include (other) library components
var hasBundledLibrary = false; var hasBundledLibrary = false;
if (!args.noLib) if (!args.noLib)
Object.keys(LIBRARY_FILES).forEach(libPath => { Object.keys(exports.libraryFiles).forEach(libPath => {
if (libPath.lastIndexOf("/") >= LIBRARY_PREFIX.length) return; if (libPath.lastIndexOf("/") >= exports.libraryPrefix.length)
return;
stats.parseCount++; stats.parseCount++;
stats.parseTime += measure(() => { parser = assemblyscript.parseFile(LIBRARY_FILES[libPath], libPath + ".ts", parser, false); }); stats.parseTime += measure(() => {
parser = assemblyscript.parseFile(
exports.libraryFiles[libPath],
libPath + ".ts",
parser
);
});
hasBundledLibrary = true; hasBundledLibrary = true;
}); });
for (let i = 0, k = libDirs.length; i < k; ++i) { for (let i = 0, k = libDirs.length; i < k; ++i) {
@ -210,9 +257,15 @@ function main(argv, options, callback) {
let libPath = libFiles[j]; let libPath = libFiles[j];
let libText = readFile(path.join(libDir, libPath)); let libText = readFile(path.join(libDir, libPath));
if (libText === null) if (libText === null)
return callback(Error("Library file '" + libPath + "' could not be read.")); return callback(Error("Library file '" + libPath + "' not found."));
stats.parseCount++; stats.parseCount++;
stats.parseTime += measure(() => { parser = assemblyscript.parseFile(libText, LIBRARY_PREFIX + libPath, parser, false); }); stats.parseTime += measure(() => {
parser = assemblyscript.parseFile(
libText,
exports.libraryPrefix + libPath,
parser
);
});
} }
} }
@ -227,7 +280,9 @@ function main(argv, options, callback) {
var module; var module;
stats.compileCount++; stats.compileCount++;
try { try {
stats.compileTime += measure(() => module = assemblyscript.compile(parser, compilerOptions)); stats.compileTime += measure(() => {
module = assemblyscript.compile(parser, compilerOptions);
});
} catch (e) { } catch (e) {
return callback(e); return callback(e);
} }
@ -250,10 +305,14 @@ function main(argv, options, callback) {
// Set Binaryen-specific options // Set Binaryen-specific options
if (args.trapMode === "clamp") { if (args.trapMode === "clamp") {
stats.optimizeCount++; stats.optimizeCount++;
stats.optimizeTime += measure(() => module.runPasses([ "trap-mode-clamp" ])); stats.optimizeTime += measure(() => {
module.runPasses([ "trap-mode-clamp" ]);
});
} else if (args.trapMode === "js") { } else if (args.trapMode === "js") {
stats.optimizeCount++; stats.optimizeCount++;
stats.optimizeTime += measure(() => module.runPasses([ "trap-mode-js" ])); stats.optimizeTime += measure(() => {
module.runPasses([ "trap-mode-js" ]);
});
} else if (args.trapMode !== "allow") { } else if (args.trapMode !== "allow") {
module.dispose(); module.dispose();
return callback(Error("Unsupported trap mode")); return callback(Error("Unsupported trap mode"));
@ -275,8 +334,8 @@ function main(argv, options, callback) {
else if (args["3"]) else if (args["3"])
optimizeLevel = 3; optimizeLevel = 3;
else if (args.optimize === true) { else if (args.optimize === true) {
optimizeLevel = DEFAULT_OPTIMIZE_LEVEL; optimizeLevel = exports.defaultOptimizeLevel;
shrinkLevel = DEFAULT_SHRINK_LEVEL; shrinkLevel = exports.defaultShrinkLevel;
} else } else
optimizeLevel = 0; optimizeLevel = 0;
} }
@ -318,7 +377,9 @@ function main(argv, options, callback) {
// Run additional passes if requested // Run additional passes if requested
if (runPasses.length) { if (runPasses.length) {
stats.optimizeCount++; stats.optimizeCount++;
stats.optimizeTime += measure(() => module.runPasses(runPasses.map(pass => pass.trim()))); stats.optimizeTime += measure(() => {
module.runPasses(runPasses.map(pass => pass.trim()));
});
} }
// Prepare output // Prepare output
@ -357,29 +418,43 @@ function main(argv, options, callback) {
if (binary.sourceMap != null) { if (binary.sourceMap != null) {
if (args.binaryFile.length) { if (args.binaryFile.length) {
let sourceMap = JSON.parse(binary.sourceMap); let sourceMap = JSON.parse(binary.sourceMap);
sourceMap.sourceRoot = SOURCEMAP_ROOT; sourceMap.sourceRoot = exports.sourceMapRoot;
sourceMap.sources.forEach((name, index) => { sourceMap.sources.forEach((name, index) => {
let text = null; let text = null;
if (name.startsWith(LIBRARY_PREFIX)) { if (name.startsWith(exports.libraryPrefix)) {
for (let i = 0, k = libDirs.length; i < k; ++i) { for (let i = 0, k = libDirs.length; i < k; ++i) {
text = readFile(path.join(libDirs[i], name.substring(LIBRARY_PREFIX.length))); text = readFile(path.join(
libDirs[i],
name.substring(exports.libraryPrefix.length))
);
if (text !== null) break; if (text !== null) break;
} }
} else } else
text = readFile(path.join(baseDir, name)); text = readFile(path.join(baseDir, name));
if (text === null) if (text === null)
return callback(Error("Source file '" + name + "' not found.")); return callback(Error("Source file '" + name + "' not found."));
(sourceMap.sourceContents || (sourceMap.sourceContents = []))[index] = text; if (!sourceMap.sourceContents)
sourceMap.sourceContents = [];
sourceMap.sourceContents[index] = text;
}); });
writeFile(path.join(baseDir, path.dirname(args.binaryFile), path.basename(sourceMapURL)), JSON.stringify(sourceMap)); writeFile(path.join(
baseDir,
path.dirname(args.binaryFile),
path.basename(sourceMapURL)
), JSON.stringify(sourceMap));
} else { } else {
stderr.write("Cannot write source map because binary already occupies stdout." + os.EOL); stderr.write("Skipped source map (stdout already occupied)" + os.EOL);
} }
} }
} }
// Write text // Write text
if (args.textFile != null || (args.binaryFile == null && args.asmjsFile == null)) { if (
args.textFile != null || (
args.binaryFile == null &&
args.asmjsFile == null
)
) {
let text; let text;
if (args.textFile && args.textFile.length) { if (args.textFile && args.textFile.length) {
stats.emitCount++; stats.emitCount++;
@ -418,7 +493,9 @@ function main(argv, options, callback) {
try { try {
var text; var text;
stats.readCount++; stats.readCount++;
stats.readTime += measure(() => { text = fs.readFileSync(filename, { encoding: "utf8" }); }); stats.readTime += measure(() => {
text = fs.readFileSync(filename, { encoding: "utf8" });
});
return text; return text;
} catch (e) { } catch (e) {
return null; return null;
@ -428,7 +505,12 @@ function main(argv, options, callback) {
function writeFileNode(filename, contents) { function writeFileNode(filename, contents) {
try { try {
stats.writeCount++; stats.writeCount++;
stats.writeTime += measure(() => fs.writeFileSync(filename, contents, typeof contents === "string" ? { encoding: "utf8" } : undefined)); stats.writeTime += measure(() => {
if (typeof contents === "string")
fs.writeFileSync(filename, contents, { encoding: "utf8" } );
else
fs.writeFileSync(filename, contents);
});
return true; return true;
} catch (e) { } catch (e) {
return false; return false;
@ -438,7 +520,9 @@ function main(argv, options, callback) {
function listFilesNode(dirname) { function listFilesNode(dirname) {
var files; var files;
try { try {
stats.readTime += measure(() => { files = require("glob").sync("*.ts", { cwd: dirname }) }); stats.readTime += measure(() => {
files = require("glob").sync("*.ts", { cwd: dirname });
});
return files; return files;
} catch (e) { } catch (e) {
return []; return [];
@ -450,16 +534,20 @@ function main(argv, options, callback) {
stats.writeCount++; stats.writeCount++;
writeStdout.used = true; writeStdout.used = true;
} }
stats.writeTime += measure(() => stdout.write(contents, typeof contents === "string" ? { encoding: "utf8" } : undefined)); stats.writeTime += measure(() => {
if (typeof contents === "string")
stdout.write(contents, { encoding: "utf8" });
else
stdout.write(contents);
});
} }
} }
exports.main = main; /** Parses the specified command line arguments. */
function parseArguments(argv) { function parseArguments(argv) {
const opts = {}; const opts = {};
Object.keys(OPTIONS).forEach(key => { Object.keys(exports.options).forEach(key => {
const opt = OPTIONS[key]; const opt = exports.options[key];
if (opt.aliases) if (opt.aliases)
(opts.alias || (opts.alias = {}))[key] = opt.aliases; (opts.alias || (opts.alias = {}))[key] = opt.aliases;
if (opt.default !== undefined) if (opt.default !== undefined)
@ -474,18 +562,24 @@ function parseArguments(argv) {
exports.parseArguments = parseArguments; exports.parseArguments = parseArguments;
function checkDiagnostics(parser, stderr) { /** Checks diagnostics emitted so far for errors. */
function checkDiagnostics(emitter, stderr) {
var diagnostic; var diagnostic;
var hasErrors = false; var hasErrors = false;
while ((diagnostic = assemblyscript.nextDiagnostic(parser)) != null) { while ((diagnostic = assemblyscript.nextDiagnostic(emitter)) != null) {
stderr.write(assemblyscript.formatDiagnostic(diagnostic, stderr.isTTY, true) + os.EOL + os.EOL); stderr.write(
if (assemblyscript.isError(diagnostic)) hasErrors = true; assemblyscript.formatDiagnostic(diagnostic, stderr.isTTY, true) +
os.EOL + os.EOL
);
if (assemblyscript.isError(diagnostic))
hasErrors = true;
} }
return hasErrors; return hasErrors;
} }
exports.checkDiagnostics = checkDiagnostics; exports.checkDiagnostics = checkDiagnostics;
/** Creates an empty set of stats. */
function createStats() { function createStats() {
return { return {
readTime: 0, readTime: 0,
@ -510,6 +604,7 @@ exports.createStats = createStats;
if (!process.hrtime) if (!process.hrtime)
process.hrtime = require("browser-process-hrtime"); process.hrtime = require("browser-process-hrtime");
/** Measures the execution time of the specified function. */
function measure(fn) { function measure(fn) {
const start = process.hrtime(); const start = process.hrtime();
fn(); fn();
@ -519,20 +614,25 @@ function measure(fn) {
exports.measure = measure; exports.measure = measure;
/** Formats and prints out the contents of a set of stats. */
function printStats(stats, output) { function printStats(stats, output) {
function format(time, count) {
return time ? (time / 1e6).toFixed(3) + " ms" : "N/A";
}
(output || process.stdout).write([ (output || process.stdout).write([
"I/O Read : " + (stats.readTime ? (stats.readTime / 1e6).toFixed(3) + " ms (" + stats.readCount + " files)" : "N/A"), "I/O Read : " + format(stats.readTime, stats.readCount),
"I/O Write : " + (stats.writeTime ? (stats.writeTime / 1e6).toFixed(3) + " ms (" + stats.writeCount + " files)" : "N/A"), "I/O Write : " + format(stats.writeTime, stats.writeCount),
"Parse : " + (stats.parseTime ? (stats.parseTime / 1e6).toFixed(3) + " ms (" + stats.parseCount + " times)" : "N/A"), "Parse : " + format(stats.parseTime, stats.parseCount),
"Compile : " + (stats.compileTime ? (stats.compileTime / 1e6).toFixed(3) + " ms (" + stats.compileCount + " times)" : "N/A"), "Compile : " + format(stats.compileTime, stats.compileCount),
"Emit : " + (stats.emitTime ? (stats.emitTime / 1e6).toFixed(3) + " ms (" + stats.emitCount + " times)" : "N/A"), "Emit : " + format(stats.emitTime, stats.emitCount),
"Validate : " + (stats.validateTime ? (stats.validateTime / 1e6).toFixed(3) + " ms (" + stats.validateCount + " times)" : "N/A"), "Validate : " + format(stats.validateTime, stats.validateCount),
"Optimize : " + (stats.optimizeTime ? (stats.optimizeTime / 1e6).toFixed(3) + " ms (" + stats.optimizeCount + " times)" : "N/A") "Optimize : " + format(stats.optimizeTime, stats.optimizeCount)
].join(os.EOL) + os.EOL); ].join(os.EOL) + os.EOL);
} }
exports.printStats = printStats; exports.printStats = printStats;
/** Creates a memory stream that can be used in place of stdout/stderr. */
function createMemoryStream(fn) { function createMemoryStream(fn) {
var stream = []; var stream = [];
stream.write = function(chunk) { stream.write = function(chunk) {
@ -554,6 +654,7 @@ function createMemoryStream(fn) {
exports.createMemoryStream = createMemoryStream; exports.createMemoryStream = createMemoryStream;
/** Compatible TypeScript compiler options. */
exports.tscOptions = { exports.tscOptions = {
alwaysStrict: true, alwaysStrict: true,
noImplicitAny: true, noImplicitAny: true,

4
dist/asc.js vendored
View File

File diff suppressed because one or more lines are too long