solid-ctrl-flow 4.1.0 → 5.0.0

package/dist/index.d.ts

@@ -86,17 +86,12 @@ declare type Keyed<T> = Standard<T> & {
 };
 
 /**
- * Memoizes some of the properties of {@link obj}.
- * If {@link keys} is not provided, memoizes everything that get returned by {@link Reflect.ownKeys} when provided with {@link obj}.
- * The {@link equals} parameter defaults to `false` to allow the specific reactive value to have control over when its dependant effects are triggered.
- * The memoized properties have {@link NO_OP} as setter, this is needed because {@link Ref}s are assigned if they're not functions, so an `undefined` forwarded {@link Ref} would throw in that case (In strict contexts)
- * @param obj Object to partially memoize
- * @param keys The keys of the properties to memoize
+ * Memoizes the properties of {@link obj}.
+ * The {@link equals} parameter defaults to `false` to allow the specific reactive value to have control over when its dependant effects are triggered
+ * @param obj The object to memoize
  * @param equals The comparator function to use on the newly created memos
  */
-export declare function memoProps<T>(obj: T, keys?: undefined, equals?: Equals): T;
-
-export declare function memoProps<T, K extends readonly (keyof T)[]>(obj: T, keys: K, equals?: Equals): Pick<T, K[number]>;
+export declare const memoProps: <T extends object>(obj: T, equals?: Equals) => T;
 
 /**
  * Allows the use of {@link Case}s inside of {@link Switch}es.

package/dist/index.mjs

@@ -1,19 +1,5 @@
-import { createMemo, splitProps, untrack, createRoot, getOwner, Show, createContext, useContext, onCleanup, For, createRenderEffect, on, createSignal, createSelector, equalFn, Match } from "solid-js";
+import { untrack, createRoot, getOwner, createMemo, Show, createContext, useContext, onCleanup, For, createRenderEffect, on, splitProps, createSignal, createSelector, equalFn, Match, runWithOwner } from "solid-js";
 import { createComponent, memo, mergeProps, spread } from "solid-js/web";
-const NO_OP = () => {
-};
-function memoProps(obj, keys = Reflect.ownKeys(obj), equals = false) {
-  const out = {};
-  for (const elm of keys)
-    Object.defineProperty(out, elm, { enumerable: true, set: NO_OP, get: createMemo(() => obj[elm], void 0, { equals }) });
-  return out;
-}
-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));
 }
@@ -229,6 +215,40 @@ function Case(props) {
     }
   });
 }
+const memoProps = (obj, equals) => new Proxy(obj, new MemoPropsHandler(getOwner(), 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;
+};
+class MemoPropsHandler {
+  constructor(owner, equals = false) {
+    this.owner = owner;
+    this.equals = equals;
+  }
+  cache = /* @__PURE__ */ Object.create(null);
+  /**
+   * -
+   * Memoizes each property that gets read
+   * @inheritdoc
+   */
+  get(t, k) {
+    const temp = k;
+    const cache = this.cache[temp] ??= this.memoize(t, temp);
+    return cache();
+  }
+  /**
+   * Memoizes a property of an object
+   * @param t The object containing the property
+   * @param k The key of the property
+   */
+  memoize(t, k) {
+    const name = `${memoProps.name}(${k.toString()})`;
+    const opts = { name, equals: this.equals };
+    return runWithOwner(this.owner, () => createMemo(() => t[k], void 0, opts));
+  }
+}
 function SameContext(props) {
   return createMemo(() => {
     getOwner().context = props.owner.context;

package/dist/index.umd.js

@@ -2,20 +2,6 @@
   typeof exports === "object" && typeof module !== "undefined" ? factory(exports, require("solid-js"), require("solid-js/web")) : typeof define === "function" && define.amd ? define(["exports", "solid-js", "solid-js/web"], factory) : (global = typeof globalThis !== "undefined" ? globalThis : global || self, factory(global.solidCtrlFlow = {}, global.solidJs, global.solidJsWeb));
 })(this, function(exports2, solidJs, web) {
   "use strict";
-  const NO_OP = () => {
-  };
-  function memoProps(obj, keys = Reflect.ownKeys(obj), equals = false) {
-    const out = {};
-    for (const elm of keys)
-      Object.defineProperty(out, elm, { enumerable: true, set: NO_OP, get: solidJs.createMemo(() => obj[elm], void 0, { equals }) });
-    return out;
-  }
-  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));
   }
@@ -231,6 +217,40 @@
       }
     });
   }
+  const memoProps = (obj, equals) => new Proxy(obj, new MemoPropsHandler(solidJs.getOwner(), 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;
+  };
+  class MemoPropsHandler {
+    constructor(owner, equals = false) {
+      this.owner = owner;
+      this.equals = equals;
+    }
+    cache = /* @__PURE__ */ Object.create(null);
+    /**
+     * -
+     * Memoizes each property that gets read
+     * @inheritdoc
+     */
+    get(t, k) {
+      const temp = k;
+      const cache = this.cache[temp] ??= this.memoize(t, temp);
+      return cache();
+    }
+    /**
+     * Memoizes a property of an object
+     * @param t The object containing the property
+     * @param k The key of the property
+     */
+    memoize(t, k) {
+      const name = `${memoProps.name}(${k.toString()})`;
+      const opts = { name, equals: this.equals };
+      return solidJs.runWithOwner(this.owner, () => solidJs.createMemo(() => t[k], void 0, opts));
+    }
+  }
   function SameContext(props) {
     return solidJs.createMemo(() => {
       solidJs.getOwner().context = props.owner.context;

package/package.json

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

package/readMe.md

@@ -225,10 +225,10 @@ return <>
 Calls an `Accessor` maintaining its reactivity at 1 level
 
 ### `memoProps()`
-Creates a partial version of an object with memoized remaining properties
+Memoizes the properties of an object
 
 ### `splitAndMemoProps()`
-Like `splitProps()` but memoizes the whole local part
+Like `splitProps()` but passes the every part except the last one to [`memoProps()`](#memoprops)
 
 ### `untrackCall()`
 Calls a function untracking what happens inside of it but not what gets passed as its argument