rapydscript-ns 0.8.2 → 0.8.4

package/src/monaco-language-service/index.js

@@ -36,6 +36,13 @@ class ModelState {
         this._timer    = null;
         this._scopeMap = null;  // most recent ScopeMap for this model
 
+        // Derive the module name from the model URI so this model's content can
+        // be registered in _virtualFiles for cross-file import resolution.
+        // e.g. URI path "/scripts/utils.py" → module name "utils"
+        const uri_path = (model.uri && (model.uri.path || model.uri.fsPath)) || '';
+        const basename = uri_path.split('/').pop() || '';
+        this._module_name = basename.replace(/\.pyj?x?$/, '') || null;
+
         // Run immediately on first attach
         this._schedule(0);
 
@@ -55,6 +62,12 @@ class ModelState {
         const code    = this._model.getValue();
         const opts    = { virtualFiles: service._virtualFiles, stdlibFiles: service._stdlibFiles };
 
+        // Register this model's content in the shared virtualFiles pool so other
+        // open models can resolve cross-file imports from it.
+        if (this._module_name) {
+            service._virtualFiles[this._module_name] = code;
+        }
+
         // Diagnostics (syntax errors + lint markers)
         const markers = service._diagnostics.check(code, {
             ...opts,
@@ -69,6 +82,10 @@ class ModelState {
     dispose() {
         clearTimeout(this._timer);
         this._subscription.dispose();
+        // Remove this model's content from the virtualFiles pool on detach.
+        if (this._module_name) {
+            delete this._service._virtualFiles[this._module_name];
+        }
         // Clear markers when detaching
         this._service._monaco.editor.setModelMarkers(this._model, LANGUAGE_ID, []);
     }

package/src/monaco-language-service/scope.js

@@ -30,6 +30,9 @@ export class SymbolInfo {
         this.inferred_class = opts.inferred_class || null;  // 'ClassName' when x = ClassName(...)
         this.dts_call_path  = opts.dts_call_path  || null;  // 'ns.getServer' when x = ns.getServer(...)
         this.type           = null;              // Phase 6: TypeInfo
+        this.return_type    = opts.return_type   || null;  // annotated return type, e.g. 'list', 'str', 'MyClass'
+        this.source_module  = opts.source_module || null;  // module name when kind='import' (from X import Y)
+        this.original_name  = opts.original_name || null;  // pre-alias name for imports (from X import Y as Z → 'Y')
     }
 }
 

package/src/output/classes.pyj

@@ -82,19 +82,75 @@ def print_class(output):
         output.with_block(def():
             output.indent()
             cname = self.name.name
-            output.print('if (!(this instanceof ' + cname + ')) return new ' + cname + '(...arguments);')
-            output.newline()
+            if self.has_new:
+                # When __new__ is defined, call it to get the instance
+                output.print('if (!(this instanceof ' + cname + '))')
+                output.space()
+                output.with_block(def():
+                    output.indent()
+                    output.print('var ρσ_instance = ')
+                    self.name.print(output)
+                    output.print('.__new__(')
+                    self.name.print(output)
+                    output.print(', ...arguments)')
+                    output.end_statement()
+                    output.indent()
+                    output.print('if (ρσ_instance instanceof ')
+                    self.name.print(output)
+                    output.print(')')
+                    output.space()
+                    output.with_block(def():
+                        output.indent()
+                        output.spaced('if', '(ρσ_instance.ρσ_object_id', '===', 'undefined)', 'Object.defineProperty(ρσ_instance,', '"ρσ_object_id",', '{"value":++ρσ_object_counter})')
+                        output.end_statement()
+                        if self.bound.length:
+                            output.indent()
+                            self.name.print(output), output.print('.prototype.__bind_methods__ && ')
+                            self.name.print(output), output.print('.prototype.__bind_methods__.call(ρσ_instance)')
+                            output.end_statement()
+                        output.indent()
+                        self.name.print(output)
+                        output.print('.prototype.__init__.apply(ρσ_instance'), output.comma(), output.print('arguments)')
+                        output.end_statement()
+                    )
+                    output.newline()
+                    output.indent()
+                    output.print('return ρσ_instance')
+                    output.end_statement()
+                )
+                output.newline()
+            else:
+                output.print('if (!(this instanceof ' + cname + ')) return new ' + cname + '(...arguments);')
+                output.newline()
             output.indent()
             output.spaced('if', '(this.ρσ_object_id', '===', 'undefined)', 'Object.defineProperty(this,', '"ρσ_object_id",', '{"value":++ρσ_object_counter})')
             output.end_statement()
-            if self.bound.length:
+            if self.has_attr_dunders:
+                # Wrap in a Proxy so __getattr__/__setattr__/__delattr__/__getattribute__ are triggered.
                 output.indent()
-                self.name.print(output), output.print(".prototype.__bind_methods__.call(this)")
+                output.print('var ρσ_proxy = ρσ_JS_Proxy ? new ρσ_JS_Proxy(this, ρσ_attr_proxy_handler) : this')
+                output.end_statement()
+                if self.bound.length:
+                    output.indent()
+                    self.name.print(output), output.print(".prototype.__bind_methods__ && ")
+                    self.name.print(output), output.print(".prototype.__bind_methods__.call(ρσ_proxy)")
+                    output.end_statement()
+                output.indent()
+                self.name.print(output)
+                output.print(".prototype.__init__.apply(ρσ_proxy"), output.comma(), output.print('arguments)')
+                output.end_statement()
+                output.indent()
+                output.print('return ρσ_proxy')
+                output.end_statement()
+            else:
+                if self.bound.length:
+                    output.indent()
+                    self.name.print(output), output.print(".prototype.__bind_methods__.call(this)")
+                    output.end_statement()
+                output.indent()
+                self.name.print(output)
+                output.print(".prototype.__init__.apply(this"), output.comma(), output.print('arguments)')
                 output.end_statement()
-            output.indent()
-            self.name.print(output)
-            output.print(".prototype.__init__.apply(this"), output.comma(), output.print('arguments)')
-            output.end_statement()
         )
 
     decorators = self.decorators or v'[]'
@@ -214,7 +270,7 @@ def print_class(output):
                 output.end_statement()
 
         elif is_node_type(stmt, AST_Class):
-            console.error('Nested classes aren\'t supported yet')  # noqa:undef
+            pass  # nested classes are emitted in the statements section below
 
     if not defined_methods['__repr__']:
         define_default_method('__repr__', def():
@@ -235,6 +291,13 @@ def print_class(output):
             output.end_statement()
         )
 
+    # Python semantics: defining __eq__ without __hash__ makes the class unhashable
+    if defined_methods['__eq__'] and not defined_methods['__hash__']:
+        output.indent()
+        self.name.print(output)
+        output.print('.prototype.__hash__ = null')
+        output.end_statement()
+
     # Multiple inheritance
     add_hidden_property('__bases__', def():
         output.print('[')
@@ -256,6 +319,43 @@ def print_class(output):
     output.print('.prototype, "__class__", {get: function() { return this.constructor; }, configurable: true})')
     output.end_statement()
 
+    # __init_subclass__ hook: call after identity properties so cls.__name__ is correct
+    if self.parent:
+        output.indent()
+        output.print('if (typeof ')
+        self.parent.print(output)
+        output.print('.__init_subclass__ === "function")')
+        output.space()
+        kws = self.class_kwargs
+        if kws and kws.length:
+            output.with_block(def():
+                output.indent()
+                output.print('var ρσ_isc_kw = {')
+                for v'var ρσ_kwi = 0; ρσ_kwi < kws.length; ρσ_kwi++':
+                    if ρσ_kwi > 0:
+                        output.comma()
+                    output.print(kws[ρσ_kwi][0].name + ':')
+                    output.space()
+                    kws[ρσ_kwi][1].print(output)
+                output.print('}')
+                output.end_statement()
+                output.indent()
+                output.print('ρσ_isc_kw[ρσ_kwargs_symbol] = true')
+                output.end_statement()
+                output.indent()
+                self.parent.print(output)
+                output.print('.__init_subclass__.call(')
+                self.name.print(output)
+                output.print(', ρσ_isc_kw)')
+                output.end_statement()
+            )
+        else:
+            self.parent.print(output)
+            output.print('.__init_subclass__.call(')
+            self.name.print(output)
+            output.print(')')
+            output.end_statement()
+
     if self.bases.length > 1:
         output.indent()
         output.print("ρσ_mixin(")
@@ -271,9 +371,26 @@ def print_class(output):
             output.print(JSON.stringify(create_doctring(self.docstrings)))
         )
 
-    # Other statements in the class context
+    # Other statements in the class context (including nested class definitions)
     for stmt in self.statements:
-        if not is_node_type(stmt, AST_Method):
+        if is_node_type(stmt, AST_Class):
+            # Print the nested class in full, then attach it to the outer class.
+            # Two assignments mirror Python semantics:
+            #   Outer.Inner        — class-level access (Outer.Inner())
+            #   Outer.prototype.Inner — instance-level access (self.Inner() inside methods)
+            output.indent()
+            stmt.print(output)
+            output.newline()
+            nested_name = stmt.name.name
+            output.indent()
+            self.name.print(output)
+            output.print('.' + nested_name + ' = ' + nested_name)
+            output.end_statement()
+            output.indent()
+            self.name.print(output)
+            output.print('.prototype.' + nested_name + ' = ' + nested_name)
+            output.end_statement()
+        elif not is_node_type(stmt, AST_Method):
             output.indent()
             stmt.print(output)
             output.newline()

package/src/output/codegen.pyj

@@ -2,7 +2,7 @@
 # License: BSD Copyright: 2016, Kovid Goyal <kovid at kovidgoyal.net>
 from __python__ import hash_literals
 
-# globals:console,regenerate,writefile
+# globals:console,writefile
 
 from utils import noop
 from parse import PRECEDENCE
@@ -13,13 +13,14 @@ from ast import (
     AST_EmptyStatement, AST_Exit, AST_ExpressiveObject, AST_ForIn,
     AST_ForJS, AST_Function, AST_Hole, AST_If, AST_Imports, AST_Infinity,
     AST_Lambda, AST_ListComprehension, AST_LoopControl, AST_NaN, AST_NamedExpr, AST_New, AST_Node,
-    AST_Number, AST_Object, AST_ObjectKeyVal, AST_ObjectProperty, AST_ObjectSpread, AST_PropAccess,
+    AST_Number, AST_Object, AST_ObjectKeyVal, AST_ObjectProperty, AST_ObjectSpread, AST_Spread, AST_PropAccess,
     AST_RegExp, AST_Return, AST_Set, AST_Seq, AST_SimpleStatement, AST_Splice,
     AST_Statement, AST_StatementWithBody, AST_String, AST_Sub, AST_ItemAccess,
     AST_Symbol, AST_This, AST_Throw, AST_Toplevel, AST_Try, AST_Unary,
     AST_UnaryPrefix, AST_Undefined, AST_Var, AST_VarDef, AST_Assert,
     AST_Verbatim, AST_While, AST_With, AST_Yield, AST_Await, TreeWalker, AST_Existential,
-    AST_Match, AST_AnnotatedAssign, AST_Super
+    AST_Match, AST_AnnotatedAssign, AST_Super,
+    AST_JSXElement, AST_JSXFragment, AST_JSXAttribute, AST_JSXSpread, AST_JSXText, AST_JSXExprContainer
 )
 from output.exceptions import print_try
 from output.classes import print_class
@@ -34,6 +35,7 @@ from output.operators import (
 )
 from output.functions import print_function, print_function_call
 from output.statements import print_bracketed, first_in_statement, force_statement, print_with, print_assert, print_match, print_annotated_assign
+from output.jsx import print_jsx_element, print_jsx_fragment, print_jsx_attribute, print_jsx_spread, print_jsx_text, print_jsx_expr_container
 from output.utils import make_block, make_num
 
 # -----[ code generators ]-----
@@ -486,6 +488,10 @@ def generate_code():
         output.print('**')
         self.value.print(output)
     )
+    DEFPRINT(AST_Spread, def(self, output):
+        output.print('...')
+        self.expression.print(output)
+    )
     DEFPRINT(AST_Set, print_set)
 
     AST_Symbol.prototype.definition = def():
@@ -525,3 +531,11 @@ def generate_code():
         output.print(make_num(self.value))
     )
     DEFPRINT(AST_RegExp, print_regexp)
+
+    # -----[ JSX ]-----
+    DEFPRINT(AST_JSXElement, print_jsx_element)
+    DEFPRINT(AST_JSXFragment, print_jsx_fragment)
+    DEFPRINT(AST_JSXAttribute, print_jsx_attribute)
+    DEFPRINT(AST_JSXSpread, print_jsx_spread)
+    DEFPRINT(AST_JSXText, print_jsx_text)
+    DEFPRINT(AST_JSXExprContainer, print_jsx_expr_container)

package/src/output/comments.pyj

@@ -1,45 +1,45 @@
-# vim:fileencoding=utf-8
-# License: BSD Copyright: 2018, Kovid Goyal <kovid at kovidgoyal.net>
-from __python__ import hash_literals
-
-from ast import AST_Exit, is_node_type
-
-
-def output_comments(comments, output, nlb):
-    for comm in comments:
-        if comm.type is "comment1":
-            output.print("//" + comm.value + "\n")
-            output.indent()
-        elif comm.type is "comment2":
-            output.print("/*" + comm.value + "*/")
-            if nlb:
-                output.print("\n")
-                output.indent()
-            else:
-                output.space()
-
-
-def print_comments(self, output):
-    c = output.options.comments
-    if c:
-        start = self.start
-        if start and not start._comments_dumped:
-            start._comments_dumped = True
-            comments = start.comments_before
-            # XXX: ugly fix for https://github.com/mishoo/RapydScript2/issues/112
-            #      if this node is `return` or `throw`, we cannot allow comments before
-            #      the returned or thrown value.
-            if is_node_type(self, AST_Exit) and self.value and self.value.start.comments_before and self.value.start.comments_before.length > 0:
-                comments = (comments or v'[]').concat(self.value.start.comments_before)
-                self.value.start.comments_before = v'[]'
-
-            if c.test:
-                comments = comments.filter(def(comment):
-                    return c.test(comment.value)
-                )
-            elif jstype(c) is "function":
-                comments = comments.filter(def(comment):
-                    return c(self, comment)
-                )
-
-            output_comments(comments, output, start.nlb)
+# vim:fileencoding=utf-8
+# License: BSD Copyright: 2018, Kovid Goyal <kovid at kovidgoyal.net>
+from __python__ import hash_literals
+
+from ast import AST_Exit, is_node_type
+
+
+def output_comments(comments, output, nlb):
+    for comm in comments:
+        if comm.type is "comment1":
+            output.print("//" + comm.value + "\n")
+            output.indent()
+        elif comm.type is "comment2":
+            output.print("/*" + comm.value + "*/")
+            if nlb:
+                output.print("\n")
+                output.indent()
+            else:
+                output.space()
+
+
+def print_comments(self, output):
+    c = output.options.comments
+    if c:
+        start = self.start
+        if start and not start._comments_dumped:
+            start._comments_dumped = True
+            comments = start.comments_before
+            # XXX: ugly fix for https://github.com/mishoo/RapydScript2/issues/112
+            #      if this node is `return` or `throw`, we cannot allow comments before
+            #      the returned or thrown value.
+            if is_node_type(self, AST_Exit) and self.value and self.value.start.comments_before and self.value.start.comments_before.length > 0:
+                comments = (comments or v'[]').concat(self.value.start.comments_before)
+                self.value.start.comments_before = v'[]'
+
+            if c.test:
+                comments = comments.filter(def(comment):
+                    return c.test(comment.value)
+                )
+            elif jstype(c) is "function":
+                comments = comments.filter(def(comment):
+                    return c(self, comment)
+                )
+
+            output_comments(comments, output, start.nlb)