plusui-native-builder 0.1.5 → 0.1.7

package/package.json

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

package/src/index.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 import { execSync, spawn } from 'child_process';
-import { existsSync, mkdirSync } from 'fs';
+import { existsSync, mkdirSync, copyFileSync } from 'fs';
 import { join, dirname } from 'path';
 import { fileURLToPath } from 'url';
 
@@ -48,13 +48,39 @@ Options:
 `;
 
 const PLATFORMS = {
-    win32: { name: 'Windows', ext: '.exe', arch: ['x64'] },
-    macos: { name: 'macOS', ext: '', arch: ['x64', 'arm64'] },
-    linux: { name: 'Linux', ext: '', arch: ['x64'] },
-    android: { name: 'Android', ext: '.so', arch: ['arm64-v8a', 'armeabi-v7a', 'x86', 'x86_64'] },
-    ios: { name: 'iOS', ext: '.app', arch: ['simulator', 'device'] },
+    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-bindgen', 'src', 'index.js'),
+        join(__dirname, '..', '..', 'plusui-native-bindgen', '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 {
@@ -68,17 +94,16 @@ function runCommand(cmd, options = {}) {
 
 function generateBindings() {
     log('Generating bindings...', 'blue');
-    let bindgenPath = join(__dirname, '..', '..', 'plusui-bindgen', 'src', 'index.js');
-    if (!existsSync(bindgenPath)) {
-        // Try installed location (node_modules/plusui-native-bindgen)
-        bindgenPath = join(__dirname, '..', '..', 'plusui-native-bindgen', 'src', 'index.js');
-    }
-    
-    if (!existsSync(bindgenPath)) {
+    const bindgenPath = resolveBindgenScriptPath();
+
+    if (!bindgenPath) {
         error('plusui-bindgen not found. Please ensure plusui-native-bindgen is installed.');
     }
-    
-    runCommand(`node ${bindgenPath} ./src/services ./src`);
+
+    const featuresDir = './src/features';
+    const outputDir = './src/Bindings_Generated';
+    runCommand(`node ${bindgenPath} ${featuresDir} ${outputDir}`);
+    syncGeneratedTsBindings('./src/Bindings_Generated', './frontend/src/Bindings_Generated');
     log('Bindings generated ✓', 'green');
 }
 
@@ -139,7 +164,10 @@ function buildPlatform(platform, arch = null) {
     for (const targetArch of archs) {
         log(`Building ${cfg.name} (${targetArch})...`, 'blue');
         
-        const buildDir = join(sourceDir, 'build', platform, targetArch);
+        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'];