@rvoh/dream 0.29.2 → 0.29.4

package/dist/cjs/src/Dream.js

@@ -313,6 +313,43 @@ class Dream {
     static get stiBaseClassOrOwnClass() {
         return this.sti.baseClass || this;
     }
+    /**
+     * @internal
+     *
+     * Returns either the base STI class name, or else this class name
+     *
+     * NOTE: This is necessary due to changes in esbuild strategy WRT esm,
+     * compiled class names can contain a prefixing underscore if they contain
+     * private fields.
+     *
+     * This can create confusion when the class name is used as an attribute,
+     * as is done in the case of polymorphic associations, which use the class
+     * name as the "type" value for the polymorphic association.
+     *
+     * As such, any time the class name is being used as a value, it should be
+     * done using this value, rather than going to the class name directly.
+     *
+     * see https://github.com/evanw/esbuild/issues/1260 for more information
+     *
+     * @returns string
+     */
+    static get stiBaseClassOrOwnClassName() {
+        return this.stiBaseClassOrOwnClass.sanitizedName;
+    }
+    /**
+     * @internal
+     *
+     * Returns the class name, replacing prefixed underscores, since esbuild
+     * will translate some class names to have underscore prefixes, which can
+     * cause unexpected behavior.
+     *
+     * see https://github.com/evanw/esbuild/issues/1260 for more information
+     *
+     * @returns string
+     */
+    static get sanitizedName() {
+        return this.name.replace(/^_/, '');
+    }
     /**
      * @internal
      *
@@ -323,6 +360,26 @@ class Dream {
     get stiBaseClassOrOwnClass() {
         return this.constructor.stiBaseClassOrOwnClass;
     }
+    /**
+     * @internal
+     *
+     * Shadows .stiBaseClassOrOwnClassName. Returns a string
+     *
+     * @returns A string
+     */
+    get stiBaseClassOrOwnClassName() {
+        return this.constructor.stiBaseClassOrOwnClassName;
+    }
+    /**
+     * @internal
+     *
+     * Shadows .sanitizedName. Returns a string
+     *
+     * @returns A string
+     */
+    get sanitizedConstructorName() {
+        return this.constructor.sanitizedName;
+    }
     /**
      * @internal
      *
@@ -1075,7 +1132,7 @@ class Dream {
      *
      * ```ts
      * class Post extends ApplicationModel {
-     *   @Sortable({ scope: ['user']})
+     *   @Deco.Sortable({ scope: ['user']})
      *   public position: DreamColumn<User, 'position'>
      * }
      *
@@ -1858,7 +1915,7 @@ class Dream {
                 }
                 if (belongsToAssociationMetaData.polymorphic) {
                     const foreignKeyTypeField = belongsToAssociationMetaData.foreignKeyTypeField();
-                    returnValues[foreignKeyTypeField] = associatedObject?.stiBaseClassOrOwnClass?.name;
+                    returnValues[foreignKeyTypeField] = associatedObject?.stiBaseClassOrOwnClassName;
                     setAttributeOnDreamInstance(foreignKeyTypeField, returnValues[foreignKeyTypeField]);
                 }
             }

package/dist/cjs/src/decorators/Decorators.js

@@ -99,8 +99,16 @@ class Decorators {
     // end: HasOne
     //////////////
     /**
-     * Shortcut to the Sortable decorator, which also provides extra type protection which cannot be provided
-     * with the Sortable decorator.
+     * Sortable decorator.
+     *
+     * NOTE: the Sortable decorator may not be used in STI child models (it may be used in the STI base class)
+     *
+     * ```ts
+     * class Balloon {
+     *   @Deco.Sortable()
+     *   public position: DreamColumn<Balloon, 'position'>
+     * }
+     * ```
      *
      * @param scope - The column, association, or combination there-of which you would like to restrict the incrementing logic to
      * @returns A Sortable decorator
@@ -109,11 +117,11 @@ class Decorators {
         return (0, Sortable_js_1.default)(opts);
     }
     /**
-     * Shortcut to the BeforeCreate decorator
+     * BeforeCreate decorator
      *
      * ```ts
      * class User {
-     *   User.BeforeCreate()
+     *   @Deco.BeforeCreate()
      *   public doSomething() {
      *     console.log('hi!')
      *   }
@@ -127,11 +135,11 @@ class Decorators {
         return (0, BeforeCreate_js_1.default)(opts);
     }
     /**
-     * Shortcut to the BeforeSave decorator
+     * BeforeSave decorator
      *
      * ```ts
      * class User {
-     *   User.BeforeSave()
+     *   @Deco.BeforeSave()
      *   public doSomething() {
      *     console.log('hi!')
      *   }
@@ -145,11 +153,11 @@ class Decorators {
         return (0, BeforeSave_js_1.default)(opts);
     }
     /**
-     * Shortcut to the BeforeUpdate decorator
+     * BeforeUpdate decorator
      *
      * ```ts
      * class User {
-     *   User.BeforeUpdate()
+     *   @Deco.BeforeUpdate()
      *   public doSomething() {
      *     console.log('hi!')
      *   }
@@ -163,11 +171,11 @@ class Decorators {
         return (0, BeforeUpdate_js_1.default)(opts);
     }
     /**
-     * Shortcut to the BeforeDestroy decorator
+     * BeforeDestroy decorator
      *
      * ```ts
      * class User {
-     *   User.BeforeDestroy()
+     *   @Deco.BeforeDestroy()
      *   public doSomething() {
      *     console.log('hi!')
      *   }
@@ -180,11 +188,11 @@ class Decorators {
         return (0, BeforeDestroy_js_1.default)();
     }
     /**
-     * Shortcut to the AfterCreate decorator
+     * AfterCreate decorator
      *
      * ```ts
      * class User {
-     *   User.AfterCreate()
+     *   @Deco.AfterCreate()
      *   public doSomething() {
      *     console.log('hi!')
      *   }
@@ -198,11 +206,11 @@ class Decorators {
         return (0, AfterCreate_js_1.default)(opts);
     }
     /**
-     * Shortcut to the AfterCreateCommit decorator
+     * AfterCreateCommit decorator
      *
      * ```ts
      * class User {
-     *   User.AfterCreateCommit()
+     *   @Deco.AfterCreateCommit()
      *   public doSomething() {
      *     console.log('hi!')
      *   }
@@ -215,11 +223,11 @@ class Decorators {
         return (0, AfterCreateCommit_js_1.default)(opts);
     }
     /**
-     * Shortcut to the AfterSave decorator
+     * AfterSave decorator
      *
      * ```ts
      * class User {
-     *   User.AfterSave()
+     *   @Deco.AfterSave()
      *   public doSomething() {
      *     console.log('hi!')
      *   }
@@ -233,11 +241,11 @@ class Decorators {
         return (0, AfterSave_js_1.default)(opts);
     }
     /**
-     * Shortcut to the AfterSaveCommit decorator
+     * AfterSaveCommit decorator
      *
      * ```ts
      * class User {
-     *   User.AfterSaveCommit()
+     *   @Deco.AfterSaveCommit()
      *   public doSomething() {
      *     console.log('hi!')
      *   }
@@ -251,11 +259,11 @@ class Decorators {
         return (0, AfterSaveCommit_js_1.default)(opts);
     }
     /**
-     * Shortcut to the AfterUpdate decorator
+     * AfterUpdate decorator
      *
      * ```ts
      * class User {
-     *   User.AfterUpdate()
+     *   @Deco.AfterUpdate()
      *   public doSomething() {
      *     console.log('hi!')
      *   }
@@ -269,11 +277,11 @@ class Decorators {
         return (0, AfterUpdate_js_1.default)(opts);
     }
     /**
-     * Shortcut to the AfterUpdateCommit decorator
+     * AfterUpdateCommit decorator
      *
      * ```ts
      * class User {
-     *   User.AfterUpdateCommit()
+     *   @Deco.AfterUpdateCommit()
      *   public doSomething() {
      *     console.log('hi!')
      *   }
@@ -287,11 +295,11 @@ class Decorators {
         return (0, AfterUpdateCommit_js_1.default)(opts);
     }
     /**
-     * Shortcut to the AfterDestroy decorator
+     * AfterDestroy decorator
      *
      * ```ts
      * class User {
-     *   User.AfterDestroy()
+     *   @Deco.AfterDestroy()
      *   public doSomething() {
      *     console.log('hi!')
      *   }
@@ -305,11 +313,11 @@ class Decorators {
         return (0, AfterDestroy_js_1.default)();
     }
     /**
-     * Shortcut to the AfterDestroyCommit decorator
+     * AfterDestroyCommit decorator
      *
      * ```ts
      * class User {
-     *   User.AfterDestroyCommit()
+     *   @Deco.AfterDestroyCommit()
      *   public doSomething() {
      *     console.log('hi!')
      *   }

package/dist/cjs/src/decorators/STI.js

@@ -25,7 +25,7 @@ function STI(dreamClass, { value } = {}) {
         stiChildClass['sti'] = {
             active: true,
             baseClass,
-            value: value || stiChildClass.name,
+            value: value || stiChildClass.sanitizedName,
         };
         stiChildClass[exports.STI_SCOPE_NAME] = function (query) {
             return query.where({ type: stiChildClass['sti'].value });

package/dist/cjs/src/decorators/associations/shared.js

@@ -47,7 +47,7 @@ function foreignKeyTypeField(foreignKey, dream, partialAssociation) {
 }
 function modelCBtoSingleDreamClass(dreamClass, partialAssociation) {
     if (Array.isArray(partialAssociation.modelCB()))
-        throw new Error(`Polymorphic association ${partialAssociation.as} on model ${dreamClass.name} requires an explicit foreignKey`);
+        throw new Error(`Polymorphic association ${partialAssociation.as} on model ${dreamClass.sanitizedName} requires an explicit foreignKey`);
     return partialAssociation.modelCB();
 }
 function applyGetterAndSetter(target, partialAssociation, { foreignKeyBase, isBelongsTo, } = {}) {
@@ -85,7 +85,7 @@ function applyGetterAndSetter(target, partialAssociation, { foreignKeyBase, isBe
                     partialAssociation.primaryKeyValue(associatedModel);
                 if (partialAssociation.polymorphic)
                     this[foreignKeyTypeField(foreignKeyBase, dreamClass, partialAssociation)] =
-                        associatedModel?.constructor?.name;
+                        associatedModel?.['sanitizedConstructorName'];
             }
         },
     });
@@ -102,7 +102,7 @@ function associationPrimaryKeyAccessors(partialAssociation, dreamClass) {
             if (Array.isArray(associationClass)) {
                 throw new Error(`
 Cannot lookup primaryKey on polymorphic association:
-dream class: ${dreamClass.name}
+dream class: ${dreamClass.sanitizedName}
 association: ${this.as}
           `);
             }

package/dist/cjs/src/decorators/hooks/AfterCreate.js

@@ -17,7 +17,7 @@ function afterCreateImplementation(target, key, opts = {}) {
     if (!Object.getOwnPropertyDescriptor(dreamClass, 'hooks'))
         dreamClass['hooks'] = (0, shared_js_1.blankHooksFactory)(dreamClass);
     const hookStatement = {
-        className: dreamClass.name,
+        className: dreamClass.sanitizedName,
         method: key,
         type: 'afterCreate',
         ifChanged: opts.ifChanged,

package/dist/cjs/src/decorators/hooks/AfterCreateCommit.js

@@ -34,7 +34,7 @@ function afterCreateCommitImplementation(target, key, opts = {}) {
     if (!Object.getOwnPropertyDescriptor(dreamClass, 'hooks'))
         dreamClass['hooks'] = (0, shared_js_1.blankHooksFactory)(dreamClass);
     const hookStatement = {
-        className: dreamClass.name,
+        className: dreamClass.sanitizedName,
         method: key,
         type: 'afterCreateCommit',
         ifChanged: opts.ifChanged,

package/dist/cjs/src/decorators/hooks/AfterDestroy.js

@@ -17,7 +17,7 @@ function afterDestroyImplementation(target, key) {
     if (!Object.getOwnPropertyDescriptor(dreamClass, 'hooks'))
         dreamClass['hooks'] = (0, shared_js_1.blankHooksFactory)(dreamClass);
     const hookStatement = {
-        className: dreamClass.name,
+        className: dreamClass.sanitizedName,
         method: key,
         type: 'afterDestroy',
     };

package/dist/cjs/src/decorators/hooks/AfterDestroyCommit.js

@@ -32,7 +32,7 @@ function afterDestroyCommitImplementation(target, key) {
     if (!Object.getOwnPropertyDescriptor(dreamClass, 'hooks'))
         dreamClass['hooks'] = (0, shared_js_1.blankHooksFactory)(dreamClass);
     const hookStatement = {
-        className: dreamClass.name,
+        className: dreamClass.sanitizedName,
         method: key,
         type: 'afterDestroyCommit',
     };

package/dist/cjs/src/decorators/hooks/AfterSave.js

@@ -17,7 +17,7 @@ function afterSaveImplementation(target, key, opts = {}) {
     if (!Object.getOwnPropertyDescriptor(dreamClass, 'hooks'))
         dreamClass['hooks'] = (0, shared_js_1.blankHooksFactory)(dreamClass);
     const hookStatement = {
-        className: dreamClass.name,
+        className: dreamClass.sanitizedName,
         method: key,
         type: 'afterSave',
         ifChanged: opts.ifChanged,

package/dist/cjs/src/decorators/hooks/AfterSaveCommit.js

@@ -34,7 +34,7 @@ function afterSaveCommitImplementation(target, key, opts = {}) {
     if (!Object.getOwnPropertyDescriptor(dreamClass, 'hooks'))
         dreamClass['hooks'] = (0, shared_js_1.blankHooksFactory)(dreamClass);
     const hookStatement = {
-        className: dreamClass.name,
+        className: dreamClass.sanitizedName,
         method: key,
         type: 'afterSaveCommit',
         ifChanged: opts.ifChanged,

package/dist/cjs/src/decorators/hooks/AfterUpdate.js

@@ -17,7 +17,7 @@ function afterUpdateImplementation(target, key, opts = {}) {
     if (!Object.getOwnPropertyDescriptor(dreamClass, 'hooks'))
         dreamClass['hooks'] = (0, shared_js_1.blankHooksFactory)(dreamClass);
     const hookStatement = {
-        className: dreamClass.name,
+        className: dreamClass.sanitizedName,
         method: key,
         type: 'afterUpdate',
         ifChanged: opts.ifChanged,

package/dist/cjs/src/decorators/hooks/AfterUpdateCommit.js

@@ -34,7 +34,7 @@ function afterUpdateCommitImplementation(target, key, opts = {}) {
     if (!Object.getOwnPropertyDescriptor(dreamClass, 'hooks'))
         dreamClass['hooks'] = (0, shared_js_1.blankHooksFactory)(dreamClass);
     const hookStatement = {
-        className: dreamClass.name,
+        className: dreamClass.sanitizedName,
         method: key,
         type: 'afterUpdateCommit',
         ifChanged: opts.ifChanged,

package/dist/cjs/src/decorators/hooks/BeforeCreate.js

@@ -17,7 +17,7 @@ function beforeCreateImplementation(target, key, opts = {}) {
     if (!Object.getOwnPropertyDescriptor(dreamClass, 'hooks'))
         dreamClass['hooks'] = (0, shared_js_1.blankHooksFactory)(dreamClass);
     const hookStatement = {
-        className: dreamClass.name,
+        className: dreamClass.sanitizedName,
         method: key,
         type: 'beforeCreate',
         ifChanging: opts.ifChanging,

package/dist/cjs/src/decorators/hooks/BeforeDestroy.js

@@ -17,7 +17,7 @@ function beforeDestroyImplementation(target, key) {
     if (!Object.getOwnPropertyDescriptor(dreamClass, 'hooks'))
         dreamClass['hooks'] = (0, shared_js_1.blankHooksFactory)(dreamClass);
     const hookStatement = {
-        className: dreamClass.name,
+        className: dreamClass.sanitizedName,
         method: key,
         type: 'beforeDestroy',
     };

package/dist/cjs/src/decorators/hooks/BeforeSave.js

@@ -17,7 +17,7 @@ function beforeSaveImplementation(target, key, opts = {}) {
     if (!Object.getOwnPropertyDescriptor(dreamClass, 'hooks'))
         dreamClass['hooks'] = (0, shared_js_1.blankHooksFactory)(dreamClass);
     const hookStatement = {
-        className: dreamClass.name,
+        className: dreamClass.sanitizedName,
         method: key,
         type: 'beforeSave',
         ifChanging: opts.ifChanging,

package/dist/cjs/src/decorators/hooks/BeforeUpdate.js

@@ -17,7 +17,7 @@ function beforeUpdateImplementation(target, key, opts = {}) {
     if (!Object.getOwnPropertyDescriptor(dreamClass, 'hooks'))
         dreamClass['hooks'] = (0, shared_js_1.blankHooksFactory)(dreamClass);
     const hookStatement = {
-        className: dreamClass.name,
+        className: dreamClass.sanitizedName,
         method: key,
         type: 'beforeUpdate',
         ifChanging: opts.ifChanging,

package/dist/cjs/src/decorators/sortable/Sortable.js

@@ -9,6 +9,7 @@ const AfterDestroyCommit_js_1 = require("../hooks/AfterDestroyCommit.js");
 const AfterUpdate_js_1 = require("../hooks/AfterUpdate.js");
 const AfterUpdateCommit_js_1 = require("../hooks/AfterUpdateCommit.js");
 const BeforeSave_js_1 = require("../hooks/BeforeSave.js");
+const STI_js_1 = require("../STI.js");
 const scopeArray_js_1 = require("./helpers/scopeArray.js");
 const afterSortableCreate_js_1 = require("./hooks/afterSortableCreate.js");
 const afterSortableDestroy_js_1 = require("./hooks/afterSortableDestroy.js");
@@ -22,18 +23,6 @@ function Sortable(opts = {}) {
             const dreamClass = dream.constructor;
             if (!dreamClass['globallyInitializingDecorators'])
                 return;
-            if (dreamClass['sti']['active']) {
-                if (!(dreamClass instanceof dreamClass['stiBaseClassOrOwnClass'])) {
-                    // what we should really be doing is throwing CannotCallSortableOnSTIChild,
-                    // but we cannot, since there is no way to know during this initializer if
-                    // the Sortable decorator was applied to the STI child, or the STI parent.
-                    //
-                    // because of this bizarre issue, we are forced to early return when
-                    // we are processing Sortable on an STI child.
-                    // throw new CannotCallSortableOnSTIChild(dreamClass)
-                    return;
-                }
-            }
             if (!Object.getOwnPropertyDescriptor(dreamClass, 'sortableFields')) {
                 // This pattern allows `sortableFields` on a base STI class and on
                 // child STI classes. The new `sortableFields` property will be created
@@ -58,7 +47,7 @@ function Sortable(opts = {}) {
             // before saving, we remember the new value for position, but clear it from our
             // supervised attributes to prevent position from saving
             dreamPrototype[beforeSaveMethodName] = async function (txn) {
-                let query = dreamClass.query();
+                let query = dreamClass.query().removeDefaultScope(STI_js_1.STI_SCOPE_NAME);
                 if (txn)
                     query = query.txn(txn);
                 await (0, beforeSortableSave_js_1.default)({
@@ -73,7 +62,7 @@ function Sortable(opts = {}) {
                 // if no transaction is provided, leverage update commit hook instead
                 if (!txn)
                     return;
-                const query = dreamClass.query().txn(txn);
+                const query = dreamClass.query().removeDefaultScope(STI_js_1.STI_SCOPE_NAME).txn(txn);
                 await (0, afterSortableUpdate_js_1.default)({
                     dream: this,
                     positionField,
@@ -86,7 +75,7 @@ function Sortable(opts = {}) {
                 // if transaction is provided, leverage update hook instead
                 if (txn)
                     return;
-                const query = dreamClass.query();
+                const query = dreamClass.query().removeDefaultScope(STI_js_1.STI_SCOPE_NAME);
                 await (0, afterSortableUpdate_js_1.default)({
                     dream: this,
                     positionField,
@@ -101,7 +90,7 @@ function Sortable(opts = {}) {
                 // if no transaction is provided, leverage create commit hook instead
                 if (!txn)
                     return;
-                const query = dreamClass.query().txn(txn);
+                const query = dreamClass.query().removeDefaultScope(STI_js_1.STI_SCOPE_NAME).txn(txn);
                 await (0, afterSortableCreate_js_1.default)({
                     dream: this,
                     positionField,
@@ -114,7 +103,7 @@ function Sortable(opts = {}) {
                 // if transaction is provided, leverage create hook instead
                 if (txn)
                     return;
-                const query = dreamClass.query();
+                const query = dreamClass.query().removeDefaultScope(STI_js_1.STI_SCOPE_NAME);
                 await (0, afterSortableCreate_js_1.default)({
                     dream: this,
                     positionField,
@@ -128,7 +117,7 @@ function Sortable(opts = {}) {
                 // if no transaction is provided, leverage destroy commit hook instead
                 if (!txn)
                     return;
-                const query = dreamClass.query().txn(txn);
+                const query = dreamClass.query().removeDefaultScope(STI_js_1.STI_SCOPE_NAME).txn(txn);
                 await (0, afterSortableDestroy_js_1.default)({
                     dream: this,
                     positionField,
@@ -140,7 +129,7 @@ function Sortable(opts = {}) {
                 // if transaction is provided, leverage destroy hook instead
                 if (txn)
                     return;
-                const query = dreamClass.query();
+                const query = dreamClass.query().removeDefaultScope(STI_js_1.STI_SCOPE_NAME);
                 await (0, afterSortableDestroy_js_1.default)({
                     dream: this,
                     positionField,

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

@@ -367,7 +367,7 @@ class Query extends ConnectedToDB_js_1.default {
     async findOrFail(primaryKey) {
         const record = await this.find(primaryKey);
         if (!record)
-            throw new RecordNotFound_js_1.default(this.dreamInstance.constructor.name);
+            throw new RecordNotFound_js_1.default(this.dreamInstance['sanitizedConstructorName']);
         return record;
     }
     /**
@@ -402,7 +402,7 @@ class Query extends ConnectedToDB_js_1.default {
     async findOrFailBy(whereStatement) {
         const record = await this.findBy(whereStatement);
         if (!record)
-            throw new RecordNotFound_js_1.default(this.dreamInstance.constructor.name);
+            throw new RecordNotFound_js_1.default(this.dreamInstance['sanitizedConstructorName']);
         return record;
     }
     /**
@@ -1422,7 +1422,7 @@ class Query extends ConnectedToDB_js_1.default {
     async firstOrFail() {
         const record = await this.first();
         if (!record)
-            throw new RecordNotFound_js_1.default(this.dreamInstance.constructor.name);
+            throw new RecordNotFound_js_1.default(this.dreamInstance['sanitizedConstructorName']);
         return record;
     }
     /**
@@ -1461,7 +1461,7 @@ class Query extends ConnectedToDB_js_1.default {
     async lastOrFail() {
         const record = await this.last();
         if (!record)
-            throw new RecordNotFound_js_1.default(this.dreamInstance.constructor.name);
+            throw new RecordNotFound_js_1.default(this.dreamInstance['sanitizedConstructorName']);
         return record;
     }
     /**
@@ -1756,7 +1756,7 @@ class Query extends ConnectedToDB_js_1.default {
     }
     async preloadPolymorphicAssociationModel(dreams, association, associatedDreamClass, associatedDreams) {
         const relevantAssociatedModels = dreams.filter((dream) => {
-            return dream[association.foreignKeyTypeField()] === associatedDreamClass['stiBaseClassOrOwnClass'].name;
+            return dream[association.foreignKeyTypeField()] === associatedDreamClass['stiBaseClassOrOwnClassName'];
         });
         if (relevantAssociatedModels.length) {
             dreams.forEach((dream) => {
@@ -1779,7 +1779,7 @@ class Query extends ConnectedToDB_js_1.default {
             for (const loadedAssociation of loadedAssociations) {
                 dreams
                     .filter((dream) => {
-                    return (dream[association.foreignKeyTypeField()] === loadedAssociation['stiBaseClassOrOwnClass'].name &&
+                    return (dream[association.foreignKeyTypeField()] === loadedAssociation['stiBaseClassOrOwnClassName'] &&
                         dream[association.foreignKey()] === association.primaryKeyValue(loadedAssociation));
                 })
                     .forEach((dream) => {
@@ -2072,8 +2072,8 @@ class Query extends ConnectedToDB_js_1.default {
                 if (association.polymorphic) {
                     join = join.on((eb) => this.whereStatementToExpressionWrapper(eb, this.aliasWhereStatement({
                         [association.foreignKeyTypeField()]: throughClass
-                            ? throughClass['stiBaseClassOrOwnClass'].name
-                            : dreamClass['stiBaseClassOrOwnClass'].name,
+                            ? throughClass['stiBaseClassOrOwnClassName']
+                            : dreamClass['stiBaseClassOrOwnClassName'],
                     }, currentAssociationTableOrAlias)));
                 }
                 if (timeToApplyThroughAssociations) {

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

@@ -28,7 +28,7 @@ async function createAssociation(dream, txn = null, associationName, opts = {})
                 ...opts,
             };
             if (hasAssociation.polymorphic) {
-                modifiedOpts[hasAssociation.foreignKeyTypeField()] = dream['stiBaseClassOrOwnClass'].name;
+                modifiedOpts[hasAssociation.foreignKeyTypeField()] = dream['stiBaseClassOrOwnClassName'];
             }
             if (txn) {
                 hasresult = await associationClass.txn(txn).create(modifiedOpts);

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

@@ -55,7 +55,7 @@ async function runHook(statement, dream, txn) {
 Attempting to run ${statement.method} as part of the ${statement.type}
 Dream model hook sequence, but we encountered a method that does not exist.
 
-Please make sure "${statement.method}" is defined on ${dream.constructor.name}
+Please make sure "${statement.method}" is defined on ${dream['sanitizedConstructorName']}
 `);
     }
     await dream[statement.method](txn);

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

@@ -23,7 +23,7 @@ async function saveDream(dream, txn = null, { skipHooks = false } = {}) {
     // need to check validations after running before hooks, or else
     // model hooks that might make a model valid cannot run
     if (dream.isInvalid)
-        throw new ValidationError_js_1.default(dream.constructor.name, dream.errors);
+        throw new ValidationError_js_1.default(dream['sanitizedConstructorName'], dream.errors);
     if (alreadyPersisted && !dream.isDirty)
         return dream;
     let query;

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

@@ -29,7 +29,7 @@ function sqlResultToDreamInstance(dreamClass, sqlResult) {
 function findExtendingDreamClass(dreamClass, type) {
     if (!dreamClass['extendedBy'])
         return undefined;
-    const extendingDreamClass = dreamClass['extendedBy'].find(extendingDreamClass => extendingDreamClass.name === type);
+    const extendingDreamClass = dreamClass['extendedBy'].find(extendingDreamClass => extendingDreamClass.sanitizedName === type);
     if (extendingDreamClass)
         return extendingDreamClass;
     return dreamClass['extendedBy']

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

@@ -12,7 +12,7 @@ Cannot call "undestroy" on a non-SoftDelete model. Ensure that your
 model has @SoftDelete applied before calling "undestroy":
 
 @SoftDelete()
-class ${this.dreamClass.name} extends ApplicationModel {
+class ${this.dreamClass.sanitizedName} extends ApplicationModel {
   ...
 }
     `;

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

@@ -12,7 +12,7 @@ class CannotDefineAssociationWithBothDependentAndPassthrough extends Error {
         return `
 Cannot define association with both "dependent" and "DreamConst.passthrough".
 Error found when trying to parse "${this.associationName}" on the 
-${this.dreamClass.name} dream class.
+${this.dreamClass.sanitizedName} dream class.
     `;
     }
 }

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

@@ -12,7 +12,7 @@ class CannotDefineAssociationWithBothDependentAndRequiredOnClause extends Error
         return `
 Cannot define association with both "dependent" and "DreamConst.required".
 Error found when trying to parse "${this.associationName}" on the 
-${this.dreamClass.name} dream class.
+${this.dreamClass.sanitizedName} dream class.
     `;
     }
 }