cpp.js 1.0.0-alpha.4 → 1.0.0-beta.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cpp.js",
-  "version": "1.0.0-alpha.4",
+  "version": "1.0.0-beta.1",
   "license": "MIT",
   "type": "module",
   "homepage": "https://cpp.js.org",

package/src/assets/browser.js

@@ -152,10 +152,23 @@ function initCppJs(userConfig = {}) {
                 return vector;
             },
         };
+        if (config.getWasmFunction) {
+            m.instantiateWasm = function instantiateWasm(info, receive) {
+                const instance = new WebAssembly.Instance(config.getWasmFunction(), info);
+                receive(instance);
+                return instance.exports;
+            };
+        }
         Module(m).then(resolve).catch(reject);
     });
 
     return cppJsPromise;
 }
 
+if (typeof globalThis === 'object') {
+    globalThis.CppJs = {
+        initCppJs,
+    };
+}
+
 export default initCppJs;

package/src/assets/node.js

@@ -121,10 +121,23 @@ function initCppJs(userConfig = {}) {
                 return vector;
             },
         };
+        if (config.getWasmFunction) {
+            m.instantiateWasm = function instantiateWasm(info, receive) {
+                const instance = new WebAssembly.Instance(config.getWasmFunction(), info);
+                receive(instance);
+                return instance.exports;
+            };
+        }
         Module(m).then(resolve).catch(reject);
     });
 
     return cppJsPromise;
 }
 
+if (typeof globalThis === 'object') {
+    globalThis.CppJs = {
+        initCppJs,
+    };
+}
+
 export default initCppJs;

package/src/functions/createBridge.js

@@ -1,23 +1,28 @@
-import glob from 'glob';
 import getBaseInfo from '../utils/getBaseInfo.js';
 import getPathInfo from '../utils/getPathInfo.js';
+import { getDependencyParams } from './getCmakeParams.js';
 import run from './run.js';
 
 const platform = 'Emscripten-x86_64';
 
 export default function createBridge(compiler) {
     const bridges = [];
+
+    const allHeaders = getDependencyParams(compiler.config).headerPathWithDepends.split(';');
+
+    let includePath = [
+        ...compiler.config.getAllDependencies().map((d) => `${d.paths.output}/prebuilt/${platform}/include`),
+        ...compiler.config.getAllDependencies().map((d) => `${d.paths.output}/prebuilt/${platform}/swig`),
+        ...compiler.config.paths.header,
+        ...allHeaders,
+    ].filter((path) => !!path.toString()).map((path) => `-I/tmp/cppjs/live/${getPathInfo(path, compiler.config.paths.base).relative}`);
+    includePath = [...new Set(includePath)];
+
     compiler.interfaces.forEach((filePath) => {
         const input = getPathInfo(filePath, compiler.config.paths.base);
         const output = getPathInfo(`${compiler.config.paths.temp}/bridge`, compiler.config.paths.base);
         const base = getBaseInfo(compiler.config.paths.base);
 
-        const includePath = [
-            ...compiler.config.getAllDependencies().map((d) => `${d.paths.output}/prebuilt/${platform}/include`),
-            ...compiler.config.getAllDependencies().map((d) => `${d.paths.output}/prebuilt/${platform}/swig`),
-            ...compiler.config.paths.header,
-        ].filter((path) => !!path.toString()).map((path) => `-I/tmp/cppjs/live/${getPathInfo(path, compiler.config.paths.base).relative}`);
-
         run(compiler, 'swig', [
             '-c++',
             '-embind',

package/src/functions/createWasm.js

@@ -6,7 +6,7 @@ import getLibs from './getLibs.js';
 import getData from './getData.js';
 import getPathInfo from '../utils/getPathInfo.js';
 
-export default async function createWasm(compiler, options, buildAll = false) {
+export default async function createWasm(compiler, options = {}, buildAll = false) {
     if (fs.existsSync('/tmp/cppjs/live')) fs.unlinkSync('/tmp/cppjs/live');
     fs.symlinkSync(compiler.config.paths.base, '/tmp/cppjs/live');
 
@@ -35,9 +35,9 @@ export default async function createWasm(compiler, options, buildAll = false) {
     run(compiler, 'emcc', [
         '-lembind', '-Wl,--whole-archive',
         ...libs, ...(options.cc || []),
-        '-s', 'WASM=1', '-s', 'MODULARIZE=1',
+        '-s', 'WASM=1', '-s', 'MODULARIZE=1', '-s', 'DYNAMIC_EXECUTION=0',
         '-s', 'RESERVED_FUNCTION_POINTERS=200', '-s', 'DISABLE_EXCEPTION_CATCHING=0', '-s', 'FORCE_FILESYSTEM=1',
-        '-s', 'TOTAL_MEMORY=512MB', '-s', 'ALLOW_MEMORY_GROWTH=1',
+        '-s', 'ALLOW_MEMORY_GROWTH=1',
         '-s', 'EXPORTED_RUNTIME_METHODS=["FS", "ENV"]',
         '-o', `${output}/${compiler.config.general.name}.js`,
         ...data,
@@ -46,9 +46,9 @@ export default async function createWasm(compiler, options, buildAll = false) {
     run(compiler, 'emcc', [
         '-lembind', '-Wl,--whole-archive', '-lnodefs.js',
         ...libs, ...(options.cc || []),
-        '-s', 'WASM=1', '-s', 'MODULARIZE=1',
+        '-s', 'WASM=1', '-s', 'MODULARIZE=1', '-s', 'DYNAMIC_EXECUTION=0',
         '-s', 'RESERVED_FUNCTION_POINTERS=200', '-s', 'DISABLE_EXCEPTION_CATCHING=0', '-s', 'FORCE_FILESYSTEM=1', '-s', 'NODERAWFS',
-        '-s', 'TOTAL_MEMORY=512MB', '-s', 'ALLOW_MEMORY_GROWTH=1',
+        '-s', 'ALLOW_MEMORY_GROWTH=1',
         '-s', 'EXPORTED_RUNTIME_METHODS=["FS", "ENV", "NODEFS"]',
         '-o', `${output}/${compiler.config.general.name}.js`,
     ]);