kysely 0.28.14 → 0.28.15

package/dist/cjs/query-builder/update-query-builder.js

@@ -1,4 +1,5 @@
 "use strict";
+var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UpdateQueryBuilder = void 0;
 const join_parser_js_1 = require("../parser/join-parser.js");
@@ -21,19 +22,19 @@ class UpdateQueryBuilder {
         this.#props = (0, object_utils_js_1.freeze)(props);
     }
     where(...args) {
-        return new UpdateQueryBuilder({
+        return new _a({
             ...this.#props,
             queryNode: query_node_js_1.QueryNode.cloneWithWhere(this.#props.queryNode, (0, binary_operation_parser_js_1.parseValueBinaryOperationOrExpression)(args)),
         });
     }
     whereRef(lhs, op, rhs) {
-        return new UpdateQueryBuilder({
+        return new _a({
             ...this.#props,
             queryNode: query_node_js_1.QueryNode.cloneWithWhere(this.#props.queryNode, (0, binary_operation_parser_js_1.parseReferentialBinaryOperation)(lhs, op, rhs)),
         });
     }
     clearWhere() {
-        return new UpdateQueryBuilder({
+        return new _a({
             ...this.#props,
             queryNode: query_node_js_1.QueryNode.cloneWithoutWhere(this.#props.queryNode),
         });
@@ -78,13 +79,13 @@ class UpdateQueryBuilder {
      * ```
      */
     top(expression, modifiers) {
-        return new UpdateQueryBuilder({
+        return new _a({
             ...this.#props,
             queryNode: query_node_js_1.QueryNode.cloneWithTop(this.#props.queryNode, (0, top_parser_js_1.parseTop)(expression, modifiers)),
         });
     }
     from(from) {
-        return new UpdateQueryBuilder({
+        return new _a({
             ...this.#props,
             queryNode: update_query_node_js_1.UpdateQueryNode.cloneWithFromItems(this.#props.queryNode, (0, table_parser_js_1.parseTableExpressionOrList)(from)),
         });
@@ -102,19 +103,19 @@ class UpdateQueryBuilder {
         return this.#join('FullJoin', args);
     }
     #join(joinType, args) {
-        return new UpdateQueryBuilder({
+        return new _a({
             ...this.#props,
             queryNode: query_node_js_1.QueryNode.cloneWithJoin(this.#props.queryNode, (0, join_parser_js_1.parseJoin)(joinType, args)),
         });
     }
     orderBy(...args) {
-        return new UpdateQueryBuilder({
+        return new _a({
             ...this.#props,
             queryNode: query_node_js_1.QueryNode.cloneWithOrderByItems(this.#props.queryNode, (0, order_by_parser_js_1.parseOrderBy)(args)),
         });
     }
     clearOrderBy() {
-        return new UpdateQueryBuilder({
+        return new _a({
             ...this.#props,
             queryNode: query_node_js_1.QueryNode.cloneWithoutOrderBy(this.#props.queryNode),
         });
@@ -141,37 +142,37 @@ class UpdateQueryBuilder {
      * ```
      */
     limit(limit) {
-        return new UpdateQueryBuilder({
+        return new _a({
             ...this.#props,
             queryNode: update_query_node_js_1.UpdateQueryNode.cloneWithLimit(this.#props.queryNode, limit_node_js_1.LimitNode.create((0, value_parser_js_1.parseValueExpression)(limit))),
         });
     }
     set(...args) {
-        return new UpdateQueryBuilder({
+        return new _a({
             ...this.#props,
             queryNode: update_query_node_js_1.UpdateQueryNode.cloneWithUpdates(this.#props.queryNode, (0, update_set_parser_js_1.parseUpdate)(...args)),
         });
     }
     returning(selection) {
-        return new UpdateQueryBuilder({
+        return new _a({
             ...this.#props,
             queryNode: query_node_js_1.QueryNode.cloneWithReturning(this.#props.queryNode, (0, select_parser_js_1.parseSelectArg)(selection)),
         });
     }
     returningAll(table) {
-        return new UpdateQueryBuilder({
+        return new _a({
             ...this.#props,
             queryNode: query_node_js_1.QueryNode.cloneWithReturning(this.#props.queryNode, (0, select_parser_js_1.parseSelectAll)(table)),
         });
     }
     output(args) {
-        return new UpdateQueryBuilder({
+        return new _a({
             ...this.#props,
             queryNode: query_node_js_1.QueryNode.cloneWithOutput(this.#props.queryNode, (0, select_parser_js_1.parseSelectArg)(args)),
         });
     }
     outputAll(table) {
-        return new UpdateQueryBuilder({
+        return new _a({
             ...this.#props,
             queryNode: query_node_js_1.QueryNode.cloneWithOutput(this.#props.queryNode, (0, select_parser_js_1.parseSelectAll)(table)),
         });
@@ -200,7 +201,7 @@ class UpdateQueryBuilder {
      * ```
      */
     modifyEnd(modifier) {
-        return new UpdateQueryBuilder({
+        return new _a({
             ...this.#props,
             queryNode: query_node_js_1.QueryNode.cloneWithEndModifier(this.#props.queryNode, modifier.toOperationNode()),
         });
@@ -225,7 +226,7 @@ class UpdateQueryBuilder {
      * ```
      */
     clearReturning() {
-        return new UpdateQueryBuilder({
+        return new _a({
             ...this.#props,
             queryNode: query_node_js_1.QueryNode.cloneWithoutReturning(this.#props.queryNode),
         });
@@ -305,7 +306,7 @@ class UpdateQueryBuilder {
         if (condition) {
             return func(this);
         }
-        return new UpdateQueryBuilder({
+        return new _a({
             ...this.#props,
         });
     }
@@ -316,7 +317,7 @@ class UpdateQueryBuilder {
      * returns a copy of this `UpdateQueryBuilder` with a new output type.
      */
     $castTo() {
-        return new UpdateQueryBuilder(this.#props);
+        return new _a(this.#props);
     }
     /**
      * Narrows (parts of) the output type of the query.
@@ -377,7 +378,7 @@ class UpdateQueryBuilder {
      * ```
      */
     $narrowType() {
-        return new UpdateQueryBuilder(this.#props);
+        return new _a(this.#props);
     }
     /**
      * Asserts that query's output row type equals the given type `T`.
@@ -434,13 +435,13 @@ class UpdateQueryBuilder {
      * ```
      */
     $assertType() {
-        return new UpdateQueryBuilder(this.#props);
+        return new _a(this.#props);
     }
     /**
      * Returns a copy of this UpdateQueryBuilder instance with the given plugin installed.
      */
     withPlugin(plugin) {
-        return new UpdateQueryBuilder({
+        return new _a({
             ...this.#props,
             executor: this.#props.executor.withPlugin(plugin),
         });
@@ -503,7 +504,7 @@ class UpdateQueryBuilder {
         }
     }
     async explain(format, options) {
-        const builder = new UpdateQueryBuilder({
+        const builder = new _a({
             ...this.#props,
             queryNode: query_node_js_1.QueryNode.cloneWithExplain(this.#props.queryNode, format, options),
         });
@@ -511,3 +512,4 @@ class UpdateQueryBuilder {
     }
 }
 exports.UpdateQueryBuilder = UpdateQueryBuilder;
+_a = UpdateQueryBuilder;

package/dist/cjs/util/column-type.d.ts

@@ -172,4 +172,58 @@ export type Insertable<R> = DrainOuterGeneric<object & {
 export type Updateable<R> = DrainOuterGeneric<{
     [K in UpdateKeys<R>]?: UpdateType<R[K]>;
 }>;
+/**
+ * Wrap your column type to opt-out from dehydration by {@link ShallowDehydrateValue},
+ * when used by JSON functions, such as the ones used by the relational helpers.
+ *
+ * Why need this?
+ *
+ * An edge case surfaced in issues where a numeric string column type was actually
+ * not a numeric data type column, but text - and thus shouldn't be dehydrated
+ * to `number`.
+ *
+ * Another use case would be, when someone finds a way to keep nested columns hydrated
+ * at runtime, e.g. via a plugin, and wants to prevent dehydration of such columns
+ * at the type level.
+ *
+ * ### Examples
+ *
+ * ```ts
+ * import type { NonDehydrateable } from 'kysely'
+ * import { jsonArrayFrom } from 'kysely/helpers/postgres'
+ *
+ * const result = await db
+ *   .withTables<{
+ *     my_table: {
+ *       a_column: '1' | '2' | '3',
+ *       another_column: NonDehydrateable<'1' | '2' | '3'>,
+ *       column_too: NonDehydrateable<ColumnType<'1' | '2' | '3'>>
+ *     }
+ *   }>()
+ *   .selectFrom('person')
+ *   .select((eb) => [
+ *     'id',
+ *     jsonArrayFrom(
+ *       eb.selectFrom('my_table')
+ *         .select(['a_column', 'another_column', 'column_too'])
+ *     ).as('related')
+ *   ])
+ *   .execute()
+ * ```
+ *
+ * In the example above, "a_column" will be dehydrated to `number`
+ * given it is a numeric string - which is normally a numeric data type column
+ * that gets output as a string by underlying database drivers to avoid
+ * precision loss or overflow.
+ *
+ * "another_column" and "column_too" will remain as `'1' | '2' | '3'`, given they're
+ * wrapped in `NonDehydrateable`, which prevents their dehydration.
+ */
+export type NonDehydrateable<T> = [T] extends [
+    ColumnType<infer S, infer I, infer U>
+] ? ColumnType<S & {
+    __kysely_dehydrate__?: false;
+}, I, U> : T & {
+    __kysely_dehydrate__?: false;
+};
 export {};

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

@@ -183,7 +183,7 @@ export type ShallowDehydrateObject<O> = {
  * For now, we catch anything in {@link StringsWhenDataTypeNotAvailable} and convert it to `string`,
  * and anything in {@link NumbersWhenDataTypeNotAvailable} and convert it to `number`.
  */
-export type ShallowDehydrateValue<T> = T extends null | undefined ? T : T extends (infer U)[] | null | undefined ? Array<ShallowDehydrateValue<U>> | Extract<T, null | undefined> : Exclude<T, StringsWhenDataTypeNotAvailable | NumbersWhenDataTypeNotAvailable> | ([Extract<T, NumbersWhenDataTypeNotAvailable>] extends [never] ? never : number) | ([Extract<T, StringsWhenDataTypeNotAvailable>] extends [never] ? never : string);
+export type ShallowDehydrateValue<T> = T extends null | undefined ? T : '__kysely_dehydrate__' extends keyof NonNullable<T> ? T : T extends (infer U)[] | null | undefined ? Array<ShallowDehydrateValue<U>> | Extract<T, null | undefined> : Exclude<T, StringsWhenDataTypeNotAvailable | NumbersWhenDataTypeNotAvailable> | ([Extract<T, NumbersWhenDataTypeNotAvailable>] extends [never] ? never : number) | ([Extract<T, StringsWhenDataTypeNotAvailable>] extends [never] ? never : string);
 export type StringsWhenDataTypeNotAvailable = Date | Uint8Array;
 export type NumbersWhenDataTypeNotAvailable = bigint | NumericString;
 export type NumericString = `${number}`;

package/dist/esm/dialect/postgres/postgres-introspector.js

@@ -71,27 +71,29 @@ export class PostgresIntrospector {
         };
     }
     #parseTableMetadata(columns) {
-        return columns.reduce((tables, it) => {
-            let table = tables.find((tbl) => tbl.name === it.table && tbl.schema === it.schema);
-            if (!table) {
-                table = freeze({
-                    name: it.table,
-                    isView: it.table_type === 'v',
-                    schema: it.schema,
+        const tableDictionary = new Map();
+        for (let i = 0, len = columns.length; i < len; i++) {
+            const column = columns[i];
+            const { schema, table } = column;
+            const tableKey = `schema:${schema};table:${table}`;
+            if (!tableDictionary.has(tableKey)) {
+                tableDictionary.set(tableKey, freeze({
                     columns: [],
-                });
-                tables.push(table);
+                    isView: column.table_type === 'v',
+                    name: table,
+                    schema,
+                }));
             }
-            table.columns.push(freeze({
-                name: it.column,
-                dataType: it.type,
-                dataTypeSchema: it.type_schema,
-                isNullable: !it.not_null,
-                isAutoIncrementing: it.auto_incrementing !== null,
-                hasDefaultValue: it.has_default,
-                comment: it.column_description ?? undefined,
+            tableDictionary.get(tableKey).columns.push(freeze({
+                comment: column.column_description ?? undefined,
+                dataType: column.type,
+                dataTypeSchema: column.type_schema,
+                hasDefaultValue: column.has_default,
+                isAutoIncrementing: column.auto_incrementing !== null,
+                isNullable: !column.not_null,
+                name: column.column,
             }));
-            return tables;
-        }, []);
+        }
+        return Array.from(tableDictionary.values());
     }
 }

package/dist/esm/query-builder/delete-query-builder.js

@@ -1,4 +1,5 @@
 /// <reference types="./delete-query-builder.d.ts" />
+var _a;
 import { parseJoin, } from '../parser/join-parser.js';
 import { parseTableExpressionOrList, } from '../parser/table-parser.js';
 import { parseSelectArg, parseSelectAll, } from '../parser/select-parser.js';
@@ -18,19 +19,19 @@ export class DeleteQueryBuilder {
         this.#props = freeze(props);
     }
     where(...args) {
-        return new DeleteQueryBuilder({
+        return new _a({
             ...this.#props,
             queryNode: QueryNode.cloneWithWhere(this.#props.queryNode, parseValueBinaryOperationOrExpression(args)),
         });
     }
     whereRef(lhs, op, rhs) {
-        return new DeleteQueryBuilder({
+        return new _a({
             ...this.#props,
             queryNode: QueryNode.cloneWithWhere(this.#props.queryNode, parseReferentialBinaryOperation(lhs, op, rhs)),
         });
     }
     clearWhere() {
-        return new DeleteQueryBuilder({
+        return new _a({
             ...this.#props,
             queryNode: QueryNode.cloneWithoutWhere(this.#props.queryNode),
         });
@@ -75,13 +76,13 @@ export class DeleteQueryBuilder {
      * ```
      */
     top(expression, modifiers) {
-        return new DeleteQueryBuilder({
+        return new _a({
             ...this.#props,
             queryNode: QueryNode.cloneWithTop(this.#props.queryNode, parseTop(expression, modifiers)),
         });
     }
     using(tables) {
-        return new DeleteQueryBuilder({
+        return new _a({
             ...this.#props,
             queryNode: DeleteQueryNode.cloneWithUsing(this.#props.queryNode, parseTableExpressionOrList(tables)),
         });
@@ -99,31 +100,31 @@ export class DeleteQueryBuilder {
         return this.#join('FullJoin', args);
     }
     #join(joinType, args) {
-        return new DeleteQueryBuilder({
+        return new _a({
             ...this.#props,
             queryNode: QueryNode.cloneWithJoin(this.#props.queryNode, parseJoin(joinType, args)),
         });
     }
     returning(selection) {
-        return new DeleteQueryBuilder({
+        return new _a({
             ...this.#props,
             queryNode: QueryNode.cloneWithReturning(this.#props.queryNode, parseSelectArg(selection)),
         });
     }
     returningAll(table) {
-        return new DeleteQueryBuilder({
+        return new _a({
             ...this.#props,
             queryNode: QueryNode.cloneWithReturning(this.#props.queryNode, parseSelectAll(table)),
         });
     }
     output(args) {
-        return new DeleteQueryBuilder({
+        return new _a({
             ...this.#props,
             queryNode: QueryNode.cloneWithOutput(this.#props.queryNode, parseSelectArg(args)),
         });
     }
     outputAll(table) {
-        return new DeleteQueryBuilder({
+        return new _a({
             ...this.#props,
             queryNode: QueryNode.cloneWithOutput(this.#props.queryNode, parseSelectAll(table)),
         });
@@ -148,7 +149,7 @@ export class DeleteQueryBuilder {
      * ```
      */
     clearReturning() {
-        return new DeleteQueryBuilder({
+        return new _a({
             ...this.#props,
             queryNode: QueryNode.cloneWithoutReturning(this.#props.queryNode),
         });
@@ -174,19 +175,19 @@ export class DeleteQueryBuilder {
      * ```
      */
     clearLimit() {
-        return new DeleteQueryBuilder({
+        return new _a({
             ...this.#props,
             queryNode: DeleteQueryNode.cloneWithoutLimit(this.#props.queryNode),
         });
     }
     orderBy(...args) {
-        return new DeleteQueryBuilder({
+        return new _a({
             ...this.#props,
             queryNode: QueryNode.cloneWithOrderByItems(this.#props.queryNode, parseOrderBy(args)),
         });
     }
     clearOrderBy() {
-        return new DeleteQueryBuilder({
+        return new _a({
             ...this.#props,
             queryNode: QueryNode.cloneWithoutOrderBy(this.#props.queryNode),
         });
@@ -216,7 +217,7 @@ export class DeleteQueryBuilder {
      * ```
      */
     limit(limit) {
-        return new DeleteQueryBuilder({
+        return new _a({
             ...this.#props,
             queryNode: DeleteQueryNode.cloneWithLimit(this.#props.queryNode, LimitNode.create(parseValueExpression(limit))),
         });
@@ -243,7 +244,7 @@ export class DeleteQueryBuilder {
      * ```
      */
     modifyEnd(modifier) {
-        return new DeleteQueryBuilder({
+        return new _a({
             ...this.#props,
             queryNode: QueryNode.cloneWithEndModifier(this.#props.queryNode, modifier.toOperationNode()),
         });
@@ -314,7 +315,7 @@ export class DeleteQueryBuilder {
         if (condition) {
             return func(this);
         }
-        return new DeleteQueryBuilder({
+        return new _a({
             ...this.#props,
         });
     }
@@ -325,7 +326,7 @@ export class DeleteQueryBuilder {
      * returns a copy of this `DeleteQueryBuilder` with a new output type.
      */
     $castTo() {
-        return new DeleteQueryBuilder(this.#props);
+        return new _a(this.#props);
     }
     /**
      * Narrows (parts of) the output type of the query.
@@ -377,7 +378,7 @@ export class DeleteQueryBuilder {
      * ```
      */
     $narrowType() {
-        return new DeleteQueryBuilder(this.#props);
+        return new _a(this.#props);
     }
     /**
      * Asserts that query's output row type equals the given type `T`.
@@ -425,13 +426,13 @@ export class DeleteQueryBuilder {
      * ```
      */
     $assertType() {
-        return new DeleteQueryBuilder(this.#props);
+        return new _a(this.#props);
     }
     /**
      * Returns a copy of this DeleteQueryBuilder instance with the given plugin installed.
      */
     withPlugin(plugin) {
-        return new DeleteQueryBuilder({
+        return new _a({
             ...this.#props,
             executor: this.#props.executor.withPlugin(plugin),
         });
@@ -492,10 +493,11 @@ export class DeleteQueryBuilder {
         }
     }
     async explain(format, options) {
-        const builder = new DeleteQueryBuilder({
+        const builder = new _a({
             ...this.#props,
             queryNode: QueryNode.cloneWithExplain(this.#props.queryNode, format, options),
         });
         return await builder.execute();
     }
 }
+_a = DeleteQueryBuilder;