chore: update dev deps + typescript 6.x

.github/workflows/ci.yaml

@@ -5,13 +5,14 @@ on:
   push:
     branches:
       - main
+  workflow_dispatch:
 
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout/install
-        uses: adamhamlin/checkout-node-project@v1
+        uses: adamhamlin/checkout-node-project@v2
 
       - name: Run Tests
         run: npm run test:ci

package.json

@@ -48,14 +48,14 @@
     },
     "devDependencies": {
         "@adamhamlin/eslint-config": "^1.4.1",
-        "@tsconfig/recommended": "^1.0.7",
-        "@types/jest": "^29.5.12",
+        "@tsconfig/recommended": "^1.0.13",
+        "@types/jest": "^30.0.0",
         "@types/object-hash": "^3.0.6",
-        "husky": "^9.1.5",
-        "jest": "^29.7.0",
-        "lint-staged": "^15.2.10",
-        "ts-jest": "^29.2.5",
+        "husky": "^9.1.7",
+        "jest": "^30.4.2",
+        "lint-staged": "^17.0.8",
+        "ts-jest": "^29.4.11",
         "ts-node": "^10.9.2",
-        "typescript": "^5.5.4"
+        "typescript": "^6.0.3"
     }
 }

src/__tests__/normalizer.test.ts

@@ -2,7 +2,7 @@ import hash from 'object-hash';
 
 import { Normalizer } from '../normalizer';
 
-jest.mock('object-hash', () => {
+jest.mock<typeof import('object-hash')>('object-hash', () => {
     const origModule = jest.requireActual('object-hash');
     return {
         __esModule: true,

src/__tests__/options.test.ts

@@ -120,7 +120,7 @@ describe('options.ts', () => {
                 const opts = {
                     caseInsensitive: true,
                     // eslint-disable-next-line jest/no-conditional-in-test
-                    replacer: (val: unknown) => (typeof val === 'string' ? val.trimEnd() : val),
+                    replacer: (val: unknown) => (typeof val === 'string' ? val.trim() : val),
                 };
                 expect(areEqual([{ word: 'blah' }, { WORD: 'Blah    ' }], opts)).toBe(true);
             });

src/map.ts

@@ -91,7 +91,7 @@ export class DeepMap<K, V, TxK = K, TxV = V> extends Map<K, V> implements Compar
      * @yields the next key-value pair in the map
      * @inheritdoc
      */
-    override *[Symbol.iterator](): IterableIterator<[K, V]> {
+    override *[Symbol.iterator](): MapIterator<[K, V]> {
         for (const [_hashStr, pair] of this.map[Symbol.iterator]()) {
             yield [pair.key, pair.val];
         }
@@ -101,7 +101,7 @@ export class DeepMap<K, V, TxK = K, TxV = V> extends Map<K, V> implements Compar
      * @yields the next key-value pair in the map
      * @inheritdoc
      */
-    override *entries(): IterableIterator<[K, V]> {
+    override *entries(): MapIterator<[K, V]> {
         for (const entry of this[Symbol.iterator]()) {
             yield entry;
         }
@@ -110,7 +110,7 @@ export class DeepMap<K, V, TxK = K, TxV = V> extends Map<K, V> implements Compar
     /**
      * @inheritdoc
      */
-    override *keys(): IterableIterator<K> {
+    override *keys(): MapIterator<K> {
         for (const [key, _val] of this[Symbol.iterator]()) {
             yield key;
         }
@@ -119,7 +119,7 @@ export class DeepMap<K, V, TxK = K, TxV = V> extends Map<K, V> implements Compar
     /**
      * @inheritdoc
      */
-    override *values(): IterableIterator<V> {
+    override *values(): MapIterator<V> {
         for (const [_key, val] of this[Symbol.iterator]()) {
             yield val;
         }

src/set.ts

@@ -71,7 +71,7 @@ export class DeepSet<V, TxV = V> extends Set<V> implements Comparable<DeepSet<V,
     /**
      * @inheritdoc
      */
-    override *[Symbol.iterator](): IterableIterator<V> {
+    override *[Symbol.iterator](): SetIterator<V> {
         for (const [key, _val] of this.map[Symbol.iterator]()) {
             yield key;
         }
@@ -80,7 +80,7 @@ export class DeepSet<V, TxV = V> extends Set<V> implements Comparable<DeepSet<V,
     /**
      * @inheritdoc
      */
-    override *entries(): IterableIterator<[V, V]> {
+    override *entries(): SetIterator<[V, V]> {
         for (const val of this[Symbol.iterator]()) {
             yield [val, val];
         }
@@ -89,7 +89,7 @@ export class DeepSet<V, TxV = V> extends Set<V> implements Comparable<DeepSet<V,
     /**
      * @inheritdoc
      */
-    override *keys(): IterableIterator<V> {
+    override *keys(): SetIterator<V> {
         for (const val of this[Symbol.iterator]()) {
             yield val;
         }
@@ -98,7 +98,7 @@ export class DeepSet<V, TxV = V> extends Set<V> implements Comparable<DeepSet<V,
     /**
      * @inheritdoc
      */
-    override *values(): IterableIterator<V> {
+    override *values(): SetIterator<V> {
         yield* this.keys();
     }
 

tsconfig.json

@@ -2,7 +2,8 @@
     "extends": "@tsconfig/recommended/tsconfig.json",
     "compilerOptions": {
         "outDir": "./dist",
-        "declaration": true
+        "declaration": true,
+        "types": ["jest"]
     },
     "exclude": ["node_modules", "dist/**/*"]
 }