kysely 0.19.11 → 0.19.12

package/dist/cjs/operation-node/create-table-node.d.ts

@@ -2,7 +2,9 @@ import { OperationNode } from './operation-node.js';
 import { TableNode } from './table-node.js';
 import { ConstraintNode } from './constraint-node.js';
 import { ColumnDefinitionNode } from './column-definition-node.js';
-export declare type OnCommitAction = 'preserve rows' | 'delete rows' | 'drop';
+import { ArrayItemType } from '../util/type-utils.js';
+export declare const ON_COMMIT_ACTIONS: string[];
+export declare type OnCommitAction = ArrayItemType<typeof ON_COMMIT_ACTIONS>;
 export declare type CreateTableNodeParams = Omit<CreateTableNode, 'kind' | 'table' | 'columns' | 'constraints'>;
 export interface CreateTableNode extends OperationNode {
     readonly kind: 'CreateTableNode';

package/dist/cjs/operation-node/create-table-node.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CreateTableNode = void 0;
+exports.CreateTableNode = exports.ON_COMMIT_ACTIONS = void 0;
 const object_utils_js_1 = require("../util/object-utils.js");
+exports.ON_COMMIT_ACTIONS = ['preserve rows', 'delete rows', 'drop'];
 /**
  * @internal
  */

package/dist/cjs/operation-node/foreign-key-constraint-node.d.ts

@@ -20,8 +20,8 @@ export declare const ForeignKeyConstraintNode: Readonly<{
     create(sourceColumns: ReadonlyArray<ColumnNode>, targetTable: TableNode, targetColumns: ReadonlyArray<ColumnNode>, constraintName?: string): ForeignKeyConstraintNode;
     cloneWith(node: ForeignKeyConstraintNode, props: ForeignKeyConstraintNodeProps): Readonly<{
         name?: IdentifierNode | undefined;
-        onDelete?: OnModifyForeignAction | undefined;
-        onUpdate?: OnModifyForeignAction | undefined;
+        onDelete?: "no action" | "restrict" | "cascade" | "set null" | "set default" | undefined;
+        onUpdate?: "no action" | "restrict" | "cascade" | "set null" | "set default" | undefined;
         kind: 'ForeignKeyConstraintNode';
         columns: ReadonlyArray<ColumnNode>;
         references: ReferencesNode;

package/dist/cjs/operation-node/references-node.d.ts

@@ -1,7 +1,9 @@
 import { OperationNode } from './operation-node.js';
 import { ColumnNode } from './column-node.js';
 import { TableNode } from './table-node.js';
-export declare type OnModifyForeignAction = 'no action' | 'restrict' | 'cascade' | 'set null' | 'set default';
+import { ArrayItemType } from '../util/type-utils.js';
+export declare const ON_MODIFY_FOREIGN_ACTIONS: readonly ["no action", "restrict", "cascade", "set null", "set default"];
+export declare type OnModifyForeignAction = ArrayItemType<typeof ON_MODIFY_FOREIGN_ACTIONS>;
 export interface ReferencesNode extends OperationNode {
     readonly kind: 'ReferencesNode';
     readonly table: TableNode;

package/dist/cjs/operation-node/references-node.js

@@ -1,7 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ReferencesNode = void 0;
+exports.ReferencesNode = exports.ON_MODIFY_FOREIGN_ACTIONS = void 0;
 const object_utils_js_1 = require("../util/object-utils.js");
+exports.ON_MODIFY_FOREIGN_ACTIONS = [
+    'no action',
+    'restrict',
+    'cascade',
+    'set null',
+    'set default',
+];
 /**
  * @internal
  */

package/dist/cjs/parser/on-commit-action-parse.d.ts

@@ -0,0 +1,2 @@
+import { OnCommitAction } from '../operation-node/create-table-node.js';
+export declare function parseOnCommitAction(action: OnCommitAction): OnCommitAction;

package/dist/cjs/parser/on-commit-action-parse.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseOnCommitAction = void 0;
+const create_table_node_js_1 = require("../operation-node/create-table-node.js");
+function parseOnCommitAction(action) {
+    if (create_table_node_js_1.ON_COMMIT_ACTIONS.includes(action)) {
+        return action;
+    }
+    throw new Error(`invalid OnCommitAction ${action}`);
+}
+exports.parseOnCommitAction = parseOnCommitAction;

package/dist/cjs/parser/on-modify-action-parser.d.ts

@@ -0,0 +1,2 @@
+import { OnModifyForeignAction } from '../operation-node/references-node.js';
+export declare function parseOnModifyForeignAction(action: OnModifyForeignAction): OnModifyForeignAction;

package/dist/cjs/parser/on-modify-action-parser.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseOnModifyForeignAction = void 0;
+const references_node_js_1 = require("../operation-node/references-node.js");
+function parseOnModifyForeignAction(action) {
+    if (references_node_js_1.ON_MODIFY_FOREIGN_ACTIONS.includes(action)) {
+        return action;
+    }
+    throw new Error(`invalid OnModifyForeignAction ${action}`);
+}
+exports.parseOnModifyForeignAction = parseOnModifyForeignAction;

package/dist/cjs/query-compiler/default-query-compiler.d.ts

@@ -154,6 +154,7 @@ export declare class DefaultQueryCompiler extends OperationNodeVisitor implement
     protected getLeftIdentifierWrapper(): string;
     protected getRightIdentifierWrapper(): string;
     protected getCurrentParameterPlaceholder(): string;
+    protected sanitizeIdentifier(identifier: string): string;
     protected addParameter(parameter: unknown): void;
     protected appendImmediateValue(value: unknown): void;
 }

package/dist/cjs/query-compiler/default-query-compiler.js

@@ -227,7 +227,7 @@ class DefaultQueryCompiler extends operation_node_visitor_js_1.OperationNodeVisi
         this.append(this.getRightIdentifierWrapper());
     }
     compileUnwrappedIdentifier(node) {
-        this.append(node.identifier);
+        this.append(this.sanitizeIdentifier(node.identifier));
     }
     visitFilter(node) {
         if (node.left) {
@@ -822,6 +822,24 @@ class DefaultQueryCompiler extends operation_node_visitor_js_1.OperationNodeVisi
     getCurrentParameterPlaceholder() {
         return '$' + this.numParameters;
     }
+    sanitizeIdentifier(identifier) {
+        if (!(0, object_utils_js_1.isString)(identifier)) {
+            throw new Error('a non-string identifier was passed to sanitizeIdentifier.');
+        }
+        const leftWrap = this.getLeftIdentifierWrapper();
+        const rightWrap = this.getRightIdentifierWrapper();
+        let sanitized = '';
+        for (const c of identifier) {
+            sanitized += c;
+            if (c === leftWrap) {
+                sanitized += leftWrap;
+            }
+            else if (c === rightWrap) {
+                sanitized += rightWrap;
+            }
+        }
+        return sanitized;
+    }
     addParameter(parameter) {
         this.#parameters.push(parameter);
     }

package/dist/cjs/schema/column-definition-builder.js

@@ -11,6 +11,7 @@ const column_definition_node_js_1 = require("../operation-node/column-definition
 const default_value_parser_js_1 = require("../parser/default-value-parser.js");
 const generated_node_js_1 = require("../operation-node/generated-node.js");
 const default_value_node_js_1 = require("../operation-node/default-value-node.js");
+const on_modify_action_parser_js_1 = require("../parser/on-modify-action-parser.js");
 class ColumnDefinitionBuilder {
     #node;
     constructor(node) {
@@ -38,7 +39,7 @@ class ColumnDefinitionBuilder {
             throw new Error('on delete constraint can only be added for foreign keys');
         }
         return new ColumnDefinitionBuilder(column_definition_node_js_1.ColumnDefinitionNode.cloneWith(this.#node, {
-            references: references_node_js_1.ReferencesNode.cloneWithOnDelete(this.#node.references, onDelete),
+            references: references_node_js_1.ReferencesNode.cloneWithOnDelete(this.#node.references, (0, on_modify_action_parser_js_1.parseOnModifyForeignAction)(onDelete)),
         }));
     }
     onUpdate(onUpdate) {
@@ -46,7 +47,7 @@ class ColumnDefinitionBuilder {
             throw new Error('on update constraint can only be added for foreign keys');
         }
         return new ColumnDefinitionBuilder(column_definition_node_js_1.ColumnDefinitionNode.cloneWith(this.#node, {
-            references: references_node_js_1.ReferencesNode.cloneWithOnUpdate(this.#node.references, onUpdate),
+            references: references_node_js_1.ReferencesNode.cloneWithOnUpdate(this.#node.references, (0, on_modify_action_parser_js_1.parseOnModifyForeignAction)(onUpdate)),
         }));
     }
     unique() {

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

@@ -14,6 +14,7 @@ const primary_constraint_node_js_1 = require("../operation-node/primary-constrai
 const unique_constraint_node_js_1 = require("../operation-node/unique-constraint-node.js");
 const check_constraint_node_js_1 = require("../operation-node/check-constraint-node.js");
 const table_parser_js_1 = require("../parser/table-parser.js");
+const on_commit_action_parse_js_1 = require("../parser/on-commit-action-parse.js");
 /**
  * This builder can be used to create a `create table` query.
  */
@@ -45,7 +46,7 @@ class CreateTableBuilder {
         return new CreateTableBuilder({
             ...this.#props,
             createTableNode: create_table_node_js_1.CreateTableNode.cloneWith(this.#props.createTableNode, {
-                onCommit,
+                onCommit: (0, on_commit_action_parse_js_1.parseOnCommitAction)(onCommit),
             }),
         });
     }

package/dist/cjs/schema/foreign-key-constraint-builder.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ForeignKeyConstraintBuilder = void 0;
 const foreign_key_constraint_node_js_1 = require("../operation-node/foreign-key-constraint-node.js");
+const on_modify_action_parser_js_1 = require("../parser/on-modify-action-parser.js");
 const prevent_await_js_1 = require("../util/prevent-await.js");
 class ForeignKeyConstraintBuilder {
     #node;
@@ -10,12 +11,12 @@ class ForeignKeyConstraintBuilder {
     }
     onDelete(onDelete) {
         return new ForeignKeyConstraintBuilder(foreign_key_constraint_node_js_1.ForeignKeyConstraintNode.cloneWith(this.#node, {
-            onDelete,
+            onDelete: (0, on_modify_action_parser_js_1.parseOnModifyForeignAction)(onDelete),
         }));
     }
     onUpdate(onUpdate) {
         return new ForeignKeyConstraintBuilder(foreign_key_constraint_node_js_1.ForeignKeyConstraintNode.cloneWith(this.#node, {
-            onUpdate,
+            onUpdate: (0, on_modify_action_parser_js_1.parseOnModifyForeignAction)(onUpdate),
         }));
     }
     toOperationNode() {

package/dist/esm/operation-node/create-table-node.d.ts

@@ -2,7 +2,9 @@ import { OperationNode } from './operation-node.js';
 import { TableNode } from './table-node.js';
 import { ConstraintNode } from './constraint-node.js';
 import { ColumnDefinitionNode } from './column-definition-node.js';
-export declare type OnCommitAction = 'preserve rows' | 'delete rows' | 'drop';
+import { ArrayItemType } from '../util/type-utils.js';
+export declare const ON_COMMIT_ACTIONS: string[];
+export declare type OnCommitAction = ArrayItemType<typeof ON_COMMIT_ACTIONS>;
 export declare type CreateTableNodeParams = Omit<CreateTableNode, 'kind' | 'table' | 'columns' | 'constraints'>;
 export interface CreateTableNode extends OperationNode {
     readonly kind: 'CreateTableNode';

package/dist/esm/operation-node/create-table-node.js

@@ -1,5 +1,6 @@
 /// <reference types="./create-table-node.d.ts" />
 import { freeze } from '../util/object-utils.js';
+export const ON_COMMIT_ACTIONS = ['preserve rows', 'delete rows', 'drop'];
 /**
  * @internal
  */

package/dist/esm/operation-node/foreign-key-constraint-node.d.ts

@@ -20,8 +20,8 @@ export declare const ForeignKeyConstraintNode: Readonly<{
     create(sourceColumns: ReadonlyArray<ColumnNode>, targetTable: TableNode, targetColumns: ReadonlyArray<ColumnNode>, constraintName?: string): ForeignKeyConstraintNode;
     cloneWith(node: ForeignKeyConstraintNode, props: ForeignKeyConstraintNodeProps): Readonly<{
         name?: IdentifierNode | undefined;
-        onDelete?: OnModifyForeignAction | undefined;
-        onUpdate?: OnModifyForeignAction | undefined;
+        onDelete?: "no action" | "restrict" | "cascade" | "set null" | "set default" | undefined;
+        onUpdate?: "no action" | "restrict" | "cascade" | "set null" | "set default" | undefined;
         kind: 'ForeignKeyConstraintNode';
         columns: ReadonlyArray<ColumnNode>;
         references: ReferencesNode;

package/dist/esm/operation-node/references-node.d.ts

@@ -1,7 +1,9 @@
 import { OperationNode } from './operation-node.js';
 import { ColumnNode } from './column-node.js';
 import { TableNode } from './table-node.js';
-export declare type OnModifyForeignAction = 'no action' | 'restrict' | 'cascade' | 'set null' | 'set default';
+import { ArrayItemType } from '../util/type-utils.js';
+export declare const ON_MODIFY_FOREIGN_ACTIONS: readonly ["no action", "restrict", "cascade", "set null", "set default"];
+export declare type OnModifyForeignAction = ArrayItemType<typeof ON_MODIFY_FOREIGN_ACTIONS>;
 export interface ReferencesNode extends OperationNode {
     readonly kind: 'ReferencesNode';
     readonly table: TableNode;

package/dist/esm/operation-node/references-node.js

@@ -1,5 +1,12 @@
 /// <reference types="./references-node.d.ts" />
 import { freeze } from '../util/object-utils.js';
+export const ON_MODIFY_FOREIGN_ACTIONS = [
+    'no action',
+    'restrict',
+    'cascade',
+    'set null',
+    'set default',
+];
 /**
  * @internal
  */

package/dist/esm/parser/on-commit-action-parse.d.ts

@@ -0,0 +1,2 @@
+import { OnCommitAction } from '../operation-node/create-table-node.js';
+export declare function parseOnCommitAction(action: OnCommitAction): OnCommitAction;

package/dist/esm/parser/on-commit-action-parse.js

@@ -0,0 +1,8 @@
+/// <reference types="./on-commit-action-parse.d.ts" />
+import { ON_COMMIT_ACTIONS, } from '../operation-node/create-table-node.js';
+export function parseOnCommitAction(action) {
+    if (ON_COMMIT_ACTIONS.includes(action)) {
+        return action;
+    }
+    throw new Error(`invalid OnCommitAction ${action}`);
+}

package/dist/esm/parser/on-modify-action-parser.d.ts

@@ -0,0 +1,2 @@
+import { OnModifyForeignAction } from '../operation-node/references-node.js';
+export declare function parseOnModifyForeignAction(action: OnModifyForeignAction): OnModifyForeignAction;

package/dist/esm/parser/on-modify-action-parser.js

@@ -0,0 +1,8 @@
+/// <reference types="./on-modify-action-parser.d.ts" />
+import { ON_MODIFY_FOREIGN_ACTIONS, } from '../operation-node/references-node.js';
+export function parseOnModifyForeignAction(action) {
+    if (ON_MODIFY_FOREIGN_ACTIONS.includes(action)) {
+        return action;
+    }
+    throw new Error(`invalid OnModifyForeignAction ${action}`);
+}

package/dist/esm/query-compiler/default-query-compiler.d.ts

@@ -154,6 +154,7 @@ export declare class DefaultQueryCompiler extends OperationNodeVisitor implement
     protected getLeftIdentifierWrapper(): string;
     protected getRightIdentifierWrapper(): string;
     protected getCurrentParameterPlaceholder(): string;
+    protected sanitizeIdentifier(identifier: string): string;
     protected addParameter(parameter: unknown): void;
     protected appendImmediateValue(value: unknown): void;
 }

package/dist/esm/query-compiler/default-query-compiler.js

@@ -225,7 +225,7 @@ export class DefaultQueryCompiler extends OperationNodeVisitor {
         this.append(this.getRightIdentifierWrapper());
     }
     compileUnwrappedIdentifier(node) {
-        this.append(node.identifier);
+        this.append(this.sanitizeIdentifier(node.identifier));
     }
     visitFilter(node) {
         if (node.left) {
@@ -820,6 +820,24 @@ export class DefaultQueryCompiler extends OperationNodeVisitor {
     getCurrentParameterPlaceholder() {
         return '$' + this.numParameters;
     }
+    sanitizeIdentifier(identifier) {
+        if (!isString(identifier)) {
+            throw new Error('a non-string identifier was passed to sanitizeIdentifier.');
+        }
+        const leftWrap = this.getLeftIdentifierWrapper();
+        const rightWrap = this.getRightIdentifierWrapper();
+        let sanitized = '';
+        for (const c of identifier) {
+            sanitized += c;
+            if (c === leftWrap) {
+                sanitized += leftWrap;
+            }
+            else if (c === rightWrap) {
+                sanitized += rightWrap;
+            }
+        }
+        return sanitized;
+    }
     addParameter(parameter) {
         this.#parameters.push(parameter);
     }

package/dist/esm/schema/column-definition-builder.js

@@ -9,6 +9,7 @@ import { ColumnDefinitionNode } from '../operation-node/column-definition-node.j
 import { parseDefaultValueExpression, } from '../parser/default-value-parser.js';
 import { GeneratedNode } from '../operation-node/generated-node.js';
 import { DefaultValueNode } from '../operation-node/default-value-node.js';
+import { parseOnModifyForeignAction } from '../parser/on-modify-action-parser.js';
 export class ColumnDefinitionBuilder {
     #node;
     constructor(node) {
@@ -36,7 +37,7 @@ export class ColumnDefinitionBuilder {
             throw new Error('on delete constraint can only be added for foreign keys');
         }
         return new ColumnDefinitionBuilder(ColumnDefinitionNode.cloneWith(this.#node, {
-            references: ReferencesNode.cloneWithOnDelete(this.#node.references, onDelete),
+            references: ReferencesNode.cloneWithOnDelete(this.#node.references, parseOnModifyForeignAction(onDelete)),
         }));
     }
     onUpdate(onUpdate) {
@@ -44,7 +45,7 @@ export class ColumnDefinitionBuilder {
             throw new Error('on update constraint can only be added for foreign keys');
         }
         return new ColumnDefinitionBuilder(ColumnDefinitionNode.cloneWith(this.#node, {
-            references: ReferencesNode.cloneWithOnUpdate(this.#node.references, onUpdate),
+            references: ReferencesNode.cloneWithOnUpdate(this.#node.references, parseOnModifyForeignAction(onUpdate)),
         }));
     }
     unique() {

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

@@ -12,6 +12,7 @@ import { PrimaryConstraintNode } from '../operation-node/primary-constraint-node
 import { UniqueConstraintNode } from '../operation-node/unique-constraint-node.js';
 import { CheckConstraintNode } from '../operation-node/check-constraint-node.js';
 import { parseTable } from '../parser/table-parser.js';
+import { parseOnCommitAction } from '../parser/on-commit-action-parse.js';
 /**
  * This builder can be used to create a `create table` query.
  */
@@ -43,7 +44,7 @@ export class CreateTableBuilder {
         return new CreateTableBuilder({
             ...this.#props,
             createTableNode: CreateTableNode.cloneWith(this.#props.createTableNode, {
-                onCommit,
+                onCommit: parseOnCommitAction(onCommit),
             }),
         });
     }

package/dist/esm/schema/foreign-key-constraint-builder.js

@@ -1,5 +1,6 @@
 /// <reference types="./foreign-key-constraint-builder.d.ts" />
 import { ForeignKeyConstraintNode } from '../operation-node/foreign-key-constraint-node.js';
+import { parseOnModifyForeignAction } from '../parser/on-modify-action-parser.js';
 import { preventAwait } from '../util/prevent-await.js';
 export class ForeignKeyConstraintBuilder {
     #node;
@@ -8,12 +9,12 @@ export class ForeignKeyConstraintBuilder {
     }
     onDelete(onDelete) {
         return new ForeignKeyConstraintBuilder(ForeignKeyConstraintNode.cloneWith(this.#node, {
-            onDelete,
+            onDelete: parseOnModifyForeignAction(onDelete),
         }));
     }
     onUpdate(onUpdate) {
         return new ForeignKeyConstraintBuilder(ForeignKeyConstraintNode.cloneWith(this.#node, {
-            onUpdate,
+            onUpdate: parseOnModifyForeignAction(onUpdate),
         }));
     }
     toOperationNode() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kysely",
-  "version": "0.19.11",
+  "version": "0.19.12",
   "description": "Type safe SQL query builder",
   "repository": {
     "type": "git",