all passing tests!

Author: ef4

packages/@ember/-internals/metal/index.ts

@@ -47,6 +47,7 @@ export {
   ComputedDescriptor,
   type ElementDescriptor,
   isElementDescriptor,
+  isDecoratorCall,
   nativeDescDecorator,
   descriptorForDecorator,
   descriptorForProperty,

packages/@ember/-internals/metal/lib/alias.ts

@@ -16,7 +16,7 @@ import type { ExtendedMethodDecorator } from './decorator';
 import {
   ComputedDescriptor,
   descriptorForDecorator,
-  isElementDescriptor,
+  isDecoratorCall,
   makeComputedDecorator,
 } from './decorator';
 import { defineProperty } from './properties';
@@ -28,7 +28,7 @@ export type AliasDecorator = ExtendedMethodDecorator & PropertyDecorator & Alias
 export default function alias(altKey: string): AliasDecorator {
   assert(
     'You attempted to use @alias as a decorator directly, but it requires a `altKey` parameter',
-    !isElementDescriptor(Array.prototype.slice.call(arguments))
+    !isDecoratorCall(Array.prototype.slice.call(arguments))
   );
 
   // SAFETY: We passed in the impl for this class

packages/@ember/-internals/metal/lib/decorator.ts

@@ -42,6 +42,12 @@ export function isElementDescriptor(args: unknown[]): args is ElementDescriptor
   );
 }
 
+export function isDecoratorCall(
+  args: unknown[]
+): args is ElementDescriptor | Parameters<Decorator> {
+  return isElementDescriptor(args) || isModernDecoratorArgs(args);
+}
+
 export function nativeDescDecorator(propertyDesc: PropertyDescriptor) {
   let decorator = function () {
     return propertyDesc;

packages/@ember/object/lib/computed/computed_macros.ts

@@ -1,4 +1,4 @@
-import { computed, isElementDescriptor, alias, expandProperties } from '@ember/-internals/metal';
+import { computed, isDecoratorCall, alias, expandProperties } from '@ember/-internals/metal';
 import { get, set } from '@ember/object';
 import type { DeprecationOptions } from '@ember/debug';
 import { assert, deprecate } from '@ember/debug';
@@ -33,7 +33,7 @@ function generateComputedWithPredicate(name: string, predicate: (value: unknown)
 
     assert(
       `You attempted to use @${name} as a decorator directly, but it requires at least one dependent key parameter`,
-      !isElementDescriptor(properties)
+      !isDecoratorCall(properties)
     );
 
     let dependentKeys = expandPropertiesToArray(name, properties);
@@ -98,7 +98,7 @@ function generateComputedWithPredicate(name: string, predicate: (value: unknown)
 export function empty(dependentKey: string) {
   assert(
     'You attempted to use @empty as a decorator directly, but it requires a `dependentKey` parameter',
-    !isElementDescriptor(Array.prototype.slice.call(arguments))
+    !isDecoratorCall(Array.prototype.slice.call(arguments))
   );
 
   return computed(`${dependentKey}.length`, function () {
@@ -144,7 +144,7 @@ export function empty(dependentKey: string) {
 export function notEmpty(dependentKey: string) {
   assert(
     'You attempted to use @notEmpty as a decorator directly, but it requires a `dependentKey` parameter',
-    !isElementDescriptor(Array.prototype.slice.call(arguments))
+    !isDecoratorCall(Array.prototype.slice.call(arguments))
   );
 
   return computed(`${dependentKey}.length`, function () {
@@ -187,7 +187,7 @@ export function notEmpty(dependentKey: string) {
 export function none(dependentKey: string) {
   assert(
     'You attempted to use @none as a decorator directly, but it requires a `dependentKey` parameter',
-    !isElementDescriptor(Array.prototype.slice.call(arguments))
+    !isDecoratorCall(Array.prototype.slice.call(arguments))
   );
 
   return computed(dependentKey, function () {
@@ -229,7 +229,7 @@ export function none(dependentKey: string) {
 export function not(dependentKey: string) {
   assert(
     'You attempted to use @not as a decorator directly, but it requires a `dependentKey` parameter',
-    !isElementDescriptor(Array.prototype.slice.call(arguments))
+    !isDecoratorCall(Array.prototype.slice.call(arguments))
   );
 
   return computed(dependentKey, function () {
@@ -277,7 +277,7 @@ export function not(dependentKey: string) {
 export function bool(dependentKey: string) {
   assert(
     'You attempted to use @bool as a decorator directly, but it requires a `dependentKey` parameter',
-    !isElementDescriptor(Array.prototype.slice.call(arguments))
+    !isDecoratorCall(Array.prototype.slice.call(arguments))
   );
 
   return computed(dependentKey, function () {
@@ -323,7 +323,7 @@ export function bool(dependentKey: string) {
 export function match(dependentKey: string, regexp: RegExp) {
   assert(
     'You attempted to use @match as a decorator directly, but it requires `dependentKey` and `regexp` parameters',
-    !isElementDescriptor(Array.prototype.slice.call(arguments))
+    !isDecoratorCall(Array.prototype.slice.call(arguments))
   );
 
   return computed(dependentKey, function () {
@@ -369,7 +369,7 @@ export function match(dependentKey: string, regexp: RegExp) {
 export function equal(dependentKey: string, value: unknown) {
   assert(
     'You attempted to use @equal as a decorator directly, but it requires `dependentKey` and `value` parameter',
-    !isElementDescriptor(Array.prototype.slice.call(arguments))
+    !isDecoratorCall(Array.prototype.slice.call(arguments))
   );
 
   return computed(dependentKey, function () {
@@ -414,7 +414,7 @@ export function equal(dependentKey: string, value: unknown) {
 export function gt(dependentKey: string, value: number) {
   assert(
     'You attempted to use @gt as a decorator directly, but it requires `dependentKey` and `value` parameters',
-    !isElementDescriptor(Array.prototype.slice.call(arguments))
+    !isDecoratorCall(Array.prototype.slice.call(arguments))
   );
 
   return computed(dependentKey, function () {
@@ -459,7 +459,7 @@ export function gt(dependentKey: string, value: number) {
 export function gte(dependentKey: string, value: number) {
   assert(
     'You attempted to use @gte as a decorator directly, but it requires `dependentKey` and `value` parameters',
-    !isElementDescriptor(Array.prototype.slice.call(arguments))
+    !isDecoratorCall(Array.prototype.slice.call(arguments))
   );
 
   return computed(dependentKey, function () {
@@ -504,7 +504,7 @@ export function gte(dependentKey: string, value: number) {
 export function lt(dependentKey: string, value: number) {
   assert(
     'You attempted to use @lt as a decorator directly, but it requires `dependentKey` and `value` parameters',
-    !isElementDescriptor(Array.prototype.slice.call(arguments))
+    !isDecoratorCall(Array.prototype.slice.call(arguments))
   );
 
   return computed(dependentKey, function () {
@@ -549,7 +549,7 @@ export function lt(dependentKey: string, value: number) {
 export function lte(dependentKey: string, value: number) {
   assert(
     'You attempted to use @lte as a decorator directly, but it requires `dependentKey` and `value` parameters',
-    !isElementDescriptor(Array.prototype.slice.call(arguments))
+    !isDecoratorCall(Array.prototype.slice.call(arguments))
   );
 
   return computed(dependentKey, function () {
@@ -723,7 +723,7 @@ export const or = generateComputedWithPredicate('or', (value) => !value);
 export function oneWay(dependentKey: string) {
   assert(
     'You attempted to use @oneWay as a decorator directly, but it requires a `dependentKey` parameter',
-    !isElementDescriptor(Array.prototype.slice.call(arguments))
+    !isDecoratorCall(Array.prototype.slice.call(arguments))
   );
 
   return alias(dependentKey).oneWay() as PropertyDecorator;
@@ -787,7 +787,7 @@ export function oneWay(dependentKey: string) {
 export function readOnly(dependentKey: string) {
   assert(
     'You attempted to use @readOnly as a decorator directly, but it requires a `dependentKey` parameter',
-    !isElementDescriptor(Array.prototype.slice.call(arguments))
+    !isDecoratorCall(Array.prototype.slice.call(arguments))
   );
 
   return alias(dependentKey).readOnly() as PropertyDecorator;
@@ -831,7 +831,7 @@ export function readOnly(dependentKey: string) {
 export function deprecatingAlias(dependentKey: string, options: DeprecationOptions) {
   assert(
     'You attempted to use @deprecatingAlias as a decorator directly, but it requires `dependentKey` and `options` parameters',
-    !isElementDescriptor(Array.prototype.slice.call(arguments))
+    !isDecoratorCall(Array.prototype.slice.call(arguments))
   );
 
   return computed(dependentKey, {

packages/@ember/object/lib/computed/reduce_computed_macros.ts

@@ -3,7 +3,7 @@
 */
 import { DEBUG } from '@glimmer/env';
 import { assert } from '@ember/debug';
-import { autoComputed, isElementDescriptor } from '@ember/-internals/metal';
+import { autoComputed, isDecoratorCall } from '@ember/-internals/metal';
 import { computed, get } from '@ember/object';
 import { compare } from '@ember/utils';
 import EmberArray, { A as emberA, uniqBy as uniqByArray } from '@ember/array';
@@ -104,7 +104,7 @@ function multiArrayMacro(
 export function sum(dependentKey: string) {
   assert(
     'You attempted to use @sum as a decorator directly, but it requires a `dependentKey` parameter',
-    !isElementDescriptor(Array.prototype.slice.call(arguments))
+    !isDecoratorCall(Array.prototype.slice.call(arguments))
   );
 
   return reduceMacro(dependentKey, (sum: number, item: number) => sum + item, 0, 'sum');
@@ -168,7 +168,7 @@ export function sum(dependentKey: string) {
 export function max(dependentKey: string) {
   assert(
     'You attempted to use @max as a decorator directly, but it requires a `dependentKey` parameter',
-    !isElementDescriptor(Array.prototype.slice.call(arguments))
+    !isDecoratorCall(Array.prototype.slice.call(arguments))
   );
 
   return reduceMacro(dependentKey, (max, item) => Math.max(max, item), -Infinity, 'max');
@@ -231,7 +231,7 @@ export function max(dependentKey: string) {
 export function min(dependentKey: string) {
   assert(
     'You attempted to use @min as a decorator directly, but it requires a `dependentKey` parameter',
-    !isElementDescriptor(Array.prototype.slice.call(arguments))
+    !isDecoratorCall(Array.prototype.slice.call(arguments))
   );
 
   return reduceMacro(dependentKey, (min, item) => Math.min(min, item), Infinity, 'min');
@@ -328,7 +328,7 @@ export function map(
 ): PropertyDecorator {
   assert(
     'You attempted to use @map as a decorator directly, but it requires atleast `dependentKey` and `callback` parameters',
-    !isElementDescriptor(Array.prototype.slice.call(arguments))
+    !isDecoratorCall(Array.prototype.slice.call(arguments))
   );
 
   assert(
@@ -412,7 +412,7 @@ export function map(
 export function mapBy(dependentKey: string, propertyKey: string) {
   assert(
     'You attempted to use @mapBy as a decorator directly, but it requires `dependentKey` and `propertyKey` parameters',
-    !isElementDescriptor(Array.prototype.slice.call(arguments))
+    !isDecoratorCall(Array.prototype.slice.call(arguments))
   );
 
   assert(
@@ -554,7 +554,7 @@ export function filter(
 ): PropertyDecorator {
   assert(
     'You attempted to use @filter as a decorator directly, but it requires atleast `dependentKey` and `callback` parameters',
-    !isElementDescriptor(Array.prototype.slice.call(arguments))
+    !isDecoratorCall(Array.prototype.slice.call(arguments))
   );
 
   assert(
@@ -636,7 +636,7 @@ export function filter(
 export function filterBy(dependentKey: string, propertyKey: string, value?: unknown) {
   assert(
     'You attempted to use @filterBy as a decorator directly, but it requires atleast `dependentKey` and `propertyKey` parameters',
-    !isElementDescriptor(Array.prototype.slice.call(arguments))
+    !isDecoratorCall(Array.prototype.slice.call(arguments))
   );
 
   assert(
@@ -696,7 +696,7 @@ export function uniq(
 ): PropertyDecorator {
   assert(
     'You attempted to use @uniq/@union as a decorator directly, but it requires atleast one dependent key parameter',
-    !isElementDescriptor(Array.prototype.slice.call(arguments))
+    !isDecoratorCall(Array.prototype.slice.call(arguments))
   );
 
   let args = [dependentKey, ...additionalDependentKeys];
@@ -765,7 +765,7 @@ export function uniq(
 export function uniqBy(dependentKey: string, propertyKey: string) {
   assert(
     'You attempted to use @uniqBy as a decorator directly, but it requires `dependentKey` and `propertyKey` parameters',
-    !isElementDescriptor(Array.prototype.slice.call(arguments))
+    !isDecoratorCall(Array.prototype.slice.call(arguments))
   );
 
   assert(
@@ -864,7 +864,7 @@ export let union = uniq;
 export function intersect(dependentKey: string, ...additionalDependentKeys: string[]) {
   assert(
     'You attempted to use @intersect as a decorator directly, but it requires atleast one dependent key parameter',
-    !isElementDescriptor(Array.prototype.slice.call(arguments))
+    !isDecoratorCall(Array.prototype.slice.call(arguments))
   );
 
   let args = [dependentKey, ...additionalDependentKeys];
@@ -953,7 +953,7 @@ export function intersect(dependentKey: string, ...additionalDependentKeys: stri
 export function setDiff(setAProperty: string, setBProperty: string) {
   assert(
     'You attempted to use @setDiff as a decorator directly, but it requires atleast one dependent key parameter',
-    !isElementDescriptor(Array.prototype.slice.call(arguments))
+    !isDecoratorCall(Array.prototype.slice.call(arguments))
   );
 
   assert('`setDiff` computed macro requires exactly two dependent arrays.', arguments.length === 2);
@@ -1011,7 +1011,7 @@ export function setDiff(setAProperty: string, setBProperty: string) {
 export function collect(dependentKey: string, ...additionalDependentKeys: string[]) {
   assert(
     'You attempted to use @collect as a decorator directly, but it requires atleast one dependent key parameter',
-    !isElementDescriptor(Array.prototype.slice.call(arguments))
+    !isDecoratorCall(Array.prototype.slice.call(arguments))
   );
 
   let dependentKeys = [dependentKey, ...additionalDependentKeys];
@@ -1188,7 +1188,7 @@ export function sort(
 ): PropertyDecorator {
   assert(
     'You attempted to use @sort as a decorator directly, but it requires atleast an `itemsKey` parameter',
-    !isElementDescriptor(Array.prototype.slice.call(arguments))
+    !isDecoratorCall(Array.prototype.slice.call(arguments))
   );
 
   if (DEBUG) {