yummies 5.7.0 → 5.7.1

package/mobx/lazy-observe.cjs

@@ -2,26 +2,19 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.lazyObserve = void 0;
 const mobx_1 = require("mobx");
+/**
+ * When ONE OF the properties is becomes observed then `onStart` function is called.
+ * WHen ALL properties are unobserved then `onEnd` function is called with the `metaData` that was returned by `onStart`.
+ *
+ * It uses `onBecomeObserved` and `onBecomeUnobserved` mobx hooks to perform lazy observation.
+ */
 const lazyObserve = ({ context, property, onStart, onEnd, endDelay = false, }) => {
     let timeoutId;
     let metaData;
+    const observingProps = new Set();
     const properties = Array.isArray(property) ? property : [property];
-    let isObserving = false;
-    const start = () => {
-        if (isObserving) {
-            return;
-        }
-        isObserving = true;
-        if (timeoutId) {
-            clearTimeout(timeoutId);
-            timeoutId = undefined;
-        }
-        metaData = onStart?.();
-    };
     const cleanup = () => {
-        if (!isObserving) {
-            return;
-        }
+        observingProps.clear();
         if (endDelay === false) {
             onEnd?.(metaData, cleanup);
             metaData = undefined;
@@ -37,14 +30,35 @@ const lazyObserve = ({ context, property, onStart, onEnd, endDelay = false, }) =
             metaData = undefined;
         }, endDelay);
     };
+    const start = (property) => {
+        const isAlreadyObserving = observingProps.size > 0;
+        observingProps.add(property);
+        if (isAlreadyObserving) {
+            return;
+        }
+        if (timeoutId) {
+            clearTimeout(timeoutId);
+            timeoutId = undefined;
+        }
+        metaData = onStart?.();
+    };
+    const stop = (property) => {
+        const isAlreadyNotObserving = !observingProps.size;
+        observingProps.delete(property);
+        const isObserving = observingProps.size > 0;
+        if (isAlreadyNotObserving || isObserving) {
+            return;
+        }
+        cleanup();
+    };
     properties.forEach((property) => {
         if (context) {
-            (0, mobx_1.onBecomeObserved)(context, property, start);
-            (0, mobx_1.onBecomeUnobserved)(context, property, cleanup);
+            (0, mobx_1.onBecomeObserved)(context, property, () => start(property));
+            (0, mobx_1.onBecomeUnobserved)(context, property, () => stop(property));
         }
         else {
-            (0, mobx_1.onBecomeObserved)(property, start);
-            (0, mobx_1.onBecomeUnobserved)(property, cleanup);
+            (0, mobx_1.onBecomeObserved)(property, () => start(property));
+            (0, mobx_1.onBecomeUnobserved)(property, () => stop(property));
         }
     });
     return cleanup;

package/mobx/lazy-observe.d.cts

@@ -1,3 +1,9 @@
+/**
+ * When ONE OF the properties is becomes observed then `onStart` function is called.
+ * WHen ALL properties are unobserved then `onEnd` function is called with the `metaData` that was returned by `onStart`.
+ *
+ * It uses `onBecomeObserved` and `onBecomeUnobserved` mobx hooks to perform lazy observation.
+ */
 export declare const lazyObserve: <TMetaData = void>({ context, property, onStart, onEnd, endDelay, }: {
     context?: any;
     property: any | any[];

package/mobx/lazy-observe.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"lazy-observe.d.ts","sourceRoot":"","sources":["../../src/mobx/lazy-observe.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,WAAW,GAAI,SAAS,GAAG,IAAI,EAAE,kDAM3C;IACD,OAAO,CAAC,EAAE,GAAG,CAAC;IACd,QAAQ,EAAE,GAAG,GAAG,GAAG,EAAE,CAAC;IACtB,OAAO,CAAC,EAAE,MAAM,SAAS,CAAC;IAC1B,KAAK,CAAC,EAAE,CAAC,QAAQ,EAAE,SAAS,EAAE,SAAS,EAAE,YAAY,KAAK,IAAI,CAAC;IAC/D,QAAQ,CAAC,EAAE,MAAM,GAAG,KAAK,CAAC;CAC3B,eAmDA,CAAC"}
+{"version":3,"file":"lazy-observe.d.ts","sourceRoot":"","sources":["../../src/mobx/lazy-observe.ts"],"names":[],"mappings":"AAEA;;;;;GAKG;AACH,eAAO,MAAM,WAAW,GAAI,SAAS,GAAG,IAAI,EAAE,kDAM3C;IACD,OAAO,CAAC,EAAE,GAAG,CAAC;IACd,QAAQ,EAAE,GAAG,GAAG,GAAG,EAAE,CAAC;IACtB,OAAO,CAAC,EAAE,MAAM,SAAS,CAAC;IAC1B,KAAK,CAAC,EAAE,CAAC,QAAQ,EAAE,SAAS,EAAE,SAAS,EAAE,YAAY,KAAK,IAAI,CAAC;IAC/D,QAAQ,CAAC,EAAE,MAAM,GAAG,KAAK,CAAC;CAC3B,eAoEA,CAAC"}

package/mobx/lazy-observe.d.ts

@@ -1,3 +1,9 @@
+/**
+ * When ONE OF the properties is becomes observed then `onStart` function is called.
+ * WHen ALL properties are unobserved then `onEnd` function is called with the `metaData` that was returned by `onStart`.
+ *
+ * It uses `onBecomeObserved` and `onBecomeUnobserved` mobx hooks to perform lazy observation.
+ */
 export declare const lazyObserve: <TMetaData = void>({ context, property, onStart, onEnd, endDelay, }: {
     context?: any;
     property: any | any[];

package/mobx/lazy-observe.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"lazy-observe.d.ts","sourceRoot":"","sources":["../../src/mobx/lazy-observe.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,WAAW,GAAI,SAAS,GAAG,IAAI,EAAE,kDAM3C;IACD,OAAO,CAAC,EAAE,GAAG,CAAC;IACd,QAAQ,EAAE,GAAG,GAAG,GAAG,EAAE,CAAC;IACtB,OAAO,CAAC,EAAE,MAAM,SAAS,CAAC;IAC1B,KAAK,CAAC,EAAE,CAAC,QAAQ,EAAE,SAAS,EAAE,SAAS,EAAE,YAAY,KAAK,IAAI,CAAC;IAC/D,QAAQ,CAAC,EAAE,MAAM,GAAG,KAAK,CAAC;CAC3B,eAmDA,CAAC"}
+{"version":3,"file":"lazy-observe.d.ts","sourceRoot":"","sources":["../../src/mobx/lazy-observe.ts"],"names":[],"mappings":"AAEA;;;;;GAKG;AACH,eAAO,MAAM,WAAW,GAAI,SAAS,GAAG,IAAI,EAAE,kDAM3C;IACD,OAAO,CAAC,EAAE,GAAG,CAAC;IACd,QAAQ,EAAE,GAAG,GAAG,GAAG,EAAE,CAAC;IACtB,OAAO,CAAC,EAAE,MAAM,SAAS,CAAC;IAC1B,KAAK,CAAC,EAAE,CAAC,QAAQ,EAAE,SAAS,EAAE,SAAS,EAAE,YAAY,KAAK,IAAI,CAAC;IAC/D,QAAQ,CAAC,EAAE,MAAM,GAAG,KAAK,CAAC;CAC3B,eAoEA,CAAC"}

package/mobx/lazy-observe.js

@@ -1,24 +1,17 @@
 import { onBecomeObserved, onBecomeUnobserved } from 'mobx';
+/**
+ * When ONE OF the properties is becomes observed then `onStart` function is called.
+ * WHen ALL properties are unobserved then `onEnd` function is called with the `metaData` that was returned by `onStart`.
+ *
+ * It uses `onBecomeObserved` and `onBecomeUnobserved` mobx hooks to perform lazy observation.
+ */
 export const lazyObserve = ({ context, property, onStart, onEnd, endDelay = false, }) => {
     let timeoutId;
     let metaData;
+    const observingProps = new Set();
     const properties = Array.isArray(property) ? property : [property];
-    let isObserving = false;
-    const start = () => {
-        if (isObserving) {
-            return;
-        }
-        isObserving = true;
-        if (timeoutId) {
-            clearTimeout(timeoutId);
-            timeoutId = undefined;
-        }
-        metaData = onStart?.();
-    };
     const cleanup = () => {
-        if (!isObserving) {
-            return;
-        }
+        observingProps.clear();
         if (endDelay === false) {
             onEnd?.(metaData, cleanup);
             metaData = undefined;
@@ -34,14 +27,35 @@ export const lazyObserve = ({ context, property, onStart, onEnd, endDelay = fals
             metaData = undefined;
         }, endDelay);
     };
+    const start = (property) => {
+        const isAlreadyObserving = observingProps.size > 0;
+        observingProps.add(property);
+        if (isAlreadyObserving) {
+            return;
+        }
+        if (timeoutId) {
+            clearTimeout(timeoutId);
+            timeoutId = undefined;
+        }
+        metaData = onStart?.();
+    };
+    const stop = (property) => {
+        const isAlreadyNotObserving = !observingProps.size;
+        observingProps.delete(property);
+        const isObserving = observingProps.size > 0;
+        if (isAlreadyNotObserving || isObserving) {
+            return;
+        }
+        cleanup();
+    };
     properties.forEach((property) => {
         if (context) {
-            onBecomeObserved(context, property, start);
-            onBecomeUnobserved(context, property, cleanup);
+            onBecomeObserved(context, property, () => start(property));
+            onBecomeUnobserved(context, property, () => stop(property));
         }
         else {
-            onBecomeObserved(property, start);
-            onBecomeUnobserved(property, cleanup);
+            onBecomeObserved(property, () => start(property));
+            onBecomeUnobserved(property, () => stop(property));
         }
     });
     return cleanup;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yummies",
-  "version": "5.7.0",
+  "version": "5.7.1",
   "keywords": [
     "javascript",
     "typescript",