solid-ctrl-flow 1.0.21 → 1.0.23

package/dist/index.d.ts

@@ -199,6 +199,12 @@ export declare function toSignal<T, K extends keyof T>(obj: T, k: K): Signal<T[K
  */
 export declare function untrackCall<F extends (...args: any[]) => any>(this: ThisParameterType<F>, f: F, ...args: Parameters<F>): any;
 
+/**
+ * Calls {@link f} maintaining its reactivity
+ * @param f An {@link Accessor} to a {@link Signal}
+ */
+export declare function unwrapSignal<T>(f: Accessor<Signal<T>>): Signal<T>;
+
 /** Like a {@link Match} but gets the value from the closest {@link Case} ancestor */
 export declare function When(props: {
     value: unknown;

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { untrack, createMemo, splitProps, createResource, createEffect, on, createContext, createRoot, getOwner, createComponent, useContext, onCleanup, Match, mergeProps, For, Show } from "solid-js";
+import { untrack, createMemo, splitProps, createEffect, on, createResource, createContext, createRoot, getOwner, createComponent, useContext, onCleanup, Match, mergeProps, For, Show } from "solid-js";
 import { createMutable } from "solid-js/store";
 function untrackCall(f, ...args) {
   return untrack(() => f.apply(this, args));
@@ -18,11 +18,12 @@ function splitAndMemoProps(obj, keys) {
   return out;
 }
 function createReactiveResource(f) {
+  var refetch;
   const memo = createMemo(f);
-  const [get, {
+  createEffect(on(memo, () => refetch?.()));
+  const [get] = [, {
     refetch
   }] = createResource(memo);
-  createEffect(on(memo, (_x, _prev, ok) => (ok && refetch(), true)));
   return get;
 }
 function createOption(init, def = init, name) {
@@ -58,6 +59,15 @@ function runWithContext(ctx2, value, f) {
   });
 }
 const IDENTITY = (x) => x;
+function bind(source, dest, to = IDENTITY) {
+  const d = createRoot((d2) => (createEffect(on(source[0], (x) => dest[1]((prev) => to(x, prev)))), d2));
+  return onCleanup(d), d;
+}
+function bindTwoWay(source, dest, to = IDENTITY, from = IDENTITY) {
+  const a = bind(source, dest, to);
+  const b = bind(dest, source, from);
+  return () => (a(), b());
+}
 function toSetter(get, set) {
   return (x) => {
     const out = typeof x === "function" ? x(untrack(get)) : x;
@@ -68,14 +78,8 @@ function toSignal(obj, k) {
   const get = () => obj[k];
   return [get, toSetter(get, (v) => obj[k] = v)];
 }
-function bind(source, dest, to = IDENTITY) {
-  const d = createRoot((d2) => (createEffect(on(source[0], (x) => dest[1]((prev) => to(x, prev)))), d2));
-  return onCleanup(d), d;
-}
-function bindTwoWay(source, dest, to = IDENTITY, from = IDENTITY) {
-  const a = bind(source, dest, to);
-  const b = bind(dest, source, from);
-  return () => (a(), b());
+function unwrapSignal(f) {
+  return [() => f()[0](), (x) => f()[1](x)];
 }
 const ctx = createContext(() => void 0, {
   name: "case-when"
@@ -187,5 +191,6 @@ export {
   splitAndMemoProps,
   toSetter,
   toSignal,
-  untrackCall
+  untrackCall,
+  unwrapSignal
 };

package/dist/index.umd.js

@@ -20,11 +20,12 @@
     return out;
   }
   function createReactiveResource(f) {
+    var refetch;
     const memo = solidJs.createMemo(f);
-    const [get, {
+    solidJs.createEffect(solidJs.on(memo, () => refetch?.()));
+    const [get] = [, {
       refetch
     }] = solidJs.createResource(memo);
-    solidJs.createEffect(solidJs.on(memo, (_x, _prev, ok) => (ok && refetch(), true)));
     return get;
   }
   function createOption(init, def = init, name) {
@@ -60,6 +61,15 @@
     });
   }
   const IDENTITY = (x) => x;
+  function bind(source, dest, to = IDENTITY) {
+    const d = solidJs.createRoot((d2) => (solidJs.createEffect(solidJs.on(source[0], (x) => dest[1]((prev) => to(x, prev)))), d2));
+    return solidJs.onCleanup(d), d;
+  }
+  function bindTwoWay(source, dest, to = IDENTITY, from = IDENTITY) {
+    const a = bind(source, dest, to);
+    const b = bind(dest, source, from);
+    return () => (a(), b());
+  }
   function toSetter(get, set) {
     return (x) => {
       const out = typeof x === "function" ? x(solidJs.untrack(get)) : x;
@@ -70,14 +80,8 @@
     const get = () => obj[k];
     return [get, toSetter(get, (v) => obj[k] = v)];
   }
-  function bind(source, dest, to = IDENTITY) {
-    const d = solidJs.createRoot((d2) => (solidJs.createEffect(solidJs.on(source[0], (x) => dest[1]((prev) => to(x, prev)))), d2));
-    return solidJs.onCleanup(d), d;
-  }
-  function bindTwoWay(source, dest, to = IDENTITY, from = IDENTITY) {
-    const a = bind(source, dest, to);
-    const b = bind(dest, source, from);
-    return () => (a(), b());
+  function unwrapSignal(f) {
+    return [() => f()[0](), (x) => f()[1](x)];
   }
   const ctx = solidJs.createContext(() => void 0, {
     name: "case-when"
@@ -189,5 +193,6 @@
   exports2.toSetter = toSetter;
   exports2.toSignal = toSignal;
   exports2.untrackCall = untrackCall;
+  exports2.unwrapSignal = unwrapSignal;
   Object.defineProperty(exports2, Symbol.toStringTag, { value: "Module" });
 });

package/package.json

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

package/readMe.md

@@ -124,18 +124,20 @@ return <>Something else</>
 ## Bindings
 Functions that create bindings between `Signal`s
 
-### `toSetter()`
-Creates a full-fledged solid `Setter` from a normal one
-
-### `toSignal()`
-Creates a `Signal` from a property of an object
-
 ### `bind()`
 Creates a one-way binding between two `Signal`s
 
 ### `bindTwoWay()`
 Creates a two-way binding between two `Signal`s
 
+### `toSetter()`
+Creates a full-fledged solid `Setter` from a normal one
+
+### `toSignal()`
+Creates a `Signal` from a property of an object
+
+### `unwrapSignal()`
+Calls an `Accessor` to a `Signal` maintaining its reactivity
 
 ## Utility functions
 Utility functions needed for the components above