pqb 0.56.5 → 0.56.7

package/dist/index.mjs

@@ -167,9 +167,7 @@ class ColumnType extends 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 }),
    *   }));
    * });
    * ```
@@ -178,6 +176,7 @@ class ColumnType extends 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
@@ -204,9 +203,9 @@ class ColumnType extends ColumnTypeBase {
    * @param args
    */
   index(...args) {
+    const a = args;
     return pushColumnData(this, "indexes", {
-      options: (typeof args[0] === "string" ? args[1] : args[0]) ?? emptyObject,
-      name: typeof args[0] === "string" ? args[0] : void 0
+      options: (typeof a[0] === "string" ? { ...a[1], name: a[0] } : a[0]) ?? emptyObject
     });
   }
   /**
@@ -312,21 +311,21 @@ class ColumnType extends ColumnTypeBase {
    * @param options - index options
    */
   searchIndex(...args) {
+    const a = args;
     return 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 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
+      }
     });
   }
   /**
@@ -374,11 +373,11 @@ class ColumnType extends ColumnTypeBase {
    * }
    * ```
    */
-  exclude(...args) {
+  exclude(op, ...args) {
+    const a = args;
     return pushColumnData(this, "excludes", {
-      with: args[0],
-      options: (typeof args[1] === "string" ? args[2] : args[1]) ?? emptyObject,
-      name: typeof args[1] === "string" ? args[1] : void 0
+      with: op,
+      options: (typeof a[0] === "string" ? { ...a[1], name: a[0] } : a[0]) ?? emptyObject
     });
   }
   comment(comment) {
@@ -539,6 +538,7 @@ const indexInnerToCode = (index, t) => {
   const columnOptions = ["collate", "opclass", "order", "weight"];
   const indexOptionsKeys = [
     index.options.tsVector ? "unique" : void 0,
+    "name",
     "using",
     "nullsNotDistinct",
     "include",
@@ -584,18 +584,12 @@ const indexInnerToCode = (index, t) => {
         objects.push("{", props, "},");
       }
     }
-    code.push(["[", objects, hasOptions || index.name ? "]," : "]"]);
-    if (index.name) {
-      addCode(code, `  ${singleQuote(index.name)},`);
-    }
+    code.push(["[", objects, hasOptions ? "]," : "]"]);
   } else {
     addCode(
       code,
       `[${index.columns.map((it) => singleQuote(it.column)).join(", ")}]`
     );
-    if (index.name) {
-      addCode(code, `, ${singleQuote(index.name)}`);
-    }
   }
   if (hasOptions) {
     if (columnsMultiline) {
@@ -631,6 +625,7 @@ const excludeInnerToCode = (item, t) => {
   const code = [`${t}.exclude(`];
   const columnOptions = ["collate", "opclass", "order", "with"];
   const optionsKeys = [
+    "name",
     "using",
     "include",
     "with",
@@ -655,10 +650,7 @@ const excludeInnerToCode = (item, t) => {
     }
     objects.push("{", props, "},");
   }
-  code.push(["[", objects, hasOptions || item.name ? "]," : "]"]);
-  if (item.name) {
-    addCode(code, `  ${singleQuote(item.name)},`);
-  }
+  code.push(["[", objects, hasOptions ? "]," : "]"]);
   if (hasOptions) {
     code.push(["{"]);
     const options = [];
@@ -766,12 +758,10 @@ const foreignKeyArgumentToCode = ({
 };
 const columnIndexesToCode = (items) => {
   const code = [];
-  for (const { options, name } of items) {
-    addCode(
-      code,
-      `.${options.unique ? "unique" : "index"}(${name ? `${singleQuote(name)}` : ""}`
-    );
+  for (const { options } of items) {
+    addCode(code, `.${options.unique ? "unique" : "index"}(`);
     const arr = [
+      options.name && `name: ${singleQuote(options.name)},`,
       options.collate && `collate: ${singleQuote(options.collate)},`,
       options.opclass && `opclass: ${singleQuote(options.opclass)},`,
       options.order && `order: ${singleQuote(options.order)},`,
@@ -783,7 +773,7 @@ const columnIndexesToCode = (items) => {
       options.where && `where: ${singleQuote(options.where)},`
     ].filter((x) => !!x);
     if (arr.length) {
-      addCode(code, name ? `, {` : "{");
+      addCode(code, "{");
       addCode(code, arr);
       addCode(code, "}");
     }
@@ -793,13 +783,13 @@ const columnIndexesToCode = (items) => {
 };
 const columnExcludesToCode = (items) => {
   const code = [];
-  for (const { options, name, with: w } of items) {
+  for (const { options, with: w } of items) {
     addCode(code, `.exclude('${w}'`);
     const arr = [
+      options.name && `name: ${singleQuote(options.name)},`,
       options.collate && `collate: ${singleQuote(options.collate)},`,
       options.opclass && `opclass: ${singleQuote(options.opclass)},`,
       options.order && `order: ${singleQuote(options.order)},`,
-      name && `name: ${singleQuote(name)},`,
       options.using && `using: ${singleQuote(options.using)},`,
       options.include && `include: ${typeof options.include === "string" ? singleQuote(options.include) : `[${options.include.map(singleQuote).join(", ")}]`},`,
       options.with && `with: ${singleQuote(options.with)},`,
@@ -878,7 +868,9 @@ const columnCode = (type, ctx, key, code) => {
   }
   if (data.explicitSelect) addCode(code, ".select(false)");
   if (data.isNullable) addCode(code, ".nullable()");
-  if (data.as) addCode(code, `.as(${data.as.toCode(ctx, key)})`);
+  if (data.as && !ctx.migration) {
+    addCode(code, `.as(${data.as.toCode(ctx, key)})`);
+  }
   if (data.default !== void 0 && data.default !== data.defaultDefault && (!ctx.migration || typeof data.default !== "function")) {
     addCode(
       code,
@@ -1187,6 +1179,17 @@ const quoteJsonValue = (arg, ctx, quotedAs, IN) => {
   }
   return addValue(ctx.values, JSON.stringify(arg)) + "::jsonb";
 };
+const serializeJsonValue = (arg, ctx, quotedAs) => {
+  if (arg && typeof arg === "object") {
+    if (isExpression(arg)) {
+      return "to_jsonb(" + arg.toSQL(ctx, quotedAs) + ")";
+    }
+    if ("toSQL" in arg) {
+      return `to_jsonb((${getSqlText(arg.toSQL(ctx))}))`;
+    }
+  }
+  return 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)}`
@@ -1229,21 +1232,24 @@ const json = {
     (key, value, ctx, quotedAs) => `${key} <@ ${quoteValue(value, ctx, quotedAs)}`
   ),
   jsonSet: makeVarArg(
-    (key, [path, value], ctx) => `jsonb_set(${key}, ${encodeJsonPath(ctx, path)}, ${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)}, ${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)}, ${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(
@@ -12817,9 +12823,9 @@ 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 ?? {};
@@ -12832,24 +12838,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 ?? {};