Move to manual module initialization

Author: DSchroer

Dockerfile

@@ -24,6 +24,6 @@ RUN sed -e "s|-isystem /emsdk/upstream/emscripten/cache/sysroot/include[^/]||g"
 RUN sed -e "s|-lfontconfig|/emsdk/upstream/emscripten/cache/sysroot/lib/libglib-2.0.a /emsdk/upstream/emscripten/cache/sysroot/lib/libzip.a /emsdk/upstream/emscripten/cache/sysroot/lib/libz.a /emsdk/upstream/emscripten/cache/sysroot/lib/libfontconfig.a|g" -i ../build/CMakeFiles/OpenSCAD.dir/linklibs.rsp
 
 # Add emscripten flags here
-RUN sed -e "s|em++|em++ ${EMXX_FLAGS} -s USE_PTHREADS=0 -s NO_DISABLE_EXCEPTION_CATCHING -s FORCE_FILESYSTEM=1 -s ALLOW_MEMORY_GROWTH=1 -s EXPORTED_RUNTIME_METHODS=['FS','callMain'] -s EXPORT_ES6=1 -s ENVIRONMENT=web,worker -s MODULARIZE=1 -s EXPORT_NAME=OpenSCAD -s EXIT_RUNTIME=0|g" -i ../build/CMakeFiles/OpenSCAD.dir/link.txt
+RUN sed -e "s|em++|em++ ${EMXX_FLAGS} -s USE_PTHREADS=0 -s NO_DISABLE_EXCEPTION_CATCHING -s FORCE_FILESYSTEM=1 -s ALLOW_MEMORY_GROWTH=1 -s EXPORTED_RUNTIME_METHODS=['FS','callMain'] -s ENVIRONMENT=web,worker -s EXPORT_NAME=OpenSCAD -s EXIT_RUNTIME=1|g" -i ../build/CMakeFiles/OpenSCAD.dir/link.txt
 
 RUN cd ../build && make -j12 VERBOSE=1

Makefile

@@ -20,7 +20,7 @@ DOCKER_FLAGS= --build-arg CMAKE_BUILD_TYPE=Debug --build-arg EMXX_FLAGS="-gsourc
 endif
 
 .PHONY: build
-build: build/openscad.js build/openscad.fonts.js
+build: build/openscad.wasm.js build/openscad.fonts.js
 
 build/openscad.fonts.js: runtime/node_modules runtime/**/* res
 	mkdir -p build
@@ -30,16 +30,14 @@ build/openscad.fonts.js: runtime/node_modules runtime/**/* res
 runtime/node_modules:
 	cd runtime; npm install
 
-build/openscad.js: .image.make
+build/openscad.wasm.js: .image.make
 	mkdir -p build
 	docker run --name tmpcpy openscad
-	docker cp tmpcpy:/build/openscad.js build/
+	docker cp tmpcpy:/build/openscad.js build/openscad.wasm.js
 	docker cp tmpcpy:/build/openscad.wasm build/
 	docker cp tmpcpy:/build/openscad.wasm.map build/ || true
 	docker rm tmpcpy
 
-	sed -i '1s&^&/// <reference types="./openscad.d.ts" />\n&' build/openscad.js
-
 .image.make: .base-image.make Dockerfile
 	docker build libs/openscad -f Dockerfile -t $(DOCKER_TAG_OPENSCAD) ${DOCKER_FLAGS}
 	touch $@

runtime/plugins/type-reference.js

@@ -0,0 +1,12 @@
+import { resolve } from "path";
+
+export default function typeReference(file, name) {
+  return {
+    name: "type-reference",
+    transform(code, id) {
+      if (resolve(id) == resolve(file)) {
+        return `/// <reference types="./${name}.d.ts" />\n${code}`;
+      }
+    },
+  };
+}

runtime/rollup.config.js

@@ -1,5 +1,6 @@
 import typescript from "@rollup/plugin-typescript";
 import embedFile from "./plugins/embed-file";
+import typeReference from "./plugins/type-reference";
 
 const bundle = (name) => ({
   input: `src/${name}.ts`,
@@ -9,10 +10,13 @@ const bundle = (name) => ({
   },
   plugins: [
     embedFile(), 
-    typescript({ tsconfig: "./tsconfig.json" })],
+    typescript({ tsconfig: "./tsconfig.json" }),
+    typeReference(`src/${name}.ts`, name),
+  ]
 });
 
 export default [
+  bundle("openscad"),
   bundle("openscad.fonts"),
   bundle("openscad.mcad")
 ];

runtime/src/openscad.ts

@@ -5,6 +5,8 @@ export interface InitOptions {
 export interface OpenSCAD {
   callMain(args: Array<string>): number;
   FS: FS;
+  locateFile?: (path: string, prefix: string) => string;
+  onRuntimeInitialized?: () => void;
 }
 
 export interface FS {
@@ -19,8 +21,34 @@ export interface FS {
   unlink(path: string): void;
 }
 
-// deno-lint-ignore no-unused-vars
-export default function (init: InitOptions): Promise<OpenSCAD> {
-  // NULL implementation. Will be replaced by the actual OpenSCAD library
-  return null as unknown as Promise<OpenSCAD>;
+declare module globalThis {
+  let OpenSCAD: Partial<OpenSCAD> | undefined;
 }
+
+let wasmModule: string;
+
+async function OpenSCAD(options?: InitOptions): Promise<OpenSCAD> {
+  if (!wasmModule) {
+    const url = new URL(`./openscad.wasm.js`, import.meta.url).href;
+    const request = await fetch(url);
+    wasmModule = "data:text/javascript;base64," + btoa(await request.text());
+  }
+
+  const module: Partial<OpenSCAD> = {
+    noInitialRun: true,
+    locateFile: (path: string) => new URL(`./${path}`, import.meta.url).href,
+    ...options,
+  };
+
+  globalThis.OpenSCAD = module;
+  await import(wasmModule + `#${Math.random()}`);
+  delete globalThis.OpenSCAD;
+
+  await new Promise((resolve) => {
+    module.onRuntimeInitialized = () => resolve(null);
+  });
+
+  return module as unknown as OpenSCAD;
+}
+
+export default OpenSCAD;

runtime/tsconfig.json

@@ -2,6 +2,7 @@
   "include": ["src"],
   "exclude": ["dist"],
   "compilerOptions": {
+    "module": "esnext",
     "target": "esnext",
     "moduleResolution": "node",
     "esModuleInterop": false,