solid-js 1.5.0-beta.0 → 1.5.0-beta.3

package/web/dist/web.cjs

@@ -206,6 +206,9 @@ function dynamicProperty(props, key) {
 function innerHTML(parent, content) {
   !solidJs.sharedConfig.context && (parent.innerHTML = content);
 }
+function use(fn, element, arg) {
+  return solidJs.untrack(() => fn(element, arg));
+}
 function insert(parent, accessor, marker, initial) {
   if (marker !== undefined && !initial) initial = [];
   if (typeof accessor !== "function") return insertExpression(parent, accessor, initial, marker);
@@ -413,6 +416,7 @@ function insertExpression(parent, value, current, marker, unwrapArray) {
       return () => current;
     }
     if (solidJs.sharedConfig.context) {
+      if (!array.length) return current;
       for (let i = 0; i < array.length; i++) {
         if (array[i].parentNode) return current = array;
       }
@@ -686,3 +690,4 @@ exports.ssrHydrationKey = ssrHydrationKey;
 exports.ssrStyle = ssrStyle;
 exports.style = style;
 exports.template = template;
+exports.use = use;

package/web/dist/web.js

@@ -1,4 +1,4 @@
-import { createMemo, createRoot, createRenderEffect, sharedConfig, enableHydration, createSignal, onCleanup, splitProps, untrack } from 'solid-js';
+import { createMemo, createRoot, createRenderEffect, sharedConfig, untrack, enableHydration, createSignal, onCleanup, splitProps } from 'solid-js';
 export { ErrorBoundary, For, Index, Match, Show, Suspense, SuspenseList, Switch, createComponent, createRenderEffect as effect, getOwner, mergeProps } from 'solid-js';
 
 const booleans = ["allowfullscreen", "async", "autofocus", "autoplay", "checked", "controls", "default", "disabled", "formnovalidate", "hidden", "indeterminate", "ismap", "loop", "multiple", "muted", "nomodule", "novalidate", "open", "playsinline", "readonly", "required", "reversed", "seamless", "selected"];
@@ -203,6 +203,9 @@ function dynamicProperty(props, key) {
 function innerHTML(parent, content) {
   !sharedConfig.context && (parent.innerHTML = content);
 }
+function use(fn, element, arg) {
+  return untrack(() => fn(element, arg));
+}
 function insert(parent, accessor, marker, initial) {
   if (marker !== undefined && !initial) initial = [];
   if (typeof accessor !== "function") return insertExpression(parent, accessor, initial, marker);
@@ -410,6 +413,7 @@ function insertExpression(parent, value, current, marker, unwrapArray) {
       return () => current;
     }
     if (sharedConfig.context) {
+      if (!array.length) return current;
       for (let i = 0; i < array.length; i++) {
         if (array[i].parentNode) return current = array;
       }
@@ -587,4 +591,4 @@ function Dynamic(props) {
   });
 }
 
-export { Aliases, Assets, ChildProperties, DOMElements, DelegatedEvents, Dynamic, Assets as HydrationScript, NoHydration, Portal, PropAliases, Properties, SVGElements, SVGNamespace, addEventListener, assign, classList, className, clearDelegatedEvents, delegateEvents, dynamicProperty, escape, generateHydrationScript, getHydrationKey, getNextElement, getNextMarker, getNextMatch, hydrate, innerHTML, insert, isServer, memo, render, renderToStream, renderToString, renderToStringAsync, resolveSSRNode, runHydrationEvents, setAttribute, setAttributeNS, spread, ssr, ssrAttribute, ssrClassList, ssrElement, ssrHydrationKey, ssrStyle, style, template };
+export { Aliases, Assets, ChildProperties, DOMElements, DelegatedEvents, Dynamic, Assets as HydrationScript, NoHydration, Portal, PropAliases, Properties, SVGElements, SVGNamespace, addEventListener, assign, classList, className, clearDelegatedEvents, delegateEvents, dynamicProperty, escape, generateHydrationScript, getHydrationKey, getNextElement, getNextMarker, getNextMatch, hydrate, innerHTML, insert, isServer, memo, render, renderToStream, renderToString, renderToStringAsync, resolveSSRNode, runHydrationEvents, setAttribute, setAttributeNS, spread, ssr, ssrAttribute, ssrClassList, ssrElement, ssrHydrationKey, ssrStyle, style, template, use };

package/web/types/client.d.ts

@@ -1,4 +1,4 @@
-import { JSX } from "./jsx";
+import { JSX } from "./jsx.js";
 export const Aliases: Record<string, string>;
 export const PropAliases: Record<string, string>;
 export const Properties: Set<string>;

package/web/types/core.d.ts

@@ -1,3 +1,3 @@
-import { createRoot, createRenderEffect, createComponent, getOwner, sharedConfig } from "../..";
-declare function memo<T>(fn: () => T, equals: boolean): import("../..").Accessor<T>;
-export { getOwner, createComponent, createRoot as root, createRenderEffect as effect, memo, sharedConfig };
+import { createRoot, createRenderEffect, createComponent, getOwner, sharedConfig, untrack } from "solid-js";
+declare function memo<T>(fn: () => T, equals: boolean): import("solid-js").Accessor<T>;
+export { getOwner, createComponent, createRoot as root, createRenderEffect as effect, memo, sharedConfig, untrack };

package/web/types/index.d.ts

@@ -1,8 +1,8 @@
-import { hydrate as hydrateCore } from "./client";
-import { JSX, Accessor, ComponentProps, ValidComponent } from "../..";
-export * from "./client";
-export { For, Show, Suspense, SuspenseList, Switch, Match, Index, ErrorBoundary, mergeProps } from "../..";
-export * from "./server-mock";
+import { hydrate as hydrateCore } from "./client.js";
+import { JSX, Accessor, ComponentProps, ValidComponent } from "solid-js";
+export * from "./client.js";
+export { For, Show, Suspense, SuspenseList, Switch, Match, Index, ErrorBoundary, mergeProps } from "solid-js";
+export * from "./server-mock.js";
 export declare const isServer = false;
 export declare const hydrate: typeof hydrateCore;
 /**

package/web/types/jsx.d.ts

@@ -1 +1 @@
-export { JSX } from "../..";
+export type { JSX } from "../../types/jsx.js";

package/web/types/server.d.ts

@@ -0,0 +1,70 @@
+export function renderToString<T>(
+  fn: () => T,
+  options?: {
+    nonce?: string;
+    renderId?: string;
+  }
+): string;
+export function renderToStringAsync<T>(
+  fn: () => T,
+  options?: {
+    timeoutMs?: number;
+    nonce?: string;
+    renderId?: string;
+  }
+): Promise<string>;
+export function renderToStream<T>(
+  fn: () => T,
+  options?: {
+    nonce?: string;
+    renderId?: string;
+    onCompleteShell?: (info: { write: (v: string) => void }) => void;
+    onCompleteAll?: (info: { write: (v: string) => void }) => void;
+  }
+): {
+  pipe: (writable: { write: (v: string) => void }) => void;
+  pipeTo: (writable: WritableStream) => void;
+};
+
+export function Assets(props: { children?: JSX.Element }): JSX.Element;
+export function HydrationScript(props: { nonce?: string; eventNames?: string[] }): JSX.Element;
+export function NoHydration(props: { children?: JSX.Element }): JSX.Element;
+export function ssr(template: string[] | string, ...nodes: any[]): { t: string };
+export function ssrElement(name: string, props: any, children: any, needsId: boolean): { t: string };
+export function ssrClassList(value: { [k: string]: boolean }): string;
+export function ssrStyle(value: { [k: string]: string }): string;
+export function ssrAttribute(key: string, value: any, isBoolean: boolean): string;
+export function ssrHydrationKey(): string;
+export function resolveSSRNode(node: any): string;
+export function escape(html: string): string;
+export function getHydrationKey(): string;
+export function effect<T>(fn: (prev?: T) => T, init?: T): void;
+export function memo<T>(fn: () => T, equal: boolean): () => T;
+export function createComponent<T>(Comp: (props: T) => JSX.Element, props: T): JSX.Element;
+export function mergeProps(...sources: unknown[]): unknown;
+export function getOwner(): unknown;
+export function generateHydrationScript(options: { nonce?: string; eventNames?: string[] }): string;
+
+// deprecated
+export type LegacyResults = {
+  write: (text: string) => void;
+  startWriting: () => void;
+};
+export function pipeToWritable<T>(
+  fn: () => T,
+  writable: WritableStream,
+  options?: {
+    nonce?: string;
+    onReady?: (res: LegacyResults) => void;
+    onCompleteAll?: () => void;
+  }
+): void;
+export function pipeToNodeWritable<T>(
+  fn: () => T,
+  writable: { write: (v: string) => void },
+  options?: {
+    nonce?: string;
+    onReady?: (res: LegacyResults) => void;
+    onCompleteAll?: () => void;
+  }
+): void;

package/h/README.md

@@ -1,99 +0,0 @@
-# Solid HyperScript
-
-This sub module provides a HyperScript method for Solid. This is useful to use Solid in non-compiled environments or in some environments where you can only use a standard JSX transform. This method can be used as the JSX factory function.
-
-HyperScript function takes a few forms. The 2nd props argument is optional. Children may be passed as either an array to the 2nd/3rd argument or as every argument past the 2nd.
-
-```js
-// create an element with a title attribute
-h("button", { title: "My button" }, "Click Me")
-
-// create a component with a title prop
-h(Button, { title: "My button" }, "Click Me")
-
-// create an element with many children
-h("div", { title: "My button" }, h("span", "1"), h("span", "2"), h("span", "3"))
-```
-
-This is the least efficient way to use Solid as it requires a slightly larger runtime that isn't treeshakebable, and cannot leverage anything in the way of analysis, so it requires manual wrapping of expressions and has a few other caveats (see below).
-
-## Example
-
-```js
-import { render } from "solid-js/web";
-import h from "solid-js/h";
-import { createSignal } from "solid-js";
-
-function Button(props) {
-  return h("button.btn-primary", props)
-}
-
-function Counter() {
-  const [count, setCount] = createSignal(0);
-  const increment = (e) => setCount(c => c + 1);
-
-  return h(Button, { type: "button", onClick: increment }, count);
-}
-
-render(Counter, document.getElementById("app"));
-```
-
-## Differences from JSX
-
-There are a few differences from Solid's JSX that are important to note. And also apply when attempting use any transformation that would compile to HyperScript.
-
-1. Reactive expression must be manually wrapped in functions to be reactive.
-
-```js
-// jsx
-<div id={props.id}>{firstName() + lastName()}</div>
-
-// hyperscript
-h("div", { id: () => props.id }, () => firstName() + lastName())
-```
-
-2. Merging spreads requires using the merge props helper to keep reactivity
-
-```js
-// jsx
-<div class={selectedClass()} {...props} />
-
-// hyperscript
-import { mergeProps } from "solid-js"
-
-h("div", mergeProps({ class: selectedClass }, props))
-```
-
-3. Events on components require explicit event in the arguments
-
-Solid's HyperScript automatically wraps functions passed to props of components with no arguments in getters so you need to provide one to prevent this. The same applies to render props like in the `<For>` component.
-
-```js
-// good
-h(Button, { onClick: (e) => console.log("Hi")});
-
-// bad
-h(Button, { onClick: () => console.log("Hi")})
-```
-
-4. All refs are callback form
-
-We can't do the compiled assigment trick so only the callback form is supported.
-
-```js
-let myEl;
-
-h(div, { ref: (el) => myEl = el });
-```
-
-5. There is a shorthand for static id and classes
-
-```js
-h("div#some-id.my-class")
-```
-
-6. Fragments are just arrays
-
-```js
-[h("span", "1"), h("span", "2")]
-```

package/h/jsx-runtime/package.json

@@ -1,8 +0,0 @@
-{
-  "name": "solid-js/h/jsx-runtime",
-  "main": "./dist/jsx.cjs",
-  "module": "./dist/jsx.js",
-  "types": "./types/index.d.ts",
-  "type": "module",
-  "sideEffects": false
-}

package/h/package.json

@@ -1,8 +0,0 @@
-{
-  "name": "solid-js/h",
-  "main": "./dist/h.cjs",
-  "module": "./dist/h.js",
-  "types": "./types/index.d.ts",
-  "type": "module",
-  "sideEffects": false
-}

package/html/README.md

@@ -1,84 +0,0 @@
-# Solid Tagged Template Literals
-
-This sub module provides a Tagged Template Literal `html` method for Solid. This is useful to use Solid in non-compiled environments. This method can be used as replacement for JSX.
-
-`html` uses `${}` to escape into JavaScript expressions. Components are closed with `<//>`
-
-```js
-// create an element with a title attribute
-html`<button title="My button">Click Me</button>`
-
-// create a component with a title prop
-html`<${Button} title="My button">Click me<//>`
-
-// create an element with dynamic attribute and spread
-html`<div title=${() => selectedClass()} ...${props} />`
-```
-
-Using `html` is slightly less efficient than JSX(but more than HyperScript), requires a larger runtime that isn't treeshakebable, and cannot leverage expression analysis, so it requires manual wrapping of expressions and has a few other caveats (see below).
-
-## Example
-
-```js
-import { render } from "solid-js/web";
-import html from "solid-js/html";
-import { createSignal } from "solid-js";
-
-function Button(props) {
-  return html`<button class="btn-primary" ...${props} />`;
-}
-
-function Counter() {
-  const [count, setCount] = createSignal(0);
-  const increment = (e) => setCount((c) => c + 1);
-
-  return html`<${Button} type="button" onClick=${increment}>${count}<//>`;
-}
-
-render(Counter, document.getElementById("app"));
-```
-
-## Differences from JSX
-
-There are a few differences from Solid's JSX that are important to note.
-
-1. Reactive expression must be manually wrapped in functions to be reactive.
-
-```js
-// jsx
-<div id={props.id}>{firstName() + lastName()}</div>
-
-// hyperscript
-html`<div id=${() => props.id}>${() => firstName() + lastName()}</div>`
-```
-
-2. Events on components require explicit event in the arguments
-
-Solid's Tagged Template Literals automatically wraps functions passed to props of components with no arguments in getters so you need to provide one to prevent this. The same applies to render props like in the `<For>` component.
-
-```js
-// good
-html`<${Button} onClick=${(e) => console.log("Hi")} />`;
-
-// bad
-html`<${Button} onClick=${() => console.log("Hi")} />`;
-```
-
-4. All refs are callback form
-
-We can't do the compiled assigment trick so only the callback form is supported.
-
-```js
-let myEl;
-html`<div ref=${(el) => myEl = el} />`;
-```
-
-5. There can be multiple top level elements
-
-No need for fragments just:
-```js
-html`
-  <div>1</div>
-  <div>2</div>
-`
-```

package/html/package.json

@@ -1,8 +0,0 @@
-{
-  "name": "solid-js/html",
-  "main": "./dist/html.cjs",
-  "module": "./dist/html.js",
-  "types": "./types/index.d.ts",
-  "type": "module",
-  "sideEffects": false
-}

package/store/README.md

@@ -1,23 +0,0 @@
-# Solid Store
-
-This submodules contains the means for handling deeps nested reactivity. It provides 2 main primitives `createStore` and `createMutable` which leverage proxies to create dynamic nested reactive structures.
-
-This also contains helper methods `produce` and `reconcile` which augment the behavior of the store setter method to allow for localized mutation and data diffing.
-
-For full documentation, check out the [website](https://www.solidjs.com/docs/latest/api).
-
-## Example
-
-```js
-import { createStore } from "solid-js/store";
-
-const [store, setStore] = createStore({
-  user: {
-    firstName: "John",
-    lastName: "Smith"
-  }
-});
-
-// update store.user.firstName
-setStore("user", "firstName", "Will");
-```

package/store/package.json

@@ -1,35 +0,0 @@
-{
-  "name": "solid-js/store",
-  "main": "./dist/server.cjs",
-  "module": "./dist/server.js",
-  "browser": {
-    "./dist/server.cjs": "./dist/store.cjs",
-    "./dist/server.js": "./dist/store.js"
-  },
-  "unpkg": "./dist/store.cjs",
-  "types": "./types/index.d.ts",
-  "type": "module",
-  "sideEffects": false,
-  "exports": {
-    ".": {
-      "browser": {
-        "development": {
-          "import": "./dist/dev.js",
-          "require": "./dist/dev.cjs"
-        },
-        "import": "./dist/store.js",
-        "require": "./dist/store.cjs"
-      },
-      "node": {
-        "import": "./dist/server.js",
-        "require": "./dist/server.cjs"
-      },
-      "development": {
-        "import": "./dist/dev.js",
-        "require": "./dist/dev.cjs"
-      },
-      "import": "./dist/store.js",
-      "require": "./dist/store.cjs"
-    }
-  }
-}

package/universal/README.md

@@ -1,102 +0,0 @@
-# Solid Universal
-
-This contains the means to create the runtime for a custom renderer for Solid. This can enable using Solid to render to different platforms like native mobile and desktop, canvas or WebGL, or even the terminal. It relies on custom compilation from `babel-preset-solid` and exporting the result of `createRenderer` at a referenceable location.
-
-## Example
-
-To use a custom renderer available in the (fictional) `solid-custom-dom` package you'd configure your babelrc as:
-```json
-{
-  "presets": [
-    [
-      "babel-preset-solid",
-      {
-        "moduleName": "solid-custom-dom",
-        "generate": "universal"
-      }
-    ]
-  ]
-}
-```
-
-To create a custom renderer you must implement certain methods and export (as named exports) the results. You may also want to forward `solid-js` control flow to allow them to be auto imported as well.
-
-```js
-// example custom dom renderer
-import { createRenderer } from "solid-js/universal";
-
-const PROPERTIES = new Set(["className", "textContent"]);
-
-export const {
-  render,
-  effect,
-  memo,
-  createComponent,
-  createElement,
-  createTextNode,
-  insertNode,
-  insert,
-  spread,
-  setProp,
-  mergeProps
-} = createRenderer({
-  createElement(string) {
-    return document.createElement(string);
-  },
-  createTextNode(value) {
-    return document.createTextNode(value);
-  },
-  replaceText(textNode, value) {
-    textNode.data = value;
-  },
-  setProperty(node, name, value) {
-    if (name === "style") Object.assign(node.style, value);
-    else if (name.startsWith("on")) node[name.toLowerCase()] = value;
-    else if (PROPERTIES.has(name)) node[name] = value;
-    else node.setAttribute(name, value);
-  },
-  insertNode(parent, node, anchor) {
-    parent.insertBefore(node, anchor);
-  },
-  isTextNode(node) {
-    return node.type === 3;
-  },
-  removeNode(parent, node) {
-    parent.removeChild(node);
-  },
-  getParentNode(node) {
-    return node.parentNode;
-  },
-  getFirstChild(node) {
-    return node.firstChild;
-  },
-  getNextSibling(node) {
-    return node.nextSibling;
-  }
-});
-
-// Forward Solid control flow
-export {
-  For,
-  Show,
-  Suspense,
-  SuspenseList,
-  Switch,
-  Match,
-  Index,
-  ErrorBoundary
-} from "solid-js";
-```
-
-Then to consume:
-```js
-import { render } from "solid-custom-dom";
-
-function App() {
-  // the skies the limits
-}
-
-render(() => <App />, mountNode)
-```
-
-> Note: For TypeScript support of non-standard JSX you will need to provide your own types at a jsx-runtime entry on your package so that it can be set as the `jsxImportSource`. If mixing and matching different JSX implementations you will need use the per file pragmas.

package/universal/package.json

@@ -1,18 +0,0 @@
-{
-  "name": "solid-js/universal",
-  "main": "./dist/universal.cjs",
-  "module": "./dist/universal.js",
-  "types": "./types/index.d.ts",
-  "type": "module",
-  "sideEffects": false,
-  "exports": {
-    ".": {
-      "development": {
-        "import": "./dist/dev.js",
-        "require": "./dist/dev.cjs"
-      },
-      "import": "./dist/universal.js",
-      "require": "./dist/universal.cjs"
-    }
-  }
-}

package/web/README.md

@@ -1,7 +0,0 @@
-# Solid Web
-
-This submodule contains the web specific APIs for Solid that are mostly internal methods imported during compilation. It has all the code to render for the web on the server and the browser.
-
-In addition this modules provides the primary entry point methods `render`, `hydrate`, `renderToString`, `renderToStringAsync`, `pipeToNodeWritable`, and `pipeToWritable`. As well as a few web specific control flow components `<Portal>` and `<Dynamic>`.
-
-Refer to the [website](https://www.solidjs.com/docs/latest/api) for documentation.

package/web/package.json

@@ -1,35 +0,0 @@
-{
-  "name": "solid-js/web",
-  "main": "./dist/server.cjs",
-  "module": "./dist/server.js",
-  "browser": {
-    "./dist/server.cjs": "./dist/web.cjs",
-    "./dist/server.js": "./dist/web.js"
-  },
-  "unpkg": "./dist/web.cjs",
-  "types": "./types/index.d.ts",
-  "type": "module",
-  "sideEffects": false,
-  "exports": {
-    ".": {
-      "browser": {
-        "development": {
-          "import": "./dist/dev.js",
-          "require": "./dist/dev.cjs"
-        },
-        "import": "./dist/web.js",
-        "require": "./dist/web.cjs"
-      },
-      "node": {
-        "import": "./dist/server.js",
-        "require": "./dist/server.cjs"
-      },
-      "development": {
-        "import": "./dist/dev.js",
-        "require": "./dist/dev.cjs"
-      },
-      "import": "./dist/web.js",
-      "require": "./dist/web.cjs"
-    }
-  }
-}