chore: Refactor source locations

Add simple WebAssembly source Signed-off-by: Gordon Smith <[email protected]>
hpcc-systems · Dec 30, 2022 · c6bd2ea · c6bd2ea
1 parent f81ed20
commit c6bd2ea
Show file tree

Hide file tree

Showing 90 changed files with 390 additions and 43 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -8,7 +8,7 @@ docker/
 emsdk/
 lib-*/
 node_modules/
-src-graphviz/
+third-party/graphviz/
 types/
 vcpkg/
 *.tsbuildinfo
diff --git a/.gitignore b/.gitignore
@@ -16,8 +16,8 @@
 /lib-*
 /node_modules
 /rust
-/src-*
-/src/*.wasm.ts
+/third-party
+/src-ts/*.wasm.ts
 /tmp
 /types
 /vcpkg

diff --git a/.nycrc b/.nycrc
@@ -2,6 +2,6 @@
     "extends": "@istanbuljs/nyc-config-typescript",
     "exclude": [
         "build",
-        "src/__tests__"
+        "src-ts/__tests__"
     ]
 }
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -95,12 +95,12 @@
         },
         {
             "name": "CLI",
-            "program": "${workspaceFolder}/bin/dot-wasm.mjs",
+            "program": "${workspaceFolder}/bin/dot-wasm.js",
             "request": "launch",
             "args": [
                 "-K neato",
                 "-n 2",
-                "./src/__tests__/simple.dot"
+                "./src-ts/__tests__/simple.dot"
             ],
             "skipFiles": [
                 "<node_internals>/**"
@@ -109,7 +109,7 @@
         },
         {
             "name": "CLI Version",
-            "program": "${workspaceFolder}/bin/dot-wasm.mjs",
+            "program": "${workspaceFolder}/bin/dot-wasm.js",
             "request": "launch",
             "args": [
                 "-v"

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -7,7 +7,7 @@ set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE ${REPO_DIR}/emsdk/upstream/emscripten/cmake/M
 set(VCPKG_ROOT ${REPO_DIR}/vcpkg)
 set(VCPKG_OVERLAY_PORTS ${CMAKE_CURRENT_SOURCE_DIR}/vcpkg-overlays)
 set(VCPKG_TARGET_TRIPLET "wasm32-emscripten")
-file(REMOVE ${REPO_DIR}/vcpkg/vcpkg)
+# file(REMOVE ${REPO_DIR}/vcpkg/vcpkg)
 
 project(cpp)
 
@@ -34,8 +34,8 @@ set(EM_LINK_FLAGS
     "-sSTANDALONE_WASM=0"
     "-sBINARYEN_ASYNC_COMPILATION=1"
     # "-sDYNAMIC_EXECUTION=0"
-    "--pre-js ${CMAKE_CURRENT_SOURCE_DIR}/cpp/src/pre.js"
-    "--post-js ${CMAKE_CURRENT_SOURCE_DIR}/cpp/src/post.js"
+    "--pre-js ${CMAKE_CURRENT_SOURCE_DIR}/src-cpp/src/pre.js"
+    "--post-js ${CMAKE_CURRENT_SOURCE_DIR}/src-cpp/src/post.js"
 )
 
 
@@ -68,7 +68,7 @@ endif ()
 
 set(EMSDK_DIR "${CMAKE_SOURCE_DIR}/emsdk")
 set(EXPAT_DIR "${CMAKE_SOURCE_DIR}/src-expat/expat")
-set(GRAPHVIZ_DIR "${CMAKE_SOURCE_DIR}/src-graphviz")
+set(GRAPHVIZ_DIR "${CMAKE_SOURCE_DIR}/third-party/graphviz")
 
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
@@ -89,4 +89,4 @@ function(packWasm targetID)
     add_dependencies(sfx-${targetID} ${targetID} base91lib zstdlib)
 endfunction ()
 
-add_subdirectory(cpp)
+add_subdirectory(src-cpp)
diff --git a/asconfig.json b/asconfig.json
@@ -0,0 +1,22 @@
+{
+  "targets": {
+    "debug": {
+      "outFile": "build/debug.wasm",
+      "textFile": "build/debug.wat",
+      "sourceMap": true,
+      "debug": true
+    },
+    "release": {
+      "outFile": "build/release.wasm",
+      "textFile": "build/release.wat",
+      "sourceMap": true,
+      "optimizeLevel": 3,
+      "shrinkLevel": 0,
+      "converge": false,
+      "noAssert": false
+    }
+  },
+  "options": {
+    "bindings": "esm"
+  }
+}
diff --git a/cpp/graphviz/config.h b/cpp/graphviz/config.h
diff --git a/docker/ubuntu-dev.dockerfile b/docker/ubuntu-dev.dockerfile
@@ -19,7 +19,7 @@ RUN apt-get install -y gcc-multilib g++-multilib pkg-config autoconf bison libto
 RUN apt-get install -y python3 python3-pip
 
 # Set the working directory
-WORKDIR /usr/src/app
+WORKDIR /usr/src-ts/app
 
 COPY ./cpp ./cpp
 COPY ./src ./src

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -57,7 +57,7 @@
     "bin/*.*",
     "dist/*.*",
     "types/*",
-    "src/*.css"
+    "src-ts/*.css"
   ],
   "scripts": {
     "install-emsdk": "run-script-os",
@@ -70,13 +70,14 @@
     "install-vcpkg:linux": "./scripts/cpp-install-vcpkg.sh",
     "install-vcpkg:win32": "wsl -e ./scripts/cpp-install-vcpkg.sh",
     "install-build-deps": "run-p install-emsdk install-graphviz install-vcpkg",
-    "uninstall-build-deps": "rimraf ./emsdk ./src-graphviz ./vcpkg ./src-expat ./src-vcpkg",
+    "uninstall-build-deps": "rimraf ./emsdk ./third-party/graphviz ./vcpkg ./src-expat ./src-vcpkg",
     "clean-build": "rimraf .nyc_output bin build coverage dist* lib* output-* tmp types *.tsbuildinfo",
     "clean-docs": "rimraf docs/.vitepress/dist docs/classes docs/interfaces docs/modules docs/.nojekyll docs/README.md",
     "clean": "run-p clean-build clean-docs",
     "copy-res": "cp ./docs/*.png ./docs/.vitepress/dist",
     "compile": "tsc",
     "compile-watch": "npm run compile -- -w",
+    "compile-asm": "asc ./src-asm/index.ts --target release",
     "compile-cpp": "run-script-os",
     "compile-cpp:linux": "./scripts/cpp-build.sh",
     "compile-cpp:win32": "wsl -e ./scripts/cpp-build.sh",
@@ -99,16 +100,17 @@
     "watch": "run-p compile-watch bundle-watch",
     "serve-docs": "vitepress serve docs",
     "serve": "ws",
-    "lint": "eslint src/**/*.ts",
+    "lint": "eslint src-ts/**/*.ts",
     "lint-fix": "npm run lint -- --fix",
     "test-cli": "node ./bin/dot-wasm.js -v",
     "test-cli-help": "node ./bin/dot-wasm.js",
-    "test-bundle": "npx -y esbuild --bundle ./dist/base91.umd.js --bundle ./dist/base91.js --outdir=tmp",
-    "test-bundle-node": "npx -y esbuild --bundle --platform=node --bundle ./dist/base91.umd.js ./dist/base91.js --outdir=tmp",
+    "test-bundle": "npx -y esbuild --format=esm --bundle ./dist/base91.js --outdir=tmp",
+    "test-bundle-umd": "npx -y esbuild --platform=node --bundle ./dist/base91.umd.js --outdir=tmp",
+    "test-bundle-node": "npx -y esbuild --platform=node --bundle ./dist/base91.js --outdir=tmp",
     "test-chrome": "karma start --single-run --browsers ChromeHeadless karma.conf.cjs",
     "test-firefox": "karma start --single-run --browsers Firefox karma.conf.cjs",
     "test-node": "node ./bin/dot-wasm.js -v && mocha ./dist-test/index.node.cjs --reporter spec && mocha ./dist-test/index.node.js --reporter spec",
-    "test": "run-s test-bundle test-bundle-node test-chrome test-node",
+    "test": "run-s test-bundle test-bundle-node test-bundle-umd test-chrome test-node",
     "coverage": "nyc npm run test-node",
     "coverage-report": "nyc report --reporter=lcov",
     "tag": "run-s standard-version git-push",
@@ -131,6 +133,7 @@
     "@types/yargs": "17.0.17",
     "@typescript-eslint/eslint-plugin": "5.47.0",
     "@typescript-eslint/parser": "5.47.0",
+    "assemblyscript": "0.25.2",
     "chai": "4.3.7",
     "coveralls": "3.1.1",
     "eslint": "8.30.0",
@@ -167,4 +170,4 @@
     "url": "https://github.com/hpcc-systems/hpcc-js-wasm/issues"
   },
   "homepage": "https://hpcc-systems.github.io/hpcc-js-wasm/"
-}
+}
diff --git a/scripts/cpp-install-graphviz.sh b/scripts/cpp-install-graphviz.sh
@@ -4,15 +4,15 @@
 # UPDATE README.md
 VERSION=7.0.5
 
-if [ ! -d "src-graphviz" ] 
+if [ ! -d "third-party/graphviz" ] 
 then
     wget -c https://gitlab.com/graphviz/graphviz/-/archive/$VERSION/graphviz-$VERSION.tar.gz
-    mkdir ./src-graphviz
-    tar -xzf ./graphviz-$VERSION.tar.gz -C ./src-graphviz --strip-components=1
+    mkdir -p ./third-party/graphviz
+    tar -xzf ./graphviz-$VERSION.tar.gz -C ./third-party/graphviz --strip-components=1
     rm ./graphviz-$VERSION.tar.gz
 
     #  Generate grammar files (and others)  ---
-    cd ./src-graphviz
+    cd ./third-party/graphviz
     mkdir ./build
     cd ./build
     cmake .. -Dwith_gvedit=OFF

diff --git a/src-asm/index.ts b/src-asm/index.ts
@@ -0,0 +1,5 @@
+// The entry file of your WebAssembly module.
+
+export function add(a: i32, b: i32): i32 {
+  return a + b;
+}
diff --git a/src-asm/tsconfig.json b/src-asm/tsconfig.json
@@ -0,0 +1,6 @@
+{
+  "extends": "assemblyscript/std/assembly.json",
+  "include": [
+    "./**/*.ts"
+  ]
+}
diff --git a/cpp/CMakeLists.txt → src-cpp/CMakeLists.txt b/cpp/CMakeLists.txt → src-cpp/CMakeLists.txt
diff --git a/cpp/base91/CMakeLists.txt → src-cpp/base91/CMakeLists.txt b/cpp/base91/CMakeLists.txt → src-cpp/base91/CMakeLists.txt
diff --git a/cpp/base91/main.cpp → src-cpp/base91/main.cpp b/cpp/base91/main.cpp → src-cpp/base91/main.cpp
diff --git a/cpp/base91/main.idl → src-cpp/base91/main.idl b/cpp/base91/main.idl → src-cpp/base91/main.idl
diff --git a/cpp/expat/CMakeLists.txt → src-cpp/expat/CMakeLists.txt b/cpp/expat/CMakeLists.txt → src-cpp/expat/CMakeLists.txt
diff --git a/cpp/expat/config.h → src-cpp/expat/config.h b/cpp/expat/config.h → src-cpp/expat/config.h
diff --git a/cpp/expat/expat_config.h → src-cpp/expat/expat_config.h b/cpp/expat/expat_config.h → src-cpp/expat/expat_config.h
diff --git a/cpp/expat/expatlib/CMakeLists.txt → src-cpp/expat/expatlib/CMakeLists.txt b/cpp/expat/expatlib/CMakeLists.txt → src-cpp/expat/expatlib/CMakeLists.txt
diff --git a/cpp/expat/expatlib/main.cpp → src-cpp/expat/expatlib/main.cpp b/cpp/expat/expatlib/main.cpp → src-cpp/expat/expatlib/main.cpp
diff --git a/cpp/expat/expatlib/main.idl → src-cpp/expat/expatlib/main.idl b/cpp/expat/expatlib/main.idl → src-cpp/expat/expatlib/main.idl
diff --git a/cpp/expat/expatlib/stack_parser.h → src-cpp/expat/expatlib/stack_parser.h b/cpp/expat/expatlib/stack_parser.h → src-cpp/expat/expatlib/stack_parser.h
diff --git a/cpp/graphviz/CMakeLists.txt → src-cpp/graphviz/CMakeLists.txt b/cpp/graphviz/CMakeLists.txt → src-cpp/graphviz/CMakeLists.txt
diff --git a/src-cpp/graphviz/config.h b/src-cpp/graphviz/config.h
@@ -0,0 +1,2 @@
+#include "../../third-party/graphviz/build/config.h"
+#define SFDP 1
diff --git a/cpp/graphviz/graphvizlib/CMakeLists.txt → src-cpp/graphviz/graphvizlib/CMakeLists.txt b/cpp/graphviz/graphvizlib/CMakeLists.txt → src-cpp/graphviz/graphvizlib/CMakeLists.txt
diff --git a/cpp/graphviz/graphvizlib/main.cpp → src-cpp/graphviz/graphvizlib/main.cpp b/cpp/graphviz/graphvizlib/main.cpp → src-cpp/graphviz/graphvizlib/main.cpp
diff --git a/cpp/graphviz/graphvizlib/main.hpp → src-cpp/graphviz/graphvizlib/main.hpp b/cpp/graphviz/graphvizlib/main.hpp → src-cpp/graphviz/graphvizlib/main.hpp
diff --git a/cpp/graphviz/graphvizlib/main.idl → src-cpp/graphviz/graphvizlib/main.idl b/cpp/graphviz/graphvizlib/main.idl → src-cpp/graphviz/graphvizlib/main.idl
diff --git a/cpp/graphviz/lib/CMakeLists.txt → src-cpp/graphviz/lib/CMakeLists.txt b/cpp/graphviz/lib/CMakeLists.txt → src-cpp/graphviz/lib/CMakeLists.txt
diff --git a/cpp/graphviz/lib/cdt/CMakeLists.txt → src-cpp/graphviz/lib/cdt/CMakeLists.txt b/cpp/graphviz/lib/cdt/CMakeLists.txt → src-cpp/graphviz/lib/cdt/CMakeLists.txt
diff --git a/cpp/graphviz/lib/cgraph++/CMakeLists.txt → src-cpp/graphviz/lib/cgraph++/CMakeLists.txt b/cpp/graphviz/lib/cgraph++/CMakeLists.txt → src-cpp/graphviz/lib/cgraph++/CMakeLists.txt
diff --git a/cpp/graphviz/lib/cgraph/CMakeLists.txt → src-cpp/graphviz/lib/cgraph/CMakeLists.txt b/cpp/graphviz/lib/cgraph/CMakeLists.txt → src-cpp/graphviz/lib/cgraph/CMakeLists.txt
diff --git a/cpp/graphviz/lib/circogen/CMakeLists.txt → src-cpp/graphviz/lib/circogen/CMakeLists.txt b/cpp/graphviz/lib/circogen/CMakeLists.txt → src-cpp/graphviz/lib/circogen/CMakeLists.txt
diff --git a/cpp/graphviz/lib/common/CMakeLists.txt → src-cpp/graphviz/lib/common/CMakeLists.txt b/cpp/graphviz/lib/common/CMakeLists.txt → src-cpp/graphviz/lib/common/CMakeLists.txt
diff --git a/cpp/graphviz/lib/dotgen/CMakeLists.txt → src-cpp/graphviz/lib/dotgen/CMakeLists.txt b/cpp/graphviz/lib/dotgen/CMakeLists.txt → src-cpp/graphviz/lib/dotgen/CMakeLists.txt
diff --git a/cpp/graphviz/lib/fdpgen/CMakeLists.txt → src-cpp/graphviz/lib/fdpgen/CMakeLists.txt b/cpp/graphviz/lib/fdpgen/CMakeLists.txt → src-cpp/graphviz/lib/fdpgen/CMakeLists.txt
diff --git a/cpp/graphviz/lib/gvc++/CMakeLists.txt → src-cpp/graphviz/lib/gvc++/CMakeLists.txt b/cpp/graphviz/lib/gvc++/CMakeLists.txt → src-cpp/graphviz/lib/gvc++/CMakeLists.txt
diff --git a/cpp/graphviz/lib/gvc/CMakeLists.txt → src-cpp/graphviz/lib/gvc/CMakeLists.txt b/cpp/graphviz/lib/gvc/CMakeLists.txt → src-cpp/graphviz/lib/gvc/CMakeLists.txt
diff --git a/cpp/graphviz/lib/ingraphs/CMakeLists.txt → src-cpp/graphviz/lib/ingraphs/CMakeLists.txt b/cpp/graphviz/lib/ingraphs/CMakeLists.txt → src-cpp/graphviz/lib/ingraphs/CMakeLists.txt
diff --git a/cpp/graphviz/lib/label/CMakeLists.txt → src-cpp/graphviz/lib/label/CMakeLists.txt b/cpp/graphviz/lib/label/CMakeLists.txt → src-cpp/graphviz/lib/label/CMakeLists.txt
diff --git a/cpp/graphviz/lib/neatogen/CMakeLists.txt → src-cpp/graphviz/lib/neatogen/CMakeLists.txt b/cpp/graphviz/lib/neatogen/CMakeLists.txt → src-cpp/graphviz/lib/neatogen/CMakeLists.txt
diff --git a/cpp/graphviz/lib/ortho/CMakeLists.txt → src-cpp/graphviz/lib/ortho/CMakeLists.txt b/cpp/graphviz/lib/ortho/CMakeLists.txt → src-cpp/graphviz/lib/ortho/CMakeLists.txt
diff --git a/cpp/graphviz/lib/osage/CMakeLists.txt → src-cpp/graphviz/lib/osage/CMakeLists.txt b/cpp/graphviz/lib/osage/CMakeLists.txt → src-cpp/graphviz/lib/osage/CMakeLists.txt
diff --git a/cpp/graphviz/lib/pack/CMakeLists.txt → src-cpp/graphviz/lib/pack/CMakeLists.txt b/cpp/graphviz/lib/pack/CMakeLists.txt → src-cpp/graphviz/lib/pack/CMakeLists.txt
diff --git a/cpp/graphviz/lib/patchwork/CMakeLists.txt → ...cpp/graphviz/lib/patchwork/CMakeLists.txt b/cpp/graphviz/lib/patchwork/CMakeLists.txt → ...cpp/graphviz/lib/patchwork/CMakeLists.txt
diff --git a/cpp/graphviz/lib/pathplan/CMakeLists.txt → src-cpp/graphviz/lib/pathplan/CMakeLists.txt b/cpp/graphviz/lib/pathplan/CMakeLists.txt → src-cpp/graphviz/lib/pathplan/CMakeLists.txt
diff --git a/cpp/graphviz/lib/rbtree/CMakeLists.txt → src-cpp/graphviz/lib/rbtree/CMakeLists.txt b/cpp/graphviz/lib/rbtree/CMakeLists.txt → src-cpp/graphviz/lib/rbtree/CMakeLists.txt
diff --git a/cpp/graphviz/lib/sfdpgen/CMakeLists.txt → src-cpp/graphviz/lib/sfdpgen/CMakeLists.txt b/cpp/graphviz/lib/sfdpgen/CMakeLists.txt → src-cpp/graphviz/lib/sfdpgen/CMakeLists.txt
diff --git a/cpp/graphviz/lib/sparse/CMakeLists.txt → src-cpp/graphviz/lib/sparse/CMakeLists.txt b/cpp/graphviz/lib/sparse/CMakeLists.txt → src-cpp/graphviz/lib/sparse/CMakeLists.txt
diff --git a/cpp/graphviz/lib/twopigen/CMakeLists.txt → src-cpp/graphviz/lib/twopigen/CMakeLists.txt b/cpp/graphviz/lib/twopigen/CMakeLists.txt → src-cpp/graphviz/lib/twopigen/CMakeLists.txt
diff --git a/cpp/graphviz/lib/vpsc/CMakeLists.txt → src-cpp/graphviz/lib/vpsc/CMakeLists.txt b/cpp/graphviz/lib/vpsc/CMakeLists.txt → src-cpp/graphviz/lib/vpsc/CMakeLists.txt
diff --git a/cpp/graphviz/lib/xdot/CMakeLists.txt → src-cpp/graphviz/lib/xdot/CMakeLists.txt b/cpp/graphviz/lib/xdot/CMakeLists.txt → src-cpp/graphviz/lib/xdot/CMakeLists.txt
diff --git a/cpp/graphviz/plugin/CMakeLists.txt → src-cpp/graphviz/plugin/CMakeLists.txt b/cpp/graphviz/plugin/CMakeLists.txt → src-cpp/graphviz/plugin/CMakeLists.txt
diff --git a/cpp/graphviz/plugin/core/CMakeLists.txt → src-cpp/graphviz/plugin/core/CMakeLists.txt b/cpp/graphviz/plugin/core/CMakeLists.txt → src-cpp/graphviz/plugin/core/CMakeLists.txt
diff --git a/...graphviz/plugin/dot_layout/CMakeLists.txt → ...graphviz/plugin/dot_layout/CMakeLists.txt b/...graphviz/plugin/dot_layout/CMakeLists.txt → ...graphviz/plugin/dot_layout/CMakeLists.txt
diff --git a/...aphviz/plugin/neato_layout/CMakeLists.txt → ...aphviz/plugin/neato_layout/CMakeLists.txt b/...aphviz/plugin/neato_layout/CMakeLists.txt → ...aphviz/plugin/neato_layout/CMakeLists.txt
diff --git a/cpp/src/post.js → src-cpp/src/post.js b/cpp/src/post.js → src-cpp/src/post.js
diff --git a/cpp/src/pre.js → src-cpp/src/pre.js b/cpp/src/pre.js → src-cpp/src/pre.js
diff --git a/cpp/zstd/CMakeLists.txt → src-cpp/zstd/CMakeLists.txt b/cpp/zstd/CMakeLists.txt → src-cpp/zstd/CMakeLists.txt
diff --git a/cpp/zstd/main.cpp → src-cpp/zstd/main.cpp b/cpp/zstd/main.cpp → src-cpp/zstd/main.cpp
diff --git a/cpp/zstd/main.idl → src-cpp/zstd/main.idl b/cpp/zstd/main.idl → src-cpp/zstd/main.idl
diff --git a/src/__bin__/dot-wasm.ts → src-ts/__bin__/dot-wasm.ts b/src/__bin__/dot-wasm.ts → src-ts/__bin__/dot-wasm.ts
diff --git a/src/__tests__/base91.ts → src-ts/__tests__/base91.ts b/src/__tests__/base91.ts → src-ts/__tests__/base91.ts
diff --git a/src/__tests__/browser-tests.ts → src-ts/__tests__/browser-tests.ts b/src/__tests__/browser-tests.ts → src-ts/__tests__/browser-tests.ts
diff --git a/src/__tests__/dot001.ts → src-ts/__tests__/dot001.ts b/src/__tests__/dot001.ts → src-ts/__tests__/dot001.ts
diff --git a/src/__tests__/dot002.ts → src-ts/__tests__/dot002.ts b/src/__tests__/dot002.ts → src-ts/__tests__/dot002.ts
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		#include "../../third-party/graphviz/build/config.h"
		#define SFDP 1