@scalar/import 0.2.23 → 0.2.25

package/CHANGELOG.md

@@ -1,5 +1,30 @@
 # @scalar/import
 
+## 0.2.25
+
+### Patch Changes
+
+- 54fdfcb: chore: remove spec wording
+- fa6afe8: chore: code formatting
+- 4d30a35: fix: can’t parse HTML attributes with HTML tags inside
+- Updated dependencies [54fdfcb]
+- Updated dependencies [1223c1f]
+  - @scalar/oas-utils@0.2.105
+  - @scalar/openapi-parser@0.10.7
+
+## 0.2.24
+
+### Patch Changes
+
+- Updated dependencies [4de3124]
+- Updated dependencies [f500435]
+- Updated dependencies [da5cf08]
+- Updated dependencies [b5727ef]
+- Updated dependencies [4de3124]
+- Updated dependencies [34e6f52]
+  - @scalar/openapi-parser@0.10.6
+  - @scalar/oas-utils@0.2.104
+
 ## 0.2.23
 
 ### Patch Changes

package/dist/index.js

@@ -1 +1 @@
-export { resolve } from './resolve.js';
+export { getConfigurationAttribute, getContentOfScriptTag, resolve } from './resolve.js';

package/dist/resolve.d.ts

@@ -8,4 +8,16 @@ export declare function resolve(value?: string | null, options?: {
      */
     fetch?: (url: string) => Promise<Response>;
 }): Promise<string | Record<string, any> | undefined>;
+/**
+ * Get the content between the script tags
+ *
+ * @example <script id="api-reference">console.log("Hello, world!");</script>
+ */
+export declare function getContentOfScriptTag(html: string): string | undefined;
+/**
+ * Get the configuration attribute from the script tag
+ *
+ * @example <script id="api-reference" data-configuration="{&quot;spec&quot;:{&quot;content&quot;:&quot;foo&quot;}}"></script>
+ */
+export declare function getConfigurationAttribute(html: string): string | undefined;
 //# sourceMappingURL=resolve.d.ts.map

package/dist/resolve.d.ts.map

@@ -1 +1 @@
-{"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,CAoHnD"}
+{"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,CA+GnD;AA6ED;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAetE;AAgCD;;;;GAIG;AACH,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAiB1E"}

package/dist/resolve.js

@@ -18,8 +18,7 @@ async function resolve(value, options) {
             return value;
         }
         // https://*.yaml
-        if (value?.toLowerCase().endsWith('.yaml') ||
-            value?.toLowerCase().endsWith('.yml')) {
+        if (value?.toLowerCase().endsWith('.yaml') || value?.toLowerCase().endsWith('.yml')) {
             return value;
         }
         // https://sandbox.scalar.com
@@ -166,21 +165,46 @@ function parseHtml(html) {
     }
     return undefined;
 }
+/**
+ * Get the content between the script tags
+ *
+ * @example <script id="api-reference">console.log("Hello, world!");</script>
+ */
+function getContentOfScriptTag(html) {
+    const patterns = [
+        // Double quotes
+        /<script[^>]*id="api-reference[\s\S]*?">([\s\S]*?)<\/script>/i,
+        // Single quotes
+        /<script[^>]*id='api-reference[\s\S]*?'>([\s\S]*?)<\/script>/i,
+    ];
+    for (const pattern of patterns) {
+        const match = html.match(pattern);
+        if (match?.[1])
+            return match[1].trim();
+    }
+    return undefined;
+}
 /**
  * Parse OpenAPI document directly from script tag content
  */
 function parseScriptContent(html) {
-    const match = html.match(/<script[^>]*id="api-reference"[^>]*>([\s\S]*?)<\/script>/);
-    if (!match?.[1])
-        return undefined;
+    const content = getContentOfScriptTag(html);
     try {
-        const content = match[1].trim();
         if (content) {
             try {
+                // JSON
                 return JSON.parse(content);
             }
             catch {
-                return parse(content);
+                try {
+                    // JSON with escaped whitespace
+                    const sanitizedContent = content.replace(/\\s/g, '\\\\s');
+                    return JSON.parse(sanitizedContent);
+                }
+                catch {
+                    // YAML
+                    return parse(content);
+                }
             }
         }
     }
@@ -189,16 +213,35 @@ function parseScriptContent(html) {
     }
     return undefined;
 }
+/**
+ * Get the configuration attribute from the script tag
+ *
+ * @example <script id="api-reference" data-configuration="{&quot;spec&quot;:{&quot;content&quot;:&quot;foo&quot;}}"></script>
+ */
+function getConfigurationAttribute(html) {
+    const patterns = [
+        // Double quotes
+        /<script[^>]*id="api-reference"[^>]*data-configuration=["]([^"]+)["][^>]*>(.*?)<\/script>/s,
+        // Single quotes
+        /<script[^>]*id='api-reference'[^>]*data-configuration=[']([^']+)['][^>]*>(.*?)<\/script>/s,
+    ];
+    for (const pattern of patterns) {
+        const match = html.match(pattern);
+        if (match?.[1]) {
+            return match[1];
+        }
+    }
+    return undefined;
+}
 /**
  * Parse embedded OpenAPI document from HTML
  */
 function parseEmbeddedOpenApi(html) {
-    const match = html.match(/<script[^>]*data-configuration=['"]([^'"]+)['"][^>]*>(.*?)<\/script>/s);
-    if (!match?.[1])
+    const configString = getConfigurationAttribute(html);
+    if (!configString)
         return undefined;
     try {
-        const configString = decodeHtmlEntities(match[1]);
-        const config = JSON.parse(configString);
+        const config = JSON.parse(decodeHtmlEntities(configString));
         // Handle both direct JSON content and YAML content
         if (config.spec?.content) {
             // If content is a string, assume it's YAML
@@ -248,4 +291,4 @@ function transformGitHubUrl(url) {
     return undefined;
 }
 
-export { resolve };
+export { getConfigurationAttribute, getContentOfScriptTag, resolve };

package/package.json

@@ -16,7 +16,7 @@
     "postman",
     "scalar"
   ],
-  "version": "0.2.23",
+  "version": "0.2.25",
   "engines": {
     "node": ">=18"
   },
@@ -36,16 +36,18 @@
   "module": "dist/index.js",
   "dependencies": {
     "yaml": "^2.4.5",
-    "@scalar/oas-utils": "0.2.103",
-    "@scalar/openapi-parser": "0.10.5"
+    "@scalar/oas-utils": "0.2.105",
+    "@scalar/openapi-parser": "0.10.7"
   },
   "devDependencies": {
     "vite": "^5.4.10",
-    "@scalar/build-tooling": "0.1.12"
+    "@scalar/build-tooling": "0.1.13"
   },
   "scripts": {
     "build": "scalar-build-rollup",
     "dev": "nodemon --exec \"vite-node playground/index.ts\" --ext ts --quiet",
+    "format": "scalar-format",
+    "format:check": "scalar-format-check",
     "lint:check": "eslint .",
     "lint:fix": "eslint .  --fix",
     "test": "vitest",