From fc1082a37f22db74f157831faddf7a26da77bbc8 Mon Sep 17 00:00:00 2001 From: Andreas Deuschlinger Date: Tue, 26 Mar 2019 21:26:50 +0100 Subject: [PATCH 1/2] fix: quater milimeters not detected --- lib/nodes/Numeric.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/nodes/Numeric.js b/lib/nodes/Numeric.js index ce7c4c0..5cf25a4 100644 --- a/lib/nodes/Numeric.js +++ b/lib/nodes/Numeric.js @@ -14,7 +14,7 @@ const { registerWalker } = require('../walker'); const Node = require('./Node'); -const unitRegex = /%|ch|cm|em|ex|in|mm|pc|pt|px|rem|vh|vmax|vmin|vw$/i; +const unitRegex = /%|ch|cm|em|ex|in|mm|pc|pt|px|q|rem|vh|vmax|vmin|vw$/i; class Numeric extends Node { constructor(options = {}) { From 8d081986525fb7b8c76383760ebd07cfa039891e Mon Sep 17 00:00:00 2001 From: Andreas Deuschlinger Date: Tue, 26 Mar 2019 21:33:04 +0100 Subject: [PATCH 2/2] test: added quatermilimeter test and updated snapshots --- test/fixtures/numeric.js | 1 + test/snapshots/numeric.test.js.md | 57 +++++++++++++++++++++++----- test/snapshots/numeric.test.js.snap | Bin 3120 -> 3194 bytes 3 files changed, 49 insertions(+), 9 deletions(-) diff --git a/test/fixtures/numeric.js b/test/fixtures/numeric.js index 267b74f..cbedc06 100644 --- a/test/fixtures/numeric.js +++ b/test/fixtures/numeric.js @@ -22,6 +22,7 @@ module.exports = { '-2px', '-16px', '-16px -1px -1px -16px', + '10q', '1e10', '1E10', '1e-10', diff --git a/test/snapshots/numeric.test.js.md b/test/snapshots/numeric.test.js.md index 185310d..75986bf 100644 --- a/test/snapshots/numeric.test.js.md +++ b/test/snapshots/numeric.test.js.md @@ -69,7 +69,7 @@ Generated by [AVA](https://ava.li). input: Input { css: '-.567800E-0012780em', hasBOM: false, - id: '', + id: '', }, start: { column: 1, @@ -375,7 +375,7 @@ Generated by [AVA](https://ava.li). input: Input { css: '.1E+10', hasBOM: false, - id: '', + id: '', }, start: { column: 1, @@ -414,7 +414,7 @@ Generated by [AVA](https://ava.li). input: Input { css: '.1E-10', hasBOM: false, - id: '', + id: '', }, start: { column: 1, @@ -505,6 +505,45 @@ Generated by [AVA](https://ava.li). }, ] +## 10q + +> Snapshot 1 + + '10q' + +> Snapshot 2 + + '10q' + +> Snapshot 3 + + [ + Numeric { + raws: { + after: '', + before: '', + }, + source: { + end: { + column: 1, + line: 1, + }, + input: Input { + css: '10q', + hasBOM: false, + id: '', + }, + start: { + column: 1, + line: 1, + }, + }, + type: 'numeric', + unit: 'q', + value: '10', + }, + ] + ## 1E+10 > Snapshot 1 @@ -531,7 +570,7 @@ Generated by [AVA](https://ava.li). input: Input { css: '1E+10', hasBOM: false, - id: '', + id: '', }, start: { column: 1, @@ -570,7 +609,7 @@ Generated by [AVA](https://ava.li). input: Input { css: '1E-10', hasBOM: false, - id: '', + id: '', }, start: { column: 1, @@ -609,7 +648,7 @@ Generated by [AVA](https://ava.li). input: Input { css: '1E10', hasBOM: false, - id: '', + id: '', }, start: { column: 1, @@ -648,7 +687,7 @@ Generated by [AVA](https://ava.li). input: Input { css: '1e+10', hasBOM: false, - id: '', + id: '', }, start: { column: 1, @@ -687,7 +726,7 @@ Generated by [AVA](https://ava.li). input: Input { css: '1e-10', hasBOM: false, - id: '', + id: '', }, start: { column: 1, @@ -726,7 +765,7 @@ Generated by [AVA](https://ava.li). input: Input { css: '1e10', hasBOM: false, - id: '', + id: '', }, start: { column: 1, diff --git a/test/snapshots/numeric.test.js.snap b/test/snapshots/numeric.test.js.snap index 0f0136b196177722937200596d71f730748622da..26556f41b3e5a1b41595a2a2d677654c9d377199 100644 GIT binary patch literal 3194 zcmV-=42APSRzVY|AB-vd^2u~}z2tLBo0P;bMSgmg*Cu*KY%f1!9; z!OdAo&5nz*bs=RfMTjCKZO7IHBcj5K?d$iAtheFmO`>d#r94QP5KGA5iHlC}Xp;5& zea-tUIh@qHl_*V=hjsNIBNP`BuxF8#2iJqHLW*SxH&+5Fyi7Eod-exyhJ%ye$55$8`o#wyvXWr&wDPVre@0 ztXR@$URnpcV@kxrW1?(*g7Q4&{bWK09g1qW^2XB#7weM_{`JdFg`#ZTNBM%%u?>FF z=cO5|f8lJM-E`&w{jS_?qHIm4jHP_ig^<==9zK1z<%NUaoIbT_*i*|t6lLpC${9-6 zu7s34f8>=zvHjAs2Oc^X(eUN&qHOI)8AjP-C#1#OQE8^>!V+g(*@B_%9Y2b)^*H4$ zrCSedcl1AYbvj%x?$V4^h%upd1)b#O-F_Q-1!M-CdgQgm4dub&Z?Hu`X8LTI>gTVInXTgxa1Db_4Ppc`3@f`P;e#w1&te8*_7 zwh%#wQ-;_;eZd$j7#`2h&ny-M_q*umXd;9WK_Ei7Aars!GCJ`(0lWd$f&<{Zdn2aw z!qJZWoNPgd9rnz6(UI+piHRXXq!fb?B?yrM1`7d#G{g$}{LJwMvNf%W)mSj5FhAQt zglKG1SLy34&U3gwm~vfvVSNg7bDZuEB7Q6Ly$M`iU@K8nYb3#^gKhev1u=a_?NO(mSFf zcc^S^qPuG}g+JX>Q8hH^F7R&x!q zXE>ujbcB2gWn;%VV1~N>R>5UG*a?pNO@H6<^miX$f8F@{8w>MzFkfAN8{zT+I1a9; z>MtI;dk{PpSpB&UrqANDX)8W`BCEdYmcYm_j4QtsKg&<<3HcNniaoywW~%G&ZMeJx zc7YRq)87T2{u=Z3_Y_}$`7jrOx778w2`<|}Irv^xe@&sghrr{3)gL{YJ`1powgS}I zl01G6jQB#h;%nn)@u45&vnLDt9Ra4ROK&Ay)`1=1nBSy#o+rIVeCgTw(#wN+9C%Y* zdhfwyD>w=+t4gmiB-add4y^R#W9hT-+G;F3v(4k@ds=vATTpm)MR?M&^jUZ*8VfJc z=JE4AExg2_@al~4615OssbGHfUndivQbdJdvLfA&eFq|AQ zpatjxvcO~=yR%3SW55y}Zw%P4^Y0iSq{t!Z<(*&Wh9q51{0Sk2jG;Z|eZR?7x}vwp z+wV(1ZNHjy1qA&LcDoV$g%z}NG&~QN3hADio{$Ih-bX`hIR!2q!2s4ZRI%l8aCr&L z0c%tVM)ksR&qd~0;wLIu&&Cao(-2AFd58e-NRG|sQ)p|l!}}* zb3){%8G~NygeM3IRbsK|Ik61Vb7RTm#De~Q9p<^XoFhHYX^_c zU=TYgQl`A|aG3-av#y>}-Uo2}2%KUYMEEr=$s?Wyc`3~wc`0Cd!GK;$2o|crLe;fj zbFfhLlGBRdG8xPR>(vX@-Ei3lzELk!^%yI|Kr@i)w?g$fUU^u=FArC1ULID@mWO$< z{K$_*$0-oCj3tp*tPbE8t3&w3>Z>sS7Hm*2R{sQ-gWwW~R4rDeLbW3ps9vl}h3Z65 zQqy8pDpbqBN%dk?DpYStYou#htV)GyM=&t3#i}dcX)rBl|FfSK)S$hgHrq4nqHK9Z zUMyPPx;j_mTUX)SQZrTi#lpJ0q8i=3a$wgZ!7TN=S5i@33U-5XzumpM$h&)WKmYDk zcmCb00+@@z0`wkqIs!#iT_|kP_6C+A(VEI= zkTC^Dgb`d3w)4LTMf8SzA`Qd7M}b$>Rk#K&8|dY&lYUd-C7uf7`6}$eSD_Q;31FeR z3g3szAHgZ`gQ^N2g!)Wsp~egLIWmlsO$mwCyZ=;|r6CQkT|jrx7YtF8 zs9u(6PG#Y~{BGfXk{0gaQY#|&A~f6sZ+ikM15E})-aTUL*SxX8IN|+IIZGB!3>dYSI@&(vxZyq9?`t!t>IWx8JD2v z#noCLfQg8;N?3!qVa*71SX;PZ{muVjRb~w7ifkP3CbTkR^nyzU7zw7b?#jy-C2&~^ zwzICv%NM8N@-?^)qS(4rdHLcIxR^nA)>V1=Vgy`r!8EXlb&pnTc_Umt07qHZ`id=I zh09G4jj^r;Tb4Gct^C>9#L1r{Ox*nWmZ^3xM(pOra-JVcMJ>nDG=vjN_YiI@=^?cn zOEE8&Rs2}ib7H}Hcns!K;0Ak5LOI8Y3ne5TJPUF{)#f;J;js{G4fQ_9f$I^tl!I%m ztEY=J^}-0b52S{vUZm**mjPfL>+0zu&0P8{`&PC=tTJx6l!I%mYn-RJ!x1+~4QCoO z^y|EjKbO*C9_ahCV>M`R3UK>~0Jo2=&Gyw7a9S;6JsY$vg}<$FDeSK&_XJ_A_vx0^ z5`1z`nIzm#?n$dEuKrw}+>=ggErvghpWM@19af7M%RT+*tke@h0eTi-%^sb70K$71 zbPe$JVAs*~U4a@u!l$>|6$-Qm6-bYnJ*dDsq(Hki3e@;nK7-Yf$ViYe1xADZx-IHm zgRZU!-WFAg(0yC<3vgXkgziPXPX_pg3_YB_t5D+y`wUjQQib-Q3f+gz9#mmnQlVWV z75e@>51aVR%3Np;s?a@nnu98=Ln?F~PTy7N`_l_-;!~>79#moF;2Bh5T~eW4BNh6- zSh$+x>L(_pq_#`5SnP=wi`9mA%%9rz>JXS!eD`w|YOjS=d@6r-H&)R%uJvw+WCB>A zF4!$_DFcV-(kA~1_BKzjt@wiN&ll`em}i02>Vo|kF8iri8;ELx?MxS2Wd>HTywhF- z`PwvIXlqPTR+OwQFlp3ZOKrWUQQ8;5rM600x|iCX1~*jm=>N^%#@4E+v}wH7R*Hw0R%)q0#=SLxfV7A2w2gzfD%pv$OqaG77~F3HycPmph7uBKCOV< zMMMxef)$X%202uYex&7waMhMprR4?<0v7svZ)Za?Z?Z3RUv}HDe*Ch#|NYN<|DE@K zGxMLBmjaQH81hw%yT4g|q4_V~OWd<-Q=5Wx81Y{nN(;(Nn2$z%nLJ_9(_8NLf1&=& zgp;jA*}8;ML@}8NDNgAXm$|{&c=hnY^fB88-4|tReTtbfBZQDn)^tnM?Ri%U-_5%- zBfjwoQMN9mtfmMNgrw})vLGuWw9vM8--uf4yKNL@Yc!<^Wn45NgT^mDyQATdclI^y zz4UN=ua=^0ok>|txrv{5K#aON<%acm9q0V!JJ+}WT9mE27#FoElN%Az^Sk(YO9!p_ zq9`SA)}`JZ_KLD~Hf056@sos1UAdr6)^d|E`9yJp>mAk@MA^EAvYnFDijc%c6EBF1 z>dj4QZ?jJdTXr6X9Wo^tc8@Im<{Y1`kN*YJiYTYpK(qa1ya5WDTz#mR%xWai?u&ov2IEGl2xK?9Z8u)`Kk{*SCtN3XihiA9K3&`$J>`Ki?WsU zb}LDH{h90yW4Q6AUC;FveS2JM5!8+JXcfZUkZhwFP6eV0gyi$S4#9_q)i*NFsy~ zK_Eh?Af&nr8J&0?2i^j!!2xi|eGpSx{wTX6J5$i%ggu75V$XC&MMV)IT#7-65QK06 zO@IKI8KMQfBV%lyY)vU=HRk2!J2LG=h{PdvWxmeB(RTL-Q;zE_tWSPUw$uGV#BXK3 zH;l;`nO}Ag5%nScAaOWOJ_^hf=#QX*3u49J5G3eV!{tNpIXKO_>lHs)#|Drw%xQPf zPlWl>IK)0I*I|F~Ee;^cwR62(?TGfAp|Y`|?t#&eoijS$DVw{MH|IGs98UQ+=EFQ5 zEYdMS8x+5BGhB+nIdI4AZs;nVpFh?(#=n6!WDnd#L+uc&c21u{dCCQYUYN zt)MzFG2U9aK}!u@sImrwxf*Pvxdz!goY5aDLcWDEapG(+OiT;hF6+Q9aMEY`yTa37eZKyF&exv<<^nKZU4I+lvJI4g z?^X5J2)cU`JmX*e(W~jT09$J-K%FJN($D@8Ul3P(t$i#$)PsEY48eJ`z*KeVt$@oK zumc?Tne;C4q*sqGJsV$oqhTHc-d301M{wB!j)Ci{(yI^2H3l91D?RyIdM&&*8Vk>C zsr2(BEj+U&AiSC)Jn33`Ej+8n!i%$1`uUL-UR*$UHAZ-GS_m&$Tj2@JG>bK%e4eLo zgV*-pInYB*fTAqGmtBSNZjSWoQsqABtxlHZeY`c`ZfO7{IrRg1f{HAI1j8KoETj{O zd%;C_nV=q{?T!p*u0sf73mHRjb3}n=pc5DZChFLeg;&xBEYIHRk!e3FWGym&iNsYY%r`O{xNdUWe0e0Doo$t!xc1!R3au5~e5Q z3BBjm5J$Gcr32{Cx&|wbJO(bWf!Sa+>mH&w@=mzy0q0rQ2*r_!fe<5T04xT^J+iu5 z@U8|<3+^;SxM!CT6;kX$bWebEUj(rs_-%D;m zjB8XS$4-Ew74%^XMEiE?6+N8>-Emv5yW=X9XTSAzdA1%kE$?YKqPNDH%a2FIM7$=0 zpQ(*Sbn>v{g|e~86gn2cn4lPMcY~AQs(c(m64VDE#x(f!rIWss!7A{XqFj*TE_QXG z=ehYrxPQhHu8>l>V~OED4oPQrb?VX_^Y6eX?C@XNsh_0ltT#X~I|fj8>alQX2A*YI zm7RJfT(ZGLFpqT)QEj09%WkGfnZZZH42f;0#+J%%|Ow z+~R4_FQxdRU-DbOU_dR!1`^dkqUt)YIgqG&=+g?|G7-!LYt<9g-Ei3l{-K_z>d{t) zfW{!%XNhWeUV2!-PY+jVo*q{0Ef4cz`H>%sj*}p28A}{5S?$kHRtNKw)i+@NEm*If zto{)$2f;NEu9~b$iE0NhKs{NN64miwQB{*wDN!v3r__^GDN(&E?R>6kvMMF29l!wp zCabRgPJ>}VyZ`%PK^4jys#b52#nrBA3lvd)qi~|O3s{D@q+~{ejLAPD4C9Kht?xxBqBi6kX&BBu61<_V!VloG zo=$I_@|g;+@l@D=ufnc;6*^%a2NtTU@MF0A0h|FpsH(6D)Ylx?{HsFOt*wO&HQun# zkztH%ij7Np@J~fq8dC7u33LI{Ge3jXB&wGsnq8K-FMp7@pQ4F-s8ou`wFnJ&#oHc0 z>VYPJ<#ZRW+FbA7;PWl`H;BQ_(GK)iq~ppozJR9f(jJB)a0pygOXE>4QhNLkm}x^l z98440aR`%u*!N2 zX+}1Nw+OB5F?zx!9gF~zS$F01#Ui*Y1KU|w<@Ci_xSR*KKm?nYDyJ`=f{Ph+VO^Ee z7g=!00aL(Y);&^jx?7MnRldx&(1!NeimpSPFTutmMbCmJ0 z;6;!ftTx7(1CNDZOR(oL4qT7Gr393+u9Z#F)CwWwF_0XhI!V(TF8#q6*0r)pnmP0d z^(}0HXl2}RDFLOdYfNQvhazr}9Lf}^>(g-`e=McNIMDlN$Er}?1X$(ng~3*r|c#k?%BO3kXQT!boTRvldzbgzjC1&-r;q zm|jlrRjBbJeTF2PQiZmF3f-5@7EobLQlU*F6>9u^ADRcVvM)3TROoIz%>fnGAQieU zr}rxK{;?jm<5Q~87EobX;~7w4O;VvvBNcl85JLsY)sBm|CbvyVOti%%CMH?%j`>@k z9v%F%jp%W%LT%NsjY#G1enu^zS`^Oxf`W* z5!mael%;#G-&t^5wIBVT`QyA=C6yM9_uNX6vEy0R_NXh-98hA7Qld6PT8sDFZvO*R Kt|2ihVgLZq@&@Jr