@rvoh/dream 1.9.4 → 1.10.0

package/dist/cjs/src/Dream.js

@@ -43,6 +43,7 @@ const CreateOrUpdateByFailedToCreateAndUpdate_js_1 = require("./errors/CreateOrU
 const GlobalNameNotSet_js_1 = require("./errors/dream-app/GlobalNameNotSet.js");
 const DreamMissingRequiredOverride_js_1 = require("./errors/DreamMissingRequiredOverride.js");
 const NonExistentScopeProvidedToResort_js_1 = require("./errors/NonExistentScopeProvidedToResort.js");
+const RecordNotFound_js_1 = require("./errors/RecordNotFound.js");
 const MissingSerializersDefinition_js_1 = require("./errors/serializers/MissingSerializersDefinition.js");
 const CalendarDate_js_1 = require("./helpers/CalendarDate.js");
 const cloneDeepSafe_js_1 = require("./helpers/cloneDeepSafe.js");
@@ -3220,6 +3221,61 @@ class Dream {
     load(...args) {
         return new LoadBuilder_js_1.default(this).load(...args);
     }
+    /**
+     * If the association is already loaded on the instance, it returns the loaded value
+     * immediately without making a database query. If the association is not loaded,
+     * it performs a database query to fetch the association.
+     *
+     * If a query is performed, the association is set on the model so that future calls to
+     * access this association can access the already loaded value.
+     *
+     * ```ts
+     * // return the already loaded user if it exists or fetch it from the database otherwise
+     * const user = await post.associationOrFail('user')
+     * ```
+     *
+     * @param associationName - The name of the BelongsTo or HasOne association
+     * @returns The associated model instance or null
+     */
+    async association(associationName) {
+        if (!this.loaded(associationName)) {
+            const association = this.getAssociationMetadata(associationName);
+            if (association?.type === 'HasMany') {
+                this[associationName] = (await this.associationQuery(associationName).all());
+            }
+            else {
+                this[associationName] = (await this.associationQuery(associationName).first());
+            }
+        }
+        return this[associationName];
+    }
+    /**
+     * If the association is already loaded on the instance, it returns the loaded value
+     * immediately without making a database query. If the association is not loaded,
+     * it performs a database query to fetch the association.
+     *
+     * Unlike `association`, this method throws an exception if no associated
+     * record is found, guaranteeing a non-null result.
+     *
+     * If a query is performed, the association is set on the model so that future calls to
+     * access this association can access the already loaded value.
+     *
+     * ```ts
+     * // return the already loaded user if it exists or fetch it from the database otherwise,
+     * // throwing RecordNotFound either way if the associated model does not exist
+     * const user = await post.associationOrFail('user')
+     * ```
+     *
+     * @param associationName - The name of the BelongsTo or HasOne association
+     * @returns The associated model instance (never null)
+     * @throws RecordNotFound if no associated record exists
+     */
+    async associationOrFail(associationName) {
+        const response = await this.association(associationName);
+        if (this[associationName] === null)
+            throw new RecordNotFound_js_1.default(this['sanitizedConstructorName']);
+        return response;
+    }
     /**
      * Recursively loads all Dream associations referenced by `rendersOne` and `rendersMany`
      * in a DreamSerializer. This traverses the entire content tree of serializers to automatically
@@ -3280,8 +3336,8 @@ class Dream {
      * 4. the individual query becomes more complex the more associations are included
      * 5. associations loading associations loading associations could result in exponential amounts of data; in those cases, `.load(...).findEach(...)` avoids instantiating massive amounts of data at once
      *
-     * NOTE: {@link Dream.leftJoinPreload} is often a preferrable way of achieving the
-     * same goal.
+     * Note: Left join loading loads all data in a single SQL query but has trade-offs compared
+     * to regular preloading. See {@link Dream.leftJoinPreload} for details about limitations.
      *
      * ```ts
      * await user
@@ -3317,6 +3373,9 @@ class Dream {
      * This method analyzes the serializer (specified by `serializerKey` or 'default') and
      * automatically preloads all associations that will be needed during serialization.
      *
+     * Note: Left join loading loads all data in a single SQL query but has trade-offs compared
+     * to regular preloading. See {@link Dream.leftJoinPreload} for details about limitations.
+     *
      * ```ts
      * // Instead of manually specifying all associations:
      * await User.preload('posts', 'comments', 'replies').all()

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

@@ -24,6 +24,12 @@ class DreamBin {
             await Query_js_1.default.dbDriverClass(connectionName).dbDrop(connectionName);
         }
     }
+    static async dbEnsureAllMigrationsHaveBeenRun() {
+        const dreamApp = index_js_2.default.getOrFail();
+        for (const connectionName of Object.keys(dreamApp.dbCredentials)) {
+            await Query_js_1.default.dbDriverClass(connectionName).ensureAllMigrationsHaveBeenRun(connectionName);
+        }
+    }
     static async dbMigrate() {
         const dreamApp = index_js_2.default.getOrFail();
         for (const connectionName of Object.keys(dreamApp.dbCredentials)) {

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

@@ -34,7 +34,7 @@ ${INDENT}
 ${INDENT}    - decimal:
 ${INDENT}    - decimal[]:
 ${INDENT}        scale,precision is required, e.g.: volume:decimal:3,2 or volume:decimal:3,2:optional
-${INDENT}        
+${INDENT}
 ${INDENT}        leveraging arrays, add the "[]" suffix, e.g.: volume:decimal[]:3,2
 ${INDENT}
 ${INDENT}    - enum:
@@ -73,7 +73,7 @@ class DreamCLI {
             .description('sync introspects your database, updating your schema to reflect, and then syncs the new schema with the installed dream node module, allowing it provide your schema to the underlying kysely integration')
             .option('--schema-only')
             .action(async (options = {}) => {
-            await initializeDreamApp();
+            await initializeDreamApp({ bypassDreamIntegrityChecks: true });
             await index_js_1.default.sync(() => { }, options);
             process.exit();
         });
@@ -95,7 +95,7 @@ class DreamCLI {
             .option('--connection-name <connectionName>', 'the connection name you wish to use for your migration')
             .argument('[columnsWithTypes...]', columnsWithTypesDescriptionForMigration)
             .action(async (migrationName, columnsWithTypes, options) => {
-            await initializeDreamApp();
+            await initializeDreamApp({ bypassDreamIntegrityChecks: true });
             await index_js_1.default.generateMigration(migrationName, columnsWithTypes, options.connectionName || 'default');
             process.exit();
         });
@@ -111,7 +111,7 @@ class DreamCLI {
             .argument('<modelName>', 'the name of the model to create, e.g. Post or Settings/CommunicationPreferences')
             .argument('[columnsWithTypes...]', columnsWithTypesDescription)
             .action(async (modelName, columnsWithTypes, options) => {
-            await initializeDreamApp();
+            await initializeDreamApp({ bypassDreamIntegrityChecks: true });
             await index_js_1.default.generateDream(modelName, columnsWithTypes, options);
             process.exit();
         });
@@ -128,7 +128,7 @@ ${INDENT}    to extend the Room model in src/app/models/Room: Room
 ${INDENT}    to extend the Coach model in src/app/models/Health/Coach: Health/Coach`)
             .argument('[columnsWithTypes...]', columnsWithTypesDescription)
             .action(async (childModelName, extendsWord, parentModelName, columnsWithTypes, options) => {
-            await initializeDreamApp();
+            await initializeDreamApp({ bypassDreamIntegrityChecks: true });
             if (extendsWord !== 'extends')
                 throw new Error('Expecting: `<child-name> extends <parent-name> <columns-and-types>');
             await index_js_1.default.generateStiChild(childModelName, parentModelName, columnsWithTypes, options);
@@ -139,16 +139,24 @@ ${INDENT}    to extend the Coach model in src/app/models/Health/Coach: Health/Co
             .description('creates a new database, seeding from local .env or .env.test if NODE_ENV=test is set for env vars')
             .action(async () => {
             EnvInternal_js_1.default.setBoolean('BYPASS_DB_CONNECTIONS_DURING_INIT');
-            await initializeDreamApp({ bypassModelIntegrityCheck: true });
+            await initializeDreamApp({ bypassDreamIntegrityChecks: true });
             await index_js_1.default.dbCreate();
             process.exit();
         });
+        program
+            .command('db:integrity-check')
+            .description('db:integrity-check fails if migrations need to be run')
+            .action(async () => {
+            await initializeDreamApp({ bypassDreamIntegrityChecks: true });
+            await index_js_1.default.dbEnsureAllMigrationsHaveBeenRun();
+            process.exit();
+        });
         program
             .command('db:migrate')
             .description('db:migrate runs any outstanding database migrations')
             .option('--skip-sync', 'skips syncing local schema after running migrations')
             .action(async ({ skipSync }) => {
-            await initializeDreamApp({ bypassModelIntegrityCheck: true });
+            await initializeDreamApp({ bypassDreamIntegrityChecks: true });
             await index_js_1.default.dbMigrate();
             if (EnvInternal_js_1.default.isDevelopmentOrTest && !skipSync) {
                 await index_js_1.default.sync(onSync);
@@ -161,7 +169,7 @@ ${INDENT}    to extend the Coach model in src/app/models/Health/Coach: Health/Co
             .option('--steps <number>', 'number of steps back to travel', myParseInt, 1)
             .option('--skip-sync', 'skips syncing local schema after running migrations')
             .action(async ({ steps, skipSync }) => {
-            await initializeDreamApp({ bypassModelIntegrityCheck: true });
+            await initializeDreamApp({ bypassDreamIntegrityChecks: true });
             await index_js_1.default.dbRollback({ steps });
             if (EnvInternal_js_1.default.isDevelopmentOrTest && !skipSync) {
                 await index_js_1.default.sync(onSync);
@@ -173,7 +181,7 @@ ${INDENT}    to extend the Coach model in src/app/models/Health/Coach: Health/Co
             .description('drops the database, seeding from local .env or .env.test if NODE_ENV=test is set for env vars')
             .action(async () => {
             EnvInternal_js_1.default.setBoolean('BYPASS_DB_CONNECTIONS_DURING_INIT');
-            await initializeDreamApp({ bypassModelIntegrityCheck: true });
+            await initializeDreamApp({ bypassDreamIntegrityChecks: true });
             await index_js_1.default.dbDrop();
             process.exit();
         });
@@ -182,11 +190,11 @@ ${INDENT}    to extend the Coach model in src/app/models/Health/Coach: Health/Co
             .description('runs db:drop (safely), then db:create, db:migrate, and db:seed')
             .action(async () => {
             EnvInternal_js_1.default.setBoolean('BYPASS_DB_CONNECTIONS_DURING_INIT');
-            await initializeDreamApp({ bypassModelIntegrityCheck: true });
+            await initializeDreamApp({ bypassDreamIntegrityChecks: true });
             await index_js_1.default.dbDrop();
             await index_js_1.default.dbCreate();
             EnvInternal_js_1.default.unsetBoolean('BYPASS_DB_CONNECTIONS_DURING_INIT');
-            await initializeDreamApp({ bypassModelIntegrityCheck: true });
+            await initializeDreamApp({ bypassDreamIntegrityChecks: true });
             await index_js_1.default.dbMigrate();
             await index_js_1.default.sync(onSync);
             await seedDb();

package/dist/cjs/src/db/migration-helpers/DreamMigrationHelpers.js

@@ -2,6 +2,25 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const kysely_1 = require("kysely");
 class DreamMigrationHelpers {
+    /**
+     * Rename a table and its associated primary key sequence.
+     *
+     * This method renames both the table and its primary key sequence to keep them
+     * in sync. When PostgreSQL creates a table with a serial or bigserial primary key,
+     * it automatically creates a sequence named `{tablename}_id_seq`. If you only rename
+     * the table, the sequence keeps the old name, which can cause confusion and issues.
+     *
+     * This method is only suitable for tables that have a serial or bigserial primary
+     * key column named 'id'.
+     *
+     * @param db - The Kysely database object passed into the migration up/down function
+     * @param from - The current name of the table to rename
+     * @param to - The new name for the table
+     */
+    static async renameTable(db, from, to) {
+        await db.schema.alterTable(from).renameTo(to).execute();
+        await (0, kysely_1.sql) `ALTER SEQUENCE ${from}_id_seq RENAME TO ${to}_id_seq`.execute(db);
+    }
     /**
      * Unique indexes cannot be populated by the same value even within a transaction,
      * but deferrable unique constraints can.

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

@@ -23,14 +23,14 @@ const shared_js_1 = require("./shared.js");
  * }
  * ```
  *
- * @param opts.foreignKey - A custom column name to use for the foreign key.
+ * @param opts.on - A custom column name to use for joining associations on.
  * @param opts.optional - Whether or not this association is optional. Defaults to false.
  * @param opts.polymorphic - If true, this association will be treated as a polymorphic association.
  * @param opts.primaryKeyOverride - A custom column name to use for the primary key.
  * @param opts.withoutDefaultScopes - A list of default scopes to bypass when loading this association
  */
 function BelongsTo(globalAssociationNameOrNames, opts = {}) {
-    const { foreignKey, optional = false, polymorphic = false, primaryKeyOverride = null, withoutDefaultScopes, } = opts;
+    const { on: foreignKey, optional = false, polymorphic = false, primaryKeyOverride = null, withoutDefaultScopes, } = opts;
     return function (_, context) {
         const key = context.name;
         context.addInitializer(function () {

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

@@ -23,7 +23,7 @@ const shared_js_1 = require("./shared.js");
  *
  * @param opts.dependent - Can be either "destroy" or undefined. If "destroy", this record will be cascade deleted if the base model is destroyed.
  * @param opts.distinct - Can be a column name, or else a boolean. If a column name, a distinct clause will be applied to the column. If true, a distinct clause will be applied to the primary key.
- * @param opts.foreignKey - A custom column name to use for the foreign key.
+ * @param opts.on - A custom column name to use for joining associations on.
  * @param opts.and - An and-clause to be applied when this association is loaded
  * @param opts.andNot - A not and-clause to be applied when this association is loaded
  * @param opts.andAny - An andAny clause to be applied when this association is loaded
@@ -37,7 +37,7 @@ const shared_js_1 = require("./shared.js");
  * @param opts.withoutDefaultScopes - A list of default scopes to bypass when loading this association
  */
 function HasMany(globalAssociationNameOrNames, opts = {}) {
-    const { dependent, distinct, foreignKey, and, andNot, andAny, order, polymorphic = false, primaryKeyOverride = null, selfAnd, selfAndNot, source, through, withoutDefaultScopes, } = opts;
+    const { dependent, distinct, on: foreignKey, and, andNot, andAny, order, polymorphic = false, primaryKeyOverride = null, selfAnd, selfAndNot, source, through, withoutDefaultScopes, } = opts;
     return function (_, context) {
         const key = context.name;
         context.addInitializer(function () {

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

@@ -22,7 +22,7 @@ const shared_js_1 = require("./shared.js");
  * ```
  *
  * @param opts.dependent - Can be either "destroy" or undefined. If "destroy", this record will be cascade deleted if the base model is destroyed.
- * @param opts.foreignKey - A custom column name to use for the foreign key.
+ * @param opts.on - A custom column name to use for joining associations on.
  * @param opts.and - An and-clause to be applied when this association is loaded
  * @param opts.andNot - A not and-clause to be applied when this association is loaded
  * @param opts.andAny - An andAny clause to be applied when this association is loaded
@@ -35,7 +35,7 @@ const shared_js_1 = require("./shared.js");
  * @param opts.withoutDefaultScopes - A list of default scopes to bypass when loading this association
  */
 function HasOne(globalAssociationNameOrNames, opts = {}) {
-    const { dependent, foreignKey, and, andNot, andAny, polymorphic = false, primaryKeyOverride = null, selfAnd, selfAndNot, source, through, withoutDefaultScopes, } = opts;
+    const { dependent, on: foreignKey, and, andNot, andAny, polymorphic = false, primaryKeyOverride = null, selfAnd, selfAndNot, source, through, withoutDefaultScopes, } = opts;
     return function (_, context) {
         const key = context.name;
         context.addInitializer(function () {

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

@@ -1217,7 +1217,10 @@ class Query {
         const recordCount = await this.count();
         const pageSize = opts.pageSize || index_js_1.default.getOrFail().paginationPageSize;
         const pageCount = Math.ceil(recordCount / pageSize);
-        const results = await this
+        const query = this.orderStatements.length
+            ? this
+            : this.order({ [this.namespacedPrimaryKey]: 'asc' });
+        const results = await query
             .limit(pageSize)
             .offset((page - 1) * pageSize)
             .all();

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

@@ -22,6 +22,12 @@ class QueryDriverBase {
         this.connectionOverride = query['originalOpts'].connection;
         this.innerJoinDreamClasses = Object.freeze(query['originalOpts'].innerJoinDreamClasses || []);
     }
+    // eslint-disable-next-line @typescript-eslint/require-await
+    static async ensureAllMigrationsHaveBeenRun(
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    connectionName) {
+        throw new Error('override ensureAllMigrationsHaveBeenRun in child class');
+    }
     /**
      * migrate the database. Must respond to the NODE_ENV value.
      */

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

@@ -66,6 +66,7 @@ const softDeleteDream_js_1 = require("../internal/softDeleteDream.js");
 const sqlResultToDreamInstance_js_1 = require("../internal/sqlResultToDreamInstance.js");
 const Query_js_1 = require("../Query.js");
 const Base_js_1 = require("./Base.js");
+const checkForNeedToBeRunMigrations_js_1 = require("./helpers/kysely/checkForNeedToBeRunMigrations.js");
 const runMigration_js_1 = require("./helpers/kysely/runMigration.js");
 class KyselyQueryDriver extends Base_js_1.default {
     // ATTENTION FRED
@@ -102,6 +103,14 @@ class KyselyQueryDriver extends Base_js_1.default {
             }),
         });
     }
+    static async ensureAllMigrationsHaveBeenRun(connectionName) {
+        const migrationsNeedToBeRun = await (0, checkForNeedToBeRunMigrations_js_1.default)({
+            connectionName,
+            dialectProvider: this.dialectProvider(connectionName, 'primary'),
+        });
+        if (migrationsNeedToBeRun)
+            throw new Error(`Migrations need to be run on ${connectionName} database`);
+    }
     /**
      * migrate the database. Must respond to the NODE_ENV value.
      */
@@ -696,9 +705,8 @@ class KyselyQueryDriver extends Base_js_1.default {
         return (0, orderByDirection_js_1.default)(direction);
     }
     buildUpdate(attributes) {
-        let kyselyQuery = this.dbFor('update')
-            .updateTable(this.query['tableName'])
-            .set(attributes);
+        let kyselyQuery = this.dbFor('update').updateTable(this.query['tableName']);
+        kyselyQuery = kyselyQuery.set(attributes);
         kyselyQuery = this.conditionallyAttachSimilarityColumnsToUpdate(kyselyQuery);
         const results = this.attachLimitAndOrderStatementsToNonSelectQuery(kyselyQuery);
         return new this.constructor(results.clone).buildCommon(results.kyselyQuery);

package/dist/cjs/src/dream/QueryDriver/helpers/kysely/checkForNeedToBeRunMigrations.js

@@ -0,0 +1,27 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = checkForNeedToBeRunMigrations;
+const kysely_1 = require("kysely");
+const fs = require("node:fs/promises");
+const path = require("node:path");
+const DreamDbConnection_js_1 = require("../../../../db/DreamDbConnection.js");
+const index_js_1 = require("../../../../db/index.js");
+const migrationFolderPath_js_1 = require("./migrationFolderPath.js");
+async function checkForNeedToBeRunMigrations({ connectionName, dialectProvider, }) {
+    const migrationFolder = (0, migrationFolderPath_js_1.default)(connectionName);
+    // Ensure the migration folder exists
+    await fs.mkdir(migrationFolder, { recursive: true });
+    const kyselyDb = (0, index_js_1.default)(connectionName, 'primary', dialectProvider);
+    const migrator = new kysely_1.Migrator({
+        db: kyselyDb,
+        allowUnorderedMigrations: true,
+        provider: new kysely_1.FileMigrationProvider({
+            fs,
+            path,
+            migrationFolder,
+        }),
+    });
+    const result = (await migrator.getMigrations()).some(migrationInfo => !migrationInfo.executedAt);
+    await (0, DreamDbConnection_js_1.closeAllConnectionsForConnectionName)(connectionName);
+    return result;
+}

package/dist/cjs/src/dream/QueryDriver/helpers/kysely/migrationFolderPath.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = migrationFolderPath;
+const path = require("node:path");
+const index_js_1 = require("../../../../dream-app/index.js");
+function migrationFolderPath(connectionName) {
+    const dreamApp = index_js_1.default.getOrFail();
+    return connectionName === 'default'
+        ? path.join(dreamApp.projectRoot, dreamApp.paths.db, 'migrations')
+        : path.join(dreamApp.projectRoot, dreamApp.paths.db, 'migrations', connectionName);
+}

package/dist/cjs/src/dream/QueryDriver/helpers/kysely/runMigration.js

@@ -4,19 +4,17 @@ exports.default = runMigration;
 const kysely_1 = require("kysely");
 const fs = require("node:fs/promises");
 const path = require("node:path");
+const index_js_1 = require("../../../../cli/index.js");
 const colorize_js_1 = require("../../../../cli/logger/loggable/colorize.js");
 const DreamDbConnection_js_1 = require("../../../../db/DreamDbConnection.js");
-const index_js_1 = require("../../../../db/index.js");
-const index_js_2 = require("../../../../dream-app/index.js");
-const index_js_3 = require("../../../../cli/index.js");
+const index_js_2 = require("../../../../db/index.js");
+const index_js_3 = require("../../../../dream-app/index.js");
+const migrationFolderPath_js_1 = require("./migrationFolderPath.js");
 async function runMigration({ connectionName, mode = 'migrate', dialectProvider, }) {
-    const dreamApp = index_js_2.default.getOrFail();
-    const migrationFolder = connectionName === 'default'
-        ? path.join(dreamApp.projectRoot, dreamApp.paths.db, 'migrations')
-        : path.join(dreamApp.projectRoot, dreamApp.paths.db, 'migrations', connectionName);
+    const migrationFolder = (0, migrationFolderPath_js_1.default)(connectionName);
     // Ensure the migration folder exists
     await fs.mkdir(migrationFolder, { recursive: true });
-    const kyselyDb = (0, index_js_1.default)(connectionName, 'primary', dialectProvider);
+    const kyselyDb = (0, index_js_2.default)(connectionName, 'primary', dialectProvider);
     const migrator = new kysely_1.Migrator({
         db: kyselyDb,
         allowUnorderedMigrations: true,
@@ -80,8 +78,8 @@ async function rollback(migrator) {
 }
 async function handleError(error, mode) {
     await (0, DreamDbConnection_js_1.closeAllDbConnections)();
-    index_js_2.default.logWithLevel('error', `failed to ${migratedActionCurrentTense(mode)}`);
-    index_js_2.default.logWithLevel('error', error);
+    index_js_3.default.logWithLevel('error', `failed to ${migratedActionCurrentTense(mode)}`);
+    index_js_3.default.logWithLevel('error', error);
     process.exit(1);
 }
 function migratedActionCurrentTense(mode) {
@@ -93,12 +91,12 @@ function migratedActionPastTense(mode) {
 function logResults(results, mode) {
     results?.forEach(it => {
         if (it.status === 'Success') {
-            index_js_3.default.logger.logContinueProgress((0, colorize_js_1.default)(`[db]`, { color: 'cyan' }) +
+            index_js_1.default.logger.logContinueProgress((0, colorize_js_1.default)(`[db]`, { color: 'cyan' }) +
                 ` migration "${it.migrationName}" was ${migratedActionPastTense(mode)} successfully`, { logPrefixColor: 'cyan' });
         }
         else if (it.status === 'Error') {
-            index_js_3.default.logger.logContinueProgress(JSON.stringify(it, null, 2));
-            index_js_3.default.logger.logContinueProgress((0, colorize_js_1.default)(`failed to ${migratedActionCurrentTense(mode)} migration "${it.migrationName}"`, {
+            index_js_1.default.logger.logContinueProgress(JSON.stringify(it, null, 2));
+            index_js_1.default.logger.logContinueProgress((0, colorize_js_1.default)(`failed to ${migratedActionCurrentTense(mode)} migration "${it.migrationName}"`, {
                 color: 'redBright',
             }));
         }

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

@@ -1,14 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = orderByDirection;
-const kysely_1 = require("kysely");
 function orderByDirection(dir) {
     switch (dir) {
         case 'asc':
         case null:
-            return (0, kysely_1.sql) `asc nulls first`;
+            return (obj) => obj.asc().nullsFirst();
         case 'desc':
-            return (0, kysely_1.sql) `desc nulls last`;
+            return (obj) => obj.desc().nullsLast();
         default: {
             // protection so that if a new OrderDir is ever added, this will throw a type error at build time
             const _never = dir;

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

@@ -52,8 +52,8 @@ async function undestroyDreamWithTransaction(dream, txn, options) {
  * deleting by one of the beforeDestroy model hooks
  */
 async function doUndestroyDream(dream, txn) {
-    let query = txn.kyselyTransaction
-        .updateTable(dream.table)
+    const updateStatement = txn.kyselyTransaction.updateTable(dream.table);
+    let query = updateStatement
         .where(dream['_primaryKey'], '=', dream.primaryKeyValue())
         .set({ [dream['_deletedAtField']]: null });
     const dreamClass = dream.constructor;

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

@@ -4,6 +4,7 @@ exports.GeneratorImportStyles = exports.DreamAppAllowedPackageManagersEnumValues
 const util = require("node:util");
 const validateTable_js_1 = require("../db/validators/validateTable.js");
 const Query_js_1 = require("../dream/Query.js");
+const Postgres_js_1 = require("../dream/QueryDriver/Postgres.js");
 const index_js_1 = require("../encrypt/index.js");
 const DreamAppInitMissingCallToLoadModels_js_1 = require("../errors/dream-app/DreamAppInitMissingCallToLoadModels.js");
 const DreamAppInitMissingMissingProjectRoot_js_1 = require("../errors/dream-app/DreamAppInitMissingMissingProjectRoot.js");
@@ -13,7 +14,6 @@ const EnvInternal_js_1 = require("../helpers/EnvInternal.js");
 const cache_js_1 = require("./cache.js");
 const importModels_js_1 = require("./helpers/importers/importModels.js");
 const importSerializers_js_1 = require("./helpers/importers/importSerializers.js");
-const Postgres_js_1 = require("../dream/QueryDriver/Postgres.js");
 // this needs to be done top-level to ensure proper configuration
 DateTime_js_1.Settings.defaultZone = 'UTC';
 class DreamApp {
@@ -43,7 +43,7 @@ class DreamApp {
             await plugin(dreamApp);
         }
         dreamApp.validateAppBuildIntegrity({
-            bypassModelIntegrityCheck: opts.bypassModelIntegrityCheck || false,
+            bypassDreamIntegrityChecks: opts.bypassDreamIntegrityChecks || false,
         });
         return dreamApp;
     }
@@ -54,14 +54,14 @@ class DreamApp {
      * that would render it in an invalid state
      *
      */
-    validateAppBuildIntegrity({ bypassModelIntegrityCheck }) {
+    validateAppBuildIntegrity({ bypassDreamIntegrityChecks }) {
         if (!this.projectRoot)
             throw new DreamAppInitMissingMissingProjectRoot_js_1.default();
         if (!this.loadedModels)
             throw new DreamAppInitMissingCallToLoadModels_js_1.default();
         if (this.encryption?.columns?.current)
             DreamApp.checkKey('columns', this.encryption.columns.current.key, this.encryption.columns.current.algorithm);
-        if (!bypassModelIntegrityCheck)
+        if (!bypassDreamIntegrityChecks)
             this.validateApplicationModels();
     }
     /**

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

@@ -17,11 +17,10 @@ class InvalidComputedForeignKey extends Error {
     }
     get message() {
         return `
-Add an explicit foreignKey declaration to this association declaration:
+Add an explicit \`on\` declaration to this association definition:
   Dream class: ${this.dreamClass.sanitizedName}
   Association: ${this.partialAssociation.as}
-Dream tried ${this.computedForeignKey} automatically, but it isn't a column in table ${this.table}.
-    `;
+Dream tried ${this.computedForeignKey} automatically, but it isn't a column in table ${this.table}.`;
     }
 }
 exports.InvalidComputedForeignKey = InvalidComputedForeignKey;
@@ -53,7 +52,7 @@ function checkForeignKey(explicitForeignKey, computedForeignKey, dreamClass, par
         table = dreamClass.table;
     else
         table = (0, shared_js_1.modelCBtoSingleDreamClass)(dreamClass, partialAssociation).table;
-    const tableColumns = Object.keys(dreamClass.prototype.schema[table]?.columns);
+    const tableColumns = Object.keys(dreamClass.prototype.schema[table]?.columns ?? {});
     const validForeignKey = tableColumns.includes(computedForeignKey);
     if (validForeignKey)
         return;

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

@@ -7,6 +7,7 @@ const dbTypesFilenameForConnection_js_1 = require("../../db/helpers/dbTypesFilen
 const index_js_1 = require("../../dream-app/index.js");
 const constants_js_1 = require("../../dream/constants.js");
 const Query_js_1 = require("../../dream/Query.js");
+const InvalidComputedForeignKey_js_1 = require("../../errors/associations/InvalidComputedForeignKey.js");
 const FailedToIdentifyAssociation_js_1 = require("../../errors/schema-builder/FailedToIdentifyAssociation.js");
 const camelize_js_1 = require("../camelize.js");
 const compact_js_1 = require("../compact.js");
@@ -265,33 +266,39 @@ may need to update the table getter in the corresponding Dream.
                     this.hasForeignKeyError = true;
                     // console.error(err)
                 }
-                tableAssociationData[associationName] ||= {
-                    tables: [],
-                    type: associationMetaData.type,
-                    polymorphic: associationMetaData.polymorphic,
-                    foreignKey,
-                    foreignKeyTypeColumn: associationMetaData.polymorphic
-                        ? associationMetaData?.foreignKeyTypeField?.() || null
-                        : null,
-                    optional,
-                    where,
-                };
-                if (foreignKey)
-                    tableAssociationData[associationName]['foreignKey'] = foreignKey;
-                if (Array.isArray(dreamClassOrClasses)) {
-                    const tables = dreamClassOrClasses.map(dreamClass => dreamClass.table);
+                try {
+                    tableAssociationData[associationName] ||= {
+                        tables: [],
+                        type: associationMetaData.type,
+                        polymorphic: associationMetaData.polymorphic,
+                        foreignKey,
+                        foreignKeyTypeColumn: associationMetaData.polymorphic
+                            ? associationMetaData?.foreignKeyTypeField?.() || null
+                            : null,
+                        optional,
+                        where,
+                    };
+                    if (foreignKey)
+                        tableAssociationData[associationName]['foreignKey'] = foreignKey;
+                    if (Array.isArray(dreamClassOrClasses)) {
+                        const tables = dreamClassOrClasses.map(dreamClass => dreamClass.table);
+                        tableAssociationData[associationName].tables = [
+                            ...tableAssociationData[associationName].tables,
+                            ...tables,
+                        ];
+                    }
+                    else {
+                        tableAssociationData[associationName].tables.push(dreamClassOrClasses.table);
+                    }
+                    // guarantee unique
                     tableAssociationData[associationName].tables = [
-                        ...tableAssociationData[associationName].tables,
-                        ...tables,
+                        ...new Set(tableAssociationData[associationName].tables),
                     ];
                 }
-                else {
-                    tableAssociationData[associationName].tables.push(dreamClassOrClasses.table);
+                catch (error) {
+                    if (!(error instanceof InvalidComputedForeignKey_js_1.ExplicitForeignKeyRequired || error instanceof InvalidComputedForeignKey_js_1.InvalidComputedForeignKey))
+                        throw error;
                 }
-                // guarantee unique
-                tableAssociationData[associationName].tables = [
-                    ...new Set(tableAssociationData[associationName].tables),
-                ];
             }
         }
         return Object.keys(tableAssociationData)