From 15848996d5b7ade5cf23be0354877cacedb43799 Mon Sep 17 00:00:00 2001
From: iacore <noreply+gpg-stub@1a-insec.net>
Date: Sat, 13 Apr 2024 12:31:55 +0000
Subject: [PATCH 1/2] remove types/**.d.ts

---
 package.json  | 14 +++-----------
 tsconfig.json |  4 ++--
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/package.json b/package.json
index 7efa01a..1130274 100644
--- a/package.json
+++ b/package.json
@@ -6,15 +6,14 @@
   "scripts": {
     "benchmark:w3c": "node test/benchmark/linkedom.js --w3c; node test/benchmark/linkedom-cached.js --w3c; node test/benchmark/dom.js --w3c",
     "benchmark:dom": "node test/benchmark/linkedom.js --dom; node test/benchmark/linkedom-cached.js --dom; node test/benchmark/dom.js --dom",
-    "build": "npm run rollup:es && node rollup/init.cjs && npm run rollup:init && rm -rf cjs/* && npm run cjs && rm -rf types && npm run ts && npm run test && npm run size",
+    "build": "npm run rollup:es && node rollup/init.cjs && npm run rollup:init && rm -rf cjs/* && npm run cjs && npm run test && npm run size",
     "cjs": "ascjs --no-default esm cjs",
     "rollup:es": "rollup --config rollup/es.config.js",
     "rollup:init": "rollup --config rollup/init.config.js",
     "server": "npx static-handler .",
     "size": "echo \"index $(cat index.js | brotli | wc -c)\";echo \"keyed $(cat keyed.js | brotli | wc -c)\";echo \"reactive $(cat reactive.js | brotli | wc -c)\";echo \"preactive $(cat preactive.js | brotli | wc -c)\";echo \"signal $(cat signal.js | brotli | wc -c)\";echo \"node  $(cat node.js | brotli | wc -c)\";",
     "test": "c8 node test/coverage.js && node test/modern.mjs",
-    "coverage": "mkdir -p ./coverage; c8 report --reporter=text-lcov > ./coverage/lcov.info",
-    "ts": "tsc -p ."
+    "coverage": "mkdir -p ./coverage; c8 report --reporter=text-lcov > ./coverage/lcov.info"
   },
   "keywords": [
     "micro",
@@ -29,43 +28,36 @@
     "ascjs": "^6.0.3",
     "c8": "^9.1.0",
     "rollup": "^4.13.2",
-    "typescript": "^5.4.3"
+    "typescript": "^5.4.5"
   },
   "module": "./esm/index.js",
   "type": "module",
   "exports": {
     ".": {
-      "types": "./types/index.d.ts",
       "import": "./esm/index.js",
       "default": "./cjs/index.js"
     },
     "./dom": {
-      "types": "./types/dom/index.d.ts",
       "import": "./esm/dom/index.js",
       "default": "./cjs/dom/index.js"
     },
     "./init": {
-      "types": "./types/init.d.ts",
       "import": "./esm/init.js",
       "default": "./cjs/init.js"
     },
     "./keyed": {
-      "types": "./types/keyed.d.ts",
       "import": "./esm/keyed.js",
       "default": "./cjs/keyed.js"
     },
     "./node": {
-      "types": "./types/node.d.ts",
       "import": "./esm/node.js",
       "default": "./cjs/node.js"
     },
     "./reactive": {
-      "types": "./types/reactive.d.ts",
       "import": "./esm/reactive.js",
       "default": "./cjs/reactive.js"
     },
     "./preactive": {
-      "types": "./types/reactive/preact.d.ts",
       "import": "./esm/reactive/preact.js",
       "default": "./cjs/reactive/preact.js"
     },
diff --git a/tsconfig.json b/tsconfig.json
index 264f07d..52e27f6 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -5,8 +5,8 @@
         "moduleResolution": "nodenext",
         "allowJs": true,
         "declaration": true,
-        "emitDeclarationOnly": true,
-        "declarationDir": "types"
+        //"emitDeclarationOnly": true,
+        "noEmit": true,
     },
     "include": [
         "esm/index.js",

From ce598fc7c19b305382183eeec245946ca3e2efca Mon Sep 17 00:00:00 2001
From: iacore <noreply+gpg-stub@1a-insec.net>
Date: Sat, 13 Apr 2024 13:06:36 +0000
Subject: [PATCH 2/2] Fix type hints for uhtml/init

---
 rollup/init.cjs | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/rollup/init.cjs b/rollup/init.cjs
index 5f94fa9..4bbdf4b 100644
--- a/rollup/init.cjs
+++ b/rollup/init.cjs
@@ -20,4 +20,14 @@ export default document => ${
     .replace(/^(\s+)replaceWith\(([^}]+?)\}/m, '$1/* c8 ignore start */\n$1replaceWith($2}\n$1/* c8 ignore stop */')
     .replace(/^(\s+)(["'])use strict\2;/m, '$1$2use strict$2;\n\n$1const { constructor: DocumentFragment } = document.createDocumentFragment();')
     .replace(/^[^(]+/, '')
+    .replace(/\n  exports\.Hole = Hole;[\S\s]*return exports;/m, `
+  return {
+    Hole : Hole,
+    attr : attr,
+    html : html,
+    htmlFor : htmlFor,
+    render : keyed$1,
+    svg : svg,
+    svgFor : svgFor,
+  };`)
 }`);