pqb 0.10.4 → 0.10.6

package/dist/index.d.ts

@@ -460,17 +460,17 @@ declare class QueryGet {
 }
 
 declare type SelectArg<T extends QueryBase> = StringKey<keyof T['selectable']> | (T['relations'] extends Record<string, Relation> ? StringKey<keyof T['relations']> : never) | SelectAsArg<T>;
-declare type SelectAsArg<T extends QueryBase> = Record<string, StringKey<keyof T['selectable']> | RawExpression | ((q: T) => Query)>;
+declare type SelectAsArg<T extends QueryBase> = Record<string, StringKey<keyof T['selectable']> | RawExpression | ((q: T) => Query | RawExpression)>;
 declare type SelectResult<T extends Query, Args extends SelectArg<T>[], SelectAsArgs = SimpleSpread<FilterTuple<Args, SelectAsArg<T>>>> = AddQuerySelect<T, {
     [Arg in Args[number] as Arg extends keyof T['selectable'] ? T['selectable'][Arg]['as'] : Arg extends keyof T['relations'] ? Arg : never]: Arg extends keyof T['selectable'] ? T['selectable'][Arg]['column'] : T['relations'] extends Record<string, Relation> ? Arg extends keyof T['relations'] ? T['relations'][Arg]['returns'] extends 'many' ? ArrayOfColumnsObjects<T['relations'][Arg]['table']['result']> : T['relations'][Arg]['options']['required'] extends true ? ColumnsObject<T['relations'][Arg]['table']['result']> : NullableColumn<ColumnsObject<T['relations'][Arg]['table']['result']>> : never : never;
 } & {
-    [K in keyof SelectAsArgs]: SelectAsArgs[K] extends keyof T['selectable'] ? T['selectable'][SelectAsArgs[K]]['column'] : SelectAsArgs[K] extends RawExpression ? SelectAsArgs[K]['__column'] : SelectAsArgs[K] extends (q: T) => Query ? SelectSubQueryResult<ReturnType<SelectAsArgs[K]>> : SelectAsArgs[K] extends ((q: T) => Query) | RawExpression ? SelectSubQueryResult<ReturnType<Exclude<SelectAsArgs[K], RawExpression>>> | Exclude<SelectAsArgs[K], (q: T) => Query>['__column'] : never;
+    [K in keyof SelectAsArgs]: SelectAsArgs[K] extends keyof T['selectable'] ? T['selectable'][SelectAsArgs[K]]['column'] : SelectAsArgs[K] extends RawExpression ? SelectAsArgs[K]['__column'] : SelectAsArgs[K] extends (q: T) => RawExpression ? ReturnType<SelectAsArgs[K]>['__column'] : SelectAsArgs[K] extends (q: T) => Query ? SelectSubQueryResult<ReturnType<SelectAsArgs[K]>> : SelectAsArgs[K] extends ((q: T) => Query) | RawExpression ? SelectSubQueryResult<ReturnType<Exclude<SelectAsArgs[K], RawExpression>>> | Exclude<SelectAsArgs[K], (q: T) => Query>['__column'] : never;
 }>;
 declare type SelectSubQueryResult<Arg extends Query & {
     [isRequiredRelationKey]?: boolean;
 }> = QueryReturnsAll<Arg['returnType']> extends true ? ArrayOfColumnsObjects<Arg['result']> : Arg['returnType'] extends 'valueOrThrow' ? Arg['result']['value'] : Arg['returnType'] extends 'pluck' ? PluckResultColumnType<Arg['result']['pluck']> : Arg[isRequiredRelationKey] extends true ? ColumnsObject<Arg['result']> : NullableColumn<ColumnsObject<Arg['result']>>;
 declare const addParserForRawExpression: (q: Query, key: string | getValueKey, raw: RawExpression) => void;
-declare const addParserForSelectItem: <T extends Query>(q: T, as: string | getValueKey | undefined, key: string, arg: RawExpression<ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, orchid_core.ColumnDataBase>> | Exclude<keyof T["selectable"], number | symbol> | ((q: T) => Query)) => string | RawExpression | Query;
+declare const addParserForSelectItem: <T extends Query>(q: T, as: string | getValueKey | undefined, key: string, arg: RawExpression<ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, orchid_core.ColumnDataBase>> | Exclude<keyof T["selectable"], number | symbol> | ((q: T) => Query | RawExpression)) => string | RawExpression | Query;
 declare const addParserToQuery: (query: QueryData, key: string | getValueKey, parser: ColumnParser) => void;
 declare const processSelectArg: <T extends Query>(q: T, as: string | undefined, arg: SelectArg<T>, columnAs?: string | getValueKey) => SelectItem;
 declare const getShapeFromSelect: (q: Query, isSubQuery?: boolean) => ColumnsShapeBase;

package/dist/index.js

@@ -714,34 +714,31 @@ const columnIndexesToCode = (indexes) => {
   const code = [];
   for (const index of indexes) {
     orchidCore.addCode(code, `.${index.unique ? "unique" : "index"}(`);
-    for (const key in index) {
-      if (key === "unique")
-        continue;
-      const arr = [];
-      if (index.collate)
-        arr.push(`collate: ${orchidCore.singleQuote(index.collate)},`);
-      if (index.opclass)
-        arr.push(`opclass: ${orchidCore.singleQuote(index.opclass)},`);
-      if (index.order)
-        arr.push(`order: ${orchidCore.singleQuote(index.order)},`);
-      if (index.name)
-        arr.push(`name: ${orchidCore.singleQuote(index.name)},`);
-      if (index.using)
-        arr.push(`using: ${orchidCore.singleQuote(index.using)},`);
-      if (index.include)
-        arr.push(
-          `include: ${typeof index.include === "string" ? orchidCore.singleQuote(index.include) : `[${index.include.map(orchidCore.singleQuote).join(", ")}]`},`
-        );
-      if (index.with)
-        arr.push(`with: ${orchidCore.singleQuote(index.with)},`);
-      if (index.tablespace)
-        arr.push(`tablespace: ${orchidCore.singleQuote(index.tablespace)},`);
-      if (index.where)
-        arr.push(`where: ${orchidCore.singleQuote(index.where)},`);
+    const arr = [];
+    if (index.collate)
+      arr.push(`collate: ${orchidCore.singleQuote(index.collate)},`);
+    if (index.opclass)
+      arr.push(`opclass: ${orchidCore.singleQuote(index.opclass)},`);
+    if (index.order)
+      arr.push(`order: ${orchidCore.singleQuote(index.order)},`);
+    if (index.name)
+      arr.push(`name: ${orchidCore.singleQuote(index.name)},`);
+    if (index.using)
+      arr.push(`using: ${orchidCore.singleQuote(index.using)},`);
+    if (index.include)
+      arr.push(
+        `include: ${typeof index.include === "string" ? orchidCore.singleQuote(index.include) : `[${index.include.map(orchidCore.singleQuote).join(", ")}]`},`
+      );
+    if (index.with)
+      arr.push(`with: ${orchidCore.singleQuote(index.with)},`);
+    if (index.tablespace)
+      arr.push(`tablespace: ${orchidCore.singleQuote(index.tablespace)},`);
+    if (index.where)
+      arr.push(`where: ${orchidCore.singleQuote(index.where)},`);
+    if (arr.length) {
       orchidCore.addCode(code, "{");
       orchidCore.addCode(code, arr);
       orchidCore.addCode(code, "}");
-      break;
     }
     orchidCore.addCode(code, ")");
   }
@@ -3724,13 +3721,17 @@ const addParserForSelectItem = (q, as, key, arg) => {
     q.isSubQuery = true;
     const rel = arg(q);
     q.isSubQuery = false;
-    const { parsers } = rel.query;
-    if (parsers) {
-      addParserToQuery(q.query, key, (item) => {
-        const t = rel.query.returnType || "all";
-        subQueryResult.rows = t === "all" || t === "rows" || t === "pluck" ? item : [item];
-        return parseResult(rel, t, subQueryResult, true);
-      });
+    if (orchidCore.isRaw(rel)) {
+      addParserForRawExpression(q, key, rel);
+    } else {
+      const { parsers } = rel.query;
+      if (parsers) {
+        addParserToQuery(q.query, key, (item) => {
+          const t = rel.query.returnType || "all";
+          subQueryResult.rows = t === "all" || t === "rows" || t === "pluck" ? item : [item];
+          return parseResult(rel, t, subQueryResult, true);
+        });
+      }
     }
     return rel;
   } else {