onejs-core 1.0.13 → 1.0.14

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

@@ -65,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)
         }
@@ -446,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
         {

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/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,7 +1,7 @@
 {
     "name": "onejs-core",
     "description": "The JS part of OneJS, a UI framework and Scripting Engine for Unity.",
-    "version": "1.0.13",
+    "version": "1.0.14",
     "main": "./dist/index.js",
     "types": "./typings.d.ts",
     "dependencies": {

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
+}