pqb 0.63.0 → 0.64.0

package/dist/internal.d.ts

@@ -1 +1 @@
-export { AdapterBase, AdapterConfigBase, AfterCommitStandaloneHook, AfterHook, ArrayColumn, ArrayColumnValue, ArrayData, AsyncState, BaseNumberData, BigIntColumn, BigSerialColumn, BitColumn, BitVaryingColumn, BooleanColumn, BoxColumn, ByteaColumn, CidrColumn, CircleColumn, CitextColumn, Code, Codes, Column, ColumnFromDbParams, ColumnSchemaConfig, ColumnSchemaGetterColumns, ColumnSchemaGetterTableClass, ColumnToCodeCtx, ColumnTypeSchemaArg, ColumnsByType, ColumnsShape, ComputedColumnsFromOptions, ComputedOptionsConfig, ComputedOptionsFactory, CreateCtx, CreateData, CreateManyMethodsNames, CreateMethodsNames, CreateSelf, CustomTypeColumn, DateColumn, DateColumnData, DbDomainArg, DbExtension, DbOptions, DbResult, DbSharedOptions, DbSqlMethod, DbStructureDomainsMap, DbTableOptionScopes, DbTableOptions, DecimalColumn, DecimalColumnData, DefaultColumnTypes, DefaultPrivileges, DefaultSchemaConfig, DeleteMethodsNames, DomainColumn, DoublePrecisionColumn, DynamicRawSQL, EmptyObject, EmptyTuple, EnumColumn, Expression, FromArg, FromResult, GeneratorIgnore, HookSelectValue, InetColumn, IntegerColumn, IntervalColumn, IsQuery, IsolationLevel, JSONColumn, JSONTextColumn, JoinQueryMethod, JoinedShapes, LineColumn, LsegColumn, MacAddr8Column, MacAddrColumn, MapTableScopesOption, MaybeArray, MaybePromise, MergeQuery, MoneyColumn, NoPrimaryKeyOption, NonUniqDataItem, NumberColumnData, Operators, OperatorsArray, OperatorsJson, OperatorsOrdinalText, Ord, PathColumn, PickQueryInputType, PickQueryInternal, PickQueryQ, PickQueryRelations, PickQuerySelectableRelations, PickQueryShape, PointColumn, PolygonColumn, PostgisGeographyPointColumn, Query, QueryAfterHook, QueryArraysResult, QueryBeforeActionHook, QueryBeforeHook, QueryData, QueryHasWhere, QueryHookUtils, QueryHooks, QueryInternal, QueryLogObject, QueryLogOptions, QueryLogger, QueryManyTake, QueryManyTakeOptional, QueryOrExpression, QueryResult, QueryResultRow, QueryReturnType, QueryScopes, RawSql, RawSqlBase, RealColumn, RecordKeyTrue, RecordOptionalString, RecordString, RecordStringOrNumber, RecordUnknown, RelationConfigBase, RelationJoinQuery, RelationsBase, SearchWeight, SelectableFromShape, SerialColumn, SerialColumnData, ShallowSimplify, ShapeColumnPrimaryKeys, ShapeUniqueColumns, SingleSql, SingleSqlItem, SmallIntColumn, SmallSerialColumn, Sql, SqlFn, SqlSessionState, StorageOptions, StringColumn, StringData, TableData, TableDataFn, TableDataInput, TableDataItem, TableDataItemsUniqueColumnTuples, TableDataItemsUniqueColumns, TableDataItemsUniqueConstraints, TableDataMethods, TemplateLiteralArgs, TextColumn, TimeColumn, TimestampColumn, TimestampTZColumn, Timestamps, TransactionAdapterBase, TransactionArgs, TransactionOptions, TsQueryColumn, TsVectorColumn, UUIDColumn, UniqueConstraints, UniqueTableDataItem, UnknownColumn, UpdateData, UpsertData, UpsertThis, VarCharColumn, VirtualColumn, WhereArg, XMLColumn, _appendQuery, _clone, _createDbSqlMethod, _hookSelectColumns, _initQueryBuilder, _orCreate, _prependWith, _queryCreate, _queryCreateMany, _queryCreateManyFrom, _queryDefaults, _queryDelete, _queryFindBy, _queryFindByOptional, _queryHookAfterCreate, _queryHookAfterUpdate, _queryInsert, _queryInsertMany, _queryJoinOn, _queryRows, _querySelect, _queryTake, _queryTakeOptional, _queryUpdate, _queryUpdateOrThrow, _queryUpsert, _queryWhere, _queryWhereExists, _queryWhereIn, addCode, addTopCte, addTopCteSql, applyMixins, assignDbDataToColumn, backtickQuote, cloneQueryBaseUnscoped, codeToString, colors, columnsShapeToCode, constraintInnerToCode, consumeColumnName, deepCompare, defaultSchemaConfig, emptyArray, emptyObject, escapeForMigration, escapeString, excludeInnerToCode, exhaustive, getCallerFilePath, getClonedQueryData, getColumnBaseType, getColumnTypes, getFreeAlias, getFreeSetAlias, getImportPath, getPrimaryKeys, getQueryAs, getQuerySchema, getShapeFromSelect, getSqlText, getStackTrace, getSupportedDefaultPrivileges, indexInnerToCode, isExpression, isQueryReturnsAll, isRawSQL, logColors, logParamToLogObject, makeColumnNullable, makeColumnTypes, makeColumnsByType, noop, objectHasValues, omit, parseTableData, parseTableDataInput, pathToLog, pick, pluralize, prepareSubQueryForSql, primaryKeyInnerToCode, pushQueryOnForOuter, pushQueryValueImmutable, pushTableDataCode, quoteObjectKey, quoteTableWithSchema, raw, rawSqlToCode, referencesArgsToCode, returnArg, setColumnData, setColumnEncode, setColumnParse, setColumnParseNull, setConnectRetryConfig, setCurrentColumnName, setDataValue, setDefaultLanguage, setFreeAlias, setQueryObjectValueImmutable, singleQuote, snakeCaseKey, tableDataMethods, toArray, toCamelCase, toPascalCase, toSnakeCase, wrapAdapterFnWithConnectRetry } from './index';
+export { AdapterBase, AdapterConfigBase, AfterCommitStandaloneHook, AfterHook, ArrayColumn, ArrayColumnValue, ArrayData, AsyncState, BaseNumberData, BigIntColumn, BigSerialColumn, BitColumn, BitVaryingColumn, BooleanColumn, BoxColumn, ByteaColumn, CidrColumn, CircleColumn, CitextColumn, Code, Codes, Column, ColumnFromDbParams, ColumnSchemaConfig, ColumnSchemaGetterColumns, ColumnSchemaGetterTableClass, ColumnToCodeCtx, ColumnTypeSchemaArg, ColumnsByType, ColumnsShape, ComputedColumnsFromOptions, ComputedOptionsConfig, ComputedOptionsFactory, CreateCtx, CreateData, CreateManyMethodsNames, CreateMethodsNames, CreateSelf, CustomTypeColumn, DateColumn, DateColumnData, DbDomainArg, DbExtension, DbOptions, DbResult, DbSharedOptions, DbSqlMethod, DbStructureDomainsMap, DbTableOptionScopes, DbTableOptions, DecimalColumn, DecimalColumnData, DefaultColumnTypes, DefaultPrivileges, DefaultSchemaConfig, DeleteMethodsNames, DomainColumn, DoublePrecisionColumn, DynamicRawSQL, EmptyObject, EmptyTuple, EnumColumn, Expression, FromArg, FromResult, GeneratorIgnore, HookSelectValue, InetColumn, IntegerColumn, IntervalColumn, IsQuery, IsolationLevel, JSONColumn, JSONTextColumn, JoinQueryMethod, JoinedShapes, LineColumn, LsegColumn, MacAddr8Column, MacAddrColumn, MapTableScopesOption, MaybeArray, MaybePromise, MergeQuery, MoneyColumn, NoPrimaryKeyOption, NonUniqDataItem, NumberColumnData, Operators, OperatorsArray, OperatorsJson, OperatorsOrdinalText, Ord, PathColumn, PickQueryInputType, PickQueryInternal, PickQueryQ, PickQueryRelations, PickQuerySelectableRelations, PickQueryShape, PointColumn, PolygonColumn, PostgisGeographyPointColumn, QueryAfterHook, QueryArraysResult, QueryBeforeActionHook, QueryBeforeHook, QueryData, QueryHasWhere, QueryHookUtils, QueryHooks, QueryInternal, QueryLogObject, QueryLogOptions, QueryLogger, QueryManyTake, QueryManyTakeOptional, QueryOrExpression, QueryResult, QueryResultRow, QueryReturnType, QueryScopes, RawSql, RawSqlBase, RealColumn, RecordKeyTrue, RecordOptionalString, RecordString, RecordStringOrNumber, RecordUnknown, RelationConfigBase, RelationJoinQuery, RelationsBase, SearchWeight, SelectableFromShape, SerialColumn, SerialColumnData, ShallowSimplify, ShapeColumnPrimaryKeys, ShapeUniqueColumns, SingleSql, SingleSqlItem, SmallIntColumn, SmallSerialColumn, Sql, SqlFn, SqlSessionState, StorageOptions, StringColumn, StringData, TableData, TableDataFn, TableDataInput, TableDataItem, TableDataItemsUniqueColumnTuples, TableDataItemsUniqueColumns, TableDataItemsUniqueConstraints, TableDataMethods, TemplateLiteralArgs, TextColumn, TimeColumn, TimestampColumn, TimestampTZColumn, Timestamps, TransactionAdapterBase, TransactionArgs, TransactionOptions, TsQueryColumn, TsVectorColumn, UUIDColumn, UniqueConstraints, UniqueTableDataItem, UnknownColumn, UpdateData, UpsertData, UpsertThis, VarCharColumn, VirtualColumn, WhereArg, XMLColumn, _appendQuery, _clone, _createDbSqlMethod, _hookSelectColumns, _initQueryBuilder, _orCreate, _prependWith, _queryCreate, _queryCreateMany, _queryCreateManyFrom, _queryDefaults, _queryDelete, _queryFindBy, _queryFindByOptional, _queryHookAfterCreate, _queryHookAfterUpdate, _queryInsert, _queryInsertMany, _queryJoinOn, _queryRows, _querySelect, _queryTake, _queryTakeOptional, _queryUpdate, _queryUpdateOrThrow, _queryUpsert, _queryWhere, _queryWhereExists, _queryWhereIn, addCode, addTopCte, addTopCteSql, applyMixins, assignDbDataToColumn, backtickQuote, cloneQueryBaseUnscoped, codeToString, colors, columnsShapeToCode, constraintInnerToCode, consumeColumnName, deepCompare, defaultSchemaConfig, emptyArray, emptyObject, escapeForMigration, escapeString, excludeInnerToCode, exhaustive, getCallerFilePath, getClonedQueryData, getColumnBaseType, getColumnTypes, getFreeAlias, getFreeSetAlias, getImportPath, getPrimaryKeys, getQueryAs, getQuerySchema, getShapeFromSelect, getSqlText, getStackTrace, getSupportedDefaultPrivileges, indexInnerToCode, isExpression, isQueryReturnsAll, isRawSQL, logColors, logParamToLogObject, makeColumnNullable, makeColumnTypes, makeColumnsByType, noop, objectHasValues, omit, parseTableData, parseTableDataInput, pathToLog, pick, pluralize, prepareSubQueryForSql, primaryKeyInnerToCode, pushQueryOnForOuter, pushQueryValueImmutable, pushTableDataCode, quoteObjectKey, quoteTableWithSchema, raw, rawSqlToCode, referencesArgsToCode, returnArg, setColumnData, setColumnEncode, setColumnParse, setColumnParseNull, setConnectRetryConfig, setCurrentColumnName, setDataValue, setDefaultLanguage, setFreeAlias, setQueryObjectValueImmutable, singleQuote, snakeCaseKey, tableDataMethods, toArray, toCamelCase, toPascalCase, toSnakeCase, wrapAdapterFnWithConnectRetry } from './index';

package/dist/node-postgres.d.ts

@@ -2054,18 +2054,21 @@ interface QueryDataSources {
     [K: string]: QuerySourceItem;
 }
 
-interface OrderArgSelf extends PickQuerySelectable, PickQueryResult, PickQueryTsQuery {
+declare namespace Order {
+    export interface ArgThis extends PickQuerySelectable, PickQueryResult, PickQueryTsQuery {
+    }
+    export type Arg<T extends ArgThis> = ArgKey<T> | ArgTsQuery<T> | {
+        [K in ArgKey<T> | ArgTsQuery<T>]?: K extends ArgTsQuery<T> ? OrderTsQueryConfig : SortDir;
+    } | Expression;
+    export type Args<T extends ArgThis> = Arg<T>[];
+    type ArgTsQuery<T extends ArgThis> = string | undefined extends T['__tsQuery'] ? never : Exclude<T['__tsQuery'], undefined>;
+    type ArgKey<T extends ArgThis> = {
+        [K in keyof T['__selectable']]: T['__selectable'][K]['column']['queryType'] extends undefined ? never : K;
+    }[keyof T['__selectable']] | {
+        [K in keyof T['result']]: T['result'][K]['dataType'] extends 'array' | 'object' | 'runtimeComputed' ? never : K;
+    }[keyof T['result']];
+    export {};
 }
-type OrderArg<T extends OrderArgSelf> = OrderArgKey<T> | OrderArgTsQuery<T> | {
-    [K in OrderArgKey<T> | OrderArgTsQuery<T>]?: K extends OrderArgTsQuery<T> ? OrderTsQueryConfig : SortDir;
-} | Expression;
-type OrderArgs<T extends OrderArgSelf> = OrderArg<T>[];
-type OrderArgTsQuery<T extends OrderArgSelf> = string | undefined extends T['__tsQuery'] ? never : Exclude<T['__tsQuery'], undefined>;
-type OrderArgKey<T extends OrderArgSelf> = {
-    [K in keyof T['__selectable']]: T['__selectable'][K]['column']['queryType'] extends undefined ? never : K;
-}[keyof T['__selectable']] | {
-    [K in keyof T['result']]: T['result'][K]['dataType'] extends 'array' | 'object' | 'runtimeComputed' ? never : K;
-}[keyof T['result']];
 declare class QueryOrder {
     /**
      * Adds an order by clause to the query.
@@ -2102,7 +2105,7 @@ declare class QueryOrder {
      *
      * @param args - column name(s) or an object with column names and sort directions.
      */
-    order<T extends OrderArgSelf>(this: T, ...args: OrderArgs<T>): T;
+    order<T extends Order.ArgThis>(this: T, ...args: Order.Args<T>): T;
     /**
      * Order by SQL expression
      *
@@ -2117,12 +2120,12 @@ declare class QueryOrder {
     orderSql<T>(this: T, ...args: SQLQueryArgs): T;
 }
 
-interface WindowArg<T extends OrderArgSelf> {
+interface WindowArg<T extends Order.ArgThis> {
     [K: string]: WindowArgDeclaration<T> | Expression;
 }
-interface WindowArgDeclaration<T extends OrderArgSelf = OrderArgSelf> {
+interface WindowArgDeclaration<T extends Order.ArgThis = Order.ArgThis> {
     partitionBy?: SelectableOrExpression<T> | SelectableOrExpressions<T>;
-    order?: OrderArg<T>;
+    order?: Order.Arg<T>;
 }
 type WindowResult<T, W extends RecordUnknown> = T & {
     windows: {
@@ -2156,12 +2159,12 @@ declare class QueryWindow {
      *
      * @param arg - window config
      */
-    window<T extends OrderArgSelf, W extends WindowArg<T>>(this: T, arg: W): WindowResult<T, W>;
+    window<T extends Order.ArgThis, W extends WindowArg<T>>(this: T, arg: W): WindowResult<T, W>;
 }
 
 interface AggregateOptions<T extends PickQuerySelectableResultRelationsWindows> {
     distinct?: boolean;
-    order?: OrderArg<T> | OrderArgs<T>;
+    order?: Order.Arg<T> | Order.Args<T>;
     filter?: WhereArg<T>;
     filterOr?: WhereArgs<T>;
     withinGroup?: boolean;
@@ -4592,22 +4595,27 @@ type CreateRelationsDataOmittingFKeys<T extends CreateSelf, Union> = (Union exte
 } & Partial<Union['nested']> : {
     [P in Union['columns'] & keyof T['inputType']]: CreateColumn<T, P>;
 } | Union['nested']) => void : never) extends (u: infer Obj) => void ? Obj : never;
-type CreateResult<T extends CreateSelf> = T extends {
+type CreateResult<T extends CreateSelf, Data> = T extends {
     isCount: true;
-} ? T : T['returnType'] extends undefined | 'all' ? SetQueryReturnsOneResult<T, NarrowCreateResult<T>> : T['returnType'] extends 'pluck' ? SetQueryReturnsColumnResult<T, NarrowCreateResult<T>> : SetQueryResult<T, NarrowCreateResult<T>>;
-type InsertResult<T extends CreateSelf> = T['__hasSelect'] extends true ? T['returnType'] extends undefined | 'all' ? SetQueryReturnsOneResult<T, NarrowCreateResult<T>> : T['returnType'] extends 'pluck' ? SetQueryReturnsColumnResult<T, NarrowCreateResult<T>> : SetQueryResult<T, NarrowCreateResult<T>> : SetQueryReturnsRowCount<T>;
+} ? T : T['returnType'] extends undefined | 'all' ? SetQueryReturnsOneResult<T, NarrowCreateResult<T, Data>> : T['returnType'] extends 'pluck' ? SetQueryReturnsColumnResult<T, NarrowCreateResult<T, Data>> : SetQueryResult<T, NarrowCreateResult<T, Data>>;
+type InsertResult<T extends CreateSelf, Data> = T['__hasSelect'] extends true ? T['returnType'] extends undefined | 'all' ? SetQueryReturnsOneResult<T, NarrowCreateResult<T, Data>> : T['returnType'] extends 'pluck' ? SetQueryReturnsColumnResult<T, NarrowCreateResult<T, Data>> : SetQueryResult<T, NarrowCreateResult<T, Data>> : SetQueryReturnsRowCount<T>;
 type CreateManyResult<T extends CreateSelf> = T extends {
     isCount: true;
-} ? SetQueryResult<T, NarrowCreateResult<T>> : T['returnType'] extends 'one' | 'oneOrThrow' ? SetQueryReturnsAllResult<T, NarrowCreateResult<T>> : T['returnType'] extends 'value' | 'valueOrThrow' ? SetQueryReturnsPluckColumnResult<T, NarrowCreateResult<T>> : SetQueryResult<T, NarrowCreateResult<T>>;
-type InsertManyResult<T extends CreateSelf> = T['__hasSelect'] extends true ? T['returnType'] extends 'one' | 'oneOrThrow' ? SetQueryReturnsAllResult<T, NarrowCreateResult<T>> : T['returnType'] extends 'value' | 'valueOrThrow' ? SetQueryReturnsPluckColumnResult<T, NarrowCreateResult<T>> : SetQueryResult<T, NarrowCreateResult<T>> : SetQueryReturnsRowCountMany<T>;
+} ? T : T['returnType'] extends 'one' | 'oneOrThrow' ? SetQueryReturnsAll<T> : T['returnType'] extends 'value' | 'valueOrThrow' ? SetValueQueryReturnsPluckColumn<T> : T;
+type InsertManyResult<T extends CreateSelf> = T['__hasSelect'] extends true ? T['returnType'] extends 'one' | 'oneOrThrow' ? SetQueryReturnsAll<T> : T['returnType'] extends 'value' | 'valueOrThrow' ? SetValueQueryReturnsPluckColumn<T> : T : SetQueryReturnsRowCountMany<T>;
 /**
  * When creating a record with a *belongs to* nested record,
  * un-nullify foreign key columns of the result.
  *
  * The same should work as well with any non-null columns passed to `create`, but it's to be implemented later.
  */
-type NarrowCreateResult<T extends CreateSelf> = EmptyObject extends T['relations'] ? T['result'] : {
-    [K in keyof T['result']]: K extends T['relations'][keyof T['relations']]['omitForeignKeyInCreate'] ? Column.Pick.QueryColumnOfTypeAndOps<string, Exclude<T['result'][K]['type'], null>, T['result'][K]['operators']> : T['result'][K];
+type NarrowCreateResult<T extends CreateSelf, Data> = EmptyObject extends T['relations'] ? T['result'] : {
+    [K in keyof T['result']]: true extends {
+        [R in keyof T['relations']]: K extends T['relations'][R]['omitForeignKeyInCreate'] ? T['relations'][R]['dataForCreate'] extends {
+            columns: unknown;
+            nested: unknown;
+        } ? keyof T['relations'][R]['dataForCreate']['nested'] extends keyof Data ? true : T['relations'][R]['dataForCreate']['columns'] extends keyof Data ? null | undefined extends Data[T['relations'][R]['dataForCreate']['columns']] ? never : true : never : never : never;
+    }[keyof T['relations']] ? Column.Pick.QueryColumnOfTypeAndOps<string, Exclude<T['result'][K]['outputType'], null>, T['result'][K]['operators']> : T['result'][K];
 };
 type IgnoreResult<T extends CreateSelf> = T['returnType'] extends 'oneOrThrow' ? QueryTakeOptional<T> : T['returnType'] extends 'valueOrThrow' ? SetQueryReturnsColumnOptional<T, T['result']['value']> : T;
 type OnConflictArg<T extends PickQueryUniqueProperties> = T['internal']['uniqueColumnNames'] | T['internal']['uniqueColumnTuples'] | Expression | {
@@ -4618,6 +4626,7 @@ type AddQueryDefaults<T extends CreateSelf, DefaultKeys extends PropertyKey> = {
         [K in keyof T['__defaults'] | DefaultKeys]: true;
     } : T[K];
 };
+type ExtraPropertiesAreNotAllowed<T extends CreateSelf, Data> = keyof Data extends keyof T['inputType'] | keyof T['relations'] ? Data : `Extra properties are not allowed: ${Exclude<keyof Data, keyof T['inputType'] | keyof T['relations']> & string}`;
 declare class QueryCreate {
     /**
      * `create` and `insert` create a single record.
@@ -4668,16 +4677,12 @@ declare class QueryCreate {
      *   )
      *   .from('b');
      * ```
-     *
-     * @param data - data for the record, may have values, raw SQL, queries, relation operations.
      */
-    create<T extends CreateSelf>(this: T, data: CreateData<T>): CreateResult<T>;
+    create<T extends CreateSelf, Data extends CreateData<T>>(this: T, data: ExtraPropertiesAreNotAllowed<T, Data>): CreateResult<T, Data>;
     /**
      * Works exactly as {@link create}, except that it returns inserted row count by default.
-     *
-     * @param data - data for the record, may have values, raw SQL, queries, relation operations.
      */
-    insert<T extends CreateSelf>(this: T, data: CreateData<T>): InsertResult<T>;
+    insert<T extends CreateSelf, Data extends CreateData<T>>(this: T, data: ExtraPropertiesAreNotAllowed<T, Data>): InsertResult<T, Data>;
     /**
      * `createMany` and `insertMany` will create a batch of records.
      *
@@ -8269,7 +8274,7 @@ declare module "./node-postgres" {
          * @param search - name of the search to use the query from
          * @param options - `text` for a text source, `options` for `ts_headline` options
          */
-        headline<T extends OrderArgSelf>(this: T, search: HeadlineSearchArg<T>, options?: HeadlineParams<T>): SetQueryReturnsColumnOrThrow<T, Column.Pick.QueryColumnOfType<string>>;
+        headline<T extends Order.ArgThis>(this: T, search: HeadlineSearchArg<T>, options?: HeadlineParams<T>): SetQueryReturnsColumnOrThrow<T, Column.Pick.QueryColumnOfType<string>>;
     }
 }
 type SearchArg<T extends PickQuerySelectable, As extends string> = {
@@ -9315,6 +9320,12 @@ interface Query extends IsQuery, PickQueryTable, PickQueryShape, PickQuerySelect
     relationQueries: IsQueries;
     error: new (message: string, length: number, name: QueryErrorName) => QueryError;
 }
+declare namespace Query {
+    namespace Order {
+        type Arg<T extends Order.ArgThis> = Order.Arg<T>;
+        type Args<T extends Order.ArgThis> = Order.Args<T>;
+    }
+}
 type SelectableOfType<T extends PickQuerySelectable, Type> = {
     [K in keyof T['__selectable']]: T['__selectable'][K]['column']['type'] extends Type | null ? K : never;
 }[keyof T['__selectable']];

package/dist/postgres-js.d.ts

@@ -2054,18 +2054,21 @@ interface QueryDataSources {
     [K: string]: QuerySourceItem;
 }
 
-interface OrderArgSelf extends PickQuerySelectable, PickQueryResult, PickQueryTsQuery {
+declare namespace Order {
+    export interface ArgThis extends PickQuerySelectable, PickQueryResult, PickQueryTsQuery {
+    }
+    export type Arg<T extends ArgThis> = ArgKey<T> | ArgTsQuery<T> | {
+        [K in ArgKey<T> | ArgTsQuery<T>]?: K extends ArgTsQuery<T> ? OrderTsQueryConfig : SortDir;
+    } | Expression;
+    export type Args<T extends ArgThis> = Arg<T>[];
+    type ArgTsQuery<T extends ArgThis> = string | undefined extends T['__tsQuery'] ? never : Exclude<T['__tsQuery'], undefined>;
+    type ArgKey<T extends ArgThis> = {
+        [K in keyof T['__selectable']]: T['__selectable'][K]['column']['queryType'] extends undefined ? never : K;
+    }[keyof T['__selectable']] | {
+        [K in keyof T['result']]: T['result'][K]['dataType'] extends 'array' | 'object' | 'runtimeComputed' ? never : K;
+    }[keyof T['result']];
+    export {};
 }
-type OrderArg<T extends OrderArgSelf> = OrderArgKey<T> | OrderArgTsQuery<T> | {
-    [K in OrderArgKey<T> | OrderArgTsQuery<T>]?: K extends OrderArgTsQuery<T> ? OrderTsQueryConfig : SortDir;
-} | Expression;
-type OrderArgs<T extends OrderArgSelf> = OrderArg<T>[];
-type OrderArgTsQuery<T extends OrderArgSelf> = string | undefined extends T['__tsQuery'] ? never : Exclude<T['__tsQuery'], undefined>;
-type OrderArgKey<T extends OrderArgSelf> = {
-    [K in keyof T['__selectable']]: T['__selectable'][K]['column']['queryType'] extends undefined ? never : K;
-}[keyof T['__selectable']] | {
-    [K in keyof T['result']]: T['result'][K]['dataType'] extends 'array' | 'object' | 'runtimeComputed' ? never : K;
-}[keyof T['result']];
 declare class QueryOrder {
     /**
      * Adds an order by clause to the query.
@@ -2102,7 +2105,7 @@ declare class QueryOrder {
      *
      * @param args - column name(s) or an object with column names and sort directions.
      */
-    order<T extends OrderArgSelf>(this: T, ...args: OrderArgs<T>): T;
+    order<T extends Order.ArgThis>(this: T, ...args: Order.Args<T>): T;
     /**
      * Order by SQL expression
      *
@@ -2117,12 +2120,12 @@ declare class QueryOrder {
     orderSql<T>(this: T, ...args: SQLQueryArgs): T;
 }
 
-interface WindowArg<T extends OrderArgSelf> {
+interface WindowArg<T extends Order.ArgThis> {
     [K: string]: WindowArgDeclaration<T> | Expression;
 }
-interface WindowArgDeclaration<T extends OrderArgSelf = OrderArgSelf> {
+interface WindowArgDeclaration<T extends Order.ArgThis = Order.ArgThis> {
     partitionBy?: SelectableOrExpression<T> | SelectableOrExpressions<T>;
-    order?: OrderArg<T>;
+    order?: Order.Arg<T>;
 }
 type WindowResult<T, W extends RecordUnknown> = T & {
     windows: {
@@ -2156,12 +2159,12 @@ declare class QueryWindow {
      *
      * @param arg - window config
      */
-    window<T extends OrderArgSelf, W extends WindowArg<T>>(this: T, arg: W): WindowResult<T, W>;
+    window<T extends Order.ArgThis, W extends WindowArg<T>>(this: T, arg: W): WindowResult<T, W>;
 }
 
 interface AggregateOptions<T extends PickQuerySelectableResultRelationsWindows> {
     distinct?: boolean;
-    order?: OrderArg<T> | OrderArgs<T>;
+    order?: Order.Arg<T> | Order.Args<T>;
     filter?: WhereArg<T>;
     filterOr?: WhereArgs<T>;
     withinGroup?: boolean;
@@ -4592,22 +4595,27 @@ type CreateRelationsDataOmittingFKeys<T extends CreateSelf, Union> = (Union exte
 } & Partial<Union['nested']> : {
     [P in Union['columns'] & keyof T['inputType']]: CreateColumn<T, P>;
 } | Union['nested']) => void : never) extends (u: infer Obj) => void ? Obj : never;
-type CreateResult<T extends CreateSelf> = T extends {
+type CreateResult<T extends CreateSelf, Data> = T extends {
     isCount: true;
-} ? T : T['returnType'] extends undefined | 'all' ? SetQueryReturnsOneResult<T, NarrowCreateResult<T>> : T['returnType'] extends 'pluck' ? SetQueryReturnsColumnResult<T, NarrowCreateResult<T>> : SetQueryResult<T, NarrowCreateResult<T>>;
-type InsertResult<T extends CreateSelf> = T['__hasSelect'] extends true ? T['returnType'] extends undefined | 'all' ? SetQueryReturnsOneResult<T, NarrowCreateResult<T>> : T['returnType'] extends 'pluck' ? SetQueryReturnsColumnResult<T, NarrowCreateResult<T>> : SetQueryResult<T, NarrowCreateResult<T>> : SetQueryReturnsRowCount<T>;
+} ? T : T['returnType'] extends undefined | 'all' ? SetQueryReturnsOneResult<T, NarrowCreateResult<T, Data>> : T['returnType'] extends 'pluck' ? SetQueryReturnsColumnResult<T, NarrowCreateResult<T, Data>> : SetQueryResult<T, NarrowCreateResult<T, Data>>;
+type InsertResult<T extends CreateSelf, Data> = T['__hasSelect'] extends true ? T['returnType'] extends undefined | 'all' ? SetQueryReturnsOneResult<T, NarrowCreateResult<T, Data>> : T['returnType'] extends 'pluck' ? SetQueryReturnsColumnResult<T, NarrowCreateResult<T, Data>> : SetQueryResult<T, NarrowCreateResult<T, Data>> : SetQueryReturnsRowCount<T>;
 type CreateManyResult<T extends CreateSelf> = T extends {
     isCount: true;
-} ? SetQueryResult<T, NarrowCreateResult<T>> : T['returnType'] extends 'one' | 'oneOrThrow' ? SetQueryReturnsAllResult<T, NarrowCreateResult<T>> : T['returnType'] extends 'value' | 'valueOrThrow' ? SetQueryReturnsPluckColumnResult<T, NarrowCreateResult<T>> : SetQueryResult<T, NarrowCreateResult<T>>;
-type InsertManyResult<T extends CreateSelf> = T['__hasSelect'] extends true ? T['returnType'] extends 'one' | 'oneOrThrow' ? SetQueryReturnsAllResult<T, NarrowCreateResult<T>> : T['returnType'] extends 'value' | 'valueOrThrow' ? SetQueryReturnsPluckColumnResult<T, NarrowCreateResult<T>> : SetQueryResult<T, NarrowCreateResult<T>> : SetQueryReturnsRowCountMany<T>;
+} ? T : T['returnType'] extends 'one' | 'oneOrThrow' ? SetQueryReturnsAll<T> : T['returnType'] extends 'value' | 'valueOrThrow' ? SetValueQueryReturnsPluckColumn<T> : T;
+type InsertManyResult<T extends CreateSelf> = T['__hasSelect'] extends true ? T['returnType'] extends 'one' | 'oneOrThrow' ? SetQueryReturnsAll<T> : T['returnType'] extends 'value' | 'valueOrThrow' ? SetValueQueryReturnsPluckColumn<T> : T : SetQueryReturnsRowCountMany<T>;
 /**
  * When creating a record with a *belongs to* nested record,
  * un-nullify foreign key columns of the result.
  *
  * The same should work as well with any non-null columns passed to `create`, but it's to be implemented later.
  */
-type NarrowCreateResult<T extends CreateSelf> = EmptyObject extends T['relations'] ? T['result'] : {
-    [K in keyof T['result']]: K extends T['relations'][keyof T['relations']]['omitForeignKeyInCreate'] ? Column.Pick.QueryColumnOfTypeAndOps<string, Exclude<T['result'][K]['type'], null>, T['result'][K]['operators']> : T['result'][K];
+type NarrowCreateResult<T extends CreateSelf, Data> = EmptyObject extends T['relations'] ? T['result'] : {
+    [K in keyof T['result']]: true extends {
+        [R in keyof T['relations']]: K extends T['relations'][R]['omitForeignKeyInCreate'] ? T['relations'][R]['dataForCreate'] extends {
+            columns: unknown;
+            nested: unknown;
+        } ? keyof T['relations'][R]['dataForCreate']['nested'] extends keyof Data ? true : T['relations'][R]['dataForCreate']['columns'] extends keyof Data ? null | undefined extends Data[T['relations'][R]['dataForCreate']['columns']] ? never : true : never : never : never;
+    }[keyof T['relations']] ? Column.Pick.QueryColumnOfTypeAndOps<string, Exclude<T['result'][K]['outputType'], null>, T['result'][K]['operators']> : T['result'][K];
 };
 type IgnoreResult<T extends CreateSelf> = T['returnType'] extends 'oneOrThrow' ? QueryTakeOptional<T> : T['returnType'] extends 'valueOrThrow' ? SetQueryReturnsColumnOptional<T, T['result']['value']> : T;
 type OnConflictArg<T extends PickQueryUniqueProperties> = T['internal']['uniqueColumnNames'] | T['internal']['uniqueColumnTuples'] | Expression | {
@@ -4618,6 +4626,7 @@ type AddQueryDefaults<T extends CreateSelf, DefaultKeys extends PropertyKey> = {
         [K in keyof T['__defaults'] | DefaultKeys]: true;
     } : T[K];
 };
+type ExtraPropertiesAreNotAllowed<T extends CreateSelf, Data> = keyof Data extends keyof T['inputType'] | keyof T['relations'] ? Data : `Extra properties are not allowed: ${Exclude<keyof Data, keyof T['inputType'] | keyof T['relations']> & string}`;
 declare class QueryCreate {
     /**
      * `create` and `insert` create a single record.
@@ -4668,16 +4677,12 @@ declare class QueryCreate {
      *   )
      *   .from('b');
      * ```
-     *
-     * @param data - data for the record, may have values, raw SQL, queries, relation operations.
      */
-    create<T extends CreateSelf>(this: T, data: CreateData<T>): CreateResult<T>;
+    create<T extends CreateSelf, Data extends CreateData<T>>(this: T, data: ExtraPropertiesAreNotAllowed<T, Data>): CreateResult<T, Data>;
     /**
      * Works exactly as {@link create}, except that it returns inserted row count by default.
-     *
-     * @param data - data for the record, may have values, raw SQL, queries, relation operations.
      */
-    insert<T extends CreateSelf>(this: T, data: CreateData<T>): InsertResult<T>;
+    insert<T extends CreateSelf, Data extends CreateData<T>>(this: T, data: ExtraPropertiesAreNotAllowed<T, Data>): InsertResult<T, Data>;
     /**
      * `createMany` and `insertMany` will create a batch of records.
      *
@@ -8269,7 +8274,7 @@ declare module "./postgres-js" {
          * @param search - name of the search to use the query from
          * @param options - `text` for a text source, `options` for `ts_headline` options
          */
-        headline<T extends OrderArgSelf>(this: T, search: HeadlineSearchArg<T>, options?: HeadlineParams<T>): SetQueryReturnsColumnOrThrow<T, Column.Pick.QueryColumnOfType<string>>;
+        headline<T extends Order.ArgThis>(this: T, search: HeadlineSearchArg<T>, options?: HeadlineParams<T>): SetQueryReturnsColumnOrThrow<T, Column.Pick.QueryColumnOfType<string>>;
     }
 }
 type SearchArg<T extends PickQuerySelectable, As extends string> = {
@@ -9315,6 +9320,12 @@ interface Query extends IsQuery, PickQueryTable, PickQueryShape, PickQuerySelect
     relationQueries: IsQueries;
     error: new (message: string, length: number, name: QueryErrorName) => QueryError;
 }
+declare namespace Query {
+    namespace Order {
+        type Arg<T extends Order.ArgThis> = Order.Arg<T>;
+        type Args<T extends Order.ArgThis> = Order.Args<T>;
+    }
+}
 type SelectableOfType<T extends PickQuerySelectable, Type> = {
     [K in keyof T['__selectable']]: T['__selectable'][K]['column']['type'] extends Type | null ? K : never;
 }[keyof T['__selectable']];

package/dist/public.d.ts

@@ -1 +1 @@
-export { Db, NotFoundError, OrchidOrmInternalError, QueryError, QueryHelperResult, QuerySchema, copyTableData, createDbWithAdapter, getColumnInfo, testTransaction } from './index';
+export { Db, NotFoundError, OrchidOrmInternalError, Query, QueryError, QueryHelperResult, QuerySchema, copyTableData, createDbWithAdapter, getColumnInfo, testTransaction } from './index';

package/dist/public.js

@@ -20,10 +20,6 @@ Object.defineProperty(exports, "QueryError", {
   enumerable: true,
   get: function () { return index.QueryError; }
 });
-Object.defineProperty(exports, "QueryHelperResult", {
-  enumerable: true,
-  get: function () { return index.QueryHelperResult; }
-});
 Object.defineProperty(exports, "copyTableData", {
   enumerable: true,
   get: function () { return index.copyTableData; }

package/dist/public.js.map

@@ -1 +1 @@
-{"version":3,"file":"public.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"public.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/dist/public.mjs

@@ -1,2 +1,2 @@
-export { Db, NotFoundError, OrchidOrmInternalError, QueryError, QueryHelperResult, copyTableData, createDbWithAdapter, getColumnInfo, testTransaction } from './index';
+export { Db, NotFoundError, OrchidOrmInternalError, QueryError, copyTableData, createDbWithAdapter, getColumnInfo, testTransaction } from './index';
 //# sourceMappingURL=public.mjs.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pqb",
-  "version": "0.63.0",
+  "version": "0.64.0",
   "description": "Postgres query builder",
   "keywords": [
     "pg",
@@ -67,7 +67,7 @@
     "check": "jest",
     "types": "tsc",
     "test:ci": "jest --coverage --coverageReporters json-summary",
-    "build": "rimraf ./dist/ && rollup -c ./rollup.config.mjs",
+    "build": "rm -rf ./dist/ && rollup -c ./rollup.config.mjs",
     "lint": "oxlint --fix",
     "lint:check": "oxlint",
     "fmt": "oxfmt",