@model-create/epanet-engine 0.7.1-alpha.3 → 0.8.0-alpha.2

package/package.json

@@ -1,22 +1,22 @@
 {
   "name": "@model-create/epanet-engine",
-  "version": "0.7.1-alpha.3",
-  "description": "",
+  "version": "0.8.0-alpha.2",
+  "type": "module",
+  "description": "EPANET WASM engine",
   "main": "dist/index.js",
-  "module": "dist/index.es6.js",
   "typings": "dist/index.d.ts",
-  "scripts": {
-    "build:dockerimage": "docker build -t mydockerimage .",
-    "build:emscripten": "docker run --rm -v \"$(pwd):/src\" mydockerimage ./build.sh",
-    "build:app": "cp index.html dist/index.html",
-    "build:typings": "cp src/index.d.ts dist/index.d.ts",
-    "build": "yarn run build:emscripten && yarn run build:app && yarn run build:typings",
-    "serve": "http-server -c0 dist"
-  },
   "keywords": [],
-  "devDependencies": {
-    "http-server": "*"
-  },
+  "files": [
+    "dist"
+  ],
   "author": "",
-  "license": "ISC"
-}
+  "license": "MIT",
+  "scripts": {
+    "build:dockerimage": "docker build -t epanet-js-engine .",
+    "build:dockerimage-arm64": "docker build --build-arg EMSDK_TAG_SUFFIX='-arm64' -t epanet-js-engine .",
+    "build:emscripten": "docker run --rm -v \"$(pwd):/src\" epanet-js-engine ./build.sh",
+    "build:types": "node type-gen/create-types.js",
+    "build": "npm run build:dockerimage && npm run build:emscripten && npm run build:types",
+    "build:arm64": "npm run build:dockerimage-arm64 && npm run build:emscripten && npm run build:types"
+  }
+}

package/Dockerfile

@@ -1,9 +0,0 @@
-FROM emscripten/emsdk:3.1.15
-
-RUN apt-get update && \
-    apt-get install -qqy git && \
-    mkdir -p /opt/epanet/build && \
-    git clone --depth 1 --branch v2.2 https://github.com/OpenWaterAnalytics/EPANET /opt/epanet/src
-RUN cd /opt/epanet/build && \
-    emcmake cmake ../src  && \
-    emmake cmake --build . --config Release

package/build.sh

@@ -1,58 +0,0 @@
-#!/bin/bash
-
-set -e
-
-# Useful debug flags for emcc
-#    -s ASSERTIONS=1 \
-#    -s SAFE_HEAP=1 \
-#    -s STACK_OVERFLOW_CHECK=1 \
-#    -s DEMANGLE_SUPPORT=1 \
-# -fsanitize=address
-
-echo "============================================="
-echo "Compiling wasm bindings"
-echo "============================================="
-(
-
-  mkdir -p build
-
-  # Compile C/C++ code
-  emcc -O3 -o ./build/epanetEngine.js /opt/epanet/build/lib/libepanet2.a \
-    -I /opt/epanet/src/include \
-    test.c \
-    src/epanet_wrapper.cpp \
-    --bind \
-    -s EXPORTED_FUNCTIONS="['_EN_geterror','_EN_getversion']" \
-    -s NO_EXIT_RUNTIME="1" \
-	    -s DEAD_FUNCTIONS="[]" \
-	    -s FORCE_FILESYSTEM="1" \
-		-s ALLOW_MEMORY_GROWTH="1" \
-    -s ERROR_ON_UNDEFINED_SYMBOLS=0 \
-	    -s EXPORTED_RUNTIME_METHODS='["ccall", "getValue", "UTF8ToString", "intArrayToString","FS"]' \
-		-s WASM=1 \
-		-s SINGLE_FILE=1 \
-    -msimd128 \
-    -s WASM_ASYNC_COMPILATION=0 \
-		--memory-init-file 0 \
-    --closure 0
-    #-s MODULARIZE=1 \
-
-    # -msimd128 Enable SIMD  https://jott.live/markdown/wasm_vector_addition
-
-		#-s BINARYEN_ASYNC_COMPILATION=0 \
-    #-s MODULARIZE=1 \
-
-		cat src/wrapper/cjs-prefix.js build/epanetEngine.js src/wrapper/cjs-postfix.js >> index.js
-		cat build/epanetEngine.js src/wrapper/es6-postfix.js >> index.es6.js
-
-
-  # Create output folder
-  mkdir -p dist
-  # Move artifacts
-  mv index.js dist
-  mv index.es6.js dist
-
-)
-echo "============================================="
-echo "Compiling wasm bindings done"
-echo "============================================="