Merge pull request #21081 from emberjs/nvp/fix-ts-nightly

Author: kategengler

packages/@glimmer/validator/lib/collections/map.ts

@@ -57,6 +57,24 @@ class TrackedMap<K = unknown, V = unknown> implements Map<K, V> {
     return this.#vals.entries();
   }
 
+  getOrInsert(key: K, defaultValue: V): V {
+    consumeTag(this.#storageFor(key));
+
+    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+    // @ts-ignore -- older versions of TS don't yet have this method
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-return, @typescript-eslint/no-unsafe-call
+    return this.#vals.getOrInsert(key, defaultValue);
+  }
+
+  getOrInsertComputed(key: K, creator: (key: K) => V): V {
+    consumeTag(this.#storageFor(key));
+
+    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+    // @ts-ignore -- older versions of TS don't yet have this method
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-return, @typescript-eslint/no-unsafe-call
+    return this.#vals.getOrInsertComputed(key, creator);
+  }
+
   keys() {
     consumeTag(this.#collection);
 

packages/@glimmer/validator/test/collections/map-test.ts

@@ -49,6 +49,46 @@ module('@glimmer/validator: trackedMap', function () {
     assert.strictEqual(map.get('foo'), 456);
   });
 
+  test('getOrInsert', (assert) => {
+    const map = trackedMap();
+
+    if (
+      'getOrInsert' in map &&
+      typeof map.getOrInsert === 'function' &&
+      'getOrInsert' in Map.prototype
+    ) {
+      let v = map.getOrInsert('foo', 123);
+      assert.strictEqual(v, 123);
+
+      assert.strictEqual(map.get('foo'), 123);
+
+      // eslint-disable-next-line qunit/no-early-return
+      return;
+    }
+
+    assert.ok('This browser has not implemented getOrInsert');
+  });
+
+  test('getOrInsertComputed', (assert) => {
+    const map = trackedMap();
+
+    if (
+      'getOrInsertComputed' in map &&
+      typeof map.getOrInsertComputed === 'function' &&
+      'getOrInsertComputed' in Map.prototype
+    ) {
+      let v = map.getOrInsertComputed('foo', (key: string) => `${key}!`);
+      assert.strictEqual(v, 'foo!');
+
+      assert.strictEqual(map.get('foo'), 'foo!');
+
+      // eslint-disable-next-line qunit/no-early-return
+      return;
+    }
+
+    assert.ok('This browser has not implemented getOrInsert');
+  });
+
   test('has', (assert) => {
     const map = trackedMap();