@k-int/stripes-kint-components 2.8.4 → 2.8.6

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">42.85% </span>
+                <span class="strong">3.52% </span>
                 <span class="quiet">Statements</span>
-                <span class='fraction'>27/63</span>
+                <span class='fraction'>3/85</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">41.17% </span>
+                <span class="strong">0% </span>
                 <span class="quiet">Branches</span>
-                <span class='fraction'>21/51</span>
+                <span class='fraction'>0/79</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">30.76% </span>
+                <span class="strong">0% </span>
                 <span class="quiet">Functions</span>
-                <span class='fraction'>4/13</span>
+                <span class='fraction'>0/18</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">47.36% </span>
+                <span class="strong">3.94% </span>
                 <span class="quiet">Lines</span>
-                <span class='fraction'>27/57</span>
+                <span class='fraction'>3/76</span>
             </div>
         
             
@@ -195,8 +195,113 @@
 <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">7x</span>
-<span class="cline-any cline-yes">7x</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>
@@ -228,39 +333,31 @@
 <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-yes">7x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">7x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">7x</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-yes">7x</span>
-<span class="cline-any cline-yes">7x</span>
-<span class="cline-any cline-yes">2x</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-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-yes">2x</span>
-<span class="cline-any cline-yes">2x</span>
-<span class="cline-any cline-yes">2x</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-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">7x</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>
@@ -292,49 +389,103 @@
 <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-yes">7x</span>
-<span class="cline-any cline-yes">7x</span>
-<span class="cline-any cline-yes">22x</span>
 <span class="cline-any cline-no">&nbsp;</span>
-<span class="cline-any cline-yes">22x</span>
-<span class="cline-any cline-yes">22x</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-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-yes">7x</span>
-<span class="cline-any cline-yes">7x</span>
-<span class="cline-any cline-yes">7x</span>
-<span class="cline-any cline-yes">7x</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-yes">7x</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-yes">7x</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-yes">7x</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-yes">7x</span>
-<span class="cline-any cline-yes">7x</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-yes">7x</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></td><td class="text"><pre class="prettyprint lang-js">const generateKiwtQueryParams = (options, nsValues) =&gt; {
-  const { qindex, query, filters, sort } = nsValues;
+<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>
-    filterConfig = [],
+    filterConfig = <span class="branch-0 cbranch-no" title="branch not covered" >[],</span>
     /* Assumtion made that if no filterKey is provided then the given filterValues for that key are standalaone, ie require no comparator or key */
     filterKeys = <span class="branch-0 cbranch-no" title="branch not covered" >{},</span>
-    sortKeys = {},
+    sortKeys = <span class="branch-0 cbranch-no" title="branch not covered" >{},</span>
     stats = <span class="branch-0 cbranch-no" title="branch not covered" >true,</span>
     /* Of the form [{ path: 'this.is.some.path', direction: 'asc'/'desc', value: 'someOverrideValue'}, ...]
      * If only path is passed then assume asc.
@@ -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,43 +513,33 @@
      * 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,
     ...rest
-  } = options;
+  } = <span class="cstat-no" title="statement not covered" >options;</span>
 &nbsp;
-  const paramsArray = [];
+  const paramsArray = <span class="cstat-no" title="statement not covered" >[];</span>
 &nbsp;
-  <span class="missing-if-branch" title="if path not taken" >I</span>if (query) {
-<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" >  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=${conditionalEncodeURIComponent(m, encode)}`)</span>);</span>
+<span class="cstat-no" title="statement not covered" >    paramsArray.push(`term=${conditionalEncodeURIComponent(query, encode)}`);</span>
   }
 &nbsp;
-  <span class="missing-if-branch" title="else path not taken" >E</span>if (optionsFilters) {
-    optionsFilters.forEach(opf =&gt; {
-      <span class="missing-if-branch" title="if path not taken" >I</span>if (opf?.values) {
-        // 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="missing-if-branch" title="else path not taken" >E</span>if (opf?.value) { // If no value OR values, then ignore
-        if (opf.path) {
-          paramsArray.push(`filters=${opf.path}${opf.comparator ?? '=='}${opf.value}`);
-        } else <span class="missing-if-branch" title="else path not taken" >E</span>{
-<span class="cstat-no" title="statement not covered" >          paramsArray.push(`filters=${opf.value}`);</span>
-        }
+  // 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>
+      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>
       }
     });
   }
 &nbsp;
-  <span class="missing-if-branch" title="if path not taken" >I</span>if (filters) {
+<span class="cstat-no" title="statement not covered" >  if (filters) {</span>
     const filterMap = <span class="cstat-no" title="statement not covered" >{};</span>
 <span class="cstat-no" title="statement not covered" >    filters.split(',').forEach(<span class="fstat-no" title="function not covered" >fi</span>lter =&gt; {</span>
       const [filterName, ...filterRest] = <span class="cstat-no" title="statement not covered" >filter.trim()?.split('.');</span>
@@ -413,49 +560,52 @@
 <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>
       }
     });
   }
 &nbsp;
-  <span class="missing-if-branch" title="else path not taken" >E</span>if (optionsSort &amp;&amp; optionsSort.length &gt; 0) {
-    optionsSort.forEach(os =&gt; {
-      <span class="missing-if-branch" title="if path not taken" >I</span>if (os.value) {
-<span class="cstat-no" title="statement not covered" >        paramsArray.push(`sort=${os.value}`);</span>
-      } else <span class="missing-if-branch" title="else path not taken" >E</span>if (os.path) { // If no path then ignore
-        paramsArray.push(`sort=${os.path};${os.direction ?? 'asc'}`);
+<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=${conditionalEncodeURIComponent(os.value, encode)}`);</span>
+      } else <span class="cstat-no" title="statement not covered" >if (os.path) { // If no path then ignore</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>
       }
     });
   }
 &nbsp;
-  <span class="missing-if-branch" title="else path not taken" >E</span>if (sort) {
-    paramsArray.push(...sort.trim()?.split(',').map(sortKey =&gt; {
-      const descending = sortKey.startsWith('-');
-      let term = sortKey.replace('-', '');
+<span class="cstat-no" title="statement not covered" >  if (sort) {</span>
+<span class="cstat-no" title="statement not covered" >    paramsArray.push(...sort.trim()?.split(',').map(<span class="fstat-no" title="function not covered" >so</span>rtKey =&gt; {</span>
+      const descending = <span class="cstat-no" title="statement not covered" >sortKey.startsWith('-');</span>
+      let term = <span class="cstat-no" title="statement not covered" >sortKey.replace('-', '');</span>
 &nbsp;
-      <span class="missing-if-branch" title="if path not taken" >I</span>if (term in sortKeys) {
+<span class="cstat-no" title="statement not covered" >      if (term in sortKeys) {</span>
 <span class="cstat-no" title="statement not covered" >        term = term.replace(term, sortKeys[term]);</span>
       }
 &nbsp;
-      return `sort=${term};${descending ? <span class="branch-0 cbranch-no" title="branch not covered" >'desc' </span>: 'asc'}`;
+      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;
-  <span class="missing-if-branch" title="if path not taken" >I</span>if (stats) {
+<span class="cstat-no" title="statement not covered" >  if (stats) {</span>
 <span class="cstat-no" title="statement not covered" >    paramsArray.push('stats=true');</span>
   }
 &nbsp;
-  for (const [key, value] of Object.entries(rest)) {
-    paramsArray.push(`${key}=${value}`);
+<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}=${conditionalEncodeURIComponent(value, encode)}`);</span>
   }
 &nbsp;
-  return paramsArray;
+<span class="cstat-no" title="statement not covered" >  return paramsArray;</span>
 };
 &nbsp;
 export default generateKiwtQueryParams;
@@ -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-22T09:57:19.883Z
+                at 2022-12-09T15:17:50.295Z
             </div>
         <script src="../prettify.js"></script>
         <script>

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

@@ -76,15 +76,15 @@
 <a name='L11'></a><a href='#L11'>11</a>
 <a name='L12'></a><a href='#L12'>12</a>
 <a name='L13'></a><a href='#L13'>13</a>
-<a name='L14'></a><a href='#L14'>14</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">7x</span>
-<span class="cline-any cline-yes">2x</span>
-<span class="cline-any cline-yes">8x</span>
-<span class="cline-any cline-yes">8x</span>
+<a name='L14'></a><a href='#L14'>14</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">3x</span>
+<span class="cline-any cline-yes">4x</span>
+<span class="cline-any cline-yes">48x</span>
+<span class="cline-any cline-yes">48x</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-yes">8x</span>
-<span class="cline-any cline-yes">8x</span>
+<span class="cline-any cline-yes">48x</span>
+<span class="cline-any cline-yes">48x</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>
@@ -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-22T09:57:19.883Z
+                at 2022-12-09T15:17:50.295Z
             </div>
         <script src="../prettify.js"></script>
         <script>

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

@@ -107,7 +107,7 @@
 <a name='L42'></a><a href='#L42'>42</a>
 <a name='L43'></a><a href='#L43'>43</a></td><td class="line-coverage quiet"><span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">7x</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-no">&nbsp;</span>
@@ -125,7 +125,7 @@
 <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-yes">7x</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-no">&nbsp;</span>
@@ -196,7 +196,7 @@ export {
             <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-22T09:57:19.883Z
+                at 2022-12-09T15:17:50.295Z
             </div>
         <script src="../prettify.js"></script>
         <script>