solid-js 1.4.6 → 1.5.0-beta.1

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/dist/html.cjs

@@ -2,10 +2,9 @@
 
 var web = require('solid-js/web');
 
-var attrRE, lookup, parseTag, pushCommentNode, pushTextNode, tagRE;
-tagRE = /(?:<!--[\S\s]*?-->|<(?:"[^"]*"['"]*|'[^']*'['"]*|[^'">])+>)/g;
-attrRE = /\s([^'"/\s><]+?)[\s/>]|([^\s=]+)=\s?(".*?"|'.*?')/g;
-lookup = {
+const tagRE = /(?:<!--[\S\s]*?-->|<(?:"[^"]*"['"]*|'[^']*'['"]*|[^'">])+>)/g;
+const attrRE = /(?:\s(?<boolean>[^/\s><=]+?)(?=[\s/>]))|(?:(?<name>\S+?)(?:\s*=\s*(?:(['"])(?<quotedValue>[\s\S]*?)\3|(?<unquotedValue>[^\s>]+))))/g;
+const lookup = {
   area: true,
   base: true,
   br: true,
@@ -23,9 +22,9 @@ lookup = {
   track: true,
   wbr: true
 };
-parseTag = function (tag) {
-  var res;
-  res = {
+function parseTag(
+tag) {
+  const res = {
     type: 'tag',
     name: '',
     voidElement: false,
@@ -47,64 +46,42 @@ parseTag = function (tag) {
     }
   }
   const reg = new RegExp(attrRE);
-  let result = null;
-  for (;;) {
-    result = reg.exec(tag);
-    if (result === null) {
-      break;
-    }
-    if (!result[0].trim()) {
-      continue;
-    }
-    if (result[1]) {
-      const attr = result[1].trim();
-      let arr = [attr, ''];
-      if (attr.indexOf('=') > -1) {
-        arr = attr.split('=');
-      }
-      res.attrs[arr[0]] = arr[1];
-      reg.lastIndex--;
-    } else if (result[2]) {
-      res.attrs[result[2]] = result[3].trim().substring(1, result[3].length - 1);
-    }
+  for (const match of tag.matchAll(reg)) {
+    res.attrs[match[1] || match[2]] = match[4] || match[5] || '';
   }
   return res;
-};
-pushTextNode = function (list, html, start) {
-  var content, end;
-  end = html.indexOf('<', start);
-  content = html.slice(start, end === -1 ? void 0 : end);
+}
+function pushTextNode(list, html, start) {
+  const end = html.indexOf('<', start);
+  const content = html.slice(start, end === -1 ? void 0 : end);
   if (!/^\s*$/.test(content)) {
     list.push({
       type: 'text',
       content: content
     });
   }
-};
-pushCommentNode = function (list, tag) {
-  var content;
-  content = tag.replace('<!--', '').replace('-->', '');
+}
+function pushCommentNode(list, tag) {
+  const content = tag.replace('<!--', '').replace('-->', '');
   if (!/^\s*$/.test(content)) {
     list.push({
       type: 'comment',
       content: content
     });
   }
-};
+}
 function parse(html) {
-  var arr, byTag, current, level, result;
-  result = [];
-  current = void 0;
-  level = -1;
-  arr = [];
-  byTag = {};
-  html.replace(tagRE, function (tag, index) {
-    var isComment, isOpen, nextChar, parent, start;
-    isOpen = tag.charAt(1) !== '/';
-    isComment = tag.slice(0, 4) === '<!--';
-    start = index + tag.length;
-    nextChar = html.charAt(start);
-    parent = void 0;
+  const result = [];
+  let current = void 0;
+  let level = -1;
+  const arr = [];
+  const byTag = {};
+  html.replace(tagRE, (tag, index) => {
+    const isOpen = tag.charAt(1) !== '/';
+    const isComment = tag.slice(0, 4) === '<!--';
+    const start = index + tag.length;
+    const nextChar = html.charAt(start);
+    let parent = void 0;
     if (isOpen && !isComment) {
       level++;
       current = parseTag(tag);
@@ -140,19 +117,17 @@ function parse(html) {
   });
   return result;
 }
-var attrString, stringifier;
-attrString = function (attrs) {
-  var buff, key;
-  buff = [];
-  for (key in attrs) {
-    buff.push(key + '="' + attrs[key] + '"');
+function attrString(attrs) {
+  const buff = [];
+  for (const key in attrs) {
+    buff.push(key + '="' + attrs[key].replace(/"/g, '&quot;') + '"');
   }
   if (!buff.length) {
     return '';
   }
   return ' ' + buff.join(' ');
-};
-stringifier = function (buff, doc) {
+}
+function stringifier(buff, doc) {
   switch (doc.type) {
     case 'text':
       return buff + doc.content;
@@ -165,7 +140,7 @@ stringifier = function (buff, doc) {
     case 'comment':
       return buff += '<!--' + doc.content + '-->';
   }
-};
+}
 function stringify(doc) {
   return doc.reduce(function (token, rootEl) {
     return token + stringifier('', rootEl);

package/html/dist/html.js

@@ -1,9 +1,8 @@
 import { effect, style, insert, spread, createComponent, delegateEvents, classList, mergeProps, dynamicProperty, setAttribute, setAttributeNS, addEventListener, Aliases, PropAliases, Properties, ChildProperties, DelegatedEvents, SVGElements, SVGNamespace } from 'solid-js/web';
 
-var attrRE, lookup, parseTag, pushCommentNode, pushTextNode, tagRE;
-tagRE = /(?:<!--[\S\s]*?-->|<(?:"[^"]*"['"]*|'[^']*'['"]*|[^'">])+>)/g;
-attrRE = /\s([^'"/\s><]+?)[\s/>]|([^\s=]+)=\s?(".*?"|'.*?')/g;
-lookup = {
+const tagRE = /(?:<!--[\S\s]*?-->|<(?:"[^"]*"['"]*|'[^']*'['"]*|[^'">])+>)/g;
+const attrRE = /(?:\s(?<boolean>[^/\s><=]+?)(?=[\s/>]))|(?:(?<name>\S+?)(?:\s*=\s*(?:(['"])(?<quotedValue>[\s\S]*?)\3|(?<unquotedValue>[^\s>]+))))/g;
+const lookup = {
   area: true,
   base: true,
   br: true,
@@ -21,9 +20,9 @@ lookup = {
   track: true,
   wbr: true
 };
-parseTag = function (tag) {
-  var res;
-  res = {
+function parseTag(
+tag) {
+  const res = {
     type: 'tag',
     name: '',
     voidElement: false,
@@ -45,64 +44,42 @@ parseTag = function (tag) {
     }
   }
   const reg = new RegExp(attrRE);
-  let result = null;
-  for (;;) {
-    result = reg.exec(tag);
-    if (result === null) {
-      break;
-    }
-    if (!result[0].trim()) {
-      continue;
-    }
-    if (result[1]) {
-      const attr = result[1].trim();
-      let arr = [attr, ''];
-      if (attr.indexOf('=') > -1) {
-        arr = attr.split('=');
-      }
-      res.attrs[arr[0]] = arr[1];
-      reg.lastIndex--;
-    } else if (result[2]) {
-      res.attrs[result[2]] = result[3].trim().substring(1, result[3].length - 1);
-    }
+  for (const match of tag.matchAll(reg)) {
+    res.attrs[match[1] || match[2]] = match[4] || match[5] || '';
   }
   return res;
-};
-pushTextNode = function (list, html, start) {
-  var content, end;
-  end = html.indexOf('<', start);
-  content = html.slice(start, end === -1 ? void 0 : end);
+}
+function pushTextNode(list, html, start) {
+  const end = html.indexOf('<', start);
+  const content = html.slice(start, end === -1 ? void 0 : end);
   if (!/^\s*$/.test(content)) {
     list.push({
       type: 'text',
       content: content
     });
   }
-};
-pushCommentNode = function (list, tag) {
-  var content;
-  content = tag.replace('<!--', '').replace('-->', '');
+}
+function pushCommentNode(list, tag) {
+  const content = tag.replace('<!--', '').replace('-->', '');
   if (!/^\s*$/.test(content)) {
     list.push({
       type: 'comment',
       content: content
     });
   }
-};
+}
 function parse(html) {
-  var arr, byTag, current, level, result;
-  result = [];
-  current = void 0;
-  level = -1;
-  arr = [];
-  byTag = {};
-  html.replace(tagRE, function (tag, index) {
-    var isComment, isOpen, nextChar, parent, start;
-    isOpen = tag.charAt(1) !== '/';
-    isComment = tag.slice(0, 4) === '<!--';
-    start = index + tag.length;
-    nextChar = html.charAt(start);
-    parent = void 0;
+  const result = [];
+  let current = void 0;
+  let level = -1;
+  const arr = [];
+  const byTag = {};
+  html.replace(tagRE, (tag, index) => {
+    const isOpen = tag.charAt(1) !== '/';
+    const isComment = tag.slice(0, 4) === '<!--';
+    const start = index + tag.length;
+    const nextChar = html.charAt(start);
+    let parent = void 0;
     if (isOpen && !isComment) {
       level++;
       current = parseTag(tag);
@@ -138,19 +115,17 @@ function parse(html) {
   });
   return result;
 }
-var attrString, stringifier;
-attrString = function (attrs) {
-  var buff, key;
-  buff = [];
-  for (key in attrs) {
-    buff.push(key + '="' + attrs[key] + '"');
+function attrString(attrs) {
+  const buff = [];
+  for (const key in attrs) {
+    buff.push(key + '="' + attrs[key].replace(/"/g, '&quot;') + '"');
   }
   if (!buff.length) {
     return '';
   }
   return ' ' + buff.join(' ');
-};
-stringifier = function (buff, doc) {
+}
+function stringifier(buff, doc) {
   switch (doc.type) {
     case 'text':
       return buff + doc.content;
@@ -163,7 +138,7 @@ stringifier = function (buff, doc) {
     case 'comment':
       return buff += '<!--' + doc.content + '-->';
   }
-};
+}
 function stringify(doc) {
   return doc.reduce(function (token, rootEl) {
     return token + stringifier('', rootEl);

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.6",
+  "version": "1.5.0-beta.1",
   "author": "Ryan Carniato",
   "license": "MIT",
   "homepage": "https://solidjs.com",
@@ -124,24 +124,6 @@
     },
     "./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 +133,25 @@
     "compiler",
     "performance"
   ],
-  "gitHead": "9dc1ba00f653c924cae926ef8a1f1c3da8f41bb5"
-}
+  "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;
   }
 };