Upgrade Scalar dependencies (#3626)

Author: gregberge

.changeset/healthy-masks-live.md

@@ -0,0 +1,5 @@
+---
+"@gitbook/openapi-parser": patch
+---
+
+Upgrade Scalar dependencies

bun.lock

@@ -12,8 +12,9 @@
     "version": "3.0.1",
     "sideEffects": false,
     "dependencies": {
-        "@scalar/openapi-parser": "^0.18.0",
-        "@scalar/openapi-types": "^0.1.9"
+        "@scalar/json-magic": "^0.3.1",
+        "@scalar/openapi-parser": "^0.20.1",
+        "@scalar/openapi-types": "^0.3.7"
     },
     "devDependencies": {
         "@tsconfig/strictest": "^2.0.5",

packages/openapi-parser/package.json

@@ -1,5 +1,5 @@
-import { bundle } from '@scalar/openapi-parser';
-import { parseJson, parseYaml } from '@scalar/openapi-parser/plugins-browser';
+import { bundle } from '@scalar/json-magic/bundle';
+import { parseJson, parseYaml } from '@scalar/json-magic/bundle/plugins/browser';
 import type { ParseOpenAPIInput } from './parse';
 import { fetchURL } from './scalar-plugins/fetchURL';
 import { fetchURLs } from './scalar-plugins/fetchURLs';

packages/openapi-parser/src/filesystem.ts

@@ -1,11 +1,10 @@
-import type { AnyObject, ErrorObject, bundle } from '@scalar/openapi-parser';
+import type { Plugin } from '@scalar/json-magic/bundle';
+import type { AnyObject, ErrorObject } from '@scalar/openapi-parser';
 import { OpenAPIParseError } from './error';
 import type { Filesystem, OpenAPIV3xDocument } from './types';
 import { convertOpenAPIV2ToOpenAPIV3 } from './v2';
 import { parseOpenAPIV3 } from './v3';
 
-export type ParsePlugin = Parameters<typeof bundle>[1]['plugins'][number];
-
 export interface ParseOpenAPIInput {
     /**
      * The API definition to parse.
@@ -19,7 +18,7 @@ export interface ParseOpenAPIInput {
      * Options for the parser.
      */
     options?: {
-        plugins?: ParsePlugin[];
+        plugins?: Plugin[];
     };
 }
 

packages/openapi-parser/src/parse.ts

@@ -1,11 +1,12 @@
+import type { Plugin } from '@scalar/json-magic/bundle';
 import { normalize } from '@scalar/openapi-parser';
-import type { ParsePlugin } from '../parse';
 
 export const fetchUrlsDefaultConfiguration = {
     limit: 40,
 };
 
-export const fetchURL = (): ParsePlugin => ({
+export const fetchURL = (): Plugin => ({
+    type: 'loader',
     validate(value) {
         return URL.canParse(value);
     },

packages/openapi-parser/src/scalar-plugins/fetchURL.ts

@@ -1,5 +1,5 @@
+import type { Plugin } from '@scalar/json-magic/bundle';
 import { normalize } from '@scalar/openapi-parser';
-import type { ParsePlugin } from '../parse';
 
 export const fetchUrlsDefaultConfiguration = {
     limit: 40,
@@ -15,7 +15,7 @@ export const fetchURLs = (customConfiguration: {
      * Limit the number of requests. Set to `false` to disable the limit.
      */
     limit?: number | false;
-}): ParsePlugin => {
+}): Plugin => {
     // State
     let numberOfRequests = 0;
 
@@ -26,6 +26,7 @@ export const fetchURLs = (customConfiguration: {
     };
 
     return {
+        type: 'loader',
         validate(value) {
             // Not a string
             if (typeof value !== 'string') {