pqb 0.35.6 → 0.36.0

package/dist/index.d.ts

@@ -5057,9 +5057,14 @@ type SelectArgs<T extends SelectSelf> = ('*' | keyof T['meta']['selectable'])[];
 interface SelectAsArg<T extends SelectSelf> {
     [K: string]: keyof T['meta']['selectable'] | Expression | ((q: {
         [K in keyof T]: K extends keyof T['relations'] ? T[K] extends (...args: any[]) => any ? ReturnType<T[K]> : never : T[K];
-    }) => (QueryBase & {
-        returnType: Exclude<QueryReturnType, 'rows'>;
-    }) | Expression);
+    }) => unknown);
+}
+type SelectAsFnReturnType = {
+    result: QueryColumns;
+    returnType: Exclude<QueryReturnType, 'rows'>;
+} | Expression;
+interface SelectAsCheckReturnTypes {
+    [K: string]: PropertyKey | Expression | ((q: never) => SelectAsFnReturnType);
 }
 type SelectResult<T extends SelectSelf, Columns extends PropertyKey[]> = {
     [K in keyof T]: K extends 'result' ? ('*' extends Columns[number] ? {
@@ -5072,7 +5077,7 @@ type SelectResult<T extends SelectSelf, Columns extends PropertyKey[]> = {
         [K in Columns[number] as T['meta']['selectable'][K]['as']]: T['meta']['selectable'][K]['column'];
     }) & (T['meta']['hasSelect'] extends true ? Omit<T['result'], Columns[number]> : unknown)>> : T[K];
 } & QueryMetaHasSelect;
-type SelectResultObj<T extends SelectSelf, Obj> = {
+type SelectResultObj<T extends SelectSelf, Obj> = Obj extends SelectAsCheckReturnTypes ? {
     [K in keyof T]: K extends 'meta' ? T['meta'] & {
         hasSelect: true;
         selectable: SelectAsSelectable<Obj>;
@@ -5081,7 +5086,9 @@ type SelectResultObj<T extends SelectSelf, Obj> = {
     } : K extends 'then' ? QueryThen<GetQueryResult<T, {
         [K in T['meta']['hasSelect'] extends true ? keyof Obj | keyof T['result'] : keyof Obj]: K extends keyof Obj ? SelectAsValueResult<T, Obj[K]> : K extends keyof T['result'] ? T['result'][K] : never;
     }>> : T[K];
-};
+} : `Invalid return type of ${{
+    [K in keyof Obj]: Obj[K] extends (...args: any[]) => any ? ReturnType<Obj[K]> extends SelectAsFnReturnType ? never : K : never;
+}[keyof Obj] & string}`;
 type SelectResultColumnsAndObj<T extends SelectSelf, Columns extends PropertyKey[], Obj> = {
     [K in keyof T]: K extends 'meta' ? T['meta'] & {
         hasSelect: true;
@@ -7355,7 +7362,10 @@ interface ColumnData extends ColumnDataBase {
     compression?: string;
     foreignKeys?: TableData.ColumnReferences[];
     identity?: TableData.Identity;
-    generated?: RawSQLBase;
+    generated?(ctx: {
+        values: unknown[];
+        snakeCase: boolean | undefined;
+    }, quotedAs?: string): string;
 }
 interface ColumnFromDbParams {
     isNullable?: boolean;

package/dist/index.js

@@ -380,7 +380,8 @@ class ColumnType extends orchidCore.ColumnTypeBase {
    * @param args - raw SQL
    */
   generated(...args) {
-    return orchidCore.setColumnData(this, "generated", raw(...args));
+    const sql = raw(...args);
+    return orchidCore.setColumnData(this, "generated", (...args2) => sql.toSQL(...args2));
   }
 }
 
@@ -461,6 +462,10 @@ const columnsShapeToCode = (shape, t) => {
   for (const key in shape) {
     if (hasTimestamps && (key === "createdAt" || key === "updatedAt"))
       continue;
+    const column = shape[key];
+    const name = column.data.name;
+    if (name === key)
+      column.data.name = void 0;
     code.push(
       ...combineCodeElements([
         `${orchidCore.quoteObjectKey(key)}: `,
@@ -468,6 +473,8 @@ const columnsShapeToCode = (shape, t) => {
         ","
       ])
     );
+    if (name === key)
+      column.data.name = name;
   }
   if (hasTimestamps) {
     code.push(`...${t}.timestamps(),`);
@@ -1517,26 +1524,33 @@ class TsVectorColumn extends ColumnType {
    * @param args
    */
   generated(...args) {
-    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;
-      let sql;
-      if (Array.isArray(target)) {
-        const columns = target.length === 1 ? `"${target[0]}"` : target.map((column) => `coalesce("${column}", '')`).join(` || ' ' || `);
-        sql = `to_tsvector('${language}', ${columns})`;
-      } else {
-        for (const key in target) {
-          sql = (sql ? sql + " || " : "(") + `setweight(to_tsvector('${language}', coalesce("${key}", '')), '${target[key]}')`;
+    return orchidCore.setColumnData(this, "generated", (ctx, quotedAs) => {
+      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 ? orchidCore.toSnakeCase(target[0]) : target[0]}"` : target.map(
+            (column) => `coalesce("${snakeCase ? orchidCore.toSnakeCase(column) : column}", '')`
+          ).join(` || ' ' || `);
+          sql = `to_tsvector('${language}', ${columns})`;
+        } else {
+          for (const key in target) {
+            sql = (sql ? sql + " || " : "(") + `setweight(to_tsvector('${language}', coalesce("${snakeCase ? orchidCore.toSnakeCase(key) : key}", '')), '${target[key]}')`;
+          }
+          if (sql) {
+            sql += ")";
+          } else {
+            throw new Error("Empty target in the text search generated column");
+          }
         }
-        if (sql)
-          sql += ")";
+        return sql;
+      } else {
+        return raw(...args).toSQL(ctx, quotedAs);
       }
-      const arr = [sql];
-      arr.raw = arr;
-      args = [arr];
-    }
-    return super.generated(...args);
+    });
   }
 }
 class TsQueryColumn extends ColumnType {