rapydscript-ns 0.8.2 → 0.8.4

package/tools/compile.js

@@ -1,219 +1,219 @@
-/*
- * compile.js
- * Copyright (C) 2015 Kovid Goyal <kovid at kovidgoyal.net>
- *
- * Distributed under terms of the BSD license.
- */
-"use strict";  /*jshint node:true */
-
-var fs = require('fs');
-var path = require('path');
-var vm = require('vm');
-var RapydScript = require("./compiler").create_compiler();
-var utils = require('./utils');
-
-function read_whole_file(filename, cb) {
-    if (!filename) {
-        var chunks = [];
-        process.stdin.setEncoding('utf-8');
-        process.stdin.on('data', function (chunk) {
-            chunks.push(chunk);
-        }).on('end', function () {
-            cb(null, chunks.join(""));
-        });
-        process.openStdin();
-    } else {
-        fs.readFile(filename, "utf-8", cb);
-    }
-}
-
-function makedirs(dir) {
-    try {
-        fs.mkdirSync(dir);
-    } catch(e) {
-        if (e.code == 'EEXIST') return;
-        if (e.code == 'ENOENT') { makedirs(path.dirname(dir)); fs.mkdirSync(dir); }
-        throw e;
-    }
-}
-
-function process_cache_dir(dir) {
-    dir = path.resolve(path.normalize(dir));
-    makedirs(dir);
-    return dir;
-}
-
-function build_scoped_flags(flags_str) {
-    var result = Object.create(null);
-    if (!flags_str) return result;
-    flags_str.split(',').forEach(function(flag) {
-        flag = flag.trim();
-        if (!flag) return;
-        var val = true;
-        if (flag.slice(0, 3) === 'no_') { val = false; flag = flag.slice(3); }
-        result[flag] = val;
-    });
-    return result;
-}
-
-module.exports = function(start_time, argv, base_path, src_path, lib_path) {
-    // configure settings for the output
-    var cache_dir = argv.cache_dir ? process_cache_dir(argv.cache_dir) : '';
-    var OUTPUT_OPTIONS = {
-        beautify: !argv.uglify,
-        private_scope: !argv.bare && !argv.export_main,
-        omit_baselib: argv.omit_baselib,
-        js_version: parseInt(argv.js_version),
-        keep_docstrings: argv.keep_docstrings,
-        discard_asserts: argv.discard_asserts,
-        module_cache_dir: cache_dir,
-        pythonize_strings: argv.pythonize_strings,
-    };
-
-    var files = argv.files.slice();
-    var STATS = {}, TOPLEVEL;
-    var num_of_files = files.length || 1;
-
-    var global_scoped_flags = build_scoped_flags(argv.python_flags);
-
-    function parse_file(code, file, toplevel) {
-        return RapydScript.parse(code, {
-            filename: file,
-            toplevel: toplevel,
-            basedir: (file !== '<stdin>') ? path.dirname(file) : undefined,
-            libdir: path.join(src_path, 'lib'),
-            import_dirs: utils.get_import_dirs(argv.import_path),
-            discard_asserts: argv.discard_asserts,
-            module_cache_dir: cache_dir,
-            scoped_flags: global_scoped_flags,
-        });
-    }
-
-    function write_output(output) {
-        if (argv.output) {
-            // Node's filesystem module cannot write directly to /dev/stdout
-            if (argv.output == '/dev/stdout') console.log(output);
-            else if (argv.output == '/dev/stderr') console.error(output);
-            else fs.writeFileSync(argv.output, output, "utf8");
-        } else if (!argv.execute){
-            console.log(output);
-        }
-        if (argv.execute) {
-            vm.runInNewContext(output, {'console':console, 'require':require}, {'filename':files[0]});
-        }
-    }
-
-    function time_it(name, cont) {
-        var t1 = new Date().getTime();
-        var ret = cont();
-        if (argv.stats) {
-            var spent = new Date().getTime() - t1;
-            if (STATS[name]) STATS[name] += spent;
-            else STATS[name] = spent;
-        }
-        return ret;
-    }
-
-    function compile_single_file(err, code) {
-        var output;
-        if (err) {
-            console.error("ERROR: can't read file: " + files[0]);
-            process.exit(1);
-        }
-        time_it("parse", function(){
-            var file = files[0] || argv.filename_for_stdin || '<stdin>';
-            try {
-                TOPLEVEL = parse_file(code, file, TOPLEVEL);
-            } catch (e) {
-                if (!(e instanceof RapydScript.SyntaxError)) throw e;
-                console.error(e.toString());
-                process.exit(1);
-            }
-        });
-
-        if (TOPLEVEL.imports && Object.keys(TOPLEVEL.imports).length) {
-            time_it("treeshake", function() {
-                RapydScript.tree_shake(TOPLEVEL, {
-                    parse: RapydScript.parse,
-                    import_dirs: utils.get_import_dirs(argv.import_path),
-                    basedir: (files[0] !== '<stdin>') ? path.dirname(files[0]) : undefined,
-                    libdir: path.join(src_path, 'lib'),
-                    discard_asserts: argv.discard_asserts,
-                    module_cache_dir: cache_dir,
-                });
-            });
-        }
-
-        try {
-            output = new RapydScript.OutputStream(OUTPUT_OPTIONS);
-        } catch(ex) {
-            if (ex instanceof RapydScript.DefaultsError) {
-                console.error(ex.message);
-                process.exit(1);
-            }
-            throw ex;
-        }
-
-        time_it("generate", function(){
-            TOPLEVEL.print(output);
-        });
-
-        output = output.get();
-
-        if (argv.export_main) {
-            output = output.replace(/^(function\smain)/gm, 'export $1')
-                .replace(/^(async\sfunction\smain)/gm, 'export $1');
-        }
-
-        write_output(output);
-
-        files = files.slice(1);
-        if (files.length) {
-            setImmediate(read_whole_file, files[0], compile_single_file);
-            return;
-        }
-        if (argv.stats) {
-            console.error(RapydScript.string_template("Timing information (compressed {count} files):", {
-                count: num_of_files
-            }));
-            for (var i in STATS) if (Object.prototype.hasOwnProperty.call(STATS, i)) {
-                console.error(RapydScript.string_template("- {name}: {time}s", {
-                    name: i,
-                    time: (STATS[i] / 1000).toFixed(3)
-                }));
-            }
-        }
-    }
-
-
-    if (argv.comments) {
-        if (/^\//.test(argv.comments)) {
-            OUTPUT_OPTIONS.comments = new Function("return(" + argv.comments + ")")();  // jshint ignore:line
-        } else if (argv.comments == "all") {
-            OUTPUT_OPTIONS.comments = true;
-        } else {
-            OUTPUT_OPTIONS.comments = function(node, comment) {
-                var text = comment.value;
-                var type = comment.type;
-                if (type == "comment2") {
-                    // multiline comment
-                    return /@preserve|@license|@cc_on/i.test(text);
-                }
-            };
-        }
-    }
-
-    if (!argv.omit_baselib) {
-        var which = (OUTPUT_OPTIONS.beautify) ? 'pretty' : 'ugly';
-        OUTPUT_OPTIONS.baselib_plain = fs.readFileSync(path.join(lib_path, 'baselib-plain-' + which + '.js'), 'utf-8');
-    }
-
-    if (files.filter(function(el){ return el == "-"; }).length > 1) {
-        console.error("ERROR: Can read a single file from STDIN (two or more dashes specified)");
-        process.exit(1);
-    }
-
-    setImmediate(read_whole_file, files[0], compile_single_file);
-
-};
-
+/*
+ * compile.js
+ * Copyright (C) 2015 Kovid Goyal <kovid at kovidgoyal.net>
+ *
+ * Distributed under terms of the BSD license.
+ */
+"use strict";  /*jshint node:true */
+
+var fs = require('fs');
+var path = require('path');
+var vm = require('vm');
+var RapydScript = require("./compiler").create_compiler();
+var utils = require('./utils');
+
+function read_whole_file(filename, cb) {
+    if (!filename) {
+        var chunks = [];
+        process.stdin.setEncoding('utf-8');
+        process.stdin.on('data', function (chunk) {
+            chunks.push(chunk);
+        }).on('end', function () {
+            cb(null, chunks.join(""));
+        });
+        process.openStdin();
+    } else {
+        fs.readFile(filename, "utf-8", cb);
+    }
+}
+
+function makedirs(dir) {
+    try {
+        fs.mkdirSync(dir);
+    } catch(e) {
+        if (e.code == 'EEXIST') return;
+        if (e.code == 'ENOENT') { makedirs(path.dirname(dir)); fs.mkdirSync(dir); }
+        throw e;
+    }
+}
+
+function process_cache_dir(dir) {
+    dir = path.resolve(path.normalize(dir));
+    makedirs(dir);
+    return dir;
+}
+
+function build_scoped_flags(flags_str) {
+    var result = Object.create(null);
+    if (!flags_str) return result;
+    flags_str.split(',').forEach(function(flag) {
+        flag = flag.trim();
+        if (!flag) return;
+        var val = true;
+        if (flag.slice(0, 3) === 'no_') { val = false; flag = flag.slice(3); }
+        result[flag] = val;
+    });
+    return result;
+}
+
+module.exports = function(start_time, argv, base_path, src_path, lib_path) {
+    // configure settings for the output
+    var cache_dir = argv.cache_dir ? process_cache_dir(argv.cache_dir) : '';
+    var OUTPUT_OPTIONS = {
+        beautify: !argv.uglify,
+        private_scope: !argv.bare && !argv.export_main,
+        omit_baselib: argv.omit_baselib,
+        js_version: parseInt(argv.js_version),
+        keep_docstrings: argv.keep_docstrings,
+        discard_asserts: argv.discard_asserts,
+        module_cache_dir: cache_dir,
+        pythonize_strings: argv.pythonize_strings,
+    };
+
+    var files = argv.files.slice();
+    var STATS = {}, TOPLEVEL;
+    var num_of_files = files.length || 1;
+
+    var global_scoped_flags = build_scoped_flags(argv.python_flags);
+
+    function parse_file(code, file, toplevel) {
+        return RapydScript.parse(code, {
+            filename: file,
+            toplevel: toplevel,
+            basedir: (file !== '<stdin>') ? path.dirname(file) : undefined,
+            libdir: path.join(src_path, 'lib'),
+            import_dirs: utils.get_import_dirs(argv.import_path),
+            discard_asserts: argv.discard_asserts,
+            module_cache_dir: cache_dir,
+            scoped_flags: global_scoped_flags,
+        });
+    }
+
+    function write_output(output) {
+        if (argv.output) {
+            // Node's filesystem module cannot write directly to /dev/stdout
+            if (argv.output == '/dev/stdout') console.log(output);
+            else if (argv.output == '/dev/stderr') console.error(output);
+            else fs.writeFileSync(argv.output, output, "utf8");
+        } else if (!argv.execute){
+            console.log(output);
+        }
+        if (argv.execute) {
+            vm.runInNewContext(output, {'console':console, 'require':require}, {'filename':files[0]});
+        }
+    }
+
+    function time_it(name, cont) {
+        var t1 = new Date().getTime();
+        var ret = cont();
+        if (argv.stats) {
+            var spent = new Date().getTime() - t1;
+            if (STATS[name]) STATS[name] += spent;
+            else STATS[name] = spent;
+        }
+        return ret;
+    }
+
+    function compile_single_file(err, code) {
+        var output;
+        if (err) {
+            console.error("ERROR: can't read file: " + files[0]);
+            process.exit(1);
+        }
+        time_it("parse", function(){
+            var file = files[0] || argv.filename_for_stdin || '<stdin>';
+            try {
+                TOPLEVEL = parse_file(code, file, TOPLEVEL);
+            } catch (e) {
+                if (!(e instanceof RapydScript.SyntaxError)) throw e;
+                console.error(e.toString());
+                process.exit(1);
+            }
+        });
+
+        if (TOPLEVEL.imports && Object.keys(TOPLEVEL.imports).length) {
+            time_it("treeshake", function() {
+                RapydScript.tree_shake(TOPLEVEL, {
+                    parse: RapydScript.parse,
+                    import_dirs: utils.get_import_dirs(argv.import_path),
+                    basedir: (files[0] !== '<stdin>') ? path.dirname(files[0]) : undefined,
+                    libdir: path.join(src_path, 'lib'),
+                    discard_asserts: argv.discard_asserts,
+                    module_cache_dir: cache_dir,
+                });
+            });
+        }
+
+        try {
+            output = new RapydScript.OutputStream(OUTPUT_OPTIONS);
+        } catch(ex) {
+            if (ex instanceof RapydScript.DefaultsError) {
+                console.error(ex.message);
+                process.exit(1);
+            }
+            throw ex;
+        }
+
+        time_it("generate", function(){
+            TOPLEVEL.print(output);
+        });
+
+        output = output.get();
+
+        if (argv.export_main) {
+            output = output.replace(/^(function\smain)/gm, 'export $1')
+                .replace(/^(async\sfunction\smain)/gm, 'export $1');
+        }
+
+        write_output(output);
+
+        files = files.slice(1);
+        if (files.length) {
+            setImmediate(read_whole_file, files[0], compile_single_file);
+            return;
+        }
+        if (argv.stats) {
+            console.error(RapydScript.string_template("Timing information (compressed {count} files):", {
+                count: num_of_files
+            }));
+            for (var i in STATS) if (Object.prototype.hasOwnProperty.call(STATS, i)) {
+                console.error(RapydScript.string_template("- {name}: {time}s", {
+                    name: i,
+                    time: (STATS[i] / 1000).toFixed(3)
+                }));
+            }
+        }
+    }
+
+
+    if (argv.comments) {
+        if (/^\//.test(argv.comments)) {
+            OUTPUT_OPTIONS.comments = new Function("return(" + argv.comments + ")")();  // jshint ignore:line
+        } else if (argv.comments == "all") {
+            OUTPUT_OPTIONS.comments = true;
+        } else {
+            OUTPUT_OPTIONS.comments = function(node, comment) {
+                var text = comment.value;
+                var type = comment.type;
+                if (type == "comment2") {
+                    // multiline comment
+                    return /@preserve|@license|@cc_on/i.test(text);
+                }
+            };
+        }
+    }
+
+    if (!argv.omit_baselib) {
+        var which = (OUTPUT_OPTIONS.beautify) ? 'pretty' : 'ugly';
+        OUTPUT_OPTIONS.baselib_plain = fs.readFileSync(path.join(lib_path, 'baselib-plain-' + which + '.js'), 'utf-8');
+    }
+
+    if (files.filter(function(el){ return el == "-"; }).length > 1) {
+        console.error("ERROR: Can read a single file from STDIN (two or more dashes specified)");
+        process.exit(1);
+    }
+
+    setImmediate(read_whole_file, files[0], compile_single_file);
+
+};
+

package/tools/compiler.js

@@ -13,7 +13,6 @@ var path = require("path");
 var fs = require("fs");
 var crypto = require('crypto');
 var vm = require("vm");
-var regenerator = require('regenerator');
 var UglifyJS = require("uglify-js");
 
 function sha1sum(data) { 
@@ -38,28 +37,6 @@ function uglify(code) {
 }
 
 
-function regenerate(code, beautify) {
-    var ans, start, end;
-    if (code) {
-        ans = regenerator.compile(code).code;
-        if (!beautify) {
-            ans = uglify(ans);
-        }
-    } else {
-        // Return the runtime
-        ans = regenerator.compile('', {includeRuntime:true}).code;
-        start = ans.indexOf('=') + 1;
-        end = ans.lastIndexOf('typeof');
-        end = ans.lastIndexOf('}(', end);
-        ans = ans.slice(start + 1, end);
-        if (!beautify) {
-            var extra = '})()';
-            ans = uglify(ans + extra).slice(0, extra.length);
-        }
-    }
-    return ans;
-}
-
 var _current_virtual_files = null;
 
 function virtual_readfile(name, encoding) {
@@ -90,7 +67,6 @@ function create_compiler() {
         writefile     : virtual_writefile,
         sha1sum       : sha1sum,
         require       : require,
-        regenerate    : regenerate,
         exports       : compiler_exports,
     });