solid-ctrl-flow 6.1.0 → 6.1.2

package/dist/index.d.ts

@@ -11,6 +11,14 @@ export declare function Case(props: ParentProps<{
     value: unknown;
 }>): JSX;
 
+/**
+ * Runs {@link f} and ensures that its reactive resources are cleaned up not only when the current {@link Owner} is disposed, but also when the provided one is
+ * @param outer The {@link Owner} for which to listen for its disposal
+ * @param f The function to run
+ * @return The same thing {@link f} returned
+ */
+export declare function disposeWithOwner<T>(outer: Owner, f: Accessor<T>): T;
+
 /**
  * Eventually wraps its content into a template if a certain condition is met.
  * If you set {@link Standard.recycled} to `true`, the content will be memoized in the beginning and will be recycled even if the wrapper changes.

package/dist/index.mjs

@@ -1,12 +1,21 @@
-import { untrack, createRoot, getOwner, createMemo, Show, createContext, useContext, onCleanup, For, createRenderEffect, on, splitProps, createSignal, batch, createSelector, equalFn, Match, runWithOwner } from "solid-js";
+import { untrack, getOwner, createRoot, runWithOwner, onCleanup, createMemo, Show, createContext, useContext, For, createRenderEffect, on, splitProps, createSignal, batch, createSelector, equalFn, Match } from "solid-js";
 import { createComponent, memo, mergeProps, spread } from "solid-js/web";
 function untrackCall(f, ...args) {
   return untrack(() => f.apply(this, args));
 }
+function disposeWithOwner(outer, f) {
+  const inner = getOwner();
+  return createRoot((d) => {
+    runWithOwner(outer, () => onCleanup(d));
+    runWithOwner(inner, () => onCleanup(d));
+    return f();
+  });
+}
 function runWithContext(ctx2, value, f) {
   return createRoot((d) => {
     try {
-      (getOwner().context ??= {})[ctx2.id] = value;
+      const owner = getOwner();
+      owner.context = { ...owner.context, [ctx2.id]: value };
       return f(value === void 0 ? ctx2.defaultValue : value);
     } finally {
       d();
@@ -180,12 +189,13 @@ function Source(props) {
     sources
   } = state;
   const order = createMemo(() => props.order);
+  const owner = getOwner();
   const info = {
     get order() {
       return order();
     },
     get children() {
-      return props.children;
+      return disposeWithOwner(owner, () => props.children);
     }
   };
   const node = new OrderedLinkedListNode(info);
@@ -291,6 +301,7 @@ export {
   OrderedLinkedListNode,
   SameContext,
   Spread,
+  disposeWithOwner,
   memoProps,
   runWithContext,
   splitAndMemoProps,

package/dist/index.umd.js

@@ -5,10 +5,19 @@
   function untrackCall(f, ...args) {
     return solidJs.untrack(() => f.apply(this, args));
   }
+  function disposeWithOwner(outer, f) {
+    const inner = solidJs.getOwner();
+    return solidJs.createRoot((d) => {
+      solidJs.runWithOwner(outer, () => solidJs.onCleanup(d));
+      solidJs.runWithOwner(inner, () => solidJs.onCleanup(d));
+      return f();
+    });
+  }
   function runWithContext(ctx2, value, f) {
     return solidJs.createRoot((d) => {
       try {
-        (solidJs.getOwner().context ??= {})[ctx2.id] = value;
+        const owner = solidJs.getOwner();
+        owner.context = { ...owner.context, [ctx2.id]: value };
         return f(value === void 0 ? ctx2.defaultValue : value);
       } finally {
         d();
@@ -182,12 +191,13 @@
       sources
     } = state;
     const order = solidJs.createMemo(() => props.order);
+    const owner = solidJs.getOwner();
     const info = {
       get order() {
         return order();
       },
       get children() {
-        return props.children;
+        return disposeWithOwner(owner, () => props.children);
       }
     };
     const node = new OrderedLinkedListNode(info);
@@ -292,6 +302,7 @@
   exports2.OrderedLinkedListNode = OrderedLinkedListNode;
   exports2.SameContext = SameContext;
   exports2.Spread = Spread;
+  exports2.disposeWithOwner = disposeWithOwner;
   exports2.memoProps = memoProps;
   exports2.runWithContext = runWithContext;
   exports2.splitAndMemoProps = splitAndMemoProps;

package/package.json

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

package/readMe.md

@@ -235,5 +235,8 @@ Like `splitProps()` but passes the every part except the last one to [`memoProps
 ### `untrackCall()`
 Calls a function untracking what happens inside of it but not what gets passed as its argument
 
+### `disposeWithOwner()`
+Calls a function in a way that makes it so that the reactive resources it creates are managed by 2 `Owner`s
+
 ### `runWithContext()`
 Creates a context scope that persists for the duration of a function