rapydscript-ng 0.7.23 → 0.8.0

package/tools/export.js

@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (C) 2015 Kovid Goyal <kovid at kovidgoyal.net>
  *
  * Distributed under terms of the BSD license
@@ -58,6 +58,70 @@ function basename(path) {
     return path;
 }
 
+function esm_to_cjs(content) {
+    var pending_exports = [];
+
+    // import X from 'Y'
+    content = content.replace(/^import\s+(\w+)\s+from\s+(['"][^'"]*['"]);?\s*$/mg,
+        'var $1 = require($2);');
+
+    // import { A, B } from 'Y'
+    content = content.replace(/^import\s+\{([^}]*)\}\s+from\s+(['"][^'"]*['"]);?\s*$/mg,
+        function(_, names, src) { return 'var {' + names + '} = require(' + src + ');'; });
+
+    // import * as X from 'Y'
+    content = content.replace(/^import\s+\*\s+as\s+(\w+)\s+from\s+(['"][^'"]*['"]);?\s*$/mg,
+        'var $1 = require($2);');
+
+    // import 'Y' (side-effect only)
+    content = content.replace(/^import\s+(['"][^'"]*['"]);?\s*$/mg, 'require($1);');
+
+    // export default function/class name (named - add to exports at end)
+    content = content.replace(/^export\s+default\s+(function|class)\s+(\w+)/mg,
+        function(_, kw, name) { pending_exports.push(['default', name]); return kw + ' ' + name; });
+
+    // export default function/class (anonymous)
+    content = content.replace(/^export\s+default\s+((?:async\s+)?function\b|class\b)/mg,
+        'module.exports = $1');
+
+    // export default <expression>
+    content = content.replace(/^export\s+default\s+/mg, 'module.exports = ');
+
+    // export async function X / export function X
+    content = content.replace(/^export\s+(async\s+)?function\s+(\w+)/mg,
+        function(_, async_, name) { pending_exports.push(name); return (async_ || '') + 'function ' + name; });
+
+    // export class X
+    content = content.replace(/^export\s+class\s+(\w+)/mg,
+        function(_, name) { pending_exports.push(name); return 'class ' + name; });
+
+    // export var/let/const X
+    content = content.replace(/^export\s+(var|let|const)\s+(\w+)/mg,
+        function(_, kw, name) { pending_exports.push(name); return kw + ' ' + name; });
+
+    // export { A, B as C }
+    content = content.replace(/^export\s+\{([^}]+)\}\s*;?\s*$/mg,
+        function(_, names) {
+            names.split(',').forEach(function(spec) {
+                spec = spec.trim();
+                if (!spec) return;
+                var m = spec.match(/^(\w+)\s+as\s+(\w+)$/);
+                if (m) pending_exports.push([m[2], m[1]]);
+                else pending_exports.push(spec);
+            });
+            return '';
+        });
+
+    if (pending_exports.length) {
+        content += '\n';
+        pending_exports.forEach(function(spec) {
+            content += '\nexports.' + (Array.isArray(spec) ? spec[0] + ' = ' + spec[1] : spec + ' = ' + spec) + ';';
+        });
+    }
+
+    return content;
+}
+
 var cache = {};
 
 function load(filepath) {
@@ -71,6 +135,7 @@ function load(filepath) {
     if (!content) throw 'Failed to load: ' + JSON.stringify(filepath);
 
     if (filepath.slice(-5) == '.json') { module.exports = JSON.parse(content); return module.exports; }
+    if (filepath.slice(-4) == '.mjs') content = esm_to_cjs(content);
 
     var base = dirname(filepath);
     function mrequire(x) {
@@ -94,6 +159,7 @@ function has(x, y) { return Object.prototype.hasOwnProperty.call(x, y); }
 function try_files(candidate) {
     if (has(data, candidate)) return candidate;
     if (has(data, candidate + '.js')) return candidate + '.js';
+    if (has(data, candidate + '.mjs')) return candidate + '.mjs';
     if (has(data, candidate + '.json')) return candidate + '.json';
     return null;
 }
@@ -145,52 +211,18 @@ function vrequire(name, base) {
     return load(modpath);
 }
 
-var UglifyJS = null, regenerator = null;
+var Terser = null;
 var crypto = null, fs = require('fs');
 
 function uglify(x) {
-    if (!UglifyJS) UglifyJS = vrequire("uglify-js");
-    ans = UglifyJS.minify(x);
+    if (!Terser) Terser = vrequire("terser");
+    var ans = Terser.minify_sync(x);
     if (ans.error) throw ans.error;
     return ans.code;
 }
 
-function regenerate(code, beautify) {
-    var orig = fs.readFileSync;
-    fs.readFileSync = function(name) { 
-        if (!has(data, name)) {
-            throw {message: "Failed to readfile from data: " + name};
-        }
-        return data[name]; 
-    };
-    if (!regenerator) regenerator = vrequire('regenerator');
-    var ans;
-    if (code) {
-        try {
-            ans = regenerator.compile(code).code;
-        } catch (e) {
-            console.error('regenerator failed for code: ' + code + 'with error stack:\n' + e.stack);
-            throw e;
-        }
-        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);
-        }
-    }
-    fs.readFileSync = orig;
-    return ans;
-}
-
 if (typeof this != 'object' || typeof this.sha1sum !== 'function') {
-    var sha1sum = function (data) { 
+    var sha1sum = function (data) {
         if (!crypto) crypto = require('crypto');
         var h = crypto.createHash('sha1');
         h.update(data);
@@ -199,19 +231,38 @@ if (typeof this != 'object' || typeof this.sha1sum !== 'function') {
 } else var sha1sum = this.sha1sum;
 
 function create_compiler() {
-    var compilerjs = data['compiler.js'];
     var module = {'id':'compiler', 'exports':{}};
-    var wrapped = '(function(module, exports, readfile, writefile, sha1sum, regenerate) {' + data['compiler.js'] + ';\n})';
-    vm.runInThisContext(wrapped, {'filename': 'compiler.js'})(module, module.exports, fs.readFileSync, fs.writeFileSync, sha1sum, regenerate);
+    // _sh (serializer holder) is populated after the compiler loads, solving the
+    // chicken-and-egg: ast_to_json needs compiler_exports, which aren't ready yet.
+    var _sh = {};
+    var wrapped = '(function(module, exports, readfile, writefile, stat_file, sha1sum, _sh) {' +
+        'var ast_to_json = function(r) { return _sh.ast_to_json(r); };' +
+        'var ast_from_json = function(d) { return _sh.ast_from_json(d); };' +
+        'var make_lazy_ast_module = function(a, b) { return _sh.make_lazy_ast_module(a, b); };' +
+        'var encode_cache = function(m, r) { return _sh.encode_cache(m, r); };' +
+        'var decode_cache = function(d) { return _sh.decode_cache(d); };' +
+        data['compiler.js'] + ';\n})';
+    vm.runInThisContext(wrapped, {'filename': 'compiler.js'})(module, module.exports, readfile, writefile, stat_file, sha1sum, _sh);
+    var s = vrequire('tools/ast_serialize.mjs').make_ast_serializer(module.exports);
+    _sh.ast_to_json = s.ast_to_json;
+    _sh.ast_from_json = s.ast_from_json;
+    _sh.make_lazy_ast_module = s.make_lazy_ast_module;
+    _sh.encode_cache = s.encode_cache;
+    _sh.decode_cache = s.decode_cache;
+    module.exports.ast_to_json = s.ast_to_json;
+    module.exports.ast_from_json = s.ast_from_json;
+    module.exports.make_lazy_ast_module = s.make_lazy_ast_module;
+    module.exports.encode_cache = s.encode_cache;
+    module.exports.decode_cache = s.decode_cache;
     return module.exports;
 }
 
 var RapydScript = null;
 
-function compile(code, filename, options) {
+async function compile(code, filename, options) {
     if (!RapydScript) RapydScript = create_compiler();
     options = options || {};
-    var ast = RapydScript.parse(code, {
+    var ast = await RapydScript.parse(code, {
         filename: filename || '<eval>',
         basedir: options.basedir || dirname(filename || ''),
         libdir: options.libdir,
@@ -220,7 +271,7 @@ function compile(code, filename, options) {
         beautify: (options.beautify === undefined ? true : options.beautify),
         private_scope: !options.bare,
         omit_baselib: !!options.omit_baselib,
-        js_version: options.js_version || 5,
+        js_version: options.js_version || 6,
     };
     if (!out_ops.omit_baselib) out_ops.baselib_plain = data['baselib-plain-' + (out_ops.beautify ? 'pretty' : 'ugly') + '.js'];
     var out = new RapydScript.OutputStream(out_ops);
@@ -228,39 +279,41 @@ function compile(code, filename, options) {
     return out.get();
 }
 
-function create_embedded_compiler(runjs) {
-    var c = vrequire('tools/embedded_compiler.js');
-    return c(create_compiler(), data['baselib-plain-pretty.js'], runjs);
+async function create_embedded_compiler(runjs) {
+    var c = vrequire('tools/embedded_compiler');
+    var ts = vrequire('tools/treeshake');
+    var sm = vrequire('tools/sourcemap');
+    return await c(create_compiler(), data['baselib-plain-pretty.js'], runjs, undefined, ts, sm.generate_source_map);
 }
 
-function web_repl() {
-    var repl = vrequire('tools/web_repl.js');
-    return repl(create_compiler(), data['baselib-plain-pretty.js']);
+async function web_repl() {
+    var repl = vrequire('tools/web_repl');
+    return await repl(create_compiler(), data['baselib-plain-pretty.js']);
 }
 
 function init_repl(options) {
-    var repl = vrequire('tools/repl.js');
+    var repl = vrequire('tools/repl');
     options.baselib = data['baselib-plain-pretty.js'];
     return repl(options);
 }
 
 function gettext_parse(catalog, code, filename) {
-    g = vrequire('tools/gettext.js');
+    g = vrequire('tools/gettext');
     g.gettext(catalog, code, filename);
 }
 
 function gettext_output(catalog, options, write) {
-    g = vrequire('tools/gettext.js');
+    g = vrequire('tools/gettext');
     g.write_output(catalog, options, write);
 }
 
 function msgfmt(data, options) {
-    m = vrequire('tools/msgfmt.js');
+    m = vrequire('tools/msgfmt');
     return m.build(data, options);
 }
 
 function completer(compiler, options) {
-    m = vrequire('tools/completer.js');
+    m = vrequire('tools/completer');
     return m(compiler, options);
 }