@rvoh/dream 0.42.3 → 0.43.0-beta.10

package/dist/cjs/src/Dream.js

@@ -41,16 +41,13 @@ const CreateOrFindByFailedToCreateAndFind_js_1 = require("./errors/CreateOrFindB
 const CreateOrUpdateByFailedToCreateAndUpdate_js_1 = require("./errors/CreateOrUpdateByFailedToCreateAndUpdate.js");
 const GlobalNameNotSet_js_1 = require("./errors/dream-app/GlobalNameNotSet.js");
 const DreamMissingRequiredOverride_js_1 = require("./errors/DreamMissingRequiredOverride.js");
-const MissingSerializersDefinition_js_1 = require("./errors/MissingSerializersDefinition.js");
 const NonExistentScopeProvidedToResort_js_1 = require("./errors/NonExistentScopeProvidedToResort.js");
 const CalendarDate_js_1 = require("./helpers/CalendarDate.js");
 const cloneDeepSafe_js_1 = require("./helpers/cloneDeepSafe.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 inferSerializerFromDreamOrViewModel_js_1 = require("./helpers/inferSerializerFromDreamOrViewModel.js");
 const notEqual_js_1 = require("./helpers/notEqual.js");
-const typechecks_js_1 = require("./helpers/typechecks.js");
 class Dream {
     DB;
     /**
@@ -489,6 +486,17 @@ class Dream {
             ...new Set([...columns, ...this.virtualAttributes.map(attr => attr.property)]),
         ];
     }
+    /**
+     * @internal
+     *
+     * Returns true if the column is a column in the database
+     *
+     * @param columnName - the name of the property you are checking for
+     * @returns boolean
+     */
+    static isColumn(columnName) {
+        return this.prototype.isColumn(columnName);
+    }
     /**
      * @internal
      *
@@ -720,7 +728,7 @@ class Dream {
         try {
             const dreamModel = this.new({
                 ...attributes,
-                ...(extraOpts?.createWith || {}),
+                ...extraOpts?.createWith,
             });
             await dreamModel.save();
             return dreamModel;
@@ -774,7 +782,7 @@ class Dream {
         try {
             return await this.create({
                 ...attributes,
-                ...(extraOpts?.with || {}),
+                ...extraOpts?.with,
             }, skipHooks ? { skipHooks } : undefined);
         }
         catch (err) {
@@ -2068,7 +2076,7 @@ class Dream {
                                 ? null
                                 : val === undefined
                                     ? undefined
-                                    : (0, typechecks_js_1.isString)(val)
+                                    : typeof val === 'string'
                                         ? val
                                         : JSON.stringify(val));
                         },
@@ -2142,6 +2150,17 @@ class Dream {
          */
         this.unshadowColumnPropertyPrototypeAccessors();
     }
+    /**
+     * @internal
+     *
+     * Returns true if the column is a column in the database
+     *
+     * @param columnName - the name of the property you are checking for
+     * @returns boolean
+     */
+    isColumn(columnName) {
+        return this.columns().has(columnName);
+    }
     /**
      * Returns true if the columnName passed is marked by a
      * Virtual attribute decorator
@@ -2150,9 +2169,7 @@ class Dream {
      * @returns A boolean
      */
     isVirtualColumn(columnName) {
-        return this.constructor.virtualAttributes
-            .map(attr => attr.property)
-            .includes(columnName);
+        return !!this.constructor.virtualAttributes.find(attr => attr.property === columnName);
     }
     /**
      * Returns an object with column names for keys, and an
@@ -2462,7 +2479,7 @@ class Dream {
     unknownValueToMillis(currentValue) {
         if (!currentValue)
             return;
-        if ((0, typechecks_js_1.isString)(currentValue))
+        if (typeof currentValue === 'string')
             currentValue = DateTime_js_1.DateTime.fromISO(currentValue);
         if (currentValue instanceof CalendarDate_js_1.default)
             currentValue = currentValue.toDateTime();
@@ -2475,7 +2492,7 @@ class Dream {
     unknownValueToDateString(currentValue) {
         if (!currentValue)
             return;
-        if ((0, typechecks_js_1.isString)(currentValue))
+        if (typeof currentValue === 'string')
             currentValue = CalendarDate_js_1.default.fromISO(currentValue);
         if (currentValue instanceof DateTime_js_1.DateTime)
             currentValue = CalendarDate_js_1.default.fromDateTime(currentValue);
@@ -2926,31 +2943,6 @@ class Dream {
     async reload() {
         await (0, reload_js_1.default)(this);
     }
-    /**
-     * Serializes an instance. You can specify a serializer key,
-     * or else the default will be used
-     *
-     * ```ts
-     * // uses the default serializer provided in the model's `serializers` getter
-     * await user.serialize()
-     *
-     * // uses the summary serializer provided in the model's `serializers` getter
-     * await user.serialize({ serializerKey: 'summary' })
-     * ```
-     *
-     * @param args.casing - Which casing to use when serializing (camel or snake, default camel)
-     * @param args.serializerKey - The key to use when referencing the object returned by the `serializers` getter on the given model instance (defaults to "default")
-     * @returns A serialized representation of the model
-     */
-    serialize({ casing = null, serializerKey } = {}) {
-        const serializerClass = (0, inferSerializerFromDreamOrViewModel_js_1.default)(this, serializerKey?.toString());
-        if (!serializerClass)
-            throw new MissingSerializersDefinition_js_1.default(this.constructor);
-        const serializer = new serializerClass(this);
-        if (casing)
-            serializer.casing(casing);
-        return serializer.render();
-    }
     /**
      * Takes the attributes passed in and sets their values,
      * leveraging any custom setters defined for these attributes.

package/dist/cjs/src/bin/index.js

@@ -81,7 +81,12 @@ class DreamBin {
         await (0, generateDream_js_1.default)({ fullyQualifiedModelName, columnsWithTypes, options });
     }
     static async generateStiChild(fullyQualifiedModelName, fullyQualifiedParentName, columnsWithTypes, options) {
-        await (0, generateDream_js_1.default)({ fullyQualifiedModelName, columnsWithTypes, options, fullyQualifiedParentName });
+        await (0, generateDream_js_1.default)({
+            fullyQualifiedModelName,
+            columnsWithTypes,
+            options: { ...options, stiBaseSerializer: false },
+            fullyQualifiedParentName,
+        });
     }
     static async generateMigration(migrationName, columnsWithTypes) {
         await (0, generateMigration_js_1.default)({ migrationName, columnsWithTypes });

package/dist/cjs/src/cli/index.js

@@ -46,6 +46,7 @@ class DreamCLI {
             .alias('generate:dream')
             .alias('g:dream')
             .option('--no-serializer')
+            .option('--sti-base-serializer', 'Omits the serializer from the dream model, but does create the serializer so it can be extended by STI children')
             .description('create a new Dream model')
             .argument('<modelName>', 'the name of the model to create, e.g. Post or Settings/CommunicationPreferences')
             .argument('[columnsWithTypes...]', 'properties of the model property1:text/string/enum/etc. property2:text/string/enum/etc. ... propertyN:text/string/enum/etc.')

package/dist/cjs/src/decorators/field/validation/Validates.js

@@ -61,8 +61,11 @@ function extractValidationOptionsFromArgs(type, args) {
             }
         case 'requiredBelongsTo':
             return {};
-        default:
-            throw new Error(`Unhandled validation type when caching options: ${type}`);
+        default: {
+            // protection so that if a new ValidationType is ever added, this will throw a type error at build time
+            const _never = type;
+            throw new Error(`Unhandled ValidationType: ${_never}`);
+        }
     }
 }
 class ValidationInstantiationError extends Error {

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

@@ -5,6 +5,7 @@ const pluralize_esm_1 = require("pluralize-esm");
 const ConnectedToDB_js_1 = require("../db/ConnectedToDB.js");
 const SoftDelete_js_1 = require("../decorators/class/SoftDelete.js");
 const associationToGetterSetterProp_js_1 = require("../decorators/field/association/associationToGetterSetterProp.js");
+const index_js_1 = require("../dream-app/index.js");
 const AssociationDeclaredWithoutAssociatedDreamClass_js_1 = require("../errors/associations/AssociationDeclaredWithoutAssociatedDreamClass.js");
 const CannotAssociateThroughPolymorphic_js_1 = require("../errors/associations/CannotAssociateThroughPolymorphic.js");
 const CannotJoinPolymorphicBelongsToError_js_1 = require("../errors/associations/CannotJoinPolymorphicBelongsToError.js");
@@ -21,6 +22,8 @@ const LeftJoinPreloadIncompatibleWithFindEach_js_1 = require("../errors/LeftJoin
 const MissingRequiredCallbackFunctionToPluckEach_js_1 = require("../errors/MissingRequiredCallbackFunctionToPluckEach.js");
 const NoUpdateAllOnJoins_js_1 = require("../errors/NoUpdateAllOnJoins.js");
 const NoUpdateOnAssociationQuery_js_1 = require("../errors/NoUpdateOnAssociationQuery.js");
+const CannotPaginateWithLimit_js_1 = require("../errors/pagination/CannotPaginateWithLimit.js");
+const CannotPaginateWithOffset_js_1 = require("../errors/pagination/CannotPaginateWithOffset.js");
 const RecordNotFound_js_1 = require("../errors/RecordNotFound.js");
 const UnexpectedUndefined_js_1 = require("../errors/UnexpectedUndefined.js");
 const CalendarDate_js_1 = require("../helpers/CalendarDate.js");
@@ -29,28 +32,25 @@ 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 isEmpty_js_1 = require("../helpers/isEmpty.js");
+const isObject_js_1 = require("../helpers/isObject.js");
 const namespaceColumn_js_1 = require("../helpers/namespaceColumn.js");
-const normalizeString_js_1 = require("../helpers/normalizeString.js");
+const normalizeUnicode_js_1 = require("../helpers/normalizeUnicode.js");
 const objectPathsToArrays_js_1 = require("../helpers/objectPathsToArrays.js");
 const protectAgainstPollutingAssignment_js_1 = require("../helpers/protectAgainstPollutingAssignment.js");
 const range_js_1 = require("../helpers/range.js");
 const snakeify_js_1 = require("../helpers/snakeify.js");
-const typechecks_js_1 = require("../helpers/typechecks.js");
 const uniq_js_1 = require("../helpers/uniq.js");
 const curried_ops_statement_js_1 = require("../ops/curried-ops-statement.js");
-const index_js_1 = require("../ops/index.js");
+const index_js_2 = require("../ops/index.js");
 const ops_statement_js_1 = require("../ops/ops-statement.js");
 const constants_js_1 = require("./constants.js");
+const computedPaginatePage_js_1 = require("./internal/computedPaginatePage.js");
 const executeDatabaseQuery_js_1 = require("./internal/executeDatabaseQuery.js");
 const extractAssociationMetadataFromAssociationName_js_1 = require("./internal/extractAssociationMetadataFromAssociationName.js");
 const orderByDirection_js_1 = require("./internal/orderByDirection.js");
 const shouldBypassDefaultScope_js_1 = require("./internal/shouldBypassDefaultScope.js");
 const SimilarityBuilder_js_1 = require("./internal/similarity/SimilarityBuilder.js");
 const sqlResultToDreamInstance_js_1 = require("./internal/sqlResultToDreamInstance.js");
-const index_js_2 = require("../dream-app/index.js");
-const CannotPaginateWithLimit_js_1 = require("../errors/pagination/CannotPaginateWithLimit.js");
-const CannotPaginateWithOffset_js_1 = require("../errors/pagination/CannotPaginateWithOffset.js");
-const computedPaginatePage_js_1 = require("./internal/computedPaginatePage.js");
 class Query extends ConnectedToDB_js_1.default {
     /**
      * @internal
@@ -301,7 +301,7 @@ class Query extends ConnectedToDB_js_1.default {
             baseSelectQuery: opts.baseSelectQuery || this.baseSelectQuery,
             passthroughOnStatement: {
                 ...this.passthroughOnStatement,
-                ...(opts.passthroughOnStatement || {}),
+                ...opts.passthroughOnStatement,
             },
             where: opts.where === null ? [] : [...this.whereStatements, ...(opts.where || [])],
             whereNot: opts.whereNot === null ? [] : [...this.whereNotStatements, ...(opts.whereNot || [])],
@@ -442,13 +442,13 @@ class Query extends ConnectedToDB_js_1.default {
         let lastId = null;
         do {
             if (lastId)
-                records = await query.where({ [this.dreamInstance.primaryKey]: index_js_1.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[records.length - 1]?.primaryKeyValue;
+            lastId = records.at(-1)?.primaryKeyValue;
         } while (records.length > 0 && records.length === batchSize);
     }
     /**
@@ -551,7 +551,7 @@ class Query extends ConnectedToDB_js_1.default {
         if (nextAssociationStatement === undefined) {
             // just satisfying typing
         }
-        else if ((0, typechecks_js_1.isString)(nextAssociationStatement)) {
+        else if (typeof nextAssociationStatement === 'string') {
             const nextStatement = nextAssociationStatement;
             if (!joinStatements[nextStatement])
                 joinStatements[(0, protectAgainstPollutingAssignment_js_1.default)(nextStatement)] = {};
@@ -573,7 +573,7 @@ class Query extends ConnectedToDB_js_1.default {
             });
             //
         }
-        else if ((0, typechecks_js_1.isObject)(nextAssociationStatement) && previousAssociationName) {
+        else if ((0, isObject_js_1.default)(nextAssociationStatement) && previousAssociationName) {
             const clonedNextAssociationStatement = (0, cloneDeepSafe_js_1.default)(nextAssociationStatement);
             const keys = Object.keys(clonedNextAssociationStatement);
             keys.forEach((key) => {
@@ -908,7 +908,7 @@ class Query extends ConnectedToDB_js_1.default {
     order(arg) {
         if (arg === null)
             return this.clone({ order: null });
-        if ((0, typechecks_js_1.isString)(arg))
+        if (typeof arg === 'string')
             return this.clone({ order: [{ column: arg, direction: 'asc' }] });
         let query = this.clone();
         Object.keys(arg).forEach(key => {
@@ -1003,8 +1003,11 @@ class Query extends ConnectedToDB_js_1.default {
                 return this.buildUpdate({});
             // TODO: in the future, we should support insert type, but don't yet, since inserts are done outside
             // the query class for some reason.
-            default:
-                throw new Error('never');
+            default: {
+                // protection so that if a new QueryType is ever added, this will throw a type error at build time
+                const _never = type;
+                throw new Error(`Unhandled QueryType: ${_never}`);
+            }
         }
     }
     /**
@@ -1187,7 +1190,7 @@ class Query extends ConnectedToDB_js_1.default {
                     kyselyQuery = kyselyQuery.select(`${this.namespaceColumn(dbColumnName, association.through)} as ${columnAlias}`);
                 };
                 if (association.through && association.preloadThroughColumns) {
-                    if ((0, typechecks_js_1.isObject)(association.preloadThroughColumns)) {
+                    if ((0, isObject_js_1.default)(association.preloadThroughColumns)) {
                         const preloadMap = association.preloadThroughColumns;
                         Object.keys(preloadMap).forEach(columnName => setupPreloadData(columnName));
                     }
@@ -1299,7 +1302,7 @@ class Query extends ConnectedToDB_js_1.default {
             return;
         let columnNames = [];
         const columnNameToPreloadedThroughColumnNameMap = {};
-        if ((0, typechecks_js_1.isObject)(association.preloadThroughColumns)) {
+        if ((0, isObject_js_1.default)(association.preloadThroughColumns)) {
             const preloadMap = association.preloadThroughColumns;
             columnNames = Object.keys(preloadMap).map(columnName => {
                 columnNameToPreloadedThroughColumnNameMap[columnName] = preloadMap[columnName];
@@ -1452,7 +1455,7 @@ class Query extends ConnectedToDB_js_1.default {
             throw new CannotPaginateWithOffset_js_1.default();
         const page = (0, computedPaginatePage_js_1.default)(opts.page);
         const recordCount = await this.count();
-        const pageSize = opts.pageSize || index_js_2.default.getOrFail().paginationPageSize;
+        const pageSize = opts.pageSize || index_js_1.default.getOrFail().paginationPageSize;
         const pageCount = Math.ceil(recordCount / pageSize);
         const results = await this.limit(pageSize)
             .offset((page - 1) * pageSize)
@@ -1932,7 +1935,7 @@ class Query extends ConnectedToDB_js_1.default {
         const columnsToPluck = dreamClassToHydrateColumns.map(column => this.namespaceColumn(column.toString(), alias));
         const asHasAssociation = association;
         if (asHasAssociation.through && asHasAssociation.preloadThroughColumns) {
-            if ((0, typechecks_js_1.isObject)(asHasAssociation.preloadThroughColumns)) {
+            if ((0, isObject_js_1.default)(asHasAssociation.preloadThroughColumns)) {
                 const preloadMap = asHasAssociation.preloadThroughColumns;
                 Object.keys(preloadMap).forEach(preloadThroughColumn => {
                     throughColumnsToHydrate.push(preloadMap[preloadThroughColumn]);
@@ -1974,7 +1977,7 @@ class Query extends ConnectedToDB_js_1.default {
                 pluckedData[dreamClassToHydrateColumns.length + index]));
             return {
                 dream: hydratedDream,
-                pointsToPrimaryKey: pluckedData[pluckedData.length - 1],
+                pointsToPrimaryKey: pluckedData.at(-1),
             };
         });
         this.hydrateAssociation(dreams, association, preloadedDreamsAndWhatTheyPointTo);
@@ -2361,7 +2364,7 @@ class Query extends ConnectedToDB_js_1.default {
             return query;
         let selectQuery = query;
         const orderStatement = association.order;
-        if ((0, typechecks_js_1.isString)(orderStatement)) {
+        if (typeof orderStatement === 'string') {
             selectQuery = selectQuery.orderBy(this.namespaceColumn(orderStatement, tableNameOrAlias), 'asc');
         }
         else {
@@ -2480,7 +2483,7 @@ class Query extends ConnectedToDB_js_1.default {
             val = val();
         }
         else if (val === constants_js_1.DreamConst.passthrough) {
-            const column = attr.split('.').pop();
+            const column = attr.split('.').at(-1);
             if (this.passthroughOnStatement[column] === undefined)
                 throw new MissingRequiredPassthroughForAssociationAndClause_js_1.default(column);
             val = this.passthroughOnStatement[column];
@@ -2498,7 +2501,11 @@ class Query extends ConnectedToDB_js_1.default {
         else if (Array.isArray(val)) {
             a = attr;
             b = 'in';
-            c = val.map(v => v instanceof DateTime_js_1.DateTime || v instanceof CalendarDate_js_1.default ? v.toSQL() : (0, typechecks_js_1.isString)(v) ? (0, normalizeString_js_1.default)(v) : v);
+            c = val.map(v => v instanceof DateTime_js_1.DateTime || v instanceof CalendarDate_js_1.default
+                ? v.toSQL()
+                : typeof v === 'string'
+                    ? (0, normalizeUnicode_js_1.default)(v)
+                    : v);
         }
         else if (val instanceof curried_ops_statement_js_1.default) {
             val = val.toOpsStatement(this.dreamClass, attr);
@@ -2541,12 +2548,12 @@ class Query extends ConnectedToDB_js_1.default {
         }
         if (c instanceof DateTime_js_1.DateTime || c instanceof CalendarDate_js_1.default)
             c = c.toSQL();
-        else if ((0, typechecks_js_1.isString)(c))
-            c = (0, normalizeString_js_1.default)(c);
+        else if (typeof c === 'string')
+            c = (0, normalizeUnicode_js_1.default)(c);
         if (c2 instanceof DateTime_js_1.DateTime || c2 instanceof CalendarDate_js_1.default)
             c2 = c2.toSQL();
-        else if ((0, typechecks_js_1.isString)(c2))
-            c2 = (0, normalizeString_js_1.default)(c2);
+        else if (typeof c2 === 'string')
+            c2 = (0, normalizeUnicode_js_1.default)(c2);
         if (a && c === undefined)
             throw new CannotPassUndefinedAsAValueToAWhereClause_js_1.default(this.dreamClass, a);
         if (a2 && c2 === undefined)

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

@@ -14,25 +14,23 @@ exports.DreamConst = {
     required: RequiredAttribute,
 };
 exports.openapiPrimitiveTypes = [
-    'string',
     'boolean',
-    'number',
-    'date',
     'date-time',
-    'double',
+    'date',
     'integer',
     'null',
+    'number',
+    'string',
 ];
 exports.openapiShorthandPrimitiveTypes = [
     ...exports.openapiPrimitiveTypes,
-    'decimal',
-    'string[]',
     'boolean[]',
-    'number[]',
-    'date[]',
     'date-time[]',
+    'date[]',
+    'decimal',
     'decimal[]',
-    'double[]',
     'integer[]',
     'json',
+    'number[]',
+    'string[]',
 ];

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

@@ -50,8 +50,11 @@ function checkSingleValidation(dream, validation) {
             if (associationMetadata === undefined)
                 throw new UnexpectedUndefined_js_1.default();
             return !!(value || dream[associationMetadata.foreignKey()]);
-        default:
-            throw new Error(`Unhandled validation type found while running validations: ${validation.type}`);
+        default: {
+            // protection so that if a new ValidationType is ever added, this will throw a type error at build time
+            const _never = validation.type;
+            throw new Error(`Unhandled ValidationType: ${_never}`);
+        }
     }
 }
 function isBlank(value) {

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

@@ -9,7 +9,7 @@ async function findOrCreateBy(dreamClass, txn = null, attributes, extraOpts = {}
         return existingRecord;
     const dreamModel = dreamClass.new({
         ...attributes,
-        ...(extraOpts?.createWith || {}),
+        ...extraOpts?.createWith,
     });
     await dreamModel.txn(txn).save();
     return dreamModel;

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

@@ -9,7 +9,10 @@ function orderByDirection(dir) {
             return (0, kysely_1.sql) `asc nulls first`;
         case 'desc':
             return (0, kysely_1.sql) `desc nulls last`;
-        default:
-            throw new Error(`Unrecognized orderBy direction: ${dir}`);
+        default: {
+            // protection so that if a new OrderDir is ever added, this will throw a type error at build time
+            const _never = dir;
+            throw new Error(`Unhandled OrderDir: ${_never}`);
+        }
     }
 }

package/dist/cjs/src/dream/internal/similarity/SimilarityBuilder.js

@@ -6,8 +6,8 @@ const ConnectedToDB_js_1 = require("../../../db/ConnectedToDB.js");
 const validateColumn_js_1 = require("../../../db/validators/validateColumn.js");
 const validateTable_js_1 = require("../../../db/validators/validateTable.js");
 const validateTableAlias_js_1 = require("../../../db/validators/validateTableAlias.js");
+const isObject_js_1 = require("../../../helpers/isObject.js");
 const namespaceColumn_js_1 = require("../../../helpers/namespaceColumn.js");
-const typechecks_js_1 = require("../../../helpers/typechecks.js");
 const constants_js_1 = require("../../constants.js");
 const similaritySelectSql_js_1 = require("./similaritySelectSql.js");
 const similarityWhereSql_js_1 = require("./similarityWhereSql.js");
@@ -193,7 +193,7 @@ class SimilarityBuilder extends ConnectedToDB_js_1.default {
                         opsStatement: statementOrValueOrNestedObject,
                     });
                 }
-                else if ((0, typechecks_js_1.isObject)(statementOrValueOrNestedObject) &&
+                else if ((0, isObject_js_1.default)(statementOrValueOrNestedObject) &&
                     !statementOrValueOrNestedObject?.isOpsStatement) {
                     // if it is an object, but not an array, it is likely a nested joins statement,
                     // since joinsWhere objects can take a recursive shape, like:
@@ -319,7 +319,7 @@ function removeJoinAndFromObjectHierarchy(obj) {
     const result = {};
     for (const key in obj) {
         if (Object.prototype.hasOwnProperty.call(obj, key)) {
-            if ((0, typechecks_js_1.isObject)(obj[key])) {
+            if ((0, isObject_js_1.default)(obj[key])) {
                 result[key] = removeJoinAndFromObjectHierarchy(obj[key].and || obj[key]);
             }
             else {

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

@@ -13,6 +13,6 @@ async function updateOrCreateBy(dreamClass, txn = null, attributes, extraOpts =
     }
     return await dreamClass.txn(txn).create({
         ...attributes,
-        ...(extraOpts?.with || {}),
+        ...extraOpts?.with,
     }, skipHooks ? { skipHooks } : undefined);
 }

package/dist/cjs/src/dream-app/helpers/DreamImporter.js

@@ -31,11 +31,11 @@ class DreamImporter {
     }
     static async importSerializers(pathToSerializers, importCb) {
         const serializerPaths = await DreamImporter.ls(pathToSerializers);
-        const serializerClasses = (await Promise.all(serializerPaths.map(serializerPath => importCb(serializerPath).then(serializerClass => [
+        const pathsNamesAndSerializers = (await Promise.all(serializerPaths.map(serializerPath => importCb(serializerPath).then(serializerClass => [
             serializerPath,
             serializerClass,
         ]))));
-        return serializerClasses;
+        return pathsNamesAndSerializers;
     }
 }
 exports.default = DreamImporter;

package/dist/cjs/src/dream-app/helpers/globalSerializerKeyFromPath.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = default_1;
-function default_1(filepath, dirPath, exportKey = 'default') {
+exports.default = globalSerializerKeyFromPath;
+function globalSerializerKeyFromPath(filepath, dirPath, exportKey = 'default') {
     const prefixPath = dirPath;
     const defaultExport = filepath
         .replace(prefixPath, '')

package/dist/cjs/src/dream-app/helpers/importers/importModels.js

@@ -73,7 +73,7 @@ function setCachedModels(models) {
 }
 function getModelsOrFail() {
     if (!_models)
-        throw new Error('Must call loadModels before calling getModelsOrFail');
+        throw new Error('Must call importModels before calling getModelsOrFail');
     return _models;
 }
 function getModelsOrBlank() {

package/dist/cjs/src/dream-app/helpers/importers/importSerializers.js

@@ -5,49 +5,31 @@ exports.setCachedSerializers = setCachedSerializers;
 exports.getSerializersOrFail = getSerializersOrFail;
 exports.getSerializersOrBlank = getSerializersOrBlank;
 const SerializerNameConflict_js_1 = require("../../../errors/dream-app/SerializerNameConflict.js");
-const index_js_1 = require("../../../serializer/index.js");
+const isDreamSerializer_js_1 = require("../../../serializer/helpers/isDreamSerializer.js");
 const DreamImporter_js_1 = require("../DreamImporter.js");
 const globalSerializerKeyFromPath_js_1 = require("../globalSerializerKeyFromPath.js");
+const serializerOpenapiNameFromPath_js_1 = require("../serializerOpenapiNameFromPath.js");
 let _serializers;
 async function importSerializers(serializersPath, serializerImportCb) {
     if (_serializers)
         return _serializers;
     const serializerClasses = await DreamImporter_js_1.default.importSerializers(serializersPath, serializerImportCb);
-    /**
-     * Certain features (e.g. building OpenAPI specs from Attribute and RendersOne/Many decorators)
-     * need static access to things set up by decorators. Stage 3 Decorators change the context that is available
-     * at decoration time such that the class of a property being decorated is only avilable during instance instantiation. In order
-     * to only apply static values once, on boot, `globallyInitializingDecorators` is set to true on DreamSerializer, and all serializers are instantiated.
-     */
-    index_js_1.default['globallyInitializingDecorators'] = true;
     _serializers = {};
     for (const [serializerPath, allSerializers] of serializerClasses) {
         Object.keys(allSerializers).forEach(key => {
             const potentialSerializer = allSerializers[key];
-            if (potentialSerializer?.isDreamSerializer) {
+            if (potentialSerializer && (0, isDreamSerializer_js_1.default)(potentialSerializer)) {
                 const serializerKey = (0, globalSerializerKeyFromPath_js_1.default)(serializerPath, serializersPath, key);
+                const serializerOpenapiName = (0, serializerOpenapiNameFromPath_js_1.default)(serializerPath, serializersPath, key);
                 if (_serializers[serializerKey])
                     throw new SerializerNameConflict_js_1.default(serializerKey);
-                const serializerClass = potentialSerializer;
-                serializerClass['setGlobalName'](serializerKey);
-                /**
-                 * Certain features (e.g. building OpenAPI specs from Attribute and RendersOne/Many decorators)
-                 * need static access to things set up by decorators. Stage 3 Decorators change the context that is available
-                 * at decoration time such that the class of a property being decorated is only avilable during instance instantiation. In order
-                 * to only apply static values once, on boot, `globallyInitializingDecorators` is set to true on DreamSerializer, and all serializers are instantiated.
-                 */
-                new serializerClass({});
+                const serializer = potentialSerializer;
+                serializer['globalName'] = serializerKey;
+                serializer['openapiName'] = serializerOpenapiName;
                 _serializers[serializerKey] = potentialSerializer;
             }
         });
     }
-    /**
-     * Certain features (e.g. building OpenAPI specs from Attribute and RendersOne/Many decorators)
-     * need static access to things set up by decorators. Stage 3 Decorators change the context that is available
-     * at decoration time such that the class of a property being decorated is only avilable during instance instantiation. In order
-     * to only apply static values once, on boot, `globallyInitializingDecorators` is set to true on DreamSerializer, and all serializers are instantiated.
-     */
-    index_js_1.default['globallyInitializingDecorators'] = false;
     return _serializers;
 }
 function setCachedSerializers(serializers) {
@@ -55,7 +37,7 @@ function setCachedSerializers(serializers) {
 }
 function getSerializersOrFail() {
     if (!_serializers)
-        throw new Error('Must call loadSerializers before calling getSerializersOrFail');
+        throw new Error('Must call importSerializers before calling getSerializersOrFail');
     return _serializers;
 }
 function getSerializersOrBlank() {

package/dist/cjs/src/dream-app/helpers/serializerOpenapiNameFromPath.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = serializerOpenapiNameFromPath;
+function serializerOpenapiNameFromPath(filepath, dirPath, exportKey = 'default') {
+    return _serializerOpenapiNameFromPath(filepath, dirPath, exportKey).replace(/Serializer$/, '');
+}
+function _serializerOpenapiNameFromPath(filepath, dirPath, exportKey = 'default') {
+    if (exportKey === 'default') {
+        const defaultExport = filepath
+            .replace(dirPath, '')
+            .replace(/\.[jt]s$/, '')
+            .replace(/\//g, '');
+        return defaultExport;
+    }
+    else {
+        return exportKey;
+    }
+}

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

@@ -317,8 +317,11 @@ Try setting it to something valid, like:
             case 'paginationPageSize':
                 this._paginationPageSize = options;
                 break;
-            default:
-                throw new Error(`Unhandled applyOption encountered in Dreamconf: ${applyOption}`);
+            default: {
+                // protection so that if a new ApplyOpt is ever added, this will throw a type error at build time
+                const _never = applyOption;
+                throw new Error(`Unhandled ApplyOpt: ${_never}`);
+            }
         }
     }
     on(hookEventType, cb) {