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

package/src/actions/getData.js

@@ -1,34 +1,34 @@
-/* eslint-disable default-param-last */
-/* eslint-disable no-param-reassign */
+ 
+ 
 import state from '../state/index.js';
+import { getFilteredTargetSpec } from './target.js';
 
-function getRecursiveData(obj, config, dependency, field, platform, subPlatform) {
-    const platformName = subPlatform ? `${platform}-${subPlatform}` : platform;
-    if (dependency?.platform?.[platformName]?.[field]) {
-        Object.entries(dependency.platform[platformName][field]).forEach(([dKey, value]) => {
-            if (field === 'data') {
-                const key = `${dependency.paths.project}/dist/prebuilt/${platform}/${dKey}`;
-                obj[key] = value;
+function getRecursiveData(obj, config, dependency, field, target) {
+    const entryArray = getFilteredTargetSpec(dependency?.targetSpecs, target).map(s => s[field]);
+    const entries = Object.assign({}, ...entryArray);
+    Object.entries(entries).forEach(([dKey, value]) => {
+        if (field === 'data') {
+            const key = `${dependency.paths.project}/dist/prebuilt/${target.path}/${dKey}`;
+            obj[key] = value;
+        } else {
+            if (typeof value === 'object' && Array.isArray(value)) {
+                obj[dKey] = [...(obj[dKey] || []), ...value];
+            } else if (typeof value === 'object') {
+                obj[dKey] = { ...(obj[dKey] || {}), ...value };
             } else {
-                if (typeof value === 'object' && Array.isArray(value)) {
-                    obj[dKey] = [...(obj[dKey] || []), ...value];
-                } else if (typeof value === 'object') {
-                    obj[dKey] = {...(obj[dKey] || {}), ...value};
-                } else {
-                    obj[dKey] = value;
-                }
+                obj[dKey] = value;
             }
-        });
-    }
+        }
+    });
 
     dependency.dependencies.forEach((dep) => {
-        getRecursiveData(obj, config, dep, field, platform, subPlatform);
+        getRecursiveData(obj, config, dep, field, target);
     });
 }
 
-export default function getData(field, platform = 'Emscripten-x86_64', subPlatform) {
+export default function getData(field, target) {
     const output = {};
-    getRecursiveData(output, state.config, state.config, field, platform, subPlatform);
+    getRecursiveData(output, state.config, state.config, field, target);
 
     return output;
 }

package/src/actions/getDependLibs.js

@@ -1,15 +1,21 @@
 import findFiles from '../utils/findFiles.js';
 import state from '../state/index.js';
+import { getFilteredTargetSpec } from './target.js';
 
-export default function getDependLibs() {
+export default function getDependLibs(target) {
     let dependLibs = [
-        ...findFiles(`${state.config.paths.build}/Source-Release/Emscripten-x86_64/dependencies/**/*.a`, { cwd: state.config.paths.project }),
+        ...findFiles(`${state.config.paths.build}/Source-Release/${target.path}/dependencies/**/*.a`, { cwd: state.config.paths.project }),
     ];
-    state.config.dependencyParameters.cmakeDepends.forEach((d) => {
+    state.config.dependencyParameters.getCmakeDepends(target).forEach((d) => {
         if (d.export.libName) {
+            const ignoreLibNames = getFilteredTargetSpec(d?.targetSpecs).map(s => s.ignoreLibName).flat();
             d.export.libName.forEach((fileName) => {
-                if (d.platform['Emscripten-x86_64'].ignoreLibName?.includes(fileName)) return;
-                dependLibs.push(...findFiles(`${d.paths.output}/prebuilt/Emscripten-x86_64/lib/lib${fileName}.a`, { cwd: d.paths.project }));
+                if (ignoreLibNames?.includes(fileName)) return;
+                let libPaths = findFiles(`${d.paths.output}/prebuilt/${target.path}/lib/lib${fileName}.a`, { cwd: d.paths.project });
+                if (libPaths.length === 0) {
+                    libPaths = findFiles(`${d.paths.output}/prebuilt/${target.releasePath}/lib/lib${fileName}.a`, { cwd: d.paths.project });
+                }
+                dependLibs.push(...libPaths);
             });
         }
     });

package/src/actions/run.js

@@ -79,14 +79,13 @@ const iosParams = [
     '-e', `LDFLAGS="${IOS_HOST_FLAGS}"`,
 ]; */
 
-export default function run(program, params = [], platformPrefix = null, platform = null, dockerOptions = {}) {
-    const buildPath = platformPrefix ? `${state.config.paths.build}/${platformPrefix}/${platform}` : state.config.paths.build;
+export default function run(program, params = [], platformPrefix = null, target = null, dockerOptions = {}) {
+    const buildPath = platformPrefix ? `${state.config.paths.build}/${platformPrefix}/${target.path}` : state.config.paths.build;
     if (!fs.existsSync(buildPath)) {
         fs.mkdirSync(buildPath, { recursive: true });
     }
 
-    const [basePlatform, ...arch] = (platform || 'unknown-unknown').split('-'); // Emscripten-x86_64, Android-arm64-v8a, iOS-iphoneos, iOS-iphonesimulator
-    if (basePlatform !== 'iOS' || program !== null) {
+    if (target.platform !== 'ios' || program !== null) {
         pullDockerImage();
     }
 
@@ -94,30 +93,30 @@ export default function run(program, params = [], platformPrefix = null, platfor
     let dParams = params;
     let platformParams = [];
     if (program === null) {
-        switch (basePlatform) {
-            case 'Emscripten':
+        switch (target.platform) {
+            case 'wasm':
                 platformParams = ['-e', 'CXXFLAGS=-fwasm-exceptions', '-e', 'CFLAGS=-fwasm-exceptions'];
                 if (params[0].includes('configure')) dProgram = 'emconfigure';
                 else if (params[0] === 'make') dProgram = 'emmake';
                 else if (params[0] === 'cmake') dProgram = 'emcmake';
                 else if (params[0] === 'cc') dProgram = 'emcc';
                 break;
-            case 'Android':
+            case 'android':
                 [dProgram, ...dParams] = params;
-                platformParams = arch[0] === 'x86_64' ? androidParamsX86_64 : androidParamsArm64;
+                platformParams = target.arch === 'x86_64' ? androidParamsX86_64 : androidParamsArm64;
                 if (dProgram === 'cmake') {
                     dParams = [
                         ...dParams,
                         '-DCMAKE_SYSTEM_NAME=Android', '-DCMAKE_SYSTEM_VERSION=33',
-                        `-DCMAKE_ANDROID_ARCH_ABI=${arch[0] === 'x86_64' ? 'x86_64' : 'arm64-v8a'}`,
+                        `-DCMAKE_ANDROID_ARCH_ABI=${target.arch === 'x86_64' ? 'x86_64' : 'arm64-v8a'}`,
                         `-DCMAKE_ANDROID_NDK=${ANDROID_NDK}`,
                         `-DANDROID_NDK=${ANDROID_NDK}`,
                     ];
                 }
                 break;
-            case 'iOS':
+            case 'ios':
                 [dProgram, ...dParams] = params;
-                platformParams = [...iosParams, ...(arch[0] === 'iphoneos' ? IOS_IPHONE_PARAMS : IOS_SIM_PARAMS)];
+                platformParams = [...iosParams, ...(target.arch === 'iphoneos' ? IOS_IPHONE_PARAMS : IOS_SIM_PARAMS)];
                 if (dProgram === 'cmake') {
                     platformParams = [];
                     if (dParams[0] !== '--build' && dParams[0] !== '--install') {
@@ -130,10 +129,10 @@ export default function run(program, params = [], platformPrefix = null, platfor
                             '-DCMAKE_SYSTEM_NAME=iOS',
                             `-DMACOSX_FRAMEWORK_IDENTIFIER=org.js.cpp.${state.config.general.name}`,
                             `-DCMAKE_XCODE_ATTRIBUTE_PRODUCT_BUNDLE_IDENTIFIER=org.js.cpp.${state.config.general.name}`,
-                            `-DCMAKE_OSX_SYSROOT='${arch[0] === 'iphoneos' ? iosSdkPath : iosSimSdkPath}'`,
-                            `-DCMAKE_OSX_ARCHITECTURES=${arch[0] === 'iphoneos' ? 'arm64;arm64e' : 'arm64;x86_64'}`,
-                            `-DCMAKE_C_FLAGS=${arch[0] === 'iphoneos' ? '-fembed-bitcode' : '-fembed-bitcode-marker'}`,
-                            `-DCMAKE_CXX_FLAGS=${arch[0] === 'iphoneos' ? '-fembed-bitcode' : '-fembed-bitcode-marker'}`,
+                            `-DCMAKE_OSX_SYSROOT='${target.arch === 'iphoneos' ? iosSdkPath : iosSimSdkPath}'`,
+                            `-DCMAKE_OSX_ARCHITECTURES=${target.arch === 'iphoneos' ? 'arm64;arm64e' : 'arm64;x86_64'}`,
+                            `-DCMAKE_C_FLAGS=${target.arch === 'iphoneos' ? '-fembed-bitcode' : '-fembed-bitcode-marker'}`,
+                            `-DCMAKE_CXX_FLAGS=${target.arch === 'iphoneos' ? '-fembed-bitcode' : '-fembed-bitcode-marker'}`,
                             '-DCMAKE_XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY=\'iPhone Developer\'',
                             `-DCMAKE_XCODE_ATTRIBUTE_DEVELOPMENT_TEAM=${state.config.system.XCODE_DEVELOPMENT_TEAM}`,
                         ];
@@ -145,8 +144,8 @@ export default function run(program, params = [], platformPrefix = null, platfor
                         dParams = [
                             ...dParams,
                             `-DCMAKE_TOOLCHAIN_FILE='${state.config.paths.cli}/assets/ios.toolchain.cmake'`,
-                            `-DPLATFORM=${arch[0] === 'iphoneos' ? 'OS64' : 'SIMULATORARM64'}`,
-                            `-DARCHS=${arch[0] === 'iphoneos' ? 'arm64;arm64e' : 'arm64;x86_64'}`,
+                            `-DPLATFORM=${target.arch === 'iphoneos' ? 'OS64' : 'SIMULATORARM64'}`,
+                            `-DARCHS=${target.arch === 'iphoneos' ? 'arm64;arm64e' : 'arm64;x86_64'}`,
                             '-DENABLE_BITCODE=TRUE',
                             '-DBUILD_SHARED_LIBS=OFF',
                             '-DFRAMEWORK=TRUE',
@@ -154,10 +153,10 @@ export default function run(program, params = [], platformPrefix = null, platfor
                             '-DCMAKE_SYSTEM_NAME=iOS',
                             `-DMACOSX_FRAMEWORK_IDENTIFIER=org.js.cpp.${state.config.general.name}`,
                             `-DCMAKE_XCODE_ATTRIBUTE_PRODUCT_BUNDLE_IDENTIFIER=org.js.cpp.${state.config.general.name}`,
-                            `-DCMAKE_OSX_SYSROOT='${arch[0] === 'iphoneos' ? iosSdkPath : iosSimSdkPath}'`,
-                            `-DCMAKE_OSX_ARCHITECTURES=${arch[0] === 'iphoneos' ? 'arm64;arm64e' : 'arm64;x86_64'}`,
-                            `-DCMAKE_C_FLAGS=${arch[0] === 'iphoneos' ? '-fembed-bitcode' : '-fembed-bitcode-marker'}`,
-                            `-DCMAKE_CXX_FLAGS=${arch[0] === 'iphoneos' ? '-fembed-bitcode' : '-fembed-bitcode-marker'}`,
+                            `-DCMAKE_OSX_SYSROOT='${target.arch === 'iphoneos' ? iosSdkPath : iosSimSdkPath}'`,
+                            `-DCMAKE_OSX_ARCHITECTURES=${target.arch === 'iphoneos' ? 'arm64;arm64e' : 'arm64;x86_64'}`,
+                            `-DCMAKE_C_FLAGS=${target.arch === 'iphoneos' ? '-fembed-bitcode' : '-fembed-bitcode-marker'}`,
+                            `-DCMAKE_CXX_FLAGS=${target.arch === 'iphoneos' ? '-fembed-bitcode' : '-fembed-bitcode-marker'}`,
                             '-DCMAKE_XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY=\'iPhone Developer\'',
                             `-DCMAKE_XCODE_ATTRIBUTE_DEVELOPMENT_TEAM=${state.config.system.XCODE_DEVELOPMENT_TEAM}`,
                         ];
@@ -170,7 +169,7 @@ export default function run(program, params = [], platformPrefix = null, platfor
 
     const env = {};
     let runner = 'DOCKER';
-    if ((basePlatform === 'iOS' && program === null) || state.config.system.RUNNER === 'LOCAL') {
+    if ((target.platform === 'ios' && program === null) || state.config.system.RUNNER === 'LOCAL') {
         runner = 'LOCAL';
     }
 

package/src/actions/target.js

@@ -0,0 +1,53 @@
+import state from '../state/index.js';
+
+export function getTargetParams(givenTargetParams = {}, noParamCheck = false) {
+    const { platform, arch, runtime, buildType, runtimeEnv } = givenTargetParams;
+    if (!noParamCheck && (
+        (state.config.target.platform && platform && platform !== 'all' && state.config.target.platform !== platform)
+        || (state.config.target.arch && arch && arch !== 'all' && state.config.target.arch !== arch)
+        || (state.config.target.runtime && runtime && runtime !== 'all' && state.config.target.runtime !== runtime)
+        || (state.config.target.buildType && buildType && buildType !== 'all' && state.config.target.buildType !== buildType)
+        || (state.config.target.runtimeEnv && runtimeEnv && runtimeEnv !== 'all' && state.config.target.runtimeEnv !== runtimeEnv)
+    )) {
+        throw new Error('Invalid target parameters');
+    }
+    return {
+        platform: state.config.target.platform || platform || 'all',
+        arch: state.config.target.arch || arch || 'all',
+        runtime: state.config.target.runtime || runtime || 'all',
+        buildType: state.config.target.buildType || buildType || 'all',
+        runtimeEnv: state.config.target.runtimeEnv || runtimeEnv || 'all',
+    };
+}
+
+export function getBuildTargets(targetParams) {
+    const { platform, arch, runtime, buildType, runtimeEnv } = targetParams;
+    return state.targets.filter(t => (
+        (platform === 'all' || t.platform === platform)
+        && (arch === 'all' || t.arch === arch)
+        && (runtime === 'all' || t.runtime === runtime)
+        && (buildType === 'all' || t.buildType === buildType)
+        && (runtimeEnv === 'all' || t.runtimeEnv === runtimeEnv)
+    ));
+}
+
+export function getFilteredBuildTargets(targetParams, targetFilter) {
+    const buildTargets = getBuildTargets(targetParams);
+    return buildTargets.filter(t => (
+        (!targetFilter.platform || t.platform === targetFilter.platform)
+        && (!targetFilter.arch || t.arch === targetFilter.arch)
+        && (!targetFilter.runtime || t.runtime === targetFilter.runtime)
+        && (!targetFilter.buildType || t.buildType === targetFilter.buildType)
+        && (!targetFilter.runtimeEnv || t.runtimeEnv === targetFilter.runtimeEnv)
+    ));
+}
+
+export function getFilteredTargetSpec(targetSpecs, target) {
+    return targetSpecs?.filter(t => (
+        (!t.platform || t.platform === target.platform)
+        && (!t.arch || t.arch === target.arch)
+        && (!t.runtime || t.runtime === target.runtime)
+        && (!t.buildType || t.buildType === target.buildType)
+        && (!t.runtimeEnv || t.runtimeEnv === target.runtimeEnv)
+    ))?.map(t => t?.specs)?.filter(t => t) || [];
+}

package/src/assets/CMakeLists.txt

@@ -2,18 +2,6 @@ cmake_minimum_required(VERSION 3.25)
 set(CMAKE_CXX_STANDARD 17)
 project("${PROJECT_NAME}")
 
-if (CMAKE_SYSTEM_NAME STREQUAL "iOS")
-    if (CMAKE_OSX_SYSROOT MATCHES "/iPhoneOS.platform/")
-        set(PACKAGE_HOST "iOS-iphoneos")
-    elseif(CMAKE_OSX_SYSROOT MATCHES "/iPhoneSimulator.platform/")
-        set(PACKAGE_HOST "iOS-iphonesimulator")
-    else()
-        set(PACKAGE_HOST "iOS-unknown")
-    endif()
-else()
-    set(PACKAGE_HOST "${CMAKE_SYSTEM_NAME}-${CMAKE_HOST_SYSTEM_PROCESSOR}")
-endif()
-
 option(BUILD_BRIDGE "Build Bridge" OFF)
 option(BUILD_SOURCE "Build Source" OFF)
 

package/src/assets/browser.js

@@ -1,7 +1,7 @@
 /* eslint-disable import/no-unresolved */
 /* eslint-disable import/first */
-/* eslint-disable no-restricted-syntax */
-/* eslint-disable no-undef */
+
+
 import Module from 'cpp.js/module';
 import systemConfig from 'cpp.js/systemConfig';
 
@@ -79,15 +79,14 @@ function initCppJs(userConfig = {}) {
                 ({ ENV }) => {
                     if (ENV && config && config.env) {
                         Object.entries(config.env).forEach(([key, value]) => {
-                            // eslint-disable-next-line no-param-reassign
-                            ENV[key] = value;
+                            ENV[key] = value?.replace('_CPPJS_DATA_PATH_', `/cppjs`);
                         });
                     }
                 },
             ],
             onRuntimeInitialized() {
-                // m.FS.mkdir(VIRTUAL_PATH);
-                // m.FS.mkdir(AUTO_MOUNTED_PATH);
+                m.FS.mkdir(VIRTUAL_PATH);
+                m.FS.mkdir(AUTO_MOUNTED_PATH);
                 if (config.onRuntimeInitialized) config.onRuntimeInitialized(m);
             },
             generateVirtualPath() {

package/src/assets/cppjs-package.podspec

@@ -0,0 +1,14 @@
+require "json"
+package = JSON.parse(File.read(File.join(__dir__, "package.json")))
+
+Pod::Spec.new do |s|
+  s.module_name  = "___PROJECT_NAME___"
+  s.name         = "___PROJECT_NAME___"
+  s.version      = package["nativeVersion"]
+  s.summary      = "___PROJECT_NAME___ package"
+  s.homepage     = "https://cpp.js.org"
+  s.author       = "___PROJECT_NAME___ Authors"
+  s.source       = { :http => "https://cpp.js.org" }
+  s.vendored_frameworks = ___PROJECT_FRAMEWORKS___
+  s.resources = ___PROJECT_RESOURCES___
+end

package/src/assets/dist.cmake

@@ -1,23 +1,10 @@
-if(ANDROID)
-    set(PACKAGE_HOST "${CMAKE_SYSTEM_NAME}-${CMAKE_ANDROID_ARCH_ABI}")
-    set(PACKAGE_DIR "${PROJECT_SOURCE_DIR}/${PACKAGE_HOST}/lib")
-elseif(APPLE)
-    if (CMAKE_SYSTEM_NAME STREQUAL "iOS")
-        set(PACKAGE_DIR "${PROJECT_SOURCE_DIR}/../..")
-    else()
-        set(PACKAGE_HOST "${CMAKE_SYSTEM_NAME}-${CMAKE_HOST_SYSTEM_PROCESSOR}")
-        set(PACKAGE_DIR "${PROJECT_SOURCE_DIR}/${PACKAGE_HOST}/lib")
-    endif()
-elseif(UNIX)
-    set(PACKAGE_HOST "${CMAKE_SYSTEM_NAME}-${CMAKE_HOST_SYSTEM_PROCESSOR}")
-    set(PACKAGE_DIR "${PROJECT_SOURCE_DIR}/${PACKAGE_HOST}/lib")
-else()
-    set(PACKAGE_HOST "${CMAKE_SYSTEM_NAME}-${CMAKE_HOST_SYSTEM_PROCESSOR}")
-    set(PACKAGE_DIR "${PROJECT_SOURCE_DIR}/${PACKAGE_HOST}/lib")
+set(MY_LIST "___PROJECT_HOST___")
+LIST(FIND MY_LIST "${PROJECT_TARGET_HOST}" PACKAGE_HOST_INDEX)
+if(PACKAGE_HOST_INDEX EQUAL -1)
+    set(PROJECT_TARGET_HOST "${PROJECT_TARGET_HOST_RELEASE}")
 endif()
+LIST(FIND MY_LIST "${PROJECT_TARGET_HOST}" PACKAGE_HOST_INDEX)
 
-set(MY_LIST "___PROJECT_HOST___")
-LIST(FIND MY_LIST "${PACKAGE_HOST}" PACKAGE_HOST_INDEX)
 if(NOT PACKAGE_HOST_INDEX EQUAL -1)
     cmake_minimum_required(VERSION 3.28)
     set(CMAKE_CXX_STANDARD 11)
@@ -25,22 +12,10 @@ if(NOT PACKAGE_HOST_INDEX EQUAL -1)
     set(PROJECT_LIBS "___PROJECT_LIBS___")
     project("${PROJECT_NAME}")
 
-    if(ANDROID)
-        set(PACKAGE_HOST "${CMAKE_SYSTEM_NAME}-${CMAKE_ANDROID_ARCH_ABI}")
-        set(PACKAGE_DIR "${PROJECT_SOURCE_DIR}/${PACKAGE_HOST}/lib")
-    elseif(APPLE)
-        if (CMAKE_SYSTEM_NAME STREQUAL "iOS")
-            set(PACKAGE_DIR "${PROJECT_SOURCE_DIR}/../..")
-        else()
-            set(PACKAGE_HOST "${CMAKE_SYSTEM_NAME}-${CMAKE_HOST_SYSTEM_PROCESSOR}")
-            set(PACKAGE_DIR "${PROJECT_SOURCE_DIR}/${PACKAGE_HOST}/lib")
-        endif()
-    elseif(UNIX)
-        set(PACKAGE_HOST "${CMAKE_SYSTEM_NAME}-${CMAKE_HOST_SYSTEM_PROCESSOR}")
-        set(PACKAGE_DIR "${PROJECT_SOURCE_DIR}/${PACKAGE_HOST}/lib")
+    if (APPLE AND CMAKE_SYSTEM_NAME STREQUAL "iOS")
+        set(PACKAGE_DIR "${PROJECT_SOURCE_DIR}/../..")
     else()
-        set(PACKAGE_HOST "${CMAKE_SYSTEM_NAME}-${CMAKE_HOST_SYSTEM_PROCESSOR}")
-        set(PACKAGE_DIR "${PROJECT_SOURCE_DIR}/${PACKAGE_HOST}/lib")
+        set(PACKAGE_DIR "${PROJECT_SOURCE_DIR}/${PROJECT_TARGET_HOST}/lib")
     endif()
 
     set(PROJECT_LIBS_DIR)
@@ -61,6 +36,6 @@ if(NOT PACKAGE_HOST_INDEX EQUAL -1)
     target_link_libraries("${PROJECT_NAME}" INTERFACE "${PROJECT_LIBS_DIR}")
 
     if(NOT APPLE)
-    target_include_directories("${PROJECT_NAME}" INTERFACE "${PROJECT_SOURCE_DIR}/${PACKAGE_HOST}/include")
+        target_include_directories("${PROJECT_NAME}" INTERFACE "${PROJECT_SOURCE_DIR}/${PROJECT_TARGET_HOST}/include")
     endif()
 endif()

package/src/assets/node.js

@@ -1,7 +1,7 @@
 /* eslint-disable import/no-unresolved */
 /* eslint-disable import/first */
-/* eslint-disable no-restricted-syntax */
-/* eslint-disable no-undef */
+ 
+ 
 
 import Module from 'cpp.js/module';
 import systemConfig from 'cpp.js/systemConfig';
@@ -77,7 +77,7 @@ function initCppJs(userConfig = {}) {
                 ({ ENV }) => {
                     if (ENV && config && config.env) {
                         Object.entries(config.env).forEach(([key, value]) => {
-                            // eslint-disable-next-line no-param-reassign
+                             
                             ENV[key] = value;
                         });
                     }
@@ -87,7 +87,7 @@ function initCppJs(userConfig = {}) {
                 if (config.onRuntimeInitialized) config.onRuntimeInitialized(m);
             },
             getPreloadedPackage(packageName) {
-                // eslint-disable-next-line global-require
+                 
                 const a = require('fs').readFileSync(`./${packageName}`, { flag: 'r' }).buffer;
                 return a;
             },

package/src/bin.js

@@ -11,10 +11,11 @@ import createLib from './actions/createLib.js';
 import buildWasm from './actions/buildWasm.js';
 import createXCFramework from './actions/createXCFramework.js';
 import runCppjsApp from './actions/run.js';
+import { getBuildTargets, getFilteredBuildTargets, getFilteredTargetSpec } from './actions/target.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';
 import findFiles from './utils/findFiles.js';
@@ -31,7 +32,11 @@ program
 
 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']));
+    .addOption(new Option('-p, --platform <platform>', 'target platform').default('all').choices(['all', 'wasm', 'android', 'ios']))
+    .addOption(new Option('-a, --arch <arch>', 'target architecture').default('all').choices(['all', 'wasm32', 'wasm64', 'x86_64', 'arm64-v8a', 'iphoneos', 'iphonesimulator']))
+    .addOption(new Option('-r, --runtime <runtime>', 'target runtime').default('all').choices(['all', 'st', 'mt']))
+    .addOption(new Option('-b, --build-type <buildType>', 'target build type').default('release').choices(['all', 'release', 'debug']))
+    .addOption(new Option('-re, --runtime-env <runtimeEnv>', 'target runtime environment').default('all').choices(['all', 'browser', 'node']));
 
 const commandDocker = program.command('docker')
     .description('manage docker');
@@ -54,11 +59,14 @@ program.parse(process.argv);
 
 switch (program.args[0]) {
     case 'build': {
-        const { platform } = commandBuild.opts();
+        const targetParams = commandBuild.opts();
+        if (targetParams.platform === 'wasm' && targetParams.arch === 'all') {
+            targetParams.arch = 'wasm32';
+        }
         if (state.config.build.withBuildConfig) {
-            buildExternal(platform);
+            buildExternal(targetParams);
         } else {
-            build(platform);
+            build(targetParams);
         }
         break;
     }
@@ -221,7 +229,7 @@ function run(programName, params) {
     runCppjsApp(programName, params, null, null, { console: true });
 }
 
-async function buildExternal(platform) {
+async function buildExternal(targetParams) {
     const version = state.config.package.nativeVersion;
     if (!version) {
         console.error('no version found!');
@@ -245,9 +253,10 @@ async function buildExternal(platform) {
         });
     }
 
-    buildLib(platform);
+    buildLib(targetParams);
 
     if (copyToDist) {
+        const targets = getBuildTargets(targetParams);
         Object.entries(copyToDist).forEach(([key, value]) => {
             const values = [];
             if (Array.isArray(value)) {
@@ -256,27 +265,33 @@ async function buildExternal(platform) {
                 values.push(value);
             }
             values.forEach(v => {
-                const targetPath = `${state.config.paths.output}/prebuilt/${v}`;
-                if (!fs.existsSync(targetPath)) {
-                    fs.copyFileSync(`${state.config.paths.project}/${key}`, targetPath);
-                }
+                targets.forEach(target => {
+                    const assetPath = `${state.config.paths.output}/prebuilt/${target.path}/${v}`;
+                    if (!fs.existsSync(assetPath)) {
+                        fs.copyFileSync(`${state.config.paths.project}/${key}`, assetPath);
+                    }
+                });
             });
         });
     }
 }
 
-async function build(platform) {
-    buildLib(platform);
-    if (platform === 'WebAssembly' || platform === 'All') {
-        createWasmJs();
-    }
+async function build(targetParams) {
+    buildLib(targetParams);
+    createWasmJs(targetParams);
 }
 
-function buildLib(platform) {
+function buildLib(targetParams) {
     let isChanged = false;
-    state.platforms[platform].forEach((p) => {
-        if (!fs.existsSync(`${state.config.paths.output}/prebuilt/${p}/lib`)) {
-            createLib(p, 'Source', { isProd: true, buildSource: true });
+    const targets = getBuildTargets(targetParams);
+    if (targets.length === 0) {
+        console.error('No targets found for the given parameters.', targetParams);
+        throw new Error('No targets found for the given parameters.');
+    }
+
+    targets.forEach((target) => {
+        if (!fs.existsSync(`${state.config.paths.output}/prebuilt/${target.path}/lib`)) {
+            createLib(target, 'Source', { buildSource: true });
 
             const modules = [];
             state.config.paths.module.forEach((modulePath) => {
@@ -284,32 +299,57 @@ function buildLib(platform) {
                 modules.push(...findFiles('*.i', { cwd: modulePath }));
             });
             if (modules.length > 0) {
-                fs.mkdirSync(`${state.config.paths.output}/prebuilt/${p}/swig`, { recursive: true });
+                fs.mkdirSync(`${state.config.paths.output}/prebuilt/${target.path}/swig`, { recursive: true });
             }
             modules.forEach((modulePath) => {
                 const fileName = modulePath.split('/').at(-1);
-                fs.copyFileSync(modulePath, `${state.config.paths.output}/prebuilt/${p}/swig/${fileName}`);
+                fs.copyFileSync(modulePath, `${state.config.paths.output}/prebuilt/${target.path}/swig/${fileName}`);
             });
             isChanged = true;
         } else {
-            console.log(`${state.config.general.name} is already compiled to ${p} architecture.`);
+            console.log(`${state.config.general.name} is already compiled to ${target.path} architecture.`);
         }
     });
 
     if (isChanged && fs.existsSync(`${state.config.paths.build}/Source-Release/prebuilt`)) {
         fs.cpSync(`${state.config.paths.build}/Source-Release/prebuilt`, `${state.config.paths.output}/prebuilt`, { recursive: true, dereference: true });
     }
+    if (isChanged && fs.existsSync(`${state.config.paths.build}/Source-Debug/prebuilt`)) {
+        fs.cpSync(`${state.config.paths.build}/Source-Debug/prebuilt`, `${state.config.paths.output}/prebuilt`, { recursive: true, dereference: true });
+    }
 
     createXCFramework();
 
+    const iosTargets = getBuildTargets({ platform: 'ios', arch: 'iphoneos', runtime: 'mt', buildType: 'release' });
+    const podSpecs = findFiles('*.podspec', { cwd: state.config.paths.project });
+    if (podSpecs.length === 0 && targets.length > 0) {
+        const iosTarget = iosTargets[0];
+        const resources = getFilteredTargetSpec(state.config.targetSpecs, iosTarget).map(s => s.data).filter(s => s).map(d => Object.keys(d)).flat();
+        const uniqueResources = [...new Set(resources)].map(r => `dist/prebuilt/${iosTarget.path}/${r}`);
+        const xcFrameworks = [];
+        xcFrameworks.push(...state.config.export.libName.map((l) => `${l}.xcframework`));
+        if (!xcFrameworks.some(f => !fs.existsSync(`${state.config.paths.project}/${f}`))) {
+            xcFrameworks.push(...state.config.dependencies.map((d) => d.export.libName.map((l) => `${l}.xcframework`)).flat());
+            const distPodSpecContent = fs.readFileSync(`${state.config.paths.cli}/assets/cppjs-package.podspec`, { encoding: 'utf8', flag: 'r' })
+                .replaceAll('___PROJECT_NAME___', state.config.general.name)
+                .replace('___PROJECT_FRAMEWORKS___', xcFrameworks.map(f => `'${f}'`).join(', '))
+                .replace('___PROJECT_RESOURCES___', JSON.stringify(uniqueResources));
+            fs.writeFileSync(`${state.config.paths.project}/${state.config.general.name}.podspec`, distPodSpecContent);
+        }
+    }
+
     const distCmakeContent = fs.readFileSync(`${state.config.paths.cli}/assets/dist.cmake`, { encoding: 'utf8', flag: 'r' })
         .replace('___PROJECT_NAME___', state.config.general.name)
-        .replace('___PROJECT_HOST___', state.platforms[platform].join(';'))
+        .replace('___PROJECT_HOST___', targets.map((t) => t.path).join(';'))
         .replace('___PROJECT_LIBS___', state.config.export.libName.join(';'));
     fs.writeFileSync(`${state.config.paths.output}/prebuilt/CMakeLists.txt`, distCmakeContent);
 }
 
-async function createWasmJs() {
+async function createWasmJs(targetParams) {
+    const targets = getFilteredBuildTargets(targetParams, { platform: 'wasm' });
+    if (targets.length === 0) {
+        return;
+    }
     let headers = [];
     state.config.paths.header.forEach((headerPath) => {
         headers.push(findFiles('**/*.h', { cwd: headerPath }));
@@ -323,30 +363,30 @@ async function createWasmJs() {
     });
 
     const opt = {
-        isProd: true,
         buildSource: false,
         nativeGlob: [
             `${state.config.paths.cli}/assets/commonBridges.cpp`,
             ...bridges,
         ],
     };
-    createLib('Emscripten-x86_64', 'Bridge', opt);
 
-    await buildWasm('browser', true);
-    await buildWasm('node', true);
+    for (const target of targets) {
+        if (fs.existsSync(`${state.config.paths.output}/${target.jsName}`) && fs.existsSync(`${state.config.paths.output}/${target.wasmName}`)) {
+            console.log(`${state.config.general.name} wasm is already compiled to ${target.path} ${target.runtimeEnv || ''} architecture.`);
+            continue;
+        }
+        createLib(target, 'Bridge', opt);
+        await buildWasm(target);
 
-    fs.rmSync(`${state.config.paths.output}/data`, { recursive: true, force: true });
-    if (fs.existsSync(`${state.config.paths.build}/data`)) {
-        fs.renameSync(`${state.config.paths.build}/data`, `${state.config.paths.output}/data`);
-    }
+        fs.rmSync(`${state.config.paths.output}/data`, { recursive: true, force: true });
+        if (fs.existsSync(`${state.config.paths.build}/data`)) {
+            fs.renameSync(`${state.config.paths.build}/data`, `${state.config.paths.output}/data`);
+        }
 
-    fs.copyFileSync(`${state.config.paths.build}/${state.config.general.name}.node.js`, `${state.config.paths.output}/${state.config.general.name}.node.js`);
-    fs.copyFileSync(`${state.config.paths.build}/${state.config.general.name}.browser.js`, `${state.config.paths.output}/${state.config.general.name}.browser.js`);
-    fs.copyFileSync(`${state.config.paths.build}/${state.config.general.name}.wasm`, `${state.config.paths.output}/${state.config.general.name}.wasm`);
-    if (fs.existsSync(`${state.config.paths.build}/${state.config.general.name}.data.txt`)) {
-        fs.copyFileSync(`${state.config.paths.build}/${state.config.general.name}.data.txt`, `${state.config.paths.output}/${state.config.general.name}.data.txt`);
+        fs.copyFileSync(`${state.config.paths.build}/${target.jsName}`, `${state.config.paths.output}/${target.jsName}`);
+        fs.copyFileSync(`${state.config.paths.build}/${target.wasmName}`, `${state.config.paths.output}/${target.wasmName}`);
+        if (fs.existsSync(`${state.config.paths.build}/${target.dataTxtName}`)) {
+            fs.copyFileSync(`${state.config.paths.build}/${target.dataTxtName}`, `${state.config.paths.output}/${target.dataTxtName}`);
+        }
     }
-    /* if (fs.existsSync(`${state.config.paths.build}/${state.config.general.name}.js`)) {
-        fs.copyFileSync(`${state.config.paths.build}/${state.config.general.name}.js`, `${state.config.paths.output}/${state.config.general.name}.js`);
-    } */
 }

package/src/index.js

@@ -9,5 +9,6 @@ export { default as getCmakeParameters } from './actions/getCmakeParameters.js';
 export { default as createXCFramework } from './actions/createXCFramework.js';
 export { default as getAllBridges } from './actions/getAllBridges.js';
 export { default as run } from './actions/run.js';
+export { getTargetParams, getBuildTargets, getFilteredBuildTargets, getFilteredTargetSpec } from './actions/target.js';
 export { default as getCppJsScript } from './integration/getCppJsScript.js';
 export { default as getDependFilePath } from './integration/getDependFilePath.js';