@solidjs/html 2.0.0-beta.6 → 2.0.0-beta.7

package/dist/html.cjs

@@ -240,12 +240,12 @@ function createHTML(r, {
       namespace = parts[0];
     }
     const isChildProp = r.ChildProperties.has(name);
-    const isStatefulDOMProperty = !!r.DOMWithState[node.name.toUpperCase()]?.[name];
+    const isLockedDOMProperty = !!r.DOMWithState[node.name.toUpperCase()]?.[name];
     if (name === "style") {
       options.exprs.push(`r.style(${tag},${expr},_$p)`);
     } else if (name === "class") {
       options.exprs.push(`r.className(${tag},${expr},_$p)`);
-    } else if (isChildProp || isStatefulDOMProperty || namespace === "prop") {
+    } else if (isChildProp || isLockedDOMProperty || namespace === "prop") {
       options.exprs.push(`${tag}.${name} = ${expr}`);
     } else {
       const ns = name.indexOf(":") > -1 && r.Namespaces[name.split(":")[0]];
@@ -554,11 +554,12 @@ const html = createHTML({
   setAttribute: web.setAttribute,
   setAttributeNS: web.setAttributeNS,
   addEventListener: web.addEventListener,
-  Properties: web.Properties,
+  DOMWithState: web.DOMWithState,
   ChildProperties: web.ChildProperties,
   DelegatedEvents: web.DelegatedEvents,
   SVGElements: web.SVGElements,
-  SVGNamespace: web.SVGNamespace
+  MathMLElements: web.MathMLElements,
+  Namespaces: web.Namespaces
 });
 
 module.exports = html;

package/dist/html.js

@@ -1,4 +1,4 @@
-import { SVGNamespace, SVGElements, DelegatedEvents, ChildProperties, Properties, addEventListener, setAttributeNS, setAttribute, dynamicProperty, mergeProps, className, delegateEvents, createComponent, spread, untrack, insert, style, effect } from '@solidjs/web';
+import { Namespaces, MathMLElements, SVGElements, DelegatedEvents, ChildProperties, DOMWithState, addEventListener, setAttributeNS, setAttribute, dynamicProperty, mergeProps, className, delegateEvents, createComponent, spread, untrack, insert, style, effect } from '@solidjs/web';
 
 const tagRE = /(?:<!--[\S\s]*?-->|<(?:"[^"]*"['"]*|'[^']*'['"]*|[^'">])+>)/g;
 const attrRE = /(?:\s(?<boolean>[^/\s><=]+?)(?=[\s/>]))|(?:(?<name>\S+?)(?:\s*=\s*(?:(['"])(?<quotedValue>[\s\S]*?)\3|(?<unquotedValue>[^\s>]+))))/g;
@@ -238,12 +238,12 @@ function createHTML(r, {
       namespace = parts[0];
     }
     const isChildProp = r.ChildProperties.has(name);
-    const isStatefulDOMProperty = !!r.DOMWithState[node.name.toUpperCase()]?.[name];
+    const isLockedDOMProperty = !!r.DOMWithState[node.name.toUpperCase()]?.[name];
     if (name === "style") {
       options.exprs.push(`r.style(${tag},${expr},_$p)`);
     } else if (name === "class") {
       options.exprs.push(`r.className(${tag},${expr},_$p)`);
-    } else if (isChildProp || isStatefulDOMProperty || namespace === "prop") {
+    } else if (isChildProp || isLockedDOMProperty || namespace === "prop") {
       options.exprs.push(`${tag}.${name} = ${expr}`);
     } else {
       const ns = name.indexOf(":") > -1 && r.Namespaces[name.split(":")[0]];
@@ -552,11 +552,12 @@ const html = createHTML({
   setAttribute,
   setAttributeNS,
   addEventListener,
-  Properties,
+  DOMWithState,
   ChildProperties,
   DelegatedEvents,
   SVGElements,
-  SVGNamespace
+  MathMLElements,
+  Namespaces
 });
 
 export { html as default };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@solidjs/html",
   "description": "Build-less Tagged-Template-Literal Templating for Solid",
-  "version": "2.0.0-beta.6",
+  "version": "2.0.0-beta.7",
   "author": "Ryan Carniato",
   "license": "MIT",
   "homepage": "https://solidjs.com",
@@ -20,28 +20,34 @@
   "files": [
     "dist",
     "types",
+    "types-cjs",
     "package.json"
   ],
   "exports": {
     ".": {
-      "types": "./types/index.d.ts",
-      "import": "./dist/html.js",
-      "require": "./dist/html.cjs"
-    },
-    "./dist/*": "./dist/*"
+      "import": {
+        "types": "./types/index.d.ts",
+        "default": "./dist/html.js"
+      },
+      "require": {
+        "types": "./types-cjs/index.d.cts",
+        "default": "./dist/html.cjs"
+      }
+    }
   },
   "peerDependencies": {
-    "@solidjs/web": "^2.0.0-beta.6"
+    "@solidjs/web": "^2.0.0-beta.7"
   },
   "devDependencies": {
-    "@solidjs/web": "2.0.0-beta.6"
+    "@solidjs/web": "2.0.0-beta.7"
   },
   "scripts": {
     "build": "npm-run-all -nl build:*",
     "build:clean": "rimraf dist/ coverage/",
     "build:js": "rollup -c",
-    "types": "npm-run-all -nl types:*",
-    "types:clean": "rimraf types/",
-    "types:html": "tsc --project ./tsconfig.json && ncp ../../node_modules/lit-dom-expressions/types/index.d.ts ./types/lit.d.ts"
+    "types": "npm-run-all -nl types:clean types:html types:cjs",
+    "types:clean": "rimraf types/ types-cjs/",
+    "types:html": "tsc --project ./tsconfig.json && ncp ../../node_modules/lit-dom-expressions/types/index.d.ts ./types/lit.d.ts",
+    "types:cjs": "node ../../scripts/sync-dual-types.mjs ./types ./types-cjs"
   }
 }

package/types/lit.d.ts

@@ -1 +1,35 @@
-export * from "lit-dom-expressions";
+type MountableElement = Element | Document | ShadowRoot | DocumentFragment | Node;
+type ClassList = Record<string, boolean> | Array<string | number | boolean | null | undefined | Record<string, boolean>>;
+interface Runtime {
+    effect<T>(fn: (prev?: T) => T, effect: (value: T, prev?: T) => void): void;
+    untrack<T>(fn: () => T): T;
+    insert(parent: MountableElement, accessor: any, marker?: Node | null, init?: any): any;
+    spread<T>(node: Element, accessor: (() => T) | T, skipChildren?: Boolean): void;
+    createComponent(Comp: (props: any) => any, props: any): any;
+    addEventListener(node: Element, name: string, handler: EventListener | EventListenerObject | (EventListenerObject & AddEventListenerOptions), delegate: boolean): void;
+    delegateEvents(eventNames: string[]): void;
+    className(node: Element, value: string | ClassList, prev?: string | ClassList): 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;
+    DOMWithState: Record<string, Record<string, 1 | 2>>;
+    ChildProperties: Set<string>;
+    DelegatedEvents: Set<string>;
+    SVGElements: Set<string>;
+    MathMLElements: Set<string>;
+    Namespaces: Record<string, string>;
+}
+export type HTMLTag = {
+    (statics: TemplateStringsArray, ...args: unknown[]): Node | Node[];
+};
+export declare function createHTML(r: Runtime, { delegateEvents, functionBuilder }?: {
+    delegateEvents?: boolean;
+    functionBuilder?: (...args: string[]) => Function;
+}): HTMLTag;
+export {};

package/types-cjs/index.d.cts

@@ -0,0 +1,3 @@
+import type { HTMLTag } from "./lit.cjs";
+declare const html: HTMLTag;
+export default html;

package/types-cjs/lit.d.cts

@@ -0,0 +1,35 @@
+type MountableElement = Element | Document | ShadowRoot | DocumentFragment | Node;
+type ClassList = Record<string, boolean> | Array<string | number | boolean | null | undefined | Record<string, boolean>>;
+interface Runtime {
+    effect<T>(fn: (prev?: T) => T, effect: (value: T, prev?: T) => void): void;
+    untrack<T>(fn: () => T): T;
+    insert(parent: MountableElement, accessor: any, marker?: Node | null, init?: any): any;
+    spread<T>(node: Element, accessor: (() => T) | T, skipChildren?: Boolean): void;
+    createComponent(Comp: (props: any) => any, props: any): any;
+    addEventListener(node: Element, name: string, handler: EventListener | EventListenerObject | (EventListenerObject & AddEventListenerOptions), delegate: boolean): void;
+    delegateEvents(eventNames: string[]): void;
+    className(node: Element, value: string | ClassList, prev?: string | ClassList): 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;
+    DOMWithState: Record<string, Record<string, 1 | 2>>;
+    ChildProperties: Set<string>;
+    DelegatedEvents: Set<string>;
+    SVGElements: Set<string>;
+    MathMLElements: Set<string>;
+    Namespaces: Record<string, string>;
+}
+export type HTMLTag = {
+    (statics: TemplateStringsArray, ...args: unknown[]): Node | Node[];
+};
+export declare function createHTML(r: Runtime, { delegateEvents, functionBuilder }?: {
+    delegateEvents?: boolean;
+    functionBuilder?: (...args: string[]) => Function;
+}): HTMLTag;
+export {};

package/types-cjs/package.json

@@ -0,0 +1,3 @@
+{
+  "type": "commonjs"
+}