@rvoh/dream 1.0.4 → 1.1.0

package/dist/cjs/src/Dream.js

@@ -15,10 +15,10 @@ const associationUpdateQuery_js_1 = require("./dream/internal/associations/assoc
 const createAssociation_js_1 = require("./dream/internal/associations/createAssociation.js");
 const destroyAssociation_js_1 = require("./dream/internal/associations/destroyAssociation.js");
 const undestroyAssociation_js_1 = require("./dream/internal/associations/undestroyAssociation.js");
+const associationStringToNameAndAlias_js_1 = require("./dream/internal/associationStringToNameAndAlias.js");
 const destroyDream_js_1 = require("./dream/internal/destroyDream.js");
 const destroyOptions_js_1 = require("./dream/internal/destroyOptions.js");
 const ensureSTITypeFieldIsSet_js_1 = require("./dream/internal/ensureSTITypeFieldIsSet.js");
-const extractAssociationMetadataFromAssociationName_js_1 = require("./dream/internal/extractAssociationMetadataFromAssociationName.js");
 const findOrCreateBy_js_1 = require("./dream/internal/findOrCreateBy.js");
 const reload_js_1 = require("./dream/internal/reload.js");
 const runValidations_js_1 = require("./dream/internal/runValidations.js");
@@ -636,7 +636,7 @@ class Dream {
      * @returns Association metadata for the requested association
      */
     static getAssociationMetadata(associationName) {
-        return this.associationMetadataMap()[(0, extractAssociationMetadataFromAssociationName_js_1.default)(associationName).name];
+        return this.associationMetadataMap()[(0, associationStringToNameAndAlias_js_1.default)(associationName).name];
     }
     /**
      * @internal
@@ -1812,7 +1812,6 @@ class Dream {
      * //       as: 'ratings',
      * //       polymorphic: true,
      * //       source: 'ratings',
-     * //       preloadThroughColumns: undefined,
      * //       where: undefined,
      * //       whereNot: undefined,
      * //       selfWhere: undefined,

package/dist/cjs/src/bin/helpers/sync.js

@@ -12,11 +12,13 @@ const EnvInternal_js_1 = require("../../helpers/EnvInternal.js");
 const dreamPath_js_1 = require("../../helpers/path/dreamPath.js");
 const snakeify_js_1 = require("../../helpers/snakeify.js");
 const sspawn_js_1 = require("../../helpers/sspawn.js");
+const CliFileWriter_js_1 = require("../../cli/CliFileWriter.js");
 async function writeSyncFile() {
     const dreamApp = index_js_2.default.getOrFail();
     const dbConf = dreamApp.dbConnectionConfig('primary');
     const dbSyncFilePath = path.join((0, dreamPath_js_1.default)('types'), 'db.ts');
     const absoluteDbSyncPath = path.join(dreamApp.projectRoot, dbSyncFilePath);
+    await CliFileWriter_js_1.CliFileWriter.cache(absoluteDbSyncPath);
     await (0, sspawn_js_1.default)(`kysely-codegen --dialect=postgres --url=postgres://${dbConf.user}:${dbConf.password}@${dbConf.host}:${dbConf.port}/${dbConf.name} --out-file=${absoluteDbSyncPath}`, {
         onStdout: message => {
             index_js_1.default.logger.logContinueProgress((0, colorize_js_1.default)(`[db]`, { color: 'cyan' }) + ' ' + message, {
@@ -28,7 +30,7 @@ async function writeSyncFile() {
     // from the dist folder, whereas dirname here is pointing to true src folder.
     const file = (await fs.readFile(absoluteDbSyncPath)).toString();
     const enhancedSchema = enhanceSchema(file);
-    await fs.writeFile(absoluteDbSyncPath, enhancedSchema);
+    await CliFileWriter_js_1.CliFileWriter.write(absoluteDbSyncPath, enhancedSchema);
 }
 // begin: schema helpers
 function enhanceSchema(file) {

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

@@ -0,0 +1,39 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CliFileWriter = void 0;
+const fs = require("node:fs/promises");
+const index_js_1 = require("./index.js");
+class CliFileWriter {
+    static async write(filepath, contents) {
+        await cliFileWriter.write(filepath, contents);
+    }
+    static async revert() {
+        await cliFileWriter.revert();
+    }
+    static async cache(filepath) {
+        await cliFileWriter.cache(filepath);
+    }
+    fileCache = {};
+    async write(filepath, contents) {
+        // if we have manually backed up this file, or else this file
+        // has been written to twice in one CLI session, we want
+        // to preserve the original backup, so we do not attempt
+        // to cache a second time
+        if (!this.fileCache[filepath])
+            await this.cache(filepath);
+        await fs.writeFile(filepath, contents);
+    }
+    async revert() {
+        const filepaths = Object.keys(this.fileCache);
+        for (const filepath of filepaths) {
+            index_js_1.default.logger.logContinueProgress(`reverting ${filepath}`);
+            await fs.writeFile(filepath, this.fileCache[filepath]);
+        }
+    }
+    async cache(filepath) {
+        const originalContents = (await fs.readFile(filepath)).toString();
+        this.fileCache[filepath] = originalContents;
+    }
+}
+exports.CliFileWriter = CliFileWriter;
+const cliFileWriter = new CliFileWriter();

package/dist/cjs/src/cli/logger/DreamCliLogger.js

@@ -10,6 +10,11 @@ class DreamCliLogger {
         });
         loggable.render();
     }
+    async logProgress(text, cb, { logPrefix = '✺ ┌', logPrefixColor, logPrefixBgColor } = {}) {
+        this.log(text, { logPrefix, logPrefixColor, logPrefixBgColor });
+        await cb();
+        this.logEndProgress();
+    }
     logStartProgress(text, { logPrefix = '✺ ┌', logPrefixColor, logPrefixBgColor } = {}) {
         this.log(text, { logPrefix, logPrefixColor, logPrefixBgColor });
     }

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

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = BelongsTo;
 const lookupModelByGlobalNameOrNames_js_1 = require("../../../dream-app/helpers/lookupModelByGlobalNameOrNames.js");
+const ArrayTargetOnlyOnPolymorphicBelongsTo_js_1 = require("../../../errors/associations/ArrayTargetOnlyOnPolymorphicBelongsTo.js");
 const Validates_js_1 = require("../validation/Validates.js");
 const shared_js_1 = require("./shared.js");
 /**
@@ -47,6 +48,8 @@ function BelongsTo(globalAssociationNameOrNames, opts = {}) {
                 delete this[key];
                 return;
             }
+            if (Array.isArray(globalAssociationNameOrNames) && !polymorphic)
+                throw new ArrayTargetOnlyOnPolymorphicBelongsTo_js_1.default({ dreamClass, associationName: key });
             const partialAssociation = (0, shared_js_1.associationPrimaryKeyAccessors)({
                 modelCB: () => (0, lookupModelByGlobalNameOrNames_js_1.default)(globalAssociationNameOrNames),
                 globalAssociationNameOrNames,

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

@@ -29,7 +29,6 @@ const shared_js_1 = require("./shared.js");
  * @param opts.andAny - An andAny clause to be applied when this association is loaded
  * @param opts.order - A custom order statement to apply to this association.
  * @param opts.polymorphic - If true, this association will be treated as a polymorphic association.
- * @param opts.preloadThroughColumns - An array of columns to pluck off the through association attached to this association. Can only be set if `through` is also set.
  * @param opts.primaryKeyOverride - A custom column name to use for the primary key.
  * @param opts.selfAnd - Adds an and-clause to an association between a column on the associated model and a column on this model.
  * @param opts.selfAndNot - Adds a not and-clause to an association between a column on the associated model and a column on this model.
@@ -38,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, preloadThroughColumns, primaryKeyOverride = null, selfAnd, selfAndNot, source, through, withoutDefaultScopes, } = opts;
+    const { dependent, distinct, 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 () {
@@ -71,7 +70,6 @@ function HasMany(globalAssociationNameOrNames, opts = {}) {
                 andNot,
                 andAny,
                 polymorphic,
-                preloadThroughColumns,
                 primaryKeyOverride,
                 selfAnd,
                 selfAndNot,

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

@@ -27,7 +27,6 @@ const shared_js_1 = require("./shared.js");
  * @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
  * @param opts.polymorphic - If true, this association will be treated as a polymorphic association.
- * @param opts.preloadThroughColumns - An array of columns to pluck off the through association attached to this association. Can only be set if `through` is also set.
  * @param opts.primaryKeyOverride - A custom column name to use for the primary key.
  * @param opts.selfAnd - Adds an and-clause to an association between a column on the associated model and a column on this model.
  * @param opts.selfAndNot - Adds a not and-clause to an association between a column on the associated model and a column on this model.
@@ -36,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, preloadThroughColumns, primaryKeyOverride = null, selfAnd, selfAndNot, source, through, withoutDefaultScopes, } = opts;
+    const { dependent, foreignKey, and, andNot, andAny, polymorphic = false, primaryKeyOverride = null, selfAnd, selfAndNot, source, through, withoutDefaultScopes, } = opts;
     return function (_, context) {
         const key = context.name;
         context.addInitializer(function () {
@@ -69,7 +68,6 @@ function HasOne(globalAssociationNameOrNames, opts = {}) {
                 andNot,
                 andAny,
                 polymorphic,
-                preloadThroughColumns,
                 primaryKeyOverride,
                 selfAnd,
                 selfAndNot,

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

@@ -98,12 +98,12 @@ function applyGetterAndSetter(target, partialAssociation, { foreignKeyBase, isBe
 function associationPrimaryKeyAccessors(partialAssociation, dreamClass) {
     return {
         ...partialAssociation,
-        primaryKey(associationInstance) {
+        primaryKey(associationInstance, { associatedClassOverride } = {}) {
             if (this.primaryKeyOverride)
                 return this.primaryKeyOverride;
             if (associationInstance)
                 return associationInstance.primaryKey;
-            const associationClass = this.modelCB();
+            const associationClass = associatedClassOverride ?? this.modelCB();
             if (Array.isArray(associationClass)) {
                 throw new Error(`
 Cannot lookup primaryKey on polymorphic association: