@rvoh/dream 1.0.0 → 1.0.2

package/CHANGELOG.md

@@ -0,0 +1,7 @@
+# 1.0.1
+
+- [bug] fix preloading STI model via polymporhic association (polymorphic type was being altered to the STI child rather than left as the STI base)
+
+## 1.0.2
+
+- stop computing foreign keys in schema builder when building schema for through associations

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

@@ -5,8 +5,8 @@ const Query_js_1 = require("../dream/Query.js");
 const generateDream_js_1 = require("../helpers/cli/generateDream.js");
 const sspawn_js_1 = require("../helpers/sspawn.js");
 class DreamBin {
-    static async sync(onSync) {
-        await Query_js_1.default.dbDriverClass().sync(onSync);
+    static async sync(onSync, options) {
+        await Query_js_1.default.dbDriverClass().sync(onSync, options);
     }
     static async dbCreate() {
         await Query_js_1.default.dbDriverClass().dbCreate();

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

@@ -59,9 +59,10 @@ class DreamCLI {
         program
             .command('sync')
             .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')
-            .action(async () => {
+            .option('--schema-only')
+            .action(async (options = {}) => {
             await initializeDreamApp();
-            await index_js_1.default.sync(() => { });
+            await index_js_1.default.sync(() => { }, options);
             process.exit();
         });
         this.generateDreamCli(program, {

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

@@ -90,7 +90,7 @@ function applyGetterAndSetter(target, partialAssociation, { foreignKeyBase, isBe
                     partialAssociation.primaryKeyValue(associatedModel);
                 if (partialAssociation.polymorphic)
                     this[foreignKeyTypeField(foreignKeyBase, dreamClass, partialAssociation)] =
-                        associatedModel?.['sanitizedConstructorName'];
+                        associatedModel?.['stiBaseClassOrOwnClassName'];
             }
         },
     });

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

@@ -2,9 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const kysely_1 = require("kysely");
 const pluralize_esm_1 = require("pluralize-esm");
+const sync_js_1 = require("../../bin/helpers/sync.js");
 const index_js_1 = require("../../cli/index.js");
 const index_js_2 = require("../../db/index.js");
 const associationToGetterSetterProp_js_1 = require("../../decorators/field/association/associationToGetterSetterProp.js");
+const PackageManager_js_1 = require("../../dream-app/helpers/PackageManager.js");
 const index_js_3 = require("../../dream-app/index.js");
 const CannotAssociateThroughPolymorphic_js_1 = require("../../errors/associations/CannotAssociateThroughPolymorphic.js");
 const CannotJoinPolymorphicBelongsToError_js_1 = require("../../errors/associations/CannotJoinPolymorphicBelongsToError.js");
@@ -19,8 +21,11 @@ const UnexpectedUndefined_js_1 = require("../../errors/UnexpectedUndefined.js");
 const CalendarDate_js_1 = require("../../helpers/CalendarDate.js");
 const camelize_js_1 = require("../../helpers/camelize.js");
 const generateMigration_js_1 = require("../../helpers/cli/generateMigration.js");
+const SchemaBuilder_js_1 = require("../../helpers/cli/SchemaBuilder.js");
 const compact_js_1 = require("../../helpers/compact.js");
 const DateTime_js_1 = require("../../helpers/DateTime.js");
+const createDb_js_1 = require("../../helpers/db/createDb.js");
+const dropDb_js_1 = require("../../helpers/db/dropDb.js");
 const loadPgClient_js_1 = require("../../helpers/db/loadPgClient.js");
 const runMigration_js_1 = require("../../helpers/db/runMigration.js");
 const EnvInternal_js_1 = require("../../helpers/EnvInternal.js");
@@ -45,10 +50,6 @@ const SimilarityBuilder_js_1 = require("../internal/similarity/SimilarityBuilder
 const sqlResultToDreamInstance_js_1 = require("../internal/sqlResultToDreamInstance.js");
 const Query_js_1 = require("../Query.js");
 const Base_js_1 = require("./Base.js");
-const sync_js_1 = require("../../bin/helpers/sync.js");
-const SchemaBuilder_js_1 = require("../../helpers/cli/SchemaBuilder.js");
-const createDb_js_1 = require("../../helpers/db/createDb.js");
-const dropDb_js_1 = require("../../helpers/db/dropDb.js");
 class KyselyQueryDriver extends Base_js_1.default {
     // ATTENTION FRED
     // stop trying to make this async. You never learn...
@@ -92,16 +93,35 @@ class KyselyQueryDriver extends Base_js_1.default {
     static async generateMigration(migrationName, columnsWithTypes) {
         await (0, generateMigration_js_1.default)({ migrationName, columnsWithTypes });
     }
-    static async sync(onSync) {
-        index_js_1.default.logger.logStartProgress('writing db schema...');
-        await (0, sync_js_1.default)();
-        index_js_1.default.logger.logEndProgress();
+    static async sync(onSync, options = {}) {
+        if (!options?.schemaOnly) {
+            index_js_1.default.logger.logStartProgress('writing db schema...');
+            await (0, sync_js_1.default)();
+            index_js_1.default.logger.logEndProgress();
+        }
         index_js_1.default.logger.logStartProgress('building dream schema...');
-        await new SchemaBuilder_js_1.default().build();
+        const schemaBuilder = new SchemaBuilder_js_1.default();
+        await schemaBuilder.build();
         index_js_1.default.logger.logEndProgress();
-        // intentionally leaving logs off here, since it allows other
-        // onSync handlers to determine their own independent logging approach
-        await onSync();
+        if (schemaBuilder.hasForeignKeyError && !options?.schemaOnly) {
+            index_js_1.default.logger.logStartProgress('triggering resync to correct for foreign key errors...');
+            // TODO: make this customizable to enable dream apps to separate
+            const cliCmd = EnvInternal_js_1.default.boolean('DREAM_CORE_DEVELOPMENT') ? 'dream' : 'psy';
+            await index_js_1.default.spawn(PackageManager_js_1.default.runCmd(`${cliCmd} sync --schema-only`), {
+                onStdout: str => {
+                    index_js_1.default.logger.logContinueProgress(`${str}`, {
+                        logPrefix: '  ├ [resync]',
+                        logPrefixColor: 'blue',
+                    });
+                },
+            });
+            index_js_1.default.logger.logEndProgress();
+        }
+        if (!options?.schemaOnly) {
+            // intentionally leaving logs off here, since it allows other
+            // onSync handlers to determine their own independent logging approach
+            await onSync();
+        }
     }
     /**
      * create the database. Must respond to the NODE_ENV value.
@@ -1613,13 +1633,13 @@ class KyselyQueryDriver extends Base_js_1.default {
             throw new Error(`Association ${association.as} points to an array of models but is not designated polymorphic`);
         if (association.type !== 'BelongsTo')
             throw new Error(`Polymorphic association ${association.as} points to an array of models but is ${association.type}. Only BelongsTo associations may point to an array of models.`);
-        const associatedDreams = [];
+        const nestedDreamsForNextRoundOfPreloading = [];
         for (const associatedModel of association.modelCB()) {
-            await this.preloadPolymorphicAssociationModel(dreams, association, associatedModel, associatedDreams);
+            await this.preloadPolymorphicAssociationModel(dreams, association, associatedModel, nestedDreamsForNextRoundOfPreloading);
         }
-        return associatedDreams;
+        return nestedDreamsForNextRoundOfPreloading;
     }
-    async preloadPolymorphicAssociationModel(dreams, association, associatedDreamClass, associatedDreams) {
+    async preloadPolymorphicAssociationModel(dreams, association, associatedDreamClass, nestedDreamsForNextRoundOfPreloading) {
         const relevantAssociatedModels = dreams.filter((dream) => {
             const field = association.foreignKeyTypeField();
             return dream[field] === associatedDreamClass['stiBaseClassOrOwnClassName'] || dream[field] === null;
@@ -1638,16 +1658,14 @@ class KyselyQueryDriver extends Base_js_1.default {
                 [associatedDreamClass.primaryKey]: relevantAssociatedModels.map((dream) => dream[association.foreignKey()]),
             })
                 .all();
-            loadedAssociations.forEach((loadedAssociation) => associatedDreams.push(loadedAssociation));
+            loadedAssociations.forEach((loadedAssociation) => nestedDreamsForNextRoundOfPreloading.push(loadedAssociation));
             //////////////////////////////////////////////////////////////////////////////////////////////
             // Associate each loaded association with each dream based on primary key and foreign key type
             //////////////////////////////////////////////////////////////////////////////////////////////
             for (const loadedAssociation of loadedAssociations) {
                 dreams
-                    .filter((dream) => {
-                    return (dream[association.foreignKeyTypeField()] === loadedAssociation['stiBaseClassOrOwnClassName'] &&
-                        dream[association.foreignKey()] === association.primaryKeyValue(loadedAssociation));
-                })
+                    .filter((dream) => dream[association.foreignKeyTypeField()] === loadedAssociation['stiBaseClassOrOwnClassName'] &&
+                    dream[association.foreignKey()] === association.primaryKeyValue(loadedAssociation))
                     .forEach((dream) => {
                     dream[association.as] = loadedAssociation;
                 });

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

@@ -0,0 +1,38 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const index_js_1 = require("../../dream-app/index.js");
+class PackageManager {
+    static get packageManager() {
+        return index_js_1.default.getOrFail().packageManager;
+    }
+    static add(dependencyOrDependencies, { dev } = {}) {
+        const dependency = Array.isArray(dependencyOrDependencies)
+            ? dependencyOrDependencies.join(' ')
+            : dependencyOrDependencies;
+        if (dev) {
+            switch (this.packageManager) {
+                case 'npm':
+                    return `${this.packageManager} install --save-dev ${dependency}`;
+                default:
+                    return `${this.packageManager} add -D ${dependency}`;
+            }
+        }
+        else {
+            switch (this.packageManager) {
+                case 'npm':
+                    return `${this.packageManager} install ${dependency}`;
+                default:
+                    return `${this.packageManager} add ${dependency}`;
+            }
+        }
+    }
+    static runCmd(cmd) {
+        switch (this.packageManager) {
+            case 'npm':
+                return `npm run ${cmd}`;
+            default:
+                return `${this.packageManager} ${cmd}`;
+        }
+    }
+}
+exports.default = PackageManager;

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

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.DreamAppAllowedPackageManagersEnumValues = void 0;
 // after building for esm, importing pg using the following:
 //
 //  import * as pg from 'pg'
@@ -211,6 +212,10 @@ Try setting it to something valid, like:
     get plugins() {
         return this._plugins;
     }
+    _packageManager;
+    get packageManager() {
+        return this._packageManager;
+    }
     loadedModels = false;
     constructor(opts) {
         if (opts?.db)
@@ -314,6 +319,9 @@ Try setting it to something valid, like:
             case 'unicodeNormalization':
                 this._unicodeNormalization = options;
                 break;
+            case 'packageManager':
+                this._packageManager = options;
+                break;
             case 'paginationPageSize':
                 this._paginationPageSize = options;
                 break;
@@ -347,3 +355,4 @@ function argToString(arg) {
         return arg.toISO();
     return util.inspect(arg, { depth: 3 });
 }
+exports.DreamAppAllowedPackageManagersEnumValues = ['yarn', 'npm', 'pnpm'];

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

@@ -17,6 +17,7 @@ const sortBy_js_1 = require("../sortBy.js");
 const uniq_js_1 = require("../uniq.js");
 const autoGeneratedFileDisclaimer_js_1 = require("./autoGeneratedFileDisclaimer.js");
 class SchemaBuilder {
+    hasForeignKeyError = false;
     async build() {
         const { schemaConstContent, passthroughColumns, allDefaultScopeNames } = await this.buildSchemaContent();
         const imports = await this.getSchemaImports(schemaConstContent);
@@ -272,11 +273,15 @@ may need to update the table getter in the corresponding Dream.
                 // split off into a separate file from the types we diliver in types/dream.ts
                 let foreignKey = null;
                 try {
-                    const _foreignKey = associationMetaData.foreignKey();
-                    foreignKey = _foreignKey;
+                    const isThroughAssociation = associationMetaData.through;
+                    if (!isThroughAssociation) {
+                        const _foreignKey = associationMetaData.foreignKey();
+                        foreignKey = _foreignKey;
+                    }
                 }
-                catch {
-                    // noop
+                catch (err) {
+                    this.hasForeignKeyError = true;
+                    // console.error(err)
                 }
                 tableAssociationData[associationName] ||= {
                     tables: [],

package/dist/cjs/src/index.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Range = exports.sharedPathPrefix = exports.relativeDreamPath = exports.dreamPath = exports.pascalize = exports.normalizeUnicode = exports.loadRepl = exports.isEmpty = exports.intersection = exports.hyphenize = exports.groupBy = exports.globalClassNameFromFullyQualifiedModelName = exports.Env = exports.DreamLogos = exports.DateTime = exports.compact = exports.cloneDeepSafe = 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.DreamApp = 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.ObjectSerializerBuilder = exports.DreamSerializerBuilder = exports.ObjectSerializer = exports.DreamSerializer = exports.serializerNameFromFullyQualifiedModelName = exports.isDreamSerializer = exports.inferSerializersFromDreamClassOrViewModelClass = exports.inferSerializerFromDreamOrViewModel = exports.ops = exports.uniq = exports.uncapitalize = exports.expandStiClasses = exports.standardizeFullyQualifiedModelName = exports.sortObjectByValue = exports.sortObjectByKey = exports.sortBy = exports.sort = exports.snakeify = exports.round = exports.range = void 0;
+exports.sharedPathPrefix = exports.relativeDreamPath = exports.dreamPath = exports.pascalize = exports.normalizeUnicode = exports.loadRepl = exports.isEmpty = exports.intersection = exports.hyphenize = exports.groupBy = exports.globalClassNameFromFullyQualifiedModelName = exports.Env = exports.DreamLogos = exports.DateTime = exports.compact = exports.cloneDeepSafe = 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.DreamAppAllowedPackageManagersEnumValues = exports.DreamApp = 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.ObjectSerializerBuilder = exports.DreamSerializerBuilder = exports.ObjectSerializer = exports.DreamSerializer = exports.serializerNameFromFullyQualifiedModelName = exports.isDreamSerializer = exports.inferSerializersFromDreamClassOrViewModelClass = exports.inferSerializerFromDreamOrViewModel = exports.ops = exports.uniq = exports.uncapitalize = exports.expandStiClasses = exports.standardizeFullyQualifiedModelName = exports.sortObjectByValue = exports.sortObjectByKey = exports.sortBy = exports.sort = exports.snakeify = exports.round = exports.range = exports.Range = void 0;
 var index_js_1 = require("./bin/index.js");
 Object.defineProperty(exports, "DreamBin", { enumerable: true, get: function () { return index_js_1.default; } });
 var index_js_2 = require("./cli/index.js");
@@ -33,6 +33,7 @@ var lookupClassByGlobalName_js_1 = require("./dream-app/helpers/lookupClassByGlo
 Object.defineProperty(exports, "lookupClassByGlobalName", { enumerable: true, get: function () { return lookupClassByGlobalName_js_1.default; } });
 var index_js_4 = require("./dream-app/index.js");
 Object.defineProperty(exports, "DreamApp", { enumerable: true, get: function () { return index_js_4.default; } });
+Object.defineProperty(exports, "DreamAppAllowedPackageManagersEnumValues", { enumerable: true, get: function () { return index_js_4.DreamAppAllowedPackageManagersEnumValues; } });
 var Dream_js_1 = require("./Dream.js");
 Object.defineProperty(exports, "Dream", { enumerable: true, get: function () { return Dream_js_1.default; } });
 var constants_js_1 = require("./dream/constants.js");

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

@@ -3,8 +3,8 @@ import Query from '../dream/Query.js';
 import generateDream from '../helpers/cli/generateDream.js';
 import sspawn from '../helpers/sspawn.js';
 export default class DreamBin {
-    static async sync(onSync) {
-        await Query.dbDriverClass().sync(onSync);
+    static async sync(onSync, options) {
+        await Query.dbDriverClass().sync(onSync, options);
     }
     static async dbCreate() {
         await Query.dbDriverClass().dbCreate();

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

@@ -57,9 +57,10 @@ export default class DreamCLI {
         program
             .command('sync')
             .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')
-            .action(async () => {
+            .option('--schema-only')
+            .action(async (options = {}) => {
             await initializeDreamApp();
-            await DreamBin.sync(() => { });
+            await DreamBin.sync(() => { }, options);
             process.exit();
         });
         this.generateDreamCli(program, {

package/dist/esm/src/decorators/field/association/shared.js

@@ -81,7 +81,7 @@ export function applyGetterAndSetter(target, partialAssociation, { foreignKeyBas
                     partialAssociation.primaryKeyValue(associatedModel);
                 if (partialAssociation.polymorphic)
                     this[foreignKeyTypeField(foreignKeyBase, dreamClass, partialAssociation)] =
-                        associatedModel?.['sanitizedConstructorName'];
+                        associatedModel?.['stiBaseClassOrOwnClassName'];
             }
         },
     });

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

@@ -1,8 +1,10 @@
 import { sql, } from 'kysely';
 import pluralize from 'pluralize-esm';
+import writeSyncFile from '../../bin/helpers/sync.js';
 import DreamCLI from '../../cli/index.js';
 import _db from '../../db/index.js';
 import associationToGetterSetterProp from '../../decorators/field/association/associationToGetterSetterProp.js';
+import PackageManager from '../../dream-app/helpers/PackageManager.js';
 import DreamApp from '../../dream-app/index.js';
 import CannotAssociateThroughPolymorphic from '../../errors/associations/CannotAssociateThroughPolymorphic.js';
 import CannotJoinPolymorphicBelongsToError from '../../errors/associations/CannotJoinPolymorphicBelongsToError.js';
@@ -17,8 +19,11 @@ import UnexpectedUndefined from '../../errors/UnexpectedUndefined.js';
 import CalendarDate from '../../helpers/CalendarDate.js';
 import camelize from '../../helpers/camelize.js';
 import generateMigration from '../../helpers/cli/generateMigration.js';
+import SchemaBuilder from '../../helpers/cli/SchemaBuilder.js';
 import compact from '../../helpers/compact.js';
 import { DateTime } from '../../helpers/DateTime.js';
+import createDb from '../../helpers/db/createDb.js';
+import _dropDb from '../../helpers/db/dropDb.js';
 import loadPgClient from '../../helpers/db/loadPgClient.js';
 import runMigration from '../../helpers/db/runMigration.js';
 import EnvInternal from '../../helpers/EnvInternal.js';
@@ -43,10 +48,6 @@ import SimilarityBuilder from '../internal/similarity/SimilarityBuilder.js';
 import sqlResultToDreamInstance from '../internal/sqlResultToDreamInstance.js';
 import Query from '../Query.js';
 import QueryDriverBase from './Base.js';
-import writeSyncFile from '../../bin/helpers/sync.js';
-import SchemaBuilder from '../../helpers/cli/SchemaBuilder.js';
-import createDb from '../../helpers/db/createDb.js';
-import _dropDb from '../../helpers/db/dropDb.js';
 export default class KyselyQueryDriver extends QueryDriverBase {
     // ATTENTION FRED
     // stop trying to make this async. You never learn...
@@ -90,16 +91,35 @@ export default class KyselyQueryDriver extends QueryDriverBase {
     static async generateMigration(migrationName, columnsWithTypes) {
         await generateMigration({ migrationName, columnsWithTypes });
     }
-    static async sync(onSync) {
-        DreamCLI.logger.logStartProgress('writing db schema...');
-        await writeSyncFile();
-        DreamCLI.logger.logEndProgress();
+    static async sync(onSync, options = {}) {
+        if (!options?.schemaOnly) {
+            DreamCLI.logger.logStartProgress('writing db schema...');
+            await writeSyncFile();
+            DreamCLI.logger.logEndProgress();
+        }
         DreamCLI.logger.logStartProgress('building dream schema...');
-        await new SchemaBuilder().build();
+        const schemaBuilder = new SchemaBuilder();
+        await schemaBuilder.build();
         DreamCLI.logger.logEndProgress();
-        // intentionally leaving logs off here, since it allows other
-        // onSync handlers to determine their own independent logging approach
-        await onSync();
+        if (schemaBuilder.hasForeignKeyError && !options?.schemaOnly) {
+            DreamCLI.logger.logStartProgress('triggering resync to correct for foreign key errors...');
+            // TODO: make this customizable to enable dream apps to separate
+            const cliCmd = EnvInternal.boolean('DREAM_CORE_DEVELOPMENT') ? 'dream' : 'psy';
+            await DreamCLI.spawn(PackageManager.runCmd(`${cliCmd} sync --schema-only`), {
+                onStdout: str => {
+                    DreamCLI.logger.logContinueProgress(`${str}`, {
+                        logPrefix: '  ├ [resync]',
+                        logPrefixColor: 'blue',
+                    });
+                },
+            });
+            DreamCLI.logger.logEndProgress();
+        }
+        if (!options?.schemaOnly) {
+            // intentionally leaving logs off here, since it allows other
+            // onSync handlers to determine their own independent logging approach
+            await onSync();
+        }
     }
     /**
      * create the database. Must respond to the NODE_ENV value.
@@ -1611,13 +1631,13 @@ export default class KyselyQueryDriver extends QueryDriverBase {
             throw new Error(`Association ${association.as} points to an array of models but is not designated polymorphic`);
         if (association.type !== 'BelongsTo')
             throw new Error(`Polymorphic association ${association.as} points to an array of models but is ${association.type}. Only BelongsTo associations may point to an array of models.`);
-        const associatedDreams = [];
+        const nestedDreamsForNextRoundOfPreloading = [];
         for (const associatedModel of association.modelCB()) {
-            await this.preloadPolymorphicAssociationModel(dreams, association, associatedModel, associatedDreams);
+            await this.preloadPolymorphicAssociationModel(dreams, association, associatedModel, nestedDreamsForNextRoundOfPreloading);
         }
-        return associatedDreams;
+        return nestedDreamsForNextRoundOfPreloading;
     }
-    async preloadPolymorphicAssociationModel(dreams, association, associatedDreamClass, associatedDreams) {
+    async preloadPolymorphicAssociationModel(dreams, association, associatedDreamClass, nestedDreamsForNextRoundOfPreloading) {
         const relevantAssociatedModels = dreams.filter((dream) => {
             const field = association.foreignKeyTypeField();
             return dream[field] === associatedDreamClass['stiBaseClassOrOwnClassName'] || dream[field] === null;
@@ -1636,16 +1656,14 @@ export default class KyselyQueryDriver extends QueryDriverBase {
                 [associatedDreamClass.primaryKey]: relevantAssociatedModels.map((dream) => dream[association.foreignKey()]),
             })
                 .all();
-            loadedAssociations.forEach((loadedAssociation) => associatedDreams.push(loadedAssociation));
+            loadedAssociations.forEach((loadedAssociation) => nestedDreamsForNextRoundOfPreloading.push(loadedAssociation));
             //////////////////////////////////////////////////////////////////////////////////////////////
             // Associate each loaded association with each dream based on primary key and foreign key type
             //////////////////////////////////////////////////////////////////////////////////////////////
             for (const loadedAssociation of loadedAssociations) {
                 dreams
-                    .filter((dream) => {
-                    return (dream[association.foreignKeyTypeField()] === loadedAssociation['stiBaseClassOrOwnClassName'] &&
-                        dream[association.foreignKey()] === association.primaryKeyValue(loadedAssociation));
-                })
+                    .filter((dream) => dream[association.foreignKeyTypeField()] === loadedAssociation['stiBaseClassOrOwnClassName'] &&
+                    dream[association.foreignKey()] === association.primaryKeyValue(loadedAssociation))
                     .forEach((dream) => {
                     dream[association.as] = loadedAssociation;
                 });

package/dist/esm/src/dream-app/helpers/PackageManager.js

@@ -0,0 +1,35 @@
+import DreamApp from '../../dream-app/index.js';
+export default class PackageManager {
+    static get packageManager() {
+        return DreamApp.getOrFail().packageManager;
+    }
+    static add(dependencyOrDependencies, { dev } = {}) {
+        const dependency = Array.isArray(dependencyOrDependencies)
+            ? dependencyOrDependencies.join(' ')
+            : dependencyOrDependencies;
+        if (dev) {
+            switch (this.packageManager) {
+                case 'npm':
+                    return `${this.packageManager} install --save-dev ${dependency}`;
+                default:
+                    return `${this.packageManager} add -D ${dependency}`;
+            }
+        }
+        else {
+            switch (this.packageManager) {
+                case 'npm':
+                    return `${this.packageManager} install ${dependency}`;
+                default:
+                    return `${this.packageManager} add ${dependency}`;
+            }
+        }
+    }
+    static runCmd(cmd) {
+        switch (this.packageManager) {
+            case 'npm':
+                return `npm run ${cmd}`;
+            default:
+                return `${this.packageManager} ${cmd}`;
+        }
+    }
+}

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

@@ -209,6 +209,10 @@ Try setting it to something valid, like:
     get plugins() {
         return this._plugins;
     }
+    _packageManager;
+    get packageManager() {
+        return this._packageManager;
+    }
     loadedModels = false;
     constructor(opts) {
         if (opts?.db)
@@ -312,6 +316,9 @@ Try setting it to something valid, like:
             case 'unicodeNormalization':
                 this._unicodeNormalization = options;
                 break;
+            case 'packageManager':
+                this._packageManager = options;
+                break;
             case 'paginationPageSize':
                 this._paginationPageSize = options;
                 break;
@@ -344,3 +351,4 @@ function argToString(arg) {
         return arg.toISO();
     return util.inspect(arg, { depth: 3 });
 }
+export const DreamAppAllowedPackageManagersEnumValues = ['yarn', 'npm', 'pnpm'];

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

@@ -15,6 +15,7 @@ import sortBy from '../sortBy.js';
 import uniq from '../uniq.js';
 import autogeneratedFileDisclaimer from './autoGeneratedFileDisclaimer.js';
 export default class SchemaBuilder {
+    hasForeignKeyError = false;
     async build() {
         const { schemaConstContent, passthroughColumns, allDefaultScopeNames } = await this.buildSchemaContent();
         const imports = await this.getSchemaImports(schemaConstContent);
@@ -270,11 +271,15 @@ may need to update the table getter in the corresponding Dream.
                 // split off into a separate file from the types we diliver in types/dream.ts
                 let foreignKey = null;
                 try {
-                    const _foreignKey = associationMetaData.foreignKey();
-                    foreignKey = _foreignKey;
+                    const isThroughAssociation = associationMetaData.through;
+                    if (!isThroughAssociation) {
+                        const _foreignKey = associationMetaData.foreignKey();
+                        foreignKey = _foreignKey;
+                    }
                 }
-                catch {
-                    // noop
+                catch (err) {
+                    this.hasForeignKeyError = true;
+                    // console.error(err)
                 }
                 tableAssociationData[associationName] ||= {
                     tables: [],

package/dist/esm/src/index.js

@@ -12,7 +12,7 @@ export { default as STI } from './decorators/class/STI.js';
 export { default as Decorators } from './decorators/Decorators.js';
 export { default as DreamImporter } from './dream-app/helpers/DreamImporter.js';
 export { default as lookupClassByGlobalName } from './dream-app/helpers/lookupClassByGlobalName.js';
-export { default as DreamApp, } from './dream-app/index.js';
+export { default as DreamApp, DreamAppAllowedPackageManagersEnumValues, } from './dream-app/index.js';
 export { default as Dream } from './Dream.js';
 export { DreamConst, openapiPrimitiveTypes, openapiShorthandPrimitiveTypes, } from './dream/constants.js';
 export { default as DreamTransaction } from './dream/DreamTransaction.js';

package/dist/types/src/bin/index.d.ts

@@ -1,5 +1,7 @@
 export default class DreamBin {
-    static sync(onSync: () => Promise<void> | void): Promise<void>;
+    static sync(onSync: () => Promise<void> | void, options?: {
+        schemaOnly?: boolean;
+    }): Promise<void>;
     static dbCreate(): Promise<void>;
     static dbDrop(): Promise<void>;
     static dbMigrate(): Promise<void>;

package/dist/types/src/dream/Query.d.ts

@@ -850,7 +850,9 @@ export default class Query<DreamInstance extends Dream, QueryTypeOpts extends Re
             steps: number;
         }): Promise<void>;
         generateMigration(migrationName: string, columnsWithTypes: string[]): Promise<void>;
-        sync(onSync: () => Promise<void> | void): Promise<void>;
+        sync(onSync: () => Promise<void> | void, options?: {
+            schemaOnly?: boolean;
+        }): Promise<void>;
         dbCreate(): Promise<void>;
         dbDrop(): Promise<void>;
         saveDream(dream: Dream, txn?: DreamTransaction<Dream> | null): Promise<any>;

package/dist/types/src/dream/QueryDriver/Kysely.d.ts

@@ -1,12 +1,12 @@
 import { DeleteQueryBuilder, Kysely, Transaction as KyselyTransaction, SelectQueryBuilder, UpdateQueryBuilder } from 'kysely';
 import Dream from '../../Dream.js';
 import { AssociationStatement } from '../../types/associations/shared.js';
+import { DbConnectionType } from '../../types/db.js';
 import { DreamColumnNames, DreamTableSchema, SqlCommandType } from '../../types/dream.js';
 import { PreloadedDreamsAndWhatTheyPointTo, QueryToKyselyDBType, QueryToKyselyTableNamesType } from '../../types/query.js';
 import DreamTransaction from '../DreamTransaction.js';
 import Query from '../Query.js';
 import QueryDriverBase from './Base.js';
-import { DbConnectionType } from '../../types/db.js';
 export default class KyselyQueryDriver<DreamInstance extends Dream> extends QueryDriverBase<DreamInstance> {
     dbFor(sqlCommandType: SqlCommandType): Kysely<DreamInstance['DB']> | KyselyTransaction<DreamInstance['DB']>;
     /**
@@ -20,7 +20,9 @@ export default class KyselyQueryDriver<DreamInstance extends Dream> extends Quer
         steps: number;
     }): Promise<void>;
     static generateMigration(migrationName: string, columnsWithTypes: string[]): Promise<void>;
-    static sync(onSync: () => Promise<void> | void): Promise<void>;
+    static sync(onSync: () => Promise<void> | void, options?: {
+        schemaOnly?: boolean;
+    }): Promise<void>;
     /**
      * create the database. Must respond to the NODE_ENV value.
      */

package/dist/types/src/dream-app/helpers/PackageManager.d.ts

@@ -0,0 +1,7 @@
+export default class PackageManager {
+    static get packageManager(): "yarn" | "npm" | "pnpm";
+    static add(dependencyOrDependencies: string | string[], { dev }?: {
+        dev?: boolean;
+    }): string;
+    static runCmd(cmd: string): string;
+}