@rvoh/dream 2.28.3 → 2.30.1

package/dist/cjs/src/Dream.js

@@ -16,7 +16,7 @@ import loadedOrLoadAssociation from './dream/internal/associations/loadedOrLoadA
 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 { destroyOptions, reallyDestroyOptions, undestroyOptions } from './dream/internal/destroyOptions.js';
 import ensureSTITypeFieldIsSet from './dream/internal/ensureSTITypeFieldIsSet.js';
 import findOrCreateBy from './dream/internal/findOrCreateBy.js';
 import mergeSerializerAssociationEdges from './dream/internal/mergeSerializerAssociationEdges.js';
@@ -878,6 +878,8 @@ export default class Dream {
         });
     }
     /**
+     * @deprecated Use {@link removeDefaultScope} instead. This method will become private in v3.
+     *
      * Returns a query which bypasses user-removable default scopes, including on
      * association loads. An STI child's reserved type discriminator remains
      * enforced; query the STI base model to span its registered children.
@@ -885,7 +887,7 @@ export default class Dream {
      * @returns A query which bypasses user-removable default scopes
      */
     static removeAllDefaultScopes() {
-        return this.query().removeAllDefaultScopes();
+        return this.query()['removeAllDefaultScopes']();
     }
     /**
      * imports an object from the IOC. This is usually done in rare cases,
@@ -3183,7 +3185,7 @@ export default class Dream {
      * this will raise an exception.
      *
      * ```ts
-     * const user = await User.removeAllDefaultScopes().last()
+     * const user = await User.removeDefaultScope('dream:SoftDelete').last()
      * await user.undestroy()
      * ```
      *

package/dist/cjs/src/decorators/field/sortable/helpers/setPosition.js

@@ -1,3 +1,5 @@
+import installPersistedAttribute from '../../../../dream/internal/installPersistedAttribute.js';
+import RecordNotFound from '../../../../errors/RecordNotFound.js';
 import range from '../../../../helpers/range.js';
 import ops from '../../../../ops/index.js';
 import acquireSortableScopeLocks from './acquireSortableScopeLocks.js';
@@ -9,9 +11,16 @@ import { invalidateSortableRowCache } from './sortableRowCache.js';
 import { snapshotScopeValue } from './sortableSnapshot.js';
 import validPosition from './validPosition.js';
 export default async function setPosition(obj) {
-    const { dream, txn } = obj;
     await applyUpdates(obj);
-    await dream.txn(txn).reload();
+    await refreshPosition(obj);
+}
+async function refreshPosition({ dream, positionField, query }) {
+    const positions = await query['removeAllDefaultScopes']()
+        .where({ [dream['_primaryKey']]: dream.primaryKeyValue() })
+        .pluck(positionField);
+    if (!positions.length)
+        throw new RecordNotFound(dream['sanitizedConstructorName']);
+    installPersistedAttribute(dream, positionField, positions[0]);
 }
 async function applyUpdates(obj) {
     const { dream, positionField, scope, txn } = obj;

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

@@ -629,6 +629,8 @@ export default class DreamClassTransactionBuilder {
         return new Query(this.dreamInstance).txn(this.dreamTransaction);
     }
     /**
+     * @deprecated Use {@link removeDefaultScope} instead. This method will become private in v3.
+     *
      * Returns a query which bypasses user-removable default scopes, including on
      * association loads. An STI child's reserved type discriminator remains
      * enforced; query the STI base model to span its registered children.
@@ -636,7 +638,7 @@ export default class DreamClassTransactionBuilder {
      * @returns A query which bypasses user-removable default scopes
      */
     removeAllDefaultScopes() {
-        return this.queryInstance().removeAllDefaultScopes();
+        return this.queryInstance()['removeAllDefaultScopes']();
     }
     /**
      * Prevents a specific default scope from applying when

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

@@ -10,7 +10,7 @@ import destroyAssociation from './internal/associations/destroyAssociation.js';
 import loadedOrLoadAssociation from './internal/associations/loadedOrLoadAssociation.js';
 import undestroyAssociation from './internal/associations/undestroyAssociation.js';
 import destroyDream from './internal/destroyDream.js';
-import { destroyOptions, reallyDestroyOptions, undestroyOptions, } from './internal/destroyOptions.js';
+import { destroyOptions, reallyDestroyOptions, undestroyOptions } from './internal/destroyOptions.js';
 import reload from './internal/reload.js';
 import saveDream from './internal/saveDream.js';
 import { DEFAULT_BYPASS_ALL_DEFAULT_SCOPES, DEFAULT_DEFAULT_SCOPES_TO_BYPASS, DEFAULT_SKIP_HOOKS, } from './internal/scopeHelpers.js';
@@ -227,7 +227,7 @@ export default class DreamInstanceTransactionBuilder {
      * this will raise an exception.
      *
      * ```ts
-     * const user = await User.removeAllDefaultScopes().last()
+     * const user = await User.removeDefaultScope('dream:SoftDelete').last()
      * await user.txn(txn).undestroy()
      * ```
      *

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

@@ -44,6 +44,8 @@ export default class LoadBuilder {
         return this;
     }
     /**
+     * @deprecated Use {@link removeDefaultScope} instead. This method will become private in v3.
+     *
      * Prevents user-removable default scopes from applying when loading
      * associations. An associated STI child's reserved type discriminator remains
      * enforced; loading through its STI base still spans registered children.
@@ -52,14 +54,14 @@ export default class LoadBuilder {
      * const user = await User.firstOrFail()
      * const loaded = await user
      *   .load('posts')
-     *   .removeAllDefaultScopes()
+     *   .removeDefaultScope('dream:SoftDelete')
      *   .execute()
      * ```
      *
      * @returns The LoadBuilder instance for chaining
      */
     removeAllDefaultScopes() {
-        this.query = this.query.removeAllDefaultScopes();
+        this.query = this.query['removeAllDefaultScopes']();
         return this;
     }
     /**

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

@@ -778,6 +778,8 @@ export default class Query {
         });
     }
     /**
+     * @deprecated Use {@link removeDefaultScope} instead. This method will become private in v3.
+     *
      * Prevents user-removable default scopes from applying when the Query is
      * executed, including when associations are loaded. An STI child's reserved
      * type discriminator remains enforced; query the STI base model to span its

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

@@ -21,6 +21,7 @@ import DreamApp from '../../dream-app/index.js';
 import Dream from '../../Dream.js';
 import ArrayTargetIncompatibleWithThroughAssociation from '../../errors/associations/ArrayTargetIncompatibleWithThroughAssociation.js';
 import CannotJoinPolymorphicBelongsToError from '../../errors/associations/CannotJoinPolymorphicBelongsToError.js';
+import IncompatibleThroughAssociationTarget from '../../errors/associations/IncompatibleThroughAssociationTarget.js';
 import JoinAttemptedOnMissingAssociation from '../../errors/associations/JoinAttemptedOnMissingAssociation.js';
 import MissingRequiredAssociationAndClause from '../../errors/associations/MissingRequiredAssociationAndClause.js';
 import MissingRequiredPassthroughForAssociationAndClause from '../../errors/associations/MissingRequiredPassthroughForAssociationAndClause.js';
@@ -1547,7 +1548,7 @@ export default class KyselyQueryDriver extends QueryDriverBase {
                 joinAndStatement,
                 joinType,
                 previousThroughAssociations: [],
-                dreamClassThroughAssociationWantsToHydrate: undefined,
+                polymorphicSourceTargetModelClass: undefined,
             });
             query = results.query;
             /**
@@ -1976,7 +1977,7 @@ export default class KyselyQueryDriver extends QueryDriverBase {
                 joinAndStatement: {},
                 previousThroughAssociations: [],
                 joinType,
-                dreamClassThroughAssociationWantsToHydrate: undefined,
+                polymorphicSourceTargetModelClass: undefined,
             });
         }
         const associatedDreamClass = associationReferencedByThroughAssociation.modelCB();
@@ -1992,12 +1993,24 @@ export default class KyselyQueryDriver extends QueryDriverBase {
                 association: throughAssociation,
                 throughClass: associatedDreamClass,
             });
+        const outermostThroughAssociation = previousThroughAssociations[0]?.association ?? throughAssociation;
+        const outermostTargetModelClass = outermostThroughAssociation.modelCB();
+        const sourceTargetModelClassOrClasses = sourceAssociation.modelCB();
+        const sourceTargetModelClasses = Array.isArray(sourceTargetModelClassOrClasses)
+            ? sourceTargetModelClassOrClasses
+            : [sourceTargetModelClassOrClasses];
+        if (!sourceTargetModelClasses.some(sourceTargetModelClass => outermostTargetModelClass.typeof(sourceTargetModelClass)))
+            throw new IncompatibleThroughAssociationTarget({
+                outermostAssociation: outermostThroughAssociation,
+                outermostTargetModelClass,
+                sourceAssociation,
+            });
         /**
-         * When the source is a polymorphic BelongsTo association, use the target of the through
-         * association to determine which class to target.
+         * A polymorphic source can accept several model classes. The outermost
+         * association target selects the one this through chain is following.
          */
-        const dreamClassThroughAssociationWantsToHydrate = Array.isArray(sourceAssociation.modelCB())
-            ? throughAssociation.modelCB()
+        const polymorphicSourceTargetModelClass = Array.isArray(sourceTargetModelClassOrClasses)
+            ? outermostTargetModelClass
             : undefined;
         /**
          * Add the source that `sourceAssociation` points to. Note that since joinsBridgeThroughAssociations
@@ -2031,7 +2044,7 @@ export default class KyselyQueryDriver extends QueryDriverBase {
                 { association: throughAssociation, selfTableAlias: previousTableAlias },
             ],
             joinType,
-            dreamClassThroughAssociationWantsToHydrate,
+            polymorphicSourceTargetModelClass,
         });
     }
     applyOneJoin({ query, dreamClass, association, 
@@ -2054,7 +2067,7 @@ export default class KyselyQueryDriver extends QueryDriverBase {
     /**
      * previousTableAlias is always set
      */
-    previousTableAlias, selfTableAlias = previousTableAlias, joinAndStatement = {}, previousThroughAssociations, joinType, dreamClassThroughAssociationWantsToHydrate, }) {
+    previousTableAlias, selfTableAlias = previousTableAlias, joinAndStatement = {}, previousThroughAssociations, joinType, polymorphicSourceTargetModelClass, }) {
         if (association.type !== 'BelongsTo' && association.through) {
             return this.joinsBridgeThroughAssociations({
                 query,
@@ -2077,7 +2090,7 @@ export default class KyselyQueryDriver extends QueryDriverBase {
             joinAndStatement,
             previousThroughAssociations,
             joinType,
-            dreamClassThroughAssociationWantsToHydrate,
+            polymorphicSourceTargetModelClass,
         });
     }
     addAssociationJoinStatementToQuery({ query, dreamClass, association, 
@@ -2100,12 +2113,38 @@ export default class KyselyQueryDriver extends QueryDriverBase {
     /**
      * previousTableAlias is always set
      */
-    previousTableAlias, selfTableAlias, joinAndStatement, previousThroughAssociations, joinType, dreamClassThroughAssociationWantsToHydrate, }) {
+    previousTableAlias, selfTableAlias, joinAndStatement, previousThroughAssociations, joinType, polymorphicSourceTargetModelClass, }) {
         const currentTableAlias = explicitAlias ?? association.as;
-        const _associatedDreamClass = association.modelCB();
-        const associatedDreamClass = Array.isArray(_associatedDreamClass)
-            ? _associatedDreamClass[0]
-            : _associatedDreamClass;
+        const associationModelClassOrPolymorphicModelClasses = association.modelCB();
+        const modelClassUsedForJoinConditions = Array.isArray(associationModelClassOrPolymorphicModelClasses)
+            ? associationModelClassOrPolymorphicModelClasses[0]
+            : associationModelClassOrPolymorphicModelClasses;
+        /**
+         * The outermost through association defines what callers expect this join to
+         * return, so its target is the single owner of the target table's default
+         * scopes. Inner associations describe how to reach that table; the
+         * compatibility check in `joinsBridgeThroughAssociations` ensures they can
+         * actually return the outer target.
+         *
+         * For example, BearBnB already defines `Host.places` and `Place.rooms`. It
+         * could expose only bedrooms from a host without adding `Place.bedrooms`:
+         *
+         *   // Place.ts
+         *   @deco.HasMany('Room')
+         *   public rooms: Room[]
+         *
+         *   // Host.ts
+         *   @deco.HasMany('Room/Bedroom', { through: 'places', source: 'rooms' })
+         *   public bedrooms: Bedroom[]
+         *
+         * `Host.bedrooms` is the outermost association, so Bedroom's `dream:STI`
+         * scope is applied once to the final rooms join. Bedroom is a subclass of
+         * Room, so `Place.rooms` is a compatible path. Reversing those targets, or
+         * mixing sibling STI children, raises instead of silently changing meaning.
+         */
+        const modelClassWhoseDefaultScopesApplyToJoin = previousThroughAssociations[0]?.association.modelCB() ??
+            polymorphicSourceTargetModelClass ??
+            modelClassUsedForJoinConditions;
         /**
          * Stacked order/distinct clauses are applied in join order: the options of
          * the through association whose bridging joins were added to the query
@@ -2131,22 +2170,22 @@ export default class KyselyQueryDriver extends QueryDriverBase {
             }
         }
         if (association.type === 'BelongsTo') {
-            if (!dreamClassThroughAssociationWantsToHydrate && Array.isArray(association.modelCB()))
+            if (!polymorphicSourceTargetModelClass && Array.isArray(association.modelCB()))
                 throw new CannotJoinPolymorphicBelongsToError({
                     dreamClass,
                     association,
                     innerJoinStatements: this.query['innerJoinStatements'],
                     leftJoinStatements: this.query['leftJoinStatements'],
                 });
-            const to = (dreamClassThroughAssociationWantsToHydrate ?? association.modelCB()).table;
+            const to = (polymorphicSourceTargetModelClass ?? association.modelCB()).table;
             const joinTableExpression = this.aliasedJoinTableExpression(to, currentTableAlias);
             query = query[(joinType === 'inner' ? 'innerJoin' : 'leftJoin')](joinTableExpression, (join) => {
                 join = join.onRef(this.namespaceColumn(association.foreignKey(), previousTableAlias), '=', this.namespaceColumn(association.primaryKey(undefined, {
-                    associatedClassOverride: dreamClassThroughAssociationWantsToHydrate,
+                    associatedClassOverride: polymorphicSourceTargetModelClass,
                 }), currentTableAlias));
-                if (dreamClassThroughAssociationWantsToHydrate) {
+                if (polymorphicSourceTargetModelClass) {
                     join = join.on((eb) => this.whereStatementToExpressionWrapper(dreamClass, eb, this.aliasWhereStatement({
-                        [association.foreignKeyTypeField()]: dreamClassThroughAssociationWantsToHydrate.sanitizedName,
+                        [association.foreignKeyTypeField()]: polymorphicSourceTargetModelClass.sanitizedName,
                     }, previousTableAlias)));
                 }
                 join = this.applyPreviousThroughAssociationAndStatementsToJoinStatement({
@@ -2156,14 +2195,14 @@ export default class KyselyQueryDriver extends QueryDriverBase {
                     currentTableAlias,
                     joinAndStatement,
                 });
-                join = this.conditionallyApplyDefaultScopesDependentOnAssociation({
+                join = this.applyAssociationDefaultScopesToJoin({
                     dreamClass,
                     join,
                     tableNameOrAlias: currentTableAlias,
                     association,
-                    throughAssociatedClassOverride: dreamClassThroughAssociationWantsToHydrate,
+                    modelClassWhoseDefaultScopesApply: modelClassWhoseDefaultScopesApplyToJoin,
                 });
-                join = this.applyJoinAndStatement(associatedDreamClass, join, joinAndStatement, currentTableAlias);
+                join = this.applyJoinAndStatement(modelClassUsedForJoinConditions, join, joinAndStatement, currentTableAlias);
                 return join;
             });
         }
@@ -2174,8 +2213,8 @@ export default class KyselyQueryDriver extends QueryDriverBase {
                 join = join.onRef(this.namespaceColumn(association.primaryKey(), previousTableAlias), '=', this.namespaceColumn(association.foreignKey(), currentTableAlias));
                 if (association.polymorphic) {
                     join = join.on((eb) => this.whereStatementToExpressionWrapper(dreamClass, eb, this.aliasWhereStatement({
-                        [association.foreignKeyTypeField()]: dreamClassThroughAssociationWantsToHydrate
-                            ? dreamClassThroughAssociationWantsToHydrate.referenceTypeString
+                        [association.foreignKeyTypeField()]: polymorphicSourceTargetModelClass
+                            ? polymorphicSourceTargetModelClass.referenceTypeString
                             : dreamClass.referenceTypeString,
                     }, currentTableAlias)));
                 }
@@ -2194,14 +2233,14 @@ export default class KyselyQueryDriver extends QueryDriverBase {
                     selfTableAlias,
                     joinAndStatement,
                 });
-                join = this.conditionallyApplyDefaultScopesDependentOnAssociation({
+                join = this.applyAssociationDefaultScopesToJoin({
                     dreamClass,
                     join,
                     tableNameOrAlias: currentTableAlias,
                     association,
-                    throughAssociatedClassOverride: dreamClassThroughAssociationWantsToHydrate,
+                    modelClassWhoseDefaultScopesApply: modelClassWhoseDefaultScopesApplyToJoin,
                 });
-                join = this.applyJoinAndStatement(associatedDreamClass, join, joinAndStatement, currentTableAlias);
+                join = this.applyJoinAndStatement(modelClassUsedForJoinConditions, join, joinAndStatement, currentTableAlias);
                 return join;
             });
             if (association.type === 'HasMany') {
@@ -2312,11 +2351,9 @@ export default class KyselyQueryDriver extends QueryDriverBase {
         if (missingRequiredWhereStatements.length)
             throw new MissingRequiredAssociationAndClause(association, missingRequiredWhereStatements[0]);
     }
-    conditionallyApplyDefaultScopesDependentOnAssociation({ dreamClass, join, tableNameOrAlias, association, throughAssociatedClassOverride, }) {
+    applyAssociationDefaultScopesToJoin({ dreamClass, join, tableNameOrAlias, association, modelClassWhoseDefaultScopesApply, }) {
         let scopesQuery = new Query(this.dreamInstance);
-        const associationClass = throughAssociatedClassOverride ?? association.modelCB();
-        const associationScopes = associationClass['scopes'].default;
-        for (const scope of associationScopes) {
+        for (const scope of modelClassWhoseDefaultScopesApply['scopes'].default) {
             if (!shouldBypassDefaultScope(scope.method, {
                 bypassAllDefaultScopes: this.query['bypassAllDefaultScopes'],
                 defaultScopesToBypass: [
@@ -2324,7 +2361,7 @@ export default class KyselyQueryDriver extends QueryDriverBase {
                     ...(association.withoutDefaultScopes || []),
                 ],
             })) {
-                const tempQuery = associationClass[scope.method](scopesQuery);
+                const tempQuery = modelClassWhoseDefaultScopesApply[scope.method](scopesQuery);
                 // The scope method on a Dream model should return a clone of the Query it receives
                 // (e.g. by returning `scope.where(...)`), but in case the function doesn't return,
                 // or returns the wrong thing, we check before overriding `scopesQuery` with what the

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

@@ -1,6 +1,6 @@
 export default function applyScopeBypassingSettingsToQuery(query, { bypassAllDefaultScopes, defaultScopesToBypass, }) {
     if (bypassAllDefaultScopes)
-        query = query.removeAllDefaultScopes();
+        query = query['removeAllDefaultScopes']();
     defaultScopesToBypass.forEach(defaultScopeToBypass => {
         query = query.removeDefaultScope(defaultScopeToBypass);
     });

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

@@ -5,6 +5,8 @@ export default async function loadedOrLoadAssociation(dream, dreamOrTransactionB
         let scope = dreamOrTransactionBuilder.associationQuery(associationName, associationQueryOptions);
         if (options?.passthrough)
             scope = scope.passthrough(options.passthrough);
+        if (options?.connection)
+            scope = scope.connection(options.connection);
         if (association?.type === 'HasMany') {
             dream[associationName] = (await scope.all());
         }

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

@@ -0,0 +1,9 @@
+/**
+ * Installs one database-sourced scalar as the persisted value without
+ * replacing the saved-change history established by the current save.
+ */
+export default function installPersistedAttribute(dream, column, val) {
+    dream['currentAttributes'][column] = val;
+    dream['frozenAttributes'][column] = val;
+    dream['originalAttributes'][column] = val;
+}

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

@@ -0,0 +1 @@
+export {};

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

@@ -21,7 +21,7 @@ export default async function loadDependentDestroyTree(dream, txn, { reallyDestr
         loadBuilder = loadBuilder.load(...args);
     }
     if (bypassAllDefaultScopes) {
-        loadBuilder = loadBuilder.removeAllDefaultScopes();
+        loadBuilder = loadBuilder['removeAllDefaultScopes']();
     }
     else {
         for (const scopeName of defaultScopesToBypass) {

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

@@ -10,7 +10,9 @@ export default async function reload(dream, txn = null) {
     // we have persisted are not yet propagated
     else
         query = query.connection('primary');
-    query = query.removeAllDefaultScopes().where({ [dream['_primaryKey']]: dream.primaryKeyValue() });
+    query = query['removeAllDefaultScopes']().where({
+        [dream['_primaryKey']]: dream.primaryKeyValue(),
+    });
     const reloadedRecord = await query.firstOrFail();
     dream.setAttributes(reloadedRecord.getAttributes());
     dream['freezeAttributes']();

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

@@ -0,0 +1,11 @@
+export default class IncompatibleThroughAssociationTarget extends Error {
+    constructor({ outermostAssociation, outermostTargetModelClass, sourceAssociation, }) {
+        super(`Through association \`${outermostAssociation.as}\` targets \`${outermostTargetModelClass.sanitizedName}\`, but source association \`${sourceAssociation.as}\` targets ${targetDescription(sourceAssociation)}. ` +
+            `The through association's target must be the same as or a subclass of a source target.`);
+    }
+}
+function targetDescription(association) {
+    const targetModelClassOrClasses = association.modelCB();
+    const targetNames = (Array.isArray(targetModelClassOrClasses) ? targetModelClassOrClasses : [targetModelClassOrClasses]).map(targetModelClass => `\`${targetModelClass.sanitizedName}\``);
+    return targetNames.join(', ');
+}

package/dist/esm/src/Dream.js

@@ -16,7 +16,7 @@ import loadedOrLoadAssociation from './dream/internal/associations/loadedOrLoadA
 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 { destroyOptions, reallyDestroyOptions, undestroyOptions } from './dream/internal/destroyOptions.js';
 import ensureSTITypeFieldIsSet from './dream/internal/ensureSTITypeFieldIsSet.js';
 import findOrCreateBy from './dream/internal/findOrCreateBy.js';
 import mergeSerializerAssociationEdges from './dream/internal/mergeSerializerAssociationEdges.js';
@@ -878,6 +878,8 @@ export default class Dream {
         });
     }
     /**
+     * @deprecated Use {@link removeDefaultScope} instead. This method will become private in v3.
+     *
      * Returns a query which bypasses user-removable default scopes, including on
      * association loads. An STI child's reserved type discriminator remains
      * enforced; query the STI base model to span its registered children.
@@ -885,7 +887,7 @@ export default class Dream {
      * @returns A query which bypasses user-removable default scopes
      */
     static removeAllDefaultScopes() {
-        return this.query().removeAllDefaultScopes();
+        return this.query()['removeAllDefaultScopes']();
     }
     /**
      * imports an object from the IOC. This is usually done in rare cases,
@@ -3183,7 +3185,7 @@ export default class Dream {
      * this will raise an exception.
      *
      * ```ts
-     * const user = await User.removeAllDefaultScopes().last()
+     * const user = await User.removeDefaultScope('dream:SoftDelete').last()
      * await user.undestroy()
      * ```
      *

package/dist/esm/src/decorators/field/sortable/helpers/setPosition.js

@@ -1,3 +1,5 @@
+import installPersistedAttribute from '../../../../dream/internal/installPersistedAttribute.js';
+import RecordNotFound from '../../../../errors/RecordNotFound.js';
 import range from '../../../../helpers/range.js';
 import ops from '../../../../ops/index.js';
 import acquireSortableScopeLocks from './acquireSortableScopeLocks.js';
@@ -9,9 +11,16 @@ import { invalidateSortableRowCache } from './sortableRowCache.js';
 import { snapshotScopeValue } from './sortableSnapshot.js';
 import validPosition from './validPosition.js';
 export default async function setPosition(obj) {
-    const { dream, txn } = obj;
     await applyUpdates(obj);
-    await dream.txn(txn).reload();
+    await refreshPosition(obj);
+}
+async function refreshPosition({ dream, positionField, query }) {
+    const positions = await query['removeAllDefaultScopes']()
+        .where({ [dream['_primaryKey']]: dream.primaryKeyValue() })
+        .pluck(positionField);
+    if (!positions.length)
+        throw new RecordNotFound(dream['sanitizedConstructorName']);
+    installPersistedAttribute(dream, positionField, positions[0]);
 }
 async function applyUpdates(obj) {
     const { dream, positionField, scope, txn } = obj;

package/dist/esm/src/dream/DreamClassTransactionBuilder.js

@@ -629,6 +629,8 @@ export default class DreamClassTransactionBuilder {
         return new Query(this.dreamInstance).txn(this.dreamTransaction);
     }
     /**
+     * @deprecated Use {@link removeDefaultScope} instead. This method will become private in v3.
+     *
      * Returns a query which bypasses user-removable default scopes, including on
      * association loads. An STI child's reserved type discriminator remains
      * enforced; query the STI base model to span its registered children.
@@ -636,7 +638,7 @@ export default class DreamClassTransactionBuilder {
      * @returns A query which bypasses user-removable default scopes
      */
     removeAllDefaultScopes() {
-        return this.queryInstance().removeAllDefaultScopes();
+        return this.queryInstance()['removeAllDefaultScopes']();
     }
     /**
      * Prevents a specific default scope from applying when

package/dist/esm/src/dream/DreamInstanceTransactionBuilder.js

@@ -10,7 +10,7 @@ import destroyAssociation from './internal/associations/destroyAssociation.js';
 import loadedOrLoadAssociation from './internal/associations/loadedOrLoadAssociation.js';
 import undestroyAssociation from './internal/associations/undestroyAssociation.js';
 import destroyDream from './internal/destroyDream.js';
-import { destroyOptions, reallyDestroyOptions, undestroyOptions, } from './internal/destroyOptions.js';
+import { destroyOptions, reallyDestroyOptions, undestroyOptions } from './internal/destroyOptions.js';
 import reload from './internal/reload.js';
 import saveDream from './internal/saveDream.js';
 import { DEFAULT_BYPASS_ALL_DEFAULT_SCOPES, DEFAULT_DEFAULT_SCOPES_TO_BYPASS, DEFAULT_SKIP_HOOKS, } from './internal/scopeHelpers.js';
@@ -227,7 +227,7 @@ export default class DreamInstanceTransactionBuilder {
      * this will raise an exception.
      *
      * ```ts
-     * const user = await User.removeAllDefaultScopes().last()
+     * const user = await User.removeDefaultScope('dream:SoftDelete').last()
      * await user.txn(txn).undestroy()
      * ```
      *

package/dist/esm/src/dream/LoadBuilder.js

@@ -44,6 +44,8 @@ export default class LoadBuilder {
         return this;
     }
     /**
+     * @deprecated Use {@link removeDefaultScope} instead. This method will become private in v3.
+     *
      * Prevents user-removable default scopes from applying when loading
      * associations. An associated STI child's reserved type discriminator remains
      * enforced; loading through its STI base still spans registered children.
@@ -52,14 +54,14 @@ export default class LoadBuilder {
      * const user = await User.firstOrFail()
      * const loaded = await user
      *   .load('posts')
-     *   .removeAllDefaultScopes()
+     *   .removeDefaultScope('dream:SoftDelete')
      *   .execute()
      * ```
      *
      * @returns The LoadBuilder instance for chaining
      */
     removeAllDefaultScopes() {
-        this.query = this.query.removeAllDefaultScopes();
+        this.query = this.query['removeAllDefaultScopes']();
         return this;
     }
     /**

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

@@ -778,6 +778,8 @@ export default class Query {
         });
     }
     /**
+     * @deprecated Use {@link removeDefaultScope} instead. This method will become private in v3.
+     *
      * Prevents user-removable default scopes from applying when the Query is
      * executed, including when associations are loaded. An STI child's reserved
      * type discriminator remains enforced; query the STI base model to span its