lunet 0.0.11 → 0.0.12

package/dist/index.cjs

@@ -30,27 +30,27 @@ var __export = (target, all) => {
 var exports_src = {};
 __export(exports_src, {
   h: () => h,
-  fragment: () => fragment,
   createRoot: () => createRoot,
-  createComponent: () => createComponent
+  createComponent: () => createComponent,
+  Fragment: () => Fragment
 });
 module.exports = __toCommonJS(exports_src);
 
 // src/jsx/component.ts
 var createComponent = (component) => (props) => [component, props, []];
 // src/jsx/fragment.ts
-var fragment = (...children) => [null, {}, children];
+var Fragment = (...children) => [null, {}, children];
 // src/jsx/likereact.ts
-var h = (type, props, ...children) => typeof type === "string" ? [type, props ?? {}, children] : type === fragment ? [null, props ?? {}, children] : type(props);
+var h = (type, props, ...children) => typeof type === "string" ? [type, props ?? {}, children] : type === Fragment ? [null, props ?? {}, children] : type(props);
 // src/index.ts
 var createRoot = (el, options) => {
-  var createText = (jsx2) => {
-    const node2 = new Text(jsx2);
-    return [[0, jsx2, node2], node2];
+  var createText = (jsx3) => {
+    const node2 = new Text(jsx3);
+    return [[0, jsx3, node2], node2];
   };
-  var updateText = (dom2, jsx2) => {
-    if (dom2[1] !== jsx2)
-      dom2[2].textContent = dom2[1] = jsx2;
+  var updateText = (dom2, jsx3) => {
+    if (dom2[1] !== jsx3)
+      dom2[2].textContent = dom2[1] = jsx3;
   };
   var revokeText = (dom2) => dom2[2].remove();
   var afterText = (dom2, node2) => {
@@ -117,8 +117,8 @@ var createRoot = (el, options) => {
           break;
       }
   };
-  var createElement = (jsx2) => {
-    const [tag, props, children] = jsx2;
+  var createElement = (jsx3) => {
+    const [tag, props, children] = jsx3;
     props.$beforeMount?.();
     const element = document.createElement(tag);
     elementEvents.set(element, {});
@@ -129,11 +129,11 @@ var createRoot = (el, options) => {
       setAttribute(element, name, value);
     const rendered_children = children.map(createNode);
     element.append(...rendered_children.map((e) => e[1]));
-    return [[1, jsx2, element, rendered_children.map((e) => e[0])], element];
+    return [[1, jsx3, element, rendered_children.map((e) => e[0])], element];
   };
-  var updateElement = (dom2, jsx2) => {
+  var updateElement = (dom2, jsx3) => {
     const [, [, old_props, old_children], element, rendered_children] = dom2;
-    const [, new_props, new_children] = jsx2;
+    const [, new_props, new_children] = jsx3;
     old_props.$beforeUpdate?.call(element, new CustomEvent("beforeupdate", {
       detail: element
     }));
@@ -167,7 +167,7 @@ var createRoot = (el, options) => {
           break;
       }
     }
-    dom2[1] = jsx2;
+    dom2[1] = jsx3;
     new_props.$update?.call(element, new CustomEvent("update", {
       detail: element
     }));
@@ -187,8 +187,8 @@ var createRoot = (el, options) => {
     dom2[2].after(node2);
   };
   var batch = options?.batch ?? ((cb) => cb());
-  var createComponent2 = (jsx2) => {
-    const [component, init_props, children] = jsx2;
+  var createComponent2 = (jsx3) => {
+    const [component, init_props, children] = jsx3;
     let rendered_dom;
     let doc_frag;
     const props = component((jsx22) => {
@@ -205,9 +205,9 @@ var createRoot = (el, options) => {
     }
     return [[3, [component, props, children], rendered_dom], doc_frag];
   };
-  var updateComponent = (dom2, jsx2) => {
+  var updateComponent = (dom2, jsx3) => {
     const old_props = dom2[1][1];
-    const new_props = jsx2[1];
+    const new_props = jsx3[1];
     batch(() => {
       for (const [key, value] of Object.entries(new_props))
         if (old_props[key] !== value)
@@ -216,35 +216,35 @@ var createRoot = (el, options) => {
   };
   var revokeComponent = (dom2) => revokeFragment(dom2[2]);
   var afterComponent = (dom2, node2) => afterFragment(dom2[2], node2);
-  var createNode = (jsx2) => {
-    if (typeof jsx2 === "string")
-      return createText(jsx2);
-    if (Array.isArray(jsx2)) {
-      const [tag] = jsx2;
+  var createNode = (jsx3) => {
+    if (typeof jsx3 === "string")
+      return createText(jsx3);
+    if (Array.isArray(jsx3)) {
+      const [tag] = jsx3;
       if (typeof tag === "string")
-        return createElement(jsx2);
+        return createElement(jsx3);
       if (typeof tag === "function")
-        return createComponent2(jsx2);
+        return createComponent2(jsx3);
       if (tag === null)
-        return createFragment(jsx2);
+        return createFragment(jsx3);
     }
     throw new Error(`Unrecognized JSX node`, {
-      cause: jsx2
+      cause: jsx3
     });
   };
-  var updateNode = (dom2, jsx2) => {
+  var updateNode = (dom2, jsx3) => {
     switch (dom2[0]) {
       case 0:
-        updateText(dom2, jsx2);
+        updateText(dom2, jsx3);
         break;
       case 1:
-        updateElement(dom2, jsx2);
+        updateElement(dom2, jsx3);
         break;
       case 2:
-        updateFragment(dom2, jsx2);
+        updateFragment(dom2, jsx3);
         break;
       case 3:
-        updateComponent(dom2, jsx2);
+        updateComponent(dom2, jsx3);
         break;
     }
   };
@@ -280,17 +280,17 @@ var createRoot = (el, options) => {
         break;
     }
   };
-  var createFragment = (jsx2) => {
-    const [, , children] = jsx2;
+  var createFragment = (jsx3) => {
+    const [, , children] = jsx3;
     const mark = new Comment;
     const el2 = new DocumentFragment;
     const rendered_children = children.map(createNode);
     el2.append(mark, ...rendered_children.map((e) => e[1]));
-    return [[2, jsx2, mark, rendered_children.map((e) => e[0])], el2];
+    return [[2, jsx3, mark, rendered_children.map((e) => e[0])], el2];
   };
-  var updateFragment = (dom2, jsx2) => {
+  var updateFragment = (dom2, jsx3) => {
     const [, [, , old_children], mark, rendered_children] = dom2;
-    const [, , new_children] = jsx2;
+    const [, , new_children] = jsx3;
     for (const [type, idx, jsx22] of diff(old_children, new_children)) {
       switch (type) {
         case 0:
@@ -311,7 +311,7 @@ var createRoot = (el, options) => {
           break;
       }
     }
-    dom2[1] = jsx2;
+    dom2[1] = jsx3;
   };
   var revokeFragment = (dom2) => {
     for (const child of dom2[3])
@@ -328,8 +328,8 @@ var createRoot = (el, options) => {
   const [node, dom] = createFragment([null, {}, []]);
   el.append(dom);
   return {
-    render(jsx2) {
-      updateFragment(node, [null, {}, [jsx2]]);
+    render(jsx3) {
+      updateFragment(node, [null, {}, [jsx3]]);
     },
     unmount() {
       revokeFragment(node);

package/dist/index.d.ts

@@ -1,11 +1,8 @@
-interface Options {
-	batch?: (cb: () => void) => void;
-}
 type ComponentFunction<T extends object> = (render: (jsx: JSXNode) => void, initProps: T) => T;
 type Component<T extends object> = (props: T) => JSXComponent;
 declare const createComponent: <T extends object>(component: ComponentFunction<T>) => Component<T>;
-declare const fragment: (...children: JSXNode[]) => JSXFragment;
-type JSXFactoryFunction = <T extends keyof HTMLElementTagNameMap | Component<any> | typeof fragment>(type: T, props: null | (T extends Component<infer P> ? P : {
+declare const Fragment: (...children: JSXNode[]) => JSXFragment;
+type JSXFactoryFunction = <T extends keyof HTMLElementTagNameMap | Component<any> | typeof Fragment>(type: T, props: null | (T extends Component<infer P> ? P : {
 	[key: string]: unknown
 }), ...children: JSXNode[]) => JSXNode;
 declare const h: JSXFactoryFunction;
@@ -16,8 +13,204 @@ type JSXNode = JSXElement | JSXComponent | JSXFragment | string;
 type JSXElement<T extends keyof HTMLElementTagNameMap = keyof HTMLElementTagNameMap> = [T, JSX.IntrinsicElements[T], JSXNode[]];
 type JSXComponent = [ComponentFunction<any>, object & Key, JSXNode[]];
 type JSXFragment = [null, Key, JSXNode[]];
+interface HTMLElAttrEvMap {
+	"$fullscreenchange": Event;
+	"$fullscreenerror": Event;
+	"$abort": UIEvent;
+	"$animationcancel": AnimationEvent;
+	"$animationend": AnimationEvent;
+	"$animationiteration": AnimationEvent;
+	"$animationstart": AnimationEvent;
+	"$auxclick": PointerEvent;
+	"$beforeinput": InputEvent;
+	"$beforetoggle": ToggleEvent;
+	"$blur": FocusEvent;
+	"$cancel": Event;
+	"$canplay": Event;
+	"$canplaythrough": Event;
+	"$change": Event;
+	"$click": MouseEvent;
+	"$close": Event;
+	"$compositionend": CompositionEvent;
+	"$compositionstart": CompositionEvent;
+	"$compositionupdate": CompositionEvent;
+	"$contextlost": Event;
+	"$contextmenu": PointerEvent;
+	"$contextrestored": Event;
+	"$copy": ClipboardEvent;
+	"$cuechange": Event;
+	"$cut": ClipboardEvent;
+	"$dblclick": MouseEvent;
+	"$drag": DragEvent;
+	"$dragend": DragEvent;
+	"$dragenter": DragEvent;
+	"$dragleave": DragEvent;
+	"$dragover": DragEvent;
+	"$dragstart": DragEvent;
+	"$drop": DragEvent;
+	"$durationchange": Event;
+	"$emptied": Event;
+	"$ended": Event;
+	"$error": ErrorEvent;
+	"$focus": FocusEvent;
+	"$focusin": FocusEvent;
+	"$focusout": FocusEvent;
+	"$formdata": FormDataEvent;
+	"$gotpointercapture": PointerEvent;
+	"$input": Event;
+	"$invalid": Event;
+	"$keydown": KeyboardEvent;
+	"$keypress": KeyboardEvent;
+	"$keyup": KeyboardEvent;
+	"$load": Event;
+	"$loadeddata": Event;
+	"$loadedmetadata": Event;
+	"$loadstart": Event;
+	"$lostpointercapture": PointerEvent;
+	"$mousedown": MouseEvent;
+	"$mouseenter": MouseEvent;
+	"$mouseleave": MouseEvent;
+	"$mousemove": MouseEvent;
+	"$mouseout": MouseEvent;
+	"$mouseover": MouseEvent;
+	"$mouseup": MouseEvent;
+	"$paste": ClipboardEvent;
+	"$pause": Event;
+	"$play": Event;
+	"$playing": Event;
+	"$pointercancel": PointerEvent;
+	"$pointerdown": PointerEvent;
+	"$pointerenter": PointerEvent;
+	"$pointerleave": PointerEvent;
+	"$pointermove": PointerEvent;
+	"$pointerout": PointerEvent;
+	"$pointerover": PointerEvent;
+	"$pointerup": PointerEvent;
+	"$progress": ProgressEvent;
+	"$ratechange": Event;
+	"$reset": Event;
+	"$resize": UIEvent;
+	"$scroll": Event;
+	"$scrollend": Event;
+	"$securitypolicyviolation": SecurityPolicyViolationEvent;
+	"$seeked": Event;
+	"$seeking": Event;
+	"$select": Event;
+	"$selectionchange": Event;
+	"$selectstart": Event;
+	"$slotchange": Event;
+	"$stalled": Event;
+	"$submit": SubmitEvent;
+	"$suspend": Event;
+	"$timeupdate": Event;
+	"$toggle": ToggleEvent;
+	"$touchcancel": TouchEvent;
+	"$touchend": TouchEvent;
+	"$touchmove": TouchEvent;
+	"$touchstart": TouchEvent;
+	"$transitioncancel": TransitionEvent;
+	"$transitionend": TransitionEvent;
+	"$transitionrun": TransitionEvent;
+	"$transitionstart": TransitionEvent;
+	"$volumechange": Event;
+	"$waiting": Event;
+	"$webkitanimationend": Event;
+	"$webkitanimationiteration": Event;
+	"$webkitanimationstart": Event;
+	"$webkittransitionend": Event;
+	"$wheel": WheelEvent;
+}
+type Attributes<
+	N extends keyof HTMLElementTagNameMap,
+	T extends object = {}
+> = Partial<HTMLAttributes & T & Key & { [key in keyof HTMLElAttrEvMap] : (this: HTMLElement, ev: HTMLElAttrEvMap[key]) => unknown } & {
+	$beforeMount: () => unknown
+	$mount: (this: HTMLElementTagNameMap[N], ev: CustomEvent<HTMLElementTagNameMap[N]>) => unknown
+	$beforeUpdate: (this: HTMLElementTagNameMap[N], ev: CustomEvent<HTMLElementTagNameMap[N]>) => unknown
+	$update: (this: HTMLElementTagNameMap[N], ev: CustomEvent<HTMLElementTagNameMap[N]>) => unknown
+	$beforeUnmount: (this: HTMLElementTagNameMap[N], ev: CustomEvent<HTMLElementTagNameMap[N]>) => unknown
+	$unmount: () => unknown
+}>;
+type HTMLAttributes = {
+	accesskey: string
+	autocapitalize: "off" | "none" | "on" | "sentences" | "words" | "characters"
+	class: string
+	contenteditable: boolean | "" | "plaintext-only"
+	dir: "ltr" | "rtl"
+	draggable: boolean
+	hidden: "" | "hidden" | "until-found"
+	id: string
+	itemprop: string
+	lang: string
+	role: string
+	slot: string
+	spellcheck: boolean
+	style: string
+	tabindex: number
+	title: string
+	translate: "yes" | "no"
+};
+type Target = "_self" | "_blank" | "_parent" | "_top";
+declare global {
+	namespace JSX {
+		type Element = JSXNode;
+		type IntrinsicElements = { [key in keyof HTMLElementTagNameMap] : Attributes<key> } & {
+			div: Attributes<"div">
+			ul: Attributes<"ul">
+			ol: Attributes<"ol">
+			li: Attributes<"li">
+			br: Attributes<"br">
+			button: Attributes<"button">
+			a: Attributes<"a", {
+				href: string
+				download: string
+				target: Target
+				hreflang: string
+				media: string
+				ping: string
+				referrerpolicy: string
+				rel: string
+				shape: string
+			}>
+			input: Attributes<"input", {
+				accept: string
+				alt: string
+				autocomplete: "off" | "on" | string
+				checked: boolean
+				disabled: boolean
+				formonvalidate: boolean
+				formtarget: Target
+				type: "button" | "checkbox" | "color" | "date" | "datetime-local" | "email" | "file" | "hidden" | "image" | "month" | "number" | "password" | "radio" | "range" | "reset" | "search" | "submit" | "tel" | "text" | "time" | "url" | "week"
+				value: string
+			}>
+			form: Attributes<"form", {
+				"accept-charset": "UTF-8"
+				autocomplete: "off" | "on"
+				name: string
+				enctype: "application/x-www-form-urlencoded" | "multipart/form-data" | "text/plain"
+				method: "post" | "get" | "dalog"
+				target: Target | "_unfencedTop"
+			}>
+			iframe: Attributes<"iframe", {
+				allow: string
+				allowfullscreen: boolean
+				width: number
+				height: number
+				loading: "eager" | "lazy"
+				name: string
+				referrerpolicy: "no-referrer" | "no-referrer-when-downgrade" | "origin" | "origin-when-cross-origin" | "same-origin" | "strict-origin" | "strict-origin-when-cross-orgin" | "usafe-url"
+				sandbox: string
+				src: string
+				srcdoc: string
+			}>
+		};
+	}
+}
+interface Options {
+	batch?: (cb: () => void) => void;
+}
 declare const createRoot: (el: HTMLElement, options?: Options) => {
 	render(jsx: JSX.Element): void
 	unmount(): void
 };
-export { h, fragment, createRoot, createComponent, Key, JSXNode, JSXFragment, JSXElement, JSXComponent, Component };
+export { h, createRoot, createComponent, Key, JSXNode, JSXFragment, JSXElement, JSXComponent, Fragment, Component };

package/dist/index.js

@@ -1,18 +1,18 @@
 // src/jsx/component.ts
 var createComponent = (component) => (props) => [component, props, []];
 // src/jsx/fragment.ts
-var fragment = (...children) => [null, {}, children];
+var Fragment = (...children) => [null, {}, children];
 // src/jsx/likereact.ts
-var h = (type, props, ...children) => typeof type === "string" ? [type, props ?? {}, children] : type === fragment ? [null, props ?? {}, children] : type(props);
+var h = (type, props, ...children) => typeof type === "string" ? [type, props ?? {}, children] : type === Fragment ? [null, props ?? {}, children] : type(props);
 // src/index.ts
 var createRoot = (el, options) => {
-  var createText = (jsx2) => {
-    const node2 = new Text(jsx2);
-    return [[0, jsx2, node2], node2];
+  var createText = (jsx3) => {
+    const node2 = new Text(jsx3);
+    return [[0, jsx3, node2], node2];
   };
-  var updateText = (dom2, jsx2) => {
-    if (dom2[1] !== jsx2)
-      dom2[2].textContent = dom2[1] = jsx2;
+  var updateText = (dom2, jsx3) => {
+    if (dom2[1] !== jsx3)
+      dom2[2].textContent = dom2[1] = jsx3;
   };
   var revokeText = (dom2) => dom2[2].remove();
   var afterText = (dom2, node2) => {
@@ -79,8 +79,8 @@ var createRoot = (el, options) => {
           break;
       }
   };
-  var createElement = (jsx2) => {
-    const [tag, props, children] = jsx2;
+  var createElement = (jsx3) => {
+    const [tag, props, children] = jsx3;
     props.$beforeMount?.();
     const element = document.createElement(tag);
     elementEvents.set(element, {});
@@ -91,11 +91,11 @@ var createRoot = (el, options) => {
       setAttribute(element, name, value);
     const rendered_children = children.map(createNode);
     element.append(...rendered_children.map((e) => e[1]));
-    return [[1, jsx2, element, rendered_children.map((e) => e[0])], element];
+    return [[1, jsx3, element, rendered_children.map((e) => e[0])], element];
   };
-  var updateElement = (dom2, jsx2) => {
+  var updateElement = (dom2, jsx3) => {
     const [, [, old_props, old_children], element, rendered_children] = dom2;
-    const [, new_props, new_children] = jsx2;
+    const [, new_props, new_children] = jsx3;
     old_props.$beforeUpdate?.call(element, new CustomEvent("beforeupdate", {
       detail: element
     }));
@@ -129,7 +129,7 @@ var createRoot = (el, options) => {
           break;
       }
     }
-    dom2[1] = jsx2;
+    dom2[1] = jsx3;
     new_props.$update?.call(element, new CustomEvent("update", {
       detail: element
     }));
@@ -149,8 +149,8 @@ var createRoot = (el, options) => {
     dom2[2].after(node2);
   };
   var batch = options?.batch ?? ((cb) => cb());
-  var createComponent2 = (jsx2) => {
-    const [component, init_props, children] = jsx2;
+  var createComponent2 = (jsx3) => {
+    const [component, init_props, children] = jsx3;
     let rendered_dom;
     let doc_frag;
     const props = component((jsx22) => {
@@ -167,9 +167,9 @@ var createRoot = (el, options) => {
     }
     return [[3, [component, props, children], rendered_dom], doc_frag];
   };
-  var updateComponent = (dom2, jsx2) => {
+  var updateComponent = (dom2, jsx3) => {
     const old_props = dom2[1][1];
-    const new_props = jsx2[1];
+    const new_props = jsx3[1];
     batch(() => {
       for (const [key, value] of Object.entries(new_props))
         if (old_props[key] !== value)
@@ -178,35 +178,35 @@ var createRoot = (el, options) => {
   };
   var revokeComponent = (dom2) => revokeFragment(dom2[2]);
   var afterComponent = (dom2, node2) => afterFragment(dom2[2], node2);
-  var createNode = (jsx2) => {
-    if (typeof jsx2 === "string")
-      return createText(jsx2);
-    if (Array.isArray(jsx2)) {
-      const [tag] = jsx2;
+  var createNode = (jsx3) => {
+    if (typeof jsx3 === "string")
+      return createText(jsx3);
+    if (Array.isArray(jsx3)) {
+      const [tag] = jsx3;
       if (typeof tag === "string")
-        return createElement(jsx2);
+        return createElement(jsx3);
       if (typeof tag === "function")
-        return createComponent2(jsx2);
+        return createComponent2(jsx3);
       if (tag === null)
-        return createFragment(jsx2);
+        return createFragment(jsx3);
     }
     throw new Error(`Unrecognized JSX node`, {
-      cause: jsx2
+      cause: jsx3
     });
   };
-  var updateNode = (dom2, jsx2) => {
+  var updateNode = (dom2, jsx3) => {
     switch (dom2[0]) {
       case 0:
-        updateText(dom2, jsx2);
+        updateText(dom2, jsx3);
         break;
       case 1:
-        updateElement(dom2, jsx2);
+        updateElement(dom2, jsx3);
         break;
       case 2:
-        updateFragment(dom2, jsx2);
+        updateFragment(dom2, jsx3);
         break;
       case 3:
-        updateComponent(dom2, jsx2);
+        updateComponent(dom2, jsx3);
         break;
     }
   };
@@ -242,17 +242,17 @@ var createRoot = (el, options) => {
         break;
     }
   };
-  var createFragment = (jsx2) => {
-    const [, , children] = jsx2;
+  var createFragment = (jsx3) => {
+    const [, , children] = jsx3;
     const mark = new Comment;
     const el2 = new DocumentFragment;
     const rendered_children = children.map(createNode);
     el2.append(mark, ...rendered_children.map((e) => e[1]));
-    return [[2, jsx2, mark, rendered_children.map((e) => e[0])], el2];
+    return [[2, jsx3, mark, rendered_children.map((e) => e[0])], el2];
   };
-  var updateFragment = (dom2, jsx2) => {
+  var updateFragment = (dom2, jsx3) => {
     const [, [, , old_children], mark, rendered_children] = dom2;
-    const [, , new_children] = jsx2;
+    const [, , new_children] = jsx3;
     for (const [type, idx, jsx22] of diff(old_children, new_children)) {
       switch (type) {
         case 0:
@@ -273,7 +273,7 @@ var createRoot = (el, options) => {
           break;
       }
     }
-    dom2[1] = jsx2;
+    dom2[1] = jsx3;
   };
   var revokeFragment = (dom2) => {
     for (const child of dom2[3])
@@ -290,8 +290,8 @@ var createRoot = (el, options) => {
   const [node, dom] = createFragment([null, {}, []]);
   el.append(dom);
   return {
-    render(jsx2) {
-      updateFragment(node, [null, {}, [jsx2]]);
+    render(jsx3) {
+      updateFragment(node, [null, {}, [jsx3]]);
     },
     unmount() {
       revokeFragment(node);
@@ -300,7 +300,7 @@ var createRoot = (el, options) => {
 };
 export {
   h,
-  fragment,
   createRoot,
-  createComponent
+  createComponent,
+  Fragment
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lunet",
-  "version": "0.0.11",
+  "version": "0.0.12",
   "author": "TNTSuperMan",
   "license": "MIT",
   "description": "より柔軟なWebフロントエンドライブラリ。",