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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cpp.js",
-  "version": "1.0.0-alpha.3",
+  "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/bin.js

@@ -84,11 +84,23 @@ function run(programName, params) {
 function generate(type, platform) {
     const compiler2 = new CppjsCompiler();
     if (type === 'lib') {
+        const modules = [];
+        compiler2.config.paths.module.forEach((modulePath) => {
+            modules.push(...glob.sync('**/*.i', { absolute: true, cwd: modulePath }));
+            modules.push(...glob.sync('*.i', { absolute: true, cwd: modulePath }));
+        });
+
         if (platform === 'all' || platform === 'wasm') {
             if (!fs.existsSync(`${compiler2.config.paths.output}/prebuilt/Emscripten-x86_64`)) {
                 generateWasmLib();
+                modules.forEach((modulePath) => {
+                    const fileName = modulePath.split('/').at(-1);
+                    createDir('prebuilt/Emscripten-x86_64/swig', compiler2.config.paths.output);
+                    fs.copyFileSync(modulePath, `${compiler2.config.paths.output}/prebuilt/Emscripten-x86_64/swig/${fileName}`);
+                });
             }
         }
+
         if (platform === 'wasm') return;
         const platforms = {
             all: ['Android-arm64-v8a', 'iOS-iphoneos', 'iOS-iphonesimulator'],
@@ -99,6 +111,11 @@ function generate(type, platform) {
             if (!fs.existsSync(`${compiler2.config.paths.output}/prebuilt/${p}`)) {
                 const compiler = new CppjsCompiler(p);
                 compiler.createLib();
+                modules.forEach((modulePath) => {
+                    const fileName = modulePath.split('/').at(-1);
+                    createDir(`prebuilt/${p}/swig`, compiler2.config.paths.output);
+                    fs.copyFileSync(modulePath, `${compiler2.config.paths.output}/prebuilt/${p}/swig/${fileName}`);
+                });
             }
         });
         if (platform === 'all' || platform === 'ios') {
@@ -126,7 +143,16 @@ async function generateWasmLib() {
 
     compiler.createBridge();
     await compiler.createWasm({ cc: ['-O3'] });
-    createDir('prebuilt/Emscripten-x86_64', compiler.config.paths.output);
+    createDir('prebuilt/Emscripten-x86_64/lib', compiler.config.paths.output);
+
+    fs.renameSync(`${compiler.config.paths.temp}/lib/lib${compiler.config.general.name}.a`, `${compiler.config.paths.output}/prebuilt/Emscripten-x86_64/lib/lib${compiler.config.general.name}.a`);
+    fs.renameSync(`${compiler.config.paths.temp}/include/`, `${compiler.config.paths.output}/prebuilt/Emscripten-x86_64/include`);
+
+    fs.rmSync(`${compiler.config.paths.output}/data`, { recursive: true, force: true });
+    if (fs.existsSync(`${compiler.config.paths.temp}/data`)) {
+        fs.renameSync(`${compiler.config.paths.temp}/data`, `${compiler.config.paths.output}/data`);
+    }
+
     fs.copyFileSync(`${compiler.config.paths.temp}/${compiler.config.general.name}.node.js`, `${compiler.config.paths.output}/${compiler.config.general.name}.node.js`);
     fs.copyFileSync(`${compiler.config.paths.temp}/${compiler.config.general.name}.browser.js`, `${compiler.config.paths.output}/${compiler.config.general.name}.browser.js`);
     fs.copyFileSync(`${compiler.config.paths.temp}/${compiler.config.general.name}.wasm`, `${compiler.config.paths.output}/${compiler.config.general.name}.wasm`);
@@ -134,10 +160,5 @@ async function generateWasmLib() {
         fs.copyFileSync(`${compiler.config.paths.temp}/${compiler.config.general.name}.data.txt`, `${compiler.config.paths.output}/${compiler.config.general.name}.data.txt`);
     }
 
-    fs.renameSync(`${compiler.config.paths.temp}/lib/`, `${compiler.config.paths.output}/prebuilt/Emscripten-x86_64/lib`);
-    fs.renameSync(`${compiler.config.paths.temp}/include/`, `${compiler.config.paths.output}/prebuilt/Emscripten-x86_64/include`);
-
-    fs.rmSync(`${compiler.config.paths.output}/data`, { recursive: true, force: true });
-    fs.renameSync(`${compiler.config.paths.temp}/data`, `${compiler.config.paths.output}/data`);
     fs.rmSync(compiler.config.paths.temp, { recursive: true, force: true });
 }

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,10 @@ 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');
+
     const output = `/tmp/cppjs/live/${getPathInfo(compiler.config.paths.temp, compiler.config.paths.base).relative}`;
 
     let params = getCmakeParams(compiler.config, '/tmp/cppjs/live/', true, false);
@@ -28,13 +31,13 @@ export default async function createWasm(compiler, options, buildAll = false) {
     run(compiler, 'emmake', ['make', 'install']);
 
     const libs = getLibs(compiler.config, '/tmp/cppjs/live/');
-    const data = Object.entries(getData(compiler.config, 'data', '/tmp/cppjs/live/', 'Emscripten-x86_64', 'browser')).map(([key, value]) => ['--preload-file', `${key}@${value}`]).flat();
+    const data = Object.entries(getData(compiler.config, 'data', '/tmp/cppjs/live/', 'Emscripten-x86_64', 'browser')).map(([key, value]) => ['--preload-file', `${key.replaceAll('@', '@@')}@${value}`]).flat();
     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,
@@ -43,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`,
     ]);

package/src/functions/getData.js

@@ -6,17 +6,16 @@ function getPath(config, path, pathPrefix) {
     if (!pathPrefix) {
         return getPathInfo(path, config.paths.base).absolute;
     }
-
     return `${pathPrefix}${getPathInfo(path, config.paths.base).relative}`;
 }
 
-function getRecursiveData(obj, dependency, field, pathPrefix, platform, subPlatform) {
+function getRecursiveData(obj, config, dependency, field, pathPrefix, platform, subPlatform) {
     const platformName = subPlatform ? `${platform}-${subPlatform}` : platform;
     if (dependency?.platform?.[platformName]?.[field]) {
         Object.entries(dependency.platform[platformName][field]).forEach(([dKey, value]) => {
             if (field === 'data') {
                 const a = `${dependency.paths.project}/dist/prebuilt/${platform}/${dKey}`;
-                const key = getPath(dependency, a, pathPrefix);
+                const key = getPath(config, a, pathPrefix);
                 obj[key] = value;
             } else {
                 obj[dKey] = value;
@@ -25,13 +24,13 @@ function getRecursiveData(obj, dependency, field, pathPrefix, platform, subPlatf
     }
 
     dependency.dependencies.forEach((dep) => {
-        getRecursiveData(obj, dep, field, pathPrefix, platform, subPlatform);
+        getRecursiveData(obj, config, dep, field, pathPrefix, platform, subPlatform);
     });
 }
 
 export default function getData(config, field, pathPrefix, platform = 'Emscripten-x86_64', subPlatform) {
     const output = {};
-    getRecursiveData(output, config, field, pathPrefix, platform, subPlatform);
+    getRecursiveData(output, config, config, field, pathPrefix, platform, subPlatform);
 
     return output;
 }