Generate type definitions with @proc7ts/rollup-plugin-flat-dts

Author: surol

.gitignore

@@ -28,4 +28,5 @@ package-lock.json
 /dist
 
 # Type definitions
-/d.ts
+*.d.ts
+*.d.ts.map

.npmignore

@@ -33,7 +33,5 @@ node_modules
 !/dist
 
 # Include type definitions
-!/d.ts
-# ...but exclude implementations
-/d.ts/**/impl
-/d.ts/**/*.impl.*
+!*.d.ts
+!*.d.ts.map

core/index.d.ts

@@ -1,5 +1,5 @@
 {
   "main": "../dist/hatsy.core.cjs",
   "module": "../dist/hatsy.core.js",
-  "types": "index.d.ts"
+  "types": "./index.d.ts"
 }

core/package.json

@@ -24,9 +24,9 @@
     "url": "https://github.com/hatsyjs/hatsy/issues"
   },
   "type": "module",
-  "main": "dist/hatsy.cjs",
-  "module": "dist/hatsy.js",
-  "types": "index.d.ts",
+  "main": "./dist/hatsy.cjs",
+  "module": "./dist/hatsy.js",
+  "types": "./index.d.ts",
   "exports": {
     ".": {
       "import": "./dist/hatsy.js",
@@ -51,8 +51,8 @@
     }
   },
   "dependencies": {
-    "@hatsy/hten": "^1.1.1",
-    "@hatsy/http-header-value": "^3.5.1",
+    "@hatsy/hten": "^1.1.2",
+    "@hatsy/http-header-value": "^3.5.2",
     "@proc7ts/primitives": "^1.5.1"
   },
   "engines": {
@@ -61,6 +61,7 @@
   "devDependencies": {
     "@proc7ts/eslint-config": "^2.0.5",
     "@proc7ts/rollup-helpers": "^1.1.1",
+    "@proc7ts/rollup-plugin-flat-dts": "^1.1.0",
     "@rollup/plugin-commonjs": "^16.0.0",
     "@rollup/plugin-node-resolve": "^10.0.0",
     "@types/jest": "^26.0.15",
@@ -88,7 +89,7 @@
     "all": "run-z build,lint,test",
     "build": "run-z +z --then rollup --config ./rollup.config.js",
     "ci:all": "run-z all +test/--ci/--runInBand",
-    "clean": "run-z +z --then shx rm -rf d.ts dist target",
+    "clean": "run-z +z --then shx rm -rf index.d.ts '*/index.d.ts' dist target",
     "doc": "run-z +z --then typedoc",
     "doc:publish": "run-z doc --then gh-pages --dist target/typedoc --dotfiles",
     "lint": "run-z +z --then eslint . --ext .js,.ts",

index.d.ts

@@ -1,4 +1,5 @@
 import { externalModules } from '@proc7ts/rollup-helpers';
+import flatDts from '@proc7ts/rollup-plugin-flat-dts';
 import commonjs from '@rollup/plugin-commonjs';
 import nodeResolve from '@rollup/plugin-node-resolve';
 import path from 'path';
@@ -19,40 +20,51 @@ export default {
       typescript,
       tsconfig: 'tsconfig.main.json',
       cacheRoot: 'target/.rts2_cache',
-      useTsconfigDeclarationDir: true,
     }),
     nodeResolve(),
     sourcemaps(),
   ],
   external: externalModules(),
   manualChunks(id) {
-    if (id.startsWith(path.join(__dirname, 'src', 'testing') + path.sep)) {
+    if (id.startsWith(path.resolve('src', 'testing') + path.sep)) {
       return 'hatsy.testing';
     }
-    if (id.startsWith(path.join(__dirname, 'src', 'core') + path.sep)) {
+    if (id.startsWith(path.resolve('src', 'core') + path.sep)) {
       return 'hatsy.core';
     }
-    if (id.startsWith(path.join(__dirname, 'src', 'impl') + path.sep)) {
+    if (id.startsWith(path.resolve('src', 'impl') + path.sep)) {
       return 'hatsy.impl';
     }
     return 'hatsy';
   },
   output: [
     {
+      dir: 'dist',
       format: 'cjs',
       sourcemap: true,
-      dir: './dist',
       entryFileNames: '[name].cjs',
-      chunkFileNames: `_[name].cjs`,
-      hoistTransitiveImports: false,
+      chunkFileNames: '_[name].cjs',
     },
     {
+      dir: '.',
       format: 'esm',
       sourcemap: true,
-      dir: './dist',
-      entryFileNames: '[name].js',
-      chunkFileNames: `_[name].js`,
-      hoistTransitiveImports: false,
+      entryFileNames: 'dist/[name].js',
+      chunkFileNames: 'dist/_[name].js',
+      plugins: [
+        flatDts({
+          tsconfig: 'tsconfig.main.json',
+          lib: true,
+          entries: {
+            core: {
+              file: 'core/index.d.ts',
+            },
+            testing: {
+              file: 'testing/index.d.ts',
+            },
+          },
+        }),
+      ],
     },
   ],
 };

package.json

@@ -1,5 +1,5 @@
 {
   "main": "../dist/hatsy.testing.cjs",
   "module": "../dist/hatsy.testing.js",
-  "types": "index.d.ts"
+  "types": "./index.d.ts"
 }

rollup.config.js

@@ -11,7 +11,6 @@
     "forceConsistentCasingInFileNames": true,
     "importsNotUsedAsValues": "error",
     "importHelpers": true,
-    "isolatedModules": true,
     "noEmitHelpers": true,
     "lib": [
       "DOM",