solid-ctrl-flow 1.0.28 → 1.0.29

package/dist/index.d.ts

@@ -187,13 +187,14 @@ export declare function memoProps<T, K extends readonly (keyof T)[] = (keyof T)[
 export declare function refCall<T, U extends T = T>(ref: Ref<T> | undefined, value: U): U;
 
 /**
- * Executes {@link f} with the provided {@link Context}
+ * Executes {@link f} with the provided value for the specified {@link Context}.
+ * You can pass `undefined` to {@link value} in order to get back the default value for {@link ctx}
  * @param ctx The context to which to set the value
  * @param value The value for the context
  * @param f The function to run
  * @returns The same thing {@link f} returned
  */
-export declare function runWithContext<T, R>(ctx: Context<T>, value: T, f: (x: T) => R): R;
+export declare function runWithContext<T, R>(ctx: Context<T>, value: T | undefined, f: (x: T | undefined) => R): R;
 
 /**
  * Executes {@link splitProps} and memoizes the first of the two returned objects

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { untrack, createMemo, splitProps, createContext, createRoot, getOwner, createEffect, on, createResource, createComponent, useContext, createRenderEffect, onCleanup, Match, mergeProps, For, Show, onMount } from "solid-js";
+import { untrack, createMemo, splitProps, createContext, getOwner, runWithOwner, createEffect, on, createResource, createComponent, useContext, createRoot, createRenderEffect, onCleanup, Match, mergeProps, For, Show, onMount } from "solid-js";
 import { createMutable } from "solid-js/store";
 function untrackCall(f, ...args) {
   return untrack(() => f.apply(this, args));
@@ -43,19 +43,18 @@ function createOption(init, def = init, name) {
   return provider;
 }
 function runWithContext(ctx2, value, f) {
-  return createRoot((d) => {
-    try {
-      getOwner().context = {
-        [ctx2.id]: value
-      };
-      const out = f(value);
-      if (out instanceof Promise)
-        return out.finally(d);
-      return d(), out;
-    } catch (ex) {
-      throw d(), ex;
-    }
-  });
+  const owner = getOwner();
+  const context = {
+    ...owner?.context,
+    [ctx2.id]: value
+  };
+  const temp = {
+    context,
+    owner,
+    owned: null,
+    cleanups: null
+  };
+  return runWithOwner(temp, () => f(value));
 }
 function createReactiveResource(f) {
   var refetch;

package/dist/index.umd.js

@@ -45,19 +45,18 @@
     return provider;
   }
   function runWithContext(ctx2, value, f) {
-    return solidJs.createRoot((d) => {
-      try {
-        solidJs.getOwner().context = {
-          [ctx2.id]: value
-        };
-        const out = f(value);
-        if (out instanceof Promise)
-          return out.finally(d);
-        return d(), out;
-      } catch (ex) {
-        throw d(), ex;
-      }
-    });
+    const owner = solidJs.getOwner();
+    const context = {
+      ...owner?.context,
+      [ctx2.id]: value
+    };
+    const temp = {
+      context,
+      owner,
+      owned: null,
+      cleanups: null
+    };
+    return solidJs.runWithOwner(temp, () => f(value));
   }
   function createReactiveResource(f) {
     var refetch;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "solid-ctrl-flow",
-  "version": "1.0.28",
+  "version": "1.0.29",
   "description": "Control flow components for solid-js",
   "author": "AFatNiBBa",
   "license": "ISC",