py2ecma 0.0.2__tar.gz → 0.0.2.post9.dev0__tar.gz

{py2ecma-0.0.2 → py2ecma-0.0.2.post9.dev0}/.gitignore

@@ -154,6 +154,7 @@ fabric.properties
 # Sonarlint plugin
 
 ### Python ###
+report.xml
 # Byte-compiled / optimized / DLL files
 __pycache__/
 *.py[cod]

{py2ecma-0.0.2 → py2ecma-0.0.2.post9.dev0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: py2ecma
-Version: 0.0.2
+Version: 0.0.2.post9.dev0
 Summary: # py2ecma
 Author-email: "Morten B. Rasmussen" <mbr@bitekspressen.dk>
 License-File: LICENSE-2.0.txt

{py2ecma-0.0.2 → py2ecma-0.0.2.post9.dev0}/pyproject.toml

@@ -19,6 +19,9 @@ dependencies = [
 ]
 dynamic = ["version"]
 
+[project.scripts]
+py2ecma = "py2ecma.main:main"
+
 [tool.hatch.version]
 source = "uv-dynamic-versioning"
 
@@ -29,6 +32,8 @@ local_scheme = "no-local-version"
 vcs = "git"
 style = "pep440"
 local_scheme = "no-local-version"
+metadata = false
+dirty = false
 
 [project.readme]
 file = "README.md"
@@ -81,5 +86,4 @@ dev = [
     "pyfakefs>=6.0.0",
     "pytest>=9.0.2",
     "twine>=6.2.0",
-    "visast>=1.0.1",
 ]

{py2ecma-0.0.2 → py2ecma-0.0.2.post9.dev0}/scripts/build.sh

@@ -1,5 +1,5 @@
 #!/bin/sh
 
 # Build python package and place it in dist/
-
+rm -rf dist/ || true
 uv build

{py2ecma-0.0.2 → py2ecma-0.0.2.post9.dev0}/scripts/install.sh

@@ -7,4 +7,4 @@
 
 pyenv exec pip install uv
 uv venv --python 3.14.2
-uv sync
+uv sync --dev

{py2ecma-0.0.2 → py2ecma-0.0.2.post9.dev0}/src/py2ecma/arguments.py

@@ -56,6 +56,12 @@ def arg_parser() -> argparse.ArgumentParser:
         " the current directory.",
         metavar="dir",
     )
+    parser.add_argument(
+        "--imports",
+        dest="imports",
+        metavar="output.js",
+        help="List of imports that can be injected at the top of the bundle file",
+    )
     parser.add_argument(
         "-c",
         "--clean",

{py2ecma-0.0.2 → py2ecma-0.0.2.post9.dev0}/src/py2ecma/codegenerator/nintermediate/comprehensions.py

@@ -25,6 +25,16 @@ class SetComp(Node):
     elt: Node
     generators: List[Node]
 
+    def code(self):
+        yield "__set_comprehension__("
+        yield "("
+        yield self.generators[-1].target
+        yield ") => ("
+        yield self.elt
+        yield "), ["
+        yield self.join(", ", self.generators)
+        yield "])"
+
 
 @dataclass
 class GeneratorComp(Node):

{py2ecma-0.0.2 → py2ecma-0.0.2.post9.dev0}/src/py2ecma/codegenerator/nintermediate/node.py

@@ -8,7 +8,7 @@ class Node:
     def code(self):
         raise NotImplementedError(
             "Itermediate node type '{}'".format(self.__class__.__name__)
-            + " is missing the code() method override"
+            + f" is missing the code() method override, issue is present in {self.__file__}"
         )
 
     @staticmethod

{py2ecma-0.0.2 → py2ecma-0.0.2.post9.dev0}/src/py2ecma/codegenerator/parser.py

@@ -600,6 +600,8 @@ def class_body(tree, name, module, file_):
 
         def visit_FunctionDef(self, node):
             decorators = [n.id for n in node.decorator_list]
+            print("====================================================")
+            print(self.file)
             return CD.Method(
                 __file__=self.file,
                 name=node.name,

{py2ecma-0.0.2 → py2ecma-0.0.2.post9.dev0}/src/py2ecma/conf.py

@@ -8,6 +8,7 @@ class TranspilerConfig:
     input_file: Path
     output_file: Path
     build_dir: Path
+    imports: Path | None
 
     clean_build: bool
     recursive: bool
@@ -22,6 +23,8 @@ class TranspilerConfig:
         self.input_file = Path(argparser.input)
         self.output_file = Path(argparser.output_file)
         self.build_dir = Path(argparser.build_dir)
+        self.imports = Path(argparser.imports) \
+            if argparser.imports is not None else None
 
         self.clean_build = argparser.clean
         self.recursive = argparser.recursive

{py2ecma-0.0.2 → py2ecma-0.0.2.post9.dev0}/src/py2ecma/dependency/getdeps.py

@@ -76,7 +76,7 @@ def getdeps(filename):
             continue
         path = find_import_src(mod, filename)
         if path is None:
-            logger.error("Could not find origin of module({})".format(mod))
+            logger.error(f"Could not find origin of module({mod}) for file {filename}")
             raise ImportError("Could not find: {}".format(mod))
         logger.info('dependency found: "{}"'.format(path))
         filepaths.append(path)

{py2ecma-0.0.2 → py2ecma-0.0.2.post9.dev0}/src/py2ecma/javascript/builtins.js

@@ -337,3 +337,4 @@ function __attribute__(cls, attr, value) {
 function __super__(t, o) {
 
 }
+var Union = type(()=>{})

{py2ecma-0.0.2 → py2ecma-0.0.2.post9.dev0}/src/py2ecma/javascript/comprehensions.js

@@ -28,6 +28,31 @@ var __list_comprehension__ = (elt, generators, li) => {
     return li;
 }
 
+
+var __set_comprehension__ = (elt, generators, li) => {
+    if (li === undefined) {
+        li = set();
+    }
+    if (generators.length > 1) {
+        var generator = generators[0];
+        for (let el of __Iterator__(generator.iter)) {
+            if (generator.ifs(el)) {
+                var tail = generators.slice(1);
+                tail[0].iter = el;
+                __set_comprehension__(elt, tail, li);
+            }
+        }
+    } else {
+        var generator = generators[0];
+        for (let el of __Iterator__(generator.iter)) {
+            if (generator.ifs(el)) {
+                li.add(elt(el));
+            }
+        }
+    }
+    return li;
+}
+
 var __dict_comprehension__ = (elt, val, generators, li) => {
     if (li === undefined) {
         var li = dict();

{py2ecma-0.0.2 → py2ecma-0.0.2.post9.dev0}/src/py2ecma/linker/jsloader.py

@@ -1,4 +1,5 @@
 import os
+from pathlib import Path
 
 from ..filesystem import loadsrc
 
@@ -50,10 +51,11 @@ def src_strings():
     return loadsrc(filepath)
 
 
-def jssources() -> str:
+def jssources(imports: str | Path | None = None) -> str:
     return "\n".join(
         [
             src_base(),
+            loadsrc(str(imports)) if imports else "",
             src_exceptions(),
             src_builtins(),
             src_classes(),

{py2ecma-0.0.2 → py2ecma-0.0.2.post9.dev0}/src/py2ecma/linker/packager.py

@@ -1,10 +1,12 @@
 import ast
+from pathlib import Path
 
 from .jsloader import jssources
 
 
-def package(cache):
-    all = jssources() + "var __exports__ = {};\n"
+def package(cache, imports: Path | None):
+
+    all = jssources(imports) + "var __exports__ = {};\n"
     for dep, src in cache.items():
         dep = dep.replace(".__init__", "")
         wsrc = wrap_iife(src)

{py2ecma-0.0.2 → py2ecma-0.0.2.post9.dev0}/src/py2ecma/modules/dataclasses.py

@@ -1,8 +1,6 @@
-import _thread
-import builtins
+#import _thread
 import copy
 import functools
-import inspect
 import keyword
 import re
 import sys
@@ -375,7 +373,7 @@ def _recursive_repr(user_function):
 
     @functools.wraps(user_function)
     def wrapper(self):
-        key = id(self), _thread.get_ident()
+        key = id(self)
         if key in repr_running:
             return "..."
         repr_running.add(key)
@@ -397,8 +395,6 @@ def _create_fn(name, args, body, *, globals=None, locals=None, return_type=MISSI
     # __builtins__ may be the "builtins" module or
     # the value of its "__dict__",
     # so make sure "__builtins__" is the module.
-    if globals is not None and "__builtins__" not in globals:
-        globals["__builtins__"] = builtins
     return_annotation = ""
     if return_type is not MISSING:
         locals["_return_type"] = return_type
@@ -1005,9 +1001,9 @@ def _process_class(cls, init, repr, eq, order, unsafe_hash, frozen):
         # we're here the overwriting is unconditional.
         cls.__hash__ = hash_action(cls, field_list)
 
-    if not getattr(cls, "__doc__"):
-        # Create a class doc-string.
-        cls.__doc__ = cls.__name__ + str(inspect.signature(cls)).replace(" -> None", "")
+    #if not getattr(cls, "__doc__"):
+    #    # Create a class doc-string.
+    #    cls.__doc__ = cls.__name__ + str(inspect.signature(cls)).replace(" -> None", "")
 
     return cls
 

{py2ecma-0.0.2 → py2ecma-0.0.2.post9.dev0}/src/py2ecma/modules/types.py

@@ -26,6 +26,7 @@ def _g():
 
 
 GeneratorType = type(_g())
+Union = type(_g())
 
 
 def _c():

{py2ecma-0.0.2 → py2ecma-0.0.2.post9.dev0}/src/py2ecma/transpiler.py

@@ -47,6 +47,7 @@ def transpiler(
     input_file: Path,
     output_file: Path,
     build_dir: Path,
+    imports: Path | None,
     clean_build: bool = False,
     minimize: bool = False,
     recursive: bool = True,
@@ -126,7 +127,7 @@ def transpiler(
         return __inner__
 
     def bundler(src_cache, output_file):
-        bundle = package(src_cache)
+        bundle = package(src_cache, imports)
         if not minimize:
             import jsbeautifier  # type: ignore
 
@@ -166,6 +167,7 @@ class Transpiler:
                 input_file=self.config.input_file,
                 output_file=self.config.output_file,
                 build_dir=self.config.build_dir,
+                imports=self.config.imports,
                 clean_build=self.config.clean_build,
                 minimize=self.config.minimize,
                 recursive=self.config.recursive,

{py2ecma-0.0.2 → py2ecma-0.0.2.post9.dev0}/tests/helpers.py

@@ -317,7 +317,12 @@ def jsfstest(data_dir, cwd="", py_path=""):
                 f.write(py_src)
 
             py_result = func()
-            transpiler(main_file, "bundle.js", build_dir="build", clean_build=True)
+            transpiler(
+                Path(main_file),
+                Path("bundle.js"),
+                build_dir=Path("build"),
+                clean_build=True,
+                imports=None)
             with open("bundle.js") as f:
                 js_body = f.read()
                 js_src = (