@scalar/api-reference 1.44.11 → 1.44.13

package/dist/components/Content/Models/components/ClassicLayout.vue.js

@@ -1,7 +1,7 @@
 import _sfc_main from "./ClassicLayout.vue2.js";
 /* empty css                   */
 import _export_sfc from "../../../../_virtual/_plugin-vue_export-helper.js";
-const ClassicLayout = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-161968a4"]]);
+const ClassicLayout = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-e4ca3c0f"]]);
 export {
   ClassicLayout as default
 };

package/dist/components/Content/Models/components/ClassicLayout.vue2.js

@@ -1,5 +1,5 @@
 import { defineComponent, createBlock, openBlock, unref, withCtx, createElementBlock, Fragment, renderList, createVNode } from "vue";
-import { getResolvedRef } from "@scalar/workspace-store/helpers/get-resolved-ref";
+import { resolve } from "@scalar/workspace-store/resolve";
 import SectionAccordion from "../../../Section/SectionAccordion.vue.js";
 import SchemaProperty from "../../Schema/SchemaProperty.vue.js";
 import _sfc_main$1 from "../../../Anchor/Anchor.vue.js";
@@ -57,7 +57,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                 name: property,
                 options: __props.options,
                 required: __props.schema.required?.includes(property),
-                schema: unref(getResolvedRef)(value)
+                schema: unref(resolve).schema(value)
               }, null, 8, ["eventBus", "name", "options", "required", "schema"]);
             }), 128))
           ])) : (openBlock(), createElementBlock("div", _hoisted_2, [

package/dist/components/Content/Schema/SchemaComposition.vue.d.ts

@@ -1,6 +1,5 @@
 import type { WorkspaceEventBus } from '@scalar/workspace-store/events';
-import type { DiscriminatorObject } from '@scalar/workspace-store/schemas/v3.1/strict/openapi-document';
-import type { SchemaWithOriginalRef } from '../../../components/Content/Schema/helpers/optimize-value-for-display.js';
+import type { DiscriminatorObject, SchemaObject } from '@scalar/workspace-store/schemas/v3.1/strict/openapi-document';
 import type { SchemaOptions } from '../../../components/Content/Schema/types';
 import { type CompositionKeyword } from './helpers/schema-composition.js';
 type __VLS_Props = {
@@ -11,7 +10,7 @@ type __VLS_Props = {
     /** Optional name for the schema */
     name?: string;
     /** The schema value containing the composition */
-    schema: SchemaWithOriginalRef;
+    schema: SchemaObject;
     /** Nesting level for proper indentation */
     level: number;
     /** Whether to use compact layout */

package/dist/components/Content/Schema/SchemaComposition.vue.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SchemaComposition.vue.d.ts","sourceRoot":"","sources":["../../../../src/components/Content/Schema/SchemaComposition.vue"],"names":[],"mappings":"AA0JA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAA;AAEvE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,8DAA8D,CAAA;AAGvG,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,gEAAgE,CAAA;AAC3G,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAA;AAItE,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,8BAA8B,CAAA;AAGtE,KAAK,WAAW,GAAG;IACf,oDAAoD;IACpD,WAAW,EAAE,kBAAkB,CAAA;IAC/B,4DAA4D;IAC5D,aAAa,CAAC,EAAE,mBAAmB,CAAA;IACnC,mCAAmC;IACnC,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,kDAAkD;IAClD,MAAM,EAAE,qBAAqB,CAAA;IAC7B,2CAA2C;IAC3C,KAAK,EAAE,MAAM,CAAA;IACb,oCAAoC;IACpC,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,kCAAkC;IAClC,WAAW,CAAC,EAAE,OAAO,CAAA;IACrB,gCAAgC;IAChC,UAAU,CAAC,EAAE,MAAM,EAAE,CAAA;IACrB,iCAAiC;IACjC,QAAQ,EAAE,iBAAiB,GAAG,IAAI,CAAA;IAClC,yEAAyE;IACzE,OAAO,EAAE,aAAa,CAAA;CACvB,CAAC;;aATU,OAAO;iBAEH,OAAO;;AAgOzB,wBAOG"}
+{"version":3,"file":"SchemaComposition.vue.d.ts","sourceRoot":"","sources":["../../../../src/components/Content/Schema/SchemaComposition.vue"],"names":[],"mappings":"AA4JA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAA;AAEvE,OAAO,KAAK,EACV,mBAAmB,EACnB,YAAY,EACb,MAAM,8DAA8D,CAAA;AAGrE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAA;AAItE,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,8BAA8B,CAAA;AAGtE,KAAK,WAAW,GAAG;IACf,oDAAoD;IACpD,WAAW,EAAE,kBAAkB,CAAA;IAC/B,4DAA4D;IAC5D,aAAa,CAAC,EAAE,mBAAmB,CAAA;IACnC,mCAAmC;IACnC,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,kDAAkD;IAClD,MAAM,EAAE,YAAY,CAAA;IACpB,2CAA2C;IAC3C,KAAK,EAAE,MAAM,CAAA;IACb,oCAAoC;IACpC,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,kCAAkC;IAClC,WAAW,CAAC,EAAE,OAAO,CAAA;IACrB,gCAAgC;IAChC,UAAU,CAAC,EAAE,MAAM,EAAE,CAAA;IACrB,iCAAiC;IACjC,QAAQ,EAAE,iBAAiB,GAAG,IAAI,CAAA;IAClC,yEAAyE;IACzE,OAAO,EAAE,aAAa,CAAA;CACvB,CAAC;;aATU,OAAO;iBAEH,OAAO;;AAgOzB,wBAOG"}

package/dist/components/Content/Schema/SchemaComposition.vue.js

@@ -2,7 +2,7 @@ import { defineComponent, computed, ref, createElementBlock, openBlock, createBl
 import { ScalarListbox } from "@scalar/components";
 import { isDefined } from "@scalar/helpers/array/is-defined";
 import { ScalarIconCaretDown } from "@scalar/icons";
-import { getResolvedRef } from "@scalar/workspace-store/helpers/get-resolved-ref";
+import { resolve } from "@scalar/workspace-store/resolve";
 import { getSchemaType } from "./helpers/get-schema-type.js";
 import { mergeAllOfSchemas } from "./helpers/merge-all-of-schemas.js";
 import Schema from "./Schema.vue.js";
@@ -34,12 +34,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
   setup(__props) {
     const props = __props;
     const composition = computed(
-      () => [props.schema[props.composition]].flat().map((schema) => ({ value: getResolvedRef(schema), original: schema })).filter((it) => isDefined(it.value))
+      () => [props.schema[props.composition]].flat().map((schema) => ({ value: resolve.schema(schema), original: schema })).filter((it) => isDefined(it.value))
     );
     const listboxOptions = computed(
       () => composition.value.map((schema, index) => ({
         id: String(index),
-        label: getSchemaType(schema.original) || "Schema"
+        label: getSchemaType(resolve.schema(schema.original)) || "Schema"
       }))
     );
     const selectedOption = ref(

package/dist/components/Content/Schema/SchemaEnumValues.vue.js

@@ -1,7 +1,7 @@
 import _sfc_main from "./SchemaEnumValues.vue2.js";
 /* empty css                      */
 import _export_sfc from "../../../_virtual/_plugin-vue_export-helper.js";
-const SchemaEnumValues = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-d4946030"]]);
+const SchemaEnumValues = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-d5367294"]]);
 export {
   SchemaEnumValues as default
 };

package/dist/components/Content/Schema/SchemaEnumValues.vue2.js

@@ -1,7 +1,7 @@
 import { defineComponent, computed, ref, createElementBlock, createCommentVNode, openBlock, createElementVNode, Fragment, renderList, createBlock, createVNode, unref, withCtx, createTextVNode, normalizeClass, toDisplayString } from "vue";
 import { ScalarButton } from "@scalar/components";
 import { ScalarIconPlus } from "@scalar/icons";
-import { getResolvedRef } from "@scalar/workspace-store/helpers/get-resolved-ref";
+import { resolve } from "@scalar/workspace-store/resolve";
 import { isArraySchema } from "@scalar/workspace-store/schemas/v3.1/strict/type-guards";
 import SchemaEnumPropertyItem from "./SchemaEnumPropertyItem.vue.js";
 const _hoisted_1 = {
@@ -23,7 +23,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       if (!__props.value) {
         return [];
       }
-      return __props.value.enum || isArraySchema(__props.value) && getResolvedRef(__props.value.items)?.enum || [];
+      return __props.value.enum || isArraySchema(__props.value) && resolve.schema(__props.value.items)?.enum || [];
     });
     const shouldUseLongListDisplay = computed(
       () => enumValues.value.length > ENUM_DISPLAY_THRESHOLD

package/dist/components/Content/Schema/SchemaObjectProperties.vue.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SchemaObjectProperties.vue.d.ts","sourceRoot":"","sources":["../../../../src/components/Content/Schema/SchemaObjectProperties.vue"],"names":[],"mappings":"AA+IA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAA;AAEvE,OAAO,KAAK,EACV,mBAAmB,EACnB,YAAY,EACb,MAAM,8DAA8D,CAAA;AAKrE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAA;AAItE,KAAK,WAAW,GAAG;IACjB,MAAM,EAAE,YAAY,CAAA;IACpB,aAAa,CAAC,EAAE,mBAAmB,CAAA;IACnC,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,WAAW,CAAC,EAAE,OAAO,CAAA;IACrB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB,UAAU,CAAC,EAAE,MAAM,EAAE,CAAA;IACrB,QAAQ,EAAE,iBAAiB,GAAG,IAAI,CAAA;IAClC,OAAO,EAAE,aAAa,CAAA;CACvB,CAAC;;AAiMF,wBAMG"}
+{"version":3,"file":"SchemaObjectProperties.vue.d.ts","sourceRoot":"","sources":["../../../../src/components/Content/Schema/SchemaObjectProperties.vue"],"names":[],"mappings":"AAkJA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAA;AAEvE,OAAO,KAAK,EACV,mBAAmB,EACnB,YAAY,EACb,MAAM,8DAA8D,CAAA;AAKrE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAA;AAItE,KAAK,WAAW,GAAG;IACjB,MAAM,EAAE,YAAY,CAAA;IACpB,aAAa,CAAC,EAAE,mBAAmB,CAAA;IACnC,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,WAAW,CAAC,EAAE,OAAO,CAAA;IACrB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB,UAAU,CAAC,EAAE,MAAM,EAAE,CAAA;IACrB,QAAQ,EAAE,iBAAiB,GAAG,IAAI,CAAA;IAClC,OAAO,EAAE,aAAa,CAAA;CACvB,CAAC;;AAoMF,wBAMG"}

package/dist/components/Content/Schema/SchemaObjectProperties.vue.js

@@ -1,5 +1,5 @@
 import { defineComponent, computed, createElementBlock, openBlock, Fragment, createCommentVNode, createBlock, unref, renderList } from "vue";
-import { getResolvedRef } from "@scalar/workspace-store/helpers/get-resolved-ref";
+import { resolve } from "@scalar/workspace-store/resolve";
 import { isTypeObject } from "./helpers/is-type-object.js";
 import { sortPropertyNames } from "./helpers/sort-property-names.js";
 import SchemaProperty from "./SchemaProperty.vue.js";
@@ -21,7 +21,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       () => sortPropertyNames(__props.schema, __props.discriminator, __props.options)
     );
     const getAdditionalPropertiesName = (_additionalProperties) => {
-      const additionalProperties = getResolvedRef(_additionalProperties);
+      const additionalProperties = typeof _additionalProperties === "boolean" ? _additionalProperties : resolve.schema(_additionalProperties);
       if (typeof additionalProperties === "object" && typeof additionalProperties["x-additionalPropertiesName"] === "string" && additionalProperties["x-additionalPropertiesName"].trim().length > 0) {
         return `${additionalProperties["x-additionalPropertiesName"].trim()}`;
       }
@@ -52,7 +52,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             name: property,
             options: __props.options,
             required: __props.schema.required?.includes(property),
-            schema: unref(getResolvedRef)(__props.schema.properties[property])
+            schema: unref(resolve).schema(__props.schema.properties[property])
           }, null, 8, ["breadcrumb", "compact", "discriminator", "eventBus", "hideHeading", "hideModelNames", "level", "name", "options", "required", "schema"]);
         }), 128)) : createCommentVNode("", true),
         unref(isTypeObject)(__props.schema) && __props.schema.patternProperties ? (openBlock(true), createElementBlock(Fragment, { key: 1 }, renderList(Object.entries(__props.schema.patternProperties), ([key, property]) => {
@@ -67,7 +67,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             level: __props.level,
             name: key,
             options: __props.options,
-            schema: unref(getResolvedRef)(property)
+            schema: unref(resolve).schema(property)
           }, null, 8, ["breadcrumb", "compact", "discriminator", "eventBus", "hideHeading", "hideModelNames", "level", "name", "options", "schema"]);
         }), 128)) : createCommentVNode("", true),
         unref(isTypeObject)(__props.schema) && __props.schema.additionalProperties ? (openBlock(), createBlock(SchemaProperty, {

package/dist/components/Content/Schema/SchemaProperty.vue.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SchemaProperty.vue.d.ts","sourceRoot":"","sources":["../../../../src/components/Content/Schema/SchemaProperty.vue"],"names":[],"mappings":"AAyaA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAA;AAEvE,OAAO,KAAK,EACV,mBAAmB,EACnB,YAAY,EACb,MAAM,8DAA8D,CAAA;AAErE,OAAO,EAAY,KAAK,SAAS,EAAE,MAAM,KAAK,CAAA;AAI9C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAA;AAetE;;;;;GAKG;AAEH,KAAK,WAAW,GAAG;IACf,EAAE,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IACvB,MAAM,EAAE,YAAY,GAAG,SAAS,CAAA;IAChC,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,aAAa,CAAC,EAAE,mBAAmB,CAAA;IACnC,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB,WAAW,CAAC,EAAE,OAAO,CAAA;IACrB,OAAO,CAAC,EAAE,sBAAsB,GAAG,mBAAmB,CAAA;IACtD,UAAU,CAAC,EAAE,MAAM,EAAE,CAAA;IACrB,QAAQ,EAAE,iBAAiB,GAAG,IAAI,CAAA;IAClC,OAAO,EAAE,aAAa,CAAA;CACvB,CAAC;;WAZQ,MAAM;cAEH,OAAO;aACR,OAAO;oBAGA,OAAO;;AAsc5B,wBAOG"}
+{"version":3,"file":"SchemaProperty.vue.d.ts","sourceRoot":"","sources":["../../../../src/components/Content/Schema/SchemaProperty.vue"],"names":[],"mappings":"AAyaA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAA;AAEvE,OAAO,KAAK,EACV,mBAAmB,EACnB,YAAY,EACb,MAAM,8DAA8D,CAAA;AAErE,OAAO,EAAY,KAAK,SAAS,EAAE,MAAM,KAAK,CAAA;AAI9C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAA;AAetE;;;;;GAKG;AAEH,KAAK,WAAW,GAAG;IACf,EAAE,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IACvB,MAAM,EAAE,YAAY,GAAG,SAAS,CAAA;IAChC,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,aAAa,CAAC,EAAE,mBAAmB,CAAA;IACnC,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB,WAAW,CAAC,EAAE,OAAO,CAAA;IACrB,OAAO,CAAC,EAAE,sBAAsB,GAAG,mBAAmB,CAAA;IACtD,UAAU,CAAC,EAAE,MAAM,EAAE,CAAA;IACrB,QAAQ,EAAE,iBAAiB,GAAG,IAAI,CAAA;IAClC,OAAO,EAAE,aAAa,CAAA;CACvB,CAAC;;WAZQ,MAAM;cAEH,OAAO;aACR,OAAO;oBAGA,OAAO;;AAuc5B,wBAOG"}

package/dist/components/Content/Schema/SchemaProperty.vue.js

@@ -1,7 +1,7 @@
 import _sfc_main from "./SchemaProperty.vue2.js";
 /* empty css                    */
 import _export_sfc from "../../../_virtual/_plugin-vue_export-helper.js";
-const SchemaProperty = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-8da63347"]]);
+const SchemaProperty = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-dfddcb79"]]);
 export {
   SchemaProperty as default
 };

package/dist/components/Content/Schema/SchemaProperty.vue2.js

@@ -1,6 +1,6 @@
 import { defineComponent, computed, createBlock, openBlock, resolveDynamicComponent, normalizeClass, withCtx, createCommentVNode, createElementBlock, createVNode, createSlots, unref, createTextVNode, toDisplayString, Fragment, renderList } from "vue";
 import { ScalarWrappingText, ScalarMarkdown } from "@scalar/components";
-import { getResolvedRef } from "@scalar/workspace-store/helpers/get-resolved-ref";
+import { resolve } from "@scalar/workspace-store/resolve";
 import { isArraySchema } from "@scalar/workspace-store/schemas/v3.1/strict/type-guards";
 import { isTypeObject } from "./helpers/is-type-object.js";
 import { getCompositionsToRender } from "./helpers/get-compositions-to-render.js";
@@ -98,7 +98,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       if (!value || !isArraySchema(value) || typeof value.items !== "object") {
         return void 0;
       }
-      return getResolvedRef(value.items);
+      return resolve.schema(value.items);
     });
     const isDiscriminatorProperty = computed(
       () => Boolean(props.name && props.discriminator?.propertyName === props.name)
@@ -189,7 +189,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               name: __props.name,
               noncollapsible: __props.noncollapsible,
               options: __props.options,
-              schema: resolvedArrayItems.value
+              schema: unref(resolve).schema(resolvedArrayItems.value)
             }, null, 8, ["compact", "eventBus", "level", "name", "noncollapsible", "options", "schema"])
           ])) : createCommentVNode("", true),
           (openBlock(true), createElementBlock(Fragment, null, renderList(compositionsToRender.value, (compositionData) => {

package/dist/components/Content/Schema/SchemaPropertyHeading.vue.js

@@ -1,7 +1,7 @@
 import _sfc_main from "./SchemaPropertyHeading.vue2.js";
 /* empty css                           */
 import _export_sfc from "../../../_virtual/_plugin-vue_export-helper.js";
-const SchemaPropertyHeading = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-5d03e993"]]);
+const SchemaPropertyHeading = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-e94a52f3"]]);
 export {
   SchemaPropertyHeading as default
 };

package/dist/components/Content/Schema/SchemaPropertyHeading.vue2.js

@@ -1,6 +1,6 @@
 import { defineComponent, toRef, computed, createElementBlock, openBlock, createCommentVNode, createBlock, normalizeClass, renderSlot, Fragment, withCtx, createVNode, createTextVNode, toDisplayString, renderList, createSlots, unref } from "vue";
 import { isDefined } from "@scalar/helpers/array/is-defined";
-import { getResolvedRef } from "@scalar/workspace-store/helpers/get-resolved-ref";
+import { resolve } from "@scalar/workspace-store/resolve";
 import { isArraySchema, isStringSchema, isNumberSchema } from "@scalar/workspace-store/schemas/v3.1/strict/type-guards";
 import ScreenReader from "../../ScreenReader.vue.js";
 import { getSchemaType } from "./helpers/get-schema-type.js";
@@ -64,7 +64,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         return schema.enum[0];
       }
       if (isArraySchema(schema) && schema.items) {
-        const items = getResolvedRef(schema.items);
+        const items = resolve.schema(schema.items);
         if (isDefined(items.const)) {
           return items.const;
         }
@@ -318,7 +318,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         props.required ? (openBlock(), createElementBlock("div", _hoisted_8, " required ")) : createCommentVNode("", true),
         props.withExamples ? (openBlock(), createBlock(SchemaPropertyExamples, {
           key: 10,
-          example: props.value?.example || props.value && unref(isArraySchema)(props.value) && unref(getResolvedRef)(props.value?.items)?.example,
+          example: props.value?.example || props.value && unref(isArraySchema)(props.value) && unref(resolve).schema(props.value?.items)?.example,
           examples: props.value?.examples
         }, null, 8, ["example", "examples"])) : createCommentVNode("", true)
       ]);

package/dist/components/Content/Schema/helpers/get-compositions-to-render.js

@@ -1,5 +1,5 @@
 import { isDefined } from "@scalar/helpers/array/is-defined";
-import { getResolvedRef } from "@scalar/workspace-store/helpers/get-resolved-ref";
+import { resolve } from "@scalar/workspace-store/resolve";
 import { isArraySchema } from "@scalar/workspace-store/schemas/v3.1/strict/type-guards";
 import { compositions } from "./schema-composition.js";
 import { shouldRenderArrayItemComposition } from "./should-render-array-item-composition.js";
@@ -11,7 +11,7 @@ const getCompositionsToRender = (value) => {
     if (shouldRenderArrayItemComposition(value, composition) && isArraySchema(value) && value.items) {
       return {
         composition,
-        value: getResolvedRef(value.items)
+        value: resolve.schema(value.items)
       };
     }
     if (value[composition]) {
@@ -19,7 +19,7 @@ const getCompositionsToRender = (value) => {
       if (!hasArrayItemComposition) {
         return {
           composition,
-          value: getResolvedRef(value)
+          value: resolve.schema(value)
         };
       }
     }

package/dist/components/Content/Schema/helpers/get-enum-values.js

@@ -1,4 +1,4 @@
-import { getResolvedRef } from "@scalar/workspace-store/helpers/get-resolved-ref";
+import { resolve } from "@scalar/workspace-store/resolve";
 import { isArraySchema } from "@scalar/workspace-store/schemas/v3.1/strict/type-guards";
 const getEnumValues = (value) => {
   if (!value) {
@@ -8,7 +8,7 @@ const getEnumValues = (value) => {
     return value.enum;
   }
   if (isArraySchema(value) && typeof value.items === "object") {
-    const resolvedItems = getResolvedRef(value.items);
+    const resolvedItems = resolve.schema(value.items);
     if (resolvedItems && "enum" in resolvedItems && resolvedItems.enum) {
       return resolvedItems.enum;
     }

package/dist/components/Content/Schema/helpers/get-schema-type.d.ts

@@ -1,5 +1,4 @@
 import type { ReferenceType, SchemaObject } from '@scalar/workspace-store/schemas/v3.1/strict/openapi-document';
-import type { SchemaWithOriginalRef } from '../../../../components/Content/Schema/helpers/optimize-value-for-display.js';
 /**
  * Computes the human-readable type for a schema.
  *
@@ -12,5 +11,5 @@ import type { SchemaWithOriginalRef } from '../../../../components/Content/Schem
  * 6. $ref names
  * 7. raw type
  */
-export declare const getSchemaType: (valueOrRef: SchemaWithOriginalRef | ReferenceType<SchemaObject>) => string;
+export declare const getSchemaType: (valueOrRef: SchemaObject | ReferenceType<SchemaObject>) => string;
 //# sourceMappingURL=get-schema-type.d.ts.map

package/dist/components/Content/Schema/helpers/get-schema-type.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"get-schema-type.d.ts","sourceRoot":"","sources":["../../../../../src/components/Content/Schema/helpers/get-schema-type.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,8DAA8D,CAAA;AAI/G,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,gEAAgE,CAAA;AAiC3G;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,aAAa,GAAI,YAAY,qBAAqB,GAAG,aAAa,CAAC,YAAY,CAAC,KAAG,MAkE/F,CAAA"}
+{"version":3,"file":"get-schema-type.d.ts","sourceRoot":"","sources":["../../../../../src/components/Content/Schema/helpers/get-schema-type.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,8DAA8D,CAAA;AAoC/G;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,aAAa,GAAI,YAAY,YAAY,GAAG,aAAa,CAAC,YAAY,CAAC,KAAG,MA0DtF,CAAA"}

package/dist/components/Content/Schema/helpers/get-schema-type.js

@@ -1,4 +1,4 @@
-import { getResolvedRef } from "@scalar/workspace-store/helpers/get-resolved-ref";
+import { resolve } from "@scalar/workspace-store/resolve";
 import { isArraySchema } from "@scalar/workspace-store/schemas/v3.1/strict/type-guards";
 import { getRefName } from "./get-ref-name.js";
 const formatArrayType = (itemType) => {
@@ -12,7 +12,7 @@ const processArrayType = (value, isUnionType = false) => {
   if (!value.items) {
     return isUnionType ? "array" : value.title || value.xml?.name || "array";
   }
-  const itemType = getSchemaType(value.items);
+  const itemType = getSchemaType(resolve.schema(value.items));
   const baseType = formatArrayType(itemType);
   if (isUnionType) {
     return baseType;
@@ -23,7 +23,7 @@ const getSchemaType = (valueOrRef) => {
   if (!valueOrRef) {
     return "";
   }
-  const value = getResolvedRef(valueOrRef);
+  const value = resolve.schema(valueOrRef);
   if (value.const !== void 0) {
     return "const";
   }
@@ -47,12 +47,6 @@ const getSchemaType = (valueOrRef) => {
   if ("type" in value && value.type && value.contentEncoding) {
     return `${value.type} • ${value.contentEncoding}`;
   }
-  if ("originalRef" in valueOrRef && valueOrRef.originalRef) {
-    const refName = getRefName(valueOrRef.originalRef);
-    if (refName) {
-      return refName;
-    }
-  }
   if ("$ref" in valueOrRef) {
     const refName = getRefName(valueOrRef.$ref);
     if (refName) {

package/dist/components/Content/Schema/helpers/merge-all-of-schemas.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"merge-all-of-schemas.d.ts","sourceRoot":"","sources":["../../../../../src/components/Content/Schema/helpers/merge-all-of-schemas.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8DAA8D,CAAA;AAGhG;;;;;;;GAOG;AACH,eAAO,MAAM,iBAAiB,GAAI,SAAS,YAAY,GAAG,SAAS,EAAE,aAAa,YAAY,KAAG,YA+ChG,CAAA"}
+{"version":3,"file":"merge-all-of-schemas.d.ts","sourceRoot":"","sources":["../../../../../src/components/Content/Schema/helpers/merge-all-of-schemas.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8DAA8D,CAAA;AAGhG;;;;;;;GAOG;AACH,eAAO,MAAM,iBAAiB,GAAI,SAAS,YAAY,GAAG,SAAS,EAAE,aAAa,YAAY,KAAG,YA+ChG,CAAA"}

package/dist/components/Content/Schema/helpers/merge-all-of-schemas.js

@@ -1,5 +1,6 @@
 import { objectKeys } from "@scalar/helpers/object/object-keys";
 import { getResolvedRef } from "@scalar/workspace-store/helpers/get-resolved-ref";
+import { resolve } from "@scalar/workspace-store/resolve";
 import { isArraySchema } from "@scalar/workspace-store/schemas/v3.1/strict/type-guards";
 const mergeAllOfSchemas = (schemas, rootSchema) => {
   if (!schemas?.allOf?.length || !Array.isArray(schemas.allOf)) {
@@ -11,7 +12,7 @@ const mergeAllOfSchemas = (schemas, rootSchema) => {
     if (!_schema || typeof _schema !== "object") {
       continue;
     }
-    const schema = getResolvedRef(_schema);
+    const schema = resolve.schema(_schema);
     if (schema.allOf) {
       const nestedMerged = mergeAllOfSchemas(schema);
       mergeSchemaIntoResult(result, nestedMerged);
@@ -58,7 +59,7 @@ const mergeSchemaIntoResult = (result, schema, override = false) => {
         mergePropertiesIntoResult(result.properties, value);
       }
     } else if (key === "items") {
-      const items = getResolvedRef(value);
+      const items = resolve.schema(value);
       if (items) {
         if (isArraySchema(schema)) {
           if (!result.items) {
@@ -92,8 +93,8 @@ const mergeSchemaIntoResult = (result, schema, override = false) => {
           result.properties = {};
         }
         for (const _option of value) {
-          const option = getResolvedRef(_option);
-          if (option.properties && "properties" in result) {
+          const option = resolve.schema(_option);
+          if (option && "properties" in option && "properties" in result) {
             mergePropertiesIntoResult(result.properties, option.properties);
           }
         }
@@ -113,7 +114,7 @@ const mergePropertiesIntoResult = (result, properties) => {
     return;
   }
   for (const key of propertyKeys) {
-    const schema = getResolvedRef(properties[key]);
+    const schema = resolve.schema(properties[key]);
     if (!schema) {
       delete result[key];
       continue;
@@ -125,25 +126,25 @@ const mergePropertiesIntoResult = (result, properties) => {
     if (!result[key]) {
       if (schema.allOf) {
         result[key] = mergeAllOfSchemas(schema);
-      } else if (isArraySchema(schema) && getResolvedRef(schema.items)?.allOf) {
+      } else if (isArraySchema(schema) && resolve.schema(schema.items)?.allOf) {
         result[key] = {
           ...schema,
-          items: mergeAllOfSchemas(getResolvedRef(schema.items))
+          items: mergeAllOfSchemas(resolve.schema(schema.items))
         };
       } else if (properties[key]) {
         result[key] = properties[key];
       }
       continue;
     }
-    const existing = getResolvedRef(result[key]);
+    const existing = resolve.schema(result[key]);
     if (schema.allOf) {
       result[key] = mergeAllOfSchemas({ allOf: [existing, ...schema.allOf] });
     } else if (isArraySchema(schema) && isArraySchema(existing) && schema.items) {
-      const existingItems = getResolvedRef(existing.items);
+      const existingItems = resolve.schema(existing.items);
       result[key] = {
         ...existing,
         type: "array",
-        items: existingItems ? mergeItems(existingItems, getResolvedRef(schema.items)) : getResolvedRef(schema.items)
+        items: existingItems ? mergeItems(existingItems, resolve.schema(schema.items)) : resolve.schema(schema.items)
       };
     } else {
       if ("properties" in existing && "properties" in schema) {
@@ -162,14 +163,14 @@ const mergeItemsIntoResult = (result, items) => {
     const allOfSchemas = [];
     if (result.allOf) {
       for (const schema of result.allOf) {
-        allOfSchemas.push(getResolvedRef(schema));
+        allOfSchemas.push(resolve.schema(schema));
       }
     } else {
       allOfSchemas.push(result);
     }
     if (items.allOf) {
       for (const schema of items.allOf) {
-        allOfSchemas.push(getResolvedRef(schema));
+        allOfSchemas.push(resolve.schema(schema));
       }
     } else {
       allOfSchemas.push(items);
@@ -188,14 +189,14 @@ const mergeItems = (existing, incoming) => {
     const allOfSchemas = [];
     if (existing.allOf) {
       for (const schema of existing.allOf) {
-        allOfSchemas.push(getResolvedRef(schema));
+        allOfSchemas.push(resolve.schema(schema));
       }
     } else {
       allOfSchemas.push(existing);
     }
     if (incoming.allOf) {
       for (const schema of incoming.allOf) {
-        allOfSchemas.push(getResolvedRef(schema));
+        allOfSchemas.push(resolve.schema(schema));
       }
     } else {
       allOfSchemas.push(incoming);

package/dist/components/Content/Schema/helpers/optimize-value-for-display.d.ts

@@ -1,12 +1,8 @@
 import type { SchemaObject } from '@scalar/workspace-store/schemas/v3.1/strict/openapi-document';
-/** We need to keep the original ref after we resolve for display purposes */
-export type SchemaWithOriginalRef = SchemaObject & {
-    originalRef?: string;
-};
 /**
  * Optimize the value by removing nulls from compositions and merging root properties.
  *
  * TODO: figure out what this does
  */
-export declare function optimizeValueForDisplay(value: SchemaObject | undefined): SchemaWithOriginalRef | undefined;
+export declare function optimizeValueForDisplay(value: SchemaObject | undefined): SchemaObject | undefined;
 //# sourceMappingURL=optimize-value-for-display.d.ts.map

package/dist/components/Content/Schema/helpers/optimize-value-for-display.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"optimize-value-for-display.d.ts","sourceRoot":"","sources":["../../../../../src/components/Content/Schema/helpers/optimize-value-for-display.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8DAA8D,CAAA;AAIhG,6EAA6E;AAC7E,MAAM,MAAM,qBAAqB,GAAG,YAAY,GAAG;IAAE,WAAW,CAAC,EAAE,MAAM,CAAA;CAAE,CAAA;AAE3E;;;;GAIG;AACH,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,YAAY,GAAG,SAAS,GAAG,qBAAqB,GAAG,SAAS,CA0F1G"}
+{"version":3,"file":"optimize-value-for-display.d.ts","sourceRoot":"","sources":["../../../../../src/components/Content/Schema/helpers/optimize-value-for-display.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8DAA8D,CAAA;AAIhG;;;;GAIG;AACH,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,YAAY,GAAG,SAAS,GAAG,YAAY,GAAG,SAAS,CAsFjG"}

package/dist/components/Content/Schema/helpers/optimize-value-for-display.js

@@ -1,4 +1,4 @@
-import { getResolvedRef } from "@scalar/workspace-store/helpers/get-resolved-ref";
+import { resolve } from "@scalar/workspace-store/resolve";
 import { compositions } from "./schema-composition.js";
 function optimizeValueForDisplay(value) {
   if (!value || typeof value !== "object") {
@@ -16,11 +16,9 @@ function optimizeValueForDisplay(value) {
   const hasRootProperties = Object.keys(rootProperties).length > 0;
   const { filteredSchemas, hasNullSchema } = schemas.reduce(
     (acc, _schema) => {
-      const schema = getResolvedRef(_schema);
+      const schema = resolve.schema(_schema);
       if ("type" in schema && schema.type === "null") {
         acc.hasNullSchema = true;
-      } else if ("$ref" in _schema && _schema.$ref) {
-        acc.filteredSchemas.push({ ...schema, originalRef: _schema.$ref });
       } else {
         acc.filteredSchemas.push(schema);
       }
@@ -39,10 +37,10 @@ function optimizeValueForDisplay(value) {
   const shouldMergeRootProperties = (composition === "oneOf" || composition === "anyOf") && (hasRootProperties || filteredSchemas.some((schema) => schema.allOf));
   if (shouldMergeRootProperties) {
     const mergedSchemas = filteredSchemas.map((_schema) => {
-      const schema = getResolvedRef(_schema);
+      const schema = resolve.schema(_schema);
       if (schema.allOf?.length === 1) {
         const { allOf, ...otherProps } = schema;
-        return { ...rootProperties, ...otherProps, ...getResolvedRef(allOf[0]) };
+        return { ...rootProperties, ...otherProps, ...resolve.schema(allOf[0]) };
       }
       return { ...rootProperties, ...schema };
     });

package/dist/components/Content/Schema/helpers/schema-name.d.ts

@@ -1,10 +1,10 @@
-import type { ReferenceType, SchemaObject } from '@scalar/workspace-store/schemas/v3.1/strict/openapi-document';
+import type { SchemaObject, SchemaReferenceType } from '@scalar/workspace-store/schemas/v3.1/strict/openapi-document';
 /**
  * Extract schema name from various schema formats
  *
  * Handles $ref, title, name, type, and schema dictionary lookup
  */
-export declare const getModelNameFromSchema: (schemaOrRef: SchemaObject | ReferenceType<SchemaObject>) => string | null;
+export declare const getModelNameFromSchema: (schemaOrRef: SchemaObject | SchemaReferenceType<SchemaObject>) => string | null;
 /**
  * Get the model name for a schema property
  * e.g. User | Admin | array of User | array of Admin

package/dist/components/Content/Schema/helpers/schema-name.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"schema-name.d.ts","sourceRoot":"","sources":["../../../../../src/components/Content/Schema/helpers/schema-name.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,8DAA8D,CAAA;AAK/G;;;;GAIG;AACH,eAAO,MAAM,sBAAsB,GAAI,aAAa,YAAY,GAAG,aAAa,CAAC,YAAY,CAAC,KAAG,MAAM,GAAG,IAyBzG,CAAA;AAQD;;;GAGG;AACH,eAAO,MAAM,YAAY,GAAI,OAAO,YAAY,EAAE,wBAAsB,KAAG,MAAM,GAAG,IA+CnF,CAAA"}
+{"version":3,"file":"schema-name.d.ts","sourceRoot":"","sources":["../../../../../src/components/Content/Schema/helpers/schema-name.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,mBAAmB,EAAE,MAAM,8DAA8D,CAAA;AAKrH;;;;GAIG;AACH,eAAO,MAAM,sBAAsB,GACjC,aAAa,YAAY,GAAG,mBAAmB,CAAC,YAAY,CAAC,KAC5D,MAAM,GAAG,IAyBX,CAAA;AAQD;;;GAGG;AACH,eAAO,MAAM,YAAY,GAAI,OAAO,YAAY,EAAE,wBAAsB,KAAG,MAAM,GAAG,IA+CnF,CAAA"}

package/dist/components/Content/Schema/helpers/schema-name.js

@@ -1,4 +1,4 @@
-import { getResolvedRef } from "@scalar/workspace-store/helpers/get-resolved-ref";
+import { resolve } from "@scalar/workspace-store/resolve";
 import { isArraySchema } from "@scalar/workspace-store/schemas/v3.1/strict/type-guards";
 import { getRefName } from "./get-ref-name.js";
 const getModelNameFromSchema = (schemaOrRef) => {
@@ -11,7 +11,7 @@ const getModelNameFromSchema = (schemaOrRef) => {
       return refName;
     }
   }
-  const schema = getResolvedRef(schemaOrRef);
+  const schema = resolve.schema(schemaOrRef);
   if (schema.title) {
     return schema.title;
   }
@@ -31,12 +31,12 @@ const getModelName = (value, hideModelNames = false) => {
     return valueType === "array" ? `array ${modelName}[]` : modelName;
   }
   if (isArraySchema(value) && value.items) {
-    const items = getResolvedRef(value.items);
+    const items = resolve.schema(value.items);
     const itemName = items.title;
     if (itemName) {
       return formatTypeWithModel(valueType, itemName);
     }
-    const itemModelName = getModelNameFromSchema(value.items);
+    const itemModelName = getModelNameFromSchema(items);
     if (itemModelName && "type" in items && itemModelName !== items.type) {
       return formatTypeWithModel(valueType, itemModelName);
     }

package/dist/components/Content/Schema/helpers/sort-property-names.js

@@ -1,4 +1,4 @@
-import { getResolvedRef } from "@scalar/workspace-store/helpers/get-resolved-ref";
+import { resolve } from "@scalar/workspace-store/resolve";
 import { isTypeObject } from "./is-type-object.js";
 const reduceNamesToObject = (names, properties) => names.reduce((acc, name) => {
   const prop = properties?.[name];
@@ -42,7 +42,7 @@ const sortPropertyNames = (schema, discriminator, {
     }
     return 0;
   }).filter((property) => {
-    const resolved = schema.properties && getResolvedRef(schema.properties[property]);
+    const resolved = schema.properties && resolve.schema(schema.properties[property]);
     if (hideReadOnly && resolved?.readOnly === true) {
       return false;
     }