onejs-core 0.3.39 → 0.3.41

package/definitions/Assemblies/OneJS.Runtime.d.ts

@@ -235,6 +235,7 @@ declare namespace CS {
             public focus () : void
             public First ($predicate: System.Func$2<OneJS.Dom.Dom, boolean>) : OneJS.Dom.Dom
             public ProcessClassStr ($classStr: string, $dom: OneJS.Dom.Dom) : string
+            public constructor ($ve: UnityEngine.UIElements.VisualElement)
             public constructor ($ve: UnityEngine.UIElements.VisualElement, $document: OneJS.Dom.Document)
         }
         class ElementCreationOptions extends System.Object

package/definitions/augments.d.ts

@@ -1,3 +1,5 @@
+import { DocumentWrapper } from "../dom/document"
+
 declare global {
 
     // interface ElementCreationOptions {
@@ -23,7 +25,7 @@ declare global {
         style: CS.OneJS.Dom.DomStyle
     }
 
-    const document: Document
+    const document: DocumentWrapper
     const setTimeout: (callback: () => void, delay?: number) => number
     const clearTimeout: (id: number) => void
     const setInterval: (callback: () => void, delay?: number) => number

package/definitions/jsx.d.ts

@@ -338,6 +338,9 @@ declare global {
             "is-password-field"?: boolean
             "mask-char"?: string
             "is-read-only"?: boolean
+            "select-all-on-focus"?: boolean
+            "select-all-on-mouse-up"?: boolean
+            "vertical-scroller-visibility"?: ScrollerVisibility
         }
 
         interface TextField extends TextInputBaseField<string> {

package/dist/dom/document.d.ts

@@ -4,6 +4,7 @@ interface ElementCreationOptions {
 }
 export declare class DocumentWrapper {
     #private;
+    get _doc(): CS.OneJS.Dom.Document;
     get body(): DomWrapper;
     constructor(doc: CS.OneJS.Dom.Document);
     addRuntimeUSS(uss: string): void;

package/dist/dom/document.js

@@ -1,11 +1,13 @@
 import { DomWrapper } from "./dom";
 export class DocumentWrapper {
+    get _doc() { return this.#doc; }
     #doc;
     #body;
     get body() { return this.#body; }
     constructor(doc) {
         this.#doc = doc;
-        this.#body = new DomWrapper(doc.body);
+        if (doc.body)
+            this.#body = new DomWrapper(doc.body);
     }
     addRuntimeUSS(uss) {
         this.#doc.addRuntimeUSS(uss);

package/dist/dom/dom-style.d.ts

@@ -4,4 +4,5 @@ export declare class DomStyleWrapper implements CS.OneJS.Dom.DomStyle {
     setProperty(name: string, value: any): void;
 }
 export interface DomStyleWrapper extends CS.OneJS.Dom.DomStyle {
+    [key: string | symbol]: any;
 }

package/dist/dom/dom.d.ts

@@ -2,7 +2,6 @@
 import { EventBase } from "UnityEngine/UIElements";
 import { DomStyleWrapper } from "./dom-style";
 export declare class DomWrapper {
-    #private;
     get _dom(): CS.OneJS.Dom.Dom;
     get ve(): CS.UnityEngine.UIElements.VisualElement;
     get childNodes(): DomWrapper[];
@@ -21,6 +20,13 @@ export declare class DomWrapper {
     set data(value: any);
     get classname(): string;
     set classname(value: string);
+    /**
+     * Not using private fields because of issues with the `#private;` line
+     * generated by tsc
+     */
+    dom: CS.OneJS.Dom.Dom;
+    domStyleWrapper: DomStyleWrapper;
+    cachedChildNodes: DomWrapper[] | null;
     constructor(dom: CS.OneJS.Dom.Dom);
     appendChild(child: DomWrapper): void;
     removeChild(child: DomWrapper): void;

package/dist/dom/dom.js

@@ -1,79 +1,83 @@
 import { DomStyleWrapper } from "./dom-style";
 export class DomWrapper {
-    get _dom() { return this.#dom; }
-    get ve() { return this.#dom.ve; }
+    get _dom() { return this.dom; }
+    get ve() { return this.dom.ve; }
     get childNodes() {
-        if (this.#cachedChildNodes)
-            return this.#cachedChildNodes;
-        this.#cachedChildNodes = new Array(this.#dom.childNodes.Length);
-        var i = this.#dom.childNodes.Length;
+        if (this.cachedChildNodes)
+            return this.cachedChildNodes;
+        this.cachedChildNodes = new Array(this.dom.childNodes.Length);
+        var i = this.dom.childNodes.Length;
         while (i--) {
-            this.#cachedChildNodes[i] = new DomWrapper(this.#dom.childNodes.get_Item(i));
+            this.cachedChildNodes[i] = new DomWrapper(this.dom.childNodes.get_Item(i));
         }
-        return this.#cachedChildNodes;
+        return this.cachedChildNodes;
     }
     get firstChild() {
-        return this.#dom.firstChild ? new DomWrapper(this.#dom.firstChild) : null;
+        return this.dom.firstChild ? new DomWrapper(this.dom.firstChild) : null;
     }
     get parentNode() {
-        return this.#dom.parentNode ? new DomWrapper(this.#dom.parentNode) : null;
+        return this.dom.parentNode ? new DomWrapper(this.dom.parentNode) : null;
     }
     get nextSibling() {
-        return this.#dom.nextSibling ? new DomWrapper(this.#dom.nextSibling) : null;
+        return this.dom.nextSibling ? new DomWrapper(this.dom.nextSibling) : null;
     }
-    get nodeType() { return this.#dom.nodeType; }
-    get style() { return this.#domStyleWrapper; }
-    get Id() { return this.#dom.Id; }
-    set Id(value) { this.#dom.Id = value; }
-    get key() { return this.#dom.key; }
-    set key(value) { this.#dom.key = value; }
-    get value() { return this.#dom.value; }
-    get checked() { return this.#dom.checked; }
-    get data() { return this.#dom.data; }
-    set data(value) { this.#dom.data = value; }
-    get classname() { return this.#dom.classname; }
-    set classname(value) { this.#dom.classname = value; }
-    #dom;
-    #domStyleWrapper;
-    #cachedChildNodes = null;
+    get nodeType() { return this.dom.nodeType; }
+    get style() { return this.domStyleWrapper; }
+    get Id() { return this.dom.Id; }
+    set Id(value) { this.dom.Id = value; }
+    get key() { return this.dom.key; }
+    set key(value) { this.dom.key = value; }
+    get value() { return this.dom.value; }
+    get checked() { return this.dom.checked; }
+    get data() { return this.dom.data; }
+    set data(value) { this.dom.data = value; }
+    get classname() { return this.dom.classname; }
+    set classname(value) { this.dom.classname = value; }
+    /**
+     * Not using private fields because of issues with the `#private;` line
+     * generated by tsc
+     */
+    dom;
+    domStyleWrapper;
+    cachedChildNodes = null;
     constructor(dom) {
-        this.#dom = dom;
-        this.#domStyleWrapper = new DomStyleWrapper(dom.style);
+        this.dom = dom;
+        this.domStyleWrapper = new DomStyleWrapper(dom.style);
     }
     appendChild(child) {
-        this.#dom.appendChild(child.#dom);
-        this.#cachedChildNodes = null;
+        this.dom.appendChild(child.dom);
+        this.cachedChildNodes = null;
     }
     removeChild(child) {
-        this.#dom.removeChild(child.#dom);
-        this.#cachedChildNodes = null;
+        this.dom.removeChild(child.dom);
+        this.cachedChildNodes = null;
     }
     insertBefore(a, b) {
-        this.#dom.insertBefore(a?._dom, b?._dom);
-        this.#cachedChildNodes = null;
+        this.dom.insertBefore(a?._dom, b?._dom);
+        this.cachedChildNodes = null;
     }
     contains(child) {
-        return this.#dom.contains(child._dom);
+        return this.dom.contains(child._dom);
     }
     clearChildren() {
-        this.#dom.clearChildren();
-        this.#cachedChildNodes = null;
+        this.dom.clearChildren();
+        this.cachedChildNodes = null;
     }
     focus() {
-        this.#dom.focus();
+        this.dom.focus();
     }
     addEventListener(type, listener, useCapture) {
         // @ts-ignore
-        this.#dom.addEventListener(type, listener.bind(this), useCapture);
+        this.dom.addEventListener(type, listener.bind(this), useCapture ? true : false);
     }
     removeEventListener(type, listener, useCapture) {
         // @ts-ignore
-        this.#dom.removeEventListener(type, listener.bind(this), useCapture);
+        this.dom.removeEventListener(type, listener.bind(this), useCapture ? true : false);
     }
     setAttribute(name, value) {
-        this.#dom.setAttribute(name, value);
+        this.dom.setAttribute(name, value);
     }
     removeAttribute(name) {
-        this.#dom.removeAttribute(name);
+        this.dom.removeAttribute(name);
     }
 }

package/dist/index.js

@@ -33,4 +33,7 @@ export function h(type, props, ...children) {
 }
 export { emo } from "./styling/index";
 // @ts-ignore
-globalThis.document = new DocumentWrapper(___document);
+if (typeof ___document != "undefined") {
+    // @ts-ignore
+    globalThis.document = new DocumentWrapper(___document);
+}

package/dom/document.ts

@@ -5,6 +5,8 @@ interface ElementCreationOptions {
 }
 
 export class DocumentWrapper {
+    public get _doc(): CS.OneJS.Dom.Document { return this.#doc }
+
     #doc: CS.OneJS.Dom.Document;
     #body: DomWrapper;
 
@@ -12,7 +14,8 @@ export class DocumentWrapper {
 
     constructor(doc: CS.OneJS.Dom.Document) {
         this.#doc = doc
-        this.#body = new DomWrapper(doc.body)
+        if (doc.body)
+            this.#body = new DomWrapper(doc.body)
     }
 
     addRuntimeUSS(uss: string): void {
@@ -41,7 +44,7 @@ export class DocumentWrapper {
 
     querySelectorAll(selector: string): DomWrapper[] {
         let doms = this.#doc.querySelectorAll(selector)
-        let res = []
+        let res = [] as any[]
         for (let i = 0; i < doms.Length; i++) {
             res.push(new DomWrapper(doms.get_Item(i)))
         }

package/dom/dom-style.ts

@@ -22,4 +22,6 @@ export class DomStyleWrapper implements CS.OneJS.Dom.DomStyle {
     }
 }
 
-export interface DomStyleWrapper extends CS.OneJS.Dom.DomStyle { }
+export interface DomStyleWrapper extends CS.OneJS.Dom.DomStyle {
+    [key: string | symbol]: any;
+}

package/dom/dom.ts

@@ -2,94 +2,98 @@ import { EventBase } from "UnityEngine/UIElements";
 import { DomStyleWrapper } from "./dom-style"
 
 export class DomWrapper {
-    public get _dom(): CS.OneJS.Dom.Dom { return this.#dom }
-    public get ve(): CS.UnityEngine.UIElements.VisualElement { return this.#dom.ve }
+    public get _dom(): CS.OneJS.Dom.Dom { return this.dom }
+    public get ve(): CS.UnityEngine.UIElements.VisualElement { return this.dom.ve }
     public get childNodes(): DomWrapper[] {
-        if (this.#cachedChildNodes) return this.#cachedChildNodes
-        this.#cachedChildNodes = new Array(this.#dom.childNodes.Length) as DomWrapper[];
-        var i = this.#dom.childNodes.Length;
+        if (this.cachedChildNodes) return this.cachedChildNodes
+        this.cachedChildNodes = new Array(this.dom.childNodes.Length) as DomWrapper[];
+        var i = this.dom.childNodes.Length;
         while (i--) {
-            this.#cachedChildNodes[i] = new DomWrapper(this.#dom.childNodes.get_Item(i));
+            this.cachedChildNodes[i] = new DomWrapper(this.dom.childNodes.get_Item(i));
         }
-        return this.#cachedChildNodes
+        return this.cachedChildNodes
     }
     public get firstChild(): DomWrapper | null {
-        return this.#dom.firstChild ? new DomWrapper(this.#dom.firstChild) : null;
+        return this.dom.firstChild ? new DomWrapper(this.dom.firstChild) : null;
     }
     public get parentNode(): DomWrapper | null {
-        return this.#dom.parentNode ? new DomWrapper(this.#dom.parentNode) : null;
+        return this.dom.parentNode ? new DomWrapper(this.dom.parentNode) : null;
     }
     public get nextSibling(): DomWrapper | null {
-        return this.#dom.nextSibling ? new DomWrapper(this.#dom.nextSibling) : null;
+        return this.dom.nextSibling ? new DomWrapper(this.dom.nextSibling) : null;
     }
 
-    public get nodeType(): number { return this.#dom.nodeType }
-    public get style(): DomStyleWrapper { return this.#domStyleWrapper }
-    public get Id(): string { return this.#dom.Id }
-    public set Id(value: string) { this.#dom.Id = value }
-    public get key(): string { return this.#dom.key }
-    public set key(value: string) { this.#dom.key = value }
-    public get value(): any { return this.#dom.value }
-    public get checked(): boolean { return this.#dom.checked }
-    public get data(): any { return this.#dom.data }
-    public set data(value: any) { this.#dom.data = value }
-
-    public get classname(): string { return this.#dom.classname }
-    public set classname(value: string) { this.#dom.classname = value }
-
-    #dom: CS.OneJS.Dom.Dom
-    #domStyleWrapper: DomStyleWrapper
-
-    #cachedChildNodes: DomWrapper[] = null
+    public get nodeType(): number { return this.dom.nodeType }
+    public get style(): DomStyleWrapper { return this.domStyleWrapper }
+    public get Id(): string { return this.dom.Id }
+    public set Id(value: string) { this.dom.Id = value }
+    public get key(): string { return this.dom.key }
+    public set key(value: string) { this.dom.key = value }
+    public get value(): any { return this.dom.value }
+    public get checked(): boolean { return this.dom.checked }
+    public get data(): any { return this.dom.data }
+    public set data(value: any) { this.dom.data = value }
+
+    public get classname(): string { return this.dom.classname }
+    public set classname(value: string) { this.dom.classname = value }
+
+    /**
+     * Not using private fields because of issues with the `#private;` line
+     * generated by tsc
+     */
+    dom: CS.OneJS.Dom.Dom
+    domStyleWrapper: DomStyleWrapper
+
+    cachedChildNodes: DomWrapper[] | null = null
 
     constructor(dom: CS.OneJS.Dom.Dom) {
-        this.#dom = dom
-        this.#domStyleWrapper = new DomStyleWrapper(dom.style)
+        this.dom = dom
+        this.domStyleWrapper = new DomStyleWrapper(dom.style)
     }
 
     appendChild(child: DomWrapper) {
-        this.#dom.appendChild(child.#dom)
-        this.#cachedChildNodes = null
+        this.dom.appendChild(child.dom)
+        this.cachedChildNodes = null
     }
 
     removeChild(child: DomWrapper) {
-        this.#dom.removeChild(child.#dom)
-        this.#cachedChildNodes = null
+        this.dom.removeChild(child.dom)
+        this.cachedChildNodes = null
     }
 
     insertBefore(a: DomWrapper, b: DomWrapper) {
-        this.#dom.insertBefore(a?._dom, b?._dom)
-        this.#cachedChildNodes = null
+        this.dom.insertBefore(a?._dom, b?._dom)
+        this.cachedChildNodes = null
     }
 
     contains(child: DomWrapper) {
-        return this.#dom.contains(child._dom)
+        return this.dom.contains(child._dom)
     }
 
     clearChildren() {
-        this.#dom.clearChildren()
-        this.#cachedChildNodes = null
+        this.dom.clearChildren()
+        this.cachedChildNodes = null
     }
 
     focus() {
-        this.#dom.focus()
+        this.dom.focus()
     }
 
     addEventListener(type: string, listener: (event: EventBase) => void, useCapture?: boolean) {
         // @ts-ignore
-        this.#dom.addEventListener(type, listener.bind(this), useCapture)
+        this.dom.addEventListener(type, listener.bind(this), useCapture ? true : false)
     }
 
     removeEventListener(type: string, listener: (event: EventBase) => void, useCapture?: boolean) {
         // @ts-ignore
-        this.#dom.removeEventListener(type, listener.bind(this), useCapture)
+        this.dom.removeEventListener(type, listener.bind(this), useCapture ? true : false)
     }
 
     setAttribute(name: string, value: any) {
-        this.#dom.setAttribute(name, value)
+        this.dom.setAttribute(name, value)
     }
 
     removeAttribute(name: string) {
-        this.#dom.removeAttribute(name)
+        this.dom.removeAttribute(name)
     }
 }

package/index.ts

@@ -37,7 +37,7 @@ export function h(type: any, props: any, ...children: any[]): any {
 export { emo } from "./styling/index"
 
 declare global {
-    interface Document extends DocumentWrapper {}
+    interface Document extends DocumentWrapper { }
     interface Element extends DomWrapper {
         classname: string
         nodeType: number
@@ -46,4 +46,7 @@ declare global {
 }
 
 // @ts-ignore
-globalThis.document = new DocumentWrapper(___document)
+if (typeof ___document != "undefined") {
+    // @ts-ignore
+    globalThis.document = new DocumentWrapper(___document)
+}

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.39",
+    "version": "0.3.41",
     "main": "./dist/index.js",
     "types": "./typings.d.ts",
     "dependencies": {

package/scripts/esbuild/import-transform.mjs

@@ -2,42 +2,41 @@ import * as fs from "fs";
 import * as path from "path";
 
 export const importTransformPlugin = {
-	name: "onejs-import-transform",
-	setup(build) {
-		// First pass: Mark C# imports as external
-		build.onResolve({ filter: /^(Unity\/|UnityEngine|OneJS)/ }, (args) => {
-			return { path: args.path, external: true };
-		});
+    name: "onejs-import-transform",
+    setup(build) {
+        // First pass: Mark imports from modules starting with a capital letter as external
+        build.onResolve({ filter: /^[A-Z]/ }, (args) => {
+            return { path: args.path, external: true };
+        });
 
-		// Second pass: Transform all JS and TSX files
-		build.onLoad({ filter: /\.(js|jsx|ts|tsx)$/ }, async (args) => {
-			let contents = await fs.promises.readFile(args.path, "utf8");
+        // Second pass: Transform all JS and TSX files
+        build.onLoad({ filter: /\.(js|jsx|ts|tsx)$/ }, async (args) => {
+            let contents = await fs.promises.readFile(args.path, "utf8");
 
-			// Transform Unity imports
-			contents = contents.replace(
-				/import\s+(?:{([^}]+)})?\s*from\s*["'](Unity\/[^"']*|UnityEngine[^"']*|OneJS[^"']*)["'];?/g,
-				(match, imports, moduleName) => {
-					moduleName = moduleName.replace(/\//g, ".");
-					if (imports) {
-						const importItems = imports.split(",").map((item) => item.trim());
-						return `const { ${importItems.join(", ")} } = CS.${moduleName};`;
-					} else {
-						const namespaceName = moduleName.split(".").pop();
-						return `const ${namespaceName} = CS.${moduleName};`;
-					}
-				}
-			);
+            // Transform imports from modules starting with a capital letter
+            contents = contents.replace(
+                /import\s+(?:{([^}]+)})?\s*from\s*["']([A-Z][^"']*)["'];?/g,
+                (match, imports, moduleName) => {
+                    moduleName = moduleName.replace(/\//g, ".");
+                    if (imports) {
+                        const importItems = imports.split(",").map((item) => item.trim());
+                        return `const { ${importItems.join(", ")} } = CS.${moduleName};`;
+                    } else {
+                        const namespaceName = moduleName.split(".").pop();
+                        return `const ${namespaceName} = CS.${moduleName};`;
+                    }
+                }
+            );
 
-			// Transform any remaining require statements for Unity modules
-			contents = contents.replace(
-				/__require\(["'](Unity\/[^"']*|UnityEngine[^"']*|OneJS[^"']*)["']\)/g,
-				(match, moduleName) => {
-					return `CS.${moduleName.replace(/\//g, ".")}`;
-				}
-			);
+            // Transform any remaining require statements for such modules
+            contents = contents.replace(
+                /__require\(["']([A-Z][^"']*)["']\)/g,
+                (match, moduleName) => {
+                    return `CS.${moduleName.replace(/\//g, ".")}`;
+                }
+            );
 
-			return { contents, loader: path.extname(args.path).slice(1) };
-		});
-	},
+            return { contents, loader: path.extname(args.path).slice(1) };
+        });
+    },
 };
-