oas 32.1.2 → 32.1.4

package/dist/analyzer/index.cjs

@@ -1,12 +1,12 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
-var _chunkY3ZBOLMAcjs = require('../chunk-Y3ZBOLMA.cjs');
-require('../chunk-TBIEIVIF.cjs');
+var _chunk774CH4GGcjs = require('../chunk-774CH4GG.cjs');
+require('../chunk-I2TE44UE.cjs');
 
 
 
 var _chunkW6GBV2JTcjs = require('../chunk-W6GBV2JT.cjs');
-require('../chunk-LCRF6RES.cjs');
+require('../chunk-3IEA3ASV.cjs');
 require('../chunk-AYA3UT4L.cjs');
 require('../chunk-YPR7YTHM.cjs');
 
@@ -20,7 +20,7 @@ function callbacks(definition) {
   );
 }
 async function circularRefs(definition) {
-  const oas = new (0, _chunkY3ZBOLMAcjs.Oas)(structuredClone(definition));
+  const oas = new (0, _chunk774CH4GGcjs.Oas)(structuredClone(definition));
   await oas.dereference();
   const results = oas.getCircularReferences();
   results.sort();
@@ -33,7 +33,7 @@ function discriminators(definition) {
   return _chunkW6GBV2JTcjs.query.call(void 0, ["$..discriminator"], definition).map((res) => _chunkW6GBV2JTcjs.refizePointer.call(void 0, res.pointer));
 }
 async function fileSize(definition) {
-  const oas = new (0, _chunkY3ZBOLMAcjs.Oas)(structuredClone(definition));
+  const oas = new (0, _chunk774CH4GGcjs.Oas)(structuredClone(definition));
   const originalSizeInBytes = Buffer.from(JSON.stringify(oas.api)).length;
   const raw = Number((originalSizeInBytes / (1024 * 1024)).toFixed(2));
   await oas.dereference();

package/dist/analyzer/index.js

@@ -1,12 +1,12 @@
 import {
   Oas
-} from "../chunk-FEWSTRYU.js";
-import "../chunk-6IAHMKE7.js";
+} from "../chunk-TY4JJJU6.js";
+import "../chunk-JEOL436F.js";
 import {
   query,
   refizePointer
 } from "../chunk-CKC36IL7.js";
-import "../chunk-77NXOTZH.js";
+import "../chunk-TM55HFEL.js";
 import "../chunk-S27IGTVG.js";
 import "../chunk-MNOEMVCF.js";
 

package/dist/{chunk-LCRF6RES.cjs → chunk-3IEA3ASV.cjs}

@@ -1012,9 +1012,9 @@ var types = {
   // This a special type reserved for https://npm.im/api
 };
 function getParametersAsJSONSchema(operation, api, opts) {
-  const usedSchemas = /* @__PURE__ */ new Map();
   const seenRefs = /* @__PURE__ */ new Set();
   const refsByGroup = /* @__PURE__ */ new Map();
+  const usedSchemasByGroup = /* @__PURE__ */ new Map();
   function refLoggerForSchemaGroup(group) {
     let set = refsByGroup.get(group);
     if (!set) {
@@ -1023,13 +1023,20 @@ function getParametersAsJSONSchema(operation, api, opts) {
     }
     return set;
   }
+  function usedSchemasForSchemaGroup(group) {
+    let map = usedSchemasByGroup.get(group);
+    if (!map) {
+      map = /* @__PURE__ */ new Map();
+      usedSchemasByGroup.set(group, map);
+    }
+    return map;
+  }
   const baseSchemaOptions = {
     definition: api,
     globalDefaults: _optionalChain([opts, 'optionalAccess', _33 => _33.globalDefaults]),
     hideReadOnlyProperties: _optionalChain([opts, 'optionalAccess', _34 => _34.hideReadOnlyProperties]),
     hideWriteOnlyProperties: _optionalChain([opts, 'optionalAccess', _35 => _35.hideWriteOnlyProperties]),
-    seenRefs,
-    usedSchemas
+    seenRefs
   };
   function transformRequestBody() {
     const requestBody = operation.getRequestBody();
@@ -1058,6 +1065,7 @@ function getParametersAsJSONSchema(operation, api, opts) {
     const requestSchema = cloneObject(mediaTypeObject.schema);
     const cleanedSchema = toJSONSchema(requestSchema, {
       ...baseSchemaOptions,
+      usedSchemas: usedSchemasForSchemaGroup(type),
       prevExampleSchemas,
       refLogger: (ref) => refLoggerForSchemaGroup(type).add(ref)
     });
@@ -1094,6 +1102,7 @@ function getParametersAsJSONSchema(operation, api, opts) {
           if (current.deprecated) currentSchema.deprecated = current.deprecated;
           const interimSchema = toJSONSchema(currentSchema, {
             ...baseSchemaOptions,
+            usedSchemas: usedSchemasForSchemaGroup(type),
             currentLocation: `/${current.name}`,
             refLogger: (ref) => refLoggerForSchemaGroup(type).add(ref)
           });
@@ -1112,6 +1121,7 @@ function getParametersAsJSONSchema(operation, api, opts) {
               if (current.deprecated) currentSchema.deprecated = current.deprecated;
               const interimSchema = toJSONSchema(currentSchema, {
                 ...baseSchemaOptions,
+                usedSchemas: usedSchemasForSchemaGroup(type),
                 currentLocation: `/${current.name}`,
                 refLogger: (ref) => refLoggerForSchemaGroup(type).add(ref)
               });
@@ -1164,25 +1174,27 @@ function getParametersAsJSONSchema(operation, api, opts) {
   typeKeys[typeKeys.indexOf("form")] = "formData";
   typeKeys.push("metadata");
   const jsonSchema = [transformRequestBody()].concat(...transformParameters()).filter((item) => item !== null);
-  applyDiscriminatorOneOfToUsedSchemas(api, usedSchemas, (ref) => {
-    if (usedSchemas.has(ref)) {
-      return usedSchemas.get(ref);
-    }
-    try {
-      const resolved = dereferenceRef({ $ref: ref }, api, seenRefs);
-      if (_chunkYPR7YTHMcjs.isRef.call(void 0, resolved)) return void 0;
-      const converted = toJSONSchema(structuredClone(resolved), {
-        ...baseSchemaOptions,
-        seenRefs
-      });
-      usedSchemas.set(ref, converted);
-      return converted;
-    } catch (e10) {
-      return void 0;
-    }
-  });
   return jsonSchema.map((group) => {
     if (group.schema && typeof group.schema === "object") {
+      const usedSchemas = _nullishCoalesce(usedSchemasByGroup.get(group.type), () => ( /* @__PURE__ */ new Map()));
+      applyDiscriminatorOneOfToUsedSchemas(api, usedSchemas, (ref) => {
+        if (usedSchemas.has(ref)) {
+          return usedSchemas.get(ref);
+        }
+        try {
+          const resolved = dereferenceRef({ $ref: ref }, api, seenRefs);
+          if (_chunkYPR7YTHMcjs.isRef.call(void 0, resolved)) return void 0;
+          const converted = toJSONSchema(structuredClone(resolved), {
+            ...baseSchemaOptions,
+            usedSchemas,
+            seenRefs
+          });
+          usedSchemas.set(ref, converted);
+          return converted;
+        } catch (e10) {
+          return void 0;
+        }
+      });
       const refsInGroup = _nullishCoalesce(refsByGroup.get(group.type), () => ( /* @__PURE__ */ new Set()));
       const referencedSchemas = filterRequiredRefsToReferenced(refsInGroup, usedSchemas);
       if (referencedSchemas.size > 0) {
@@ -1219,4 +1231,4 @@ var SERVER_VARIABLE_REGEX = /{([-_a-zA-Z0-9:.[\]]+)}/g;
 
 
 exports.isObject = isObject; exports.isPrimitive = isPrimitive; exports.decorateComponentSchemasWithRefName = decorateComponentSchemasWithRefName; exports.decodePointer = decodePointer; exports.dereferenceRef = dereferenceRef; exports.getDereferencingOptions = getDereferencingOptions; exports.filterRequiredRefsToReferenced = filterRequiredRefsToReferenced; exports.mergeReferencedSchemasIntoRoot = mergeReferencedSchemasIntoRoot; exports.matches_mimetype_default = matches_mimetype_default; exports.getParameterContentType = getParameterContentType; exports.cloneObject = cloneObject; exports.applyDiscriminatorOneOfToUsedSchemas = applyDiscriminatorOneOfToUsedSchemas; exports.getSchemaVersionString = getSchemaVersionString; exports.toJSONSchema = toJSONSchema; exports.types = types; exports.getParametersAsJSONSchema = getParametersAsJSONSchema; exports.supportedMethods = supportedMethods; exports.SERVER_VARIABLE_REGEX = SERVER_VARIABLE_REGEX;
-//# sourceMappingURL=chunk-LCRF6RES.cjs.map
+//# sourceMappingURL=chunk-3IEA3ASV.cjs.map