rapydscript-ns 0.9.3 → 0.9.5

package/tools/test.js

@@ -1,118 +1,118 @@
-/*
- * test.js
- * Copyright (C) 2015 Kovid Goyal <kovid at kovidgoyal.net>
- *
- * Distributed under terms of the BSD license.
- */
-"use strict";  /*jshint node:true */
-var path = require('path');
-var fs = require('fs');
-var RapydScript = require('./compiler').create_compiler();
-var utils = require('./utils');
-var colored = utils.safe_colored;
-
-module.exports = function(argv, base_path, src_path, lib_path) {
-    // run all tests and exit
-    var assert = require("assert");
-    var os = require('os');
-    var failures = [];
-    var vm = require('vm');
-    var compiler_dir = path.join(base_path, 'dev');
-    if (!utils.path_exists(path.join(compiler_dir, 'compiler.js'))) compiler_dir = path.join(base_path, 'release');
-    var test_dir = path.join(base_path, 'test');
-	var baselib = fs.readFileSync(path.join(lib_path, 'baselib-plain-pretty.js'), 'utf-8');
-    var files;
-    var deep_eq = assert.deepEqual;
-    assert.deepEqual = function(a, b, message) {
-        // Compare array objects that have extra properties as simple arrays
-        if (Array.isArray(a) && Array.isArray(b)) {
-            if (a === b) return;
-            if (a.length !== b.length) throw new assert.AssertionError({actual:a, expected:b, operator:'deepEqual', stackStartFunction:assert.deepEqual});
-            for(var i=0; i < a.length; i++) assert.deepEqual(a[i], b[i], message);
-        } else if (a !== undefined && a !== null && typeof a.__eq__ === 'function') {
-            if (!a.__eq__(b)) throw new assert.AssertionError({actual:a, expected:b, operator:'deepEqual', stackStartFunction:assert.deepEqual});
-        } else return deep_eq(a, b, message);
-    };
-
-    if (argv.files.length) {
-        files = [];
-		argv.files.forEach(function(fname) { files.push(fname + '.pyj'); });
-	} else {
-        files = fs.readdirSync(test_dir).filter(function(name){
-            return /^[^_].*\.pyj$/.test(name);
-        });
-	}
-    files.forEach(function(file){
-        var ast;
-        var filepath = path.join(test_dir, file);
-        var failed = false;
-        try {
-            ast = RapydScript.parse(fs.readFileSync(filepath, "utf-8"), {
-                filename: file,
-                toplevel: ast,
-                basedir: test_dir,
-                libdir: path.join(src_path, 'lib'),
-            });
-            if (ast.imports && Object.keys(ast.imports).length) {
-                RapydScript.tree_shake(ast, {
-                    parse: RapydScript.parse,
-                    import_dirs: [],
-                    basedir: test_dir,
-                    libdir: path.join(src_path, 'lib'),
-                });
-            }
-        } catch(e) {
-            failures.push(file);
-            failed = true;
-            console.log(colored(file, 'red') + ': ' + e + "\n\n");
-            return;
-        }
-
-        var js_version = 5;
-        while (js_version < 7) {
-            // generate output
-            var output = new RapydScript.OutputStream({
-                baselib_plain: baselib,
-                beautify: true,
-                js_version: js_version,
-                keep_docstrings: true,
-            });
-            ast.print(output);
-
-            // test that output performs correct JS operations
-            var jsfile = path.join(os.tmpdir(), file + '-es' + js_version + '.js');
-            var code = output.toString();
-            try {
-                vm.runInNewContext(code, {
-                    'assrt':assert, 
-                    '__name__': jsfile,
-                    'require':require, 
-                    'fs':fs,
-                    'RapydScript':RapydScript, 
-                    'console':console,
-                    'compiler_dir': compiler_dir,
-                    'test_path':test_dir,
-                    'Buffer': Buffer,
-                }, {'filename':jsfile});
-            } catch (e) {
-                failures.push(file);
-                failed = true;
-                fs.writeFileSync(jsfile, code);
-                console.error('Failed running: ' + colored(jsfile, 'red'));
-                if (e.stack) 
-                    console.error(colored(file, 'red') + ":\n" + e.stack + "\n\n");
-                else 
-                    console.error(colored(file, 'red') + ": " + e + "\n\n");
-                js_version = 1000;
-            }
-            js_version++;
-        }
-		if (!failed) console.log(colored(file, 'green') + ": test completed successfully\n");
-        else { console.log(colored(file, 'red') + ":\ttest failed\n"); }
-    });
-    if (failures.length) {
-        console.log(colored('There were ' + failures.length + ' test failure(s):', 'red'));
-        console.log.apply(console, failures);
-    } else console.log(colored('All tests passed!', 'green'));
-    process.exit((failures.length) ? 1 : 0);
-};
+/*
+ * test.js
+ * Copyright (C) 2015 Kovid Goyal <kovid at kovidgoyal.net>
+ *
+ * Distributed under terms of the BSD license.
+ */
+"use strict";  /*jshint node:true */
+var path = require('path');
+var fs = require('fs');
+var RapydScript = require('./compiler').create_compiler();
+var utils = require('./utils');
+var colored = utils.safe_colored;
+
+module.exports = function(argv, base_path, src_path, lib_path) {
+    // run all tests and exit
+    var assert = require("assert");
+    var os = require('os');
+    var failures = [];
+    var vm = require('vm');
+    var compiler_dir = path.join(base_path, 'dev');
+    if (!utils.path_exists(path.join(compiler_dir, 'compiler.js'))) compiler_dir = path.join(base_path, 'release');
+    var test_dir = path.join(base_path, 'test');
+	var baselib = fs.readFileSync(path.join(lib_path, 'baselib-plain-pretty.js'), 'utf-8');
+    var files;
+    var deep_eq = assert.deepEqual;
+    assert.deepEqual = function(a, b, message) {
+        // Compare array objects that have extra properties as simple arrays
+        if (Array.isArray(a) && Array.isArray(b)) {
+            if (a === b) return;
+            if (a.length !== b.length) throw new assert.AssertionError({actual:a, expected:b, operator:'deepEqual', stackStartFunction:assert.deepEqual});
+            for(var i=0; i < a.length; i++) assert.deepEqual(a[i], b[i], message);
+        } else if (a !== undefined && a !== null && typeof a.__eq__ === 'function') {
+            if (!a.__eq__(b)) throw new assert.AssertionError({actual:a, expected:b, operator:'deepEqual', stackStartFunction:assert.deepEqual});
+        } else return deep_eq(a, b, message);
+    };
+
+    if (argv.files.length) {
+        files = [];
+		argv.files.forEach(function(fname) { files.push(fname + '.pyj'); });
+	} else {
+        files = fs.readdirSync(test_dir).filter(function(name){
+            return /^[^_].*\.pyj$/.test(name);
+        });
+	}
+    files.forEach(function(file){
+        var ast;
+        var filepath = path.join(test_dir, file);
+        var failed = false;
+        try {
+            ast = RapydScript.parse(fs.readFileSync(filepath, "utf-8"), {
+                filename: file,
+                toplevel: ast,
+                basedir: test_dir,
+                libdir: path.join(src_path, 'lib'),
+            });
+            if (ast.imports && Object.keys(ast.imports).length) {
+                RapydScript.tree_shake(ast, {
+                    parse: RapydScript.parse,
+                    import_dirs: [],
+                    basedir: test_dir,
+                    libdir: path.join(src_path, 'lib'),
+                });
+            }
+        } catch(e) {
+            failures.push(file);
+            failed = true;
+            console.log(colored(file, 'red') + ': ' + e + "\n\n");
+            return;
+        }
+
+        var js_version = 5;
+        while (js_version < 7) {
+            // generate output
+            var output = new RapydScript.OutputStream({
+                baselib_plain: baselib,
+                beautify: true,
+                js_version: js_version,
+                keep_docstrings: true,
+            });
+            ast.print(output);
+
+            // test that output performs correct JS operations
+            var jsfile = path.join(os.tmpdir(), file + '-es' + js_version + '.js');
+            var code = output.toString();
+            try {
+                vm.runInNewContext(code, {
+                    'assrt':assert, 
+                    '__name__': jsfile,
+                    'require':require, 
+                    'fs':fs,
+                    'RapydScript':RapydScript, 
+                    'console':console,
+                    'compiler_dir': compiler_dir,
+                    'test_path':test_dir,
+                    'Buffer': Buffer,
+                }, {'filename':jsfile});
+            } catch (e) {
+                failures.push(file);
+                failed = true;
+                fs.writeFileSync(jsfile, code);
+                console.error('Failed running: ' + colored(jsfile, 'red'));
+                if (e.stack) 
+                    console.error(colored(file, 'red') + ":\n" + e.stack + "\n\n");
+                else 
+                    console.error(colored(file, 'red') + ": " + e + "\n\n");
+                js_version = 1000;
+            }
+            js_version++;
+        }
+		if (!failed) console.log(colored(file, 'green') + ": test completed successfully\n");
+        else { console.log(colored(file, 'red') + ":\ttest failed\n"); }
+    });
+    if (failures.length) {
+        console.log(colored('There were ' + failures.length + ' test failure(s):', 'red'));
+        console.log.apply(console, failures);
+    } else console.log(colored('All tests passed!', 'green'));
+    process.exit((failures.length) ? 1 : 0);
+};

package/tools/utils.js

@@ -1,128 +1,141 @@
-/* vim:fileencoding=utf-8
- * 
- * Copyright (C) 2015 Kovid Goyal <kovid at kovidgoyal.net>
- *
- * Distributed under terms of the BSD license
- */
-"use strict";  /*jshint node:true */
-
-var comment_contents = /\/\*!?(?:\@preserve)?[ \t]*(?:\r\n|\n)([\s\S]*?)(?:\r\n|\n)[ \t]*\*\//;
-var colors = ['red', 'green', 'yellow', 'blue', 'magenta', 'cyan', 'white'];
-
-function ansi(code) {
-    code = code || 0;
-    return String.fromCharCode(27) + '[' + code + 'm';
-}
-
-function path_exists(path) {
-    var fs = require('fs');
-    try {
-        fs.statSync(path);
-        return true;
-    } catch(e) {
-        if (e.code != 'ENOENT') throw e;
-    }
-}
-
-function colored(string, color, bold) {
-    var prefix = [];
-    if (bold) prefix.push(ansi(1));
-    if (color) prefix.push(ansi(colors.indexOf(color) + 31));
-    return prefix.join('') + string + ansi(0);
-}
-
-function supports_color(stdout) {
-    stdout = stdout || process.stdout;
-	if (stdout && !stdout.isTTY) {
-		return false;
-	}
-
-	if (process.platform === 'win32') {
-		return false;
-	}
-
-	if ('COLORTERM' in process.env) {
-		return true;
-	}
-
-	if (process.env.TERM === 'dumb') {
-		return false;
-	}
-
-	if (/^screen|^xterm|^vt100|color|ansi|cygwin|linux/i.test(process.env.TERM)) {
-		return true;
-	}
-
-    return false;
-
-}
-
-function safe_colored(string) {
-    return string;
-}
-
-function repeat(str, num) {
-    return new Array( num + 1 ).join( str );
-}
-
-function generators_available() {
-    var gen;
-    try {
-        eval('gen = function *(){}'); // jshint ignore:line
-        return typeof gen === 'function' && gen.constructor.name == 'GeneratorFunction';
-    } catch(e) {
-        return false;
-    }
-}
-
-function wrap(lines, width) {
-	var ans = [];
-	var prev = '';
-	lines.forEach(function (line) {
-		line = prev + line;
-		prev = '';
-		if (line.length > width) {
-			prev = line.substr(width);
-            if (prev) prev += ' ';
-			line = line.substr(0, width - 1);
-			if (line.substr(line.length - 1 !== ' ')) line += '-';
-		} 
-		ans.push(line);
-	});
-	if (prev) ans = ans.concat(wrap([prev]));
-	return ans;
-}
-
-function merge() {
-    // Simple merge of properties from all objects
-    var ans = {};
-    Array.prototype.slice.call(arguments).forEach(function (arg) {
-        Object.keys(arg).forEach(function(key) {
-            ans[key] = arg[key];
-        });
-    });
-    return ans;
-}
-
-function get_import_dirs(paths_string, ignore_env) {
-    var path = require('path');
-    var paths = [];
-    function merge(new_path) {
-        if (paths.indexOf(new_path) == -1) paths.push(new_path);
-    }
-    if (!ignore_env && process && process.env && process.env.RAPYDSCRIPT_IMPORT_PATH) {
-        process.env.RAPYDSCRIPT_IMPORT_PATH.split(path.delimiter).forEach(merge);
-    }
-    if (paths_string) paths_string.split(path.delimiter).forEach(merge);
-    return paths;
-}
-
-exports.comment_contents = comment_contents;
-exports.repeat = repeat;
-exports.wrap = wrap;
-exports.merge = merge;
-exports.colored = colored;
-exports.safe_colored = (supports_color()) ? colored : safe_colored;
-exports.generators_available = generators_available;
-exports.get_import_dirs = get_import_dirs;
-exports.path_exists = path_exists;
+/* vim:fileencoding=utf-8
+ * 
+ * Copyright (C) 2015 Kovid Goyal <kovid at kovidgoyal.net>
+ *
+ * Distributed under terms of the BSD license
+ */
+"use strict";  /*jshint node:true */
+
+var comment_contents = /\/\*!?(?:\@preserve)?[ \t]*(?:\r\n|\n)([\s\S]*?)(?:\r\n|\n)[ \t]*\*\//;
+var colors = ['red', 'green', 'yellow', 'blue', 'magenta', 'cyan', 'white'];
+
+function ansi(code) {
+    code = code || 0;
+    return String.fromCharCode(27) + '[' + code + 'm';
+}
+
+function path_exists(path) {
+    var fs = require('fs');
+    try {
+        fs.statSync(path);
+        return true;
+    } catch(e) {
+        if (e.code != 'ENOENT') throw e;
+    }
+}
+
+function colored(string, color, bold) {
+    var prefix = [];
+    if (bold) prefix.push(ansi(1));
+    if (color) prefix.push(ansi(colors.indexOf(color) + 31));
+    return prefix.join('') + string + ansi(0);
+}
+
+function supports_color(stdout) {
+    stdout = stdout || process.stdout;
+
+	if (process.platform === 'win32') {
+		// MSYS2/MINGW/Git Bash/Cygwin: isTTY is unreliable, check TERM instead
+		if (/^screen|^xterm|^vt100|color|ansi|cygwin|linux/i.test(process.env.TERM)) {
+			return true;
+		}
+		// Modern Windows terminals (Windows Terminal, VS Code, etc.)
+		if ('WT_SESSION' in process.env || process.env.TERM_PROGRAM === 'vscode' || 'COLORTERM' in process.env) {
+			return true;
+		}
+		// ConEmu / cmder
+		if (process.env.ConEmuANSI === 'ON') {
+			return true;
+		}
+		return false;
+	}
+
+	if (stdout && !stdout.isTTY) {
+		return false;
+	}
+
+	if ('COLORTERM' in process.env) {
+		return true;
+	}
+
+	if (process.env.TERM === 'dumb') {
+		return false;
+	}
+
+	if (/^screen|^xterm|^vt100|color|ansi|cygwin|linux/i.test(process.env.TERM)) {
+		return true;
+	}
+
+    return false;
+
+}
+
+function safe_colored(string) {
+    return string;
+}
+
+function repeat(str, num) {
+    return new Array( num + 1 ).join( str );
+}
+
+function generators_available() {
+    var gen;
+    try {
+        eval('gen = function *(){}'); // jshint ignore:line
+        return typeof gen === 'function' && gen.constructor.name == 'GeneratorFunction';
+    } catch(e) {
+        return false;
+    }
+}
+
+function wrap(lines, width) {
+	var ans = [];
+	var prev = '';
+	lines.forEach(function (line) {
+		line = prev + line;
+		prev = '';
+		if (line.length > width) {
+			prev = line.substr(width);
+            if (prev) prev += ' ';
+			line = line.substr(0, width - 1);
+			if (line.substr(line.length - 1 !== ' ')) line += '-';
+		} 
+		ans.push(line);
+	});
+	if (prev) ans = ans.concat(wrap([prev]));
+	return ans;
+}
+
+function merge() {
+    // Simple merge of properties from all objects
+    var ans = {};
+    Array.prototype.slice.call(arguments).forEach(function (arg) {
+        Object.keys(arg).forEach(function(key) {
+            ans[key] = arg[key];
+        });
+    });
+    return ans;
+}
+
+function get_import_dirs(paths_string, ignore_env) {
+    var path = require('path');
+    var paths = [];
+    function merge(new_path) {
+        if (paths.indexOf(new_path) == -1) paths.push(new_path);
+    }
+    if (!ignore_env && process && process.env && process.env.RAPYDSCRIPT_IMPORT_PATH) {
+        process.env.RAPYDSCRIPT_IMPORT_PATH.split(path.delimiter).forEach(merge);
+    }
+    if (paths_string) paths_string.split(path.delimiter).forEach(merge);
+    return paths;
+}
+
+exports.comment_contents = comment_contents;
+exports.repeat = repeat;
+exports.wrap = wrap;
+exports.merge = merge;
+exports.colored = colored;
+exports.safe_colored = (supports_color()) ? colored : safe_colored;
+exports.generators_available = generators_available;
+exports.get_import_dirs = get_import_dirs;
+exports.path_exists = path_exists;