@rvoh/dream 0.31.0 → 0.31.2

package/dist/esm/src/index.js

@@ -14,9 +14,9 @@ export { default as DreamImporter } from './dream-application/helpers/DreamImpor
 export { default as lookupClassByGlobalName } from './dream-application/helpers/lookupClassByGlobalName.js';
 export { default as DreamApplication, } from './dream-application/index.js';
 export { default as Dream } from './Dream.js';
+export { DreamConst, openapiPrimitiveTypes, openapiShorthandPrimitiveTypes, } from './dream/constants.js';
 export { default as DreamTransaction } from './dream/DreamTransaction.js';
 export { default as Query } from './dream/Query.js';
-export { DreamConst, } from './dream/types.js';
 export { default as Encrypt } from './encrypt/index.js';
 export { default as NonLoadedAssociation } from './errors/associations/NonLoadedAssociation.js';
 export { default as CreateOrFindByFailedToCreateAndFind } from './errors/CreateOrFindByFailedToCreateAndFind.js';
@@ -46,11 +46,11 @@ export { Range, default as range } from './helpers/range.js';
 export { default as round } 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 { default as uncapitalize } from './helpers/uncapitalize.js';
 export { default as uniq } from './helpers/uniq.js';
-export { openapiPrimitiveTypes, openapiShorthandPrimitiveTypes, } 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';

package/dist/esm/src/ops/ops-statement.js

@@ -1,4 +1,4 @@
-import { TRIGRAM_OPERATORS } from '../dream/types.js';
+import { TRIGRAM_OPERATORS } from '../dream/constants.js';
 import ScoreMustBeANormalNumber from '../errors/ops/ScoreMustBeANormalNumber.js';
 export default class OpsStatement {
     operator;

package/dist/esm/src/serializer/decorators/associations/RendersMany.js

@@ -13,12 +13,12 @@ import { isSerializable } 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/esm/src/serializer/decorators/associations/RendersOne.js

@@ -13,12 +13,12 @@ import { isSerializable } 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/esm/src/serializer/index.js

@@ -1,5 +1,5 @@
 import DreamApplication from '../dream-application/index.js';
-import { DreamConst, } from '../dream/types.js';
+import { DreamConst } from '../dream/constants.js';
 import GlobalNameNotSet from '../errors/dream-application/GlobalNameNotSet.js';
 import MissingSerializer from '../errors/MissingSerializersDefinition.js';
 import FailedToRenderThroughAssociationForSerializer from '../errors/serializers/FailedToRenderThroughAssociationForSerializer.js';

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

@@ -1,11 +1,6 @@
 import { CompiledQuery, DeleteQueryBuilder, InsertQueryBuilder, SelectQueryBuilder, Updateable, UpdateQueryBuilder } from 'kysely';
-import { AssociationTableNames } from './db/reflections.js';
-import { DbConnectionType } from './db/types.js';
 import { VirtualAttributeStatement } from './decorators/field-or-getter/Virtual.js';
-import { AssociationStatementsMap, PassthroughOnClause, WhereStatement } from './decorators/field/association/shared.js';
-import { HookStatement, HookStatementMap } from './decorators/field/lifecycle/shared.js';
 import { SortableFieldConfig } from './decorators/field/sortable/Sortable.js';
-import ValidationStatement, { ValidationType } from './decorators/field/validation/shared.js';
 import { ScopeStatement } from './decorators/static-method/Scope.js';
 import DreamClassTransactionBuilder from './dream/DreamClassTransactionBuilder.js';
 import DreamInstanceTransactionBuilder from './dream/DreamInstanceTransactionBuilder.js';
@@ -13,8 +8,14 @@ import DreamTransaction from './dream/DreamTransaction.js';
 import { DestroyOptions } from './dream/internal/destroyOptions.js';
 import LeftJoinLoadBuilder from './dream/LeftJoinLoadBuilder.js';
 import LoadBuilder from './dream/LoadBuilder.js';
-import Query, { BaseModelColumnTypes, DefaultQueryTypeOptions, FindEachOpts, QueryWithJoinedAssociationsType, QueryWithJoinedAssociationsTypeAndNoPreload } from './dream/Query.js';
-import { AllDefaultScopeNames, AssociationNameToDream, AttributeKeys, DefaultOrNamedScopeName, DreamAssociationNames, DreamAssociationNamesWithoutRequiredOnClauses, DreamAttributes, DreamColumnNames, DreamParamSafeColumnNames, DreamSerializeOptions, IdType, JoinedAssociation, JoinedAssociationsTypeFromAssociations, JoinOnStatements, NextPreloadArgumentType, OrderDir, PassthroughColumnNames, PluckEachArgs, PrimaryKeyForFind, RequiredOnClauseKeys, TableColumnNames, UpdateableAssociationProperties, UpdateableProperties, UpdateablePropertiesForClass, VariadicJoinsArgs, VariadicLeftJoinLoadArgs, VariadicLoadArgs } from './dream/types.js';
+import Query from './dream/Query.js';
+import { AssociationStatementsMap, PassthroughOnClause, WhereStatement } from './types/associations/shared.js';
+import { AssociationTableNames, DbConnectionType } from './types/db.js';
+import { AllDefaultScopeNames, AssociationNameToDream, AttributeKeys, DefaultOrNamedScopeName, DreamAssociationNames, DreamAssociationNamesWithoutRequiredOnClauses, DreamAttributes, DreamColumnNames, DreamParamSafeColumnNames, DreamSerializeOptions, IdType, JoinOnStatements, NextPreloadArgumentType, OrderDir, PassthroughColumnNames, PluckEachArgs, PrimaryKeyForFind, TableColumnNames, UpdateableAssociationProperties, UpdateableProperties, UpdateablePropertiesForClass } from './types/dream.js';
+import { HookStatement, HookStatementMap } from './types/lifecycle.js';
+import { BaseModelColumnTypes, DefaultQueryTypeOptions, FindEachOpts, QueryWithJoinedAssociationsType, QueryWithJoinedAssociationsTypeAndNoPreload } from './types/query.js';
+import { ValidationStatement, ValidationType } from './types/validation.js';
+import { JoinedAssociation, JoinedAssociationsTypeFromAssociations, RequiredOnClauseKeys, VariadicJoinsArgs, VariadicLeftJoinLoadArgs, VariadicLoadArgs } from './types/variadic.js';
 export default class Dream {
     DB: any;
     /**
@@ -107,9 +108,9 @@ export default class Dream {
      * @internal
      *
      * Model storage for association metadata, set when using the association decorators like:
-     *   @Deco.HasOne
-     *   @Deco.HasMany
-     *   @Deco.BelongsTo
+     *   @deco.HasOne
+     *   @deco.HasMany
+     *   @deco.BelongsTo
      */
     protected static associationMetadataByType: AssociationStatementsMap;
     /**
@@ -297,13 +298,12 @@ export default class Dream {
      */
     protected get stiBaseClassOrOwnClassName(): string;
     /**
-     * @internal
-     *
-     * Shadows .sanitizedName. Returns a string
+     * this.constructor.name may be prefixed with an underscore during conversion to Javascript.
+     * This method returns the constructor name without a leading underscore.
      *
      * @returns A string
      */
-    protected get sanitizedConstructorName(): string;
+    get sanitizedConstructorName(): string;
     /**
      * @internal
      *
@@ -929,7 +929,7 @@ export default class Dream {
      *
      * ```ts
      * class Post extends ApplicationModel {
-     *   @Deco.Sortable({ scope: ['user']})
+     *   @deco.Sortable({ scope: ['user']})
      *   public position: DreamColumn<User, 'position'>
      * }
      *
@@ -952,7 +952,7 @@ export default class Dream {
      *
      * ```ts
      * class User extends ApplicationModel {
-     *   @Deco.Scope()
+     *   @deco.Scope()
      *   public visible(query: Query<User>) {
      *     return query.where({ hidden: false })
      *   }
@@ -1047,10 +1047,10 @@ export default class Dream {
      *
      * ```ts
      * class Post {
-     *   @Deco.HasMany('LocalizedText')
+     *   @deco.HasMany('LocalizedText')
      *   public localizedTexts: LocalizedText[]
      *
-     *   @Deco.HasOne('LocalizedText', {
+     *   @deco.HasOne('LocalizedText', {
      *     where: { locale: DreamConst.passthrough },
      *   })
      *   public currentLocalizedText: LocalizedText
@@ -1351,7 +1351,7 @@ export default class Dream {
      *
      * ```ts
      * class User extends ApplicationModel {
-     *   @Deco.Validates('presence')
+     *   @deco.Validates('presence')
      *   public email: DreamColumn<User, 'email'>
      * }
      * const user = User.new()
@@ -1393,7 +1393,7 @@ export default class Dream {
      *
      * ```ts
      * class User extends ApplicationModel {
-     *   @Deco.Validates('presence')
+     *   @deco.Validates('presence')
      *   public email: DreamColumn<User, 'email'>
      * }
      *
@@ -1591,7 +1591,7 @@ export default class Dream {
      * ```ts
      *  class User extends ApplicationModel {
      *    ...
-     *    @Deco.Validate()
+     *    @deco.Validate()
      *    public async validateName() {
      *      if (typeof this.name === 'number')
      *        this.addError('name', 'name cannot be a number')
@@ -1948,10 +1948,10 @@ export default class Dream {
      *
      * ```ts
      * class Post {
-     *   @Deco.HasMany('LocalizedText')
+     *   @deco.HasMany('LocalizedText')
      *   public localizedTexts: LocalizedText[]
      *
-     *   @Deco.HasOne('LocalizedText', {
+     *   @deco.HasOne('LocalizedText', {
      *     where: { locale: DreamConst.passthrough },
      *   })
      *   public currentLocalizedText: LocalizedText
@@ -2088,7 +2088,7 @@ export default class Dream {
      *  user.assignAttributes({ email: 'my@email', password: 'my password' })
      * ```
      */
-    assignAttributes<I extends Dream>(this: I, attributes: UpdateableProperties<I>): Partial<import("./helpers/typeutils.js").MergeUnionOfRecordTypes<{
+    assignAttributes<I extends Dream>(this: I, attributes: UpdateableProperties<I>): Partial<import("./types/utils.js").MergeUnionOfRecordTypes<{
         [x: string]: any;
     } | Partial<{
         [x: string]: any;
@@ -2105,7 +2105,7 @@ export default class Dream {
      *  user.setAttributes({ email: 'my@email', password: 'my password' })
      * ```
      */
-    setAttributes<I extends Dream>(this: I, attributes: UpdateableProperties<I>): Partial<import("./helpers/typeutils.js").MergeUnionOfRecordTypes<{
+    setAttributes<I extends Dream>(this: I, attributes: UpdateableProperties<I>): Partial<import("./types/utils.js").MergeUnionOfRecordTypes<{
         [x: string]: any;
     } | Partial<{
         [x: string]: any;
@@ -2217,7 +2217,7 @@ export default class Dream {
      *
      * ```ts
      * class User extends ApplicationModel {
-     *   @Deco.BeforeDestroy()
+     *   @deco.BeforeDestroy()
      *   public softDelete() {
      *     await this.update({ deletedAt: DateTime.now() })
      *     this.preventDeletion()
@@ -2236,13 +2236,13 @@ export default class Dream {
      *
      * ```ts
      * class User extends ApplicationModel {
-     *   @Deco.BeforeDestroy()
+     *   @deco.BeforeDestroy()
      *   public async softDelete() {
      *     await this.update({ deletedAt: DateTime.now() })
      *     this.preventDeletion()
      *   }
      *
-     *   @Deco.BeforeDestroy()
+     *   @deco.BeforeDestroy()
      *   public async undoSoftDelete() {
      *     await this.update({ deletedAt: null })
      *     this.unpreventDeletion()

package/dist/types/src/cli/logger/DreamCliLogger.d.ts

@@ -1,22 +1,7 @@
-import DreamCliLoggableSpinner from './loggable/DreamCliLoggableSpinner.js';
-import DreamCliLoggableText from './loggable/DreamCliLoggableText.js';
+import { DreamCliLoggerLogOpts } from '../../types/logger.js';
 export default class DreamCliLogger {
-    private logs;
-    log<IsSpinner extends boolean, RetValue extends IsSpinner extends false ? DreamCliLoggableText : DreamCliLoggableSpinner>(text: string, { permanent, spinner, logPrefix, logPrefixColor, logPrefixBgColor, spinnerPrefixColor, spinnerPrefixBgColor, }?: DreamCliLoggerLogOpts<IsSpinner>): RetValue;
-    render(): void;
-    get spinners(): DreamCliLoggableSpinner[];
-    purge(): void;
-    private clear;
+    log(text: string, { logPrefix, logPrefixColor, logPrefixBgColor }?: DreamCliLoggerLogOpts): void;
+    logStartProgress(text: string, { logPrefix, logPrefixColor, logPrefixBgColor }?: DreamCliLoggerLogOpts): void;
+    logContinueProgress(text: string, { logPrefix, logPrefixColor, logPrefixBgColor }?: DreamCliLoggerLogOpts): void;
+    logEndProgress(text?: string, { logPrefix, logPrefixColor, logPrefixBgColor }?: DreamCliLoggerLogOpts): void;
 }
-export interface DreamCliLoggerLogOpts<IsSpinner extends boolean> {
-    permanent?: boolean;
-    spinner?: IsSpinner;
-    logPrefix?: string;
-    logPrefixColor?: DreamCliForegroundColor;
-    logPrefixBgColor?: DreamCliBgColor;
-    spinnerPrefixColor?: DreamCliForegroundColor;
-    spinnerPrefixBgColor?: DreamCliBgColor;
-}
-export type DreamCliColor = DreamCliForegroundColor | DreamCliBgColor;
-export type DreamCliForegroundColor = 'black' | 'red' | 'redBright' | 'green' | 'greenBright' | 'yellow' | 'yellowBright' | 'blue' | 'blueBright' | 'magenta' | 'magentaBright' | 'cyan' | 'cyanBright' | 'white' | 'whiteBright' | 'gray';
-export type DreamCliBgColor = 'bgBlack' | 'bgRed' | 'bgRedBright' | 'bgGreen' | 'bgGreenBright' | 'bgYellow' | 'bgYellowBright' | 'bgBlue' | 'bgBlueBright' | 'bgMagenta' | 'bgMagentaBright' | 'bgCyan' | 'bgCyanBright' | 'bgWhite' | 'bgWhiteBright';

package/dist/types/src/cli/logger/loggable/DreamCliLoggable.d.ts

@@ -1,11 +1,9 @@
-import { DreamCliBgColor, DreamCliForegroundColor } from '../DreamCliLogger.js';
+import { DreamCliBgColor, DreamCliForegroundColor } from '../../../types/logger.js';
 export default class DreamCliLoggable {
-    permanent: boolean;
     logPrefix: string;
     logPrefixColor: DreamCliForegroundColor | undefined;
     logPrefixBgColor: DreamCliBgColor | undefined;
-    constructor({ permanent, logPrefix, logPrefixColor, logPrefixBgColor, }: {
-        permanent: boolean;
+    constructor({ logPrefix, logPrefixColor, logPrefixBgColor, }: {
         logPrefix?: string;
         logPrefixColor?: DreamCliForegroundColor;
         logPrefixBgColor?: DreamCliBgColor;

package/dist/types/src/cli/logger/loggable/DreamCliLoggableText.d.ts

@@ -1,11 +1,10 @@
-import { DreamCliBgColor, DreamCliForegroundColor } from '../DreamCliLogger.js';
+import { DreamCliBgColor, DreamCliForegroundColor } from '../../../types/logger.js';
 import DreamCliLoggable from './DreamCliLoggable.js';
 export default class DreamCliLoggableText extends DreamCliLoggable {
     private text;
     private color;
     private bgColor;
-    constructor(text: string, { permanent, logPrefix, color, bgColor, logPrefixColor, logPrefixBgColor, }: {
-        permanent: boolean;
+    constructor(text: string, { logPrefix, color, bgColor, logPrefixColor, logPrefixBgColor, }: {
         logPrefix?: string;
         color?: DreamCliForegroundColor;
         bgColor?: DreamCliBgColor;

package/dist/types/src/cli/logger/loggable/colorize.d.ts

@@ -1,4 +1,4 @@
-import { DreamCliBgColor, DreamCliForegroundColor } from '../DreamCliLogger.js';
+import { DreamCliBgColor, DreamCliForegroundColor } from '../../../types/logger.js';
 export default function colorize(text: string, { color, bgColor }: {
     color?: DreamCliForegroundColor;
     bgColor?: DreamCliBgColor;

package/dist/types/src/db/ConnectedToDB.d.ts

@@ -1,8 +1,8 @@
 import { Kysely, Transaction as KyselyTransaction } from 'kysely';
 import Dream from '../Dream.js';
 import DreamTransaction from '../dream/DreamTransaction.js';
-import { DreamConstructorType, SqlCommandType } from '../dream/types.js';
-import { DbConnectionType } from './types.js';
+import { DbConnectionType } from '../types/db.js';
+import { DreamConstructorType, SqlCommandType } from '../types/dream.js';
 export default class ConnectedToDB<DreamInstance extends Dream> {
     dreamInstance: DreamInstance;
     protected readonly dreamClass: DreamConstructorType<DreamInstance>;

package/dist/types/src/db/ConnectionConfRetriever.d.ts

@@ -1,5 +1,5 @@
 import { SingleDbCredential } from '../dream-application/index.js';
-import { DbConnectionType } from './types.js';
+import { DbConnectionType } from '../types/db.js';
 export default class ConnectionConfRetriever {
     getConnectionConf(connection: DbConnectionType): SingleDbCredential;
     hasReplicaConfig(): boolean;

package/dist/types/src/db/DreamDbConnection.d.ts

@@ -1,5 +1,5 @@
 import { Kysely } from 'kysely';
-import { DbConnectionType } from './types.js';
+import { DbConnectionType } from '../types/db.js';
 export default class DreamDbConnection {
     static getConnection<DB>(connectionType: DbConnectionType): Kysely<DB>;
     static dropAllConnections(): Promise<void>;

package/dist/types/src/db/dataTypes.d.ts

@@ -1,6 +1,3 @@
 export default function dataTypes(): readonly ["bigint", "bigserial", "bit", "bit varying", "boolean", "box", "bytea", "character", "character varying", "char", "cidr", "circle", "citext", "date", "double precision", "inet", "integer", "interval", "json", "jsonb", "line", "lseg", "macaddr", "money", "numeric", "path", "point", "polygon", "real", "smallint", "smallserial", "serial", "text", "time", "time with time zone", "timestamp", "timestamp with time zone", "timestamp without time zone", "tsquery", "tsvector", "txid_snapshot", "uuid", "xml"];
 export declare function isPrimitiveDataType(type: string): boolean;
 export declare const postgresDatatypes: readonly ["bigint", "bigserial", "bit", "bit varying", "boolean", "box", "bytea", "character", "character varying", "char", "cidr", "circle", "citext", "date", "double precision", "inet", "integer", "interval", "json", "jsonb", "line", "lseg", "macaddr", "money", "numeric", "path", "point", "polygon", "real", "smallint", "smallserial", "serial", "text", "time", "time with time zone", "timestamp", "timestamp with time zone", "timestamp without time zone", "tsquery", "tsvector", "txid_snapshot", "uuid", "xml"];
-type NonArrayDbTypes = (typeof postgresDatatypes)[number];
-export type DbTypes = NonArrayDbTypes | `${NonArrayDbTypes}[]`;
-export {};

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

@@ -1,5 +1,5 @@
 import { Kysely } from 'kysely';
 import Dream from '../Dream.js';
 import '../helpers/loadEnv.js';
-import { DbConnectionType } from './types.js';
+import { DbConnectionType } from '../types/db.js';
 export default function db<T extends Dream, DB extends T['DB'] = T['DB']>(connectionType?: DbConnectionType): Kysely<DB>;

package/dist/types/src/decorators/Decorators.d.ts

@@ -1,11 +1,11 @@
 import Dream from '../Dream.js';
-import { DreamColumnNames, GlobalModelNameTableMap, SortableOptions } from '../dream/types.js';
 import { SerializableTypes } from '../serializer/decorators/attribute.js';
-import { NonPolymorphicBelongsToOptions, PolymorphicBelongsToOptions } from './field/association/BelongsTo.js';
-import { HasManyOptions, HasManyThroughOptions, PolymorphicHasManyOptions } from './field/association/HasMany.js';
-import { HasOneOptions, HasOneThroughOptions, PolymorphicHasOneOptions } from './field/association/HasOne.js';
-import { AfterHookOpts, BeforeHookOpts } from './field/lifecycle/shared.js';
-import { ValidationType } from './field/validation/shared.js';
+import { NonPolymorphicBelongsToOptions, PolymorphicBelongsToOptions } from '../types/associations/belongsTo.js';
+import { HasManyOptions, HasManyThroughOptions, PolymorphicHasManyOptions } from '../types/associations/hasMany.js';
+import { HasOneOptions, HasOneThroughOptions, PolymorphicHasOneOptions } from '../types/associations/hasOne.js';
+import { DreamColumnNames, GlobalModelNameTableMap, SortableOptions } from '../types/dream.js';
+import { AfterHookOpts, BeforeHookOpts } from '../types/lifecycle.js';
+import { ValidationType } from '../types/validation.js';
 export default class Decorators<T extends Dream> {
     BelongsTo<const AssociationGlobalNameOrNames extends keyof GlobalModelNameTableMap<T> | (keyof GlobalModelNameTableMap<T>)[]>(this: Decorators<T>, globalAssociationNameOrNames: AssociationGlobalNameOrNames, options?: NonPolymorphicBelongsToOptions<T, AssociationGlobalNameOrNames>): any;
     BelongsTo<const AssociationGlobalNameOrNames extends keyof GlobalModelNameTableMap<T> | (keyof GlobalModelNameTableMap<T>)[]>(this: Decorators<T>, globalAssociationNameOrNames: AssociationGlobalNameOrNames, options?: PolymorphicBelongsToOptions<T, AssociationGlobalNameOrNames>): any;
@@ -22,14 +22,14 @@ export default class Decorators<T extends Dream> {
      *
      * ```ts
      * class User {
-     *   @Deco.Encrypted()
+     *   @deco.Encrypted()
      *   // automatically sets `encryptedSsn` to the encrypted value that
      *   // `ssn` is set to in new/create/update, e.g., `await user.update({ ssn })`
      *   public ssn: string
      *
      *   // automatically sets `myEncryptedPhone` to the encrypted value that
      *   // `phone` is set to new/create/update, e.g., `await user.update({ phone })`
-     *   @Deco.Encrypted('myEncryptedPhone)
+     *   @deco.Encrypted('myEncryptedPhone)
      *   public phone: string
      * }
      * ```
@@ -44,7 +44,7 @@ export default class Decorators<T extends Dream> {
      *
      * ```ts
      * class Collar {
-     *   @Deco.Scope({ default: true })
+     *   @deco.Scope({ default: true })
      *   public static hideHiddenCollars(query: Query<Collar>) {
      *     return query.where({ hidden: false })
      *   }
@@ -66,7 +66,7 @@ export default class Decorators<T extends Dream> {
      *
      * ```ts
      * class Balloon {
-     *   @Deco.Sortable({ scope: 'user' })
+     *   @deco.Sortable({ scope: 'user' })
      *   public position: DreamColumn<Balloon, 'position'>
      * }
      * ```
@@ -82,7 +82,7 @@ export default class Decorators<T extends Dream> {
      *
      * ```ts
      * class Sandbag {
-     *   @Deco.Validate()
+     *   @deco.Validate()
      *   public validateWeight(this: Sandbag) {
      *     if (!this.weight) return
      *
@@ -105,7 +105,7 @@ export default class Decorators<T extends Dream> {
      *
      * ```ts
      * class Balloon {
-     *   @Deco.Validates('numericality', { min: 0, max: 100 })
+     *   @deco.Validates('numericality', { min: 0, max: 100 })
      *   public volume: DreamColumn<Balloon, 'volume'>
      * }
      * ```
@@ -143,7 +143,7 @@ export default class Decorators<T extends Dream> {
      *
      * ```ts
      * class BodyMeasurement {
-     *   @Deco.Virtual()
+     *   @deco.Virtual()
      *   public get lbs() {
      *     const self: User = this
      *     return gramsToLbs(self.getAttribute('grams') ?? 0)
@@ -154,7 +154,7 @@ export default class Decorators<T extends Dream> {
      *     self.setAttribute('grams', lbsToGrams(lbs))
      *   }
      *
-     *   @Deco.Virtual()
+     *   @deco.Virtual()
      *   public get kilograms() {
      *     const self: User = this
      *     return gramsToKilograms(self.getAttribute('grams') ?? 0)
@@ -170,10 +170,10 @@ export default class Decorators<T extends Dream> {
      *
      * ```ts
      * class User {
-     *   @Deco.Virtual()
+     *   @deco.Virtual()
      *   public password: string
      *
-     *   @Deco.BeforeSave()
+     *   @deco.BeforeSave()
      *   public hasPassword() {
      *     this.setAttribute('hashedPassword', preferredHashingAlgorithm(this.password))
      *   }
@@ -188,7 +188,7 @@ export default class Decorators<T extends Dream> {
      *
      * ```ts
      * class User {
-     *   @Deco.BeforeCreate()
+     *   @deco.BeforeCreate()
      *   public doSomething() {
      *     console.log('hi!')
      *   }
@@ -204,7 +204,7 @@ export default class Decorators<T extends Dream> {
      *
      * ```ts
      * class User {
-     *   @Deco.BeforeSave()
+     *   @deco.BeforeSave()
      *   public doSomething() {
      *     console.log('hi!')
      *   }
@@ -220,7 +220,7 @@ export default class Decorators<T extends Dream> {
      *
      * ```ts
      * class User {
-     *   @Deco.BeforeUpdate()
+     *   @deco.BeforeUpdate()
      *   public doSomething() {
      *     console.log('hi!')
      *   }
@@ -236,7 +236,7 @@ export default class Decorators<T extends Dream> {
      *
      * ```ts
      * class User {
-     *   @Deco.BeforeDestroy()
+     *   @deco.BeforeDestroy()
      *   public doSomething() {
      *     console.log('hi!')
      *   }
@@ -251,7 +251,7 @@ export default class Decorators<T extends Dream> {
      *
      * ```ts
      * class User {
-     *   @Deco.AfterCreate()
+     *   @deco.AfterCreate()
      *   public doSomething() {
      *     console.log('hi!')
      *   }
@@ -267,7 +267,7 @@ export default class Decorators<T extends Dream> {
      *
      * ```ts
      * class User {
-     *   @Deco.AfterCreateCommit()
+     *   @deco.AfterCreateCommit()
      *   public doSomething() {
      *     console.log('hi!')
      *   }
@@ -282,7 +282,7 @@ export default class Decorators<T extends Dream> {
      *
      * ```ts
      * class User {
-     *   @Deco.AfterSave()
+     *   @deco.AfterSave()
      *   public doSomething() {
      *     console.log('hi!')
      *   }
@@ -298,7 +298,7 @@ export default class Decorators<T extends Dream> {
      *
      * ```ts
      * class User {
-     *   @Deco.AfterSaveCommit()
+     *   @deco.AfterSaveCommit()
      *   public doSomething() {
      *     console.log('hi!')
      *   }
@@ -314,7 +314,7 @@ export default class Decorators<T extends Dream> {
      *
      * ```ts
      * class User {
-     *   @Deco.AfterUpdate()
+     *   @deco.AfterUpdate()
      *   public doSomething() {
      *     console.log('hi!')
      *   }
@@ -330,7 +330,7 @@ export default class Decorators<T extends Dream> {
      *
      * ```ts
      * class User {
-     *   @Deco.AfterUpdateCommit()
+     *   @deco.AfterUpdateCommit()
      *   public doSomething() {
      *     console.log('hi!')
      *   }
@@ -346,7 +346,7 @@ export default class Decorators<T extends Dream> {
      *
      * ```ts
      * class User {
-     *   @Deco.AfterDestroy()
+     *   @deco.AfterDestroy()
      *   public doSomething() {
      *     console.log('hi!')
      *   }
@@ -362,7 +362,7 @@ export default class Decorators<T extends Dream> {
      *
      * ```ts
      * class User {
-     *   @Deco.AfterDestroyCommit()
+     *   @deco.AfterDestroyCommit()
      *   public doSomething() {
      *     console.log('hi!')
      *   }

package/dist/types/src/decorators/field/association/BelongsTo.d.ts

@@ -1,33 +1,5 @@
-import { AssociationTableNames } from '../../../db/reflections.js';
 import Dream from '../../../Dream.js';
-import { DefaultScopeName, DefaultScopeNameForTable, DreamColumnNames, GlobalModelNames, GlobalModelNameTableMap, TableColumnNames, TableNameForGlobalModelName } from '../../../dream/types.js';
+import { NonPolymorphicBelongsToOptions, PolymorphicBelongsToOptions } from '../../../types/associations/belongsTo.js';
+import { GlobalModelNameTableMap } from '../../../types/dream.js';
 export default function BelongsTo<BaseInstance extends Dream, AssociationGlobalNameOrNames extends keyof GlobalModelNameTableMap<BaseInstance> | (keyof GlobalModelNameTableMap<BaseInstance>)[]>(globalAssociationNameOrNames: AssociationGlobalNameOrNames, opts?: NonPolymorphicBelongsToOptions<BaseInstance, AssociationGlobalNameOrNames>): any;
 export default function BelongsTo<BaseInstance extends Dream, AssociationGlobalNameOrNames extends keyof GlobalModelNameTableMap<BaseInstance> | (keyof GlobalModelNameTableMap<BaseInstance>)[]>(globalAssociationNameOrNames: AssociationGlobalNameOrNames, opts?: PolymorphicBelongsToOptions<BaseInstance, AssociationGlobalNameOrNames>): any;
-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/decorators/field/association/HasMany.d.ts

@@ -1,19 +1,6 @@
-import { AssociationTableNames } from '../../../db/reflections.js';
 import Dream from '../../../Dream.js';
-import { GlobalModelNames, GlobalModelNameTableMap, TableColumnNames, TableNameForGlobalModelName } from '../../../dream/types.js';
-import { HasOptions, HasStatement, HasThroughOptions, OrderStatement, PolymorphicHasOptions } from './shared.js';
+import { HasManyOptions, HasManyThroughOptions, PolymorphicHasManyOptions } from '../../../types/associations/hasMany.js';
+import { GlobalModelNameTableMap } from '../../../types/dream.js';
 export default function HasMany<BaseInstance extends Dream, AssociationGlobalName extends keyof GlobalModelNameTableMap<BaseInstance>>(globalAssociationNameOrNames: AssociationGlobalName, opts?: HasManyOptions<BaseInstance, AssociationGlobalName>): any;
 export default function HasMany<BaseInstance extends Dream, AssociationGlobalName extends keyof GlobalModelNameTableMap<BaseInstance>>(globalAssociationNameOrNames: AssociationGlobalName, opts?: HasManyThroughOptions<BaseInstance, AssociationGlobalName>): any;
 export default function HasMany<BaseInstance extends Dream, AssociationGlobalName extends keyof GlobalModelNameTableMap<BaseInstance>>(globalAssociationNameOrNames: AssociationGlobalName, opts?: PolymorphicHasManyOptions<BaseInstance, AssociationGlobalName>): any;
-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>;
-export {};