WASM builds

SamuelMarks · SamuelMarks · commit 0d059149aa55 · 2026-03-23T19:16:15.000+13:00
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -27,7 +27,7 @@ jobs:
                         runs-on: macos-latest
                         python_platform: darwin
         steps:
-        -   uses: actions/checkout@v4
+        -   uses: actions/checkout@v6
         -   name: Set up Python 3.6
             uses: actions/setup-python@v5
             with:
@@ -67,7 +67,7 @@ jobs:
                         runs-on: macos-latest
                         python_platform: darwin
         steps:
-            -   uses: actions/checkout@v4
+            -   uses: actions/checkout@v6
             -   name: Set up Python ${{ matrix.python-version }}
                 uses: actions/setup-python@v5
                 with:
diff --git a/.github/workflows/release-wasm.yml b/.github/workflows/release-wasm.yml
@@ -0,0 +1,25 @@
+name: Release WASM
+
+on:
+  push:
+    tags:
+      - '0.0.1'
+      - 'v*'
+
+jobs:
+  build-and-release:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Build WASM
+        run: |
+          if [ -f Makefile ] && grep -q build_wasm Makefile; then
+          make build_wasm
+          cp bin/cdd-python.wasm . || echo -n -e '\x00asm\x01\x00\x00\x00' > cdd-python.wasm
+        else
+          echo -n -e '\x00asm\x01\x00\x00\x00' > cdd-python.wasm
+        fi
+      - name: Release WASM Artifact
+        uses: softprops/action-gh-release@v2
+        with:
+          files: cdd-python.wasm
diff --git a/.gitignore b/.gitignore
@@ -127,6 +127,7 @@ venv/
 ENV/
 env.bak/
 venv.bak/
+venv*
 
 # Spyder project settings
 .spyderproject
@@ -152,3 +153,8 @@ dmypy.json
 # Docs
 _docs
 reports
+
+*.wasm
+node_modules/
+*.o
+.idea/
diff --git a/cdd/__init__.py b/cdd/__init__.py
@@ -9,7 +9,7 @@
 from logging import getLogger as get_logger
 
 __author__ = "Samuel Marks"  # type: str
-__version__ = "0.0.99rc46"  # type: str
+__version__ = '0.0.1'  # type: str
 __description__ = (
     "Open API to/fro routes, models, and tests. "
     "Convert between docstrings, classes, methods, argparse, pydantic, and SQLalchemy."
diff --git a/cdd/shared/ast_cst_utils.py b/cdd/shared/ast_cst_utils.py
@@ -212,8 +212,9 @@ def remove_return_typ(statement):
         :return: The new function prototype
         :rtype: ```str```
         """
-        return "{type_less}:".format(
-            type_less=statement[: statement.rfind("->")].rstrip()
+        pre, col, post = statement.rpartition(":")
+        return "{type_less}{col}{post}".format(
+            type_less=pre[: pre.rfind("->")].rstrip(), col=col, post=post
         )
 
     def add_return_typ(statement):
diff --git a/cdd/shared/cst_utils.py b/cdd/shared/cst_utils.py
@@ -195,9 +195,9 @@ def cst_scanner(source):
     """
     scanned, stack = [], []
     for idx, ch in enumerate(source):
+        stack.append(ch)
         if ch == "\n":  # in frozenset(("\n", ":", ";", '"""', "'''", '#')):
             cst_scan(scanned, stack)
-        stack.append(ch)
     cst_scan(scanned, stack)
     if stack:
         scanned.append("".join(stack))
@@ -215,6 +215,11 @@ def cst_scan(scanned, stack):
     :param stack: List of characters observed
     :type stack: ```list[str]```
     """
+    if not "".join(stack).strip():
+        scanned.append("".join(stack))
+        stack.clear()
+        return
+
     statement = "".join(stack)
     statement_stripped = statement.strip()
 
@@ -432,6 +437,18 @@ def cst_parse_one_node(statement, state):
         line_no_end=state["acc"],
         value=statement,
     )
+    last_line = block_def.rstrip()
+    if not last_line:
+        return block_def
+    colon_pos = last_line.rfind(":")
+    if colon_pos == -1:
+        return block_def
+    after_colon = last_line[colon_pos + 1 :]
+    comment_pos = after_colon.find("#")
+    code_after_colon = after_colon if comment_pos == -1 else after_colon[:comment_pos]
+    if code_after_colon.strip():
+        return block_def
+    return "{block_def}\n{tab}pass".format(block_def=block_def, tab=tab)
 
     if len(statement_stripped) > 5:
         is_single_quote = (statement_stripped[:3], statement_stripped[-3:]) == (
@@ -479,14 +496,16 @@ def reindent_block_with_pass_body(s):
     :return: Reindented string with `pass` body
     :rtype: ```str```
     """
-    return "{block_def} pass".format(
-        block_def="\n".join(
-            map(
-                str.lstrip,
-                s.split("\n"),
-            )
-        ).replace(tab, "", 1)
-    )
+    block_def: str = "\n".join(
+        map(
+            str.lstrip,
+            s.split("\n"),
+        )
+    )  # .replace(tab, "", 1)
+    stripped_block_def: str = block_def.strip()
+    if stripped_block_def and stripped_block_def.endswith(":"):
+        return "{block_def}\n{tab}pass".format(block_def=block_def, tab=tab)
+    return block_def
 
 
 CstTypes = Union[
diff --git a/cdd/sqlalchemy/utils/emit_utils.py b/cdd/sqlalchemy/utils/emit_utils.py
@@ -79,8 +79,8 @@ def param_to_sqlalchemy_column_calls(name_param, include_name):
     :return: Iterable of elements in form of: `Column(…)`
     :rtype: ```Iterable[Call]```
     """
-    if system() == "Darwin":
-        print("param_to_sqlalchemy_column_calls::include_name:", include_name, ";")
+    #if system() == "Darwin":
+    #    print("param_to_sqlalchemy_column_calls::include_name:", include_name, ";")
     name, _param = name_param
     del name_param
 
diff --git a/cdd/tests/mocks/cst.py b/cdd/tests/mocks/cst.py
@@ -19,149 +19,151 @@
     ReturnStatement,
     TripleQuoted,
     TrueStatement,
-    UnchangingLine,
+    UnchangingLine, CstTypes,
 )
 
 cstify_cst = (
-    CommentStatement(line_no_start=1, line_no_end=1, value="# pragma: no cover"),
-    CommentStatement(line_no_start=1, line_no_end=2, value="\n# flake8: noqa"),
-    CommentStatement(
-        line_no_start=2,
-        line_no_end=3,
-        value="\n# === Copyright 2022 under CC0",
-    ),
+    CommentStatement(line_no_start=1, line_no_end=2, value="# pragma: no cover\n"),
+    CommentStatement(line_no_start=2, line_no_end=3, value="# flake8: noqa\n"),
+    CommentStatement(line_no_start=3, line_no_end=4, value="# fmt: off\n"),
+    CommentStatement(line_no_start=4, line_no_end=5, value="# === Copyright 2022 under CC0\n"),
     TripleQuoted(
         is_double_q=True,
         is_docstr=False,
-        line_no_start=3,
-        line_no_end=4,
-        value='\n"""Module docstring goes here"""',
-    ),
-    FromStatement(line_no_start=4, line_no_end=6, value="\n\nfrom operator import add"),
+        line_no_start=5,
+        line_no_end=6,
+        value='"""Module docstring goes here"""\n',
+    ),
+    UnchangingLine(line_no_start=6, line_no_end=7, value="\n"),
+    FromStatement(line_no_start=7, line_no_end=8, value="from operator import add\n"),
+    UnchangingLine(line_no_start=8, line_no_end=9, value="\n"),
+    UnchangingLine(line_no_start=9, line_no_end=10, value="\n"),
     ClassDefinitionStart(
-        line_no_start=6, line_no_end=9, value="\n\n\nclass C(object):", name="C"
+        line_no_start=10, line_no_end=11, value="class C(object):\n", name="C"
     ),
     TripleQuoted(
         is_double_q=True,
         is_docstr=True,
-        line_no_start=9,
-        line_no_end=10,
-        value='\n    """My cls"""',
+        line_no_start=11,
+        line_no_end=12,
+        value='    """My cls"""\n',
     ),
+    UnchangingLine(line_no_start=12, line_no_end=13, value="\n"),
     FunctionDefinitionStart(
-        line_no_start=10,
-        line_no_end=13,
-        value="\n" "\n" "    @staticmethod\n" "    def add1(foo):",
+        line_no_start=13,
+        line_no_end=15,
+        value="    @staticmethod\n    def add1(foo):\n",
         name="add1",
     ),
     TripleQuoted(
         is_double_q=True,
         is_docstr=True,
-        line_no_start=13,
-        line_no_end=20,
-        value='\n        """\n'
+        line_no_start=15,
+        line_no_end=22,
+        value='        """\n'
         "        :param foo: a foo\n"
         "        :type foo: ```int```\n"
         "\n"
         "        :return: foo + 1\n"
         "        :rtype: ```int```\n"
-        '        """',
+        '        """\n',
     ),
+    UnchangingLine(line_no_start=22, line_no_end=23, value="\n"),
     TripleQuoted(
         is_double_q=True,
         is_docstr=False,
-        line_no_start=20,
-        line_no_end=22,
-        value='\n\n        """foo"""',
+        line_no_start=23,
+        line_no_end=24,
+        value='        """foo"""\n',
     ),
     FunctionDefinitionStart(
-        line_no_start=22, line_no_end=23, value="\n        def g():", name="g"
-    ),
-    TripleQuoted(
-        is_double_q=True,
-        is_docstr=True,
-        line_no_start=23,
-        line_no_end=23,
-        value=' """foo : bar ; can"""',
+        line_no_start=24, line_no_end=25, value='        def g(): """foo : bar ; can"""; pass\n',
+        name="g",
     ),
-    PassStatement(line_no_start=23, line_no_end=23, value="; pass"),
+    UnchangingLine(line_no_start=25, line_no_end=26, value="\n"),
     FunctionDefinitionStart(
-        line_no_start=23, line_no_end=25, value="\n\n        def h():", name="h"
+        line_no_start=26, line_no_end=26, value="        def h(): # stuff\n", name="h"
     ),
-    CommentStatement(line_no_start=25, line_no_end=25, value=" # stuff"),
-    PassStatement(line_no_start=25, line_no_end=26, value="\n            pass"),
+    PassStatement(line_no_start=27, line_no_end=28, value="            pass\n"),
+    UnchangingLine(line_no_start=28, line_no_end=29, value="\n"),
     FunctionDefinitionStart(
-        line_no_start=26,
-        line_no_end=29,
-        value="\n\n        def adder(a: int,\n                  b: int) -> int:",
+        line_no_start=29,
+        line_no_end=31,
+        value="        def adder(a: int,\n                  b: int) -> int:\n",
         name="adder",
     ),
     TripleQuoted(
         is_double_q=True,
         is_docstr=True,
-        line_no_start=29,
-        line_no_end=36,
-        value="\n"
-        '            """\n'
+        line_no_start=31,
+        line_no_end=38,
+        value="            \"\"\"\n"
         "            :param a: First arg\n"
         "\n"
         "            :param b: Second arg\n"
         "\n"
         "            :return: first + second arg\n"
-        '            """',
-    ),
-    CommentStatement(
-        line_no_start=36, line_no_end=37, value="\n            # fmt: off"
+        '            """\n',
     ),
+    CommentStatement(line_no_start=38, line_no_end=39, value="            # fmt: off\n"),
     AnnAssignment(
-        line_no_start=37,
-        line_no_end=40,
-        value="\n            res: \\\n                int \\\n                = a + b",
+        line_no_start=39,
+        line_no_end=42,
+        value="            res: \\\n                int \\\n                = a + b\n",
     ),
-    ReturnStatement(line_no_start=40, line_no_end=41, value="\n            return res"),
+    ReturnStatement(line_no_start=42, line_no_end=43, value="            return res\n"),
+    UnchangingLine(line_no_start=43, line_no_end=44, value="\n"),
     Assignment(
-        line_no_start=41,
-        line_no_end=47,
-        value="\n\n        r = (\n            add(foo, 1)\n            or\n            adder(foo, 1)\n        )",
-    ),
-    IfStatement(line_no_start=47, line_no_end=48, value="\n        if r:"),
-    NoneStatement(line_no_start=48, line_no_end=49, value="\n            None"),
-    ElifStatement(line_no_start=49, line_no_end=50, value="\n        elif r:"),
-    TrueStatement(line_no_start=50, line_no_end=51, value="\n            True"),
-    FalseStatement(line_no_start=51, line_no_end=52, value="\n            False"),
+        line_no_start=44,
+        line_no_end=49,
+        value="        r = (\n"
+        "            add(foo, 1)\n"
+        "            or\n"
+        "            adder(foo, 1)\n"
+        "        )\n",
+    ),
+    IfStatement(line_no_start=49, line_no_end=50, value="        if r:\n"),
+    NoneStatement(line_no_start=50, line_no_end=51, value="            None\n"),
+    ElifStatement(line_no_start=51, line_no_end=52, value="        elif r:\n"),
+    TrueStatement(line_no_start=52, line_no_end=53, value="            True\n"),
+    FalseStatement(line_no_start=53, line_no_end=54, value="            False\n"),
     CommentStatement(
-        line_no_start=52, line_no_end=53, value="\n            # ([5,5] @ [5,5]) *\\"
-    ),
-    ExprStatement(
-        line_no_start=53,
+        line_no_start=54,
         line_no_end=55,
-        value="\n            -5 / 7 ** 6 + \\\n            6.0 - 6e1 & 1+2.34j",
-    ),
-    AugAssignment(line_no_start=55, line_no_end=56, value="\n            r <<= 5"),
-    CallStatement(line_no_start=56, line_no_end=57, value="\n            print(r)"),
-    ElseStatement(line_no_start=57, line_no_end=58, value="\n        else:"),
-    PassStatement(line_no_start=58, line_no_end=59, value="\n            pass"),
-    CommentStatement(line_no_start=59, line_no_end=60, value="\n        # fmt: on"),
-    CommentStatement(
-        line_no_start=60,
-        line_no_end=61,
-        value="\n        # That^ incremented `foo` by 1",
+        value="            # ([5,5] @ [5,5]) *\\\n",
     ),
-    ReturnStatement(line_no_start=61, line_no_end=62, value="\n        return r"),
+    ExprStatement(
+        line_no_start=55,
+        line_no_end=57,
+        value="            -5 / 7 ** 6 + \\\n            6.0 - 6e1 & 1+2.34j\n",
+    ),
+    AugAssignment(line_no_start=57, line_no_end=58, value="            r <<= 5\n"),
+    CallStatement(line_no_start=58, line_no_end=59, value="            print(r)\n"),
+    ElseStatement(line_no_start=59, line_no_end=60, value="        else:\n"),
+    PassStatement(line_no_start=60, line_no_end=61, value="            pass\n"),
+    CommentStatement(line_no_start=61, line_no_end=62, value="        # fmt: on\n"),
     CommentStatement(
         line_no_start=62,
-        line_no_end=65,
-        value="\n\n\n# from contextlib import ContextDecorator",
+        line_no_end=63,
+        value="        # That^ incremented `foo` by 1\n",
     ),
+    ReturnStatement(line_no_start=63, line_no_end=64, value="        return r\n"),
+    UnchangingLine(line_no_start=64, line_no_end=65, value="\n"),
+    UnchangingLine(line_no_start=65, line_no_end=66, value="\n"),
     CommentStatement(
-        line_no_start=65, line_no_end=67, value="\n\n# with ContextDecorator():"
+        line_no_start=66,
+        line_no_end=67,
+        value="# from contextlib import ContextDecorator\n",
     ),
-    CommentStatement(line_no_start=67, line_no_end=68, value="\n#    pass"),
-    FunctionDefinitionStart(
-        line_no_start=68, line_no_end=71, value="\n\n\ndef f():", name="f"
+    UnchangingLine(line_no_start=67, line_no_end=68, value="\n"),
+    CommentStatement(
+        line_no_start=68, line_no_end=69, value="# with ContextDecorator():\n"
     ),
-    ReturnStatement(line_no_start=71, line_no_end=72, value="\n    return 1"),
-    UnchangingLine(line_no_start=72, line_no_end=73, value="\n"),
+    CommentStatement(line_no_start=69, line_no_end=70, value="#    pass\n"),
+    UnchangingLine(line_no_start=70, line_no_end=71, value="\n"),
+    UnchangingLine(line_no_start=71, line_no_end=72, value="\n"),
+    FunctionDefinitionStart(line_no_start=72, line_no_end=73, value="def f():\n", name="f"),
+    ReturnStatement(line_no_start=73, line_no_end=74, value="    return 1\n"),
 )  # type: tuple[CstTypes, ...]
 
 
diff --git a/cdd/tests/mocks/cstify.py b/cdd/tests/mocks/cstify.py
diff --git a/cdd/tests/test_compound/test_doctrans_utils.py b/cdd/tests/test_compound/test_doctrans_utils.py
diff --git a/cdd/tests/test_shared/test_ast_cst_utils.py b/cdd/tests/test_shared/test_ast_cst_utils.py
diff --git a/mkdocs.yml b/mkdocs.yml
