Fix idbstore.js with -sSTRICT + --closure (#23888)

Fixes: #23886

Author: sbc100

src/IDBStore.js

@@ -9,7 +9,9 @@ var IDBStore = {
     if (typeof indexedDB != 'undefined') return indexedDB;
     var ret = null;
     if (typeof window == 'object') ret = window.indexedDB || window.mozIndexedDB || window.webkitIndexedDB || window.msIndexedDB;
+#if ASSERTIONS
     assert(ret, 'IDBStore used, but indexedDB not supported');
+#endif
     return ret;
   },
   DB_VERSION: 22,

src/lib/libidbstore.js

@@ -112,36 +112,44 @@ var LibraryIDBStore = {
   emscripten_idb_store__async: true,
   emscripten_idb_store: (db, id, ptr, num, perror) => Asyncify.handleSleep((wakeUp) => {
     IDBStore.setFile(UTF8ToString(db), UTF8ToString(id), new Uint8Array(HEAPU8.subarray(ptr, ptr+num)), (error) => {
+      // Closure warns about storing booleans in TypedArrays.
+      /** @suppress{checkTypes} */
       {{{ makeSetValue('perror', 0, '!!error', 'i32') }}};
       wakeUp();
     });
   }),
   emscripten_idb_delete__async: true,
   emscripten_idb_delete: (db, id, perror) => Asyncify.handleSleep((wakeUp) => {
     IDBStore.deleteFile(UTF8ToString(db), UTF8ToString(id), (error) => {
+      /** @suppress{checkTypes} */
       {{{ makeSetValue('perror', 0, '!!error', 'i32') }}};
       wakeUp();
     });
   }),
   emscripten_idb_exists__async: true,
   emscripten_idb_exists: (db, id, pexists, perror) => Asyncify.handleSleep((wakeUp) => {
     IDBStore.existsFile(UTF8ToString(db), UTF8ToString(id), (error, exists) => {
+      /** @suppress{checkTypes} */
       {{{ makeSetValue('pexists', 0, '!!exists', 'i32') }}};
+      /** @suppress{checkTypes} */
       {{{ makeSetValue('perror',  0, '!!error', 'i32') }}};
       wakeUp();
     });
   }),
   emscripten_idb_clear__async: true,
   emscripten_idb_clear: (db, perror) => Asyncify.handleSleep((wakeUp) => {
     IDBStore.clearStore(UTF8ToString(db), (error) => {
+      /** @suppress{checkTypes} */
       {{{ makeSetValue('perror', 0, '!!error', 'i32') }}};
       wakeUp();
     });
   }),
   // extra worker methods - proxied
   emscripten_idb_load_blob__async: true,
   emscripten_idb_load_blob: (db, id, pblob, perror) => Asyncify.handleSleep((wakeUp) => {
+#if ASSERTIONS
     assert(!IDBStore.pending);
+#endif
     IDBStore.pending = (msg) => {
       IDBStore.pending = null;
       var blob = msg.blob;
@@ -150,7 +158,9 @@ var LibraryIDBStore = {
         wakeUp();
         return;
       }
+#if ASSERTIONS
       assert(blob instanceof Blob);
+#endif
       var blobId = IDBStore.blobs.length;
       IDBStore.blobs.push(blob);
       {{{ makeSetValue('pblob', 0, 'blobId', 'i32') }}};
@@ -165,7 +175,9 @@ var LibraryIDBStore = {
   }),
   emscripten_idb_store_blob__async: true,
   emscripten_idb_store_blob: (db, id, ptr, num, perror) => Asyncify.handleSleep((wakeUp) => {
+#if ASSERTIONS
     assert(!IDBStore.pending);
+#endif
     IDBStore.pending = (msg) => {
       IDBStore.pending = null;
       {{{ makeSetValue('perror', 0, '!!msg.error', 'i32') }}};
@@ -188,7 +200,9 @@ var LibraryIDBStore = {
     return 0;
   },
   emscripten_idb_free_blob: (blobId) => {
+#if ASSERTIONS
     assert(IDBStore.blobs[blobId]);
+#endif
     IDBStore.blobs[blobId] = null;
   },
 #else

test/test_browser.py

@@ -1484,7 +1484,7 @@ def test_idbstore_sync(self, asyncify):
     if asyncify == 2:
       self.require_jspi()
     secret = str(time.time())
-    self.btest('test_idbstore_sync.c', '8', emcc_args=['-lidbstore.js', f'-DSECRET="{secret}"', '-O3', '-g2', f'-sASYNCIFY={asyncify}'])
+    self.btest('test_idbstore_sync.c', '8', emcc_args=['-sSTRICT', '-lidbstore.js', f'-DSECRET="{secret}"', '-O3', '--closure=1', f'-sASYNCIFY={asyncify}'])
 
   def test_idbstore_sync_worker(self):
     secret = str(time.time())