cpp.js 0.1.1 → 0.2.0

package/assets/CMakeLists.txt

@@ -5,5 +5,4 @@ file(GLOB SRC_FILES "${BASE_DIR}/native/**/*.cpp" "${BASE_DIR}/native/*.cpp" "${
 add_library(cppjs STATIC ${SRC_FILES})
 
 file(GLOB HEADERS "${BASE_DIR}/node_modules/cppjs-lib-*/include")
-message("... ${SRC_FILES} . ${HEADERS};${BASE_DIR}/native")
 include_directories("${HEADERS};${BASE_DIR}/native;${BASE_DIR}/src/native")

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cpp.js",
-  "version": "0.1.1",
+  "version": "0.2.0",
   "license": "MIT",
   "type": "module",
   "bin": {

package/src/createBridge.js

@@ -1,18 +1,28 @@
 import glob from 'glob';
+import os from "os";
 import { execFileSync } from 'child_process';
 import pullDockerImage from './pullDockerImage.js';
+import { getBaseInfo, getPathInfo, getOsUserAndGroupId } from './utils.js';
 
-export default function createBridge(filePath, outputPath) {
+export default function createBridge(filePath, outputPath, basePath = process.cwd()) {
     pullDockerImage();
+
+    const input = getPathInfo(filePath, basePath);
+    const output = getPathInfo(outputPath, basePath);
+    const projectPath = getPathInfo(process.cwd(), basePath);
+    const base = getBaseInfo(basePath);
+
     const includePath = [
-        glob.sync("node_modules/cppjs-lib-*-web/include", { absolute: true })
-    ].map(path => `-I${path}`);
+        glob.sync("node_modules/cppjs-lib-*-web/include", { absolute: false }),
+        glob.sync("native", { absolute: false }),
+        glob.sync("src/native", { absolute: false }),
+    ].filter(path => !!path.toString()).map(path => `-I/live/${projectPath.relative}/${path}`);
 
     const options = { cwd: outputPath, stdio : 'pipe' };
     const args = [
-        "run", "-v", `${outputPath}:/output`, "-v", "/:/live", "bugra9/cpp.js",
-        "swig", "-c++", '-emscripten', '-o', `/output/${filePath.split('/').at(-1)}.cpp`, ...includePath, `/live${filePath}`
+        "run", "--user", getOsUserAndGroupId(), "-v", `${base.withoutSlash}:/live`, "bugra9/cpp.js",
+        "swig", "-c++", '-emscripten', '-o', `/live/${output.relative}/${filePath.split('/').at(-1)}.cpp`, ...includePath, `/live/${input.relative}`
     ];
     execFileSync("docker", args, options);
-    return `${outputPath}/${filePath.split('/').at(-1)}.cpp`;
+    return `${base.withSlash}${output.relative}/${filePath.split('/').at(-1)}.cpp`;
 }

package/src/createWasm.js

@@ -1,6 +1,7 @@
 import { execFileSync } from 'child_process';
 import * as url from 'node:url';
 import pullDockerImage from './pullDockerImage.js';
+import { getBaseInfo, getPathInfo, getOsUserAndGroupId } from './utils.js';
 
 const __filename = url.fileURLToPath(import.meta.url);
 const temp = __filename.split('/');
@@ -8,32 +9,42 @@ temp.pop();
 temp.pop();
 const __dirname = temp.join('/');
 
-export default function createWasm(cMakeFilePath, outputPath, tempPath, options = {}) {
+export default function createWasm(cMakeFilePath, outputPath, tempPath, options = {}, basePath = process.cwd()) {
     pullDockerImage();
-    cmake(cMakeFilePath, tempPath);
-    make(tempPath);
-    cc(tempPath, outputPath, options.cc);
+    cmake(cMakeFilePath, tempPath, basePath);
+    make(cMakeFilePath, tempPath, basePath);
+    cc(tempPath, outputPath, options.cc, basePath);
 
     return outputPath;
 }
 
-function cmake(cMakeFilePath, outputPath) {
+function cmake(cMakeFilePath, outputPath, basePath) {
+    const output = getPathInfo(outputPath, basePath);
+    const projectPath = getPathInfo(process.cwd(), basePath);
+    const base = getBaseInfo(basePath);
+
     let cMakeParentPath = cMakeFilePath.split('/');
     cMakeParentPath.pop();
     cMakeParentPath = cMakeParentPath.join('/');
-
     const args = [
-        "run", "-v", `${outputPath}:/output`, "-v", "/:/live", "--workdir", "/output", "bugra9/cpp.js",
-        "emcmake", "cmake", "/live"+cMakeParentPath, "-DCMAKE_INSTALL_PREFIX=/output", `-DBASE_DIR=/live${process.cwd()}`, '-DBRIDGE_DIR=/output',
+        "run", "--user", getOsUserAndGroupId(), "-v", `${base.withoutSlash}:/live`, "-v", `${cMakeParentPath}:/cmake`, "--workdir", `/live/${output.relative}`, "bugra9/cpp.js",
+        "emcmake", "cmake", "/cmake", `-DBASE_DIR=/live/${projectPath.relative}`,
+        `-DCMAKE_INSTALL_PREFIX=/live/${output.relative}`, `-DBRIDGE_DIR=/live/${output.relative}`,
     ];
     const options = { cwd: outputPath, stdio : 'pipe' };
     execFileSync("docker", args, options);
     return outputPath;
 }
 
-function make(outputPath) {
+function make(cMakeFilePath, outputPath, basePath) {
+    const output = getPathInfo(outputPath, basePath);
+    const base = getBaseInfo(basePath);
+
+    let cMakeParentPath = cMakeFilePath.split('/');
+    cMakeParentPath.pop();
+    cMakeParentPath = cMakeParentPath.join('/');
     const args = [
-        "run", "-v", `${outputPath}:/output`, "-v", "/:/live", "--workdir", "/output", "bugra9/cpp.js",
+        "run", "--user", getOsUserAndGroupId(), "-v", `${base.withoutSlash}:/live`, "-v", `${cMakeParentPath}:/cmake`, "--workdir", `/live/${output.relative}`, "bugra9/cpp.js",
         "emmake", "make"
     ];
     const options = { cwd: outputPath, stdio : 'pipe' };
@@ -41,10 +52,13 @@ function make(outputPath) {
     return outputPath;
 }
 
-function cc(tempPath, outputPath, flags = []) {
+function cc(tempPath, outputPath, flags = [], basePath) {
+    const input = getPathInfo(tempPath, basePath);
+    const output = getPathInfo(outputPath, basePath);
+    const base = getBaseInfo(basePath);
     const args = [
-        "run", "-v", `${tempPath}:/tempPath`, "-v", `${outputPath}:/output`, "-v", `${__dirname}:/cli`, "-v", "/:/live", "bugra9/cpp.js",
-        "emcc", "-lembind", "-Wl,--whole-archive", '/tempPath/libcppjs.a', ...flags, "-s", "WASM=1", "-s", "MODULARIZE=1", '-o', '/output/cpp.js', '--extern-post-js', '/cli/src/extern-post.js'
+        "run", "--user", getOsUserAndGroupId(), "-v", `${base.withoutSlash}:/live`, "-v", `${__dirname}:/cli`, "bugra9/cpp.js",
+        "emcc", "-lembind", "-Wl,--whole-archive", `/live/${input.relative}/libcppjs.a`, ...flags, "-s", "WASM=1", "-s", "MODULARIZE=1", '-o', `/live/${output.relative}/cpp.js`, '--extern-post-js', '/cli/src/extern-post.js'
     ];
     const options = { cwd: tempPath, stdio : 'pipe' };
     execFileSync("docker", args, options);

package/src/findOrCreateInterfaceFile.js

@@ -1,7 +1,12 @@
 import fs from 'fs';
+import { getBaseInfo, getPathInfo } from './utils.js';
 
-export default function findOrCreateInterfaceFile(filePath, outputPath) {
-    const temp = filePath.match(/^(.*)\..+?$/);
+export default function findOrCreateInterfaceFile(filePath, outputPath, basePath = process.cwd()) {
+    const input = getPathInfo(filePath, basePath);
+    const output = getPathInfo(outputPath, basePath);
+    const base = getBaseInfo(basePath);
+
+    const temp = input.relative.match(/^(.*)\..+?$/);
     if (temp.length < 2) return null;
 
     const filePathWithoutExt = temp[1];
@@ -10,7 +15,7 @@ export default function findOrCreateInterfaceFile(filePath, outputPath) {
     if (fs.existsSync(interfaceFile)) return interfaceFile;
 
     const fileName = filePathWithoutExt.split('/').at(-1);
-    const fileNameWithExt = filePath.split('/').at(-1);
+    const fileNameWithExt = input.relative.split('/').at(-1);
 
     const content =
 `#ifndef _${fileName.toUpperCase()}_I
@@ -22,12 +27,11 @@ export default function findOrCreateInterfaceFile(filePath, outputPath) {
 #include "${fileNameWithExt}"
 %}
 
-%include "/live${filePath}"
+%include "${fileNameWithExt}"
 
 #endif
 `;
-
-    const outputFilePath = outputPath+'/'+fileName+'.i';
+    const outputFilePath = base.withSlash + output.relative+'/'+fileName+'.i';
     fs.writeFileSync(outputFilePath, content);
     return outputFilePath;
 }

package/src/utils.js

@@ -1,6 +1,6 @@
 import fs from 'fs';
 import p, {dirname} from 'path';
-import { tmpdir } from "os";
+import os, { tmpdir } from "os";
 import * as url from 'node:url';
 
 export const __filename = url.fileURLToPath(import.meta.url);
@@ -54,3 +54,48 @@ export async function getConfig(projectPath) {
 
     return config;
 }
+
+let osUserAndGroupId;
+export function getOsUserAndGroupId() {
+    const userInfo = os.userInfo();
+    if (!osUserAndGroupId) {
+        osUserAndGroupId = `${userInfo.uid}:${userInfo.gid}`;
+    }
+    return osUserAndGroupId;
+}
+
+export function getBaseInfo(base) {
+    let basePath = base;
+
+    const output = {
+        withSlash: '/',
+        withoutSlash: '/',
+    };
+    if (basePath && basePath !== '/') {
+        if (basePath.at(-1) !== '/') basePath += '/';
+
+        output.withSlash = basePath;
+        output.withoutSlash = basePath.substring(0, basePath.length - 1);
+    }
+    return output;
+}
+
+
+export function getPathInfo(path, base) {
+    let basePath = base;
+
+    const output = {
+        relative: path,
+        absolute: path,
+    };
+    if (basePath) {
+        if (basePath.at(-1) !== '/') basePath += '/';
+
+        if (path.substring(0, basePath.length) === basePath) {
+            output.relative = path.substring(basePath.length);
+        } else {
+            output.absolute = basePath + path;
+        }
+    }
+    return output;
+}

package/src/utils.spec.js

@@ -0,0 +1,81 @@
+import { assert } from 'chai';
+import { getBaseInfo, getPathInfo } from './utils.js';
+
+describe('getBaseInfo', function () {
+    it('empty', async function () {
+        const baseInfo = getBaseInfo('');
+        assert.equal(baseInfo.withSlash, '/');
+        assert.equal(baseInfo.withoutSlash, '/');
+    });
+
+    it('null', async function () {
+        const baseInfo = getBaseInfo(null);
+        assert.equal(baseInfo.withSlash, '/');
+        assert.equal(baseInfo.withoutSlash, '/');
+    });
+
+    it('undefined', async function () {
+        const baseInfo = getBaseInfo();
+        assert.equal(baseInfo.withSlash, '/');
+        assert.equal(baseInfo.withoutSlash, '/');
+    });
+
+    it('/', async function () {
+        const baseInfo = getBaseInfo('/');
+        assert.equal(baseInfo.withSlash, '/');
+        assert.equal(baseInfo.withoutSlash, '/');
+    });
+
+    it('with /', async function () {
+        const baseInfo = getBaseInfo('/home/cppjs/');
+        assert.equal(baseInfo.withSlash, '/home/cppjs/');
+        assert.equal(baseInfo.withoutSlash, '/home/cppjs');
+    });
+
+    it('without /', async function () {
+        const baseInfo = getBaseInfo('/home/cppjs');
+        assert.equal(baseInfo.withSlash, '/home/cppjs/');
+        assert.equal(baseInfo.withoutSlash, '/home/cppjs');
+    });
+});
+
+describe('getPathInfo', function () {
+    it('path: absolute', async function () {
+        const path = '/home/cppjs/cppjs.h';
+        const pathInfo = getPathInfo(path);
+        assert.equal(pathInfo.relative, path);
+        assert.equal(pathInfo.absolute, path);
+    });
+
+    it('path: absolute, base: /', async function () {
+        const basePath = '/home/cppjs/';
+        const path = '/home/cppjs/cppjs.h';
+        const pathInfo = getPathInfo(path, basePath);
+        assert.equal(pathInfo.relative, 'cppjs.h');
+        assert.equal(pathInfo.absolute, path);
+    });
+
+    it('path: absolute, base', async function () {
+        const basePath = '/home/cppjs';
+        const path = '/home/cppjs/cppjs.h';
+        const pathInfo = getPathInfo(path, basePath);
+        assert.equal(pathInfo.relative, 'cppjs.h');
+        assert.equal(pathInfo.absolute, path);
+    });
+
+    it('path: relative, base: /', async function () {
+        const basePath = '/home/cppjs/';
+        const path = 'cppjs.h';
+        const pathInfo = getPathInfo(path, basePath);
+        assert.equal(pathInfo.relative, 'cppjs.h');
+        assert.equal(pathInfo.absolute, basePath + path);
+    });
+
+    it('path: relative, base: ', async function () {
+        const basePath = '/home/cppjs';
+        const path = 'cppjs.h';
+        const pathInfo = getPathInfo(path, basePath);
+        assert.equal(pathInfo.relative, 'cppjs.h');
+        assert.equal(pathInfo.absolute, basePath + '/' + path);
+    });
+});