Kill reopenClass

wagenet · wagenet · commit 4ee6f6816a26 · 2025-06-20T06:22:46.000-07:00
diff --git a/packages/@ember/-internals/container/tests/container_test.js b/packages/@ember/-internals/container/tests/container_test.js
@@ -432,11 +432,9 @@ moduleFor(
       let Apple = factory();
       let Orange = factory();
 
-      Apple.reopenClass({
-        _lazyInjections() {
-          return [{ specifier: 'orange:main' }, { specifier: 'banana:main' }];
-        },
-      });
+      Apple._lazyInjections = function () {
+        return [{ specifier: 'orange:main' }, { specifier: 'banana:main' }];
+      };
 
       registry.register('apple:main', Apple);
       registry.register('orange:main', Orange);
@@ -459,12 +457,10 @@ moduleFor(
       let Apple = factory();
       let Orange = factory();
 
-      Apple.reopenClass({
-        _lazyInjections: () => {
-          assert.ok(true, 'should call lazy injection method');
-          return [{ specifier: 'orange:main' }];
-        },
-      });
+      Apple._lazyInjections = () => {
+        assert.ok(true, 'should call lazy injection method');
+        return [{ specifier: 'orange:main' }];
+      };
 
       registry.register('apple:main', Apple);
       registry.register('orange:main', Orange);
diff --git a/packages/@ember/-internals/glimmer/lib/component.ts b/packages/@ember/-internals/glimmer/lib/component.ts
@@ -1103,7 +1103,7 @@ class Component<S = unknown>
     @property positionalParams
     @since 1.13.0
     */
-  declare static positionalParams: string | string[];
+  static positionalParams: string | string[];
 
   /**
     Layout can be used to wrap content in a component.
@@ -1614,11 +1614,6 @@ class Component<S = unknown>
   }
 }
 
-// We continue to use reopenClass here so that positionalParams can be overridden with reopenClass in subclasses.
-Component.reopenClass({
-  positionalParams: [],
-});
-
 setInternalComponentManager(CURLY_COMPONENT_MANAGER, Component);
 
 export default Component;
diff --git a/packages/@ember/-internals/glimmer/lib/views/outlet.ts b/packages/@ember/-internals/glimmer/lib/views/outlet.ts
@@ -37,10 +37,6 @@ export default class OutletView {
     };
   }
 
-  static reopenClass(injections: any): void {
-    Object.assign(this, injections);
-  }
-
   static create(options: {
     environment: BootEnvironment;
     application: InternalOwner;
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/attrs-lookup-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/attrs-lookup-test.js
@@ -143,6 +143,8 @@ moduleFor(
 
       let instance;
       let FooBarComponent = class extends Component {
+        static positionalParams = ['firstPositional'];
+
         init() {
           super.init(...arguments);
           instance = this;
@@ -166,10 +168,6 @@ moduleFor(
         }
       };
 
-      FooBarComponent.reopenClass({
-        positionalParams: ['firstPositional'],
-      });
-
       this.registerComponent('foo-bar', { ComponentClass: FooBarComponent });
 
       this.render(`{{foo-bar this.firstPositional first=this.first second=this.second}}`, {
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/component-template-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/component-template-test.js
@@ -62,14 +62,7 @@ moduleFor(
         return;
       }
 
-      let Thing = setComponentTemplate(
-        compile('hello'),
-        Component.extend().reopenClass({
-          toString() {
-            return 'Thing';
-          },
-        })
-      );
+      let Thing = setComponentTemplate(compile('hello'), Component.extend());
 
       assert.throws(() => {
         setComponentTemplate(compile('foo'), Thing);
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js
@@ -3253,9 +3253,9 @@ moduleFor(
 
       expectAssertion(() => {
         this.registerComponent('foo-bar', {
-          ComponentClass: MyComponent.reopenClass({
-            positionalParams: ['myVar'],
-          }),
+          ComponentClass: class extends MyComponent {
+            static positionalParams = ['myVar'];
+          },
           template:
             'MyVar1: {{attrs.myVar}} {{this.myVar}} MyVar2: {{this.myVar2}} {{attrs.myVar2}}',
         });
@@ -3268,9 +3268,9 @@ moduleFor(
 
       expectDeprecation(() => {
         this.registerComponent('foo-bar', {
-          ComponentClass: MyComponent.reopenClass({
-            positionalParams: ['myVar'],
-          }),
+          ComponentClass: class extends MyComponent {
+            static positionalParams = ['myVar'];
+          },
           template:
             'MyVar1: {{this.attrs.myVar}} {{this.myVar}} MyVar2: {{this.myVar2}} {{this.attrs.myVar2}}',
         });
@@ -3285,9 +3285,9 @@ moduleFor(
       let MyComponent = class extends Component {};
 
       this.registerComponent('foo-bar', {
-        ComponentClass: MyComponent.reopenClass({
-          positionalParams: ['myVar'],
-        }),
+        ComponentClass: class extends MyComponent {
+          static positionalParams = ['myVar'];
+        },
         template: 'MyVar1: {{@myVar}} {{this.myVar}} MyVar2: {{this.myVar2}} {{@myVar2}}',
       });
 
diff --git a/packages/@ember/engine/index.ts b/packages/@ember/engine/index.ts
@@ -551,10 +551,7 @@ export function buildInitializerMethod<
     // SAFETY: The superclass may be an Engine, we don't call unless we confirmed it was ok.
     let superclass = this.superclass as typeof Engine;
     if (superclass[bucketName] !== undefined && superclass[bucketName] === this[bucketName]) {
-      let attrs = {
-        [bucketName]: Object.create(this[bucketName]),
-      };
-      this.reopenClass(attrs);
+      this[bucketName] = Object.create(this[bucketName]);
     }
 
     assert(
diff --git a/packages/@ember/object/core.ts b/packages/@ember/object/core.ts
@@ -17,8 +17,7 @@ import {
   DEBUG_INJECTION_FUNCTIONS,
   hasUnknownProperty,
 } from '@ember/-internals/metal';
-import Mixin, { applyMixin } from '@ember/object/mixin';
-import { ActionHandler } from '@ember/-internals/runtime';
+import Mixin from '@ember/object/mixin';
 import makeArray from '@ember/array/make';
 import { assert } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
@@ -801,71 +800,6 @@ class CoreObject {
     return instance as InstanceType<C> & MergeArray<Args>;
   }
 
-  /**
-    Augments a constructor's own properties and functions:
-
-    ```javascript
-    import EmberObject from '@ember/object';
-
-    const MyObject = EmberObject.extend({
-      name: 'an object'
-    });
-
-    MyObject.reopenClass({
-      canBuild: false
-    });
-
-    MyObject.canBuild; // false
-    o = MyObject.create();
-    ```
-
-    In other words, this creates static properties and functions for the class.
-    These are only available on the class and not on any instance of that class.
-
-    ```javascript
-    import EmberObject from '@ember/object';
-
-    const Person = EmberObject.extend({
-      name: '',
-      sayHello() {
-        alert(`Hello. My name is ${this.get('name')}`);
-      }
-    });
-
-    Person.reopenClass({
-      species: 'Homo sapiens',
-
-      createPerson(name) {
-        return Person.create({ name });
-      }
-    });
-
-    let tom = Person.create({
-      name: 'Tom Dale'
-    });
-    let yehuda = Person.createPerson('Yehuda Katz');
-
-    tom.sayHello(); // "Hello. My name is Tom Dale"
-    yehuda.sayHello(); // "Hello. My name is Yehuda Katz"
-    alert(Person.species); // "Homo sapiens"
-    ```
-
-    Note that `species` and `createPerson` are *not* valid on the `tom` and `yehuda`
-    variables. They are only valid on `Person`.
-
-    @method reopenClass
-    @for @ember/object
-    @static
-    @public
-  */
-  static reopenClass<C extends typeof CoreObject>(
-    this: C,
-    ...mixins: Array<Mixin | Record<string, unknown>>
-  ): C {
-    applyMixin(this, mixins);
-    return this;
-  }
-
   static detect(obj: unknown) {
     if ('function' !== typeof obj) {
       return false;
diff --git a/packages/@ember/object/mixin.ts b/packages/@ember/object/mixin.ts
@@ -393,7 +393,7 @@ function updateObserversAndListeners(obj: object, key: string, fn: Function, add
   }
 }
 
-export function applyMixin(
+function applyMixin(
   obj: Record<string, any>,
   mixins: Array<Mixin | Record<string, unknown>>,
   _hideKeys = false
diff --git a/packages/@ember/object/tests/extend_test.js b/packages/@ember/object/tests/extend_test.js
@@ -1,4 +1,4 @@
-import { computed, get } from '@ember/object';
+import { computed } from '@ember/object';
 import EmberObject, { observer } from '@ember/object';
 import { moduleFor, AbstractTestCase, runLoopSettled } from 'internal-test-helpers';
 
@@ -92,36 +92,6 @@ moduleFor(
       );
     }
 
-    ['@test With concatenatedProperties class properties'](assert) {
-      let SomeClass = EmberObject.extend();
-      SomeClass.reopenClass({
-        concatenatedProperties: ['things'],
-        things: 'foo',
-      });
-      let AnotherClass = SomeClass.extend();
-      AnotherClass.reopenClass({ things: 'bar' });
-      let YetAnotherClass = SomeClass.extend();
-      YetAnotherClass.reopenClass({ things: 'baz' });
-      let some = SomeClass.create();
-      let another = AnotherClass.create();
-      let yetAnother = YetAnotherClass.create();
-      assert.deepEqual(
-        get(some.constructor, 'things'),
-        ['foo'],
-        'base class should have just its value'
-      );
-      assert.deepEqual(
-        get(another.constructor, 'things'),
-        ['foo', 'bar'],
-        "subclass should have base class' and its own"
-      );
-      assert.deepEqual(
-        get(yetAnother.constructor, 'things'),
-        ['foo', 'baz'],
-        "subclass should have base class' and its own"
-      );
-    }
-
     async ['@test Overriding a computed property with an observer'](assert) {
       let Parent = EmberObject.extend({
         foo: computed(function () {
diff --git a/packages/@ember/object/tests/reopenClass_test.js b/packages/@ember/object/tests/reopenClass_test.js
diff --git a/packages/@ember/object/type-tests/core/index.test.ts b/packages/@ember/object/type-tests/core/index.test.ts
@@ -33,6 +33,3 @@ const co3 = CoreObject.create({ foo: '123', bar: 456 });
 // Note: we don't provide type creation via `.extend`. People should use native
 // classes instead.
 expectTypeOf(CoreObject.extend({ baz: 6 }).create()).not.toHaveProperty('baz');
-
-// NOTE: This is marked as @internal and will not be publicly available
-CoreObject.reopenClass({ baz: 6 });
diff --git a/packages/@ember/object/type-tests/ember-object.test.ts b/packages/@ember/object/type-tests/ember-object.test.ts
@@ -93,9 +93,6 @@ expectTypeOf(p2c.firstName).toEqualTypeOf<string>();
 // NOTE: This is marked as @internal and will not be publicly available
 Person.extend({ fullName: 6 });
 
-// NOTE: This is marked as @internal and will not be publicly available
-Person.reopenClass({ fullName: 6 });
-
 class MyComponent extends EmberObject {
   foo = 'bar';
 
diff --git a/packages/@ember/routing/router.ts b/packages/@ember/routing/router.ts
@@ -194,15 +194,7 @@ class EmberRouter extends EmberObject.extend(Evented) implements Evented {
 
   private namespace: any;
 
-  // Begin Evented
-  declare on: (name: string, method: ((...args: any[]) => void) | string) => this;
-  declare one: (name: string, method: string | ((...args: any[]) => void)) => this;
-  declare trigger: (name: string, ...args: any[]) => unknown;
-  declare off: (name: string, method: string | ((...args: any[]) => void)) => this;
-  declare has: (name: string) => boolean;
-  // End Evented
-
-  // Set with reopenClass
+  // Set by `map`
   private static dslCallbacks?: DSLCallback[];
 
   /**
@@ -246,8 +238,6 @@ class EmberRouter extends EmberObject.extend(Evented) implements Evented {
   static map(callback: DSLCallback) {
     if (!this.dslCallbacks) {
       this.dslCallbacks = [];
-      // FIXME: Can we remove this?
-      this.reopenClass({ dslCallbacks: this.dslCallbacks });
     }
 
     this.dslCallbacks.push(callback);
diff --git a/packages/internal-test-helpers/lib/factory.ts b/packages/internal-test-helpers/lib/factory.ts
@@ -33,10 +33,6 @@ export default function factory() {
       return new TestFactory(options);
     }
 
-    static reopenClass(options: Partial<typeof TestFactory>) {
-      setProperties(this, options);
-    }
-
     static extend(options: object) {
       class ChildTestFactory extends TestFactory {}
       setProperties(ChildTestFactory, options);
diff --git a/tests/docs/expected.js b/tests/docs/expected.js
@@ -422,9 +422,6 @@ module.exports = {
     'removeTestHelpers',
     'renderSettled',
     'reopen',
-    'reopenClass',
-    'replace',
-    'replaceContent',
     'replaceRoute',
     'replaceState',
     'replaceURL',

Original file line number	Diff line number	Diff line change
`@@ -393,7 +393,7 @@ function updateObserversAndListeners(obj: object, key: string, fn: Function, add`
`393`	`393`	`}`
`394`	`394`	`}`
`395`	`395`
`396`		`-export function applyMixin(`
	`396`	`+function applyMixin(`
`397`	`397`	`obj: Record<string, any>,`
`398`	`398`	`mixins: Array<Mixin \| Record<string, unknown>>,`
`399`	`399`	`_hideKeys = false`