Emit async imports for variants (justjake#100)

* upgrade typescript

* attempt to use nodenext tsc

* revert enabling noUnused{Locals,Parameters}

* fix imports to use real extensions

* update mocha for ESM

* awkward async import issue

* npm run build

* examples/website: update for newer NPM, typescript

* fix behavior for webpack build

* bump emsdk to 3.1.31

* fix function signature

* cache another item

* use EMSDK 3.1.32 native, 3.1.31 in Docker

* add some extra default timeout

* Fix breakage caused by upgrade

* rebuild

* More precise/strict compilation (drop support for node<16)

* rebuild

* add note about MINIMAL_RUNTIME

* tested website

* ?

* pretty

Author: justjake

.github/workflows/main.yml

@@ -30,16 +30,15 @@ jobs:
         if: matrix.platform == 'macos-latest'
 
       - name: Setup Node.js environment
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v3
         with:
-          # Version Spec of the version to use.  Examples: 10.x, 10.15.1, >=10.15.0
-          node-version: 12.x
+          node-version: 16
 
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
-      - name: Cache dependencies
-        uses: actions/cache@v2
+      - name: Yarn cache
+        uses: actions/cache@v3
         with:
           path: "**/.yarn/cache"
           key: ${{ hashFiles('**/yarn.lock') }}
@@ -49,6 +48,12 @@ jobs:
         env:
           YARN_ENABLE_SCRIPTS: 0
 
+      - name: EMSDK cache
+        uses: actions/cache@v3
+        with:
+          path: "emsdk-cache"
+          key: ${{ hashFiles('scripts/emcc.sh') }}
+
       - name: Build
         run: yarn build
 

.gitignore

@@ -7,6 +7,7 @@ npm-error.log
 
 /build
 /dist
+/emsdk-cache
 
 # QuickJS build stuff
 /quickjs/test_fib.c
@@ -24,6 +25,5 @@ npm-error.log
 /quickjs/repl.c
 /quickjs/run-test262
 
-
 **/.yarn/*
 !/.yarn/releases

.mocharc.cjs

@@ -0,0 +1,22 @@
+"use strict"
+
+// https://mochajs.org/#configuring-mocha-nodejs
+
+module.exports = {
+  // https://typestrong.org/ts-node/docs/recipes/mocha/
+  require: [
+    // Specify "require" for CommonJS
+    // "ts-node/register",
+    "source-map-support/register",
+  ],
+  // Specify "loader" for native ESM
+  loader: "ts-node/esm",
+  extensions: ["js", "ts", "tsx"],
+  timeout: 5000,
+
+  "watch-files": [
+    "ts/**/*",
+    "build/**/*.js",
+    // "build/**/*.ts",
+  ],
+}

Makefile

@@ -1,8 +1,8 @@
 # Tools
 CC=clang
-EMSDK_VERSION=3.1.7
-EMSDK_DOCKER_IMAGE=emscripten/emsdk:$(EMSDK_VERSION)
-EMCC=EMSDK_VERSION=$(EMSDK_VERSION) EMSDK_DOCKER_IMAGE=$(EMSDK_DOCKER_IMAGE) EMSDK_DOCKER_CACHE=$(THIS_DIR)/$(BUILD_EMSDK_CACHE)/$(EMSDK_VERSION) scripts/emcc.sh
+EMSDK_VERSION=3.1.32
+EMSDK_DOCKER_IMAGE=emscripten/emsdk:3.1.31 # .32 not released to Docker hub.
+EMCC=EMSDK_VERSION=$(EMSDK_VERSION) EMSDK_DOCKER_IMAGE=$(EMSDK_DOCKER_IMAGE) EMSDK_DOCKER_CACHE=$(THIS_DIR)/emsdk-cache/$(EMSDK_VERSION) scripts/emcc.sh
 GENERATE_TS=$(VARIANT_GENERATE_TS_ENV) npx ts-node generate.ts
 PRETTIER=npx prettier
 THIS_DIR := $(dir $(abspath $(firstword $(MAKEFILE_LIST))))
@@ -41,7 +41,6 @@ WRAPPER_ROOT=c
 BUILD_ROOT=build
 BUILD_WRAPPER=$(BUILD_ROOT)/wrapper
 BUILD_QUICKJS=$(BUILD_ROOT)/quickjs
-BUILD_EMSDK_CACHE=$(BUILD_ROOT)/emsdk-cache
 BUILD_TS=ts/generated
 
 # QuickJS
@@ -51,25 +50,44 @@ QUICKJS_DEFINES:=-D_GNU_SOURCE -DCONFIG_VERSION=\"$(QUICKJS_CONFIG_VERSION)\" -D
 VARIANT_QUICKJS_OBJS=$(patsubst %.o, $(BUILD_QUICKJS)/%.$(VARIANT).o, $(QUICKJS_OBJS))
 
 # quickjs-emscripten
+WRAPPER_DEFINES+=-Wcast-function-type   # Likewise, warns about some quickjs casts we don't control.
 EMCC_EXPORTED_FUNCS+=-s EXPORTED_FUNCTIONS=@$(BUILD_WRAPPER)/symbols.json
 EMCC_EXPORTED_FUNCS_ASYNCIFY+=-s EXPORTED_FUNCTIONS=@$(BUILD_WRAPPER)/symbols.asyncify.json
 
 # Emscripten options
 CFLAGS_WASM+=-s WASM=1
 CFLAGS_WASM+=-s [email protected]
-CFLAGS_WASM+=-s NODEJS_CATCH_EXIT=0
 CFLAGS_WASM+=-s MODULARIZE=1
 CFLAGS_WASM+=-s EXPORT_NAME=QuickJSRaw
 CFLAGS_WASM+=-s INVOKE_RUN=0
 CFLAGS_WASM+=-s ALLOW_MEMORY_GROWTH=1
 CFLAGS_WASM+=-s ALLOW_TABLE_GROWTH=1
+CFLAGS_WASM+=-s STACK_SIZE=5MB
+# CFLAGS_WASM+=-s MINIMAL_RUNTIME=1 # Appears to break MODULARIZE
+CFLAGS_WASM+=-s SUPPORT_ERRNO=0
+
+# Emscripten options - like STRICT
+# https://github.com/emscripten-core/emscripten/blob/fa339b76424ca9fbe5cf15faea0295d2ac8d58cc/src/settings.js#L1095-L1109
+# CFLAGS_WASM+=-s STRICT_JS=1 # Doesn't work with MODULARIZE
+CFLAGS_WASM+=-s IGNORE_MISSING_MAIN=0 --no-entry
+CFLAGS_WASM+=-s AUTO_JS_LIBRARIES=0
+CFLAGS_WASM+=-s -lccall.js
+CFLAGS_WASM+=-s AUTO_NATIVE_LIBRARIES=0
+CFLAGS_WASM+=-s AUTO_ARCHIVE_INDEXES=0
+CFLAGS_WASM+=-s DEFAULT_TO_CXX=0
+CFLAGS_WASM+=-s ALLOW_UNIMPLEMENTED_SYSCALLS=0
+
+# Emscripten options - NodeJS
+CFLAGS_WASM+=-s MIN_NODE_VERSION=160000
+CFLAGS_WASM+=-s NODEJS_CATCH_EXIT=0
 
 # Empscripten options for asyncify variant
 # https://emscripten.org/docs/porting/asyncify.html
 CFLAGS_WASM_ASYNCIFY+=-s ASYNCIFY=1
 CFLAGS_WASM_ASYNCIFY+=-DQTS_ASYNCIFY=1
 CFLAGS_WASM_ASYNCIFY+=-s ASYNCIFY_REMOVE=@$(BUILD_WRAPPER)/asyncify-remove.json
 CFLAGS_WASM_ASYNCIFY+=-s ASYNCIFY_IMPORTS=@$(BUILD_WRAPPER)/asyncify-imports.json
+CFLAGS_WASM_ASYNCIFY+=-lasync.js
 GENERATE_TS_ENV_ASYNCIFY+=ASYNCIFY=true
 
 # Release options
@@ -82,8 +100,10 @@ CFLAGS_WASM_RELEASE+=-s FILESYSTEM=0
 
 # Debug options
 GENERATE_TS_ENV_DEBUG+=DEBUG=true
+
 CFLAGS_DEBUG+=-O0
 CFLAGS_DEBUG+=-DQTS_DEBUG_MODE
+
 CFLAGS_WASM_DEBUG+=-gsource-map
 CFLAGS_WASM_DEBUG+=-s ASSERTIONS=1
 
@@ -202,15 +222,15 @@ WASM_SYMBOLS=$(BUILD_WRAPPER)/symbols.json $(BUILD_WRAPPER)/asyncify-remove.json
 
 $(BUILD_TS)/emscripten-module.$(VARIANT).js: $(BUILD_WRAPPER)/interface.$(VARIANT).o $(VARIANT_QUICKJS_OBJS) $(WASM_SYMBOLS) | scripts/emcc.sh
 	$(MKDIRP)
-	$(EMCC) $(VARIANT_CFLAGS) $(EMCC_EXPORTED_FUNCS) -o $@ $< $(VARIANT_QUICKJS_OBJS)
+	$(EMCC) $(VARIANT_CFLAGS) $(WRAPPER_DEFINES) $(EMCC_EXPORTED_FUNCS) -o $@ $< $(VARIANT_QUICKJS_OBJS)
 
 $(BUILD_TS)/emscripten-module.$(VARIANT).d.ts: ts/types-generated/emscripten-module.$(SYNC).d.ts
 	echo '// Generated from $<' > $@
 	cat $< >> $@
 
 $(BUILD_WRAPPER)/%.WASM_$(RELEASE)_$(SYNC).o: $(WRAPPER_ROOT)/%.c $(WASM_SYMBOLS) | scripts/emcc.sh
 	$(MKDIRP)
-	$(EMCC) $(VARIANT_CFLAGS) $(CFLAGS_SORTED_FUNCS) -c -o $@ $<
+	$(EMCC) $(VARIANT_CFLAGS) $(CFLAGS_SORTED_FUNCS) $(WRAPPER_DEFINES) -c -o $@ $<
 
 $(BUILD_QUICKJS)/%.WASM_$(RELEASE)_$(SYNC).o: $(QUICKJS_ROOT)/%.c $(WASM_SYMBOLS) | scripts/emcc.sh
 	$(MKDIRP)

README.md

@@ -567,8 +567,11 @@ the Javascript parts of the library without setting up the Emscripten toolchain.
 
 Intermediate object files from QuickJS end up in ./build/quickjs/.
 
-This project uses `emscripten 3.1.7` via Docker. You will need a working `docker`
-install to build the Emscripten artifacts.
+This project uses `emscripten 3.1.32`.
+
+- On ARM64, you should install `emscripten` on your machine. For example on macOS, `brew install emscripten`.
+- If _the correct version of emcc_ is not in your PATH, compilation falls back to using Docker.
+  On ARM64, this is 10-50x slower than native compilation, but it's just fine on x64.
 
 Related NPM scripts:
 
@@ -583,8 +586,7 @@ Related NPM scripts:
 The ./ts directory contains Typescript types and wraps the generated Emscripten
 FFI in a more usable interface.
 
-You'll need `node` and `npm` or `yarn`. Install dependencies with `npm install`
-or `yarn install`.
+You'll need `node` and `yarn`. Install dependencies with `yarn install`.
 
 - `yarn build` produces ./dist.
 - `yarn test` runs the tests.

c/interface.c

@@ -563,7 +563,7 @@ EM_JS(MaybeAsync(JSValue *), qts_host_call_function, (JSContext * ctx, JSValueCo
 #endif
 
 // Function: QuickJS -> C
-JSValue qts_call_function(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv, uint32_t magic) {
+JSValue qts_call_function(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv, int magic) {
   JSValue *result_ptr = qts_host_call_function(ctx, &this_val, argc, argv, magic);
   if (result_ptr == NULL) {
     return JS_UNDEFINED;

examples/typescript-smoketest/package-lock.json

@@ -3,9 +3,9 @@
 
 
 "quickjs-emscripten@file:../../build/quickjs-emscripten.tgz":
-  "integrity" "sha512-U+tgZEDv7qE8v68mp9amKnv7Am3bXL8OSDQdtFUKx75LCJYr/UdZGNy8NFvKHFBu0dtvm1L+bKu4wlcV0j4eQg=="
+  "integrity" "sha512-zsmoyZgRQM3p+//njVseFyF1EPGQouNZD3mUzu7bVdiuejLG528XlZn5sEiPbrhCWq8VMo2XW8Nm01ZRTw8Bgg=="
   "resolved" "file:../../build/quickjs-emscripten.tgz"
-  "version" "0.21.1"
+  "version" "0.21.2"
 
 "[email protected]":
   "integrity" "sha512-TCTIul70LyWe6IJWT8QSYeA54WQe8EjQFU4wY52Fasj5UKx88LNYKCgBEHcOMOrFF1rKGbD8v/xcNWVUq9SymA=="