onejs-core 1.0.12 → 1.0.14

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

@@ -14,13 +14,6 @@ declare namespace CS {
     // }
     // interface $Task<T> {}
     namespace OneJS {
-        class WebApi extends System.Object
-        {
-            protected [__keep_incompatibility]: never;
-            public static getText ($uri: string, $callback: System.Action$1<string>) : UnityEngine.Coroutine
-            public static getImage ($uri: string, $callback: System.Action$1<UnityEngine.Texture2D>) : UnityEngine.Coroutine
-            public constructor ()
-        }
         class EventfulPropertyAttribute extends System.Attribute implements System.Runtime.InteropServices._Attribute
         {
             protected [__keep_incompatibility]: never;
@@ -57,7 +50,7 @@ declare namespace CS {
             public textAsset : UnityEngine.TextAsset
             public constructor ()
         }
-        class DTSGenerator extends UnityEngine.MonoBehaviour
+        class DTSGenerator extends System.Object
         {
             protected [__keep_incompatibility]: never;
             public assemblies : System.Array$1<string>
@@ -72,17 +65,21 @@ declare namespace CS {
             public includeGlobalObjects : boolean
             public constructor ()
         }
-        class EngineHost extends System.Object implements System.IDisposable
+        interface IEngineHost {
+            add_onReload ($value: System.Action) : void
+            remove_onReload ($value: System.Action) : void
+            add_onDispose ($value: System.Action) : void
+            remove_onDispose ($value: System.Action) : void
+        }
+        class EngineHost extends System.Object implements System.IDisposable, IEngineHost
         {
             protected [__keep_incompatibility]: never;
-            public add_onReload ($value: OneJS.EngineHost.ActionCallback) : void
-            public remove_onReload ($value: OneJS.EngineHost.ActionCallback) : void
-            public add_onDestroy ($value: OneJS.EngineHost.ActionCallback) : void
-            public remove_onDestroy ($value: OneJS.EngineHost.ActionCallback) : void
+            public add_onReload ($value: System.Action) : void
+            public remove_onReload ($value: System.Action) : void
+            public add_onDispose ($value: System.Action) : void
+            public remove_onDispose ($value: System.Action) : void
             public subscribe ($eventSource: any, $eventName: string, $handler: Function) : System.Action
             public subscribe ($eventName: string, $handler: Function) : System.Action
-            public InvokeOnReload () : void
-            public InvokeOnDestroy () : void
             public Dispose () : void
             public constructor ($engine: OneJS.ScriptEngine)
         }
@@ -94,16 +91,22 @@ declare namespace CS {
             public preloads : System.Array$1<UnityEngine.TextAsset>
             public globalObjects : System.Array$1<OneJS.ObjectMappingPair>
             public styleSheets : System.Array$1<UnityEngine.UIElements.StyleSheet>
+            public dtsGenerator : OneJS.DTSGenerator
             public get Tick(): number;
             public get WorkingDir(): string;
             public get JsEnv(): Puerts.JsEnv;
+            public get AddToGlobal(): System.Action$2<string, any>;
+            public add_OnPreInit ($value: System.Action$1<Puerts.JsEnv>) : void
+            public remove_OnPreInit ($value: System.Action$1<Puerts.JsEnv>) : void
+            public add_OnPostInit ($value: System.Action$1<Puerts.JsEnv>) : void
+            public remove_OnPostInit ($value: System.Action$1<Puerts.JsEnv>) : void
             public add_OnReload ($value: System.Action) : void
             public remove_OnReload ($value: System.Action) : void
             public GetFullPath ($filepath: string) : string
             public Shutdown () : void
             public Reload () : void
             public EvalFile ($filepath: string) : void
-            public Eval ($code: string) : void
+            public Eval ($code: string, $chunkName?: string) : void
             public GenerateGlobalsDefinitions () : void
             public constructor ()
         }
@@ -142,6 +145,20 @@ declare namespace CS {
             public ClearLog () : void
             public constructor ()
         }
+        class StaticCoroutine extends System.Object
+        {
+            protected [__keep_incompatibility]: never;
+            public static Start ($coroutine: System.Collections.IEnumerator) : UnityEngine.Coroutine
+            public static Stop ($coroutine: UnityEngine.Coroutine) : void
+            public constructor ()
+        }
+        class WebApi extends System.Object
+        {
+            protected [__keep_incompatibility]: never;
+            public getText ($uri: string, $callback: System.Action$1<string>) : UnityEngine.Coroutine
+            public getImage ($url: string, $callback: System.Action$1<UnityEngine.Texture2D>) : UnityEngine.Coroutine
+            public constructor ()
+        }
         class Runner extends UnityEngine.MonoBehaviour
         {
             protected [__keep_incompatibility]: never;
@@ -154,6 +171,7 @@ declare namespace CS {
             public respawnJanitorOnSceneLoad : boolean
             public stopCleaningOnDisable : boolean
             public standalone : boolean
+            public Reload () : void
             public constructor ()
         }
         class ScreenMonitor extends UnityEngine.MonoBehaviour
@@ -203,7 +221,7 @@ declare namespace CS {
         class Dom extends System.Object
         {
             protected [__keep_incompatibility]: never;
-            public get document(): OneJS.Dom.Document;
+            public get document(): OneJS.Dom.IDocument;
             public get ve(): UnityEngine.UIElements.VisualElement;
             public get childNodes(): System.Array$1<OneJS.Dom.Dom>;
             public get firstChild(): OneJS.Dom.Dom;
@@ -235,16 +253,15 @@ declare namespace CS {
             public removeEventListener ($name: string, $callback: UnityEngine.UIElements.EventCallback$1<UnityEngine.UIElements.EventBase>, $useCapture?: boolean) : void
             public appendChild ($node: OneJS.Dom.Dom) : void
             public removeChild ($child: OneJS.Dom.Dom) : void
-            public contains ($child: OneJS.Dom.Dom) : boolean
             public insertBefore ($a: OneJS.Dom.Dom, $b: OneJS.Dom.Dom) : void
             public insertAfter ($a: OneJS.Dom.Dom, $b: OneJS.Dom.Dom) : void
             public setAttribute ($name: string, $val: any) : void
             public removeAttribute ($name: string) : void
+            public contains ($child: OneJS.Dom.Dom) : boolean
             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)
+            public constructor ($ve: UnityEngine.UIElements.VisualElement, $document: OneJS.Dom.IDocument)
         }
         class ElementCreationOptions extends System.Object
         {
@@ -252,14 +269,12 @@ declare namespace CS {
             public is : string
             public constructor ()
         }
-        class Document extends System.Object
+        class Document extends System.Object implements OneJS.Dom.IDocument
         {
             protected [__keep_incompatibility]: never;
             public get scriptEngine(): OneJS.ScriptEngine;
             public get Root(): UnityEngine.UIElements.VisualElement;
             public get body(): OneJS.Dom.Dom;
-            public get UIElementEventTypesDict(): System.Collections.Generic.Dictionary$2<string, System.Type>;
-            public FindUIElementEventType ($name: string) : System.Type
             public addRuntimeUSS ($uss: string) : void
             public removeRuntimeStyleSheet ($sheet: UnityEngine.UIElements.StyleSheet) : void
             public clearRuntimeStyleSheets () : void
@@ -270,6 +285,8 @@ declare namespace CS {
             public getElementById ($id: string) : OneJS.Dom.Dom
             public querySelectorAll ($selector: string) : System.Array$1<OneJS.Dom.Dom>
             public getDomFromVE ($ve: UnityEngine.UIElements.VisualElement) : OneJS.Dom.Dom
+            public clearCache () : void
+            public loadRemoteImage ($url: string, $callback: System.Action$1<UnityEngine.Texture2D>) : UnityEngine.Coroutine
             public loadImage ($path: string, $filterMode?: UnityEngine.FilterMode) : UnityEngine.Texture2D
             public loadFont ($path: string) : UnityEngine.Font
             public loadFontDefinition ($path: string) : UnityEngine.UIElements.FontDefinition
@@ -278,6 +295,23 @@ declare namespace CS {
             public static createStyleList ($v: any, $type: System.Type) : any
             public static createStyleListWithKeyword ($keyword: UnityEngine.UIElements.StyleKeyword, $type: System.Type) : any
             public constructor ($root: UnityEngine.UIElements.VisualElement, $scriptEngine: OneJS.ScriptEngine)
+            public loadRemoteImage ($path: string, $callback: System.Action$1<UnityEngine.Texture2D>) : UnityEngine.Coroutine
+            public AddCachingDom ($dom: OneJS.Dom.Dom) : void
+            public RemoveCachingDom ($dom: OneJS.Dom.Dom) : void
+        }
+        interface IDocument
+        {
+            createElement ($tagName: string) : OneJS.Dom.Dom
+            createElement ($tagName: string, $options: OneJS.Dom.ElementCreationOptions) : OneJS.Dom.Dom
+            createElementNS ($ns: string, $tagName: string, $options: OneJS.Dom.ElementCreationOptions) : OneJS.Dom.Dom
+            createTextNode ($text: string) : OneJS.Dom.Dom
+            clearCache () : void
+            loadRemoteImage ($path: string, $callback: System.Action$1<UnityEngine.Texture2D>) : UnityEngine.Coroutine
+            loadImage ($path: string, $filterMode?: UnityEngine.FilterMode) : UnityEngine.Texture2D
+            loadFont ($path: string) : UnityEngine.Font
+            loadFontDefinition ($path: string) : UnityEngine.UIElements.FontDefinition
+            AddCachingDom ($dom: OneJS.Dom.Dom) : void
+            RemoveCachingDom ($dom: OneJS.Dom.Dom) : void
         }
         class RegisteredCallbackHolder extends System.Object
         {
@@ -385,7 +419,7 @@ declare namespace CS {
             public static TryParseColorString ($s: string, $color: $Ref<UnityEngine.Color>) : boolean
             public constructor ($dom: OneJS.Dom.Dom)
         }
-        class Flipbook extends UnityEngine.UIElements.Image implements UnityEngine.UIElements.IStylePropertyAnimations, UnityEngine.UIElements.IVisualElementScheduler, UnityEngine.UIElements.Experimental.ITransitionAnimations, UnityEngine.UIElements.IResolvedStyle, UnityEngine.UIElements.IExperimentalFeatures, UnityEngine.UIElements.ITransform, UnityEngine.UIElements.IEventHandler
+        class Flipbook extends UnityEngine.UIElements.Image implements UnityEngine.UIElements.Experimental.ITransitionAnimations, UnityEngine.UIElements.IVisualElementScheduler, UnityEngine.UIElements.IResolvedStyle, UnityEngine.UIElements.IStylePropertyAnimations, UnityEngine.UIElements.IEventHandler, UnityEngine.UIElements.IExperimentalFeatures, UnityEngine.UIElements.ITransform
         {
             protected [__keep_incompatibility]: never;
             public get src(): any;
@@ -400,14 +434,14 @@ declare namespace CS {
             public set randomRotation(value: boolean);
             public constructor ()
         }
-        class GradientRect extends UnityEngine.UIElements.VisualElement implements UnityEngine.UIElements.IStylePropertyAnimations, UnityEngine.UIElements.IVisualElementScheduler, UnityEngine.UIElements.Experimental.ITransitionAnimations, UnityEngine.UIElements.IResolvedStyle, UnityEngine.UIElements.IExperimentalFeatures, UnityEngine.UIElements.ITransform, UnityEngine.UIElements.IEventHandler
+        class GradientRect extends UnityEngine.UIElements.VisualElement implements UnityEngine.UIElements.Experimental.ITransitionAnimations, UnityEngine.UIElements.IVisualElementScheduler, UnityEngine.UIElements.IResolvedStyle, UnityEngine.UIElements.IStylePropertyAnimations, UnityEngine.UIElements.IEventHandler, UnityEngine.UIElements.IExperimentalFeatures, UnityEngine.UIElements.ITransform
         {
             protected [__keep_incompatibility]: never;
             public get Colors(): System.Array$1<UnityEngine.Color>;
             public set Colors(value: System.Array$1<UnityEngine.Color>);
             public constructor ()
         }
-        class Img extends UnityEngine.UIElements.VisualElement implements UnityEngine.UIElements.Experimental.ITransitionAnimations, UnityEngine.UIElements.IVisualElementScheduler, UnityEngine.UIElements.IResolvedStyle, UnityEngine.UIElements.IStylePropertyAnimations, UnityEngine.UIElements.IEventHandler, UnityEngine.UIElements.IExperimentalFeatures, UnityEngine.UIElements.ITransform
+        class Img extends UnityEngine.UIElements.Image implements UnityEngine.UIElements.Experimental.ITransitionAnimations, UnityEngine.UIElements.IVisualElementScheduler, UnityEngine.UIElements.IResolvedStyle, UnityEngine.UIElements.IStylePropertyAnimations, UnityEngine.UIElements.IEventHandler, UnityEngine.UIElements.IExperimentalFeatures, UnityEngine.UIElements.ITransform
         {
             protected [__keep_incompatibility]: never;
             public get Src(): string;
@@ -416,14 +450,6 @@ declare namespace CS {
             public constructor ()
         }
     }
-    namespace OneJS.EngineHost {
-        interface ActionCallback
-        { 
-        () : void; 
-        Invoke?: () => void;
-        }
-        var ActionCallback: { new (func: () => void): ActionCallback; }
-    }
     namespace Puerts {
         class GenericDelegate extends System.Object
         {
@@ -433,26 +459,17 @@ declare namespace CS {
         {
             protected [__keep_incompatibility]: never;
         }
+        type JSObject = any;
     }
     namespace OneJS.EditorWorkingDirInfo {
         enum EditorBaseDir
-        { ProjectPath = 0, PersistentDataPath = 1 }
+        { ProjectPath = 0, PersistentDataPath = 1, StreamingAssetsPath = 2 }
     }
     namespace OneJS.PlayerWorkingDirInfo {
         enum PlayerBaseDir
-        { PersistentDataPath = 0, AppPath = 1 }
+        { PersistentDataPath = 0, StreamingAssetsPath = 1, AppPath = 2 }
     }
     namespace OneJS.Utils {
-        class FloatConvUtil extends System.Object
-        {
-            protected [__keep_incompatibility]: never;
-            public static CreateFloatBuffer ($jsObj: any) : System.Array
-            public static SetFloatValue ($arr: System.Array, val: number, index: number) : void
-            public static SetFloat2Value ($arr: System.Array, val: Unity.Mathematics.float2, index: number) : void
-            public static SetFloat3Value ($arr: System.Array, val: Unity.Mathematics.float3, index: number) : void
-            public static SetFloat4Value ($arr: System.Array, val: Unity.Mathematics.float4, index: number) : void
-            public constructor ()
-        }
         class AssemblyFinder extends System.Object
         {
             protected [__keep_incompatibility]: never;
@@ -461,6 +478,16 @@ declare namespace CS {
             public static FindTypesInNamespace ($namespaceName: string) : System.Collections.Generic.List$1<System.Type>
             public constructor ()
         }
+        class FloatConvUtil extends System.Object
+        {
+            protected [__keep_incompatibility]: never;
+            public static CreateFloatBuffer ($obj: Puerts.JSObject) : System.Array$1<number>
+            public static SetFloatValue ($arr: System.Array, $val: number, $index: number) : void
+            public static SetFloat2Value ($arr: System.Array, $val: Unity.Mathematics.float2, $index: number) : void
+            public static SetFloat3Value ($arr: System.Array, $val: Unity.Mathematics.float3, $index: number) : void
+            public static SetFloat4Value ($arr: System.Array, $val: Unity.Mathematics.float4, $index: number) : void
+            public constructor ()
+        }
         class CoroutineUtil extends UnityEngine.MonoBehaviour
         {
             protected [__keep_incompatibility]: never;
@@ -602,11 +629,21 @@ declare namespace CS {
         class VisualElementExts extends System.Object
         {
             protected [__keep_incompatibility]: never;
+            public static Q ($e: UnityEngine.UIElements.VisualElement, $type: System.Type, $name?: string, ...classes: string[]) : UnityEngine.UIElements.VisualElement
+            public static Query ($e: UnityEngine.UIElements.VisualElement, $type: System.Type, $name?: string, ...classes: string[]) : UnityEngine.UIElements.UQueryBuilder$1<UnityEngine.UIElements.VisualElement>
             public static Register ($cbeh: UnityEngine.UIElements.CallbackEventHandler, $eventType: System.Type, $handler: UnityEngine.UIElements.EventCallback$1<UnityEngine.UIElements.EventBase>, $useTrickleDown?: UnityEngine.UIElements.TrickleDown) : void
             public static Unregister ($cbeh: UnityEngine.UIElements.CallbackEventHandler, $eventType: System.Type, $handler: UnityEngine.UIElements.EventCallback$1<UnityEngine.UIElements.EventBase>, $useTrickleDown?: UnityEngine.UIElements.TrickleDown) : void
             public static ForceUpdate ($view: UnityEngine.UIElements.VisualElement) : void
         }
     }
+    namespace OneJS.Dom.Dom {
+        interface RegisterCallbackDelegate
+        { 
+        (ve: UnityEngine.UIElements.VisualElement, callback: UnityEngine.UIElements.EventCallback$1<UnityEngine.UIElements.EventBase>, trickleDown: UnityEngine.UIElements.TrickleDown) : void; 
+        Invoke?: (ve: UnityEngine.UIElements.VisualElement, callback: UnityEngine.UIElements.EventCallback$1<UnityEngine.UIElements.EventBase>, trickleDown: UnityEngine.UIElements.TrickleDown) => void;
+        }
+        var RegisterCallbackDelegate: { new (func: (ve: UnityEngine.UIElements.VisualElement, callback: UnityEngine.UIElements.EventCallback$1<UnityEngine.UIElements.EventBase>, trickleDown: UnityEngine.UIElements.TrickleDown) => void): RegisterCallbackDelegate; }
+    }
     namespace OneJS.CustomStyleSheets {
         class CSSSpec extends System.Object
         {
@@ -642,7 +679,7 @@ declare namespace CS {
         {
             protected [__keep_incompatibility]: never;
             public BuildStyleSheet ($asset: UnityEngine.UIElements.StyleSheet, $contents: string) : void
-            public constructor ($scriptEngine: OneJS.ScriptEngine)
+            public constructor ($scriptEngine: OneJS.IScriptEngine)
         }
         class Dimension extends System.ValueType implements System.IEquatable$1<OneJS.CustomStyleSheets.Dimension>
         {
@@ -780,12 +817,4 @@ declare namespace CS {
         enum Unit
         { Unitless = 0, Pixel = 1, Percent = 2, Second = 3, Millisecond = 4, Degree = 5, Gradian = 6, Radian = 7, Turn = 8 }
     }
-    namespace OneJS.Dom.Dom {
-        interface RegisterCallbackDelegate
-        { 
-        (ve: UnityEngine.UIElements.VisualElement, callback: UnityEngine.UIElements.EventCallback$1<UnityEngine.UIElements.EventBase>, trickleDown: UnityEngine.UIElements.TrickleDown) : void; 
-        Invoke?: (ve: UnityEngine.UIElements.VisualElement, callback: UnityEngine.UIElements.EventCallback$1<UnityEngine.UIElements.EventBase>, trickleDown: UnityEngine.UIElements.TrickleDown) => void;
-        }
-        var RegisterCallbackDelegate: { new (func: (ve: UnityEngine.UIElements.VisualElement, callback: UnityEngine.UIElements.EventCallback$1<UnityEngine.UIElements.EventBase>, trickleDown: UnityEngine.UIElements.TrickleDown) => void): RegisterCallbackDelegate; }
-    }
 }

package/definitions/augments.d.ts

@@ -34,11 +34,14 @@ declare global {
     const cancelAnimationFrame: (id: number) => void
 
     const console: {
-        log: (...args: any[]) => void
-        error: (...args: any[]) => void
-        warn: (...args: any[]) => void
-        info: (...args: any[]) => void
-        debug: (...args: any[]) => void
+        log: (...args: any[]) => void;
+        info: (...args: any[]) => void;
+        warn: (...args: any[]) => void;
+        error: (...args: any[]) => void;
+        trace: (...args: any[]) => void;
+        assert: (condition: boolean, ...args: any[]) => void;
+        time: (label: string) => void;
+        timeEnd: (label: string) => void;
     }
 
     interface Event {

package/definitions/globals.d.ts

@@ -12,13 +12,13 @@ declare namespace OneJS {
 declare const onejs: {
     add_onReload(handler: () => void): void
     remove_onReload(handler: () => void): void
-    add_onDestroy(handler: () => void): void
-    remove_onDestroy(handler: () => void): void
+    add_onDispose(handler: () => void): void
+    remove_onDispose(handler: () => void): void
 
-    interop: { // TODO
-        classes: Record<string, any>
-        objects: Record<string, any>
-    }
+    // interop: { // TODO
+    //     classes: Record<string, any>
+    //     objects: Record<string, any>
+    // }
 
     subscribe<T, K extends OneJS.EventKeys<T>>(
         eventSource: T,

package/definitions/modules.d.ts

@@ -10,6 +10,10 @@ declare module "OneJS/Dom" {
     export = CS.OneJS.Dom
 }
 
+declare module "System" {
+    export = CS.System;
+}
+
 declare module "UnityEngine" {
     export = CS.UnityEngine;
 }

package/dist/dom/document.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="Assemblies" />
 import { DomWrapper } from "./dom";
 interface ElementCreationOptions {
     is?: string;

package/dist/dom/dom.d.ts

@@ -1,6 +1,4 @@
 /// <reference path="../../definitions/modules.d.ts" />
-/// <reference types="Assemblies" />
-/// <reference types="Assemblies" />
 import { EventBase } from "UnityEngine/UIElements";
 import { DomStyleWrapper } from "./dom-style";
 export declare class DomWrapper {

package/dist/index.d.ts

@@ -1,5 +1,4 @@
 /// <reference path="../definitions/index.d.ts" />
-/// <reference types="Assemblies" />
 import { DocumentWrapper } from "./dom/document";
 import { DomWrapper } from "./dom/dom";
 /**

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

@@ -1,4 +1,3 @@
-/// <reference types="Assemblies" />
 type float4 = CS.Unity.Mathematics.float4;
 declare var kCSSColorTable: {
     transparent: number[];

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

@@ -1,4 +1,3 @@
-/// <reference types="Assemblies" />
 type float2 = CS.Unity.Mathematics.float2;
 type float3 = CS.Unity.Mathematics.float3;
 type float4 = CS.Unity.Mathematics.float4;

package/dist/utils/index.d.ts

@@ -7,3 +7,4 @@
 export { parseColor, parseCSSColor, colorStrToF4, namedColor, namedColors } from "./color-parser";
 export { palettes } from "./color-palettes";
 export { parseFloat2, parseFloat3, parseFloat4 } from "./float-parser";
+export { subscribe } from "./subscribe";

package/dist/utils/index.js

@@ -10,3 +10,4 @@ export { parseColor, parseCSSColor, colorStrToF4, namedColor, namedColors } from
 export { palettes } from "./color-palettes";
 // @ts-ignore - prevent `allowImportingTsExtensions` error
 export { parseFloat2, parseFloat3, parseFloat4 } from "./float-parser";
+export { subscribe } from "./subscribe";

package/dist/utils/subscribe.d.ts

@@ -0,0 +1,4 @@
+export declare function subscribe<T, K extends keyof T>(target: T, eventName: K, callback: () => void): () => void;
+export declare function subscribe<T, K extends keyof T>(target: {
+    new (): T;
+}, eventName: K, callback: () => void): () => void;

package/dist/utils/subscribe.js

@@ -0,0 +1,10 @@
+import { Action, Delegate } from "System";
+export function subscribe(target, eventName, callback) {
+    var action = new Action(callback);
+    target[eventName] = Delegate.Combine(target[eventName], action);
+    const unsubscribe = () => {
+        target[eventName] = Delegate.Remove(target[eventName], action);
+    };
+    onejs.add_onReload(unsubscribe);
+    return unsubscribe;
+}

package/package.json

@@ -1,9 +1,9 @@
 {
     "name": "onejs-core",
     "description": "The JS part of OneJS, a UI framework and Scripting Engine for Unity.",
-    "version": "1.0.12",
+    "version": "1.0.14",
     "main": "./dist/index.js",
-    "types": "./dist/index.d.ts",
+    "types": "./typings.d.ts",
     "dependencies": {
         "css-flatten": "^2.0.0",
         "css-simple-parser": "^3.0.0"

package/scripts/onejs-tw-config.cjs

@@ -6,7 +6,7 @@ theme.extend = {
     transitionTimingFunction: {
         DEFAULT: "ease-in-out",
         "in-out": "ease-in-out",
-    },
+    }
 }
 exports.theme = theme
 
@@ -155,11 +155,11 @@ exports.plugins = [
 exports.corePlugins = [
     "alignContent", "alignItems", "alignSelf",
     "justifyContent",
-    "backgroundColor", "backgroundImage", "backgroundPosition", "backgroundRepeat", "backgroundSize", 
-    "borderColor", "borderRadius", "borderWidth", 
+    "backgroundColor", "backgroundImage", "backgroundPosition", "backgroundRepeat", "backgroundSize",
+    "borderColor", "borderRadius", "borderWidth",
     "colors", "textColor", "cursor",
     "flex", "flexBasis", "flexDirection", "flexGrow", "flexShrink", "flexWrap",
-    "fontFamily", "fontSize", "fontStyle", 
+    "fontFamily", "fontSize", "fontStyle",
     "width", "height", "maxWidth", "maxHeight", "minWidth", "minHeight",
     "margin", "padding",
     "opacity", "overflow", "display", "visibility",

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.replace(/(\\\.|\\#|\\%|\\:|\\\/|\\\[|\\\]|\\\(|\\\)|\\2c)/g, match => {
+                    selector.replace(/(\\\.|\\#|\\%|\\:|\\\/|\\\[|\\\]|\\\(|\\\)|\\2c|\\&|\\>|\\<|\\\*)/g, match => {
                         switch (match) {
                             case '\\.': return '_d_';
                             case '\\#': return '_n_';
@@ -24,6 +24,10 @@ module.exports = () => {
                             case '\\(': return '_lp_';
                             case '\\)': return '_rp_';
                             case '\\2c': return '_cm_';
+                            case '\\&': return '_amp_';
+                            case '\\>': return '_gt_';
+                            case '\\<': return '_lt_';
+                            case '\\*': return '_ast_';
                             default: return match;
                         }
                     })

package/tsconfig.json

@@ -4,14 +4,14 @@
         "module": "esnext",
         "lib": [ "esnext" ],
         "outDir": "./dist",
-        "moduleResolution": "node",
+        "moduleResolution": "bundler",
         "jsx": "react",
         "jsxFactory": "h",
         "jsxFragmentFactory": "Fragment",
         "skipLibCheck": false,
         "forceConsistentCasingInFileNames": true,
         "declaration": true,
-        "typeRoots": [ "./definitions" ],
+        "typeRoots": [ ],
     },
     "include": [
         "./**/*"

package/utils/index.ts

@@ -11,3 +11,4 @@ export { parseColor, parseCSSColor, colorStrToF4, namedColor, namedColors } from
 export { palettes } from "./color-palettes"
 // @ts-ignore - prevent `allowImportingTsExtensions` error
 export { parseFloat2, parseFloat3, parseFloat4 } from "./float-parser"
+export { subscribe } from "./subscribe"

package/utils/subscribe.ts

@@ -0,0 +1,17 @@
+import { Action, Delegate } from "System"
+
+
+export function subscribe<T, K extends keyof T>(target: T, eventName: K, callback: () => void): () => void
+export function subscribe<T, K extends keyof T>(target: { new(): T }, eventName: K, callback: () => void): () => void
+export function subscribe(target: any, eventName: any, callback: () => void): () => void {
+    var action = new Action(callback)
+    target[eventName] = Delegate.Combine(target[eventName] as any, action) as any
+
+    const unsubscribe = () => {
+        target[eventName] = Delegate.Remove(target[eventName] as any, action) as any
+    }
+
+    onejs.add_onReload(unsubscribe)
+
+    return unsubscribe
+}