solid-ctrl-flow 1.0.22 → 1.0.24

package/dist/index.d.ts

@@ -184,10 +184,10 @@ export declare function toSetter<T>(get: Accessor<T>, set: (x: T) => void): Sett
 
 /**
  * Creates a {@link Signal} from a property access
- * @param obj The object from which to get the property
- * @param k The key of the property
+ * @param obj The {@link Accessor} to the object from which to get the property
+ * @param k The {@link Accessor} to the key of the property
  */
-export declare function toSignal<T, K extends keyof T>(obj: T, k: K): Signal<T[K]>;
+export declare function toSignal<T, K extends keyof T>(obj: Accessor<T>, k: Accessor<K>): Signal<T[K]>;
 
 /**
  * Executes {@link f} untracking it.
@@ -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

@@ -59,16 +59,6 @@ function runWithContext(ctx2, value, f) {
   });
 }
 const IDENTITY = (x) => x;
-function toSetter(get, set) {
-  return (x) => {
-    const out = typeof x === "function" ? x(untrack(get)) : x;
-    return set(out), out;
-  };
-}
-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;
@@ -78,6 +68,19 @@ function bindTwoWay(source, dest, to = IDENTITY, from = IDENTITY) {
   const b = bind(dest, source, from);
   return () => (a(), b());
 }
+function toSetter(get, set) {
+  return (x) => {
+    const out = typeof x === "function" ? x(untrack(get)) : x;
+    return set(out), out;
+  };
+}
+function toSignal(obj, k) {
+  const get = () => obj()[k()];
+  return [get, toSetter(get, (v) => obj()[k()] = v)];
+}
+function unwrapSignal(f) {
+  return [() => f()[0](), (x) => f()[1](x)];
+}
 const ctx = createContext(() => void 0, {
   name: "case-when"
 });
@@ -188,5 +191,6 @@ export {
   splitAndMemoProps,
   toSetter,
   toSignal,
-  untrackCall
+  untrackCall,
+  unwrapSignal
 };

package/dist/index.umd.js

@@ -61,16 +61,6 @@
     });
   }
   const IDENTITY = (x) => x;
-  function toSetter(get, set) {
-    return (x) => {
-      const out = typeof x === "function" ? x(solidJs.untrack(get)) : x;
-      return set(out), out;
-    };
-  }
-  function toSignal(obj, k) {
-    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;
@@ -80,6 +70,19 @@
     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;
+      return set(out), out;
+    };
+  }
+  function toSignal(obj, k) {
+    const get = () => obj()[k()];
+    return [get, toSetter(get, (v) => obj()[k()] = v)];
+  }
+  function unwrapSignal(f) {
+    return [() => f()[0](), (x) => f()[1](x)];
+  }
   const ctx = solidJs.createContext(() => void 0, {
     name: "case-when"
   });
@@ -190,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.22",
+  "version": "1.0.24",
   "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