From 5e0656fe2c9aade6a7c08a14c1ae402134da7b39 Mon Sep 17 00:00:00 2001
From: sugoidogo <sugoidogo@sugoidogo.com>
Date: Sat, 4 Apr 2026 15:06:38 -0700
Subject: [PATCH] fix parsing to grab globals from all definitions

---
 main.js           | 34 +++++++++++++++++++++++++++++-----
 package-lock.json | 29 +++++++++++++++++++----------
 tsconfig.json     | 10 ++++++++++
 3 files changed, 58 insertions(+), 15 deletions(-)
 create mode 100644 tsconfig.json

diff --git a/main.js b/main.js
index 6267eb5..8242959 100644
--- a/main.js
+++ b/main.js
@@ -1,12 +1,36 @@
-// @ts-check
 import * as fs from "node:fs";
-const globalRegex = /    (?:var|function) (\w+)/g;
+const symbolRegex = /(?:var|function) (\w+)/g;
 const globalSymbols = [];
 let buffer = '';
-for (const basename of fs.readdirSync("node_modules/@types/node/web-globals")) {
-    buffer += fs.readFileSync("node_modules/@types/node/web-globals/" + basename, "utf8");
+
+const fileQueue = []
+const dirQueue = ["node_modules/@types/node"]
+
+while (dirQueue.length !== 0) {
+    const dirname = dirQueue.pop()
+    for (const basename of fs.readdirSync(dirname)) {
+        const path = dirname + "/" + basename
+        if (fs.statSync(path).isDirectory()) {
+            dirQueue.push(path)
+        } else {
+            fileQueue.push(path)
+        }
+    }
 }
-for (const match of buffer.matchAll(globalRegex)) {
+
+for (const path of fileQueue) {
+    const filebuffer = fs.readFileSync(path, "utf8");
+    const lines = filebuffer.split('\n')
+    let startLine=0
+    for (const line of lines) {
+        if (line.trim().endsWith("global {")) {
+            break
+        }
+        startLine++
+    }
+    buffer+=lines.slice(startLine).join('\n')
+}
+for (const match of buffer.matchAll(symbolRegex)) {
     globalSymbols.push(match[0].trim());
 }
 const declarationRegex = /(?:^\/\*\*[\s\S]+?\*\/\n)?^(interface|type|declare \w+) (\w+).+\n(?:(?: .+\n)*};?\n)?/gm;
diff --git a/package-lock.json b/package-lock.json
index 79e8fc2..3adea40 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -7,10 +7,13 @@
     "": {
       "name": "@sugoidogo/node-web-globals",
       "version": "0.0.0",
-      "license": "MIT",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "undici-types": "^7.21.0"
+      },
       "devDependencies": {
         "@sugoidogo/importable-types-web": "^1.0.0",
-        "@types/node": "^25.2.2",
+        "@types/node": "^22.19.17",
         "@types/web": "^0.0.329"
       }
     },
@@ -25,15 +28,22 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "25.2.2",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.2.2.tgz",
-      "integrity": "sha512-BkmoP5/FhRYek5izySdkOneRyXYN35I860MFAGupTdebyE66uZaR+bXLHq8k4DirE5DwQi3NuhvRU1jqTVwUrQ==",
+      "version": "22.19.17",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.19.17.tgz",
+      "integrity": "sha512-wGdMcf+vPYM6jikpS/qhg6WiqSV/OhG+jeeHT/KlVqxYfD40iYJf9/AE1uQxVWFvU7MipKRkRv8NSHiCGgPr8Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "undici-types": "~7.16.0"
+        "undici-types": "~6.21.0"
       }
     },
+    "node_modules/@types/node/node_modules/undici-types": {
+      "version": "6.21.0",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz",
+      "integrity": "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/@types/web": {
       "version": "0.0.329",
       "resolved": "https://registry.npmjs.org/@types/web/-/web-0.0.329.tgz",
@@ -42,10 +52,9 @@
       "license": "Apache-2.0"
     },
     "node_modules/undici-types": {
-      "version": "7.16.0",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.16.0.tgz",
-      "integrity": "sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==",
-      "dev": true,
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.24.7.tgz",
+      "integrity": "sha512-XA+gOBkzYD3C74sZowtCLTpgtaCdqZhqCvR6y9LXvrKTt/IVU6bz49T4D+BPi475scshCCkb0IklJRw6T1ZlgQ==",
       "license": "MIT"
     }
   }
diff --git a/tsconfig.json b/tsconfig.json
new file mode 100644
index 0000000..41e3342
--- /dev/null
+++ b/tsconfig.json
@@ -0,0 +1,10 @@
+{
+    "compilerOptions": {
+        "allowJs": true,
+        "noEmit": true,
+        "moduleResolution": "node",
+        "target": "es2022",
+        "lib": ["ESNext"],
+        "types": ["node"]
+    }
+}
\ No newline at end of file