solid-ctrl-flow 1.0.61 → 1.0.63

package/dist/index.d.ts

@@ -5,9 +5,6 @@ import { MemoOptions } from 'solid-js';
 import { Owner } from 'solid-js';
 import { ParentProps } from 'solid-js';
 
-/** Type hack for making {@link ReactiveContext} implement {@link Accessor} */
-declare const BASE_CTOR: new <T>() => Accessor<T>;
-
 /** Like a {@link Match} but gets the value from the closest {@link On} ancestor */
 export declare function Case(props: ParentProps<{
     value: unknown;
@@ -73,9 +70,6 @@ export declare function createExtractor(name?: string): {
     readonly extracting: () => number | null;
 };
 
-/** Built-in {@link ReactiveContext} which allows you to display different things in debug mode */
-export declare const debug: ReactiveContext<boolean>;
-
 /**
  * Eventually wraps its content into a template if a certain condition is met.
  * If you set {@link Standard.recycled} to `true`, the content will be memoized in the beginning and will be recycled even if the wrapper changes.
@@ -99,7 +93,7 @@ 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 Object.keys} when provided with {@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
  * @param obj Object to partially memoize
  * @param keys The keys of the properties to memoize
@@ -143,43 +137,6 @@ export declare const On: (props: ParentProps<{
     value: any;
 }>) => JSX.Element;
 
-/**
- * Reactive {@link Context} with some additional built-in functionalities.
- * The call signature returns the value in the current {@link Owner} (It's like calling {@link get})
- */
-export declare abstract class ReactiveContext<T> extends BASE_CTOR<T> {
-    /** The actual {@link Context} that contains the reactive {@link Accessor} to the value */
-    abstract ctx: Context<Accessor<T>>;
-    /**
-     * Returns the {@link Accessor} for the value in the current {@link Owner}.
-     * It's like calling {@link useContext}
-     */
-    get get(): Accessor<T>;
-    /**
-     * Component that sets the value of the current {@link Context} for its children.
-     * If no value is provided then it will use the default value for {@link ctx}.
-     * The function is bound for the way solid compiles components inside other objects.
-     * (The value is memoized)
-     */
-    get Provider(): (props: ParentProps<{
-        value?: T;
-    }>) => JSX.Element;
-    /**
-     * Executes {@link runWithContext} on the current context
-     * @param value The value for the context
-     * @param f The function to run
-     * @returns The same thing {@link f} returned
-     */
-    runWith<V extends T, R>(value: V | undefined, f: (x: V) => R): R;
-    /**
-     * Creates a {@link ReactiveContext}
-     * @param defaultValue Initial value for the context
-     * @param name Name to give to the context
-     */
-    static create<T>(defaultValue?: undefined, name?: string): ReactiveContext<T | undefined>;
-    static create<T>(defaultValue: T, name?: string): ReactiveContext<T>;
-}
-
 /**
  * Executes {@link f} with the provided value for the specified {@link Context}.
  * You can pass `undefined` to {@link value} in order to get back the default value for {@link ctx}.

package/dist/index.mjs

@@ -1,58 +1,18 @@
-import { useContext, createMemo, createComponent, createContext, createRoot, getOwner, untrack, splitProps, Show, onCleanup, For, Match, mergeProps } from "solid-js";
+import { createMemo, splitProps, untrack, createRoot, getOwner, createComponent, Show, createContext, useContext, onCleanup, For, Match, mergeProps } from "solid-js";
 import { createMutable } from "solid-js/store";
-const BASE_CTOR = Function;
-class ReactiveContext extends BASE_CTOR {
-  /** The actual {@link Context} that contains the reactive {@link Accessor} to the value */
-  /**
-   * Returns the {@link Accessor} for the value in the current {@link Owner}.
-   * It's like calling {@link useContext}
-   */
-  get get() {
-    return useContext(this.ctx);
-  }
-  /**
-   * Component that sets the value of the current {@link Context} for its children.
-   * If no value is provided then it will use the default value for {@link ctx}.
-   * The function is bound for the way solid compiles components inside other objects.
-   * (The value is memoized)
-   */
-  get Provider() {
-    const {
-      ctx: ctx2
-    } = this;
-    return function(props) {
-      const memo = createMemo(() => props.value);
-      return createComponent(ctx2.Provider, {
-        value: memo,
-        get children() {
-          return props.children;
-        }
-      });
-    };
-  }
-  /**
-   * Executes {@link runWithContext} on the current context
-   * @param value The value for the context
-   * @param f The function to run
-   * @returns The same thing {@link f} returned
-   */
-  runWith(value, f) {
-    return runWithContext(this.ctx, value === void 0 ? void 0 : () => value, (x) => f(x()));
-  }
-  /**
-   * Creates a {@link ReactiveContext}
-   * @param defaultValue Initial value for the context
-   * @param name Name to give to the context
-   */
-  static create(defaultValue, name) {
-    const ctx2 = createContext(() => defaultValue, {
-      name
-    });
-    const f = () => out.get();
-    f.ctx = ctx2;
-    const out = Object.setPrototypeOf(f, ReactiveContext.prototype);
-    return out;
-  }
+function memoProps(obj, keys = Reflect.ownKeys(obj), equals = false) {
+  const out = {};
+  for (const elm of keys)
+    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);
+  return out;
+}
+function untrackCall(f, ...args) {
+  return untrack(() => f.apply(this, args));
 }
 function runWithContext(ctx2, value, f) {
   return createRoot((d) => {
@@ -64,20 +24,6 @@ function runWithContext(ctx2, value, f) {
     }
   });
 }
-function untrackCall(f, ...args) {
-  return untrack(() => f.apply(this, args));
-}
-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 }) });
-  return out;
-}
-function splitAndMemoProps(obj, keys, equals) {
-  const out = splitProps(obj, keys);
-  out[0] = memoProps(out[0], keys, equals);
-  return out;
-}
 const unwrap = (f) => new Proxy(f, HANDLER);
 const HANDLER = new Proxy({}, {
   get(cache, k) {
@@ -210,13 +156,18 @@ function createInfo(props) {
     }
   };
 }
-const ctx = ReactiveContext.create(void 0, "on-case");
-const On = ctx.Provider;
+const ctx = createContext(void 0, {
+  name: "on-case"
+});
+const On = (props) => createComponent(ctx.Provider, {
+  value: () => props.value,
+  get children() {
+    return props.children;
+  }
+});
 function Case(props) {
   const [mine, other] = splitAndMemoProps(props, ["value", "pred"]);
-  const {
-    get
-  } = ctx;
+  const get = useContext(ctx);
   const pred = (x) => mine.pred ? mine.pred(x) : x === mine.value;
   return createComponent(Match, mergeProps({
     get when() {
@@ -224,7 +175,6 @@ function Case(props) {
     }
   }, other));
 }
-const debug = ReactiveContext.create(false, "debug-scope");
 function SameContext(props) {
   return createMemo(() => {
     getOwner().context = props.owner.context;
@@ -235,11 +185,9 @@ export {
   Case,
   Enfold,
   On,
-  ReactiveContext,
   SameContext,
   Slot,
   createExtractor,
-  debug,
   memoProps,
   runWithContext,
   splitAndMemoProps,

package/dist/index.umd.js

@@ -2,59 +2,19 @@
   typeof exports === "object" && typeof module !== "undefined" ? factory(exports, require("solid-js"), require("solid-js/store")) : typeof define === "function" && define.amd ? define(["exports", "solid-js", "solid-js/store"], factory) : (global = typeof globalThis !== "undefined" ? globalThis : global || self, factory(global.solidCtrlFlow = {}, global.solidJs, global.solidJsStore));
 })(this, function(exports2, solidJs, store) {
   "use strict";
-  const BASE_CTOR = Function;
-  class ReactiveContext extends BASE_CTOR {
-    /** The actual {@link Context} that contains the reactive {@link Accessor} to the value */
-    /**
-     * Returns the {@link Accessor} for the value in the current {@link Owner}.
-     * It's like calling {@link useContext}
-     */
-    get get() {
-      return solidJs.useContext(this.ctx);
-    }
-    /**
-     * Component that sets the value of the current {@link Context} for its children.
-     * If no value is provided then it will use the default value for {@link ctx}.
-     * The function is bound for the way solid compiles components inside other objects.
-     * (The value is memoized)
-     */
-    get Provider() {
-      const {
-        ctx: ctx2
-      } = this;
-      return function(props) {
-        const memo = solidJs.createMemo(() => props.value);
-        return solidJs.createComponent(ctx2.Provider, {
-          value: memo,
-          get children() {
-            return props.children;
-          }
-        });
-      };
-    }
-    /**
-     * Executes {@link runWithContext} on the current context
-     * @param value The value for the context
-     * @param f The function to run
-     * @returns The same thing {@link f} returned
-     */
-    runWith(value, f) {
-      return runWithContext(this.ctx, value === void 0 ? void 0 : () => value, (x) => f(x()));
-    }
-    /**
-     * Creates a {@link ReactiveContext}
-     * @param defaultValue Initial value for the context
-     * @param name Name to give to the context
-     */
-    static create(defaultValue, name) {
-      const ctx2 = solidJs.createContext(() => defaultValue, {
-        name
-      });
-      const f = () => out.get();
-      f.ctx = ctx2;
-      const out = Object.setPrototypeOf(f, ReactiveContext.prototype);
-      return out;
-    }
+  function memoProps(obj, keys = Reflect.ownKeys(obj), equals = false) {
+    const out = {};
+    for (const elm of keys)
+      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);
+    return out;
+  }
+  function untrackCall(f, ...args) {
+    return solidJs.untrack(() => f.apply(this, args));
   }
   function runWithContext(ctx2, value, f) {
     return solidJs.createRoot((d) => {
@@ -66,20 +26,6 @@
       }
     });
   }
-  function untrackCall(f, ...args) {
-    return solidJs.untrack(() => f.apply(this, args));
-  }
-  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 }) });
-    return out;
-  }
-  function splitAndMemoProps(obj, keys, equals) {
-    const out = solidJs.splitProps(obj, keys);
-    out[0] = memoProps(out[0], keys, equals);
-    return out;
-  }
   const unwrap = (f) => new Proxy(f, HANDLER);
   const HANDLER = new Proxy({}, {
     get(cache, k) {
@@ -212,13 +158,18 @@
       }
     };
   }
-  const ctx = ReactiveContext.create(void 0, "on-case");
-  const On = ctx.Provider;
+  const ctx = solidJs.createContext(void 0, {
+    name: "on-case"
+  });
+  const On = (props) => solidJs.createComponent(ctx.Provider, {
+    value: () => props.value,
+    get children() {
+      return props.children;
+    }
+  });
   function Case(props) {
     const [mine, other] = splitAndMemoProps(props, ["value", "pred"]);
-    const {
-      get
-    } = ctx;
+    const get = solidJs.useContext(ctx);
     const pred = (x) => mine.pred ? mine.pred(x) : x === mine.value;
     return solidJs.createComponent(solidJs.Match, solidJs.mergeProps({
       get when() {
@@ -226,7 +177,6 @@
       }
     }, other));
   }
-  const debug = ReactiveContext.create(false, "debug-scope");
   function SameContext(props) {
     return solidJs.createMemo(() => {
       solidJs.getOwner().context = props.owner.context;
@@ -236,10 +186,8 @@
   exports2.Case = Case;
   exports2.Enfold = Enfold;
   exports2.On = On;
-  exports2.ReactiveContext = ReactiveContext;
   exports2.SameContext = SameContext;
   exports2.createExtractor = createExtractor;
-  exports2.debug = debug;
   exports2.memoProps = memoProps;
   exports2.runWithContext = runWithContext;
   exports2.splitAndMemoProps = splitAndMemoProps;

package/package.json

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

package/readMe.md

@@ -162,40 +162,17 @@ return <>
 
 ## Utility
 
-### `ReactiveContext.create()`
-Method that creates a reactive version of a solid `Context` with some additional built-in functionalities
-```ts
-const ctx = ReactiveContext.create("SOMETHING");
-const underlyingNormalContext = ctx.ctx;
-const valueAccessorForTheCurrentOwner = ctx.get;
-const value = ctx();
-```
-
-### `runWithContext()`
-Creates a context scope that persists for the duration of a function
-
 ### `unwrap()`
 Calls an `Accessor` maintaining its reactivity at 1 level
 
-### `debug()`
-Allows you to define ui section that are only visible in debug or NOT in debug
-```tsx
-const value = false;
-return <>
-  <debug.Provider value={value}>
-    {/* (A LOT OF NESTING...) */}
-    <Show when={debug()}>
-      THIS WOULD BE VISIBLE IF "value" HAD BEEN {true}
-    </Show>
-  </debug.Provider>
-</>
-```
-
-### `untrackCall()`
-Calls a function untracking what happens inside of it but not what gets passed as its argument
-
 ### `memoProps()`
 Creates a partial version of an object with memoized remaining properties
 
 ### `splitAndMemoProps()`
-Like `splitProps()` but memoizes the whole local part
+Like `splitProps()` but memoizes the whole local part
+
+### `untrackCall()`
+Calls a function untracking what happens inside of it but not what gets passed as its argument
+
+### `runWithContext()`
+Creates a context scope that persists for the duration of a function