plusui-native-builder 0.1.106 → 0.1.107

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "plusui-native-builder",
-  "version": "0.1.106",
+  "version": "0.1.107",
   "description": "Multi-platform build tool for PlusUI",
   "main": "src/index.js",
   "type": "module",
@@ -25,6 +25,6 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "plusui-native-connect": "^0.1.106"
+    "plusui-native-connect": "^0.1.107"
   }
 }

package/src/index.js

@@ -1,263 +1,263 @@
 #!/usr/bin/env node
-
-import { execSync, spawn } from 'child_process';
-import { existsSync, mkdirSync, copyFileSync } from 'fs';
-import { join, dirname } from 'path';
-import { fileURLToPath } from 'url';
-
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = dirname(__filename);
-
-const COLORS = {
-    reset: '\x1b[0m',
-    bright: '\x1b[1m',
-    green: '\x1b[32m',
-    blue: '\x1b[34m',
-    yellow: '\x1b[33m',
-    red: '\x1b[31m',
-};
-
-function log(msg, color = 'reset') {
-    console.log(`${COLORS[color]}${msg}${COLORS.reset}`);
-}
-
-function error(msg) {
-    console.error(`${COLORS.red}Error: ${msg}${COLORS.reset}`);
-    process.exit(1);
-}
-
-const USAGE = `
-PlusUI Builder - Multi-platform build tool
-
-Usage:
-  plusui-builder                    Build for current platform
-  plusui-builder <platform>         Build for specific platform
-  plusui-builder all                Build for all platforms
-    plusui-builder generate           Generate connection bindings only
-
-Platforms:
-  win32        - Windows (x64)
-  macos        - macOS (x64, arm64)
-  linux        - Linux (x64)
-  android      - Android (arm64-v8a, armeabi-v7a, x86, x86_64)
-  ios          - iOS (simulator, device)
-
-Options:
-  -h, --help     Show this help
-  -v, --version  Show version
-`;
-
-const PLATFORMS = {
-    win32: { name: 'Windows', folder: 'Windows', ext: '.exe', arch: ['x64'] },
-    macos: { name: 'macOS', folder: 'MacOS', ext: '', arch: ['x64', 'arm64'] },
-    linux: { name: 'Linux', folder: 'Linux', ext: '', arch: ['x64'] },
-    android: { name: 'Android', folder: 'Android', ext: '.so', arch: ['arm64-v8a', 'armeabi-v7a', 'x86', 'x86_64'] },
-    ios: { name: 'iOS', folder: 'iOS', ext: '.app', arch: ['simulator', 'device'] },
-};
-
-function resolveBindgenScriptPath() {
-    const candidates = [
-        join(__dirname, '..', '..', 'plusui-connect', 'src', 'connect.js'),
-        join(__dirname, '..', '..', 'plusui-connect', 'src', 'index.js'),
-        join(__dirname, '..', '..', 'plusui-native-connect', 'src', 'index.js'),
-        join(__dirname, '..', '..', 'plusui-native-bindgen', 'src', 'index.js'),
-            join(process.cwd(), 'node_modules', 'plusui-native-connect', 'src', 'connect.js'),
-            join(__dirname, '..', '..', 'plusui-native-connect', 'src', 'connect.js'),
-        join(process.cwd(), 'node_modules', 'plusui-native-connect', 'src', 'index.js'),
-        join(process.cwd(), 'node_modules', 'plusui-native-bindgen', 'src', 'index.js'),
-    ];
-
-    for (const candidate of candidates) {
-        if (existsSync(candidate)) {
-            return candidate;
-        }
-    }
-
-    return null;
-}
-
-function syncGeneratedTsBindings(backendOutputDir, frontendOutputDir) {
-    const tsSource = join(backendOutputDir, 'bindings.gen.ts');
-    if (!existsSync(tsSource)) {
-        return;
-    }
-
-    mkdirSync(frontendOutputDir, { recursive: true });
-    copyFileSync(tsSource, join(frontendOutputDir, 'bindings.gen.ts'));
-}
-
-function runCommand(cmd, options = {}) {
-    const { cwd = process.cwd(), env = process.env, fatal = true } = options;
-    try {
-        execSync(cmd, { cwd, env, stdio: 'inherit' });
-        return true;
-    } catch (e) {
-        if (fatal) error(`Command failed: ${cmd}`);
-        return false;
-    }
-}
-
-function generateBindings() {
-    log('Generating connection bindings...', 'blue');
-    const bindgenPath = resolveBindgenScriptPath();
-
-    if (!bindgenPath) {
-        error('plusui-connect tool not found. Please ensure plusui-native-connect is installed.');
-    }
-
-    const projectRoot = '.';
-    // Output goes to Connections/ at project root
-    const outputDir = './Connections';
-    runCommand(`node ${bindgenPath} ${projectRoot} ${outputDir}`);
-    log('Connection bindings generated ✓', 'green');
-}
-
-function getCMakePlatformArgs(platform) {
-    const args = [];
-    
-    switch (platform) {
-        case 'win32':
-            break;
-        case 'macos':
-            args.push('-G', 'Xcode');
-            break;
-        case 'linux':
-            args.push('-G', 'Ninja');
-            break;
-        case 'android':
-            const sdkRoot = process.env.ANDROID_SDK_ROOT || process.env.ANDROID_HOME;
-            if (!sdkRoot) {
-                error('ANDROID_SDK_ROOT or ANDROID_HOME not set');
-            }
-            args.push('-G', 'Ninja');
-            args.push('-DCMAKE_TOOLCHAIN_FILE=' + join(sdkRoot, 'build-tools', 'cmake', 'android.toolchain.cmake'));
-            args.push('-DANDROID_NATIVE_API_LEVEL=24');
-            break;
-        case 'ios':
-            args.push('-G', 'Xcode');
-            args.push('-DCMAKE_SYSTEM_NAME=iOS');
-            break;
-    }
-    
-    return args;
-}
-
-function findCMakeLists() {
-    const root = process.cwd();
-    if (existsSync(join(root, 'CMakeLists.txt'))) {
-        return root;
-    }
-    const subdirs = ['.', 'src', 'app', 'core'];
-    for (const dir of subdirs) {
-        const path = join(root, dir, 'CMakeLists.txt');
-        if (existsSync(path)) {
-            return join(root, dir);
-        }
-    }
-    error('CMakeLists.txt not found. Run from a PlusUI project directory.');
-}
-
-function buildPlatform(platform, arch = null) {
-    const cfg = PLATFORMS[platform];
-    if (!cfg) {
-        error(`Unknown platform: ${platform}`);
-    }
-    
-    const sourceDir = findCMakeLists();
-    const archs = arch ? [arch] : cfg.arch;
-    
-    for (const targetArch of archs) {
-        log(`Building ${cfg.name} (${targetArch})...`, 'blue');
-        
-        const desktopSingleArch = ['win32', 'linux'].includes(platform) || (platform === 'macos' && archs.length === 1);
-        const buildDir = desktopSingleArch
-            ? join(sourceDir, 'build', cfg.folder)
-            : join(sourceDir, 'build', cfg.folder, targetArch);
-        mkdirSync(buildDir, { recursive: true });
-        
-        const cmakeArgs = ['-S' + sourceDir, `-B${buildDir}`, '-DCMAKE_BUILD_TYPE=Release'];
-        cmakeArgs.push(...getCMakePlatformArgs(platform));
-        
-        if (platform === 'android') {
-            cmakeArgs.push(`-DANDROID_ABI=${targetArch}`);
-        }
-        
-        const cmakeCmd = 'cmake ' + cmakeArgs.join(' ');
-        runCommand(cmakeCmd);
-        runCommand(`cmake --build ${buildDir} --config Release`);
-        
-        log(`Built ${cfg.name} (${targetArch}) ✓`, 'green');
-    }
-}
-
-function buildCurrentPlatform() {
-    const platform = process.platform;
-    const platformMap = { 'win32': 'win32', 'darwin': 'macos', 'linux': 'linux' };
-    const targetPlatform = platformMap[platform];
-    
-    if (targetPlatform) {
-        buildPlatform(targetPlatform);
-    } else {
-        error(`Unsupported platform: ${platform}`);
-    }
-}
-
-function buildAll() {
-    generateBindings();
-    
-    for (const platform of Object.keys(PLATFORMS)) {
-        log(`\n=== Building for ${PLATFORMS[platform].name} ===`, 'yellow');
-        buildPlatform(platform);
-    }
-    
-    log('\n✓ All builds complete!', 'green');
-}
-
-function main() {
-    const args = process.argv.slice(2);
-    const cmd = args[0];
-    
-    switch (cmd) {
-        case 'generate':
-        case 'gen':
-            generateBindings();
-            break;
-        case 'all':
-            buildAll();
-            break;
-        case 'win32':
-        case 'windows':
-            generateBindings();
-            buildPlatform('win32');
-            break;
-        case 'macos':
-            generateBindings();
-            buildPlatform('macos');
-            break;
-        case 'linux':
-            generateBindings();
-            buildPlatform('linux');
-            break;
-        case 'android':
-            generateBindings();
-            buildPlatform('android');
-            break;
-        case 'ios':
-            generateBindings();
-            buildPlatform('ios');
-            break;
-        case '-h':
-        case '--help':
-            console.log(USAGE);
-            break;
-        case '-v':
-        case '--version':
-            console.log('plusui-builder v0.1.0');
-            break;
-        default:
-            generateBindings();
-            buildCurrentPlatform();
-    }
-}
-
-main();
+
+import { execSync, spawn } from 'child_process';
+import { existsSync, mkdirSync, copyFileSync } from 'fs';
+import { join, dirname } from 'path';
+import { fileURLToPath } from 'url';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+
+const COLORS = {
+    reset: '\x1b[0m',
+    bright: '\x1b[1m',
+    green: '\x1b[32m',
+    blue: '\x1b[34m',
+    yellow: '\x1b[33m',
+    red: '\x1b[31m',
+};
+
+function log(msg, color = 'reset') {
+    console.log(`${COLORS[color]}${msg}${COLORS.reset}`);
+}
+
+function error(msg) {
+    console.error(`${COLORS.red}Error: ${msg}${COLORS.reset}`);
+    process.exit(1);
+}
+
+const USAGE = `
+PlusUI Builder - Multi-platform build tool
+
+Usage:
+  plusui-builder                    Build for current platform
+  plusui-builder <platform>         Build for specific platform
+  plusui-builder all                Build for all platforms
+    plusui-builder generate           Generate connection bindings only
+
+Platforms:
+  win32        - Windows (x64)
+  macos        - macOS (x64, arm64)
+  linux        - Linux (x64)
+  android      - Android (arm64-v8a, armeabi-v7a, x86, x86_64)
+  ios          - iOS (simulator, device)
+
+Options:
+  -h, --help     Show this help
+  -v, --version  Show version
+`;
+
+const PLATFORMS = {
+    win32: { name: 'Windows', folder: 'Windows', ext: '.exe', arch: ['x64'] },
+    macos: { name: 'macOS', folder: 'MacOS', ext: '', arch: ['x64', 'arm64'] },
+    linux: { name: 'Linux', folder: 'Linux', ext: '', arch: ['x64'] },
+    android: { name: 'Android', folder: 'Android', ext: '.so', arch: ['arm64-v8a', 'armeabi-v7a', 'x86', 'x86_64'] },
+    ios: { name: 'iOS', folder: 'iOS', ext: '.app', arch: ['simulator', 'device'] },
+};
+
+function resolveBindgenScriptPath() {
+    const candidates = [
+        join(__dirname, '..', '..', 'plusui-connect', 'src', 'connect.js'),
+        join(__dirname, '..', '..', 'plusui-connect', 'src', 'index.js'),
+        join(__dirname, '..', '..', 'plusui-native-connect', 'src', 'index.js'),
+        join(__dirname, '..', '..', 'plusui-native-bindgen', 'src', 'index.js'),
+            join(process.cwd(), 'node_modules', 'plusui-native-connect', 'src', 'connect.js'),
+            join(__dirname, '..', '..', 'plusui-native-connect', 'src', 'connect.js'),
+        join(process.cwd(), 'node_modules', 'plusui-native-connect', 'src', 'index.js'),
+        join(process.cwd(), 'node_modules', 'plusui-native-bindgen', 'src', 'index.js'),
+    ];
+
+    for (const candidate of candidates) {
+        if (existsSync(candidate)) {
+            return candidate;
+        }
+    }
+
+    return null;
+}
+
+function syncGeneratedTsBindings(backendOutputDir, frontendOutputDir) {
+    const tsSource = join(backendOutputDir, 'bindings.gen.ts');
+    if (!existsSync(tsSource)) {
+        return;
+    }
+
+    mkdirSync(frontendOutputDir, { recursive: true });
+    copyFileSync(tsSource, join(frontendOutputDir, 'bindings.gen.ts'));
+}
+
+function runCommand(cmd, options = {}) {
+    const { cwd = process.cwd(), env = process.env, fatal = true } = options;
+    try {
+        execSync(cmd, { cwd, env, stdio: 'inherit' });
+        return true;
+    } catch (e) {
+        if (fatal) error(`Command failed: ${cmd}`);
+        return false;
+    }
+}
+
+function generateBindings() {
+    log('Generating connection bindings...', 'blue');
+    const bindgenPath = resolveBindgenScriptPath();
+
+    if (!bindgenPath) {
+        error('plusui-connect tool not found. Please ensure plusui-native-connect is installed.');
+    }
+
+    const projectRoot = '.';
+    // Output goes to Connections/ at project root
+    const outputDir = './Connections';
+    runCommand(`node ${bindgenPath} ${projectRoot} ${outputDir}`);
+    log('Connection bindings generated ✓', 'green');
+}
+
+function getCMakePlatformArgs(platform) {
+    const args = [];
+    
+    switch (platform) {
+        case 'win32':
+            break;
+        case 'macos':
+            args.push('-G', 'Xcode');
+            break;
+        case 'linux':
+            args.push('-G', 'Ninja');
+            break;
+        case 'android':
+            const sdkRoot = process.env.ANDROID_SDK_ROOT || process.env.ANDROID_HOME;
+            if (!sdkRoot) {
+                error('ANDROID_SDK_ROOT or ANDROID_HOME not set');
+            }
+            args.push('-G', 'Ninja');
+            args.push('-DCMAKE_TOOLCHAIN_FILE=' + join(sdkRoot, 'build-tools', 'cmake', 'android.toolchain.cmake'));
+            args.push('-DANDROID_NATIVE_API_LEVEL=24');
+            break;
+        case 'ios':
+            args.push('-G', 'Xcode');
+            args.push('-DCMAKE_SYSTEM_NAME=iOS');
+            break;
+    }
+    
+    return args;
+}
+
+function findCMakeLists() {
+    const root = process.cwd();
+    if (existsSync(join(root, 'CMakeLists.txt'))) {
+        return root;
+    }
+    const subdirs = ['.', 'src', 'app', 'core'];
+    for (const dir of subdirs) {
+        const path = join(root, dir, 'CMakeLists.txt');
+        if (existsSync(path)) {
+            return join(root, dir);
+        }
+    }
+    error('CMakeLists.txt not found. Run from a PlusUI project directory.');
+}
+
+function buildPlatform(platform, arch = null) {
+    const cfg = PLATFORMS[platform];
+    if (!cfg) {
+        error(`Unknown platform: ${platform}`);
+    }
+    
+    const sourceDir = findCMakeLists();
+    const archs = arch ? [arch] : cfg.arch;
+    
+    for (const targetArch of archs) {
+        log(`Building ${cfg.name} (${targetArch})...`, 'blue');
+        
+        const desktopSingleArch = ['win32', 'linux'].includes(platform) || (platform === 'macos' && archs.length === 1);
+        const buildDir = desktopSingleArch
+            ? join(sourceDir, 'build', cfg.folder)
+            : join(sourceDir, 'build', cfg.folder, targetArch);
+        mkdirSync(buildDir, { recursive: true });
+        
+        const cmakeArgs = ['-S' + sourceDir, `-B${buildDir}`, '-DCMAKE_BUILD_TYPE=Release'];
+        cmakeArgs.push(...getCMakePlatformArgs(platform));
+        
+        if (platform === 'android') {
+            cmakeArgs.push(`-DANDROID_ABI=${targetArch}`);
+        }
+        
+        const cmakeCmd = 'cmake ' + cmakeArgs.join(' ');
+        runCommand(cmakeCmd);
+        runCommand(`cmake --build ${buildDir} --config Release`);
+        
+        log(`Built ${cfg.name} (${targetArch}) ✓`, 'green');
+    }
+}
+
+function buildCurrentPlatform() {
+    const platform = process.platform;
+    const platformMap = { 'win32': 'win32', 'darwin': 'macos', 'linux': 'linux' };
+    const targetPlatform = platformMap[platform];
+    
+    if (targetPlatform) {
+        buildPlatform(targetPlatform);
+    } else {
+        error(`Unsupported platform: ${platform}`);
+    }
+}
+
+function buildAll() {
+    generateBindings();
+    
+    for (const platform of Object.keys(PLATFORMS)) {
+        log(`\n=== Building for ${PLATFORMS[platform].name} ===`, 'yellow');
+        buildPlatform(platform);
+    }
+    
+    log('\n✓ All builds complete!', 'green');
+}
+
+function main() {
+    const args = process.argv.slice(2);
+    const cmd = args[0];
+    
+    switch (cmd) {
+        case 'generate':
+        case 'gen':
+            generateBindings();
+            break;
+        case 'all':
+            buildAll();
+            break;
+        case 'win32':
+        case 'windows':
+            generateBindings();
+            buildPlatform('win32');
+            break;
+        case 'macos':
+            generateBindings();
+            buildPlatform('macos');
+            break;
+        case 'linux':
+            generateBindings();
+            buildPlatform('linux');
+            break;
+        case 'android':
+            generateBindings();
+            buildPlatform('android');
+            break;
+        case 'ios':
+            generateBindings();
+            buildPlatform('ios');
+            break;
+        case '-h':
+        case '--help':
+            console.log(USAGE);
+            break;
+        case '-v':
+        case '--version':
+            console.log('plusui-builder v0.1.0');
+            break;
+        default:
+            generateBindings();
+            buildCurrentPlatform();
+    }
+}
+
+main();