Merge pull request #1822 from hey-api/fix/bump-json-schema-ref

Author: mrlubos

.changeset/big-boats-grin.md

@@ -0,0 +1,5 @@
+---
+'@hey-api/openapi-ts': patch
+---
+
+fix: bump json-schema-ref-parser package

packages/openapi-ts/package.json

@@ -79,7 +79,7 @@
     "node": "^18.18.0 || ^20.9.0 || >=22.10.0"
   },
   "dependencies": {
-    "@hey-api/json-schema-ref-parser": "1.0.2",
+    "@hey-api/json-schema-ref-parser": "1.0.3",
     "c12": "2.0.1",
     "commander": "13.0.0",
     "handlebars": "4.7.8"

packages/openapi-ts/src/getSpec.ts

@@ -30,15 +30,7 @@ export const getSpec = async ({
   watch: WatchValues;
 }): Promise<SpecResponse | SpecError> => {
   const refParser = new $RefParser();
-  // TODO: patch @hey-api/json-schema-ref-parser to correctly handle raw spec
-  const resolvedInput =
-    typeof inputPath === 'string'
-      ? getResolvedInput({ pathOrUrlOrSchema: inputPath })
-      : ({
-          path: '',
-          schema: inputPath,
-          type: 'json',
-        } as const);
+  const resolvedInput = getResolvedInput({ pathOrUrlOrSchema: inputPath });
 
   let arrayBuffer: ArrayBuffer | undefined;
   // boolean signals whether the file has **definitely** changed
@@ -48,23 +40,30 @@ export const getSpec = async ({
   if (resolvedInput.type === 'url') {
     // do NOT send HEAD request on first run or if unsupported
     if (watch.lastValue && watch.isHeadMethodSupported !== false) {
-      let request;
       try {
-        request = await sendRequest({
+        const request = await sendRequest({
           init: {
             headers: watch.headers,
             method: 'HEAD',
           },
           timeout,
           url: resolvedInput.path,
         });
-      } catch (ex) {
+
+        if (request.response.status >= 300) {
+          return {
+            error: 'not-ok',
+            response: request.response,
+          };
+        }
+
+        response = request.response;
+      } catch (error) {
         return {
           error: 'not-ok',
-          response: new Response(ex.message),
+          response: new Response(error.message),
         };
       }
-      response = request.response;
 
       if (!response.ok && watch.isHeadMethodSupported) {
         // assume the server is no longer running
@@ -118,18 +117,26 @@ export const getSpec = async ({
     }
 
     try {
-      const fileRequest = await sendRequest({
+      const request = await sendRequest({
         init: {
           method: 'GET',
         },
         timeout,
         url: resolvedInput.path,
       });
-      response = fileRequest.response;
-    } catch (ex) {
+
+      if (request.response.status >= 300) {
+        return {
+          error: 'not-ok',
+          response: request.response,
+        };
+      }
+
+      response = request.response;
+    } catch (error) {
       return {
         error: 'not-ok',
-        response: new Response(ex.message),
+        response: new Response(error.message),
       };
     }
 

packages/openapi-ts/test/custom/request.ts

@@ -30,7 +30,7 @@ export const request = <T>(
       onCancel(() => {
         clearTimeout(timeout);
       });
-    } catch (e) {
-      reject(e);
+    } catch (error) {
+      reject(error);
     }
   });

packages/openapi-ts/test/openapi-ts.config.ts

@@ -5,27 +5,29 @@ import { defineConfig } from '../src';
 export default defineConfig({
   // experimentalParser: false,
   input: {
-    // branch: 'main',
+    branch: 'main',
     // exclude: '^#/components/schemas/ModelWithCircularReference$',
     // include:
     //   '^(#/components/schemas/import|#/paths/api/v{api-version}/simple/options)$',
-    // organization: 'hey-api',
-    path: {
-      components: {},
-      info: {
-        version: '1.0.0',
-      },
-      openapi: '3.1.0',
-      paths: {},
-    },
+    organization: 'hey-api',
+    // path: {
+    //   components: {},
+    //   info: {
+    //     version: '1.0.0',
+    //   },
+    //   openapi: '3.1.0',
+    //   paths: {},
+    // },
     // path: path.resolve(__dirname, 'spec', '3.1.x', 'full.json'),
-    // path: 'https://get.heyapi.dev/',
+    // path: 'http://localhost:4000/',
+    path: 'https://get.heyapi.dev/',
     // path: 'https://get.heyapi.dev/hey-api/backend?branch=main&version=1.0.0',
     // path: 'http://localhost:8000/openapi.json',
     // path: './test/spec/v3-transforms.json',
     // path: 'https://mongodb-mms-prod-build-server.s3.amazonaws.com/openapi/2caffd88277a4e27c95dcefc7e3b6a63a3b03297-v2-2023-11-15.json',
     // path: 'https://raw.githubusercontent.com/swagger-api/swagger-petstore/master/src/main/resources/openapi.yaml',
     // project: 'backend',
+    project: 'upload-openapi-spec',
     // version: '1.0.0',
   },
   logs: {