@stoplight/elements-core 9.0.20 → 9.0.21

package/index.esm.js

@@ -112,6 +112,71 @@ const recursivelyCreateResolvedObject = (currentObject, rootCurrentObject, prope
 const isResolvedObjectProxy = (someObject) => {
     return !!someObject[originalObjectSymbol];
 };
+const getResolvedObject = (obj, cache = new WeakMap()) => {
+    if (!isPlainObject(obj) && !isArray(obj)) {
+        return obj;
+    }
+    if (cache.has(obj)) {
+        return cache.get(obj);
+    }
+    if (isArray(obj)) {
+        const result = [];
+        cache.set(obj, result);
+        for (let i = 0; i < obj.length; i++) {
+            result[i] = getResolvedObject(obj[i], cache);
+        }
+        return result;
+    }
+    const result = {};
+    cache.set(obj, result);
+    for (const key in obj) {
+        if (!Object.prototype.hasOwnProperty.call(obj, key))
+            continue;
+        const value = obj[key];
+        if (isArray(value)) {
+            result[key] = getResolvedObject(value, cache);
+        }
+        else if (isPlainObject(value)) {
+            result[key] = getResolvedObject(value, cache);
+        }
+        else {
+            result[key] = value;
+        }
+    }
+    return result;
+};
+const deepUnwrapObject = (obj, cache = new WeakMap()) => {
+    const unwrapped = (obj === null || obj === void 0 ? void 0 : obj[originalObjectSymbol]) || obj;
+    if (!isPlainObject(unwrapped)) {
+        return unwrapped;
+    }
+    if (cache.has(obj)) {
+        return cache.get(obj);
+    }
+    const hasComposition = Object.prototype.hasOwnProperty.call(unwrapped, 'oneOf') ||
+        Object.prototype.hasOwnProperty.call(unwrapped, 'anyOf') ||
+        Object.prototype.hasOwnProperty.call(unwrapped, 'allOf');
+    if (!hasComposition && unwrapped === obj) {
+        return unwrapped;
+    }
+    const result = {};
+    cache.set(obj, result);
+    for (const key in unwrapped) {
+        if (!Object.prototype.hasOwnProperty.call(unwrapped, key))
+            continue;
+        const value = unwrapped[key];
+        if (isArray(value)) {
+            result[key] = value.map(item => (isPlainObject(item) || isArray(item) ? deepUnwrapObject(item, cache) : item));
+        }
+        else if (isPlainObject(value)) {
+            result[key] = deepUnwrapObject(value, cache);
+        }
+        else {
+            result[key] = value;
+        }
+    }
+    return result;
+};
 const getOriginalObject = (resolvedObject) => {
     const originalObject = resolvedObject[originalObjectSymbol] || resolvedObject;
     if (!originalObject) {
@@ -120,21 +185,22 @@ const getOriginalObject = (resolvedObject) => {
     const hasAllSchemaErrors = (array) => {
         return array.every(item => item['x-sl-error-message'] !== undefined);
     };
-    if (originalObject.anyOf) {
-        if (hasAllSchemaErrors(originalObject.anyOf)) {
-            return Object.assign(Object.assign({}, originalObject), { anyOf: [originalObject.anyOf] });
+    const deepUnwrapped = deepUnwrapObject(originalObject);
+    if (deepUnwrapped.anyOf) {
+        if (hasAllSchemaErrors(deepUnwrapped.anyOf)) {
+            return Object.assign(Object.assign({}, deepUnwrapped), { anyOf: [deepUnwrapped.anyOf] });
         }
-        const filteredArray = originalObject.anyOf.filter((item) => !item['x-sl-error-message']);
-        return Object.assign(Object.assign({}, originalObject), { anyOf: filteredArray });
+        const filteredArray = deepUnwrapped.anyOf.filter((item) => !item['x-sl-error-message']);
+        return Object.assign(Object.assign({}, deepUnwrapped), { anyOf: filteredArray });
     }
-    else if (originalObject.oneOf) {
-        if (hasAllSchemaErrors(originalObject.oneOf)) {
-            return Object.assign(Object.assign({}, originalObject), { oneOf: [originalObject.oneOf] });
+    else if (deepUnwrapped.oneOf) {
+        if (hasAllSchemaErrors(deepUnwrapped.oneOf)) {
+            return Object.assign(Object.assign({}, deepUnwrapped), { oneOf: [deepUnwrapped.oneOf] });
         }
-        const filteredArray = originalObject.oneOf.filter((item) => !item['x-sl-error-message']);
-        return Object.assign(Object.assign({}, originalObject), { oneOf: filteredArray });
+        const filteredArray = deepUnwrapped.oneOf.filter((item) => !item['x-sl-error-message']);
+        return Object.assign(Object.assign({}, deepUnwrapped), { oneOf: filteredArray });
     }
-    return originalObject;
+    return deepUnwrapped;
 };
 const isReference = hasRef;
 
@@ -1752,6 +1818,34 @@ function ExampleMenu({ examples, requestBody, onChange }) {
     return (React.createElement(Menu, { "aria-label": "Examples", items: menuItems, renderTrigger: ({ isOpen }) => (React.createElement(Button, { appearance: "minimal", size: "sm", iconRight: ['fas', 'sort'], active: isOpen }, "Examples")) }));
 }
 
+const mergeOneOfAnyOf = (schema) => {
+    if (!isPlainObject$1(schema)) {
+        return schema;
+    }
+    let result = Object.assign({}, schema);
+    if (result.oneOf && result.oneOf.length > 0) {
+        const firstOption = result.oneOf[0];
+        const { oneOf } = result, rest = __rest(result, ["oneOf"]);
+        result = Object.assign(Object.assign({}, rest), firstOption);
+    }
+    else if (result.anyOf && result.anyOf.length > 0) {
+        const firstOption = result.anyOf[0];
+        const { anyOf } = result, rest = __rest(result, ["anyOf"]);
+        result = Object.assign(Object.assign({}, rest), firstOption);
+    }
+    if (result.properties) {
+        result.properties = Object.fromEntries(Object.entries(result.properties).map(([key, value]) => [key, mergeOneOfAnyOf(value)]));
+    }
+    if (result.items) {
+        result.items = mergeOneOfAnyOf(result.items);
+    }
+    if (result.allOf) {
+        result.allOf = result.allOf.map((item) => mergeOneOfAnyOf(item));
+    }
+    delete result.oneOf;
+    delete result.anyOf;
+    return result;
+};
 const useGenerateExampleFromMediaTypeContent = (mediaTypeContent, chosenExampleIndex, { skipReadOnly, skipWriteOnly, skipNonRequired, ticks } = {}) => {
     const document = useDocument();
     return React__default.useMemo(() => generateExampleFromMediaTypeContent(mediaTypeContent, document, chosenExampleIndex, {
@@ -1770,7 +1864,9 @@ const generateExampleFromMediaTypeContent = (mediaTypeContent, document, chosenE
             return ((_a = safeStringify(textRequestBodyExamples === null || textRequestBodyExamples === void 0 ? void 0 : textRequestBodyExamples[chosenExampleIndex]['value'], undefined, 2)) !== null && _a !== void 0 ? _a : '');
         }
         else if (textRequestBodySchema) {
-            const generated = Sampler.sample(textRequestBodySchema, options, document);
+            let unwrappedSchema = getResolvedObject(textRequestBodySchema);
+            unwrappedSchema = mergeOneOfAnyOf(unwrappedSchema);
+            const generated = Sampler.sample(unwrappedSchema, options, document);
             return generated !== null ? (_b = safeStringify(generated, undefined, 2)) !== null && _b !== void 0 ? _b : '' : '';
         }
     }
@@ -1807,7 +1903,9 @@ const generateExamplesFromJsonSchema = (schema) => {
         return examples;
     }
     try {
-        const generated = Sampler.sample(schema, {
+        let resolvedSchema = getResolvedObject(schema);
+        resolvedSchema = mergeOneOfAnyOf(resolvedSchema);
+        const generated = Sampler.sample(resolvedSchema, {
             maxSampleDepth: 4,
             ticks: 6000,
         });

package/index.js

@@ -133,6 +133,71 @@ const recursivelyCreateResolvedObject = (currentObject, rootCurrentObject, prope
 const isResolvedObjectProxy = (someObject) => {
     return !!someObject[originalObjectSymbol];
 };
+const getResolvedObject = (obj, cache = new WeakMap()) => {
+    if (!isPlainObject(obj) && !isArray(obj)) {
+        return obj;
+    }
+    if (cache.has(obj)) {
+        return cache.get(obj);
+    }
+    if (isArray(obj)) {
+        const result = [];
+        cache.set(obj, result);
+        for (let i = 0; i < obj.length; i++) {
+            result[i] = getResolvedObject(obj[i], cache);
+        }
+        return result;
+    }
+    const result = {};
+    cache.set(obj, result);
+    for (const key in obj) {
+        if (!Object.prototype.hasOwnProperty.call(obj, key))
+            continue;
+        const value = obj[key];
+        if (isArray(value)) {
+            result[key] = getResolvedObject(value, cache);
+        }
+        else if (isPlainObject(value)) {
+            result[key] = getResolvedObject(value, cache);
+        }
+        else {
+            result[key] = value;
+        }
+    }
+    return result;
+};
+const deepUnwrapObject = (obj, cache = new WeakMap()) => {
+    const unwrapped = (obj === null || obj === void 0 ? void 0 : obj[originalObjectSymbol]) || obj;
+    if (!isPlainObject(unwrapped)) {
+        return unwrapped;
+    }
+    if (cache.has(obj)) {
+        return cache.get(obj);
+    }
+    const hasComposition = Object.prototype.hasOwnProperty.call(unwrapped, 'oneOf') ||
+        Object.prototype.hasOwnProperty.call(unwrapped, 'anyOf') ||
+        Object.prototype.hasOwnProperty.call(unwrapped, 'allOf');
+    if (!hasComposition && unwrapped === obj) {
+        return unwrapped;
+    }
+    const result = {};
+    cache.set(obj, result);
+    for (const key in unwrapped) {
+        if (!Object.prototype.hasOwnProperty.call(unwrapped, key))
+            continue;
+        const value = unwrapped[key];
+        if (isArray(value)) {
+            result[key] = value.map(item => (isPlainObject(item) || isArray(item) ? deepUnwrapObject(item, cache) : item));
+        }
+        else if (isPlainObject(value)) {
+            result[key] = deepUnwrapObject(value, cache);
+        }
+        else {
+            result[key] = value;
+        }
+    }
+    return result;
+};
 const getOriginalObject = (resolvedObject) => {
     const originalObject = resolvedObject[originalObjectSymbol] || resolvedObject;
     if (!originalObject) {
@@ -141,21 +206,22 @@ const getOriginalObject = (resolvedObject) => {
     const hasAllSchemaErrors = (array) => {
         return array.every(item => item['x-sl-error-message'] !== undefined);
     };
-    if (originalObject.anyOf) {
-        if (hasAllSchemaErrors(originalObject.anyOf)) {
-            return Object.assign(Object.assign({}, originalObject), { anyOf: [originalObject.anyOf] });
+    const deepUnwrapped = deepUnwrapObject(originalObject);
+    if (deepUnwrapped.anyOf) {
+        if (hasAllSchemaErrors(deepUnwrapped.anyOf)) {
+            return Object.assign(Object.assign({}, deepUnwrapped), { anyOf: [deepUnwrapped.anyOf] });
         }
-        const filteredArray = originalObject.anyOf.filter((item) => !item['x-sl-error-message']);
-        return Object.assign(Object.assign({}, originalObject), { anyOf: filteredArray });
+        const filteredArray = deepUnwrapped.anyOf.filter((item) => !item['x-sl-error-message']);
+        return Object.assign(Object.assign({}, deepUnwrapped), { anyOf: filteredArray });
     }
-    else if (originalObject.oneOf) {
-        if (hasAllSchemaErrors(originalObject.oneOf)) {
-            return Object.assign(Object.assign({}, originalObject), { oneOf: [originalObject.oneOf] });
+    else if (deepUnwrapped.oneOf) {
+        if (hasAllSchemaErrors(deepUnwrapped.oneOf)) {
+            return Object.assign(Object.assign({}, deepUnwrapped), { oneOf: [deepUnwrapped.oneOf] });
         }
-        const filteredArray = originalObject.oneOf.filter((item) => !item['x-sl-error-message']);
-        return Object.assign(Object.assign({}, originalObject), { oneOf: filteredArray });
+        const filteredArray = deepUnwrapped.oneOf.filter((item) => !item['x-sl-error-message']);
+        return Object.assign(Object.assign({}, deepUnwrapped), { oneOf: filteredArray });
     }
-    return originalObject;
+    return deepUnwrapped;
 };
 const isReference = json.hasRef;
 
@@ -1773,6 +1839,34 @@ function ExampleMenu({ examples, requestBody, onChange }) {
     return (React__namespace.createElement(mosaic.Menu, { "aria-label": "Examples", items: menuItems, renderTrigger: ({ isOpen }) => (React__namespace.createElement(mosaic.Button, { appearance: "minimal", size: "sm", iconRight: ['fas', 'sort'], active: isOpen }, "Examples")) }));
 }
 
+const mergeOneOfAnyOf = (schema) => {
+    if (!json.isPlainObject(schema)) {
+        return schema;
+    }
+    let result = Object.assign({}, schema);
+    if (result.oneOf && result.oneOf.length > 0) {
+        const firstOption = result.oneOf[0];
+        const { oneOf } = result, rest = tslib.__rest(result, ["oneOf"]);
+        result = Object.assign(Object.assign({}, rest), firstOption);
+    }
+    else if (result.anyOf && result.anyOf.length > 0) {
+        const firstOption = result.anyOf[0];
+        const { anyOf } = result, rest = tslib.__rest(result, ["anyOf"]);
+        result = Object.assign(Object.assign({}, rest), firstOption);
+    }
+    if (result.properties) {
+        result.properties = Object.fromEntries(Object.entries(result.properties).map(([key, value]) => [key, mergeOneOfAnyOf(value)]));
+    }
+    if (result.items) {
+        result.items = mergeOneOfAnyOf(result.items);
+    }
+    if (result.allOf) {
+        result.allOf = result.allOf.map((item) => mergeOneOfAnyOf(item));
+    }
+    delete result.oneOf;
+    delete result.anyOf;
+    return result;
+};
 const useGenerateExampleFromMediaTypeContent = (mediaTypeContent, chosenExampleIndex, { skipReadOnly, skipWriteOnly, skipNonRequired, ticks } = {}) => {
     const document = useDocument();
     return React.useMemo(() => generateExampleFromMediaTypeContent(mediaTypeContent, document, chosenExampleIndex, {
@@ -1791,7 +1885,9 @@ const generateExampleFromMediaTypeContent = (mediaTypeContent, document, chosenE
             return ((_a = json.safeStringify(textRequestBodyExamples === null || textRequestBodyExamples === void 0 ? void 0 : textRequestBodyExamples[chosenExampleIndex]['value'], undefined, 2)) !== null && _a !== void 0 ? _a : '');
         }
         else if (textRequestBodySchema) {
-            const generated = Sampler__namespace.sample(textRequestBodySchema, options, document);
+            let unwrappedSchema = getResolvedObject(textRequestBodySchema);
+            unwrappedSchema = mergeOneOfAnyOf(unwrappedSchema);
+            const generated = Sampler__namespace.sample(unwrappedSchema, options, document);
             return generated !== null ? (_b = json.safeStringify(generated, undefined, 2)) !== null && _b !== void 0 ? _b : '' : '';
         }
     }
@@ -1828,7 +1924,9 @@ const generateExamplesFromJsonSchema = (schema) => {
         return examples;
     }
     try {
-        const generated = Sampler__namespace.sample(schema, {
+        let resolvedSchema = getResolvedObject(schema);
+        resolvedSchema = mergeOneOfAnyOf(resolvedSchema);
+        const generated = Sampler__namespace.sample(resolvedSchema, {
             maxSampleDepth: 4,
             ticks: 6000,
         });

package/index.mjs

@@ -112,6 +112,71 @@ const recursivelyCreateResolvedObject = (currentObject, rootCurrentObject, prope
 const isResolvedObjectProxy = (someObject) => {
     return !!someObject[originalObjectSymbol];
 };
+const getResolvedObject = (obj, cache = new WeakMap()) => {
+    if (!isPlainObject(obj) && !isArray(obj)) {
+        return obj;
+    }
+    if (cache.has(obj)) {
+        return cache.get(obj);
+    }
+    if (isArray(obj)) {
+        const result = [];
+        cache.set(obj, result);
+        for (let i = 0; i < obj.length; i++) {
+            result[i] = getResolvedObject(obj[i], cache);
+        }
+        return result;
+    }
+    const result = {};
+    cache.set(obj, result);
+    for (const key in obj) {
+        if (!Object.prototype.hasOwnProperty.call(obj, key))
+            continue;
+        const value = obj[key];
+        if (isArray(value)) {
+            result[key] = getResolvedObject(value, cache);
+        }
+        else if (isPlainObject(value)) {
+            result[key] = getResolvedObject(value, cache);
+        }
+        else {
+            result[key] = value;
+        }
+    }
+    return result;
+};
+const deepUnwrapObject = (obj, cache = new WeakMap()) => {
+    const unwrapped = (obj === null || obj === void 0 ? void 0 : obj[originalObjectSymbol]) || obj;
+    if (!isPlainObject(unwrapped)) {
+        return unwrapped;
+    }
+    if (cache.has(obj)) {
+        return cache.get(obj);
+    }
+    const hasComposition = Object.prototype.hasOwnProperty.call(unwrapped, 'oneOf') ||
+        Object.prototype.hasOwnProperty.call(unwrapped, 'anyOf') ||
+        Object.prototype.hasOwnProperty.call(unwrapped, 'allOf');
+    if (!hasComposition && unwrapped === obj) {
+        return unwrapped;
+    }
+    const result = {};
+    cache.set(obj, result);
+    for (const key in unwrapped) {
+        if (!Object.prototype.hasOwnProperty.call(unwrapped, key))
+            continue;
+        const value = unwrapped[key];
+        if (isArray(value)) {
+            result[key] = value.map(item => (isPlainObject(item) || isArray(item) ? deepUnwrapObject(item, cache) : item));
+        }
+        else if (isPlainObject(value)) {
+            result[key] = deepUnwrapObject(value, cache);
+        }
+        else {
+            result[key] = value;
+        }
+    }
+    return result;
+};
 const getOriginalObject = (resolvedObject) => {
     const originalObject = resolvedObject[originalObjectSymbol] || resolvedObject;
     if (!originalObject) {
@@ -120,21 +185,22 @@ const getOriginalObject = (resolvedObject) => {
     const hasAllSchemaErrors = (array) => {
         return array.every(item => item['x-sl-error-message'] !== undefined);
     };
-    if (originalObject.anyOf) {
-        if (hasAllSchemaErrors(originalObject.anyOf)) {
-            return Object.assign(Object.assign({}, originalObject), { anyOf: [originalObject.anyOf] });
+    const deepUnwrapped = deepUnwrapObject(originalObject);
+    if (deepUnwrapped.anyOf) {
+        if (hasAllSchemaErrors(deepUnwrapped.anyOf)) {
+            return Object.assign(Object.assign({}, deepUnwrapped), { anyOf: [deepUnwrapped.anyOf] });
         }
-        const filteredArray = originalObject.anyOf.filter((item) => !item['x-sl-error-message']);
-        return Object.assign(Object.assign({}, originalObject), { anyOf: filteredArray });
+        const filteredArray = deepUnwrapped.anyOf.filter((item) => !item['x-sl-error-message']);
+        return Object.assign(Object.assign({}, deepUnwrapped), { anyOf: filteredArray });
     }
-    else if (originalObject.oneOf) {
-        if (hasAllSchemaErrors(originalObject.oneOf)) {
-            return Object.assign(Object.assign({}, originalObject), { oneOf: [originalObject.oneOf] });
+    else if (deepUnwrapped.oneOf) {
+        if (hasAllSchemaErrors(deepUnwrapped.oneOf)) {
+            return Object.assign(Object.assign({}, deepUnwrapped), { oneOf: [deepUnwrapped.oneOf] });
         }
-        const filteredArray = originalObject.oneOf.filter((item) => !item['x-sl-error-message']);
-        return Object.assign(Object.assign({}, originalObject), { oneOf: filteredArray });
+        const filteredArray = deepUnwrapped.oneOf.filter((item) => !item['x-sl-error-message']);
+        return Object.assign(Object.assign({}, deepUnwrapped), { oneOf: filteredArray });
     }
-    return originalObject;
+    return deepUnwrapped;
 };
 const isReference = hasRef;
 
@@ -1752,6 +1818,34 @@ function ExampleMenu({ examples, requestBody, onChange }) {
     return (React.createElement(Menu, { "aria-label": "Examples", items: menuItems, renderTrigger: ({ isOpen }) => (React.createElement(Button, { appearance: "minimal", size: "sm", iconRight: ['fas', 'sort'], active: isOpen }, "Examples")) }));
 }
 
+const mergeOneOfAnyOf = (schema) => {
+    if (!isPlainObject$1(schema)) {
+        return schema;
+    }
+    let result = Object.assign({}, schema);
+    if (result.oneOf && result.oneOf.length > 0) {
+        const firstOption = result.oneOf[0];
+        const { oneOf } = result, rest = __rest(result, ["oneOf"]);
+        result = Object.assign(Object.assign({}, rest), firstOption);
+    }
+    else if (result.anyOf && result.anyOf.length > 0) {
+        const firstOption = result.anyOf[0];
+        const { anyOf } = result, rest = __rest(result, ["anyOf"]);
+        result = Object.assign(Object.assign({}, rest), firstOption);
+    }
+    if (result.properties) {
+        result.properties = Object.fromEntries(Object.entries(result.properties).map(([key, value]) => [key, mergeOneOfAnyOf(value)]));
+    }
+    if (result.items) {
+        result.items = mergeOneOfAnyOf(result.items);
+    }
+    if (result.allOf) {
+        result.allOf = result.allOf.map((item) => mergeOneOfAnyOf(item));
+    }
+    delete result.oneOf;
+    delete result.anyOf;
+    return result;
+};
 const useGenerateExampleFromMediaTypeContent = (mediaTypeContent, chosenExampleIndex, { skipReadOnly, skipWriteOnly, skipNonRequired, ticks } = {}) => {
     const document = useDocument();
     return React__default.useMemo(() => generateExampleFromMediaTypeContent(mediaTypeContent, document, chosenExampleIndex, {
@@ -1770,7 +1864,9 @@ const generateExampleFromMediaTypeContent = (mediaTypeContent, document, chosenE
             return ((_a = safeStringify(textRequestBodyExamples === null || textRequestBodyExamples === void 0 ? void 0 : textRequestBodyExamples[chosenExampleIndex]['value'], undefined, 2)) !== null && _a !== void 0 ? _a : '');
         }
         else if (textRequestBodySchema) {
-            const generated = Sampler.sample(textRequestBodySchema, options, document);
+            let unwrappedSchema = getResolvedObject(textRequestBodySchema);
+            unwrappedSchema = mergeOneOfAnyOf(unwrappedSchema);
+            const generated = Sampler.sample(unwrappedSchema, options, document);
             return generated !== null ? (_b = safeStringify(generated, undefined, 2)) !== null && _b !== void 0 ? _b : '' : '';
         }
     }
@@ -1807,7 +1903,9 @@ const generateExamplesFromJsonSchema = (schema) => {
         return examples;
     }
     try {
-        const generated = Sampler.sample(schema, {
+        let resolvedSchema = getResolvedObject(schema);
+        resolvedSchema = mergeOneOfAnyOf(resolvedSchema);
+        const generated = Sampler.sample(resolvedSchema, {
             maxSampleDepth: 4,
             ticks: 6000,
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stoplight/elements-core",
-  "version": "9.0.20",
+  "version": "9.0.21",
   "main": "./index.js",
   "sideEffects": [
     "web-components.min.js",

package/utils/ref-resolving/resolvedObject.d.ts

@@ -5,6 +5,7 @@ interface CreateResolvedObjectOptions {
 }
 export declare const createResolvedObject: (currentObject: object, options?: CreateResolvedObjectOptions) => object;
 export declare const isResolvedObjectProxy: (someObject: object) => boolean;
+export declare const getResolvedObject: (obj: any, cache?: WeakMap<object, any>) => any;
 export declare const getOriginalObject: (resolvedObject: object) => object;
 export declare const isReference: (obj: unknown) => obj is Record<string, unknown> & {
     $ref: string;