From 029bc8b5f8b017cd335a733770176d8b55696055 Mon Sep 17 00:00:00 2001 From: Madeline <46743919+MaddyUnderStars@users.noreply.github.com> Date: Fri, 14 Apr 2023 15:17:30 +1000 Subject: [PATCH] Fix bug where different HTTP method handlers would overwrite eachother in spec generation --- assets/openapi.json | Bin 459469 -> 550446 bytes scripts/openapi.js | 11 +++++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/assets/openapi.json b/assets/openapi.json index 142f183887f1b6f0df524e85bcf24c78afee9564..2bc257f45b3735b463b8d0016cb9970c36c0839a 100644 GIT binary patch delta 3117 zcma)8e{9oL5YOxPz1RI-8H@qK)`^i|WPk#SC{WgJOx&nz2a+Kju*u4{ZY+Zc5-0*P ze?*zhI8dfj7$79F5#50bju;{)4yJ;V5Ty~+fFdI?IDx3|``&l$cbi84S-SS_-RJH; zpS$baJo4SoGlQGRCd+%;&THsiO+O%DyU&si-FIt=7{00HT0+72WH^<>?m*jnw2Fi} zx~OgvgA=Z6=b7&F34z;RX^Ai=%xkcF1pkUaFqz)1JK~?QbPIvM&S(kvMvvA>@u)_h zQ(suzEAg!!Z5G8YLfeQm&v=*~pxFHqeU?D?7RsPWqjrT$E2yr64OJ|J!EW|F(TysU zlX%j>v80&3p#B#z&yLZZ+DV+lo#(FguUcGJ7RqcJA=3g|8*hjp?3Wt)?x%@^u;ynv zMP$*A`zPxxq_Y`pgZ%k%NGX%WtGrS&sKqZ8_kXYSEa?7<@D-M zRUz)Kt$xa1sTXO@wv((PTB81dj|AzN$MhtZP$+4p=`gO7jxqIX=C?c^GfvY`jKUK7 zsNN3tP7;H`21+d;8kU1q-_jK-pRC<9E4j$y^5r``9$#L;ygaW9J1((9B;p9du^cnL zU|U7!er2_q$z7D=6Olf>G0*6H)zL~7HpY%?y{eF& z4FpeESkVv&7x0O&-p*REWH=i`;QT@@cJHG*m_?VxzXZke!&t3VL5&qX_m)-FR4&Gu z2UxMvo~Z6f2o&*j1Ek1522<~3*JHq4#2*F$y-ANZoT$>+pJ!ubc}=AOp^@Rxn#+en z(9U-Mr@5&nGTiBVS*(FEMqu>R`IlDUEA?!H1|3hZ<+2(PoZvda4nT7cy^MP%vlWIP z)T|?!l0=FN3TB6ct&O&!ujgT|L=m-Ff0a$v6R@HPQAJVwlEif7=a?JX3* z#M)1?)g*!yMSgoy3~n#llx~70$a#cfXNav*u%aPnyuzjsv`^y4#9tpHTna|Kbb{d2 zVwPqz(T%!mR|cdI`vwMGD!8tK)sIHeyjt;+?AGm_%w~*$Xy`sYv!aNcf%7~xAPvUMUigQRm3#NBrJLCqt*UE?n-}U zDLQtrSQCxC2HJ=x3KdT^rL&LVsoktF!Bmv^`Tn|c{l&6U2Tc6MG8nqP(QJ{)aE0~} z)!I12)qcN5X;t-dKZ+r^{yzxUa+H-CgbUqzE@MDr4}Hd-judHHlyA(XM}UqX-32xK zXiq<9)upI&lof)A)i7B+G*IMdFt@>G+QU;d8mQXK#320LJ=#g}SO7X`?sS*nOStodb2%B!m@ zs7>JtUZ*miF;&gOuv|Q_b%!<#nm5y> z7@o!d(A3R0^#3lT4@<&y@3yFzgC+C^%$ zs!JmZEj3%z-s=(p7H3r+0F zui0L-?`PY^B|3uVqPPQ{7D#U7DRRx@PQO?L0|nfu8xB*OTQO6AN3G`pYBw9pl`C|9 z)}bVuBqZyosj2iYU0mm{4wx>$*0D6cG0S?VRG&Jq^@A<6KPeHr&T)$|INN{Zmm?!Y x?t_3xrI5s7*(KhS1P5>O4(Mhy3&Qj1Neqvo4+!ps`QgZXG?oZn`i);s{2MF)YVQC5 delta 1241 zcmaJ>TS!z<6y@A|9(QtP7+;wwa#d2P4>htkB|`dB5>1q4p-@C>(WRguE3E86MU5J6 z?ZxyFfl-)Bn?8cECyCY+h4eJR$_#26u&kgucV?OZy;gsemPc+eT}_oloC2eo?JhHLN~k;I?WL{}kZoBUwo$w1;AuM|@FGFJ>JC zvt#Iaf*%;&PZ~U43a)rc(UC;k>1cx0{i=rV(`aGFsGcScD;H5)^cV#=IE~ow_!_z( z0c77!)YHTesgD~EHR;+U@TCb0w(g}hd~~}g7qy^qln#s^gB5?a&_@eLLD2Dop3%%M zH^6s@env+EYx^gM^2v>r*-5~}W2%#t#sz=iErV?qK}hQe({cVLwx6KBi+$BX5c#g*3}BYXWg9!#LJbzj z@p^DvWSOSyWH1RpRxUuRlQm;`H1{cHR-P=Hj_2Fh4%xqo%IxN{80@;qDpioG=Ad_k z9U|y|%=#VSA7`T@e016Q!E~_Ki6k_p@;w9=&k-juzk)9}`O!BZt)ZUJS6Iy5F^hy- z=27U9yVHI9wiUi2nCgO2>kr-lOnTdF5sW@N@e_sm@M1o=!oLeDeg1@0D zXfZ^e9o(yEqB+1skkC7U9SE*wbpp8ilz23T#Y+O7Jaf%-u^RMsvWLzp!W?(Y%;{4SAf3cjn14STMH5mT@*lTIaQ#qYO8lQpbNN15bR zf+t>xh{7qA+v~s|JCZx1tX9JmDfJoj(mp^i0r_u-GrMLeYjVACLzy ms-eYhLwTx{!0;ljra%>=3$zhC7zHeJH+lVh2n$QJLEA4sx6qmZ diff --git a/scripts/openapi.js b/scripts/openapi.js index 76025e4d..8258a76c 100644 --- a/scripts/openapi.js +++ b/scripts/openapi.js @@ -84,7 +84,7 @@ function combineSchemas(schemas) { } for (const key in definitions) { - const reg = new RegExp(/^[a-zA-Z0-9\.\-_]+$/, "gm"); + const reg = new RegExp(/^[a-zA-Z0-9.\-_]+$/, "gm"); if (!reg.test(key)) { console.error(`Invalid schema name: ${key} (${reg.test(key)})`); continue; @@ -218,9 +218,12 @@ function apiRoutes() { obj.tags = [...(obj.tags || []), getTag(p)].unique(); - specification.paths[path] = { - [method]: obj, - }; + specification.paths[path] = Object.assign( + specification.paths[path] || {}, + { + [method]: obj, + }, + ); }); }