pqb 0.1.7 → 0.1.9

package/dist/index.d.ts

@@ -7,7 +7,7 @@ declare type RawExpression<C extends ColumnType = ColumnType> = {
     __values: unknown[];
     __column: C;
 };
-declare type Expression<T extends Query = Query, C extends ColumnType = ColumnType> = keyof T['selectable'] | RawExpression<C>;
+declare type Expression<T extends Query = Query, C extends ColumnType = ColumnType> = StringKey<keyof T['selectable']> | RawExpression<C>;
 declare type ExpressionOfType<T extends Query, C extends ColumnType, Type> = {
     [K in keyof T['selectable']]: ColumnOutput<T['selectable'][K]['column']> extends Type | null ? K : never;
 }[Selectable<T>] | RawExpression<C>;
@@ -223,8 +223,8 @@ declare class WhereQueryBuilder<Q extends QueryBase = QueryBase> extends Where i
     query: QueryData;
     selectable: Q['selectable'];
     shape: Q['shape'];
+    relations: Q['relations'];
     __model: Query;
-    relations: {};
     withData: {};
     constructor(q: QueryBase | string, shape: ColumnsShape);
     clone<T extends this>(this: T): T;
@@ -1011,9 +1011,7 @@ declare class From {
     _from<T extends Query, Args extends FromArgs<T>>(this: T, ...args: Args): FromResult<T, Args>;
 }
 
-declare type GetArg<T extends QueryBase> = keyof T['selectable'] | (RelationQueryBase & {
-    returnType: 'value' | 'valueOrThrow';
-}) | RawExpression;
+declare type GetArg<T extends QueryBase> = StringKey<keyof T['selectable']> | RawExpression;
 declare type UnwrapRaw<T extends Query, Arg extends GetArg<T>> = Arg extends RawExpression ? Arg['__column'] : Exclude<Arg, RawExpression>;
 declare type GetResult<T extends Query, Arg extends GetArg<T>> = SetQueryReturnsValue<T, UnwrapRaw<T, Arg>>;
 declare type GetOptionalResult<T extends Query, Arg extends GetArg<T>> = SetQueryReturnsValueOptional<T, UnwrapRaw<T, Arg>>;
@@ -1099,20 +1097,20 @@ declare class Json {
     }): JsonPathQueryResult<T, As, Type>;
 }
 
-declare type SelectArg<T extends QueryBase> = keyof T['selectable'] | (T['relations'] extends Record<string, Relation> ? keyof T['relations'] : never) | RelationQueryBase | SelectAsArg<T>;
-declare type SelectAsArg<T extends QueryBase> = Record<string, keyof T['selectable'] | Query | RawExpression>;
-declare type SelectResult<T extends Query, Args extends SelectArg<T>[], SelectAsArgs = SimpleSpread<FilterTuple<Args, SelectAsArg<QueryBase>>>> = AddQuerySelect<T, {
-    [Arg in Args[number] as Arg extends keyof T['selectable'] ? T['selectable'][Arg]['as'] : Arg extends keyof T['relations'] ? Arg : Arg extends RelationQueryBase ? Arg['tableAlias'] extends string ? Arg['tableAlias'] : never : never]: Arg extends keyof T['selectable'] ? T['selectable'][Arg]['column'] : Arg extends RelationQueryBase ? SelectSubQueryResult<Arg> : T['relations'] extends Record<string, Relation> ? Arg extends keyof T['relations'] ? T['relations'][Arg]['returns'] extends 'many' ? ArrayOfColumnsObjects<T['relations'][Arg]['model']['result']> : T['relations'][Arg]['options']['required'] extends true ? ColumnsObject<T['relations'][Arg]['model']['result']> : NullableColumn<ColumnsObject<T['relations'][Arg]['model']['result']>> : never : never;
+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 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]['model']['result']> : T['relations'][Arg]['options']['required'] extends true ? ColumnsObject<T['relations'][Arg]['model']['result']> : NullableColumn<ColumnsObject<T['relations'][Arg]['model']['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 Query ? SelectSubQueryResult<SelectAsArgs[K]> : 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]>> : never;
 }>;
 declare type SelectSubQueryResult<Arg extends Query & {
     [isRequiredRelationKey]?: boolean;
 }> = Arg['returnType'] extends 'all' ? 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, item: Query | RawExpression<ColumnType<unknown, Operators, unknown>> | keyof T["selectable"]) => void;
+declare const addParserForSelectItem: <T extends Query>(q: T, as: string | getValueKey | undefined, key: string, arg: RawExpression<ColumnType<unknown, Operators, unknown>> | Exclude<keyof T["selectable"], number | symbol> | ((q: T) => Query)) => 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, item: SelectArg<T>, columnAs?: string | getValueKey) => SelectItem;
+declare const processSelectArg: <T extends Query>(q: T, as: string | undefined, arg: SelectArg<T>, columnAs?: string | getValueKey) => SelectItem;
 declare class Select {
     select<T extends Query, K extends SelectArg<T>[]>(this: T, ...args: K): SelectResult<T, K>;
     _select<T extends Query, K extends SelectArg<T>[]>(this: T, ...args: K): SelectResult<T, K>;

package/dist/index.esm.js

@@ -2375,9 +2375,6 @@ const aggregateToSql = (ctx, model, item, quotedAs) => {
   return sql.join("");
 };
 
-const relationQueryKey = Symbol("relationQuery");
-const isRequiredRelationKey = Symbol("isRequiredRelation");
-
 class PormError extends Error {
 }
 class NotFoundError extends PormError {
@@ -2439,22 +2436,17 @@ const selectToSql = (ctx, model, query, quotedAs) => {
   if (query.select) {
     const list = [];
     query.select.forEach((item) => {
-      var _a2, _b;
+      var _a2;
       if (typeof item === "string") {
         list.push(
           item === "*" ? ((_a2 = query.join) == null ? void 0 : _a2.length) ? `${quotedAs}.*` : "*" : quoteFullColumn(item, quotedAs)
         );
-      } else if ((_b = item.query) == null ? void 0 : _b[relationQueryKey]) {
-        const relationQuery = item.clone();
-        const as = getQueryAs(relationQuery);
-        relationQuery._as(relationQuery.query[relationQueryKey]);
-        pushSubQuerySql(relationQuery, as, ctx.values, list);
       } else {
         if ("selectAs" in item) {
           const obj = item.selectAs;
           for (const as in obj) {
             const value = obj[as];
-            if (typeof value === "object") {
+            if (typeof value === "object" || typeof value === "function") {
               if (isRaw(value)) {
                 list.push(`${getRaw(value, ctx.values)} AS ${q(as)}`);
               } else {
@@ -3101,30 +3093,31 @@ const addParserForRawExpression = (q, key, raw) => {
   if (parser)
     addParserToQuery(q.query, key, parser);
 };
-const addParserForSelectItem = (q, as, key, item) => {
+const addParserForSelectItem = (q, as, key, arg) => {
   var _a, _b, _c, _d;
-  if (typeof item === "object") {
-    if (isRaw(item)) {
-      addParserForRawExpression(q, key, item);
-    } else {
-      const parsers = getQueryParsers(item);
-      if (parsers) {
-        if (item.query.take) {
-          addParserToQuery(q.query, key, (item2) => parseRecord(parsers, item2));
-        } else {
-          addParserToQuery(
-            q.query,
-            key,
-            (items) => items.map((item2) => parseRecord(parsers, item2))
-          );
-        }
+  if (typeof arg === "object") {
+    addParserForRawExpression(q, key, arg);
+    return arg;
+  } else if (typeof arg === "function") {
+    const rel = arg(q);
+    const parsers = getQueryParsers(rel);
+    if (parsers) {
+      if (rel.query.take) {
+        addParserToQuery(q.query, key, (item) => parseRecord(parsers, item));
+      } else {
+        addParserToQuery(
+          q.query,
+          key,
+          (items) => items.map((item) => parseRecord(parsers, item))
+        );
       }
     }
+    return rel;
   } else {
-    const index = item.indexOf(".");
+    const index = arg.indexOf(".");
     if (index !== -1) {
-      const table = item.slice(0, index);
-      const column = item.slice(index + 1);
+      const table = arg.slice(0, index);
+      const column = arg.slice(index + 1);
       if (table === as) {
         const parser = (_a = q.columnsParsers) == null ? void 0 : _a[column];
         if (parser)
@@ -3135,10 +3128,11 @@ const addParserForSelectItem = (q, as, key, item) => {
           addParserToQuery(q.query, key, parser);
       }
     } else {
-      const parser = (_d = q.columnsParsers) == null ? void 0 : _d[item];
+      const parser = (_d = q.columnsParsers) == null ? void 0 : _d[arg];
       if (parser)
         addParserToQuery(q.query, key, parser);
     }
+    return arg;
   }
 };
 const addParserToQuery = (query, key, parser) => {
@@ -3147,65 +3141,47 @@ const addParserToQuery = (query, key, parser) => {
   else
     query.parsers = { [key]: parser };
 };
-const processSelectArg = (q, as, item, columnAs) => {
-  var _a, _b, _c, _d, _e;
-  if (typeof item === "string") {
-    if (q.relations[item]) {
-      item = q[item];
+const processSelectArg = (q, as, arg, columnAs) => {
+  if (typeof arg === "string") {
+    if (q.relations[arg]) {
+      const rel = q.relations[arg];
+      arg = {
+        [arg]: () => rel.joinQuery(q, rel.query)
+      };
     } else {
-      const index = item.indexOf(".");
-      if (index !== -1) {
-        const table = item.slice(0, index);
-        const column = item.slice(index + 1);
-        if (table === as) {
-          const parser = (_a = q.columnsParsers) == null ? void 0 : _a[column];
-          if (parser)
-            addParserToQuery(q.query, columnAs || column, parser);
-        } else {
-          const parser = (_c = (_b = q.query.joinedParsers) == null ? void 0 : _b[table]) == null ? void 0 : _c[column];
-          if (parser)
-            addParserToQuery(q.query, columnAs || column, parser);
-        }
-      } else {
-        const parser = (_d = q.columnsParsers) == null ? void 0 : _d[item];
-        if (parser)
-          addParserToQuery(q.query, columnAs || item, parser);
-      }
-      return item;
+      return processSelectColumnArg(q, arg, as, columnAs);
     }
   }
-  if ((_e = item.query) == null ? void 0 : _e[relationQueryKey]) {
-    const relation = item;
-    const parsers = relation.query.parsers || relation.columnsParsers;
-    if (parsers) {
-      addParserToQuery(q.query, getQueryAs(relation), (input) => {
-        if (Array.isArray(input)) {
-          input.forEach((record) => {
-            for (const key in parsers) {
-              const value = record[key];
-              if (value !== null) {
-                record[key] = parsers[key](value);
-              }
-            }
-          });
-        } else {
-          for (const key in parsers) {
-            const value = input[key];
-            if (value !== null) {
-              input[key] = parsers[key](value);
-            }
-          }
-        }
-        return input;
-      });
+  return processSelectAsArg(q, arg, as);
+};
+const processSelectColumnArg = (q, arg, as, columnAs) => {
+  var _a, _b, _c, _d;
+  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.columnsParsers) == null ? void 0 : _a[column];
+      if (parser)
+        addParserToQuery(q.query, columnAs || column, parser);
+    } else {
+      const parser = (_c = (_b = q.query.joinedParsers) == null ? void 0 : _b[table]) == null ? void 0 : _c[column];
+      if (parser)
+        addParserToQuery(q.query, columnAs || column, parser);
     }
   } else {
-    for (const key in item) {
-      addParserForSelectItem(q, as, key, item[key]);
-    }
-    return { selectAs: item };
+    const parser = (_d = q.columnsParsers) == null ? void 0 : _d[arg];
+    if (parser)
+      addParserToQuery(q.query, columnAs || arg, parser);
+  }
+  return arg;
+};
+const processSelectAsArg = (q, arg, as) => {
+  const selectAs = {};
+  for (const key in arg) {
+    selectAs[key] = addParserForSelectItem(q, as, key, arg[key]);
   }
-  return item;
+  return { selectAs };
 };
 class Select {
   select(...args) {
@@ -3918,7 +3894,6 @@ class WhereQueryBuilder extends Where {
   constructor(q, shape) {
     super();
     this.query = {};
-    this.relations = {};
     this.withData = {};
     this.table = typeof q === "object" ? q.table : q;
     this.shape = shape;
@@ -5442,5 +5417,8 @@ const createDb = (_a) => {
 
 const defaultsKey = Symbol("defaults");
 
+const relationQueryKey = Symbol("relationQuery");
+const isRequiredRelationKey = Symbol("isRequiredRelation");
+
 export { Adapter, Aggregate, ArrayColumn, ArrayOfColumnsObjects, BigIntColumn, BigSerialColumn, BitColumn, BitVaryingColumn, BooleanColumn, BoxColumn, ByteaColumn, CharColumn, CidrColumn, CircleColumn, Clear, ColumnInfoMethods, ColumnType, ColumnsObject, DateBaseColumn, DateColumn, DateTimeBaseClass, DateTimeWithTimeZoneBaseClass, Db, DecimalBaseColumn, DecimalColumn, Delete, DoublePrecisionColumn, EMPTY_OBJECT, EnumColumn, For, From, Having, InetColumn, Insert, IntegerBaseColumn, IntegerColumn, IntervalColumn, JSONColumn, JSONTextColumn, Join, Json, LimitedTextBaseColumn, LineColumn, LsegColumn, MacAddr8Column, MacAddrColumn, MoneyColumn, MoreThanOneRowError, NotFoundError, NumberAsStringBaseColumn, NumberBaseColumn, OnConflictQueryBuilder, OnQueryBuilder, Operators, PathColumn, PluckResultColumnType, PointColumn, PolygonColumn, PormError, PormInternalError, QueryCallbacks, QueryGet, QueryLog, QueryMethods, QueryUpsert, RealColumn, Select, SerialColumn, SmallIntColumn, SmallSerialColumn, TableSchema, TextBaseColumn, TextColumn, Then, TimeColumn, TimeWithTimeZoneColumn, TimestampColumn, TimestampWithTimeZoneColumn, Transaction, TransactionAdapter, TsQueryColumn, TsVectorColumn, UUIDColumn, UnhandledTypeError, Union, Update, VarCharColumn, Where, WhereQueryBuilder, With, XMLColumn, addOr, addOrNot, addParserForRawExpression, addParserForSelectItem, addParserToQuery, addQueryOn, addQueryOrOn, addWhere, addWhereIn, addWhereNot, aggregate1FunctionNames, applyMixins, array, arrayToEnum, columnTypes, utils as columnUtils, constructType, createDb, createOperator, defaultsKey, discriminatedUnion, emptyObject, enumType, getClonedQueryData, getColumnTypes, getQueryAs, getQueryParsers, getRaw, getTableData, getValidEnumValues, getValueKey, handleResult, instanceOf, intersection, isRaw, isRequiredRelationKey, joinTruthy, jsonTypes, lazy, literal, logColors, logParamToLogObject, map, nativeEnum, newTableData, noop, notNullable, notNullish, nullable, nullish, object, optional, parseRecord, parseResult, processSelectArg, pushQueryArray, pushQueryOn, pushQueryOrOn, pushQueryValue, queryKeysOfNotSimpleQuery, queryMethodByReturnType, quote, raw, record, relationQueryKey, removeFromQuery, required, resetTableData, scalarTypes, set, setQueryObjectValue, toArray, toSql, tuple, union };
 //# sourceMappingURL=index.esm.js.map