@rvoh/dream 1.0.5 → 1.1.0

package/dist/cjs/src/dream/internal/{extractAssociationMetadataFromAssociationName.js → associationStringToNameAndAlias.js}

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = extractAssociationMetadataFromAssociationName;
-function extractAssociationMetadataFromAssociationName(associationName) {
+exports.default = associationStringToNameAndAlias;
+function associationStringToNameAndAlias(associationName) {
     if (/ as /.test(associationName)) {
         const [name, alias] = associationName.split(/ as /);
         return { name: name ?? associationName, alias: alias ?? associationName };
     }
     else {
-        return { name: associationName, alias: associationName };
+        return { name: associationName, alias: undefined };
     }
 }

package/dist/cjs/src/dream/internal/associations/throughAssociationHasOptionsBesidesThroughAndSource.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = throughAssociationHasOptionsBesidesThroughAndSource;
+function throughAssociationHasOptionsBesidesThroughAndSource(throughAssociation) {
+    const throughAssocForTesting = throughAssociation;
+    return (throughAssocForTesting &&
+        (throughAssocForTesting.and ||
+            throughAssocForTesting.andAny ||
+            throughAssocForTesting.andNot ||
+            throughAssocForTesting.distinct ||
+            throughAssocForTesting.order ||
+            throughAssocForTesting.selfAnd ||
+            throughAssocForTesting.selfAndNot));
+}

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

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = unaliasTableName;
-const extractAssociationMetadataFromAssociationName_js_1 = require("./extractAssociationMetadataFromAssociationName.js");
+const associationStringToNameAndAlias_js_1 = require("./associationStringToNameAndAlias.js");
 function unaliasTableName(tableName) {
-    return (0, extractAssociationMetadataFromAssociationName_js_1.default)(tableName).name;
+    return (0, associationStringToNameAndAlias_js_1.default)(tableName).name;
 }

package/dist/cjs/src/errors/UnexpectedUndefined.js

@@ -6,9 +6,7 @@ class UnexpectedUndefined extends Error {
     }
     get message() {
         return `Undefined detected where it should never happen since we are iterating 
-over keys of an internal object that should not have undefined values.
-
-This was added as part of activating noUncheckedIndexedAccess in tsconfig.`;
+over keys of an internal object that should not have undefined values.`;
     }
 }
 exports.default = UnexpectedUndefined;

package/dist/cjs/src/errors/associations/{ArrayTargetsIncompatibleWithThroughAssociation.js → ArrayTargetIncompatibleWithThroughAssociation.js}

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-class ArrayTargetsIncompatibleWithThroughAssociation extends Error {
+class ArrayTargetIncompatibleWithThroughAssociation extends Error {
     dreamClass;
     association;
     constructor({ dreamClass, association, }) {
@@ -16,4 +16,4 @@ Association: ${this.association.as}
 `;
     }
 }
-exports.default = ArrayTargetsIncompatibleWithThroughAssociation;
+exports.default = ArrayTargetIncompatibleWithThroughAssociation;

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

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+class ArrayTargetOnlyOnPolymorphicBelongsTo extends Error {
+    dreamClass;
+    associationName;
+    constructor({ dreamClass, associationName }) {
+        super();
+        this.dreamClass = dreamClass;
+        this.associationName = associationName;
+    }
+    get message() {
+        return `
+An array of targets may only be defined on polymorphic BelongsTo associations:
+Dream class: ${this.dreamClass.sanitizedName}
+Association: ${this.associationName}
+`;
+    }
+}
+exports.default = ArrayTargetOnlyOnPolymorphicBelongsTo;

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

@@ -10,7 +10,7 @@ class JoinAttemptedOnMissingAssociation extends Error {
     }
     get message() {
         return `
-A joins call has been attempted on \`${this.dreamClass.sanitizedName}\` association \`${this.associationName}\`,
+A join call has been attempted on \`${this.dreamClass.sanitizedName}\` association \`${this.associationName}\`,
 but \`${this.dreamClass.sanitizedName}\` does not define association \`${this.associationName}\`.
 
 

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

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+class ThroughAssociationConditionsIncompatibleWithThroughAssociationSource extends Error {
+    dreamClass;
+    association;
+    constructor({ dreamClass, association, }) {
+        super();
+        this.dreamClass = dreamClass;
+        this.association = association;
+    }
+    get message() {
+        return `
+Through association options besides \`through\` and \`source\` are incompatible
+with \`source\` associations that are themselves \`through\` associations.
+Dream class: ${this.dreamClass.sanitizedName}
+Association: ${this.association.as}
+`;
+    }
+}
+exports.default = ThroughAssociationConditionsIncompatibleWithThroughAssociationSource;

package/dist/esm/src/Dream.js

@@ -13,10 +13,10 @@ import associationUpdateQuery from './dream/internal/associations/associationUpd
 import createAssociation from './dream/internal/associations/createAssociation.js';
 import destroyAssociation from './dream/internal/associations/destroyAssociation.js';
 import undestroyAssociation from './dream/internal/associations/undestroyAssociation.js';
+import associationStringToNameAndAlias from './dream/internal/associationStringToNameAndAlias.js';
 import destroyDream from './dream/internal/destroyDream.js';
 import { destroyOptions, reallyDestroyOptions, undestroyOptions, } from './dream/internal/destroyOptions.js';
 import ensureSTITypeFieldIsSet from './dream/internal/ensureSTITypeFieldIsSet.js';
-import extractAssociationMetadataFromAssociationName from './dream/internal/extractAssociationMetadataFromAssociationName.js';
 import findOrCreateBy from './dream/internal/findOrCreateBy.js';
 import reload from './dream/internal/reload.js';
 import runValidations from './dream/internal/runValidations.js';
@@ -634,7 +634,7 @@ export default class Dream {
      * @returns Association metadata for the requested association
      */
     static getAssociationMetadata(associationName) {
-        return this.associationMetadataMap()[extractAssociationMetadataFromAssociationName(associationName).name];
+        return this.associationMetadataMap()[associationStringToNameAndAlias(associationName).name];
     }
     /**
      * @internal
@@ -1810,7 +1810,6 @@ export default class Dream {
      * //       as: 'ratings',
      * //       polymorphic: true,
      * //       source: 'ratings',
-     * //       preloadThroughColumns: undefined,
      * //       where: undefined,
      * //       whereNot: undefined,
      * //       selfWhere: undefined,

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

@@ -1,4 +1,5 @@
 import lookupModelByGlobalNameOrNames from '../../../dream-app/helpers/lookupModelByGlobalNameOrNames.js';
+import ArrayTargetOnlyOnPolymorphicBelongsTo from '../../../errors/associations/ArrayTargetOnlyOnPolymorphicBelongsTo.js';
 import { validatesImplementation } from '../validation/Validates.js';
 import { applyGetterAndSetter, associationPrimaryKeyAccessors, blankAssociationsFactory, finalForeignKey, foreignKeyTypeField, } from './shared.js';
 /**
@@ -44,6 +45,8 @@ export default function BelongsTo(globalAssociationNameOrNames, opts = {}) {
                 delete this[key];
                 return;
             }
+            if (Array.isArray(globalAssociationNameOrNames) && !polymorphic)
+                throw new ArrayTargetOnlyOnPolymorphicBelongsTo({ dreamClass, associationName: key });
             const partialAssociation = associationPrimaryKeyAccessors({
                 modelCB: () => lookupModelByGlobalNameOrNames(globalAssociationNameOrNames),
                 globalAssociationNameOrNames,

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

@@ -26,7 +26,6 @@ import { applyGetterAndSetter, associationPrimaryKeyAccessors, blankAssociations
  * @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.
@@ -35,7 +34,7 @@ import { applyGetterAndSetter, associationPrimaryKeyAccessors, blankAssociations
  * @param opts.withoutDefaultScopes - A list of default scopes to bypass when loading this association
  */
 export default 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 () {
@@ -68,7 +67,6 @@ export default function HasMany(globalAssociationNameOrNames, opts = {}) {
                 andNot,
                 andAny,
                 polymorphic,
-                preloadThroughColumns,
                 primaryKeyOverride,
                 selfAnd,
                 selfAndNot,

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

@@ -24,7 +24,6 @@ import { applyGetterAndSetter, associationPrimaryKeyAccessors, blankAssociations
  * @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.
@@ -33,7 +32,7 @@ import { applyGetterAndSetter, associationPrimaryKeyAccessors, blankAssociations
  * @param opts.withoutDefaultScopes - A list of default scopes to bypass when loading this association
  */
 export default 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 () {
@@ -66,7 +65,6 @@ export default function HasOne(globalAssociationNameOrNames, opts = {}) {
                 andNot,
                 andAny,
                 polymorphic,
-                preloadThroughColumns,
                 primaryKeyOverride,
                 selfAnd,
                 selfAndNot,