@mulsense/xnew 0.6.4 → 0.6.5

package/dist/addons/xmatter.js

@@ -6,7 +6,7 @@
 
     var xmatter = {
         initialize({} = {}) {
-            xnew(Root, {});
+            xnew.promise(xnew(Root, {}));
         },
         get engine() {
             var _a;

package/dist/addons/xmatter.mjs

@@ -3,7 +3,7 @@ import Matter from 'matter-js';
 
 var xmatter = {
     initialize({} = {}) {
-        xnew(Root, {});
+        xnew.promise(xnew(Root, {}));
     },
     get engine() {
         var _a;

package/dist/addons/xpixi.js

@@ -25,7 +25,7 @@
 
     var xpixi = {
         initialize({ canvas = null } = {}) {
-            xnew(Root, { canvas });
+            xnew.promise(xnew(Root, { canvas }));
         },
         nest(object) {
             xnew(Nest, { object });
@@ -49,7 +49,10 @@
         xnew.promise(PIXI__namespace.autoDetectRenderer({
             width: canvas.width, height: canvas.height, view: canvas,
             antialias: true, backgroundAlpha: 0,
-        })).then((value) => renderer = value);
+        })).then((value) => {
+            renderer = value;
+            xnew.resolve();
+        });
         let scene = new PIXI__namespace.Container();
         return {
             get renderer() { return renderer; },

package/dist/addons/xpixi.mjs

@@ -3,7 +3,7 @@ import * as PIXI from 'pixi.js';
 
 var xpixi = {
     initialize({ canvas = null } = {}) {
-        xnew(Root, { canvas });
+        xnew.promise(xnew(Root, { canvas }));
     },
     nest(object) {
         xnew(Nest, { object });
@@ -27,7 +27,10 @@ function Root(unit, { canvas }) {
     xnew.promise(PIXI.autoDetectRenderer({
         width: canvas.width, height: canvas.height, view: canvas,
         antialias: true, backgroundAlpha: 0,
-    })).then((value) => renderer = value);
+    })).then((value) => {
+        renderer = value;
+        xnew.resolve();
+    });
     let scene = new PIXI.Container();
     return {
         get renderer() { return renderer; },

package/dist/addons/xrapier2d.js

@@ -6,7 +6,7 @@
 
     var xrapier2d = {
         initialize({ gravity = { x: 0.0, y: -9.81 } } = {}) {
-            xnew(Root, { gravity });
+            xnew.promise(xnew(Root, { gravity }));
         },
         get world() {
             var _a;

package/dist/addons/xrapier2d.mjs

@@ -3,7 +3,7 @@ import RAPIER from '@dimforge/rapier2d-compat';
 
 var xrapier2d = {
     initialize({ gravity = { x: 0.0, y: -9.81 } } = {}) {
-        xnew(Root, { gravity });
+        xnew.promise(xnew(Root, { gravity }));
     },
     get world() {
         var _a;

package/dist/addons/xrapier3d.js

@@ -6,7 +6,7 @@
 
     var xrapier3d = {
         initialize({ gravity = { x: 0.0, y: -9.81, z: 0.0 } } = {}) {
-            xnew(Root, { gravity });
+            xnew.promise(xnew(Root, { gravity }));
         },
         get world() {
             var _a;

package/dist/addons/xrapier3d.mjs

@@ -3,7 +3,7 @@ import RAPIER from '@dimforge/rapier3d-compat';
 
 var xrapier3d = {
     initialize({ gravity = { x: 0.0, y: -9.81, z: 0.0 } } = {}) {
-        xnew(Root, { gravity });
+        xnew.promise(xnew(Root, { gravity }));
     },
     get world() {
         var _a;

package/dist/addons/xthree.js

@@ -25,7 +25,7 @@
 
     var xthree = {
         initialize({ canvas = null, camera = null } = {}) {
-            xnew(Root, { canvas, camera });
+            xnew.promise(xnew(Root, { canvas, camera }));
         },
         nest(object) {
             xnew(Nest, { object });
@@ -53,6 +53,7 @@
         renderer.setClearColor(0x000000, 0);
         camera = camera !== null && camera !== void 0 ? camera : new THREE__namespace.PerspectiveCamera(45, renderer.domElement.width / renderer.domElement.height);
         const scene = new THREE__namespace.Scene();
+        xnew.resolve();
         return {
             get canvas() { return canvas; },
             get camera() { return camera; },

package/dist/addons/xthree.mjs

@@ -3,7 +3,7 @@ import * as THREE from 'three';
 
 var xthree = {
     initialize({ canvas = null, camera = null } = {}) {
-        xnew(Root, { canvas, camera });
+        xnew.promise(xnew(Root, { canvas, camera }));
     },
     nest(object) {
         xnew(Nest, { object });
@@ -31,6 +31,7 @@ function Root(unit, { canvas, camera }) {
     renderer.setClearColor(0x000000, 0);
     camera = camera !== null && camera !== void 0 ? camera : new THREE.PerspectiveCamera(45, renderer.domElement.width / renderer.domElement.height);
     const scene = new THREE.Scene();
+    xnew.resolve();
     return {
         get canvas() { return canvas; },
         get camera() { return camera; },

package/dist/xnew.d.ts

@@ -92,6 +92,11 @@ interface Internal {
     ancestors: Unit[];
     children: Unit[];
     promises: UnitPromise[];
+    done: {
+        promise: Promise<any>;
+        resolve: Function;
+        reject: Function;
+    };
     nestElements: {
         element: UnitElement;
         owned: boolean;
@@ -281,12 +286,14 @@ declare const xnew: CreateUnit & {
     promise(promise: Promise<any> | Unit): UnitPromise;
     then(callback: Function): UnitPromise;
     catch(callback: Function): UnitPromise;
+    resolve(value?: any): void;
+    reject(reason?: any): void;
     finally(callback: Function): UnitPromise;
     scope(callback: any): any;
     find(component: Function): Unit[];
     emit(type: string, ...args: any[]): void;
-    timeout(timeout: Function, duration?: number): UnitTimer;
-    interval(interval: Function, duration: number, iterations?: number): UnitTimer;
+    timeout(callback: Function, duration?: number): UnitTimer;
+    interval(callback: Function, duration: number, iterations?: number): UnitTimer;
     transition(transition: Function, duration?: number, easing?: string): UnitTimer;
     protect(): void;
 } & {

package/dist/xnew.js

@@ -664,6 +664,12 @@
         static initialize(unit, anchor) {
             const backup = Unit.currentUnit;
             Unit.currentUnit = unit;
+            const done = {
+                promise: null,
+                resolve: null,
+                reject: null
+            };
+            done.promise = new Promise((resolve, reject) => { done.resolve = resolve; done.reject = reject; });
             unit._ = Object.assign(unit._, {
                 currentElement: unit._.baseElement,
                 currentContext: unit._.baseContext,
@@ -676,6 +682,7 @@
                 children: [],
                 nestElements: [],
                 promises: [],
+                done,
                 components: [],
                 listeners: new MapMap(),
                 defines: {},
@@ -689,7 +696,8 @@
             // setup component
             Unit.extend(unit, unit._.baseComponent, unit._.props);
             // whether the unit promise was resolved
-            Promise.all(unit._.promises.map(p => p.promise)).then(() => unit._.state = 'initialized');
+            // Promise.all(unit._.promises.map(p => p.promise)).then(() => unit._.state = 'initialized');
+            unit._.state = 'initialized';
             Unit.currentUnit = backup;
         }
         static finalize(unit) {
@@ -1030,11 +1038,14 @@
                 const component = Unit.currentUnit._.currentComponent;
                 let unitPromise;
                 if (promise instanceof Unit) {
-                    unitPromise = new UnitPromise(Promise.all(promise._.promises.map(p => p.promise)), component);
+                    unitPromise = new UnitPromise(promise._.done.promise, component);
                 }
-                else {
+                else if (promise instanceof Promise) {
                     unitPromise = new UnitPromise(promise, component);
                 }
+                else {
+                    unitPromise = new UnitPromise(new Promise(xnew$1.scope(promise)), component);
+                }
                 Unit.currentUnit._.promises.push(unitPromise);
                 return unitPromise;
             }
@@ -1082,6 +1093,40 @@
                 throw error;
             }
         },
+        /**
+         * Resolves the current unit's promise with the given value
+         * @param value - Value to resolve the promise with
+         * @returns void
+         * @example
+         * xnew.resolve('data');
+         */
+        resolve(value) {
+            try {
+                const done = Unit.currentUnit._.done;
+                done.resolve(value);
+            }
+            catch (error) {
+                console.error('xnew.resolve(value?: any): ', error);
+                throw error;
+            }
+        },
+        /**
+         * Rejects the current unit's promise with the given reason
+         * @param reason - Reason to reject the promise
+         * @returns void
+         * @example
+         * xnew.reject(new Error('Something went wrong'));
+         */
+        reject(reason) {
+            try {
+                const done = Unit.currentUnit._.done;
+                done.reject(reason);
+            }
+            catch (error) {
+                console.error('xnew.reject(reason?: any): ', error);
+                throw error;
+            }
+        },
         /**
          * Executes callback after all registered promises settle (resolve or reject)
          * @param callback - Function to call after promises settle

package/dist/xnew.mjs

@@ -658,6 +658,12 @@ class Unit {
     static initialize(unit, anchor) {
         const backup = Unit.currentUnit;
         Unit.currentUnit = unit;
+        const done = {
+            promise: null,
+            resolve: null,
+            reject: null
+        };
+        done.promise = new Promise((resolve, reject) => { done.resolve = resolve; done.reject = reject; });
         unit._ = Object.assign(unit._, {
             currentElement: unit._.baseElement,
             currentContext: unit._.baseContext,
@@ -670,6 +676,7 @@ class Unit {
             children: [],
             nestElements: [],
             promises: [],
+            done,
             components: [],
             listeners: new MapMap(),
             defines: {},
@@ -683,7 +690,8 @@ class Unit {
         // setup component
         Unit.extend(unit, unit._.baseComponent, unit._.props);
         // whether the unit promise was resolved
-        Promise.all(unit._.promises.map(p => p.promise)).then(() => unit._.state = 'initialized');
+        // Promise.all(unit._.promises.map(p => p.promise)).then(() => unit._.state = 'initialized');
+        unit._.state = 'initialized';
         Unit.currentUnit = backup;
     }
     static finalize(unit) {
@@ -1024,11 +1032,14 @@ const xnew$1 = Object.assign(function (...args) {
             const component = Unit.currentUnit._.currentComponent;
             let unitPromise;
             if (promise instanceof Unit) {
-                unitPromise = new UnitPromise(Promise.all(promise._.promises.map(p => p.promise)), component);
+                unitPromise = new UnitPromise(promise._.done.promise, component);
             }
-            else {
+            else if (promise instanceof Promise) {
                 unitPromise = new UnitPromise(promise, component);
             }
+            else {
+                unitPromise = new UnitPromise(new Promise(xnew$1.scope(promise)), component);
+            }
             Unit.currentUnit._.promises.push(unitPromise);
             return unitPromise;
         }
@@ -1076,6 +1087,40 @@ const xnew$1 = Object.assign(function (...args) {
             throw error;
         }
     },
+    /**
+     * Resolves the current unit's promise with the given value
+     * @param value - Value to resolve the promise with
+     * @returns void
+     * @example
+     * xnew.resolve('data');
+     */
+    resolve(value) {
+        try {
+            const done = Unit.currentUnit._.done;
+            done.resolve(value);
+        }
+        catch (error) {
+            console.error('xnew.resolve(value?: any): ', error);
+            throw error;
+        }
+    },
+    /**
+     * Rejects the current unit's promise with the given reason
+     * @param reason - Reason to reject the promise
+     * @returns void
+     * @example
+     * xnew.reject(new Error('Something went wrong'));
+     */
+    reject(reason) {
+        try {
+            const done = Unit.currentUnit._.done;
+            done.reject(reason);
+        }
+        catch (error) {
+            console.error('xnew.reject(reason?: any): ', error);
+            throw error;
+        }
+    },
     /**
      * Executes callback after all registered promises settle (resolve or reject)
      * @param callback - Function to call after promises settle

package/package.json

@@ -4,7 +4,7 @@
   "keywords": [
     "Component-Oriented Programming"
   ],
-  "version": "0.6.4",
+  "version": "0.6.5",
   "main": "dist/xnew.js",
   "module": "dist/xnew.mjs",
   "types": "dist/xnew.d.ts",