Fix JS tests, merge gha scripts

Author: texodus

.github/workflows/build.yml

@@ -1033,6 +1033,56 @@ jobs:
                   path: python/perspective/dist/*.tar.gz
               if: ${{ matrix.os == 'macos-11' }}
 
+    build-pyodide:
+        runs-on: ubuntu-22.04
+        needs: [initialize]
+        env:
+            PYODIDE_VERSION: 0.23.2
+            # PYTHON_VERSION and EMSCRIPTEN_VERSION are determined by PYODIDE_VERSION.
+            # The appropriate versions can be found in the Pyodide repodata.json
+            # "info" field, or in Makefile.envs:
+            # https://github.com/pyodide/pyodide/blob/main/Makefile.envs#L2
+            PYTHON_VERSION: 3.11.2
+            EMSCRIPTEN_VERSION: 3.1.32
+        steps:
+            - name: Checkout perspective
+              uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
+
+            - name: set up python
+              id: setup-python
+              uses: actions/setup-python@57ded4d7d5e986d7296eab16560982c6dd7c923b # v4.6.0
+              with:
+                  python-version: ${{ env.PYTHON_VERSION }}
+
+            - uses: mymindstorm/setup-emsdk@ab889da2abbcbb280f91ec4c215d3bb4f3a8f775 # v12
+              with:
+                  version: ${{ env.EMSCRIPTEN_VERSION }}
+                  actions-cache-folder: emsdk-cache
+
+            - name: copy files
+              run: |
+                  npm install -g yarn
+                  yarn --frozen-lockfile
+                  yarn build_python --setup-only
+
+            - name: Linux init steps
+              run: sudo node scripts/install_tools.js
+
+            - name: Install pyodide-build
+              run: pip install pyodide-build==$PYODIDE_VERSION
+
+            - name: Build
+              # Without --exports=pyinit, pyodide-build tries to export all symbols from every .o,
+              # which causes the em++ linker command line invocation to be so long
+              # that the command fails.
+              run: pyodide build python/perspective --exports=pyinit
+
+            - name: Upload pyodide wheel
+              uses: actions/upload-artifact@v3
+              with:
+                  name: perspective-python-dist-pyodide
+                  path: dist/*.whl
+
     ##########################################################################################################################
     ##########################################################################################################################
 

.github/workflows/pyodide.yml

@@ -541,7 +541,6 @@ set(PSP_WASM_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} \
     -s EXPORT_NAME=\"load_perspective\" \
     -s MAXIMUM_MEMORY=4gb \
     -s ERROR_ON_UNDEFINED_SYMBOLS=1 \
-    -s ENVIRONMENT=worker \
 ")
 
 if(PSP_WASM_BUILD)
@@ -594,7 +593,6 @@ elseif(PSP_CPP_BUILD OR PSP_PYTHON_BUILD)
         add_library(psp STATIC ${PYTHON_SOURCE_FILES})
         add_library(binding SHARED ${PYTHON_BINDING_SOURCE_FILES})
         if(PSP_PYODIDE)
-            set(CMAKE_EXE_LINKER_FLAGS "${PSP_WASM_LINKER_FLAGS}")
             set(PSP_PYTHON_DEFS PSP_ENABLE_WASM=1)
         else()
             set(PSP_PYTHON_DEFS PSP_ENABLE_PYTHON_THREADING=1)

cpp/perspective/CMakeLists.txt

@@ -2023,7 +2023,7 @@ namespace computed_function {
             number = val.to_double();
         }
 
-#if defined(PSP_ENABLE_WASM) && defined(PSP_ENABLE_PYTHON)
+#if defined(PSP_ENABLE_WASM) && !defined(PSP_ENABLE_PYTHON)
         // check for overflow
         if (number > std::numeric_limits<std::int32_t>::max()
             || number < std::numeric_limits<std::int32_t>::min()) {

cpp/perspective/src/cpp/computed_function.cpp

@@ -59,7 +59,7 @@ try {
     } else if (IS_INSTALL) {
         cmd = `${PYTHON} -m pip install .`;
     } else if (IS_PYODIDE) {
-        cmd = `pyodide build`;
+        cmd = `pyodide build . --exports=pyinit`;
     } else {
         cmd = bash`${PYTHON} setup.py build -v`;
     }

scripts/build_python.js

@@ -306,13 +306,13 @@ exports.run_with_scope = async function run_recursive(strings, ...args) {
     const workspaces = JSON.parse(stdout.toString());
     const compiled = new Set(
         Object.keys(workspaces.dependencies).filter(
-            (x) => !workspaces.dependencies[x].resolved.startsWith("file:")
+            (x) => !workspaces.dependencies[x].resolved?.startsWith("file:")
         )
     );
 
     let uncompiled = Object.keys(workspaces.dependencies).filter(
         (x) =>
-            workspaces.dependencies[x].resolved.startsWith("file:") &&
+            workspaces.dependencies[x].resolved?.startsWith("file:") &&
             (scope === null || scope.indexOf(x) >= 0)
     );