solid-js 1.9.3 → 1.9.5

package/dist/solid.cjs

@@ -144,6 +144,7 @@ function nextHydrateContext() {
   };
 }
 
+const IS_DEV = false;
 const equalFn = (a, b) => a === b;
 const $PROXY = Symbol("solid-proxy");
 const SUPPORTS_PROXY = typeof Proxy === "function";
@@ -257,14 +258,14 @@ function createResource(pSource, pFetcher, pOptions) {
   let source;
   let fetcher;
   let options;
-  if (arguments.length === 2 && typeof pFetcher === "object" || arguments.length === 1) {
-    source = true;
-    fetcher = pSource;
-    options = pFetcher || {};
-  } else {
+  if (typeof pFetcher === "function") {
     source = pSource;
     fetcher = pFetcher;
     options = pOptions || {};
+  } else {
+    source = true;
+    fetcher = pSource;
+    options = pFetcher || {};
   }
   let pr = null,
     initP = NO_INIT,
@@ -651,7 +652,7 @@ function writeSignal(node, value, isComp) {
         }
         if (Updates.length > 10e5) {
           Updates = [];
-          if (false) ;
+          if (IS_DEV) ;
           throw new Error();
         }
       }, false);
@@ -1054,8 +1055,8 @@ function observable(input) {
     }
   };
 }
-function from(producer) {
-  const [s, set] = createSignal(undefined, {
+function from(producer, initalValue = undefined) {
+  const [s, set] = createSignal(initalValue, {
     equals: false
   });
   if ("subscribe" in producer) {
@@ -1415,7 +1416,7 @@ function lazy(fn) {
     }
     let Comp;
     return createMemo(() => (Comp = comp()) ? untrack(() => {
-      if (false) ;
+      if (IS_DEV) ;
       if (!ctx || sharedConfig.done) return Comp(props);
       const c = sharedConfig.context;
       setHydrateContext(ctx);
@@ -1448,8 +1449,9 @@ function Index(props) {
 }
 function Show(props) {
   const keyed = props.keyed;
-  const condition = createMemo(() => props.when, undefined, {
-    equals: (a, b) => keyed ? a === b : !a === !b
+  const conditionValue = createMemo(() => props.when, undefined, undefined);
+  const condition = keyed ? conditionValue : createMemo(conditionValue, undefined, {
+    equals: (a, b) => !a === !b
   });
   return createMemo(() => {
     const c = condition();
@@ -1458,39 +1460,40 @@ function Show(props) {
       const fn = typeof child === "function" && child.length > 0;
       return fn ? untrack(() => child(keyed ? c : () => {
         if (!untrack(condition)) throw narrowedError("Show");
-        return props.when;
+        return conditionValue();
       })) : child;
     }
     return props.fallback;
   }, undefined, undefined);
 }
 function Switch(props) {
-  let keyed = false;
-  const equals = (a, b) => (keyed ? a[1] === b[1] : !a[1] === !b[1]) && a[2] === b[2];
-  const conditions = children(() => props.children),
-    evalConditions = createMemo(() => {
-      let conds = conditions();
-      if (!Array.isArray(conds)) conds = [conds];
-      for (let i = 0; i < conds.length; i++) {
-        const c = conds[i].when;
-        if (c) {
-          keyed = !!conds[i].keyed;
-          return [i, c, conds[i]];
-        }
-      }
-      return [-1];
-    }, undefined, {
-      equals
-    });
+  const chs = children(() => props.children);
+  const switchFunc = createMemo(() => {
+    const ch = chs();
+    const mps = Array.isArray(ch) ? ch : [ch];
+    let func = () => undefined;
+    for (let i = 0; i < mps.length; i++) {
+      const index = i;
+      const mp = mps[i];
+      const prevFunc = func;
+      const conditionValue = createMemo(() => prevFunc() ? undefined : mp.when, undefined, undefined);
+      const condition = mp.keyed ? conditionValue : createMemo(conditionValue, undefined, {
+        equals: (a, b) => !a === !b
+      });
+      func = () => prevFunc() || (condition() ? [index, conditionValue, mp] : undefined);
+    }
+    return func;
+  });
   return createMemo(() => {
-    const [index, when, cond] = evalConditions();
-    if (index < 0) return props.fallback;
-    const c = cond.children;
-    const fn = typeof c === "function" && c.length > 0;
-    return fn ? untrack(() => c(keyed ? when : () => {
-      if (untrack(evalConditions)[0] !== index) throw narrowedError("Match");
-      return cond.when;
-    })) : c;
+    const sel = switchFunc()();
+    if (!sel) return props.fallback;
+    const [index, conditionValue, mp] = sel;
+    const child = mp.children;
+    const fn = typeof child === "function" && child.length > 0;
+    return fn ? untrack(() => child(mp.keyed ? conditionValue() : () => {
+      if (untrack(switchFunc)()?.[0] !== index) throw narrowedError("Match");
+      return conditionValue();
+    })) : child;
   }, undefined, undefined);
 }
 function Match(props) {

package/dist/solid.js

@@ -144,6 +144,7 @@ function nextHydrateContext() {
   };
 }
 
+const IS_DEV = false;
 const equalFn = (a, b) => a === b;
 const $PROXY = Symbol("solid-proxy");
 const SUPPORTS_PROXY = typeof Proxy === "function";
@@ -267,14 +268,14 @@ function createResource(pSource, pFetcher, pOptions) {
   let source;
   let fetcher;
   let options;
-  if ((arguments.length === 2 && typeof pFetcher === "object") || arguments.length === 1) {
-    source = true;
-    fetcher = pSource;
-    options = pFetcher || {};
-  } else {
+  if (typeof pFetcher === "function") {
     source = pSource;
     fetcher = pFetcher;
     options = pOptions || {};
+  } else {
+    source = true;
+    fetcher = pSource;
+    options = pFetcher || {};
   }
   let pr = null,
     initP = NO_INIT,
@@ -712,7 +713,7 @@ function writeSignal(node, value, isComp) {
         }
         if (Updates.length > 10e5) {
           Updates = [];
-          if (false);
+          if (IS_DEV);
           throw new Error();
         }
       }, false);
@@ -1138,8 +1139,8 @@ function observable(input) {
     }
   };
 }
-function from(producer) {
-  const [s, set] = createSignal(undefined, {
+function from(producer, initalValue = undefined) {
+  const [s, set] = createSignal(initalValue, {
     equals: false
   });
   if ("subscribe" in producer) {
@@ -1531,7 +1532,7 @@ function lazy(fn) {
     return createMemo(() =>
       (Comp = comp())
         ? untrack(() => {
-            if (false);
+            if (IS_DEV);
             if (!ctx || sharedConfig.done) return Comp(props);
             const c = sharedConfig.context;
             setHydrateContext(ctx);
@@ -1566,9 +1567,12 @@ function Index(props) {
 }
 function Show(props) {
   const keyed = props.keyed;
-  const condition = createMemo(() => props.when, undefined, {
-    equals: (a, b) => (keyed ? a === b : !a === !b)
-  });
+  const conditionValue = createMemo(() => props.when, undefined, undefined);
+  const condition = keyed
+    ? conditionValue
+    : createMemo(conditionValue, undefined, {
+        equals: (a, b) => !a === !b
+      });
   return createMemo(
     () => {
       const c = condition();
@@ -1582,7 +1586,7 @@ function Show(props) {
                   ? c
                   : () => {
                       if (!untrack(condition)) throw narrowedError("Show");
-                      return props.when;
+                      return conditionValue();
                     }
               )
             )
@@ -1595,45 +1599,48 @@ function Show(props) {
   );
 }
 function Switch(props) {
-  let keyed = false;
-  const equals = (a, b) => (keyed ? a[1] === b[1] : !a[1] === !b[1]) && a[2] === b[2];
-  const conditions = children(() => props.children),
-    evalConditions = createMemo(
-      () => {
-        let conds = conditions();
-        if (!Array.isArray(conds)) conds = [conds];
-        for (let i = 0; i < conds.length; i++) {
-          const c = conds[i].when;
-          if (c) {
-            keyed = !!conds[i].keyed;
-            return [i, c, conds[i]];
-          }
-        }
-        return [-1];
-      },
-      undefined,
-      {
-        equals
-      }
-    );
+  const chs = children(() => props.children);
+  const switchFunc = createMemo(() => {
+    const ch = chs();
+    const mps = Array.isArray(ch) ? ch : [ch];
+    let func = () => undefined;
+    for (let i = 0; i < mps.length; i++) {
+      const index = i;
+      const mp = mps[i];
+      const prevFunc = func;
+      const conditionValue = createMemo(
+        () => (prevFunc() ? undefined : mp.when),
+        undefined,
+        undefined
+      );
+      const condition = mp.keyed
+        ? conditionValue
+        : createMemo(conditionValue, undefined, {
+            equals: (a, b) => !a === !b
+          });
+      func = () => prevFunc() || (condition() ? [index, conditionValue, mp] : undefined);
+    }
+    return func;
+  });
   return createMemo(
     () => {
-      const [index, when, cond] = evalConditions();
-      if (index < 0) return props.fallback;
-      const c = cond.children;
-      const fn = typeof c === "function" && c.length > 0;
+      const sel = switchFunc()();
+      if (!sel) return props.fallback;
+      const [index, conditionValue, mp] = sel;
+      const child = mp.children;
+      const fn = typeof child === "function" && child.length > 0;
       return fn
         ? untrack(() =>
-            c(
-              keyed
-                ? when
+            child(
+              mp.keyed
+                ? conditionValue()
                 : () => {
-                    if (untrack(evalConditions)[0] !== index) throw narrowedError("Match");
-                    return cond.when;
+                    if (untrack(switchFunc)()?.[0] !== index) throw narrowedError("Match");
+                    return conditionValue();
                   }
             )
           )
-        : c;
+        : child;
     },
     undefined,
     undefined

package/h/jsx-runtime/types/jsx.d.ts

@@ -868,7 +868,7 @@ export namespace JSX {
     ping?: FunctionMaybe<string>;
     referrerpolicy?: FunctionMaybe<HTMLReferrerPolicy>;
     rel?: FunctionMaybe<string>;
-    target?: FunctionMaybe<string>;
+    target?: FunctionMaybe<"_self" | "_blank" | "_parent" | "_top" | (string & {})>;
     type?: FunctionMaybe<string>;
     referrerPolicy?: FunctionMaybe<HTMLReferrerPolicy>;
   }
@@ -1022,7 +1022,31 @@ export namespace JSX {
     size?: FunctionMaybe<number | string>;
     src?: FunctionMaybe<string>;
     step?: FunctionMaybe<number | string>;
-    type?: FunctionMaybe<string>;
+    type?: FunctionMaybe<
+      | "button"
+      | "checkbox"
+      | "color"
+      | "date"
+      | "datetime-local"
+      | "email"
+      | "file"
+      | "hidden"
+      | "image"
+      | "month"
+      | "number"
+      | "password"
+      | "radio"
+      | "range"
+      | "reset"
+      | "search"
+      | "submit"
+      | "tel"
+      | "text"
+      | "time"
+      | "url"
+      | "week"
+      | (string & {})
+    >;
     value?: FunctionMaybe<string | string[] | number>;
     width?: FunctionMaybe<number | string>;
     crossOrigin?: FunctionMaybe<HTMLCrossorigin>;
@@ -1079,6 +1103,9 @@ export namespace JSX {
   interface MediaHTMLAttributes<T> extends HTMLAttributes<T> {
     autoplay?: FunctionMaybe<boolean>;
     controls?: FunctionMaybe<boolean>;
+    controlslist?: FunctionMaybe<
+      "nodownload" | "nofullscreen" | "noplaybackrate" | "noremoteplayback" | (string & {})
+    >;
     crossorigin?: FunctionMaybe<HTMLCrossorigin>;
     loop?: FunctionMaybe<boolean>;
     mediagroup?: FunctionMaybe<string>;
@@ -1248,6 +1275,7 @@ export namespace JSX {
     poster?: FunctionMaybe<string>;
     width?: FunctionMaybe<number | string>;
     disablepictureinpicture?: FunctionMaybe<boolean>;
+    disableremoteplayback?: FunctionMaybe<boolean>;
   }
   type SVGPreserveAspectRatio =
     | "none"

package/html/dist/html.cjs

@@ -64,7 +64,7 @@ function parseTag(tag) {
 }
 function pushTextNode(list, html, start) {
   const end = html.indexOf('<', start);
-  const content = html.slice(start, end === -1 ? void 0 : end);
+  const content = html.slice(start, end === -1 ? undefined : end);
   if (!/^\s*$/.test(content)) {
     list.push({
       type: 'text',
@@ -83,7 +83,7 @@ function pushCommentNode(list, tag) {
 }
 function parse(html) {
   const result = [];
-  let current = void 0;
+  let current = undefined;
   let level = -1;
   const arr = [];
   const byTag = {};
@@ -92,7 +92,7 @@ function parse(html) {
     const isComment = tag.slice(0, 4) === '<!--';
     const start = index + tag.length;
     const nextChar = html.charAt(start);
-    let parent = void 0;
+    let parent = undefined;
     if (isOpen && !isComment) {
       level++;
       current = parseTag(tag);

package/html/dist/html.js

@@ -84,7 +84,7 @@ function parseTag(tag) {
 }
 function pushTextNode(list, html, start) {
   const end = html.indexOf("<", start);
-  const content = html.slice(start, end === -1 ? void 0 : end);
+  const content = html.slice(start, end === -1 ? undefined : end);
   if (!/^\s*$/.test(content)) {
     list.push({
       type: "text",
@@ -103,7 +103,7 @@ function pushCommentNode(list, tag) {
 }
 function parse(html) {
   const result = [];
-  let current = void 0;
+  let current = undefined;
   let level = -1;
   const arr = [];
   const byTag = {};
@@ -112,7 +112,7 @@ function parse(html) {
     const isComment = tag.slice(0, 4) === "<!--";
     const start = index + tag.length;
     const nextChar = html.charAt(start);
-    let parent = void 0;
+    let parent = undefined;
     if (isOpen && !isComment) {
       level++;
       current = parseTag(tag);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "solid-js",
   "description": "A declarative JavaScript library for building user interfaces.",
-  "version": "1.9.3",
+  "version": "1.9.5",
   "author": "Ryan Carniato",
   "license": "MIT",
   "homepage": "https://solidjs.com",

package/store/dist/dev.cjs

@@ -341,7 +341,7 @@ function applyState(target, parent, property, merge, key) {
       }
       const temp = new Array(target.length),
         newIndices = new Map();
-      for (end = previous.length - 1, newEnd = target.length - 1; end >= start && newEnd >= start && (previous[end] === target[newEnd] || key && previous[start] && target[start] && previous[end][key] === target[newEnd][key]); end--, newEnd--) {
+      for (end = previous.length - 1, newEnd = target.length - 1; end >= start && newEnd >= start && (previous[end] === target[newEnd] || key && previous[end] && target[newEnd] && previous[end][key] === target[newEnd][key]); end--, newEnd--) {
         temp[newEnd] = previous[end];
       }
       if (start > newEnd || start > end) {

package/store/dist/dev.js

@@ -411,7 +411,7 @@ function applyState(target, parent, property, merge, key) {
         end >= start &&
         newEnd >= start &&
         (previous[end] === target[newEnd] ||
-          (key && previous[start] && target[start] && previous[end][key] === target[newEnd][key]));
+          (key && previous[end] && target[newEnd] && previous[end][key] === target[newEnd][key]));
         end--, newEnd--
       ) {
         temp[newEnd] = previous[end];

package/store/dist/store.cjs

@@ -325,7 +325,7 @@ function applyState(target, parent, property, merge, key) {
       }
       const temp = new Array(target.length),
         newIndices = new Map();
-      for (end = previous.length - 1, newEnd = target.length - 1; end >= start && newEnd >= start && (previous[end] === target[newEnd] || key && previous[start] && target[start] && previous[end][key] === target[newEnd][key]); end--, newEnd--) {
+      for (end = previous.length - 1, newEnd = target.length - 1; end >= start && newEnd >= start && (previous[end] === target[newEnd] || key && previous[end] && target[newEnd] && previous[end][key] === target[newEnd][key]); end--, newEnd--) {
         temp[newEnd] = previous[end];
       }
       if (start > newEnd || start > end) {

package/store/dist/store.js

@@ -389,7 +389,7 @@ function applyState(target, parent, property, merge, key) {
         end >= start &&
         newEnd >= start &&
         (previous[end] === target[newEnd] ||
-          (key && previous[start] && target[start] && previous[end][key] === target[newEnd][key]));
+          (key && previous[end] && target[newEnd] && previous[end][key] === target[newEnd][key]));
         end--, newEnd--
       ) {
         temp[newEnd] = previous[end];

package/store/types/store.d.ts

@@ -1,3 +1,4 @@
+export declare const IS_DEV: string | boolean;
 export declare const $RAW: unique symbol,
   $NODE: unique symbol,
   $HAS: unique symbol,

package/types/index.d.ts

@@ -77,6 +77,9 @@ export declare const DEV:
         afterCreateSignal:
           | ((signal: import("./reactive/signal.js").SignalState<any>) => void)
           | null;
+        afterRegisterGraph:
+          | ((sourceMapValue: import("./reactive/signal.js").SourceMapValue) => void)
+          | null;
       };
       readonly writeSignal: typeof writeSignal;
       readonly registerGraph: typeof registerGraph;

package/types/jsx.d.ts

@@ -963,7 +963,7 @@ export namespace JSX {
     ping?: string | undefined;
     referrerpolicy?: HTMLReferrerPolicy | undefined;
     rel?: string | undefined;
-    target?: string | undefined;
+    target?: "_self" | "_blank" | "_parent" | "_top" | (string & {}) | undefined;
     type?: string | undefined;
     referrerPolicy?: HTMLReferrerPolicy | undefined;
   }
@@ -1125,7 +1125,31 @@ export namespace JSX {
     size?: number | string | undefined;
     src?: string | undefined;
     step?: number | string | undefined;
-    type?: string | undefined;
+    type?:
+      | "button"
+      | "checkbox"
+      | "color"
+      | "date"
+      | "datetime-local"
+      | "email"
+      | "file"
+      | "hidden"
+      | "image"
+      | "month"
+      | "number"
+      | "password"
+      | "radio"
+      | "range"
+      | "reset"
+      | "search"
+      | "submit"
+      | "tel"
+      | "text"
+      | "time"
+      | "url"
+      | "week"
+      | (string & {})
+      | undefined;
     value?: string | string[] | number | undefined;
     width?: number | string | undefined;
     crossOrigin?: HTMLCrossorigin | undefined;
@@ -1182,6 +1206,13 @@ export namespace JSX {
   interface MediaHTMLAttributes<T> extends HTMLAttributes<T> {
     autoplay?: boolean | undefined;
     controls?: boolean | undefined;
+    controlslist?:
+      | "nodownload"
+      | "nofullscreen"
+      | "noplaybackrate"
+      | "noremoteplayback"
+      | (string & {})
+      | undefined;
     crossorigin?: HTMLCrossorigin | undefined;
     loop?: boolean | undefined;
     mediagroup?: string | undefined;
@@ -1352,6 +1383,7 @@ export namespace JSX {
     poster?: string | undefined;
     width?: number | string | undefined;
     disablepictureinpicture?: boolean;
+    disableremoteplayback?: boolean;
   }
   type SVGPreserveAspectRatio =
     | "none"

package/types/reactive/observable.d.ts

@@ -28,15 +28,15 @@ export type ObservableObserver<T> =
  * description https://docs.solidjs.com/reference/reactive-utilities/observable
  */
 export declare function observable<T>(input: Accessor<T>): Observable<T>;
-export declare function from<T>(
-  producer:
-    | ((setter: Setter<T | undefined>) => () => void)
-    | {
-        subscribe: (fn: (v: T) => void) =>
-          | (() => void)
-          | {
-              unsubscribe: () => void;
-            };
-      }
-): Accessor<T | undefined>;
+type Producer<T> =
+  | ((setter: Setter<T>) => () => void)
+  | {
+      subscribe: (fn: (v: T) => void) =>
+        | (() => void)
+        | {
+            unsubscribe: () => void;
+          };
+    };
+export declare function from<T>(producer: Producer<T>, initalValue: T): Accessor<T>;
+export declare function from<T>(producer: Producer<T | undefined>): Accessor<T | undefined>;
 export {};

package/types/reactive/signal.d.ts

@@ -24,6 +24,7 @@ SOFTWARE.
 import { requestCallback } from "./scheduler.js";
 import type { JSX } from "../jsx.js";
 import type { FlowComponent } from "../render/index.js";
+export declare const IS_DEV: string | boolean;
 export declare const equalFn: <T>(a: T, b: T) => boolean;
 export declare const $PROXY: unique symbol;
 export declare const SUPPORTS_PROXY: boolean;
@@ -35,7 +36,9 @@ export declare let Transition: TransitionState | null;
 export declare const DevHooks: {
   afterUpdate: (() => void) | null;
   afterCreateOwner: ((owner: Owner) => void) | null;
+  /** @deprecated use `afterRegisterGraph` */
   afterCreateSignal: ((signal: SignalState<any>) => void) | null;
+  afterRegisterGraph: ((sourceMapValue: SourceMapValue) => void) | null;
 };
 export type ComputationState = 0 | 1 | 2;
 export interface SourceMapValue {
@@ -49,6 +52,7 @@ export interface SignalState<T> extends SourceMapValue {
   observerSlots: number[] | null;
   tValue?: T;
   comparator?: (prev: T, next: T) => boolean;
+  internal?: true;
 }
 export interface Owner {
   owned: Computation<any>[] | null;

package/types/server/reactive.d.ts

@@ -103,7 +103,12 @@ export declare function observable<T>(input: Accessor<T>): {
   subscribe(observer: ObservableObserver<T>): {
     unsubscribe(): void;
   };
-  [Symbol.observable](): any;
+  [Symbol.observable](): {
+    subscribe(observer: ObservableObserver<T>): {
+      unsubscribe(): void;
+    };
+    [Symbol.observable](): /*elided*/ any;
+  };
 };
 export declare function from<T>(
   producer: