build(parser-adapter-openapi-json-2): use nodenext for TypeScript mod…

…ules (#4463) Refs #4385
swagger-api · Nov 11, 2024 · 17b5fc2 · 17b5fc2
1 parent 2a563d8
commit 17b5fc2
Show file tree

Hide file tree

Showing 9 changed files with 45 additions and 12 deletions.
diff --git a/packages/apidom-parser-adapter-openapi-json-2/.eslintrc b/packages/apidom-parser-adapter-openapi-json-2/.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-openapi-json-2/package.json b/packages/apidom-parser-adapter-openapi-json-2/package.json
@@ -24,8 +24,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 mocha",
     "prepack": "copyfiles -u 3 ../../LICENSES/* LICENSES && copyfiles -u 2 ../../NOTICE .",
     "postpack": "rimraf NOTICE LICENSES"

diff --git a/packages/apidom-parser-adapter-openapi-json-2/src/adapter.ts b/packages/apidom-parser-adapter-openapi-json-2/src/adapter.ts
@@ -4,7 +4,7 @@ import { ParseResultElement, createNamespace } from '@swagger-api/apidom-core';
 import { parse as parseJSON, detect as detectJSON } from '@swagger-api/apidom-parser-adapter-json';
 import openApiNamespace, { SwaggerElement } from '@swagger-api/apidom-ns-openapi-2';
 
-export { default as mediaTypes } from './media-types';
+export { default as mediaTypes } from './media-types.ts';
 
 export const detectionRegExp = /"swagger"\s*:\s*"(?<version_json>2\.0)"/;
 

diff --git a/packages/apidom-parser-adapter-openapi-json-2/test/adapter.ts b/packages/apidom-parser-adapter-openapi-json-2/test/adapter.ts
@@ -5,7 +5,7 @@ import { assert, expect } from 'chai';
 import { isParseResultElement, sexprs } from '@swagger-api/apidom-core';
 import { isSwaggerElement } from '@swagger-api/apidom-ns-openapi-2';
 
-import * as adapter from '../src/adapter';
+import * as adapter from '../src/adapter.ts';
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 const jsonSpec = fs.readFileSync(path.join(__dirname, 'fixtures', 'sample-api.json')).toString();

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

diff --git a/packages/apidom-parser-adapter-openapi-json-2/test/mocha-bootstrap.ts b/packages/apidom-parser-adapter-openapi-json-2/test/mocha-bootstrap.ts
@@ -2,9 +2,9 @@ import * as chai from 'chai';
 import { jestSnapshotPlugin, addSerializer } from 'mocha-chai-jest-snapshot';
 
 // @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';
 
 chai.use(jestSnapshotPlugin());
 addSerializer(jestApiDOMSerializer);

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

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