cpp.js 1.0.0-beta.31 → 1.0.0-beta.33

package/CHANGELOG.md

@@ -0,0 +1,7 @@
+# cpp.js
+
+## 1.0.0-beta.33
+
+### Patch Changes
+
+- chore: add initial version of CHANGELOGS files

package/README.md

@@ -15,8 +15,10 @@
 <a href="https://github.com/bugra9/cpp.js/discussions"><img alt="Discussions" src="https://img.shields.io/github/discussions/bugra9/cpp.js?style=for-the-badge" /></a>
 <a href="https://github.com/bugra9/cpp.js/issues"><img alt="Issues" src="https://img.shields.io/github/issues/bugra9/cpp.js?style=for-the-badge" /></a>
 <br />
+<img alt="CodeQL" src="https://img.shields.io/github/actions/workflow/status/bugra9/cpp.js/github-code-scanning/codeql?branch=main&style=for-the-badge&label=CodeQL">
 <img alt="Linux Build" src="https://img.shields.io/github/actions/workflow/status/bugra9/cpp.js/build-linux.yml?branch=main&style=for-the-badge&label=Linux%20Build">
 <img alt="Macos Build" src="https://img.shields.io/github/actions/workflow/status/bugra9/cpp.js/build-macos.yml?branch=main&style=for-the-badge&label=Macos%20Build">
+<img alt="Windows Build" src="https://img.shields.io/github/actions/workflow/status/bugra9/cpp.js/build-windows.yml?branch=main&style=for-the-badge&label=Windows%20Build">
 </div>
 
 <h3 align="center">
@@ -101,4 +103,4 @@ Integrate cpp.js seamlessly into your existing projects using the appropriate pa
 ## License
 [MIT](https://github.com/bugra9/cpp.js/blob/main/LICENSE)
 
-Copyright (c) 2024, Buğra Sarı
+Copyright (c) 2023-2025, Buğra Sarı

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cpp.js",
-  "version": "1.0.0-beta.31",
+  "version": "1.0.0-beta.33",
   "license": "MIT",
   "homepage": "https://cpp.js.org",
   "repository": "https://github.com/bugra9/cpp.js.git",

package/src/actions/getAllBridges.js

@@ -1,8 +1,8 @@
-import { glob } from 'glob';
+import findFiles from '../utils/findFiles.js';
 import state from '../state/index.js';
 
 export default function getAllBridges() {
     return [
-        ...glob.sync(`${state.config.paths.build}/bridge/*.i.cpp`, { absolute: true }),
+        ...findFiles(`${state.config.paths.build}/bridge/*.i.cpp`),
     ];
 }

package/src/actions/getDependLibs.js

@@ -1,15 +1,15 @@
-import { glob } from 'glob';
+import findFiles from '../utils/findFiles.js';
 import state from '../state/index.js';
 
 export default function getDependLibs() {
     let dependLibs = [
-        ...glob.sync(`${state.config.paths.build}/Source-Release/Emscripten-x86_64/dependencies/**/*.a`, { absolute: true, cwd: state.config.paths.project }),
+        ...findFiles(`${state.config.paths.build}/Source-Release/Emscripten-x86_64/dependencies/**/*.a`, { cwd: state.config.paths.project }),
     ];
     state.config.dependencyParameters.cmakeDepends.forEach((d) => {
         if (d.export.libName) {
             d.export.libName.forEach((fileName) => {
                 if (d.platform['Emscripten-x86_64'].ignoreLibName?.includes(fileName)) return;
-                dependLibs.push(...glob.sync(`${d.paths.output}/prebuilt/Emscripten-x86_64/lib/lib${fileName}.a`, { absolute: true, cwd: d.paths.project }));
+                dependLibs.push(...findFiles(`${d.paths.output}/prebuilt/Emscripten-x86_64/lib/lib${fileName}.a`, { cwd: d.paths.project }));
             });
         }
     });

package/src/actions/run.js

@@ -5,7 +5,8 @@ import getOsUserAndGroupId from '../utils/getOsUserAndGroupId.js';
 import { getContentHash } from '../utils/hash.js';
 import state from '../state/index.js';
 
-const CROSSCOMPILER = 'aarch64-linux-android33';
+const CROSSCOMPILER_ARM64 = 'aarch64-linux-android33';
+const CROSSCOMPILER_x86_64 = 'x86_64-linux-android33';
 const ANDROID_NDK = '/opt/android-sdk/ndk/25.2.9519653';
 const t = `${ANDROID_NDK}/toolchains/llvm/prebuilt/linux-x86_64/bin`;
 const t2 = `${ANDROID_NDK}/toolchains/llvm/prebuilt/linux-x86_64`;
@@ -15,11 +16,23 @@ const iosBinPath = `${iOSDevPath}/Toolchains/XcodeDefault.xctoolchain/usr/bin`;
 const iosSdkPath = `${iOSDevPath}/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk`;
 const iosSimSdkPath = `${iOSDevPath}/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk`;
 
-const androidParams = [
+const androidParamsArm64 = [
     '-e', `AR=${t}/llvm-ar`,
     '-e', `AS=${t}/llvm-as`,
-    '-e', `CC=${t}/${CROSSCOMPILER}-clang`,
-    '-e', `CXX=${t}/${CROSSCOMPILER}-clang++`,
+    '-e', `CC=${t}/${CROSSCOMPILER_ARM64}-clang`,
+    '-e', `CXX=${t}/${CROSSCOMPILER_ARM64}-clang++`,
+    '-e', `LD=${t}/ld`,
+    '-e', `RANLIB=${t}/llvm-ranlib`,
+    '-e', `STRIP=${t}/llvm-strip`,
+    '-e', `NM=${t}/nm`,
+    '-e', `CFLAGS=--sysroot=${t2}/sysroot`,
+];
+
+const androidParamsX86_64 = [
+    '-e', `AR=${t}/llvm-ar`,
+    '-e', `AS=${t}/llvm-as`,
+    '-e', `CC=${t}/${CROSSCOMPILER_x86_64}-clang`,
+    '-e', `CXX=${t}/${CROSSCOMPILER_x86_64}-clang++`,
     '-e', `LD=${t}/ld`,
     '-e', `RANLIB=${t}/llvm-ranlib`,
     '-e', `STRIP=${t}/llvm-strip`,
@@ -91,11 +104,12 @@ export default function run(program, params = [], platformPrefix = null, platfor
                 break;
             case 'Android':
                 [dProgram, ...dParams] = params;
-                platformParams = androidParams;
+                platformParams = arch[0] === 'x86_64' ? androidParamsX86_64 : androidParamsArm64;
                 if (dProgram === 'cmake') {
                     dParams = [
                         ...dParams,
-                        '-DCMAKE_SYSTEM_NAME=Android', '-DCMAKE_SYSTEM_VERSION=33', '-DCMAKE_ANDROID_ARCH_ABI=arm64-v8a',
+                        '-DCMAKE_SYSTEM_NAME=Android', '-DCMAKE_SYSTEM_VERSION=33',
+                        `-DCMAKE_ANDROID_ARCH_ABI=${arch[0] === 'x86_64' ? 'x86_64' : 'arm64-v8a'}`,
                         `-DCMAKE_ANDROID_NDK=${ANDROID_NDK}`,
                     ];
                 }

package/src/bin.js

@@ -3,7 +3,6 @@
 import fs from 'node:fs';
 import { execFileSync } from 'node:child_process';
 import { Command, Option } from 'commander';
-import { glob } from 'glob';
 import replace from 'replace';
 
 import { state } from './index.js';
@@ -18,6 +17,7 @@ import systemKeys from './utils/systemKeys.js';
 
 import { getDockerImage } from './utils/pullDockerImage.js';
 import { getContentHash } from './utils/hash.js';
+import findFiles from './utils/findFiles.js';
 
 const packageJSON = JSON.parse(fs.readFileSync(new URL('../package.json', import.meta.url)));
 
@@ -262,8 +262,8 @@ function buildLib(platform) {
 
             const modules = [];
             state.config.paths.module.forEach((modulePath) => {
-                modules.push(...glob.sync('**/*.i', { absolute: true, cwd: modulePath }));
-                modules.push(...glob.sync('*.i', { absolute: true, cwd: modulePath }));
+                modules.push(...findFiles('**/*.i', { cwd: modulePath }));
+                modules.push(...findFiles('*.i', { cwd: modulePath }));
             });
             if (modules.length > 0) {
                 fs.mkdirSync(`${state.config.paths.output}/prebuilt/${p}/swig`, { recursive: true });
@@ -289,7 +289,7 @@ function buildLib(platform) {
 async function createWasmJs() {
     let headers = [];
     state.config.paths.header.forEach((headerPath) => {
-        headers.push(glob.sync('**/*.h', { absolute: true, cwd: headerPath }));
+        headers.push(findFiles('**/*.h', { cwd: headerPath }));
     });
     headers = headers.filter((path) => !!path.toString()).flat();
 

package/src/state/index.js

@@ -6,9 +6,9 @@ const cacheDir = `${process.cwd()}/.cppjs`;
 
 const state = {
     platforms: {
-        All: ['Emscripten-x86_64', 'Android-arm64-v8a', 'iOS-iphoneos', 'iOS-iphonesimulator'],
+        All: ['Emscripten-x86_64', 'Android-arm64-v8a', 'Android-x86_64', 'iOS-iphoneos', 'iOS-iphonesimulator'],
         WebAssembly: ['Emscripten-x86_64'],
-        Android: ['Android-arm64-v8a'],
+        Android: ['Android-arm64-v8a', 'Android-x86_64'],
         iOS: ['iOS-iphoneos', 'iOS-iphonesimulator'],
     },
     config: null,

package/src/state/loadConfig.js

@@ -64,7 +64,7 @@ function getFilledConfig(config, options = { isDepend: false }) {
     newConfig.paths.bridge = (newConfig.paths.bridge || [...newConfig.paths.native, newConfig.paths.build])
         .map((p) => getPath(p));
     newConfig.paths.output = getPath(newConfig.paths.output) || newConfig.paths.build;
-    newConfig.paths.cmake = options.isDepend ? getCMakeListsFilePath(newConfig.paths.output) : (
+    newConfig.paths.cmake = options.isDepend ? getPath(getCMakeListsFilePath(newConfig.paths.output)) : (
         getPath(newConfig.paths.cmake || getCMakeListsFilePath(newConfig.paths.project))
     );
     newConfig.paths.cmakeDir = getParentPath(newConfig.paths.cmake);
@@ -85,6 +85,7 @@ function getFilledConfig(config, options = { isDepend: false }) {
     newConfig.platform['Emscripten-x86_64-browser'] = newConfig.platform['Emscripten-x86_64-browser'] || {};
     newConfig.platform['Emscripten-x86_64-node'] = newConfig.platform['Emscripten-x86_64-node'] || {};
     newConfig.platform['Android-arm64-v8a'] = newConfig.platform['Android-arm64-v8a'] || {};
+    newConfig.platform['Android-x86_64'] = newConfig.platform['Android-x86_64'] || {};
     newConfig.platform['iOS-iphoneos'] = newConfig.platform['iOS-iphoneos'] || {};
     newConfig.platform['iOS-iphonesimulator'] = newConfig.platform['iOS-iphonesimulator'] || {};
 

package/src/utils/findFiles.js

@@ -0,0 +1,5 @@
+import { glob } from 'glob';
+
+export default function findFiles(regex, options = {}) {
+    return glob.sync(regex, { absolute: true, posix: true, ...options }).map(p => p.replace('//?/', ''));
+}

package/src/utils/getAbsolutePath.js

@@ -5,7 +5,7 @@ export default function getAbsolutePath(projectPath, path) {
         return null;
     }
     if (upath.isAbsolute(path)) {
-        return path;
+        return upath.resolve(path);
     }
     if (projectPath) {
         return upath.resolve(upath.join(upath.resolve(projectPath), path));

package/src/utils/getCMakeListsFilePath.js

@@ -1,10 +1,10 @@
-import { glob } from 'glob';
 import getParentPath from './getParentPath.js';
+import findFiles from './findFiles.js';
 
 export default function getCMakeListsFilePath(basePath = process.cwd()) {
-    let temp = glob.sync('CMakeLists.txt', { absolute: true, cwd: basePath });
+    let temp = findFiles('CMakeLists.txt', { cwd: basePath });
     if (temp.length === 0) {
-        temp = glob.sync('*/CMakeLists.txt', { absolute: true, cwd: basePath, ignore: ['node_modules/*', 'dist/*', 'build/*'] });
+        temp = findFiles('*/CMakeLists.txt', { cwd: basePath, ignore: ['node_modules/*', 'dist/*', 'build/*'] });
     }
 
     if (temp.length > 0) return temp[0];