pqb 0.11.5 → 0.11.6

package/dist/index.d.ts

@@ -288,6 +288,7 @@ declare class TransactionAdapter implements Adapter {
 }
 
 type JoinedShapes = Record<string, ColumnsShapeBase>;
+type JoinedParsers = Record<string, ColumnsParsers>;
 type CommonQueryData = {
     adapter: Adapter;
     shape: ColumnsShapeBase;
@@ -300,7 +301,7 @@ type CommonQueryData = {
     with?: WithItem[];
     withShapes?: Record<string, ColumnsShape>;
     joinedShapes?: JoinedShapes;
-    joinedParsers?: Record<string, ColumnsParsers>;
+    joinedParsers?: JoinedParsers;
     schema?: string;
     select?: SelectItem[];
     as?: string;
@@ -648,24 +649,34 @@ type JoinWithArgs<T extends QueryBase, W extends keyof T['withData']> = [
     op: string,
     rightColumn: Selectable<T> | RawExpression
 ];
-type JoinResult<T extends Query, Require extends boolean, Arg extends JoinFirstArg<T>, J extends Pick<Query, 'result' | 'table' | 'meta'> = Arg extends Query ? Arg : T['relations'] extends Record<string, Relation> ? Arg extends keyof T['relations'] ? T['relations'][Arg]['table'] : Arg extends keyof T['withData'] ? T['withData'][Arg] extends WithDataItem ? {
+type JoinResult<T extends Query, RequireJoined extends boolean, RequireMain extends boolean, Arg extends JoinFirstArg<T>, J extends Pick<Query, 'result' | 'table' | 'meta'> = Arg extends Query ? Arg : T['relations'] extends Record<string, Relation> ? Arg extends keyof T['relations'] ? T['relations'][Arg]['table'] : Arg extends keyof T['withData'] ? T['withData'][Arg] extends WithDataItem ? {
     table: T['withData'][Arg]['table'];
     result: T['withData'][Arg]['shape'];
     meta: EmptyObject;
-} : never : never : never, Result extends ColumnsShape = Require extends true ? J['result'] : {
+} : never : never : never, Result extends ColumnsShape = RequireJoined extends true ? J['result'] : {
     [K in keyof J['result']]: NullableColumn<J['result'][K]>;
-}, As extends string = AliasOrTable<J>> = {
-    [K in keyof T]: K extends 'selectable' ? T['selectable'] & {
-        [K in keyof Result as `${As}.${StringKey<K>}`]: {
-            as: K;
-            column: Result[K];
-        };
-    } & {
-        [K in As]: {
-            as: K;
-            column: Require extends true ? ColumnsObject<J['result']> : NullableColumn<ColumnsObject<J['result']>>;
+}, As extends string = AliasOrTable<J>, Selectable extends SelectableBase = {
+    [K in keyof Result as `${As}.${StringKey<K>}`]: {
+        as: K;
+        column: Result[K];
+    };
+} & {
+    [K in As]: {
+        as: K;
+        column: RequireJoined extends true ? ColumnsObject<J['result']> : NullableColumn<ColumnsObject<J['result']>>;
+    };
+}> = RequireMain extends true ? {
+    [K in keyof T]: K extends 'selectable' ? T['selectable'] & Selectable : T[K];
+} : OptionalMain<T, Selectable>;
+type OptionalMain<T extends Query, Selectable extends SelectableBase, Result extends ColumnsShape = {
+    [K in keyof T['result']]: NullableColumn<T['result'][K]>;
+}> = {
+    [K in keyof T]: K extends 'selectable' ? {
+        [K in keyof T['selectable']]: {
+            as: T['selectable'][K]['as'];
+            column: NullableColumn<T['selectable'][K]['column']>;
         };
-    } : T[K];
+    } & Selectable : K extends 'result' ? Result : K extends 'then' ? QueryThen<T['returnType'], Result> : T[K];
 };
 type JoinCallback<T extends QueryBase, Arg extends JoinFirstArg<T>> = (q: OnQueryBuilder<T, Arg extends keyof T['withData'] ? T['withData'][Arg] extends WithDataItem ? {
     query: QueryData;
@@ -685,22 +696,22 @@ type JoinCallback<T extends QueryBase, Arg extends JoinFirstArg<T>> = (q: OnQuer
     internal: QueryInternal;
 } : never : Arg extends Query ? Arg : T['relations'] extends Record<string, Relation> ? Arg extends keyof T['relations'] ? T['relations'][Arg]['table'] : never : never>) => OnQueryBuilder;
 declare class Join {
-    join<T extends Query, Arg extends JoinFirstArg<T>, Args extends JoinArgs<T, Arg>>(this: T, arg: Arg, ...args: Args): JoinResult<T, true, Arg>;
-    join<T extends Query, Arg extends JoinFirstArg<T>>(this: T, arg: Arg, cb: JoinCallback<T, Arg>): JoinResult<T, true, Arg>;
-    _join<T extends Query, Arg extends JoinFirstArg<T>, Args extends JoinArgs<T, Arg>>(this: T, arg: Arg, ...args: Args): JoinResult<T, true, Arg>;
-    _join<T extends Query, Arg extends JoinFirstArg<T>>(this: T, arg: Arg, cb: JoinCallback<T, Arg>): JoinResult<T, true, Arg>;
-    leftJoin<T extends Query, Arg extends JoinFirstArg<T>, Args extends JoinArgs<T, Arg>>(this: T, arg: Arg, ...args: Args): JoinResult<T, false, Arg>;
-    leftJoin<T extends Query, Arg extends JoinFirstArg<T>>(this: T, arg: Arg, cb: JoinCallback<T, Arg>): JoinResult<T, false, Arg>;
-    _leftJoin<T extends Query, Arg extends JoinFirstArg<T>, Args extends JoinArgs<T, Arg>>(this: T, arg: Arg, ...args: Args): JoinResult<T, false, Arg>;
-    _leftJoin<T extends Query, Arg extends JoinFirstArg<T>>(this: T, arg: Arg, cb: JoinCallback<T, Arg>): JoinResult<T, false, Arg>;
-    rightJoin<T extends Query, Arg extends JoinFirstArg<T>, Args extends JoinArgs<T, Arg>>(this: T, arg: Arg, ...args: Args): JoinResult<T, true, Arg>;
-    rightJoin<T extends Query, Arg extends JoinFirstArg<T>>(this: T, arg: Arg, cb: JoinCallback<T, Arg>): JoinResult<T, true, Arg>;
-    _rightJoin<T extends Query, Arg extends JoinFirstArg<T>, Args extends JoinArgs<T, Arg>>(this: T, arg: Arg, ...args: Args): JoinResult<T, true, Arg>;
-    _rightJoin<T extends Query, Arg extends JoinFirstArg<T>>(this: T, arg: Arg, cb: JoinCallback<T, Arg>): JoinResult<T, true, Arg>;
-    fullJoin<T extends Query, Arg extends JoinFirstArg<T>, Args extends JoinArgs<T, Arg>>(this: T, arg: Arg, ...args: Args): JoinResult<T, false, Arg>;
-    fullJoin<T extends Query, Arg extends JoinFirstArg<T>>(this: T, arg: Arg, cb: JoinCallback<T, Arg>): JoinResult<T, false, Arg>;
-    _fullJoin<T extends Query, Arg extends JoinFirstArg<T>, Args extends JoinArgs<T, Arg>>(this: T, arg: Arg, ...args: Args): JoinResult<T, false, Arg>;
-    _fullJoin<T extends Query, Arg extends JoinFirstArg<T>>(this: T, arg: Arg, cb: JoinCallback<T, Arg>): JoinResult<T, false, Arg>;
+    join<T extends Query, Arg extends JoinFirstArg<T>, Args extends JoinArgs<T, Arg>>(this: T, arg: Arg, ...args: Args): JoinResult<T, true, true, Arg>;
+    join<T extends Query, Arg extends JoinFirstArg<T>>(this: T, arg: Arg, cb: JoinCallback<T, Arg>): JoinResult<T, true, true, Arg>;
+    _join<T extends Query, Arg extends JoinFirstArg<T>, Args extends JoinArgs<T, Arg>>(this: T, arg: Arg, ...args: Args): JoinResult<T, true, true, Arg>;
+    _join<T extends Query, Arg extends JoinFirstArg<T>>(this: T, arg: Arg, cb: JoinCallback<T, Arg>): JoinResult<T, true, true, Arg>;
+    leftJoin<T extends Query, Arg extends JoinFirstArg<T>, Args extends JoinArgs<T, Arg>>(this: T, arg: Arg, ...args: Args): JoinResult<T, false, true, Arg>;
+    leftJoin<T extends Query, Arg extends JoinFirstArg<T>>(this: T, arg: Arg, cb: JoinCallback<T, Arg>): JoinResult<T, false, true, Arg>;
+    _leftJoin<T extends Query, Arg extends JoinFirstArg<T>, Args extends JoinArgs<T, Arg>>(this: T, arg: Arg, ...args: Args): JoinResult<T, false, true, Arg>;
+    _leftJoin<T extends Query, Arg extends JoinFirstArg<T>>(this: T, arg: Arg, cb: JoinCallback<T, Arg>): JoinResult<T, false, true, Arg>;
+    rightJoin<T extends Query, Arg extends JoinFirstArg<T>, Args extends JoinArgs<T, Arg>>(this: T, arg: Arg, ...args: Args): JoinResult<T, true, false, Arg>;
+    rightJoin<T extends Query, Arg extends JoinFirstArg<T>>(this: T, arg: Arg, cb: JoinCallback<T, Arg>): JoinResult<T, true, false, Arg>;
+    _rightJoin<T extends Query, Arg extends JoinFirstArg<T>, Args extends JoinArgs<T, Arg>>(this: T, arg: Arg, ...args: Args): JoinResult<T, true, false, Arg>;
+    _rightJoin<T extends Query, Arg extends JoinFirstArg<T>>(this: T, arg: Arg, cb: JoinCallback<T, Arg>): JoinResult<T, true, false, Arg>;
+    fullJoin<T extends Query, Arg extends JoinFirstArg<T>, Args extends JoinArgs<T, Arg>>(this: T, arg: Arg, ...args: Args): JoinResult<T, false, false, Arg>;
+    fullJoin<T extends Query, Arg extends JoinFirstArg<T>>(this: T, arg: Arg, cb: JoinCallback<T, Arg>): JoinResult<T, false, false, Arg>;
+    _fullJoin<T extends Query, Arg extends JoinFirstArg<T>, Args extends JoinArgs<T, Arg>>(this: T, arg: Arg, ...args: Args): JoinResult<T, false, false, Arg>;
+    _fullJoin<T extends Query, Arg extends JoinFirstArg<T>>(this: T, arg: Arg, cb: JoinCallback<T, Arg>): JoinResult<T, false, false, Arg>;
 }
 type OnArgs<Q extends {
     selectable: SelectableBase;
@@ -3631,4 +3642,4 @@ declare const setQueryObjectValue: <T extends {
     query: QueryData;
 }>(q: T, object: string, key: string, value: unknown) => T;
 
-export { Adapter, AdapterConfig, AdapterOptions, AddQuerySelect, AddQueryWith, AfterCallback, Aggregate, Aggregate1ArgumentTypes, AggregateArg, AggregateItem, AggregateItemArg, AggregateItemOptions, AggregateOptions, AliasOrTable, ArrayColumn, ArrayData, ArrayOfColumnsObjects, BaseRelation, BeforeCallback, BelongsToRelation, BigIntColumn, BigSerialColumn, BitColumn, BitVaryingColumn, BooleanColumn, BooleanExpression, BoxColumn, ByteaColumn, CharColumn, CidrColumn, CircleColumn, CitextColumn, Clear, ClearStatement, ColumnData, ColumnFromDbParams, ColumnInfo, ColumnInfoMethods, ColumnInfoQueryData, ColumnNameOfTable, ColumnOperators, ColumnParser, ColumnType, ColumnTypes, ColumnsObject, ColumnsParsers, ColumnsShape, CommonQueryData, CopyOptions, CopyQueryData, Create, CreateCtx, CreateData, CreateMethodsNames, CustomTypeColumn, DateBaseColumn, DateColumn, DateTimeBaseClass, DateTimeTzBaseClass, Db, DbOptions, DbResult, DbTableOptions, DecimalBaseColumn, DecimalColumn, DefaultColumnTypes, Delete, DeleteMethodsNames, DeleteQueryData, DomainColumn, DoublePrecisionColumn, DropMode, EnumColumn, Expression, ExpressionOfType, ExpressionOutput, For, ForeignKey, ForeignKeyAction, ForeignKeyMatch, ForeignKeyOptions, ForeignKeyTable, From, FromArgs, FromResult, GetArg, HasAndBelongsToManyRelation, HasManyRelation, HasOneRelation, Having, HavingArg, HavingItem, IndexColumnOptions, IndexOptions, InetColumn, InsertQueryData, IntegerBaseColumn, IntegerColumn, IntervalColumn, IsolationLevel, JSONColumn, JSONTextColumn, JSONTypes, Join, JoinArgs, JoinCallback, JoinFirstArg, JoinItem, JoinResult, JoinedShapes, Json, JsonItem, LimitedTextBaseColumn, LineColumn, LsegColumn, MacAddr8Column, MacAddrColumn, MergeQuery, MergeQueryMethods, MoneyColumn, MoreThanOneRowError, NoPrimaryKeyOption, NotFoundError, NumberAsStringBaseColumn, NumberBaseColumn, NumberColumn, NumberColumnData, NumberExpression, OnConflictItem, OnConflictMergeUpdate, OnConflictQueryBuilder, OnQueryBuilder, Operators, OrchidOrmError, OrchidOrmInternalError, OrderArg, OrderItem, PathColumn, PluckResultColumnType, PointColumn, PolygonColumn, Query, QueryArraysResult, QueryBase, QueryCallbacks, QueryData, QueryError, QueryErrorName, QueryGet, QueryLog, QueryLogObject, QueryLogOptions, QueryLogger, QueryMethods, QueryResult, QueryReturnType, QueryReturnsAll, QueryThen, QueryUpsertOrCreate, QueryWithTable, RawMethods, RealColumn, Relation, RelationQuery, RelationQueryBase, RelationQueryData, RelationsBase, Select, SelectAgg, SelectArg, SelectFunctionItem, SelectItem, SelectQueryData, Selectable, SelectableBase, SelectableFromShape, SerialColumn, SerialColumnData, SetQueryReturns, SetQueryReturnsAll, SetQueryReturnsColumnInfo, SetQueryReturnsOne, SetQueryReturnsOneOptional, SetQueryReturnsPluck, SetQueryReturnsRowCount, SetQueryReturnsRows, SetQueryReturnsValue, SetQueryReturnsValueOptional, SetQueryReturnsVoid, SetQueryTableAlias, SetQueryWindows, SetQueryWith, SingleColumnIndexOptions, SmallIntColumn, SmallSerialColumn, SortDir, StringColumn, StringExpression, TableData, TextBaseColumn, TextColumn, TextColumnData, Then, TimeColumn, TimeInterval, TimestampColumn, TimestampTzColumn, ToSqlCtx, ToSqlOptions, Transaction, TransactionAdapter, TransactionOptions, TruncateQueryData, TsQueryColumn, TsVectorColumn, TypeParsers, UUIDColumn, UnhandledTypeError, Union, UnionArg, UnionItem, UnionKind, UnknownColumn, Update, UpdateCtx, UpdateData, UpdateQueryData, UpdateQueryDataItem, UpdateQueryDataObject, UpdatedAtDataInjector, UpsertData, UpsertResult, UpsertThis, VarCharColumn, VirtualColumn, Where, WhereArg, WhereInArg, WhereInColumn, WhereInItem, WhereInValues, WhereItem, WhereJsonPathEqualsItem, WhereOnItem, WhereOnJoinItem, WhereQueryBuilder, WhereResult, WindowArg, WindowArgDeclaration, WindowDeclaration, WindowFunctionOptions, WindowItem, With, WithDataBase, WithDataItem, WithItem, WithOptions, XMLColumn, addOr, addOrNot, addParserForRawExpression, addParserForSelectItem, addParserToQuery, addQueryOn, addQueryOrOn, addWhere, addWhereIn, addWhereNot, aggregate1FunctionNames, anyShape, checkIfASimpleQuery, cloneQueryArrays, columnCheckToCode, columnCode, columnForeignKeysToCode, columnIndexesToCode, columnTypes, utils as columnUtils, columnsByType, columnsShapeToCode, constraintPropsToCode, constraintToCode, createDb, defaultsKey, foreignKeyArgumentToCode, getClonedQueryData, getColumnTypes, getConstraintKind, getQueryAs, getRaw, getShapeFromSelect, getTableData, getValueKey, handleResult, identityToCode, indexToCode, instantiateColumn, isQueryReturnsAll, isRequiredRelationKey, jsonTypes, logColors, logParamToLogObject, makeRegexToFindInSql, makeSql, newTableData, parseRecord, parseResult, primaryKeyToCode, processSelectArg, pushQueryArray, pushQueryOn, pushQueryOrOn, pushQueryValue, queryMethodByReturnType, queryTypeWithLimitOne, quote, quoteString, referencesArgsToCode, relationQueryKey, resetTableData, setQueryObjectValue, simplifyColumnDefault, toSql, toSqlCacheKey };
+export { Adapter, AdapterConfig, AdapterOptions, AddQuerySelect, AddQueryWith, AfterCallback, Aggregate, Aggregate1ArgumentTypes, AggregateArg, AggregateItem, AggregateItemArg, AggregateItemOptions, AggregateOptions, AliasOrTable, ArrayColumn, ArrayData, ArrayOfColumnsObjects, BaseRelation, BeforeCallback, BelongsToRelation, BigIntColumn, BigSerialColumn, BitColumn, BitVaryingColumn, BooleanColumn, BooleanExpression, BoxColumn, ByteaColumn, CharColumn, CidrColumn, CircleColumn, CitextColumn, Clear, ClearStatement, ColumnData, ColumnFromDbParams, ColumnInfo, ColumnInfoMethods, ColumnInfoQueryData, ColumnNameOfTable, ColumnOperators, ColumnParser, ColumnType, ColumnTypes, ColumnsObject, ColumnsParsers, ColumnsShape, CommonQueryData, CopyOptions, CopyQueryData, Create, CreateCtx, CreateData, CreateMethodsNames, CustomTypeColumn, DateBaseColumn, DateColumn, DateTimeBaseClass, DateTimeTzBaseClass, Db, DbOptions, DbResult, DbTableOptions, DecimalBaseColumn, DecimalColumn, DefaultColumnTypes, Delete, DeleteMethodsNames, DeleteQueryData, DomainColumn, DoublePrecisionColumn, DropMode, EnumColumn, Expression, ExpressionOfType, ExpressionOutput, For, ForeignKey, ForeignKeyAction, ForeignKeyMatch, ForeignKeyOptions, ForeignKeyTable, From, FromArgs, FromResult, GetArg, HasAndBelongsToManyRelation, HasManyRelation, HasOneRelation, Having, HavingArg, HavingItem, IndexColumnOptions, IndexOptions, InetColumn, InsertQueryData, IntegerBaseColumn, IntegerColumn, IntervalColumn, IsolationLevel, JSONColumn, JSONTextColumn, JSONTypes, Join, JoinArgs, JoinCallback, JoinFirstArg, JoinItem, JoinResult, JoinedParsers, JoinedShapes, Json, JsonItem, LimitedTextBaseColumn, LineColumn, LsegColumn, MacAddr8Column, MacAddrColumn, MergeQuery, MergeQueryMethods, MoneyColumn, MoreThanOneRowError, NoPrimaryKeyOption, NotFoundError, NumberAsStringBaseColumn, NumberBaseColumn, NumberColumn, NumberColumnData, NumberExpression, OnConflictItem, OnConflictMergeUpdate, OnConflictQueryBuilder, OnQueryBuilder, Operators, OrchidOrmError, OrchidOrmInternalError, OrderArg, OrderItem, PathColumn, PluckResultColumnType, PointColumn, PolygonColumn, Query, QueryArraysResult, QueryBase, QueryCallbacks, QueryData, QueryError, QueryErrorName, QueryGet, QueryLog, QueryLogObject, QueryLogOptions, QueryLogger, QueryMethods, QueryResult, QueryReturnType, QueryReturnsAll, QueryThen, QueryUpsertOrCreate, QueryWithTable, RawMethods, RealColumn, Relation, RelationQuery, RelationQueryBase, RelationQueryData, RelationsBase, Select, SelectAgg, SelectArg, SelectFunctionItem, SelectItem, SelectQueryData, Selectable, SelectableBase, SelectableFromShape, SerialColumn, SerialColumnData, SetQueryReturns, SetQueryReturnsAll, SetQueryReturnsColumnInfo, SetQueryReturnsOne, SetQueryReturnsOneOptional, SetQueryReturnsPluck, SetQueryReturnsRowCount, SetQueryReturnsRows, SetQueryReturnsValue, SetQueryReturnsValueOptional, SetQueryReturnsVoid, SetQueryTableAlias, SetQueryWindows, SetQueryWith, SingleColumnIndexOptions, SmallIntColumn, SmallSerialColumn, SortDir, StringColumn, StringExpression, TableData, TextBaseColumn, TextColumn, TextColumnData, Then, TimeColumn, TimeInterval, TimestampColumn, TimestampTzColumn, ToSqlCtx, ToSqlOptions, Transaction, TransactionAdapter, TransactionOptions, TruncateQueryData, TsQueryColumn, TsVectorColumn, TypeParsers, UUIDColumn, UnhandledTypeError, Union, UnionArg, UnionItem, UnionKind, UnknownColumn, Update, UpdateCtx, UpdateData, UpdateQueryData, UpdateQueryDataItem, UpdateQueryDataObject, UpdatedAtDataInjector, UpsertData, UpsertResult, UpsertThis, VarCharColumn, VirtualColumn, Where, WhereArg, WhereInArg, WhereInColumn, WhereInItem, WhereInValues, WhereItem, WhereJsonPathEqualsItem, WhereOnItem, WhereOnJoinItem, WhereQueryBuilder, WhereResult, WindowArg, WindowArgDeclaration, WindowDeclaration, WindowFunctionOptions, WindowItem, With, WithDataBase, WithDataItem, WithItem, WithOptions, XMLColumn, addOr, addOrNot, addParserForRawExpression, addParserForSelectItem, addParserToQuery, addQueryOn, addQueryOrOn, addWhere, addWhereIn, addWhereNot, aggregate1FunctionNames, anyShape, checkIfASimpleQuery, cloneQueryArrays, columnCheckToCode, columnCode, columnForeignKeysToCode, columnIndexesToCode, columnTypes, utils as columnUtils, columnsByType, columnsShapeToCode, constraintPropsToCode, constraintToCode, createDb, defaultsKey, foreignKeyArgumentToCode, getClonedQueryData, getColumnTypes, getConstraintKind, getQueryAs, getRaw, getShapeFromSelect, getTableData, getValueKey, handleResult, identityToCode, indexToCode, instantiateColumn, isQueryReturnsAll, isRequiredRelationKey, jsonTypes, logColors, logParamToLogObject, makeRegexToFindInSql, makeSql, newTableData, parseRecord, parseResult, primaryKeyToCode, processSelectArg, pushQueryArray, pushQueryOn, pushQueryOrOn, pushQueryValue, queryMethodByReturnType, queryTypeWithLimitOne, quote, quoteString, referencesArgsToCode, relationQueryKey, resetTableData, setQueryObjectValue, simplifyColumnDefault, toSql, toSqlCacheKey };

package/dist/index.js

@@ -161,7 +161,7 @@ const getJoinedColumnName = (data, shape, table, key, isOwnColumn) => {
   return (_c = (isOwnColumn ? shape[key] : void 0) || ((_b = (_a = data.joinedShapes) == null ? void 0 : _a[table]) == null ? void 0 : _b[key])) == null ? void 0 : _c.data.name;
 };
 const revealColumnToSql = (data, shape, column, quotedAs) => {
-  var _a;
+  var _a, _b;
   const index = column.indexOf(".");
   if (index !== -1) {
     const table = column.slice(0, index);
@@ -170,10 +170,12 @@ const revealColumnToSql = (data, shape, column, quotedAs) => {
     return `${quoted}.${q(
       getJoinedColumnName(data, shape, table, key, quoted === quotedAs) || key
     )}`;
+  } else if ((_a = data.joinedShapes) == null ? void 0 : _a[column]) {
+    return `row_to_json("${column}".*)`;
   } else if (quotedAs && shape[column]) {
     return `${quotedAs}.${q(shape[column].data.name || column)}`;
   } else {
-    return q(((_a = shape[column]) == null ? void 0 : _a.data.name) || column);
+    return q(((_b = shape[column]) == null ? void 0 : _b.data.name) || column);
   }
 };
 const revealColumnToSqlWithAs = (data, column, quotedAs) => {
@@ -3722,8 +3724,21 @@ const subQueryResult = {
   rowCount: -1,
   rows: []
 };
+const addParsersForSelectJoined = (q, arg, as = arg) => {
+  const parsers = q.query.joinedParsers[arg];
+  if (parsers) {
+    addParserToQuery(q.query, as, (item) => {
+      subQueryResult.rows = [item];
+      const type = q.query.returnType;
+      q.query.returnType = "one";
+      const res = q.query.handleResult(q, subQueryResult, true);
+      q.query.returnType = type;
+      return res;
+    });
+  }
+};
 const addParserForSelectItem = (q, as, key, arg) => {
-  var _a, _b, _c, _d;
+  var _a, _b, _c, _d, _e;
   if (typeof arg === "object") {
     addParserForRawExpression(q, key, arg);
     return arg;
@@ -3745,23 +3760,27 @@ const addParserForSelectItem = (q, as, key, arg) => {
     }
     return rel;
   } else {
-    const index = arg.indexOf(".");
-    if (index !== -1) {
-      const table = arg.slice(0, index);
-      const column = arg.slice(index + 1);
-      if (table === as) {
-        const parser = (_a = q.query.parsers) == null ? void 0 : _a[column];
-        if (parser)
-          addParserToQuery(q.query, key, parser);
+    if ((_a = q.query.joinedShapes) == null ? void 0 : _a[arg]) {
+      addParsersForSelectJoined(q, arg, key);
+    } else {
+      const index = arg.indexOf(".");
+      if (index !== -1) {
+        const table = arg.slice(0, index);
+        const column = arg.slice(index + 1);
+        if (table === as) {
+          const parser = (_b = q.query.parsers) == null ? void 0 : _b[column];
+          if (parser)
+            addParserToQuery(q.query, key, parser);
+        } else {
+          const parser = (_d = (_c = q.query.joinedParsers) == null ? void 0 : _c[table]) == null ? void 0 : _d[column];
+          if (parser)
+            addParserToQuery(q.query, key, parser);
+        }
       } else {
-        const parser = (_c = (_b = q.query.joinedParsers) == null ? void 0 : _b[table]) == null ? void 0 : _c[column];
+        const parser = (_e = q.query.parsers) == null ? void 0 : _e[arg];
         if (parser)
           addParserToQuery(q.query, key, parser);
       }
-    } else {
-      const parser = (_d = q.query.parsers) == null ? void 0 : _d[arg];
-      if (parser)
-        addParserToQuery(q.query, key, parser);
     }
     return arg;
   }
@@ -3773,20 +3792,10 @@ const addParserToQuery = (query, key, parser) => {
     query.parsers = { [key]: parser };
 };
 const processSelectArg = (q, as, arg, columnAs) => {
-  var _a, _b;
+  var _a;
   if (typeof arg === "string") {
     if ((_a = q.query.joinedShapes) == null ? void 0 : _a[arg]) {
-      const parsers = (_b = q.query.joinedParsers) == null ? void 0 : _b[arg];
-      if (parsers) {
-        addParserToQuery(q.query, arg, (item) => {
-          subQueryResult.rows = [item];
-          const type = q.query.returnType;
-          q.query.returnType = "one";
-          const res = q.query.handleResult(q, subQueryResult, true);
-          q.query.returnType = type;
-          return res;
-        });
-      }
+      addParsersForSelectJoined(q, arg);
       return arg;
     } else if (q.relations[arg]) {
       const rel = q.relations[arg];