@rvoh/dream 0.34.0 → 0.35.1

package/dist/cjs/src/Dream.js

@@ -26,7 +26,11 @@ const undestroyDream_js_1 = require("./dream/internal/undestroyDream.js");
 const LeftJoinLoadBuilder_js_1 = require("./dream/LeftJoinLoadBuilder.js");
 const LoadBuilder_js_1 = require("./dream/LoadBuilder.js");
 const Query_js_1 = require("./dream/Query.js");
+const CannotAssociationQueryOnUnpersistedDream_js_1 = require("./errors/associations/CannotAssociationQueryOnUnpersistedDream.js");
+const CannotCreateAssociationOnUnpersistedDream_js_1 = require("./errors/associations/CannotCreateAssociationOnUnpersistedDream.js");
+const CannotDestroyAssociationOnUnpersistedDream_js_1 = require("./errors/associations/CannotDestroyAssociationOnUnpersistedDream.js");
 const CannotPassNullOrUndefinedToRequiredBelongsTo_js_1 = require("./errors/associations/CannotPassNullOrUndefinedToRequiredBelongsTo.js");
+const CannotUpdateAssociationOnUnpersistedDream_js_1 = require("./errors/associations/CannotUpdateAssociationOnUnpersistedDream.js");
 const CanOnlyPassBelongsToModelParam_js_1 = require("./errors/associations/CanOnlyPassBelongsToModelParam.js");
 const NonLoadedAssociation_js_1 = require("./errors/associations/NonLoadedAssociation.js");
 const CannotCallUndestroyOnANonSoftDeleteModel_js_1 = require("./errors/CannotCallUndestroyOnANonSoftDeleteModel.js");
@@ -42,6 +46,7 @@ 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;
@@ -2245,13 +2250,8 @@ class Dream {
         this.constructor.columns().forEach(column => {
             const was = this.previousValueForAttribute(column);
             const now = this[column];
-            if (was !== now) {
-                ;
-                obj[column] = {
-                    was,
-                    now,
-                };
-            }
+            if ((0, notEqual_js_1.default)(was, now))
+                obj[column] = { was, now };
         });
         return obj;
     }
@@ -2285,7 +2285,7 @@ class Dream {
      * @returns Returns the previous value for an attribute
      */
     previousValueForAttribute(columnName) {
-        if (this.frozenAttributes[columnName] !== this[columnName])
+        if ((0, notEqual_js_1.default)(this.frozenAttributes[columnName], this[columnName]))
             return this.frozenAttributes[columnName];
         return this.attributesFromBeforeLastSave[columnName];
     }
@@ -2301,7 +2301,7 @@ class Dream {
         const changes = this.changes();
         const now = changes?.[columnName]?.now;
         const was = changes?.[columnName]?.was;
-        return this.isPersisted && now !== was;
+        return this.isPersisted && (0, notEqual_js_1.default)(now, was);
     }
     /**
      * Returns true if the columnName provided has
@@ -2484,7 +2484,12 @@ class Dream {
      * @returns A boolean
      */
     equals(other) {
-        return other?.constructor === this.constructor && other.primaryKeyValue === this.primaryKeyValue;
+        if (!other?.isDreamInstance)
+            return false;
+        return this.comparisonKey === other.comparisonKey;
+    }
+    get comparisonKey() {
+        return `${this.constructor.globalName}:${this.primaryKeyValue}`;
     }
     /**
      * @internal
@@ -2547,6 +2552,8 @@ class Dream {
      * @returns The created association
      */
     async createAssociation(associationName, attributes = {}) {
+        if (this.isNewRecord)
+            throw new CannotCreateAssociationOnUnpersistedDream_js_1.default(this, associationName);
         return (0, createAssociation_js_1.default)(this, null, associationName, attributes);
     }
     /**
@@ -2567,6 +2574,8 @@ class Dream {
      * @returns The number of records deleted
      */
     async destroyAssociation(associationName, options) {
+        if (this.isNewRecord)
+            throw new CannotDestroyAssociationOnUnpersistedDream_js_1.default(this, associationName);
         return await (0, destroyAssociation_js_1.default)(this, null, associationName, {
             ...(0, destroyOptions_js_1.destroyOptions)(options),
             joinOnStatements: {
@@ -2599,6 +2608,8 @@ class Dream {
      * @returns The number of records deleted
      */
     async reallyDestroyAssociation(associationName, options) {
+        if (this.isNewRecord)
+            throw new CannotDestroyAssociationOnUnpersistedDream_js_1.default(this, associationName);
         return await (0, destroyAssociation_js_1.default)(this, null, associationName, {
             ...(0, destroyOptions_js_1.reallyDestroyOptions)(options),
             joinOnStatements: {
@@ -2650,6 +2661,8 @@ class Dream {
      *
      */
     associationQuery(associationName, joinOnStatements) {
+        if (this.isNewRecord)
+            throw new CannotAssociationQueryOnUnpersistedDream_js_1.default(this, associationName);
         return (0, associationQuery_js_1.default)(this, null, associationName, {
             joinOnStatements: joinOnStatements,
             bypassAllDefaultScopes: scopeHelpers_js_1.DEFAULT_BYPASS_ALL_DEFAULT_SCOPES,
@@ -2679,6 +2692,8 @@ class Dream {
      * @returns The number of updated records
      */
     async updateAssociation(associationName, attributes, updateAssociationOptions) {
+        if (this.isNewRecord)
+            throw new CannotUpdateAssociationOnUnpersistedDream_js_1.default(this, associationName);
         return (0, associationUpdateQuery_js_1.default)(this, null, associationName, {
             joinOnStatements: {
                 on: updateAssociationOptions?.on,

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

@@ -1,5 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const CannotAssociationQueryOnUnpersistedDream_js_1 = require("../errors/associations/CannotAssociationQueryOnUnpersistedDream.js");
+const CannotCreateAssociationOnUnpersistedDream_js_1 = require("../errors/associations/CannotCreateAssociationOnUnpersistedDream.js");
+const CannotDestroyAssociationOnUnpersistedDream_js_1 = require("../errors/associations/CannotDestroyAssociationOnUnpersistedDream.js");
+const CannotUpdateAssociationOnUnpersistedDream_js_1 = require("../errors/associations/CannotUpdateAssociationOnUnpersistedDream.js");
 const associationQuery_js_1 = require("./internal/associations/associationQuery.js");
 const associationUpdateQuery_js_1 = require("./internal/associations/associationUpdateQuery.js");
 const createAssociation_js_1 = require("./internal/associations/createAssociation.js");
@@ -310,6 +314,8 @@ class DreamInstanceTransactionBuilder {
      * @returns A Query scoped to the specified association on the current instance
      */
     associationQuery(associationName, joinOnStatements) {
+        if (this.dreamInstance.isNewRecord)
+            throw new CannotAssociationQueryOnUnpersistedDream_js_1.default(this.dreamInstance, associationName);
         return (0, associationQuery_js_1.default)(this.dreamInstance, this.dreamTransaction, associationName, {
             joinOnStatements: joinOnStatements,
             bypassAllDefaultScopes: scopeHelpers_js_1.DEFAULT_BYPASS_ALL_DEFAULT_SCOPES,
@@ -341,6 +347,8 @@ class DreamInstanceTransactionBuilder {
      * @returns The number of updated records
      */
     async updateAssociation(associationName, attributes, updateAssociationOptions) {
+        if (this.dreamInstance.isNewRecord)
+            throw new CannotUpdateAssociationOnUnpersistedDream_js_1.default(this.dreamInstance, associationName);
         return await (0, associationUpdateQuery_js_1.default)(this.dreamInstance, this.dreamTransaction, associationName, {
             joinOnStatements: {
                 on: updateAssociationOptions?.on,
@@ -367,6 +375,8 @@ class DreamInstanceTransactionBuilder {
      * @returns The created association
      */
     async createAssociation(associationName, opts = {}) {
+        if (this.dreamInstance.isNewRecord)
+            throw new CannotCreateAssociationOnUnpersistedDream_js_1.default(this.dreamInstance, associationName);
         return await (0, createAssociation_js_1.default)(this.dreamInstance, this.dreamTransaction, associationName, opts);
     }
     /**
@@ -389,6 +399,8 @@ class DreamInstanceTransactionBuilder {
      * @returns The number of records deleted
      */
     async destroyAssociation(associationName, options) {
+        if (this.dreamInstance.isNewRecord)
+            throw new CannotDestroyAssociationOnUnpersistedDream_js_1.default(this.dreamInstance, associationName);
         return await (0, destroyAssociation_js_1.default)(this.dreamInstance, this.dreamTransaction, associationName, {
             ...(0, destroyOptions_js_1.destroyOptions)(options),
             joinOnStatements: {
@@ -423,6 +435,8 @@ class DreamInstanceTransactionBuilder {
      * @returns The number of records deleted
      */
     async reallyDestroyAssociation(associationName, options) {
+        if (this.dreamInstance.isNewRecord)
+            throw new CannotDestroyAssociationOnUnpersistedDream_js_1.default(this.dreamInstance, associationName);
         return await (0, destroyAssociation_js_1.default)(this.dreamInstance, this.dreamTransaction, associationName, {
             ...(0, destroyOptions_js_1.reallyDestroyOptions)(options),
             joinOnStatements: {

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

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = destroyDream;
 const destroyAssociatedRecords_js_1 = require("./destroyAssociatedRecords.js");
 const runHooksFor_js_1 = require("./runHooksFor.js");
-const safelyRunCommitHooks_js_1 = require("./safelyRunCommitHooks.js");
 const softDeleteDream_js_1 = require("./softDeleteDream.js");
 /**
  * @internal
@@ -42,7 +41,7 @@ async function destroyDreamWithTransaction(dream, txn, options) {
     await maybeDestroyDream(dream, txn, reallyDestroy);
     if (!skipHooks) {
         await (0, runHooksFor_js_1.default)('afterDestroy', dream, true, null, txn || undefined);
-        await (0, safelyRunCommitHooks_js_1.default)(dream, 'afterDestroyCommit', true, null, txn);
+        await (0, runHooksFor_js_1.default)('afterDestroyCommit', dream, true, null, txn);
     }
     if (shouldSoftDelete(dream, reallyDestroy)) {
         await dream.txn(txn).reload();

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

@@ -4,48 +4,90 @@ exports.default = runHooksFor;
 exports.runHook = runHook;
 async function runHooksFor(key, dream, alreadyPersisted, beforeSaveChanges, txn) {
     const Base = dream.constructor;
-    for (const statement of Base['hooks'][key]) {
-        if (statement.ifChanging?.length) {
+    for (const hook of Base['hooks'][key]) {
+        if (hook.ifChanging?.length) {
             switch (key) {
                 case 'beforeCreate':
-                    await runConditionalBeforeHooksForCreate(dream, statement, txn);
+                    if (shouldRunBeforeCreateHook(dream, hook)) {
+                        await runHook(hook, dream, txn);
+                    }
                     break;
                 case 'beforeSave':
-                    if (alreadyPersisted)
-                        await runConditionalBeforeHooksForUpdate(dream, statement, txn);
-                    else
-                        await runConditionalBeforeHooksForCreate(dream, statement, txn);
+                    if ((alreadyPersisted && shouldRunBeforeUpdateHook(dream, hook)) ||
+                        (!alreadyPersisted && shouldRunBeforeCreateHook(dream, hook))) {
+                        await runHook(hook, dream, txn);
+                    }
                     break;
                 case 'beforeUpdate':
-                    await runConditionalBeforeHooksForUpdate(dream, statement, txn);
+                    if (shouldRunBeforeUpdateHook(dream, hook)) {
+                        await runHook(hook, dream, txn);
+                    }
                     break;
                 default:
                     throw new Error(`Unexpected statement key detected with ifChanging clause: ${key}`);
             }
         }
-        else if (statement.ifChanged?.length) {
+        else if (hook.ifChanged?.length) {
             switch (key) {
                 case 'afterCreate':
+                    if (shouldRunAfterCreateHook(dream, hook, beforeSaveChanges)) {
+                        await runHook(hook, dream, txn);
+                    }
+                    break;
                 case 'afterCreateCommit':
-                    await runConditionalAfterHooksForCreate(dream, statement, beforeSaveChanges, txn);
+                    if (shouldRunAfterCreateHook(dream, hook, beforeSaveChanges)) {
+                        if (txn)
+                            txn.addCommitHook(hook, dream);
+                        else
+                            await runHook(hook, dream);
+                    }
                     break;
                 case 'afterSave':
+                    if ((alreadyPersisted && shouldRunAfterUpdateHook(dream, hook)) ||
+                        (!alreadyPersisted && shouldRunAfterCreateHook(dream, hook, beforeSaveChanges))) {
+                        await runHook(hook, dream, txn);
+                    }
+                    break;
                 case 'afterSaveCommit':
-                    if (alreadyPersisted)
-                        await runConditionalAfterHooksForUpdate(dream, statement, txn);
-                    else
-                        await runConditionalAfterHooksForCreate(dream, statement, beforeSaveChanges, txn);
+                    if ((alreadyPersisted && shouldRunAfterUpdateHook(dream, hook)) ||
+                        (!alreadyPersisted && shouldRunAfterCreateHook(dream, hook, beforeSaveChanges))) {
+                        if (txn)
+                            txn.addCommitHook(hook, dream);
+                        else
+                            await runHook(hook, dream);
+                    }
                     break;
                 case 'afterUpdate':
+                    if (shouldRunAfterUpdateHook(dream, hook)) {
+                        await runHook(hook, dream, txn);
+                    }
+                    break;
                 case 'afterUpdateCommit':
-                    await runConditionalAfterHooksForUpdate(dream, statement, txn);
+                    if (shouldRunAfterUpdateHook(dream, hook)) {
+                        if (txn)
+                            txn.addCommitHook(hook, dream);
+                        else
+                            await runHook(hook, dream);
+                    }
                     break;
                 default:
                     throw new Error(`Unexpected statement key detected with ifChanged clause: ${key}`);
             }
         }
         else {
-            await runHook(statement, dream, txn);
+            switch (key) {
+                case 'afterCreateCommit':
+                case 'afterSaveCommit':
+                case 'afterUpdateCommit':
+                case 'afterDestroyCommit':
+                    if (txn)
+                        txn.addCommitHook(hook, dream);
+                    else
+                        await runHook(hook, dream);
+                    break;
+                default:
+                    await runHook(hook, dream, txn);
+            }
         }
     }
 }
@@ -60,40 +102,36 @@ Please make sure "${statement.method}" is defined on ${dream['sanitizedConstruct
     }
     await dream[statement.method](txn);
 }
-async function runConditionalBeforeHooksForCreate(dream, statement, txn) {
+function shouldRunBeforeCreateHook(dream, statement) {
     let shouldRun = false;
     for (const attribute of statement.ifChanging) {
         if (dream[attribute] !== undefined)
             shouldRun = true;
     }
-    if (shouldRun)
-        await runHook(statement, dream, txn);
+    return shouldRun;
 }
-async function runConditionalAfterHooksForCreate(dream, statement, beforeSaveChanges, txn) {
+function shouldRunAfterCreateHook(dream, statement, beforeSaveChanges) {
     let shouldRun = false;
     for (const attribute of statement.ifChanged) {
         if (beforeSaveChanges?.[attribute] &&
             beforeSaveChanges[attribute].was !== beforeSaveChanges[attribute].now)
             shouldRun = true;
     }
-    if (shouldRun)
-        await runHook(statement, dream, txn);
+    return shouldRun;
 }
-async function runConditionalBeforeHooksForUpdate(dream, statement, txn) {
+function shouldRunBeforeUpdateHook(dream, statement) {
     let shouldRun = false;
     for (const attribute of statement.ifChanging) {
         if (dream.willSaveChangeToAttribute(attribute))
             shouldRun = true;
     }
-    if (shouldRun)
-        await runHook(statement, dream, txn);
+    return shouldRun;
 }
-async function runConditionalAfterHooksForUpdate(dream, statement, txn) {
+function shouldRunAfterUpdateHook(dream, statement) {
     let shouldRun = false;
     for (const attribute of statement.ifChanged) {
         if (dream.savedChangeToAttribute(attribute))
             shouldRun = true;
     }
-    if (shouldRun)
-        await runHook(statement, dream, txn);
+    return shouldRun;
 }

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

@@ -8,7 +8,6 @@ const namespaceColumn_js_1 = require("../../helpers/namespaceColumn.js");
 const sqlAttributes_js_1 = require("../../helpers/sqlAttributes.js");
 const executeDatabaseQuery_js_1 = require("./executeDatabaseQuery.js");
 const runHooksFor_js_1 = require("./runHooksFor.js");
-const safelyRunCommitHooks_js_1 = require("./safelyRunCommitHooks.js");
 async function saveDream(dream, txn = null, { skipHooks = false } = {}) {
     const db = txn?.kyselyTransaction || (0, index_js_1.default)('primary');
     const alreadyPersisted = dream.isPersisted;
@@ -59,9 +58,8 @@ async function saveDream(dream, txn = null, { skipHooks = false } = {}) {
             await (0, runHooksFor_js_1.default)('afterUpdate', dream, alreadyPersisted, beforeSaveChanges, txn);
         else
             await (0, runHooksFor_js_1.default)('afterCreate', dream, alreadyPersisted, beforeSaveChanges, txn);
-        const commitHookType = alreadyPersisted ? 'afterUpdateCommit' : 'afterCreateCommit';
-        await (0, safelyRunCommitHooks_js_1.default)(dream, commitHookType, alreadyPersisted, beforeSaveChanges, txn);
-        await (0, safelyRunCommitHooks_js_1.default)(dream, 'afterSaveCommit', alreadyPersisted, beforeSaveChanges, txn);
+        await (0, runHooksFor_js_1.default)(alreadyPersisted ? 'afterUpdateCommit' : 'afterCreateCommit', dream, alreadyPersisted, beforeSaveChanges, txn);
+        await (0, runHooksFor_js_1.default)('afterSaveCommit', dream, alreadyPersisted, beforeSaveChanges, txn);
     }
     return dream;
 }

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

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = undestroyDream;
 const setPosition_js_1 = require("../../decorators/field/sortable/helpers/setPosition.js");
 const runHooksFor_js_1 = require("./runHooksFor.js");
-const safelyRunCommitHooks_js_1 = require("./safelyRunCommitHooks.js");
 /**
  * @internal
  *
@@ -41,7 +40,7 @@ async function undestroyDreamWithTransaction(dream, txn, options) {
     }
     if (!skipHooks) {
         await (0, runHooksFor_js_1.default)('afterUpdate', dream, true, null, txn);
-        await (0, safelyRunCommitHooks_js_1.default)(dream, 'afterUpdateCommit', true, null, txn);
+        await (0, runHooksFor_js_1.default)('afterUpdateCommit', dream, true, null, txn);
     }
     await dream.txn(txn).reload();
     return dream;

package/dist/cjs/src/errors/associations/CannotAssociationQueryOnUnpersistedDream.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+class CannotAssociationQueryOnUnpersistedDream extends Error {
+    dream;
+    associationName;
+    constructor(dream, associationName) {
+        super();
+        this.dream = dream;
+        this.associationName = associationName;
+    }
+    get message() {
+        return `Cannot perform associationQuery on an unpersisted Dream.
+Dream class: ${this.dream.sanitizedConstructorName}
+Association: ${this.associationName.toString()}
+    `;
+    }
+}
+exports.default = CannotAssociationQueryOnUnpersistedDream;

package/dist/cjs/src/errors/associations/CannotCreateAssociationOnUnpersistedDream.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+class CannotCreateAssociationOnUnpersistedDream extends Error {
+    dream;
+    associationName;
+    constructor(dream, associationName) {
+        super();
+        this.dream = dream;
+        this.associationName = associationName;
+    }
+    get message() {
+        return `Cannot perform createAssociation on an unpersisted Dream.
+Dream class: ${this.dream.sanitizedConstructorName}
+Association: ${this.associationName.toString()}
+    `;
+    }
+}
+exports.default = CannotCreateAssociationOnUnpersistedDream;

package/dist/cjs/src/errors/associations/CannotDestroyAssociationOnUnpersistedDream.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+class CannotDestroyAssociationOnUnpersistedDream extends Error {
+    dream;
+    associationName;
+    constructor(dream, associationName) {
+        super();
+        this.dream = dream;
+        this.associationName = associationName;
+    }
+    get message() {
+        return `Cannot perform destroyAssociation on an unpersisted Dream.
+Dream class: ${this.dream.sanitizedConstructorName}
+Association: ${this.associationName.toString()}
+    `;
+    }
+}
+exports.default = CannotDestroyAssociationOnUnpersistedDream;

package/dist/cjs/src/errors/associations/CannotUpdateAssociationOnUnpersistedDream.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+class CannotUpdateAssociationOnUnpersistedDream extends Error {
+    dream;
+    associationName;
+    constructor(dream, associationName) {
+        super();
+        this.dream = dream;
+        this.associationName = associationName;
+    }
+    get message() {
+        return `Cannot perform updateAssociation on an unpersisted Dream.
+Dream class: ${this.dream.sanitizedConstructorName}
+Association: ${this.associationName.toString()}
+    `;
+    }
+}
+exports.default = CannotUpdateAssociationOnUnpersistedDream;

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

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const logos_js_1 = require("./logos.js");
+class DreamLogos {
+    static colorful() {
+        return (0, logos_js_1.default)();
+    }
+    static monochrome() {
+        return (0, logos_js_1.monochromeLogo)();
+    }
+}
+exports.default = DreamLogos;

package/dist/cjs/src/helpers/{DreamGlam/howyadoins/whaaaaaaaaaaok.js → DreamLogos/logos.js}

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = whaaaaaaaaaaok;
-exports.whaaaaaaaaaaokBasic = whaaaaaaaaaaokBasic;
+exports.monochromeLogo = monochromeLogo;
 const yoctocolors_1 = require("yoctocolors");
 function whaaaaaaaaaaok() {
     return (yoctocolors_1.default.bgMagentaBright(yoctocolors_1.default.black(`
@@ -45,7 +45,7 @@ function whaaaaaaaaaaok() {
                                                          
                                                          `)));
 }
-function whaaaaaaaaaaokBasic() {
+function monochromeLogo() {
     return `
                                     ,▄█▄                 
     ]█▄▄                         ╓█████▌                 

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

@@ -0,0 +1,29 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = areEqual;
+const CalendarDate_js_1 = require("./CalendarDate.js");
+const DateTime_js_1 = require("./DateTime.js");
+function areEqual(a, b) {
+    return areEqualOrUndefined(a, b) ?? areEqualOrUndefined(b, a) ?? JSON.stringify(a) === JSON.stringify(b);
+}
+function areEqualOrUndefined(a, b) {
+    if (a === null)
+        return b === null;
+    if (a === undefined)
+        return b === undefined;
+    if (typeof a === 'boolean')
+        return a === b;
+    if (typeof a === 'number')
+        return a === b;
+    if (typeof a === 'string')
+        return a === b;
+    if (a instanceof DateTime_js_1.DateTime)
+        return b instanceof DateTime_js_1.DateTime && a.equals(b);
+    if (a instanceof CalendarDate_js_1.default)
+        return b instanceof CalendarDate_js_1.default && a.equals(b);
+    if (Array.isArray(a))
+        return Array.isArray(b) && a.length === b.length && !a.find((value, index) => !areEqual(value, b[index]));
+    if (a?.isDreamInstance)
+        return a.equals(b);
+    return undefined;
+}

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

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = autogeneratedFileDisclaimer;
-const DreamGlam_js_1 = require("../DreamGlam/DreamGlam.js");
+const DreamLogos_js_1 = require("../DreamLogos/DreamLogos.js");
 function autogeneratedFileDisclaimer(startComment = '\n/*', endComment = '\n*/') {
     return `\
 ${startComment}
-${DreamGlam_js_1.default.whaaaaaaaaaaokBasic()}
+${DreamLogos_js_1.default.monochrome()}
 
 This file was automatically generated by my cat, Aster.
 He does not want you mucking about with his files,

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

@@ -78,7 +78,7 @@ public ${(0, camelize_js_1.default)(attributeName)}: ${getAttributeType(attribut
     return `\
 import { ${(0, uniq_js_1.default)(dreamImports).join(', ')} } from '@rvoh/dream'${(0, uniq_js_1.default)(modelImportStatements).join('')}
 
-const deco = new Decorators<InstanceType<typeof ${modelClassName}>>()
+const deco = new Decorators<typeof ${modelClassName}>()
 
 ${isSTI ? `\n@STI(${parentModelClassName})` : ''}
 export default class ${modelClassName} extends ${isSTI ? parentModelClassName : 'ApplicationModel'} {
@@ -89,7 +89,7 @@ ${isSTI
   }
 
 `}${serializer
-        ? `  public get serializers(): DreamSerializers<${modelClassName}> {
+        ? `  public ${isSTI ? 'override ' : ''}get serializers(): DreamSerializers<${modelClassName}> {
     return {
       default: '${(0, serializerNameFromFullyQualifiedModelName_js_1.default)(fullyQualifiedModelName)}',
       summary: '${(0, serializerNameFromFullyQualifiedModelName_js_1.default)(fullyQualifiedModelName, 'summary')}',

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

@@ -32,13 +32,13 @@ function generateSerializerContent({ fullyQualifiedModelName, columnsWithTypes =
   Passthrough extends object,
 >`;
     dreamSerializerTypeArgs = `<DataType, Passthrough>`;
-    const defaultSerialzerClassName = (0, globalClassNameFromFullyQualifiedModelName_js_1.default)((0, serializerNameFromFullyQualifiedModelName_js_1.default)(fullyQualifiedModelName));
-    const summarySerialzerClassName = (0, globalClassNameFromFullyQualifiedModelName_js_1.default)((0, serializerNameFromFullyQualifiedModelName_js_1.default)(fullyQualifiedModelName, 'summary'));
+    const defaultSerialzerClassName = (0, serializerNameFromFullyQualifiedModelName_js_1.default)(fullyQualifiedModelNameToSerializerBaseName(fullyQualifiedModelName));
+    const summarySerialzerClassName = (0, serializerNameFromFullyQualifiedModelName_js_1.default)(fullyQualifiedModelNameToSerializerBaseName(fullyQualifiedModelName), 'summary');
     const defaultSerialzerExtends = isSTI
-        ? (0, globalClassNameFromFullyQualifiedModelName_js_1.default)((0, serializerNameFromFullyQualifiedModelName_js_1.default)(fullyQualifiedParentName))
+        ? (0, serializerNameFromFullyQualifiedModelName_js_1.default)(fullyQualifiedModelNameToSerializerBaseName(fullyQualifiedParentName))
         : summarySerialzerClassName;
     const summarySerialzerExtends = isSTI
-        ? (0, globalClassNameFromFullyQualifiedModelName_js_1.default)((0, serializerNameFromFullyQualifiedModelName_js_1.default)(fullyQualifiedParentName, 'summary'))
+        ? (0, serializerNameFromFullyQualifiedModelName_js_1.default)(fullyQualifiedModelNameToSerializerBaseName(fullyQualifiedParentName), 'summary')
         : 'DreamSerializer';
     const additionalModelImports = [];
     columnsWithTypes.forEach(attr => {
@@ -101,8 +101,16 @@ function attributeOptionsSpecifier(type, attr) {
     }
 }
 function importStatementForSerializer(originModelName, destinationModelName) {
-    return `\nimport ${(0, globalClassNameFromFullyQualifiedModelName_js_1.default)((0, serializerNameFromFullyQualifiedModelName_js_1.default)(destinationModelName))}, { ${(0, globalClassNameFromFullyQualifiedModelName_js_1.default)((0, serializerNameFromFullyQualifiedModelName_js_1.default)(destinationModelName, 'summary'))} } from '${(0, relativeDreamPath_js_1.default)('serializers', 'serializers', originModelName, destinationModelName)}'`;
+    const defaultSerializer = (0, globalClassNameFromFullyQualifiedModelName_js_1.default)((0, serializerNameFromFullyQualifiedModelName_js_1.default)(fullyQualifiedModelNameToSerializerBaseName(destinationModelName)));
+    const summarySerializer = (0, globalClassNameFromFullyQualifiedModelName_js_1.default)((0, serializerNameFromFullyQualifiedModelName_js_1.default)(fullyQualifiedModelNameToSerializerBaseName(destinationModelName), 'summary'));
+    const importFrom = (0, relativeDreamPath_js_1.default)('serializers', 'serializers', originModelName, destinationModelName);
+    return `\nimport ${defaultSerializer}, { ${summarySerializer} } from '${importFrom}'`;
 }
 function importStatementForModel(originModelName, destinationModelName = originModelName) {
-    return `\nimport ${(0, globalClassNameFromFullyQualifiedModelName_js_1.default)(destinationModelName)} from '${(0, relativeDreamPath_js_1.default)('serializers', 'models', originModelName, destinationModelName)}'`;
+    const modelName = (0, globalClassNameFromFullyQualifiedModelName_js_1.default)(destinationModelName);
+    const importFrom = (0, relativeDreamPath_js_1.default)('serializers', 'models', originModelName, destinationModelName);
+    return `\nimport ${modelName} from '${importFrom}'`;
+}
+function fullyQualifiedModelNameToSerializerBaseName(fullyQualifiedModelName) {
+    return fullyQualifiedModelName.split('/').pop() ?? '';
 }

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

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = default_1;
+const areEqual_js_1 = require("./areEqual.js");
+function default_1(a, b) {
+    return !(0, areEqual_js_1.default)(a, b);
+}

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

@@ -6,15 +6,14 @@ function uniq(arr, toKey = undefined) {
         return uniqWith(arr, toKey);
     return uniqWith(arr, a => String(a));
 }
-function dreamKey(dream) {
-    return `${dream.constructor.globalName}:${dream.primaryKeyValue}`;
-}
 function uniqWith(arr, toKey) {
     const map = arr.reduce((acc, val) => {
         // Prefix with underscore to ensure that the values cannot be interpreted as integers.
         // If they can be interpreted as integers, then the keys are ordered not by the
         // order in which they were added, but in ascending numerical order.
-        const key = val?.isDreamInstance ? dreamKey(val) : `_${toKey(val)}`;
+        const key = val?.isDreamInstance
+            ? val.comparisonKey
+            : `_${toKey(val)}`;
         acc[key] ||= val;
         return acc;
     }, {});

package/dist/cjs/src/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.range = exports.Range = exports.sharedPathPrefix = exports.relativeDreamPath = exports.dreamPath = exports.pascalize = exports.loadRepl = exports.isEmpty = exports.inferSerializerFromDreamOrViewModel = exports.inferSerializerFromDreamClassOrViewModelClass = exports.hyphenize = exports.globalClassNameFromFullyQualifiedModelName = exports.Env = exports.DreamGlam = exports.debug = exports.DateTime = exports.compact = exports.generateDream = exports.capitalize = exports.camelize = exports.CalendarDate = exports.Benchmark = exports.ValidationError = exports.RecordNotFound = exports.GlobalNameNotSet = exports.CreateOrFindByFailedToCreateAndFind = exports.NonLoadedAssociation = exports.Encrypt = exports.Query = exports.DreamTransaction = exports.openapiShorthandPrimitiveTypes = exports.openapiPrimitiveTypes = exports.DreamConst = exports.Dream = exports.DreamApplication = exports.lookupClassByGlobalName = exports.DreamImporter = exports.Decorators = exports.STI = exports.SoftDelete = exports.ReplicaSafe = exports.validateTable = exports.validateColumn = exports.DreamMigrationHelpers = exports.untypedDb = exports.pgErrorType = exports.dreamDbConnections = exports.closeAllDbConnections = exports.DreamCLI = exports.DreamBin = void 0;
+exports.range = exports.Range = exports.sharedPathPrefix = exports.relativeDreamPath = exports.dreamPath = exports.pascalize = exports.loadRepl = exports.isEmpty = exports.inferSerializerFromDreamOrViewModel = exports.inferSerializerFromDreamClassOrViewModelClass = exports.hyphenize = exports.globalClassNameFromFullyQualifiedModelName = exports.Env = exports.DreamLogos = exports.debug = exports.DateTime = exports.compact = exports.generateDream = exports.capitalize = exports.camelize = exports.CalendarDate = exports.Benchmark = exports.ValidationError = exports.RecordNotFound = exports.GlobalNameNotSet = exports.CreateOrFindByFailedToCreateAndFind = exports.NonLoadedAssociation = exports.Encrypt = exports.Query = exports.DreamTransaction = exports.openapiShorthandPrimitiveTypes = exports.openapiPrimitiveTypes = exports.DreamConst = exports.Dream = exports.DreamApplication = exports.lookupClassByGlobalName = exports.DreamImporter = exports.Decorators = exports.STI = exports.SoftDelete = exports.ReplicaSafe = exports.validateTable = exports.validateColumn = exports.DreamMigrationHelpers = exports.untypedDb = exports.pgErrorType = exports.dreamDbConnections = exports.closeAllDbConnections = exports.DreamCLI = exports.DreamBin = void 0;
 exports.DreamSerializer = exports.Attribute = exports.RendersOne = exports.RendersMany = exports.ops = exports.uniq = exports.uncapitalize = exports.standardizeFullyQualifiedModelName = exports.sortBy = exports.sort = exports.snakeify = exports.serializerNameFromFullyQualifiedModelName = exports.round = void 0;
 var index_js_1 = require("./bin/index.js");
 Object.defineProperty(exports, "DreamBin", { enumerable: true, get: function () { return index_js_1.default; } });
@@ -71,8 +71,8 @@ var DateTime_js_1 = require("./helpers/DateTime.js");
 Object.defineProperty(exports, "DateTime", { enumerable: true, get: function () { return DateTime_js_1.DateTime; } });
 var debug_js_1 = require("./helpers/debug.js");
 Object.defineProperty(exports, "debug", { enumerable: true, get: function () { return debug_js_1.default; } });
-var DreamGlam_js_1 = require("./helpers/DreamGlam/DreamGlam.js");
-Object.defineProperty(exports, "DreamGlam", { enumerable: true, get: function () { return DreamGlam_js_1.default; } });
+var DreamLogos_js_1 = require("./helpers/DreamLogos/DreamLogos.js");
+Object.defineProperty(exports, "DreamLogos", { enumerable: true, get: function () { return DreamLogos_js_1.default; } });
 var Env_js_1 = require("./helpers/Env.js");
 Object.defineProperty(exports, "Env", { enumerable: true, get: function () { return Env_js_1.default; } });
 var globalClassNameFromFullyQualifiedModelName_js_1 = require("./helpers/globalClassNameFromFullyQualifiedModelName.js");