solid-ctrl-flow 1.0.42 → 1.0.44

package/dist/index.d.ts

@@ -75,7 +75,7 @@ export declare const Case: (props: {
 
 /**
  * Returns a {@link Signal} that applies the `??=` operator to the input one.
- * If the getter of {@link param0} is like "x", then the result one is like "(x ??= {@link f}())"
+ * If the getter of {@link param0} is like `x`, then the result one is like "(x ??= {@link f}())"
  * @param param0 The {@link Signal} to which to coalesce the getter
  * @param f An {@link Accessor} to the value to use when there's a nullish value
  */
@@ -97,8 +97,8 @@ export declare type Convert<S, D> = (x: S, prev: D) => D;
  *      </div>
  *      <div id="something-else">
  *          <e.Source>
- *              This text will be shown instead of "e.Dest".
- *              If there weren't to be any "e.Joint" ancestor, then this text would have stayed here
+ *              This text will be shown instead of `e.Dest`.
+ *              If there weren't to be any `e.Joint` ancestor, then this text would have stayed here
  *          </e.Source>
  *      </div>
  *  </e.Joint>
@@ -335,11 +335,11 @@ export declare const unwrap: <T extends object>(f: Accessor<T>) => T;
  * Calls {@link f} maintaining its reactivity at 2 levels.
  * Unlike the normal {@link unwrap}, this maintains reactivity on the elements of the array too, which means that it can be destructured
  * ```ts
- * const first = unwrap(f);         // The value of "first" is reactive but CANNOT be destructured
- * const [ getFirst ] = first;      // The value of "getFirst" is NOT reactive, it's the first element of the CURRENT signal returned by "f"
+ * const first = unwrap(f);         // The value of `first` is reactive but CANNOT be destructured
+ * const [ getFirst ] = first;      // The value of `getFirst()` is NOT reactive, it's the first element of the CURRENT signal returned by `f()`
  *
- * const second = unwrapSignal(f);  // The value of "second" is reactive and CAN be destructured
- * const [ getSecond ] = second;    // The value of "getSecond" IS reactive, it's a function that calls "f", gets the first element and calls that too
+ * const second = unwrapSignal(f);  // The value of `second` is reactive and CAN be destructured
+ * const [ getSecond ] = second;    // The value of `getSecond()` IS reactive, it's a function that calls `f()`, gets the first element and calls that too
  * ```
  * @param f An {@link Accessor} to a {@link Signal}
  */

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { useContext, createMemo, createComponent, createContext, createRoot, getOwner, Match, mergeProps, splitProps, createEffect, on, createResource, untrack, Show, onCleanup, For, mapArray, createSignal, onMount, createRenderEffect } from "solid-js";
+import { useContext, createMemo, createComponent, createContext, createRoot, getOwner, Match, mergeProps, splitProps, createEffect, on, createResource, untrack, Show, onCleanup, For, mapArray, createSignal, onMount, createRenderEffect, getListener } from "solid-js";
 import { createMutable } from "solid-js/store";
 const BASE_CTOR = Function;
 class ReactiveContext extends BASE_CTOR {
@@ -131,7 +131,7 @@ var Slot;
     if (i >= list.length)
       return;
     const last = list.pop();
-    if (i === list.length - 1)
+    if (i === list.length)
       return last;
     const out = list[i];
     out.slot = void 0;
@@ -246,12 +246,23 @@ 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 coalesceSignal([get, set], f) {
+  return [getter, set];
+  function getter() {
+    const out = get();
+    if (out != null)
+      return out;
+    const listener = getListener(), { state } = listener;
+    try {
+      return set(f);
+    } finally {
+      listener.state = state;
+    }
+  }
+}
 const debug = ReactiveContext.create(false, "debug-scope");
 export {
   Case,

package/dist/index.umd.js

@@ -133,7 +133,7 @@
       if (i >= list.length)
         return;
       const last = list.pop();
-      if (i === list.length - 1)
+      if (i === list.length)
         return last;
       const out = list[i];
       out.slot = void 0;
@@ -248,12 +248,23 @@
     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 coalesceSignal([get, set], f) {
+    return [getter, set];
+    function getter() {
+      const out = get();
+      if (out != null)
+        return out;
+      const listener = solidJs.getListener(), { state } = listener;
+      try {
+        return set(f);
+      } finally {
+        listener.state = state;
+      }
+    }
+  }
   const debug = ReactiveContext.create(false, "debug-scope");
   exports2.Case = Case;
   exports2.Enfold = Enfold;

package/package.json

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

package/readMe.md

@@ -180,11 +180,11 @@ Functions that create bindings between `Signal`s
 > #### `toSignal()`
 > Creates a `Signal` from a property of an object
 > 
-> #### `coalesceSignal()`
-> Creates a non nullable `Signal` from a nullable one
-> 
 > #### `unwrapSignal()`
 > A `Signal`-specific version of `unwrap()` that allows the destructuring of its result
+> 
+> #### `coalesceSignal()`
+> Creates a non nullable `Signal` from a nullable one
 
 ### `ReactiveContext.create()`
 Method that creates a reactive version of a solid `Context` with some additional built-in functionalities