@rvoh/dream 0.29.2 → 0.29.3

package/dist/cjs/src/Dream.js

@@ -1075,7 +1075,7 @@ class Dream {
      *
      * ```ts
      * class Post extends ApplicationModel {
-     *   @Sortable({ scope: ['user']})
+     *   @Deco.Sortable({ scope: ['user']})
      *   public position: DreamColumn<User, 'position'>
      * }
      *

package/dist/cjs/src/decorators/Decorators.js

@@ -99,8 +99,16 @@ class Decorators {
     // end: HasOne
     //////////////
     /**
-     * Shortcut to the Sortable decorator, which also provides extra type protection which cannot be provided
-     * with the Sortable decorator.
+     * Sortable decorator.
+     *
+     * NOTE: the Sortable decorator may not be used in STI child models (it may be used in the STI base class)
+     *
+     * ```ts
+     * class Balloon {
+     *   @Deco.Sortable()
+     *   public position: DreamColumn<Balloon, 'position'>
+     * }
+     * ```
      *
      * @param scope - The column, association, or combination there-of which you would like to restrict the incrementing logic to
      * @returns A Sortable decorator
@@ -109,11 +117,11 @@ class Decorators {
         return (0, Sortable_js_1.default)(opts);
     }
     /**
-     * Shortcut to the BeforeCreate decorator
+     * BeforeCreate decorator
      *
      * ```ts
      * class User {
-     *   User.BeforeCreate()
+     *   @Deco.BeforeCreate()
      *   public doSomething() {
      *     console.log('hi!')
      *   }
@@ -127,11 +135,11 @@ class Decorators {
         return (0, BeforeCreate_js_1.default)(opts);
     }
     /**
-     * Shortcut to the BeforeSave decorator
+     * BeforeSave decorator
      *
      * ```ts
      * class User {
-     *   User.BeforeSave()
+     *   @Deco.BeforeSave()
      *   public doSomething() {
      *     console.log('hi!')
      *   }
@@ -145,11 +153,11 @@ class Decorators {
         return (0, BeforeSave_js_1.default)(opts);
     }
     /**
-     * Shortcut to the BeforeUpdate decorator
+     * BeforeUpdate decorator
      *
      * ```ts
      * class User {
-     *   User.BeforeUpdate()
+     *   @Deco.BeforeUpdate()
      *   public doSomething() {
      *     console.log('hi!')
      *   }
@@ -163,11 +171,11 @@ class Decorators {
         return (0, BeforeUpdate_js_1.default)(opts);
     }
     /**
-     * Shortcut to the BeforeDestroy decorator
+     * BeforeDestroy decorator
      *
      * ```ts
      * class User {
-     *   User.BeforeDestroy()
+     *   @Deco.BeforeDestroy()
      *   public doSomething() {
      *     console.log('hi!')
      *   }
@@ -180,11 +188,11 @@ class Decorators {
         return (0, BeforeDestroy_js_1.default)();
     }
     /**
-     * Shortcut to the AfterCreate decorator
+     * AfterCreate decorator
      *
      * ```ts
      * class User {
-     *   User.AfterCreate()
+     *   @Deco.AfterCreate()
      *   public doSomething() {
      *     console.log('hi!')
      *   }
@@ -198,11 +206,11 @@ class Decorators {
         return (0, AfterCreate_js_1.default)(opts);
     }
     /**
-     * Shortcut to the AfterCreateCommit decorator
+     * AfterCreateCommit decorator
      *
      * ```ts
      * class User {
-     *   User.AfterCreateCommit()
+     *   @Deco.AfterCreateCommit()
      *   public doSomething() {
      *     console.log('hi!')
      *   }
@@ -215,11 +223,11 @@ class Decorators {
         return (0, AfterCreateCommit_js_1.default)(opts);
     }
     /**
-     * Shortcut to the AfterSave decorator
+     * AfterSave decorator
      *
      * ```ts
      * class User {
-     *   User.AfterSave()
+     *   @Deco.AfterSave()
      *   public doSomething() {
      *     console.log('hi!')
      *   }
@@ -233,11 +241,11 @@ class Decorators {
         return (0, AfterSave_js_1.default)(opts);
     }
     /**
-     * Shortcut to the AfterSaveCommit decorator
+     * AfterSaveCommit decorator
      *
      * ```ts
      * class User {
-     *   User.AfterSaveCommit()
+     *   @Deco.AfterSaveCommit()
      *   public doSomething() {
      *     console.log('hi!')
      *   }
@@ -251,11 +259,11 @@ class Decorators {
         return (0, AfterSaveCommit_js_1.default)(opts);
     }
     /**
-     * Shortcut to the AfterUpdate decorator
+     * AfterUpdate decorator
      *
      * ```ts
      * class User {
-     *   User.AfterUpdate()
+     *   @Deco.AfterUpdate()
      *   public doSomething() {
      *     console.log('hi!')
      *   }
@@ -269,11 +277,11 @@ class Decorators {
         return (0, AfterUpdate_js_1.default)(opts);
     }
     /**
-     * Shortcut to the AfterUpdateCommit decorator
+     * AfterUpdateCommit decorator
      *
      * ```ts
      * class User {
-     *   User.AfterUpdateCommit()
+     *   @Deco.AfterUpdateCommit()
      *   public doSomething() {
      *     console.log('hi!')
      *   }
@@ -287,11 +295,11 @@ class Decorators {
         return (0, AfterUpdateCommit_js_1.default)(opts);
     }
     /**
-     * Shortcut to the AfterDestroy decorator
+     * AfterDestroy decorator
      *
      * ```ts
      * class User {
-     *   User.AfterDestroy()
+     *   @Deco.AfterDestroy()
      *   public doSomething() {
      *     console.log('hi!')
      *   }
@@ -305,11 +313,11 @@ class Decorators {
         return (0, AfterDestroy_js_1.default)();
     }
     /**
-     * Shortcut to the AfterDestroyCommit decorator
+     * AfterDestroyCommit decorator
      *
      * ```ts
      * class User {
-     *   User.AfterDestroyCommit()
+     *   @Deco.AfterDestroyCommit()
      *   public doSomething() {
      *     console.log('hi!')
      *   }

package/dist/cjs/src/decorators/sortable/Sortable.js

@@ -9,6 +9,7 @@ const AfterDestroyCommit_js_1 = require("../hooks/AfterDestroyCommit.js");
 const AfterUpdate_js_1 = require("../hooks/AfterUpdate.js");
 const AfterUpdateCommit_js_1 = require("../hooks/AfterUpdateCommit.js");
 const BeforeSave_js_1 = require("../hooks/BeforeSave.js");
+const STI_js_1 = require("../STI.js");
 const scopeArray_js_1 = require("./helpers/scopeArray.js");
 const afterSortableCreate_js_1 = require("./hooks/afterSortableCreate.js");
 const afterSortableDestroy_js_1 = require("./hooks/afterSortableDestroy.js");
@@ -22,18 +23,6 @@ function Sortable(opts = {}) {
             const dreamClass = dream.constructor;
             if (!dreamClass['globallyInitializingDecorators'])
                 return;
-            if (dreamClass['sti']['active']) {
-                if (!(dreamClass instanceof dreamClass['stiBaseClassOrOwnClass'])) {
-                    // what we should really be doing is throwing CannotCallSortableOnSTIChild,
-                    // but we cannot, since there is no way to know during this initializer if
-                    // the Sortable decorator was applied to the STI child, or the STI parent.
-                    //
-                    // because of this bizarre issue, we are forced to early return when
-                    // we are processing Sortable on an STI child.
-                    // throw new CannotCallSortableOnSTIChild(dreamClass)
-                    return;
-                }
-            }
             if (!Object.getOwnPropertyDescriptor(dreamClass, 'sortableFields')) {
                 // This pattern allows `sortableFields` on a base STI class and on
                 // child STI classes. The new `sortableFields` property will be created
@@ -58,7 +47,7 @@ function Sortable(opts = {}) {
             // before saving, we remember the new value for position, but clear it from our
             // supervised attributes to prevent position from saving
             dreamPrototype[beforeSaveMethodName] = async function (txn) {
-                let query = dreamClass.query();
+                let query = dreamClass.query().removeDefaultScope(STI_js_1.STI_SCOPE_NAME);
                 if (txn)
                     query = query.txn(txn);
                 await (0, beforeSortableSave_js_1.default)({
@@ -73,7 +62,7 @@ function Sortable(opts = {}) {
                 // if no transaction is provided, leverage update commit hook instead
                 if (!txn)
                     return;
-                const query = dreamClass.query().txn(txn);
+                const query = dreamClass.query().removeDefaultScope(STI_js_1.STI_SCOPE_NAME).txn(txn);
                 await (0, afterSortableUpdate_js_1.default)({
                     dream: this,
                     positionField,
@@ -86,7 +75,7 @@ function Sortable(opts = {}) {
                 // if transaction is provided, leverage update hook instead
                 if (txn)
                     return;
-                const query = dreamClass.query();
+                const query = dreamClass.query().removeDefaultScope(STI_js_1.STI_SCOPE_NAME);
                 await (0, afterSortableUpdate_js_1.default)({
                     dream: this,
                     positionField,
@@ -101,7 +90,7 @@ function Sortable(opts = {}) {
                 // if no transaction is provided, leverage create commit hook instead
                 if (!txn)
                     return;
-                const query = dreamClass.query().txn(txn);
+                const query = dreamClass.query().removeDefaultScope(STI_js_1.STI_SCOPE_NAME).txn(txn);
                 await (0, afterSortableCreate_js_1.default)({
                     dream: this,
                     positionField,
@@ -114,7 +103,7 @@ function Sortable(opts = {}) {
                 // if transaction is provided, leverage create hook instead
                 if (txn)
                     return;
-                const query = dreamClass.query();
+                const query = dreamClass.query().removeDefaultScope(STI_js_1.STI_SCOPE_NAME);
                 await (0, afterSortableCreate_js_1.default)({
                     dream: this,
                     positionField,
@@ -128,7 +117,7 @@ function Sortable(opts = {}) {
                 // if no transaction is provided, leverage destroy commit hook instead
                 if (!txn)
                     return;
-                const query = dreamClass.query().txn(txn);
+                const query = dreamClass.query().removeDefaultScope(STI_js_1.STI_SCOPE_NAME).txn(txn);
                 await (0, afterSortableDestroy_js_1.default)({
                     dream: this,
                     positionField,
@@ -140,7 +129,7 @@ function Sortable(opts = {}) {
                 // if transaction is provided, leverage destroy hook instead
                 if (txn)
                     return;
-                const query = dreamClass.query();
+                const query = dreamClass.query().removeDefaultScope(STI_js_1.STI_SCOPE_NAME);
                 await (0, afterSortableDestroy_js_1.default)({
                     dream: this,
                     positionField,

package/dist/cjs/src/index.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.debug = exports.compact = exports.generateDream = exports.capitalize = exports.camelize = exports.CalendarDate = exports.Benchmark = exports.ValidationError = exports.RecordNotFound = exports.GlobalNameNotSet = exports.CreateOrFindByFailedToCreateAndFind = exports.NonLoadedAssociation = exports.Encrypt = exports.DreamConst = exports.Query = exports.DreamTransaction = exports.Dream = exports.DreamApplication = exports.lookupClassByGlobalName = exports.DreamImporter = exports.Virtual = exports.Validates = exports.Validate = exports.STI = exports.Sortable = exports.SoftDelete = exports.Scope = exports.ReplicaSafe = exports.BeforeUpdate = exports.BeforeSave = exports.BeforeDestroy = exports.BeforeCreate = exports.AfterUpdateCommit = exports.AfterUpdate = exports.AfterSaveCommit = exports.AfterSave = exports.AfterDestroyCommit = exports.AfterDestroy = exports.AfterCreateCommit = exports.AfterCreate = exports.Decorators = exports.validateTable = exports.validateColumn = exports.DreamMigrationHelpers = exports.db = exports.pgErrorType = exports.dreamDbConnections = exports.closeAllDbConnections = exports.DreamCLI = exports.DreamBin = void 0;
-exports.DreamSerializer = exports.Attribute = exports.RendersOne = exports.RendersMany = exports.ops = exports.openapiShorthandPrimitiveTypes = exports.openapiPrimitiveTypes = exports.uniq = exports.uncapitalize = exports.standardizeFullyQualifiedModelName = exports.sortBy = exports.snakeify = exports.serializerNameFromFullyQualifiedModelName = exports.round = exports.range = exports.Range = exports.sharedPathPrefix = exports.relativeDreamPath = exports.dreamPath = exports.pascalize = exports.loadRepl = exports.isEmpty = exports.inferSerializerFromDreamOrViewModel = exports.inferSerializerFromDreamClassOrViewModelClass = exports.hyphenize = exports.globalClassNameFromFullyQualifiedModelName = exports.Env = void 0;
+exports.range = exports.Range = exports.sharedPathPrefix = exports.relativeDreamPath = exports.dreamPath = exports.pascalize = exports.loadRepl = exports.isEmpty = exports.inferSerializerFromDreamOrViewModel = exports.inferSerializerFromDreamClassOrViewModelClass = exports.hyphenize = exports.globalClassNameFromFullyQualifiedModelName = exports.Env = exports.debug = exports.compact = exports.generateDream = exports.capitalize = exports.camelize = exports.CalendarDate = exports.Benchmark = exports.ValidationError = exports.RecordNotFound = exports.GlobalNameNotSet = exports.CreateOrFindByFailedToCreateAndFind = exports.NonLoadedAssociation = exports.Encrypt = exports.DreamConst = exports.Query = exports.DreamTransaction = exports.Dream = exports.DreamApplication = exports.lookupClassByGlobalName = exports.DreamImporter = exports.Virtual = exports.Validates = exports.Validate = exports.STI = exports.SoftDelete = exports.Scope = exports.ReplicaSafe = exports.Decorators = exports.validateTable = exports.validateColumn = exports.DreamMigrationHelpers = exports.db = exports.pgErrorType = exports.dreamDbConnections = exports.closeAllDbConnections = exports.DreamCLI = exports.DreamBin = void 0;
+exports.DreamSerializer = exports.Attribute = exports.RendersOne = exports.RendersMany = exports.ops = exports.openapiShorthandPrimitiveTypes = exports.openapiPrimitiveTypes = exports.uniq = exports.uncapitalize = exports.standardizeFullyQualifiedModelName = exports.sortBy = exports.snakeify = exports.serializerNameFromFullyQualifiedModelName = exports.round = 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");
@@ -21,38 +21,12 @@ var validateTable_js_1 = require("./db/validators/validateTable.js");
 Object.defineProperty(exports, "validateTable", { enumerable: true, get: function () { return validateTable_js_1.default; } });
 var Decorators_js_1 = require("./decorators/Decorators.js");
 Object.defineProperty(exports, "Decorators", { enumerable: true, get: function () { return Decorators_js_1.default; } });
-var AfterCreate_js_1 = require("./decorators/hooks/AfterCreate.js");
-Object.defineProperty(exports, "AfterCreate", { enumerable: true, get: function () { return AfterCreate_js_1.default; } });
-var AfterCreateCommit_js_1 = require("./decorators/hooks/AfterCreateCommit.js");
-Object.defineProperty(exports, "AfterCreateCommit", { enumerable: true, get: function () { return AfterCreateCommit_js_1.default; } });
-var AfterDestroy_js_1 = require("./decorators/hooks/AfterDestroy.js");
-Object.defineProperty(exports, "AfterDestroy", { enumerable: true, get: function () { return AfterDestroy_js_1.default; } });
-var AfterDestroyCommit_js_1 = require("./decorators/hooks/AfterDestroyCommit.js");
-Object.defineProperty(exports, "AfterDestroyCommit", { enumerable: true, get: function () { return AfterDestroyCommit_js_1.default; } });
-var AfterSave_js_1 = require("./decorators/hooks/AfterSave.js");
-Object.defineProperty(exports, "AfterSave", { enumerable: true, get: function () { return AfterSave_js_1.default; } });
-var AfterSaveCommit_js_1 = require("./decorators/hooks/AfterSaveCommit.js");
-Object.defineProperty(exports, "AfterSaveCommit", { enumerable: true, get: function () { return AfterSaveCommit_js_1.default; } });
-var AfterUpdate_js_1 = require("./decorators/hooks/AfterUpdate.js");
-Object.defineProperty(exports, "AfterUpdate", { enumerable: true, get: function () { return AfterUpdate_js_1.default; } });
-var AfterUpdateCommit_js_1 = require("./decorators/hooks/AfterUpdateCommit.js");
-Object.defineProperty(exports, "AfterUpdateCommit", { enumerable: true, get: function () { return AfterUpdateCommit_js_1.default; } });
-var BeforeCreate_js_1 = require("./decorators/hooks/BeforeCreate.js");
-Object.defineProperty(exports, "BeforeCreate", { enumerable: true, get: function () { return BeforeCreate_js_1.default; } });
-var BeforeDestroy_js_1 = require("./decorators/hooks/BeforeDestroy.js");
-Object.defineProperty(exports, "BeforeDestroy", { enumerable: true, get: function () { return BeforeDestroy_js_1.default; } });
-var BeforeSave_js_1 = require("./decorators/hooks/BeforeSave.js");
-Object.defineProperty(exports, "BeforeSave", { enumerable: true, get: function () { return BeforeSave_js_1.default; } });
-var BeforeUpdate_js_1 = require("./decorators/hooks/BeforeUpdate.js");
-Object.defineProperty(exports, "BeforeUpdate", { enumerable: true, get: function () { return BeforeUpdate_js_1.default; } });
 var ReplicaSafe_js_1 = require("./decorators/ReplicaSafe.js");
 Object.defineProperty(exports, "ReplicaSafe", { enumerable: true, get: function () { return ReplicaSafe_js_1.default; } });
 var Scope_js_1 = require("./decorators/Scope.js");
 Object.defineProperty(exports, "Scope", { enumerable: true, get: function () { return Scope_js_1.default; } });
 var SoftDelete_js_1 = require("./decorators/SoftDelete.js");
 Object.defineProperty(exports, "SoftDelete", { enumerable: true, get: function () { return SoftDelete_js_1.default; } });
-var Sortable_js_1 = require("./decorators/sortable/Sortable.js");
-Object.defineProperty(exports, "Sortable", { enumerable: true, get: function () { return Sortable_js_1.default; } });
 var STI_js_1 = require("./decorators/STI.js");
 Object.defineProperty(exports, "STI", { enumerable: true, get: function () { return STI_js_1.default; } });
 var Validate_js_1 = require("./decorators/validations/Validate.js");

package/dist/esm/src/Dream.js

@@ -1073,7 +1073,7 @@ export default class Dream {
      *
      * ```ts
      * class Post extends ApplicationModel {
-     *   @Sortable({ scope: ['user']})
+     *   @Deco.Sortable({ scope: ['user']})
      *   public position: DreamColumn<User, 'position'>
      * }
      *

package/dist/esm/src/decorators/Decorators.js

@@ -97,8 +97,16 @@ export default class Decorators {
     // end: HasOne
     //////////////
     /**
-     * Shortcut to the Sortable decorator, which also provides extra type protection which cannot be provided
-     * with the Sortable decorator.
+     * Sortable decorator.
+     *
+     * NOTE: the Sortable decorator may not be used in STI child models (it may be used in the STI base class)
+     *
+     * ```ts
+     * class Balloon {
+     *   @Deco.Sortable()
+     *   public position: DreamColumn<Balloon, 'position'>
+     * }
+     * ```
      *
      * @param scope - The column, association, or combination there-of which you would like to restrict the incrementing logic to
      * @returns A Sortable decorator
@@ -107,11 +115,11 @@ export default class Decorators {
         return Sortable(opts);
     }
     /**
-     * Shortcut to the BeforeCreate decorator
+     * BeforeCreate decorator
      *
      * ```ts
      * class User {
-     *   User.BeforeCreate()
+     *   @Deco.BeforeCreate()
      *   public doSomething() {
      *     console.log('hi!')
      *   }
@@ -125,11 +133,11 @@ export default class Decorators {
         return BeforeCreate(opts);
     }
     /**
-     * Shortcut to the BeforeSave decorator
+     * BeforeSave decorator
      *
      * ```ts
      * class User {
-     *   User.BeforeSave()
+     *   @Deco.BeforeSave()
      *   public doSomething() {
      *     console.log('hi!')
      *   }
@@ -143,11 +151,11 @@ export default class Decorators {
         return BeforeSave(opts);
     }
     /**
-     * Shortcut to the BeforeUpdate decorator
+     * BeforeUpdate decorator
      *
      * ```ts
      * class User {
-     *   User.BeforeUpdate()
+     *   @Deco.BeforeUpdate()
      *   public doSomething() {
      *     console.log('hi!')
      *   }
@@ -161,11 +169,11 @@ export default class Decorators {
         return BeforeUpdate(opts);
     }
     /**
-     * Shortcut to the BeforeDestroy decorator
+     * BeforeDestroy decorator
      *
      * ```ts
      * class User {
-     *   User.BeforeDestroy()
+     *   @Deco.BeforeDestroy()
      *   public doSomething() {
      *     console.log('hi!')
      *   }
@@ -178,11 +186,11 @@ export default class Decorators {
         return BeforeDestroy();
     }
     /**
-     * Shortcut to the AfterCreate decorator
+     * AfterCreate decorator
      *
      * ```ts
      * class User {
-     *   User.AfterCreate()
+     *   @Deco.AfterCreate()
      *   public doSomething() {
      *     console.log('hi!')
      *   }
@@ -196,11 +204,11 @@ export default class Decorators {
         return AfterCreate(opts);
     }
     /**
-     * Shortcut to the AfterCreateCommit decorator
+     * AfterCreateCommit decorator
      *
      * ```ts
      * class User {
-     *   User.AfterCreateCommit()
+     *   @Deco.AfterCreateCommit()
      *   public doSomething() {
      *     console.log('hi!')
      *   }
@@ -213,11 +221,11 @@ export default class Decorators {
         return AfterCreateCommit(opts);
     }
     /**
-     * Shortcut to the AfterSave decorator
+     * AfterSave decorator
      *
      * ```ts
      * class User {
-     *   User.AfterSave()
+     *   @Deco.AfterSave()
      *   public doSomething() {
      *     console.log('hi!')
      *   }
@@ -231,11 +239,11 @@ export default class Decorators {
         return AfterSave(opts);
     }
     /**
-     * Shortcut to the AfterSaveCommit decorator
+     * AfterSaveCommit decorator
      *
      * ```ts
      * class User {
-     *   User.AfterSaveCommit()
+     *   @Deco.AfterSaveCommit()
      *   public doSomething() {
      *     console.log('hi!')
      *   }
@@ -249,11 +257,11 @@ export default class Decorators {
         return AfterSaveCommit(opts);
     }
     /**
-     * Shortcut to the AfterUpdate decorator
+     * AfterUpdate decorator
      *
      * ```ts
      * class User {
-     *   User.AfterUpdate()
+     *   @Deco.AfterUpdate()
      *   public doSomething() {
      *     console.log('hi!')
      *   }
@@ -267,11 +275,11 @@ export default class Decorators {
         return AfterUpdate(opts);
     }
     /**
-     * Shortcut to the AfterUpdateCommit decorator
+     * AfterUpdateCommit decorator
      *
      * ```ts
      * class User {
-     *   User.AfterUpdateCommit()
+     *   @Deco.AfterUpdateCommit()
      *   public doSomething() {
      *     console.log('hi!')
      *   }
@@ -285,11 +293,11 @@ export default class Decorators {
         return AfterUpdateCommit(opts);
     }
     /**
-     * Shortcut to the AfterDestroy decorator
+     * AfterDestroy decorator
      *
      * ```ts
      * class User {
-     *   User.AfterDestroy()
+     *   @Deco.AfterDestroy()
      *   public doSomething() {
      *     console.log('hi!')
      *   }
@@ -303,11 +311,11 @@ export default class Decorators {
         return AfterDestroy();
     }
     /**
-     * Shortcut to the AfterDestroyCommit decorator
+     * AfterDestroyCommit decorator
      *
      * ```ts
      * class User {
-     *   User.AfterDestroyCommit()
+     *   @Deco.AfterDestroyCommit()
      *   public doSomething() {
      *     console.log('hi!')
      *   }

package/dist/esm/src/decorators/sortable/Sortable.js

@@ -6,6 +6,7 @@ import { afterDestroyCommitImplementation } from '../hooks/AfterDestroyCommit.js
 import { afterUpdateImplementation } from '../hooks/AfterUpdate.js';
 import { afterUpdateCommitImplementation } from '../hooks/AfterUpdateCommit.js';
 import { beforeSaveImplementation } from '../hooks/BeforeSave.js';
+import { STI_SCOPE_NAME } from '../STI.js';
 import scopeArray from './helpers/scopeArray.js';
 import afterSortableCreate from './hooks/afterSortableCreate.js';
 import afterSortableDestroy from './hooks/afterSortableDestroy.js';
@@ -19,18 +20,6 @@ export default function Sortable(opts = {}) {
             const dreamClass = dream.constructor;
             if (!dreamClass['globallyInitializingDecorators'])
                 return;
-            if (dreamClass['sti']['active']) {
-                if (!(dreamClass instanceof dreamClass['stiBaseClassOrOwnClass'])) {
-                    // what we should really be doing is throwing CannotCallSortableOnSTIChild,
-                    // but we cannot, since there is no way to know during this initializer if
-                    // the Sortable decorator was applied to the STI child, or the STI parent.
-                    //
-                    // because of this bizarre issue, we are forced to early return when
-                    // we are processing Sortable on an STI child.
-                    // throw new CannotCallSortableOnSTIChild(dreamClass)
-                    return;
-                }
-            }
             if (!Object.getOwnPropertyDescriptor(dreamClass, 'sortableFields')) {
                 // This pattern allows `sortableFields` on a base STI class and on
                 // child STI classes. The new `sortableFields` property will be created
@@ -55,7 +44,7 @@ export default function Sortable(opts = {}) {
             // before saving, we remember the new value for position, but clear it from our
             // supervised attributes to prevent position from saving
             dreamPrototype[beforeSaveMethodName] = async function (txn) {
-                let query = dreamClass.query();
+                let query = dreamClass.query().removeDefaultScope(STI_SCOPE_NAME);
                 if (txn)
                     query = query.txn(txn);
                 await beforeSortableSave({
@@ -70,7 +59,7 @@ export default function Sortable(opts = {}) {
                 // if no transaction is provided, leverage update commit hook instead
                 if (!txn)
                     return;
-                const query = dreamClass.query().txn(txn);
+                const query = dreamClass.query().removeDefaultScope(STI_SCOPE_NAME).txn(txn);
                 await afterUpdateSortable({
                     dream: this,
                     positionField,
@@ -83,7 +72,7 @@ export default function Sortable(opts = {}) {
                 // if transaction is provided, leverage update hook instead
                 if (txn)
                     return;
-                const query = dreamClass.query();
+                const query = dreamClass.query().removeDefaultScope(STI_SCOPE_NAME);
                 await afterUpdateSortable({
                     dream: this,
                     positionField,
@@ -98,7 +87,7 @@ export default function Sortable(opts = {}) {
                 // if no transaction is provided, leverage create commit hook instead
                 if (!txn)
                     return;
-                const query = dreamClass.query().txn(txn);
+                const query = dreamClass.query().removeDefaultScope(STI_SCOPE_NAME).txn(txn);
                 await afterSortableCreate({
                     dream: this,
                     positionField,
@@ -111,7 +100,7 @@ export default function Sortable(opts = {}) {
                 // if transaction is provided, leverage create hook instead
                 if (txn)
                     return;
-                const query = dreamClass.query();
+                const query = dreamClass.query().removeDefaultScope(STI_SCOPE_NAME);
                 await afterSortableCreate({
                     dream: this,
                     positionField,
@@ -125,7 +114,7 @@ export default function Sortable(opts = {}) {
                 // if no transaction is provided, leverage destroy commit hook instead
                 if (!txn)
                     return;
-                const query = dreamClass.query().txn(txn);
+                const query = dreamClass.query().removeDefaultScope(STI_SCOPE_NAME).txn(txn);
                 await afterSortableDestroy({
                     dream: this,
                     positionField,
@@ -137,7 +126,7 @@ export default function Sortable(opts = {}) {
                 // if transaction is provided, leverage destroy hook instead
                 if (txn)
                     return;
-                const query = dreamClass.query();
+                const query = dreamClass.query().removeDefaultScope(STI_SCOPE_NAME);
                 await afterSortableDestroy({
                     dream: this,
                     positionField,

package/dist/esm/src/index.js

@@ -7,22 +7,9 @@ export { default as DreamMigrationHelpers } from './db/migration-helpers/DreamMi
 export { default as validateColumn } from './db/validators/validateColumn.js';
 export { default as validateTable } from './db/validators/validateTable.js';
 export { default as Decorators } from './decorators/Decorators.js';
-export { default as AfterCreate } from './decorators/hooks/AfterCreate.js';
-export { default as AfterCreateCommit } from './decorators/hooks/AfterCreateCommit.js';
-export { default as AfterDestroy } from './decorators/hooks/AfterDestroy.js';
-export { default as AfterDestroyCommit } from './decorators/hooks/AfterDestroyCommit.js';
-export { default as AfterSave } from './decorators/hooks/AfterSave.js';
-export { default as AfterSaveCommit } from './decorators/hooks/AfterSaveCommit.js';
-export { default as AfterUpdate } from './decorators/hooks/AfterUpdate.js';
-export { default as AfterUpdateCommit } from './decorators/hooks/AfterUpdateCommit.js';
-export { default as BeforeCreate } from './decorators/hooks/BeforeCreate.js';
-export { default as BeforeDestroy } from './decorators/hooks/BeforeDestroy.js';
-export { default as BeforeSave } from './decorators/hooks/BeforeSave.js';
-export { default as BeforeUpdate } from './decorators/hooks/BeforeUpdate.js';
 export { default as ReplicaSafe } from './decorators/ReplicaSafe.js';
 export { default as Scope } from './decorators/Scope.js';
 export { default as SoftDelete } from './decorators/SoftDelete.js';
-export { default as Sortable } from './decorators/sortable/Sortable.js';
 export { default as STI } from './decorators/STI.js';
 export { default as Validate } from './decorators/validations/Validate.js';
 export { default as Validates } from './decorators/validations/Validates.js';

package/dist/types/src/Dream.d.ts

@@ -880,7 +880,7 @@ export default class Dream {
      *
      * ```ts
      * class Post extends ApplicationModel {
-     *   @Sortable({ scope: ['user']})
+     *   @Deco.Sortable({ scope: ['user']})
      *   public position: DreamColumn<User, 'position'>
      * }
      *