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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cpp.js",
-  "version": "1.0.0-alpha.4",
+  "version": "1.0.0-beta.2",
   "license": "MIT",
   "type": "module",
   "homepage": "https://cpp.js.org",
@@ -13,7 +13,7 @@
     "@rollup/plugin-commonjs": "^26.0.1",
     "@rollup/plugin-node-resolve": "^15.2.3",
     "@rollup/plugin-virtual": "^3.0.2",
-    "commander": "^9.4.1",
+    "commander": "^12.1.0",
     "glob": "^8.0.3",
     "rollup": "^4.18.0",
     "rollup-plugin-uglify": "^6.0.4"

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

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 
-import { Command, Argument } from 'commander';
+import { Command, Option } from 'commander';
 import fs from 'fs';
 import glob from 'glob';
 import { createDir } from './utils/createTempDir.js';
@@ -14,30 +14,26 @@ const program = new Command();
 
 program
     .name('cpp.js')
-    .description('Compile c++ files to webassembly.')
+    .description('Compile C++ files to WebAssembly and native platforms.')
     .version(packageJSON.version)
     .showHelpAfterError();
 
-const commandGenerate = program.command('generate')
-    .description('Generate app or lib.')
-    .addArgument(new Argument('<type>', 'Generation type').choices(['app', 'lib']))
-    .option('-b, --base <base>', 'base path')
-    .option('-p, --platform <platform>', 'platform (all)', 'all', ['all', 'wasm', 'android', 'ios'])
-    .option('-o, --output <string>', 'Output path');
+const commandBuild = program.command('build')
+    .description('compile the project that was set up using Cpp.js')
+    .addOption(new Option('-p, --platform <platform>', 'target platform').default('all').choices(['all', 'wasm', 'android', 'ios']));
 
 const commandRun = program.command('run')
-    .description('Run docker application');
+    .description('run docker application');
 
 const commandPostInstall = program.command('postinstall')
-    .description('npm postinstall');
+    .description('prepare the required packages for Cpp.js after installation');
 
 program.parse(process.argv);
 
 switch (program.args[0]) {
-    case 'generate': {
-        const type = commandGenerate.args[0];
-        const { output, platform, base } = commandGenerate.opts();
-        generate(type, platform, output, base);
+    case 'build': {
+        const { platform } = commandBuild.opts();
+        build(platform);
         break;
     }
     case 'run': {
@@ -55,7 +51,15 @@ switch (program.args[0]) {
 
 function postInstall() {
     const projectPath = process.env.PWD;
-    if (!fs.existsSync(`${projectPath}/cppjs.config.js`) && !fs.existsSync(`${projectPath}/cppjs.config.cjs`) && !fs.existsSync(`${projectPath}/cppjs.config.mjs`)) {
+    const isDarwin = process.platform === 'darwin';
+    if (
+        !isDarwin
+        || (
+            !fs.existsSync(`${projectPath}/cppjs.config.js`)
+            && !fs.existsSync(`${projectPath}/cppjs.config.cjs`)
+            && !fs.existsSync(`${projectPath}/cppjs.config.mjs`)
+        )
+    ) {
         return;
     }
 
@@ -78,49 +82,48 @@ function postInstall() {
 
 function run(programName, params) {
     const compiler = new CppjsCompiler();
-    compiler.run(programName, params);
+    compiler.run(programName, params, { console: true });
 }
 
-function generate(type, platform) {
+function build(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}`);
-                });
-            }
+
+    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`)) {
+            buildWasm();
+            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'],
-            android: ['Android-arm64-v8a'],
-            ios: ['iOS-iphoneos', 'iOS-iphonesimulator'],
-        };
-        platforms[platform].forEach((p) => {
-            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') {
-            compiler2.finishBuild();
+    if (platform === 'wasm') return;
+    const platforms = {
+        all: ['Android-arm64-v8a', 'iOS-iphoneos', 'iOS-iphonesimulator'],
+        android: ['Android-arm64-v8a'],
+        ios: ['iOS-iphoneos', 'iOS-iphonesimulator'],
+    };
+    platforms[platform].forEach((p) => {
+        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') {
+        compiler2.finishBuild();
     }
 
     const distCmakeContent = fs.readFileSync(`${compiler2.config.paths.cli}/assets/dist.cmake`, { encoding: 'utf8', flag: 'r' })
@@ -128,7 +131,7 @@ function generate(type, platform) {
     fs.writeFileSync(`${compiler2.config.paths.output}/prebuilt/CMakeLists.txt`, distCmakeContent);
 }
 
-async function generateWasmLib() {
+async function buildWasm() {
     let headers = [];
 
     const compiler = new CppjsCompiler();

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`,
     ]);