@rvoh/dream 1.0.5 → 1.1.1

package/CHANGELOG.md

@@ -1,3 +1,20 @@
+## 1.1.1
+
+- Add fs.writeFile options as third argument to CliFileWriter.write, enabling psychic to provide custom flags when writing openapi.json files.
+
+## 1.1.0
+
+- Remove support for preloadThroughColumns. They were broken, fixing them would be overly complex, and the same effect can be obtained using flatten on a serializer rendersOne
+
+## 1.0.6
+
+- Fix joining after a through a polymorphic BelongsTo
+  association.
+
+- Improve join implementation
+
+- Disable leftJoinPreload preloadThroughColumns since it doesn't actually work on through associations that resolve to a source that doesn't match the association name (and we were unnecessarily including columns in the leftJoinPreload statement even when there was no `preloadThroughColumns`, thereby bloating the queries unnecessarily)
+
 ## 1.0.5
 
 - Support HasOne/Many through polymorphic BelongsTo (trick is that it uses the associated model from the HasOne/Many to limit the BelongsTo to a single associated class / table)

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/cli/CliFileWriter.js

@@ -4,8 +4,8 @@ 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 write(filepath, contents, opts) {
+        await cliFileWriter.write(filepath, contents, opts);
     }
     static async revert() {
         await cliFileWriter.revert();
@@ -14,14 +14,14 @@ class CliFileWriter {
         await cliFileWriter.cache(filepath);
     }
     fileCache = {};
-    async write(filepath, contents) {
+    async write(filepath, contents, opts) {
         // 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);
+        await fs.writeFile(filepath, contents, opts);
     }
     async revert() {
         const filepaths = Object.keys(this.fileCache);

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,