plusui-native 0.2.72 → 0.2.74

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "plusui-native",
-  "version": "0.2.72",
+  "version": "0.2.74",
   "description": "PlusUI CLI - Build C++ desktop apps modern UI ",
   "main": "src/index.js",
   "type": "module",
@@ -27,11 +27,11 @@
     "semver": "^7.6.0",
     "which": "^4.0.0",
     "execa": "^8.0.1",
-    "plusui-native-builder": "^0.1.71",
-    "plusui-native-connect": "^0.1.71"
+    "plusui-native-builder": "^0.1.73",
+    "plusui-native-connect": "^0.1.73"
   },
   "peerDependencies": {
-    "plusui-native-connect": "^0.1.71"
+    "plusui-native-connect": "^0.1.73"
   },
   "publishConfig": {
     "access": "public"

package/src/index.js

@@ -250,14 +250,57 @@ function findVcvarsall() {
     return null;
 }
 
+// Capture the full environment from vcvarsall.bat (cached per session)
+let _vcEnvCache = undefined;
+function getVcEnvironment() {
+    if (_vcEnvCache !== undefined) return _vcEnvCache;
+
+    if (process.platform !== 'win32') {
+        _vcEnvCache = null;
+        return null;
+    }
+
+    const vcvarsall = findVcvarsall();
+    if (!vcvarsall) {
+        _vcEnvCache = null;
+        return null;
+    }
+
+    try {
+        // Run vcvarsall and dump all environment variables
+        const output = execSync(
+            `cmd /c ""${vcvarsall}" x64 >nul 2>&1 && set"`,
+            { encoding: 'utf8', stdio: ['pipe', 'pipe', 'pipe'], timeout: 30000, shell: true }
+        );
+
+        // Parse "KEY=VALUE" lines into an env object
+        const env = {};
+        for (const line of output.split(/\r?\n/)) {
+            const idx = line.indexOf('=');
+            if (idx > 0) {
+                env[line.substring(0, idx)] = line.substring(idx + 1);
+            }
+        }
+
+        // Sanity check: we should have PATH and INCLUDE set
+        if (env.PATH && env.INCLUDE) {
+            _vcEnvCache = env;
+            return env;
+        }
+    } catch { }
+
+    _vcEnvCache = null;
+    return null;
+}
+
 function runCMake(args, options = {}) {
     const cmake = getCMakePath();
 
-    // On Windows, wrap cmake in vcvarsall to ensure cl.exe is in PATH (needed for Ninja)
+    // On Windows, use the captured vcvarsall environment so cl.exe + ninja are in PATH
     if (process.platform === 'win32') {
-        const vcvarsall = findVcvarsall();
-        if (vcvarsall) {
-            return execSync(`cmd /c ""${vcvarsall}" x64 >nul 2>&1 && "${cmake}" ${args}"`, { stdio: 'inherit', shell: true, ...options });
+        const vcEnv = getVcEnvironment();
+        if (vcEnv) {
+            return execSync(`"${cmake}" ${args}`, { stdio: 'inherit', env: vcEnv, ...options });
         }
     }
 

package/templates/react/main.cpp.template

@@ -114,12 +114,13 @@ struct WebGPUConfig {
 // MAIN - Application Entry Point
 // ============================================================================
 // ── Connect instance ─────────────────────────────────────────────────────────
-// connect is the bridge between C++ and the frontend.
+// conn is the bridge between C++ and the frontend.
 // Run `plusui connect` to generate Connections/ from your name.on / name.emit usage.
-// Then declare:  Connections ch(connect);
-// and use:       ch.myEvent.on([](const json& p) { ... });
-//                ch.myEvent.emit({{"value", 42}});
-static Connect connect;
+// Call initChannels(conn) once, then use channels directly:
+//   customFileDrop.on([](const json& p) { ... });
+//   customFileDrop.emit({{"value", 42}});
+static Connect conn;
+using json = nlohmann::json;
 
 int main() {
     // Build the app with configuration
@@ -191,12 +192,12 @@ int main() {
     // ========================================
     // CONNECT — bind frontend ↔ backend
     // ========================================
-    // Wires the connect object to this window.
-    // Connections ch gives you named channel objects — same API as TypeScript:
-    //   ch.myEvent.on([](const json& p) { ... });  // receive from frontend
-    //   ch.myEvent.emit({{"value", 42}});          // send to frontend
-    bindConnect(mainWindow, connect);
-    Connections ch(connect);  // use ch.name.on() / ch.name.emit()
+    // Wires the connect object to this window, then initialises
+    // the auto-generated channels so you can use them directly:
+    //   customFileDrop.on([](const json& p) { ... });
+    //   customFileDrop.emit({{"value", 42}});
+    bindConnect(mainWindow, conn);
+    initChannels(conn);
     
     // ========================================
     // CUSTOM FILE DROP CHANNEL
@@ -205,7 +206,7 @@ int main() {
     // Frontend drops files → emits via customFileDrop.emit({ files: [...] })
     // C++ receives here, processes, then emits back to the frontend.
     // Frontend receives the reply via customFileDrop.on() in App.tsx.
-    ch.customFileDrop.on([&ch](const json& payload) {
+    customFileDrop.on([](const json& payload) {
         auto files = payload.value("files", json::array());
         int count = static_cast<int>(files.size());
         std::cout << "customFileDrop: received " << count << " file(s) from frontend" << std::endl;
@@ -213,7 +214,7 @@ int main() {
             std::cout << "  - " << f.value("name", "?") << " (" << f.value("size", 0) << " bytes)" << std::endl;
         }
         // Reply back to frontend — received by customFileDrop.on() in App.tsx
-        ch.customFileDrop.emit({
+        customFileDrop.emit({
             {"processed", true},
             {"count", count},
             {"message", "C++ received " + std::to_string(count) + " file(s)"}
@@ -237,10 +238,10 @@ int main() {
 //
 // CONNECT (custom channels — same API on both sides):
 //   Run `plusui connect` to generate Connections/ from your name.on / name.emit calls.
-//   C++: ch.myEvent.on([](const json& p) { ... });  // receive
-//        ch.myEvent.emit({{"value", 42}});          // send
-//   TS:  myEvent.on((data) => { ... });             // receive
-//        myEvent.emit({ value: 42 });               // send
+//   C++: customFileDrop.on([](const json& p) { ... });  // receive
+//        customFileDrop.emit({{"value", 42}});           // send
+//   TS:  customFileDrop.on((data) => { ... });           // receive
+//        customFileDrop.emit({ value: 42 });             // send
 //
 // WINDOW: win.minimize(), win.maximize(), win.close(), win.center(),
 //         win.setSize(w, h), win.setPosition(x, y), win.setTitle(str),

package/templates/solid/main.cpp.template

@@ -113,12 +113,13 @@ struct WebGPUConfig {
 // MAIN - Application Entry Point
 // ============================================================================
 // ── Connect instance ─────────────────────────────────────────────────────────
-// connect is the bridge between C++ and the frontend.
+// conn is the bridge between C++ and the frontend.
 // Run `plusui connect` to generate Connections/ from your name.on / name.emit usage.
-// Then declare:  Connections ch(connect);
-// and use:       ch.myEvent.on([](const json& p) { ... });
-//                ch.myEvent.emit({{"value", 42}});
-static Connect connect;
+// Call initChannels(conn) once, then use channels directly:
+//   customFileDrop.on([](const json& p) { ... });
+//   customFileDrop.emit({{"value", 42}});
+static Connect conn;
+using json = nlohmann::json;
 
 int main() {
     // Build the app with configuration
@@ -185,12 +186,12 @@ int main() {
     // ========================================
     // CONNECT — bind frontend ↔ backend
     // ========================================
-    // Wires the connect object to this window.
-    // Connections ch gives you named channel objects — same API as TypeScript:
-    //   ch.myEvent.on([](const json& p) { ... });  // receive from frontend
-    //   ch.myEvent.emit({{"value", 42}});          // send to frontend
-    bindConnect(mainWindow, connect);
-    Connections ch(connect);  // use ch.name.on() / ch.name.emit()
+    // Wires the connect object to this window, then initialises
+    // the auto-generated channels so you can use them directly:
+    //   customFileDrop.on([](const json& p) { ... });
+    //   customFileDrop.emit({{"value", 42}});
+    bindConnect(mainWindow, conn);
+    initChannels(conn);
     
     // ========================================
     // CUSTOM FILE DROP CHANNEL
@@ -199,7 +200,7 @@ int main() {
     // Frontend drops files → emits via customFileDrop.emit({ files: [...] })
     // C++ receives here, processes, then emits back to the frontend.
     // Frontend receives the reply via customFileDrop.on() in App.tsx.
-    ch.customFileDrop.on([&ch](const json& payload) {
+    customFileDrop.on([](const json& payload) {
         auto files = payload.value("files", json::array());
         int count = static_cast<int>(files.size());
         std::cout << "customFileDrop: received " << count << " file(s) from frontend" << std::endl;
@@ -207,7 +208,7 @@ int main() {
             std::cout << "  - " << f.value("name", "?") << " (" << f.value("size", 0) << " bytes)" << std::endl;
         }
         // Reply back to frontend — received by customFileDrop.on() in App.tsx
-        ch.customFileDrop.emit({
+        customFileDrop.emit({
             {"processed", true},
             {"count", count},
             {"message", "C++ received " + std::to_string(count) + " file(s)"}
@@ -231,10 +232,10 @@ int main() {
 //
 // CONNECT (custom channels — same API on both sides):
 //   Run `plusui connect` to generate Connections/ from your name.on / name.emit calls.
-//   C++: ch.myEvent.on([](const json& p) { ... });  // receive
-//        ch.myEvent.emit({{"value", 42}});          // send
-//   TS:  myEvent.on((data) => { ... });             // receive
-//        myEvent.emit({ value: 42 });               // send
+//   C++: customFileDrop.on([](const json& p) { ... });  // receive
+//        customFileDrop.emit({{"value", 42}});           // send
+//   TS:  customFileDrop.on((data) => { ... });           // receive
+//        customFileDrop.emit({ value: 42 });             // send
 //
 // WINDOW: win.minimize(), win.maximize(), win.close(), win.center(),
 //         win.setSize(w, h), win.setPosition(x, y), win.setTitle(str),