cpp.js 1.0.0-beta.25 → 1.0.0-beta.27

package/package.json

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

package/src/actions/buildJs.js

@@ -1,6 +1,5 @@
 /* eslint-disable no-await-in-loop */
 /* eslint-disable no-restricted-syntax */
-import fs from 'fs';
 import { rollup } from 'rollup';
 import { nodeResolve } from '@rollup/plugin-node-resolve';
 import commonjs from '@rollup/plugin-commonjs';

package/src/actions/buildWasm.js

@@ -1,4 +1,4 @@
-import fs from 'fs';
+import fs from 'node:fs';
 import run from './run.js';
 import getDependLibs from './getDependLibs.js';
 import getData from './getData.js';
@@ -8,7 +8,7 @@ import state from '../state/index.js';
 export default async function buildWasm(type, isProd = false) {
     const buildType = isProd ? 'Release' : 'Debug';
     const libs = [
-        getDependLibs(),
+        ...getDependLibs(),
         `${state.config.paths.build}/Source-${buildType}/Emscripten-x86_64/lib${state.config.general.name}.a`,
         `${state.config.paths.build}/Bridge-${buildType}/Emscripten-x86_64/lib${state.config.general.name}.a`,
     ];

package/src/actions/createInterface.js

@@ -1,5 +1,5 @@
 /* eslint-disable prefer-destructuring */
-import fs from 'fs';
+import fs from 'node:fs';
 import state, { saveCache } from '../state/index.js';
 import { getFileHash } from '../utils/hash.js';
 import run from './run.js';
@@ -36,8 +36,7 @@ function createInterfaceFile(headerOrModuleFilePath) {
     }
 
     const headerPaths = (state.config.dependencyParameters?.pathsOfCmakeDepends?.split(';') || [])
-        .filter((d) => d.startsWith(state.config.paths.base))
-        .map((d) => d.replace(`${state.config.paths.base}/`, ''));
+        .filter((d) => d.startsWith(state.config.paths.base));
 
     const temp2 = headerPaths
         .map((p) => headerOrModuleFilePath.match(new RegExp(`^${p}/.*?/include/(.*?)$`, 'i')))
@@ -47,10 +46,10 @@ function createInterfaceFile(headerOrModuleFilePath) {
     if (temp.length < 2) return null;
 
     const filePathWithoutExt = temp[1];
-    const interfaceFile = `${state.config.paths.base}/${filePathWithoutExt}.i`;
+    const interfaceFile = `${filePathWithoutExt}.i`;
 
     if (fs.existsSync(interfaceFile)) {
-        const newPath = `${state.config.paths.build}/interface/${filePathWithoutExt}.i`;
+        const newPath = `${state.config.paths.build}/interface/${interfaceFile.split('/').at(-1)}`;
         fs.copyFileSync(interfaceFile, newPath);
         state.cache.interfaces[headerOrModuleFilePath] = newPath;
         state.cache.hashes[headerOrModuleFilePath] = fileHash;

package/src/actions/createLib.js

@@ -1,5 +1,5 @@
-import os from 'os';
-import fs from 'fs';
+import os from 'node:os';
+import fs from 'node:fs';
 import replace from 'replace';
 import run from './run.js';
 import getCmakeParameters from './getCmakeParameters.js';
@@ -32,7 +32,8 @@ export default function createLib(platform, fileType, options = {}) {
         const ext = sharedPlatforms.includes(basePlatform) ? 'so' : 'a';
         buildParams = getBuildParams ? getBuildParams(platform, depPaths, ext, buildPath) : [];
         if (state.config.build?.buildType !== 'configure') {
-            buildParams.push(`-DCMAKE_PREFIX_PATH=${libdir}`, `-DCMAKE_FIND_ROOT_PATH=${libdir}`);
+            const cmakeBuildType = sharedPlatforms.includes(basePlatform) ? 'SHARED' : 'STATIC';
+            buildParams.push(`-DCMAKE_PREFIX_PATH=${libdir}`, `-DCMAKE_FIND_ROOT_PATH=${libdir}`, `-DBUILD_TYPE=${cmakeBuildType}`);
         }
 
         const cFlags = Object.values(depPaths).map((d) => `-I${d.header}`).join(' ');

package/src/actions/createXCFramework.js

@@ -1,40 +1,44 @@
-import fs from 'fs';
-import { execFileSync } from 'child_process';
+import fs from 'node:fs';
+import upath from 'upath';
+import { execFileSync } from 'node:child_process';
 import state from '../state/index.js';
 
-export default function createXCFramework(createLink = true) {
+export default function createXCFramework(overrideConfig = null) {
     if (process.platform !== 'darwin') {
         return;
     }
-    const { output } = state.config.paths;
+
+    const output = overrideConfig?.paths?.output || state.config.paths.output;
+    const projectPath = overrideConfig?.paths?.project || state.config.paths.project;
+    const libName = overrideConfig?.export?.libName || state.config.export.libName;
+
     if (
         !fs.existsSync(`${output}/prebuilt/iOS-iphoneos/lib`)
         || !fs.existsSync(`${output}/prebuilt/iOS-iphonesimulator/lib`)
     ) return;
 
     const options = {
-        cwd: `${output}/prebuilt`,
+        cwd: projectPath,
         stdio: 'inherit',
     };
 
-    state.config.export.libName.forEach((fileName) => {
-        if (!fs.existsSync(`${options.cwd}/${fileName}.xcframework`)) {
+    const relativeOutput = upath.relative(projectPath, output);
+
+    libName.forEach((fileName) => {
+        if (!fs.existsSync(`${projectPath}/${fileName}.xcframework`)) {
             const params = [
                 '-create-xcframework',
-                '-library', `iOS-iphoneos/lib/lib${fileName}.a`,
-                '-headers', 'iOS-iphoneos/include',
-                '-library', `iOS-iphonesimulator/lib/lib${fileName}.a`,
-                '-headers', 'iOS-iphonesimulator/include',
+                '-library', `${relativeOutput}/prebuilt/iOS-iphoneos/lib/lib${fileName}.a`,
+                '-headers', `${relativeOutput}/prebuilt/iOS-iphoneos/include`,
+                '-library', `${relativeOutput}/prebuilt/iOS-iphonesimulator/lib/lib${fileName}.a`,
+                '-headers', `${relativeOutput}/prebuilt/iOS-iphonesimulator/include`,
                 '-output', `${fileName}.xcframework`,
             ];
             execFileSync('xcodebuild', params, options);
         }
 
-        if (!fs.existsSync(`${options.cwd}/${fileName}.xcframework.zip`)) {
-            execFileSync('zip', ['-y', '-r', `./${fileName}.xcframework.zip`, `${fileName}.xcframework`], options);
-        }
-        if (createLink && !fs.existsSync(`${state.config.paths.project}/${fileName}.xcframework`)) {
-            fs.symlinkSync(`${options.cwd}/${fileName}.xcframework`, `${state.config.paths.project}/${fileName}.xcframework`);
+        if (!fs.existsSync(`${output}/prebuilt/${fileName}.xcframework.zip`)) {
+            execFileSync('zip', ['-y', '-r', `${relativeOutput}/prebuilt/${fileName}.xcframework.zip`, `${fileName}.xcframework`], options);
         }
     });
 }

package/src/actions/getCmakeParameters.js

@@ -12,7 +12,12 @@ export default function getCmakeParameters(platform, options = {}) {
     const externalNativeGlob = [
         ...(options.nativeGlob || []),
     ];
+    const externalBridgeGlob = [
+        `${state.config.paths.cli}/assets/bridge.cpp`,
+        ...(options.bridgeGlob || []),
+    ];
     const nativeGlob = [
+        `${state.config.paths.cli}/assets/cppjsemptysource.cpp`,
         ...(dependParams.nativeGlob || []),
     ];
     const headerGlob = [
@@ -34,6 +39,7 @@ export default function getCmakeParameters(platform, options = {}) {
         `-DPROJECT_NAME=${options.name || state.config.general.name}`,
         `-DBASE_DIR=${state.config.paths.project}`,
         `-DEXTERNAL_NATIVE_GLOB=${externalNativeGlob.join(';')}`,
+        `-DEXTERNAL_BRIDGE_GLOB=${externalBridgeGlob.join(';')}`,
         `-DNATIVE_GLOB=${nativeGlob.join(';')}`,
         `-DHEADER_GLOB=${headerGlob.join(';')}`,
         `-DHEADER_DIR=${headerDirs.join(';')}`,

package/src/actions/run.js

@@ -1,7 +1,8 @@
-import { execFileSync } from 'child_process';
-import fs from 'fs';
+import { execFileSync } from 'node:child_process';
+import fs from 'node:fs';
 import pullDockerImage, { getDockerImage } from '../utils/pullDockerImage.js';
 import getOsUserAndGroupId from '../utils/getOsUserAndGroupId.js';
+import { getContentHash } from '../utils/hash.js';
 import state from '../state/index.js';
 
 const CROSSCOMPILER = 'aarch64-linux-android33';
@@ -151,92 +152,94 @@ export default function run(program, params = [], platformPrefix = null, platfor
             default:
         }
     }
-    if (basePlatform === 'iOS' && program === null) {
+
+    const env = {};
+    let runner = 'DOCKER';
+    if ((basePlatform === 'iOS' && program === null) || state.config.system.RUNNER === 'LOCAL') {
+        runner = 'LOCAL';
+    }
+
+    if (runner === 'LOCAL') {
         const allowedEnv = [
             '^PWD$', '^SHELL$', '^LC_CTYPE$', '^PATH$', '^HOME$', '^TMPDIR$', '^USER$',
             '^PODS_*', '^CONFIGURATION_BUILD_DIR$', '^UNLOCALIZED_RESOURCES_FOLDER_PATH$',
         ];
-        const env = {};
         Object.entries(process.env).forEach(([key, value]) => {
             if (allowedEnv.some((e) => key.match(e))) {
                 env[key] = value;
             }
         });
-        const pParams = [...platformParams, ...(dockerOptions.params || [])];
-        for (let i = 0; i < pParams.length; i += 2) {
-            if (pParams[i] === '-e') {
-                const [key, ...rest] = pParams[i + 1].split('=');
-                const value = rest.join('=');
-                if (['CFLAGS', 'CXXFLAGS', 'CPPFLAGS', 'LDFLAGS'].includes(key)) {
-                    let v = value;
-                    if (v.startsWith('\'') || v.startsWith('"')) {
-                        v = v.substring(1, v.length - 1);
-                    }
-                    if (env[key]) env[key] += ` ${v}`;
-                    else env[key] = v;
-                } else {
-                    env[key] = value;
+    }
+
+    const pParams = [...platformParams, ...(dockerOptions.params || [])];
+    for (let i = 0; i < pParams.length; i += 2) {
+        if (pParams[i] === '-e') {
+            const [key, ...rest] = pParams[i + 1].split('=');
+            const value = rest.join('=');
+            if (['CFLAGS', 'CXXFLAGS', 'CPPFLAGS', 'LDFLAGS'].includes(key)) {
+                let v = value;
+                if (v.startsWith('\'') || v.startsWith('"')) {
+                    v = v.substring(1, v.length - 1);
                 }
+                if (env[key]) env[key] += ` ${v}`;
+                else env[key] = v;
+            } else {
+                env[key] = value;
             }
         }
+    }
 
+    let fileExecParams;
+    if (runner === 'LOCAL') {
         env.PATH = `/opt/homebrew/bin:${env.PATH}`;
 
         const options = {
             cwd: dockerOptions.workdir || buildPath,
-            stdio: dockerOptions.console ? 'inherit' : 'ignore',
+            stdio: dockerOptions.console ? 'inherit' : ['ignore', 'pipe', 'pipe'],
             env,
         };
-        execFileSync(dProgram, dParams, options);
-    } else if (false) {
-        const options = { cwd: buildPath, stdio: dockerOptions.console ? 'inherit' : 'ignore' };
-        const args = [
-            'exec',
-            '--user', getOsUserAndGroupId(),
-            '--workdir', dockerOptions.workdir || replaceBasePathForDocker(buildPath),
-            'cppjs-builder',
-            dProgram,
-            ...replaceBasePathForDocker(dParams),
-        ];
-        execFileSync('docker', args, options);
-    } else {
-        const env = {};
-        const pParams = [...platformParams, ...(dockerOptions.params || [])];
-        for (let i = 0; i < pParams.length; i += 2) {
-            if (pParams[i] === '-e') {
-                const [key, ...rest] = pParams[i + 1].split('=');
-                const value = rest.join('=');
-                if (['CFLAGS', 'CXXFLAGS', 'CPPFLAGS', 'LDFLAGS'].includes(key)) {
-                    let v = value;
-                    if (v.startsWith('\'') || v.startsWith('"')) {
-                        v = v.substring(1, v.length - 1);
-                    }
-                    if (env[key]) env[key] += ` ${v}`;
-                    else env[key] = v;
-                } else {
-                    env[key] = value;
-                }
-            }
-        }
-
+        fileExecParams = [dProgram, dParams, options];
+    } else if (runner === 'DOCKER') {
         const dockerEnv = [];
         Object.entries(env).forEach(([key, value]) => {
             dockerEnv.push('-e', `${key}=${value}`);
         });
-        const options = { cwd: buildPath, stdio: dockerOptions.console ? 'inherit' : 'ignore' };
+        const options = { cwd: buildPath, stdio: dockerOptions.console ? 'inherit' : ['ignore', 'pipe', 'pipe'] };
+
+        let runnerParams = [];
+        let imageOrContainer = null;
+        if (state.config.system.RUNNER === 'DOCKER_RUN') {
+            imageOrContainer = getDockerImage();
+            runnerParams = ['run', '--rm', '-v', `${state.config.paths.base}:/tmp/cppjs/live`];
+        } else if (state.config.system.RUNNER === 'DOCKER_EXEC') {
+            imageOrContainer = `${getDockerImage()}-${getContentHash(state.config.paths.base)}`.replace('/', '-').replace(':', '-');
+            runnerParams = ['exec'];
+        } else {
+            throw new Error(`The runner ${state.config.system.RUNNER} is invalid.`);
+        }
+
         const args = [
-            'run',
-            '--rm',
+            ...runnerParams,
             '--user', getOsUserAndGroupId(),
-            '-v', `${state.config.paths.base}:/tmp/cppjs/live`,
             '--workdir', replaceBasePathForDocker(dockerOptions.workdir || buildPath),
             ...replaceBasePathForDocker(dockerEnv),
             // '-e', replaceBasePathForDocker(`CCACHE_DIR=${state.config.paths.build}/ccache`),
-            getDockerImage(),
+            imageOrContainer,
             replaceBasePathForDocker(dProgram),
             ...replaceBasePathForDocker(dParams),
         ];
-        execFileSync('docker', args, options);
+        fileExecParams = ['docker', args, options];
+    } else {
+        throw new Error(`The runner ${state.config.system.RUNNER} or command is invalid.`);
+    }
+
+    try {
+        execFileSync(...fileExecParams);
+    } catch (e) {
+        console.log(e?.stdout?.toString() || 'stdout is empty');
+        console.error(e?.stderr?.toString() || 'stderr is empty');
+        console.error('An error occurred while running the application. Please check the logs for more details.');
+        process.exit();
     }
 }
 

package/src/assets/CMakeLists.txt

@@ -26,7 +26,7 @@ if (BUILD_SOURCE)
 endif(BUILD_SOURCE)
 
 if (BUILD_BRIDGE)
-    file(GLOB BRIDGE_SRC_FILES "${BRIDGE_DIR}/*.i.cpp")
+    file(GLOB BRIDGE_SRC_FILES "${BRIDGE_DIR}/*.i.cpp;${EXTERNAL_BRIDGE_GLOB}")
 endif(BUILD_BRIDGE)
 
 file(GLOB_RECURSE EXTERNAL_SRC_FILES ${EXTERNAL_NATIVE_GLOB})

package/src/assets/bridge.cpp

@@ -0,0 +1,17 @@
+#include <emscripten/bind.h>
+
+EMSCRIPTEN_BINDINGS(stl_wrappers) {
+    emscripten::register_vector<bool>("VectorBool");
+    emscripten::register_vector<char>("VectorChar");
+    emscripten::register_vector<short>("VectorShort");
+    emscripten::register_vector<int>("VectorInt");
+    emscripten::register_vector<int64_t>("VectorInt64");
+    emscripten::register_vector<float>("VectorFloat");
+    emscripten::register_vector<double>("VectorDouble");
+    emscripten::register_vector<std::string>("VectorString");
+
+    emscripten::register_map<int,int>("MapIntInt");
+    emscripten::register_map<int,std::string>("MapIntString");
+    emscripten::register_map<std::string,std::string>("MapStringString");
+    emscripten::register_map<std::string,int>("MapStringInt");
+}

package/src/bin.js

@@ -1,6 +1,7 @@
 #!/usr/bin/env node
 
-import fs from 'fs';
+import fs from 'node:fs';
+import { execFileSync } from 'node:child_process';
 import { Command, Option } from 'commander';
 import glob from 'glob';
 import upath from 'upath';
@@ -14,6 +15,10 @@ import createXCFramework from './actions/createXCFramework.js';
 import runCppjsApp from './actions/run.js';
 import downloadAndExtractFile from './utils/downloadAndExtractFile.js';
 import writeJson from './utils/writeJson.js';
+import systemKeys from './utils/systemKeys.js';
+
+import { getDockerImage } from './utils/pullDockerImage.js';
+import { getContentHash } from './utils/hash.js';
 
 const packageJSON = JSON.parse(fs.readFileSync(new URL('../package.json', import.meta.url)));
 
@@ -29,20 +34,22 @@ 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', 'WebAssembly', 'Android', 'iOS']));
 
-const commandRun = program.command('run')
-    .description('run docker application');
+const commandDocker = program.command('docker')
+    .description('manage docker');
+const commandRun = commandDocker.command('run').description('run docker application');
+commandDocker.command('create').description('create docker container');
+commandDocker.command('start').description('start docker container');
+commandDocker.command('stop').description('stop docker container');
+commandDocker.command('delete').description('delete docker container');
 
 const commandConfig = program.command('config')
-    .description('Manage the cpp.js configuration files');
-
-commandConfig.command('get').description('get cpp.js system configuration');
-commandConfig.command('set').description('set cpp.js system configuration');
-commandConfig.command('delete').description('delete cpp.js system configuration');
-const commandConfigList = commandConfig.command('list').description('list cpp.js configuration')
-    .addOption(new Option('-t, --type <type>', 'config type').default('all').choices(['all', 'system', 'project']));
-
-const commandPostInstall = program.command('postinstall')
-    .description('prepare the required packages for Cpp.js after installation');
+    .description('Manage the Cpp.js configuration files');
+commandConfig.command('get').description('get the Cpp.js system configuration');
+commandConfig.command('set').description('set the Cpp.js system configuration');
+commandConfig.command('delete').description('delete the Cpp.js system configuration');
+const commandConfigList = commandConfig.command('list').description('list the Cpp.js configurations')
+    .addOption(new Option('-t, --type <type>', 'config type').default('system').choices(['all', 'system', 'project']));
+commandConfig.command('keys').description('list all available system configuration keys for Cpp.js');
 
 program.parse(process.argv);
 
@@ -56,9 +63,72 @@ switch (program.args[0]) {
         }
         break;
     }
-    case 'run': {
-        const [programName, ...params] = commandRun.args;
-        run(programName, params);
+    case 'docker': {
+        switch (program.args[1]) {
+            case 'run': {
+                const [programName, ...params] = commandRun.args;
+                run(programName, params);
+                break;
+            }
+            case 'create': {
+                const args = [
+                    'run',
+                    '-dit',
+                    '--name',
+                    `${getDockerImage()}-${getContentHash(state.config.paths.base)}`.replace('/', '-').replace(':', '-'),
+                    '-v', `${state.config.paths.base}:/tmp/cppjs/live`,
+                    getDockerImage(),
+                    'bash',
+                ];
+                try {
+                    execFileSync('docker', args, { stdio: 'inherit' });
+                } catch (e) {
+                    console.error('An error occurred while running the application. Please check the logs for more details.');
+                    process.exit();
+                }
+                break;
+            }
+            case 'start': {
+                const args = [
+                    'start',
+                    `${getDockerImage()}-${getContentHash(state.config.paths.base)}`.replace('/', '-').replace(':', '-'),
+                ];
+                try {
+                    execFileSync('docker', args, { stdio: 'inherit' });
+                } catch (e) {
+                    console.error('An error occurred while running the application. Please check the logs for more details.');
+                    process.exit();
+                }
+                break;
+            }
+            case 'stop': {
+                const args = [
+                    'stop',
+                    `${getDockerImage()}-${getContentHash(state.config.paths.base)}`.replace('/', '-').replace(':', '-'),
+                ];
+                try {
+                    execFileSync('docker', args, { stdio: 'inherit' });
+                } catch (e) {
+                    console.error('An error occurred while running the application. Please check the logs for more details.');
+                    process.exit();
+                }
+                break;
+            }
+            case 'delete': {
+                const args = [
+                    'rm',
+                    `${getDockerImage()}-${getContentHash(state.config.paths.base)}`.replace('/', '-').replace(':', '-'),
+                ];
+                try {
+                    execFileSync('docker', args, { stdio: 'inherit' });
+                } catch (e) {
+                    console.error('An error occurred while running the application. Please check the logs for more details.');
+                    process.exit();
+                }
+                break;
+            }
+            default:
+        }
         break;
     }
     case 'config': {
@@ -75,29 +145,58 @@ switch (program.args[0]) {
             case 'list':
                 listSystemConfig(commandConfigList.opts().type);
                 break;
+            case 'keys':
+                listSystemKeys();
+                break;
             default:
                 break;
         }
         break;
     }
-    case 'postinstall': {
-        postInstall();
-        break;
-    }
     default:
         break;
 }
 
-function getSystemConfig(key) {
-    console.log(state.config.system[key]);
+function listSystemKeys() {
+    console.info('Available configurations:');
+    console.table(systemKeys);
+}
+
+function getSystemConfig(systemKey) {
+    if (!systemKey) {
+        listSystemConfig('system');
+        return;
+    }
+    const key = systemKey.toUpperCase();
+    const output = {};
+    if (key in state.config.system) {
+        output[key] = { value: state.config.system[key] || 'undefined', default: systemKeys[key].default };
+    }
+    Object.keys(systemKeys).filter((k) => k.includes(key)).forEach((k) => {
+        if (k in state.config.system) {
+            output[k] = { value: state.config.system[k] || 'undefined', default: systemKeys[k].default };
+        }
+    });
+
+    console.table(output);
 }
 
 function setSystemConfig(key, value) {
+    if (!systemKeys[key]) {
+        throw new Error(`Configuration ${key} is not available. Please choose from the following available configurations: ${Object.keys(systemKeys).join(', ')}`);
+    }
+    if (systemKeys[key].options && !systemKeys[key].options.includes(value)) {
+        throw new Error(`Value ${value} is not available. Please choose from the following available values: ${systemKeys[key].options.join(', ')}`);
+    }
+
     state.config.system[key] = value;
     writeJson(state.config.paths.systemConfig, state.config.system);
 }
 
 function deleteSystemConfig(key) {
+    if (!systemKeys[key]) {
+        throw new Error(`Configuration ${key} is not available. Please choose from the following available configurations: ${Object.keys(systemKeys).join(', ')}`);
+    }
     delete state.config.system[key];
     writeJson(state.config.paths.systemConfig, state.config.system);
 }
@@ -106,7 +205,7 @@ function listSystemConfig(type) {
     const { system: systemConfig, ...projectConfig } = state.config;
     if (type === 'all' || type === 'system') {
         console.log('System Configuration');
-        console.log(JSON.stringify(systemConfig, null, 2));
+        console.table(systemConfig);
     }
 
     if (type === 'all') {
@@ -115,38 +214,8 @@ function listSystemConfig(type) {
 
     if (type === 'all' || type === 'project') {
         console.log('Project Configuration');
-        console.log(JSON.stringify(projectConfig, null, 2));
-    }
-}
-
-function postInstall() {
-    const projectPath = process.env.PWD;
-    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;
-    }
-
-    const name = state?.config?.general?.name;
-    let dist = state?.config?.paths?.output;
-    dist = dist ? upath.relative(projectPath, dist) : null;
-
-    if (!name || !dist) {
-        return;
+        console.table(projectConfig);
     }
-
-    state?.config?.export?.libName?.forEach((fileName) => {
-        if (fs.existsSync(`${projectPath}/${fileName}.xcframework`) || !fs.existsSync(`${dist}/prebuilt/${fileName}.xcframework`)) {
-            return;
-        }
-        fs.symlinkSync(`${dist}/prebuilt/${fileName}.xcframework`, `${projectPath}/${fileName}.xcframework`);
-    });
 }
 
 function run(programName, params) {
@@ -177,7 +246,7 @@ async function buildExternal(platform) {
         });
     }
 
-    await buildLib(platform);
+    buildLib(platform);
 }
 
 async function build(platform) {
@@ -187,10 +256,23 @@ async function build(platform) {
     }
 }
 
-async function buildLib(platform) {
+function buildLib(platform) {
     state.platforms[platform].forEach((p) => {
         if (!fs.existsSync(`${state.config.paths.output}/prebuilt/${p}/lib`)) {
             createLib(p, 'Source', { isProd: true, buildSource: true });
+
+            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 }));
+            });
+            if (modules.length > 0) {
+                fs.mkdirSync(`${state.config.paths.output}/prebuilt/${p}/swig`, { recursive: true });
+            }
+            modules.forEach((modulePath) => {
+                const fileName = modulePath.split('/').at(-1);
+                fs.copyFileSync(modulePath, `${state.config.paths.output}/prebuilt/${p}/swig/${fileName}`);
+            });
         } else {
             console.log(`${state.config.general.name} is already compiled to ${p} architecture.`);
         }

package/src/integration/getCppJsScript.js

@@ -79,7 +79,7 @@ function getWebScript(env, modulePrefix) {
     return `
         export function initCppJs(config = {}) {
             return new Promise((resolve, reject) => {
-                import('/cpp.js').then(n => {
+                import(/* webpackIgnore: true */ '/cpp.js').then(n => {
                     return window.CppJs.initCppJs(${params});
                 }).then(m => {
                     ${modulePrefix}

package/src/integration/getDependFilePath.js

@@ -1,3 +1,4 @@
+import fs from 'node:fs';
 import state from '../state/index.js';
 
 export default function getDependFilePath(source, platform) {
@@ -6,13 +7,24 @@ export default function getDependFilePath(source, platform) {
 
     const dependPackage = state.config.allDependencies.find((d) => source.startsWith(d.package.name));
     if (dependPackage) {
-        const filePath = source.substring(dependPackage.package.name.length + 1);
+        const depName = dependPackage.package.name;
+        const filePath = source.substring(depName.length + 1);
 
-        let path = `${dependPackage.paths.output}/prebuilt/${platform}/${filePath}`;
+        let path;
         if (headerRegex.test(source)) {
-            path = `${dependPackage.paths.output}/prebuilt/${platform}/include/${filePath}`;
+            path = `${dependPackage.paths.output}/prebuilt/${platform}/include`;
         } else if (moduleRegex.test(source)) {
-            path = `${dependPackage.paths.output}/prebuilt/${platform}/swig/${filePath}`;
+            path = `${dependPackage.paths.output}/prebuilt/${platform}/swig`;
+        } else {
+            path = `${dependPackage.paths.output}/prebuilt/${platform}`;
+        }
+
+        if (fs.existsSync(`${path}/${depName}/${filePath}`)) {
+            path = `${path}/${depName}/${filePath}`;
+        } else if (fs.existsSync(`${path}/${filePath}`)) {
+            path = `${path}/${filePath}`;
+        } else {
+            throw new Error(`${source} not found in ${depName} package.`);
         }
 
         return path;

package/src/state/index.js

@@ -55,9 +55,9 @@ function setAllDependecyPaths() {
                 if (basePlatform === 'iOS') {
                     let xcRoot;
                     if (platform === 'iOS-iphoneos') {
-                        xcRoot = `${d.paths.output}/prebuilt/${name}.xcframework/ios-arm64_arm64e`;
+                        xcRoot = `${d.paths.project}/${name}.xcframework/ios-arm64_arm64e`;
                     } else if (platform === 'iOS-iphonesimulator') {
-                        xcRoot = `${d.paths.output}/prebuilt/${name}.xcframework/ios-arm64_arm64e_x86_64-simulator`;
+                        xcRoot = `${d.paths.project}/${name}.xcframework/ios-arm64_arm64e_x86_64-simulator`;
                     }
                     dep.header = `${xcRoot}/Headers`;
                     dep.libPath = xcRoot;

package/src/state/loadConfig.js

@@ -1,4 +1,5 @@
-import os from 'os';
+import os from 'node:os';
+import systemKeys from '../utils/systemKeys.js';
 import loadJs from '../utils/loadJs.js';
 import loadJson from '../utils/loadJson.js';
 import getParentPath from '../utils/getParentPath.js';
@@ -16,6 +17,12 @@ export default async function loadConfig(configDir = process.cwd(), configName =
     output.paths.systemConfig = `${os.homedir()}/.cppjs.json`;
     output.system = loadJson(output.paths.systemConfig) || {};
 
+    Object.entries(systemKeys).forEach(([key, value]) => {
+        if (!(key in output.system)) {
+            output.system[key] = value.default;
+        }
+    });
+
     return output;
 }
 

package/src/utils/downloadAndExtractFile.js

@@ -1,5 +1,5 @@
-import path from 'path';
-import fs, { mkdirSync } from 'fs';
+import path from 'node:path';
+import fs, { mkdirSync } from 'node:fs';
 import fr from 'follow-redirects';
 import decompress from 'decompress';
 

package/src/utils/getOsUserAndGroupId.js

@@ -1,4 +1,4 @@
-import os from 'os';
+import os from 'node:os';
 
 let osUserAndGroupId;
 export default function getOsUserAndGroupId() {

package/src/utils/getParentPath.js

@@ -1,4 +1,4 @@
-import * as url from 'url';
+import * as url from 'node:url';
 import upath from 'upath';
 
 export default function getParentPath(importUrl) {

package/src/utils/hash.js

@@ -1,5 +1,5 @@
-import fs from 'fs';
-import { createHash } from 'crypto';
+import fs from 'node:fs';
+import { createHash } from 'node:crypto';
 
 export function getFileHash(path) {
     const data = fs.readFileSync(path);

package/src/utils/loadJs.js

@@ -1,4 +1,4 @@
-import fs from 'fs';
+import fs from 'node:fs';
 
 export default async function loadJs(path, fileName, fileExt = ['json', 'js', 'mjs', 'cjs', 'ts']) {
     let filePath;

package/src/utils/loadJson.js

@@ -1,4 +1,4 @@
-import fs from 'fs';
+import fs from 'node:fs';
 
 export default function loadJson(filePath) {
     if (!fs.existsSync(filePath)) {

package/src/utils/pullDockerImage.js

@@ -1,9 +1,9 @@
-import { execFileSync } from 'child_process';
+import { execFileSync } from 'node:child_process';
 
 let isDockerImageAvailable = false;
 
 export function getDockerImage() {
-    return 'bugra9/cpp.js:0.2.7';
+    return 'bugra9/cpp.js:0.2.8';
 }
 
 export default function pullDockerImage() {

package/src/utils/systemKeys.js

@@ -0,0 +1,18 @@
+const systemKeys = {
+    XCODE_DEVELOPMENT_TEAM: {
+        description: 'The unique identifier of the development team used for code signing and app distribution in Xcode.',
+        default: '',
+    },
+    RUNNER: {
+        description: 'The execution environment for running the application.',
+        options: ['DOCKER_RUN', 'DOCKER_EXEC', 'LOCAL'],
+        default: 'DOCKER_RUN',
+    },
+    LOG_LEVEL: {
+        description: 'The verbosity of log output.',
+        options: ['DEBUG', 'INFO', 'WARN', 'ERROR'],
+        default: 'INFO',
+    },
+};
+
+export default systemKeys;

package/src/utils/writeJson.js

@@ -1,4 +1,4 @@
-import fs from 'fs';
+import fs from 'node:fs';
 
 export default function writeJson(filePath, data) {
     try {