cpp.js 1.0.0-beta.21 → 1.0.0-beta.22

package/package.json

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

package/src/index.js

@@ -9,5 +9,5 @@ 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 { default as exportWeb } from './export/web.js';
-export { default as exportReactNative } from './export/react-native.js';
+export { default as getCppJsScript } from './integration/getCppJsScript.js';
+export { default as getDependFilePath } from './integration/getDependFilePath.js';

package/src/integration/getCppJsScript.js

@@ -0,0 +1,90 @@
+import getData from '../actions/getData.js';
+import loadJson from '../utils/loadJson.js';
+import state from '../state/index.js';
+
+export default function getCppJsScript(platform, bridgePath = null) {
+    if (!platform || !state.platforms.All.includes(platform)) {
+        throw new Error('The platform is not available!');
+    }
+    const env = JSON.stringify(getData('env', platform));
+    const getPlatformScript = state.platforms.WebAssembly.includes(platform) ? getWebScript : getReactNativeScript;
+
+    const bridgeExportFile = `${bridgePath}.exports.json`;
+    let symbols = null;
+    if (bridgePath) {
+        symbols = loadJson(bridgeExportFile);
+    }
+
+    let symbolExportDefineString = '';
+    let symbolExportAssignString = '';
+    if (symbols && Array.isArray(symbols)) {
+        symbolExportDefineString = symbols.map((s) => `export let ${s} = null;`).join('\n');
+        symbolExportAssignString = symbols.map((s) => `${s} = m.${s};`).join('\n');
+    }
+
+    const scriptContent = `
+        AllSymbols = m;
+        ${symbolExportAssignString}
+    `;
+
+    return `
+        export let AllSymbols = {};
+        ${symbolExportDefineString}
+
+        export function initCppJs(config = {}) {
+            ${getPlatformScript(env, scriptContent)}
+        }
+    `;
+}
+
+function getReactNativeScript(env, modulePrefix) {
+    return `
+        import { NativeModules } from 'react-native';
+        import Module from '@cpp.js/core-embind-jsi';
+
+        const { RNJsiLib } = NativeModules;
+
+        function setEnv() {
+            const env = JSON.parse('${env}');
+            const CPPJS_DATA_PATH = Module.CppJS.getEnv('CPPJS_DATA_PATH');
+
+            Object.entries(env).forEach(([key, value]) => {
+                Module.CppJS.setEnv(key, value.replace('_CPPJS_DATA_PATH_', CPPJS_DATA_PATH), true);
+            });
+        }
+
+        return new Promise((resolve, reject) => {
+            if (RNJsiLib && RNJsiLib.start) {
+                RNJsiLib.start();
+                setEnv();
+                const m = Module;
+                ${modulePrefix}
+                resolve(Module);
+            } else {
+                reject('Module failed to initialise.');
+            }
+        });
+    `;
+}
+
+function getWebScript(env, modulePrefix) {
+    const params = `{
+        ...config,
+        env: {...${env}, ...config.env},
+        paths: {
+            wasm: 'cpp.wasm',
+            data: 'cpp.data.txt'
+        }
+    }`;
+
+    return `
+        return new Promise((resolve, reject) => {
+            import('/cpp.js').then(n => {
+                return window.CppJs.initCppJs(${params});
+            }).then(m => {
+                ${modulePrefix}
+                resolve(m);
+            });
+        });
+    `;
+}

package/src/integration/getDependFilePath.js

@@ -0,0 +1,22 @@
+import state from '../state/index.js';
+
+export default function getDependFilePath(source, platform) {
+    const headerRegex = new RegExp(`\\.(${state.config.ext.header.join('|')})$`);
+    const moduleRegex = new RegExp(`\\.(${state.config.ext.module.join('|')})$`);
+
+    const dependPackage = state.config.allDependencies.find((d) => source.startsWith(d.package.name));
+    if (dependPackage) {
+        const filePath = source.substring(dependPackage.package.name.length + 1);
+
+        let path = `${dependPackage.paths.output}/prebuilt/${platform}/${filePath}`;
+        if (headerRegex.test(source)) {
+            path = `${dependPackage.paths.output}/prebuilt/${platform}/include/${filePath}`;
+        } else if (moduleRegex.test(source)) {
+            path = `${dependPackage.paths.output}/prebuilt/${platform}/swig/${filePath}`;
+        }
+
+        return path;
+    }
+
+    return null;
+}

package/src/utils/pullDockerImage.js

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