Merge pull request #136 from universal-ember/remove-cached-polyfill

Keeping 3.28+ support, but remove the cached-decorator polyfill

Author: NullVoxPopuli

pnpm-lock.yaml

@@ -62,7 +62,6 @@
     "@embroider/macros": "^1.16.6",
     "decorator-transforms": "^2.2.2",
     "ember-async-data": "^1.0.3 || >=2.0.0",
-    "ember-cached-decorator-polyfill": "^1.0.2",
     "ember-resources": ">= 6.4.2"
   },
   "devDependencies": {

reactiveweb/package.json

@@ -0,0 +1,24 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
+import { dependencySatisfies, importSync, macroCondition } from '@embroider/macros';
+
+import type Owner from '@ember/owner';
+
+interface CompatOwner {
+  getOwner: (context: unknown) => Owner | undefined;
+  setOwner: (context: unknown, owner: Owner) => void;
+}
+
+export const compatOwner = {} as CompatOwner;
+
+if (macroCondition(dependencySatisfies('ember-source', '>=4.12.0'))) {
+  // In no version of ember where `@ember/owner` tried to be imported did it exist
+  // if (macroCondition(false)) {
+  // Using 'any' here because importSync can't lookup types correctly
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  compatOwner.getOwner = (importSync('@ember/owner') as any).getOwner;
+  compatOwner.setOwner = (importSync('@ember/owner') as any).setOwner;
+} else {
+  // Using 'any' here because importSync can't lookup types correctly
+  compatOwner.getOwner = (importSync('@ember/application') as any).getOwner;
+  compatOwner.setOwner = (importSync('@ember/application') as any).setOwner;
+}

reactiveweb/src/-private/ember-compat.ts

@@ -1,10 +1,14 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import { getOwner, setOwner } from '@ember/application';
 import { assert } from '@ember/debug';
 import { associateDestroyableChild } from '@ember/destroyable';
 
+import { compatOwner } from './-private/ember-compat.ts';
+
 import type { Class, Stage1Decorator, Stage1DecoratorDescriptor } from '#types';
 
+let getOwner = compatOwner.getOwner;
+let setOwner = compatOwner.setOwner;
+
 type NonKey<K> = K extends string ? never : K extends symbol ? never : K;
 
 /**

reactiveweb/src/link.ts

@@ -1,7 +1,10 @@
-import { cached } from '@glimmer/tracking';
-import { setOwner } from '@ember/application';
+import { createCache, getValue } from '@glimmer/tracking/primitives/cache';
 import { assert } from '@ember/debug';
 
+import { compatOwner } from './-private/ember-compat.ts';
+
+const setOwner = compatOwner.setOwner;
+
 /**
  * Public API of the return value of the [[map]] utility.
  */
@@ -231,8 +234,11 @@ export class TrackedArrayMap<Element = unknown, MappedTo = unknown>
     }) as TrackedArrayMap<Element, MappedTo>;
   }
 
-  @cached
-  get _records(): (Element & object)[] {
+  /**
+   * We don't want to use @cached
+   * because we support 3.28, and @cached was introduced in 4.1-4.5
+   */
+  #records = createCache(() => {
     let data = this._dataFn();
 
     assert(
@@ -241,6 +247,10 @@ export class TrackedArrayMap<Element = unknown, MappedTo = unknown>
     );
 
     return data as Array<Element & object>;
+  });
+
+  get _records(): (Element & object)[] {
+    return getValue(this.#records) as (Element & object)[];
   }
 
   values = () => [...this];

reactiveweb/src/map.ts

@@ -3,28 +3,14 @@ import { getValue } from '@glimmer/tracking/primitives/cache';
 import { assert } from '@ember/debug';
 import { associateDestroyableChild } from '@ember/destroyable';
 import { invokeHelper } from '@ember/helper';
-import {
-  dependencySatisfies,
-  importSync,
-  isDevelopingApp,
-  isTesting,
-  macroCondition,
-} from '@embroider/macros';
+import { isDevelopingApp, isTesting, macroCondition } from '@embroider/macros';
+
+import { compatOwner } from '../-private/ember-compat.ts';
 
 import type Owner from '@ember/owner';
 import type { Stage1DecoratorDescriptor } from '#types';
 
-let getOwner: (context: unknown) => Owner | undefined;
-
-if (macroCondition(dependencySatisfies('ember-source', '>=4.12.0'))) {
-  // Using 'any' here because importSync can't lookup types correctly
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  getOwner = (importSync('@ember/owner') as any).getOwner;
-} else {
-  // Using 'any' here because importSync can't lookup types correctly
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  getOwner = (importSync('@ember/application') as any).getOwner;
-}
+let getOwner = compatOwner.getOwner;
 
 /**
  * In order for the same cache to be used for all references