Merge remote-tracking branch 'origin/main' into feature_refs_in_paths

Author: js2me

bun.lock

@@ -60,12 +60,12 @@
     "type-fest": "^5.4.4",
     "typescript": "~5.9.3",
     "yaml": "^2.8.2",
-    "yummies": "7.9.0"
+    "yummies": "7.10.0"
   },
   "devDependencies": {
     "@biomejs/biome": "2.4.5",
     "@changesets/changelog-github": "0.5.2",
-    "@changesets/cli": "2.29.8",
+    "@changesets/cli": "2.30.0",
     "@tsconfig/node20": "20.1.9",
     "@tsconfig/strictest": "2.0.8",
     "@types/node": "25.3.3",

package.json

@@ -1,8 +1,8 @@
+import * as fs from "node:fs";
+import path from "node:path";
 import type { resolve } from "@apidevtools/swagger-parser";
 import SwaggerParser from "@apidevtools/swagger-parser";
 import consola from "consola";
-import * as fs from "node:fs";
-import path from "node:path";
 import type { OpenAPI } from "openapi-types";
 import * as YAML from "yaml";
 import type { AnyObject, Maybe, Primitive } from "yummies/types";
@@ -86,8 +86,9 @@ export class ResolvedSwaggerSchema {
             Authorization: this.config.authorizationToken,
           }
         : {},
-      (this.config.requestOptions?.headers as Record<string, string> | undefined) ||
-        {},
+      (this.config.requestOptions?.headers as
+        | Record<string, string>
+        | undefined) || {},
     );
   }
 
@@ -124,7 +125,9 @@ export class ResolvedSwaggerSchema {
     return [...refs];
   }
 
-  private async fetchRemoteSchemaDocument(url: string): Promise<Maybe<AnyObject>> {
+  private async fetchRemoteSchemaDocument(
+    url: string,
+  ): Promise<Maybe<AnyObject>> {
     try {
       const response = await fetch(url, {
         headers: this.getRemoteRequestHeaders(),
@@ -155,7 +158,10 @@ export class ResolvedSwaggerSchema {
   }
 
   private async warmUpRemoteSchemasCache() {
-    if (typeof this.config.url !== "string" || !this.isHttpUrl(this.config.url)) {
+    if (
+      typeof this.config.url !== "string" ||
+      !this.isHttpUrl(this.config.url)
+    ) {
       return;
     }
 
@@ -212,7 +218,8 @@ export class ResolvedSwaggerSchema {
       return [];
     }
 
-    const [relativePath = "", rawPointer = ""] = this.normalizeRef(ref).split("#");
+    const [relativePath = "", rawPointer = ""] =
+      this.normalizeRef(ref).split("#");
     if (!relativePath) {
       return [];
     }
@@ -225,7 +232,10 @@ export class ResolvedSwaggerSchema {
 
     const bases = new Set<string>();
 
-    if (typeof this.config.url === "string" && this.isHttpUrl(this.config.url)) {
+    if (
+      typeof this.config.url === "string" &&
+      this.isHttpUrl(this.config.url)
+    ) {
       bases.add(this.config.url);
     }
 
@@ -240,7 +250,10 @@ export class ResolvedSwaggerSchema {
         const resolverPaths =
           typeof resolver.paths === "function" ? resolver.paths() : [];
         for (const resolverPath of resolverPaths) {
-          if (typeof resolverPath === "string" && this.isHttpUrl(resolverPath)) {
+          if (
+            typeof resolverPath === "string" &&
+            this.isHttpUrl(resolverPath)
+          ) {
             bases.add(resolverPath);
           }
         }
@@ -398,15 +411,17 @@ export class ResolvedSwaggerSchema {
       }
     }
 
-    const remoteAbsoluteCandidates = this.collectRemoteAbsoluteRefCandidates(ref);
+    const remoteAbsoluteCandidates =
+      this.collectRemoteAbsoluteRefCandidates(ref);
     for (const remoteAbsoluteRef of remoteAbsoluteCandidates) {
       const resolvedFromRemoteCache =
         this.resolveFromRemoteSchemaCache(remoteAbsoluteRef);
       if (resolvedFromRemoteCache) {
         return resolvedFromRemoteCache;
       }
 
-      const resolvedByRemoteAbsoluteRef = this.tryToResolveRef(remoteAbsoluteRef);
+      const resolvedByRemoteAbsoluteRef =
+        this.tryToResolveRef(remoteAbsoluteRef);
       if (resolvedByRemoteAbsoluteRef) {
         return this.normalizeResolvedExternalSchemaRef(
           remoteAbsoluteRef,

src/resolved-swagger-schema.ts

@@ -13,7 +13,9 @@ describe("paths-by-url", async () => {
   let server: ReturnType<typeof createServer> | null = null;
 
   beforeAll(async () => {
-    tmpRoot = await fs.mkdtemp(path.join(os.tmpdir(), "swagger-typescript-api"));
+    tmpRoot = await fs.mkdtemp(
+      path.join(os.tmpdir(), "swagger-typescript-api"),
+    );
     fixturesRoot = path.join(tmpRoot, "fixtures");
     outputRoot = path.join(tmpRoot, "output");
 

tests/spec/paths-by-url/basic.test.ts

@@ -120,7 +120,9 @@ describe("SwaggerSchemaResolver URL loading", () => {
         const host = req.headers.host || "127.0.0.1";
         const requestUrl = new URL(req.url || "/", `http://${host}`);
         const requestedPath = decodeURIComponent(requestUrl.pathname);
-        const filePath = path.resolve(path.join(fixturesRoot, `.${requestedPath}`));
+        const filePath = path.resolve(
+          path.join(fixturesRoot, `.${requestedPath}`),
+        );
         const file = await fs.readFile(filePath, { encoding: "utf8" });
         res.statusCode = 200;
         res.end(file);