kysely 0.18.1 → 0.19.2

package/dist/esm/index.js

@@ -1,12 +1,152 @@
 /// <reference types="./index.d.ts" />
-export * from './index-nodeless.js';
-export * from './migration/file-migration-provider.js';
+export * from './kysely.js';
+export * from './query-creator.js';
+export * from './query-builder/where-interface.js';
+export * from './query-builder/join-interface.js';
+export * from './query-builder/returning-interface.js';
+export * from './query-builder/having-interface.js';
+export * from './query-builder/select-query-builder.js';
+export * from './query-builder/insert-query-builder.js';
+export * from './query-builder/update-query-builder.js';
+export * from './query-builder/delete-query-builder.js';
+export * from './query-builder/no-result-error.js';
+export * from './query-builder/join-builder.js';
+export * from './query-builder/expression-builder.js';
+export * from './query-builder/function-builder.js';
+export * from './query-builder/insert-result.js';
+export * from './query-builder/delete-result.js';
+export * from './query-builder/update-result.js';
+export * from './query-builder/on-conflict-builder.js';
+export * from './raw-builder/raw-builder.js';
+export * from './raw-builder/sql.js';
+export * from './query-executor/query-executor.js';
+export * from './query-executor/default-query-executor.js';
+export * from './query-executor/noop-query-executor.js';
+export * from './query-executor/query-executor-provider.js';
+export * from './query-compiler/default-query-compiler.js';
+export * from './query-compiler/compiled-query.js';
+export * from './schema/schema.js';
+export * from './schema/create-table-builder.js';
+export * from './schema/drop-table-builder.js';
+export * from './schema/create-index-builder.js';
+export * from './schema/drop-index-builder.js';
+export * from './schema/create-schema-builder.js';
+export * from './schema/drop-schema-builder.js';
+export * from './schema/column-definition-builder.js';
+export * from './schema/foreign-key-constraint-builder.js';
+export * from './schema/alter-table-builder.js';
+export * from './schema/create-view-builder.js';
+export * from './schema/drop-view-builder.js';
+export * from './dynamic/dynamic.js';
+export * from './driver/driver.js';
+export * from './driver/database-connection.js';
+export * from './driver/connection-provider.js';
+export * from './driver/default-connection-provider.js';
+export * from './driver/single-connection-provider.js';
+export * from './driver/dummy-driver.js';
+export * from './dialect/dialect.js';
+export * from './dialect/dialect-adapter.js';
+export * from './dialect/dialect-adapter-base.js';
+export * from './dialect/database-introspector.js';
 export * from './dialect/sqlite/sqlite-dialect.js';
 export * from './dialect/sqlite/sqlite-dialect-config.js';
 export * from './dialect/sqlite/sqlite-driver.js';
+export * from './dialect/postgres/postgres-query-compiler.js';
+export * from './dialect/postgres/postgres-introspector.js';
+export * from './dialect/postgres/postgres-adapter.js';
 export * from './dialect/mysql/mysql-dialect.js';
 export * from './dialect/mysql/mysql-dialect-config.js';
 export * from './dialect/mysql/mysql-driver.js';
+export * from './dialect/mysql/mysql-query-compiler.js';
+export * from './dialect/mysql/mysql-introspector.js';
+export * from './dialect/mysql/mysql-adapter.js';
 export * from './dialect/postgres/postgres-driver.js';
 export * from './dialect/postgres/postgres-dialect-config.js';
 export * from './dialect/postgres/postgres-dialect.js';
+export * from './dialect/sqlite/sqlite-query-compiler.js';
+export * from './dialect/sqlite/sqlite-introspector.js';
+export * from './dialect/sqlite/sqlite-adapter.js';
+export * from './query-compiler/default-query-compiler.js';
+export * from './query-compiler/query-compiler.js';
+export * from './migration/migrator.js';
+export * from './migration/file-migration-provider.js';
+export * from './plugin/kysely-plugin.js';
+export * from './plugin/camel-case/camel-case-plugin.js';
+export * from './plugin/deduplicate-joins/deduplicate-joins-plugin.js';
+export * from './operation-node/add-column-node.js';
+export * from './operation-node/add-constraint-node.js';
+export * from './operation-node/alias-node.js';
+export * from './operation-node/alter-column-node.js';
+export * from './operation-node/alter-table-node.js';
+export * from './operation-node/and-node.js';
+export * from './operation-node/check-constraint-node.js';
+export * from './operation-node/column-definition-node.js';
+export * from './operation-node/column-node.js';
+export * from './operation-node/column-update-node.js';
+export * from './operation-node/common-table-expression-node.js';
+export * from './operation-node/common-table-expression-name-node.js';
+export * from './operation-node/constraint-node.js';
+export * from './operation-node/create-index-node.js';
+export * from './operation-node/create-schema-node.js';
+export * from './operation-node/create-table-node.js';
+export * from './operation-node/create-view-node.js';
+export * from './operation-node/data-type-node.js';
+export * from './operation-node/default-value-node.js';
+export * from './operation-node/delete-query-node.js';
+export * from './operation-node/drop-column-node.js';
+export * from './operation-node/drop-constraint-node.js';
+export * from './operation-node/drop-index-node.js';
+export * from './operation-node/drop-schema-node.js';
+export * from './operation-node/drop-table-node.js';
+export * from './operation-node/drop-view-node.js';
+export * from './operation-node/filter-node.js';
+export * from './operation-node/foreign-key-constraint-node.js';
+export * from './operation-node/from-node.js';
+export * from './operation-node/generated-node.js';
+export * from './operation-node/group-by-item-node.js';
+export * from './operation-node/group-by-node.js';
+export * from './operation-node/having-node.js';
+export * from './operation-node/identifier-node.js';
+export * from './operation-node/insert-query-node.js';
+export * from './operation-node/join-node.js';
+export * from './operation-node/limit-node.js';
+export * from './operation-node/list-node.js';
+export * from './operation-node/modify-column-node.js';
+export * from './operation-node/offset-node.js';
+export * from './operation-node/on-conflict-node.js';
+export * from './operation-node/on-duplicate-key-node.js';
+export * from './operation-node/on-node.js';
+export * from './operation-node/operation-node-source.js';
+export * from './operation-node/operation-node-transformer.js';
+export * from './operation-node/operation-node-utils.js';
+export * from './operation-node/operation-node-visitor.js';
+export * from './operation-node/operation-node.js';
+export * from './operation-node/operator-node.js';
+export * from './operation-node/or-node.js';
+export * from './operation-node/order-by-item-node.js';
+export * from './operation-node/order-by-node.js';
+export * from './operation-node/parens-node.js';
+export * from './operation-node/primary-constraint-node.js';
+export * from './operation-node/primitive-value-list-node.js';
+export * from './operation-node/query-node.js';
+export * from './operation-node/raw-node.js';
+export * from './operation-node/reference-node.js';
+export * from './operation-node/references-node.js';
+export * from './operation-node/rename-column-node.js';
+export * from './operation-node/returning-node.js';
+export * from './operation-node/select-all-node.js';
+export * from './operation-node/select-query-node.js';
+export * from './operation-node/select-query-node.js';
+export * from './operation-node/selection-node.js';
+export * from './operation-node/table-node.js';
+export * from './operation-node/union-node.js';
+export * from './operation-node/unique-constraint-node.js';
+export * from './operation-node/update-query-node.js';
+export * from './operation-node/value-list-node.js';
+export * from './operation-node/value-node.js';
+export * from './operation-node/values-node.js';
+export * from './operation-node/where-node.js';
+export * from './operation-node/with-node.js';
+export * from './util/column-type.js';
+export * from './util/compilable.js';
+export * from './util/log.js';

package/dist/esm/migration/file-migration-provider.d.ts

@@ -1,18 +1,23 @@
 import { Migration, MigrationProvider } from './migrator.js';
 /**
- * Reads all migrations from a folder.
+ * Reads all migrations from a folder in node.js.
  *
  * ### Examples
  *
  * ```ts
- * new FileMigrationProvider(
- *   'path/to/migrations/folder'
- * )
+ * import { promises as fs } from 'fs'
+ * import path from 'path'
+ *
+ * new FileMigrationProvider({
+ *   fs,
+ *   path,
+ *   migrationFolder: 'path/to/migrations/folder'
+ * })
  * ```
  */
 export declare class FileMigrationProvider implements MigrationProvider {
     #private;
-    constructor(migrationFolderPath: string);
+    constructor(props: FileMigrationProviderProps);
     /**
      * Returns all migrations, old and new.
      *
@@ -27,3 +32,14 @@ export declare class FileMigrationProvider implements MigrationProvider {
      */
     getMigrations(): Promise<Record<string, Migration>>;
 }
+export interface FileMigrationProviderFS {
+    readdir(path: string): Promise<string[]>;
+}
+export interface FileMigrationProviderPath {
+    join(...path: string[]): string;
+}
+export interface FileMigrationProviderProps {
+    fs: FileMigrationProviderFS;
+    path: FileMigrationProviderPath;
+    migrationFolder: string;
+}

package/dist/esm/migration/file-migration-provider.js

@@ -1,32 +1,33 @@
 /// <reference types="./file-migration-provider.d.ts" />
 import { isFunction, isObject } from '../util/object-utils.js';
 /**
- * Reads all migrations from a folder.
+ * Reads all migrations from a folder in node.js.
  *
  * ### Examples
  *
  * ```ts
- * new FileMigrationProvider(
- *   'path/to/migrations/folder'
- * )
+ * import { promises as fs } from 'fs'
+ * import path from 'path'
+ *
+ * new FileMigrationProvider({
+ *   fs,
+ *   path,
+ *   migrationFolder: 'path/to/migrations/folder'
+ * })
  * ```
  */
 export class FileMigrationProvider {
-    #migrationFolderPath;
-    constructor(migrationFolderPath) {
-        this.#migrationFolderPath = migrationFolderPath;
+    #props;
+    constructor(props) {
+        this.#props = props;
     }
     async getMigrations() {
-        // Import these dynamically so that we don't have any top level
-        // node dependencies.
-        const fs = await import('fs/promises');
-        const path = await import('path');
         const migrations = {};
-        const files = await fs.readdir(this.#migrationFolderPath);
+        const files = await this.#props.fs.readdir(this.#props.migrationFolder);
         for (const fileName of files) {
             if ((fileName.endsWith('.js') || fileName.endsWith('.ts')) &&
                 !fileName.endsWith('.d.ts')) {
-                const migration = await import(path.join(this.#migrationFolderPath, fileName));
+                const migration = await import(this.#props.path.join(this.#props.migrationFolder, fileName));
                 if (isMigration(migration)) {
                     migrations[fileName.substring(0, fileName.length - 3)] = migration;
                 }

package/dist/esm/migration/migrator.d.ts

@@ -188,6 +188,8 @@ export interface MigratorProps {
      * If you do specify this, ALWAYS ALWAYS use the same value from the beginning of
      * the project, to the end of time or prepare to manually migrate the migration
      * tables.
+     *
+     * This only works on postgres.
      */
     readonly migrationTableSchema?: string;
 }

package/dist/esm/plugin/noop-plugin.d.ts

@@ -1,6 +1,6 @@
 import { QueryResult } from '../driver/database-connection.js';
-import { UnknownRow } from '../index-nodeless.js';
 import { RootOperationNode } from '../query-compiler/query-compiler.js';
+import { UnknownRow } from '../util/type-utils.js';
 import { KyselyPlugin, PluginTransformQueryArgs, PluginTransformResultArgs } from './kysely-plugin.js';
 export declare class NoopPlugin implements KyselyPlugin {
     /**

package/dist/esm/schema/alter-table-builder.d.ts

@@ -25,12 +25,8 @@ export declare class AlterTableBuilder {
     renameColumn(column: string, newColumn: string): AlterTableExecutor;
     /**
      * See {@link CreateTableBuilder.addColumn}
-     *
-     * Unlike {@link CreateTableBuilder.addColumn} this method returns the column builder
-     * and doesn't take a callback as the last argument. This is because you can only
-     * add one column per `ALTER TABLE` query.
      */
-    addColumn(columnName: string, dataType: DataTypeExpression): AlterTableAddColumnBuilder;
+    addColumn(columnName: string, dataType: DataTypeExpression, build?: AlterTableAddColumnBuilderCallback): AlterTableAddColumnBuilder;
     /**
      * Creates an `alter table modify column` query. The `modify column` statement
      * is only implemeted by MySQL and oracle AFAIK. On other databases you
@@ -245,6 +241,7 @@ export declare class AlterTableAddColumnBuilder implements ColumnDefinitionBuild
 export interface AlterTableAddColumnBuilderProps extends AlterTableBuilderProps {
     readonly columnBuilder: ColumnDefinitionBuilder;
 }
+export declare type AlterTableAddColumnBuilderCallback = (builder: AlterTableAddColumnBuilder) => AlterTableAddColumnBuilder;
 export declare class AlterTableModifyColumnBuilder implements ColumnDefinitionBuilderInterface, OperationNodeSource, Compilable {
     #private;
     constructor(props: AlterTableModifyColumnBuilderProps);

package/dist/esm/schema/alter-table-builder.js

@@ -7,7 +7,7 @@ import { DataTypeNode, } from '../operation-node/data-type-node.js';
 import { DropColumnNode } from '../operation-node/drop-column-node.js';
 import { IdentifierNode } from '../operation-node/identifier-node.js';
 import { RenameColumnNode } from '../operation-node/rename-column-node.js';
-import { freeze } from '../util/object-utils.js';
+import { freeze, noop } from '../util/object-utils.js';
 import { preventAwait } from '../util/prevent-await.js';
 import { ColumnDefinitionBuilder, } from './column-definition-builder.js';
 import { ModifyColumnNode } from '../operation-node/modify-column-node.js';
@@ -68,16 +68,12 @@ export class AlterTableBuilder {
     }
     /**
      * See {@link CreateTableBuilder.addColumn}
-     *
-     * Unlike {@link CreateTableBuilder.addColumn} this method returns the column builder
-     * and doesn't take a callback as the last argument. This is because you can only
-     * add one column per `ALTER TABLE` query.
      */
-    addColumn(columnName, dataType) {
-        return new AlterTableAddColumnBuilder({
+    addColumn(columnName, dataType, build = noop) {
+        return build(new AlterTableAddColumnBuilder({
             ...this.#props,
             columnBuilder: new ColumnDefinitionBuilder(ColumnDefinitionNode.create(columnName, parseDataTypeExpression(dataType))),
-        });
+        }));
     }
     /**
      * Creates an `alter table modify column` query. The `modify column` statement

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kysely",
-  "version": "0.18.1",
+  "version": "0.19.2",
   "description": "Type safe SQL query builder",
   "repository": {
     "type": "git",
@@ -15,9 +15,7 @@
     ".": {
       "import": "./dist/esm/index.js",
       "require": "./dist/cjs/index.js"
-    },
-    "./dist/cjs/index-nodeless.js": "./dist/cjs/index-nodeless.js",
-    "./dist/esm/index-nodeless.js": "./dist/esm/index-nodeless.js"
+    }
   },
   "scripts": {
     "clean": "rm -rf dist && rm -rf test/node/dist && rm -rf test/browser/bundle.js",
@@ -43,9 +41,6 @@
   },
   "author": "Sami Koskimäki <sami@jakso.me>",
   "license": "MIT",
-  "dependencies": {
-    "@types/node": "^16.11.9"
-  },
   "devDependencies": {
     "@types/better-sqlite3": "^7.5.0",
     "@types/chai": "^4.3.1",

package/dist/cjs/index-nodeless.d.ts

@@ -1,152 +0,0 @@
-export * from './kysely.js';
-export * from './query-creator.js';
-export * from './query-builder/where-interface.js';
-export * from './query-builder/join-interface.js';
-export * from './query-builder/returning-interface.js';
-export * from './query-builder/having-interface.js';
-export * from './query-builder/select-query-builder.js';
-export * from './query-builder/insert-query-builder.js';
-export * from './query-builder/update-query-builder.js';
-export * from './query-builder/delete-query-builder.js';
-export * from './query-builder/no-result-error.js';
-export * from './query-builder/join-builder.js';
-export * from './query-builder/expression-builder.js';
-export * from './query-builder/function-builder.js';
-export * from './query-builder/insert-result.js';
-export * from './query-builder/delete-result.js';
-export * from './query-builder/update-result.js';
-export * from './query-builder/on-conflict-builder.js';
-export * from './raw-builder/raw-builder.js';
-export * from './raw-builder/sql.js';
-export * from './query-executor/query-executor.js';
-export * from './query-executor/default-query-executor.js';
-export * from './query-executor/noop-query-executor.js';
-export * from './query-executor/query-executor-provider.js';
-export * from './query-compiler/default-query-compiler.js';
-export * from './query-compiler/compiled-query.js';
-export * from './schema/schema.js';
-export * from './schema/create-table-builder.js';
-export * from './schema/drop-table-builder.js';
-export * from './schema/create-index-builder.js';
-export * from './schema/drop-index-builder.js';
-export * from './schema/create-schema-builder.js';
-export * from './schema/drop-schema-builder.js';
-export * from './schema/column-definition-builder.js';
-export * from './schema/foreign-key-constraint-builder.js';
-export * from './schema/alter-table-builder.js';
-export * from './schema/create-view-builder.js';
-export * from './schema/drop-view-builder.js';
-export * from './dynamic/dynamic.js';
-export * from './driver/driver.js';
-export * from './driver/database-connection.js';
-export * from './driver/connection-provider.js';
-export * from './driver/default-connection-provider.js';
-export * from './driver/single-connection-provider.js';
-export * from './driver/dummy-driver.js';
-export * from './dialect/dialect.js';
-export * from './dialect/dialect-adapter.js';
-export * from './dialect/dialect-adapter-base.js';
-export * from './dialect/database-introspector.js';
-export * from './dialect/postgres/postgres-query-compiler.js';
-export * from './dialect/postgres/postgres-introspector.js';
-export * from './dialect/postgres/postgres-adapter.js';
-export * from './dialect/mysql/mysql-query-compiler.js';
-export * from './dialect/mysql/mysql-introspector.js';
-export * from './dialect/mysql/mysql-adapter.js';
-export * from './dialect/sqlite/sqlite-query-compiler.js';
-export * from './dialect/sqlite/sqlite-introspector.js';
-export * from './dialect/sqlite/sqlite-adapter.js';
-export * from './query-compiler/default-query-compiler.js';
-export * from './query-compiler/query-compiler.js';
-export * from './migration/migrator.js';
-export * from './plugin/kysely-plugin.js';
-export * from './plugin/camel-case/camel-case-plugin.js';
-export * from './plugin/deduplicate-joins/deduplicate-joins-plugin.js';
-export * from './operation-node/add-column-node.js';
-export * from './operation-node/add-constraint-node.js';
-export * from './operation-node/alias-node.js';
-export * from './operation-node/alter-column-node.js';
-export * from './operation-node/alter-table-node.js';
-export * from './operation-node/and-node.js';
-export * from './operation-node/check-constraint-node.js';
-export * from './operation-node/column-definition-node.js';
-export * from './operation-node/column-node.js';
-export * from './operation-node/column-update-node.js';
-export * from './operation-node/common-table-expression-node.js';
-export * from './operation-node/common-table-expression-name-node.js';
-export * from './operation-node/constraint-node.js';
-export * from './operation-node/create-index-node.js';
-export * from './operation-node/create-schema-node.js';
-export * from './operation-node/create-table-node.js';
-export * from './operation-node/create-view-node.js';
-export * from './operation-node/data-type-node.js';
-export * from './operation-node/default-value-node.js';
-export * from './operation-node/delete-query-node.js';
-export * from './operation-node/drop-column-node.js';
-export * from './operation-node/drop-constraint-node.js';
-export * from './operation-node/drop-index-node.js';
-export * from './operation-node/drop-schema-node.js';
-export * from './operation-node/drop-table-node.js';
-export * from './operation-node/drop-view-node.js';
-export * from './operation-node/filter-node.js';
-export * from './operation-node/foreign-key-constraint-node.js';
-export * from './operation-node/from-node.js';
-export * from './operation-node/generated-node.js';
-export * from './operation-node/group-by-item-node.js';
-export * from './operation-node/group-by-node.js';
-export * from './operation-node/having-node.js';
-export * from './operation-node/identifier-node.js';
-export * from './operation-node/insert-query-node.js';
-export * from './operation-node/join-node.js';
-export * from './operation-node/limit-node.js';
-export * from './operation-node/list-node.js';
-export * from './operation-node/modify-column-node.js';
-export * from './operation-node/offset-node.js';
-export * from './operation-node/on-conflict-node.js';
-export * from './operation-node/on-duplicate-key-node.js';
-export * from './operation-node/on-node.js';
-export * from './operation-node/operation-node-source.js';
-export * from './operation-node/operation-node-transformer.js';
-export * from './operation-node/operation-node-utils.js';
-export * from './operation-node/operation-node-visitor.js';
-export * from './operation-node/operation-node.js';
-export * from './operation-node/operator-node.js';
-export * from './operation-node/or-node.js';
-export * from './operation-node/order-by-item-node.js';
-export * from './operation-node/order-by-node.js';
-export * from './operation-node/parens-node.js';
-export * from './operation-node/primary-constraint-node.js';
-export * from './operation-node/primitive-value-list-node.js';
-export * from './operation-node/query-node.js';
-export * from './operation-node/raw-node.js';
-export * from './operation-node/reference-node.js';
-export * from './operation-node/references-node.js';
-export * from './operation-node/rename-column-node.js';
-export * from './operation-node/returning-node.js';
-export * from './operation-node/select-all-node.js';
-export * from './operation-node/select-query-node.js';
-export * from './operation-node/select-query-node.js';
-export * from './operation-node/selection-node.js';
-export * from './operation-node/table-node.js';
-export * from './operation-node/union-node.js';
-export * from './operation-node/unique-constraint-node.js';
-export * from './operation-node/update-query-node.js';
-export * from './operation-node/value-list-node.js';
-export * from './operation-node/value-node.js';
-export * from './operation-node/values-node.js';
-export * from './operation-node/where-node.js';
-export * from './operation-node/with-node.js';
-export * from './util/column-type.js';
-export * from './util/compilable.js';
-export * from './util/log.js';
-export { AnyColumn, UnknownRow, AnySelectQueryBuilder, } from './util/type-utils.js';
-export { SelectExpression, SelectExpressionOrList, Selection, } from './parser/select-parser.js';
-export { ReferenceExpression, ReferenceExpressionOrList, } from './parser/reference-parser.js';
-export { ValueExpression, ValueExpressionOrList, } from './parser/value-parser.js';
-export { FilterValueExpression, FilterValueExpressionOrList, ExistsExpression, FilterOperator, } from './parser/filter-parser.js';
-export { TableExpression, TableExpressionOrList, } from './parser/table-parser.js';
-export { JoinReferenceExpression, JoinCallbackExpression, } from './parser/join-parser.js';
-export { InsertObject } from './parser/insert-values-parser.js';
-export { MutationObject } from './parser/update-set-parser.js';
-export { OrderByExpression, OrderByDirectionExpression, } from './parser/order-by-parser.js';
-export { UnionExpression } from './parser/union-parser.js';