fix: Compatibility with ESM on Node 20 (#1098)

Add file extension to relative imports as recommended in https://www.typescriptlang.org/docs/handbook/esm-node.html
netwerk-digitaal-erfgoed · Sep 9, 2023 · 3539dd0 · 3539dd0
1 parent 0a0cc12
commit 3539dd0
Show file tree

Hide file tree

Showing 14 changed files with 42 additions and 40 deletions.
diff --git a/jest.config.js b/jest.config.js
@@ -13,8 +13,8 @@ export default {
     global: {
       lines: 90.87,
       statements: 90.87,
-      branches: 93.83,
-      functions: 89.79,
+      branches: 95.86,
+      functions: 91.52,
     },
   },
   transform: {
@@ -27,5 +27,6 @@ export default {
   },
   moduleNameMapper: {
     '^@netwerk-digitaal-erfgoed/(.*)$': '<rootDir>/packages/$1/src/',
+    '^(\\.{1,2}/.*)\\.js$': '$1',
   },
 };
diff --git a/packages/network-of-terms-catalog/src/index.ts b/packages/network-of-terms-catalog/src/index.ts
@@ -1 +1 @@
-export * from './getCatalog';
+export * from './getCatalog.js';
diff --git a/packages/network-of-terms-graphql/src/main.ts b/packages/network-of-terms-graphql/src/main.ts
@@ -1,6 +1,6 @@
 import {getCatalog} from '@netwerk-digitaal-erfgoed/network-of-terms-catalog';
-import {server} from './server';
-import {config} from './config';
+import {server} from './server.js';
+import {config} from './config.js';
 
 (async () => {
   try {

diff --git a/packages/network-of-terms-graphql/src/server.ts b/packages/network-of-terms-graphql/src/server.ts
@@ -1,7 +1,7 @@
 import fastify, {FastifyInstance} from 'fastify';
 import mercurius from 'mercurius';
-import {resolvers} from './resolvers';
-import {schema} from './schema';
+import {resolvers} from './resolvers.js';
+import {schema} from './schema.js';
 import fastifyCors from '@fastify/cors';
 import {Server} from 'http';
 import {

diff --git a/packages/network-of-terms-query/src/distributions.ts b/packages/network-of-terms-query/src/distributions.ts
@@ -1,11 +1,11 @@
 import {QueryEngine} from '@comunica/query-sparql';
 import Joi from 'joi';
 import Pino from 'pino';
-import {QueryTermsService, TermsResponse} from './query';
-import {QueryMode} from './search/query-mode';
-import {Catalog, IRI} from './catalog';
-import {comunica} from './index';
-import {clientQueriesCounter} from './instrumentation';
+import {QueryTermsService, TermsResponse} from './query.js';
+import {QueryMode} from './search/query-mode.js';
+import {Catalog, IRI} from './catalog.js';
+import {comunica} from './index.js';
+import {clientQueriesCounter} from './instrumentation.js';
 
 export interface QueryOptions {
   source: IRI;

diff --git a/packages/network-of-terms-query/src/index.ts b/packages/network-of-terms-query/src/index.ts
@@ -1,10 +1,10 @@
-export * from './query';
-export * from './catalog';
-export * from './lookup/lookup';
-export * from './terms';
-export * from './search/query-mode';
-export * from './distributions';
-export * from './helpers/logger';
+export * from './query.js';
+export * from './catalog.js';
+export * from './lookup/lookup.js';
+export * from './terms.js';
+export * from './search/query-mode.js';
+export * from './distributions.js';
+export * from './helpers/logger.js';
 
 import {QueryEngine} from '@comunica/query-sparql';
 

diff --git a/packages/network-of-terms-query/src/lookup/lookup.ts b/packages/network-of-terms-query/src/lookup/lookup.ts
@@ -1,4 +1,4 @@
-import {Catalog, Dataset, Distribution, IRI} from '../catalog';
+import {Catalog, Dataset, Distribution, IRI} from '../catalog.js';
 import {
   Error,
   QueryTermsService,
@@ -7,9 +7,9 @@ import {
   TermsResponse,
   TermsResult,
   TimeoutError,
-} from '../query';
-import {Term} from '../terms';
-import {clientQueriesCounter} from '../instrumentation';
+} from '../query.js';
+import {Term} from '../terms.js';
+import {clientQueriesCounter} from '../instrumentation.js';
 
 export type LookupQueryResult = {
   uri: IRI;

diff --git a/packages/network-of-terms-query/src/query.ts b/packages/network-of-terms-query/src/query.ts
@@ -1,17 +1,17 @@
 import * as Hoek from '@hapi/hoek';
 import Joi from 'joi';
-import {LoggerPino} from './helpers/logger-pino';
+import {LoggerPino} from './helpers/logger-pino.js';
 import Pino from 'pino';
 import PrettyMilliseconds from 'pretty-ms';
 import * as RDF from '@rdfjs/types';
 import {Bindings} from '@rdfjs/types';
-import {Term, TermsTransformer} from './terms';
-import {QueryMode, queryVariants} from './search/query-mode';
-import {Dataset, Distribution, IRI} from './catalog';
+import {Term, TermsTransformer} from './terms.js';
+import {QueryMode, queryVariants} from './search/query-mode.js';
+import {Dataset, Distribution, IRI} from './catalog.js';
 import {QueryEngine} from '@comunica/query-sparql';
 import {BindingsFactory} from '@comunica/bindings-factory';
 import {DataFactory} from 'rdf-data-factory';
-import {sourceQueriesHistogram} from './instrumentation';
+import {sourceQueriesHistogram} from './instrumentation.js';
 
 export type TermsResult = Terms | TimeoutError | ServerError;
 

diff --git a/packages/network-of-terms-query/src/server-test.ts b/packages/network-of-terms-query/src/server-test.ts
@@ -6,7 +6,7 @@ import {
   IRI,
   Organization,
   SparqlDistribution,
-} from './index';
+} from './index.js';
 import {setup, teardown as teardownServer} from 'jest-dev-server';
 import {dirname} from 'path';
 import {fileURLToPath} from 'url';

diff --git a/packages/network-of-terms-reconciliation/src/main.ts b/packages/network-of-terms-reconciliation/src/main.ts
@@ -1,6 +1,6 @@
-import {server} from './server';
+import {server} from './server.js';
 import {getCatalog} from '@netwerk-digitaal-erfgoed/network-of-terms-catalog';
-import {config} from './config';
+import {config} from './config.js';
 
 (async () => {
   try {

diff --git a/packages/network-of-terms-reconciliation/src/preview.ts b/packages/network-of-terms-reconciliation/src/preview.ts
@@ -6,7 +6,7 @@ import {
 } from '@netwerk-digitaal-erfgoed/network-of-terms-query';
 import {Literal} from '@rdfjs/types';
 import {escapeHtml} from '@hapi/hoek';
-import {locale} from './server';
+import {locale} from './server.js';
 
 export function preview(
   lookupResult: LookupQueryResult,

diff --git a/packages/network-of-terms-reconciliation/src/query.ts b/packages/network-of-terms-reconciliation/src/query.ts
@@ -5,7 +5,7 @@ import {
   QueryTermsService,
   Terms,
 } from '@netwerk-digitaal-erfgoed/network-of-terms-query';
-import {score} from './score';
+import {score} from './score.js';
 
 /**
  * Fan out reconciliation query batch to terminology source queries.

diff --git a/packages/network-of-terms-reconciliation/src/server.ts b/packages/network-of-terms-reconciliation/src/server.ts
@@ -1,10 +1,10 @@
 import fastify, {FastifyInstance} from 'fastify';
 import fastifyCors from '@fastify/cors';
 import fastifyAccepts from '@fastify/accepts';
-import {findManifest} from './manifest';
+import {findManifest} from './manifest.js';
 import formBodyPlugin from '@fastify/formbody';
-import {reconciliationQuery, ReconciliationQueryBatch} from './query';
-import {preview} from './preview';
+import {reconciliationQuery, ReconciliationQueryBatch} from './query.js';
+import {preview} from './preview.js';
 import en from './locales/en.json' assert {type: 'json'};
 import nl from './locales/nl.json' assert {type: 'json'};
 import {
@@ -22,7 +22,7 @@ import {
   dataExtensionProperties,
   DataExtensionQuery,
   extendQuery,
-} from './data-extension';
+} from './data-extension.js';
 import {EnvSchemaData} from 'env-schema';
 
 export async function server(

diff --git a/tsconfig.build.json b/tsconfig.build.json
@@ -2,16 +2,17 @@
   "extends": "./node_modules/gts/tsconfig-google.json",
   "compilerOptions": {
     "sourceMap": true,
-    "target": "es2018",
+    "target": "es2022",
     "lib": [
-      "ES2020"
+      "es2023"
     ],
     "module": "esnext",
     "declarationMap": true,
     "skipLibCheck": true,
     "esModuleInterop": true,
     "moduleResolution": "node",
     "resolveJsonModule": true,
-    "declaration": true
+    "declaration": true,
+    "forceConsistentCasingInFileNames": true
   }
 }