v1.0.0-alpha.2

Author: bugra9

.gitignore

@@ -5,6 +5,9 @@ dist
 tmp
 .cppjs
 /out-tsc
+*.xcframework
+*.xcframework.zip
+*.tgz
 
 # dependencies
 node_modules

.npmignore

@@ -0,0 +1,2 @@
+LICENSE
+*.xcframework.zip

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2023 Buğra Sarı
+Copyright (c) 2024 Buğra Sarı
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -4,7 +4,7 @@ Bind C++ codes to JS on the web and react native without writing extra code.
 
 > **Note:** This project is currently under heavy development.
 
-<https://gdal3.js.org>
+<https://cpp.js.org>
 
   \
 **Why Cpp.js?**  
@@ -47,4 +47,4 @@ public:
 ## License
 [MIT](https://opensource.org/licenses/MIT)
 
-Copyright (c) 2023-present, Buğra Sarı
+Copyright (c) 2024, Buğra Sarı

core/cppjs-core-docker/package.json

@@ -1,6 +1,7 @@
 {
     "name": "cppjs-docker",
-    "version": "0.2.6",
+    "version": "1.0.0-alpha.2",
+    "private": "true",
     "scripts": {
         "build": "docker build --no-cache -t bugra9/cpp.js:latest -t bugra9/cpp.js:0.2.6 .",
         "push": "docker push bugra9/cpp.js --all-tags"

core/cppjs-core-rn-embind/cpp/src/emscripten/bind.cpp

@@ -19,12 +19,15 @@
 
 #include <any>
 #include <unordered_map>
+#include <stdlib.h>
 
 
 using namespace emscripten;
 using namespace internal;
 using namespace facebook;
 
+std::string CPPJS_DATA_PATH = "";
+
 namespace emscripten {
     facebook::jsi::Runtime* jsRuntime = nullptr;
     namespace internal {
@@ -907,7 +910,9 @@ namespace emscripten {
         };
 
 
-        EMSCRIPTEN_KEEPALIVE void _embind_initialize_bindings(jsi::Runtime& rt) {
+        EMSCRIPTEN_KEEPALIVE void _embind_initialize_bindings(jsi::Runtime& rt, std::string path) {
+            CPPJS_DATA_PATH = path;
+            CppJS::setEnv("CPPJS_DATA_PATH", path, false);
             jsRuntime = &rt;
 
             char* name = "M";
@@ -1006,6 +1011,15 @@ template <typename T> static void register_memory_view(const char* name) {
 }
 } // namespace
 
+int CppJS::setEnv(std::string key, std::string value, bool overwrite) {
+    return setenv(key.c_str(), value.c_str(), overwrite);
+}
+std::string CppJS::getEnv(std::string key) {
+    char* value = getenv(key.c_str());
+    std::string valueStr = std::string(value);
+    // free(value);
+    return valueStr;
+}
 
 EMSCRIPTEN_BINDINGS(builtin) {
   using namespace emscripten::internal;
@@ -1070,11 +1084,17 @@ EMSCRIPTEN_BINDINGS(builtin) {
   register_memory_view<double>("emscripten::memory_view<double>");
 
     // register_vector<bool>("BoolVector");
-    register_vector<char>("CharVector");
+    /* register_vector<char>("CharVector");
     register_vector<short>("ShortVector");
     register_vector<int>("IntVector");
     register_vector<int64_t>("Int64_tVector");
     register_vector<float>("FloatVector");
     register_vector<double>("DoubleVector");
-    register_vector<std::string>("StringVector");
+    register_vector<std::string>("StringVector"); */
+
+    class_<CppJS>("CppJS")
+        .class_function("setEnv", &CppJS::setEnv)
+        .class_function("getEnv", &CppJS::getEnv)
+    ;
+    constant("CPPJS_DATA_PATH", CPPJS_DATA_PATH);
 }

core/cppjs-core-rn-embind/cpp/src/emscripten/bind.h

@@ -42,7 +42,7 @@ namespace emscripten {
     };
 
     namespace internal {
-        EMSCRIPTEN_KEEPALIVE void _embind_initialize_bindings(facebook::jsi::Runtime& rt);
+        EMSCRIPTEN_KEEPALIVE void _embind_initialize_bindings(facebook::jsi::Runtime& rt, std::string path);
 
         typedef int32_t GenericEnumValue;
 
@@ -2668,6 +2668,10 @@ namespace internal {
             v[index] = value;
             return true;
         }
+
+        static int size(VectorType& v) {
+            return (int) v.size();
+        }
     };
 
 } // end namespace internal
@@ -2678,12 +2682,12 @@ class_<std::vector<T>> register_vector(const char* name) {
 
     void (VecType::*push_back)(const T&) = &VecType::push_back;
     void (VecType::*resize)(const size_t, const T&) = &VecType::resize;
-    size_t (VecType::*size)() const = &VecType::size;
+    // size_t (VecType::*size)() const = &VecType::size;
     return class_<std::vector<T>>(name)
             .template constructor<>()
             .function("push_back", push_back)
             .function("resize", resize)
-            .function("size", size)
+            .function("size", &internal::VectorAccess<VecType, T>::size)
             .function("get", &internal::VectorAccess<VecType, T>::get)
             .function("set", &internal::VectorAccess<VecType, T>::set)
             ;
@@ -2823,3 +2827,9 @@ void constant(const char* name, const ConstantType& v) {
   static void embind_init_##name()
 
 } // end namespace emscripten
+
+class CppJS {
+public:
+    static int setEnv(std::string key, std::string value, bool overwrite);
+    static std::string getEnv(std::string key);
+};

core/cppjs-core-rn-embind/js/embind.js

@@ -567,7 +567,7 @@ function readFromMemoryUsingBit(pointer, signed, bit) {
     default:
         throw new TypeError("Unknown bit");
   }
-  
+
   return readFromMemoryUsingShift(pointer, signed, shift);
 }
 
@@ -583,7 +583,7 @@ function readFromMemoryUsingSize(pointer, signed, bit) {
     default:
         throw new TypeError("Unknown size");
   }
-  
+
   return readFromMemoryUsingShift(pointer, signed, shift);
 }
 
@@ -1512,7 +1512,7 @@ function dbg(text) {
               return readFromMemoryUsingShift(pointer, true, 2, true);
             };
           case 3:
-          case 3n:  
+          case 3n:
             return function(pointer) {
               return readFromMemoryUsingShift(pointer, true, 3, true);
             };
@@ -1552,7 +1552,7 @@ function dbg(text) {
   function simpleReadValueFromPointer(pointer) {
       /* console.log(
         'simpleReadValueFromPointer :',
-        this.name, JSON.stringify(pointer, null, 2), 
+        this.name, JSON.stringify(pointer, null, 2),
         readFromMemoryUsingShift(pointer, true, 2)
       ); */
       return this['fromWireType'](readFromMemoryUsingShift(pointer, true, 2));
@@ -1561,7 +1561,7 @@ function dbg(text) {
   function simpleReadValueFromPointer64(pointer) {
       /* console.log(
         'simpleReadValueFromPointer :',
-        this.name, JSON.stringify(pointer, null, 3), 
+        this.name, JSON.stringify(pointer, null, 3),
         readFromMemoryUsingShift(pointer, true, 3)
       ); */
       return this['fromWireType'](readFromMemoryUsingShift(pointer, false, 3));
@@ -1618,7 +1618,7 @@ function dbg(text) {
     }
   function stringToUTF8(str, outPtr, maxBytesToWrite) {
       assert(typeof maxBytesToWrite == 'number', 'stringToUTF8(str, outPtr, maxBytesToWrite) is missing the third parameter that specifies the length of the output buffer!');
-      
+
       const index = getHeapIndex(outPtr);
       return stringToUTF8Array(str, HEAPU8[index], outPtr - HEAP_OFFSET[index], maxBytesToWrite);
     }
@@ -1768,7 +1768,7 @@ function dbg(text) {
           /* if (!usePointer) {
             return value;
           }
-          
+
           if (value instanceof ArrayBuffer) {
             value = new Uint8Array(value)
           }
@@ -4746,3 +4746,23 @@ run();
 
 globalThis.Module['ASSERTIONS'] = true;
 export default globalThis.Module;
+
+function toArray(vector) {
+    console.log('aaaaa', vector);
+    const output = [];
+    for (let i = 0; i < vector.size(); i += 1) {
+        output.push(vector.get(i));
+    }
+    return output;
+}
+
+function toVector(VectorClass, array = []) {
+    const vector = new VectorClass();
+    array.forEach((item) => {
+        vector.push_back(item);
+    });
+    return vector;
+}
+
+globalThis.Module.toArray = toArray;
+globalThis.Module.toVector = toVector;

core/cppjs-core-rn-embind/package.json

@@ -1,15 +1,15 @@
 
 {
     "name": "cppjs-core-rn-embind",
-    "version": "0.3.0",
+    "version": "1.0.0-alpha.2",
     "description": "IOS embind implementation for React Native",
     "author": "Bugra Sari",
     "homepage": "https://github.com/bugra9/cpp.js",
     "license": "MIT",
     "main": "js/embind.js",
     "peerDependencies": {
         "@babel/runtime": "^7.20.7",
-        "react-native": "^0.72.0"
+        "react-native": "^0.74.3"
     },
     "dependencies": {
         "cpp.js": "workspace:^"

core/cppjs-core-sample-creator/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-cpp.js",
-  "version": "0.6.2",
+  "version": "1.0.0-alpha.2",
   "description": "",
   "bin": "src/index.js",
   "main": "src/index.js",

core/cppjs-core-sample-list/package.json

@@ -1,8 +1,8 @@
 {
     "name": "cppjs-samples",
-    "version": "0.6.2",
+    "version": "1.0.0-alpha.2",
     "description": "Cpp.js Samples",
-    "author": "Buğra Sarı <[email protected]>",
+    "author": "Bugra SARI <[email protected]>",
     "license": "MIT",
     "type": "module",
     "main": "index.js",

core/cppjs-core/package.json

@@ -1,18 +1,25 @@
 {
     "name": "cpp.js",
-    "version": "0.6.1",
+    "version": "1.0.0-alpha.2",
     "license": "MIT",
     "type": "module",
+    "homepage": "https://cpp.js.org",
+    "repository": "https://github.com/bugra9/cpp.js.git",
     "scripts": {
         "test": "mocha"
     },
     "bin": {
         "cpp.js": "./src/bin.js"
     },
-    "main": "/src/index.js",
+    "main": "src/index.js",
     "dependencies": {
+        "@rollup/plugin-commonjs": "^26.0.1",
+        "@rollup/plugin-node-resolve": "^15.2.3",
+        "@rollup/plugin-virtual": "^3.0.2",
         "commander": "^9.4.1",
-        "glob": "^8.0.3"
+        "glob": "^8.0.3",
+        "rollup": "^4.18.0",
+        "rollup-plugin-uglify": "^6.0.4"
     },
     "devDependencies": {
         "mocha": "^10.2.0"

core/cppjs-core/src/assets/CMakeLists.txt

@@ -45,14 +45,14 @@ file(GLOB_RECURSE HEADER_FILES ${HEADER_GLOB})
 target_include_directories("${PROJECT_NAME}" PUBLIC "${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}" DESTINATION "prebuilt/${PACKAGE_HOST}/lib")
-    install(TARGETS "${PROJECT_NAME}" FILE_SET HEADERS DESTINATION "prebuilt/${PACKAGE_HOST}/include/cppjs-lib-${HEADER_FOLDER}")
+    install(TARGETS "${PROJECT_NAME}" DESTINATION "lib")
+    if(NOT "${HEADER_FILES}" STREQUAL "")
+        target_sources("${PROJECT_NAME}"
+            PUBLIC FILE_SET HEADERS
+            BASE_DIRS "${HEADER_DIR}"
+            FILES "${HEADER_FILES}")
+        install(TARGETS "${PROJECT_NAME}" FILE_SET HEADERS DESTINATION "include")
+    endif()
 endif(BUILD_SOURCE)
 unset(BUILD_SOURCE CACHE)