...

Author: igalklebanov

deno.check.d.ts

@@ -7,7 +7,7 @@ import type {
   Selectable,
   SqlBool,
   Updateable,
-} from './dist/esm'
+} from './dist'
 
 export interface Database {
   audit: AuditTable

deno.check.json

@@ -6,13 +6,13 @@
   "imports": {
     "@electric-sql/pglite": "npm:@electric-sql/pglite",
     "better-sqlite3": "npm:better-sqlite3",
-    "kysely": "./dist/esm",
-    "kysely/helpers/mssql": "./dist/esm/helpers/mssql.js",
-    "kysely/helpers/mysql": "./dist/esm/helpers/mysql.js",
-    "kysely/helpers/postgres": "./dist/esm/helpers/postgres.js",
-    "kysely/helpers/sqlite": "./dist/esm/helpers/sqlite.js",
-    "kysely/migration": "./dist/esm/migration",
-    "kysely/readonly": "./dist/esm/readonly",
+    "kysely": "./dist",
+    "kysely/helpers/mssql": "./dist/helpers/mssql.js",
+    "kysely/helpers/mysql": "./dist/helpers/mysql.js",
+    "kysely/helpers/postgres": "./dist/helpers/postgres.js",
+    "kysely/helpers/sqlite": "./dist/helpers/sqlite.js",
+    "kysely/migration": "./dist/migration",
+    "kysely/readonly": "./dist/readonly",
     "lodash/snakeCase": "npm:lodash/snakeCase",
     "mysql2": "npm:mysql2",
     "pg": "npm:pg",

package.json

@@ -28,8 +28,8 @@
     "node": ">=20.0.0"
   },
   "type": "module",
-  "main": "dist/cjs/index.js",
-  "module": "dist/esm/index.js",
+  "main": "dist/index.js",
+  "module": "dist/index.js",
   "typesVersions": {
     "<5.4": {
       "*": [
@@ -39,54 +39,23 @@
   },
   "files": [
     "dist",
-    "helpers",
-    "migration.d.ts",
-    "migration.js",
-    "outdated-typescript.d.ts",
-    "readonly.d.ts",
-    "readonly.js"
+    "outdated-typescript.d.ts"
   ],
   "exports": {
     ".": {
       "types@<5.4": "./outdated-typescript.d.ts",
-      "import": "./dist/esm/index.js",
-      "require": "./dist/cjs/index.js",
-      "default": "./dist/cjs/index.js"
+      "default": "./dist/index.js"
     },
-    "./helpers/postgres": {
-      "import": "./dist/esm/helpers/postgres.js",
-      "require": "./dist/cjs/helpers/postgres.js",
-      "default": "./dist/cjs/helpers/postgres.js"
-    },
-    "./helpers/mysql": {
-      "import": "./dist/esm/helpers/mysql.js",
-      "require": "./dist/cjs/helpers/mysql.js",
-      "default": "./dist/cjs/helpers/mysql.js"
-    },
-    "./helpers/mssql": {
-      "import": "./dist/esm/helpers/mssql.js",
-      "require": "./dist/cjs/helpers/mssql.js",
-      "default": "./dist/cjs/helpers/mssql.js"
-    },
-    "./helpers/sqlite": {
-      "import": "./dist/esm/helpers/sqlite.js",
-      "require": "./dist/cjs/helpers/sqlite.js",
-      "default": "./dist/cjs/helpers/sqlite.js"
-    },
-    "./migration": {
-      "import": "./dist/esm/migration/index.js",
-      "require": "./dist/cjs/migration/index.js",
-      "default": "./dist/cjs/migration/index.js"
-    },
-    "./readonly": {
-      "import": "./dist/esm/readonly/index.js",
-      "require": "./dist/cjs/readonly/index.js",
-      "default": "./dist/cjs/readonly/index.js"
-    }
+    "./helpers/mssql": "./dist/helpers/mssql.js",
+    "./helpers/mysql": "./dist/helpers/mysql.js",
+    "./helpers/postgres": "./dist/helpers/postgres.js",
+    "./helpers/sqlite": "./dist/helpers/sqlite.js",
+    "./migration": "./dist/migration/index.js",
+    "./readonly": "./dist/readonly/index.js"
   },
   "sideEffects": false,
   "scripts": {
-    "clean": "rm -rf dist & rm -rf test/node/dist & rm -rf test/browser/bundle.js & rm -rf helpers",
+    "clean": "rm -rf dist & rm -rf test/node/dist & rm -rf test/browser/bundle.js",
     "bench:ts": "pnpm build && node --experimental-strip-types ./test/ts-benchmarks/index.ts",
     "test": "pnpm build && pnpm test:node:build && pnpm test:node:run && pnpm test:typings && pnpm test:esmimports && pnpm test:exports",
     "test:node:build": "tsc -p test/node",
@@ -99,16 +68,13 @@
     "test:deno": "deno run --allow-env --allow-read --allow-net --no-lock test/deno/local.test.ts && deno run --allow-env --allow-read --allow-net --no-lock test/deno/cdn.test.ts",
     "test:typings": "tsd test/typings",
     "test:esmimports": "node scripts/check-esm-imports.cjs",
-    "test:esbuild": "esbuild --bundle --platform=node --external:pg-native dist/esm/index.js --outfile=/dev/null",
+    "test:esbuild": "esbuild --bundle --platform=node --external:pg-native dist/index.js --outfile=/dev/null",
     "test:exports": "attw --pack . && node scripts/check-exports.cjs",
     "test:jsdocs": "deno check --doc-only --no-lock --unstable-sloppy-imports --config=\"deno.check.json\" ./src",
     "test:outdatedts": "pnpm build && cd test/outdated-ts && pnpm i && pnpm test",
     "lint:deno": "deno lint --config=\"deno.lint.json\" ./src",
     "prettier": "prettier --write 'src/**/*.ts' 'test/**/*.ts'",
-    "build": "pnpm clean && (pnpm build:esm & pnpm build:cjs) && pnpm script:module-fixup && pnpm script:copy-interface-doc",
-    "build:esm": "tsc -p tsconfig.json && pnpm script:add-deno-type-references",
-    "build:cjs": "tsc -p tsconfig-cjs.json",
-    "script:module-fixup": "node scripts/module-fixup.cjs",
+    "build": "pnpm clean && tsc && pnpm script:add-deno-type-references && pnpm script:copy-interface-doc",
     "script:copy-interface-doc": "node scripts/copy-interface-documentation.cjs",
     "script:add-deno-type-references": "node scripts/add-deno-type-references.cjs",
     "script:align-versions": "node --experimental-strip-types scripts/align-versions.mts",

scripts/add-deno-type-references.cjs

@@ -5,12 +5,12 @@
  */
 
 const fs = require('fs')
-const path = require('path')
+const path = require('pathe')
 const forEachFile = require('./util/for-each-file.cjs')
 
-const ESM_DIST_PATH = path.join(__dirname, '..', 'dist', 'esm')
+const DIST_PATH = path.join(__dirname, '..', 'dist')
 
-forEachFile(ESM_DIST_PATH, (filePath) => {
+forEachFile(DIST_PATH, (filePath) => {
   if (filePath.endsWith('.js')) {
     const dTsFile = path.basename(filePath).replace(/\.js$/, '.d.ts')
     const content = fs.readFileSync(filePath, { encoding: 'utf-8' })

scripts/copy-interface-documentation.cjs

@@ -27,31 +27,24 @@ const JSDOC_START_REGEX = /^\s+\/\*\*/
 const JSDOC_END_REGEX = /^\s+\*\//
 
 function main() {
-  for (const distSubDir of ['cjs', 'esm']) {
-    const subDirPath = path.join(DIST_PATH, distSubDir)
-    const files = []
+  const files = []
 
-    if (!fs.existsSync(subDirPath)) {
-      continue
-    }
-
-    forEachFile(subDirPath, (filePath) => {
-      if (filePath.endsWith('.d.ts')) {
-        const file = {
-          path: filePath,
-          lines: readLines(filePath),
-        }
+  forEachFile(DIST_PATH, (filePath) => {
+    if (filePath.endsWith('.d.ts')) {
+      const file = {
+        path: filePath,
+        lines: readLines(filePath),
+      }
 
-        file.objects = parseObjects(file)
+      file.objects = parseObjects(file)
 
-        if (file.objects.length > 0) {
-          files.push(file)
-        }
+      if (file.objects.length > 0) {
+        files.push(file)
       }
-    })
+    }
+  })
 
-    copyDocumentation(files)
-  }
+  copyDocumentation(files)
 }
 
 function readLines(filePath) {

scripts/generate-site-examples.cjs

@@ -10,7 +10,7 @@ const path = require('path')
 const forEachFile = require('./util/for-each-file.cjs')
 const _ = require('lodash')
 
-const ESM_PATH = path.join(__dirname, '..', 'dist', 'esm')
+const DIST_PATH = path.join(__dirname, '..', 'dist')
 const SITE_EXAMPLE_PATH = path.join(__dirname, '..', 'site', 'docs', 'examples')
 
 const SITE_EXAMPLE_START_REGEX = /<!--\s*siteExample\(/
@@ -98,7 +98,7 @@ const moreExamplesByCategory = {
 function main() {
   deleteAllExamples()
 
-  forEachFile(ESM_PATH, (filePath) => {
+  forEachFile(DIST_PATH, (filePath) => {
     if (!filePath.endsWith('.d.ts')) {
       return
     }

scripts/module-fixup.cjs

@@ -16,7 +16,7 @@ import {
   PostgresAdapter,
   PostgresIntrospector,
   PostgresQueryCompiler,
-} from 'https://cdn.jsdelivr.net/npm/kysely/dist/esm/index.js'
+} from 'https://cdn.jsdelivr.net/npm/kysely/dist/index.js'
 
 interface Person {
   id: Generated<number>

site/docs/runtimes/deno.mdx

@@ -1,11 +1,11 @@
 import {
   Kysely,
-  Generated,
+  type Generated,
   DummyDriver,
   SqliteAdapter,
   SqliteIntrospector,
   SqliteQueryCompiler,
-} from '../../dist/esm/index.js'
+} from '../../dist/index.js'
 
 interface Person {
   id: Generated<number>

test/browser/main.ts

@@ -1,6 +1,7 @@
 {
-    "extends": ["../../tsconfig-base.json"],
-    "compilerOptions": {
-        "rootDir": "."
-    }
+  "extends": ["../../tsconfig-base.json"],
+  "compilerOptions": {
+    "lib": ["es2023", "dom"],
+    "rootDir": "."
+  }
 }