fluencelabs/assemblyscript
1
0
Fork 0
mirror of https://github.com/fluencelabs/assemblyscript synced 2025-04-25 07:02:13 +00:00
Code Issues Projects Releases Wiki Activity

Fix an issue with the --lib argument in asc and allow specifying files (#42)

Browse Source
This commit is contained in:
Norton Wang 2018-03-18 09:11:27 -04:00 committed by Daniel Wirtz
parent 5eb10d404f
commit 9511e2618d
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NOTICE
View File

@ -6,6 +6,7 @@ under the licensing terms detailed in LICENSE.
* Daniel Wirtz <dcode@dcode.io> * Daniel Wirtz <dcode@dcode.io>
* Max Graey <maxgraey@gmail.com> * Max Graey <maxgraey@gmail.com>
* Igor Sbitnev <PinkaminaDianePie@gmail.com> * Igor Sbitnev <PinkaminaDianePie@gmail.com>
* Norton Wang <me@nortonwang.com>
================================================================================ ================================================================================

10
bin/asc.js
View File

@ -157,7 +157,7 @@ exports.main = function main(argv, options, callback) {
if (typeof args.lib === "string") { if (typeof args.lib === "string") {
args.lib = args.lib.split(","); args.lib = args.lib.split(",");
} }
Array.prototype.push.apply(libDirs, args.lib.map(trim)); Array.prototype.push.apply(libDirs, args.lib.map(lib => lib.trim()));
} }
// Begin parsing // Begin parsing
@ -267,7 +267,13 @@ exports.main = function main(argv, options, callback) {
for (let i = 0, k = libDirs.length; i < k; ++i) { for (let i = 0, k = libDirs.length; i < k; ++i) {
if (i === 0 && hasBundledLibrary) continue; if (i === 0 && hasBundledLibrary) continue;
let libDir = libDirs[i]; let libDir = libDirs[i];
let libFiles = listFiles(libDir); let libFiles;
if (libDir.endsWith(".ts")) {
libFiles = [path.basename(libDir)];
libDir = path.dirname(libDir);
} else {
libFiles = listFiles(libDir);
}
for (let j = 0, l = libFiles.length; j < l; ++j) { for (let j = 0, l = libFiles.length; j < l; ++j) {
let libPath = libFiles[j]; let libPath = libFiles[j];
let libText = readFile(path.join(libDir, libPath)); let libText = readFile(path.join(libDir, libPath));