@rvoh/dream 1.3.3 → 1.4.0

package/dist/cjs/src/Dream.js

@@ -45,13 +45,16 @@ const CreateOrUpdateByFailedToCreateAndUpdate_js_1 = require("./errors/CreateOrU
 const GlobalNameNotSet_js_1 = require("./errors/dream-app/GlobalNameNotSet.js");
 const DreamMissingRequiredOverride_js_1 = require("./errors/DreamMissingRequiredOverride.js");
 const NonExistentScopeProvidedToResort_js_1 = require("./errors/NonExistentScopeProvidedToResort.js");
+const MissingSerializersDefinition_js_1 = require("./errors/serializers/MissingSerializersDefinition.js");
 const CalendarDate_js_1 = require("./helpers/CalendarDate.js");
 const cloneDeepSafe_js_1 = require("./helpers/cloneDeepSafe.js");
+const compact_js_1 = require("./helpers/compact.js");
 const DateTime_js_1 = require("./helpers/DateTime.js");
 const cachedTypeForAttribute_js_1 = require("./helpers/db/cachedTypeForAttribute.js");
 const isJsonColumn_js_1 = require("./helpers/db/types/isJsonColumn.js");
 const notEqual_js_1 = require("./helpers/notEqual.js");
 const inferSerializerFromDreamOrViewModel_js_1 = require("./serializer/helpers/inferSerializerFromDreamOrViewModel.js");
+const RECURSIVE_SERIALIZATION_MAX_REPEATS = 4;
 class Dream {
     DB;
     /**
@@ -155,7 +158,7 @@ class Dream {
      * @returns string
      */
     static get primaryKey() {
-        return this.prototype.primaryKey;
+        return this.prototype._primaryKey;
     }
     /**
      * Shadows #table, a getter which can be overwritten to customize the table field
@@ -167,8 +170,9 @@ class Dream {
         return this.prototype.table;
     }
     /**
-     * A getter which can be overwritten to customize the automatic createdAt timestamp field
-     * for a given model.
+     * @internal
+     *
+     * The `createdAt` field may be customized on a Dream model:
      *
      * ```ts
      *  class User extends ApplicationModel {
@@ -182,12 +186,13 @@ class Dream {
      *
      * @returns string
      */
-    get createdAtField() {
-        return 'createdAt';
+    get _createdAtField() {
+        return this.createdAtField || 'createdAt';
     }
     /**
-     * A getter which can be overwritten to customize the automatic updatedAt timestamp field
-     * for a given model.
+     * @internal
+     *
+     * The `updatedAt` field may be customized on a Dream model:
      *
      * ```ts
      *  class User extends ApplicationModel {
@@ -202,11 +207,30 @@ class Dream {
      *
      * @returns string
      */
-    get updatedAtField() {
-        return 'updatedAt';
+    get _updatedAtField() {
+        return this.updatedAtField || 'updatedAt';
     }
-    get deletedAtField() {
-        return 'deletedAt';
+    /**
+     * @internal
+     *
+     * The `deletedAt` field may be customized on a Dream model:
+     *
+     * ```ts
+     *  class User extends ApplicationModel {
+     *    public get deletedAtField() {
+     *       return 'deletedAtTimestamp' as const
+     *    }
+     *  }
+     *
+     * const user = await User.first()
+     * await user.destroy()
+     * user.deletedAtTimestamp // returns the DateTime that this user was soft-deleted
+     * ```
+     *
+     * @returns string
+     */
+    get _deletedAtField() {
+        return this.deletedAtField || 'deletedAt';
     }
     /**
      * @internal
@@ -379,7 +403,7 @@ class Dream {
      *   .whereAny(
      *     modelsWithTextAssociation.map(
      *       model => ({
-     *         localizableId: model.primaryKeyValue,
+     *         localizableId: model.primaryKeyValue(),
      *         localizableType: model.referenceTypeString,
      *       })
      *     )
@@ -441,7 +465,7 @@ class Dream {
      *   .whereAny(
      *     modelsWithTextAssociation.map(
      *       model => ({
-     *         localizableId: model.primaryKeyValue,
+     *         localizableId: model.primaryKeyValue(),
      *         localizableType: model.referenceTypeString,
      *       })
      *     )
@@ -528,10 +552,15 @@ class Dream {
             forDisplay: true,
         });
     }
-    static recursiveSerializationMap(serializer, { forDisplay = false, forDisplayDepth = 0, } = {}) {
+    static recursiveSerializationMap(serializer, { forDisplay = false, forDisplayDepth = 0, repeatedAssociationTracker = {}, } = {}) {
+        const depthTrackerId = this.globalName;
+        repeatedAssociationTracker[depthTrackerId] ??= 0;
+        if (repeatedAssociationTracker[depthTrackerId] + 1 > RECURSIVE_SERIALIZATION_MAX_REPEATS)
+            return {};
+        repeatedAssociationTracker[depthTrackerId]++;
         const serializerBuilder = serializer(undefined, undefined);
         const serializerAssociations = serializerBuilder['attributes'].filter(attribute => ['rendersOne', 'rendersMany', 'delegatedAttribute'].includes(attribute.type));
-        return serializerAssociations.reduce((accumulator, serializerAssociation) => {
+        const mappedAssociations = serializerAssociations.reduce((accumulator, serializerAssociation) => {
             const serializerAssociationName = serializerAssociation.targetName ??
                 serializerAssociation.name;
             const serializerAssociationType = serializerAssociation.type;
@@ -552,11 +581,17 @@ class Dream {
                  * `serializers` is an array because `associatedClass` may be an STI
                  * base, with each of its STI children having its own serializer
                  */
-                const serializers = serializerAssociation.options.serializer
-                    ? [serializerAssociation.options.serializer]
-                    : (0, inferSerializerFromDreamOrViewModel_js_1.inferSerializersFromDreamClassOrViewModelClass)(associatedClass, serializerAssociation.options.serializerKey);
-                if (!serializers.length)
-                    throw new Error(`No serializer found to render ${serializerAssociationName} on ${this.sanitizedName}`);
+                let serializers = [];
+                try {
+                    serializers = serializerAssociation.options.serializer
+                        ? (0, compact_js_1.default)([serializerAssociation.options.serializer])
+                        : (0, compact_js_1.default)((0, inferSerializerFromDreamOrViewModel_js_1.inferSerializersFromDreamClassOrViewModelClass)(associatedClass, serializerAssociation.options.serializerKey));
+                }
+                catch (error) {
+                    if (!(error instanceof MissingSerializersDefinition_js_1.default))
+                        throw error;
+                    serializers = [];
+                }
                 return serializers.map(serializer => [associatedClass, serializer]);
             });
             /////////////////////////////////////////////////////
@@ -579,6 +614,7 @@ class Dream {
                     ...associatedClass['recursiveSerializationMap'](associatedSerializer, {
                         forDisplay,
                         forDisplayDepth: forDisplayDepth + 1,
+                        repeatedAssociationTracker,
                     }),
                 };
             }, {});
@@ -591,6 +627,10 @@ class Dream {
             };
             return accumulator;
         }, {});
+        // reduce the depth as we're coming up so that other branches of the serialization tree don't stop
+        // rendering this association on this class
+        repeatedAssociationTracker[depthTrackerId]--;
+        return mappedAssociations;
     }
     /**
      * Returns the column names for the given model
@@ -633,13 +673,13 @@ class Dream {
     }
     static defaultParamSafeColumns() {
         const columns = [...this.columns()].filter(column => {
-            if (this.prototype.primaryKey === column)
+            if (this.prototype._primaryKey === column)
                 return false;
-            if (this.prototype.createdAtField === column)
+            if (this.prototype._createdAtField === column)
                 return false;
-            if (this.prototype.updatedAtField === column)
+            if (this.prototype._updatedAtField === column)
                 return false;
-            if (this.prototype.deletedAtField === column)
+            if (this.prototype._deletedAtField === column)
                 return false;
             if (this.explicitUnsafeParamColumns.includes(column))
                 return false;
@@ -1138,7 +1178,7 @@ class Dream {
      */
     query() {
         const dreamClass = this.constructor;
-        return dreamClass.where({ [this.primaryKey]: this.primaryKeyValue });
+        return dreamClass.where({ [this._primaryKey]: this.primaryKeyValue() });
     }
     /**
      * Finds the first record—ordered by primary key—matching
@@ -2119,9 +2159,9 @@ class Dream {
         return !Object.keys(this.errors).filter(key => !!this.errors[key]?.length).length;
     }
     /**
-     * The name of the primary key column on this model.
-     * NOTE: Must specify `as const` when defining a custom
-     * primary key.
+     * @internal
+     *
+     * The primary key may be customized on a Dream model:
      *
      * ```ts
      * class User extends ApplicationModel {
@@ -2135,16 +2175,16 @@ class Dream {
      *
      * @returns The primary key column name
      */
-    get primaryKey() {
-        return 'id';
+    get _primaryKey() {
+        return this.primaryKey || 'id';
     }
     /**
      * Returns the value of the primary key
      *
      * @returns The value of the primary key field for this Dream instance
      */
-    get primaryKeyValue() {
-        return this[this.primaryKey] || null;
+    primaryKeyValue() {
+        return this[this._primaryKey] || null;
     }
     /**
      * This must be defined on every model, and it must point
@@ -2916,7 +2956,7 @@ class Dream {
         return this.comparisonKey === other.comparisonKey;
     }
     get comparisonKey() {
-        return `${this.constructor.globalName}:${this.primaryKeyValue}`;
+        return `${this.constructor.globalName}:${this.primaryKeyValue()}`;
     }
     /**
      * @internal
@@ -2935,9 +2975,9 @@ class Dream {
     dup() {
         const clone = this.clone({ includeAssociations: false });
         clone.isPersisted = false;
-        clone[clone.primaryKey] = undefined;
-        clone[clone.createdAtField] = undefined;
-        clone[clone.updatedAtField] = undefined;
+        clone[clone._primaryKey] = undefined;
+        clone[clone._createdAtField] = undefined;
+        clone[clone._updatedAtField] = undefined;
         const dreamClass = this.constructor;
         dreamClass.sortableFields.forEach(data => {
             ;

package/dist/cjs/src/bin/helpers/sync.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = writeSyncFile;
 const fs = require("node:fs/promises");
 const path = require("node:path");
+const CliFileWriter_js_1 = require("../../cli/CliFileWriter.js");
 const index_js_1 = require("../../cli/index.js");
 const colorize_js_1 = require("../../cli/logger/loggable/colorize.js");
 const index_js_2 = require("../../dream-app/index.js");
@@ -12,7 +13,6 @@ const EnvInternal_js_1 = require("../../helpers/EnvInternal.js");
 const dreamPath_js_1 = require("../../helpers/path/dreamPath.js");
 const snakeify_js_1 = require("../../helpers/snakeify.js");
 const sspawn_js_1 = require("../../helpers/sspawn.js");
-const CliFileWriter_js_1 = require("../../cli/CliFileWriter.js");
 async function writeSyncFile() {
     const dreamApp = index_js_2.default.getOrFail();
     const dbConf = dreamApp.dbConnectionConfig('primary');
@@ -60,8 +60,7 @@ export class DBClass {
     return sortedFileContents;
 }
 function removeUnwantedExports(file) {
-    return file.replace(/\nexport type Timestamp = ColumnType<.*/, `export type IdType = string | number | bigint
-export type Timestamp = ColumnType<DateTime | CalendarDate>`);
+    return file.replace(/\nexport type Timestamp = ColumnType<.*/, `export type Timestamp = ColumnType<DateTime | CalendarDate>`);
 }
 function addCustomImports(file) {
     const customImports = EnvInternal_js_1.default.boolean('DREAM_CORE_DEVELOPMENT')

package/dist/cjs/src/decorators/class/SoftDelete.js

@@ -47,7 +47,7 @@ function SoftDelete() {
             throw new StiChildIncompatibleWithSoftDeleteDecorator_js_1.default(dreamClass);
         dreamClass['softDelete'] = true;
         target[exports.SOFT_DELETE_SCOPE_NAME] = function (query) {
-            return query.where({ [dreamClass.prototype.deletedAtField]: null });
+            return query.where({ [dreamClass.prototype['_deletedAtField']]: null });
         };
         (0, Scope_js_1.scopeImplementation)(target, exports.SOFT_DELETE_SCOPE_NAME, { default: true });
     };

package/dist/cjs/src/decorators/field/association/shared.js

@@ -102,7 +102,7 @@ function associationPrimaryKeyAccessors(partialAssociation, dreamClass) {
             if (this.primaryKeyOverride)
                 return this.primaryKeyOverride;
             if (associationInstance)
-                return associationInstance.primaryKey;
+                return associationInstance['_primaryKey'];
             const associationClass = associatedClassOverride ?? this.modelCB();
             if (Array.isArray(associationClass)) {
                 throw new Error(`

package/dist/cjs/src/decorators/field/sortable/helpers/decrementScopedRecordsGreaterThanPosition.js

@@ -6,7 +6,7 @@ const getColumnForSortableScope_js_1 = require("./getColumnForSortableScope.js")
 const scopeArray_js_1 = require("./scopeArray.js");
 async function decrementPositionForScopedRecordsGreaterThanPosition(position, { dream, positionField, query, scope, }) {
     let kyselyQuery = query
-        .whereNot({ [dream.primaryKey]: dream.primaryKeyValue })
+        .whereNot({ [dream['_primaryKey']]: dream.primaryKeyValue() })
         .where({
         [positionField]: index_js_1.default.greaterThanOrEqualTo(position),
     })

package/dist/cjs/src/decorators/field/sortable/helpers/resortAllRecords.js

@@ -21,7 +21,7 @@ async function resortAllRecords(dreamClass, positionField, scope) {
             for (const dream of dreams) {
                 await dreamClass
                     .txn(txn)
-                    .where({ [dream.primaryKey]: dream.primaryKeyValue })
+                    .where({ [dream['_primaryKey']]: dream.primaryKeyValue() })
                     .toKysely('update')
                     .set({
                     [positionField]: counter++,

package/dist/cjs/src/decorators/field/sortable/helpers/setPosition.js

@@ -82,7 +82,7 @@ async function setNewPosition({ dream, positionField, query, scope, previousPosi
     const dbOrTxn = txn ? txn.kyselyTransaction : (0, index_js_1.default)('primary');
     await dbOrTxn
         .updateTable(dream.table)
-        .where(dream.primaryKey, '=', dream.primaryKeyValue)
+        .where(dream['_primaryKey'], '=', dream.primaryKeyValue())
         .set({
         [positionField]: newPosition,
     })
@@ -123,7 +123,7 @@ async function updateConflictingRecords({ position, previousPosition, dream, pos
     const increasing = newPosition === undefined || (previousPosition !== undefined && previousPosition < newPosition);
     let kyselyQuery = query
         .txn(txn)
-        .whereNot({ [dream.primaryKey]: dream.primaryKeyValue })
+        .whereNot({ [dream['_primaryKey']]: dream.primaryKeyValue() })
         .where({
         [positionField]: increasing
             ? (0, range_js_1.default)(previousPosition, newPosition)
@@ -150,7 +150,7 @@ function applySortableScopesToQuery(dream, kyselyQuery, whereValueCB, scope) {
 async function updatePositionForRecord(txn, dream, positionField, position) {
     await txn.kyselyTransaction
         .updateTable(dream.table)
-        .where(dream.primaryKey, '=', dream.primaryKeyValue)
+        .where(dream['_primaryKey'], '=', dream.primaryKeyValue())
         .set({
         [positionField]: position,
     })

package/dist/cjs/src/decorators/field/sortable/helpers/sortableQueryExcludingDream.js

@@ -4,7 +4,7 @@ exports.default = sortableQueryExcludingDream;
 const applySortableScopeToQuery_js_1 = require("./applySortableScopeToQuery.js");
 function sortableQueryExcludingDream(dream, query, scope) {
     query = query.whereNot({
-        [dream.primaryKey]: dream.primaryKeyValue,
+        [dream['_primaryKey']]: dream.primaryKeyValue(),
     });
     return (0, applySortableScopeToQuery_js_1.default)(query, dream, scope);
 }

package/dist/cjs/src/dream/DreamInstanceTransactionBuilder.js

@@ -591,8 +591,8 @@ class DreamInstanceTransactionBuilder {
      */
     queryInstance() {
         const dreamClass = this.dreamInstance.constructor;
-        const id = this.dreamInstance.primaryKeyValue;
-        return dreamClass.txn(this.dreamTransaction).where({ [this.dreamInstance.primaryKey]: id });
+        const id = this.dreamInstance.primaryKeyValue();
+        return dreamClass.txn(this.dreamTransaction).where({ [this.dreamInstance['_primaryKey']]: id });
     }
 }
 exports.default = DreamInstanceTransactionBuilder;

package/dist/cjs/src/dream/LeftJoinLoadBuilder.js

@@ -119,7 +119,7 @@ class LeftJoinLoadBuilder {
             if (associationMetadata === undefined)
                 throw new UnexpectedUndefined_js_1.default();
             this.query.dbDriverInstance()['hydrateAssociation']([this.dream], associationMetadata, this.associationToPreloadedDreamsAndWhatTheyPointTo({
-                pointsToPrimaryKey: this.dream.primaryKeyValue,
+                pointsToPrimaryKey: this.dream.primaryKeyValue(),
                 associatedModels: dreamWithLoadedAssociations[associationName],
             }));
         });

package/dist/cjs/src/dream/Query.js

@@ -327,7 +327,7 @@ class Query {
         if (!primaryKey)
             return null;
         return await this.where({
-            [this.dreamInstance.primaryKey]: primaryKey,
+            [this.dreamInstance['_primaryKey']]: primaryKey,
         }).first();
     }
     /**
@@ -414,13 +414,15 @@ class Query {
         let lastId = null;
         do {
             if (lastId)
-                records = await query.where({ [this.dreamInstance.primaryKey]: index_js_2.default.greaterThan(lastId) }).all();
+                records = await query
+                    .where({ [this.dreamInstance['_primaryKey']]: index_js_2.default.greaterThan(lastId) })
+                    .all();
             else
                 records = await query.all();
             for (const record of records) {
                 await cb(record);
             }
-            lastId = records.at(-1)?.primaryKeyValue;
+            lastId = records.at(-1)?.primaryKeyValue?.();
         } while (records.length > 0 && records.length === batchSize);
     }
     /**
@@ -1029,7 +1031,7 @@ class Query {
     distinct(column = true) {
         if (column === true) {
             return this.clone({
-                distinctColumn: this.namespaceColumn(this.dreamInstance.primaryKey),
+                distinctColumn: this.namespaceColumn(this.dreamInstance['_primaryKey']),
             });
         }
         else if (column === false) {

package/dist/cjs/src/dream/QueryDriver/Kysely.js

@@ -343,7 +343,7 @@ class KyselyQueryDriver extends Base_js_1.default {
         let kyselyQuery = new KyselyQueryDriver(query).buildSelect({ bypassSelectAll: true, bypassOrder: true });
         const countClause = distinctColumn
             ? count((0, kysely_1.sql) `DISTINCT ${distinctColumn}`)
-            : count(query['namespaceColumn'](query.dreamInstance.primaryKey));
+            : count(query['namespaceColumn'](query.dreamInstance['_primaryKey']));
         kyselyQuery = kyselyQuery.select(countClause.as('tablecount'));
         const data = await (0, executeDatabaseQuery_js_1.default)(kyselyQuery, 'executeTakeFirstOrThrow');
         return parseInt(data.tablecount.toString());
@@ -425,7 +425,7 @@ class KyselyQueryDriver extends Base_js_1.default {
                 const query = db
                     .updateTable(dream.table)
                     .set(sqlifiedAttributes)
-                    .where((0, namespaceColumn_js_1.default)(dream.primaryKey, dream.table), '=', dream.primaryKeyValue);
+                    .where((0, namespaceColumn_js_1.default)(dream['_primaryKey'], dream.table), '=', dream.primaryKeyValue());
                 return await (0, executeDatabaseQuery_js_1.default)(query.returning([...dream.columns()]), 'executeTakeFirstOrThrow');
             }
             else {
@@ -587,7 +587,7 @@ class KyselyQueryDriver extends Base_js_1.default {
         //  rating.rateable = loadedAssociation
         preloadedDreamsAndWhatTheyPointTo.forEach(preloadedDreamAndWhatItPointsTo => {
             dreams
-                .filter(dream => dream.primaryKeyValue === preloadedDreamAndWhatItPointsTo.pointsToPrimaryKey)
+                .filter(dream => dream.primaryKeyValue() === preloadedDreamAndWhatItPointsTo.pointsToPrimaryKey)
                 .forEach((dream) => {
                 if (association.type === 'HasMany') {
                     dream[association.as].push(preloadedDreamAndWhatItPointsTo.dream);
@@ -658,8 +658,8 @@ class KyselyQueryDriver extends Base_js_1.default {
     attachLimitAndOrderStatementsToNonSelectQuery(kyselyQuery) {
         if (this.query['limitStatement'] || this.query['orderStatements'].length) {
             kyselyQuery = kyselyQuery.where((eb) => {
-                const subquery = this.query.nestedSelect(this.dreamInstance.primaryKey);
-                return eb(this.dreamInstance.primaryKey, 'in', subquery);
+                const subquery = this.query.nestedSelect(this.dreamInstance['_primaryKey']);
+                return eb(this.dreamInstance['_primaryKey'], 'in', subquery);
             });
             return {
                 kyselyQuery,
@@ -1825,7 +1825,7 @@ class KyselyQueryDriver extends Base_js_1.default {
             // regardless of default scopes on that Dream's class.
             bypassAllDefaultScopesExceptOnAssociations: true,
         }).where({
-            [dreamClass.primaryKey]: dreams.map(obj => obj.primaryKeyValue),
+            [dreamClass.primaryKey]: dreams.map(obj => obj.primaryKeyValue()),
         });
         const hydrationData = await associationDataScope['_connection'](this.connectionOverride)
             .innerJoin(associationName, (onStatement || {}))

package/dist/cjs/src/dream/internal/associations/associationQuery.js

@@ -8,7 +8,7 @@ function associationQuery(dream, txn = null, associationName, { joinAndStatement
     const dreamClass = dream.constructor;
     const dreamClassOrTransaction = (txn ? dreamClass.txn(txn) : dreamClass);
     let baseSelectQuery = dreamClassOrTransaction.where({
-        [dream.primaryKey]: dream.primaryKeyValue,
+        [dream['_primaryKey']]: dream.primaryKeyValue(),
     });
     if (joinAndStatements && (joinAndStatements.and || joinAndStatements.andNot || joinAndStatements.andAny))
         baseSelectQuery = baseSelectQuery.innerJoin(association.as, joinAndStatements);

package/dist/cjs/src/dream/internal/associations/associationUpdateQuery.js

@@ -25,7 +25,7 @@ function associationUpdateQuery(dream, txn = null, associationName, { joinAndSta
     else
         nestedScope = nestedScope.innerJoin(association.as);
     const nestedSelect = nestedScope
-        .where({ [dream.primaryKey]: dream.primaryKeyValue })
+        .where({ [dream['_primaryKey']]: dream.primaryKeyValue() })
         .nestedSelect((0, namespaceColumn_js_1.default)(associationClass.primaryKey, association.as));
     const whereClause = {
         [associationClass.primaryKey]: nestedSelect,

package/dist/cjs/src/dream/internal/destroyDream.js

@@ -65,7 +65,7 @@ async function maybeDestroyDream(dream, txn, reallyDestroy) {
     else if (!dream['_preventDeletion']) {
         await txn.kyselyTransaction
             .deleteFrom(dream.table)
-            .where(dream.primaryKey, '=', dream.primaryKeyValue)
+            .where(dream['_primaryKey'], '=', dream.primaryKeyValue())
             .execute();
     }
 }

package/dist/cjs/src/dream/internal/reload.js

@@ -13,7 +13,7 @@ async function reload(dream, txn = null) {
     // we have persisted are not yet propagated
     else
         query = query.connection('primary');
-    query = query.removeAllDefaultScopes().where({ [dream.primaryKey]: dream.primaryKeyValue });
+    query = query.removeAllDefaultScopes().where({ [dream['_primaryKey']]: dream.primaryKeyValue() });
     const reloadedRecord = await query.firstOrFail();
     dream.setAttributes(reloadedRecord.getAttributes());
     dream['freezeAttributes']();

package/dist/cjs/src/dream/internal/softDeleteDream.js

@@ -5,15 +5,15 @@ const MissingDeletedAtFieldForSoftDelete_js_1 = require("../../errors/MissingDel
 const DateTime_js_1 = require("../../helpers/DateTime.js");
 const isDatetimeOrDatetimeArrayColumn_js_1 = require("../../helpers/db/types/isDatetimeOrDatetimeArrayColumn.js");
 async function softDeleteDream(dream, txn) {
-    const deletedAtField = dream.deletedAtField;
+    const deletedAtField = dream['_deletedAtField'];
     const dreamClass = dream.constructor;
     if (!(0, isDatetimeOrDatetimeArrayColumn_js_1.default)(dreamClass, deletedAtField)) {
         throw new MissingDeletedAtFieldForSoftDelete_js_1.default(dream.constructor);
     }
     let query = txn.kyselyTransaction
         .updateTable(dream.table)
-        .where(dream.primaryKey, '=', dream.primaryKeyValue)
-        .set(dream.deletedAtField, DateTime_js_1.DateTime.now());
+        .where(dream['_primaryKey'], '=', dream.primaryKeyValue())
+        .set(dream['_deletedAtField'], DateTime_js_1.DateTime.now());
     dreamClass['sortableFields']?.forEach(sortableFieldMetadata => {
         const positionColumn = sortableFieldMetadata.positionField;
         query = query.set(positionColumn, null);

package/dist/cjs/src/dream/internal/undestroyDream.js

@@ -54,8 +54,8 @@ async function undestroyDreamWithTransaction(dream, txn, options) {
 async function doUndestroyDream(dream, txn) {
     let query = txn.kyselyTransaction
         .updateTable(dream.table)
-        .where(dream.primaryKey, '=', dream.primaryKeyValue)
-        .set({ [dream.deletedAtField]: null });
+        .where(dream['_primaryKey'], '=', dream.primaryKeyValue())
+        .set({ [dream['_deletedAtField']]: null });
     const dreamClass = dream.constructor;
     dreamClass['sortableFields']?.forEach(sortableFieldMetadata => {
         const positionColumn = sortableFieldMetadata.positionField;

package/dist/cjs/src/dream-app/index.js

@@ -96,6 +96,7 @@ class DreamApp {
         pgTypes.setTypeParser(pgTypes.builtins.TIMESTAMP, customPgParsers_js_1.parsePostgresDatetime);
         pgTypes.setTypeParser(pgTypes.builtins.TIMESTAMPTZ, customPgParsers_js_1.parsePostgresDatetime);
         pgTypes.setTypeParser(pgTypes.builtins.NUMERIC, customPgParsers_js_1.parsePostgresDecimal);
+        pgTypes.setTypeParser(pgTypes.builtins.INT8, customPgParsers_js_1.parsePostgresBigint);
         const textArrayOid = await (0, customPgParsers_js_1.findCorrespondingArrayOid)(kyselyDb, pgTypes.builtins.TEXT);
         if (textArrayOid) {
             let oid;
@@ -123,6 +124,9 @@ class DreamApp {
             oid = await (0, customPgParsers_js_1.findCorrespondingArrayOid)(kyselyDb, pgTypes.builtins.NUMERIC);
             if (oid)
                 pgTypes.setTypeParser(oid, transformPostgresArray(customPgParsers_js_1.parsePostgresDecimal));
+            oid = await (0, customPgParsers_js_1.findCorrespondingArrayOid)(kyselyDb, pgTypes.builtins.INT8);
+            if (oid)
+                pgTypes.setTypeParser(oid, transformPostgresArray(customPgParsers_js_1.parsePostgresBigint));
         }
     }
     static checkKey(encryptionIdentifier, key, algorithm) {

package/dist/cjs/src/errors/MissingDeletedAtFieldForSoftDelete.js

@@ -7,7 +7,7 @@ class MissingDeletedAtFieldForSoftDelete extends Error {
         this.dreamClass = dreamClass;
     }
     get message() {
-        const deletedAtField = this.dreamClass.prototype.deletedAtField;
+        const deletedAtField = this.dreamClass.prototype['_deletedAtField'];
         return `
 Expected "${deletedAtField}" to be a valid column for the ${this.dreamClass.name} model.
 Whenever the using SoftDelete decorator, you must have either a deletedAt column,

package/dist/cjs/src/helpers/cli/SchemaBuilder.js

@@ -83,10 +83,6 @@ export const schema = {
                 return '';
             return `\
 ${tableName}: {
-    primaryKey: '${tableData.primaryKey}',
-    createdAtField: '${tableData.createdAtField}',
-    updatedAtField: '${tableData.updatedAtField}',
-    deletedAtField: '${tableData.deletedAtField}',
     serializerKeys: ${stringifyArray(tableData.serializerKeys)},
     scopes: {
       default: ${stringifyArray(defaultScopeNames)},
@@ -195,10 +191,6 @@ may need to update the table getter in the corresponding Dream.
         });
         const serializerKeys = (0, intersection_js_1.default)(...eachModelSerializerKeys);
         return {
-            primaryKey: baseModel.prototype.primaryKey,
-            createdAtField: baseModel.prototype.createdAtField,
-            updatedAtField: baseModel.prototype.updatedAtField,
-            deletedAtField: baseModel.prototype.deletedAtField,
             scopes: {
                 default: (0, uniq_js_1.default)(models.flatMap(model => model['scopes'].default.map(scopeStatement => scopeStatement.method))),
                 named: (0, uniq_js_1.default)(models.flatMap(model => model['scopes'].named.map(scopeStatement => scopeStatement.method))),
@@ -386,7 +378,7 @@ may need to update the table getter in the corresponding Dream.
                     return /^date[[\]]*$/.test(dbType) ? `CalendarDate${postfix}` : `DateTime${postfix}`;
                 case 'Int8':
                 case 'Int8[]':
-                    return `IdType${postfix}`;
+                    return `string${postfix}`;
                 default:
                     return individualType;
             }

package/dist/cjs/src/helpers/cli/generateSerializerContent.js

@@ -54,7 +54,7 @@ function generateSerializerContent({ fullyQualifiedModelName, columnsWithTypes =
             return '';
         if (['belongs_to', 'has_one', 'has_many'].includes(type))
             return '';
-        return `\n    ${attribute(name, type, attr)}`;
+        return `\n    ${attribute(name, type, attr, stiBaseSerializer)}`;
     })
         .join('')}`;
     return `${dreamImport}${additionalImportsStr}${relatedModelImport}${additionalModelImports.join('')}
@@ -69,7 +69,10 @@ ${summarySerializer.replace(summarySerializerClassName, adminSummarySerializerCl
 ${defaultSerializer.replace(serializerClassName, adminSerializerClassName).replace(summarySerializerClassName, adminSummarySerializerClassName)}`}
 `;
 }
-function attribute(name, type, attr) {
+function attribute(name, type, attr, stiBaseSerializer) {
+    if (name === 'type' && stiBaseSerializer) {
+        return `.attribute('type', { openapi: { type: 'string', enum: [StiChildClass.sanitizedName] } })`;
+    }
     switch (type) {
         case 'json':
         case 'jsonb':

package/dist/cjs/src/helpers/customPgParsers.js

@@ -6,6 +6,7 @@ exports.findCorrespondingArrayOid = findCorrespondingArrayOid;
 exports.parsePostgresDate = parsePostgresDate;
 exports.parsePostgresDatetime = parsePostgresDatetime;
 exports.parsePostgresDecimal = parsePostgresDecimal;
+exports.parsePostgresBigint = parsePostgresBigint;
 const CalendarDate_js_1 = require("./CalendarDate.js");
 const DateTime_js_1 = require("./DateTime.js");
 async function findEnumArrayOids(kyselyDb) {
@@ -37,3 +38,12 @@ function parsePostgresDatetime(datetimeString) {
 function parsePostgresDecimal(numberString) {
     return numberString ? parseFloat(numberString) : numberString;
 }
+function parsePostgresBigint(numberString) {
+    /**
+     * JSON.stringify() throws an error when it encounters a bigint anywhere, and they are
+     * troublesome overall to handle. Instead, we serialize bigints as strings, but allow
+     * numerical operations to be performed on them in the database (e.g. when passing an
+     * `ops` query ina `where` clause)
+     */
+    return numberString;
+}

package/dist/cjs/src/helpers/sort.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = sort;
 const sortBy_js_1 = require("./sortBy.js");
 /**
- * Returns a copy of array containing strings, numbers, bigints, and/or IdTypes, sorted in ascending order.
+ * Returns a copy of array containing strings, numbers, bigints, sorted in ascending order.
  * To sort other types use {@link sortBy}.
  *
  *  ```ts