fix: allow type export on mts

fengmk2 · fengmk2 · commit 20523d3c7f32 · 2023-09-10T15:18:48.000+08:00
closes #464
diff --git a/package.json b/package.json
@@ -50,8 +50,11 @@
     "build:version": "node ./scripts/replace_urllib_version.js",
     "build:cjs:test": "cd test/cjs && rm -rf node_modules && npm link ../.. && node index.js",
     "build:esm:test": "cd test/esm && rm -rf node_modules && npm link ../.. && node index.js",
-    "build:test": "npm run build && npm run build:cjs:test && npm run build:esm:test && npm run test-tsc",
-    "test-tsc": "tsc -p ./test/fixtures/ts/tsconfig.json",
+    "build:mts:test": "cd test/mts && rm -rf node_modules && npm link ../.. && tsc",
+    "build:test": "npm run build && npm run build:cjs:test && npm run build:esm:test && npm run build:mts:test && npm run test-tsc",
+    "test-tsc": "npm run test-tsc:cjs",
+    "test-tsc:cjs": "tsc -p ./test/fixtures/ts/tsconfig.json",
+    "test-tsc:esm": "tsc -p ./test/fixtures/ts-esm/tsconfig.json",
     "test": "npm run lint && vitest run",
     "test-keepalive": "cross-env TEST_KEEPALIVE_COUNT=50 vitest run --test-timeout 180000 keep-alive-header.test.ts",
     "cov": "vitest run --coverage",
@@ -82,6 +85,8 @@
     "@types/selfsigned": "^2.0.1",
     "@types/tar-stream": "^2.2.2",
     "@vitest/coverage-v8": "^0.32.0",
+    "@tsconfig/node18": "^18.2.1",
+    "@tsconfig/strictest": "^2.0.2",
     "busboy": "^1.6.0",
     "cross-env": "^7.0.3",
     "eslint": "^8.25.0",
diff --git a/scripts/esm_import_fix.js b/scripts/esm_import_fix.js
@@ -7,14 +7,19 @@ async function main() {
   const root = path.join(process.cwd(), 'src/esm');
   const files = await fs.readdir(root);
   for (const name of files) {
-    if (!name.endsWith('.js')) continue;
+    if (!name.endsWith('.js') && !name.endsWith('.d.ts')) continue;
     const file = path.join(root, name);
     const content = await fs.readFile(file, 'utf-8');
     // replace "from './HttpClient'" to "from './HttpClient.js'"
     const newContent = content.replace(/ from \'(\.\/[^\.\']+?)\'/g, (match, p1) => {
       const after = ` from '${p1}.js'`;
       console.log('[%s] %s => %s', file, match, after);
       return after;
+    }).replace(/import\(\"(\.\/[^\.\"]+?)\"\)/g, (match, p1) => {
+      // import("./Response") => import("./Response.js")
+      const after = `import("${p1}.js")`;
+      console.log('[%s] %s => %s', file, match, after);
+      return after;
     });
     if (newContent !== content) {
       await fs.writeFile(file, newContent);
diff --git a/src/HttpAgent.ts b/src/HttpAgent.ts
@@ -2,9 +2,9 @@ import dns from 'node:dns';
 import { LookupFunction, isIP } from 'node:net';
 import {
   Agent,
+  Dispatcher,
+  buildConnector,
 } from 'undici';
-import type Dispatcher from 'undici/types/dispatcher';
-import type buildConnector from 'undici/types/connector';
 
 export type CheckAddressFunction = (ip: string, family: number | string) => boolean;
 
diff --git a/src/Request.ts b/src/Request.ts
@@ -1,6 +1,6 @@
 import { Readable, Writable } from 'node:stream';
 import type { IncomingHttpHeaders } from 'node:http';
-import type Dispatcher from 'undici/types/dispatcher';
+import type { Dispatcher } from 'undici';
 import type {
   HttpClientResponse,
 } from './Response';
diff --git a/test/fixtures/ts-esm/hello.ts b/test/fixtures/ts-esm/hello.ts
@@ -0,0 +1,14 @@
+import { RequestURL, RequestOptions2, RequestOptions } from 'urllib';
+import { HttpClientResponse } from 'urllib';
+import urllib from 'urllib';
+import * as urllib2 from 'urllib';
+
+async function request(url: RequestURL, options: RequestOptions): Promise<HttpClientResponse> {
+  return await urllib.request(url, options);
+}
+
+async function request2(url: RequestURL, options: RequestOptions2): Promise<HttpClientResponse> {
+  return await urllib2.curl(url, options);
+}
+
+console.log(request, request2);
diff --git a/test/fixtures/ts-esm/package.json b/test/fixtures/ts-esm/package.json
@@ -0,0 +1,4 @@
+{
+  "name": "ts-esm-demo",
+  "type": "module"
+}
diff --git a/test/fixtures/ts-esm/tsconfig.json b/test/fixtures/ts-esm/tsconfig.json
@@ -0,0 +1,12 @@
+{
+  "compilerOptions": {
+    "strict": true,
+    "target": "ES2021",
+    "module": "NodeNext",
+    "moduleResolution": "NodeNext",
+    "baseUrl": "./",
+    "paths": {
+      "urllib": ["../../.."]
+    }
+  }
+}
diff --git a/test/fixtures/ts/package.json b/test/fixtures/ts/package.json
@@ -1,3 +1,3 @@
 {
-  "name": "ts-demo"
+  "name": "ts-cjs-demo"
 }
diff --git a/test/fixtures/ts/tsconfig.json b/test/fixtures/ts/tsconfig.json
@@ -2,7 +2,7 @@
   "compilerOptions": {
     "strict": true,
     "target": "ES2021",
-    "module": "NodeNext",
+    "module": "CommonJS",
     "moduleResolution": "Node",
     "baseUrl": "./",
     "paths": {
diff --git a/test/mts/package.json b/test/mts/package.json
@@ -0,0 +1,3 @@
+{
+  "name": "test-ts"
+}
diff --git a/test/mts/src/index.mts b/test/mts/src/index.mts
@@ -0,0 +1,8 @@
+import { request } from "urllib";
+const responseObj = await request("test");
+
+type IsAny<T, Y, N> = 0 extends (1 & T) ? Y : N;
+(x: IsAny<number, true, never>) => x; // never
+(x: IsAny<any, true, never>) => x; // true
+
+(x: IsAny<typeof responseObj, true, never>) => x; // true
diff --git a/test/mts/tsconfig.json b/test/mts/tsconfig.json
@@ -0,0 +1,9 @@
+{
+	"extends": ["@tsconfig/strictest/tsconfig", "@tsconfig/node18/tsconfig"],
+	"compilerOptions": {
+		"allowSyntheticDefaultImports": true,
+		"outDir": "dist",
+		"skipLibCheck": false
+	},
+	"include": ["src/**/*"]
+}
diff --git a/tsconfig.build.cjs.json b/tsconfig.build.cjs.json
@@ -1,7 +1,6 @@
 {
   "extends": "./tsconfig.json",
   "compilerOptions": {
-    "module": "commonjs",
     "outDir": "./src/cjs",
   }
 }
diff --git a/tsconfig.json b/tsconfig.json
@@ -7,8 +7,8 @@
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
     "importHelpers": false,
-    "module": "NodeNext",
-    "moduleResolution": "node",
+    "module": "CommonJS",
+    "moduleResolution": "Node",
     "newLine": "LF",
     "checkJs": false,
     "allowJs": true,

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +{
 +  "name": "ts-esm-demo",
 +  "type": "module"
 +}
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`{`
`2`		`- "name": "ts-demo"`
	`2`	`+ "name": "ts-cjs-demo"`
`3`	`3`	`}`