build(parser-adapter-json): use nodenext for TypeScript modules (#4454)

Refs #4385
swagger-api · Nov 8, 2024 · 43ab521 · 43ab521
1 parent 6571168
commit 43ab521
Show file tree

Hide file tree

Showing 23 changed files with 73 additions and 40 deletions.
diff --git a/packages/apidom-parser-adapter-json/.eslintrc b/packages/apidom-parser-adapter-json/.eslintrc
@@ -0,0 +1,22 @@
+{
+  "settings": {
+    "import/resolver": {
+      "typescript": {
+        "project": ["./tsconfig.json"]
+      }
+    }
+  },
+  "rules": {
+    "import/extensions": [
+      "error",
+      "always",
+      {
+        "ts": "always",
+        "tsx": "always",
+        "js": "always",
+        "jsx": "never",
+        "ignorePackages": true
+      }
+    ]
+  }
+}
diff --git a/packages/apidom-parser-adapter-json/package.json b/packages/apidom-parser-adapter-json/package.json
@@ -35,8 +35,8 @@
     "lint": "eslint ./",
     "lint:fix": "eslint ./ --fix",
     "clean": "rimraf --glob 'src/**/*.mjs' 'src/**/*.cjs' 'test/**/*.mjs' ./dist ./types",
-    "typescript:check-types": "tsc --noEmit",
-    "typescript:declaration": "tsc -p declaration.tsconfig.json && rollup -c config/rollup/types.dist.js",
+    "typescript:check-types": "tsc --noEmit && tsc -p ./test/tsconfig.json --noEmit",
+    "typescript:declaration": "tsc -p tsconfig.declaration.json && rollup -c config/rollup/types.dist.js",
     "test": "npm run build:es && cross-env BABEL_ENV=es babel test --out-dir test --extensions '.ts' --out-file-extension '.mjs' --root-mode 'upward' && cross-env NODE_ENV=test NODE_NO_WARNINGS=1 mocha",
     "perf": "cross-env BABEL_ENV=es babel ./test/perf/index.ts --out-file ./test/perf/index.mjs --root-mode 'upward' && cross-env NODE_ENV=test node ./test/perf/index.mjs",
     "perf:lexical-analysis": "cross-env BABEL_ENV=es babel ./test/perf/lexical-analysis.ts --out-file ./test/perf/lexical-analysis.mjs --root-mode 'upward' && cross-env NODE_ENV=test node ./test/perf/lexical-analysis.mjs",

diff --git a/packages/apidom-parser-adapter-json/src/adapter-browser.ts b/packages/apidom-parser-adapter-json/src/adapter-browser.ts
@@ -1,11 +1,11 @@
 import { ParseResultElement } from '@swagger-api/apidom-core';
 
-import lexicalAnalysis from './lexical-analysis/browser';
-import syntacticAnalysisDirect from './syntactic-analysis/direct';
-import syntacticAnalysisIndirect from './syntactic-analysis/indirect';
-import { detectionRegExp } from './adapter';
+import lexicalAnalysis from './lexical-analysis/browser.ts';
+import syntacticAnalysisDirect from './syntactic-analysis/direct/index.ts';
+import syntacticAnalysisIndirect from './syntactic-analysis/indirect/index.ts';
+import { detectionRegExp } from './adapter.ts';
 
-export { mediaTypes, namespace } from './adapter';
+export { mediaTypes, namespace } from './adapter.ts';
 export { detectionRegExp };
 
 export {

diff --git a/packages/apidom-parser-adapter-json/src/adapter-node.ts b/packages/apidom-parser-adapter-json/src/adapter-node.ts
@@ -1,11 +1,11 @@
 import { ParseResultElement } from '@swagger-api/apidom-core';
 
-import lexicalAnalysis from './lexical-analysis/node';
-import syntacticAnalysisDirect from './syntactic-analysis/direct';
-import syntacticAnalysisIndirect from './syntactic-analysis/indirect';
-import { detectionRegExp } from './adapter';
+import lexicalAnalysis from './lexical-analysis/node.ts';
+import syntacticAnalysisDirect from './syntactic-analysis/direct/index.ts';
+import syntacticAnalysisIndirect from './syntactic-analysis/indirect/index.ts';
+import { detectionRegExp } from './adapter.ts';
 
-export { mediaTypes, namespace } from './adapter';
+export { mediaTypes, namespace } from './adapter.ts';
 export { detectionRegExp };
 
 export {

diff --git a/packages/apidom-parser-adapter-json/src/adapter.ts b/packages/apidom-parser-adapter-json/src/adapter.ts
@@ -1,6 +1,6 @@
 import { createNamespace } from '@swagger-api/apidom-core';
 
-export { default as mediaTypes } from './media-types';
+export { default as mediaTypes } from './media-types.ts';
 
 export const namespace = createNamespace();
 

diff --git a/packages/apidom-parser-adapter-json/src/lexical-analysis/browser.ts b/packages/apidom-parser-adapter-json/src/lexical-analysis/browser.ts
@@ -1,4 +1,4 @@
-import './browser-patch';
+import './browser-patch.ts';
 
 import Parser, { Tree } from 'web-tree-sitter';
 import { ApiDOMError } from '@swagger-api/apidom-error';

diff --git a/packages/apidom-parser-adapter-json/src/syntactic-analysis/TreeCursorIterator.ts b/packages/apidom-parser-adapter-json/src/syntactic-analysis/TreeCursorIterator.ts
@@ -1,7 +1,7 @@
 import { TreeCursor as NodeTreeCursor } from 'tree-sitter';
 import { TreeCursor as WebTreeCursor } from 'web-tree-sitter';
 
-import TreeCursorSyntaxNode from './TreeCursorSyntaxNode';
+import TreeCursorSyntaxNode from './TreeCursorSyntaxNode.ts';
 
 class TreeCursorIterator {
   protected readonly cursor;

diff --git a/packages/apidom-parser-adapter-json/src/syntactic-analysis/direct/index.ts b/packages/apidom-parser-adapter-json/src/syntactic-analysis/direct/index.ts
@@ -9,8 +9,8 @@ import {
   getNodeType as getNodeTypeApiDOM,
 } from '@swagger-api/apidom-core';
 
-import CstVisitor from './visitors/CstVisitor';
-import TreeCursorIterator from '../TreeCursorIterator';
+import CstVisitor from './visitors/CstVisitor.ts';
+import TreeCursorIterator from '../TreeCursorIterator.ts';
 
 const keyMap = {
   document: ['children'],

diff --git a/packages/apidom-parser-adapter-json/src/syntactic-analysis/direct/visitors/CstVisitor.ts b/packages/apidom-parser-adapter-json/src/syntactic-analysis/direct/visitors/CstVisitor.ts
@@ -13,7 +13,7 @@ import {
   isPrimitiveElement,
 } from '@swagger-api/apidom-core';
 
-import TreeCursorSyntaxNode from '../../TreeCursorSyntaxNode';
+import TreeCursorSyntaxNode from '../../TreeCursorSyntaxNode.ts';
 
 /* eslint-disable no-underscore-dangle */
 

diff --git a/packages/apidom-parser-adapter-json/src/syntactic-analysis/indirect/index.ts b/packages/apidom-parser-adapter-json/src/syntactic-analysis/indirect/index.ts
@@ -3,13 +3,13 @@ import { Tree as WebTree } from 'web-tree-sitter';
 import { ParseResultElement } from '@swagger-api/apidom-core';
 import { visit } from '@swagger-api/apidom-ast';
 
-import TreeCursorIterator from '../TreeCursorIterator';
-import CstVisitor, { keyMap as cstKeyMap } from './visitors/CstVisitor';
+import TreeCursorIterator from '../TreeCursorIterator.ts';
+import CstVisitor, { keyMap as cstKeyMap } from './visitors/CstVisitor.ts';
 import JsonAstVisitor, {
   keyMap as astKeyMap,
   isNode,
   getNodeType,
-} from './visitors/JsonAstVisitor';
+} from './visitors/JsonAstVisitor.ts';
 
 type Tree = WebTree | NodeTree;
 

diff --git a/packages/apidom-parser-adapter-json/src/syntactic-analysis/indirect/visitors/CstVisitor.ts b/packages/apidom-parser-adapter-json/src/syntactic-analysis/indirect/visitors/CstVisitor.ts
@@ -17,7 +17,7 @@ import {
   Error,
 } from '@swagger-api/apidom-ast';
 
-import TreeCursorSyntaxNode from '../../TreeCursorSyntaxNode';
+import TreeCursorSyntaxNode from '../../TreeCursorSyntaxNode.ts';
 
 export const keyMap = {
   document: ['children'],

diff --git a/packages/apidom-parser-adapter-json/test/adapter-browser.ts b/packages/apidom-parser-adapter-json/test/adapter-browser.ts
@@ -4,7 +4,7 @@ import { fileURLToPath } from 'node:url';
 import { expect, assert } from 'chai';
 import { sexprs, isObjectElement, isParseResultElement } from '@swagger-api/apidom-core';
 
-import * as adapter from '../src/adapter-browser';
+import * as adapter from '../src/adapter-browser.ts';
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 const spec = fs.readFileSync(path.join(__dirname, 'fixtures', 'sample-data.json')).toString();

diff --git a/packages/apidom-parser-adapter-json/test/adapter-node.ts b/packages/apidom-parser-adapter-json/test/adapter-node.ts
@@ -4,7 +4,7 @@ import { fileURLToPath } from 'node:url';
 import { expect, assert } from 'chai';
 import { sexprs, toJSON, isObjectElement, isParseResultElement } from '@swagger-api/apidom-core';
 
-import * as adapter from '../src/adapter-node';
+import * as adapter from '../src/adapter-node.ts';
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 const spec = fs.readFileSync(path.join(__dirname, 'fixtures', 'sample-data.json')).toString();

diff --git a/packages/apidom-parser-adapter-json/test/media-types.ts b/packages/apidom-parser-adapter-json/test/media-types.ts
@@ -1,7 +1,7 @@
 import { assert } from 'chai';
 import ApiDOMParser from '@swagger-api/apidom-parser';
 
-import * as jsonAdapter from '../src/adapter-node';
+import * as jsonAdapter from '../src/adapter-node.ts';
 
 describe('given adapter is used in parser', function () {
   const parser = new ApiDOMParser().use(jsonAdapter);

diff --git a/packages/apidom-parser-adapter-json/test/mocha-bootstrap.ts b/packages/apidom-parser-adapter-json/test/mocha-bootstrap.ts
@@ -3,9 +3,9 @@ import { jestSnapshotPlugin, addSerializer } from 'mocha-chai-jest-snapshot';
 import jsdomGlobal from 'jsdom-global';
 
 // @ts-ignore
-import * as jestApiDOMSerializer from '../../../scripts/jest-serializer-apidom';
+import * as jestApiDOMSerializer from '../../../scripts/jest-serializer-apidom.mjs';
 // @ts-ignore
-import * as jestStringSerializer from '../../../scripts/jest-serializer-string';
+import * as jestStringSerializer from '../../../scripts/jest-serializer-string.mjs';
 
 /**
  * Configure snapshot testing.

diff --git a/packages/apidom-parser-adapter-json/test/perf/index.ts b/packages/apidom-parser-adapter-json/test/perf/index.ts
@@ -2,9 +2,9 @@
 import Benchmark from 'benchmark';
 import type { Event } from 'benchmark';
 
-import lexicalAnalysisBench from './lexical-analysis';
-import parseSyntacticAnalysisDirectBench from './parse-syntactic-analysis-direct';
-import parseSyntacticAnalysisIndirectBench from './parse-syntactic-analysis-indirect';
+import lexicalAnalysisBench from './lexical-analysis.ts';
+import parseSyntacticAnalysisDirectBench from './parse-syntactic-analysis-direct.ts';
+import parseSyntacticAnalysisIndirectBench from './parse-syntactic-analysis-indirect.ts';
 
 const suite = new Benchmark.Suite();
 

diff --git a/packages/apidom-parser-adapter-json/test/perf/lexical-analysis.ts b/packages/apidom-parser-adapter-json/test/perf/lexical-analysis.ts
@@ -5,7 +5,7 @@ import { fileURLToPath } from 'node:url';
 import Benchmark from 'benchmark';
 import type { Deferred } from 'benchmark';
 
-import analyze from '../../src/lexical-analysis/node';
+import analyze from '../../src/lexical-analysis/node.ts';
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 const fixturePath = path.join(__dirname, 'fixtures/data.json');

diff --git a/packages/apidom-parser-adapter-json/test/perf/parse-syntactic-analysis-direct.ts b/packages/apidom-parser-adapter-json/test/perf/parse-syntactic-analysis-direct.ts
@@ -4,7 +4,7 @@ import path from 'node:path';
 import { fileURLToPath } from 'node:url';
 import Benchmark, { Deferred } from 'benchmark';
 
-import { parse } from '../../src/adapter-node';
+import { parse } from '../../src/adapter-node.ts';
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 const fixturePath = path.join(__dirname, 'fixtures/data.json');

diff --git a/packages/apidom-parser-adapter-json/test/perf/parse-syntactic-analysis-indirect.ts b/packages/apidom-parser-adapter-json/test/perf/parse-syntactic-analysis-indirect.ts
@@ -5,7 +5,7 @@ import { fileURLToPath } from 'node:url';
 import Benchmark from 'benchmark';
 import type { Event, Deferred } from 'benchmark';
 
-import { parse } from '../../src/adapter-node';
+import { parse } from '../../src/adapter-node.ts';
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 const fixturePath = path.join(__dirname, 'fixtures/data.json');

diff --git a/packages/apidom-parser-adapter-json/test/syntactic-analysis/TreeCursorIterator.ts b/packages/apidom-parser-adapter-json/test/syntactic-analysis/TreeCursorIterator.ts
@@ -1,7 +1,7 @@
 import { expect } from 'chai';
 
-import { lexicalAnalysis } from '../../src/adapter-node';
-import TreeCursorIterator from '../../src/syntactic-analysis/TreeCursorIterator';
+import { lexicalAnalysis } from '../../src/adapter-node.ts';
+import TreeCursorIterator from '../../src/syntactic-analysis/TreeCursorIterator.ts';
 
 describe('syntactic-analysis', function () {
   context('TreeCursorIterator', function () {

diff --git a/packages/apidom-parser-adapter-json/test/tsconfig.json b/packages/apidom-parser-adapter-json/test/tsconfig.json
@@ -0,0 +1,10 @@
+{
+  "extends": "../tsconfig.json",
+  "compilerOptions": {
+    "module": "esnext",
+    "moduleResolution": "node"
+  },
+  "include": [
+    "."
+  ]
+}
diff --git a/...er-adapter-json/declaration.tsconfig.json → ...er-adapter-json/tsconfig.declaration.json b/...er-adapter-json/declaration.tsconfig.json → ...er-adapter-json/tsconfig.declaration.json
@@ -1,8 +1,5 @@
 {
   "extends": "./tsconfig.json",
-  "exclude": [
-    "test/**/*"
-  ],
   "compilerOptions": {
     "declaration": true,
     "declarationDir": "types",

diff --git a/packages/apidom-parser-adapter-json/tsconfig.json b/packages/apidom-parser-adapter-json/tsconfig.json
@@ -1,7 +1,11 @@
 {
   "extends": "../../tsconfig.json",
+  "compilerOptions": {
+    "module": "nodenext",
+    "moduleResolution": "nodenext",
+    "allowImportingTsExtensions": true
+  },
   "include": [
-    "src/**/*",
-    "test/**/*"
+    "src/**/*"
   ]
 }