@rvoh/dream 0.31.0 → 0.31.1

package/dist/types/src/decorators/field/lifecycle/shared.d.ts

@@ -1,34 +1,5 @@
 import Dream from '../../../Dream.js';
-import { DreamColumnNames } from '../../../dream/types.js';
-export type HookType = 'beforeCreate' | 'beforeSave' | 'beforeUpdate' | 'beforeDestroy' | 'afterCreate' | 'afterSave' | 'afterUpdate' | 'afterDestroy' | CommitHookType;
-export type CommitHookType = 'afterCreateCommit' | 'afterSaveCommit' | 'afterUpdateCommit' | 'afterDestroyCommit';
-export interface HookStatement {
-    type: HookType;
-    className: string;
-    method: string;
-    ifChanging?: string[];
-    ifChanged?: string[];
-}
-export interface BeforeHookOpts<T extends Dream | null = null> {
-    ifChanging?: T extends Dream ? DreamColumnNames<T>[] : string[];
-}
-export interface AfterHookOpts<T extends Dream | null = null> {
-    ifChanged?: T extends Dream ? DreamColumnNames<T>[] : string[];
-}
-export interface HookStatementMap {
-    beforeCreate: readonly HookStatement[] | HookStatement[];
-    beforeUpdate: readonly HookStatement[] | HookStatement[];
-    beforeSave: readonly HookStatement[] | HookStatement[];
-    beforeDestroy: readonly HookStatement[] | HookStatement[];
-    afterCreate: readonly HookStatement[] | HookStatement[];
-    afterCreateCommit: readonly HookStatement[] | HookStatement[];
-    afterUpdate: readonly HookStatement[] | HookStatement[];
-    afterUpdateCommit: readonly HookStatement[] | HookStatement[];
-    afterSave: readonly HookStatement[] | HookStatement[];
-    afterSaveCommit: readonly HookStatement[] | HookStatement[];
-    afterDestroy: readonly HookStatement[] | HookStatement[];
-    afterDestroyCommit: readonly HookStatement[] | HookStatement[];
-}
+import { HookStatementMap } from '../../../types/lifecycle.js';
 export declare function blankHooksFactory(dreamClass: typeof Dream, { freeze, }?: {
     freeze?: boolean;
 }): HookStatementMap;

package/dist/types/src/decorators/field/validation/Validates.d.ts

@@ -1,5 +1,5 @@
 import Dream from '../../../Dream.js';
-import { ValidationType } from './shared.js';
+import { ValidationType } from '../../../types/validation.js';
 export default function Validates<VT extends ValidationType, VTArgs extends VT extends 'numericality' ? {
     min?: number;
     max?: number;

package/dist/types/src/dream/DreamClassTransactionBuilder.d.ts

@@ -1,10 +1,12 @@
 import { SelectArg, SelectExpression, Updateable } from 'kysely';
-import { AssociationTableNames } from '../db/reflections.js';
-import { PassthroughOnClause, WhereStatement } from '../decorators/field/association/shared.js';
 import Dream from '../Dream.js';
+import { PassthroughOnClause, WhereStatement } from '../types/associations/shared.js';
+import { AssociationTableNames } from '../types/db.js';
+import { DefaultScopeName, DreamColumnNames, OrderDir, PassthroughColumnNames, PluckEachArgs, PrimaryKeyForFind, TableColumnNames, UpdateableProperties } from '../types/dream.js';
+import { BaseModelColumnTypes, FindEachOpts, QueryWithJoinedAssociationsType, QueryWithJoinedAssociationsTypeAndNoPreload } from '../types/query.js';
+import { JoinedAssociation, JoinedAssociationsTypeFromAssociations, VariadicJoinsArgs, VariadicLeftJoinLoadArgs, VariadicLoadArgs } from '../types/variadic.js';
 import DreamTransaction from './DreamTransaction.js';
-import Query, { BaseModelColumnTypes, FindEachOpts, QueryWithJoinedAssociationsType, QueryWithJoinedAssociationsTypeAndNoPreload } from './Query.js';
-import { DefaultScopeName, DreamColumnNames, JoinedAssociation, JoinedAssociationsTypeFromAssociations, OrderDir, PassthroughColumnNames, PluckEachArgs, PrimaryKeyForFind, TableColumnNames, UpdateableProperties, VariadicJoinsArgs, VariadicLeftJoinLoadArgs, VariadicLoadArgs } from './types.js';
+import Query from './Query.js';
 export default class DreamClassTransactionBuilder<DreamInstance extends Dream> {
     dreamInstance: DreamInstance;
     dreamTransaction: DreamTransaction<Dream>;

package/dist/types/src/dream/DreamInstanceTransactionBuilder.d.ts

@@ -1,10 +1,12 @@
 import Dream from '../Dream.js';
+import { AllDefaultScopeNames, AssociationNameToDream, DreamAssociationNames, DreamAssociationNamesWithoutRequiredOnClauses, DreamAttributes, JoinOnStatements, UpdateableAssociationProperties, UpdateableProperties } from '../types/dream.js';
+import { DefaultQueryTypeOptions, QueryWithJoinedAssociationsType } from '../types/query.js';
+import { JoinedAssociation, JoinedAssociationsTypeFromAssociations, RequiredOnClauseKeys, VariadicJoinsArgs, VariadicLeftJoinLoadArgs, VariadicLoadArgs } from '../types/variadic.js';
 import DreamTransaction from './DreamTransaction.js';
 import { DestroyOptions } from './internal/destroyOptions.js';
 import LeftJoinLoadBuilder from './LeftJoinLoadBuilder.js';
 import LoadBuilder from './LoadBuilder.js';
-import Query, { DefaultQueryTypeOptions, QueryWithJoinedAssociationsType } from './Query.js';
-import { AllDefaultScopeNames, AssociationNameToDream, DreamAssociationNames, DreamAssociationNamesWithoutRequiredOnClauses, DreamAttributes, JoinedAssociation, JoinedAssociationsTypeFromAssociations, JoinOnStatements, RequiredOnClauseKeys, UpdateableAssociationProperties, UpdateableProperties, VariadicJoinsArgs, VariadicLeftJoinLoadArgs, VariadicLoadArgs } from './types.js';
+import Query from './Query.js';
 export default class DreamInstanceTransactionBuilder<DreamInstance extends Dream> {
     dreamInstance: DreamInstance;
     dreamTransaction: DreamTransaction<Dream>;

package/dist/types/src/dream/DreamTransaction.d.ts

@@ -1,6 +1,6 @@
 import { Transaction } from 'kysely';
-import { HookStatement } from '../decorators/field/lifecycle/shared.js';
 import Dream from '../Dream.js';
+import { HookStatement } from '../types/lifecycle.js';
 export interface TransactionCommitHookStatement {
     hookStatement: HookStatement;
     dreamInstance: Dream;

package/dist/types/src/dream/LeftJoinLoadBuilder.d.ts

@@ -1,7 +1,8 @@
-import { PassthroughOnClause } from '../decorators/field/association/shared.js';
 import Dream from '../Dream.js';
+import { PassthroughOnClause } from '../types/associations/shared.js';
+import { PassthroughColumnNames } from '../types/dream.js';
+import { VariadicLeftJoinLoadArgs } from '../types/variadic.js';
 import DreamTransaction from './DreamTransaction.js';
-import { PassthroughColumnNames, VariadicLeftJoinLoadArgs } from './types.js';
 export default class LeftJoinLoadBuilder<DreamInstance extends Dream> {
     private dream;
     private dreamTransaction;

package/dist/types/src/dream/LoadBuilder.d.ts

@@ -1,7 +1,8 @@
-import { PassthroughOnClause } from '../decorators/field/association/shared.js';
 import Dream from '../Dream.js';
+import { PassthroughOnClause } from '../types/associations/shared.js';
+import { PassthroughColumnNames } from '../types/dream.js';
+import { VariadicLoadArgs } from '../types/variadic.js';
 import DreamTransaction from './DreamTransaction.js';
-import { PassthroughColumnNames, VariadicLoadArgs } from './types.js';
 export default class LoadBuilder<DreamInstance extends Dream> {
     private dream;
     private dreamTransaction;

package/dist/types/src/dream/Query.d.ts

@@ -1,29 +1,12 @@
 import { DeleteQueryBuilder, SelectQueryBuilder, UpdateQueryBuilder } from 'kysely';
 import ConnectedToDB from '../db/ConnectedToDB.js';
-import { DbConnectionType } from '../db/types.js';
-import { ColumnNamesAccountingForJoinedAssociations, LimitStatement, OffsetStatement, OrderQueryStatement, PassthroughOnClause, WhereStatement, WhereStatementForJoinedAssociation } from '../decorators/field/association/shared.js';
 import Dream from '../Dream.js';
-import { FindInterfaceWithValue } from '../helpers/typeutils.js';
+import { ColumnNamesAccountingForJoinedAssociations, LimitStatement, OffsetStatement, OrderQueryStatement, PassthroughOnClause, WhereStatement, WhereStatementForJoinedAssociation } from '../types/associations/shared.js';
+import { DbConnectionType } from '../types/db.js';
+import { AllDefaultScopeNames, DefaultScopeName, DreamColumnNames, DreamTableSchema, OrderDir, PassthroughColumnNames, PluckEachArgs, PrimaryKeyForFind, RelaxedJoinOnStatement, RelaxedJoinStatement, RelaxedPreloadOnStatement, RelaxedPreloadStatement, TableColumnNames, TableOrAssociationName } from '../types/dream.js';
+import { DefaultQueryTypeOptions, ExtendQueryType, NamespacedOrBaseModelColumnTypes } from '../types/query.js';
+import { JoinedAssociation, JoinedAssociationsTypeFromAssociations, QueryTypeOptions, VariadicJoinsArgs, VariadicLeftJoinLoadArgs, VariadicLoadArgs } from '../types/variadic.js';
 import DreamTransaction from './DreamTransaction.js';
-import { AllDefaultScopeNames, DefaultScopeName, DreamColumnNames, DreamTableSchema, IdType, JoinedAssociation, JoinedAssociationsTypeFromAssociations, OrderDir, PassthroughColumnNames, PluckEachArgs, PrimaryKeyForFind, QueryTypeOptions, RelaxedJoinOnStatement, RelaxedJoinStatement, RelaxedPreloadOnStatement, RelaxedPreloadStatement, TableColumnNames, TableColumnType, TableOrAssociationName, VariadicJoinsArgs, VariadicLeftJoinLoadArgs, VariadicLoadArgs } from './types.js';
-export type QueryWithJoinedAssociationsType<Q extends Query<any, any>, JoinedAssociations extends Readonly<JoinedAssociation[]>> = Query<Q['dreamInstance'], ExtendQueryType<Q['queryTypeOpts'], Readonly<{
-    joinedAssociations: JoinedAssociations;
-}>>>;
-export type QueryWithJoinedAssociationsTypeAndNoPreload<Q extends Query<any, any>, JoinedAssociations extends Readonly<JoinedAssociation[]> = Readonly<JoinedAssociation[]>> = Query<Q['dreamInstance'], ExtendQueryType<Q['queryTypeOpts'], Readonly<{
-    joinedAssociations: JoinedAssociations;
-    allowPreload: false;
-}>>>;
-export type QueryWithJoinedAssociationsTypeAndNoLeftJoinPreload<Q extends Query<any, any>, JoinedAssociations extends Readonly<JoinedAssociation[]> = Readonly<JoinedAssociation[]>> = Query<Q['dreamInstance'], ExtendQueryType<Q['queryTypeOpts'], Readonly<{
-    joinedAssociations: JoinedAssociations;
-    allowLeftJoinPreload: false;
-}>>>;
-export type DefaultQueryTypeOptions<TableNameSource extends Dream, TableAliasSource extends Dream | string = TableNameSource> = Readonly<{
-    joinedAssociations: Readonly<[]>;
-    rootTableName: TableNameSource['table'];
-    rootTableAlias: TableAliasSource extends Dream ? TableAliasSource['table'] : TableAliasSource;
-    allowPreload: true;
-    allowLeftJoinPreload: true;
-}>;
 export default class Query<DreamInstance extends Dream, QueryTypeOpts extends Readonly<QueryTypeOptions> = DefaultQueryTypeOptions<DreamInstance>> extends ConnectedToDB<DreamInstance> {
     /**
      * @internal
@@ -1116,28 +1099,3 @@ export interface QueryOpts<DreamInstance extends Dream, ColumnType extends Dream
     connection?: DbConnectionType;
     shouldReallyDestroy?: boolean;
 }
-export interface PreloadedDreamsAndWhatTheyPointTo {
-    dream: Dream;
-    pointsToPrimaryKey: IdType;
-}
-export interface FindEachOpts {
-    batchSize?: number;
-}
-export type ExtendQueryType<OriginalOpts extends Readonly<QueryTypeOptions>, Opts extends Readonly<Partial<QueryTypeOptions>>> = Readonly<{
-    joinedAssociations: Opts['joinedAssociations'] extends Readonly<JoinedAssociation[]> ? Readonly<[...OriginalOpts['joinedAssociations'], ...Opts['joinedAssociations']]> : OriginalOpts['joinedAssociations'];
-    rootTableName: OriginalOpts['rootTableName'];
-    rootTableAlias: OriginalOpts['rootTableAlias'];
-    allowPreload: Opts['allowPreload'] extends false ? false : OriginalOpts['allowPreload'];
-    allowLeftJoinPreload: Opts['allowLeftJoinPreload'] extends false ? false : OriginalOpts['allowLeftJoinPreload'];
-}>;
-export type NamespacedColumnType<ColumnName, Q extends Query<any, any>, DreamInstance extends Dream, JoinedAssociationsArr = Q['queryTypeOpts']['joinedAssociations'], AssociationName = ColumnName extends `${infer Name extends string}.${string}` ? Name : never, RealColumnName = ColumnName extends `${string}.${infer Col extends string}` ? Col : never, JoinedAssociation extends FindInterfaceWithValue<JoinedAssociationsArr, 'alias', AssociationName> = FindInterfaceWithValue<JoinedAssociationsArr, 'alias', AssociationName>, JoinedTable = JoinedAssociation['table'] extends never ? DreamInstance['table'] : JoinedAssociation['table'], ReturnType = TableColumnType<DreamInstance['schema'], JoinedTable, RealColumnName>> = ReturnType;
-type NamespacedColumnTypes<ColumnNames, Q extends Query<any, any>, DreamInstance extends Dream> = ColumnNames extends Readonly<[infer First, ...infer Rest]> ? [
-    NamespacedColumnType<First, Q, DreamInstance>,
-    ...NamespacedColumnTypes<Readonly<Rest>, Q, DreamInstance>
-] : [];
-export type BaseModelColumnTypes<ColumnNames, DreamInstance extends Dream> = ColumnNames extends Readonly<[infer First, ...infer Rest]> ? [
-    TableColumnType<DreamInstance['schema'], DreamInstance['table'], First>,
-    ...BaseModelColumnTypes<Readonly<Rest>, DreamInstance>
-] : [];
-export type NamespacedOrBaseModelColumnTypes<ColumnNames, Q extends Query<any, any>, DreamInstance extends Dream> = Q['queryTypeOpts']['joinedAssociations']['length'] extends 0 ? BaseModelColumnTypes<ColumnNames, DreamInstance> : NamespacedColumnTypes<ColumnNames, Q, DreamInstance>;
-export {};

package/dist/types/src/dream/constants.d.ts

@@ -0,0 +1,15 @@
+export declare const primaryKeyTypes: readonly ["bigserial", "bigint", "uuid", "integer"];
+export declare const TRIGRAM_OPERATORS: readonly ["%", "<%", "<<%"];
+declare class RequiredAttribute {
+    constructor();
+}
+declare class PassthroughAttribute {
+    constructor();
+}
+export declare const DreamConst: {
+    passthrough: typeof PassthroughAttribute;
+    required: typeof RequiredAttribute;
+};
+export declare const openapiPrimitiveTypes: readonly ["string", "boolean", "number", "date", "date-time", "double", "integer", "null"];
+export declare const openapiShorthandPrimitiveTypes: readonly ["string", "boolean", "number", "date", "date-time", "double", "integer", "null", "decimal", "string[]", "boolean[]", "number[]", "date[]", "date-time[]", "decimal[]", "double[]", "integer[]", "json"];
+export {};

package/dist/types/src/dream/internal/applyScopeBypassingSettingsToQuery.d.ts

@@ -1,6 +1,6 @@
 import Dream from '../../Dream.js';
+import { AllDefaultScopeNames } from '../../types/dream.js';
 import Query from '../Query.js';
-import { AllDefaultScopeNames } from '../types.js';
 export default function applyScopeBypassingSettingsToQuery<DreamInstance extends Dream>(query: Query<DreamInstance>, { bypassAllDefaultScopes, defaultScopesToBypass, }: {
     bypassAllDefaultScopes: boolean;
     defaultScopesToBypass: AllDefaultScopeNames<DreamInstance>[];

package/dist/types/src/dream/internal/associations/associationQuery.d.ts

@@ -1,7 +1,7 @@
 import Dream from '../../../Dream.js';
+import { AssociationNameToDream, DreamAssociationNames, JoinOnStatements } from '../../../types/dream.js';
 import DreamTransaction from '../../DreamTransaction.js';
 import Query from '../../Query.js';
-import { AssociationNameToDream, DreamAssociationNames, JoinOnStatements } from '../../types.js';
 export default function associationQuery<DreamInstance extends Dream, DB extends DreamInstance['DB'], Schema extends DreamInstance['schema'], AssociationName extends DreamAssociationNames<DreamInstance>, AssociationDream extends AssociationNameToDream<DreamInstance, AssociationName>, AssociationTableName extends AssociationDream['table'], AssociationQuery = Query<AssociationNameToDream<DreamInstance, AssociationName>>>(dream: DreamInstance, txn: (DreamTransaction<Dream> | null) | undefined, associationName: AssociationName, { joinOnStatements, bypassAllDefaultScopes, defaultScopesToBypass, }: {
     joinOnStatements: JoinOnStatements<DB, Schema, AssociationTableName, null>;
     bypassAllDefaultScopes: boolean;

package/dist/types/src/dream/internal/associations/associationUpdateQuery.d.ts

@@ -1,7 +1,7 @@
 import Dream from '../../../Dream.js';
+import { AssociationNameToDream, DreamAssociationNames, JoinOnStatements } from '../../../types/dream.js';
 import DreamTransaction from '../../DreamTransaction.js';
 import Query from '../../Query.js';
-import { AssociationNameToDream, DreamAssociationNames, JoinOnStatements } from '../../types.js';
 export default function associationUpdateQuery<DreamInstance extends Dream, DB extends DreamInstance['DB'], Schema extends DreamInstance['schema'], AssociationName extends DreamAssociationNames<DreamInstance>, AssociationDream extends AssociationNameToDream<DreamInstance, AssociationName>, AssociationTableName extends AssociationDream['table'], AssociationQuery = Query<AssociationNameToDream<DreamInstance, AssociationName>>>(dream: DreamInstance, txn: (DreamTransaction<Dream> | null) | undefined, associationName: AssociationName, { joinOnStatements, bypassAllDefaultScopes, defaultScopesToBypass, }: {
     joinOnStatements: JoinOnStatements<DB, Schema, AssociationTableName, null>;
     bypassAllDefaultScopes: boolean;

package/dist/types/src/dream/internal/associations/createAssociation.d.ts

@@ -1,4 +1,4 @@
 import Dream from '../../../Dream.js';
+import { DreamAssociationNames, UpdateableAssociationProperties } from '../../../types/dream.js';
 import DreamTransaction from '../../DreamTransaction.js';
-import { DreamAssociationNames, UpdateableAssociationProperties } from '../../types.js';
 export default function createAssociation<DreamInstance extends Dream, AssociationName extends DreamAssociationNames<DreamInstance>, PossibleArrayAssociationType = DreamInstance[AssociationName & keyof DreamInstance], AssociationType = PossibleArrayAssociationType extends (infer ElementType)[] ? ElementType & typeof Dream : PossibleArrayAssociationType & typeof Dream, RestrictedAssociationType extends AssociationType extends Dream ? AssociationType : never = AssociationType extends Dream ? AssociationType : never>(dream: DreamInstance, txn: (DreamTransaction<Dream> | null) | undefined, associationName: AssociationName, opts?: UpdateableAssociationProperties<DreamInstance, RestrictedAssociationType>): Promise<NonNullable<AssociationType>>;

package/dist/types/src/dream/internal/associations/destroyAssociation.d.ts

@@ -1,6 +1,6 @@
 import Dream from '../../../Dream.js';
+import { AssociationNameToDream, DreamAssociationNames, JoinOnStatements } from '../../../types/dream.js';
 import DreamTransaction from '../../DreamTransaction.js';
-import { AssociationNameToDream, DreamAssociationNames, JoinOnStatements } from '../../types.js';
 export default function destroyAssociation<DreamInstance extends Dream, DB extends DreamInstance['DB'], Schema extends DreamInstance['schema'], AssociationName extends DreamAssociationNames<DreamInstance>, AssociationDream extends AssociationNameToDream<DreamInstance, AssociationName>, AssociationTableName extends AssociationDream['table']>(dream: DreamInstance, txn: (DreamTransaction<Dream> | null) | undefined, associationName: AssociationName, { joinOnStatements, bypassAllDefaultScopes, defaultScopesToBypass, cascade, reallyDestroy, skipHooks, }: {
     joinOnStatements: JoinOnStatements<DB, Schema, AssociationTableName, null>;
     bypassAllDefaultScopes: boolean;

package/dist/types/src/dream/internal/associations/undestroyAssociation.d.ts

@@ -1,6 +1,6 @@
 import Dream from '../../../Dream.js';
+import { AssociationNameToDream, DreamAssociationNames, JoinOnStatements } from '../../../types/dream.js';
 import DreamTransaction from '../../DreamTransaction.js';
-import { AssociationNameToDream, DreamAssociationNames, JoinOnStatements } from '../../types.js';
 export default function undestroyAssociation<DreamInstance extends Dream, DB extends DreamInstance['DB'], Schema extends DreamInstance['schema'], AssociationName extends DreamAssociationNames<DreamInstance>, AssociationDream extends AssociationNameToDream<DreamInstance, AssociationName>, AssociationTableName extends AssociationDream['table']>(dream: DreamInstance, txn: (DreamTransaction<Dream> | null) | undefined, associationName: AssociationName, { joinOnStatements, bypassAllDefaultScopes, defaultScopesToBypass, cascade, skipHooks, }: {
     joinOnStatements: JoinOnStatements<DB, Schema, AssociationTableName, null>;
     bypassAllDefaultScopes: boolean;

package/dist/types/src/dream/internal/checkSingleValidation.d.ts

@@ -1,3 +1,3 @@
-import ValidationStatement from '../../decorators/field/validation/shared.js';
 import Dream from '../../Dream.js';
+import { ValidationStatement } from '../../types/validation.js';
 export default function checkSingleValidation(dream: Dream, validation: ValidationStatement): any;

package/dist/types/src/dream/internal/destroyOptions.d.ts

@@ -1,5 +1,5 @@
 import Dream from '../../Dream.js';
-import { AllDefaultScopeNames } from '../types.js';
+import { AllDefaultScopeNames } from '../../types/dream.js';
 /**
  * Options for destroying a Dream instance or its associations.
  */

package/dist/types/src/dream/internal/orderByDirection.d.ts

@@ -1,2 +1,2 @@
-import { OrderDir } from '../types.js';
+import { OrderDir } from '../../types/dream.js';
 export default function orderByDirection(dir: OrderDir | null): import("kysely").RawBuilder<unknown>;

package/dist/types/src/dream/internal/runHooksFor.d.ts

@@ -1,5 +1,5 @@
-import { HookStatement, HookType } from '../../decorators/field/lifecycle/shared.js';
 import Dream from '../../Dream.js';
+import { HookStatement, HookType } from '../../types/lifecycle.js';
 import DreamTransaction from '../DreamTransaction.js';
 export default function runHooksFor<T extends Dream>(key: HookType, dream: T, alreadyPersisted: boolean, beforeSaveChanges: Partial<Record<string, {
     was: any;

package/dist/types/src/dream/internal/safelyRunCommitHooks.d.ts

@@ -1,5 +1,5 @@
-import { CommitHookType } from '../../decorators/field/lifecycle/shared.js';
 import Dream from '../../Dream.js';
+import { CommitHookType } from '../../types/lifecycle.js';
 import DreamTransaction from '../DreamTransaction.js';
 export default function safelyRunCommitHooks<DreamInstance extends Dream>(dream: DreamInstance, hookType: CommitHookType, alreadyPersisted: boolean, beforeSaveChanges: Partial<Record<string, {
     was: any;

package/dist/types/src/dream/internal/scopeHelpers.d.ts

@@ -1,5 +1,5 @@
 import Dream from '../../Dream.js';
-import { AllDefaultScopeNames } from '../types.js';
+import { AllDefaultScopeNames } from '../../types/dream.js';
 export declare const DEFAULT_BYPASS_ALL_DEFAULT_SCOPES = false;
 export declare const DEFAULT_CASCADE = true;
 export declare const DEFAULT_DEFAULT_SCOPES_TO_BYPASS: never[];

package/dist/types/src/dream/internal/similarity/SimilarityBuilder.d.ts

@@ -1,10 +1,10 @@
 import { SelectQueryBuilder, UpdateQueryBuilder } from 'kysely';
 import ConnectedToDB from '../../../db/ConnectedToDB.js';
-import { DbConnectionType } from '../../../db/types.js';
-import { WhereStatement } from '../../../decorators/field/association/shared.js';
 import Dream from '../../../Dream.js';
+import { WhereStatement } from '../../../types/associations/shared.js';
+import { DbConnectionType } from '../../../types/db.js';
+import { JoinOnStatements, RelaxedJoinOnStatement, SimilarityStatement } from '../../../types/dream.js';
 import DreamTransaction from '../../DreamTransaction.js';
-import { JoinOnStatements, RelaxedJoinOnStatement, SimilarityStatement } from '../../types.js';
 export default class SimilarityBuilder<DreamInstance extends Dream, DB extends DreamInstance['DB'] = DreamInstance['DB'], Schema extends DreamInstance['schema'] = DreamInstance['schema']> extends ConnectedToDB<DreamInstance> {
     readonly whereStatement: readonly WhereStatement<DB, Schema, any>[];
     readonly whereNotStatement: readonly WhereStatement<DB, Schema, any>[];

package/dist/types/src/dream/internal/sqlResultToDreamInstance.d.ts

@@ -1,4 +1,4 @@
-import { AssociationTableNames } from '../../db/reflections.js';
 import Dream from '../../Dream.js';
+import { AssociationTableNames } from '../../types/db.js';
 export default function sqlResultToDreamInstance<DreamClass extends typeof Dream, DreamInstance extends InstanceType<DreamClass> = InstanceType<DreamClass>, Schema extends DreamInstance['schema'] = DreamInstance['schema'], DB extends DreamInstance['DB'] = DreamInstance['DB'], TableName extends AssociationTableNames<DB, Schema> & keyof DB = InstanceType<DreamClass>['table'], Table extends DB[TableName] = DB[TableName]>(dreamClass: DreamClass, sqlResult: any): InstanceType<DreamClass> | Dream;
 export declare function findExtendingDreamClass(dreamClass: typeof Dream, type: string): typeof Dream | undefined;

package/dist/types/src/dream-application/index.d.ts

@@ -1,6 +1,6 @@
 import { CompiledQuery } from 'kysely';
 import Dream from '../Dream.js';
-import { primaryKeyTypes } from '../dream/types.js';
+import { primaryKeyTypes } from '../dream/constants.js';
 import { EncryptOptions } from '../encrypt/index.js';
 import DreamSerializer from '../serializer/index.js';
 export default class DreamApplication {

package/dist/types/src/errors/ValidationError.d.ts

@@ -1,4 +1,4 @@
-import { ValidationType } from '../decorators/field/validation/shared.js';
+import { ValidationType } from '../types/validation.js';
 export default class ValidationError extends Error {
     dreamClassName: string;
     errors: {

package/dist/types/src/errors/associations/CanOnlyPassBelongsToModelParam.d.ts

@@ -1,6 +1,6 @@
-import { HasManyStatement } from '../../decorators/field/association/HasMany.js';
-import { HasOneStatement } from '../../decorators/field/association/HasOne.js';
 import Dream from '../../Dream.js';
+import { HasManyStatement } from '../../types/associations/hasMany.js';
+import { HasOneStatement } from '../../types/associations/hasOne.js';
 export default class CanOnlyPassBelongsToModelParam extends Error {
     dreamClass: typeof Dream;
     association: HasManyStatement<any, any, any, any> | HasOneStatement<any, any, any, any>;

package/dist/types/src/errors/associations/CannotAssociateThroughPolymorphic.d.ts

@@ -1,6 +1,6 @@
-import { HasManyStatement } from '../../decorators/field/association/HasMany.js';
-import { HasOneStatement } from '../../decorators/field/association/HasOne.js';
 import Dream from '../../Dream.js';
+import { HasManyStatement } from '../../types/associations/hasMany.js';
+import { HasOneStatement } from '../../types/associations/hasOne.js';
 export default class CannotAssociateThroughPolymorphic extends Error {
     dreamClass: typeof Dream;
     association: HasManyStatement<any, any, any, any> | HasOneStatement<any, any, any, any>;

package/dist/types/src/errors/associations/CannotCreateAssociationWithThroughContext.d.ts

@@ -1,6 +1,6 @@
-import { HasManyStatement } from '../../decorators/field/association/HasMany.js';
-import { HasOneStatement } from '../../decorators/field/association/HasOne.js';
 import Dream from '../../Dream.js';
+import { HasManyStatement } from '../../types/associations/hasMany.js';
+import { HasOneStatement } from '../../types/associations/hasOne.js';
 export default class CannotCreateAssociationWithThroughContext extends Error {
     dreamClass: typeof Dream;
     association: HasManyStatement<any, any, any, any> | HasOneStatement<any, any, any, any>;

package/dist/types/src/errors/associations/CannotJoinPolymorphicBelongsToError.d.ts

@@ -1,5 +1,5 @@
-import { BelongsToStatement } from '../../decorators/field/association/BelongsTo.js';
 import Dream from '../../Dream.js';
+import { BelongsToStatement } from '../../types/associations/belongsTo.js';
 export default class CannotJoinPolymorphicBelongsToError extends Error {
     dreamClass: typeof Dream;
     association: BelongsToStatement<any, any, any, any>;

package/dist/types/src/errors/associations/CannotPassNullOrUndefinedToRequiredBelongsTo.d.ts

@@ -1,5 +1,5 @@
-import { BelongsToStatement } from '../../decorators/field/association/BelongsTo.js';
 import Dream from '../../Dream.js';
+import { BelongsToStatement } from '../../types/associations/belongsTo.js';
 export default class CannotPassNullOrUndefinedToRequiredBelongsTo extends Error {
     dreamClass: typeof Dream;
     association: BelongsToStatement<any, any, any, any>;

package/dist/types/src/errors/associations/InvalidComputedForeignKey.d.ts

@@ -1,5 +1,5 @@
-import { PartialAssociationStatement } from '../../decorators/field/association/shared.js';
 import Dream from '../../Dream.js';
+import { PartialAssociationStatement } from '../../types/associations/shared.js';
 export declare class InvalidComputedForeignKey extends Error {
     dreamClass: typeof Dream;
     partialAssociation: PartialAssociationStatement;

package/dist/types/src/errors/associations/MissingRequiredAssociationOnClause.d.ts

@@ -1,5 +1,5 @@
-import { HasManyStatement } from '../../decorators/field/association/HasMany.js';
-import { HasOneStatement } from '../../decorators/field/association/HasOne.js';
+import { HasManyStatement } from '../../types/associations/hasMany.js';
+import { HasOneStatement } from '../../types/associations/hasOne.js';
 export default class MissingRequiredAssociationOnClause extends Error {
     private association;
     private column;

package/dist/types/src/errors/associations/MissingThroughAssociation.d.ts

@@ -1,6 +1,6 @@
-import { HasManyStatement } from '../../decorators/field/association/HasMany.js';
-import { HasOneStatement } from '../../decorators/field/association/HasOne.js';
 import Dream from '../../Dream.js';
+import { HasManyStatement } from '../../types/associations/hasMany.js';
+import { HasOneStatement } from '../../types/associations/hasOne.js';
 export default class MissingThroughAssociation extends Error {
     dreamClass: typeof Dream;
     association: HasManyStatement<any, any, any, any> | HasOneStatement<any, any, any, any>;

package/dist/types/src/errors/associations/MissingThroughAssociationSource.d.ts

@@ -1,6 +1,6 @@
-import { HasManyStatement } from '../../decorators/field/association/HasMany.js';
-import { HasOneStatement } from '../../decorators/field/association/HasOne.js';
 import Dream from '../../Dream.js';
+import { HasManyStatement } from '../../types/associations/hasMany.js';
+import { HasOneStatement } from '../../types/associations/hasOne.js';
 export default class MissingThroughAssociationSource extends Error {
     dreamClass: typeof Dream;
     throughClass: typeof Dream;

package/dist/types/src/helpers/cli/generateMigrationContent.d.ts

@@ -1,4 +1,4 @@
-import { PrimaryKeyType } from '../../dream/types.js';
+import { PrimaryKeyType } from '../../types/dream.js';
 export default function generateMigrationContent({ table, columnsWithTypes, primaryKeyType, createOrAlter, }?: {
     table?: string;
     columnsWithTypes?: string[];

package/dist/types/src/helpers/cli/generateStiMigrationContent.d.ts

@@ -1,4 +1,4 @@
-import { PrimaryKeyType } from '../../dream/types.js';
+import { PrimaryKeyType } from '../../types/dream.js';
 export default function generateStiMigrationContent({ table, columnsWithTypes, primaryKeyType, }?: {
     table?: string;
     columnsWithTypes?: string[];

package/dist/types/src/helpers/db/createDb.d.ts

@@ -1,2 +1,2 @@
-import { DbConnectionType } from '../../db/types.js';
+import { DbConnectionType } from '../../types/db.js';
 export default function createDb(connection: DbConnectionType, dbName?: string | null): Promise<false | undefined>;

package/dist/types/src/helpers/db/dropDb.d.ts

@@ -1,2 +1,2 @@
-import { DbConnectionType } from '../../db/types.js';
+import { DbConnectionType } from '../../types/db.js';
 export default function dropDb(connection: DbConnectionType, dbName?: string | null): Promise<false | undefined>;

package/dist/types/src/helpers/db/foreignKeyTypeFromPrimaryKey.d.ts

@@ -1,2 +1,2 @@
-import { PrimaryKeyType } from '../../dream/types.js';
+import { PrimaryKeyType } from '../../types/dream.js';
 export default function foreignKeyTypeFromPrimaryKey(primaryKey: PrimaryKeyType): "bigint" | "integer" | "uuid";

package/dist/types/src/helpers/inferSerializerFromDreamOrViewModel.d.ts

@@ -1,4 +1,4 @@
 import Dream from '../Dream.js';
-import { SerializableDreamClassOrViewModelClass, SerializableDreamOrViewModel } from '../dream/types.js';
+import { SerializableDreamClassOrViewModelClass, SerializableDreamOrViewModel } from '../types/dream.js';
 export default function inferSerializerFromDreamOrViewModel(obj: Dream | SerializableDreamOrViewModel, serializerKey?: string | undefined): typeof import("../index.js").DreamSerializer | null;
 export declare function inferSerializerFromDreamClassOrViewModelClass(classDef: SerializableDreamClassOrViewModelClass, serializerKey?: string | undefined): typeof import("../index.js").DreamSerializer | null;

package/dist/types/src/helpers/isEmpty.d.ts

@@ -1 +1 @@
-export default function isEmpty(value: any[] | object): boolean;
+export default function isEmpty(value: unknown[] | Record<string, unknown> | Set<unknown> | Map<unknown, unknown>): boolean;

package/dist/types/src/helpers/objectPathsToArrays.d.ts

@@ -1,2 +1,2 @@
-import { RelaxedJoinStatement } from '../dream/types.js';
+import { RelaxedJoinStatement } from '../types/dream.js';
 export default function objectPathsToArrays(obj: RelaxedJoinStatement): string[][];

package/dist/types/src/helpers/sort.d.ts

@@ -0,0 +1,15 @@
+/**
+ * Returns a copy of array containing strings, numbers, bigints, and/or IdTypes, sorted in ascending order.
+ * To sort other types use {@link sortBy}.
+ *
+ *  ```ts
+ * import { sort } from '@rvoh/dream'
+ *
+ * sort([2, 1, 3])
+ * // [1, 2, 3]
+ *
+ * sort(['world', 'Hello', 'hello', 'World'])
+ * // ['hello', 'Hello', 'world', 'World']
+ * ```
+ */
+export default function sort<ArrayType extends string[] | number[] | bigint[]>(array: ArrayType): ArrayType;

package/dist/types/src/helpers/sortBy.d.ts

@@ -1,5 +1,5 @@
-import { IdType } from '../dream/types.js';
-export default function sortBy<T>(array: T[], valueToCompare: (value: T) => number | string | bigint | IdType): T[];
+export default function sortBy<T>(array: T[], valueToCompare: (value: T) => number): T[];
+export default function sortBy<T>(array: T[], valueToCompare: (value: T) => string): T[];
 export declare class UnsupportedValueFromComparisonFunction extends Error {
     private aPrime;
     private bPrime;

package/dist/types/src/helpers/stringCasing.d.ts

@@ -1,4 +1,4 @@
-import { NotReadonlyHead, NotReadonlyTail, ReadonlyHead, ReadonlyTail } from './typeutils.js';
+import { NotReadonlyHead, NotReadonlyTail, ReadonlyHead, ReadonlyTail } from '../types/utils.js';
 type RecursivelyStringCaseObjectKeysInTuple<T extends any[], StringCaseType extends StringCasingOptions> = T['length'] extends 0 ? [] : [
     RecursiveStringCase<NotReadonlyHead<T>, StringCaseType>,
     ...RecursivelyStringCaseObjectKeysInTuple<NotReadonlyTail<T>, StringCaseType>

package/dist/types/src/helpers/uniq.d.ts

@@ -1 +1 @@
-export default function uniq<T>(arr: T[], toKey?: ((a: T) => string) | undefined): T[];
+export default function uniq<ArrayType extends any[], ElementType extends ArrayType extends (infer U)[] ? U : never>(arr: ArrayType, toKey?: ((a: ElementType) => string | number | bigint) | undefined): ArrayType;

package/dist/types/src/index.d.ts

@@ -11,15 +11,13 @@ export { default as SoftDelete } from './decorators/class/SoftDelete.js';
 export { default as STI } from './decorators/class/STI.js';
 export { type DecoratorContext } from './decorators/DecoratorContextType.js';
 export { default as Decorators } from './decorators/Decorators.js';
-export { type WhereStatementForDream, type WhereStatementForDreamClass, } from './decorators/field/association/shared.js';
-export { type ValidationType } from './decorators/field/validation/shared.js';
 export { default as DreamImporter } from './dream-application/helpers/DreamImporter.js';
 export { default as lookupClassByGlobalName } from './dream-application/helpers/lookupClassByGlobalName.js';
 export { default as DreamApplication, type DreamApplicationInitOptions, type DreamApplicationOpts, type DreamLogger, type DreamLogLevel, } from './dream-application/index.js';
 export { default as Dream } from './Dream.js';
+export { DreamConst, openapiPrimitiveTypes, openapiShorthandPrimitiveTypes, type primaryKeyTypes, type TRIGRAM_OPERATORS, } from './dream/constants.js';
 export { default as DreamTransaction } from './dream/DreamTransaction.js';
 export { default as Query } from './dream/Query.js';
-export { DreamConst, type DreamAssociationMetadata, type DreamAttributes, type DreamClassColumn, type DreamColumn, type DreamColumnNames, type DreamOrViewModelSerializerKey, type DreamParamSafeAttributes, type DreamParamSafeColumnNames, type DreamSerializerKey, type DreamSerializers, type DreamTableSchema, type DreamVirtualColumns, type IdType, type PrimaryKeyType, type primaryKeyTypes, type SerializableClassOrSerializerCallback, type SerializableDreamClassOrViewModelClass, type SerializableDreamOrViewModel, type Timestamp, type TRIGRAM_OPERATORS, type UpdateableAssociationProperties, type UpdateableProperties, type ViewModelSerializerKey, } from './dream/types.js';
 export { default as Encrypt, type EncryptAlgorithm, type EncryptOptions } from './encrypt/index.js';
 export { default as NonLoadedAssociation } from './errors/associations/NonLoadedAssociation.js';
 export { default as CreateOrFindByFailedToCreateAndFind } from './errors/CreateOrFindByFailedToCreateAndFind.js';
@@ -49,15 +47,19 @@ export { Range, default as range } from './helpers/range.js';
 export { default as round, type RoundingPrecision } from './helpers/round.js';
 export { default as serializerNameFromFullyQualifiedModelName } from './helpers/serializerNameFromFullyQualifiedModelName.js';
 export { default as snakeify } from './helpers/snakeify.js';
+export { default as sort } from './helpers/sort.js';
 export { default as sortBy } from './helpers/sortBy.js';
 export { default as standardizeFullyQualifiedModelName } from './helpers/standardizeFullyQualifiedModelName.js';
 export { type Camelized, type Hyphenized, type Pascalized, type Snakeified } from './helpers/stringCasing.js';
 export { default as uncapitalize } from './helpers/uncapitalize.js';
 export { default as uniq } from './helpers/uniq.js';
-export { openapiPrimitiveTypes, openapiShorthandPrimitiveTypes, type CommonOpenapiSchemaObjectFields, type OpenapiAllTypes, type OpenapiFormats, type OpenapiNumberFormats, type OpenapiPrimitiveTypes, type OpenapiSchemaArray, type OpenapiSchemaArrayShorthand, type OpenapiSchemaBase, type OpenapiSchemaBody, type OpenapiSchemaBodyShorthand, type OpenapiSchemaCommonFields, type OpenapiSchemaExpressionAllOf, type OpenapiSchemaExpressionAnyOf, type OpenapiSchemaExpressionOneOf, type OpenapiSchemaExpressionRef, type OpenapiSchemaExpressionRefSchemaShorthand, type OpenapiSchemaInteger, type OpenapiSchemaNull, type OpenapiSchemaNumber, type OpenapiSchemaObject, type OpenapiSchemaObjectAllOf, type OpenapiSchemaObjectAllOfShorthand, type OpenapiSchemaObjectAnyOf, type OpenapiSchemaObjectAnyOfShorthand, type OpenapiSchemaObjectBase, type OpenapiSchemaObjectBaseShorthand, type OpenapiSchemaObjectOneOf, type OpenapiSchemaObjectOneOfShorthand, type OpenapiSchemaObjectShorthand, type OpenapiSchemaPartialSegment, type OpenapiSchemaPrimitiveGeneric, type OpenapiSchemaProperties, type OpenapiSchemaPropertiesShorthand, type OpenapiSchemaShorthandExpressionAllOf, type OpenapiSchemaShorthandExpressionAnyOf, type OpenapiSchemaShorthandExpressionOneOf, type OpenapiSchemaShorthandExpressionSerializableRef, type OpenapiSchemaShorthandExpressionSerializerRef, type OpenapiSchemaShorthandPrimitiveGeneric, type OpenapiSchemaString, type OpenapiShorthandAllTypes, type OpenapiShorthandPrimitiveTypes, type OpenapiTypeField, type OpenapiTypeFieldObject, } from './openapi/types.js';
 export { default as ops } from './ops/index.js';
 export { default as RendersMany } from './serializer/decorators/associations/RendersMany.js';
 export { default as RendersOne } from './serializer/decorators/associations/RendersOne.js';
 export { type DreamSerializerAssociationStatement } from './serializer/decorators/associations/shared.js';
 export { default as Attribute, type AttributeStatement, type SerializableTypes, } from './serializer/decorators/attribute.js';
 export { default as DreamSerializer } from './serializer/index.js';
+export { type WhereStatementForDream, type WhereStatementForDreamClass } from './types/associations/shared.js';
+export { type DreamAssociationMetadata, type DreamAttributes, type DreamClassColumn, type DreamColumn, type DreamColumnNames, type DreamOrViewModelSerializerKey, type DreamParamSafeAttributes, type DreamParamSafeColumnNames, type DreamSerializerKey, type DreamSerializers, type DreamTableSchema, type DreamVirtualColumns, type IdType, type PrimaryKeyType, type SerializableClassOrSerializerCallback, type SerializableDreamClassOrViewModelClass, type SerializableDreamOrViewModel, type Timestamp, type UpdateableAssociationProperties, type UpdateableProperties, type ViewModelSerializerKey, } from './types/dream.js';
+export { type CommonOpenapiSchemaObjectFields, type OpenapiAllTypes, type OpenapiFormats, type OpenapiNumberFormats, type OpenapiPrimitiveTypes, type OpenapiSchemaArray, type OpenapiSchemaArrayShorthand, type OpenapiSchemaBase, type OpenapiSchemaBody, type OpenapiSchemaBodyShorthand, type OpenapiSchemaCommonFields, type OpenapiSchemaExpressionAllOf, type OpenapiSchemaExpressionAnyOf, type OpenapiSchemaExpressionOneOf, type OpenapiSchemaExpressionRef, type OpenapiSchemaExpressionRefSchemaShorthand, type OpenapiSchemaInteger, type OpenapiSchemaNull, type OpenapiSchemaNumber, type OpenapiSchemaObject, type OpenapiSchemaObjectAllOf, type OpenapiSchemaObjectAllOfShorthand, type OpenapiSchemaObjectAnyOf, type OpenapiSchemaObjectAnyOfShorthand, type OpenapiSchemaObjectBase, type OpenapiSchemaObjectBaseShorthand, type OpenapiSchemaObjectOneOf, type OpenapiSchemaObjectOneOfShorthand, type OpenapiSchemaObjectShorthand, type OpenapiSchemaPartialSegment, type OpenapiSchemaPrimitiveGeneric, type OpenapiSchemaProperties, type OpenapiSchemaPropertiesShorthand, type OpenapiSchemaShorthandExpressionAllOf, type OpenapiSchemaShorthandExpressionAnyOf, type OpenapiSchemaShorthandExpressionOneOf, type OpenapiSchemaShorthandExpressionSerializableRef, type OpenapiSchemaShorthandExpressionSerializerRef, type OpenapiSchemaShorthandPrimitiveGeneric, type OpenapiSchemaString, type OpenapiShorthandAllTypes, type OpenapiShorthandPrimitiveTypes, type OpenapiTypeField, type OpenapiTypeFieldObject, } from './types/openapi.js';
+export { type ValidationType } from './types/validation.js';

package/dist/types/src/ops/index.d.ts

@@ -1,5 +1,5 @@
 import { ComparisonOperatorExpression as KyselyComparisonOperatorExpression } from 'kysely';
-import { TrigramOperator } from '../dream/types.js';
+import { TrigramOperator } from '../types/dream.js';
 import CurriedOpsStatement from './curried-ops-statement.js';
 import OpsStatement from './ops-statement.js';
 type ArrayOperatorType = 'in' | 'not in';

package/dist/types/src/ops/ops-statement.d.ts

@@ -1,5 +1,5 @@
 import { ComparisonOperatorExpression as KyselyComparisonOperatorExpression } from 'kysely';
-import { TrigramOperator } from '../dream/types.js';
+import { TrigramOperator } from '../types/dream.js';
 export interface ExtraSimilarityArgs {
     score?: number;
 }

package/dist/types/src/serializer/decorators/associations/RendersMany.d.ts

@@ -1,4 +1,4 @@
-import { SerializableClassOrClasses } from '../../../dream/types.js';
+import { SerializableClassOrClasses } from '../../../types/dream.js';
 import { RendersOneOrManyOpts } from './shared.js';
 /**
  * Establishes a One to Many relationship between

package/dist/types/src/serializer/decorators/associations/RendersOne.d.ts

@@ -1,4 +1,4 @@
-import { SerializableClassOrClasses } from '../../../dream/types.js';
+import { SerializableClassOrClasses } from '../../../types/dream.js';
 import { RendersOneOrManyOpts } from './shared.js';
 /**
  * Establishes a One to One relationship between