plusui-native 0.2.5 → 0.2.8

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "plusui-native",
-  "version": "0.2.5",
-  "description": "PlusUI CLI - Build C++ desktop apps with web tech",
+  "version": "0.2.8",
+  "description": "PlusUI CLI - Build C++ desktop apps modern UI ",
   "main": "src/index.js",
   "type": "module",
   "bin": {
@@ -27,11 +27,11 @@
     "semver": "^7.6.0",
     "which": "^4.0.0",
     "execa": "^8.0.1",
-    "plusui-native-builder": "^0.1.5",
-    "plusui-native-bindgen": "^0.1.5"
+    "plusui-native-builder": "^0.1.8",
+    "plusui-native-bindgen": "^0.1.8"
   },
   "peerDependencies": {
-    "plusui-native-bindgen": "^0.1.5"
+    "plusui-native-bindgen": "^0.1.8"
   },
   "publishConfig": {
     "access": "public"

package/src/index.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
-import { mkdir, readFile, stat, rm, readdir, writeFile } from 'fs/promises';
-import { existsSync, watch, statSync } from 'fs';
+import { mkdir, readFile, stat, rm, readdir, writeFile, copyFile } from 'fs/promises';
+import { existsSync, watch, statSync, mkdirSync } from 'fs';
 import { exec, spawn, execSync } from 'child_process';
 import { join, dirname, basename, resolve } from 'path';
 import { fileURLToPath } from 'url';
@@ -199,9 +199,97 @@ function getAppBindgenPaths() {
     return {
         featuresDir: join(process.cwd(), 'src', 'features'),
         outputDir: join(process.cwd(), 'src', 'Bindings_Generated'),
+        frontendOutputDir: join(process.cwd(), 'frontend', 'src', 'Bindings_Generated'),
     };
 }
 
+function findLikelyProjectDirs(baseDir) {
+    try {
+        const entries = execSync('npm pkg get name', { cwd: baseDir, encoding: 'utf8', stdio: ['ignore', 'pipe', 'ignore'] });
+        if (entries) {
+            // noop; just to ensure cwd is a Node project when possible
+        }
+    } catch {}
+
+    const candidates = [];
+    try {
+        const dirs = execSync(process.platform === 'win32' ? 'dir /b /ad' : 'ls -1 -d */', {
+            cwd: baseDir,
+            encoding: 'utf8',
+            stdio: ['ignore', 'pipe', 'ignore'],
+            shell: true,
+        })
+            .split(/\r?\n/)
+            .map(s => s.trim().replace(/[\\/]$/, ''))
+            .filter(Boolean);
+
+        for (const dirName of dirs) {
+            const fullDir = join(baseDir, dirName);
+            if (existsSync(join(fullDir, 'CMakeLists.txt')) && existsSync(join(fullDir, 'package.json'))) {
+                candidates.push(dirName);
+            }
+        }
+    } catch {}
+
+    return candidates;
+}
+
+function ensureProjectRoot(commandName) {
+    const hasCMake = existsSync(join(process.cwd(), 'CMakeLists.txt'));
+    const hasPackage = existsSync(join(process.cwd(), 'package.json'));
+
+    if (hasCMake && hasPackage) {
+        return;
+    }
+
+    const likelyDirs = findLikelyProjectDirs(process.cwd());
+    let hint = '';
+
+    if (likelyDirs.length === 1) {
+        hint = `\n\nHint: you may be in a parent folder. Try:\n  cd ${likelyDirs[0]}\n  plusui ${commandName}`;
+    } else if (likelyDirs.length > 1) {
+        hint = `\n\nHint: run this command from your app folder (one containing CMakeLists.txt and package.json).`;
+    }
+
+    error(`This command must be run from a PlusUI project root (missing CMakeLists.txt and/or package.json in ${process.cwd()}).${hint}`);
+}
+
+function ensureBuildLayout() {
+    const buildRoot = join(process.cwd(), 'build');
+    for (const platform of Object.values(PLATFORMS)) {
+        mkdirSync(join(buildRoot, platform.folder), { recursive: true });
+    }
+}
+
+function resolveBindgenScriptPath() {
+    const candidates = [
+        resolve(__dirname, '../../plusui-bindgen/src/index.js'),
+        resolve(__dirname, '../../plusui-native-bindgen/src/index.js'),
+        resolve(__dirname, '../../../plusui-native-bindgen/src/index.js'),
+        resolve(process.cwd(), 'node_modules', 'plusui-native-bindgen', 'src', 'index.js'),
+    ];
+
+    for (const candidate of candidates) {
+        if (existsSync(candidate)) {
+            return candidate;
+        }
+    }
+
+    return null;
+}
+
+async function syncGeneratedTsBindings(backendOutputDir, frontendOutputDir) {
+    const generatedTsPath = join(backendOutputDir, 'bindings.gen.ts');
+    if (!existsSync(generatedTsPath)) {
+        return;
+    }
+
+    await mkdir(frontendOutputDir, { recursive: true });
+    const frontendTsPath = join(frontendOutputDir, 'bindings.gen.ts');
+    await copyFile(generatedTsPath, frontendTsPath);
+    log(`Synced TS bindings: ${frontendTsPath}`, 'dim');
+}
+
 function promptTemplateSelection() {
     return new Promise((resolve) => {
         const rl = createInterface({
@@ -238,6 +326,7 @@ async function createProject(name, options = {}) {
 // ============================================================
 
 function buildFrontend() {
+    ensureProjectRoot('build:frontend');
     logSection('Building Frontend');
 
     if (existsSync('frontend')) {
@@ -250,6 +339,7 @@ function buildFrontend() {
 }
 
 function buildBackend(platform = null, devMode = false) {
+    ensureProjectRoot(devMode ? 'dev:backend' : 'build:backend');
     const targetPlatform = platform || process.platform;
     const platformConfig = PLATFORMS[targetPlatform] || PLATFORMS[Object.keys(PLATFORMS).find(k => PLATFORMS[k].folder.toLowerCase() === targetPlatform?.toLowerCase())];
 
@@ -259,9 +349,10 @@ function buildBackend(platform = null, devMode = false) {
 
     logSection(`Building Backend (${platformConfig.name})`);
 
-    const projectName = getProjectName();
     const buildDir = `build/${platformConfig.folder}`;
 
+    ensureBuildLayout();
+
     // Create build directory
     if (!existsSync(buildDir)) {
         execSync(`mkdir -p "${buildDir}"`, { stdio: 'ignore', shell: true });
@@ -291,6 +382,7 @@ function buildBackend(platform = null, devMode = false) {
 }
 
 async function generateIcons(inputPath = null) {
+    ensureProjectRoot('icons');
     logSection('Generating Platform Icons');
 
     const { IconGenerator } = await import('./assets/icon-generator.js');
@@ -309,6 +401,7 @@ async function generateIcons(inputPath = null) {
 }
 
 async function embedResources(platform = null) {
+    ensureProjectRoot('embed');
     const targetPlatform = platform || process.platform;
     logSection(`Embedding Resources (${targetPlatform})`);
 
@@ -331,6 +424,7 @@ async function embedResources(platform = null) {
 }
 
 async function embedAssets() {
+    ensureProjectRoot('build');
     const assetsDir = join(process.cwd(), 'assets');
     if (!existsSync(assetsDir)) {
         try {
@@ -379,6 +473,7 @@ async function embedAssets() {
 
 
 async function build(production = true) {
+    ensureProjectRoot('build');
     logSection('Building PlusUI Application');
 
     // Embed assets
@@ -397,8 +492,11 @@ async function build(production = true) {
 }
 
 function buildAll() {
+    ensureProjectRoot('build:all');
     logSection('Building for All Platforms');
 
+    ensureBuildLayout();
+
     buildFrontend();
 
     const supportedPlatforms = ['win32', 'darwin', 'linux'];
@@ -416,6 +514,8 @@ function buildAll() {
     log('  build/Windows/', 'cyan');
     log('  build/MacOS/', 'cyan');
     log('  build/Linux/', 'cyan');
+    log('  build/Android/', 'cyan');
+    log('  build/iOS/', 'cyan');
 }
 
 function buildPlatform(platform) {
@@ -432,6 +532,7 @@ let viteServer = null;
 let cppProcess = null;
 
 async function startViteServer() {
+    ensureProjectRoot('dev:frontend');
     log('Starting Vite dev server...', 'blue');
 
     viteServer = await createViteServer({
@@ -449,12 +550,14 @@ async function startViteServer() {
 }
 
 async function startBackend() {
+    ensureProjectRoot('dev');
     logSection('Building C++ Backend (Dev Mode)');
 
     const projectName = getProjectName();
     killProcessByName(projectName);
 
-    const buildDir = 'build/dev';
+    const platformFolder = PLATFORMS[process.platform]?.folder || 'Windows';
+    const buildDir = join('build', platformFolder, 'dev');
 
     // Configure with dev mode if not configured
     if (!existsSync(join(buildDir, 'CMakeCache.txt'))) {
@@ -555,6 +658,7 @@ function killProcessByName(name) {
 }
 
 async function dev() {
+    ensureProjectRoot('dev');
     logSection('PlusUI Development Mode');
 
     const toolCheck = checkTools();
@@ -600,6 +704,7 @@ async function dev() {
 }
 
 async function devFrontend() {
+    ensureProjectRoot('dev:frontend');
     logSection('Frontend Development Mode');
 
     // specific port cleaning
@@ -622,12 +727,14 @@ async function devFrontend() {
 }
 
 function devBackend() {
+    ensureProjectRoot('dev:backend');
     logSection('Backend Development Mode');
 
     const projectName = getProjectName();
     killProcessByName(projectName);
 
-    const buildDir = 'build/dev';
+    const platformFolder = PLATFORMS[process.platform]?.folder || 'Windows';
+    const buildDir = join('build', platformFolder, 'dev');
 
     if (!existsSync(join(buildDir, 'CMakeCache.txt'))) {
         log('Configuring CMake...', 'blue');
@@ -698,9 +805,10 @@ function devBackend() {
 // ============================================================
 
 function run() {
+    ensureProjectRoot('run');
     const projectName = getProjectName();
     const platform = PLATFORMS[process.platform];
-    const buildDir = `build/${platform?.folder || 'dev'}`;
+    const buildDir = `build/${platform?.folder || 'Windows'}`;
 
     let exePath;
     if (process.platform === 'win32') {
@@ -730,6 +838,7 @@ function run() {
 // ============================================================
 
 async function clean() {
+    ensureProjectRoot('clean');
     logSection('Cleaning Build Artifacts');
 
     const dirs = ['build', 'frontend/dist'];
@@ -749,18 +858,14 @@ async function clean() {
 // ============================================================
 
 async function runBindgen(providedArgs = null, options = {}) {
+    ensureProjectRoot('bindgen');
     logSection('Running Binding Generator');
 
     const { skipIfNoInput = false, source = 'manual' } = options;
 
-    // Try to find the bindgen script
-    let scriptPath = resolve(__dirname, '../../plusui-bindgen/src/index.js');
-    if (!existsSync(scriptPath)) {
-    // Try installed location (node_modules/plusui-native-bindgen)
-        scriptPath = resolve(__dirname, '../../../plusui-native-bindgen/src/index.js');
-    }
+    const scriptPath = resolveBindgenScriptPath();
 
-    if (!existsSync(scriptPath)) {
+    if (!scriptPath) {
         error(`Bindgen script not found. Please ensure plusui-native-bindgen is installed.`);
     }
 
@@ -771,11 +876,18 @@ async function runBindgen(providedArgs = null, options = {}) {
     const args = providedArgs ?? process.argv.slice(3);
     let bindgenArgs = [...args];
 
+    let usedDefaultAppMode = false;
+    let defaultOutputDir = null;
+    let defaultFrontendOutputDir = null;
+
     if (bindgenArgs.length === 0) {
-        const { featuresDir: appFeaturesDir, outputDir: appOutputDir } = getAppBindgenPaths();
+        const { featuresDir: appFeaturesDir, outputDir: appOutputDir, frontendOutputDir } = getAppBindgenPaths();
 
         if (existsSync(appFeaturesDir)) {
             bindgenArgs = [appFeaturesDir, appOutputDir];
+            usedDefaultAppMode = true;
+            defaultOutputDir = appOutputDir;
+            defaultFrontendOutputDir = frontendOutputDir;
             log(`App mode: ${appFeaturesDir} -> ${appOutputDir}`, 'dim');
         } else {
             if (skipIfNoInput) {
@@ -794,10 +906,17 @@ async function runBindgen(providedArgs = null, options = {}) {
     });
 
     return new Promise((resolve, reject) => {
-        proc.on('close', (code) => {
+        proc.on('close', async (code) => {
             if (code === 0) {
-                log('\nBindgen complete!', 'green');
-                resolve();
+                try {
+                    if (usedDefaultAppMode && defaultOutputDir && defaultFrontendOutputDir) {
+                        await syncGeneratedTsBindings(defaultOutputDir, defaultFrontendOutputDir);
+                    }
+                    log('\nBindgen complete!', 'green');
+                    resolve();
+                } catch (syncErr) {
+                    reject(syncErr);
+                }
             } else {
                 reject(new Error(`Bindgen failed with code ${code}`));
             }

package/templates/base/README.md.template

@@ -89,9 +89,11 @@ npm run build:all
 This creates platform-specific builds in:
 ```
 build/
-├── Windows/    # Windows executable
-├── MacOS/      # macOS app bundle
-└── Linux/      # Linux binary
+├── Windows/    # Windows builds
+├── MacOS/      # macOS builds
+├── Linux/      # Linux builds
+├── Android/    # Android builds
+└── iOS/        # iOS builds
 ```
 
 ### Platform-specific builds

package/templates/react/CMakeLists.txt.template

@@ -117,13 +117,7 @@ if(WIN32)
     endif()
     
     target_link_libraries({{PROJECT_NAME}} PRIVATE ole32 shell32 shlwapi user32 version)
-
-    # Set subsystem to Windows for release builds (no console window)
-    if(NOT PLUSUI_DEV_MODE)
-        set_target_properties({{PROJECT_NAME}} PROPERTIES
-            WIN32_EXECUTABLE TRUE
-        )
-    endif()
+    # Keep default console subsystem so standard int main() works in all build modes.
 elseif(APPLE)
     # macOS: WebKit
     find_library(WEBKIT_LIBRARY WebKit REQUIRED)

package/templates/solid/CMakeLists.txt.template

@@ -117,13 +117,7 @@ if(WIN32)
     endif()
     
     target_link_libraries({{PROJECT_NAME}} PRIVATE ole32 shell32 shlwapi user32 version)
-
-    # Set subsystem to Windows for release builds (no console window)
-    if(NOT PLUSUI_DEV_MODE)
-        set_target_properties({{PROJECT_NAME}} PROPERTIES
-            WIN32_EXECUTABLE TRUE
-        )
-    endif()
+    # Keep default console subsystem so standard int main() works in all build modes.
 elseif(APPLE)
     # macOS: WebKit
     find_library(WEBKIT_LIBRARY WebKit REQUIRED)