@rvoh/dream 2.5.1 → 2.5.3

package/dist/esm/src/cli/logger/DreamCliLogger.js

@@ -1,25 +1,126 @@
+import c from 'yoctocolors';
 import DreamCliLoggableText from './loggable/DreamCliLoggableText.js';
+const SPINNER_FRAMES = ['✺', '✹', '✸', '✷', '✶', '✵', '✴', '✵', '✶', '✷', '✸', '✹'];
+const EYE_FRAMES = ['─', '◡', '◯', '◉', '●', '◉', '◯', '◡'];
+const SPINNER_INTERVAL_MS = 200;
+function formatElapsed(ms) {
+    if (ms < 1000)
+        return `${ms}ms`;
+    return `${(ms / 1000).toFixed(1)}s`;
+}
 export default class DreamCliLogger {
+    spinner = null;
     log(text, { logPrefix, logPrefixColor, logPrefixBgColor } = {}) {
         const loggable = new DreamCliLoggableText(text, {
             logPrefix,
-            logPrefixColor: logPrefixColor || 'green',
+            logPrefixColor: logPrefixColor || 'greenBright',
             logPrefixBgColor,
         });
         loggable.render();
     }
     async logProgress(text, cb, { logPrefix = '✺ ┌', logPrefixColor, logPrefixBgColor } = {}) {
-        this.log(text, { logPrefix, logPrefixColor, logPrefixBgColor });
+        this.logStartProgress(text, { logPrefix, logPrefixColor, logPrefixBgColor });
         await cb();
         this.logEndProgress();
     }
-    logStartProgress(text, { logPrefix = '✺ ┌', logPrefixColor, logPrefixBgColor } = {}) {
-        this.log(text, { logPrefix, logPrefixColor, logPrefixBgColor });
+    logStartProgress(text, { logPrefixColor, logPrefixBgColor } = {}) {
+        if (!process.stdout.isTTY) {
+            this.log(text, { logPrefix: '✺ ┌', logPrefixColor: logPrefixColor || 'greenBright', logPrefixBgColor });
+            return;
+        }
+        this.startTopSpinner(text);
+    }
+    startTopSpinner(text) {
+        const renderFrame = (frameIndex) => {
+            const star = SPINNER_FRAMES[frameIndex % SPINNER_FRAMES.length];
+            process.stdout.write(`${this.escapeSequence('clearLine')}${c.yellow(`${star} ┌`)} ${c.yellow(text)}`);
+        };
+        renderFrame(0);
+        const interval = setInterval(() => {
+            if (this.spinner && !this.spinner.committed) {
+                this.spinner.frameIndex++;
+                renderFrame(this.spinner.frameIndex);
+            }
+        }, SPINNER_INTERVAL_MS);
+        this.spinner = {
+            actionText: text,
+            startTime: Date.now(),
+            frameIndex: 0,
+            interval,
+            committed: false,
+        };
+    }
+    startBottomSpinner() {
+        if (!process.stdout.isTTY || !this.spinner)
+            return;
+        const renderFrame = (frameIndex) => {
+            const eye = EYE_FRAMES[frameIndex % EYE_FRAMES.length];
+            process.stdout.write(`${this.escapeSequence('clearLine')}${c.yellow(eye)} ${c.yellow(`└ ${this.spinner.actionText}`)}`);
+        };
+        this.spinner.frameIndex = 0;
+        renderFrame(0);
+        this.spinner.interval = setInterval(() => {
+            if (this.spinner) {
+                this.spinner.frameIndex++;
+                renderFrame(this.spinner.frameIndex);
+            }
+        }, SPINNER_INTERVAL_MS);
     }
     logContinueProgress(text, { logPrefix = '  ├', logPrefixColor, logPrefixBgColor } = {}) {
-        this.log(text, { logPrefix, logPrefixColor, logPrefixBgColor });
+        if (this.spinner && !this.spinner.committed) {
+            clearInterval(this.spinner.interval);
+            // Overwrite the yellow animated header with green past-tense text before marking
+            // the spinner as committed
+            process.stdout.write(`${this.escapeSequence('clearLine')}${c.greenBright('✺ ┌')} ${c.greenBright(this.spinner.actionText)}\n`);
+            this.spinner.committed = true;
+            this.log(text, { logPrefix, logPrefixColor, logPrefixBgColor });
+            this.startBottomSpinner();
+        }
+        else if (this.spinner?.committed) {
+            // Clear the bottom running... spinner, log sub-line, then re-show it
+            clearInterval(this.spinner.interval);
+            this.clearLine();
+            this.log(text, { logPrefix, logPrefixColor, logPrefixBgColor });
+            this.startBottomSpinner();
+        }
+        else {
+            this.log(text, { logPrefix, logPrefixColor, logPrefixBgColor });
+        }
     }
     logEndProgress(text = 'complete', { logPrefix = '  └', logPrefixColor, logPrefixBgColor } = {}) {
-        this.log(text, { logPrefix, logPrefixColor, logPrefixBgColor });
+        if (!this.spinner) {
+            this.log(text, { logPrefix, logPrefixColor, logPrefixBgColor });
+            return;
+        }
+        const spinner = this.spinner;
+        this.spinner = null;
+        clearInterval(spinner.interval);
+        const elapsed = Date.now() - spinner.startTime;
+        const elapsedStr = formatElapsed(elapsed);
+        if (!spinner.committed) {
+            // No sub-lines: overwrite the spinner in-place with the green completed header
+            process.stdout.write(`${this.escapeSequence('clearLine')}${c.greenBright('✺ ┌')} ${c.greenBright(spinner.actionText)}\n`);
+        }
+        else {
+            // Has sub-lines: clear the bottom running... spinner line
+            if (process.stdout.isTTY)
+                this.clearLine();
+        }
+        this.log(c.greenBright(`done in ${elapsedStr}\n`), {
+            logPrefix,
+            logPrefixColor: logPrefixColor || 'greenBright',
+            logPrefixBgColor,
+        });
+    }
+    clearLine() {
+        process.stdout.write(this.escapeSequence('clearLine'));
+    }
+    escapeSequence(sequence) {
+        switch (sequence) {
+            case 'clearLine':
+                return `\r\x1b[2K`;
+            default:
+                throw new Error(`unexpected sequence: ${sequence}`);
+        }
     }
 }

package/dist/esm/src/db/helpers/syncDbTypesFiles.js

@@ -28,8 +28,8 @@ export default async function syncDbTypesFiles(connectionName) {
     const kyselyCodegenCmd = `kysely-codegen ${dialect} ${url} ${includePattern} ${excludePattern} ${outfile}`;
     await sspawn(kyselyCodegenCmd, {
         onStdout: message => {
-            DreamCLI.logger.logContinueProgress(colorize(`[db]`, { color: 'cyan' }) + ' ' + message, {
-                logPrefixColor: 'cyan',
+            DreamCLI.logger.logContinueProgress(colorize(`[db]`, { color: 'greenBright' }) + ' ' + message, {
+                logPrefixColor: 'greenBright',
             });
         },
     });

package/dist/esm/src/decorators/field/Encrypted.js

@@ -1,5 +1,6 @@
 import InternalEncrypt from '../../encrypt/InternalEncrypt.js';
 import DoNotSetEncryptedFieldsDirectly from '../../errors/DoNotSetEncryptedFieldsDirectly.js';
+import columnAllowsNull from '../../helpers/db/columnAllowsNull.js';
 import pascalize from '../../helpers/pascalize.js';
 export default function Encrypted(encryptedColumnName) {
     return function (_, context) {
@@ -29,7 +30,7 @@ export default function Encrypted(encryptedColumnName) {
             ;
             dreamClass['virtualAttributes'].push({
                 property: key,
-                type: 'string',
+                type: columnAllowsNull(dreamClass, encryptedKey) ? ['string', 'null'] : 'string',
             });
             if (!Object.getOwnPropertyDescriptor(dreamClass, 'explicitUnsafeParamColumns')) {
                 // This pattern allows `explicitUnsafeParamColumns` on a base STI class and on

package/dist/esm/src/dream/QueryDriver/Postgres.js

@@ -157,13 +157,13 @@ export default class PostgresQueryDriver extends KyselyQueryDriver {
         const client = await loadPgClient({ useSystemDb: true, connectionName });
         if (EnvInternal.boolean('DREAM_CORE_DEVELOPMENT')) {
             const replicaTestWorkerDatabaseName = `replica_test_${dbConf.name}`;
-            DreamCLI.logger.logContinueProgress(`creating fake replica test database ${replicaTestWorkerDatabaseName}...`, { logPrefix: '  ├ [db]', logPrefixColor: 'cyan' });
+            DreamCLI.logger.logContinueProgress(`creating fake replica test database ${replicaTestWorkerDatabaseName}...`, { logPrefix: '  ├ [db]', logPrefixColor: 'greenBright' });
             await client.query(`DROP DATABASE IF EXISTS ${replicaTestWorkerDatabaseName};`);
             await client.query(`CREATE DATABASE ${replicaTestWorkerDatabaseName} TEMPLATE ${dbConf.name};`);
         }
         for (let i = 2; i <= parallelTests; i++) {
             const workerDatabaseName = `${dbConf.name}_${i}`;
-            DreamCLI.logger.logContinueProgress(`creating duplicate test database ${workerDatabaseName} for concurrent tests...`, { logPrefix: '  ├ [db]', logPrefixColor: 'cyan' });
+            DreamCLI.logger.logContinueProgress(`creating duplicate test database ${workerDatabaseName} for concurrent tests...`, { logPrefix: '  ├ [db]', logPrefixColor: 'greenBright' });
             await client.query(`DROP DATABASE IF EXISTS ${workerDatabaseName};`);
             await client.query(`CREATE DATABASE ${workerDatabaseName} TEMPLATE ${dbConf.name};`);
         }

package/dist/esm/src/dream/QueryDriver/helpers/kysely/runMigration.js

@@ -88,8 +88,8 @@ function migratedActionPastTense(mode) {
 function logResults(results, mode) {
     results?.forEach(it => {
         if (it.status === 'Success') {
-            DreamCLI.logger.logContinueProgress(colorize(`[db]`, { color: 'cyan' }) +
-                ` migration "${it.migrationName}" was ${migratedActionPastTense(mode)} successfully`, { logPrefixColor: 'cyan' });
+            DreamCLI.logger.logContinueProgress(colorize(`[db]`, { color: 'greenBright' }) +
+                ` migration "${it.migrationName}" was ${migratedActionPastTense(mode)} successfully`, { logPrefixColor: 'greenBright' });
         }
         else if (it.status === 'Error') {
             DreamCLI.logger.logContinueProgress(JSON.stringify(it, null, 2));

package/dist/esm/src/dream/QueryDriver/helpers/pg/dropDb.js

@@ -22,14 +22,14 @@ async function maybeDropDuplicateDatabases(client, dbName) {
         return;
     if (EnvInternal.boolean('DREAM_CORE_DEVELOPMENT')) {
         const replicaTestWorkerDatabaseName = `replica_test_${dbName}`;
-        DreamCLI.logger.logContinueProgress(`dropping fake replica test database ${replicaTestWorkerDatabaseName}`, { logPrefix: '  ├ [db]', logPrefixColor: 'cyan' });
+        DreamCLI.logger.logContinueProgress(`dropping fake replica test database ${replicaTestWorkerDatabaseName}`, { logPrefix: '  ├ [db]', logPrefixColor: 'greenBright' });
         await client.query(`DROP DATABASE IF EXISTS ${replicaTestWorkerDatabaseName};`);
     }
     for (let i = 2; i <= parallelTests; i++) {
         const workerDatabaseName = `${dbName}_${i}`;
         DreamCLI.logger.logContinueProgress(`dropping duplicate test database ${workerDatabaseName}`, {
             logPrefix: '  ├ [db]',
-            logPrefixColor: 'cyan',
+            logPrefixColor: 'greenBright',
         });
         await client.query(`DROP DATABASE IF EXISTS ${workerDatabaseName};`);
     }

package/dist/esm/src/helpers/db/columnAllowsNull.js

@@ -0,0 +1,3 @@
+export default function columnAllowsNull(dreamClass, attribute) {
+    return dreamClass.prototype.schema[dreamClass.table]?.['columns']?.[attribute]?.['allowNull'] ?? false;
+}

package/dist/esm/src/helpers/db/normalizeDataForDb.js

@@ -1,3 +1,4 @@
+import cachedTypeForAttribute from './cachedTypeForAttribute.js';
 import DataTypeColumnTypeMismatch from '../../errors/db/DataTypeColumnTypeMismatch.js';
 import BaseClockTime from '../../utils/datetime/BaseClockTime.js';
 import CalendarDate from '../../utils/datetime/CalendarDate.js';
@@ -7,7 +8,7 @@ import { DateTime } from '../../utils/datetime/DateTime.js';
 import normalizeUnicode from '../normalizeUnicode.js';
 import { DATE_OR_DATE_ARRAY_COLUMN_CHECK_REGEXP, DATETIME_OR_DATETIME_ARRAY_COLUMN_CHECK_REGEXP, STRING_OR_STRING_ARRAY_COLUMN_CHECK_REGEXP, TIME_WITH_TIMEZONE_COLUMN_CHECK_REGEXP, TIME_WITHOUT_TIMEZONE_COLUMN_CHECK_REGEXP, } from './types/helpers.js';
 export function normalizeDataForDb({ val, dreamClass, column, }) {
-    const columnType = dreamClass['cachedTypeFor'](column);
+    const columnType = cachedTypeForAttribute(dreamClass, column);
     if (val instanceof DateTime || DATETIME_OR_DATETIME_ARRAY_COLUMN_CHECK_REGEXP.test(columnType)) {
         return dateTimeOrDateToSql(DateTime, val);
         //

package/dist/esm/src/helpers/db/types/isDatabaseArrayColumn.js

@@ -1,3 +1,4 @@
+import cachedTypeForAttribute from '../cachedTypeForAttribute.js';
 export default function isDatabaseArrayColumn(dreamClass, column) {
-    return /\[\]$/.test(dreamClass['cachedTypeFor'](column));
+    return /\[\]$/.test(cachedTypeForAttribute(dreamClass, column));
 }

package/dist/esm/src/helpers/db/types/isDatetimeOrDatetimeArrayColumn.js

@@ -1,4 +1,5 @@
+import cachedTypeForAttribute from '../cachedTypeForAttribute.js';
 import { DATETIME_OR_DATETIME_ARRAY_COLUMN_CHECK_REGEXP } from './helpers.js';
 export default function isDatetimeOrDatetimeArrayColumn(dreamClass, column) {
-    return DATETIME_OR_DATETIME_ARRAY_COLUMN_CHECK_REGEXP.test(dreamClass['cachedTypeFor'](column));
+    return DATETIME_OR_DATETIME_ARRAY_COLUMN_CHECK_REGEXP.test(cachedTypeForAttribute(dreamClass, column));
 }

package/dist/esm/src/helpers/db/types/isJsonColumn.js

@@ -1,3 +1,4 @@
+import cachedTypeForAttribute from '../cachedTypeForAttribute.js';
 export default function isJsonColumn(dreamClass, column) {
-    return ['json', 'jsonb'].includes(dreamClass['cachedTypeFor'](column));
+    return ['json', 'jsonb'].includes(cachedTypeForAttribute(dreamClass, column));
 }

package/dist/esm/src/ops/index.js

@@ -1,5 +1,6 @@
 import { sql } from 'kysely';
 import AnyRequiresArrayColumn from '../errors/ops/AnyRequiresArrayColumn.js';
+import cachedTypeForAttribute from '../helpers/db/cachedTypeForAttribute.js';
 import isDatabaseArrayColumn from '../helpers/db/types/isDatabaseArrayColumn.js';
 import CurriedOpsStatement from './curried-ops-statement.js';
 import OpsStatement from './ops-statement.js';
@@ -10,7 +11,7 @@ const ops = {
         const column = fieldName.replace(/^.*\./, '');
         if (!isDatabaseArrayColumn(dreamClass, column))
             throw new AnyRequiresArrayColumn(dreamClass, column);
-        const castType = dreamClass['cachedTypeFor'](column);
+        const castType = cachedTypeForAttribute(dreamClass, column);
         return new OpsStatement('@>', sql `ARRAY[${sql.join([value])}]::${sql.raw(castType)}`);
     }),
     like: (like) => new OpsStatement('like', like),

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

@@ -2061,12 +2061,6 @@ export default class Dream {
      * ```
      */
     getAttributes<I extends Dream, DB extends I['DB']>(this: I): Selectable<DB[I['table']]>;
-    /**
-     * @internal
-     *
-     * Returns the db type stored within the database
-     */
-    private static cachedTypeFor;
     /**
      * Returns the attributes that have changed since
      * being persisted to the database, with the values

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

@@ -1,8 +1,13 @@
 import { DreamCliLoggerLogOpts } from '../../types/logger.js';
 export default class DreamCliLogger {
+    private spinner;
     log(text: string, { logPrefix, logPrefixColor, logPrefixBgColor }?: DreamCliLoggerLogOpts): void;
     logProgress(text: string, cb: () => void | Promise<void>, { logPrefix, logPrefixColor, logPrefixBgColor }?: DreamCliLoggerLogOpts): Promise<void>;
-    logStartProgress(text: string, { logPrefix, logPrefixColor, logPrefixBgColor }?: DreamCliLoggerLogOpts): void;
+    logStartProgress(text: string, { logPrefixColor, logPrefixBgColor }?: DreamCliLoggerLogOpts): void;
+    private startTopSpinner;
+    private startBottomSpinner;
     logContinueProgress(text: string, { logPrefix, logPrefixColor, logPrefixBgColor }?: DreamCliLoggerLogOpts): void;
     logEndProgress(text?: string, { logPrefix, logPrefixColor, logPrefixBgColor }?: DreamCliLoggerLogOpts): void;
+    private clearLine;
+    private escapeSequence;
 }

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

@@ -0,0 +1,2 @@
+import Dream from '../../Dream.js';
+export default function columnAllowsNull<T extends typeof Dream, DB extends InstanceType<T>['DB'], TableName extends keyof DB = InstanceType<T>['table'] & keyof DB, Table extends DB[keyof DB] = DB[TableName]>(dreamClass: T, attribute: keyof Table): boolean;

package/dist/types/src/serializer/builders/DreamSerializerBuilder.d.ts

@@ -38,7 +38,7 @@ export default class DreamSerializerBuilder<DataTypeForOpenapi extends typeof Dr
     attribute(name: NonJsonDreamColumnNames<DataType> & keyof DataType & 'type', options?: AutomaticSerializerAttributeOptionsForType): DreamSerializerBuilder<DataTypeForOpenapi, MaybeNullDataType, PassthroughDataType, DataType>;
     attribute(name: DreamVirtualColumns<DataType>[number], options?: SerializerAttributeOptionsForVirtualColumn): DreamSerializerBuilder<DataTypeForOpenapi, MaybeNullDataType, PassthroughDataType, DataType>;
     attribute<MaybeAttributeName extends NonJsonDreamColumnNames<DataType> | (keyof DataType & string), AttributeName extends MaybeAttributeName extends NonJsonDreamColumnNames<DataType> ? never : Exclude<keyof DataType, keyof Dream> & string>(name: AttributeName, options: NonAutomaticSerializerAttributeOptionsWithPossibleDecimalRenderOption): DreamSerializerBuilder<DataTypeForOpenapi, MaybeNullDataType, PassthroughDataType, DataType>;
-    attribute<AttributeName extends NonJsonDreamColumnNames<DataType> & keyof DataType & string>(name: AttributeName, options?: AutomaticSerializerAttributeOptions<DataType, AttributeName>): DreamSerializerBuilder<DataTypeForOpenapi, MaybeNullDataType, PassthroughDataType, DataType>;
+    attribute<AttributeName extends NonJsonDreamColumnNames<DataType> & keyof DataType & string>(name: AttributeName, options?: AutomaticSerializerAttributeOptions): DreamSerializerBuilder<DataTypeForOpenapi, MaybeNullDataType, PassthroughDataType, DataType>;
     /**
      * Includes an attribute from a nested object in the serialized output.
      *
@@ -67,7 +67,7 @@ export default class DreamSerializerBuilder<DataTypeForOpenapi extends typeof Dr
      *
      * See: {@link https://your-docs-url.com/docs/serializers/attributes | Serializer Attributes Documentation}
      */
-    delegatedAttribute<ProvidedModelType = undefined, ProvidedTargetName extends ProvidedModelType extends undefined ? undefined : Exclude<keyof ProvidedModelType, keyof Dream> = ProvidedModelType extends undefined ? undefined : Exclude<keyof ProvidedModelType, keyof Dream>, ActualDataType extends ProvidedModelType extends undefined ? DataType : ProvidedModelType = ProvidedModelType extends undefined ? DataType : ProvidedModelType, TargetName extends ProvidedTargetName extends undefined ? Exclude<keyof ActualDataType, keyof Dream> : ProvidedTargetName & keyof ActualDataType = ProvidedTargetName extends undefined ? Exclude<keyof ActualDataType, keyof Dream> : ProvidedTargetName & keyof ActualDataType, AssociatedModelType = Exclude<ActualDataType[TargetName], null>, TargetAttributeName extends AssociatedModelType extends object ? Exclude<keyof AssociatedModelType, keyof Dream> & string : never = AssociatedModelType extends object ? Exclude<keyof AssociatedModelType, keyof Dream> & string : never>(targetName: TargetName, name: TargetAttributeName, options?: AssociatedModelType extends Dream ? TargetAttributeName extends NonJsonDreamColumnNames<AssociatedModelType> & keyof AssociatedModelType & 'type' ? AutomaticSerializerAttributeOptionsForType : TargetAttributeName extends DreamVirtualColumns<AssociatedModelType>[number] ? SerializerAttributeOptionsForVirtualColumn : TargetAttributeName extends AssociatedModelType & keyof AssociatedModelType & string ? AutomaticSerializerAttributeOptions<AssociatedModelType, TargetAttributeName> | NonAutomaticSerializerAttributeOptionsWithPossibleDecimalRenderOption : NonAutomaticSerializerAttributeOptionsWithPossibleDecimalRenderOption : NonAutomaticSerializerAttributeOptionsWithPossibleDecimalRenderOption): this;
+    delegatedAttribute<ProvidedModelType = undefined, ProvidedTargetName extends ProvidedModelType extends undefined ? undefined : Exclude<keyof ProvidedModelType, keyof Dream> = ProvidedModelType extends undefined ? undefined : Exclude<keyof ProvidedModelType, keyof Dream>, ActualDataType extends ProvidedModelType extends undefined ? DataType : ProvidedModelType = ProvidedModelType extends undefined ? DataType : ProvidedModelType, TargetName extends ProvidedTargetName extends undefined ? Exclude<keyof ActualDataType, keyof Dream> : ProvidedTargetName & keyof ActualDataType = ProvidedTargetName extends undefined ? Exclude<keyof ActualDataType, keyof Dream> : ProvidedTargetName & keyof ActualDataType, AssociatedModelType = Exclude<ActualDataType[TargetName], null>, TargetAttributeName extends AssociatedModelType extends object ? Exclude<keyof AssociatedModelType, keyof Dream> & string : never = AssociatedModelType extends object ? Exclude<keyof AssociatedModelType, keyof Dream> & string : never>(targetName: TargetName, name: TargetAttributeName, options?: AssociatedModelType extends Dream ? TargetAttributeName extends NonJsonDreamColumnNames<AssociatedModelType> & keyof AssociatedModelType & 'type' ? AutomaticSerializerAttributeOptionsForType : TargetAttributeName extends DreamVirtualColumns<AssociatedModelType>[number] ? SerializerAttributeOptionsForVirtualColumn : TargetAttributeName extends AssociatedModelType & keyof AssociatedModelType & string ? AutomaticSerializerAttributeOptions | NonAutomaticSerializerAttributeOptionsWithPossibleDecimalRenderOption : NonAutomaticSerializerAttributeOptionsWithPossibleDecimalRenderOption : NonAutomaticSerializerAttributeOptionsWithPossibleDecimalRenderOption): this;
     /**
      * Includes a computed value in the serialized output.
      *

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

@@ -2,8 +2,8 @@ import Dream from '../Dream.js';
 import { RoundingPrecision } from '../helpers/round.js';
 import DreamSerializerBuilder from '../serializer/builders/DreamSerializerBuilder.js';
 import ObjectSerializerBuilder from '../serializer/builders/ObjectSerializerBuilder.js';
-import { DreamAttributeDbTypes, DreamSerializable, DreamSerializableArray, ViewModelClass } from './dream.js';
-import { DecimalOpenapiTypesIncludingDbTypes, OpenapiDescription, OpenapiSchemaBodyShorthand, OpenapiShorthandPrimitiveTypes } from './openapi.js';
+import { DreamSerializable, DreamSerializableArray, ViewModelClass } from './dream.js';
+import { OpenapiDescription, OpenapiSchemaBodyShorthand, OpenapiShorthandPrimitiveTypes } from './openapi.js';
 export type SerializerCasing = 'camel' | 'snake';
 export type DreamsOrSerializersOrViewModels = DreamSerializable | DreamSerializableArray;
 export interface InternalAnyTypedSerializerAttribute {
@@ -45,11 +45,11 @@ export interface InternalAnyTypedSerializerRendersMany<DataType, AttributeName e
     name: AttributeName;
     options: InternalAnyRendersOneOrManyOpts;
 }
-export type AutomaticSerializerAttributeOptions<DreamInstance extends Dream, AttributeName extends keyof DreamInstance & string> = {
+export type AutomaticSerializerAttributeOptions = {
     as?: string;
     default?: any;
     openapi?: OpenapiDescription;
-    precision?: DreamAttributeDbTypes<DreamInstance>[AttributeName] extends DecimalOpenapiTypesIncludingDbTypes ? RoundingPrecision : never;
+    precision?: RoundingPrecision;
     required?: false;
 };
 export type AutomaticSerializerAttributeOptionsForType = {

package/dist/types/src/types/serializer.ts

@@ -2,13 +2,8 @@ import Dream from '../Dream.js'
 import { RoundingPrecision } from '../helpers/round.js'
 import DreamSerializerBuilder from '../serializer/builders/DreamSerializerBuilder.js'
 import ObjectSerializerBuilder from '../serializer/builders/ObjectSerializerBuilder.js'
-import { DreamAttributeDbTypes, DreamSerializable, DreamSerializableArray, ViewModelClass } from './dream.js'
-import {
-  DecimalOpenapiTypesIncludingDbTypes,
-  OpenapiDescription,
-  OpenapiSchemaBodyShorthand,
-  OpenapiShorthandPrimitiveTypes,
-} from './openapi.js'
+import { DreamSerializable, DreamSerializableArray, ViewModelClass } from './dream.js'
+import { OpenapiDescription, OpenapiSchemaBodyShorthand, OpenapiShorthandPrimitiveTypes } from './openapi.js'
 
 export type SerializerCasing = 'camel' | 'snake'
 export type DreamsOrSerializersOrViewModels = DreamSerializable | DreamSerializableArray
@@ -62,16 +57,11 @@ export interface InternalAnyTypedSerializerRendersMany<
   options: InternalAnyRendersOneOrManyOpts
 }
 
-export type AutomaticSerializerAttributeOptions<
-  DreamInstance extends Dream,
-  AttributeName extends keyof DreamInstance & string,
-> = {
+export type AutomaticSerializerAttributeOptions = {
   as?: string
   default?: any
   openapi?: OpenapiDescription
-  precision?: DreamAttributeDbTypes<DreamInstance>[AttributeName] extends DecimalOpenapiTypesIncludingDbTypes
-    ? RoundingPrecision
-    : never
+  precision?: RoundingPrecision
   required?: false
 }