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

package/package.json

@@ -1,12 +1,13 @@
 {
   "name": "cpp.js",
-  "version": "1.0.0-beta.2",
+  "version": "1.0.0-beta.4",
   "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": {
@@ -16,7 +17,8 @@
     "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

@@ -13,7 +13,7 @@ const packageJSON = JSON.parse(fs.readFileSync(new URL('../package.json', import
 const program = new Command();
 
 program
-    .name('cpp.js')
+    .name('cppjs')
     .description('Compile C++ files to WebAssembly and native platforms.')
     .version(packageJSON.version)
     .showHelpAfterError();

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;