Build separate declaration files

.gitignore

@@ -8,4 +8,5 @@ dist.new
 .cache
 .turbo
 .rollup.cache
-dist-dts
+dist-dcts
+dist-dmts

drizzle-orm/package.json

@@ -13,7 +13,7 @@
   },
   "main": "./index.cjs",
   "module": "./index.mjs",
-  "types": "./index.d.ts",
+  "types": "./index.d.cts",
   "sideEffects": false,
   "publishConfig": {
     "provenance": true

drizzle-orm/rollup.dts.config.ts → drizzle-orm/rollup.dcts.config.ts

@@ -6,13 +6,14 @@ import { entries, external } from './rollup.common';
 export default defineConfig([
 	{
 		input: entries.reduce<Record<string, string>>((acc, entry) => {
-			const from = 'dist-dts/' + entry + '.d.ts';
+			const from = 'dist-dcts/' + entry + '.d.ts';
 			const to = entry;
 			acc[to] = from;
 			return acc;
 		}, {}),
 		output: {
 			dir: 'dist.new',
+			entryFileNames: '[name].d.cts',
 		},
 		external,
 		plugins: [

drizzle-orm/rollup.dmts.config.ts

@@ -0,0 +1,26 @@
+import json from '@rollup/plugin-json';
+import { defineConfig } from 'rollup';
+import dts from 'rollup-plugin-dts';
+import { entries, external } from './rollup.common';
+
+export default defineConfig([
+	{
+		input: entries.reduce<Record<string, string>>((acc, entry) => {
+			const from = 'dist-dmts/' + entry + '.d.ts';
+			const to = entry;
+			acc[to] = from;
+			return acc;
+		}, {}),
+		output: {
+			dir: 'dist.new',
+			entryFileNames: '[name].d.mts',
+		},
+		external,
+		plugins: [
+			json({
+				preferConst: true,
+			}),
+			dts(),
+		],
+	},
+]);

drizzle-orm/scripts/build.ts

@@ -3,20 +3,34 @@ import 'zx/globals';
 import concurrently from 'concurrently';
 import { entries } from '../rollup.common';
 
+interface Export {
+	types: string;
+	default: string;
+}
+
 function updateAndCopyPackageJson() {
 	const pkg = fs.readJSONSync('package.json');
 
-	pkg.exports = entries.reduce<Record<string, { import: string; require: string; default: string; types: string }>>(
+	pkg.exports = entries.reduce<Record<string, { import: Export; require: Export; default: Export; }>>(
 		(acc, entry) => {
 			const exportsEntry = entry === 'index' ? '.' : './' + entry.replace(/\/index$/, '');
 			const importEntry = `./${entry}.mjs`;
 			const requireEntry = `./${entry}.cjs`;
-			const typesEntry = `./${entry}.d.ts`;
+			const importTypesEntry = `./${entry}.d.mts`;
+			const requireTypesEntry = `./${entry}.d.cts`;
 			acc[exportsEntry] = {
-				types: typesEntry,
-				import: importEntry,
-				require: requireEntry,
-				default: importEntry,
+				import: {
+					types: importTypesEntry,
+					default: importEntry,
+				},
+				require: {
+					types: requireTypesEntry,
+					default: requireEntry,
+				},
+				default: {
+					types: importTypesEntry,
+					default: importEntry,
+				},
 			};
 			return acc;
 		},
@@ -36,15 +50,17 @@ await concurrently([
 		name: 'esm',
 	},
 	{
-		command: `tsc -p tsconfig.esm.json --declaration --outDir dist-dts --emitDeclarationOnly &&
-resolve-tspaths --out dist-dts &&
-rollup --config rollup.dts.config.ts --configPlugin typescript`,
-		name: 'dts',
+		command: `tsc -p tsconfig.cjs.json --declaration --outDir dist-dcts --emitDeclarationOnly && resolve-tspaths --out dist-dcts && rollup --config rollup.dcts.config.ts --configPlugin typescript`,
+		name: 'dcts',
+	},
+	{
+		command: `tsc -p tsconfig.esm.json --declaration --outDir dist-dmts --emitDeclarationOnly && resolve-tspaths --out dist-dmts && rollup --config rollup.dmts.config.ts --configPlugin typescript`,
+		name: 'dmts',
 	},
 ], {
 	killOthers: 'failure',
 }).result.catch(() => process.exit(1));
 fs.copySync('../README.md', 'dist.new/README.md');
 updateAndCopyPackageJson();
 fs.removeSync('dist');
-fs.renameSync('dist.new', 'dist');
+fs.renameSync('dist.new', 'dist');

drizzle-zod/package.json

@@ -4,7 +4,7 @@
   "description": "Generate Zod schemas from Drizzle ORM schemas",
   "type": "module",
   "scripts": {
-    "build": "rimraf dist && rollup --config rollup.config.ts --configPlugin typescript && resolve-tspaths && cp README.md package.json dist/",
+    "build": "scripts/build.ts",
     "b": "pnpm build",
     "test:types": "cd tests && tsc",
     "pack": "(cd dist && npm pack --pack-destination ..) && rm -f package.tgz && mv *.tgz package.tgz",
@@ -13,15 +13,23 @@
   },
   "exports": {
     ".": {
-      "types": "./index.d.ts",
-      "import": "./index.mjs",
-      "require": "./index.cjs",
-      "default": "./index.mjs"
+      "import": {
+        "types": "./index.d.mts",
+        "default": "./index.mjs"
+      },
+      "require": {
+        "types": "./index.d.cts",
+        "default": "./index.cjs"
+      },
+      "default": {
+        "types": "./index.d.mts",
+        "default": "./index.mjs"
+      }
     }
   },
   "main": "./index.cjs",
   "module": "./index.mjs",
-  "types": "./index.d.ts",
+  "types": "./index.d.cts",
   "publishConfig": {
     "provenance": true
   },
@@ -72,7 +80,9 @@
     "drizzle-orm": "link:../drizzle-orm/dist",
     "rimraf": "^5.0.0",
     "rollup": "^3.20.7",
+    "rollup-plugin-dts": "^5.3.0",
     "tsx": "^3.12.2",
-    "zod": "^3.20.2"
+    "zod": "^3.20.2",
+    "zx": "^7.2.2"
   }
 }

drizzle-zod/rollup.cjs.config.ts

@@ -0,0 +1,26 @@
+import terser from '@rollup/plugin-terser';
+import typescript from '@rollup/plugin-typescript';
+import { defineConfig } from 'rollup';
+
+export default defineConfig([
+	{
+		input: 'src/index.ts',
+		output: {
+			format: 'cjs',
+			dir: 'dist.new',
+			entryFileNames: '[name].cjs',
+			chunkFileNames: '[name]-[hash].cjs',
+			sourcemap: true,
+		},
+		external: [
+			/^drizzle-orm\/?/,
+			'zod',
+		],
+		plugins: [
+			typescript({
+				tsconfig: 'tsconfig.cjs.json',
+			}),
+			terser(),
+		],
+	},
+]);

drizzle-zod/rollup.dcts.config.ts

@@ -0,0 +1,19 @@
+import { defineConfig } from 'rollup';
+import dts from 'rollup-plugin-dts';
+
+export default defineConfig([
+	{
+		input: 'src/index.ts',
+		output: {
+			dir: 'dist.new',
+			entryFileNames: '[name].d.cts',
+		},
+		external: [
+			/^drizzle-orm\/?/,
+			'zod',
+		],
+		plugins: [
+			dts(),
+		],
+	},
+]);

drizzle-zod/rollup.dmts.config.ts

@@ -0,0 +1,19 @@
+import { defineConfig } from 'rollup';
+import dts from 'rollup-plugin-dts';
+
+export default defineConfig([
+	{
+		input: 'src/index.ts',
+		output: {
+			dir: 'dist.new',
+			entryFileNames: '[name].d.mts',
+		},
+		external: [
+			/^drizzle-orm\/?/,
+			'zod',
+		],
+		plugins: [
+			dts(),
+		],
+	},
+]);

drizzle-zod/rollup.esm.config.ts

@@ -0,0 +1,26 @@
+import terser from '@rollup/plugin-terser';
+import typescript from '@rollup/plugin-typescript';
+import { defineConfig } from 'rollup';
+
+export default defineConfig([
+	{
+		input: 'src/index.ts',
+		output: {
+			format: 'esm',
+			dir: 'dist.new',
+			entryFileNames: '[name].mjs',
+			chunkFileNames: '[name]-[hash].mjs',
+			sourcemap: true,
+		},
+		external: [
+			/^drizzle-orm\/?/,
+			'zod',
+		],
+		plugins: [
+			typescript({
+				tsconfig: 'tsconfig.esm.json',
+			}),
+			terser(),
+		],
+	},
+]);

drizzle-zod/scripts/build.ts

@@ -0,0 +1,27 @@
+#!/usr/bin/env -S pnpm tsx
+import 'zx/globals';
+import concurrently from 'concurrently';
+
+await concurrently([
+	{
+		command: 'rollup --config rollup.cjs.config.ts --configPlugin typescript',
+		name: 'cjs',
+	},
+	{
+		command: 'rollup --config rollup.esm.config.ts --configPlugin typescript',
+		name: 'esm',
+	},
+	{
+		command: `tsc -p tsconfig.cjs.json --declaration --outDir dist-dcts --emitDeclarationOnly && resolve-tspaths --out dist-dcts && rollup --config rollup.dcts.config.ts --configPlugin typescript`,
+		name: 'dcts',
+	},
+	{
+		command: `tsc -p tsconfig.esm.json --declaration --outDir dist-dmts --emitDeclarationOnly && resolve-tspaths --out dist-dmts && rollup --config rollup.dmts.config.ts --configPlugin typescript`,
+		name: 'dmts',
+	},
+], {
+	killOthers: 'failure',
+}).result.catch(() => process.exit(1));
+fs.copySync('../README.md', 'dist.new/README.md');
+fs.removeSync('dist');
+fs.renameSync('dist.new', 'dist');

drizzle-zod/tsconfig.esm.json

@@ -0,0 +1,8 @@
+{
+	"extends": "./tsconfig.json",
+	"compilerOptions": {
+		"rootDir": "src",
+		"incremental": true
+	},
+	"include": ["src"]
+}

drizzle-zod/tsconfig.json

@@ -1,9 +1,7 @@
 {
 	"extends": "../tsconfig.json",
 	"compilerOptions": {
-		"outDir": "dist",
 		"baseUrl": ".",
-		"declaration": true,
 		"paths": {
 			"~/*": ["src/*"]
 		}