pqb 0.56.5 → 0.56.6

package/dist/index.d.ts

@@ -1512,6 +1512,8 @@ interface OperatorsJson extends Base<unknown> {
          * ```ts
          * await db.table.find(id).update({
          *   data: (q) => q.get('data').jsonSet(['path', 'to', 'value'], 'new value'),
+         *   // supports sql for the value
+         *   data: (q) => q.get('data').jsonSet(['path', 'to', 'value'], sql`'new value'`),
          * });
          * ```
          *
@@ -1530,6 +1532,9 @@ interface OperatorsJson extends Base<unknown> {
          * await db.table.find(id).update({
          *   // data.path.to.value will be updated only if it already was defined
          *   data: (q) => q.get('data').jsonReplace(['path', 'to', 'value'], 'new value'),
+         *   // supports sql for the value
+         *   data: (q) =>
+         *     q.get('data').jsonReplace(['path', 'to', 'value'], sql`'new value'`),
          * });
          * ```
          *
@@ -1556,6 +1561,8 @@ interface OperatorsJson extends Base<unknown> {
          * // update the record with data { tags: ['two'] } to have data { tags: ['one', 'two'] }
          * await db.table.find(id).update({
          *   data: (q) => q.get('data').jsonInsert(['tags', 0], 'one'),
+         *   // supports sql for the value
+         *   data: (q) => q.get('data').jsonInsert(['tags', 0], sql`'one'`),
          * });
          *
          * // add 'three' after 'two'
@@ -2656,7 +2663,6 @@ declare namespace TableData {
     }
     export interface ColumnIndex {
         options: Index.ColumnArg & Index.Options;
-        name?: string;
     }
     export interface ColumnExclude extends ColumnIndex {
         with: string;
@@ -2664,12 +2670,10 @@ declare namespace TableData {
     export interface Index {
         columns: Index.ColumnOrExpressionOptions[];
         options: Index.Options;
-        name?: string;
     }
     export interface Exclude {
         columns: Exclude.ColumnOrExpressionOptions[];
         options: Exclude.Options;
-        name?: string;
     }
     export interface Constraint {
         name?: string;
@@ -2709,7 +2713,8 @@ declare namespace TableData {
             order?: string;
             weight?: SearchWeight;
         }
-        export interface UniqueOptionsArg {
+        export interface UniqueOptionsArg<Name extends string = string> {
+            name?: Name;
             nullsNotDistinct?: boolean;
             using?: string;
             include?: MaybeArray<string>;
@@ -2724,7 +2729,7 @@ declare namespace TableData {
         export interface TsVectorArg extends OptionsArg, TsVectorOptions {
         }
         export type Options = TsVectorArg;
-        export interface UniqueColumnArg extends ColumnOptions, UniqueOptionsArg {
+        export interface UniqueColumnArg<Name extends string = string> extends ColumnOptions, UniqueOptionsArg<Name> {
             expression?: string;
         }
         export interface ColumnArg extends UniqueColumnArg {
@@ -2748,6 +2753,7 @@ declare namespace TableData {
     }
     export namespace Exclude {
         export interface Options {
+            name?: string;
             using?: string;
             include?: MaybeArray<string>;
             with?: string;
@@ -2829,15 +2835,15 @@ interface TableDataMethods<Key extends PropertyKey> {
     unique<Columns extends [
         Key | TableData.Index.ColumnOrExpressionOptions<Key>,
         ...(Key | TableData.Index.ColumnOrExpressionOptions<Key>)[]
-    ], Name extends string>(columns: Columns, ...args: [options?: TableData.Index.UniqueOptionsArg] | [name?: Name, options?: TableData.Index.UniqueOptionsArg]): {
+    ], Name extends string>(columns: Columns, options?: TableData.Index.UniqueOptionsArg<Name>): {
         tableDataItem: true;
         columns: Columns extends (Key | TableData.Index.ColumnOptionsForColumn<Key>)[] ? {
             [I in keyof Columns]: 'column' extends keyof Columns[I] ? Columns[I]['column'] : Columns[I];
         } : never;
         name: string extends Name ? never : Name;
     };
-    index(columns: (Key | TableData.Index.ColumnOrExpressionOptions<Key>)[], ...args: [options?: TableData.Index.OptionsArg] | [name?: string, options?: TableData.Index.OptionsArg]): NonUniqDataItem;
-    searchIndex(columns: (Key | TableData.Index.ColumnOrExpressionOptions<Key>)[], ...args: [options?: TableData.Index.TsVectorArg] | [name?: string, options?: TableData.Index.TsVectorArg]): NonUniqDataItem;
+    index(columns: (Key | TableData.Index.ColumnOrExpressionOptions<Key>)[], options?: TableData.Index.OptionsArg): NonUniqDataItem;
+    searchIndex(columns: (Key | TableData.Index.ColumnOrExpressionOptions<Key>)[], options?: TableData.Index.TsVectorArg): NonUniqDataItem;
     /**
      * Defines an `EXCLUDE` constraint for multiple columns.
      *
@@ -2907,7 +2913,7 @@ interface TableDataMethods<Key extends PropertyKey> {
      * });
      * ```
      */
-    exclude(columns: TableData.Exclude.ColumnOrExpressionOptions<Key>[], ...args: [options?: TableData.Exclude.Options] | [name?: string, options?: TableData.Exclude.Options]): NonUniqDataItem;
+    exclude(columns: TableData.Exclude.ColumnOrExpressionOptions<Key>[], options?: TableData.Exclude.Options): NonUniqDataItem;
     foreignKey<ForeignTable extends (() => ForeignKeyTable) | string, ForeignColumns extends ForeignTable extends () => ForeignKeyTable ? [
         ColumnNameOfTable<ReturnType<ForeignTable>>,
         ...ColumnNameOfTable<ReturnType<ForeignTable>>[]
@@ -3565,7 +3571,9 @@ declare class Db<Table extends string | undefined = undefined, Shape extends Que
     queryArrays<R extends any[] = any[]>(...args: SQLQueryArgs): Promise<QueryArraysResult<R>>;
 }
 interface DbTableConstructor<ColumnTypes> {
-    <Table extends string, Shape extends QueryColumnsInit, Data extends MaybeArray<TableDataItem>, Options extends DbTableOptions<ColumnTypes, Table, Shape>>(table: Table, shape?: ((t: ColumnTypes) => Shape) | Shape, tableData?: TableDataFn<Shape, Data>, options?: Options): Db<Table, Shape, keyof ShapeColumnPrimaryKeys<Shape> extends never ? never : ShapeColumnPrimaryKeys<Shape>, ShapeUniqueColumns<Shape> | TableDataItemsUniqueColumns<Shape, Data>, TableDataItemsUniqueColumnTuples<Shape, Data>, UniqueConstraints<Shape> | TableDataItemsUniqueConstraints<Data>, ColumnTypes, Shape & ComputedColumnsFromOptions<Options['computed']>, MapTableScopesOption<Options>>;
+    <Table extends string, Shape extends QueryColumnsInit, Data extends MaybeArray<TableDataItem>, Options extends DbTableOptions<ColumnTypes, Table, Shape>>(table: Table, shape?: ((t: ColumnTypes) => Shape) | Shape, tableData?: TableDataFn<Shape, Data>, options?: Options): Db<Table, Shape, keyof ShapeColumnPrimaryKeys<Shape> extends never ? never : ShapeColumnPrimaryKeys<Shape>, ShapeUniqueColumns<Shape> | TableDataItemsUniqueColumns<Shape, Data>, TableDataItemsUniqueColumnTuples<Shape, Data>, UniqueConstraints<Shape> | TableDataItemsUniqueConstraints<Data>, ColumnTypes, Shape & ComputedColumnsFromOptions<Options['computed']>, MapTableScopesOption<Options>> & {
+        ko: Shape;
+    };
 }
 type MapTableScopesOption<T> = T extends {
     scopes: RecordUnknown;
@@ -8270,9 +8278,7 @@ declare abstract class ColumnType<Schema extends ColumnTypeSchemaArg = ColumnTyp
      *     // options are described below:
      *     name: t.text().index({ ...options }),
      *     // with a database-level name:
-     *     name: t.text().index('custom_index_name'),
-     *     // with name and options:
-     *     name: t.text().index('custom_index_name', { ...options }),
+     *     name: t.text().index({ name: 'custom_index_name', ...indexOptions }),
      *   }));
      * });
      * ```
@@ -8281,6 +8287,7 @@ declare abstract class ColumnType<Schema extends ColumnTypeSchemaArg = ColumnTyp
      *
      * ```ts
      * type IndexOptions = {
+     *   name?: string,
      *   // NULLS NOT DISTINCT: availabe in Postgres 15+, makes sense only for unique index
      *   nullsNotDistinct?: true;
      *   // index algorithm to use such as GIST, GIN
@@ -8306,7 +8313,7 @@ declare abstract class ColumnType<Schema extends ColumnTypeSchemaArg = ColumnTyp
      *
      * @param args
      */
-    index<T extends PickColumnData>(this: T, ...args: [options?: TableData.Index.ColumnArg] | [name: string, options?: TableData.Index.ColumnArg]): T;
+    index<T extends PickColumnData>(this: T, ...args: [options?: TableData.Index.ColumnArg]): T;
     /**
      * `searchIndex` is designed for [full text search](/guide/text-search).
      *
@@ -8412,8 +8419,8 @@ declare abstract class ColumnType<Schema extends ColumnTypeSchemaArg = ColumnTyp
     searchIndex<T extends {
         data: ColumnType['data'];
         dataType: string;
-    }>(this: T, ...args: [options?: TableData.Index.TsVectorColumnArg] | [name: string, options?: TableData.Index.TsVectorColumnArg]): T;
-    unique<T extends PickColumnData, Name extends string>(this: T, ...args: [options?: TableData.Index.UniqueColumnArg] | [name: Name, options?: TableData.Index.UniqueColumnArg]): UniqueColumn<T, Name>;
+    }>(this: T, ...args: [options?: TableData.Index.TsVectorColumnArg]): T;
+    unique<T extends PickColumnData, const Options extends TableData.Index.ColumnArg>(this: T, ...args: [options?: Options]): UniqueColumn<T, Options['name'] & string>;
     /**
      * Add [EXCLUDE constraint](https://www.postgresql.org/docs/current/sql-createtable.html#SQL-CREATETABLE-EXCLUDE) to the column.
      *
@@ -8459,7 +8466,7 @@ declare abstract class ColumnType<Schema extends ColumnTypeSchemaArg = ColumnTyp
      * }
      * ```
      */
-    exclude<T extends PickColumnData>(this: T, ...args: [op: string, options?: TableData.Exclude.ColumnArg] | [op: string, name: string, options?: TableData.Exclude.ColumnArg]): T;
+    exclude<T extends PickColumnData>(this: T, op: string, ...args: [options?: TableData.Exclude.ColumnArg]): T;
     comment<T extends PickColumnData>(this: T, comment: string): T;
     compression<T extends PickColumnData>(this: T, compression: string): T;
     collate<T extends PickColumnData>(this: T, collate: string): T;

package/dist/index.js

@@ -169,9 +169,7 @@ class ColumnType extends orchidCore.ColumnTypeBase {
    *     // options are described below:
    *     name: t.text().index({ ...options }),
    *     // with a database-level name:
-   *     name: t.text().index('custom_index_name'),
-   *     // with name and options:
-   *     name: t.text().index('custom_index_name', { ...options }),
+   *     name: t.text().index({ name: 'custom_index_name', ...indexOptions }),
    *   }));
    * });
    * ```
@@ -180,6 +178,7 @@ class ColumnType extends orchidCore.ColumnTypeBase {
    *
    * ```ts
    * type IndexOptions = {
+   *   name?: string,
    *   // NULLS NOT DISTINCT: availabe in Postgres 15+, makes sense only for unique index
    *   nullsNotDistinct?: true;
    *   // index algorithm to use such as GIST, GIN
@@ -206,9 +205,9 @@ class ColumnType extends orchidCore.ColumnTypeBase {
    * @param args
    */
   index(...args) {
+    const a = args;
     return orchidCore.pushColumnData(this, "indexes", {
-      options: (typeof args[0] === "string" ? args[1] : args[0]) ?? orchidCore.emptyObject,
-      name: typeof args[0] === "string" ? args[0] : void 0
+      options: (typeof a[0] === "string" ? { ...a[1], name: a[0] } : a[0]) ?? orchidCore.emptyObject
     });
   }
   /**
@@ -314,21 +313,21 @@ class ColumnType extends orchidCore.ColumnTypeBase {
    * @param options - index options
    */
   searchIndex(...args) {
+    const a = args;
     return orchidCore.pushColumnData(this, "indexes", {
       options: {
-        ...typeof args[0] === "string" ? args[1] : args[0],
+        ...typeof a[0] === "string" ? { ...a[1], name: a[0] } : a[0],
         ...this.dataType === "tsvector" ? { using: "GIN" } : { tsVector: true }
-      },
-      name: typeof args[0] === "string" ? args[0] : void 0
+      }
     });
   }
   unique(...args) {
+    const a = args;
     return orchidCore.pushColumnData(this, "indexes", {
       options: {
-        ...typeof args[0] === "string" ? args[1] : args[0],
+        ...typeof a[0] === "string" ? { ...a[1], name: a[0] } : a[0],
         unique: true
-      },
-      name: typeof args[0] === "string" ? args[0] : void 0
+      }
     });
   }
   /**
@@ -376,11 +375,11 @@ class ColumnType extends orchidCore.ColumnTypeBase {
    * }
    * ```
    */
-  exclude(...args) {
+  exclude(op, ...args) {
+    const a = args;
     return orchidCore.pushColumnData(this, "excludes", {
-      with: args[0],
-      options: (typeof args[1] === "string" ? args[2] : args[1]) ?? orchidCore.emptyObject,
-      name: typeof args[1] === "string" ? args[1] : void 0
+      with: op,
+      options: (typeof a[0] === "string" ? { ...a[1], name: a[0] } : a[0]) ?? orchidCore.emptyObject
     });
   }
   comment(comment) {
@@ -541,6 +540,7 @@ const indexInnerToCode = (index, t) => {
   const columnOptions = ["collate", "opclass", "order", "weight"];
   const indexOptionsKeys = [
     index.options.tsVector ? "unique" : void 0,
+    "name",
     "using",
     "nullsNotDistinct",
     "include",
@@ -586,18 +586,12 @@ const indexInnerToCode = (index, t) => {
         objects.push("{", props, "},");
       }
     }
-    code.push(["[", objects, hasOptions || index.name ? "]," : "]"]);
-    if (index.name) {
-      orchidCore.addCode(code, `  ${orchidCore.singleQuote(index.name)},`);
-    }
+    code.push(["[", objects, hasOptions ? "]," : "]"]);
   } else {
     orchidCore.addCode(
       code,
       `[${index.columns.map((it) => orchidCore.singleQuote(it.column)).join(", ")}]`
     );
-    if (index.name) {
-      orchidCore.addCode(code, `, ${orchidCore.singleQuote(index.name)}`);
-    }
   }
   if (hasOptions) {
     if (columnsMultiline) {
@@ -633,6 +627,7 @@ const excludeInnerToCode = (item, t) => {
   const code = [`${t}.exclude(`];
   const columnOptions = ["collate", "opclass", "order", "with"];
   const optionsKeys = [
+    "name",
     "using",
     "include",
     "with",
@@ -657,10 +652,7 @@ const excludeInnerToCode = (item, t) => {
     }
     objects.push("{", props, "},");
   }
-  code.push(["[", objects, hasOptions || item.name ? "]," : "]"]);
-  if (item.name) {
-    orchidCore.addCode(code, `  ${orchidCore.singleQuote(item.name)},`);
-  }
+  code.push(["[", objects, hasOptions ? "]," : "]"]);
   if (hasOptions) {
     code.push(["{"]);
     const options = [];
@@ -768,12 +760,10 @@ const foreignKeyArgumentToCode = ({
 };
 const columnIndexesToCode = (items) => {
   const code = [];
-  for (const { options, name } of items) {
-    orchidCore.addCode(
-      code,
-      `.${options.unique ? "unique" : "index"}(${name ? `${orchidCore.singleQuote(name)}` : ""}`
-    );
+  for (const { options } of items) {
+    orchidCore.addCode(code, `.${options.unique ? "unique" : "index"}(`);
     const arr = [
+      options.name && `name: ${orchidCore.singleQuote(options.name)},`,
       options.collate && `collate: ${orchidCore.singleQuote(options.collate)},`,
       options.opclass && `opclass: ${orchidCore.singleQuote(options.opclass)},`,
       options.order && `order: ${orchidCore.singleQuote(options.order)},`,
@@ -785,7 +775,7 @@ const columnIndexesToCode = (items) => {
       options.where && `where: ${orchidCore.singleQuote(options.where)},`
     ].filter((x) => !!x);
     if (arr.length) {
-      orchidCore.addCode(code, name ? `, {` : "{");
+      orchidCore.addCode(code, "{");
       orchidCore.addCode(code, arr);
       orchidCore.addCode(code, "}");
     }
@@ -795,13 +785,13 @@ const columnIndexesToCode = (items) => {
 };
 const columnExcludesToCode = (items) => {
   const code = [];
-  for (const { options, name, with: w } of items) {
+  for (const { options, with: w } of items) {
     orchidCore.addCode(code, `.exclude('${w}'`);
     const arr = [
+      options.name && `name: ${orchidCore.singleQuote(options.name)},`,
       options.collate && `collate: ${orchidCore.singleQuote(options.collate)},`,
       options.opclass && `opclass: ${orchidCore.singleQuote(options.opclass)},`,
       options.order && `order: ${orchidCore.singleQuote(options.order)},`,
-      name && `name: ${orchidCore.singleQuote(name)},`,
       options.using && `using: ${orchidCore.singleQuote(options.using)},`,
       options.include && `include: ${typeof options.include === "string" ? orchidCore.singleQuote(options.include) : `[${options.include.map(orchidCore.singleQuote).join(", ")}]`},`,
       options.with && `with: ${orchidCore.singleQuote(options.with)},`,
@@ -880,7 +870,9 @@ const columnCode = (type, ctx, key, code) => {
   }
   if (data.explicitSelect) orchidCore.addCode(code, ".select(false)");
   if (data.isNullable) orchidCore.addCode(code, ".nullable()");
-  if (data.as) orchidCore.addCode(code, `.as(${data.as.toCode(ctx, key)})`);
+  if (data.as && !ctx.migration) {
+    orchidCore.addCode(code, `.as(${data.as.toCode(ctx, key)})`);
+  }
   if (data.default !== void 0 && data.default !== data.defaultDefault && (!ctx.migration || typeof data.default !== "function")) {
     orchidCore.addCode(
       code,
@@ -1189,6 +1181,17 @@ const quoteJsonValue = (arg, ctx, quotedAs, IN) => {
   }
   return orchidCore.addValue(ctx.values, JSON.stringify(arg)) + "::jsonb";
 };
+const serializeJsonValue = (arg, ctx, quotedAs) => {
+  if (arg && typeof arg === "object") {
+    if (orchidCore.isExpression(arg)) {
+      return "to_jsonb(" + arg.toSQL(ctx, quotedAs) + ")";
+    }
+    if ("toSQL" in arg) {
+      return `to_jsonb((${getSqlText(arg.toSQL(ctx))}))`;
+    }
+  }
+  return orchidCore.addValue(ctx.values, JSON.stringify(arg));
+};
 const json = {
   equals: make(
     (key, value, ctx, quotedAs) => value === null ? `nullif(${key}, 'null'::jsonb) IS NULL` : `${key} = ${quoteJsonValue(value, ctx, quotedAs)}`
@@ -1231,21 +1234,24 @@ const json = {
     (key, value, ctx, quotedAs) => `${key} <@ ${quoteValue(value, ctx, quotedAs)}`
   ),
   jsonSet: makeVarArg(
-    (key, [path, value], ctx) => `jsonb_set(${key}, ${encodeJsonPath(ctx, path)}, ${orchidCore.addValue(
-      ctx.values,
-      JSON.stringify(value)
+    (key, [path, value], ctx, quotedAs) => `jsonb_set(${key}, ${encodeJsonPath(ctx, path)}, ${serializeJsonValue(
+      value,
+      ctx,
+      quotedAs
     )})`
   ),
   jsonReplace: makeVarArg(
-    (key, [path, value], ctx) => `jsonb_set(${key}, ${encodeJsonPath(ctx, path)}, ${orchidCore.addValue(
-      ctx.values,
-      JSON.stringify(value)
+    (key, [path, value], ctx, quotedAs) => `jsonb_set(${key}, ${encodeJsonPath(ctx, path)}, ${serializeJsonValue(
+      value,
+      ctx,
+      quotedAs
     )}, false)`
   ),
   jsonInsert: makeVarArg(
-    (key, [path, value, options], ctx) => `jsonb_insert(${key}, ${encodeJsonPath(ctx, path)}, ${orchidCore.addValue(
-      ctx.values,
-      JSON.stringify(value)
+    (key, [path, value, options], ctx, quotedAs) => `jsonb_insert(${key}, ${encodeJsonPath(ctx, path)}, ${serializeJsonValue(
+      value,
+      ctx,
+      quotedAs
     )}${options?.after ? ", true" : ""})`
   ),
   jsonRemove: makeVarArg(
@@ -12819,9 +12825,9 @@ orchidCore.applyMixins(QueryMethods, [
 
 const makeIndex = (columns, first, second) => {
   if (typeof first === "string") {
-    const options = second ?? {};
+    const options = { ...second, name: first };
     return {
-      index: { columns, options, name: first }
+      index: { columns, options }
     };
   } else {
     const options = first ?? {};
@@ -12834,24 +12840,27 @@ const tableDataMethods = {
   primaryKey(columns, name) {
     return { primaryKey: { columns, name } };
   },
-  unique(columns, ...[first, second]) {
+  unique(columns, ...args) {
+    const [first, second] = args;
     const input = makeIndex(columns, first, second);
     input.index.options.unique = true;
     return input;
   },
   index: makeIndex,
-  searchIndex(columns, ...[first, second]) {
+  searchIndex(columns, ...args) {
     var _a;
+    const [first, second] = args;
     const input = makeIndex(columns, first, second);
     (_a = input.index.options).using ?? (_a.using = "gin");
     input.index.options.tsVector = true;
     return input;
   },
-  exclude(columns, ...[first, second]) {
+  exclude(columns, ...args) {
+    const [first, second] = args;
     if (typeof first === "string") {
       const options = second ?? {};
       return {
-        exclude: { columns, options, name: first }
+        exclude: { columns, options: { ...options, name: first } }
       };
     } else {
       const options = first ?? {};