@scalar/openapi-parser 0.9.0 → 0.10.0

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @scalar/openapi-parser
 
+## 0.10.0
+
+### Minor Changes
+
+- fbef0c3: fix(openapi-parser): improve performance
+
+### Patch Changes
+
+- fbef0c3: fix: doesn’t validate files with external references
+
 ## 0.9.0
 
 ### Minor Changes

package/dist/utils/resolveReferences.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resolveReferences.d.ts","sourceRoot":"","sources":["../../src/utils/resolveReferences.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAA;AAGpD,OAAO,KAAK,EACV,SAAS,EACT,WAAW,EACX,UAAU,EACV,eAAe,EACf,kBAAkB,EACnB,MAAM,UAAU,CAAA;AAejB,MAAM,MAAM,uBAAuB,GAAG;IACpC,KAAK,EAAE,OAAO,CAAA;IACd,MAAM,EAAE,WAAW,EAAE,CAAA;IACrB,MAAM,EAAE,OAAO,CAAC,QAAQ,CAAA;CACzB,CAAA;AAED,MAAM,MAAM,wBAAwB,GAAG,kBAAkB,GAAG;IAC1D,aAAa,CAAC,EAAE,CAAC,IAAI,EAAE;QAAE,MAAM,EAAE,SAAS,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,CAAA;CACnE,CAAA;AAOD;;GAEG;AACH,wBAAgB,iBAAiB,CAE/B,KAAK,EAAE,SAAS,GAAG,UAAU,EAE7B,OAAO,CAAC,EAAE,wBAAwB,EAElC,IAAI,CAAC,EAAE,eAAe,EAEtB,MAAM,CAAC,EAAE,WAAW,EAAE,GACrB,uBAAuB,CAoGzB"}
+{"version":3,"file":"resolveReferences.d.ts","sourceRoot":"","sources":["../../src/utils/resolveReferences.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAA;AAGpD,OAAO,KAAK,EACV,SAAS,EACT,WAAW,EACX,UAAU,EACV,eAAe,EACf,kBAAkB,EACnB,MAAM,UAAU,CAAA;AAejB,MAAM,MAAM,uBAAuB,GAAG;IACpC,KAAK,EAAE,OAAO,CAAA;IACd,MAAM,EAAE,WAAW,EAAE,CAAA;IACrB,MAAM,EAAE,OAAO,CAAC,QAAQ,CAAA;CACzB,CAAA;AAED,MAAM,MAAM,wBAAwB,GAAG,kBAAkB,GAAG;IAC1D,aAAa,CAAC,EAAE,CAAC,IAAI,EAAE;QAAE,MAAM,EAAE,SAAS,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,CAAA;CACnE,CAAA;AAOD;;GAEG;AACH,wBAAgB,iBAAiB,CAE/B,KAAK,EAAE,SAAS,GAAG,UAAU,EAE7B,OAAO,CAAC,EAAE,wBAAwB,EAElC,IAAI,CAAC,EAAE,eAAe,EAEtB,MAAM,CAAC,EAAE,WAAW,EAAE,GACrB,uBAAuB,CAqGzB"}

package/dist/utils/resolveReferences.js

@@ -26,10 +26,7 @@ errors) {
     // Get the main file
     const entrypoint = getEntrypoint(filesystem);
     // Recursively resolve all references
-    resolve(file?.specification ?? entrypoint.specification, filesystem, file ?? entrypoint, options?.onDereference);
-    // If we replace references with content, that includes a reference, we can’t deal with that right-away.
-    // That’s why we need a second run.
-    resolve(file?.specification ?? entrypoint.specification, filesystem, file ?? entrypoint, options?.onDereference);
+    resolve(file?.specification ?? entrypoint.specification, filesystem, file ?? entrypoint);
     // Remove duplicats (according to message) from errors
     errors = errors.filter((error, index, self) => index ===
         self.findIndex((t) => t.message === error.message && t.code === error.code));
@@ -43,49 +40,46 @@ errors) {
     /**
      * Resolves the circular reference to an object and deletes the $ref properties.
      */
-    function resolve(schema, resolveFilesystem, resolveFile, onResolve) {
-        let result;
-        // Iterate over the whole objecct
-        Object.entries(schema ?? {}).forEach(([_, value]) => {
-            // Ignore parts without a reference
-            if (schema.$ref !== undefined) {
-                // Find the referenced content
-                const target = resolveUri(schema.$ref, options, resolveFile, resolveFilesystem, errors);
-                if (target === undefined) {
-                    return undefined;
-                }
-                onResolve?.({ schema, ref: schema.$ref });
-                // Get rid of the reference
-                delete schema.$ref;
-                if (typeof target === 'object') {
-                    Object.keys(target).forEach((key) => {
-                        if (schema[key] === undefined) {
-                            schema[key] = target[key];
-                        }
-                    });
+    function resolve(schema, resolveFilesystem, resolveFile, 
+    // references to resolved object
+    resolved = new WeakSet()) {
+        let result = { errors: [] };
+        if (schema === null || resolved.has(schema))
+            return result;
+        resolved.add(schema);
+        function resolveExternal(externalFile) {
+            resolve(externalFile.specification, resolveFilesystem, externalFile, resolved);
+            return externalFile;
+        }
+        // Ignore parts without a reference
+        while (schema.$ref !== undefined) {
+            // Find the referenced content
+            const target = resolveUri(schema.$ref, options, resolveFile, resolveFilesystem, resolveExternal, errors);
+            // invalid
+            if (typeof target !== 'object' || target === null)
+                break;
+            options?.onDereference?.({ schema, ref: schema.$ref });
+            // Get rid of the reference
+            delete schema.$ref;
+            for (const key of Object.keys(target)) {
+                if (schema[key] === undefined) {
+                    schema[key] = target[key];
                 }
             }
-            if (typeof value === 'object' && !isCircular(value)) {
-                result = resolve(value, resolveFilesystem, resolveFile, onResolve);
+        }
+        // Iterate over the whole object
+        for (const value of Object.values(schema)) {
+            if (typeof value === 'object' && value !== null) {
+                result = resolve(value, resolveFilesystem, resolveFile, resolved);
             }
-        });
-        return {
-            errors: result?.errors ?? [],
-        };
-    }
-}
-// TODO: Is there a better way? :D
-function isCircular(schema) {
-    try {
-        JSON.stringify(schema);
-        return false;
-    }
-    catch (error) {
-        return true;
+        }
+        return result;
     }
 }
 /**
  * Resolves a URI to a part of the specification
+ *
+ * The output is not necessarily dereferenced
  */
 function resolveUri(
 // 'foobar.json#/foo/bar'
@@ -93,7 +87,9 @@ uri, options,
 // { filename: './foobar.json '}
 file, 
 // [ { filename: './foobar.json '} ]
-filesystem, errors) {
+filesystem, 
+// a function to resolve references in external file
+resolve, errors) {
     // Ignore invalid URIs
     if (typeof uri !== 'string') {
         if (options?.throwOnError) {
@@ -124,13 +120,13 @@ filesystem, errors) {
             });
             return;
         }
-        const result = resolveReferences(filesystem, options, externalReference, errors);
         // $ref: 'other-file.yaml'
         if (path === undefined) {
-            return result.schema;
+            return externalReference.specification;
         }
         // $ref: 'other-file.yaml#/foo/bar'
-        return resolveUri(`#${path}`, options, externalReference, filesystem, errors);
+        // resolve refs first before accessing properties directly
+        return resolveUri(`#${path}`, options, resolve(externalReference), filesystem, resolve, errors);
     }
     // Pointers
     const segments = getSegmentsFromPath(path);

package/package.json

@@ -17,7 +17,7 @@
     "parser",
     "typescript"
   ],
-  "version": "0.9.0",
+  "version": "0.10.0",
   "engines": {
     "node": ">=18"
   },