rapydscript-ng 0.8.3 → 0.8.4

package/src/utils.pyj

@@ -2,7 +2,8 @@
 # License: BSD Copyright: 2016, Kovid Goyal <kovid at kovidgoyal.net>
 from __python__ import hash_literals
 
-has_prop = Object.prototype.hasOwnProperty.call.bind(Object.prototype.hasOwnProperty)
+has_prop = Object.prototype.hasOwnProperty.call.bind(
+    Object.prototype.hasOwnProperty)
 
 
 def array_to_hash(a):
@@ -41,7 +42,11 @@ def repeat_string(str_, i):
 
 class DefaultsError(ValueError):
     def __init__(self, name, defs):
-        ValueError.__init__(self, name + ' is not a supported option. Supported options are: ' + str(Object.keys(defs)))
+        ValueError.__init__(
+            self,
+            name + ' is not a supported option. Supported options are: '
+            + str(Object.keys(defs))
+        )
 
 
 def defaults(args, defs, croak):
@@ -80,12 +85,18 @@ MAP = def ():
             if isinstance(val, AtTop):
                 val = val.v
                 if isinstance(val, Splice):
-                    top.push.apply(top, (val.v.slice().reverse() if backwards else val.v))
+                    top.push.apply(
+                        top,
+                        (val.v.slice().reverse() if backwards else val.v)
+                    )
                 else:
                     top.push(val)
             elif val is not skip:
                 if isinstance(val, Splice):
-                    ret.push.apply(ret, (val.v.slice().reverse() if backwards else val.v))
+                    ret.push.apply(
+                        ret,
+                        (val.v.slice().reverse() if backwards else val.v)
+                    )
                 else:
                     ret.push(val)
             return is_last
@@ -205,5 +216,8 @@ def make_predicate(words):
 def cache_file_name(src, cache_dir):
     if cache_dir:
         src = str.replace(src, '\\', '/')
-        return cache_dir + '/' + str.lstrip(str.replace(src, '/', '-') + '.bin', '-')
+        return cache_dir + '/' + str.lstrip(
+            str.replace(src, '/', '-') + '.bin',
+            '-'
+        )
     return src + '-cached'

package/test/functions.pyj

@@ -22,6 +22,14 @@ mul = None
 assrt.equal(add(1,2), 3)
 assrt.equal(sub(1,2), -1)
 assrt.equal(mul(2,2), 4)
+
+# newline as implicit comma separator in function calls
+assrt.equal(add(1
+2), 3)
+assrt.equal(sub(1
+2), -1)
+assrt.equal(add(list().length
+list().length), 0)
 # for some reason input to throws must be of type block, hence the 'def' wrapper
 assrt.throws(
     def():

package/test/generic.pyj

@@ -48,6 +48,15 @@ assrt.deepEqual((1,
 assrt.deepEqual((1,
                  2), [1, 2])
 
+# Tuples with newlines as implicit separators (no comma)
+assrt.deepEqual((1
+2), [1, 2])
+assrt.deepEqual((list()
+list()), [[], []])
+assrt.deepEqual((1
+2
+3), [1, 2, 3])
+
 # Conditional operators
 assrt.equal(1 if True else 2, 1)
 assrt.equal(1

package/test/lsp.pyj

@@ -50,6 +50,22 @@ async def test_diagnostics():
     assrt.ok(c['import-unresolved'], 'expected import-unresolved for nonexistent_module')
     fs.rmSync(tmp, {'recursive': True})
 
+async def test_globals_directive_suppresses_undef():
+    tmp = write_workspace()
+    ctx = make_ctx(tmp)
+    uri = uri_of(path.join(tmp, 'globals_test.pyj'))
+    # ext_func is declared via # globals: so it must not produce an undef diagnostic.
+    text = '# globals: ext_func\n\nresult = ext_func(42)\n'
+    diags = await lsp.compute_diagnostics(ctx, uri, text)
+    c = codes(diags)
+    assrt.ok(not c['undef'], 'ext_func declared in # globals: must not be flagged as undef')
+    # A name NOT in # globals: must still be flagged.
+    text2 = '# globals: ext_func\n\nresult = ext_func(42)\nbad = undeclared_thing()\n'
+    diags2 = await lsp.compute_diagnostics(ctx, uri, text2)
+    c2 = codes(diags2)
+    assrt.ok(c2['undef'], 'undeclared_thing not in # globals: must still be flagged as undef')
+    fs.rmSync(tmp, {'recursive': True})
+
 async def test_hover_and_definition():
     tmp = write_workspace()
     ctx = make_ctx(tmp)

package/tools/compiler.mjs

@@ -13,7 +13,6 @@ import path from 'path';
 import fs from 'fs';
 import crypto from 'crypto';
 import vm from 'vm';
-import * as terser from 'terser';
 import { fileURLToPath } from 'url';
 import { createRequire } from 'module';
 import { generate_source_map } from './sourcemap.mjs';
@@ -39,11 +38,6 @@ async function path_exists(p) {
     }
 }
 
-function uglify(code) {
-    var ans = terser.minify_sync(code);
-    if (ans.error) throw ans.error;
-    return ans.code;
-}
 
 
 async function find_compiler_dir() {

package/tools/fmt.mjs

@@ -848,13 +848,51 @@ function normalize_opts(options) {
 // check-only reporting
 // ---------------------------------------------------------------------------
 
+// Returns a Set of 0-based line indices that fall inside vr/v verbatim
+// triple-quoted blocks.  The formatter cannot reflow that content (it is
+// raw JS/text), so line-length violations inside those blocks are skipped.
+function verbatim_line_set(lines) {
+    var skip = new Set();
+    var in_block = false;
+    var close_q = null;
+    for (var i = 0; i < lines.length; i++) {
+        var line = lines[i];
+        if (!in_block) {
+            // Detect the opening of a verbatim triple-quoted block.
+            // Patterns: vr''', vr""", v''', v"""  (with any combination of
+            // v/r/u/f prefix letters, case-insensitive).
+            var m = /\b[vrufVRUF]*(?:'{3}|"{3})/.exec(line);
+            if (m) {
+                var q = m[0].slice(-3);   // ''' or """
+                var after = line.slice(m.index + m[0].length);
+                if (after.indexOf(q) < 0) {
+                    // Block does not close on the same line.
+                    in_block = true;
+                    close_q = q;
+                    skip.add(i);  // opening line itself may be long
+                }
+                // If it closes on the same line we leave skip alone —
+                // the single-line v'...' case is handled per-line below.
+            }
+        } else {
+            skip.add(i);
+            if (line.indexOf(close_q) >= 0) {
+                in_block = false;
+                close_q = null;
+            }
+        }
+    }
+    return skip;
+}
+
 export function check_report(file, src, formatted, options) {
     var opts = normalize_opts(options);
     var errs = [];
     if (formatted !== src.replace(/\r\n?/g, '\n')) errs.push(file + ': would be reformatted');
     var lines = formatted.split('\n');
+    var skip = verbatim_line_set(lines);
     for (var i = 0; i < lines.length; i++) {
-        if (lines[i].length > opts.line_length) {
+        if (!skip.has(i) && lines[i].length > opts.line_length) {
             errs.push(file + ':' + (i + 1) + ': line exceeds ' + opts.line_length + ' characters (' + lines[i].length + ')');
         }
     }
@@ -970,8 +1008,9 @@ export async function cli(argv, base_path, src_path, lib_path) {
                 console.log('reformatted ' + f);
             }
             var flines = formatted.split('\n');
+            var fskip = verbatim_line_set(flines);
             for (var li = 0; li < flines.length; li++) {
-                if (flines[li].length > opts.line_length) {
+                if (!fskip.has(li) && flines[li].length > opts.line_length) {
                     console.error(f + ':' + (li + 1) + ': line exceeds ' + opts.line_length + ' characters (' + flines[li].length + ')');
                     had_errors = true;
                 }

package/tools/lint-worker.mjs

@@ -8,7 +8,7 @@
  * instance so parsing can run on multiple CPU cores simultaneously.
  */
 
-import { parentPort } from 'worker_threads';
+import { parentPort, workerData } from 'worker_threads';
 import { create_compiler } from './compiler.mjs';
 import { read_config } from './ini.mjs';
 import * as utils from './utils.mjs';
@@ -18,6 +18,12 @@ import path from 'path';
 const merge = utils.merge;
 const has_prop = Object.prototype.hasOwnProperty.call.bind(Object.prototype.hasOwnProperty);
 
+// Restore embedded assets forwarded by the main thread (needed in compiled binaries
+// where workers don't inherit the main thread's globalThis).
+if (workerData && workerData.embedded) {
+    globalThis.__rapydscript_embedded__ = workerData.embedded;
+}
+
 // Initialize the compiler first — lint.mjs reads globalThis.create_rapydscript_compiler
 // at module evaluation time, so the global must be set before the dynamic import.
 const compiler = await create_compiler();

package/tools/lint.mjs

@@ -7,7 +7,6 @@
 
 import fs from 'fs';
 import path from 'path';
-import { fileURLToPath } from 'url';
 import { read_config } from './ini.mjs';
 import * as utils from './utils.mjs';
 
@@ -805,11 +804,19 @@ export async function cli(argv, base_path, src_path, lib_path) {
     // Workers own their own compiler instance so parsing runs in parallel across CPU cores.
     var WORKER_THRESHOLD = 4;
 
-    if (!has_stdin && all_files.length >= WORKER_THRESHOLD) {
+    // In compiled binaries lint.mjs is dynamically imported so Bun's static
+    // analysis never sees the new Worker() call.  build.ts pre-bundles
+    // lint-worker.mjs and embeds it via `with { type: 'file' }`, storing the
+    // virtual-FS path in __rapydscript_embedded__['lint-worker-url'].
+    // Fall back gracefully (single-threaded) if the URL isn't available.
+    var embedded = globalThis.__rapydscript_embedded__;
+    var worker_url = embedded
+        ? embedded['lint-worker-url']
+        : new URL('./lint-worker.mjs', import.meta.url);
+
+    if (!has_stdin && all_files.length >= WORKER_THRESHOLD && worker_url) {
         var { Worker } = await import('worker_threads');
         var os_mod = await import('os');
-
-        var worker_path = path.join(path.dirname(fileURLToPath(import.meta.url)), 'lint-worker.mjs');
         var num_workers = Math.min(os_mod.cpus().length, all_files.length, 8);
 
         // Dispatch files to workers dynamically so fast files don't leave workers idle.
@@ -836,7 +843,7 @@ export async function cli(argv, base_path, src_path, lib_path) {
         // waiting for all workers before starting any work.
         var worker_promises = Array.from({length: num_workers}, function() {
             return new Promise(function(resolve) {
-                var w = new Worker(worker_path);
+                var w = new Worker(worker_url, { workerData: { embedded: embedded || null } });
                 w.once('message', function(m) {
                     if (m.type !== 'ready') return;
                     w.on('message', function(msg) {

package/tools/lsp.mjs

@@ -230,7 +230,7 @@ export async function compute_diagnostics(ctx, uri, raw_text) {
     // 2. Linter diagnostics -- only when the file parsed cleanly, so we do not
     //    emit misleading undefined/unused warnings from a partial AST.
     if (a.toplevel && (!a.recovered_errors || a.recovered_errors.length === 0)) {
-        var builtins = utils.merge(BUILTINS);
+        var builtins = utils.merge(BUILTINS, file_globals(a.text));
         var messages = lint_parsed(a.toplevel, a.text, { filename: a.file_path, builtins: builtins, noqa: file_noqa(a.text) });
         messages.forEach(function (m) {
             out.push(lint_message_to_diagnostic(doc, m));
@@ -265,6 +265,16 @@ function file_noqa(code) {
     return noqa;
 }
 
+// Parse `# globals: a,b` file-level directives from the first lines (mirrors lint cli).
+function file_globals(code) {
+    var globals = Object.create(null);
+    code.split('\n', 20).forEach(function (line) {
+        var lq = line.replace(/\s+/g, '');
+        if (lq.slice(0, 9).toLowerCase() === '#globals:') (lq.split(':', 2)[1] || '').split(',').forEach(function (x) { if (x) globals[x] = true; });
+    });
+    return globals;
+}
+
 function lint_message_to_diagnostic(doc, m) {
     var start_line = (m.start_line || 1) - 1;
     var start_col = (m.start_col === undefined || m.start_col === null) ? 0 : m.start_col;