Fix fetch with build-time substitution (#2744)

* split fetch into build-time files

* fix lint

* test sh

* add grep replace for ci

* bump types node version

* add info log

* add override for node-fetch whatwg

Author: inferrinizzard

package-lock.json

@@ -66,6 +66,13 @@
         "ts-node": "^10.9.2",
         "watch": "^1.0.2"
     },
+    "overrides": {
+        "cross-fetch": {
+            "node-fetch": {
+                "whatwg-url": "^13.0.0"
+            }
+        }
+    },
     "files": ["dist"],
     "bin": "dist/index.js"
 }

package.json

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+if [[ $CI ]]
+then
+	grep -rl '$fetch' src | xargs sed -i '' -e 's/$fetch/$fetch.ci/g'
+fi
+
+exit 0

packages/quicktype-core/env.sh

@@ -8,7 +8,7 @@
     "repository": "https://github.com/quicktype/quicktype",
     "scripts": {
         "clean": "rm -rf dist node_modules *~",
-        "build": "tsc"
+        "build": "./env.sh && tsc"
     },
     "dependencies": {
         "@glideapps/ts-necessities": "2.2.3",
@@ -29,7 +29,7 @@
     "devDependencies": {
         "@types/browser-or-node": "^1.3.2",
         "@types/is-url": "^1.2.32",
-        "@types/node": "18.19.31",
+        "@types/node": "~22.14.0",
         "@types/pako": "^1.0.0",
         "@types/pluralize": "0.0.30",
         "@types/readable-stream": "4.0.10",
@@ -38,6 +38,13 @@
         "@types/wordwrap": "^1.0.3",
         "typescript": "~5.8.3"
     },
+    "overrides": {
+        "cross-fetch": {
+            "node-fetch": {
+                "whatwg-url": "^13.0.0"
+            }
+        }
+    },
     "files": ["dist"],
     "browser": {
         "fs": false

packages/quicktype-core/package.json

@@ -0,0 +1,3 @@
+console.info("=== RUNNING IN CI, USE FETCH.CI ===");
+
+export const fetch = require("cross-fetch").default;

packages/quicktype-core/src/input/io/$fetch.ci.ts

@@ -0,0 +1,11 @@
+import type CrossFetch from "cross-fetch";
+
+let fetch: typeof CrossFetch;
+
+try {
+    fetch = global.fetch ?? require("cross-fetch").default;
+} catch {
+    fetch = require("cross-fetch").default;
+}
+
+export { fetch };

packages/quicktype-core/src/input/io/$fetch.ts

@@ -1,4 +1,4 @@
-import * as fs from "fs";
+import * as fs from "node:fs";
 
 import { defined, exceptionToString } from "@glideapps/ts-necessities";
 import { isNode } from "browser-or-node";
@@ -10,11 +10,7 @@ import { panic } from "../../support/Support";
 
 import { getStream } from "./get-stream";
 
-// We need to use cross-fetch in CI or if fetch is not available in the global scope
-// We use a dynamic import to avoid punycode deprecated dependency warning on node > 20
-const fetch = process.env.CI
-    ? require("cross-fetch").default
-    : ((global as any).fetch ?? require("cross-fetch").default);
+import { fetch } from "./$fetch";
 
 interface HttpHeaders {
     [key: string]: string;
@@ -25,10 +21,7 @@ function parseHeaders(httpHeaders?: string[]): HttpHeaders {
         return {};
     }
 
-    return httpHeaders.reduce((
-        result: HttpHeaders,
-        httpHeader: string,
-    ) => {
+    return httpHeaders.reduce((result: HttpHeaders, httpHeader: string) => {
         if (httpHeader !== undefined && httpHeader.length > 0) {
             const split = httpHeader.indexOf(":");
 
@@ -56,7 +49,9 @@ export async function readableFromFileOrURL(
             });
 
             return defined(response.body) as unknown as Readable;
-        } else if (isNode) {
+        }
+
+        if (isNode) {
             if (fileOrURL === "-") {
                 // Cast node readable to isomorphic readable from readable-stream
                 return process.stdin as unknown as Readable;

packages/quicktype-core/src/input/io/NodeIO.ts

@@ -16,7 +16,7 @@
         "graphql": "^0.11.7"
     },
     "devDependencies": {
-        "@types/node": "18.19.31",
+        "@types/node": "~22.14.0",
         "@types/graphql": "^0.11.7",
         "typescript": "~5.8.3"
     },

packages/quicktype-graphql-input/package.json

@@ -16,7 +16,7 @@
         "@mark.probst/typescript-json-schema": "0.55.0"
     },
     "devDependencies": {
-        "@types/node": "18.19.31"
+        "@types/node": "~22.14.0"
     },
     "files": ["dist"]
 }

packages/quicktype-typescript-input/package.json

@@ -139,7 +139,7 @@
     },
     "devDependencies": {
         "@types/mocha": "^10.0.6",
-        "@types/node": "18.x",
+        "@types/node": "~22.14.0",
         "@types/node-persist": "^3.1.8",
         "@types/readable-stream": "^4.0.10",
         "@types/vscode": "^1.87.0",