Update to Jest 30

Author: rubensworks

engines/query-sparql-link-traversal-solid/test/QuerySparqlLinkTraversalSolid-solidbench-test.ts

@@ -1,15 +1,11 @@
 /** @jest-environment setup-polly-jest/jest-environment-node */
-
-// Needed to undo automock from actor-http-native, cleaner workarounds do not appear to be working.
 import { QueryEngine } from '../lib';
 import { usePolly, loadQueries } from './util';
 
 if (!globalThis.window) {
-  jest.unmock('follow-redirects');
+  jest.useRealTimers();
 }
 
-jest.useRealTimers();
-
 const queries = loadQueries();
 
 describe('System test: QuerySparqlLinkTraversalSolid', () => {
@@ -43,7 +39,9 @@ describe('System test: QuerySparqlLinkTraversalSolid', () => {
   ], (file, expectedCount) => () => {
     it('produces the expected results', async() => {
       const bindings = await engine.queryBindings(queries[file], { lenient: true });
-      await expect((bindings.toArray())).resolves.toHaveLength(expectedCount);
+      // Ignore eslint suggestion to make this work in karma as well!
+      // eslint-disable-next-line jest/prefer-to-have-length
+      expect((await bindings.toArray()).length).toBe(expectedCount);
     });
   });
 

eslint.config.js

@@ -78,4 +78,22 @@ module.exports = config([
       'import/extensions': 'off',
     },
   },
+  {
+    // Karma setup script
+    files: [
+      'karma.setup.ts',
+    ],
+    rules: {
+      'import/no-extraneous-dependencies': 'off',
+    },
+  },
+  {
+    files: [
+      'eslint.config.js',
+    ],
+    rules: {
+      'ts/no-var-requires': 'off',
+      'ts/no-require-imports': 'off',
+    },
+  },
 ]);

karma.config.js

@@ -9,7 +9,7 @@ const testFiles = [
 // Based on https://github.com/tom-sherman/blog/blob/main/posts/02-running-jest-tests-in-a-browser.md
 module.exports = function(config) {
   config.set({
-    basePath: '',
+    basePath: __dirname,
     browserNoActivityTimeout: 100_000,
     plugins: [
       'karma-webpack',
@@ -21,15 +21,15 @@ module.exports = function(config) {
     ],
     frameworks: [ 'jasmine', 'webpack' ],
 
-    files: [ './karma-setup.js', ...testFiles ],
+    files: [ './karma.setup.ts', ...testFiles ],
     client: {
       args: [ '--grep', '/^(?!.*no browser).*$/' ],
       jasmine: {
         timeoutInterval: 50_000,
       },
     },
     preprocessors: {
-      './karma-setup.js': [ 'webpack' ],
+      './karma.setup.ts': [ 'webpack' ],
       ...Object.fromEntries(testFiles.map(key => [ key, [ 'webpack', 'sourcemap' ]])),
     },
 

karma-setup.js karma.setup.tskarma-setup.js renamed to karma.setup.ts

@@ -1,3 +1,8 @@
+/* eslint-disable import/first */
+(<any> window).process = {
+  env: {},
+};
+
 import expect from 'expect';
 import jest from 'jest-mock';
 
@@ -9,5 +14,5 @@ window.test.each = inputs => (testName, test) => {
   }
 };
 window.test.todo = function() {};
-window.jest = jest;
-window.expect = expect;
+(<any>window).jest = jest;
+(<any>window).expect = expect;

package.json

@@ -50,7 +50,7 @@
     "@pollyjs/persister-fs": "^6.0.6",
     "@rubensworks/eslint-config": "^3.0.0",
     "@rubensworks/process-sparql-benchmark-results": "^1.3.4",
-    "@types/jest": "^29.5.14",
+    "@types/jest": "^30.0.0",
     "@types/node": "^22.0.0",
     "@types/setup-polly-jest": "^0.5.5",
     "@types/triple-beam": "^1.3.5",
@@ -62,7 +62,8 @@
     "eslint": "^8.0.0",
     "husky": "^9.1.7",
     "immutable": "^5.0.3",
-    "jest": "^29.7.0",
+    "jest": "^30.2.0",
+    "jest-mock": "^29.3.1",
     "jest-rdf": "^2.0.0",
     "karma": "^6.4.4",
     "karma-chrome-launcher": "^3.2.0",
@@ -84,7 +85,7 @@
     "stream-to-string": "^1.2.1",
     "streamify-array": "^1.0.1",
     "streamify-string": "^1.0.1",
-    "ts-jest": "^29.2.5",
+    "ts-jest": "^29.4.4",
     "ts-loader": "^9.5.1",
     "ts-node": "^10.9.2",
     "typedoc": "^0.27.6",

packages/actor-extract-links-headers/test/ActorExtractLinksHeaders-test.ts

@@ -47,5 +47,52 @@ describe('ActorExtractLinksHeaders', () => {
           ],
         });
     });
+
+    it('should run on empty link headers', async() => {
+      const inputThis = new Headers();
+      inputThis.append('Content-Type', 'text-turtle');
+      inputThis.append('Location', '/storage/resource');
+      inputThis.append('Content-Length', '1024');
+      inputThis.append('Link', '');
+      await expect(actor.run({ url: 'http://pod.example.com/storage/resource', metadata: inputMetadata, headers: inputThis, requestTime: 0, context: new ActionContext() })).resolves
+        .toEqual({
+          links: [],
+        });
+    });
+
+    it('should run on no link headers', async() => {
+      const inputThis = new Headers();
+      inputThis.append('Content-Type', 'text-turtle');
+      inputThis.append('Location', '/storage/resource');
+      inputThis.append('Content-Length', '1024');
+      await expect(actor.run({ url: 'http://pod.example.com/storage/resource', metadata: inputMetadata, headers: inputThis, requestTime: 0, context: new ActionContext() })).resolves
+        .toEqual({
+          links: [],
+        });
+    });
+
+    it('should run on unknown link headers', async() => {
+      const inputThis = new Headers();
+      inputThis.append('Content-Type', 'text-turtle');
+      inputThis.append('Location', '/storage/resource');
+      inputThis.append('Content-Length', '1024');
+      inputThis.append('Link', '</storage/resource.meta>;rel="unknown"');
+      await expect(actor.run({ url: 'http://pod.example.com/storage/resource', metadata: inputMetadata, headers: inputThis, requestTime: 0, context: new ActionContext() })).resolves
+        .toEqual({
+          links: [],
+        });
+    });
+
+    it('should run on invalid link headers', async() => {
+      const inputThis = new Headers();
+      inputThis.append('Content-Type', 'text-turtle');
+      inputThis.append('Location', '/storage/resource');
+      inputThis.append('Content-Length', '1024');
+      inputThis.append('Link', '/storage/resource.meta;rel="describedby"');
+      await expect(actor.run({ url: 'http://pod.example.com/storage/resource', metadata: inputMetadata, headers: inputThis, requestTime: 0, context: new ActionContext() })).resolves
+        .toEqual({
+          links: [],
+        });
+    });
   });
 });

packages/actor-extract-links-solid-type-index/lib/ActorExtractLinksSolidTypeIndex.ts

@@ -165,14 +165,12 @@ export class ActorExtractLinksSolidTypeIndex extends ActorExtractLinks {
         .map(async predicate => [ predicate, await this.fetchPredicateDomains(predicate) ]));
       const predicateDomainsRec = Object.fromEntries(predicateDomainsInner);
       for (const [ predicate, subject ] of Object.entries(predicateSubjects)) {
-        const typeNames = predicateDomainsRec[predicate];
-        if (typeNames) {
-          for (const typeName of typeNames) {
-            if (!typeSubjects[typeName]) {
-              typeSubjects[typeName] = [];
-            }
-            typeSubjects[typeName].push(subject);
+        const typeNames = predicateDomainsRec[predicate]!;
+        for (const typeName of typeNames) {
+          if (!typeSubjects[typeName]) {
+            typeSubjects[typeName] = [];
           }
+          typeSubjects[typeName].push(subject);
         }
       }
     }