cpp.js 0.3.2 → 0.4.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cpp.js",
-  "version": "0.3.2",
+  "version": "0.4.1",
   "license": "MIT",
   "type": "module",
   "bin": {
@@ -12,8 +12,7 @@
     "glob": "^8.0.3"
   },
   "devDependencies": {
-    "mocha": "^10.2.0",
-    "cppjs-lib-sample-web": "^0.1.0"
+    "mocha": "^10.2.0"
   },
   "scripts": {
     "test": "mocha"

package/src/assets/CMakeLists.txt

@@ -1,23 +1,37 @@
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.25)
 project("${PROJECT_NAME}")
 
 option(BUILD_BRIDGE "Build Bridge" OFF)
 option(BUILD_SOURCE "Build Source" OFF)
 
 if(BUILD_SOURCE)
-file(GLOB BUILD_SRC_FILES "${BASE_DIR}/native/**/*.cpp" "${BASE_DIR}/native/*.cpp" "${BASE_DIR}/src/native/**/*.cpp" "${BASE_DIR}/src/native/*.cpp")
+file(GLOB_RECURSE BUILD_SRC_FILES ${NATIVE_GLOB})
 endif(BUILD_SOURCE)
-unset(BUILD_SOURCE CACHE)
-
-message("aa", BUILD_SRC_FILES)
 
 if(BUILD_BRIDGE)
 file(GLOB BRIDGE_SRC_FILES "${BRIDGE_DIR}/*.i.cpp")
 endif(BUILD_BRIDGE)
-unset(BUILD_BRIDGE CACHE)
 
 set(SRC_FILES "${BUILD_SRC_FILES}" "${BRIDGE_SRC_FILES}")
 add_library("${PROJECT_NAME}" STATIC ${SRC_FILES})
 
-file(GLOB HEADERS "${BASE_DIR}/node_modules/cppjs-lib-*/include")
-include_directories("${HEADERS};${BASE_DIR}/native;${BASE_DIR}/src/native")
+file(GLOB LIB_HEADERS_DIR "${BASE_DIR}/node_modules/cppjs-lib-*/include" "${BASE_DIR}/node_modules/cppjs-lib-*/node_modules/cppjs-lib-*/include")
+file(GLOB_RECURSE HEADER_FILES ${HEADER_GLOB})
+target_include_directories("${PROJECT_NAME}" PUBLIC "${LIB_HEADERS_DIR}" "${HEADER_DIR}")
+
+if(BUILD_SOURCE)
+target_sources("${PROJECT_NAME}"
+    PUBLIC FILE_SET HEADERS
+    BASE_DIRS "${HEADER_DIR}"
+    FILES "${HEADER_FILES}")
+
+string(REPLACE "-" ";" HEADER_FOLDER ${PROJECT_NAME})
+list(GET HEADER_FOLDER 2 HEADER_FOLDER)
+install(TARGETS "${PROJECT_NAME}" FILE_SET HEADERS DESTINATION "include/cppjs-lib-${HEADER_FOLDER}")
+endif(BUILD_SOURCE)
+unset(BUILD_SOURCE CACHE)
+
+if(BUILD_BRIDGE)
+install(TARGETS "${PROJECT_NAME}")
+endif(BUILD_BRIDGE)
+unset(BUILD_BRIDGE CACHE)

package/src/bin.js

@@ -45,19 +45,21 @@ function generateLib(platform, output, base) {
 
     const compiler = new CppjsCompiler();
     compiler.config.paths.header.forEach(headerPath => {
-        headers.push(glob.sync("*.h", { absolute: true, cwd: headerPath }));
+        headers.push(glob.sync("**/*.h", { absolute: true, cwd: headerPath }));
     });
     headers = headers.filter(path => !!path.toString()).flat();
 
     headers.forEach(header => {
         compiler.findOrCreateInterfaceFile(header);
-        compiler.createBridge();
-        compiler.createWasm({ cc: ['-O3'] });
-        createDir('lib', compiler.config.paths.output);
-        fs.copyFileSync(`${compiler.config.paths.temp}/${compiler.config.general.name}.js`, `${compiler.config.paths.output}/${compiler.config.general.name}.js`);
-        fs.copyFileSync(`${compiler.config.paths.temp}/${compiler.config.general.name}.wasm`, `${compiler.config.paths.output}/${compiler.config.general.name}.wasm`);
-        fs.copyFileSync(`${compiler.config.paths.temp}/lib${compiler.config.general.name}.a`, `${compiler.config.paths.output}/lib/lib${compiler.config.general.name}.a`);
-        fs.rmSync(compiler.config.paths.temp, { recursive: true, force: true });
     });
 
+    compiler.createBridge();
+    compiler.createWasm({ cc: ['-O3'] });
+    createDir('lib', compiler.config.paths.output);
+    fs.copyFileSync(`${compiler.config.paths.temp}/${compiler.config.general.name}.js`, `${compiler.config.paths.output}/${compiler.config.general.name}.js`);
+    fs.copyFileSync(`${compiler.config.paths.temp}/${compiler.config.general.name}.wasm`, `${compiler.config.paths.output}/${compiler.config.general.name}.wasm`);
+    fs.copyFileSync(`${compiler.config.paths.temp}/lib${compiler.config.general.name}.a`, `${compiler.config.paths.output}/lib/lib${compiler.config.general.name}.a`);
+    fs.rmSync(`${compiler.config.paths.output}/include`, { recursive: true, force: true });
+    fs.renameSync(`${compiler.config.paths.temp}/include`, `${compiler.config.paths.output}/include`);
+    fs.rmSync(compiler.config.paths.temp, { recursive: true, force: true });
 }

package/src/functions/createBridge.js

@@ -1,6 +1,6 @@
 import glob from 'glob';
 import { execFileSync } from 'child_process';
-import pullDockerImage from '../utils/pullDockerImage.js';
+import pullDockerImage, { getDockerImage } from '../utils/pullDockerImage.js';
 import getBaseInfo from '../utils/getBaseInfo.js';
 import getPathInfo from '../utils/getPathInfo.js';
 import getOsUserAndGroupId from '../utils/getOsUserAndGroupId.js';
@@ -16,14 +16,14 @@ export default function createBridge(compiler) {
         const base = getBaseInfo(compiler.config.paths.base);
 
         const includePath = [
-            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}`);
+            ...glob.sync("node_modules/cppjs-lib-*/include", { absolute: true, cwd: compiler.config.paths.project }),
+            ...glob.sync("node_modules/cppjs-lib-*/node_modules/cppjs-lib-*/include", { absolute: true, cwd: compiler.config.paths.project }),
+            ...compiler.config.paths.header,
+        ].filter(path => !!path.toString()).map(path => `-I/live/${getPathInfo(path, compiler.config.paths.base).relative}`);
 
         const options = { cwd: output.absolute, stdio : 'pipe' };
         const args = [
-            "run", "--user", getOsUserAndGroupId(), "-v", `${base.withoutSlash}:/live`, "bugra9/cpp.js",
+            "run", "--user", getOsUserAndGroupId(), "-v", `${base.withoutSlash}:/live`, getDockerImage(),
             "swig", "-c++", '-emscripten', '-o', `/live/${output.relative}/${filePath.split('/').at(-1)}.cpp`, ...includePath, `/live/${input.relative}`
         ];
         execFileSync("docker", args, options);

package/src/functions/createWasm.js

@@ -1,45 +1,42 @@
 import { execFileSync } from 'child_process';
-import pullDockerImage from '../utils/pullDockerImage.js';
+import glob from 'glob';
+import pullDockerImage, { getDockerImage } from '../utils/pullDockerImage.js';
 import getBaseInfo from '../utils/getBaseInfo.js';
 import getPathInfo from '../utils/getPathInfo.js';
 import getOsUserAndGroupId from '../utils/getOsUserAndGroupId.js';
 
 export default function createWasm(compiler, options = {}) {
     const compiler2 = new CppjsCompiler(
-        compiler.config.paths.cmake,
-        compiler.config.paths.output,
-        compiler.config.paths.temp,
-        compiler.config.paths.cli,
-        compiler.config.general.name,
+        compiler.config,
         options,
-        compiler.config.paths.base
     );
     return compiler2.compile();
 }
 
 class CppjsCompiler {
-    constructor(cMakeFilePath, outputPath, tempPath, cliPath, name, options = {}, basePath = process.cwd()) {
-        this.cMakeFilePath = cMakeFilePath;
-        this.outputPath = tempPath;
-        this.tempPath = tempPath;
-        this.cliPath = cliPath;
+    constructor(config, options) {
+        this.config = config;
         this.options = options;
-        this.basePath = basePath;
-        this.name = name;
     }
 
     compile() {
         pullDockerImage();
 
-        this.cmake(this.name, true, false);
+        this.cmake(this.config.general.name, true, false);
         this.make();
-        this.cmake(this.name+'bridge', false, true);
+        this.cmake(this.config.general.name+'bridge', false, true);
         this.make();
-        this.libs = [`lib${this.name}.a`, `lib${this.name}bridge.a`];
+
+        this.libs = [
+            `${this.config.paths.temp}/lib${this.config.general.name}.a`,
+            `${this.config.paths.temp}/lib${this.config.general.name}bridge.a`,
+            ...glob.sync("node_modules/cppjs-lib-*-wasm/lib/lib*.a", { absolute: true, cwd: this.config.paths.project }),
+            ...glob.sync("node_modules/cppjs-lib-*-wasm/node_modules/cppjs-lib-*-wasm/lib/lib*.a", { absolute: true, cwd: this.config.paths.project }),
+        ].filter(path => !!path.toString()).map(path => `/live/${getPathInfo(path, this.config.paths.base).relative}`);
 
         this.cc();
 
-        return this.outputPath;
+        return this.config.paths.temp;
     }
 
     cmake(name, isBuildSource, isBuildBridge) {
@@ -47,49 +44,55 @@ class CppjsCompiler {
         if (isBuildSource) params.push('-DBUILD_SOURCE=TRUE');
         if (isBuildBridge) params.push('-DBUILD_BRIDGE=TRUE');
 
-        const output = getPathInfo(this.outputPath, this.basePath);
-        const projectPath = getPathInfo(process.cwd(), this.basePath);
-        const base = getBaseInfo(this.basePath);
+        const output = getPathInfo(this.config.paths.temp, this.config.paths.base);
+        const projectPath = getPathInfo(process.cwd(), this.config.paths.base);
+        const native = this.config.paths.native.map(p => `/live/${getPathInfo(p, this.config.paths.base).relative}`).join(';');
+        const header = this.config.paths.header.map(p => `/live/${getPathInfo(p, this.config.paths.base).relative}`).join(';');
+        const base = getBaseInfo(this.config.paths.base);
 
-        let cMakeParentPath = this.cMakeFilePath.split('/');
+        let cMakeParentPath = this.config.paths.cmake.split('/');
         cMakeParentPath.pop();
         cMakeParentPath = cMakeParentPath.join('/');
         const args = [
-            "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}`,
+            "run", "--user", getOsUserAndGroupId(), "-v", `${base.withoutSlash}:/live`, "-v", `${cMakeParentPath}:/cmake`, "--workdir", `/live/${output.relative}`, getDockerImage(),
+            "emcmake", "cmake", "/cmake", '-DCMAKE_BUILD_TYPE=Release',
+            `-DBASE_DIR=/live/${projectPath.relative}`,
+            `-DNATIVE_GLOB=${this.config.ext.source.map(ext => `${native}/*.${ext}`).join(';')}`,
+            `-DHEADER_GLOB=${this.config.ext.header.map(ext => `${header}/*.${ext}`).join(';')}`,
+            `-DHEADER_DIR=${header}`,
             `-DCMAKE_INSTALL_PREFIX=/live/${output.relative}`, `-DBRIDGE_DIR=/live/${output.relative}/bridge`, `-DPROJECT_NAME=${name}`, ...params,
         ];
-        const options = { cwd: this.outputPath, stdio : 'pipe' };
+        const options = { cwd: this.config.paths.temp, stdio : 'pipe' };
         execFileSync("docker", args, options);
-        return this.outputPath;
+        return this.config.paths.temp;
     }
 
     make() {
-        const output = getPathInfo(this.outputPath, this.basePath);
-        const base = getBaseInfo(this.basePath);
+        const output = getPathInfo(this.config.paths.temp, this.config.paths.base);
+        const base = getBaseInfo(this.config.paths.base);
 
-        let cMakeParentPath = this.cMakeFilePath.split('/');
+        let cMakeParentPath = this.config.paths.cmake.split('/');
         cMakeParentPath.pop();
         cMakeParentPath = cMakeParentPath.join('/');
         const args = [
-            "run", "--user", getOsUserAndGroupId(), "-v", `${base.withoutSlash}:/live`, "-v", `${cMakeParentPath}:/cmake`, "--workdir", `/live/${output.relative}`, "bugra9/cpp.js",
-            "emmake", "make"
+            "run", "--user", getOsUserAndGroupId(), "-v", `${base.withoutSlash}:/live`, "-v", `${cMakeParentPath}:/cmake`, "--workdir", `/live/${output.relative}`, getDockerImage(),
+            "emmake", "make", "install"
         ];
-        const options = { cwd: this.outputPath, stdio : 'pipe' };
+        const options = { cwd: this.config.paths.temp, stdio : 'pipe' };
         execFileSync("docker", args, options);
-        return this.outputPath;
+        return this.config.paths.temp;
     }
 
     cc() {
-        const input = getPathInfo(this.tempPath, this.basePath);
-        const output = getPathInfo(this.outputPath, this.basePath);
-        const base = getBaseInfo(this.basePath);
+        const input = getPathInfo(this.config.paths.temp, this.config.paths.base);
+        const output = getPathInfo(this.config.paths.temp, this.config.paths.base);
+        const base = getBaseInfo(this.config.paths.base);
         const args = [
-            "run", "--user", getOsUserAndGroupId(), "-v", `${base.withoutSlash}:/live`, "-v", `${this.cliPath}:/cli`, "bugra9/cpp.js",
-            "emcc", "-lembind", "-Wl,--whole-archive", ...this.libs.map(lib => `/live/${input.relative}/${lib}`), ...(this.options.cc || []), "-s", "WASM=1", "-s", "MODULARIZE=1", '-o', `/live/${output.relative}/${this.name}.js`, '--extern-post-js', '/cli/assets/extern-post.js'
+            "run", "--user", getOsUserAndGroupId(), "-v", `${base.withoutSlash}:/live`, "-v", `${this.config.paths.cli}:/cli`, getDockerImage(),
+            "emcc", "-lembind", "-Wl,--whole-archive", ...this.libs, ...(this.options.cc || []), "-s", "WASM=1", "-s", "MODULARIZE=1", '-o', `/live/${output.relative}/${this.config.general.name}.js`, '--extern-post-js', '/cli/assets/extern-post.js'
         ];
-        const options = { cwd: this.tempPath, stdio : 'pipe' };
+        const options = { cwd: this.config.paths.temp, stdio : 'pipe' };
         execFileSync("docker", args, options);
-        return this.outputPath;
+        return this.config.paths.temp;
     }
 }

package/src/functions/findOrCreateInterfaceFile.js

@@ -16,7 +16,10 @@ export default function findOrCreateInterfaceFile(compiler, filePath) {
     if (fs.existsSync(interfaceFile)) return interfaceFile;
 
     const fileName = filePathWithoutExt.split('/').at(-1);
-    const fileNameWithExt = input.relative.split('/').at(-1);
+
+    let headerPath = compiler.config.paths.header.find(path => filePath.startsWith(path));
+    if (headerPath) headerPath = filePath.substr(headerPath.length+1);
+    else headerPath = input.relative.split('/').at(-1);
 
     const content =
 `#ifndef _${fileName.toUpperCase()}_I
@@ -25,10 +28,10 @@ export default function findOrCreateInterfaceFile(compiler, filePath) {
 %module ${fileName.toUpperCase()}
 
 %{
-#include "${fileNameWithExt}"
+#include "${headerPath}"
 %}
 
-%include "${fileNameWithExt}"
+%include "${headerPath}"
 
 #endif
 `;

package/src/utils/getConfig.js

@@ -14,7 +14,7 @@ const require = createRequire(import.meta.url);
  * @typedef {Object} Config
  * @property {string} general General
  * @property {ConfigPaths} paths Paths
- * @property {ConfigExtensions} extensions Extensions
+ * @property {ConfigExtensions} ext Extensions
  */
 
 /**
@@ -22,7 +22,7 @@ const require = createRequire(import.meta.url);
  * @property {string} project Project path.
  * @property {string} base Base path (Use for monorepo structure)
  * @property {string} temp Temp path.
- * @property {string} native Native path (default: ['native', 'src/native']).
+ * @property {string} native Native path (default: ['src/native']).
  * @property {string} module Module path (default: native path)
  * @property {string} header Header path (default: native path)
  * @property {string} bridge Bridge path (default: native and temp path)
@@ -43,7 +43,7 @@ const require = createRequire(import.meta.url);
  */
 
 export default function getConfig(param) {
-    let tempConfig = { general: {}, paths: {}, extensions: {} };
+    let tempConfig = { general: {}, paths: {}, ext: {} };
 
     if (!param || (typeof param === 'string' || param instanceof String)) {
         const ext = (param || '').split('.').at(-1)
@@ -79,7 +79,7 @@ function forceToConfigSchema(tempConfig) {
     const config = {
         general: tempConfig && tempConfig.general ? tempConfig.general : {},
         paths: tempConfig && tempConfig.paths ? tempConfig.paths : {},
-        extensions: tempConfig && tempConfig.extensions ? tempConfig.extensions : {},
+        ext: tempConfig && tempConfig.ext ? tempConfig.ext : {},
     };
     return config;
 }
@@ -103,7 +103,7 @@ function fillConfig(tempConfig) {
         paths: {
             project: getAbsolutePath(null, tempConfig.paths.project) || process.cwd(),
         },
-        extensions: {},
+        ext: {},
     };
 
     if (!config.general.name) {
@@ -121,7 +121,7 @@ function fillConfig(tempConfig) {
 
     config.paths.base = getPath(tempConfig.paths.base) || config.paths.project;
     config.paths.temp = getPath(tempConfig.paths.temp) || createTempDir(undefined, config.paths.project)
-    config.paths.native = (tempConfig.paths.native || ['native', 'src/native']).map(p => getPath(p));
+    config.paths.native = (tempConfig.paths.native || ['src/native']).map(p => getPath(p));
     config.paths.module = (tempConfig.paths.module || config.paths.native).map(p => getPath(p));
     config.paths.header = (tempConfig.paths.header || config.paths.native).map(p => getPath(p));
     config.paths.bridge = (tempConfig.paths.bridge || [...config.paths.native, config.paths.temp]).map(p => getPath(p));
@@ -129,9 +129,9 @@ function fillConfig(tempConfig) {
     config.paths.cmake = getPath(tempConfig.paths.cmake || findCMakeListsFile(config.paths.project));
     config.paths.cli = __dirname;
 
-    config.extensions.header = tempConfig.extensions.header || ['h', 'hpp', 'hxx', 'hh'];
-    config.extensions.source = tempConfig.extensions.source || ['c', 'cpp', 'cxx', 'cc'];
-    config.extensions.module = tempConfig.extensions.module || ['i'];
+    config.ext.header = tempConfig.ext.header || ['h', 'hpp', 'hxx', 'hh'];
+    config.ext.source = tempConfig.ext.source || ['c', 'cpp', 'cxx', 'cc'];
+    config.ext.module = tempConfig.ext.module || ['i'];
 
     createDir('interface', config.paths.temp);
     createDir('bridge', config.paths.temp);

package/src/utils/pullDockerImage.js

@@ -1,7 +1,7 @@
 import { execFileSync } from 'child_process';
 
 export default function pullDockerImage() {
-    const isImageExist = execFileSync("docker", ["images", "-q", "bugra9/cpp.js"], {encoding: 'utf-8'}).trim() !== '';
+    const isImageExist = execFileSync("docker", ["images", "-q", getDockerImage()], {encoding: 'utf-8'}).trim() !== '';
 
     if (!isImageExist) {
         console.log('');
@@ -9,9 +9,13 @@ export default function pullDockerImage() {
         console.log('============= Downloading the docker image... =============');
         console.log('===========================================================');
         console.log('');
-        execFileSync("docker", ["pull", "bugra9/cpp.js"], {stdio: 'inherit'});
+        execFileSync("docker", ["pull", getDockerImage], {stdio: 'inherit'});
         console.log('');
         console.log('===========================================================');
         console.log('');
     }
 }
+
+export function getDockerImage() {
+    return "bugra9/cpp.js:0.2.0";
+}