Merge pull request #520 from drizzle-team/beta

drizzle-team · Apr 25, 2023 · aadde62 · aadde62
2 parents d43e04b + a6ec9f3
commit aadde62
Show file tree

Hide file tree

Showing 16 changed files with 956 additions and 28 deletions.
diff --git a/changelogs/drizzle-orm/0.25.3.md b/changelogs/drizzle-orm/0.25.3.md
@@ -0,0 +1,2 @@
+- 🐛 Fix `pg` imports in ESM mode (#505)
+- 🐛 Add "types" and "default" fields to "exports" entries in package.json (#511)
diff --git a/changelogs/drizzle-zod/0.4.1.md b/changelogs/drizzle-zod/0.4.1.md
@@ -0,0 +1 @@
+- 🐛 Add "exports" field to package.json
diff --git a/drizzle-orm/package.json b/drizzle-orm/package.json
@@ -1,6 +1,6 @@
 {
   "name": "drizzle-orm",
-  "version": "0.25.2",
+  "version": "0.25.3",
   "description": "Drizzle ORM package for SQL databases",
   "type": "module",
   "scripts": {

diff --git a/drizzle-orm/scripts/build.ts b/drizzle-orm/scripts/build.ts
@@ -5,13 +5,17 @@ import { entries } from '../rollup.common';
 function updateAndCopyPackageJson() {
 	const pkg = fs.readJSONSync('package.json');
 
-	pkg.exports = entries.reduce<Record<string, { import: string; require: string }>>((acc, entry) => {
-		const exportsEntry = entry === 'index' ? '.' : './' + entry.replace(/\/index$/, '');
-		const importEntry = `./${entry}.mjs`;
-		const requireEntry = `./${entry}.cjs`;
-		acc[exportsEntry] = { import: importEntry, require: requireEntry };
-		return acc;
-	}, {});
+	pkg.exports = entries.reduce<Record<string, { import: string; require: string; default: string; types: string }>>(
+		(acc, entry) => {
+			const exportsEntry = entry === 'index' ? '.' : './' + entry.replace(/\/index$/, '');
+			const importEntry = `./${entry}.mjs`;
+			const requireEntry = `./${entry}.cjs`;
+			const typesEntry = `./${entry}.d.ts`;
+			acc[exportsEntry] = { import: importEntry, require: requireEntry, default: importEntry, types: typesEntry };
+			return acc;
+		},
+		{},
+	);
 
 	fs.writeJSONSync('dist/package.json', pkg, { spaces: 2 });
 }

diff --git a/drizzle-orm/src/mysql-core/columns/index.ts b/drizzle-orm/src/mysql-core/columns/index.ts
@@ -1,9 +1,11 @@
 export * from './bigint';
 export * from './binary';
-export * from './char';
 export * from './boolean';
-export { MySqlColumn } from './common';
-export type { AnyMySqlColumn } from './common';
+export * from './char';
+export * from './common';
+export * from './custom';
+export * from './date';
+export * from './datetime';
 export * from './decimal';
 export * from './double';
 export * from './enum';
@@ -15,12 +17,9 @@ export * from './real';
 export * from './serial';
 export * from './smallint';
 export * from './text';
+export * from './time';
 export * from './timestamp';
 export * from './tinyint';
 export * from './varbinary';
 export * from './varchar';
-export * from './date';
-export * from './datetime';
-export * from './time';
 export * from './year';
-export * from './custom'
diff --git a/drizzle-orm/src/node-postgres/driver.ts b/drizzle-orm/src/node-postgres/driver.ts
@@ -1,4 +1,4 @@
-import * as pg from 'pg';
+import pg from 'pg';
 import type { Logger } from '~/logger';
 import { DefaultLogger } from '~/logger';
 import { PgDatabase } from '~/pg-core/db';

diff --git a/drizzle-orm/src/node-postgres/session.ts b/drizzle-orm/src/node-postgres/session.ts
@@ -1,5 +1,5 @@
 import type { Client, PoolClient, QueryArrayConfig, QueryConfig, QueryResult, QueryResultRow } from 'pg';
-import * as pg from 'pg';
+import pg from 'pg';
 import { type Logger, NoopLogger } from '~/logger';
 import { PgTransaction } from '~/pg-core';
 import type { PgDialect } from '~/pg-core/dialect';

diff --git a/drizzle-orm/src/pg-core/columns/index.ts b/drizzle-orm/src/pg-core/columns/index.ts
@@ -4,8 +4,7 @@ export * from './bigserial';
 export * from './boolean';
 export * from './char';
 export * from './cidr';
-export { PgColumn } from './common';
-export type { AnyPgColumn } from './common';
+export * from './common';
 export * from './custom';
 export * from './date';
 export * from './double-precision';

diff --git a/drizzle-orm/src/sqlite-core/columns/index.ts b/drizzle-orm/src/sqlite-core/columns/index.ts
@@ -1,6 +1,5 @@
 export * from './blob';
-export { SQLiteColumn } from './common';
-export type { AnySQLiteColumn } from './common';
+export * from './common';
 export * from './custom';
 export * from './integer';
 export * from './numeric';

diff --git a/drizzle-orm/type-tests/mysql/1000columns.ts b/drizzle-orm/type-tests/mysql/1000columns.ts
diff --git a/drizzle-zod/package.json b/drizzle-zod/package.json
@@ -1,6 +1,6 @@
 {
   "name": "drizzle-zod",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "description": "Generate Zod schemas from Drizzle ORM schemas",
   "type": "module",
   "scripts": {
@@ -11,6 +11,14 @@
     "publish": "npm publish package.tgz",
     "test": "ava tests"
   },
+  "exports": {
+    ".": {
+      "import": "./index.mjs",
+      "require": "./index.cjs",
+      "default": "./index.mjs",
+      "types": "./index.d.ts"
+    }
+  },
   "main": "./index.cjs",
   "module": "./index.mjs",
   "types": "./index.d.ts",

diff --git a/drizzle-zod/tests/imports.test.cjs b/drizzle-zod/tests/imports.test.cjs
diff --git a/drizzle-zod/tests/imports.test.mjs b/drizzle-zod/tests/imports.test.mjs
diff --git a/integration-tests/tests/imports.test.cjs b/integration-tests/tests/imports.test.cjs
@@ -18,7 +18,7 @@ require('drizzle-orm/neon-serverless');
 require('drizzle-orm/neon-serverless/migrator');
 require('drizzle-orm/node-postgres');
 require('drizzle-orm/node-postgres/migrator');
-require('drizzle-orm/pg-core');
+const { pgTable, serial } = require('drizzle-orm/pg-core');
 require('drizzle-orm/planetscale-serverless');
 require('drizzle-orm/planetscale-serverless/migrator');
 require('drizzle-orm/postgres-js');
@@ -29,9 +29,15 @@ require('drizzle-orm/sqlite-core');
 require('drizzle-orm/sqlite-proxy');
 require('drizzle-orm/sqlite-proxy/migrator');
 require('drizzle-orm/migrator');
-require('drizzle-zod');
+const { createInsertSchema } = require('drizzle-zod');
 const { compatibilityVersion, npmVersion } = require('drizzle-orm/version');
 const { strict: assert } = require('node:assert');
 
 assert.equal(typeof compatibilityVersion, 'number');
 assert.equal(typeof npmVersion, 'string');
+
+const test = pgTable('test', {
+	id: serial('id').primaryKey(),
+});
+
+const insertSchema = createInsertSchema(test);
diff --git a/integration-tests/tests/imports.test.mjs b/integration-tests/tests/imports.test.mjs
@@ -18,7 +18,7 @@ import 'drizzle-orm/neon-serverless';
 import 'drizzle-orm/neon-serverless/migrator';
 import 'drizzle-orm/node-postgres';
 import 'drizzle-orm/node-postgres/migrator';
-import 'drizzle-orm/pg-core';
+import { pgTable, serial } from 'drizzle-orm/pg-core';
 import 'drizzle-orm/planetscale-serverless';
 import 'drizzle-orm/planetscale-serverless/migrator';
 import 'drizzle-orm/postgres-js';
@@ -29,9 +29,15 @@ import 'drizzle-orm/sqlite-core';
 import 'drizzle-orm/sqlite-proxy';
 import 'drizzle-orm/sqlite-proxy/migrator';
 import 'drizzle-orm/migrator';
-import 'drizzle-zod';
+import { createInsertSchema } from 'drizzle-zod';
 import { compatibilityVersion, npmVersion } from 'drizzle-orm/version';
 import { strict as assert } from 'node:assert';
 
 assert.equal(typeof compatibilityVersion, 'number');
 assert.equal(typeof npmVersion, 'string');
+
+const test = pgTable('test', {
+	id: serial('id').primaryKey(),
+});
+
+const insertSchema = createInsertSchema(test);
diff --git a/tsconfig.json b/tsconfig.json
@@ -33,7 +33,8 @@
 		"allowUnusedLabels": false /* Disable error reporting for unused labels. */,
 		"allowUnreachableCode": false /* Disable error reporting for unreachable code. */,
 		"skipLibCheck": true /* Skip type checking all .d.ts files. */,
-		"noErrorTruncation": true /* Disable truncating types in error messages. */
+		"noErrorTruncation": true /* Disable truncating types in error messages. */,
+		"checkJs": true
 	},
 	"exclude": ["**/dist"],
 	"ts-node": {