solid-js 1.8.7 → 1.8.8

package/dist/dev.cjs

@@ -152,7 +152,7 @@ const NO_INIT = {};
 var Owner = null;
 let Transition = null;
 let Scheduler = null;
-let ExternalSourceFactory = null;
+let ExternalSourceConfig = null;
 let Listener = null;
 let Updates = null;
 let Effects = null;
@@ -438,10 +438,11 @@ function batch(fn) {
   return runUpdates(fn, false);
 }
 function untrack(fn) {
-  if (Listener === null) return fn();
+  if (!ExternalSourceConfig && Listener === null) return fn();
   const listener = Listener;
   Listener = null;
   try {
+    if (ExternalSourceConfig) return ExternalSourceConfig.untrack(fn);
     return fn();
   } finally {
     Listener = listener;
@@ -594,22 +595,31 @@ let SuspenseContext;
 function getSuspenseContext() {
   return SuspenseContext || (SuspenseContext = createContext());
 }
-function enableExternalSource(factory) {
-  if (ExternalSourceFactory) {
-    const oldFactory = ExternalSourceFactory;
-    ExternalSourceFactory = (fn, trigger) => {
-      const oldSource = oldFactory(fn, trigger);
-      const source = factory(x => oldSource.track(x), trigger);
-      return {
-        track: x => source.track(x),
-        dispose() {
-          source.dispose();
-          oldSource.dispose();
-        }
-      };
+function enableExternalSource(factory, untrack = fn => fn()) {
+  if (ExternalSourceConfig) {
+    const {
+      factory: oldFactory,
+      untrack: oldUntrack
+    } = ExternalSourceConfig;
+    ExternalSourceConfig = {
+      factory: (fn, trigger) => {
+        const oldSource = oldFactory(fn, trigger);
+        const source = factory(x => oldSource.track(x), trigger);
+        return {
+          track: x => source.track(x),
+          dispose() {
+            source.dispose();
+            oldSource.dispose();
+          }
+        };
+      },
+      untrack: fn => oldUntrack(() => untrack(fn))
     };
   } else {
-    ExternalSourceFactory = factory;
+    ExternalSourceConfig = {
+      factory,
+      untrack
+    };
   }
 }
 function readSignal() {
@@ -752,14 +762,14 @@ function createComputation(fn, init, pure, state = STALE, options) {
     }
   }
   if (options && options.name) c.name = options.name;
-  if (ExternalSourceFactory) {
+  if (ExternalSourceConfig && c.fn) {
     const [track, trigger] = createSignal(undefined, {
       equals: false
     });
-    const ordinary = ExternalSourceFactory(c.fn, trigger);
+    const ordinary = ExternalSourceConfig.factory(c.fn, trigger);
     onCleanup(() => ordinary.dispose());
     const triggerInTransition = () => startTransition(trigger).then(() => inTransition.dispose());
-    const inTransition = ExternalSourceFactory(c.fn, triggerInTransition);
+    const inTransition = ExternalSourceConfig.factory(c.fn, triggerInTransition);
     c.fn = x => {
       track();
       return Transition && Transition.running ? inTransition.track(x) : ordinary.track(x);
@@ -1508,7 +1518,7 @@ function Show(props) {
 }
 function Switch(props) {
   let keyed = false;
-  const equals = (a, b) => a[0] === b[0] && (keyed ? a[1] === b[1] : !a[1] === !b[1]) && a[2] === b[2];
+  const equals = (a, b) => (keyed ? a[1] === b[1] : !a[1] === !b[1]) && a[2] === b[2];
   const conditions = children(() => props.children),
     evalConditions = createMemo(() => {
       let conds = conditions();