onejs-core 2.0.19 → 2.0.21

package/definitions/augments.d.ts

@@ -26,6 +26,7 @@ declare global {
     }
 
     const document: DocumentWrapper
+    const onejsDocument: DocumentWrapper
     const setTimeout: (callback: () => void, delay?: number) => number
     const clearTimeout: (id: number) => void
     const setInterval: (callback: () => void, delay?: number) => number

package/dist/index.js

@@ -33,9 +33,12 @@ export function h(type, props, ...children) {
     return element;
 }
 export { emo } from "./styling/index";
-// @ts-ignore
-if (typeof ___document != "undefined") {
+if (typeof globalThis.___document != "undefined") {
     // @ts-ignore
-    globalThis.document = new DocumentWrapper(___document);
+    globalThis.onejsDocument = new DocumentWrapper(globalThis.___document);
+    if (!globalThis.ONEJS_WEBGL) {
+        // @ts-ignore
+        globalThis.document = globalThis.onejsDocument;
+    }
 }
 // puer.$extension(CS.UnityEngine.UIElements.VisualElement, CS.UnityEngine.UIElements.VisualElementExtensions)

package/dist/utils/color-parser.d.ts

@@ -1,5 +1,5 @@
 type float4 = CS.Unity.Mathematics.float4;
-declare var kCSSColorTable: {
+declare const kCSSColorTable: {
     transparent: number[];
     aliceblue: number[];
     antiquewhite: number[];

package/dist/utils/color-parser.js

@@ -27,7 +27,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 IN THE SOFTWARE.
 */
-var kCSSColorTable = {
+const kCSSColorTable = {
     "transparent": [0, 0, 0, 0], "aliceblue": [240, 248, 255, 1],
     "antiquewhite": [250, 235, 215, 1], "aqua": [0, 255, 255, 1],
     "aquamarine": [127, 255, 212, 1], "azure": [240, 255, 255, 1],

package/index.ts

@@ -1,6 +1,6 @@
 /// <reference path="./definitions/index.d.ts" />
-import { DocumentWrapper } from "./dom/document";
-import { DomWrapper } from "./dom/dom";
+import { DocumentWrapper } from "./dom/document"
+import { DomWrapper } from "./dom/dom"
 
 /**
  * OneJS's own h function. Use this to quickly create elements in jsx-like syntax
@@ -10,29 +10,29 @@ import { DomWrapper } from "./dom/dom";
  * @returns
  */
 export function h(type: any, props: any, ...children: any[]): any {
-    const element = typeof type === "string" ? document.createElement(type) : type;
+    const element = typeof type === "string" ? document.createElement(type) : type
 
     // Assign properties to the element
     for (const [key, value] of Object.entries(props || {})) {
         if (key.startsWith("on") && typeof value === "function") {
-            element.addEventListener(key.substring(2).toLowerCase(), value);
+            element.addEventListener(key.substring(2).toLowerCase(), value)
         } else if (key === "style" && typeof value === "object") {
-            Object.assign(element.style, value);
+            Object.assign(element.style, value)
         } else {
-            element.setAttribute(key, value);
+            element.setAttribute(key, value)
         }
     }
 
     // Append children
     for (const child of children) {
         if (typeof child === "string") {
-            element.appendChild(document.createTextNode(child));
+            element.appendChild(document.createTextNode(child))
         } else {
-            element.appendChild(child);
+            element.appendChild(child)
         }
     }
 
-    return element;
+    return element
 }
 
 export { emo } from "./styling/index"
@@ -46,10 +46,13 @@ declare global {
     const toJsArray: <T>(csArr: CS.System.Array) => T[]
 }
 
-// @ts-ignore
-if (typeof ___document != "undefined") {
+if (typeof globalThis.___document != "undefined") {
     // @ts-ignore
-    globalThis.document = new DocumentWrapper(___document)
+    globalThis.onejsDocument = new DocumentWrapper(globalThis.___document)
+    if (!globalThis.ONEJS_WEBGL) {
+        // @ts-ignore
+        globalThis.document = globalThis.onejsDocument
+    }
 }
 
 // puer.$extension(CS.UnityEngine.UIElements.VisualElement, CS.UnityEngine.UIElements.VisualElementExtensions)

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": "2.0.19",
+    "version": "2.0.21",
     "repository": {
         "type": "git",
         "url": "https://github.com/Singtaa/onejs-core"

package/scripts/switch.cjs

@@ -13,9 +13,9 @@ 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.2.1/PuerTS_Quickjs_2.2.1.tgz" },
-    { name: "V8", tgzUrl: "https://github.com/Tencent/puerts/releases/download/Unity_v2.2.1/PuerTS_V8_2.2.1.tgz" },
-    { name: "NodeJS", tgzUrl: "https://github.com/Tencent/puerts/releases/download/Unity_v2.2.1/PuerTS_Nodejs_2.2.1.tgz" }
+    { name: "QuickJS", tgzUrl: "https://github.com/Tencent/puerts/releases/download/Unity_v2.2.2/PuerTS_Quickjs_2.2.2.tgz" },
+    { name: "V8", tgzUrl: "https://github.com/Tencent/puerts/releases/download/Unity_v2.2.2/PuerTS_V8_2.2.2.tgz" },
+    { name: "NodeJS", tgzUrl: "https://github.com/Tencent/puerts/releases/download/Unity_v2.2.2/PuerTS_Nodejs_2.2.2.tgz" }
 ]
 
 const args = process.argv.slice(2)
@@ -33,16 +33,16 @@ if (args.length > 0 && args[0].toLowerCase() == "clear") {
 } else if (
     args.length > 0 &&
     (["quickjs", "v8", "nodejs"].includes(args[0].toLowerCase()) ||
-     (args[0].toLowerCase().endsWith('.tgz') || /^https?:\/\/.+\.tgz$/i.test(args[0])))
+        (args[0].toLowerCase().endsWith('.tgz') || /^https?:\/\/.+\.tgz$/i.test(args[0])))
 ) {
-    let backend;
-    const outputDir = "./tmp";
+    let backend
+    const outputDir = "./tmp"
     if (["quickjs", "v8", "nodejs"].includes(args[0].toLowerCase())) {
-        backend = backends.find(b => b.name.toLowerCase() === args[0]);
+        backend = backends.find(b => b.name.toLowerCase() === args[0])
     } else {
-        backend = { name: "Custom", tgzUrl: args[0] };
+        backend = { name: "Custom", tgzUrl: args[0] }
     }
-    Process(backend, outputDir);
+    Process(backend, outputDir)
 } else {
     console.log("Usage: npm run switch <quickjs|v8|nodejs|clear|tgz-url>\n")
     console.log("           quickjs: Switch to QuickJS backend")
@@ -64,7 +64,7 @@ async function Process(backend, outputDir) {
         }
         await extractTgz(downloadedPath, outputDir)
 
-        // Safe keep asmdef files
+        // Safe keep asmdef files, et al.
         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')
@@ -72,6 +72,9 @@ async function Process(backend, outputDir) {
         const d = path.join(upmDir, 'Runtime/com.tencent.puerts.core.asmdef')
         await fse.copy(a, b)
         await fse.copy(c, d)
+        const e = path.join(onejsDir, 'Puerts/Runtime/Src/Default/JsEnv.cs')
+        const f = path.join(upmDir, 'Runtime/Src/Default/JsEnv.cs')
+        await fse.copy(e, f)
 
         // Replace OneJS/Puerts with the new one
         const puertsDir = path.join(onejsDir, "Puerts")
@@ -95,130 +98,138 @@ async function Process(backend, outputDir) {
 // }
 
 async function getOneJSUnityDir() {
-    let oneJSPath = null;
+    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;
+        const manifestContent = fs.readFileSync(manifestPath, "utf8")
+        let manifestJson
+        try { manifestJson = JSON.parse(manifestContent) } catch {
+            console.error('Could not parse manifest.json at ' + manifestPath)
+            return null
+        }
+
+        const dependencies = manifestJson && manifestJson.dependencies
+        const oneJSKeys = ["com.dragonground.onejs", "com.singtaa.onejs"]
+
+        if (dependencies) {
+            for (const key of oneJSKeys) {
+                const packagePath = dependencies[key]
+                if (typeof packagePath === "string") {
+                    const v = packagePath.trim() // e.g., "file:PATH/TO/OneJS"
+                    if (v.startsWith("file:")) {
+                        oneJSPath = path.resolve(projectDir, v.substring(5)) // strip "file:"
+                        return oneJSPath
+                    }
+                }
             }
         }
     }
 
     // Step 2: If not found, parse OneJS.Runtime.csproj
     if (!oneJSPath) {
-        const csprojPath = path.join(projectDir, 'OneJS.Runtime.csproj');
+        const csprojPath = path.join(projectDir, 'OneJS.Runtime.csproj')
 
         if (fs.existsSync(csprojPath)) {
-            const csprojContent = fs.readFileSync(csprojPath, 'utf8');
-            const parser = new xml2js.Parser();
+            const csprojContent = fs.readFileSync(csprojPath, 'utf8')
+            const parser = new xml2js.Parser()
 
             try {
-                const result = await parser.parseStringPromise(csprojContent);
+                const result = await parser.parseStringPromise(csprojContent)
 
-                const project = result.Project;
-                const itemGroups = project.ItemGroup;
+                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;
+                                const includePath = compileItem.$.Include
 
                                 // Normalize path separators for cross-platform compatibility
-                                const normalizedIncludePath = includePath.replace(/\\/g, '/');
-                                const searchIndex = normalizedIncludePath.indexOf('OneJS/Runtime/Engine/ScriptEngine.cs');
+                                const normalizedIncludePath = includePath.replace(/\\/g, '/')
+                                const searchIndex = normalizedIncludePath.indexOf('OneJS/Runtime/Engine/ScriptEngine.cs')
 
                                 if (searchIndex !== -1) {
-                                    oneJSPath = normalizedIncludePath.substring(0, searchIndex + 'OneJS'.length);
-                                    oneJSPath = path.resolve(projectDir, oneJSPath);
-                                    return oneJSPath;
+                                    oneJSPath = normalizedIncludePath.substring(0, searchIndex + 'OneJS'.length)
+                                    oneJSPath = path.resolve(projectDir, oneJSPath)
+                                    return oneJSPath
                                 }
                             }
                         }
                     }
                 }
 
-                console.error('Could not find OneJS path in csproj file.');
-                return null;
+                console.error('Could not find OneJS path in csproj file.')
+                return null
             } catch (err) {
-                console.error('Error parsing csproj file:', err);
-                return null;
+                console.error('Error parsing csproj file:', err)
+                return null
             }
         } else {
-            console.error('OneJS.Runtime.csproj file does not exist.');
-            return null;
+            console.error('OneJS.Runtime.csproj file does not exist.')
+            return null
         }
     }
 
-    return oneJSPath;
+    return oneJSPath
 }
 
 function ensureDirectoryExistence(filePath) {
-    const dirname = path.dirname(filePath);
+    const dirname = path.dirname(filePath)
     if (fs.existsSync(dirname)) {
-        return true;
+        return true
     }
-    fs.mkdirSync(dirname, { recursive: true });
+    fs.mkdirSync(dirname, { recursive: true })
 }
 
 function getFilenameFromUrl(fileUrl) {
-    const parsedUrl = url.parse(fileUrl);
-    return path.basename(parsedUrl.pathname);
+    const parsedUrl = url.parse(fileUrl)
+    return path.basename(parsedUrl.pathname)
 }
 
 async function downloadFile(fileUrl, outputDir) {
-    const filename = getFilenameFromUrl(fileUrl);
-    const outputLocationPath = path.join(outputDir, filename);
+    const filename = getFilenameFromUrl(fileUrl)
+    const outputLocationPath = path.join(outputDir, filename)
 
-    ensureDirectoryExistence(outputLocationPath);
+    ensureDirectoryExistence(outputLocationPath)
 
     // Check if file exists (keep existing code)
     if (fs.existsSync(outputLocationPath)) {
-        console.log(`Local .tgz found: ${outputLocationPath}`);
-        return outputLocationPath;
+        console.log(`Local .tgz found: ${outputLocationPath}`)
+        return outputLocationPath
     }
 
-    console.log(`Downloading ${filename}`);
-    const response = await fetch(fileUrl);
+    console.log(`Downloading ${filename}`)
+    const response = await fetch(fileUrl)
 
     if (!response.ok) {
-        throw new Error(`Failed to fetch ${fileUrl}: ${response.statusText}`);
+        throw new Error(`Failed to fetch ${fileUrl}: ${response.statusText}`)
     }
 
     // Get the total size for the progress bar
-    const totalSize = parseInt(response.headers.get('content-length'), 10);
-    
+    const totalSize = parseInt(response.headers.get('content-length'), 10)
+
     // Create progress bar
     const progressBar = new ProgressBar('[:bar] :percent ETA: :etas', {
         complete: '=',
         incomplete: ' ',
         width: 40,
         total: totalSize
-    });
+    })
 
-    const fileStream = fs.createWriteStream(outputLocationPath);
+    const fileStream = fs.createWriteStream(outputLocationPath)
     for await (const chunk of response.body) {
-        fileStream.write(chunk);
-        progressBar.tick(chunk.length);
+        fileStream.write(chunk)
+        progressBar.tick(chunk.length)
     }
 
-    fileStream.end();
+    fileStream.end()
 
     return new Promise((resolve, reject) => {
-        fileStream.on('close', () => resolve(outputLocationPath));
-        fileStream.on('error', reject);
-    });
+        fileStream.on('close', () => resolve(outputLocationPath))
+        fileStream.on('error', reject)
+    })
 }
 
 async function extractTgz(filePath, outputDir) {
@@ -226,47 +237,47 @@ async function extractTgz(filePath, outputDir) {
         file: filePath,
         cwd: outputDir,
     })
-    console.log(`Extraction completed.`);
+    console.log(`Extraction completed.`)
 }
 
 
 
 async function checkFileInUse(file) {
     try {
-        const handle = await fsp.open(file, 'r+');
-        await handle.close();
+        const handle = await fsp.open(file, 'r+')
+        await handle.close()
     } catch (err) {
         if (err.code === 'EBUSY' || err.code === 'EPERM' || err.code === 'EACCES') {
-            console.error('File is in use by another program or access is denied:', err);
-            return false;
+            console.error('File is in use by another program or access is denied:', err)
+            return false
         } else {
-            console.error('Cannot access file:', err);
-            return false;
+            console.error('Cannot access file:', err)
+            return false
         }
     }
-    return true;
+    return true
 }
 
 async function checkAllDeletable(currentPath) {
     try {
-        const stats = await fsp.stat(currentPath);
+        const stats = await fsp.stat(currentPath)
 
         if (stats.isDirectory()) {
-            const files = await fsp.readdir(currentPath);
+            const files = await fsp.readdir(currentPath)
 
             for (const file of files) {
-                const deletable = await checkAllDeletable(path.join(currentPath, file));
+                const deletable = await checkAllDeletable(path.join(currentPath, file))
                 if (!deletable) {
-                    return false;
+                    return false
                 }
             }
-            return true;
+            return true
         } else {
-            return await checkFileInUse(currentPath);
+            return await checkFileInUse(currentPath)
         }
     } catch (err) {
-        console.log(`Error accessing: ${currentPath}, ${err}`);
-        return false;
+        console.log(`Error accessing: ${currentPath}, ${err}`)
+        return false
     }
 }
 

package/utils/color-parser.ts

@@ -31,7 +31,7 @@ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 IN THE SOFTWARE.
 */
 
-var kCSSColorTable = {
+const kCSSColorTable = {
     "transparent": [0, 0, 0, 0], "aliceblue": [240, 248, 255, 1],
     "antiquewhite": [250, 235, 215, 1], "aqua": [0, 255, 255, 1],
     "aquamarine": [127, 255, 212, 1], "azure": [240, 255, 255, 1],