@nifrajs/island-trigger 4.0.0 → 5.0.0

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,oGAAoG;AACpG,MAAM,MAAM,cAAc,GAAG,MAAM,GAAG,MAAM,GAAG,SAAS,GAAG;IAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAA;AAErF,2EAA2E;AAC3E,eAAO,MAAM,sBAAsB,MAAM,CAAA;AAEzC,MAAM,WAAW,cAAc;IAC7B,8FAA8F;IAC9F,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CACzB;AAyCD;;;;GAIG;AACH,wBAAgB,eAAe,CAC7B,QAAQ,EAAE,cAAc,EACxB,GAAG,EAAE,MAAM,IAAI,EACf,OAAO,GAAE,cAAmB,GAC3B,MAAM,IAAI,CAwFZ"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,oGAAoG;AACpG,MAAM,MAAM,cAAc,GAAG,MAAM,GAAG,MAAM,GAAG,SAAS,GAAG;IAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAA;AAErF,2EAA2E;AAC3E,eAAO,MAAM,sBAAsB,MAAM,CAAA;AAEzC,MAAM,WAAW,cAAc;IAC7B,8FAA8F;IAC9F,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CACzB;AAuCD;;;;GAIG;AACH,wBAAgB,eAAe,CAC7B,QAAQ,EAAE,cAAc,EACxB,GAAG,EAAE,MAAM,IAAI,EACf,OAAO,GAAE,cAAmB,GAC3B,MAAM,IAAI,CAgFZ"}

package/dist/index.js

@@ -5,7 +5,6 @@
  */
 /** The maximum media-query length accepted from an HTML data attribute. */
 export const MAX_MEDIA_QUERY_LENGTH = 256;
-const NOOP = () => { };
 const mediaQuery = (strategy) => {
     if (typeof strategy !== "object" || strategy === null)
         return undefined;
@@ -21,41 +20,42 @@ export function scheduleTrigger(strategy, run, options = {}) {
     // Cast through unknown so a consumer's DOM lib cannot merge its stricter Element signatures into
     // this structural, DOM-free contract.
     const browser = globalThis;
-    let fired = false;
     let disposed = false;
     let cleanup;
-    const fire = () => {
-        if (fired || disposed)
-            return;
-        fired = true;
+    // The one disposer every pending strategy returns; `cleanup` holds what that strategy registered.
+    const stop = () => {
+        disposed = true;
         cleanup?.();
         cleanup = undefined;
+    };
+    // Firing stops the trigger first, so a late event (or a dispose) finds it already done.
+    const fire = () => {
+        if (disposed)
+            return;
+        stop();
         run();
     };
     if (strategy === "load") {
         fire();
-        return NOOP;
+        return stop;
     }
     if (strategy === "idle") {
         const ric = browser.requestIdleCallback;
         if (ric === undefined) {
-            const handle = globalThis.setTimeout(fire, 1);
-            return () => {
-                disposed = true;
-                globalThis.clearTimeout(handle);
-            };
+            const handle = setTimeout(fire, 1);
+            cleanup = () => clearTimeout(handle);
         }
-        const handle = ric(fire);
-        return () => {
-            disposed = true;
-            browser.cancelIdleCallback?.(handle);
-        };
+        else {
+            const handle = ric(fire);
+            cleanup = () => browser.cancelIdleCallback?.(handle);
+        }
+        return stop;
     }
     if (strategy === "visible") {
         const Observer = browser.IntersectionObserver;
         if (options.target === undefined || Observer === undefined) {
             fire();
-            return NOOP;
+            return stop;
         }
         const observer = new Observer((entries) => {
             if (entries.some((entry) => entry.isIntersecting))
@@ -63,26 +63,22 @@ export function scheduleTrigger(strategy, run, options = {}) {
         });
         observer.observe(options.target);
         cleanup = () => observer.disconnect();
-        return () => {
-            disposed = true;
-            cleanup?.();
-            cleanup = undefined;
-        };
+        return stop;
     }
     const query = mediaQuery(strategy);
     const matchMedia = browser.matchMedia;
     if (query === undefined)
-        return NOOP;
+        return stop;
     if (matchMedia === undefined) {
         // No matchMedia means the browser cannot honor a conditional trigger. Immediate activation is
         // the availability fallback; malformed/oversized queries remain inert above.
         fire();
-        return NOOP;
+        return stop;
     }
     const list = matchMedia(query);
     if (list.matches) {
         fire();
-        return NOOP;
+        return stop;
     }
     const onChange = (event) => {
         if (event.matches)
@@ -97,12 +93,8 @@ export function scheduleTrigger(strategy, run, options = {}) {
         cleanup = () => list.removeListener?.(onChange);
     }
     else {
-        return NOOP;
+        return stop;
     }
-    return () => {
-        disposed = true;
-        cleanup?.();
-        cleanup = undefined;
-    };
+    return stop;
 }
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nifrajs/island-trigger",
-  "version": "4.0.0",
+  "version": "5.0.0",
   "description": "Tiny, framework-neutral island trigger scheduler for nifra.",
   "keywords": [
     "nifra",

package/src/index.ts

@@ -15,8 +15,6 @@ export interface TriggerOptions {
   readonly target?: object
 }
 
-const NOOP = (): void => {}
-
 /** Structural event shape used instead of a DOM lib type so this package stays runtime-neutral. */
 interface MediaQueryChangeEvent {
   readonly matches: boolean
@@ -67,71 +65,67 @@ export function scheduleTrigger(
   // Cast through unknown so a consumer's DOM lib cannot merge its stricter Element signatures into
   // this structural, DOM-free contract.
   const browser = globalThis as unknown as BrowserCapabilities
-  let fired = false
   let disposed = false
   let cleanup: (() => void) | undefined
 
-  const fire = (): void => {
-    if (fired || disposed) return
-    fired = true
+  // The one disposer every pending strategy returns; `cleanup` holds what that strategy registered.
+  const stop = (): void => {
+    disposed = true
     cleanup?.()
     cleanup = undefined
+  }
+  // Firing stops the trigger first, so a late event (or a dispose) finds it already done.
+  const fire = (): void => {
+    if (disposed) return
+    stop()
     run()
   }
 
   if (strategy === "load") {
     fire()
-    return NOOP
+    return stop
   }
 
   if (strategy === "idle") {
     const ric = browser.requestIdleCallback
     if (ric === undefined) {
-      const handle = globalThis.setTimeout(fire, 1)
-      return () => {
-        disposed = true
-        globalThis.clearTimeout(handle)
-      }
-    }
-    const handle = ric(fire)
-    return () => {
-      disposed = true
-      browser.cancelIdleCallback?.(handle)
+      const handle = setTimeout(fire, 1)
+      cleanup = () => clearTimeout(handle)
+    } else {
+      const handle = ric(fire)
+      cleanup = () => browser.cancelIdleCallback?.(handle)
     }
+    return stop
   }
 
   if (strategy === "visible") {
     const Observer = browser.IntersectionObserver
     if (options.target === undefined || Observer === undefined) {
       fire()
-      return NOOP
+      return stop
     }
     const observer = new Observer((entries) => {
       if (entries.some((entry) => entry.isIntersecting)) fire()
     })
     observer.observe(options.target)
     cleanup = () => observer.disconnect()
-    return () => {
-      disposed = true
-      cleanup?.()
-      cleanup = undefined
-    }
+    return stop
   }
 
   const query = mediaQuery(strategy)
   const matchMedia = browser.matchMedia
-  if (query === undefined) return NOOP
+  if (query === undefined) return stop
   if (matchMedia === undefined) {
     // No matchMedia means the browser cannot honor a conditional trigger. Immediate activation is
     // the availability fallback; malformed/oversized queries remain inert above.
     fire()
-    return NOOP
+    return stop
   }
 
   const list = matchMedia(query)
   if (list.matches) {
     fire()
-    return NOOP
+    return stop
   }
 
   const onChange = (event: MediaQueryChangeEvent): void => {
@@ -144,11 +138,7 @@ export function scheduleTrigger(
     list.addListener(onChange)
     cleanup = () => list.removeListener?.(onChange)
   } else {
-    return NOOP
-  }
-  return () => {
-    disposed = true
-    cleanup?.()
-    cleanup = undefined
+    return stop
   }
+  return stop
 }