rapydscript-ns 0.8.2 → 0.8.3

package/test/unit/web-repl.js

@@ -445,6 +445,140 @@ var TESTS = [
         },
     },
 
+    {
+        name: "nested_class_web_repl",
+        description: "Nested class definitions compile and run correctly via the web-repl bundle",
+        run: function () {
+            var repl = RS.web_repl();
+            var js = bundle_compile(repl, [
+                "class Outer:",
+                "    class Inner:",
+                "        def __init__(self, val):",
+                "            self.val = val",
+                "    def __init__(self, v):",
+                "        self.inner = Outer.Inner(v)",
+                "o = Outer(99)",
+                "assrt.equal(o.inner.val, 99)",
+                "assrt.ok(isinstance(o.inner, Outer.Inner))",
+                "assrt.ok(o.Inner is Outer.Inner)",
+            ].join("\n"));
+            run_js(js);
+        },
+    },
+
+    // ── slice() builtin ───────────────────────────────────────────────────
+
+    {
+        name: "bundle_slice_constructor",
+        description: "slice() constructor stores start/stop/step attributes correctly",
+        run: function () {
+            var repl = RS.web_repl();
+            var js = bundle_compile(repl, [
+                "s1 = slice(5)",
+                "assrt.equal(s1.start, None)",
+                "assrt.equal(s1.stop, 5)",
+                "assrt.equal(s1.step, None)",
+                "s2 = slice(2, 8)",
+                "assrt.equal(s2.start, 2)",
+                "assrt.equal(s2.stop, 8)",
+                "assrt.equal(s2.step, None)",
+                "s3 = slice(1, 9, 2)",
+                "assrt.equal(s3.start, 1)",
+                "assrt.equal(s3.stop, 9)",
+                "assrt.equal(s3.step, 2)",
+            ].join("\n"));
+            run_js(js);
+        },
+    },
+
+    {
+        name: "bundle_slice_subscript",
+        description: "slice object used as list subscript returns the correct sub-list",
+        run: function () {
+            var repl = RS.web_repl();
+            var js = bundle_compile(repl, [
+                "from __python__ import overload_getitem",
+                "lst = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]",
+                "s = slice(2, 5)",
+                "assrt.deepEqual(lst[s], [2, 3, 4])",
+                "assrt.deepEqual(lst[slice(0, 6, 2)], [0, 2, 4])",
+                "assrt.deepEqual(lst[slice(5, 1, -1)], [5, 4, 3, 2])",
+            ].join("\n"));
+            run_js(js);
+        },
+    },
+
+    {
+        name: "bundle_slice_indices",
+        description: "slice.indices() returns normalised (start, stop, step) tuple",
+        run: function () {
+            var repl = RS.web_repl();
+            var js = bundle_compile(repl, [
+                "s = slice(2, 8)",
+                "idx = s.indices(10)",
+                "assrt.equal(idx[0], 2)",
+                "assrt.equal(idx[1], 8)",
+                "assrt.equal(idx[2], 1)",
+                "# negative indices normalised",
+                "s2 = slice(-3, -1)",
+                "idx2 = s2.indices(10)",
+                "assrt.equal(idx2[0], 7)",
+                "assrt.equal(idx2[1], 9)",
+            ].join("\n"));
+            run_js(js);
+        },
+    },
+
+    {
+        name: "bundle_slice_repr",
+        description: "str(slice(...)) produces the Python-style repr",
+        run: function () {
+            var repl = RS.web_repl();
+            var js = bundle_compile(repl, [
+                "assrt.equal(str(slice(1, 5, None)), 'slice(1, 5, None)')",
+                "assrt.equal(str(slice(None, 5, 2)), 'slice(None, 5, 2)')",
+            ].join("\n"));
+            run_js(js);
+        },
+    },
+
+    {
+        name: "bundle_slice_isinstance",
+        description: "isinstance(slice(...), slice) returns True in bundled baselib",
+        run: function () {
+            var repl = RS.web_repl();
+            var js = bundle_compile(repl, [
+                "s = slice(1, 5)",
+                "assrt.ok(isinstance(s, slice))",
+            ].join("\n"));
+            run_js(js);
+        },
+    },
+
+    {
+        name: "bundle_list_concatenation",
+        description: "list + list returns a concatenated list in the bundled baselib",
+        run: function () {
+            var repl = RS.web_repl();
+            var js = bundle_compile(repl, [
+                "a = [1, 2]",
+                "b = [3, 4]",
+                "c = a + b",
+                "assrt.deepEqual(c, [1, 2, 3, 4])",
+                "assrt.deepEqual(a, [1, 2])",
+                "assrt.deepEqual(b, [3, 4])",
+                "# iadd extends in-place",
+                "a += [5]",
+                "assrt.deepEqual(a, [1, 2, 5])",
+                "# numbers still work",
+                "assrt.equal(1 + 2, 3)",
+                "# strings still work",
+                "assrt.equal('foo' + 'bar', 'foobar')",
+            ].join("\n"));
+            run_js(js);
+        },
+    },
+
 ];
 
 // ---------------------------------------------------------------------------

package/tools/build-language-service.js

@@ -14,7 +14,7 @@ var path = require("path");
 
 var SRC_DIR     = path.join(__dirname, "..", "src", "monaco-language-service");
 var COMPILER_JS = path.join(__dirname, "..", "web-repl", "rapydscript.js");
-var DEFAULT_OUT = path.join(__dirname, "..", "web-repl", "language-service.js");
+var DEFAULT_OUT = path.join(__dirname, "..", "language-service", "index.js");
 
 // Parse --out flag
 var out_path = DEFAULT_OUT;
@@ -124,7 +124,7 @@ var chunks = [
     "// language-service.js — RapydScript Monaco Language Service",
     "// Auto-generated by tools/build-language-service.js — do not edit directly.",
     "// Source: src/monaco-language-service/  +  web-repl/rapydscript.js (embedded)",
-    "// Usage:  import { registerRapydScript } from './language-service.js';",
+    "// Usage:  import { registerRapydScript } from 'rapydscript-ns/language-service';",
     "//         No external compiler bundle needed — the compiler is bundled inside.",
     "",
     compiler_chunk,

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,
     });
 

package/tools/export.js

@@ -145,7 +145,7 @@ function vrequire(name, base) {
     return load(modpath);
 }
 
-var UglifyJS = null, regenerator = null;
+var UglifyJS = null;
 var crypto = null, fs = require('fs');
 
 var current_virtual_files = null;
@@ -176,40 +176,6 @@ function uglify(x) {
     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) { 
         if (!crypto) crypto = require('crypto');
@@ -222,8 +188,8 @@ if (typeof this != 'object' || typeof this.sha1sum !== 'function') {
 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, readfile_wrapper, writefile_wrapper, sha1sum, regenerate);
+    var wrapped = '(function(module, exports, readfile, writefile, sha1sum) {' + data['compiler.js'] + ';\n})';
+    vm.runInThisContext(wrapped, {'filename': 'compiler.js'})(module, module.exports, readfile_wrapper, writefile_wrapper, sha1sum);
     return module.exports;
 }