@k-int/stripes-kint-components 3.2.1 → 3.2.2

package/src/artifacts/coverage-jest/lcov-report/index.html

@@ -23,30 +23,30 @@
         <div class='clearfix'>
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">28.4% </span>
+                <span class="strong">27.57% </span>
                 <span class="quiet">Statements</span>
-                <span class='fraction'>486/1711</span>
+                <span class='fraction'>488/1770</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">24.08% </span>
+                <span class="strong">22.84% </span>
                 <span class="quiet">Branches</span>
-                <span class='fraction'>263/1092</span>
+                <span class='fraction'>263/1151</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">25.35% </span>
+                <span class="strong">25.09% </span>
                 <span class="quiet">Functions</span>
-                <span class='fraction'>126/497</span>
+                <span class='fraction'>126/502</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">28.66% </span>
+                <span class="strong">27.78% </span>
                 <span class="quiet">Lines</span>
-                <span class='fraction'>469/1636</span>
+                <span class='fraction'>471/1695</span>
             </div>
         
             
@@ -84,13 +84,13 @@
 	<div class="chart"><div class="cover-fill" style="width: 0%"></div><div class="cover-empty" style="width: 100%"></div></div>
 	</td>
 	<td data-value="0" class="pct low">0%</td>
-	<td data-value="128" class="abs low">0/128</td>
+	<td data-value="132" class="abs low">0/132</td>
 	<td data-value="0" class="pct low">0%</td>
 	<td data-value="93" class="abs low">0/93</td>
 	<td data-value="0" class="pct low">0%</td>
-	<td data-value="35" class="abs low">0/35</td>
+	<td data-value="33" class="abs low">0/33</td>
 	<td data-value="0" class="pct low">0%</td>
-	<td data-value="119" class="abs low">0/119</td>
+	<td data-value="125" class="abs low">0/125</td>
 	</tr>
 
 <tr>
@@ -125,17 +125,17 @@
 
 <tr>
 	<td class="file medium" data-value="CustomProperties/Edit"><a href="CustomProperties/Edit/index.html">CustomProperties/Edit</a></td>
-	<td data-value="72.92" class="pic medium">
+	<td data-value="72.77" class="pic medium">
 	<div class="chart"><div class="cover-fill" style="width: 72%"></div><div class="cover-empty" style="width: 28%"></div></div>
 	</td>
-	<td data-value="72.92" class="pct medium">72.92%</td>
-	<td data-value="181" class="abs medium">132/181</td>
+	<td data-value="72.77" class="pct medium">72.77%</td>
+	<td data-value="180" class="abs medium">131/180</td>
 	<td data-value="64.86" class="pct medium">64.86%</td>
 	<td data-value="111" class="abs medium">72/111</td>
 	<td data-value="72.88" class="pct medium">72.88%</td>
 	<td data-value="59" class="abs medium">43/59</td>
-	<td data-value="74.41" class="pct medium">74.41%</td>
-	<td data-value="172" class="abs medium">128/172</td>
+	<td data-value="74.26" class="pct medium">74.26%</td>
+	<td data-value="171" class="abs medium">127/171</td>
 	</tr>
 
 <tr>
@@ -339,13 +339,13 @@
 	<div class="chart"><div class="cover-fill" style="width: 0%"></div><div class="cover-empty" style="width: 100%"></div></div>
 	</td>
 	<td data-value="0" class="pct low">0%</td>
-	<td data-value="51" class="abs low">0/51</td>
+	<td data-value="52" class="abs low">0/52</td>
 	<td data-value="0" class="pct low">0%</td>
-	<td data-value="41" class="abs low">0/41</td>
+	<td data-value="44" class="abs low">0/44</td>
 	<td data-value="0" class="pct low">0%</td>
-	<td data-value="16" class="abs low">0/16</td>
+	<td data-value="17" class="abs low">0/17</td>
 	<td data-value="0" class="pct low">0%</td>
-	<td data-value="50" class="abs low">0/50</td>
+	<td data-value="51" class="abs low">0/51</td>
 	</tr>
 
 <tr>
@@ -369,13 +369,13 @@
 	<div class="chart"><div class="cover-fill" style="width: 0%"></div><div class="cover-empty" style="width: 100%"></div></div>
 	</td>
 	<td data-value="0" class="pct low">0%</td>
-	<td data-value="46" class="abs low">0/46</td>
+	<td data-value="47" class="abs low">0/47</td>
 	<td data-value="0" class="pct low">0%</td>
-	<td data-value="35" class="abs low">0/35</td>
+	<td data-value="43" class="abs low">0/43</td>
 	<td data-value="0" class="pct low">0%</td>
-	<td data-value="11" class="abs low">0/11</td>
+	<td data-value="9" class="abs low">0/9</td>
 	<td data-value="0" class="pct low">0%</td>
-	<td data-value="45" class="abs low">0/45</td>
+	<td data-value="46" class="abs low">0/46</td>
 	</tr>
 
 <tr>
@@ -545,17 +545,17 @@
 
 <tr>
 	<td class="file low" data-value="utils"><a href="utils/index.html">utils</a></td>
-	<td data-value="19.87" class="pic low">
-	<div class="chart"><div class="cover-fill" style="width: 19%"></div><div class="cover-empty" style="width: 81%"></div></div>
+	<td data-value="16.36" class="pic low">
+	<div class="chart"><div class="cover-fill" style="width: 16%"></div><div class="cover-empty" style="width: 84%"></div></div>
 	</td>
-	<td data-value="19.87" class="pct low">19.87%</td>
-	<td data-value="166" class="abs low">33/166</td>
-	<td data-value="11.29" class="pct low">11.29%</td>
-	<td data-value="124" class="abs low">14/124</td>
-	<td data-value="16.32" class="pct low">16.32%</td>
-	<td data-value="49" class="abs low">8/49</td>
-	<td data-value="21.29" class="pct low">21.29%</td>
-	<td data-value="155" class="abs low">33/155</td>
+	<td data-value="16.36" class="pct low">16.36%</td>
+	<td data-value="220" class="abs low">36/220</td>
+	<td data-value="8.13" class="pct low">8.13%</td>
+	<td data-value="172" class="abs low">14/172</td>
+	<td data-value="14.03" class="pct low">14.03%</td>
+	<td data-value="57" class="abs low">8/57</td>
+	<td data-value="17.39" class="pct low">17.39%</td>
+	<td data-value="207" class="abs low">36/207</td>
 	</tr>
 
 </tbody>
@@ -566,7 +566,7 @@
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at 2022-11-03T13:44:33.087Z
+                at 2023-01-18T10:53:27.335Z
             </div>
         <script src="prettify.js"></script>
         <script>

package/src/artifacts/coverage-jest/lcov-report/utils/buildUrl.js.html

@@ -178,7 +178,7 @@ export default function <span class="fstat-no" title="function not covered" >bui
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at 2022-11-03T13:44:33.087Z
+                at 2023-01-18T10:53:27.335Z
             </div>
         <script src="../prettify.js"></script>
         <script>

package/src/artifacts/coverage-jest/lcov-report/utils/generateKiwtQuery.js.html

@@ -23,23 +23,23 @@
         <div class='clearfix'>
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">25% </span>
+                <span class="strong">33.33% </span>
                 <span class="quiet">Statements</span>
-                <span class='fraction'>1/4</span>
+                <span class='fraction'>1/3</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
                 <span class="strong">0% </span>
                 <span class="quiet">Branches</span>
-                <span class='fraction'>0/2</span>
+                <span class='fraction'>0/3</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
                 <span class="strong">0% </span>
                 <span class="quiet">Functions</span>
-                <span class='fraction'>0/2</span>
+                <span class='fraction'>0/1</span>
             </div>
         
             
@@ -81,9 +81,9 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span></td><td class="text"><pre class="prettyprint lang-js">import generateKiwtQueryParams from './generateKiwtQueryParams';
 &nbsp;
-const generateKiwtQuery = <span class="fstat-no" title="function not covered" >(o</span>ptions, nsValues) =&gt; {
-  const paramsArray = <span class="cstat-no" title="statement not covered" >generateKiwtQueryParams(options, nsValues);</span>
-<span class="cstat-no" title="statement not covered" >  return paramsArray.length ? '?' + paramsArray.map(<span class="fstat-no" title="function not covered" >p </span>=&gt; <span class="cstat-no" title="statement not covered" >encodeURI(p))</span>.join('&amp;') : '';</span>
+const generateKiwtQuery = <span class="fstat-no" title="function not covered" >(o</span>ptions, nsValues, encode = <span class="branch-0 cbranch-no" title="branch not covered" >true)</span> =&gt; {
+  const paramsArray = <span class="cstat-no" title="statement not covered" >generateKiwtQueryParams(options, nsValues, encode);</span>
+<span class="cstat-no" title="statement not covered" >  return paramsArray.length ? '?' + paramsArray.join('&amp;') : '';</span>
 };
 &nbsp;
 export default generateKiwtQuery;
@@ -94,7 +94,7 @@ export default generateKiwtQuery;
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at 2022-11-03T13:44:33.087Z
+                at 2023-01-18T10:53:27.335Z
             </div>
         <script src="../prettify.js"></script>
         <script>

package/src/artifacts/coverage-jest/lcov-report/utils/generateKiwtQueryParams.js.html

@@ -23,30 +23,30 @@
         <div class='clearfix'>
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">1.58% </span>
+                <span class="strong">3.52% </span>
                 <span class="quiet">Statements</span>
-                <span class='fraction'>1/63</span>
+                <span class='fraction'>3/85</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
                 <span class="strong">0% </span>
                 <span class="quiet">Branches</span>
-                <span class='fraction'>0/51</span>
+                <span class='fraction'>0/79</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
                 <span class="strong">0% </span>
                 <span class="quiet">Functions</span>
-                <span class='fraction'>0/13</span>
+                <span class='fraction'>0/18</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">1.75% </span>
+                <span class="strong">3.94% </span>
                 <span class="quiet">Lines</span>
-                <span class='fraction'>1/57</span>
+                <span class='fraction'>3/76</span>
             </div>
         
             
@@ -195,10 +195,116 @@
 <a name='L130'></a><a href='#L130'>130</a>
 <a name='L131'></a><a href='#L131'>131</a>
 <a name='L132'></a><a href='#L132'>132</a>
-<a name='L133'></a><a href='#L133'>133</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">3x</span>
+<a name='L133'></a><a href='#L133'>133</a>
+<a name='L134'></a><a href='#L134'>134</a>
+<a name='L135'></a><a href='#L135'>135</a>
+<a name='L136'></a><a href='#L136'>136</a>
+<a name='L137'></a><a href='#L137'>137</a>
+<a name='L138'></a><a href='#L138'>138</a>
+<a name='L139'></a><a href='#L139'>139</a>
+<a name='L140'></a><a href='#L140'>140</a>
+<a name='L141'></a><a href='#L141'>141</a>
+<a name='L142'></a><a href='#L142'>142</a>
+<a name='L143'></a><a href='#L143'>143</a>
+<a name='L144'></a><a href='#L144'>144</a>
+<a name='L145'></a><a href='#L145'>145</a>
+<a name='L146'></a><a href='#L146'>146</a>
+<a name='L147'></a><a href='#L147'>147</a>
+<a name='L148'></a><a href='#L148'>148</a>
+<a name='L149'></a><a href='#L149'>149</a>
+<a name='L150'></a><a href='#L150'>150</a>
+<a name='L151'></a><a href='#L151'>151</a>
+<a name='L152'></a><a href='#L152'>152</a>
+<a name='L153'></a><a href='#L153'>153</a>
+<a name='L154'></a><a href='#L154'>154</a>
+<a name='L155'></a><a href='#L155'>155</a>
+<a name='L156'></a><a href='#L156'>156</a>
+<a name='L157'></a><a href='#L157'>157</a>
+<a name='L158'></a><a href='#L158'>158</a>
+<a name='L159'></a><a href='#L159'>159</a>
+<a name='L160'></a><a href='#L160'>160</a>
+<a name='L161'></a><a href='#L161'>161</a>
+<a name='L162'></a><a href='#L162'>162</a>
+<a name='L163'></a><a href='#L163'>163</a>
+<a name='L164'></a><a href='#L164'>164</a>
+<a name='L165'></a><a href='#L165'>165</a>
+<a name='L166'></a><a href='#L166'>166</a>
+<a name='L167'></a><a href='#L167'>167</a>
+<a name='L168'></a><a href='#L168'>168</a>
+<a name='L169'></a><a href='#L169'>169</a>
+<a name='L170'></a><a href='#L170'>170</a>
+<a name='L171'></a><a href='#L171'>171</a>
+<a name='L172'></a><a href='#L172'>172</a>
+<a name='L173'></a><a href='#L173'>173</a>
+<a name='L174'></a><a href='#L174'>174</a>
+<a name='L175'></a><a href='#L175'>175</a>
+<a name='L176'></a><a href='#L176'>176</a>
+<a name='L177'></a><a href='#L177'>177</a>
+<a name='L178'></a><a href='#L178'>178</a>
+<a name='L179'></a><a href='#L179'>179</a>
+<a name='L180'></a><a href='#L180'>180</a>
+<a name='L181'></a><a href='#L181'>181</a>
+<a name='L182'></a><a href='#L182'>182</a>
+<a name='L183'></a><a href='#L183'>183</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">3x</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">3x</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">3x</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -228,38 +334,29 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
@@ -298,6 +395,7 @@
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -313,6 +411,8 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
@@ -327,7 +427,58 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span></td><td class="text"><pre class="prettyprint lang-js">const generateKiwtQueryParams = <span class="fstat-no" title="function not covered" >(o</span>ptions, nsValues) =&gt; {
+<span class="cline-any cline-neutral">&nbsp;</span></td><td class="text"><pre class="prettyprint lang-js">const conditionalEncodeURIComponent = <span class="fstat-no" title="function not covered" >(s</span>tr, encode = <span class="branch-0 cbranch-no" title="branch not covered" >true)</span> =&gt; {
+<span class="cstat-no" title="statement not covered" >  if (encode) {</span>
+<span class="cstat-no" title="statement not covered" >    return encodeURIComponent(str);</span>
+  }
+&nbsp;
+<span class="cstat-no" title="statement not covered" >  return str;</span>
+};
+&nbsp;
+const buildFilterOptionBlock = <span class="fstat-no" title="function not covered" >(o</span>pf, isNested = <span class="branch-0 cbranch-no" title="branch not covered" >false,</span> encode = <span class="branch-0 cbranch-no" title="branch not covered" >true)</span> =&gt; {
+<span class="cstat-no" title="statement not covered" >  if (opf?.groupValues) {</span>
+    const groupValues = <span class="cstat-no" title="statement not covered" >opf.groupValues;</span>
+&nbsp;
+    // Small utility function to add negation and brackets to the options block where necessary
+    const negationAndNesting = <span class="cstat-no" title="statement not covered" ><span class="fstat-no" title="function not covered" >(s</span>tr) =&gt; <span class="cstat-no" title="statement not covered" >`${groupValues?.NOT ? '!' : ''}${(isNested || groupValues?.NOT) ? '(' : ''}${str}${(isNested || groupValues?.NOT) ? ')' : ''}`;</span></span>
+&nbsp;
+    // First check whether groupValues is ANDed or ORed together
+<span class="cstat-no" title="statement not covered" >    if (</span>
+      (groupValues?.AND &amp;&amp; Array.isArray(groupValues.AND)) ||
+      (groupValues?.OR &amp;&amp; Array.isArray(groupValues.OR))
+    ) {
+      // AND takes precedence
+<span class="cstat-no" title="statement not covered" >      if (groupValues.AND) {</span>
+<span class="cstat-no" title="statement not covered" >        return negationAndNesting(groupValues?.AND?.map(<span class="fstat-no" title="function not covered" >gv</span>o =&gt; <span class="cstat-no" title="statement not covered" >buildFilterOptionBlock(gvo, true, encode))</span>?.join('&amp;&amp;'));</span>
+      }
+<span class="cstat-no" title="statement not covered" >      return negationAndNesting(groupValues?.OR?.map(<span class="fstat-no" title="function not covered" >gv</span>o =&gt; <span class="cstat-no" title="statement not covered" >buildFilterOptionBlock(gvo, true, encode))</span>?.join('||'));</span>
+    }
+    // If neither valid OR nor AND exist, ignore the block
+  } else <span class="cstat-no" title="statement not covered" >if (opf?.values) {</span>
+    // Build the values filter block
+    const innerFilters = <span class="cstat-no" title="statement not covered" >[];</span>
+<span class="cstat-no" title="statement not covered" >    opf.values.forEach(<span class="fstat-no" title="function not covered" >op</span>fv =&gt; {</span>
+<span class="cstat-no" title="statement not covered" >      if (opf.path) {</span>
+<span class="cstat-no" title="statement not covered" >        innerFilters.push(`${opf.path}${opf.comparator ?? '=='}${opfv}`);</span>
+      } else {
+<span class="cstat-no" title="statement not covered" >        innerFilters.push(opfv);</span>
+      }
+    });
+&nbsp;
+<span class="cstat-no" title="statement not covered" >    return conditionalEncodeURIComponent(innerFilters.join('||'), encode);</span>
+  } else <span class="cstat-no" title="statement not covered" >if (opf?.value) { // If no value OR values, then ignore</span>
+<span class="cstat-no" title="statement not covered" >    if (opf.path) {</span>
+      const filterString = <span class="cstat-no" title="statement not covered" >`${opf.path}${opf.comparator ?? '=='}${opf.value}`;</span>
+<span class="cstat-no" title="statement not covered" >      return conditionalEncodeURIComponent(filterString, encode);</span>
+    }
+&nbsp;
+<span class="cstat-no" title="statement not covered" >    return conditionalEncodeURIComponent(opf.value, encode);</span>
+  }
+&nbsp;
+<span class="cstat-no" title="statement not covered" >  return null;</span>
+};
+&nbsp;
+const generateKiwtQueryParams = <span class="fstat-no" title="function not covered" >(o</span>ptions, nsValues, encode = <span class="branch-0 cbranch-no" title="branch not covered" >true)</span> =&gt; {
   const { qindex, query, filters, sort } = <span class="cstat-no" title="statement not covered" >nsValues;</span>
   const {
     searchKey = <span class="branch-0 cbranch-no" title="branch not covered" >'',</span>
@@ -347,7 +498,13 @@
           path: 'this.is.some.path'
           comparator: '=='
           value: 'this is a value' //OR
-          values: ['value1', 'value2']
+          values: ['value1', 'value2'] //OR
+          groupValues: { // This is an object containing objects either in groups of AND or OR. AND takes precedence
+            AND: [
+              // Objects of the same shape as an individual filters object, recursively.
+            ],
+            NOT: true // When this is set to true, the entire group is negated
+          }
         },
         ...
       ]
@@ -356,6 +513,9 @@
      * If no comparator is passed, it assumes '=='
      * Values overwrites value and will construct "filters=this.is.some.path==value1||this.is.some.path==value2"
      * Values WITHOUT path will construct "filters=value1||value2"
+     *
+     * GroupValues will override everything above, and group into brackets.
+     *
      * If more complex query building is desired, this should be done externally and passed in as a standalone 'value'
      */
     filters: optionsFilters,
@@ -365,29 +525,16 @@
   const paramsArray = <span class="cstat-no" title="statement not covered" >[];</span>
 &nbsp;
 <span class="cstat-no" title="statement not covered" >  if (query) {</span>
-<span class="cstat-no" title="statement not covered" >    paramsArray.push(...(qindex || searchKey).split(',')?.map(<span class="fstat-no" title="function not covered" >m </span>=&gt; <span class="cstat-no" title="statement not covered" >`match=${m}`)</span>);</span>
-<span class="cstat-no" title="statement not covered" >    paramsArray.push(`term=${query}`);</span>
+<span class="cstat-no" title="statement not covered" >    paramsArray.push(...(qindex || searchKey).split(',')?.map(<span class="fstat-no" title="function not covered" >m </span>=&gt; <span class="cstat-no" title="statement not covered" >`match=${conditionalEncodeURIComponent(m, encode)}`)</span>);</span>
+<span class="cstat-no" title="statement not covered" >    paramsArray.push(`term=${conditionalEncodeURIComponent(query, encode)}`);</span>
   }
 &nbsp;
+  // Actually build the optionsFilters block (Moved logic to its own function to allow recursion)
 <span class="cstat-no" title="statement not covered" >  if (optionsFilters) {</span>
 <span class="cstat-no" title="statement not covered" >    optionsFilters.forEach(<span class="fstat-no" title="function not covered" >op</span>f =&gt; {</span>
-<span class="cstat-no" title="statement not covered" >      if (opf?.values) {</span>
-        // Build the values filter block
-        const innerFilters = <span class="cstat-no" title="statement not covered" >[];</span>
-<span class="cstat-no" title="statement not covered" >        opf.values.forEach(<span class="fstat-no" title="function not covered" >op</span>fv =&gt; {</span>
-<span class="cstat-no" title="statement not covered" >          if (opf.path) {</span>
-<span class="cstat-no" title="statement not covered" >            innerFilters.push(`${opf.path}${opf.comparator ?? '=='}${opfv}`);</span>
-          } else {
-<span class="cstat-no" title="statement not covered" >            innerFilters.push(opfv);</span>
-          }
-        });
-<span class="cstat-no" title="statement not covered" >        paramsArray.push(`filters=${innerFilters.join('||')}`);</span>
-      } else <span class="cstat-no" title="statement not covered" >if (opf?.value) { // If no value OR values, then ignore</span>
-<span class="cstat-no" title="statement not covered" >        if (opf.path) {</span>
-<span class="cstat-no" title="statement not covered" >          paramsArray.push(`filters=${opf.path}${opf.comparator ?? '=='}${opf.value}`);</span>
-        } else {
-<span class="cstat-no" title="statement not covered" >          paramsArray.push(`filters=${opf.value}`);</span>
-        }
+      const optionsBlock = <span class="cstat-no" title="statement not covered" >buildFilterOptionBlock(opf, false, encode);</span>
+<span class="cstat-no" title="statement not covered" >      if (optionsBlock) {</span>
+<span class="cstat-no" title="statement not covered" >        paramsArray.push(`filters=${optionsBlock}`);</span>
       }
     });
   }
@@ -413,13 +560,13 @@
 <span class="cstat-no" title="statement not covered" >          return `${filterName}==${fceValue ?? v}`;</span>
         }).join('||');
 &nbsp;
-<span class="cstat-no" title="statement not covered" >        paramsArray.push(`filters=${filterString}`);</span>
+<span class="cstat-no" title="statement not covered" >        paramsArray.push(`filters=${conditionalEncodeURIComponent(filterString, encode)}`);</span>
       } else <span class="cstat-no" title="statement not covered" >if (!filterKey) {</span>
         // These filters have no key mapping so we just pass the values to the backend as-is.
-<span class="cstat-no" title="statement not covered" >        paramsArray.push(...filterValues?.map(<span class="fstat-no" title="function not covered" >f </span>=&gt; <span class="cstat-no" title="statement not covered" >`filters=${f}`)</span>);</span>
+<span class="cstat-no" title="statement not covered" >        paramsArray.push(...filterValues?.map(<span class="fstat-no" title="function not covered" >f </span>=&gt; <span class="cstat-no" title="statement not covered" >`filters=${conditionalEncodeURIComponent(f, encode)}`)</span>);</span>
       } else {
         const filterString = <span class="cstat-no" title="statement not covered" >filterValues.map(<span class="fstat-no" title="function not covered" >v </span>=&gt; <span class="cstat-no" title="statement not covered" >`${filterKey}==${v}`)</span>.join('||');</span>
-<span class="cstat-no" title="statement not covered" >        paramsArray.push(`filters=${filterString}`);</span>
+<span class="cstat-no" title="statement not covered" >        paramsArray.push(`filters=${conditionalEncodeURIComponent(filterString, encode)}`);</span>
       }
     });
   }
@@ -427,9 +574,10 @@
 <span class="cstat-no" title="statement not covered" >  if (optionsSort &amp;&amp; optionsSort.length &gt; 0) {</span>
 <span class="cstat-no" title="statement not covered" >    optionsSort.forEach(<span class="fstat-no" title="function not covered" >os</span> =&gt; {</span>
 <span class="cstat-no" title="statement not covered" >      if (os.value) {</span>
-<span class="cstat-no" title="statement not covered" >        paramsArray.push(`sort=${os.value}`);</span>
+<span class="cstat-no" title="statement not covered" >        paramsArray.push(`sort=${conditionalEncodeURIComponent(os.value, encode)}`);</span>
       } else <span class="cstat-no" title="statement not covered" >if (os.path) { // If no path then ignore</span>
-<span class="cstat-no" title="statement not covered" >        paramsArray.push(`sort=${os.path};${os.direction ?? 'asc'}`);</span>
+        const sortString = <span class="cstat-no" title="statement not covered" >`${os.path};${os.direction ?? 'asc'}`;</span>
+<span class="cstat-no" title="statement not covered" >        paramsArray.push(`sort=${conditionalEncodeURIComponent(sortString, encode)}`);</span>
       }
     });
   }
@@ -443,7 +591,9 @@
 <span class="cstat-no" title="statement not covered" >        term = term.replace(term, sortKeys[term]);</span>
       }
 &nbsp;
-<span class="cstat-no" title="statement not covered" >      return `sort=${term};${descending ? 'desc' : 'asc'}`;</span>
+      const sortString = <span class="cstat-no" title="statement not covered" >`${term};${descending ? 'desc' : 'asc'}`;</span>
+&nbsp;
+<span class="cstat-no" title="statement not covered" >      return `sort=${conditionalEncodeURIComponent(sortString, encode)}`;</span>
     }));
   }
 &nbsp;
@@ -452,7 +602,7 @@
   }
 &nbsp;
 <span class="cstat-no" title="statement not covered" >  for (const [key, value] of Object.entries(rest)) {</span>
-<span class="cstat-no" title="statement not covered" >    paramsArray.push(`${key}=${value}`);</span>
+<span class="cstat-no" title="statement not covered" >    paramsArray.push(`${key}=${conditionalEncodeURIComponent(value, encode)}`);</span>
   }
 &nbsp;
 <span class="cstat-no" title="statement not covered" >  return paramsArray;</span>
@@ -466,7 +616,7 @@ export default generateKiwtQueryParams;
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at 2022-11-03T13:44:33.087Z
+                at 2023-01-18T10:53:27.335Z
             </div>
         <script src="../prettify.js"></script>
         <script>

package/src/artifacts/coverage-jest/lcov-report/utils/groupCustomPropertiesByCtx.js.html

@@ -109,7 +109,7 @@ export default groupCustomPropertiesByCtx;
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at 2022-11-03T13:44:33.087Z
+                at 2023-01-18T10:53:27.335Z
             </div>
         <script src="../prettify.js"></script>
         <script>