nesquick 0.0.27 → 1.0.0

package/lib/NesquickComponent.js

@@ -161,7 +161,7 @@ class NesquickComponent {
     _renderStyle(element, style) {
         switch (typeof style) {
             case "function": {
-                (0, State_1.useRender)(style, (style, isState) => {
+                (0, State_1.useRender)(style, (style, lastReaction) => {
                     if (this._styleSubscriptions != null) {
                         this._styleSubscriptions.dispose();
                         this._styleSubscriptions = null;
@@ -169,16 +169,16 @@ class NesquickComponent {
                     switch (typeof style) {
                         case "object": {
                             if (style) {
-                                if (isState) {
+                                if (lastReaction) {
+                                    this._renderStyles(element, style);
+                                }
+                                else {
                                     element.removeAttribute("style");
                                     this._styleSubscriptions = new State_1.Subscriptions();
                                     State_1.subscriptions.set(this._styleSubscriptions);
                                     this._renderStyles(element, style);
                                     State_1.subscriptions.reset();
                                 }
-                                else {
-                                    this._renderStyles(element, style);
-                                }
                             }
                             break;
                         }

package/lib/State.js

@@ -4,6 +4,7 @@ exports.subscriptions = exports.Subscriptions = void 0;
 exports.useState = useState;
 exports.useEffect = useEffect;
 exports.useRender = useRender;
+exports.useMemo = useMemo;
 exports.useDispose = useDispose;
 let currentReactor = [];
 var reactor;
@@ -87,18 +88,57 @@ function useState(value) {
         return value;
     };
     const setValue = (newValue) => {
-        value = newValue;
-        for (const reactor of reactors) {
-            renderReactor(reactor, reactor.effect);
+        if (value !== newValue) {
+            value = newValue;
+            for (const reactor of reactors) {
+                renderReactor(reactor, reactor.effect);
+            }
         }
     };
     return [getValue, setValue];
 }
 function useEffect(cb, reaction = null) {
-    newSubscription(cb, reaction, true);
+    const sub = newSubscription(cb, reaction, true);
+    runSubscription(sub);
 }
 function useRender(cb, reaction = null) {
-    newSubscription(cb, reaction, false);
+    const sub = newSubscription(cb, reaction, false);
+    runSubscription(sub);
+}
+function useMemo(cb) {
+    const reactors = new Set();
+    let state = 0;
+    let value;
+    const sub = newSubscription(() => {
+        if (state === 0) {
+            sub.iteration--;
+        }
+        else if (state === 1) {
+            state = 2;
+            value = cb();
+        }
+        else {
+            sub.iteration--;
+            state = 0;
+            for (const reactor of reactors) {
+                renderReactor(reactor, reactor.effect);
+            }
+        }
+    }, null, true);
+    return () => {
+        if (state === 0) {
+            state = 1;
+            runSubscription(sub);
+        }
+        if (!sub.cancelled) {
+            const reactor = currentReactor[currentReactor.length - 1];
+            if (reactor) {
+                reactors.add(reactor);
+                reactor.states.set(reactors, reactor.iteration);
+            }
+        }
+        return value;
+    };
 }
 function useDispose(cb) {
     const container = currentSubscriptions[currentSubscriptions.length - 1];
@@ -107,8 +147,10 @@ function useDispose(cb) {
     }
 }
 function newSubscription(cb, reaction, effect) {
-    const sub = {
+    return {
         cb: cb,
+        firstRun: true,
+        lastValue: null,
         reaction: reaction,
         iteration: 0,
         states: new Map(),
@@ -117,16 +159,6 @@ function newSubscription(cb, reaction, effect) {
         cancelled: false,
         pending: false
     };
-    renderReactor(sub, true);
-    if (sub.states.size === 0) {
-        cancelSubscription(sub);
-    }
-    else {
-        const container = currentSubscriptions[currentSubscriptions.length - 1];
-        if (container) {
-            container.list.push(sub);
-        }
-    }
 }
 function cancelSubscription(sub) {
     sub.cancelled = true;
@@ -136,6 +168,7 @@ function cancelSubscription(sub) {
 }
 function runSubscription(sub) {
     sub.pending = false;
+    sub.iteration++;
     reactor.set(sub);
     const res = sub.cb();
     reactor.reset();
@@ -144,5 +177,24 @@ function runSubscription(sub) {
             sub.states.delete(state);
         }
     }
-    sub.reaction?.(res, sub.states.size > 0);
+    if (sub.states.size === 0) {
+        cancelSubscription(sub);
+    }
+    if (sub.firstRun) {
+        sub.firstRun = false;
+        if (sub.states.size > 0) {
+            const container = currentSubscriptions[currentSubscriptions.length - 1];
+            if (container) {
+                container.list.push(sub);
+            }
+        }
+        if (sub.reaction) {
+            sub.lastValue = res;
+            sub.reaction(res, sub.cancelled);
+        }
+    }
+    else if (sub.reaction && sub.lastValue !== res) {
+        sub.lastValue = res;
+        sub.reaction(res, sub.cancelled);
+    }
 }

package/lib/types/State.d.ts

@@ -1,10 +1,12 @@
 export type Getter<T> = () => T;
 export type Setter<T> = (value: T) => void;
 export type State<T> = [get: Getter<T>, set: Setter<T>];
-export type Subscription<T> = {
+type Subscription<T> = {
     cb: () => T;
-    reaction: ((data: T, isState: boolean) => void) | null;
     iteration: number;
+    lastValue: T | null;
+    firstRun: boolean;
+    reaction: ((data: T, lastReaction: boolean) => void) | null;
     states: Map<Set<Subscription<any>>, number>;
     next: Subscription<T> | null;
     effect: boolean;
@@ -21,6 +23,8 @@ export declare namespace subscriptions {
     function reset(): void;
 }
 export declare function useState<T>(value: T): State<T>;
-export declare function useEffect<T>(cb: () => T, reaction?: ((data: T, isState: boolean) => void) | null): void;
-export declare function useRender<T>(cb: () => T, reaction?: ((data: T, isState: boolean) => void) | null): void;
+export declare function useEffect<T>(cb: () => T, reaction?: ((data: T, lastReaction: boolean) => void) | null): void;
+export declare function useRender<T>(cb: () => T, reaction?: ((data: T, lastReaction: boolean) => void) | null): void;
+export declare function useMemo<T>(cb: () => T): Getter<T>;
 export declare function useDispose(cb: () => void): void;
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nesquick",
-  "version": "0.0.27",
+  "version": "1.0.0",
   "description": "React-like library with focus on drawing performance",
   "types": "./lib/types",
   "main": "./lib",