@@ -60,118 +60,79 @@ function parseSingleStatistic(statistic: string, prefix: string): Omit<SingleSta
6060 return undefined ;
6161 }
6262
63- let r : RegExpExecArray | null = null ;
63+ // A decimal positive number regex (1, 1.2, 99.999, etc)
64+ const reDecimal = '\\d+(?:\\.\\d+)?' ;
6465
6566 // p99.99
66- // /^p(\d{1,2}(?:\.\d+)?)$/
67- r = new RegExp ( `^${ prefixLower } ) . exec ( statistic ) ;
68- if ( r ) {
69- return {
70- type : 'single' ,
71- rawStatistic : statistic ,
72- statPrefix : prefixLower ,
73- value : parseFloat ( r [ 1 ] ) ,
74- } ;
67+ // /^p(\d+(?:\.\d+)?)$/
68+ const r = new RegExp ( `^${ prefixLower } ${ reDecimal } ) . exec ( statistic ) ;
69+ if ( ! r ) {
70+ return undefined ;
7571 }
7672
77- return undefined ;
73+ const value = parseFloat ( r [ 1 ] ) ;
74+ if ( value < 0 || value > 100 ) {
75+ return undefined ;
76+ }
77+ return {
78+ type : 'single' ,
79+ rawStatistic : statistic ,
80+ statPrefix : prefixLower ,
81+ value,
82+ } ;
7883}
7984
85+ /**
86+ * Parse a statistic that looks like `tm( LOWER : UPPER )`.
87+ */
8088function parsePairStatistic ( statistic : string , prefix : string ) : Omit < PairStatistic , 'statName' > | undefined {
81- const prefixUpper = prefix . toUpperCase ( ) ;
82-
83- // Allow `tm(10%:90%)` lowercase
84- statistic = statistic . toUpperCase ( ) ;
85-
86- if ( ! statistic . startsWith ( prefixUpper ) ) {
89+ const r = new RegExp ( `^${ prefix } , 'i' ) . exec ( statistic ) ;
90+ if ( ! r ) {
8791 return undefined ;
8892 }
8993
9094 const common : Omit < PairStatistic , 'statName' | 'isPercent' > = {
9195 type : 'pair' ,
9296 canBeSingleStat : false ,
9397 rawStatistic : statistic ,
94- statPrefix : prefixUpper ,
98+ statPrefix : prefix . toUpperCase ( ) ,
9599 } ;
96100
97- let r : RegExpExecArray | null = null ;
98-
99- // TM(99.999:)
100- // /TM\((\d{1,2}(?:\.\d+)?):\)/
101- r = new RegExp ( `^${ prefixUpper } ) . exec ( statistic ) ;
102- if ( r ) {
103- return {
104- ...common ,
105- lower : parseFloat ( r [ 1 ] ) ,
106- upper : undefined ,
107- isPercent : false ,
108- } ;
109- }
110-
111- // TM(99.999%:)
112- // /TM\((\d{1,2}(?:\.\d+)?)%:\)/
113- r = new RegExp ( `^${ prefixUpper } ) . exec ( statistic ) ;
114- if ( r ) {
115- return {
116- ...common ,
117- lower : parseFloat ( r [ 1 ] ) ,
118- upper : undefined ,
119- isPercent : true ,
120- } ;
101+ const [ lhs , rhs ] = r [ 1 ] . split ( ':' ) ;
102+ if ( rhs === undefined ) {
103+ // Doesn't have 2 parts
104+ return undefined ;
121105 }
122106
123- // TM(:99.999)
124- // /TM\(:(\d{1,2}(?:\.\d+)?)\)/
125- r = new RegExp ( `^${ prefixUpper } ) . exec ( statistic ) ;
126- if ( r ) {
127- return {
128- ...common ,
129- lower : undefined ,
130- upper : parseFloat ( r [ 1 ] ) ,
131- isPercent : false ,
132- } ;
133- }
107+ const parseNumberAndPercent = ( x : string ) : [ number | undefined | 'fail' , boolean ] => {
108+ x = x . trim ( ) ;
109+ if ( ! x ) {
110+ return [ undefined , false ] ;
111+ }
112+ const value = parseFloat ( x . replace ( / % $ / , '' ) ) ;
113+ const percent = x . endsWith ( '%' ) ;
114+ if ( isNaN ( value ) || value < 0 || ( percent && value > 100 ) ) {
115+ return [ 'fail' , false ] ;
116+ }
117+ return [ value , percent ] ;
118+ } ;
134119
135- // TM(:99.999%)
136- // /TM\(:(\d{1,2}(?:\.\d+)?)%\)/
137- // Note: this can be represented as a single stat! TM(:90%) = tm90
138- r = new RegExp ( `^${ prefixUpper } ) . exec ( statistic ) ;
139- if ( r ) {
140- return {
141- ...common ,
142- canBeSingleStat : true ,
143- asSingleStatStr : `${ prefix . toLowerCase ( ) } ${ r [ 1 ] } ,
144- lower : undefined ,
145- upper : parseFloat ( r [ 1 ] ) ,
146- isPercent : true ,
147- } ;
120+ const [ lower , lhsPercent ] = parseNumberAndPercent ( lhs ) ;
121+ const [ upper , rhsPercent ] = parseNumberAndPercent ( rhs ) ;
122+ if ( lower === 'fail' || upper === 'fail' || ( lower === undefined && upper === undefined ) ) {
123+ return undefined ;
148124 }
149125
150- // TM(99.999:99.999)
151- // /TM\((\d{1,2}(?:\.\d+)?):(\d{1,2}(?:\.\d+)?)\)/
152- r = new RegExp ( `^${ prefixUpper } ) . exec ( statistic ) ;
153- if ( r ) {
154- return {
155- ...common ,
156- lower : parseFloat ( r [ 1 ] ) ,
157- upper : parseFloat ( r [ 2 ] ) ,
158- isPercent : false ,
159- } ;
126+ if ( lower !== undefined && upper !== undefined && lhsPercent !== rhsPercent ) {
127+ // If one value is a percentage, the other one must be too
128+ return undefined ;
160129 }
161130
162- // TM(99.999%:99.999%)
163- // /TM\((\d{1,2}(?:\.\d+)?)%:(\d{1,2}(?:\.\d+)?)%\)/
164- r = new RegExp ( `^${ prefixUpper } ) . exec ( statistic ) ;
165- if ( r ) {
166- return {
167- ...common ,
168- lower : parseFloat ( r [ 1 ] ) ,
169- upper : parseFloat ( r [ 2 ] ) ,
170- isPercent : true ,
171- } ;
172- }
131+ const isPercent = lhsPercent || rhsPercent ;
132+ const canBeSingleStat = lower === undefined && isPercent ;
133+ const asSingleStatStr = canBeSingleStat ? `${ prefix . toLowerCase ( ) } ${ upper } : undefined ;
173134
174- return undefined ;
135+ return { ... common , lower , upper , isPercent , canBeSingleStat , asSingleStatStr } ;
175136}
176137
177138export function singleStatisticToString ( parsed : SingleStatistic ) : string {
0 commit comments