@rvoh/dream 0.29.3 → 0.29.5

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
      *
@@ -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/db/DreamDbConnection.js

@@ -2,10 +2,16 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.dreamDbConnections = dreamDbConnections;
 exports.closeAllDbConnections = closeAllDbConnections;
-const kysely_1 = require("kysely");
+// after building for esm, importing pg using the following:
+//
+//  import * as pg from 'pg'
+//
+// will crash. This is difficult to discover, since it only happens
+// when being imported from our esm build.
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
 const pg_1 = require("pg");
+const kysely_1 = require("kysely");
 const index_js_1 = require("../dream-application/index.js");
 const ConnectionConfRetriever_js_1 = require("./ConnectionConfRetriever.js");
 let connections = {};

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

@@ -2,8 +2,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PG_ERRORS = void 0;
 exports.pgErrorType = pgErrorType;
-const pg = require("pg");
-const { DatabaseError } = pg;
+// after building for esm, importing pg using the following:
+//
+//  import * as pg from 'pg'
+//
+// will crash. This is difficult to discover, since it only happens
+// when being imported from our esm build.
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+// @ts-ignore
+const pg_1 = require("pg");
 exports.PG_ERRORS = {
     23505: 'UNIQUE_CONSTRAINT_VIOLATION',
 };
@@ -11,7 +18,7 @@ function pgErrorFromCode(code) {
     return exports.PG_ERRORS[code] || null;
 }
 function pgErrorType(error) {
-    if (error instanceof DatabaseError)
+    if (error instanceof pg_1.default.DatabaseError)
         return pgErrorFromCode(error.code);
     return null;
 }

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/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;
     }
     /**
@@ -1101,6 +1101,9 @@ class Query extends ConnectedToDB_js_1.default {
             // base model, it will be underscored (to match the table name), but when the selected column
             // comes back from Kysely camelCased
             aliases.push(field.includes('_') ? (0, camelize_js_1.default)(field) : field);
+            //  namespace the selection so that when plucking the same column name from
+            // multpile tables, they don't get saved as the same name (e.g. select results with two `id` columns,
+            // which the pg package then returns in an object with a single `id` key)
             kyselyQuery = kyselyQuery.select(`${this.namespaceColumn(field)} as ${field}`);
         });
         return (await (0, executeDatabaseQuery_js_1.default)(kyselyQuery, 'execute')).map(singleResult => aliases.map(alias => singleResult[alias]));
@@ -1422,7 +1425,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 +1464,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 +1759,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 +1782,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) => {
@@ -1802,14 +1805,15 @@ class Query extends ConnectedToDB_js_1.default {
         const dream = dreams.find(dream => dream['getAssociationMetadata'](associationName));
         if (!dream)
             return;
-        const association = dream['getAssociationMetadata'](associationName);
+        const { name, alias } = (0, extractAssociationMetadataFromAssociationName_js_1.default)(associationName);
+        const association = dream['getAssociationMetadata'](name);
         const dreamClass = dream.constructor;
         const dreamClassToHydrate = association.modelCB();
         if ((association.polymorphic && association.type === 'BelongsTo') || Array.isArray(dreamClassToHydrate))
             return this.preloadPolymorphicBelongsTo(association, dreams);
         const dreamClassToHydrateColumns = [...dreamClassToHydrate.columns()];
         const throughColumnsToHydrate = [];
-        const columnsToPluck = dreamClassToHydrateColumns.map(column => this.namespaceColumn(column.toString(), associationName));
+        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)) {
@@ -1921,9 +1925,17 @@ class Query extends ConnectedToDB_js_1.default {
         }
         return query;
     }
-    // Through associations don't get written into the SQL; they
-    // locate the next association we need to build into the SQL
-    // AND the source to reference on the other side
+    /**
+     * Each association in the chain is pushed onto `throughAssociations`
+     * and `applyOneJoin` is recursively called. The trick is that the
+     * through associations don't get written into the SQL; they
+     * locate the next association we need to build into the SQL,
+     * which is only run by the association that started the `through`
+     * chain. The final association at the end of the `through` chain _is_
+     * written into the SQL as a full association, but the modifications from
+     * the `through` association are only added when the recursion returns
+     * back to the association that kicked off the through associations.
+     */
     joinsBridgeThroughAssociations({ query, dreamClass, association, previousAssociationTableOrAlias, throughAssociations, joinType, }) {
         if (association.type === 'BelongsTo' || !association.through) {
             return {
@@ -2004,25 +2016,33 @@ class Query extends ConnectedToDB_js_1.default {
         previousAssociationTableOrAlias = results.previousAssociationTableOrAlias;
         const throughClass = results.throughClass;
         if (timeToApplyThroughAssociations) {
-            ///////////////////////////////////////////////////////////////////////////////////////
-            // when an association is through another association, `joinsBridgeThroughAssociations`
-            // is called, which eventually calls back to this method, passing in the original
-            // through association as `originalAssociation`
-            ///////////////////////////////////////////////////////////////////////////////////////
+            /**
+             * Each association in the chain is pushed onto `throughAssociations`
+             * and `applyOneJoin` is recursively called. The trick is that the
+             * through associations don't get written into the SQL; they
+             * locate the next association we need to build into the SQL,
+             * which is only run by the association that started the `through`
+             * chain (thus the
+             * `throughAssociations.length && throughAssociations[0].source === association.as`
+             * above). The final association at the end of the `through` chain _is_
+             * written into the SQL as a full association, but the modifications from
+             * the `through` association are only added when the recursion returns
+             * back to the association that kicked off the through associations.
+             */
             throughAssociations.forEach((throughAssociation) => {
                 if (throughAssociation.type === 'HasMany') {
                     if (query?.distinctOn && throughAssociation.distinct) {
                         query = query.distinctOn(this.distinctColumnNameForAssociation({
                             association: throughAssociation,
-                            tableNameOrAlias: throughAssociation.as,
+                            tableNameOrAlias: currentAssociationTableOrAlias,
                             foreignKey: throughAssociation.primaryKey(),
                         }));
                     }
                     if (throughAssociation.order) {
                         query = this.applyOrderStatementForAssociation({
                             query,
-                            tableNameOrAlias: throughAssociation.as,
                             association: throughAssociation,
+                            tableNameOrAlias: currentAssociationTableOrAlias,
                         });
                     }
                 }
@@ -2072,8 +2092,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/dream-application/index.js

@@ -1,5 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+// after building for esm, importing pg using the following:
+//
+//  import * as pg from 'pg'
+//
+// will crash. This is difficult to discover, since it only happens
+// when being imported from our esm build.
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
 const pg_1 = require("pg");

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.
     `;
     }
 }

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

@@ -12,7 +12,7 @@ class CannotPassUndefinedAsAValueToAWhereClause extends Error {
         return `
 Cannot pass undefined as a value to a where clause.
 
-dream class: ${this.dreamClass.name}
+dream class: ${this.dreamClass.sanitizedName}
 key receiving an undefined value: ${this.key}
 `;
     }

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

@@ -9,7 +9,7 @@ class CannotReloadUnsavedDream extends Error {
     get message() {
         return `
 Cannot reload a Dream that has not yet been persisted
-  dream: ${this.dream.constructor.name}
+  dream: ${this.dream['sanitizedConstructorName']}
     `;
     }
 }

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

@@ -8,7 +8,7 @@ class CreateOrFindByFailedToCreateAndFind extends Error {
     }
     get message() {
         return `
-Failed to create instance of ${this.dreamClass.name} and no matching model exists.
+Failed to create instance of ${this.dreamClass.sanitizedName} and no matching model exists.
 
 The likely cause is that one of the \`createWith\` fields violates
 a uniqueness constraint.

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

@@ -15,7 +15,7 @@ class DoNotSetEncryptedFieldsDirectly extends Error {
 Do not set @Encrypted columns directly. Instead, set their accessors, so that
 those fields can be encrypted by Dream internally.
 
-Dream class: ${this.dreamClass.name}
+Dream class: ${this.dreamClass.sanitizedName}
 Problematic setter: ${this.encryptedColumnName}
 Setter to be used instead: ${this.encryptedProperty}`;
     }

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

@@ -14,7 +14,7 @@ Whenever the using SoftDelete decorator, you must have either a deletedAt column
 or else another column defined, along with an ovrriding getter on your model, like so:
 
   @SoftDelete()
-  class ${this.dreamClass.name} extends ApplicationModel {
+  class ${this.dreamClass.sanitizedName} extends ApplicationModel {
     public get deletedAtField() {
       return 'customDeletedAtField' as const
     }

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

@@ -9,14 +9,14 @@ class MissingSerializersDefinition extends Error {
     get message() {
         return `
 Missing serializers definition on the following class
-Dream class: ${this.dreamClass.name}
+Dream class: ${this.dreamClass.sanitizedName}
 
-Try something like this in your ${this.dreamClass.name}'s serializer getter:
+Try something like this in your ${this.dreamClass.sanitizedName}'s serializer getter:
 
-class ${this.dreamClass.name} {
-  public get serializers(): DreamSerializers<${this.dreamClass.name}> {
+class ${this.dreamClass.sanitizedName} {
+  public get serializers(): DreamSerializers<${this.dreamClass.sanitizedName}> {
     return {
-      default: '${this.dreamClass.name}Serializer'
+      default: '${this.dreamClass.sanitizedName}Serializer'
     }
   }
   ...

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

@@ -11,14 +11,14 @@ class MissingTable extends Error {
     get message() {
         return `
 Missing table definition on the following dream class:
-Dream class: ${this.dreamClass.name}
+Dream class: ${this.dreamClass.sanitizedName}
 
-Try something like this in your ${this.dreamClass.name}'s table getter:
+Try something like this in your ${this.dreamClass.sanitizedName}'s table getter:
 
-class ${this.dreamClass.name} {
+class ${this.dreamClass.sanitizedName} {
   ...
   public get table() {
-    return '${(0, pluralize_esm_1.default)((0, snakeify_js_1.default)(this.dreamClass.name))}'
+    return '${(0, pluralize_esm_1.default)((0, snakeify_js_1.default)(this.dreamClass.sanitizedName))}'
   }
 }
     `;

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

@@ -12,10 +12,10 @@ class NonBelongsToAssociationProvidedAsSortableDecoratorScope extends Error {
         return `
 Only BelongsTo associations are supported as scopes for the @Sortable decorator.
 received:
-  dream model class: ${this.dreamClass.name}
+  dream model class: ${this.dreamClass.sanitizedName}
   scope: ${this.scope}
 
-BelongsTo scopes on ${this.dreamClass.name} are:
+BelongsTo scopes on ${this.dreamClass.sanitizedName} are:
   ${this.dreamClass['associationMetadataByType'].belongsTo.map(assoc => assoc.as).join('\n        ')}
     `;
     }