@scalar/import 0.0.6 → 0.1.0

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @scalar/import
 
+## 0.1.0
+
+### Minor Changes
+
+- c98a99c: feat: use X-Forwarded-Host header (if available)
+
+### Patch Changes
+
+- Updated dependencies [4bcaa75]
+- Updated dependencies [9eb6650]
+- Updated dependencies [c98a99c]
+  - @scalar/oas-utils@0.2.72
+
 ## 0.0.6
 
 ### Patch Changes

package/dist/resolve.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resolve.d.ts","sourceRoot":"","sources":["../src/resolve.ts"],"names":[],"mappings":"AAEA;;;GAGG;AACH,wBAAsB,OAAO,CAC3B,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,EACrB,OAAO,CAAC,EAAE;IACR;;OAEG;IACH,KAAK,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAA;CAC3C,GACA,OAAO,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,SAAS,CAAC,CAmHnD"}
+{"version":3,"file":"resolve.d.ts","sourceRoot":"","sources":["../src/resolve.ts"],"names":[],"mappings":"AAGA;;;GAGG;AACH,wBAAsB,OAAO,CAC3B,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,EACrB,OAAO,CAAC,EAAE;IACR;;OAEG;IACH,KAAK,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAA;CAC3C,GACA,OAAO,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,SAAS,CAAC,CAuHnD"}

package/dist/resolve.js

@@ -1,3 +1,4 @@
+import { makeUrlAbsolute } from '@scalar/oas-utils/helpers';
 import { parse } from 'yaml';
 
 /**
@@ -41,6 +42,8 @@ async function resolve(value, options) {
             }
             if (result.ok) {
                 const content = await result.text();
+                const forwardedHost = result.headers.get('X-Forwarded-Host');
+                console.log('ASAS', forwardedHost);
                 // Check if content is directly JSON/YAML
                 try {
                     // Try parsing as JSON
@@ -88,7 +91,8 @@ async function resolve(value, options) {
                 }
                 // Relative or absolute URL
                 if (urlOrPathOrDocument) {
-                    return makeRelativeUrlsAbsolute(value, urlOrPathOrDocument);
+                    console.log('make absolute', forwardedHost, urlOrPathOrDocument);
+                    return makeUrlAbsolute(urlOrPathOrDocument, forwardedHost || value);
                 }
                 // Check for embedded OpenAPI document
                 const embeddedSpec = parseEmbeddedOpenApi(content);
@@ -187,25 +191,6 @@ function parseScriptContent(html) {
     }
     return undefined;
 }
-/**
- * URLs can be relative, but we need absolute URLs eventually.
- */
-function makeRelativeUrlsAbsolute(baseUrl, path) {
-    // Check whether the path is already absolute
-    if (path.startsWith('http://') || path.startsWith('https://')) {
-        return path;
-    }
-    // Combine the URL and the relative path
-    try {
-        const { href } = new URL(path, baseUrl);
-        return href;
-    }
-    catch (error) {
-        // Return original path if URL creation fails
-        console.error('[makeRelativeUrlsAbsolute] Error combining URLs:', error);
-        return path;
-    }
-}
 /**
  * Parse embedded OpenAPI document from HTML
  */

package/package.json

@@ -16,7 +16,7 @@
     "postman",
     "scalar"
   ],
-  "version": "0.0.6",
+  "version": "0.1.0",
   "engines": {
     "node": ">=18"
   },
@@ -36,7 +36,8 @@
   "module": "dist/index.js",
   "dependencies": {
     "yaml": "^2.4.5",
-    "@scalar/openapi-parser": "0.8.9"
+    "@scalar/openapi-parser": "0.8.9",
+    "@scalar/oas-utils": "0.2.72"
   },
   "devDependencies": {
     "vite": "^5.4.9",