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

package/package.json

@@ -1,22 +1,24 @@
 {
   "name": "cpp.js",
-  "version": "1.0.0-beta.1",
+  "version": "1.0.0-beta.3",
   "license": "MIT",
   "type": "module",
   "homepage": "https://cpp.js.org",
   "repository": "https://github.com/bugra9/cpp.js.git",
   "bin": {
-    "cpp.js": "./src/bin.js"
+    "cpp.js": "./src/bin.js",
+    "cppjs": "./src/bin.js"
   },
   "main": "src/index.js",
   "dependencies": {
     "@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"
+    "rollup-plugin-uglify": "^6.0.4",
+    "upath": "^2.0.1"
   },
   "devDependencies": {
     "mocha": "^10.2.0"

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/createWasm.js

@@ -6,10 +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) {
-    if (fs.existsSync('/tmp/cppjs/live')) fs.unlinkSync('/tmp/cppjs/live');
-    fs.symlinkSync(compiler.config.paths.base, '/tmp/cppjs/live');
-
+export default async function createWasm(compiler, options = {}) {
     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);
@@ -42,7 +39,7 @@ export default async function createWasm(compiler, options = {}, buildAll = fals
         '-o', `${output}/${compiler.config.general.name}.js`,
         ...data,
     ]);
-    await buildJS(compiler, `${output}/${compiler.config.general.name}.js`, 'browser');
+    await buildJS(compiler, `${compiler.config.paths.temp}/${compiler.config.general.name}.js`, 'browser');
     run(compiler, 'emcc', [
         '-lembind', '-Wl,--whole-archive', '-lnodefs.js',
         ...libs, ...(options.cc || []),
@@ -54,15 +51,14 @@ export default async function createWasm(compiler, options = {}, buildAll = fals
     ]);
     Object.entries(getData(compiler.config, 'data', null, 'Emscripten-x86_64', 'node')).forEach(([key, value]) => {
         if (fs.existsSync(key)) {
-            const dAssetPath = `${output}/data/${value}`;
+            const dAssetPath = `${compiler.config.paths.temp}/data/${value}`;
             if (!fs.existsSync(dAssetPath)) {
                 fs.mkdirSync(dAssetPath, { recursive: true });
                 fs.cpSync(key, dAssetPath, { recursive: true });
             }
         }
     });
-    await buildJS(compiler, `${output}/${compiler.config.general.name}.js`, 'node');
-    // await buildJS(compiler, `${output}/${compiler.config.general.name}.js`);
+    await buildJS(compiler, `${compiler.config.paths.temp}/${compiler.config.general.name}.js`, 'node');
     if (fs.existsSync(`${compiler.config.paths.temp}/${compiler.config.general.name}.data`)) {
         fs.renameSync(`${compiler.config.paths.temp}/${compiler.config.general.name}.data`, `${compiler.config.paths.temp}/${compiler.config.general.name}.data.txt`);
     }

package/src/utils/createTempDir.js

@@ -1,5 +1,5 @@
 import fs from 'fs';
-import p from 'path';
+import p from 'upath';
 
 export default function createTempDir(folder = `a${Math.random()}`, base = process.cwd()) {
     const path = p.join(base, '.cppjs');
@@ -11,5 +11,5 @@ export function createDir(folder, base = process.cwd()) {
 
     if (fs.existsSync(path)) fs.rmSync(path, { recursive: true, force: true });
     fs.mkdirSync(path, { recursive: true });
-    return path;
+    return p.normalize(path);
 }

package/src/utils/getCliPath.js

@@ -1,6 +1,7 @@
 import * as url from 'node:url';
+import upath from 'upath';
 
-const filename = url.fileURLToPath(import.meta.url);
+const filename = upath.normalize(url.fileURLToPath(import.meta.url));
 const temp = filename.split('/');
 temp.pop();
 temp.pop();

package/src/utils/getConfig.js

@@ -1,10 +1,10 @@
 import fs from 'fs';
-import nodePath from 'path';
+import nodePath from 'upath';
 import * as url from 'node:url';
 import createTempDir, { createDir } from './createTempDir.js';
 import findCMakeListsFile from './findCMakeListsFile.js';
 
-const filename = url.fileURLToPath(import.meta.url);
+const filename = nodePath.normalize(url.fileURLToPath(import.meta.url));
 const temp = filename.split('/'); temp.pop(); temp.pop();
 const dirname = temp.join('/');
 
@@ -58,7 +58,7 @@ async function initDefaultConfigFile() {
     });
 
     if (filePath) {
-        let file = await import(filePath);
+        let file = await import('file:///' + filePath);
         if (file.default) file = file.default;
 
         if (typeof file === 'function') tempConfigDefault = file();

package/src/utils/getDirName.js

@@ -1,7 +1,8 @@
 import * as url from 'node:url';
+import upath from 'upath';
 
 export default function getDirName(importUrl) {
-    const filename = url.fileURLToPath(importUrl);
+    const filename = upath.normalize(url.fileURLToPath(importUrl));
     const temp = filename.split('/'); temp.pop();
     return temp.join('/');
 }

package/src/utils/getOsUserAndGroupId.js

@@ -4,7 +4,8 @@ let osUserAndGroupId;
 export default function getOsUserAndGroupId() {
     const userInfo = os.userInfo();
     if (!osUserAndGroupId) {
-        osUserAndGroupId = `${userInfo.uid}:${userInfo.gid}`;
+        const isInvalid = userInfo.uid === -1 && userInfo.gid === -1;
+        osUserAndGroupId = isInvalid ? '0:0' : `${userInfo.uid}:${userInfo.gid}`;
     }
     return osUserAndGroupId;
 }

package/src/utils/getPathInfo.js

@@ -1,9 +1,9 @@
-import p from 'path';
+import p from 'upath';
 
 export default function getPathInfo(path, base) {
     const output = {
         relative: p.relative(base, path),
-        absolute: path,
+        absolute: p.normalize(path),
     };
 
     return output;