plusui-native 0.2.59 → 0.2.62

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "plusui-native",
-  "version": "0.2.59",
+  "version": "0.2.62",
   "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.58",
-    "plusui-native-connect": "^0.1.58"
+    "plusui-native-builder": "^0.1.61",
+    "plusui-native-connect": "^0.1.61"
   },
   "peerDependencies": {
-    "plusui-native-connect": "^0.1.58"
+    "plusui-native-connect": "^0.1.61"
   },
   "publishConfig": {
     "access": "public"

package/src/index.js

@@ -1,4 +1,4 @@
-#!/usr/bin/env node
+#!/usr/bin/env node
 
 import { mkdir, readFile, stat, rm, readdir, writeFile, copyFile } from 'fs/promises';
 import { existsSync, watch, statSync, mkdirSync } from 'fs';
@@ -400,8 +400,8 @@ async function updatePlusUIPackages() {
 function getAppBindgenPaths() {
     return {
         featuresDir: join(process.cwd(), 'src', 'features'),
-        outputDir: join(process.cwd(), 'src', 'Bindings'),
-        frontendOutputDir: join(process.cwd(), 'frontend', 'src', 'Bindings'),
+        // Connections/ is now at the project root — shared by C++ and TS
+        outputDir: join(process.cwd(), 'Connections'),
     };
 }
 
@@ -1089,14 +1089,12 @@ async function runBindgen(providedArgs = null, options = {}) {
 
     let usedDefaultAppMode = false;
     let defaultOutputDir = null;
-    let defaultFrontendOutputDir = null;
 
     if (bindgenArgs.length === 0) {
-        const { outputDir: appOutputDir, frontendOutputDir } = getAppBindgenPaths();
+        const { outputDir: appOutputDir } = getAppBindgenPaths();
         bindgenArgs = [process.cwd(), appOutputDir];
         usedDefaultAppMode = true;
         defaultOutputDir = appOutputDir;
-        defaultFrontendOutputDir = frontendOutputDir;
         log(`Project mode: ${process.cwd()} -> ${appOutputDir}`, 'dim');
     }
     
@@ -1110,9 +1108,6 @@ async function runBindgen(providedArgs = null, options = {}) {
         proc.on('close', async (code) => {
             if (code === 0) {
                 try {
-                    if (usedDefaultAppMode && defaultOutputDir && defaultFrontendOutputDir) {
-                        await syncGeneratedTsBindings(defaultOutputDir, defaultFrontendOutputDir);
-                    }
                     log('\nBindgen complete!', 'green');
                     resolve();
                 } catch (syncErr) {

package/templates/base/README.md.template

@@ -40,23 +40,19 @@ npm run connect
 
 Default connect generator paths:
 - Input: project root scan (frontend + backend files)
-- Output: `src/Bindings`
+- Output: `Connections/` (at project root)
 
 Generated structure:
-- `src/Bindings/bindings.gen.ts`
-- `src/Bindings/bindings.gen.hpp`
-- `src/Bindings/connect.manifest.json`
+- `Connections/connections.gen.ts`    — typed TS channel exports (regenerated)
+- `Connections/connections.gen.hpp`   — C++ `Connections` struct (regenerated)
+- `Connections/connect.manifest.json` — detected channel list (regenerated)
+
+All three files are always regenerated — do not manually edit them.
 
 Scan extensions:
 - `WEB_IO`: `.ts`, `.tsx`, `.js`, `.jsx`, `.mts`, `.cts`, `.html`
 - `CPP_IO`: `.h`, `.hpp`, `.hh`, `.hxx`, `.cpp`, `.cc`, `.cxx`
 
-Custom binding kinds detected:
-- `method`
-- `service`
-- `stream`
-- `event`
-
 `plusui connect` scans your project structure and does not require a schema file.
 
 You can also pass custom paths:
@@ -163,10 +159,12 @@ just help         # Show all commands
 
 ## Calling C++ from TypeScript
 
-Use the local `frontend/src/plusui.ts` bridge to interact with the native backend:
+All features and custom channels are available via a single import:
 
 ```tsx
-import { win } from './plusui';
+import plusui from 'plusui';
+// or named imports:
+import { connect, win, clipboard, app } from 'plusui';
 
 // Window controls
 await win.minimize();

package/templates/manager.js

@@ -5,6 +5,7 @@ import { fileURLToPath } from 'url';
 import { EnvironmentDoctor } from '../src/doctor/index.js';
 import chalk from 'chalk';
 import { spawn } from 'child_process';
+import { execSync } from 'child_process';
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
@@ -24,6 +25,58 @@ export class TemplateManager {
     return this.cliPackageJson.version;
   }
 
+  async loadCliPackageJson() {
+    if (!this.cliPackageJson) {
+      const packageJsonPath = join(this.templatesDir, '..', 'package.json');
+      const content = await readFile(packageJsonPath, 'utf8');
+      this.cliPackageJson = JSON.parse(content);
+    }
+    return this.cliPackageJson;
+  }
+
+  getLatestPublishedVersion(packageName) {
+    try {
+      const version = execSync(`npm view ${packageName} version`, {
+        encoding: 'utf8',
+        stdio: ['pipe', 'pipe', 'ignore']
+      }).trim();
+      return version || null;
+    } catch {
+      return null;
+    }
+  }
+
+  toCompatibleRange(version) {
+    if (!version) {
+      return null;
+    }
+    return version.startsWith('^') || version.startsWith('~') ? version : `^${version}`;
+  }
+
+  async resolveTemplatePackageVersions() {
+    const cliPkg = await this.loadCliPackageJson();
+    const cliVersion = cliPkg.version;
+    const [major, minor] = cliVersion.split('.');
+
+    const fallbackCliRange = `^${major}.${minor}.0`;
+    const fallbackToolsRange = `^${major}.1.0`;
+
+    const publishedCli = this.getLatestPublishedVersion('plusui-native');
+    const publishedCore = this.getLatestPublishedVersion('plusui-native-core');
+    const publishedBuilder = this.getLatestPublishedVersion('plusui-native-builder');
+    const publishedConnect = this.getLatestPublishedVersion('plusui-native-connect');
+
+    const cliDependencyBuilder = cliPkg.dependencies?.['plusui-native-builder'] || null;
+    const cliDependencyConnect = cliPkg.dependencies?.['plusui-native-connect'] || null;
+
+    return {
+      cli: this.toCompatibleRange(publishedCli) || fallbackCliRange,
+      core: this.toCompatibleRange(publishedCore) || fallbackToolsRange,
+      builder: this.toCompatibleRange(publishedBuilder) || cliDependencyBuilder || fallbackToolsRange,
+      connect: this.toCompatibleRange(publishedConnect) || cliDependencyConnect || fallbackToolsRange
+    };
+  }
+
   async create(projectName, options = {}) {
     const template = options.template || 'react';
     const templatePath = join(this.templatesDir, template);
@@ -53,32 +106,22 @@ export class TemplateManager {
 
     await mkdir(projectPath, { recursive: true });
 
-    // 3. Get current package versions
-    const cliVersion = await this.loadCliVersion();
-    
-    // Use version ranges that match latest published versions
-    // For CLI (plusui-native): Use major.minor.0 to get latest compatible
-    const [major, minor, patch] = cliVersion.split('.');
-    const cliVersionRange = `^${major}.${minor}.0`;
-    
-    // Core version follows 0.1.x pattern when CLI is 0.2.x
-    const coreVersionRange = `^${major}.1.0`;
-    
-    // Builder and connect generator also follow 0.1.x pattern
-    const builderVersionRange = `^${major}.1.0`;
-    const connectVersionRange = `^${major}.1.0`;
+    // 3. Resolve package versions for generated app dependencies
+    const resolvedVersions = await this.resolveTemplatePackageVersions();
     
     // 4. Prepare template variables
     const variables = {
       PROJECT_NAME: projectName,
       PROJECT_NAME_LOWER: projectName.toLowerCase(),
       PROJECT_VERSION: '0.1.0',
-      PLUSUI_CLI_VERSION: cliVersionRange,
-      PLUSUI_CORE_VERSION: coreVersionRange,
-      PLUSUI_BUILDER_VERSION: builderVersionRange,
-      PLUSUI_CONNECT_VERSION: connectVersionRange
+      PLUSUI_CLI_VERSION: resolvedVersions.cli,
+      PLUSUI_CORE_VERSION: resolvedVersions.core,
+      PLUSUI_BUILDER_VERSION: resolvedVersions.builder,
+      PLUSUI_CONNECT_VERSION: resolvedVersions.connect
     };
 
+    console.log(chalk.dim(`Using versions: core=${variables.PLUSUI_CORE_VERSION}, builder=${variables.PLUSUI_BUILDER_VERSION}, connect=${variables.PLUSUI_CONNECT_VERSION}`));
+
     // 5. Copy template files
     await this.copyTemplate(templatePath, projectPath, variables);
 

package/templates/react/frontend/src/App.tsx

@@ -1,5 +1,7 @@
 import { useState, useEffect } from 'react';
-import { win, browser, router, app, fileDrop, formatFileSize, type FileInfo } from './plusui';
+import plusui, { type FileInfo } from 'plusui';
+// Custom channels (generated by `plusui connect`) — import what you use:
+// import { greeting, download } from '../Connections/connections.gen';
 
 // Define routes for your app (optional - for SPA routing)
 const routes = {
@@ -22,39 +24,39 @@ function App() {
   const [dropAccent] = useState('#60a5fa');
 
   useEffect(() => {
-    win.show().catch(() => {
+    plusui.win.show().catch(() => {
       // no-op for browser preview mode
     });
 
     // Setup routes
-    router.setRoutes(routes);
+    plusui.router.setRoutes(routes);
     
     // Listen for navigation changes
-    const unsub = browser.onNavigate((url) => {
+    const unsub = plusui.browser.onNavigate((url) => {
       setCurrentUrl(url);
-      browser.canGoBack().then(setCanGoBack);
-      browser.canGoForward().then(setCanGoForward);
+      plusui.browser.canGoBack().then(setCanGoBack);
+      plusui.browser.canGoForward().then(setCanGoForward);
     });
     
     // Setup FileDrop listeners
-    const unsubDrop = fileDrop.onFilesDropped((droppedFiles) => {
+    const unsubDrop = plusui.fileDrop.onFilesDropped((droppedFiles) => {
       console.log('Files dropped:', droppedFiles);
       setFiles(prev => [...prev, ...droppedFiles]);
       setIsDragging(false);
     });
     
-    const unsubEnter = fileDrop.onDragEnter(() => {
+    const unsubEnter = plusui.fileDrop.onDragEnter(() => {
       setIsDragging(true);
     });
     
-    const unsubLeave = fileDrop.onDragLeave(() => {
+    const unsubLeave = plusui.fileDrop.onDragLeave(() => {
       setIsDragging(false);
     });
     
     // Get initial state
-    browser.getUrl().then(setCurrentUrl);
-    browser.canGoBack().then(setCanGoBack);
-    browser.canGoForward().then(setCanGoForward);
+    plusui.browser.getUrl().then(setCurrentUrl);
+    plusui.browser.canGoBack().then(setCanGoBack);
+    plusui.browser.canGoForward().then(setCanGoForward);
     
     return () => {
       unsub();
@@ -64,29 +66,29 @@ function App() {
     };
   }, []);
 
-  const handleMinimize = async () => await win.minimize();
-  const handleMaximize = async () => await win.maximize();
-  const handleClose = async () => await win.close();
+  const handleMinimize = async () => await plusui.win.minimize();
+  const handleMaximize = async () => await plusui.win.maximize();
+  const handleClose = async () => await plusui.win.close();
   const handleGetSize = async () => {
-    const size = await win.getSize();
+    const size = await plusui.win.getSize();
     setWindowSize(size);
   };
   const handleGetPosition = async () => {
-    const pos = await win.getPosition();
+    const pos = await plusui.win.getPosition();
     setWindowPos(pos);
   };
 
   // Browser navigation
-  const handleGoBack = async () => await browser.goBack();
-  const handleGoForward = async () => await browser.goForward();
-  const handleReload = async () => await browser.reload();
+  const handleGoBack = async () => await plusui.browser.goBack();
+  const handleGoForward = async () => await plusui.browser.goForward();
+  const handleReload = async () => await plusui.browser.reload();
 
   // Router navigation
-  const handleGoHome = async () => await router.push('/');
-  const handleGoSettings = async () => await router.push('/settings');
+  const handleGoHome = async () => await plusui.router.push('/');
+  const handleGoSettings = async () => await plusui.router.push('/settings');
 
   // App control
-  const handleQuit = async () => await app.quit();
+  const handleQuit = async () => await plusui.app.quit();
 
   return (
     <div className="app">
@@ -117,8 +119,8 @@ function App() {
           <h2>Window Position</h2>
           <div className="button-group">
             <button onClick={handleGetPosition} className="button">Get Position</button>
-            <button onClick={() => win.setPosition(100, 100)} className="button">Move Left</button>
-            <button onClick={() => win.setPosition(800, 100)} className="button">Move Right</button>
+            <button onClick={() => plusui.win.setPosition(100, 100)} className="button">Move Left</button>
+            <button onClick={() => plusui.win.setPosition(800, 100)} className="button">Move Right</button>
           </div>
           {windowPos.x !== 0 && (
             <p className="info-text">Position: {windowPos.x}, {windowPos.y}</p>
@@ -142,7 +144,7 @@ function App() {
             <button onClick={handleGoSettings} className="button">Settings</button>
           </div>
           <p style={{ fontSize: '0.85em', color: '#666', marginTop: '10px' }}>
-            Define routes with <code>router.setRoutes({'{ ... }'})</code> then navigate with <code>router.push('/path')</code>
+            Define routes with <code>plusui.router.setRoutes({'{ ... }'})</code> then navigate with <code>plusui.router.push('/path')</code>
           </p>
         </div>
 
@@ -200,7 +202,7 @@ function App() {
                   <div className="filedrop-file-info">
                     <div className="filedrop-file-name">{file.name}</div>
                     <div className="filedrop-file-meta">
-                      {formatFileSize(file.size)} • {file.type}
+                      {plusui.formatFileSize(file.size)} • {file.type}
                     </div>
                   </div>
                   <button