Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Combines mergedSchemas with original to ensure no edge properties are lost in schema item #985

Merged
merged 2 commits into from
Oct 4, 2024

Conversation

sserrata
Copy link
Member

@sserrata sserrata commented Oct 4, 2024

Description

Addresses issue reported in #977 and also adds support for rendering example value.

Motivation and Context

Previously, if an edge property referenced an allOf the behavior was to resolve the allOf and render the SchemaItem based solely on that result. This change now merges the allOf result with the original schema to ensure nothing is lost.

How Has This Been Tested?

Tested by reproducing issue described in #977

Screenshots (if appropriate)

Screenshot 2024-10-04 at 11 25 30 AM
  eventName:
    description: Event name for the subscription
    default: ONE
    allOf: 
      - $ref: '#/components/schemas/Test'
Test:
  type: string
  example: TWO
  enum:
    - ONE
    - TWO

@sserrata sserrata added bug Something isn't working v4.0.0 v4.0.0 labels Oct 4, 2024
@sserrata sserrata self-assigned this Oct 4, 2024
Copy link

github-actions bot commented Oct 4, 2024

Size Change: +4.9 kB (+0.05%)

Total Size: 9.15 MB

Filename Size Change
demo/build/assets/js/0d832478.********.js 20.2 kB +134 B (+0.67%)
demo/build/assets/js/12693653.********.js 19.9 kB +134 B (+0.68%)
demo/build/assets/js/1c7bbcb9.********.js 14.2 kB -37 B (-0.26%)
demo/build/assets/js/1e6c5cae.********.js 26.9 kB -58 B (-0.21%)
demo/build/assets/js/28c25788.********.js 27.8 kB -66 B (-0.24%)
demo/build/assets/js/2bb7a9e5.********.js 15.5 kB -114 B (-0.73%)
demo/build/assets/js/2e6f8121.********.js 16.3 kB -106 B (-0.64%)
demo/build/assets/js/3946f914.********.js 25.2 kB -42 B (-0.17%)
demo/build/assets/js/40a238b6.********.js 19.9 kB +134 B (+0.68%)
demo/build/assets/js/4214e38c.********.js 16 kB -45 B (-0.28%)
demo/build/assets/js/466ac800.********.js 30.3 kB +544 B (+1.83%)
demo/build/assets/js/49332066.********.js 21 kB +134 B (+0.64%)
demo/build/assets/js/4964e910.********.js 18 kB +134 B (+0.75%)
demo/build/assets/js/5f33cfb8.********.js 11.6 kB +272 B (+2.4%)
demo/build/assets/js/66c76a57.********.js 27 kB -66 B (-0.24%)
demo/build/assets/js/68b61ac5.********.js 32.2 kB +544 B (+1.72%)
demo/build/assets/js/69a61f78.********.js 18.6 kB +134 B (+0.72%)
demo/build/assets/js/6d85557e.********.js 8.21 kB +251 B (+3.15%)
demo/build/assets/js/73b594ee.********.js 26.9 kB -58 B (-0.22%)
demo/build/assets/js/7431086d.********.js 33 kB +544 B (+1.67%)
demo/build/assets/js/77264a1a.********.js 25.4 kB -34 B (-0.13%)
demo/build/assets/js/785615ec.********.js 15.5 kB -114 B (-0.73%)
demo/build/assets/js/7b96997a.********.js 2.43 kB +44 B (+1.84%)
demo/build/assets/js/7ed7dafe.********.js 20.2 kB +134 B (+0.67%)
demo/build/assets/js/8cf21e73.********.js 11.6 kB +272 B (+2.39%)
demo/build/assets/js/91696e06.********.js 27 kB -66 B (-0.24%)
demo/build/assets/js/94589c06.********.js 15.2 kB -37 B (-0.24%)
demo/build/assets/js/977dffa1.********.js 20.7 kB +134 B (+0.65%)
demo/build/assets/js/97810f3c.********.js 19.3 kB +134 B (+0.7%)
demo/build/assets/js/9b5caaf3.********.js 19.9 kB +134 B (+0.68%)
demo/build/assets/js/9c42c0f3.********.js 25.7 kB -40 B (-0.16%)
demo/build/assets/js/ab6072f2.********.js 18.6 kB +134 B (+0.72%)
demo/build/assets/js/ae7f40a3.********.js 32.2 kB +544 B (+1.72%)
demo/build/assets/js/b5c059ef.********.js 25.7 kB -40 B (-0.16%)
demo/build/assets/js/c61d4380.********.js 20.7 kB +134 B (+0.65%)
demo/build/assets/js/c65697f5.********.js 19 kB +134 B (+0.71%)
demo/build/assets/js/c80efd64.********.js 13.2 kB +251 B (+1.94%)
demo/build/assets/js/cba4eeac.********.js 20.1 kB +134 B (+0.67%)
demo/build/assets/js/common.********.js 480 kB +409 B (+0.09%)
demo/build/assets/js/d155d641.********.js 26.5 kB -32 B (-0.12%)
demo/build/assets/js/d56bafd7.********.js 27.7 kB -66 B (-0.24%)
demo/build/assets/js/db4eb4ec.********.js 2.45 kB +44 B (+1.83%)
demo/build/assets/js/db6316ab.********.js 8.23 kB +251 B (+3.15%)
demo/build/assets/js/dd696920.********.js 19.2 kB +134 B (+0.7%)
demo/build/assets/js/e015ccf9.********.js 19.9 kB +134 B (+0.68%)
demo/build/assets/js/f84e10c2.********.js 14.4 kB -53 B (-0.37%)
demo/build/assets/js/fcd67c8d.********.js 14.3 kB -98 B (-0.68%)
demo/build/assets/js/fe97f0d1.********.js 15.2 kB -37 B (-0.24%)
ℹ️ View Unchanged
Filename Size Change
demo/.docusaurus/globalData.json 36.2 kB 0 B
demo/build/assets/css/styles.********.css 131 kB 0 B
demo/build/assets/js/006e727e.********.js 12.5 kB 0 B
demo/build/assets/js/01f92bc9.********.js 7.18 kB 0 B
demo/build/assets/js/04510fe4.********.js 1.75 kB 0 B
demo/build/assets/js/05f64ae1.********.js 3.08 kB 0 B
demo/build/assets/js/06e5f0f0.********.js 15.4 kB 0 B
demo/build/assets/js/081bfb0d.********.js 7.3 kB 0 B
demo/build/assets/js/0823fb9f.********.js 672 B 0 B
demo/build/assets/js/09e07b87.********.js 3.25 kB 0 B
demo/build/assets/js/09f7fd0a.********.js 1.72 kB +21 B (+1.24%)
demo/build/assets/js/0c78db99.********.js 6.22 kB 0 B
demo/build/assets/js/0cfc62ff.********.js 444 B 0 B
demo/build/assets/js/0e31c608.********.js 363 B 0 B
demo/build/assets/js/0fa9def4.********.js 3.85 kB 0 B
demo/build/assets/js/13012432.********.js 6.75 kB 0 B
demo/build/assets/js/14492604.********.js 629 B 0 B
demo/build/assets/js/14eb3368.********.js 9.15 kB 0 B
demo/build/assets/js/1639936b.********.js 5.69 kB 0 B
demo/build/assets/js/177e86db.********.js 8.35 kB 0 B
demo/build/assets/js/17888ae3.********.js 13.3 kB 0 B
demo/build/assets/js/19d4fd48.********.js 4.96 kB 0 B
demo/build/assets/js/19d75775.********.js 6.34 kB 0 B
demo/build/assets/js/1a4e3797.********.js 86 kB 0 B
demo/build/assets/js/1a8cc2a6.********.js 9.92 kB 0 B
demo/build/assets/js/1c54f54e.********.js 7.89 kB 0 B
demo/build/assets/js/1db415c4.********.js 3.1 kB 0 B
demo/build/assets/js/1e6ff21d.********.js 8.39 kB 0 B
demo/build/assets/js/1f818248.********.js 8.99 kB 0 B
demo/build/assets/js/21f042e7.********.js 2.42 kB 0 B
demo/build/assets/js/22dd74f7.********.js 69.7 kB 0 B
demo/build/assets/js/29c9b200.********.js 8.93 kB 0 B
demo/build/assets/js/2c860537.********.js 6.32 kB 0 B
demo/build/assets/js/2de14e09.********.js 2.51 kB 0 B
demo/build/assets/js/326c3861.********.js 12.7 kB 0 B
demo/build/assets/js/3340ad32.********.js 8.51 kB 0 B
demo/build/assets/js/3431.********.js 1.32 kB 0 B
demo/build/assets/js/3720c009.********.js 1.73 kB 0 B
demo/build/assets/js/39d00f16.********.js 16 kB 0 B
demo/build/assets/js/39dd9bca.********.js 20.9 kB 0 B
demo/build/assets/js/3ce58061.********.js 3.99 kB 0 B
demo/build/assets/js/3d18bc4d.********.js 1.55 kB 0 B
demo/build/assets/js/3e0d14e9.********.js 18.7 kB 0 B
demo/build/assets/js/3fccde26.********.js 2.67 kB +26 B (+0.98%)
demo/build/assets/js/41ad23b9.********.js 443 B 0 B
demo/build/assets/js/41cd56a1.********.js 8.14 kB 0 B
demo/build/assets/js/423cd203.********.js 11.5 kB 0 B
demo/build/assets/js/441ad7e9.********.js 369 B 0 B
demo/build/assets/js/47abaca6.********.js 3.17 kB 0 B
demo/build/assets/js/483a5060.********.js 586 B 0 B
demo/build/assets/js/499b3970.********.js 373 B 0 B
demo/build/assets/js/49bd3d39.********.js 12.9 kB -29 B (-0.22%)
demo/build/assets/js/4adec5c6.********.js 1.53 kB 0 B
demo/build/assets/js/4afa9934.********.js 6.66 kB 0 B
demo/build/assets/js/4b891ed6.********.js 9 kB 0 B
demo/build/assets/js/4c5e977b.********.js 77.5 kB 0 B
demo/build/assets/js/4db2e020.********.js 6.63 kB 0 B
demo/build/assets/js/4eaf684e.********.js 7.85 kB 0 B
demo/build/assets/js/54ae5c2a.********.js 6.24 kB 0 B
demo/build/assets/js/55a6d13f.********.js 12.5 kB 0 B
demo/build/assets/js/56717cba.********.js 3.24 kB 0 B
demo/build/assets/js/56a33119.********.js 8.11 kB 0 B
demo/build/assets/js/57708823.********.js 5.53 kB 0 B
demo/build/assets/js/57f1a671.********.js 9.04 kB 0 B
demo/build/assets/js/58ff8b1e.********.js 22.7 kB 0 B
demo/build/assets/js/597ddc40.********.js 7.67 kB 0 B
demo/build/assets/js/59af61a6.********.js 391 B 0 B
demo/build/assets/js/59c04cc9.********.js 8.95 kB 0 B
demo/build/assets/js/5c5e5c94.********.js 6.37 kB 0 B
demo/build/assets/js/5e95c892.********.js 345 B 0 B
demo/build/assets/js/5fb917be.********.js 2.8 kB 0 B
demo/build/assets/js/62b62ccf.********.js 7.96 kB 0 B
demo/build/assets/js/63fc267d.********.js 8.54 kB 0 B
demo/build/assets/js/6693.********.js 104 B 0 B
demo/build/assets/js/674cd211.********.js 8.49 kB 0 B
demo/build/assets/js/682c57d3.********.js 2.42 kB 0 B
demo/build/assets/js/6ad7bd23.********.js 1.56 kB 0 B
demo/build/assets/js/703b796f.********.js 6.79 kB 0 B
demo/build/assets/js/71612962.********.js 7.69 kB 0 B
demo/build/assets/js/73f06468.********.js 5.27 kB 0 B
demo/build/assets/js/744937d3.********.js 3.14 kB 0 B
demo/build/assets/js/79d7b0d5.********.js 6.13 kB 0 B
demo/build/assets/js/7ca3ae45.********.js 13.4 kB -29 B (-0.22%)
demo/build/assets/js/7ee7d9e7.********.js 1.71 kB +21 B (+1.25%)
demo/build/assets/js/7f47b856.********.js 14.1 kB 0 B
demo/build/assets/js/7f6346b9.********.js 5.71 kB 0 B
demo/build/assets/js/83208226.********.js 1.37 kB 0 B
demo/build/assets/js/8361.********.js 5.34 MB 0 B
demo/build/assets/js/852da26d.********.js 9.82 kB 0 B
demo/build/assets/js/85d3c400.********.js 3.16 kB 0 B
demo/build/assets/js/85e11929.********.js 19.9 kB 0 B
demo/build/assets/js/85ec4403.********.js 4.7 kB 0 B
demo/build/assets/js/86b273b1.********.js 8.16 kB 0 B
demo/build/assets/js/86c45737.********.js 22.6 kB 0 B
demo/build/assets/js/8961c7a6.********.js 20.1 kB 0 B
demo/build/assets/js/8973.********.js 104 B 0 B
demo/build/assets/js/89ac24b4.********.js 1.76 kB 0 B
demo/build/assets/js/8ab9b16e.********.js 7.77 kB 0 B
demo/build/assets/js/8d43b879.********.js 5.93 kB 0 B
demo/build/assets/js/8d4e78cd.********.js 3.12 kB 0 B
demo/build/assets/js/8f31c8db.********.js 3.19 kB 0 B
demo/build/assets/js/8f441c78.********.js 16.1 kB 0 B
demo/build/assets/js/8fe07157.********.js 8.6 kB 0 B
demo/build/assets/js/93304a97.********.js 5.79 kB 0 B
demo/build/assets/js/95d88c92.********.js 8.49 kB 0 B
demo/build/assets/js/960ace6c.********.js 2.69 kB +26 B (+0.98%)
demo/build/assets/js/96d3d581.********.js 410 B 0 B
demo/build/assets/js/9714.********.js 152 B 0 B
demo/build/assets/js/9be91988.********.js 8.44 kB 0 B
demo/build/assets/js/a06b4842.********.js 5.77 kB 0 B
demo/build/assets/js/a106d181.********.js 10.7 kB 0 B
demo/build/assets/js/a1205735.********.js 6.35 kB 0 B
demo/build/assets/js/a2b8aca8.********.js 8.22 kB 0 B
demo/build/assets/js/a40c6d71.********.js 5.79 kB 0 B
demo/build/assets/js/a63defdd.********.js 8.27 kB 0 B
demo/build/assets/js/a6cd895f.********.js 23.1 kB 0 B
demo/build/assets/js/a6f66deb.********.js 4 kB 0 B
demo/build/assets/js/a705d98d.********.js 6.48 kB 0 B
demo/build/assets/js/a728d93a.********.js 7.81 kB 0 B
demo/build/assets/js/a7bd4aaa.********.js 695 B 0 B
demo/build/assets/js/a94703ab.********.js 11 kB 0 B
demo/build/assets/js/aa2f1ec7.********.js 19 kB 0 B
demo/build/assets/js/ab09fd5c.********.js 23.2 kB 0 B
demo/build/assets/js/aba21aa0.********.js 172 B 0 B
demo/build/assets/js/ac9f9fec.********.js 9.28 kB 0 B
demo/build/assets/js/aeac4323.********.js 631 B 0 B
demo/build/assets/js/aec2c957.********.js 7.89 kB 0 B
demo/build/assets/js/aedd5031.********.js 8.42 kB 0 B
demo/build/assets/js/b2a753ec.********.js 7.86 kB 0 B
demo/build/assets/js/b314ffcf.********.js 15.1 kB 0 B
demo/build/assets/js/b4ebd305.********.js 13.4 kB -29 B (-0.22%)
demo/build/assets/js/b89b49f4.********.js 6.89 kB 0 B
demo/build/assets/js/baebb6c1.********.js 2.77 kB 0 B
demo/build/assets/js/bc17b4cf.********.js 8.5 kB 0 B
demo/build/assets/js/bdbe39c2.********.js 2.77 kB 0 B
demo/build/assets/js/bead4b8e.********.js 3.29 kB 0 B
demo/build/assets/js/bee04d06.********.js 23.5 kB 0 B
demo/build/assets/js/bf87ce40.********.js 375 B 0 B
demo/build/assets/js/c141421f.********.js 172 B 0 B
demo/build/assets/js/c51aa9b5.********.js 413 B 0 B
demo/build/assets/js/c5e96c8d.********.js 9.18 kB 0 B
demo/build/assets/js/c7a5be9f.********.js 8.1 kB 0 B
demo/build/assets/js/c7ded1cb.********.js 3.22 kB 0 B
demo/build/assets/js/cb2a8bf9.********.js 24 kB 0 B
demo/build/assets/js/cf07762b.********.js 22.7 kB 0 B
demo/build/assets/js/d492db52.********.js 2.47 kB 0 B
demo/build/assets/js/d4c22c56.********.js 7.89 kB 0 B
demo/build/assets/js/d63c7029.********.js 3.2 kB 0 B
demo/build/assets/js/d64c2530.********.js 6.17 kB 0 B
demo/build/assets/js/d805e82c.********.js 2.51 kB 0 B
demo/build/assets/js/db9084e9.********.js 6.17 kB 0 B
demo/build/assets/js/dc1ed7fc.********.js 8.42 kB 0 B
demo/build/assets/js/de527494.********.js 7.83 kB 0 B
demo/build/assets/js/df203c0f.********.js 8 kB 0 B
demo/build/assets/js/e0075694.********.js 3.87 kB 0 B
demo/build/assets/js/e01f8d18.********.js 6.31 kB 0 B
demo/build/assets/js/e5e5340c.********.js 2.65 kB 0 B
demo/build/assets/js/e5f74b05.********.js 379 B 0 B
demo/build/assets/js/e7e42acb.********.js 2.7 kB 0 B
demo/build/assets/js/e9647dd2.********.js 3.88 kB 0 B
demo/build/assets/js/eadbd531.********.js 1.98 kB 0 B
demo/build/assets/js/eae14b71.********.js 24.1 kB -8 B (-0.03%)
demo/build/assets/js/eaf4471e.********.js 9.89 kB 0 B
demo/build/assets/js/ee308fa3.********.js 7.63 kB 0 B
demo/build/assets/js/ee9514c0.********.js 2.52 kB 0 B
demo/build/assets/js/f12ef7c4.********.js 8.43 kB 0 B
demo/build/assets/js/f212caf7.********.js 20.1 kB 0 B
demo/build/assets/js/f283d1c6.********.js 5.35 kB 0 B
demo/build/assets/js/f4486b6b.********.js 9.43 kB 0 B
demo/build/assets/js/f4538a24.********.js 2.65 kB 0 B
demo/build/assets/js/f65290a6.********.js 8.12 kB 0 B
demo/build/assets/js/f65fafa2.********.js 1.38 kB 0 B
demo/build/assets/js/f8409a7e.********.js 38.1 kB 0 B
demo/build/assets/js/f99cae10.********.js 10.7 kB 0 B
demo/build/assets/js/fb27f34a.********.js 435 B 0 B
demo/build/assets/js/main.********.js 667 kB 0 B
demo/build/assets/js/runtime~main.********.js 14 kB 0 B
demo/build/index.html 94.5 kB 0 B

compressed-size-action

Copy link

github-actions bot commented Oct 4, 2024

Visit the preview URL for this PR (updated for commit 1283280):

https://docusaurus-openapi-36b86--pr985-5uzhfb7f.web.app

(expires Sun, 03 Nov 2024 15:31:57 GMT)

🔥 via Firebase Hosting GitHub Action 🌎

Sign: bf293780ee827f578864d92193b8c2866acd459f

@sserrata sserrata merged commit b7872d6 into main Oct 4, 2024
13 checks passed
@sserrata sserrata deleted the edge-allof branch October 4, 2024 15:36

if (name === "eventName") {
console.log(mergedSchemaName, combinedSchemas);
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Was this debugging info that was left in there?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working v4.0.0 v4.0.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants