pqb 0.47.3 → 0.47.5

package/dist/index.mjs

@@ -561,7 +561,7 @@ const indexInnerToCode = (index, t) => {
   if (columnsMultiline) {
     const objects = [];
     for (const column of index.columns) {
-      const expr = "column" in column ? column.column : column.expression;
+      const expr = "expression" in column ? column.expression : column.column;
       let hasOptions2 = false;
       for (const key in column) {
         if (key !== "column") {
@@ -572,7 +572,7 @@ const indexInnerToCode = (index, t) => {
         objects.push(`${singleQuote(expr)},`);
       } else {
         const props = [
-          `${"column" in column ? "column" : "expression"}: ${singleQuote(
+          `${"expression" in column ? "expression" : "column"}: ${singleQuote(
             expr
           )},`
         ];
@@ -642,9 +642,11 @@ const excludeInnerToCode = (item, t) => {
   const hasOptions = optionsKeys.some((key) => key && item.options[key]);
   const objects = [];
   for (const column of item.columns) {
-    const expr = "column" in column ? column.column : column.expression;
+    const expr = "expression" in column ? column.expression : column.column;
     const props = [
-      `${"column" in column ? "column" : "expression"}: ${singleQuote(expr)},`
+      `${"expression" in column ? "expression" : "column"}: ${singleQuote(
+        expr
+      )},`
     ];
     for (const key of columnOptions) {
       const value = column[key];
@@ -766,12 +768,14 @@ const foreignKeyArgumentToCode = ({
 const columnIndexesToCode = (items) => {
   const code = [];
   for (const { options, name } of items) {
-    addCode(code, `.${options.unique ? "unique" : "index"}(`);
+    addCode(
+      code,
+      `.${options.unique ? "unique" : "index"}(${name ? `${singleQuote(name)}` : ""}`
+    );
     const arr = [
       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.nullsNotDistinct && `nullsNotDistinct: true,`,
@@ -780,7 +784,7 @@ const columnIndexesToCode = (items) => {
       options.where && `where: ${singleQuote(options.where)},`
     ].filter((x) => !!x);
     if (arr.length) {
-      addCode(code, "{");
+      addCode(code, name ? `, {` : "{");
       addCode(code, arr);
       addCode(code, "}");
     }
@@ -2998,12 +3002,7 @@ const runAfterCommit = async (afterCommit, result) => {
 const applyBatchTransforms = (q, batches) => {
   if (q.transform) {
     for (const item of batches) {
-      item.parent[item.key] = applyTransforms(
-        q,
-        q.returnType,
-        q.transform,
-        item.data
-      );
+      item.parent[item.key] = item.data === null ? void 0 : applyTransforms(q, q.returnType, q.transform, item.data);
     }
   }
 };