beta.6

sjc5 · Oct 23, 2023 · c230da3 · c230da3
1 parent 593fddb
commit c230da3
Show file tree

Hide file tree

Showing 13 changed files with 79 additions and 62 deletions.
diff --git a/.changeset/large-worms-sparkle.md b/.changeset/large-worms-sparkle.md
@@ -0,0 +1,8 @@
+---
+"create-hwy": patch
+"@hwy-js/build": patch
+"hwy": patch
+"@hwy-js/dev": patch
+---
+
+clean up types
diff --git a/.changeset/pre.json b/.changeset/pre.json
@@ -12,6 +12,7 @@
   "changesets": [
     "early-readers-rule",
     "famous-adults-push",
+    "large-worms-sparkle",
     "light-carpets-cough",
     "neat-moles-brush",
     "poor-phones-lie",

diff --git a/docs/package-lock.json b/docs/package-lock.json
diff --git a/docs/package.json b/docs/package.json
@@ -13,11 +13,11 @@
     "@hono/node-server": "^1.2.0",
     "highlight.js": "^11.9.0",
     "hono": "^3.8.3",
-    "hwy": "0.4.2-beta.5"
+    "hwy": "0.4.2-beta.6"
   },
   "devDependencies": {
-    "@hwy-js/build": "0.4.2-beta.5",
-    "@hwy-js/dev": "0.4.2-beta.5",
+    "@hwy-js/build": "0.4.2-beta.6",
+    "@hwy-js/dev": "0.4.2-beta.6",
     "@types/node": "^20.8.7",
     "@types/nprogress": "^0.2.2",
     "htmx.org": "^1.9.6",

diff --git a/packages/build/CHANGELOG.md b/packages/build/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @hwy-js/build
 
+## 0.4.2-beta.6
+
+### Patch Changes
+
+- clean up types
+
 ## 0.4.2-beta.5
 
 ### Patch Changes

diff --git a/packages/build/package.json b/packages/build/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@hwy-js/build",
-  "version": "0.4.2-beta.5",
+  "version": "0.4.2-beta.6",
   "author": {
     "name": "Samuel J. Cook"
   },

diff --git a/packages/core/CHANGELOG.md b/packages/core/CHANGELOG.md
@@ -1,5 +1,11 @@
 # hwy
 
+## 0.4.2-beta.6
+
+### Patch Changes
+
+- clean up types
+
 ## 0.4.2-beta.5
 
 ### Patch Changes

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "hwy",
-  "version": "0.4.2-beta.5",
+  "version": "0.4.2-beta.6",
   "author": {
     "name": "Samuel J. Cook"
   },

diff --git a/packages/create-hwy/CHANGELOG.md b/packages/create-hwy/CHANGELOG.md
@@ -1,5 +1,11 @@
 # create-hwy
 
+## 0.4.2-beta.6
+
+### Patch Changes
+
+- clean up types
+
 ## 0.4.2-beta.5
 
 ### Patch Changes

diff --git a/packages/create-hwy/package.json b/packages/create-hwy/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-hwy",
-  "version": "0.4.2-beta.5",
+  "version": "0.4.2-beta.6",
   "author": {
     "name": "Samuel J. Cook"
   },

diff --git a/packages/dev/CHANGELOG.md b/packages/dev/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @hwy-js/dev
 
+## 0.4.2-beta.6
+
+### Patch Changes
+
+- clean up types
+
 ## 0.4.2-beta.5
 
 ### Patch Changes

diff --git a/packages/dev/index.ts b/packages/dev/index.ts
@@ -1,20 +1,16 @@
-type BooleanLike = boolean | `${boolean}`;
+import type { HtmlEscapedString } from "hono/utils/html";
 
+type BooleanLike = boolean | `${boolean}`;
 type NumberLike = number | `${number}`;
 
-type IfValueTypeIsBooleanConvertToBooleanOrBooleanString<T> = T extends boolean
-  ? BooleanLike
-  : T;
-
-type IfValueTypeIsNumberConvertToNumberOrNumberString<T> = T extends number
-  ? NumberLike
-  : T;
+type BooleanToBooleanLike<T> = T extends boolean ? BooleanLike : T;
+type NumberToNumberLike<T> = T extends number ? NumberLike : T;
 
 type StripNever<T> = {
   [K in keyof T as T[K] extends never ? never : K]: T[K];
 };
 
-type IfKeyStartsWithOnConvertValueToString<
+type FunctionToStringOrStrip<
   T extends {
     [key: string]: any;
   },
@@ -28,49 +24,37 @@ type IfKeyStartsWithOnConvertValueToString<
     : T[K];
 }>;
 
-type HandleConversions<T> = IfValueTypeIsBooleanConvertToBooleanOrBooleanString<
-  IfValueTypeIsNumberConvertToNumberOrNumberString<T>
->;
+type HandleConversions<T> = BooleanToBooleanLike<NumberToNumberLike<T>>;
+
+type Child = string | number | boolean | null | undefined | HtmlEscapedString;
+
+type AdditionalAttributes = {
+  children: Child | Child[];
+  class: string;
+  dangerouslySetInnerHTML: {
+    __html: string;
+  };
+  style: Partial<CSSStyleDeclaration>;
+};
 
 type HTMLAttributesOuter<E> = Partial<
-  {
-    children: any;
-    class: string;
-    dangerouslySetInnerHTML: {
-      __html: string;
-    };
-    style: Partial<CSSStyleDeclaration>;
-  } & Omit<
-    {
-      [K in keyof E]: HandleConversions<E[K]>;
-    },
-    "children" | "class" | "dangerouslySetInnerHTML" | "style"
-  >
+  AdditionalAttributes &
+    Omit<
+      {
+        [K in keyof E]: HandleConversions<E[K]>;
+      },
+      keyof AdditionalAttributes
+    >
 >;
 
-type Bob = IfKeyStartsWithOnConvertValueToString<{
-  onClick: (e: Event) => void;
-  onHover: ((this: GlobalEventHandlers, ev: Event) => any) | null;
-  addEventListener: (e: Event) => void;
-  foo: string;
-  onFoo: number;
-}>;
-
 type HTMLAttributes<
   E extends {
     [key: string]: any;
   },
-> = HTMLAttributesOuter<Partial<IfKeyStartsWithOnConvertValueToString<E>>>;
-
-type Jerry = HTMLAttributes<HTMLAnchorElement>;
-
-const asdf: Jerry = {
-  ontimeupdate: "asdf",
-  onclick: "asdf",
-};
+> = HTMLAttributesOuter<Partial<FunctionToStringOrStrip<E>>>;
 
 /*
-BEGIN JSX INTRISIC ELEMENTS CODE
+BEGIN ADAPTED YUDAI-NKT CODE
 Adapted from: https://github.com/yudai-nkt/hono-jsx-types/blob/main/index.d.ts
 Original license: MIT
 Copied from source on: October 22, 2023
@@ -262,7 +246,7 @@ interface CustomIntrinsicElements {
 }
 
 /*
-END JSX INTRISIC ELEMENTS CODE
+END ADAPTED YUDAI-NKT CODE
 */
 
 declare global {

diff --git a/packages/dev/package.json b/packages/dev/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@hwy-js/dev",
-  "version": "0.4.2-beta.5",
+  "version": "0.4.2-beta.6",
   "author": {
     "name": "Samuel J. Cook"
   },