solid-js 1.9.3 → 2.0.0-experimental.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "solid-js",
   "description": "A declarative JavaScript library for building user interfaces.",
-  "version": "1.9.3",
+  "version": "2.0.0-experimental.0",
   "author": "Ryan Carniato",
   "license": "MIT",
   "homepage": "https://solidjs.com",
@@ -17,30 +17,9 @@
   "type": "module",
   "files": [
     "dist",
-    "store/dist",
-    "store/types",
-    "store/package.json",
-    "web/dist",
-    "web/types",
-    "web/package.json",
-    "web/storage/dist",
-    "web/storage/types",
-    "web/storage/package.json",
-    "h/dist",
-    "h/types",
-    "h/package.json",
-    "h/jsx-runtime/dist",
-    "h/jsx-runtime/types",
-    "h/jsx-runtime/package.json",
-    "h/jsx-dev-runtime/package.json",
-    "html/dist",
-    "html/types",
-    "html/package.json",
-    "universal/dist",
-    "universal/types",
-    "universal/package.json",
     "types",
-    "jsx-runtime.d.ts"
+    "jsx-runtime.d.ts",
+    "package.json"
   ],
   "exports": {
     ".": {
@@ -88,120 +67,6 @@
       "types": "./types/jsx.d.ts",
       "default": "./dist/solid.js"
     },
-    "./store": {
-      "worker": {
-        "types": "./store/types/index.d.ts",
-        "import": "./store/dist/server.js",
-        "require": "./store/dist/server.cjs"
-      },
-      "browser": {
-        "development": {
-          "types": "./store/types/index.d.ts",
-          "import": "./store/dist/dev.js",
-          "require": "./store/dist/dev.cjs"
-        },
-        "types": "./store/types/index.d.ts",
-        "import": "./store/dist/store.js",
-        "require": "./store/dist/store.cjs"
-      },
-      "deno": {
-        "types": "./store/types/index.d.ts",
-        "import": "./store/dist/server.js",
-        "require": "./store/dist/server.cjs"
-      },
-      "node": {
-        "types": "./store/types/index.d.ts",
-        "import": "./store/dist/server.js",
-        "require": "./store/dist/server.cjs"
-      },
-      "development": {
-        "types": "./store/types/index.d.ts",
-        "import": "./store/dist/dev.js",
-        "require": "./store/dist/dev.cjs"
-      },
-      "types": "./store/types/index.d.ts",
-      "import": "./store/dist/store.js",
-      "require": "./store/dist/store.cjs"
-    },
-    "./store/dist/*": "./store/dist/*",
-    "./store/types/*": "./store/types/*",
-    "./web": {
-      "worker": {
-        "types": "./web/types/index.d.ts",
-        "import": "./web/dist/server.js",
-        "require": "./web/dist/server.cjs"
-      },
-      "browser": {
-        "development": {
-          "types": "./web/types/index.d.ts",
-          "import": "./web/dist/dev.js",
-          "require": "./web/dist/dev.cjs"
-        },
-        "types": "./web/types/index.d.ts",
-        "import": "./web/dist/web.js",
-        "require": "./web/dist/web.cjs"
-      },
-      "deno": {
-        "types": "./web/types/index.d.ts",
-        "import": "./web/dist/server.js",
-        "require": "./web/dist/server.cjs"
-      },
-      "node": {
-        "types": "./web/types/index.d.ts",
-        "import": "./web/dist/server.js",
-        "require": "./web/dist/server.cjs"
-      },
-      "development": {
-        "types": "./web/types/index.d.ts",
-        "import": "./web/dist/dev.js",
-        "require": "./web/dist/dev.cjs"
-      },
-      "types": "./web/types/index.d.ts",
-      "import": "./web/dist/web.js",
-      "require": "./web/dist/web.cjs"
-    },
-    "./web/storage": {
-      "types": "./web/storage/types/index.d.ts",
-      "import": "./web/storage/dist/storage.js",
-      "require": "./web/storage/dist/storage.cjs"
-    },
-    "./web/dist/*": "./web/dist/*",
-    "./web/types/*": "./web/types/*",
-    "./universal": {
-      "development": {
-        "types": "./universal/types/index.d.ts",
-        "import": "./universal/dist/dev.js",
-        "require": "./universal/dist/dev.cjs"
-      },
-      "types": "./universal/types/index.d.ts",
-      "import": "./universal/dist/universal.js",
-      "require": "./universal/dist/universal.cjs"
-    },
-    "./universal/dist/*": "./universal/dist/*",
-    "./universal/types/*": "./universal/types/*",
-    "./h": {
-      "types": "./h/types/index.d.ts",
-      "import": "./h/dist/h.js",
-      "require": "./h/dist/h.cjs"
-    },
-    "./h/jsx-runtime": {
-      "types": "./h/jsx-runtime/types/index.d.ts",
-      "import": "./h/jsx-runtime/dist/jsx.js",
-      "require": "./h/jsx-runtime/dist/jsx.cjs"
-    },
-    "./h/jsx-dev-runtime": {
-      "types": "./h/jsx-runtime/types/index.d.ts",
-      "import": "./h/jsx-runtime/dist/jsx.js",
-      "require": "./h/jsx-runtime/dist/jsx.cjs"
-    },
-    "./h/dist/*": "./h/dist/*",
-    "./h/types/*": "./h/types/*",
-    "./html": {
-      "types": "./html/types/index.d.ts",
-      "import": "./html/dist/html.js",
-      "require": "./html/dist/html.cjs"
-    },
-    "./html/dist/*": "./html/dist/*",
     "./package.json": "./package.json"
   },
   "keywords": [
@@ -214,28 +79,17 @@
     "performance"
   ],
   "dependencies": {
-    "csstype": "^3.1.0",
-    "seroval": "^1.1.0",
-    "seroval-plugins": "^1.1.0"
+    "@solidjs/signals": "^0.0.10",
+    "csstype": "^3.1.0"
   },
   "scripts": {
     "build": "npm-run-all -nl build:*",
-    "build:clean": "rimraf dist/ coverage/ store/dist/ web/dist/ h/dist/ h/jsx-runtime/dist html/dist/",
+    "build:clean": "rimraf dist/ coverage/",
     "build:js": "rollup -c",
     "types": "npm-run-all -nl types:*",
-    "types:clean": "rimraf types/ store/types/ web/types/ h/types/ h/jsx-runtime/types html/types/",
-    "types:copy": "ncp ../../node_modules/dom-expressions/src/jsx.d.ts ./src/jsx.d.ts && ncp ../../node_modules/dom-expressions/src/jsx-h.d.ts ./h/jsx-runtime/src/jsx.d.ts",
+    "types:clean": "rimraf types/",
+    "types:copy": "ncp ../../node_modules/dom-expressions/src/jsx.d.ts ./src/jsx.d.ts",
     "types:src": "tsc --project ./tsconfig.build.json && ncp ../../node_modules/dom-expressions/src/jsx.d.ts ./types/jsx.d.ts",
-    "types:web": "tsc --project ./web/tsconfig.build.json",
-    "types:web-storage": "tsc --project ./web/storage/tsconfig.build.json",
-    "types:copy-web": "ncp ../../node_modules/dom-expressions/src/client.d.ts ./web/types/client.d.ts && ncp ../../node_modules/dom-expressions/src/server.d.ts ./web/types/server.d.ts",
-    "types:store": "tsc --project ./store/tsconfig.build.json",
-    "types:html": "tsc --project ./html/tsconfig.json && ncp ../../node_modules/lit-dom-expressions/types/index.d.ts ./html/types/lit.d.ts",
-    "types:h": "tsc --project ./h/tsconfig.json && ncp ../../node_modules/hyper-dom-expressions/types/index.d.ts ./h/types/hyperscript.d.ts",
-    "types:jsx": "rimraf ./h/jsx-runtime/types && tsc --project ./h/jsx-runtime/tsconfig.json && ncp ../../node_modules/dom-expressions/src/jsx-h.d.ts ./h/jsx-runtime/types/jsx.d.ts",
-    "types:universal": "tsc --project ./universal/tsconfig.json && ncp ../../node_modules/dom-expressions/src/universal.d.ts ./universal/types/universal.d.ts",
-    "bench": "node --allow-natives-syntax bench/bench.cjs",
-    "link": "symlink-dir . node_modules/solid-js",
     "test": "vitest run",
     "coverage": "vitest run --coverage",
     "test-types": "tsc --project tsconfig.test.json"

package/types/{render → client}/component.d.ts

@@ -51,8 +51,6 @@ export type FlowProps<P extends Record<string, any> = {}, C = JSX.Element> = P &
 export type FlowComponent<P extends Record<string, any> = {}, C = JSX.Element> = Component<
   FlowProps<P, C>
 >;
-/** @deprecated: use `ParentProps` instead */
-export type PropsWithChildren<P extends Record<string, any> = {}> = ParentProps<P>;
 export type ValidComponent = keyof JSX.IntrinsicElements | Component<any> | (string & {});
 /**
  * Takes the props of the passed component and returns its type
@@ -76,64 +74,6 @@ export declare function createComponent<T extends Record<string, any>>(
   Comp: Component<T>,
   props: T
 ): JSX.Element;
-type DistributeOverride<T, F> = T extends undefined ? F : T;
-type Override<T, U> = T extends any
-  ? U extends any
-    ? {
-        [K in keyof T]: K extends keyof U ? DistributeOverride<U[K], T[K]> : T[K];
-      } & {
-        [K in keyof U]: K extends keyof T ? DistributeOverride<U[K], T[K]> : U[K];
-      }
-    : T & U
-  : T & U;
-type OverrideSpread<T, U> = T extends any
-  ? {
-      [K in keyof ({
-        [K in keyof T]: any;
-      } & {
-        [K in keyof U]?: any;
-      } & {
-        [K in U extends any ? keyof U : keyof U]?: any;
-      })]: K extends keyof T
-        ? Exclude<U extends any ? U[K & keyof U] : never, undefined> | T[K]
-        : U extends any
-        ? U[K & keyof U]
-        : never;
-    }
-  : T & U;
-type Simplify<T> = T extends any
-  ? {
-      [K in keyof T]: T[K];
-    }
-  : T;
-type _MergeProps<T extends unknown[], Curr = {}> = T extends [
-  infer Next | (() => infer Next),
-  ...infer Rest
-]
-  ? _MergeProps<Rest, Override<Curr, Next>>
-  : T extends [...infer Rest, infer Next | (() => infer Next)]
-  ? Override<_MergeProps<Rest, Curr>, Next>
-  : T extends []
-  ? Curr
-  : T extends (infer I | (() => infer I))[]
-  ? OverrideSpread<Curr, I>
-  : Curr;
-export type MergeProps<T extends unknown[]> = Simplify<_MergeProps<T>>;
-export declare function mergeProps<T extends unknown[]>(...sources: T): MergeProps<T>;
-export type SplitProps<T, K extends (readonly (keyof T)[])[]> = [
-  ...{
-    [P in keyof K]: P extends `${number}`
-      ? Pick<T, Extract<K[P], readonly (keyof T)[]>[number]>
-      : never;
-  },
-  {
-    [P in keyof T as Exclude<P, K[number][number]>]: T[P];
-  }
-];
-export declare function splitProps<
-  T extends Record<any, any>,
-  K extends [readonly (keyof T)[], ...(readonly (keyof T)[])[]]
->(props: T, ...keys: K): SplitProps<T, K>;
 export declare function lazy<T extends Component<any>>(
   fn: () => Promise<{
     default: T;
@@ -144,4 +84,3 @@ export declare function lazy<T extends Component<any>>(
   }>;
 };
 export declare function createUniqueId(): string;
-export {};

package/types/client/core.d.ts

@@ -0,0 +1,75 @@
+import type { Accessor, Owner, EffectOptions } from "@solidjs/signals";
+import type { JSX } from "../jsx.js";
+import { FlowComponent } from "./component.js";
+export declare const IS_DEV: string | boolean;
+export declare const $DEVCOMP: unique symbol;
+/**
+ * Runs an effect only after initial render on mount
+ * @param fn an effect that should run only once on mount
+ *
+ * @description https://docs.solidjs.com/reference/lifecycle/on-mount
+ */
+export declare function onMount(fn: () => void): void;
+export type NoInfer<T extends any> = [T][T extends any ? 0 : never];
+export type ContextProviderComponent<T> = FlowComponent<{
+  value: T;
+}>;
+export interface Context<T> extends ContextProviderComponent<T> {
+  id: symbol;
+  defaultValue: T;
+}
+/**
+ * Creates a Context to handle a state scoped for the children of a component
+ * ```typescript
+ * interface Context<T> {
+ *   id: symbol;
+ *   Provider: FlowComponent<{ value: T }>;
+ *   defaultValue: T;
+ * }
+ * export function createContext<T>(
+ *   defaultValue?: T,
+ *   options?: { name?: string }
+ * ): Context<T | undefined>;
+ * ```
+ * @param defaultValue optional default to inject into context
+ * @param options allows to set a name in dev mode for debugging purposes
+ * @returns The context that contains the Provider Component and that can be used with `useContext`
+ *
+ * @description https://docs.solidjs.com/reference/component-apis/create-context
+ */
+export declare function createContext<T>(
+  defaultValue?: undefined,
+  options?: EffectOptions
+): Context<T | undefined>;
+export declare function createContext<T>(defaultValue: T, options?: EffectOptions): Context<T>;
+/**
+ * Uses a context to receive a scoped state from a parent's Context.Provider
+ *
+ * @param context Context object made by `createContext`
+ * @returns the current or `defaultValue`, if present
+ *
+ * @description https://docs.solidjs.com/reference/component-apis/use-context
+ */
+export declare function useContext<T>(context: Context<T>): T;
+export type ResolvedJSXElement = Exclude<JSX.Element, JSX.ArrayElement>;
+export type ResolvedChildren = ResolvedJSXElement | ResolvedJSXElement[];
+export type ChildrenReturn = Accessor<ResolvedChildren> & {
+  toArray: () => ResolvedJSXElement[];
+};
+/**
+ * Resolves child elements to help interact with children
+ *
+ * @param fn an accessor for the children
+ * @returns a accessor of the same children, but resolved
+ *
+ * @description https://docs.solidjs.com/reference/component-apis/children
+ */
+export declare function children(fn: Accessor<JSX.Element>): ChildrenReturn;
+export declare function devComponent<P, V>(Comp: (props: P) => V, props: P): V;
+interface SourceMapValue {
+  value: unknown;
+  name?: string;
+  graph?: Owner;
+}
+export declare function registerGraph(value: SourceMapValue): void;
+export {};

package/types/client/flow.d.ts

@@ -0,0 +1,114 @@
+import type { Accessor } from "@solidjs/signals";
+import type { JSX } from "../jsx.js";
+/**
+ * Creates a list of elements from a list
+ *
+ * it receives a map function as its child that receives list element and index accessors and returns a JSX-Element; if the list is empty, an optional fallback is returned:
+ * ```typescript
+ * <For each={items} fallback={<div>No items</div>}>
+ *   {(item, index) => <div data-index={index()}>{item()}</div>}
+ * </For>
+ * ```
+ *
+ * @description https://docs.solidjs.com/reference/components/for
+ */
+export declare function For<T extends readonly any[], U extends JSX.Element>(props: {
+  each: T | undefined | null | false;
+  fallback?: JSX.Element;
+  keyed?: boolean | ((item: T) => any);
+  children: (item: Accessor<T[number]>, index: Accessor<number>) => U;
+}): JSX.Element;
+/**
+ * Creates a list elements from a count
+ *
+ * it receives a map function as its child that receives the index and returns a JSX-Element; if the list is empty, an optional fallback is returned:
+ * ```typescript
+ * <Repeat count={items.length} fallback={<div>No items</div>}>
+ *   {(index) => <div data-index={index}>{items[index]}</div>}
+ * </Repeat>
+ * ```
+ *
+ * @description https://docs.solidjs.com/reference/components/repeat
+ */
+export declare function Repeat<T extends JSX.Element>(props: {
+  count: number;
+  fallback?: JSX.Element;
+  children: ((index: number) => T) | T;
+}): JSX.Element;
+/**
+ * Conditionally render its children or an optional fallback component
+ * @description https://docs.solidjs.com/reference/components/show
+ */
+export declare function Show<T>(props: {
+  when: T | undefined | null | false;
+  keyed?: boolean;
+  fallback?: JSX.Element;
+  children: JSX.Element | ((item: Accessor<NonNullable<T>>) => JSX.Element);
+}): JSX.Element;
+/**
+ * Switches between content based on mutually exclusive conditions
+ * ```typescript
+ * <Switch fallback={<FourOhFour />}>
+ *   <Match when={state.route === 'home'}>
+ *     <Home />
+ *   </Match>
+ *   <Match when={state.route === 'settings'}>
+ *     <Settings />
+ *   </Match>
+ * </Switch>
+ * ```
+ * @description https://docs.solidjs.com/reference/components/switch-and-match
+ */
+export declare function Switch(props: {
+  fallback?: JSX.Element;
+  children: JSX.Element;
+}): JSX.Element;
+export type MatchProps<T> = {
+  when: T | undefined | null | false;
+  keyed?: boolean;
+  children: JSX.Element | ((item: Accessor<NonNullable<T>>) => JSX.Element);
+};
+/**
+ * Selects a content based on condition when inside a `<Switch>` control flow
+ * ```typescript
+ * <Match when={condition()}>
+ *   <Content/>
+ * </Match>
+ * ```
+ * @description https://docs.solidjs.com/reference/components/switch-and-match
+ */
+export declare function Match<T>(props: MatchProps<T>): JSX.Element;
+/**
+ * Catches uncaught errors inside components and renders a fallback content
+ *
+ * Also supports a callback form that passes the error and a reset function:
+ * ```typescript
+ * <ErrorBoundary fallback={
+ *   (err, reset) => <div onClick={reset}>Error: {err.toString()}</div>
+ * }>
+ *   <MyComp />
+ * </ErrorBoundary>
+ * ```
+ * Errors thrown from the fallback can be caught by a parent ErrorBoundary
+ *
+ * @description https://docs.solidjs.com/reference/components/error-boundary
+ */
+export declare function ErrorBoundary(props: {
+  fallback: JSX.Element | ((err: any, reset: () => void) => JSX.Element);
+  children: JSX.Element;
+}): JSX.Element;
+/**
+ * Tracks all resources inside a component and renders a fallback until they are all resolved
+ * ```typescript
+ * const AsyncComponent = lazy(() => import('./component'));
+ *
+ * <Suspense fallback={<LoadingIndicator />}>
+ *   <AsyncComponent />
+ * </Suspense>
+ * ```
+ * @description https://docs.solidjs.com/reference/components/suspense
+ */
+export declare function Suspense(props: {
+  fallback?: JSX.Element;
+  children: JSX.Element;
+}): JSX.Element;

package/types/{render → client}/hydration.d.ts

@@ -1,4 +1,3 @@
-import { Computation } from "../reactive/signal.js";
 export type HydrationContext = {
   id: string;
   count: number;
@@ -14,7 +13,6 @@ type SharedConfig = {
   registry?: Map<string, Element>;
   done?: boolean;
   count?: number;
-  effects?: Computation<any, any>[];
   getContextId(): string;
   getNextContextId(): string;
 };

package/types/{reactive → client}/observable.d.ts

@@ -1,4 +1,4 @@
-import { Accessor, Setter } from "./signal.js";
+import { Accessor, Setter } from "@solidjs/signals";
 declare global {
   interface SymbolConstructor {
     readonly observable: symbol;

package/types/index.d.ts

@@ -1,84 +1,73 @@
 export {
-  $DEVCOMP,
   $PROXY,
   $TRACK,
-  batch,
+  $RAW,
   catchError,
-  children,
-  createComputed,
-  createContext,
-  createDeferred,
+  createAsync,
   createEffect,
   createMemo,
+  createProjection,
   createReaction,
   createRenderEffect,
-  createResource,
   createRoot,
-  createSelector,
   createSignal,
-  enableExternalSource,
-  enableScheduling,
-  equalFn,
-  getListener,
+  createStore,
+  flatten,
+  flushSync,
+  getObserver,
   getOwner,
-  on,
+  isEqual,
+  isStale,
+  isWrappable,
+  latest,
+  mapArray,
+  merge,
+  omit,
   onCleanup,
-  onError,
-  onMount,
+  reconcile,
+  repeat,
+  resolve,
   runWithOwner,
-  startTransition,
   untrack,
-  useContext,
-  useTransition
-} from "./reactive/signal.js";
+  unwrap
+} from "@solidjs/signals";
 export type {
   Accessor,
-  AccessorArray,
-  ChildrenReturn,
-  Context,
-  ContextProviderComponent,
+  ComputeFunction,
   EffectFunction,
   EffectOptions,
-  InitializedResource,
-  InitializedResourceOptions,
-  InitializedResourceReturn,
-  MemoOptions,
+  Merge,
   NoInfer,
-  OnEffectFunction,
-  OnOptions,
+  NotWrappable,
+  Omit,
   Owner,
-  ResolvedChildren,
-  ResolvedJSXElement,
-  Resource,
-  ResourceActions,
-  ResourceFetcher,
-  ResourceFetcherInfo,
-  ResourceOptions,
-  ResourceReturn,
-  ResourceSource,
-  ReturnTypes,
-  Setter,
   Signal,
-  SignalOptions
-} from "./reactive/signal.js";
-export * from "./reactive/observable.js";
-export * from "./reactive/scheduler.js";
-export * from "./reactive/array.js";
-export * from "./render/index.js";
+  SignalOptions,
+  Setter,
+  Store,
+  SolidStore,
+  StoreNode,
+  StoreSetter
+} from "@solidjs/signals";
+export { $DEVCOMP, children, createContext, onMount, useContext } from "./client/core.js";
+export type {
+  ChildrenReturn,
+  Context,
+  ContextProviderComponent,
+  ResolvedChildren,
+  ResolvedJSXElement
+} from "./client/core.js";
+export * from "./client/observable.js";
+export * from "./client/component.js";
+export * from "./client/flow.js";
+export { sharedConfig } from "./client/hydration.js";
 import type { JSX } from "./jsx.js";
 type JSXElement = JSX.Element;
 export type { JSXElement, JSX };
-import { registerGraph, writeSignal } from "./reactive/signal.js";
+import { registerGraph } from "./client/core.js";
 export declare const DEV:
   | {
-      readonly hooks: {
-        afterUpdate: (() => void) | null;
-        afterCreateOwner: ((owner: import("./reactive/signal.js").Owner) => void) | null;
-        afterCreateSignal:
-          | ((signal: import("./reactive/signal.js").SignalState<any>) => void)
-          | null;
-      };
-      readonly writeSignal: typeof writeSignal;
+      readonly hooks: {};
       readonly registerGraph: typeof registerGraph;
     }
   | undefined;