solid-ctrl-flow 1.0.40 → 1.0.42

package/dist/index.d.ts

@@ -19,11 +19,12 @@ declare const BASE_CTOR: new <T>() => Accessor<T>;
  * @param source The getter of the source of the binding
  * @param dest The setter of the destination of the binding
  * @param to Conversion function from {@link S} to {@link D}
+ * @param skip If it is `true`, {@link dest} won't be executed until the next change
  * @returns A function that disposes the binding
  */
-export declare function bind<S>(source: Accessor<S>, dest: Setter<S>): () => void;
+export declare function bind<S>(source: Accessor<S>, dest: Setter<S>, to?: undefined, skip?: boolean): () => void;
 
-export declare function bind<S, D>(source: Accessor<S>, dest: Setter<D>, to: Convert<S, D>): () => void;
+export declare function bind<S, D>(source: Accessor<S>, dest: Setter<D>, to: Convert<S, D>, skip?: boolean): () => void;
 
 /**
  * Creates a two-way binding between two {@link Signal}s calling {@link bind} two times
@@ -148,7 +149,7 @@ export declare function Enfold<T>(props: Unkeyed<T>): JSX.Element;
 declare type Equals = MemoOptions<unknown>["equals"];
 
 /** Informations about a {@link Source} component */
-declare type Info = {
+declare type Info = Slot & {
     /** Order of the current source if there are many */
     order?: number;
     children: JSX.Element;
@@ -244,6 +245,36 @@ export declare function runWithContext<T, V extends T, R>(ctx: Context<T>, value
 
 export declare function runWithContext<T, R>(ctx: Context<T>, value: T | undefined, f: (x: T) => R): R;
 
+/** Element which tracks its index in its containing array */
+export declare interface Slot {
+    slot?: number;
+}
+
+/** Utility of {@link Slot}s */
+export declare namespace Slot {
+    /**
+     * Pushes an element into a slotted list
+     * @param list The list in which to add the element
+     * @param v The element to add to {@link list}
+     * @returns The index of the new element
+     */
+    const push: <T extends Slot>(list: T[], v: T) => number;
+    /**
+     * Exactly like {@link removeSlotAt}, but it gets the index from {@link v}
+     * @param list The list from which to remove the element
+     * @param v The element to remove from {@link list}
+     * @returns The removed element
+     */
+    const remove: <T extends Slot>(list: T[], v: T) => T | undefined;
+    /**
+     * Removes an element from a slotted list
+     * @param list The list from which to remove the element
+     * @param i The index at which to remove the element
+     * @returns The removed element
+     */
+    export function removeAt<T extends Slot>(list: T[], i: number): T | undefined;
+}
+
 /**
  * Executes {@link splitProps} and memoizes the first of the two returned objects using {@link memoProps}
  * @param obj Object to split and partially memoize
@@ -293,7 +324,8 @@ declare type Unkeyed<T> = Standard<T> & {
 export declare function untrackCall<F extends (...args: any[]) => unknown>(this: ThisParameterType<F>, f: F, ...args: Parameters<F>): ReturnType<F>;
 
 /**
- * Calls an {@link Accessor} maintaining its reactivity at 1 level
+ * Calls an {@link Accessor} maintaining its reactivity at 1 level.
+ * The `typeof` operator on the output returns `"function"`, so you have to wrap it if you use it in, for example, in a {@link Setter} and you don't want it to be invoked
  * @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
  */

package/dist/index.mjs

@@ -81,12 +81,7 @@ function When(props) {
 function memoProps(obj, keys = Object.keys(obj), equals = false) {
   const out = {};
   for (const elm of keys)
-    Object.defineProperty(out, elm, {
-      enumerable: true,
-      get: createMemo(() => obj[elm], void 0, {
-        equals
-      })
-    });
+    Object.defineProperty(out, elm, { enumerable: true, get: createMemo(() => obj[elm], void 0, { equals }) });
   return out;
 }
 function splitAndMemoProps(obj, keys, equals) {
@@ -98,9 +93,7 @@ function createReactiveResource(f) {
   var refetch;
   const memo = createMemo(f);
   createEffect(on(memo, () => refetch?.()));
-  const [get] = [, {
-    refetch
-  }] = createResource(memo);
+  const [get] = [, { refetch }] = createResource(memo);
   return get;
 }
 function untrackCall(f, ...args) {
@@ -130,6 +123,23 @@ function Enfold(props) {
     children: (x) => createMemo(() => untrackCall(props.template, children, x))
   });
 }
+var Slot;
+((Slot2) => {
+  Slot2.push = (list, v) => v.slot = list.push(v) - 1;
+  Slot2.remove = (list, v) => v.slot != null ? removeAt(list, v.slot) : v;
+  function removeAt(list, i) {
+    if (i >= list.length)
+      return;
+    const last = list.pop();
+    if (i === list.length - 1)
+      return last;
+    const out = list[i];
+    out.slot = void 0;
+    list[last.slot = i] = last;
+    return out;
+  }
+  Slot2.removeAt = removeAt;
+})(Slot || (Slot = {}));
 function createExtractor(name = "extractor") {
   const ctx2 = createContext(void 0, {
     name
@@ -159,7 +169,7 @@ function Dest() {
   onCleanup(() => obj.attached--);
   return createComponent(For, {
     get each() {
-      return obj.source.sort((a, b) => a.order - b.order);
+      return obj.source.toSorted((a, b) => a.order - b.order);
     },
     children: (x) => createMemo(() => x.children)
   });
@@ -177,8 +187,8 @@ function Source(props) {
       return props.children;
     }
   };
-  obj.source.push(info);
-  onCleanup(() => obj.source.splice(obj.source.indexOf(createMutable(info)), 1));
+  Slot.push(obj.source, info);
+  onCleanup(() => Slot.remove(obj.source, info));
   return createComponent(Show, {
     get when() {
       return !obj.attached;
@@ -217,13 +227,13 @@ function Nest(props) {
   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));
+function bind(source, dest, to = IDENTITY, skip = false) {
+  const d = createRoot((d2) => (createRenderEffect(on(source, (x) => skip ? skip = false : 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);
+  const b = bind(dest[0], source[1], from, true);
   return () => (a(), b());
 }
 function toSetter(get, set) {
@@ -248,6 +258,7 @@ export {
   Enfold,
   Nest,
   ReactiveContext,
+  Slot,
   When,
   bind,
   bindTwoWay,

package/dist/index.umd.js

@@ -83,12 +83,7 @@
   function memoProps(obj, keys = Object.keys(obj), equals = false) {
     const out = {};
     for (const elm of keys)
-      Object.defineProperty(out, elm, {
-        enumerable: true,
-        get: solidJs.createMemo(() => obj[elm], void 0, {
-          equals
-        })
-      });
+      Object.defineProperty(out, elm, { enumerable: true, get: solidJs.createMemo(() => obj[elm], void 0, { equals }) });
     return out;
   }
   function splitAndMemoProps(obj, keys, equals) {
@@ -100,9 +95,7 @@
     var refetch;
     const memo = solidJs.createMemo(f);
     solidJs.createEffect(solidJs.on(memo, () => refetch?.()));
-    const [get] = [, {
-      refetch
-    }] = solidJs.createResource(memo);
+    const [get] = [, { refetch }] = solidJs.createResource(memo);
     return get;
   }
   function untrackCall(f, ...args) {
@@ -132,6 +125,23 @@
       children: (x) => solidJs.createMemo(() => untrackCall(props.template, children, x))
     });
   }
+  exports2.Slot = void 0;
+  ((Slot2) => {
+    Slot2.push = (list, v) => v.slot = list.push(v) - 1;
+    Slot2.remove = (list, v) => v.slot != null ? removeAt(list, v.slot) : v;
+    function removeAt(list, i) {
+      if (i >= list.length)
+        return;
+      const last = list.pop();
+      if (i === list.length - 1)
+        return last;
+      const out = list[i];
+      out.slot = void 0;
+      list[last.slot = i] = last;
+      return out;
+    }
+    Slot2.removeAt = removeAt;
+  })(exports2.Slot || (exports2.Slot = {}));
   function createExtractor(name = "extractor") {
     const ctx2 = solidJs.createContext(void 0, {
       name
@@ -161,7 +171,7 @@
     solidJs.onCleanup(() => obj.attached--);
     return solidJs.createComponent(solidJs.For, {
       get each() {
-        return obj.source.sort((a, b) => a.order - b.order);
+        return obj.source.toSorted((a, b) => a.order - b.order);
       },
       children: (x) => solidJs.createMemo(() => x.children)
     });
@@ -179,8 +189,8 @@
         return props.children;
       }
     };
-    obj.source.push(info);
-    solidJs.onCleanup(() => obj.source.splice(obj.source.indexOf(store.createMutable(info)), 1));
+    exports2.Slot.push(obj.source, info);
+    solidJs.onCleanup(() => exports2.Slot.remove(obj.source, info));
     return solidJs.createComponent(solidJs.Show, {
       get when() {
         return !obj.attached;
@@ -219,13 +229,13 @@
     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));
+  function bind(source, dest, to = IDENTITY, skip = false) {
+    const d = solidJs.createRoot((d2) => (solidJs.createRenderEffect(solidJs.on(source, (x) => skip ? skip = false : 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);
+    const b = bind(dest[0], source[1], from, true);
     return () => (a(), b());
   }
   function toSetter(get, set) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "solid-ctrl-flow",
-  "version": "1.0.40",
+  "version": "1.0.42",
   "description": "Control flow components for solid-js",
   "author": "AFatNiBBa",
   "license": "ISC",
@@ -34,6 +34,6 @@
     "switch",
     "case",
     "when",
-    "debug"
+    "slot"
   ]
 }