@scalar/oas-utils 0.2.63 → 0.2.64

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @scalar/oas-utils
 
+## 0.2.64
+
+### Patch Changes
+
+- 931106f: fix: rollback changes to fetchSpecFromUrl
+
 ## 0.2.63
 
 ### Patch Changes

package/dist/helpers/fetchSpecFromUrl.d.ts

@@ -1,5 +1,5 @@
 /**
- * Fetches an OpenAPI/Swagger document from a given URL.
+ * Fetches an OpenAPI/Swagger specification from a given URL.
  *
  * @throws an error if the fetch fails
  */

package/dist/helpers/fetchSpecFromUrl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fetchSpecFromUrl.d.ts","sourceRoot":"","sources":["../../src/helpers/fetchSpecFromUrl.ts"],"names":[],"mappings":"AAQA;;;;GAIG;AACH,wBAAsB,gBAAgB,CACpC,GAAG,EAAE,MAAM,EACX,KAAK,CAAC,EAAE,MAAM,EACd,QAAQ,UAAO,GACd,OAAO,CAAC,MAAM,CAAC,CAkCjB"}
+{"version":3,"file":"fetchSpecFromUrl.d.ts","sourceRoot":"","sources":["../../src/helpers/fetchSpecFromUrl.ts"],"names":[],"mappings":"AASA;;;;GAIG;AACH,wBAAsB,gBAAgB,CACpC,GAAG,EAAE,MAAM,EACX,KAAK,CAAC,EAAE,MAAM,EACd,QAAQ,UAAO,GACd,OAAO,CAAC,MAAM,CAAC,CA8BjB"}

package/dist/helpers/fetchSpecFromUrl.js

@@ -1,4 +1,4 @@
-import { fetchWithProxyFallback } from './fetchWithProxyFallback.js';
+import { redirectToProxy } from './redirectToProxy.js';
 import { formatJsonOrYamlString } from './parse.js';
 
 // Doesn’t work
@@ -6,7 +6,7 @@ const OLD_PROXY_URL = 'https://api.scalar.com/request-proxy';
 // Does work
 const NEW_PROXY_URL = 'https://proxy.scalar.com';
 /**
- * Fetches an OpenAPI/Swagger document from a given URL.
+ * Fetches an OpenAPI/Swagger specification from a given URL.
  *
  * @throws an error if the fetch fails
  */
@@ -16,22 +16,21 @@ async function fetchSpecFromUrl(url, proxy, beautify = true) {
         // eslint-disable-next-line no-param-reassign
         proxy = NEW_PROXY_URL;
     }
-    try {
-        const response = await fetchWithProxyFallback(url, proxy);
-        if (!response.ok) {
-            throw new Error(`Failed to fetch the OpenAPI document: ${url} (Status: ${response.status})`);
-        }
-        const text = await response.text();
-        // If it's JSON, make it pretty
-        return beautify ? formatJsonOrYamlString(text) : text;
-    }
-    catch (error) {
-        console.error(`[fetchSpecFromUrl] Failed to fetch the OpenAPI document at ${url}`, error);
+    // To use a proxy or not to use a proxy
+    const response = await fetch(proxy ? redirectToProxy(proxy, url) : url);
+    // Looks like the request failed
+    if (response.status !== 200) {
+        console.error(`[fetchSpecFromUrl] Failed to fetch the specification at ${url} (Status: ${response.status})`);
         if (!proxy) {
-            console.warn(`[fetchSpecFromUrl] Tried to fetch the OpenAPI document (${url}) without a proxy. Are the CORS headers configured to allow cross-domain requests? https://developer.mozilla.org/en-US/docs/Web/HTTP/CORS`);
+            console.warn(`[fetchSpecFromUrl] Tried to fetch the specification (url: ${url}) without a proxy. Are the CORS headers configured to allow cross-domain requests? https://developer.mozilla.org/en-US/docs/Web/HTTP/CORS`);
         }
-        throw error;
+        throw new Error(`Failed to fetch the specification (Status: ${response.status})`);
     }
+    // If it’s JSON, make it pretty
+    if (beautify)
+        return formatJsonOrYamlString(await response.text());
+    else
+        return await response.text();
 }
 
 export { fetchSpecFromUrl };

package/package.json

@@ -16,7 +16,7 @@
     "specification",
     "yaml"
   ],
-  "version": "0.2.63",
+  "version": "0.2.64",
   "engines": {
     "node": ">=18"
   },
@@ -108,18 +108,18 @@
     "zod": "^3.23.8",
     "@scalar/import": "0.0.3",
     "@scalar/object-utils": "1.1.10",
+    "@scalar/openapi-types": "0.1.4",
     "@scalar/themes": "0.9.44",
-    "@scalar/types": "0.0.17",
-    "@scalar/openapi-types": "0.1.4"
+    "@scalar/types": "0.0.17"
   },
   "devDependencies": {
     "type-fest": "^4.20.0",
     "vite": "^5.4.9",
     "vitest": "^1.6.0",
     "zod-to-ts": "^1.2.0",
-    "@scalar/build-tooling": "0.1.11",
     "@scalar/openapi-parser": "0.8.8",
-    "@scalar/openapi-types": "0.1.4"
+    "@scalar/openapi-types": "0.1.4",
+    "@scalar/build-tooling": "0.1.11"
   },
   "scripts": {
     "build": "scalar-build-rollup",