@rvoh/dream 0.31.0 → 0.31.2

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/sspawn.d.ts

@@ -1,2 +1,6 @@
-export default function sspawn(command: string, opts?: any): Promise<unknown>;
-export declare function ssspawn(command: string, opts?: any): import("child_process").ChildProcessWithoutNullStreams;
+export default function sspawn(command: string, opts?: Record<string, unknown> & {
+    onStdout?: (str: string) => void;
+}): Promise<unknown>;
+export declare function ssspawn(command: string, opts?: Record<string, unknown> & {
+    onStdout?: (str: string) => void;
+}): import("child_process").ChildProcessWithoutNullStreams;

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
@@ -14,12 +14,12 @@ import { RendersOneOrManyOpts } from './shared.js';
  *
  * ```ts
  * class User extends ApplicationModel {
- *   @Deco.HasOne('Settings')
+ *   @deco.HasOne('Settings')
  *   public settings: Settings
  * }
  *
  * class Post extends ApplicationModel {
- *   @Deco.BelongsTo('User')
+ *   @deco.BelongsTo('User')
  *   public user: User
  * }
  *

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
@@ -14,12 +14,12 @@ import { RendersOneOrManyOpts } from './shared.js';
  *
  * ```ts
  * class User extends ApplicationModel {
- *   @Deco.HasOne('Settings')
+ *   @deco.HasOne('Settings')
  *   public settings: Settings
  * }
  *
  * class Settings extends ApplicationModel {
- *   @Deco.BelongsTo('User')
+ *   @deco.BelongsTo('User')
  *   public user: User
  * }
  *

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

@@ -1,4 +1,5 @@
-import { DreamConst, SerializableClassOrClasses } from '../../../dream/types.js';
+import { DreamConst } from '../../../dream/constants.js';
+import { SerializableClassOrClasses } from '../../../types/dream.js';
 export type SerializableAssociationType = 'RendersOne' | 'RendersMany';
 export interface DreamSerializerAssociationStatement {
     field: string;

package/dist/types/src/serializer/decorators/attribute.d.ts

@@ -1,6 +1,6 @@
 import Dream from '../../Dream.js';
 import { RoundingPrecision } from '../../helpers/round.js';
-import { OpenapiSchemaBodyShorthand, OpenapiShorthandPrimitiveTypes } from '../../openapi/types.js';
+import { OpenapiSchemaBodyShorthand, OpenapiShorthandPrimitiveTypes } from '../../types/openapi.js';
 export default function Attribute(): any;
 export default function Attribute(manualOpenapiOptions: OpenapiSchemaBodyShorthand, renderOptions?: AttributeRenderOptions): any;
 export default function Attribute<DreamClass extends typeof Dream>(dreamClass: DreamClass, openApiAndRenderOptions?: AutomaticOpenapiAndRenderOptions): any;

package/dist/types/src/serializer/decorators/helpers/dreamAttributeOpenapiShape.d.ts

@@ -1,6 +1,6 @@
 import Dream from '../../../Dream.js';
-import { DreamClassColumnNames } from '../../../dream/types.js';
-import { OpenapiSchemaBody } from '../../../openapi/types.js';
+import { DreamClassColumnNames } from '../../../types/dream.js';
+import { OpenapiSchemaBody } from '../../../types/openapi.js';
 export declare function dreamAttributeOpenapiShape<DreamClass extends typeof Dream>(dreamClass: DreamClass, column: DreamClassColumnNames<DreamClass>): OpenapiSchemaBody;
 export declare class UseCustomOpenapiForJson extends Error {
     get message(): string;

package/dist/types/src/serializer/decorators/helpers/hasSerializersGetter.d.ts

@@ -1,2 +1,2 @@
-import { SerializableClassOrSerializerCallback } from '../../../dream/types.js';
+import { SerializableClassOrSerializerCallback } from '../../../types/dream.js';
 export default function (dreamOrSerializerClass: SerializableClassOrSerializerCallback): boolean;

package/dist/types/src/serializer/decorators/helpers/maybeSerializableToDreamSerializerCallbackFunction.d.ts

@@ -1,2 +1,2 @@
-import { DreamSerializerCallback, SerializableClassOrClasses } from '../../../dream/types.js';
+import { DreamSerializerCallback, SerializableClassOrClasses } from '../../../types/dream.js';
 export default function (dreamOrSerializerClass: SerializableClassOrClasses | null): DreamSerializerCallback | null;

package/dist/types/src/types/associations/belongsTo.d.ts

@@ -0,0 +1,76 @@
+import Dream from '../../Dream.ts'
+import { AssociationTableNames } from '../db.js'
+import {
+  DefaultScopeName,
+  DefaultScopeNameForTable,
+  DreamColumnNames,
+  GlobalModelNames,
+  TableColumnNames,
+  TableNameForGlobalModelName,
+} from '../dream.js'
+
+export interface BelongsToStatement<
+  BaseInstance extends Dream,
+  DB,
+  Schema,
+  TableName extends AssociationTableNames<DB, Schema> & keyof DB,
+> {
+  modelCB: () => typeof Dream | (typeof Dream)[]
+  globalAssociationNameOrNames: string[]
+  type: 'BelongsTo'
+  as: string
+  primaryKey: (associationInstance?: Dream) => keyof DB[TableName] & string
+  primaryKeyValue: (associationInstance: Dream | null) => any
+  primaryKeyOverride?: (keyof DB[TableName] & string) | null
+  foreignKey: () => DreamColumnNames<BaseInstance> & string
+  foreignKeyTypeField: () => DreamColumnNames<BaseInstance> & string
+  optional: boolean
+  distinct: null
+  polymorphic: boolean
+  withoutDefaultScopes?: DefaultScopeName<BaseInstance>[]
+}
+
+export interface NonPolymorphicBelongsToOptions<
+  BaseInstance extends Dream,
+  AssociationGlobalNameOrNames extends
+    | GlobalModelNames<BaseInstance>
+    | readonly GlobalModelNames<BaseInstance>[],
+  AssociationGlobalName = AssociationGlobalNameOrNames extends Readonly<any[]>
+    ? AssociationGlobalNameOrNames[0] & string
+    : AssociationGlobalNameOrNames & string,
+  AssociationTableName extends AssociationTableNames<BaseInstance['DB'], BaseInstance['schema']> &
+    keyof BaseInstance['DB'] = TableNameForGlobalModelName<
+    BaseInstance,
+    AssociationGlobalName & GlobalModelNames<BaseInstance>
+  > &
+    AssociationTableNames<BaseInstance['DB'], BaseInstance['schema']> &
+    keyof BaseInstance['DB'],
+> {
+  foreignKey?: DreamColumnNames<BaseInstance>
+  primaryKeyOverride?: TableColumnNames<BaseInstance['DB'], AssociationTableName> | null
+  optional?: boolean
+  withoutDefaultScopes?: DefaultScopeNameForTable<BaseInstance['schema'], AssociationTableName>[]
+}
+
+export interface PolymorphicBelongsToOptions<
+  BaseInstance extends Dream,
+  AssociationGlobalNameOrNames extends
+    | GlobalModelNames<BaseInstance>
+    | readonly GlobalModelNames<BaseInstance>[],
+  AssociationGlobalName = AssociationGlobalNameOrNames extends Readonly<any[]>
+    ? AssociationGlobalNameOrNames[0] & string
+    : AssociationGlobalNameOrNames & string,
+  AssociationTableName extends AssociationTableNames<BaseInstance['DB'], BaseInstance['schema']> &
+    keyof BaseInstance['DB'] = TableNameForGlobalModelName<
+    BaseInstance,
+    AssociationGlobalName & GlobalModelNames<BaseInstance>
+  > &
+    AssociationTableNames<BaseInstance['DB'], BaseInstance['schema']> &
+    keyof BaseInstance['DB'],
+> {
+  foreignKey: DreamColumnNames<BaseInstance>
+  primaryKeyOverride?: TableColumnNames<BaseInstance['DB'], AssociationTableName> | null
+  optional?: boolean
+  polymorphic: boolean
+  withoutDefaultScopes?: DefaultScopeNameForTable<BaseInstance['schema'], AssociationTableName>[]
+}

package/dist/types/src/types/associations/hasMany.d.ts

@@ -0,0 +1,80 @@
+import Dream from '../../Dream.ts'
+import { AssociationTableNames } from '../db.js'
+import {
+  GlobalModelNames,
+  GlobalModelNameTableMap,
+  TableColumnNames,
+  TableNameForGlobalModelName,
+} from '../dream.js'
+import {
+  HasOptions,
+  HasStatement,
+  HasThroughOptions,
+  OrderStatement,
+  PolymorphicHasOptions,
+} from './shared.js'
+
+export type HasManyStatement<
+  BaseInstance extends Dream,
+  DB,
+  Schema,
+  ForeignTableName extends AssociationTableNames<DB, Schema> & keyof DB,
+> = HasStatement<BaseInstance, DB, Schema, ForeignTableName, 'HasMany'> & {
+  distinct?: TableColumnNames<DB, ForeignTableName>
+  order?: OrderStatement<DB, Schema, ForeignTableName>
+}
+interface HasManyOnlyOptions<
+  BaseInstance extends Dream,
+  AssociationGlobalNameOrNames extends
+    | GlobalModelNames<BaseInstance>
+    | readonly GlobalModelNames<BaseInstance>[],
+  AssociationGlobalName = AssociationGlobalNameOrNames extends any[]
+    ? AssociationGlobalNameOrNames[0] & string
+    : AssociationGlobalNameOrNames & string,
+  AssociationTableName = TableNameForGlobalModelName<
+    BaseInstance,
+    AssociationGlobalName & GlobalModelNames<BaseInstance>
+  >,
+> {
+  distinct?:
+    | TableColumnNames<
+        BaseInstance['DB'],
+        AssociationTableName &
+          AssociationTableNames<BaseInstance['DB'], BaseInstance['schema']> &
+          keyof BaseInstance['DB']
+      >
+    | boolean
+
+  order?:
+    | OrderStatement<
+        BaseInstance['DB'],
+        BaseInstance['schema'],
+        AssociationTableName &
+          AssociationTableNames<BaseInstance['DB'], BaseInstance['schema']> &
+          keyof BaseInstance['DB']
+      >
+    | OrderStatement<
+        BaseInstance['DB'],
+        BaseInstance['schema'],
+        AssociationTableName &
+          AssociationTableNames<BaseInstance['DB'], BaseInstance['schema']> &
+          keyof BaseInstance['DB']
+      >[]
+}
+
+export type HasManyOptions<
+  BaseInstance extends Dream,
+  AssociationGlobalName extends keyof GlobalModelNameTableMap<BaseInstance>,
+> = HasOptions<BaseInstance, AssociationGlobalName> & HasManyOnlyOptions<BaseInstance, AssociationGlobalName>
+
+export type PolymorphicHasManyOptions<
+  BaseInstance extends Dream,
+  AssociationGlobalName extends keyof GlobalModelNameTableMap<BaseInstance>,
+> = PolymorphicHasOptions<BaseInstance, AssociationGlobalName> &
+  HasManyOnlyOptions<BaseInstance, AssociationGlobalName>
+
+export type HasManyThroughOptions<
+  BaseInstance extends Dream,
+  AssociationGlobalName extends keyof GlobalModelNameTableMap<BaseInstance>,
+> = HasThroughOptions<BaseInstance, AssociationGlobalName> &
+  HasManyOnlyOptions<BaseInstance, AssociationGlobalName>

package/dist/types/src/types/associations/hasOne.d.ts

@@ -0,0 +1,26 @@
+import Dream from '../../Dream.ts'
+import { AssociationTableNames } from '../db.js'
+import { GlobalModelNameTableMap } from '../dream.js'
+import { HasOptions, HasStatement, HasThroughOptions, PolymorphicHasOptions } from './shared.js'
+
+export type HasOneStatement<
+  BaseInstance extends Dream,
+  DB,
+  Schema,
+  ForeignTableName extends AssociationTableNames<DB, Schema> & keyof DB,
+> = HasStatement<BaseInstance, DB, Schema, ForeignTableName, 'HasOne'>
+
+export type HasOneOptions<
+  BaseInstance extends Dream,
+  AssociationGlobalName extends keyof GlobalModelNameTableMap<BaseInstance>,
+> = HasOptions<BaseInstance, AssociationGlobalName>
+
+export type PolymorphicHasOneOptions<
+  BaseInstance extends Dream,
+  AssociationGlobalName extends keyof GlobalModelNameTableMap<BaseInstance>,
+> = PolymorphicHasOptions<BaseInstance, AssociationGlobalName>
+
+export type HasOneThroughOptions<
+  BaseInstance extends Dream,
+  AssociationGlobalName extends keyof GlobalModelNameTableMap<BaseInstance>,
+> = HasThroughOptions<BaseInstance, AssociationGlobalName>