From b87b401a9cdfb6d37bef86e2e23f3947377c146e Mon Sep 17 00:00:00 2001
From: Jon Johnson <jon.johnson@ucsf.edu>
Date: Thu, 22 Sep 2022 10:36:45 -0700
Subject: [PATCH] Use array notation instead of at for accessing object at
 values (#8189)

---
 .../unit/record-arrays/record-array-test.js   | 46 +++++++++++++++++++
 .../record-arrays/identifier-array.ts         |  6 ++-
 2 files changed, 50 insertions(+), 2 deletions(-)

diff --git a/packages/-ember-data/tests/unit/record-arrays/record-array-test.js b/packages/-ember-data/tests/unit/record-arrays/record-array-test.js
index 96dfcddce11..fb0df1b14a1 100644
--- a/packages/-ember-data/tests/unit/record-arrays/record-array-test.js
+++ b/packages/-ember-data/tests/unit/record-arrays/record-array-test.js
@@ -183,6 +183,52 @@ module('unit/record-arrays/record-array - DS.RecordArray', function (hooks) {
     }
   );
 
+  deprecatedTest(
+    '#objectAt and #objectsAt',
+    { id: 'ember-data:deprecate-array-like', until: '5.0', count: 5 },
+    async function (assert) {
+      this.owner.register('model:tag', Tag);
+      let store = this.owner.lookup('service:store');
+
+      let records = store.push({
+        data: [
+          {
+            type: 'tag',
+            id: '1',
+            attributes: {
+              name: 'first',
+            },
+          },
+          {
+            type: 'tag',
+            id: '3',
+          },
+          {
+            type: 'tag',
+            id: '5',
+            attributes: {
+              name: 'fifth',
+            },
+          },
+        ],
+      });
+
+      let recordArray = new RecordArray({
+        type: 'recordType',
+        identifiers: records.map(recordIdentifierFor),
+        store,
+      });
+
+      assert.strictEqual(recordArray.length, 3);
+      assert.strictEqual(recordArray.objectAt(0).id, '1');
+      assert.strictEqual(recordArray.objectAt(-1).id, '5');
+      assert.deepEqual(
+        recordArray.objectsAt([2, 1]).map((r) => r.id),
+        ['5', '3']
+      );
+    }
+  );
+
   test('#update', async function (assert) {
     let findAllCalled = 0;
     let deferred = RSVP.defer();
diff --git a/packages/store/addon/-private/record-arrays/identifier-array.ts b/packages/store/addon/-private/record-arrays/identifier-array.ts
index 805c441ff00..6346f37e6a6 100644
--- a/packages/store/addon/-private/record-arrays/identifier-array.ts
+++ b/packages/store/addon/-private/record-arrays/identifier-array.ts
@@ -631,12 +631,14 @@ if (DEPRECATE_ARRAY_LIKE) {
 
   IdentifierArray.prototype.objectAt = function (index: number) {
     deprecateArrayLike(this.DEPRECATED_CLASS_NAME, 'objectAt', 'at');
-    return this.at(index);
+    //For negative index values go back from the end of the array
+    let arrIndex = Math.sign(index) === -1 ? this.length + index : index;
+    return this[arrIndex];
   };
 
   IdentifierArray.prototype.objectsAt = function (indeces: number[]) {
     deprecateArrayLike(this.DEPRECATED_CLASS_NAME, 'objectsAt', 'at');
-    return indeces.map((index) => this.at(index)!);
+    return indeces.map((index) => this.objectAt(index)!);
   };
 
   IdentifierArray.prototype.removeAt = function (index: number) {