solid-ctrl-flow 2.0.0 → 2.1.0

package/dist/index.d.ts

@@ -4,6 +4,7 @@ import { JSX } from 'solid-js';
 import { MemoOptions } from 'solid-js';
 import { Owner } from 'solid-js';
 import { ParentProps } from 'solid-js';
+import { splitProps } from 'solid-js';
 
 /** Like a {@link Match} but gets the value from the closest {@link On} ancestor */
 export declare function Case(props: ParentProps<{
@@ -28,7 +29,7 @@ export declare function Case(props: ParentProps<{
  *          </e.Source>
  *      </div>
  *  </e.Joint>
- * <>
+ * </>
  * ```
  * @param name Name to give to the context of the extractor
  */
@@ -108,7 +109,7 @@ export declare function memoProps<T, K extends readonly (keyof T)[]>(obj: T, key
  *          Default
  *      </Match>
  *  </Switch>
- * <>
+ * </>
  * ```
  */
 export declare function On<T>(props: ParentProps<{
@@ -163,13 +164,11 @@ export declare namespace Slot {
 }
 
 /**
- * Executes {@link splitProps} and memoizes the first of the two returned objects using {@link memoProps}.
- * Unlike {@link splitProps}, this doesn't support multiple key-sets out of the box
+ * Executes {@link splitProps} and memoizes every returned object but the last one using {@link memoProps}
  * @param obj Object to split and partially memoize
- * @param keys The keys of the properties to memoize and to include in the first of the two objects
- * @param equals The comparator function to use on the newly created memos
+ * @param keys The lists of the keys to split from {@link obj}
  */
-export declare function splitAndMemoProps<T extends Record<any, any>, K extends readonly (keyof T)[]>(obj: T, keys: K, equals?: Equals): [Pick<T, Extract<K, readonly (keyof T)[]>[number]>, Omit<T, K[number]>];
+export declare const splitAndMemoProps: typeof splitProps;
 
 /** Standard parameters to pass to an {@link Enfold} */
 declare type Standard<T> = ParentProps<{

package/dist/index.mjs

@@ -6,11 +6,12 @@ function memoProps(obj, keys = Reflect.ownKeys(obj), equals = false) {
     Object.defineProperty(out, elm, { enumerable: true, get: createMemo(() => obj[elm], void 0, { equals }) });
   return out;
 }
-function splitAndMemoProps(obj, keys, equals) {
-  const out = splitProps(obj, keys);
-  out[0] = memoProps(out[0], keys, equals);
+const splitAndMemoProps = (obj, ...keys) => {
+  const out = splitProps(obj, ...keys);
+  for (var i = 0; i < keys.length; i++)
+    out[i] = memoProps(out[i], keys[i]);
   return out;
-}
+};
 function untrackCall(f, ...args) {
   return untrack(() => f.apply(this, args));
 }

package/dist/index.umd.js

@@ -8,11 +8,12 @@
       Object.defineProperty(out, elm, { enumerable: true, get: solidJs.createMemo(() => obj[elm], void 0, { equals }) });
     return out;
   }
-  function splitAndMemoProps(obj, keys, equals) {
-    const out = solidJs.splitProps(obj, keys);
-    out[0] = memoProps(out[0], keys, equals);
+  const splitAndMemoProps = (obj, ...keys) => {
+    const out = solidJs.splitProps(obj, ...keys);
+    for (var i = 0; i < keys.length; i++)
+      out[i] = memoProps(out[i], keys[i]);
     return out;
-  }
+  };
   function untrackCall(f, ...args) {
     return solidJs.untrack(() => f.apply(this, args));
   }

package/package.json

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