Try doing a module version

LivInTheLookingGlass · Aug 21, 2024 · ba93637 · ba93637
1 parent 8d3a4cb
commit ba93637
Show file tree

Hide file tree

Showing 6 changed files with 88 additions and 82 deletions.
diff --git a/.github/workflows/pages.yml b/.github/workflows/pages.yml
@@ -47,11 +47,10 @@ jobs:
     - uses: actions-rs/toolchain@v1
       with:
         toolchain: stable
+        default: true
+        target: wasm32-unknown-unknown
 
-    - run: |
-        rustup default stable
-        rustup target add wasm32-unknown-unknown
-        cargo install wasm-pack
+    - run: cargo install wasm-pack
 
     - uses: mymindstorm/setup-emsdk@v14
       with:

diff --git a/c/Makefile b/c/Makefile
@@ -68,9 +68,9 @@ native_test: native
 clean:
 	@rm -rf build dist {.,*,*/*}/{*.pyc,__pycache__,.mypy_cache,.pytest_cache,.benchmarks} || echo
 
-dist/lib.wasm: build/c-lib.c
+dist/c-lib.wasm: build/lib.c
 	@mkdir -p dist
-	@emcc build/lib.c -Wl,--whole-archive -DUNITY_END -O$(O) -o dist/c-lib.js
+	@emcc build/lib.c -Wl,--whole-archive -DUNITY_END -O$(O) -o dist/c-lib.mjs
 
 build/lib.c: ../LICENSE
 	@mkdir -p build

diff --git a/cplusplus/Makefile b/cplusplus/Makefile
@@ -62,7 +62,7 @@ clean:
 
 dist/cp-lib.wasm: build/lib.cpp
 	@mkdir -p dist
-	@emcc build/lib.cpp -Wl,--whole-archive -DUNITY_END -O$(O) -o dist/cp-lib.js
+	@emcc build/lib.cpp -Wl,--whole-archive -DUNITY_END -O$(O) -o dist/cp-lib.mjs
 
 build/lib.cpp: ../LICENSE
 	@mkdir -p build

diff --git a/docs/Makefile b/docs/Makefile
@@ -42,13 +42,16 @@ _static/dist/bundle.js:
 
 _static/dist/c-lib.js:
 	@$(MAKE) -C ../c dist/c-lib.wasm $(MFLAGS)
+	@mkdir -p _static/dist
 	@cp ../c/dist/c-lib.* _static/dist/
 
 _static/dist/cp-lib.js:
 	@$(MAKE) -C ../cplusplus dist/cp-lib.wasm $(MFLAGS)
-	@cp ../c/dist/cp-lib.* _static/dist/
+	@mkdir -p _static/dist
+	@cp ../cplusplus/dist/cp-lib.* _static/dist/
 
 _static/dist/rust.js:
+	@mkdir -p _static/dist
 	@cd ../rust && wasm-pack build --target web --out-dir ../docs/_static/dist/
 
 _static/dist/python.tar.gz:

diff --git a/docs/_static/test-c.html b/docs/_static/test-c.html
@@ -11,49 +11,51 @@
     <div id="mocha"></div>
     <!-- Mocha setup and initiation code -->
     <script type="module">
-      import * as wasm from './dist/c/lib.js';
+      import Module from './dist/c-lib.mjs';
       mocha.setup('bdd');
       window.onload = function() {
-        for (let p = 1; p < 10000; p++) {
-          const formattedQuestion = `${p}`.padStart(4, '0');
-          const func = wasm[`_p${formattedQuestion}`];
-          if (func === undefined) continue;
-          const expected = wasm._get_answer(p);
-          describe(`run test ${p}`, function() {
-            this.timeout(Infinity);
-            it(`should return ${expected}`, async () => {
-              const answer = func();
-              console.log(p, answer, expected);
-              if (answer !== expected) {
-                throw new Error();
-              }
+        Module().then((wasm) => {
+          for (let p = 1; p < 10000; p++) {
+            const formattedQuestion = `${p}`.padStart(4, '0');
+            const func = wasm[`_p${formattedQuestion}`];
+            if (func === undefined) continue;
+            const expected = wasm._get_answer(p);
+            describe(`run test ${p}`, function() {
+              this.timeout(Infinity);
+              it(`should return ${expected}`, async () => {
+                const answer = func();
+                console.log(p, answer, expected);
+                if (answer !== expected) {
+                  throw new Error();
+                }
+              });
             });
-          });
-        }
-        const runner = mocha.run();
-        let failedTests = [];
+          }
+          const runner = mocha.run();
+          let failedTests = [];
 
-        runner.on('end', function() {
-          window.mochaResults = runner.stats;
-          window.mochaResults.reports = failedTests;
-        });
+          runner.on('end', function() {
+            window.mochaResults = runner.stats;
+            window.mochaResults.reports = failedTests;
+          });
 
-        runner.on('fail', function(test, err){
-          const flattenTitles = function(test){
-            let titles = [];
-            while (test.parent.title){
-              titles.push(test.parent.title);
-              test = test.parent;
-            }
-            return titles.reverse();
-          };
+          runner.on('fail', function(test, err){
+            const flattenTitles = function(test){
+              let titles = [];
+              while (test.parent.title){
+                titles.push(test.parent.title);
+                test = test.parent;
+              }
+              return titles.reverse();
+            };
 
-          failedTests.push({
-            name: test.title,
-            result: false,
-            message: err.message,
-            stack: err.stack,
-            titles: flattenTitles(test)
+            failedTests.push({
+              name: test.title,
+              result: false,
+              message: err.message,
+              stack: err.stack,
+              titles: flattenTitles(test)
+            });
           });
         });
       };

diff --git a/docs/_static/test-cp.html b/docs/_static/test-cp.html
@@ -11,49 +11,51 @@
     <div id="mocha"></div>
     <!-- Mocha setup and initiation code -->
     <script type="module">
-      import * as wasm from './dist/cp/lib.js';
+      import Module from './dist/c-lib.mjs';
       mocha.setup('bdd');
       window.onload = function() {
-        for (let p = 1; p < 10000; p++) {
-          const formattedQuestion = `${p}`.padStart(4, '0');
-          const func = wasm[`_p${formattedQuestion}`];
-          if (func === undefined) continue;
-          const expected = wasm._get_answer(p);
-          describe(`run test ${p}`, function() {
-            this.timeout(Infinity);
-            it(`should return ${expected}`, async () => {
-              const answer = func();
-              console.log(p, answer, expected);
-              if (answer !== expected) {
-                throw new Error();
-              }
+        Module().then((wasm) => {
+          for (let p = 1; p < 10000; p++) {
+            const formattedQuestion = `${p}`.padStart(4, '0');
+            const func = wasm[`_p${formattedQuestion}`];
+            if (func === undefined) continue;
+            const expected = wasm._get_answer(p);
+            describe(`run test ${p}`, function() {
+              this.timeout(Infinity);
+              it(`should return ${expected}`, async () => {
+                const answer = func();
+                console.log(p, answer, expected);
+                if (answer !== expected) {
+                  throw new Error();
+                }
+              });
             });
-          });
-        }
-        const runner = mocha.run();
-        let failedTests = [];
+          }
+          const runner = mocha.run();
+          let failedTests = [];
 
-        runner.on('end', function() {
-          window.mochaResults = runner.stats;
-          window.mochaResults.reports = failedTests;
-        });
+          runner.on('end', function() {
+            window.mochaResults = runner.stats;
+            window.mochaResults.reports = failedTests;
+          });
 
-        runner.on('fail', function(test, err){
-          const flattenTitles = function(test){
-            let titles = [];
-            while (test.parent.title){
-              titles.push(test.parent.title);
-              test = test.parent;
-            }
-            return titles.reverse();
-          };
+          runner.on('fail', function(test, err){
+            const flattenTitles = function(test){
+              let titles = [];
+              while (test.parent.title){
+                titles.push(test.parent.title);
+                test = test.parent;
+              }
+              return titles.reverse();
+            };
 
-          failedTests.push({
-            name: test.title,
-            result: false,
-            message: err.message,
-            stack: err.stack,
-            titles: flattenTitles(test)
+            failedTests.push({
+              name: test.title,
+              result: false,
+              message: err.message,
+              stack: err.stack,
+              titles: flattenTitles(test)
+            });
           });
         });
       };