onejs-core 0.3.32 → 0.3.34

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "onejs-core",
     "description": "The JS part of OneJS, a UI framework and Scripting Engine for Unity.",
-    "version": "0.3.32",
+    "version": "0.3.34",
     "main": "./dist/index.js",
     "types": "./typings.d.ts",
     "dependencies": {
@@ -16,6 +16,7 @@
         "rimraf": "^5.0.7",
         "tailwindcss": "^3.4.1",
         "tar": "^7.2.0",
-        "tiny-glob": "^0.2.9"
+        "tiny-glob": "^0.2.9",
+        "xml2js": "^0.6.2"
     }
 }

package/scripts/switch.cjs

@@ -3,10 +3,14 @@ const tar = require('tar')
 const url = require('url')
 const path = require('path')
 const fse = require('fs-extra')
+const xml2js = require('xml2js')
 const { rimraf } = require('rimraf')
 
 const fsp = fs.promises
 
+const projectDir = path.resolve(process.cwd(), '..')
+const manifestPath = path.join(projectDir, 'Packages', 'manifest.json')
+
 const backends = [
     { name: "QuickJS", tgzUrl: "https://github.com/Tencent/puerts/releases/download/Unity_v2.1.0/PuerTS_Quickjs_2.1.0.tgz" },
     { name: "V8", tgzUrl: "https://github.com/Tencent/puerts/releases/download/Unity_v2.1.0/PuerTS_V8_2.1.0.tgz" },
@@ -50,7 +54,7 @@ async function Process(backend, outputDir) {
         await extractTgz(downloadedPath, outputDir)
 
         // Safe keep asmdef files
-        const onejsDir = getOneJSUnityDir()
+        const onejsDir = await getOneJSUnityDir()
         const a = path.join(onejsDir, 'Puerts/Editor/com.tencent.puerts.core.Editor.asmdef')
         const b = path.join(upmDir, 'Editor/com.tencent.puerts.core.Editor.asmdef')
         const c = path.join(onejsDir, 'Puerts/Runtime/com.tencent.puerts.core.asmdef')
@@ -73,10 +77,80 @@ async function Process(backend, outputDir) {
 
 // --- Support Functions ---
 
-function getOneJSUnityDir() {
-    var packageJsonPath = path.join(process.cwd(), 'package.json')
-    var json = require(packageJsonPath)
-    return json.onejs["unity-package-path"]
+// function getOneJSUnityDir() {
+//     var packageJsonPath = path.join(process.cwd(), 'package.json')
+//     var json = require(packageJsonPath)
+//     return json.onejs["unity-package-path"]
+// }
+
+async function getOneJSUnityDir() {
+    let oneJSPath = null;
+
+    // Step 1: Check manifest.json
+    if (fs.existsSync(manifestPath)) {
+        const manifestContent = fs.readFileSync(manifestPath, 'utf8');
+        const manifestJson = JSON.parse(manifestContent);
+
+        const dependencies = manifestJson.dependencies;
+        const oneJSKey = 'com.dragonground.onejs';
+
+        if (dependencies && dependencies[oneJSKey]) {
+            const packagePath = dependencies[oneJSKey]; // e.g., "file:PATH/TO/OneJS"
+            if (packagePath.startsWith('file:')) {
+                oneJSPath = packagePath.substring(5); // Remove "file:" prefix
+                oneJSPath = path.resolve(projectDir, oneJSPath);
+                return oneJSPath;
+            }
+        }
+    }
+
+    // Step 2: If not found, parse OneJS.Runtime.csproj
+    if (!oneJSPath) {
+        const csprojPath = path.join(projectDir, 'OneJS.Runtime.csproj');
+
+        if (fs.existsSync(csprojPath)) {
+            const csprojContent = fs.readFileSync(csprojPath, 'utf8');
+            const parser = new xml2js.Parser();
+
+            try {
+                const result = await parser.parseStringPromise(csprojContent);
+
+                const project = result.Project;
+                const itemGroups = project.ItemGroup;
+
+                if (itemGroups && itemGroups.length > 0) {
+                    for (const itemGroup of itemGroups) {
+                        if (itemGroup.Compile) {
+                            for (const compileItem of itemGroup.Compile) {
+                                const includePath = compileItem.$.Include;
+
+                                // Normalize path separators for cross-platform compatibility
+                                const normalizedIncludePath = includePath.replace(/\\/g, '/');
+                                const searchIndex = normalizedIncludePath.indexOf('Assets/OneJS');
+
+                                if (searchIndex !== -1) {
+                                    oneJSPath = normalizedIncludePath.substring(0, searchIndex + 'Assets/OneJS'.length);
+                                    oneJSPath = path.resolve(projectDir, oneJSPath);
+                                    return oneJSPath;
+                                }
+                            }
+                        }
+                    }
+                }
+
+                console.error('Could not find OneJS path in csproj file.');
+                return null;
+            } catch (err) {
+                console.error('Error parsing csproj file:', err);
+                return null;
+            }
+        } else {
+            console.error('OneJS.Runtime.csproj file does not exist.');
+            return null;
+        }
+    }
+
+    return oneJSPath;
 }
 
 function ensureDirectoryExistence(filePath) {