Remove CJS build, update deps, use undici (#866)

Author: drwpow

.gitignore

@@ -1,3 +1,4 @@
+.dccache
 .cache
 .DS_Store
 .nyc_output/

bin/cli.js

@@ -4,7 +4,7 @@ import fs from "fs";
 import path from "path";
 import glob from "tiny-glob";
 import parser from "yargs-parser";
-import openapiTS from "../dist/esm/index.js";
+import openapiTS from "../dist/index.js";
 
 const GREEN = "\u001b[32m";
 const BOLD = "\u001b[1m";

package-lock.json

@@ -11,22 +11,13 @@
   "bin": {
     "openapi-typescript": "bin/cli.js"
   },
-  "main": "./dist/cjs/index.js",
-  "module": "./dist/esm/index.js",
+  "main": "./dist/index.js",
+  "module": "./dist/index.js",
   "type": "module",
-  "exports": {
-    ".": {
-      "browser": "./dist/esm/index.js",
-      "import": "./dist/esm/index.js",
-      "require": "./dist/cjs/index.cjs"
-    },
-    "./*": "./*"
-  },
   "files": [
     "bin",
     "dist",
-    "src",
-    "types"
+    "src"
   ],
   "repository": {
     "type": "git",
@@ -48,10 +39,7 @@
   },
   "homepage": "https://github.com/drwpow/openapi-typescript#readme",
   "scripts": {
-    "build": "rm -rf dist && npm run build:esm && npm run build:cjs && npm run build:cjs-types",
-    "build:cjs": "esbuild src/index.ts --bundle --format=cjs --outfile=dist/cjs/index.cjs --platform=node --target=es2019 --external:js-yaml --external:mime --external:node-fetch --external:prettier --external:tiny-glob",
-    "build:cjs-types": "echo \"import openapiTS from '../esm/index';\nexport default openapiTS;\nexport * from '../esm/index';\" > dist/cjs/index.d.ts",
-    "build:esm": "tsc",
+    "build": "rm -rf dist && tsc",
     "format": "npm run prettier -w .",
     "lint": "eslint .",
     "prepare": "npm run build",
@@ -63,28 +51,26 @@
   "dependencies": {
     "js-yaml": "^4.1.0",
     "mime": "^3.0.0",
-    "node-fetch": "^3.1.0",
     "prettier": "^2.5.1",
     "tiny-glob": "^0.2.9",
+    "undici": "^4.12.2",
     "yargs-parser": "^21.0.0"
   },
   "devDependencies": {
     "@types/js-yaml": "^4.0.5",
     "@types/mime": "^2.0.3",
-    "@types/node": "^17.0.8",
-    "@types/node-fetch": "^3.0.3",
-    "@types/prettier": "^2.4.2",
-    "@typescript-eslint/eslint-plugin": "^5.9.1",
-    "@typescript-eslint/parser": "^5.9.1",
+    "@types/node": "^17.0.10",
+    "@types/prettier": "^2.4.3",
+    "@typescript-eslint/eslint-plugin": "^5.10.0",
+    "@typescript-eslint/parser": "^5.10.0",
     "chai": "^4.3.4",
     "codecov": "^3.8.3",
     "eol": "^0.9.1",
-    "esbuild": "^0.14.11",
-    "eslint": "^8.6.0",
+    "eslint": "^8.7.0",
     "eslint-config-prettier": "^8.3.0",
     "eslint-plugin-prettier": "^4.0.0",
-    "mocha": "^9.1.3",
+    "mocha": "^9.1.4",
     "nyc": "^15.1.0",
-    "typescript": "^4.5.4"
+    "typescript": "^4.5.5"
   }
 }

package.json

@@ -1,4 +1,4 @@
-import type { GlobalContext, OpenAPI2, OpenAPI3, SchemaObject, SwaggerToTSOptions } from "./types";
+import type { GlobalContext, OpenAPI2, OpenAPI3, SchemaObject, SwaggerToTSOptions } from "./types.js";
 import path from "path";
 import prettier from "prettier";
 import parserTypescript from "prettier/parser-typescript.js";

src/index.ts

@@ -1,5 +1,6 @@
-import type { GlobalContext, Headers } from "./types";
-import fetch from "node-fetch";
+import type { GlobalContext, Headers } from "./types.js";
+import type { Dispatcher } from "undici";
+import { request } from "undici";
 import fs from "fs";
 import path from "path";
 import { URL } from "url";
@@ -136,9 +137,10 @@ export default async function load(
         }
       }
 
-      const res = await fetch(schemaID, { method: options.httpMethod || "GET", headers });
-      contentType = res.headers.get("Content-Type") || "";
-      contents = await res.text();
+      const res = await request(schemaID, { method: (options.httpMethod as Dispatcher.HttpMethod) || "GET", headers });
+      if (Array.isArray(res.headers["Content-Type"])) contentType = res.headers["Content-Type"][0];
+      else if (res.headers["Content-Type"]) contentType = res.headers["Content-Type"];
+      contents = await res.body.text();
     }
 
     const isYAML = contentType === "application/openapi+yaml" || contentType === "text/yaml";

src/load.ts

@@ -1,4 +1,4 @@
-import type { GlobalContext, HeaderObject } from "../types";
+import type { GlobalContext, HeaderObject } from "../types.js";
 import { comment, tsReadonly } from "../utils.js";
 import { transformSchemaObj } from "./schema.js";
 

src/transform/headers.ts

@@ -1,4 +1,4 @@
-import type { GlobalContext, OperationObject, PathItemObject } from "../types";
+import type { GlobalContext, OperationObject, PathItemObject } from "../types.js";
 import { comment, tsReadonly } from "../utils.js";
 import { transformHeaderObjMap } from "./headers.js";
 import { transformOperationObj } from "./operation.js";

src/transform/index.ts

@@ -1,4 +1,4 @@
-import type { GlobalContext, OperationObject, ParameterObject, PathItemObject } from "../types";
+import type { GlobalContext, OperationObject, ParameterObject, PathItemObject } from "../types.js";
 import { comment, isRef, tsReadonly } from "../utils.js";
 import { transformParametersArray } from "./parameters.js";
 import { transformRequestBodyObj } from "./request.js";

src/transform/operation.ts

@@ -1,4 +1,4 @@
-import type { GlobalContext, ParameterObject, ReferenceObject } from "../types";
+import type { GlobalContext, ParameterObject, ReferenceObject } from "../types.js";
 import { comment, tsReadonly } from "../utils.js";
 import { transformSchemaObj } from "./schema.js";
 

src/transform/parameters.ts

@@ -1,4 +1,4 @@
-import type { GlobalContext, OperationObject, ParameterObject, PathItemObject } from "../types";
+import type { GlobalContext, OperationObject, ParameterObject, PathItemObject } from "../types.js";
 import { comment, tsReadonly } from "../utils.js";
 import { transformOperationObj } from "./operation.js";
 import { transformParametersArray } from "./parameters.js";

src/transform/paths.ts

@@ -1,4 +1,4 @@
-import type { GlobalContext, RequestBody } from "../types";
+import type { GlobalContext, RequestBody } from "../types.js";
 import { comment, tsReadonly } from "../utils.js";
 import { transformSchemaObj } from "./schema.js";
 

src/transform/request.ts

@@ -1,4 +1,4 @@
-import type { GlobalContext } from "../types";
+import type { GlobalContext } from "../types.js";
 import { comment, tsReadonly } from "../utils.js";
 import { transformHeaderObjMap } from "./headers.js";
 import { transformSchemaObj } from "./schema.js";

src/transform/responses.ts

@@ -1,4 +1,4 @@
-import type { GlobalContext } from "../types";
+import type { GlobalContext } from "../types.js";
 import {
   prepareComment,
   nodeType,

src/transform/schema.ts

@@ -1,4 +1,4 @@
-import { OpenAPI2, OpenAPI3, ReferenceObject } from "./types";
+import type { OpenAPI2, OpenAPI3, ReferenceObject } from "./types.js";
 
 type CommentObject = {
   const?: boolean; // jsdoc without value

src/utils.ts

@@ -1,5 +1,5 @@
 import { expect } from "chai";
-import { transformOperationObj } from "../../dist/esm/transform/operation.js";
+import { transformOperationObj } from "../../dist/transform/operation.js";
 
 const defaults = {
   additionalProperties: false,

test/core/operation.test.js

@@ -1,5 +1,5 @@
 import { expect } from "chai";
-import { transformParametersArray } from "../../dist/esm/transform/parameters.js";
+import { transformParametersArray } from "../../dist/transform/parameters.js";
 
 const defaults = {
   additionalProperties: false,

test/core/parameters.test.js

@@ -1,6 +1,6 @@
 import { expect } from "chai";
 import prettier from "prettier";
-import { transformPathsObj as transform } from "../../dist/esm/transform/paths.js";
+import { transformPathsObj as transform } from "../../dist/transform/paths.js";
 
 function format(source) {
   return prettier.format(`export interface paths {\n${source}\n}`, { parser: "typescript" });

test/core/paths.test.js

@@ -1,6 +1,6 @@
 import { expect } from "chai";
 import prettier from "prettier";
-import { transformRequestBodies } from "../../dist/esm/transform/request.js";
+import { transformRequestBodies } from "../../dist/transform/request.js";
 
 const defaults = {
   additionalProperties: false,

test/core/request.test.js

@@ -2,7 +2,7 @@
  * Tests raw generation, pre-Prettier
  */
 import { expect } from "chai";
-import { transformSchemaObj as transform } from "../../dist/esm/transform/schema.js";
+import { transformSchemaObj as transform } from "../../dist/transform/schema.js";
 
 const defaults = {
   additionalProperties: false,

test/core/schema.test.js

@@ -1,7 +1,7 @@
 import { expect } from "chai";
 import eol from "eol";
 import fs from "fs";
-import openapiTS from "../../dist/esm/index.js";
+import openapiTS from "../../dist/index.js";
 
 describe("allow empty definitions", () => {
   const schema = {

test/opts/empty-definitions.test.js

@@ -1,7 +1,7 @@
 import { expect } from "chai";
 import fs from "fs";
 import eol from "eol";
-import openapiTS from "../../dist/esm/index.js";
+import openapiTS from "../../dist/index.js";
 
 describe("formatter", () => {
   it("basic", async () => {

test/opts/formatter.test.js

@@ -1,5 +1,5 @@
 import { expect } from "chai";
-import openapiTS from "../../dist/esm/index.js";
+import openapiTS from "../../dist/index.js";
 
 describe("rawSchema", () => {
   it("v2", async () => {

test/opts/raw-schema.test.js

@@ -1,7 +1,7 @@
 import { expect } from "chai";
 import fs from "fs";
 import eol from "eol";
-import openapiTS from "../../dist/esm/index.js";
+import openapiTS from "../../dist/index.js";
 
 describe("remote $refs", () => {
   it("resolves remote $refs", async () => {

test/opts/remote-schema.test.js

@@ -4,7 +4,7 @@ import eol from "eol";
 import fs from "fs";
 import yaml from "js-yaml";
 import { fileURLToPath } from "url";
-import openapiTS from "../../dist/esm/index.js";
+import openapiTS from "../../dist/index.js";
 
 const cmd = `node ../../bin/cli.js`;
 const cwd = new URL(".", import.meta.url);

test/v2/index.test.js

@@ -3,7 +3,7 @@ import { execSync } from "child_process";
 import eol from "eol";
 import fs from "fs";
 import yaml from "js-yaml";
-import openapiTS from "../../dist/esm/index.js";
+import openapiTS from "../../dist/index.js";
 import { fileURLToPath } from "url";
 
 const cmd = `node ../../bin/cli.js`;

test/v3/index.test.js

@@ -7,7 +7,7 @@
     "lib": ["ES2018"],
     "moduleResolution": "Node",
     "noImplicitReturns": true,
-    "outDir": "./dist/esm",
+    "outDir": "./dist",
     "removeComments": true,
     "sourceMap": true,
     "strict": true,