pqb 0.42.6 → 0.42.7

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { ExpressionTypeMethod, Expression, RawSQLBase, emptyObject, isTemplateLiteralArgs, ColumnTypeBase, setColumnData, pushColumnData, quoteObjectKey, toArray, singleQuote, addCode, singleQuoteArray, objectHasValues, toSnakeCase, columnDefaultArgumentToCode, columnErrorMessagesToCode, getValueKey, emptyArray, addValue, isExpression, joinTruthy, stringDataToCode, getDefaultLanguage, dateDataToCode, returnArg as returnArg$1, noop, pushOrNewArrayToObject, arrayDataToCode, numberDataToCode, logColors, applyTransforms, callWithThis, setParserToQuery, isRawSQL, pushOrNewArray, setDefaultNowFn, setDefaultLanguage, setCurrentColumnName, makeTimestampsHelpers, setAdapterConnectRetry, isObjectEmpty, ValExpression, applyMixins, snakeCaseKey } from 'orchid-core';
+import { ExpressionTypeMethod, Expression, RawSQLBase, emptyObject, isTemplateLiteralArgs, ColumnTypeBase, setColumnData, pushColumnData, templateLiteralToSQL as templateLiteralToSQL$1, quoteObjectKey, toArray, singleQuote, addCode, singleQuoteArray, objectHasValues, toSnakeCase, columnDefaultArgumentToCode, columnErrorMessagesToCode, getValueKey, emptyArray, addValue, isExpression, joinTruthy, stringDataToCode, getDefaultLanguage, dateDataToCode, returnArg as returnArg$1, noop, pushOrNewArrayToObject, arrayDataToCode, numberDataToCode, logColors, applyTransforms, callWithThis, setParserToQuery, isRawSQL, pushOrNewArray, setDefaultNowFn, setDefaultLanguage, setCurrentColumnName, makeTimestampsHelpers, setAdapterConnectRetry, isObjectEmpty, ValExpression, applyMixins, snakeCaseKey } from 'orchid-core';
 import pg from 'pg';
 import { inspect } from 'node:util';
 import { AsyncLocalStorage } from 'node:async_hooks';
@@ -362,7 +362,21 @@ class ColumnType extends ColumnTypeBase {
    */
   generated(...args) {
     const sql = raw(...args);
-    return setColumnData(this, "generated", (...args2) => sql.toSQL(...args2));
+    return setColumnData(this, "generated", {
+      toSQL(ctx, quoted) {
+        return sql.toSQL(ctx, quoted);
+      },
+      toCode() {
+        let sql2 = ".generated";
+        if (Array.isArray(args[0])) {
+          sql2 += templateLiteralToSQL$1(args);
+        } else {
+          const { raw: raw2, values } = args[0];
+          sql2 += `({ raw: '${raw2.replace(/'/g, "\\'")}'${values ? `, values: ${JSON.stringify(values)}` : ""} })`;
+        }
+        return sql2;
+      }
+    });
   }
 }
 
@@ -726,6 +740,9 @@ const columnCode = (type, ctx, key, code) => {
   } else {
     code[0].unshift(prepend);
   }
+  if (data.generated) {
+    addCode(code, data.generated.toCode());
+  }
   if (data.primaryKey) {
     addCode(
       code,
@@ -1320,32 +1337,59 @@ class TsVectorColumn extends ColumnType {
    * @param args
    */
   generated(...args) {
-    return setColumnData(this, "generated", (ctx, quotedAs) => {
+    const arg = args[0];
+    if (typeof arg === "object" && "raw" in arg) {
+      return super.generated(...args);
+    }
+    const toSQL = (ctx) => {
       const first = args[0];
-      if (typeof first === "string" || !("raw" in first)) {
-        const target = typeof first === "string" ? args[1] : first;
-        const language = typeof first === "string" ? first : this.defaultLanguage;
-        const { snakeCase } = ctx;
-        let sql;
-        if (Array.isArray(target)) {
-          const columns = target.length === 1 ? `"${snakeCase ? toSnakeCase(target[0]) : target[0]}"` : target.map(
-            (column) => `coalesce("${snakeCase ? toSnakeCase(column) : column}", '')`
-          ).join(` || ' ' || `);
-          sql = `to_tsvector('${language}', ${columns})`;
+      const target = typeof first === "string" ? args[1] : first;
+      const language = typeof first === "string" ? first : this.defaultLanguage;
+      const { snakeCase } = ctx;
+      let sql;
+      if (Array.isArray(target)) {
+        const columns = target.length === 1 ? `"${snakeCase ? toSnakeCase(target[0]) : target[0]}"` : target.map(
+          (column) => `coalesce("${snakeCase ? toSnakeCase(column) : column}", '')`
+        ).join(` || ' ' || `);
+        sql = `to_tsvector('${language}', ${columns})`;
+      } else {
+        for (const key in target) {
+          sql = (sql ? sql + " || " : "(") + `setweight(to_tsvector('${language}', coalesce("${snakeCase ? toSnakeCase(key) : key}", '')), '${target[key]}')`;
+        }
+        if (sql) {
+          sql += ")";
         } else {
-          for (const key in target) {
-            sql = (sql ? sql + " || " : "(") + `setweight(to_tsvector('${language}', coalesce("${snakeCase ? toSnakeCase(key) : key}", '')), '${target[key]}')`;
-          }
-          if (sql) {
-            sql += ")";
-          } else {
-            throw new Error("Empty target in the text search generated column");
-          }
+          throw new Error("Empty target in the text search generated column");
         }
-        return sql;
+      }
+      return sql;
+    };
+    const toCode = () => {
+      let code = ".generated(";
+      const first = args[0];
+      let target;
+      if (typeof first === "string") {
+        code += `'${first}', `;
+        target = args[1];
       } else {
-        return raw(...args).toSQL(ctx, quotedAs);
+        target = args[0];
       }
+      if (Array.isArray(target)) {
+        code += `[${target.map((x) => `'${x}'`).join(", ")}]`;
+      } else {
+        const pairs = [];
+        for (const key in target) {
+          pairs.push(
+            `${quoteObjectKey(key)}: '${target[key]}'`
+          );
+        }
+        code += `{ ${pairs.join(", ")} }`;
+      }
+      return code + ")";
+    };
+    return setColumnData(this, "generated", {
+      toSQL,
+      toCode
     });
   }
 }