Favor includes over indexOf.

Change-Id: I78a8334c025fe11d485cb2f9cb7cb4cb7dcb6c2c
Pavelas · Jun 27, 2019 · 28cc9f6 · 28cc9f6
1 parent a27f50d
commit 28cc9f6
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -47,6 +47,11 @@ const commonNoRestrictedSyntax = [
     'selector': 'MemberExpression[property.name="prototype"]',
     'message': 'Use ES6 classes not .prototype.',
   },
+  {
+    'selector': 'BinaryExpression[operator=/^([<>!=]=?)$/] > ' +
+                'CallExpression[callee.property.name=indexOf]',
+    'message': 'Use Array.includes instead of indexOf.',
+  },
 ];
 
 module.exports = {

diff --git a/lib/media/adaptation_set_criteria.js b/lib/media/adaptation_set_criteria.js
@@ -194,8 +194,8 @@ shaka.media.PreferenceBasedCriteria = class {
     return variants.filter((variant) => {
       const audio = variant.audio;
       const video = variant.video;
-      return (audio && audio.roles.indexOf(preferredRole) >= 0) ||
-             (video && video.roles.indexOf(preferredRole) >= 0);
+      return (audio && audio.roles.includes(preferredRole)) ||
+             (video && video.roles.includes(preferredRole));
     });
   }
 };
diff --git a/lib/offline/indexeddb/eme_session_storage_cell.js b/lib/offline/indexeddb/eme_session_storage_cell.js
@@ -74,7 +74,7 @@ shaka.offline.indexeddb.EmeSessionStorageCell = class {
     const op = this.connection_.startReadWriteOperation(this.store_);
 
     await op.forEachEntry((key, value, cursor) => {
-      if (sessionIds.indexOf(value.sessionId) >= 0) {
+      if (sessionIds.includes(value.sessionId)) {
         cursor.delete();
       }
     });

diff --git a/lib/offline/storage.js b/lib/offline/storage.js
@@ -1221,7 +1221,7 @@ shaka.offline.Storage = class {
     const deletedSessionIds = await deleter.delete(drmConfig, net, sessions);
     await sessionIdCell.remove(deletedSessionIds);
     await sessionIdCell.add(sessions.filter(
-        (session) => deletedSessionIds.indexOf(session.sessionId) == -1));
+        (session) => !deletedSessionIds.includes(session.sessionId)));
   }
 
   /**