solid-ctrl-flow 1.0.38 → 1.0.39

package/dist/index.d.ts

@@ -269,10 +269,11 @@ export declare function toSignal<T, K extends keyof T>(obj: Accessor<T>, k: Acce
 export declare function untrackCall<F extends (...args: any[]) => unknown>(this: ThisParameterType<F>, f: F, ...args: Parameters<F>): ReturnType<F>;
 
 /**
- * Calls {@link f} maintaining its reactivity
- * @param f An {@link Accessor} to a {@link Signal}
+ * Calls an {@link Accessor} maintaining its reactivity
+ * @param f The {@link Accessor} to the value to emulate
+ * @returns A {@link Proxy} that copies the functionalities of the result of {@link f} calling it for each interaction, thus maintaining reactivity
  */
-export declare function unwrapSignal<T>(f: Accessor<Signal<T>>): Signal<T>;
+export declare const unwrap: <T>(f: Accessor<T>) => T;
 
 /** Like a {@link Match} but gets the value from the closest {@link Case} ancestor */
 export declare function When(props: {

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { useContext, createMemo, createComponent, createContext, Match, mergeProps, onCleanup, For, Show, mapArray, createSignal, onMount, createRoot, createRenderEffect, on, untrack, splitProps, getOwner, createEffect, createResource } from "solid-js";
+import { useContext, createMemo, createComponent, createContext, createRoot, getOwner, Match, mergeProps, onCleanup, For, Show, untrack, splitProps, createEffect, on, createResource, mapArray, createSignal, onMount, createRenderEffect } from "solid-js";
 import { createMutable } from "solid-js/store";
 const BASE_CTOR = Function;
 class ReactiveContext extends BASE_CTOR {
@@ -54,6 +54,16 @@ class ReactiveContext extends BASE_CTOR {
     return out;
   }
 }
+function runWithContext(ctx2, value, f) {
+  return createRoot((d) => {
+    try {
+      (getOwner().context ??= {})[ctx2.id] = value;
+      return f(value === void 0 ? ctx2.defaultValue : value);
+    } finally {
+      d();
+    }
+  });
+}
 const ctx = ReactiveContext.create(void 0, "case-when");
 const Case = ctx.Provider;
 function When(props) {
@@ -141,45 +151,6 @@ function Joint(props) {
     }
   });
 }
-function Nest(props) {
-  const memo = memoProps(props, ["template", "children"]);
-  const content = mapArray(() => props.each, (x, i) => {
-    const [get, set] = createSignal();
-    const out = memo.template(x, get, i);
-    return (x2) => {
-      onMount(() => set(() => x2));
-      onCleanup(() => set(void 0));
-      return out;
-    };
-  });
-  return createMemo(() => content().reduceRight((a, b) => b(a), memo.children));
-}
-const IDENTITY = (x) => x;
-function bind(source, dest, to = IDENTITY) {
-  const d = createRoot((d2) => (createRenderEffect(on(source, (x) => dest((prev) => to(x, prev)))), d2));
-  return onCleanup(d), d;
-}
-function bindTwoWay(source, dest, to, from) {
-  const a = bind(source[0], dest[1], to);
-  const b = bind(dest[0], source[1], 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 coalesceSignal([get, set], f) {
-  return [() => get() ?? set(f), set];
-}
-function unwrapSignal(f) {
-  return [() => f()[0](), (x) => f()[1](x)];
-}
 function untrackCall(f, ...args) {
   return untrack(() => f.apply(this, args));
 }
@@ -207,16 +178,6 @@ function splitAndMemoProps(obj, keys, equals) {
   out[0] = memoProps(out[0], keys, equals);
   return out;
 }
-function runWithContext(ctx2, value, f) {
-  return createRoot((d) => {
-    try {
-      (getOwner().context ??= {})[ctx2.id] = value;
-      return f(value === void 0 ? ctx2.defaultValue : value);
-    } finally {
-      d();
-    }
-  });
-}
 function createReactiveResource(f) {
   var refetch;
   const memo = createMemo(f);
@@ -226,6 +187,50 @@ function createReactiveResource(f) {
   }] = createResource(memo);
   return get;
 }
+function Nest(props) {
+  const memo = memoProps(props, ["template", "children"]);
+  const content = mapArray(() => props.each, (x, i) => {
+    const [get, set] = createSignal();
+    const out = memo.template(x, get, i);
+    return (x2) => {
+      onMount(() => set(() => x2));
+      onCleanup(() => set(void 0));
+      return out;
+    };
+  });
+  return createMemo(() => content().reduceRight((a, b) => b(a), memo.children));
+}
+const IDENTITY = (x) => x;
+function bind(source, dest, to = IDENTITY) {
+  const d = createRoot((d2) => (createRenderEffect(on(source, (x) => dest((prev) => to(x, prev)))), d2));
+  return onCleanup(d), d;
+}
+function bindTwoWay(source, dest, to, from) {
+  const a = bind(source[0], dest[1], to);
+  const b = bind(dest[0], source[1], 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 coalesceSignal([get, set], f) {
+  return [() => get() ?? set(f), set];
+}
+const unwrap = (f) => new Proxy(f, HANDLER);
+const HANDLER = new Proxy({}, {
+  get(cache, k) {
+    return cache[k] ??= (t, ...args) => {
+      return Reflect[k](t(), ...args);
+    };
+  }
+});
 const debug = ReactiveContext.create(false, "debug-scope");
 export {
   Case,
@@ -245,5 +250,5 @@ export {
   toSetter,
   toSignal,
   untrackCall,
-  unwrapSignal
+  unwrap
 };

package/dist/index.umd.js

@@ -56,6 +56,16 @@
       return out;
     }
   }
+  function runWithContext(ctx2, value, f) {
+    return solidJs.createRoot((d) => {
+      try {
+        (solidJs.getOwner().context ??= {})[ctx2.id] = value;
+        return f(value === void 0 ? ctx2.defaultValue : value);
+      } finally {
+        d();
+      }
+    });
+  }
   const ctx = ReactiveContext.create(void 0, "case-when");
   const Case = ctx.Provider;
   function When(props) {
@@ -143,45 +153,6 @@
       }
     });
   }
-  function Nest(props) {
-    const memo = memoProps(props, ["template", "children"]);
-    const content = solidJs.mapArray(() => props.each, (x, i) => {
-      const [get, set] = solidJs.createSignal();
-      const out = memo.template(x, get, i);
-      return (x2) => {
-        solidJs.onMount(() => set(() => x2));
-        solidJs.onCleanup(() => set(void 0));
-        return out;
-      };
-    });
-    return solidJs.createMemo(() => content().reduceRight((a, b) => b(a), memo.children));
-  }
-  const IDENTITY = (x) => x;
-  function bind(source, dest, to = IDENTITY) {
-    const d = solidJs.createRoot((d2) => (solidJs.createRenderEffect(solidJs.on(source, (x) => dest((prev) => to(x, prev)))), d2));
-    return solidJs.onCleanup(d), d;
-  }
-  function bindTwoWay(source, dest, to, from) {
-    const a = bind(source[0], dest[1], to);
-    const b = bind(dest[0], source[1], 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 coalesceSignal([get, set], f) {
-    return [() => get() ?? set(f), set];
-  }
-  function unwrapSignal(f) {
-    return [() => f()[0](), (x) => f()[1](x)];
-  }
   function untrackCall(f, ...args) {
     return solidJs.untrack(() => f.apply(this, args));
   }
@@ -209,16 +180,6 @@
     out[0] = memoProps(out[0], keys, equals);
     return out;
   }
-  function runWithContext(ctx2, value, f) {
-    return solidJs.createRoot((d) => {
-      try {
-        (solidJs.getOwner().context ??= {})[ctx2.id] = value;
-        return f(value === void 0 ? ctx2.defaultValue : value);
-      } finally {
-        d();
-      }
-    });
-  }
   function createReactiveResource(f) {
     var refetch;
     const memo = solidJs.createMemo(f);
@@ -228,6 +189,50 @@
     }] = solidJs.createResource(memo);
     return get;
   }
+  function Nest(props) {
+    const memo = memoProps(props, ["template", "children"]);
+    const content = solidJs.mapArray(() => props.each, (x, i) => {
+      const [get, set] = solidJs.createSignal();
+      const out = memo.template(x, get, i);
+      return (x2) => {
+        solidJs.onMount(() => set(() => x2));
+        solidJs.onCleanup(() => set(void 0));
+        return out;
+      };
+    });
+    return solidJs.createMemo(() => content().reduceRight((a, b) => b(a), memo.children));
+  }
+  const IDENTITY = (x) => x;
+  function bind(source, dest, to = IDENTITY) {
+    const d = solidJs.createRoot((d2) => (solidJs.createRenderEffect(solidJs.on(source, (x) => dest((prev) => to(x, prev)))), d2));
+    return solidJs.onCleanup(d), d;
+  }
+  function bindTwoWay(source, dest, to, from) {
+    const a = bind(source[0], dest[1], to);
+    const b = bind(dest[0], source[1], 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 coalesceSignal([get, set], f) {
+    return [() => get() ?? set(f), set];
+  }
+  const unwrap = (f) => new Proxy(f, HANDLER);
+  const HANDLER = new Proxy({}, {
+    get(cache, k) {
+      return cache[k] ??= (t, ...args) => {
+        return Reflect[k](t(), ...args);
+      };
+    }
+  });
   const debug = ReactiveContext.create(false, "debug-scope");
   exports2.Case = Case;
   exports2.Nest = Nest;
@@ -246,6 +251,6 @@
   exports2.toSetter = toSetter;
   exports2.toSignal = toSignal;
   exports2.untrackCall = untrackCall;
-  exports2.unwrapSignal = unwrapSignal;
+  exports2.unwrap = unwrap;
   Object.defineProperty(exports2, Symbol.toStringTag, { value: "Module" });
 });

package/package.json

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

package/readMe.md

@@ -150,9 +150,6 @@ Functions that create bindings between `Signal`s
 > 
 > #### `coalesceSignal()`
 > Creates a non nullable `Signal` from a nullable one
-> 
-> #### `unwrapSignal()`
-> Calls an `Accessor` to a `Signal` maintaining its reactivity
 
 ### `ReactiveContext.create()`
 Method that creates a reactive version of a solid `Context` with some additional built-in functionalities
@@ -163,6 +160,12 @@ const valueAccessorForTheCurrentOwner = ctx.read;
 const value = ctx();
 ```
 
+### `runWithContext()`
+Creates a context scope that persists for the duration of a function
+
+### `unwrap()`
+Calls an `Accessor` maintaining its reactivity
+
 ### `debug()`
 Allows you to define ui section that are only visible in debug or NOT in debug
 ```tsx
@@ -189,8 +192,5 @@ Creates a partial version of an object with memoized remaining properties
 ### `splitAndMemoProps()`
 Like `splitProps()` but memoizes the whole local part
 
-### `runWithContext()`
-Creates a context scope that persists for the duration of a function
-
 ### `createReactiveResource()`
 Like `createResource()` but the provided function will be reactive