@mulsense/xnew 0.3.0 → 0.3.2

package/dist/addons/xpixi.js

@@ -60,12 +60,7 @@
             antialias: true, backgroundAlpha: 0,
         });
         root.renderer = null;
-        if (renderer instanceof Promise) {
-            xnew.promise(renderer).then((renderer) => root.renderer = renderer);
-        }
-        else {
-            root.renderer = renderer;
-        }
+        xnew.promise(renderer, false).then((renderer) => root.renderer = renderer);
         root.updates = [];
         root.scene = new PIXI__namespace.Container();
         xnew.context('xpixi.object', root.scene);

package/dist/addons/xpixi.mjs

@@ -38,12 +38,7 @@ function Root(self, { canvas }) {
         antialias: true, backgroundAlpha: 0,
     });
     root.renderer = null;
-    if (renderer instanceof Promise) {
-        xnew.promise(renderer).then((renderer) => root.renderer = renderer);
-    }
-    else {
-        root.renderer = renderer;
-    }
+    xnew.promise(renderer, false).then((renderer) => root.renderer = renderer);
     root.updates = [];
     root.scene = new PIXI.Container();
     xnew.context('xpixi.object', root.scene);

package/dist/addons/xrapier2d.js

@@ -20,7 +20,7 @@
     function Root(self, { gravity, timestep }) {
         const root = {};
         xnew.context('xrapier2d.root', root);
-        xnew.promise(RAPIER.init()).then(() => {
+        xnew.promise(RAPIER.init(), false).then(() => {
             root.world = new RAPIER.World(gravity);
             if (timestep !== null) {
                 root.world.timestep = timestep;

package/dist/addons/xrapier2d.mjs

@@ -17,7 +17,7 @@ var xrapier2d = {
 function Root(self, { gravity, timestep }) {
     const root = {};
     xnew.context('xrapier2d.root', root);
-    xnew.promise(RAPIER.init()).then(() => {
+    xnew.promise(RAPIER.init(), false).then(() => {
         root.world = new RAPIER.World(gravity);
         if (timestep !== null) {
             root.world.timestep = timestep;

package/dist/types/core/unit.d.ts

@@ -26,7 +26,7 @@ interface UnitInternal {
     protected: boolean;
     ancestors: Unit[];
     children: Unit[];
-    promises: Promise<any>[];
+    promises: UnitPromise[];
     elements: UnitElement[];
     components: Function[];
     listeners: MapMap<string, Function, {
@@ -41,7 +41,6 @@ export declare class Unit {
     _: UnitInternal;
     constructor(parent: Unit | null, ...args: any[]);
     get element(): UnitElement;
-    get components(): Function[];
     start(): void;
     stop(): void;
     finalize(): void;
@@ -71,8 +70,9 @@ export declare class Unit {
     static emit(type: string, ...args: any[]): void;
 }
 export declare class UnitPromise {
-    private promise;
-    constructor(promise: Promise<any>);
+    promise: Promise<any>;
+    useResult: Boolean;
+    constructor(promise: Promise<any>, useResult: Boolean);
     then(callback: Function): UnitPromise;
     catch(callback: Function): UnitPromise;
     finally(callback: Function): UnitPromise;

package/dist/types/core/xnew.d.ts

@@ -65,7 +65,7 @@ export declare const xnew: CreateUnit & {
      * @example
      * xnew.promise(fetchData()).then(data => console.log(data))
      */
-    promise(promise: Promise<any>): UnitPromise;
+    promise(promise: Promise<any>, useResult?: Boolean): UnitPromise;
     /**
      * Handles successful resolution of all registered promises in the current component
      * @param callback - Function to call when all promises resolve

package/dist/xnew.d.ts

@@ -52,7 +52,7 @@ interface UnitInternal {
     protected: boolean;
     ancestors: Unit[];
     children: Unit[];
-    promises: Promise<any>[];
+    promises: UnitPromise[];
     elements: UnitElement[];
     components: Function[];
     listeners: MapMap<string, Function, {
@@ -67,7 +67,6 @@ declare class Unit {
     _: UnitInternal;
     constructor(parent: Unit | null, ...args: any[]);
     get element(): UnitElement;
-    get components(): Function[];
     start(): void;
     stop(): void;
     finalize(): void;
@@ -97,8 +96,9 @@ declare class Unit {
     static emit(type: string, ...args: any[]): void;
 }
 declare class UnitPromise {
-    private promise;
-    constructor(promise: Promise<any>);
+    promise: Promise<any>;
+    useResult: Boolean;
+    constructor(promise: Promise<any>, useResult: Boolean);
     then(callback: Function): UnitPromise;
     catch(callback: Function): UnitPromise;
     finally(callback: Function): UnitPromise;
@@ -170,7 +170,7 @@ declare const xnew$1: CreateUnit & {
      * @example
      * xnew.promise(fetchData()).then(data => console.log(data))
      */
-    promise(promise: Promise<any>): UnitPromise;
+    promise(promise: Promise<any>, useResult?: Boolean): UnitPromise;
     /**
      * Handles successful resolution of all registered promises in the current component
      * @param callback - Function to call when all promises resolve

package/dist/xnew.js

@@ -262,9 +262,6 @@
         get element() {
             return this._.currentElement;
         }
-        get components() {
-            return this._.components;
-        }
         start() {
             this._.tostart = true;
         }
@@ -313,7 +310,7 @@
             // setup component
             Unit.extend(unit, unit._.baseComponent, unit._.props);
             // whether the unit promise was resolved
-            Promise.all(unit._.promises).then(() => unit._.state = 'initialized');
+            Promise.all(unit._.promises.map(p => p.promise)).then(() => unit._.state = 'initialized');
             Unit.current = backup;
         }
         static finalize(unit) {
@@ -530,7 +527,10 @@
     // unit promise
     //----------------------------------------------------------------------------------------------------
     class UnitPromise {
-        constructor(promise) { this.promise = promise; }
+        constructor(promise, useResult) {
+            this.promise = promise;
+            this.useResult = useResult;
+        }
         then(callback) {
             this.promise = this.promise.then(Unit.wrap(Unit.current, callback));
             return this;
@@ -678,10 +678,10 @@
          * @example
          * xnew.promise(fetchData()).then(data => console.log(data))
          */
-        promise(promise) {
+        promise(promise, useResult = true) {
             try {
-                Unit.current._.promises.push(promise);
-                return new UnitPromise(promise);
+                Unit.current._.promises.push(new UnitPromise(promise, useResult));
+                return Unit.current._.promises[Unit.current._.promises.length - 1];
             }
             catch (error) {
                 console.error('xnew.promise(promise: Promise<any>): ', error);
@@ -697,7 +697,11 @@
          */
         then(callback) {
             try {
-                return new UnitPromise(Promise.all(Unit.current._.promises)).then(callback);
+                const promises = Unit.current._.promises;
+                return new UnitPromise(Promise.all(promises.map(p => p.promise)), true)
+                    .then((results) => {
+                    callback(results.filter((_result, index) => promises[index].useResult));
+                });
             }
             catch (error) {
                 console.error('xnew.then(callback: Function): ', error);
@@ -713,7 +717,9 @@
          */
         catch(callback) {
             try {
-                return new UnitPromise(Promise.all(Unit.current._.promises)).catch(callback);
+                const promises = Unit.current._.promises;
+                return new UnitPromise(Promise.all(promises.map(p => p.promise)), true)
+                    .catch(callback);
             }
             catch (error) {
                 console.error('xnew.catch(callback: Function): ', error);
@@ -729,7 +735,9 @@
          */
         finally(callback) {
             try {
-                return new UnitPromise(Promise.all(Unit.current._.promises)).finally(callback);
+                const promises = Unit.current._.promises;
+                return new UnitPromise(Promise.all(promises.map(p => p.promise)), true)
+                    .finally(callback);
             }
             catch (error) {
                 console.error('xnew.finally(callback: Function): ', error);

package/dist/xnew.mjs

@@ -256,9 +256,6 @@ class Unit {
     get element() {
         return this._.currentElement;
     }
-    get components() {
-        return this._.components;
-    }
     start() {
         this._.tostart = true;
     }
@@ -307,7 +304,7 @@ class Unit {
         // setup component
         Unit.extend(unit, unit._.baseComponent, unit._.props);
         // whether the unit promise was resolved
-        Promise.all(unit._.promises).then(() => unit._.state = 'initialized');
+        Promise.all(unit._.promises.map(p => p.promise)).then(() => unit._.state = 'initialized');
         Unit.current = backup;
     }
     static finalize(unit) {
@@ -524,7 +521,10 @@ Unit.type2units = new MapSet();
 // unit promise
 //----------------------------------------------------------------------------------------------------
 class UnitPromise {
-    constructor(promise) { this.promise = promise; }
+    constructor(promise, useResult) {
+        this.promise = promise;
+        this.useResult = useResult;
+    }
     then(callback) {
         this.promise = this.promise.then(Unit.wrap(Unit.current, callback));
         return this;
@@ -672,10 +672,10 @@ const xnew$1 = Object.assign(function (...args) {
      * @example
      * xnew.promise(fetchData()).then(data => console.log(data))
      */
-    promise(promise) {
+    promise(promise, useResult = true) {
         try {
-            Unit.current._.promises.push(promise);
-            return new UnitPromise(promise);
+            Unit.current._.promises.push(new UnitPromise(promise, useResult));
+            return Unit.current._.promises[Unit.current._.promises.length - 1];
         }
         catch (error) {
             console.error('xnew.promise(promise: Promise<any>): ', error);
@@ -691,7 +691,11 @@ const xnew$1 = Object.assign(function (...args) {
      */
     then(callback) {
         try {
-            return new UnitPromise(Promise.all(Unit.current._.promises)).then(callback);
+            const promises = Unit.current._.promises;
+            return new UnitPromise(Promise.all(promises.map(p => p.promise)), true)
+                .then((results) => {
+                callback(results.filter((_result, index) => promises[index].useResult));
+            });
         }
         catch (error) {
             console.error('xnew.then(callback: Function): ', error);
@@ -707,7 +711,9 @@ const xnew$1 = Object.assign(function (...args) {
      */
     catch(callback) {
         try {
-            return new UnitPromise(Promise.all(Unit.current._.promises)).catch(callback);
+            const promises = Unit.current._.promises;
+            return new UnitPromise(Promise.all(promises.map(p => p.promise)), true)
+                .catch(callback);
         }
         catch (error) {
             console.error('xnew.catch(callback: Function): ', error);
@@ -723,7 +729,9 @@ const xnew$1 = Object.assign(function (...args) {
      */
     finally(callback) {
         try {
-            return new UnitPromise(Promise.all(Unit.current._.promises)).finally(callback);
+            const promises = Unit.current._.promises;
+            return new UnitPromise(Promise.all(promises.map(p => p.promise)), true)
+                .finally(callback);
         }
         catch (error) {
             console.error('xnew.finally(callback: Function): ', error);

package/package.json

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