kysely 0.22.0 → 0.23.1

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

@@ -7,7 +7,7 @@ import { ColumnDefinitionBuilder } from './column-definition-builder.js';
 import { QueryId } from '../util/query-id.js';
 import { ForeignKeyConstraintBuilder } from './foreign-key-constraint-builder.js';
 import { DataTypeExpression } from '../parser/data-type-parser.js';
-import { AnyRawBuilder } from '../util/type-utils.js';
+import { Expression } from '../expression/expression.js';
 /**
  * This builder can be used to create a `create table` query.
  */
@@ -118,7 +118,7 @@ export declare class CreateTableBuilder<TB extends string, C extends string = ne
      * addCheckConstraint('check_legs', sql`number_of_legs < 5`)
      * ```
      */
-    addCheckConstraint(constraintName: string, checkExpression: AnyRawBuilder): CreateTableBuilder<TB, C>;
+    addCheckConstraint(constraintName: string, checkExpression: Expression<any>): CreateTableBuilder<TB, C>;
     /**
      * Adds a foreign key constraint.
      *
@@ -159,7 +159,7 @@ export declare class CreateTableBuilder<TB extends string, C extends string = ne
      * ```ts
      * db.schema.createTable('person')
      *   .modifyFront(sql`global temporary`)
-     *   .addColumn('id', 'integer', col => col => primaryKey())
+     *   .addColumn('id', 'integer', col => col.primaryKey())
      *   .addColumn('first_name', 'varchar(64)', col => col.notNull())
      *   .addColumn('last_name', 'varchar(64), col => col.notNull())
      *   .execute()
@@ -175,7 +175,7 @@ export declare class CreateTableBuilder<TB extends string, C extends string = ne
      * )
      * ```
      */
-    modifyFront(modifier: AnyRawBuilder): CreateTableBuilder<TB, C>;
+    modifyFront(modifier: Expression<any>): CreateTableBuilder<TB, C>;
     /**
      * This can be used to add any additional SQL to the end of the query.
      *
@@ -202,7 +202,40 @@ export declare class CreateTableBuilder<TB extends string, C extends string = ne
      * ) collate utf8_unicode_ci
      * ```
      */
-    modifyEnd(modifier: AnyRawBuilder): CreateTableBuilder<TB, C>;
+    modifyEnd(modifier: Expression<any>): CreateTableBuilder<TB, C>;
+    /**
+     * Calls the given function passing `this` as the only argument.
+     *
+     * ### Examples
+     *
+     * ```ts
+     * db.schema
+     *   .createTable('test')
+     *   .call((builder) => builder.addColumn('id', 'integer'))
+     *   .execute()
+     * ```
+     *
+     * ```ts
+     * const addDefaultColumns = <T extends string, C extends string = never>(
+     *   builder: CreateTableBuilder<T, C>
+     * ) => {
+     *   return builder
+     *     .addColumn('id', 'integer', (col) => col.notNull())
+     *     .addColumn('created_at', 'date', (col) =>
+     *       col.notNull().defaultTo(sql`now()`)
+     *     )
+     *     .addColumn('updated_at', 'date', (col) =>
+     *       col.notNull().defaultTo(sql`now()`)
+     *     )
+     * }
+     *
+     * db.schema
+     *   .createTable('test')
+     *   .call(addDefaultColumns)
+     *   .execute()
+     * ```
+     */
+    call<T>(func: (qb: this) => T): T;
     toOperationNode(): CreateTableNode;
     compile(): CompiledQuery;
     execute(): Promise<void>;
@@ -210,7 +243,7 @@ export declare class CreateTableBuilder<TB extends string, C extends string = ne
 export interface CreateTableBuilderProps {
     readonly queryId: QueryId;
     readonly executor: QueryExecutor;
-    readonly createTableNode: CreateTableNode;
+    readonly node: CreateTableNode;
 }
 export declare type ColumnBuilderCallback = (builder: ColumnDefinitionBuilder) => ColumnDefinitionBuilder;
 export declare type ForeignKeyConstraintBuilderCallback = (builder: ForeignKeyConstraintBuilder) => ForeignKeyConstraintBuilder;

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

@@ -29,7 +29,7 @@ export class CreateTableBuilder {
     temporary() {
         return new CreateTableBuilder({
             ...this.#props,
-            createTableNode: CreateTableNode.cloneWith(this.#props.createTableNode, {
+            node: CreateTableNode.cloneWith(this.#props.node, {
                 temporary: true,
             }),
         });
@@ -43,7 +43,7 @@ export class CreateTableBuilder {
     onCommit(onCommit) {
         return new CreateTableBuilder({
             ...this.#props,
-            createTableNode: CreateTableNode.cloneWith(this.#props.createTableNode, {
+            node: CreateTableNode.cloneWith(this.#props.node, {
                 onCommit: parseOnCommitAction(onCommit),
             }),
         });
@@ -56,7 +56,7 @@ export class CreateTableBuilder {
     ifNotExists() {
         return new CreateTableBuilder({
             ...this.#props,
-            createTableNode: CreateTableNode.cloneWith(this.#props.createTableNode, {
+            node: CreateTableNode.cloneWith(this.#props.node, {
                 ifNotExists: true,
             }),
         });
@@ -109,7 +109,7 @@ export class CreateTableBuilder {
         const columnBuilder = build(new ColumnDefinitionBuilder(ColumnDefinitionNode.create(columnName, parseDataTypeExpression(dataType))));
         return new CreateTableBuilder({
             ...this.#props,
-            createTableNode: CreateTableNode.cloneWithColumn(this.#props.createTableNode, columnBuilder.toOperationNode()),
+            node: CreateTableNode.cloneWithColumn(this.#props.node, columnBuilder.toOperationNode()),
         });
     }
     /**
@@ -127,7 +127,7 @@ export class CreateTableBuilder {
     addPrimaryKeyConstraint(constraintName, columns) {
         return new CreateTableBuilder({
             ...this.#props,
-            createTableNode: CreateTableNode.cloneWithConstraint(this.#props.createTableNode, PrimaryConstraintNode.create(columns, constraintName)),
+            node: CreateTableNode.cloneWithConstraint(this.#props.node, PrimaryConstraintNode.create(columns, constraintName)),
         });
     }
     /**
@@ -145,7 +145,7 @@ export class CreateTableBuilder {
     addUniqueConstraint(constraintName, columns) {
         return new CreateTableBuilder({
             ...this.#props,
-            createTableNode: CreateTableNode.cloneWithConstraint(this.#props.createTableNode, UniqueConstraintNode.create(columns, constraintName)),
+            node: CreateTableNode.cloneWithConstraint(this.#props.node, UniqueConstraintNode.create(columns, constraintName)),
         });
     }
     /**
@@ -165,7 +165,7 @@ export class CreateTableBuilder {
     addCheckConstraint(constraintName, checkExpression) {
         return new CreateTableBuilder({
             ...this.#props,
-            createTableNode: CreateTableNode.cloneWithConstraint(this.#props.createTableNode, CheckConstraintNode.create(checkExpression.toOperationNode(), constraintName)),
+            node: CreateTableNode.cloneWithConstraint(this.#props.node, CheckConstraintNode.create(checkExpression.toOperationNode(), constraintName)),
         });
     }
     /**
@@ -201,7 +201,7 @@ export class CreateTableBuilder {
         const builder = build(new ForeignKeyConstraintBuilder(ForeignKeyConstraintNode.create(columns.map(ColumnNode.create), parseTable(targetTable), targetColumns.map(ColumnNode.create), constraintName)));
         return new CreateTableBuilder({
             ...this.#props,
-            createTableNode: CreateTableNode.cloneWithConstraint(this.#props.createTableNode, builder.toOperationNode()),
+            node: CreateTableNode.cloneWithConstraint(this.#props.node, builder.toOperationNode()),
         });
     }
     /**
@@ -214,7 +214,7 @@ export class CreateTableBuilder {
      * ```ts
      * db.schema.createTable('person')
      *   .modifyFront(sql`global temporary`)
-     *   .addColumn('id', 'integer', col => col => primaryKey())
+     *   .addColumn('id', 'integer', col => col.primaryKey())
      *   .addColumn('first_name', 'varchar(64)', col => col.notNull())
      *   .addColumn('last_name', 'varchar(64), col => col.notNull())
      *   .execute()
@@ -233,7 +233,7 @@ export class CreateTableBuilder {
     modifyFront(modifier) {
         return new CreateTableBuilder({
             ...this.#props,
-            createTableNode: CreateTableNode.cloneWithFrontModifier(this.#props.createTableNode, modifier.toOperationNode()),
+            node: CreateTableNode.cloneWithFrontModifier(this.#props.node, modifier.toOperationNode()),
         });
     }
     /**
@@ -265,11 +265,46 @@ export class CreateTableBuilder {
     modifyEnd(modifier) {
         return new CreateTableBuilder({
             ...this.#props,
-            createTableNode: CreateTableNode.cloneWithEndModifier(this.#props.createTableNode, modifier.toOperationNode()),
+            node: CreateTableNode.cloneWithEndModifier(this.#props.node, modifier.toOperationNode()),
         });
     }
+    /**
+     * Calls the given function passing `this` as the only argument.
+     *
+     * ### Examples
+     *
+     * ```ts
+     * db.schema
+     *   .createTable('test')
+     *   .call((builder) => builder.addColumn('id', 'integer'))
+     *   .execute()
+     * ```
+     *
+     * ```ts
+     * const addDefaultColumns = <T extends string, C extends string = never>(
+     *   builder: CreateTableBuilder<T, C>
+     * ) => {
+     *   return builder
+     *     .addColumn('id', 'integer', (col) => col.notNull())
+     *     .addColumn('created_at', 'date', (col) =>
+     *       col.notNull().defaultTo(sql`now()`)
+     *     )
+     *     .addColumn('updated_at', 'date', (col) =>
+     *       col.notNull().defaultTo(sql`now()`)
+     *     )
+     * }
+     *
+     * db.schema
+     *   .createTable('test')
+     *   .call(addDefaultColumns)
+     *   .execute()
+     * ```
+     */
+    call(func) {
+        return func(this);
+    }
     toOperationNode() {
-        return this.#props.executor.transformQuery(this.#props.createTableNode, this.#props.queryId);
+        return this.#props.executor.transformQuery(this.#props.node, this.#props.queryId);
     }
     compile() {
         return this.#props.executor.compileQuery(this.toOperationNode(), this.#props.queryId);

package/dist/esm/schema/create-type-builder.d.ts

@@ -24,5 +24,5 @@ export declare class CreateTypeBuilder implements OperationNodeSource, Compilabl
 export interface CreateTypeBuilderProps {
     readonly queryId: QueryId;
     readonly executor: QueryExecutor;
-    readonly createTypeNode: CreateTypeNode;
+    readonly node: CreateTypeNode;
 }

package/dist/esm/schema/create-type-builder.js

@@ -8,7 +8,7 @@ export class CreateTypeBuilder {
         this.#props = freeze(props);
     }
     toOperationNode() {
-        return this.#props.executor.transformQuery(this.#props.createTypeNode, this.#props.queryId);
+        return this.#props.executor.transformQuery(this.#props.node, this.#props.queryId);
     }
     /**
      * Creates an anum type.
@@ -22,7 +22,7 @@ export class CreateTypeBuilder {
     asEnum(values) {
         return new CreateTypeBuilder({
             ...this.#props,
-            createTypeNode: CreateTypeNode.cloneWithEnum(this.#props.createTypeNode, values),
+            node: CreateTypeNode.cloneWithEnum(this.#props.node, values),
         });
     }
     compile() {

package/dist/esm/schema/create-view-builder.d.ts

@@ -4,7 +4,8 @@ import { Compilable } from '../util/compilable.js';
 import { QueryExecutor } from '../query-executor/query-executor.js';
 import { QueryId } from '../util/query-id.js';
 import { CreateViewNode } from '../operation-node/create-view-node.js';
-import { AnyRawBuilder, AnySelectQueryBuilder } from '../util/type-utils.js';
+import { AnySelectQueryBuilder } from '../util/type-utils.js';
+import { RawBuilder } from '../raw-builder/raw-builder.js';
 export declare class CreateViewBuilder implements OperationNodeSource, Compilable {
     #private;
     constructor(props: CreateViewBuilderProps);
@@ -30,7 +31,7 @@ export declare class CreateViewBuilder implements OperationNodeSource, Compilabl
      * string opening an SQL injection vulnerability. DO NOT pass unchecked user input
      * into the query or raw expression passed to this method!
      */
-    as(query: AnySelectQueryBuilder | AnyRawBuilder): CreateViewBuilder;
+    as(query: AnySelectQueryBuilder | RawBuilder<any>): CreateViewBuilder;
     toOperationNode(): CreateViewNode;
     compile(): CompiledQuery;
     execute(): Promise<void>;
@@ -38,5 +39,5 @@ export declare class CreateViewBuilder implements OperationNodeSource, Compilabl
 export interface CreateViewBuilderProps {
     readonly queryId: QueryId;
     readonly executor: QueryExecutor;
-    readonly createViewNode: CreateViewNode;
+    readonly node: CreateViewNode;
 }

package/dist/esm/schema/create-view-builder.js

@@ -17,7 +17,7 @@ export class CreateViewBuilder {
     temporary() {
         return new CreateViewBuilder({
             ...this.#props,
-            createViewNode: CreateViewNode.cloneWith(this.#props.createViewNode, {
+            node: CreateViewNode.cloneWith(this.#props.node, {
                 temporary: true,
             }),
         });
@@ -25,7 +25,7 @@ export class CreateViewBuilder {
     materialized() {
         return new CreateViewBuilder({
             ...this.#props,
-            createViewNode: CreateViewNode.cloneWith(this.#props.createViewNode, {
+            node: CreateViewNode.cloneWith(this.#props.node, {
                 materialized: true,
             }),
         });
@@ -36,7 +36,7 @@ export class CreateViewBuilder {
     ifNotExists() {
         return new CreateViewBuilder({
             ...this.#props,
-            createViewNode: CreateViewNode.cloneWith(this.#props.createViewNode, {
+            node: CreateViewNode.cloneWith(this.#props.node, {
                 ifNotExists: true,
             }),
         });
@@ -44,7 +44,7 @@ export class CreateViewBuilder {
     orReplace() {
         return new CreateViewBuilder({
             ...this.#props,
-            createViewNode: CreateViewNode.cloneWith(this.#props.createViewNode, {
+            node: CreateViewNode.cloneWith(this.#props.node, {
                 orReplace: true,
             }),
         });
@@ -52,7 +52,7 @@ export class CreateViewBuilder {
     columns(columns) {
         return new CreateViewBuilder({
             ...this.#props,
-            createViewNode: CreateViewNode.cloneWith(this.#props.createViewNode, {
+            node: CreateViewNode.cloneWith(this.#props.node, {
                 columns: columns.map(parseColumnName),
             }),
         });
@@ -72,13 +72,13 @@ export class CreateViewBuilder {
             .toOperationNode();
         return new CreateViewBuilder({
             ...this.#props,
-            createViewNode: CreateViewNode.cloneWith(this.#props.createViewNode, {
+            node: CreateViewNode.cloneWith(this.#props.node, {
                 as: queryNode,
             }),
         });
     }
     toOperationNode() {
-        return this.#props.executor.transformQuery(this.#props.createViewNode, this.#props.queryId);
+        return this.#props.executor.transformQuery(this.#props.node, this.#props.queryId);
     }
     compile() {
         return this.#props.executor.compileQuery(this.toOperationNode(), this.#props.queryId);

package/dist/esm/schema/drop-index-builder.d.ts

@@ -21,5 +21,5 @@ export declare class DropIndexBuilder implements OperationNodeSource, Compilable
 export interface DropIndexBuilderProps {
     readonly queryId: QueryId;
     readonly executor: QueryExecutor;
-    readonly dropIndexNode: DropIndexNode;
+    readonly node: DropIndexNode;
 }

package/dist/esm/schema/drop-index-builder.js

@@ -15,7 +15,7 @@ export class DropIndexBuilder {
     on(table) {
         return new DropIndexBuilder({
             ...this.#props,
-            dropIndexNode: DropIndexNode.cloneWith(this.#props.dropIndexNode, {
+            node: DropIndexNode.cloneWith(this.#props.node, {
                 table: parseTable(table),
             }),
         });
@@ -23,7 +23,7 @@ export class DropIndexBuilder {
     ifExists() {
         return new DropIndexBuilder({
             ...this.#props,
-            dropIndexNode: DropIndexNode.cloneWith(this.#props.dropIndexNode, {
+            node: DropIndexNode.cloneWith(this.#props.node, {
                 ifExists: true,
             }),
         });
@@ -31,13 +31,13 @@ export class DropIndexBuilder {
     cascade() {
         return new DropIndexBuilder({
             ...this.#props,
-            dropIndexNode: DropIndexNode.cloneWith(this.#props.dropIndexNode, {
+            node: DropIndexNode.cloneWith(this.#props.node, {
                 cascade: true,
             }),
         });
     }
     toOperationNode() {
-        return this.#props.executor.transformQuery(this.#props.dropIndexNode, this.#props.queryId);
+        return this.#props.executor.transformQuery(this.#props.node, this.#props.queryId);
     }
     compile() {
         return this.#props.executor.compileQuery(this.toOperationNode(), this.#props.queryId);

package/dist/esm/schema/drop-schema-builder.d.ts

@@ -16,5 +16,5 @@ export declare class DropSchemaBuilder implements OperationNodeSource, Compilabl
 export interface DropSchemaBuilderProps {
     readonly queryId: QueryId;
     readonly executor: QueryExecutor;
-    readonly dropSchemaNode: DropSchemaNode;
+    readonly node: DropSchemaNode;
 }

package/dist/esm/schema/drop-schema-builder.js

@@ -10,7 +10,7 @@ export class DropSchemaBuilder {
     ifExists() {
         return new DropSchemaBuilder({
             ...this.#props,
-            dropSchemaNode: DropSchemaNode.cloneWith(this.#props.dropSchemaNode, {
+            node: DropSchemaNode.cloneWith(this.#props.node, {
                 ifExists: true,
             }),
         });
@@ -18,13 +18,13 @@ export class DropSchemaBuilder {
     cascade() {
         return new DropSchemaBuilder({
             ...this.#props,
-            dropSchemaNode: DropSchemaNode.cloneWith(this.#props.dropSchemaNode, {
+            node: DropSchemaNode.cloneWith(this.#props.node, {
                 cascade: true,
             }),
         });
     }
     toOperationNode() {
-        return this.#props.executor.transformQuery(this.#props.dropSchemaNode, this.#props.queryId);
+        return this.#props.executor.transformQuery(this.#props.node, this.#props.queryId);
     }
     compile() {
         return this.#props.executor.compileQuery(this.toOperationNode(), this.#props.queryId);

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

@@ -16,5 +16,5 @@ export declare class DropTableBuilder implements OperationNodeSource, Compilable
 export interface DropTableBuilderProps {
     readonly queryId: QueryId;
     readonly executor: QueryExecutor;
-    readonly dropTableNode: DropTableNode;
+    readonly node: DropTableNode;
 }

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

@@ -10,7 +10,7 @@ export class DropTableBuilder {
     ifExists() {
         return new DropTableBuilder({
             ...this.#props,
-            dropTableNode: DropTableNode.cloneWith(this.#props.dropTableNode, {
+            node: DropTableNode.cloneWith(this.#props.node, {
                 ifExists: true,
             }),
         });
@@ -18,13 +18,13 @@ export class DropTableBuilder {
     cascade() {
         return new DropTableBuilder({
             ...this.#props,
-            dropTableNode: DropTableNode.cloneWith(this.#props.dropTableNode, {
+            node: DropTableNode.cloneWith(this.#props.node, {
                 cascade: true,
             }),
         });
     }
     toOperationNode() {
-        return this.#props.executor.transformQuery(this.#props.dropTableNode, this.#props.queryId);
+        return this.#props.executor.transformQuery(this.#props.node, this.#props.queryId);
     }
     compile() {
         return this.#props.executor.compileQuery(this.toOperationNode(), this.#props.queryId);

package/dist/esm/schema/drop-type-builder.d.ts

@@ -15,5 +15,5 @@ export declare class DropTypeBuilder implements OperationNodeSource, Compilable
 export interface DropTypeBuilderProps {
     readonly queryId: QueryId;
     readonly executor: QueryExecutor;
-    readonly dropTypeNode: DropTypeNode;
+    readonly node: DropTypeNode;
 }

package/dist/esm/schema/drop-type-builder.js

@@ -10,13 +10,13 @@ export class DropTypeBuilder {
     ifExists() {
         return new DropTypeBuilder({
             ...this.#props,
-            dropTypeNode: DropTypeNode.cloneWith(this.#props.dropTypeNode, {
+            node: DropTypeNode.cloneWith(this.#props.node, {
                 ifExists: true,
             }),
         });
     }
     toOperationNode() {
-        return this.#props.executor.transformQuery(this.#props.dropTypeNode, this.#props.queryId);
+        return this.#props.executor.transformQuery(this.#props.node, this.#props.queryId);
     }
     compile() {
         return this.#props.executor.compileQuery(this.toOperationNode(), this.#props.queryId);

package/dist/esm/schema/drop-view-builder.d.ts

@@ -17,5 +17,5 @@ export declare class DropViewBuilder implements OperationNodeSource, Compilable
 export interface DropViewBuilderProps {
     readonly queryId: QueryId;
     readonly executor: QueryExecutor;
-    readonly dropViewNode: DropViewNode;
+    readonly node: DropViewNode;
 }

package/dist/esm/schema/drop-view-builder.js

@@ -10,7 +10,7 @@ export class DropViewBuilder {
     materialized() {
         return new DropViewBuilder({
             ...this.#props,
-            dropViewNode: DropViewNode.cloneWith(this.#props.dropViewNode, {
+            node: DropViewNode.cloneWith(this.#props.node, {
                 materialized: true,
             }),
         });
@@ -18,7 +18,7 @@ export class DropViewBuilder {
     ifExists() {
         return new DropViewBuilder({
             ...this.#props,
-            dropViewNode: DropViewNode.cloneWith(this.#props.dropViewNode, {
+            node: DropViewNode.cloneWith(this.#props.node, {
                 ifExists: true,
             }),
         });
@@ -26,13 +26,13 @@ export class DropViewBuilder {
     cascade() {
         return new DropViewBuilder({
             ...this.#props,
-            dropViewNode: DropViewNode.cloneWith(this.#props.dropViewNode, {
+            node: DropViewNode.cloneWith(this.#props.node, {
                 cascade: true,
             }),
         });
     }
     toOperationNode() {
-        return this.#props.executor.transformQuery(this.#props.dropViewNode, this.#props.queryId);
+        return this.#props.executor.transformQuery(this.#props.node, this.#props.queryId);
     }
     compile() {
         return this.#props.executor.compileQuery(this.toOperationNode(), this.#props.queryId);

package/dist/esm/schema/schema.d.ts

@@ -186,7 +186,7 @@ export declare class SchemaModule {
      *   .execute()
      * ```
      */
-    createType(viewName: string): CreateTypeBuilder;
+    createType(typeName: string): CreateTypeBuilder;
     /**
      * Drop a type.
      *
@@ -201,7 +201,7 @@ export declare class SchemaModule {
      *   .execute()
      * ```
      */
-    dropType(viewName: string): DropTypeBuilder;
+    dropType(typeName: string): DropTypeBuilder;
     /**
      * Returns a copy of this schema module with the given plugin installed.
      */

package/dist/esm/schema/schema.js

@@ -24,6 +24,7 @@ import { CreateTypeBuilder } from './create-type-builder.js';
 import { DropTypeBuilder } from './drop-type-builder.js';
 import { CreateTypeNode } from '../operation-node/create-type-node.js';
 import { DropTypeNode } from '../operation-node/drop-type-node.js';
+import { parseSchemableIdentifier } from '../parser/identifier-parser.js';
 /**
  * Provides methods for building database schema.
  */
@@ -87,7 +88,7 @@ export class SchemaModule {
         return new CreateTableBuilder({
             queryId: createQueryId(),
             executor: this.#executor,
-            createTableNode: CreateTableNode.create(parseTable(table)),
+            node: CreateTableNode.create(parseTable(table)),
         });
     }
     /**
@@ -105,7 +106,7 @@ export class SchemaModule {
         return new DropTableBuilder({
             queryId: createQueryId(),
             executor: this.#executor,
-            dropTableNode: DropTableNode.create(parseTable(table)),
+            node: DropTableNode.create(parseTable(table)),
         });
     }
     /**
@@ -125,7 +126,7 @@ export class SchemaModule {
         return new CreateIndexBuilder({
             queryId: createQueryId(),
             executor: this.#executor,
-            createIndexNode: CreateIndexNode.create(indexName),
+            node: CreateIndexNode.create(indexName),
         });
     }
     /**
@@ -143,7 +144,7 @@ export class SchemaModule {
         return new DropIndexBuilder({
             queryId: createQueryId(),
             executor: this.#executor,
-            dropIndexNode: DropIndexNode.create(indexName),
+            node: DropIndexNode.create(indexName),
         });
     }
     /**
@@ -161,7 +162,7 @@ export class SchemaModule {
         return new CreateSchemaBuilder({
             queryId: createQueryId(),
             executor: this.#executor,
-            createSchemaNode: CreateSchemaNode.create(schema),
+            node: CreateSchemaNode.create(schema),
         });
     }
     /**
@@ -179,7 +180,7 @@ export class SchemaModule {
         return new DropSchemaBuilder({
             queryId: createQueryId(),
             executor: this.#executor,
-            dropSchemaNode: DropSchemaNode.create(schema),
+            node: DropSchemaNode.create(schema),
         });
     }
     /**
@@ -199,7 +200,7 @@ export class SchemaModule {
         return new AlterTableBuilder({
             queryId: createQueryId(),
             executor: this.#executor,
-            alterTableNode: AlterTableNode.create(table),
+            node: AlterTableNode.create(table),
         });
     }
     /**
@@ -219,7 +220,7 @@ export class SchemaModule {
         return new CreateViewBuilder({
             queryId: createQueryId(),
             executor: this.#executor,
-            createViewNode: CreateViewNode.create(viewName),
+            node: CreateViewNode.create(viewName),
         });
     }
     /**
@@ -238,7 +239,7 @@ export class SchemaModule {
         return new DropViewBuilder({
             queryId: createQueryId(),
             executor: this.#executor,
-            dropViewNode: DropViewNode.create(viewName),
+            node: DropViewNode.create(viewName),
         });
     }
     /**
@@ -255,11 +256,11 @@ export class SchemaModule {
      *   .execute()
      * ```
      */
-    createType(viewName) {
+    createType(typeName) {
         return new CreateTypeBuilder({
             queryId: createQueryId(),
             executor: this.#executor,
-            createTypeNode: CreateTypeNode.create(viewName),
+            node: CreateTypeNode.create(parseSchemableIdentifier(typeName)),
         });
     }
     /**
@@ -276,11 +277,11 @@ export class SchemaModule {
      *   .execute()
      * ```
      */
-    dropType(viewName) {
+    dropType(typeName) {
         return new DropTypeBuilder({
             queryId: createQueryId(),
             executor: this.#executor,
-            dropTypeNode: DropTypeNode.create(viewName),
+            node: DropTypeNode.create(parseSchemableIdentifier(typeName)),
         });
     }
     /**

package/dist/esm/util/compilable.d.ts

@@ -1,4 +1,4 @@
 import { CompiledQuery } from '../query-compiler/compiled-query.js';
-export interface Compilable {
-    compile(): CompiledQuery;
+export interface Compilable<O = unknown> {
+    compile(): CompiledQuery<O>;
 }

package/dist/esm/util/explainable.d.ts

@@ -1,5 +1,5 @@
-import { AnyRawBuilder } from './type-utils.js';
+import { Expression } from '../expression/expression.js';
 export declare type ExplainFormat = 'text' | 'xml' | 'json' | 'yaml' | 'traditional' | 'tree';
 export interface Explainable {
-    explain<O extends Record<string, any> = Record<string, any>>(format?: ExplainFormat, options?: AnyRawBuilder): Promise<O[]>;
+    explain<O extends Record<string, any> = Record<string, any>>(format?: ExplainFormat, options?: Expression<any>): Promise<O[]>;
 }