chore: enable useUnknownInCatchVariables TypeScript option

src/blob-store/live-download.js

@@ -241,7 +241,7 @@ export class DriveLiveDownload extends TypedEmitter {
       const [blobs] = await once(this.#drive, 'blobs', { signal: this.#signal })
       return blobs.core
     } catch (e) {
-      if (e.name === 'AbortError') return
+      if (e instanceof Error && e.name === 'AbortError') return
       throw e
     }
   }

src/config-import.js

@@ -2,6 +2,7 @@ import yauzl from 'yauzl-promise'
 import { validate, valueSchemas } from '@mapeo/schema'
 import { json, buffer } from 'node:stream/consumers'
 import path from 'node:path'
+import { isRecord } from './lib/object.js'
 
 // Throw error if a zipfile contains more than 10,000 entries
 const MAX_ENTRIES = 10_000
@@ -95,7 +96,11 @@ export async function readConfig(configPath) {
             }
           }
         } catch (err) {
-          warnings.push(err)
+          warnings.push(
+            err instanceof Error
+              ? err
+              : new Error('Unknown error importing icon')
+          )
         }
       }
       if (icon) {
@@ -253,14 +258,6 @@ function validatePresetsFile(presetsFile) {
   }
 }
 
-/**
- * @param {unknown} value
- * @returns {value is Record<string, unknown>}
- */
-function isRecord(value) {
-  return value !== null && typeof value === 'object' && !Array.isArray(value)
-}
-
 /**
  * @param {Record<string | symbol, unknown>} obj
  * @param {string | symbol} prop

src/lib/object.js

@@ -0,0 +1,9 @@
+// @ts-check
+
+/**
+ * @param {unknown} value
+ * @returns {value is Record<string, unknown>}
+ */
+export function isRecord(value) {
+  return value !== null && typeof value === 'object' && !Array.isArray(value)
+}

tests/lib/object.js

@@ -0,0 +1,28 @@
+// @ts-check
+import test from 'brittle'
+import { isRecord } from '../../src/lib/object.js'
+
+test('isRecord()', (t) => {
+  class Klass {}
+
+  const records = [
+    {},
+    { foo: 'bar' },
+    Object.create(null),
+    new Klass(),
+    new Error(),
+  ]
+  for (const value of records) t.ok(isRecord(value), 'value is record')
+
+  const others = [
+    undefined,
+    null,
+    0,
+    123,
+    'string',
+    Symbol('symbol'),
+    () => {},
+    [],
+  ]
+  for (const value of others) t.ok(!isRecord(value), 'value is not a record')
+})

tsconfig.json

@@ -7,6 +7,7 @@
     "strictNullChecks": true,
     "strictBindCallApply": true,
     "strictPropertyInitialization": true,
+    "useUnknownInCatchVariables": true,
     "allowSyntheticDefaultImports": true,
     "resolveJsonModule": true,
     "module": "Node16",