kysely 0.26.3 → 0.27.0

package/dist/esm/util/type-utils.d.ts

@@ -33,19 +33,15 @@ import { KyselyTypeError } from './type-error.js';
  * // Columns == 'id' | 'name' | 'species'
  * ```
  */
-export type AnyColumn<DB, TB extends keyof DB> = [
-    DB
-] extends [unknown] ? {
+export type AnyColumn<DB, TB extends keyof DB> = {
     [T in TB]: keyof DB[T];
-}[TB] & string : never;
+}[TB] & string;
 /**
  * Extracts a column type.
  */
-export type ExtractColumnType<DB, TB extends keyof DB, C> = [
-    DB
-] extends [unknown] ? {
+export type ExtractColumnType<DB, TB extends keyof DB, C> = {
     [T in TB]: C extends keyof DB[T] ? DB[T][C] : never;
-}[TB] : never;
+}[TB];
 /**
  * Given a database type and a union of table names in that db, returns
  * a union type with all possible `table`.`column` combinations.
@@ -77,21 +73,17 @@ export type ExtractColumnType<DB, TB extends keyof DB, C> = [
  * // Columns == 'person.id' | 'pet.name' | 'pet.species'
  * ```
  */
-export type AnyColumnWithTable<DB, TB extends keyof DB> = DrainOuterGeneric<{
-    [T in TB]: T extends string ? keyof DB[T] extends string ? `${T}.${keyof DB[T]}` : never : never;
-}[TB]>;
+export type AnyColumnWithTable<DB, TB extends keyof DB> = {
+    [T in TB]: `${T & string}.${keyof DB[T] & string}`;
+}[TB];
 /**
  * Just like {@link AnyColumn} but with a ` as <string>` suffix.
  */
-export type AnyAliasedColumn<DB, TB extends keyof DB> = DrainOuterGeneric<{
-    [T in TB]: T extends string ? keyof DB[T] extends string ? `${keyof DB[T]} as ${string}` : never : never;
-}[TB]>;
+export type AnyAliasedColumn<DB, TB extends keyof DB> = `${AnyColumn<DB, TB>} as ${string}`;
 /**
  * Just like {@link AnyColumnWithTable} but with a ` as <string>` suffix.
  */
-export type AnyAliasedColumnWithTable<DB, TB extends keyof DB> = DrainOuterGeneric<{
-    [T in TB]: T extends string ? keyof DB[T] extends string ? `${T}.${keyof DB[T]} as ${string}` : never : never;
-}[TB]>;
+export type AnyAliasedColumnWithTable<DB, TB extends keyof DB> = `${AnyColumnWithTable<DB, TB>} as ${string}`;
 /**
  * Extracts the item type of an array.
  */
@@ -123,9 +115,25 @@ export type IsAny<T> = 0 extends T & 1 ? true : false;
  * Evaluates to `true` if the types `T` and `U` are equal.
  */
 export type Equals<T, U> = (<G>() => G extends T ? 1 : 2) extends <G>() => G extends U ? 1 : 2 ? true : false;
-export type NarrowPartial<S, T> = DrainOuterGeneric<T extends object ? {
-    [K in keyof S & string]: K extends keyof T ? T[K] extends S[K] ? T[K] : KyselyTypeError<`$narrowType() call failed: passed type does not exist in '${K}'s type union`> : S[K];
+export type NarrowPartial<O, T> = DrainOuterGeneric<T extends object ? {
+    [K in keyof O & string]: K extends keyof T ? T[K] extends NotNull ? Exclude<O[K], null> : T[K] extends O[K] ? T[K] : KyselyTypeError<`$narrowType() call failed: passed type does not exist in '${K}'s type union`> : O[K];
 } : never>;
+/**
+ * A type constant for marking a column as not null. Can be used with `$narrowPartial`.
+ *
+ * Example:
+ *
+ * ```ts
+ * const person = await db.selectFrom('person')
+ *   .where('nullable_column', 'is not', null)
+ *   .selectAll()
+ *   .$narrowType<{ nullable_column: NotNull }>()
+ *   .executeTakeFirstOrThrow()
+ * ```
+ */
+export type NotNull = {
+    readonly __notNull__: unique symbol;
+};
 export type SqlBool = boolean | 0 | 1;
 /**
  * Utility to reduce depth of TypeScript's internal type instantiation stack.

package/helpers/mssql.d.ts

@@ -0,0 +1 @@
+export * from '../dist/cjs/helpers/mssql.js'

package/helpers/mssql.js

@@ -0,0 +1 @@
+module.exports = require('../dist/cjs/helpers/mssql.js')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kysely",
-  "version": "0.26.3",
+  "version": "0.27.0",
   "description": "Type safe SQL query builder",
   "repository": {
     "type": "git",
@@ -27,6 +27,11 @@
       "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",
@@ -37,10 +42,11 @@
     "clean": "rm -rf dist & rm -rf test/node/dist & rm -rf test/browser/bundle.js & rm -rf helpers",
     "test": "npm run build && npm run test:node:build && concurrently -n node,typings,esmimports \"npm run test:node\" \"npm run test:typings\" \"npm run test:esmimports\"",
     "test:node:build": "tsc -p test/node",
-    "test:node": "concurrently -n postgres,mysql,sqlite \"npm run test:node:postgres\" \"npm run test:node:mysql\" \"npm run test:node:sqlite\"",
-    "test:node:postgres": "DIALECT=postgres npm run test:node:run",
-    "test:node:mysql": "DIALECT=mysql npm run test:node:run",
-    "test:node:sqlite": "DIALECT=sqlite npm run test:node:run",
+    "test:node": "concurrently -n postgres,mysql,mssql,sqlite \"npm run test:node:postgres\" \"npm run test:node:mysql\" \"npm run test:node:mssql\" \"npm run test:node:sqlite\"",
+    "test:node:postgres": "cross-env DIALECT=postgres npm run test:node:run",
+    "test:node:mysql": "cross-env DIALECT=mysql npm run test:node:run",
+    "test:node:mssql": "cross-env DIALECT=mssql npm run test:node:run",
+    "test:node:sqlite": "cross-env DIALECT=sqlite npm run test:node:run",
     "test:node:run": "mocha --reporter min --timeout 15000 test/node/dist/**/*.test.js",
     "test:browser:build": "rm -rf test/browser/bundle.js && esbuild test/browser/main.ts --bundle --outfile=test/browser/bundle.js",
     "test:browser": "npm run build && npm run test:browser:build && node test/browser/test.js",
@@ -63,6 +69,7 @@
   "author": "Sami Koskimäki <sami@jakso.me>",
   "license": "MIT",
   "contributors": [
+    "Sami Koskimäki <sami@jakso.me>",
     "Igal Klebanov <igalklebanov@gmail.com>"
   ],
   "devDependencies": {
@@ -75,11 +82,13 @@
     "@types/pg": "^8.10.2",
     "@types/pg-cursor": "^2.7.0",
     "@types/sinon": "^10.0.15",
+    "@types/tedious": "^4.0.9",
     "better-sqlite3": "^8.4.0",
     "chai": "^4.3.7",
     "chai-as-promised": "^7.1.1",
     "chai-subset": "^1.6.0",
     "concurrently": "^8.1.0",
+    "cross-env": "^7.0.3",
     "esbuild": "^0.17.19",
     "mocha": "^10.2.0",
     "mysql2": "^3.3.3",
@@ -88,7 +97,9 @@
     "playwright": "^1.34.3",
     "prettier": "^2.8.8",
     "sinon": "^15.1.0",
+    "tarn": "^3.0.2",
+    "tedious": "^16.4.0",
     "tsd": "^0.28.1",
-    "typescript": "^5.1.6"
+    "typescript": "^5.2.2"
   }
 }