fix: include types lost when generating dts (#707)

* fix: include types lost when generating dts

* test: add case for include types

* test: correct type error for build cases

* refactor: compatible with windows os

src/builder/bundless/dts/index.ts

@@ -163,7 +163,7 @@ export default async function getDeclarations(
     });
 
     const incrProgram = ts.createIncrementalProgram({
-      rootNames: inputFiles,
+      rootNames: tsconfig.fileNames,
       options: tsconfig.options,
       host: tsHost,
     });

src/builder/bundless/loaders/index.ts

@@ -1,3 +1,4 @@
+import { winPath } from '@umijs/utils';
 import fs from 'fs';
 import { runLoaders } from 'loader-runner';
 import type { IApi } from '../../../types';
@@ -63,17 +64,23 @@ export default async (
   const cacheRet = await cache.get(cacheKey, '');
 
   // use cache first
-  if (cacheRet)
+  /* istanbul ignore if -- @preserve */
+  if (cacheRet) {
+    const tsconfig = /\.tsx?$/.test(fileAbsPath)
+      ? getTsconfig(opts.cwd)
+      : undefined;
+
     return Promise.resolve<ILoaderOutput>({
       ...cacheRet,
       options: {
         ...cacheRet.options,
         // FIXME: shit code for avoid invalid declaration value when tsconfig changed
-        declaration: /\.tsx?$/.test(fileAbsPath)
-          ? getTsconfig(opts.cwd)?.options.declaration
-          : false,
+        declaration:
+          tsconfig?.options.declaration &&
+          tsconfig?.fileNames.includes(winPath(fileAbsPath)),
       },
     });
+  }
 
   // get matched loader by test
   const matched = loaders.find((item) => {

src/builder/bundless/loaders/javascript/index.ts

@@ -1,3 +1,4 @@
+import { winPath } from '@umijs/utils';
 import { getTsconfig } from '../../dts';
 import type { IBundlessLoader, IJSTransformer, ILoaderOutput } from '../types';
 
@@ -32,9 +33,12 @@ const jsLoader: IBundlessLoader = function (content) {
   }
 
   // mark for output declaration file
+  const tsconfig = /\.tsx?$/.test(this.resource)
+    ? getTsconfig(this.context!)
+    : undefined;
   if (
-    /\.tsx?$/.test(this.resource) &&
-    getTsconfig(this.context!)?.options.declaration
+    tsconfig?.options.declaration &&
+    tsconfig?.fileNames.includes(winPath(this.resource))
   ) {
     outputOpts.declaration = true;
   }

tests/fixtures/build/bundle-alias-tsconfig/tsconfig.json

@@ -1,17 +1,7 @@
 {
+  "extends": "../tsconfig.json",
   "compilerOptions": {
-    "declaration": true,
-    "declarationMap": true,
-    "esModuleInterop": true,
-    "module": "commonjs",
-    "moduleResolution": "node",
-    "noUnusedLocals": true,
-    "noUnusedParameters": true,
-    "strict": true,
-    "skipLibCheck": true,
-    "target": "es2015",
-    "jsx": "react",
-    "baseUrl": ".",
+    "baseUrl": "./",
     "paths": {
       "alias-module": ["./src/alias.ts"],
       "@/*": ["./src/*"],

tests/fixtures/build/bundle-targets/src/index.ts

@@ -2,4 +2,4 @@ async function hello() {
   return await Promise.resolve('ok');
 }
 
-hello();
+export default hello;

tests/fixtures/build/bundless-alias/tsconfig.json

@@ -1,8 +1,7 @@
 {
+  "extends": "../tsconfig.json",
   "compilerOptions": {
-    "strict": true,
     "declaration": true,
-    "skipLibCheck": true,
     "baseUrl": "./",
     "paths": {
       "@/*": ["./src/*"],

tests/fixtures/build/bundless-babel-targets/src/index.ts

@@ -2,4 +2,4 @@ async function hello() {
   return await Promise.resolve('ok');
 }
 
-hello();
+export default hello;

tests/fixtures/build/bundless-diff-dts/tsconfig.json

@@ -1,4 +1,5 @@
 {
+  "extends": "../tsconfig.json",
   "compilerOptions": {
     "declaration": true
   }

tests/fixtures/build/bundless-esbuild-targets/src/index.ts

@@ -2,4 +2,4 @@ async function hello() {
   return await Promise.resolve('ok');
 }
 
-hello();
+export default hello;

tests/fixtures/build/bundless-include-dts/.fatherrc.ts

@@ -0,0 +1,3 @@
+export default {
+  esm: {},
+};

tests/fixtures/build/bundless-include-dts/expect.ts

@@ -0,0 +1,4 @@
+export default (files: Record<string, string>) => {
+  // expect global types to be included
+  expect(files['esm/index.d.ts']).toContain(': string;');
+};

tests/fixtures/build/bundless-include-dts/global.d.ts

@@ -0,0 +1,7 @@
+declare global {
+  interface Window {
+    hello: string;
+  }
+}
+
+export {};

tests/fixtures/build/bundless-include-dts/src/index.ts

@@ -0,0 +1 @@
+export default window.hello;

tests/fixtures/build/bundless-include-dts/tsconfig.json

@@ -0,0 +1,6 @@
+{
+  "extends": "../tsconfig.json",
+  "compilerOptions": {
+    "declaration": true
+  }
+}

tests/fixtures/build/bundless-outer-paths/tsconfig.json

@@ -1,9 +1,8 @@
 {
+  "extends": "../tsconfig.json",
   "compilerOptions": {
-    "strict": true,
-    "skipLibCheck": true,
     "declaration": true,
-    "baseUrl": ".",
+    "baseUrl": "./",
     "paths": {
       "@bundless-overrides": ["../bundless-overrides/src/client"]
     }

tests/fixtures/build/bundless-swc-alias/tsconfig.json

@@ -1,8 +1,7 @@
 {
+  "extends": "../tsconfig.json",
   "compilerOptions": {
-    "strict": true,
     "declaration": true,
-    "skipLibCheck": true,
     "baseUrl": "./",
     "paths": {
       "@/*": ["./src/*"],

tests/fixtures/build/bundless-swc-targets/src/index.ts

@@ -2,4 +2,4 @@ async function hello() {
   return await Promise.resolve('ok');
 }
 
-hello();
+export default hello;

tests/fixtures/build/tsconfig.json

@@ -1,8 +1,7 @@
 {
-  "extends": "../../../tsconfig.json",
   "compilerOptions": {
-    "rootDir": ".",
+    "strict": true,
+    "skipLibCheck": true,
     "jsx": "react"
-  },
-  "include": ["**/*.ts", "**/*.tsx"]
+  }
 }