solid-js 1.4.8 → 1.5.0-beta.2

package/h/types/hyperscript.d.ts

@@ -0,0 +1,17 @@
+declare type MountableElement = Element | Document | ShadowRoot | DocumentFragment | Node;
+interface Runtime {
+    insert(parent: MountableElement, accessor: any, marker?: Node | null, init?: any): any;
+    spread(node: Element, accessor: any, isSVG?: Boolean, skipChildren?: Boolean): void;
+    assign(node: Element, props: any, isSVG?: Boolean, skipChildren?: Boolean): void;
+    createComponent(Comp: (props: any) => any, props: any): any;
+    dynamicProperty(props: any, key: string): any;
+    SVGElements: Set<string>;
+}
+declare type ExpandableNode = Node & {
+    [key: string]: any;
+};
+export declare type HyperScript = {
+    (...args: any[]): () => ExpandableNode | ExpandableNode[];
+};
+export declare function createHyperScript(r: Runtime): HyperScript;
+export {};

package/html/types/lit.d.ts

@@ -0,0 +1,37 @@
+declare type MountableElement = Element | Document | ShadowRoot | DocumentFragment | Node;
+interface Runtime {
+    effect<T>(fn: (prev?: T) => T, init?: T): any;
+    insert(parent: MountableElement, accessor: any, marker?: Node | null, init?: any): any;
+    spread<T>(node: Element, accessor: (() => T) | T, isSVG?: Boolean, skipChildren?: Boolean): void;
+    createComponent(Comp: (props: any) => any, props: any): any;
+    addEventListener(node: Element, name: string, handler: () => void, delegate: boolean): void;
+    delegateEvents(eventNames: string[]): void;
+    classList(node: Element, value: {
+        [k: string]: boolean;
+    }, prev?: {
+        [k: string]: boolean;
+    }): void;
+    style(node: Element, value: {
+        [k: string]: string;
+    }, prev?: {
+        [k: string]: string;
+    }): void;
+    mergeProps(...sources: unknown[]): unknown;
+    dynamicProperty(props: any, key: string): any;
+    setAttribute(node: Element, name: string, value: any): void;
+    setAttributeNS(node: Element, namespace: string, name: string, value: any): void;
+    Aliases: Record<string, string>;
+    PropAliases: Record<string, string>;
+    Properties: Set<string>;
+    ChildProperties: Set<string>;
+    DelegatedEvents: Set<string>;
+    SVGElements: Set<string>;
+    SVGNamespace: Record<string, string>;
+}
+export declare type HTMLTag = {
+    (statics: TemplateStringsArray, ...args: unknown[]): Node | Node[];
+};
+export declare function createHTML(r: Runtime, { delegateEvents }?: {
+    delegateEvents?: boolean | undefined;
+}): HTMLTag;
+export {};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "solid-js",
   "description": "A declarative JavaScript library for building user interfaces.",
-  "version": "1.4.8",
+  "version": "1.5.0-beta.2",
   "author": "Ryan Carniato",
   "license": "MIT",
   "homepage": "https://solidjs.com",
@@ -40,108 +40,150 @@
     ".": {
       "browser": {
         "development": {
-          "import": "./dist/dev.js",
+          "import": {
+            "types": "./types/index.d.ts",
+            "default": "./dist/dev.js"
+          },
           "require": "./dist/dev.cjs"
         },
-        "import": "./dist/solid.js",
+        "import": {
+          "types": "./types/index.d.ts",
+          "default": "./dist/solid.js"
+        },
         "require": "./dist/solid.cjs"
       },
       "node": {
-        "import": "./dist/server.js",
+        "import": {
+          "types": "./types/index.d.ts",
+          "default": "./dist/server.js"
+        },
         "require": "./dist/server.cjs"
       },
       "development": {
-        "import": "./dist/dev.js",
+        "import": {
+          "types": "./types/index.d.ts",
+          "default": "./dist/dev.js"
+        },
         "require": "./dist/dev.cjs"
       },
-      "import": "./dist/solid.js",
+      "import": {
+        "types": "./types/index.d.ts",
+        "default": "./dist/solid.js"
+      },
       "require": "./dist/solid.cjs"
     },
     "./dist/*": "./dist/*",
     "./store": {
       "browser": {
         "development": {
-          "import": "./store/dist/dev.js",
+          "import": {
+            "types": "./store/types/index.d.ts",
+            "default": "./store/dist/dev.js"
+          },
           "require": "./store/dist/dev.cjs"
         },
-        "import": "./store/dist/store.js",
+        "import": {
+          "types": "./store/types/index.d.ts",
+          "default": "./store/dist/store.js"
+        },
         "require": "./store/dist/store.cjs"
       },
       "node": {
-        "import": "./store/dist/server.js",
+        "import": {
+          "types": "./store/types/index.d.ts",
+          "default": "./store/dist/server.js"
+        },
         "require": "./store/dist/server.cjs"
       },
       "development": {
-        "import": "./store/dist/dev.js",
+        "import": {
+          "types": "./store/types/index.d.ts",
+          "default": "./store/dist/dev.js"
+        },
         "require": "./store/dist/dev.cjs"
       },
-      "import": "./store/dist/store.js",
+      "import": {
+        "types": "./store/types/index.d.ts",
+        "default": "./store/dist/store.js"
+      },
       "require": "./store/dist/store.cjs"
     },
     "./store/dist/*": "./store/dist/*",
     "./web": {
       "browser": {
         "development": {
-          "import": "./web/dist/dev.js",
+          "import": {
+            "types": "./web/types/index.d.ts",
+            "default": "./web/dist/dev.js"
+          },
           "require": "./web/dist/dev.cjs"
         },
-        "import": "./web/dist/web.js",
+        "import": {
+          "types": "./web/types/index.d.ts",
+          "default": "./web/dist/web.js"
+        },
         "require": "./web/dist/web.cjs"
       },
       "node": {
-        "import": "./web/dist/server.js",
+        "import": {
+          "types": "./web/types/index.d.ts",
+          "default": "./web/dist/server.js"
+        },
         "require": "./web/dist/server.cjs"
       },
       "development": {
-        "import": "./web/dist/dev.js",
+        "import": {
+          "types": "./web/types/index.d.ts",
+          "default": "./web/dist/dev.js"
+        },
         "require": "./web/dist/dev.cjs"
       },
-      "import": "./web/dist/web.js",
+      "import": {
+        "types": "./web/types/index.d.ts",
+        "default": "./web/dist/web.js"
+      },
       "require": "./web/dist/web.cjs"
     },
     "./web/dist/*": "./web/dist/*",
     "./universal": {
       "development": {
-        "import": "./universal/dist/dev.js",
+        "import": {
+          "types": "./universal/types/index.d.ts",
+          "default": "./universal/dist/dev.js"
+        },
         "require": "./universal/dist/dev.cjs"
       },
-      "import": "./universal/dist/universal.js",
+      "import": {
+        "types": "./universal/types/index.d.ts",
+        "default": "./universal/dist/universal.js"
+      },
       "require": "./universal/dist/universal.cjs"
     },
     "./universal/dist/*": "./universal/dist/*",
     "./h": {
-      "import": "./h/dist/h.js",
+      "import": {
+        "types": "./h/types/index.d.ts",
+        "default": "./h/dist/h.js"
+      },
       "require": "./h/dist/h.cjs"
     },
     "./h/jsx-runtime": {
-      "import": "./h/jsx-runtime/dist/jsx.js",
+      "import": {
+        "types": "./h/jsx-runtime/types/index.d.ts",
+        "default": "./h/jsx-runtime/dist/jsx.js"
+      },
       "require": "./h/jsx-runtime/dist/jsx.cjs"
     },
     "./h/dist/*": "./h/dist/*",
     "./html": {
-      "import": "./html/dist/html.js",
+      "import": {
+        "types": "./html/types/index.d.ts",
+        "default": "./html/dist/html.js"
+      },
       "require": "./html/dist/html.cjs"
     },
     "./html/dist/*": "./html/dist/*"
   },
-  "scripts": {
-    "prebuild": "npm run clean",
-    "clean": "rimraf dist/ types/ coverage/ store/dist/ store/types/ web/dist/ web/types/ h/dist/ h/types/ h/jsx-runtime/dist h/jsx-runtime/types html/dist/ html/types/",
-    "build": "npm-run-all -cnl build:*",
-    "build:link": "symlink-dir . node_modules/solid-js",
-    "build:js": "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 && rollup -c",
-    "build:types": "tsc --project ./tsconfig.build.json",
-    "build:types-store": "tsc --project ./store/tsconfig.build.json && tsconfig-replace-paths --project ./store/tsconfig.types.json",
-    "build:types-web": "tsc --project ./web/tsconfig.build.json && tsconfig-replace-paths --project ./web/tsconfig.types.json",
-    "build:types-html": "tsc --project ./html/tsconfig.json",
-    "build:types-h": "tsc --project ./h/tsconfig.json",
-    "build:types-jsx": "tsc --project ./h/jsx-runtime/tsconfig.json",
-    "build:types-universal": "tsc --project ./universal/tsconfig.json",
-    "bench": "node --allow-natives-syntax bench/bench.cjs",
-    "test": "jest && npm run test:types",
-    "test:coverage": "jest --coverage && npm run test:types",
-    "test:types": "tsc --project tsconfig.test.json"
-  },
   "keywords": [
     "solid",
     "solidjs",
@@ -151,5 +193,25 @@
     "compiler",
     "performance"
   ],
-  "gitHead": "e7f60ab9ac33e0666d966b4ba50371f2a683a574"
-}
+  "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: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: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: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": "jest",
+    "coverage": "jest --coverage",
+    "test-types": "tsc --project tsconfig.test.json"
+  }
+}

package/store/dist/dev.cjs

@@ -13,15 +13,17 @@ function wrap$1(value, name) {
     Object.defineProperty(value, solidJs.$PROXY, {
       value: p = new Proxy(value, proxyTraps$1)
     });
-    const keys = Object.keys(value),
-          desc = Object.getOwnPropertyDescriptors(value);
-    for (let i = 0, l = keys.length; i < l; i++) {
-      const prop = keys[i];
-      if (desc[prop].get) {
-        const get = desc[prop].get.bind(p);
-        Object.defineProperty(value, prop, {
-          get
-        });
+    if (!Array.isArray(value)) {
+      const keys = Object.keys(value),
+            desc = Object.getOwnPropertyDescriptors(value);
+      for (let i = 0, l = keys.length; i < l; i++) {
+        const prop = keys[i];
+        if (desc[prop].get) {
+          const get = desc[prop].get.bind(p);
+          Object.defineProperty(value, prop, {
+            get
+          });
+        }
       }
     }
     if (name) Object.defineProperty(value, $NAME, {
@@ -65,7 +67,7 @@ function getDataNodes(target) {
   return nodes;
 }
 function getDataNode(nodes, property, value) {
-  return nodes[property] || (nodes[property] = createDataNode(value, true));
+  return nodes[property] || (nodes[property] = createDataNode(value));
 }
 function proxyDescriptor(target, property) {
   const desc = Reflect.getOwnPropertyDescriptor(target, property);
@@ -85,10 +87,8 @@ function ownKeys(target) {
   trackSelf(target);
   return Reflect.ownKeys(target);
 }
-function createDataNode(value, equals) {
-  const [s, set] = solidJs.createSignal(value, equals ? {
-    internal: true
-  } : {
+function createDataNode(value) {
+  const [s, set] = solidJs.createSignal(value, {
     equals: false,
     internal: true
   });
@@ -99,9 +99,12 @@ const proxyTraps$1 = {
   get(target, property, receiver) {
     if (property === $RAW) return target;
     if (property === solidJs.$PROXY) return receiver;
-    if (property === solidJs.$TRACK) return trackSelf(target);
+    if (property === solidJs.$TRACK) {
+      trackSelf(target);
+      return receiver;
+    }
     const nodes = getDataNodes(target);
-    const tracked = nodes[property];
+    const tracked = nodes.hasOwnProperty(property);
     let value = tracked ? nodes[property]() : target[property];
     if (property === $NODE || property === "__proto__") return value;
     if (!tracked) {
@@ -110,6 +113,12 @@ const proxyTraps$1 = {
     }
     return isWrappable(value) ? wrap$1(value, target[$NAME] && `${target[$NAME]}:${property.toString()}`) : value;
   },
+  has(target, property) {
+    if (property === $RAW || property === solidJs.$PROXY || property === solidJs.$TRACK || property === $NODE || property === "__proto__") return true;
+    const tracked = getDataNodes(target)[property];
+    tracked && tracked();
+    return property in target;
+  },
   set() {
     console.warn("Cannot mutate a Store directly");
     return true;
@@ -121,8 +130,8 @@ const proxyTraps$1 = {
   ownKeys: ownKeys,
   getOwnPropertyDescriptor: proxyDescriptor
 };
-function setProperty(state, property, value) {
-  if (state[property] === value) return;
+function setProperty(state, property, value, deleting = false) {
+  if (!deleting && state[property] === value) return;
   const prev = state[property];
   const len = state.length;
   if (value === undefined) {
@@ -223,9 +232,12 @@ const proxyTraps = {
   get(target, property, receiver) {
     if (property === $RAW) return target;
     if (property === solidJs.$PROXY) return receiver;
-    if (property === solidJs.$TRACK) return trackSelf(target);
+    if (property === solidJs.$TRACK) {
+      trackSelf(target);
+      return receiver;
+    }
     const nodes = getDataNodes(target);
-    const tracked = nodes[property];
+    const tracked = nodes.hasOwnProperty(property);
     let value = tracked ? nodes[property]() : target[property];
     if (property === $NODE || property === "__proto__") return value;
     if (!tracked) {
@@ -237,12 +249,18 @@ const proxyTraps = {
     }
     return isWrappable(value) ? wrap(value, target[$NAME] && `${target[$NAME]}:${property.toString()}`) : value;
   },
+  has(target, property) {
+    if (property === $RAW || property === solidJs.$PROXY || property === solidJs.$TRACK || property === $NODE || property === "__proto__") return true;
+    const tracked = getDataNodes(target)[property];
+    tracked && tracked();
+    return property in target;
+  },
   set(target, property, value) {
     solidJs.batch(() => setProperty(target, property, unwrap(value)));
     return true;
   },
   deleteProperty(target, property) {
-    solidJs.batch(() => setProperty(target, property, undefined));
+    solidJs.batch(() => setProperty(target, property, undefined, true));
     return true;
   },
   ownKeys: ownKeys,
@@ -393,7 +411,7 @@ const setterTraps = {
     return true;
   },
   deleteProperty(target, property) {
-    setProperty(target, property, undefined);
+    setProperty(target, property, undefined, true);
     return true;
   }
 };

package/store/dist/dev.js

@@ -1,4 +1,4 @@
-import { $PROXY, DEV, $TRACK, getListener, batch, createSignal } from 'solid-js';
+import { DEV, $PROXY, $TRACK, getListener, batch, createSignal } from 'solid-js';
 
 const $RAW = Symbol("store-raw"),
       $NODE = Symbol("store-node"),
@@ -9,15 +9,17 @@ function wrap$1(value, name) {
     Object.defineProperty(value, $PROXY, {
       value: p = new Proxy(value, proxyTraps$1)
     });
-    const keys = Object.keys(value),
-          desc = Object.getOwnPropertyDescriptors(value);
-    for (let i = 0, l = keys.length; i < l; i++) {
-      const prop = keys[i];
-      if (desc[prop].get) {
-        const get = desc[prop].get.bind(p);
-        Object.defineProperty(value, prop, {
-          get
-        });
+    if (!Array.isArray(value)) {
+      const keys = Object.keys(value),
+            desc = Object.getOwnPropertyDescriptors(value);
+      for (let i = 0, l = keys.length; i < l; i++) {
+        const prop = keys[i];
+        if (desc[prop].get) {
+          const get = desc[prop].get.bind(p);
+          Object.defineProperty(value, prop, {
+            get
+          });
+        }
       }
     }
     if (name) Object.defineProperty(value, $NAME, {
@@ -61,7 +63,7 @@ function getDataNodes(target) {
   return nodes;
 }
 function getDataNode(nodes, property, value) {
-  return nodes[property] || (nodes[property] = createDataNode(value, true));
+  return nodes[property] || (nodes[property] = createDataNode(value));
 }
 function proxyDescriptor(target, property) {
   const desc = Reflect.getOwnPropertyDescriptor(target, property);
@@ -81,10 +83,8 @@ function ownKeys(target) {
   trackSelf(target);
   return Reflect.ownKeys(target);
 }
-function createDataNode(value, equals) {
-  const [s, set] = createSignal(value, equals ? {
-    internal: true
-  } : {
+function createDataNode(value) {
+  const [s, set] = createSignal(value, {
     equals: false,
     internal: true
   });
@@ -95,9 +95,12 @@ const proxyTraps$1 = {
   get(target, property, receiver) {
     if (property === $RAW) return target;
     if (property === $PROXY) return receiver;
-    if (property === $TRACK) return trackSelf(target);
+    if (property === $TRACK) {
+      trackSelf(target);
+      return receiver;
+    }
     const nodes = getDataNodes(target);
-    const tracked = nodes[property];
+    const tracked = nodes.hasOwnProperty(property);
     let value = tracked ? nodes[property]() : target[property];
     if (property === $NODE || property === "__proto__") return value;
     if (!tracked) {
@@ -106,6 +109,12 @@ const proxyTraps$1 = {
     }
     return isWrappable(value) ? wrap$1(value, target[$NAME] && `${target[$NAME]}:${property.toString()}`) : value;
   },
+  has(target, property) {
+    if (property === $RAW || property === $PROXY || property === $TRACK || property === $NODE || property === "__proto__") return true;
+    const tracked = getDataNodes(target)[property];
+    tracked && tracked();
+    return property in target;
+  },
   set() {
     console.warn("Cannot mutate a Store directly");
     return true;
@@ -117,8 +126,8 @@ const proxyTraps$1 = {
   ownKeys: ownKeys,
   getOwnPropertyDescriptor: proxyDescriptor
 };
-function setProperty(state, property, value) {
-  if (state[property] === value) return;
+function setProperty(state, property, value, deleting = false) {
+  if (!deleting && state[property] === value) return;
   const prev = state[property];
   const len = state.length;
   if (value === undefined) {
@@ -219,9 +228,12 @@ const proxyTraps = {
   get(target, property, receiver) {
     if (property === $RAW) return target;
     if (property === $PROXY) return receiver;
-    if (property === $TRACK) return trackSelf(target);
+    if (property === $TRACK) {
+      trackSelf(target);
+      return receiver;
+    }
     const nodes = getDataNodes(target);
-    const tracked = nodes[property];
+    const tracked = nodes.hasOwnProperty(property);
     let value = tracked ? nodes[property]() : target[property];
     if (property === $NODE || property === "__proto__") return value;
     if (!tracked) {
@@ -233,12 +245,18 @@ const proxyTraps = {
     }
     return isWrappable(value) ? wrap(value, target[$NAME] && `${target[$NAME]}:${property.toString()}`) : value;
   },
+  has(target, property) {
+    if (property === $RAW || property === $PROXY || property === $TRACK || property === $NODE || property === "__proto__") return true;
+    const tracked = getDataNodes(target)[property];
+    tracked && tracked();
+    return property in target;
+  },
   set(target, property, value) {
     batch(() => setProperty(target, property, unwrap(value)));
     return true;
   },
   deleteProperty(target, property) {
-    batch(() => setProperty(target, property, undefined));
+    batch(() => setProperty(target, property, undefined, true));
     return true;
   },
   ownKeys: ownKeys,
@@ -389,7 +407,7 @@ const setterTraps = {
     return true;
   },
   deleteProperty(target, property) {
-    setProperty(target, property, undefined);
+    setProperty(target, property, undefined, true);
     return true;
   }
 };