onejs-core 0.3.41 → 0.3.43

package/definitions/jsx.d.ts

@@ -78,6 +78,7 @@ declare global {
 
         interface IntrinsicAttributes {
             id?: string
+            key?: string | number
         }
 
         // interface VNode<P = {}> {

package/dist/dom/dom.d.ts

@@ -27,6 +27,7 @@ export declare class DomWrapper {
     dom: CS.OneJS.Dom.Dom;
     domStyleWrapper: DomStyleWrapper;
     cachedChildNodes: DomWrapper[] | null;
+    boundListeners: WeakMap<WeakKey, any>;
     constructor(dom: CS.OneJS.Dom.Dom);
     appendChild(child: DomWrapper): void;
     removeChild(child: DomWrapper): void;

package/dist/dom/dom.js

@@ -40,15 +40,20 @@ export class DomWrapper {
     dom;
     domStyleWrapper;
     cachedChildNodes = null;
+    boundListeners = new WeakMap();
     constructor(dom) {
         this.dom = dom;
         this.domStyleWrapper = new DomStyleWrapper(dom.style);
     }
     appendChild(child) {
+        if (!child)
+            return;
         this.dom.appendChild(child.dom);
         this.cachedChildNodes = null;
     }
     removeChild(child) {
+        if (!child)
+            return;
         this.dom.removeChild(child.dom);
         this.cachedChildNodes = null;
     }
@@ -57,6 +62,8 @@ export class DomWrapper {
         this.cachedChildNodes = null;
     }
     contains(child) {
+        if (!child)
+            return false;
         return this.dom.contains(child._dom);
     }
     clearChildren() {
@@ -67,12 +74,19 @@ export class DomWrapper {
         this.dom.focus();
     }
     addEventListener(type, listener, useCapture) {
-        // @ts-ignore
-        this.dom.addEventListener(type, listener.bind(this), useCapture ? true : false);
+        let boundListener = this.boundListeners.get(listener);
+        if (!boundListener) {
+            boundListener = listener.bind(this);
+            this.boundListeners.set(listener, boundListener);
+        }
+        this.dom.addEventListener(type, boundListener, useCapture ? true : false);
     }
     removeEventListener(type, listener, useCapture) {
-        // @ts-ignore
-        this.dom.removeEventListener(type, listener.bind(this), useCapture ? true : false);
+        const boundListener = this.boundListeners.get(listener);
+        if (boundListener) {
+            this.dom.removeEventListener(type, boundListener, useCapture ? true : false);
+            this.boundListeners.delete(listener); // isn't strictly necessary for WeakMap, but still good practice
+        }
     }
     setAttribute(name, value) {
         this.dom.setAttribute(name, value);

package/dom/dom.ts

@@ -45,6 +45,7 @@ export class DomWrapper {
     domStyleWrapper: DomStyleWrapper
 
     cachedChildNodes: DomWrapper[] | null = null
+    boundListeners = new WeakMap();
 
     constructor(dom: CS.OneJS.Dom.Dom) {
         this.dom = dom
@@ -52,11 +53,13 @@ export class DomWrapper {
     }
 
     appendChild(child: DomWrapper) {
+        if (!child) return
         this.dom.appendChild(child.dom)
         this.cachedChildNodes = null
     }
 
     removeChild(child: DomWrapper) {
+        if (!child) return
         this.dom.removeChild(child.dom)
         this.cachedChildNodes = null
     }
@@ -67,6 +70,7 @@ export class DomWrapper {
     }
 
     contains(child: DomWrapper) {
+        if (!child) return false
         return this.dom.contains(child._dom)
     }
 
@@ -80,13 +84,20 @@ export class DomWrapper {
     }
 
     addEventListener(type: string, listener: (event: EventBase) => void, useCapture?: boolean) {
-        // @ts-ignore
-        this.dom.addEventListener(type, listener.bind(this), useCapture ? true : false)
+        let boundListener = this.boundListeners.get(listener);
+        if (!boundListener) {
+            boundListener = listener.bind(this);
+            this.boundListeners.set(listener, boundListener);
+        }
+        this.dom.addEventListener(type, boundListener, useCapture ? true : false)
     }
 
     removeEventListener(type: string, listener: (event: EventBase) => void, useCapture?: boolean) {
-        // @ts-ignore
-        this.dom.removeEventListener(type, listener.bind(this), useCapture ? true : false)
+        const boundListener = this.boundListeners.get(listener);
+        if (boundListener) {
+            this.dom.removeEventListener(type, boundListener, useCapture ? true : false)
+            this.boundListeners.delete(listener); // isn't strictly necessary for WeakMap, but still good practice
+        }
     }
 
     setAttribute(name: string, value: any) {

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.41",
+    "version": "0.3.43",
     "main": "./dist/index.js",
     "types": "./typings.d.ts",
     "dependencies": {
@@ -13,6 +13,7 @@
         "fs-extra": "^11.2.0",
         "postcss": "^8.4.38",
         "postcss-cli": "^11.0.0",
+        "progress": "^2.0.3",
         "rimraf": "^5.0.7",
         "tailwindcss": "^3.4.1",
         "tar": "^7.2.0",

package/scripts/switch.cjs

@@ -5,6 +5,7 @@ const path = require('path')
 const fse = require('fs-extra')
 const xml2js = require('xml2js')
 const { rimraf } = require('rimraf')
+const ProgressBar = require('progress')
 
 const fsp = fs.promises
 
@@ -172,7 +173,7 @@ async function downloadFile(fileUrl, outputDir) {
 
     ensureDirectoryExistence(outputLocationPath);
 
-    // Check if the file already exists
+    // Check if file exists (keep existing code)
     if (fs.existsSync(outputLocationPath)) {
         console.log(`Local .tgz found: ${outputLocationPath}`);
         return outputLocationPath;
@@ -185,15 +186,24 @@ async function downloadFile(fileUrl, outputDir) {
         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);
+    
+    // Create progress bar
+    const progressBar = new ProgressBar('[:bar] :percent ETA: :etas', {
+        complete: '=',
+        incomplete: ' ',
+        width: 40,
+        total: totalSize
+    });
+
     const fileStream = fs.createWriteStream(outputLocationPath);
     for await (const chunk of response.body) {
         fileStream.write(chunk);
+        progressBar.tick(chunk.length);
     }
 
     fileStream.end();
-    fileStream.on('finish', () => {
-        console.log(`Download completed: ${outputLocationPath}`);
-    });
 
     return new Promise((resolve, reject) => {
         fileStream.on('close', () => resolve(outputLocationPath));

package/scripts/uss-transform-plugin.cjs

@@ -12,7 +12,7 @@ module.exports = () => {
             root.walkRules((rule) => {
                 // Transform class selectors
                 rule.selectors = rule.selectors.map(selector =>
-                    "." + selector.slice(1).replace(/(\\\.|\\#|\\%|\\:|\\\/|\\\[|\\\]|\\\(|\\\)|\\2c)/g, match => {
+                    selector.replace(/(\\\.|\\#|\\%|\\:|\\\/|\\\[|\\\]|\\\(|\\\)|\\2c)/g, match => {
                         switch (match) {
                             case '\\.': return '_d_';
                             case '\\#': return '_n_';
@@ -39,12 +39,12 @@ module.exports = () => {
 
             // Handle hexadecimal colors with alpha value to RGBA conversion
             root.walkDecls(decl => {
-                decl.value = decl.value.replace(/: #([A-Fa-f0-9]{8})/g, (match, hex) => {
+                decl.value = decl.value.replace(/#([A-Fa-f0-9]{8})/g, (match, hex) => {
                     const r = parseInt(hex.slice(0, 2), 16);
                     const g = parseInt(hex.slice(2, 4), 16);
                     const b = parseInt(hex.slice(4, 6), 16);
                     const a = parseInt(hex.slice(6, 8), 16) / 255;
-                    return `: rgba(${r}, ${g}, ${b}, ${a})`;
+                    return `rgba(${r}, ${g}, ${b}, ${a})`;
                 });
             });