@featurevisor/core 2.16.0 → 2.18.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (73) hide show
  1. package/CHANGELOG.md +22 -0
  2. package/coverage/clover.xml +798 -764
  3. package/coverage/coverage-final.json +5 -5
  4. package/coverage/lcov-report/builder/allocator.ts.html +1 -1
  5. package/coverage/lcov-report/builder/buildScopedConditions.ts.html +1 -1
  6. package/coverage/lcov-report/builder/buildScopedDatafile.ts.html +1 -1
  7. package/coverage/lcov-report/builder/buildScopedSegments.ts.html +1 -1
  8. package/coverage/lcov-report/builder/index.html +1 -1
  9. package/coverage/lcov-report/builder/mutateVariables.ts.html +1 -1
  10. package/coverage/lcov-report/builder/mutator.ts.html +18 -18
  11. package/coverage/lcov-report/builder/revision.ts.html +1 -1
  12. package/coverage/lcov-report/builder/traffic.ts.html +1 -1
  13. package/coverage/lcov-report/config/index.html +1 -1
  14. package/coverage/lcov-report/config/index.ts.html +1 -1
  15. package/coverage/lcov-report/config/projectConfig.ts.html +1 -1
  16. package/coverage/lcov-report/datasource/adapter.ts.html +1 -1
  17. package/coverage/lcov-report/datasource/datasource.ts.html +1 -1
  18. package/coverage/lcov-report/datasource/filesystemAdapter.ts.html +1 -1
  19. package/coverage/lcov-report/datasource/index.html +1 -1
  20. package/coverage/lcov-report/datasource/index.ts.html +1 -1
  21. package/coverage/lcov-report/index.html +18 -18
  22. package/coverage/lcov-report/linter/attributeSchema.ts.html +1 -1
  23. package/coverage/lcov-report/linter/checkCircularDependency.ts.html +1 -1
  24. package/coverage/lcov-report/linter/checkPercentageExceedingSlot.ts.html +1 -1
  25. package/coverage/lcov-report/linter/conditionSchema.ts.html +7 -7
  26. package/coverage/lcov-report/linter/featureSchema.ts.html +365 -188
  27. package/coverage/lcov-report/linter/groupSchema.ts.html +1 -1
  28. package/coverage/lcov-report/linter/index.html +34 -34
  29. package/coverage/lcov-report/linter/lintProject.ts.html +1 -1
  30. package/coverage/lcov-report/linter/mutationNotation.ts.html +99 -66
  31. package/coverage/lcov-report/linter/printError.ts.html +1 -1
  32. package/coverage/lcov-report/linter/schema.ts.html +170 -80
  33. package/coverage/lcov-report/linter/segmentSchema.ts.html +1 -1
  34. package/coverage/lcov-report/linter/testSchema.ts.html +1 -1
  35. package/coverage/lcov-report/list/index.html +1 -1
  36. package/coverage/lcov-report/list/matrix.ts.html +1 -1
  37. package/coverage/lcov-report/parsers/index.html +1 -1
  38. package/coverage/lcov-report/parsers/index.ts.html +1 -1
  39. package/coverage/lcov-report/parsers/json.ts.html +1 -1
  40. package/coverage/lcov-report/parsers/yml.ts.html +1 -1
  41. package/coverage/lcov-report/tester/cliFormat.ts.html +1 -1
  42. package/coverage/lcov-report/tester/helpers.ts.html +1 -1
  43. package/coverage/lcov-report/tester/index.html +1 -1
  44. package/coverage/lcov-report/utils/git.ts.html +1 -1
  45. package/coverage/lcov-report/utils/index.html +1 -1
  46. package/coverage/lcov.info +1653 -1567
  47. package/json-schema/attribute.json +25 -9
  48. package/json-schema/feature.json +319 -238
  49. package/json-schema/segment.json +76 -45
  50. package/lib/generate-code/typescript.js +118 -50
  51. package/lib/generate-code/typescript.js.map +1 -1
  52. package/lib/linter/featureSchema.d.ts +9 -0
  53. package/lib/linter/featureSchema.js +38 -8
  54. package/lib/linter/featureSchema.js.map +1 -1
  55. package/lib/linter/featureSchema.spec.js +93 -0
  56. package/lib/linter/featureSchema.spec.js.map +1 -1
  57. package/lib/linter/mutationNotation.js +21 -11
  58. package/lib/linter/mutationNotation.js.map +1 -1
  59. package/lib/linter/mutationNotation.spec.js +18 -0
  60. package/lib/linter/mutationNotation.spec.js.map +1 -1
  61. package/lib/linter/schema.d.ts +1 -0
  62. package/lib/linter/schema.js +13 -0
  63. package/lib/linter/schema.js.map +1 -1
  64. package/lib/linter/schema.spec.js +51 -0
  65. package/lib/linter/schema.spec.js.map +1 -1
  66. package/package.json +5 -5
  67. package/src/generate-code/typescript.ts +150 -52
  68. package/src/linter/featureSchema.spec.ts +118 -0
  69. package/src/linter/featureSchema.ts +65 -6
  70. package/src/linter/mutationNotation.spec.ts +23 -0
  71. package/src/linter/mutationNotation.ts +18 -7
  72. package/src/linter/schema.spec.ts +72 -0
  73. package/src/linter/schema.ts +30 -0
package/coverage/lcov-report/linter/featureSchema.ts.html CHANGED
@@ -23,30 +23,30 @@
23
23
  <div class='clearfix'>
24
24
 
25
25
  <div class='fl pad1y space-right2'>
26
- <span class="strong">70.96% </span>
26
+ <span class="strong">71.64% </span>
27
27
  <span class="quiet">Statements</span>
28
- <span class='fraction'>369/520</span>
28
+ <span class='fraction'>384/536</span>
29
29
  </div>
30
30
 
31
31
 
32
32
  <div class='fl pad1y space-right2'>
33
- <span class="strong">61.49% </span>
33
+ <span class="strong">62.79% </span>
34
34
  <span class="quiet">Branches</span>
35
- <span class='fraction'>222/361</span>
35
+ <span class='fraction'>243/387</span>
36
36
  </div>
37
37
 
38
38
 
39
39
  <div class='fl pad1y space-right2'>
40
- <span class="strong">76.38% </span>
40
+ <span class="strong">75.34% </span>
41
41
  <span class="quiet">Functions</span>
42
- <span class='fraction'>55/72</span>
42
+ <span class='fraction'>55/73</span>
43
43
  </div>
44
44
 
45
45
 
46
46
  <div class='fl pad1y space-right2'>
47
- <span class="strong">75.1% </span>
47
+ <span class="strong">75.4% </span>
48
48
  <span class="quiet">Lines</span>
49
- <span class='fraction'>356/474</span>
49
+ <span class='fraction'>371/492</span>
50
50
  </div>
51
51
 
52
52
 
@@ -1829,7 +1829,66 @@
1829
1829
  <a name='L1764'></a><a href='#L1764'>1764</a>
1830
1830
  <a name='L1765'></a><a href='#L1765'>1765</a>
1831
1831
  <a name='L1766'></a><a href='#L1766'>1766</a>
1832
- <a name='L1767'></a><a href='#L1767'>1767</a></td><td class="line-coverage quiet"><span class="cline-any cline-neutral">&nbsp;</span>
1832
+ <a name='L1767'></a><a href='#L1767'>1767</a>
1833
+ <a name='L1768'></a><a href='#L1768'>1768</a>
1834
+ <a name='L1769'></a><a href='#L1769'>1769</a>
1835
+ <a name='L1770'></a><a href='#L1770'>1770</a>
1836
+ <a name='L1771'></a><a href='#L1771'>1771</a>
1837
+ <a name='L1772'></a><a href='#L1772'>1772</a>
1838
+ <a name='L1773'></a><a href='#L1773'>1773</a>
1839
+ <a name='L1774'></a><a href='#L1774'>1774</a>
1840
+ <a name='L1775'></a><a href='#L1775'>1775</a>
1841
+ <a name='L1776'></a><a href='#L1776'>1776</a>
1842
+ <a name='L1777'></a><a href='#L1777'>1777</a>
1843
+ <a name='L1778'></a><a href='#L1778'>1778</a>
1844
+ <a name='L1779'></a><a href='#L1779'>1779</a>
1845
+ <a name='L1780'></a><a href='#L1780'>1780</a>
1846
+ <a name='L1781'></a><a href='#L1781'>1781</a>
1847
+ <a name='L1782'></a><a href='#L1782'>1782</a>
1848
+ <a name='L1783'></a><a href='#L1783'>1783</a>
1849
+ <a name='L1784'></a><a href='#L1784'>1784</a>
1850
+ <a name='L1785'></a><a href='#L1785'>1785</a>
1851
+ <a name='L1786'></a><a href='#L1786'>1786</a>
1852
+ <a name='L1787'></a><a href='#L1787'>1787</a>
1853
+ <a name='L1788'></a><a href='#L1788'>1788</a>
1854
+ <a name='L1789'></a><a href='#L1789'>1789</a>
1855
+ <a name='L1790'></a><a href='#L1790'>1790</a>
1856
+ <a name='L1791'></a><a href='#L1791'>1791</a>
1857
+ <a name='L1792'></a><a href='#L1792'>1792</a>
1858
+ <a name='L1793'></a><a href='#L1793'>1793</a>
1859
+ <a name='L1794'></a><a href='#L1794'>1794</a>
1860
+ <a name='L1795'></a><a href='#L1795'>1795</a>
1861
+ <a name='L1796'></a><a href='#L1796'>1796</a>
1862
+ <a name='L1797'></a><a href='#L1797'>1797</a>
1863
+ <a name='L1798'></a><a href='#L1798'>1798</a>
1864
+ <a name='L1799'></a><a href='#L1799'>1799</a>
1865
+ <a name='L1800'></a><a href='#L1800'>1800</a>
1866
+ <a name='L1801'></a><a href='#L1801'>1801</a>
1867
+ <a name='L1802'></a><a href='#L1802'>1802</a>
1868
+ <a name='L1803'></a><a href='#L1803'>1803</a>
1869
+ <a name='L1804'></a><a href='#L1804'>1804</a>
1870
+ <a name='L1805'></a><a href='#L1805'>1805</a>
1871
+ <a name='L1806'></a><a href='#L1806'>1806</a>
1872
+ <a name='L1807'></a><a href='#L1807'>1807</a>
1873
+ <a name='L1808'></a><a href='#L1808'>1808</a>
1874
+ <a name='L1809'></a><a href='#L1809'>1809</a>
1875
+ <a name='L1810'></a><a href='#L1810'>1810</a>
1876
+ <a name='L1811'></a><a href='#L1811'>1811</a>
1877
+ <a name='L1812'></a><a href='#L1812'>1812</a>
1878
+ <a name='L1813'></a><a href='#L1813'>1813</a>
1879
+ <a name='L1814'></a><a href='#L1814'>1814</a>
1880
+ <a name='L1815'></a><a href='#L1815'>1815</a>
1881
+ <a name='L1816'></a><a href='#L1816'>1816</a>
1882
+ <a name='L1817'></a><a href='#L1817'>1817</a>
1883
+ <a name='L1818'></a><a href='#L1818'>1818</a>
1884
+ <a name='L1819'></a><a href='#L1819'>1819</a>
1885
+ <a name='L1820'></a><a href='#L1820'>1820</a>
1886
+ <a name='L1821'></a><a href='#L1821'>1821</a>
1887
+ <a name='L1822'></a><a href='#L1822'>1822</a>
1888
+ <a name='L1823'></a><a href='#L1823'>1823</a>
1889
+ <a name='L1824'></a><a href='#L1824'>1824</a>
1890
+ <a name='L1825'></a><a href='#L1825'>1825</a>
1891
+ <a name='L1826'></a><a href='#L1826'>1826</a></td><td class="line-coverage quiet"><span class="cline-any cline-neutral">&nbsp;</span>
1833
1892
  <span class="cline-any cline-yes">2x</span>
1834
1893
  <span class="cline-any cline-neutral">&nbsp;</span>
1835
1894
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -1865,7 +1924,7 @@
1865
1924
  <span class="cline-any cline-neutral">&nbsp;</span>
1866
1925
  <span class="cline-any cline-neutral">&nbsp;</span>
1867
1926
  <span class="cline-any cline-neutral">&nbsp;</span>
1868
- <span class="cline-any cline-yes">2811x</span>
1927
+ <span class="cline-any cline-yes">2956x</span>
1869
1928
  <span class="cline-any cline-neutral">&nbsp;</span>
1870
1929
  <span class="cline-any cline-neutral">&nbsp;</span>
1871
1930
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -1913,10 +1972,13 @@
1913
1972
  <span class="cline-any cline-neutral">&nbsp;</span>
1914
1973
  <span class="cline-any cline-neutral">&nbsp;</span>
1915
1974
  <span class="cline-any cline-neutral">&nbsp;</span>
1916
- <span class="cline-any cline-yes">2515x</span>
1917
- <span class="cline-any cline-yes">503x</span>
1918
1975
  <span class="cline-any cline-neutral">&nbsp;</span>
1919
- <span class="cline-any cline-yes">2012x</span>
1976
+ <span class="cline-any cline-neutral">&nbsp;</span>
1977
+ <span class="cline-any cline-yes">2630x</span>
1978
+ <span class="cline-any cline-yes">525x</span>
1979
+ <span class="cline-any cline-neutral">&nbsp;</span>
1980
+ <span class="cline-any cline-yes">2105x</span>
1981
+ <span class="cline-any cline-neutral">&nbsp;</span>
1920
1982
  <span class="cline-any cline-neutral">&nbsp;</span>
1921
1983
  <span class="cline-any cline-neutral">&nbsp;</span>
1922
1984
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -1976,6 +2038,7 @@
1976
2038
  <span class="cline-any cline-neutral">&nbsp;</span>
1977
2039
  <span class="cline-any cline-neutral">&nbsp;</span>
1978
2040
  <span class="cline-any cline-neutral">&nbsp;</span>
2041
+ <span class="cline-any cline-neutral">&nbsp;</span>
1979
2042
  <span class="cline-any cline-yes">124x</span>
1980
2043
  <span class="cline-any cline-no">&nbsp;</span>
1981
2044
  <span class="cline-any cline-no">&nbsp;</span>
@@ -2029,6 +2092,14 @@
2029
2092
  <span class="cline-any cline-yes">7x</span>
2030
2093
  <span class="cline-any cline-yes">7x</span>
2031
2094
  <span class="cline-any cline-yes">7x</span>
2095
+ <span class="cline-any cline-no">&nbsp;</span>
2096
+ <span class="cline-any cline-neutral">&nbsp;</span>
2097
+ <span class="cline-any cline-yes">7x</span>
2098
+ <span class="cline-any cline-no">&nbsp;</span>
2099
+ <span class="cline-any cline-no">&nbsp;</span>
2100
+ <span class="cline-any cline-neutral">&nbsp;</span>
2101
+ <span class="cline-any cline-neutral">&nbsp;</span>
2102
+ <span class="cline-any cline-yes">7x</span>
2032
2103
  <span class="cline-any cline-yes">7x</span>
2033
2104
  <span class="cline-any cline-yes">14x</span>
2034
2105
  <span class="cline-any cline-yes">14x</span>
@@ -2039,6 +2110,12 @@
2039
2110
  <span class="cline-any cline-yes">14x</span>
2040
2111
  <span class="cline-any cline-yes">14x</span>
2041
2112
  <span class="cline-any cline-no">&nbsp;</span>
2113
+ <span class="cline-any cline-no">&nbsp;</span>
2114
+ <span class="cline-any cline-no">&nbsp;</span>
2115
+ <span class="cline-any cline-no">&nbsp;</span>
2116
+ <span class="cline-any cline-neutral">&nbsp;</span>
2117
+ <span class="cline-any cline-no">&nbsp;</span>
2118
+ <span class="cline-any cline-neutral">&nbsp;</span>
2042
2119
  <span class="cline-any cline-neutral">&nbsp;</span>
2043
2120
  <span class="cline-any cline-yes">7x</span>
2044
2121
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -2109,31 +2186,32 @@
2109
2186
  <span class="cline-any cline-neutral">&nbsp;</span>
2110
2187
  <span class="cline-any cline-neutral">&nbsp;</span>
2111
2188
  <span class="cline-any cline-neutral">&nbsp;</span>
2112
- <span class="cline-any cline-yes">615x</span>
2189
+ <span class="cline-any cline-neutral">&nbsp;</span>
2190
+ <span class="cline-any cline-yes">651x</span>
2113
2191
  <span class="cline-any cline-neutral">&nbsp;</span>
2114
2192
  <span class="cline-any cline-neutral">&nbsp;</span>
2115
- <span class="cline-any cline-yes">615x</span>
2116
- <span class="cline-any cline-yes">615x</span>
2117
- <span class="cline-any cline-yes">26x</span>
2118
- <span class="cline-any cline-yes">26x</span>
2119
- <span class="cline-any cline-yes">26x</span>
2193
+ <span class="cline-any cline-yes">651x</span>
2194
+ <span class="cline-any cline-yes">651x</span>
2195
+ <span class="cline-any cline-yes">30x</span>
2196
+ <span class="cline-any cline-yes">30x</span>
2197
+ <span class="cline-any cline-yes">30x</span>
2120
2198
  <span class="cline-any cline-neutral">&nbsp;</span>
2121
2199
  <span class="cline-any cline-neutral">&nbsp;</span>
2122
- <span class="cline-any cline-yes">589x</span>
2123
- <span class="cline-any cline-yes">589x</span>
2124
- <span class="cline-any cline-yes">589x</span>
2125
- <span class="cline-any cline-yes">589x</span>
2200
+ <span class="cline-any cline-yes">621x</span>
2201
+ <span class="cline-any cline-yes">621x</span>
2202
+ <span class="cline-any cline-yes">621x</span>
2203
+ <span class="cline-any cline-yes">621x</span>
2126
2204
  <span class="cline-any cline-neutral">&nbsp;</span>
2127
- <span class="cline-any cline-yes">589x</span>
2205
+ <span class="cline-any cline-yes">621x</span>
2128
2206
  <span class="cline-any cline-neutral">&nbsp;</span>
2129
2207
  <span class="cline-any cline-neutral">&nbsp;</span>
2130
2208
  <span class="cline-any cline-neutral">&nbsp;</span>
2131
2209
  <span class="cline-any cline-neutral">&nbsp;</span>
2132
2210
  <span class="cline-any cline-neutral">&nbsp;</span>
2133
2211
  <span class="cline-any cline-neutral">&nbsp;</span>
2134
- <span class="cline-any cline-yes">73x</span>
2135
- <span class="cline-any cline-yes">73x</span>
2136
- <span class="cline-any cline-yes">135x</span>
2212
+ <span class="cline-any cline-yes">79x</span>
2213
+ <span class="cline-any cline-yes">79x</span>
2214
+ <span class="cline-any cline-yes">146x</span>
2137
2215
  <span class="cline-any cline-no">&nbsp;</span>
2138
2216
  <span class="cline-any cline-neutral">&nbsp;</span>
2139
2217
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -2143,21 +2221,34 @@
2143
2221
  <span class="cline-any cline-neutral">&nbsp;</span>
2144
2222
  <span class="cline-any cline-neutral">&nbsp;</span>
2145
2223
  <span class="cline-any cline-neutral">&nbsp;</span>
2146
- <span class="cline-any cline-yes">589x</span>
2147
- <span class="cline-any cline-yes">129x</span>
2148
- <span class="cline-any cline-yes">262x</span>
2149
- <span class="cline-any cline-yes">262x</span>
2150
- <span class="cline-any cline-yes">262x</span>
2224
+ <span class="cline-any cline-yes">621x</span>
2225
+ <span class="cline-any cline-yes">136x</span>
2226
+ <span class="cline-any cline-yes">274x</span>
2227
+ <span class="cline-any cline-yes">274x</span>
2228
+ <span class="cline-any cline-yes">274x</span>
2229
+ <span class="cline-any cline-neutral">&nbsp;</span>
2230
+ <span class="cline-any cline-neutral">&nbsp;</span>
2231
+ <span class="cline-any cline-neutral">&nbsp;</span>
2232
+ <span class="cline-any cline-neutral">&nbsp;</span>
2233
+ <span class="cline-any cline-neutral">&nbsp;</span>
2234
+ <span class="cline-any cline-neutral">&nbsp;</span>
2235
+ <span class="cline-any cline-neutral">&nbsp;</span>
2236
+ <span class="cline-any cline-neutral">&nbsp;</span>
2237
+ <span class="cline-any cline-yes">621x</span>
2238
+ <span class="cline-any cline-yes">621x</span>
2151
2239
  <span class="cline-any cline-neutral">&nbsp;</span>
2152
2240
  <span class="cline-any cline-neutral">&nbsp;</span>
2153
2241
  <span class="cline-any cline-neutral">&nbsp;</span>
2154
2242
  <span class="cline-any cline-neutral">&nbsp;</span>
2243
+ <span class="cline-any cline-yes">9x</span>
2155
2244
  <span class="cline-any cline-neutral">&nbsp;</span>
2156
2245
  <span class="cline-any cline-neutral">&nbsp;</span>
2157
2246
  <span class="cline-any cline-neutral">&nbsp;</span>
2158
2247
  <span class="cline-any cline-neutral">&nbsp;</span>
2159
2248
  <span class="cline-any cline-neutral">&nbsp;</span>
2160
- <span class="cline-any cline-yes">589x</span>
2249
+ <span class="cline-any cline-neutral">&nbsp;</span>
2250
+ <span class="cline-any cline-neutral">&nbsp;</span>
2251
+ <span class="cline-any cline-yes">621x</span>
2161
2252
  <span class="cline-any cline-yes">42x</span>
2162
2253
  <span class="cline-any cline-neutral">&nbsp;</span>
2163
2254
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -2166,8 +2257,8 @@
2166
2257
  <span class="cline-any cline-neutral">&nbsp;</span>
2167
2258
  <span class="cline-any cline-neutral">&nbsp;</span>
2168
2259
  <span class="cline-any cline-neutral">&nbsp;</span>
2169
- <span class="cline-any cline-yes">589x</span>
2170
- <span class="cline-any cline-yes">589x</span>
2260
+ <span class="cline-any cline-yes">621x</span>
2261
+ <span class="cline-any cline-yes">621x</span>
2171
2262
  <span class="cline-any cline-yes">12x</span>
2172
2263
  <span class="cline-any cline-yes">24x</span>
2173
2264
  <span class="cline-any cline-yes">24x</span>
@@ -2182,10 +2273,10 @@
2182
2273
  <span class="cline-any cline-neutral">&nbsp;</span>
2183
2274
  <span class="cline-any cline-neutral">&nbsp;</span>
2184
2275
  <span class="cline-any cline-neutral">&nbsp;</span>
2185
- <span class="cline-any cline-yes">2071x</span>
2186
- <span class="cline-any cline-yes">2071x</span>
2187
- <span class="cline-any cline-yes">2071x</span>
2188
- <span class="cline-any cline-yes">1879x</span>
2276
+ <span class="cline-any cline-yes">2174x</span>
2277
+ <span class="cline-any cline-yes">2174x</span>
2278
+ <span class="cline-any cline-yes">2174x</span>
2279
+ <span class="cline-any cline-yes">1982x</span>
2189
2280
  <span class="cline-any cline-neutral">&nbsp;</span>
2190
2281
  <span class="cline-any cline-neutral">&nbsp;</span>
2191
2282
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -2293,20 +2384,22 @@
2293
2384
  <span class="cline-any cline-neutral">&nbsp;</span>
2294
2385
  <span class="cline-any cline-neutral">&nbsp;</span>
2295
2386
  <span class="cline-any cline-neutral">&nbsp;</span>
2296
- <span class="cline-any cline-yes">434x</span>
2297
- <span class="cline-any cline-yes">434x</span>
2298
2387
  <span class="cline-any cline-neutral">&nbsp;</span>
2299
- <span class="cline-any cline-yes">434x</span>
2388
+ <span class="cline-any cline-yes">476x</span>
2389
+ <span class="cline-any cline-yes">476x</span>
2390
+ <span class="cline-any cline-yes">476x</span>
2300
2391
  <span class="cline-any cline-neutral">&nbsp;</span>
2301
- <span class="cline-any cline-yes">430x</span>
2392
+ <span class="cline-any cline-yes">476x</span>
2302
2393
  <span class="cline-any cline-neutral">&nbsp;</span>
2303
- <span class="cline-any cline-yes">431x</span>
2394
+ <span class="cline-any cline-yes">452x</span>
2304
2395
  <span class="cline-any cline-neutral">&nbsp;</span>
2396
+ <span class="cline-any cline-yes">472x</span>
2305
2397
  <span class="cline-any cline-neutral">&nbsp;</span>
2306
2398
  <span class="cline-any cline-neutral">&nbsp;</span>
2307
- <span class="cline-any cline-yes">430x</span>
2308
- <span class="cline-any cline-yes">829x</span>
2309
- <span class="cline-any cline-yes">5x</span>
2399
+ <span class="cline-any cline-neutral">&nbsp;</span>
2400
+ <span class="cline-any cline-yes">452x</span>
2401
+ <span class="cline-any cline-yes">871x</span>
2402
+ <span class="cline-any cline-yes">6x</span>
2310
2403
  <span class="cline-any cline-neutral">&nbsp;</span>
2311
2404
  <span class="cline-any cline-neutral">&nbsp;</span>
2312
2405
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -2314,16 +2407,26 @@
2314
2407
  <span class="cline-any cline-neutral">&nbsp;</span>
2315
2408
  <span class="cline-any cline-neutral">&nbsp;</span>
2316
2409
  <span class="cline-any cline-neutral">&nbsp;</span>
2317
- <span class="cline-any cline-yes">430x</span>
2318
- <span class="cline-any cline-yes">877x</span>
2319
- <span class="cline-any cline-yes">877x</span>
2320
- <span class="cline-any cline-no">&nbsp;</span>
2410
+ <span class="cline-any cline-yes">452x</span>
2411
+ <span class="cline-any cline-yes">920x</span>
2412
+ <span class="cline-any cline-yes">920x</span>
2413
+ <span class="cline-any cline-yes">1x</span>
2414
+ <span class="cline-any cline-neutral">&nbsp;</span>
2415
+ <span class="cline-any cline-neutral">&nbsp;</span>
2416
+ <span class="cline-any cline-neutral">&nbsp;</span>
2417
+ <span class="cline-any cline-neutral">&nbsp;</span>
2418
+ <span class="cline-any cline-neutral">&nbsp;</span>
2419
+ <span class="cline-any cline-neutral">&nbsp;</span>
2420
+ <span class="cline-any cline-neutral">&nbsp;</span>
2421
+ <span class="cline-any cline-neutral">&nbsp;</span>
2422
+ <span class="cline-any cline-yes">919x</span>
2423
+ <span class="cline-any cline-yes">1x</span>
2321
2424
  <span class="cline-any cline-neutral">&nbsp;</span>
2322
2425
  <span class="cline-any cline-neutral">&nbsp;</span>
2323
2426
  <span class="cline-any cline-neutral">&nbsp;</span>
2324
2427
  <span class="cline-any cline-neutral">&nbsp;</span>
2325
2428
  <span class="cline-any cline-neutral">&nbsp;</span>
2326
- <span class="cline-any cline-yes">877x</span>
2429
+ <span class="cline-any cline-yes">918x</span>
2327
2430
  <span class="cline-any cline-neutral">&nbsp;</span>
2328
2431
  <span class="cline-any cline-neutral">&nbsp;</span>
2329
2432
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -2334,6 +2437,18 @@
2334
2437
  <span class="cline-any cline-neutral">&nbsp;</span>
2335
2438
  <span class="cline-any cline-neutral">&nbsp;</span>
2336
2439
  <span class="cline-any cline-neutral">&nbsp;</span>
2440
+ <span class="cline-any cline-yes">24x</span>
2441
+ <span class="cline-any cline-yes">20x</span>
2442
+ <span class="cline-any cline-yes">38x</span>
2443
+ <span class="cline-any cline-neutral">&nbsp;</span>
2444
+ <span class="cline-any cline-neutral">&nbsp;</span>
2445
+ <span class="cline-any cline-neutral">&nbsp;</span>
2446
+ <span class="cline-any cline-neutral">&nbsp;</span>
2447
+ <span class="cline-any cline-neutral">&nbsp;</span>
2448
+ <span class="cline-any cline-neutral">&nbsp;</span>
2449
+ <span class="cline-any cline-neutral">&nbsp;</span>
2450
+ <span class="cline-any cline-neutral">&nbsp;</span>
2451
+ <span class="cline-any cline-neutral">&nbsp;</span>
2337
2452
  <span class="cline-any cline-neutral">&nbsp;</span>
2338
2453
  <span class="cline-any cline-yes">4x</span>
2339
2454
  <span class="cline-any cline-yes">12x</span>
@@ -2347,7 +2462,7 @@
2347
2462
  <span class="cline-any cline-neutral">&nbsp;</span>
2348
2463
  <span class="cline-any cline-neutral">&nbsp;</span>
2349
2464
  <span class="cline-any cline-neutral">&nbsp;</span>
2350
- <span class="cline-any cline-yes">434x</span>
2465
+ <span class="cline-any cline-yes">476x</span>
2351
2466
  <span class="cline-any cline-no">&nbsp;</span>
2352
2467
  <span class="cline-any cline-no">&nbsp;</span>
2353
2468
  <span class="cline-any cline-no">&nbsp;</span>
@@ -2374,9 +2489,9 @@
2374
2489
  <span class="cline-any cline-neutral">&nbsp;</span>
2375
2490
  <span class="cline-any cline-neutral">&nbsp;</span>
2376
2491
  <span class="cline-any cline-neutral">&nbsp;</span>
2377
- <span class="cline-any cline-yes">2185x</span>
2492
+ <span class="cline-any cline-yes">2288x</span>
2378
2493
  <span class="cline-any cline-neutral">&nbsp;</span>
2379
- <span class="cline-any cline-yes">2185x</span>
2494
+ <span class="cline-any cline-yes">2288x</span>
2380
2495
  <span class="cline-any cline-neutral">&nbsp;</span>
2381
2496
  <span class="cline-any cline-no">&nbsp;</span>
2382
2497
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -2392,8 +2507,8 @@
2392
2507
  <span class="cline-any cline-no">&nbsp;</span>
2393
2508
  <span class="cline-any cline-neutral">&nbsp;</span>
2394
2509
  <span class="cline-any cline-neutral">&nbsp;</span>
2395
- <span class="cline-any cline-yes">2185x</span>
2396
- <span class="cline-any cline-yes">2185x</span>
2510
+ <span class="cline-any cline-yes">2288x</span>
2511
+ <span class="cline-any cline-yes">2288x</span>
2397
2512
  <span class="cline-any cline-yes">3x</span>
2398
2513
  <span class="cline-any cline-neutral">&nbsp;</span>
2399
2514
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -2402,12 +2517,12 @@
2402
2517
  <span class="cline-any cline-yes">3x</span>
2403
2518
  <span class="cline-any cline-neutral">&nbsp;</span>
2404
2519
  <span class="cline-any cline-neutral">&nbsp;</span>
2405
- <span class="cline-any cline-yes">2182x</span>
2520
+ <span class="cline-any cline-yes">2285x</span>
2406
2521
  <span class="cline-any cline-no">&nbsp;</span>
2407
2522
  <span class="cline-any cline-neutral">&nbsp;</span>
2408
2523
  <span class="cline-any cline-neutral">&nbsp;</span>
2409
- <span class="cline-any cline-yes">2182x</span>
2410
- <span class="cline-any cline-yes">2182x</span>
2524
+ <span class="cline-any cline-yes">2285x</span>
2525
+ <span class="cline-any cline-yes">2285x</span>
2411
2526
  <span class="cline-any cline-yes">48x</span>
2412
2527
  <span class="cline-any cline-yes">96x</span>
2413
2528
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -2427,8 +2542,8 @@
2427
2542
  <span class="cline-any cline-yes">48x</span>
2428
2543
  <span class="cline-any cline-neutral">&nbsp;</span>
2429
2544
  <span class="cline-any cline-neutral">&nbsp;</span>
2430
- <span class="cline-any cline-yes">2134x</span>
2431
- <span class="cline-any cline-yes">2134x</span>
2545
+ <span class="cline-any cline-yes">2237x</span>
2546
+ <span class="cline-any cline-yes">2237x</span>
2432
2547
  <span class="cline-any cline-yes">36x</span>
2433
2548
  <span class="cline-any cline-yes">3x</span>
2434
2549
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -2439,8 +2554,8 @@
2439
2554
  <span class="cline-any cline-yes">36x</span>
2440
2555
  <span class="cline-any cline-neutral">&nbsp;</span>
2441
2556
  <span class="cline-any cline-neutral">&nbsp;</span>
2442
- <span class="cline-any cline-yes">2098x</span>
2443
- <span class="cline-any cline-yes">2098x</span>
2557
+ <span class="cline-any cline-yes">2201x</span>
2558
+ <span class="cline-any cline-yes">2201x</span>
2444
2559
  <span class="cline-any cline-yes">40x</span>
2445
2560
  <span class="cline-any cline-yes">27x</span>
2446
2561
  <span class="cline-any cline-yes">2x</span>
@@ -2453,7 +2568,7 @@
2453
2568
  <span class="cline-any cline-neutral">&nbsp;</span>
2454
2569
  <span class="cline-any cline-neutral">&nbsp;</span>
2455
2570
  <span class="cline-any cline-neutral">&nbsp;</span>
2456
- <span class="cline-any cline-yes">2071x</span>
2571
+ <span class="cline-any cline-yes">2174x</span>
2457
2572
  <span class="cline-any cline-no">&nbsp;</span>
2458
2573
  <span class="cline-any cline-neutral">&nbsp;</span>
2459
2574
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -2462,38 +2577,38 @@
2462
2577
  <span class="cline-any cline-no">&nbsp;</span>
2463
2578
  <span class="cline-any cline-neutral">&nbsp;</span>
2464
2579
  <span class="cline-any cline-neutral">&nbsp;</span>
2465
- <span class="cline-any cline-yes">2071x</span>
2466
- <span class="cline-any cline-yes">2071x</span>
2580
+ <span class="cline-any cline-yes">2174x</span>
2581
+ <span class="cline-any cline-yes">2174x</span>
2467
2582
  <span class="cline-any cline-neutral">&nbsp;</span>
2468
2583
  <span class="cline-any cline-neutral">&nbsp;</span>
2469
- <span class="cline-any cline-yes">2071x</span>
2470
- <span class="cline-any cline-yes">1017x</span>
2471
- <span class="cline-any cline-no">&nbsp;</span>
2584
+ <span class="cline-any cline-yes">2174x</span>
2585
+ <span class="cline-any cline-yes">1077x</span>
2586
+ <span class="cline-any cline-yes">1x</span>
2472
2587
  <span class="cline-any cline-neutral">&nbsp;</span>
2473
2588
  <span class="cline-any cline-neutral">&nbsp;</span>
2474
2589
  <span class="cline-any cline-neutral">&nbsp;</span>
2475
2590
  <span class="cline-any cline-neutral">&nbsp;</span>
2476
- <span class="cline-any cline-no">&nbsp;</span>
2591
+ <span class="cline-any cline-yes">1x</span>
2477
2592
  <span class="cline-any cline-neutral">&nbsp;</span>
2478
2593
  <span class="cline-any cline-neutral">&nbsp;</span>
2479
- <span class="cline-any cline-yes">1017x</span>
2480
- <span class="cline-any cline-yes">1017x</span>
2481
- <span class="cline-any cline-yes">1017x</span>
2482
- <span class="cline-any cline-yes">1017x</span>
2594
+ <span class="cline-any cline-yes">1076x</span>
2595
+ <span class="cline-any cline-yes">1076x</span>
2596
+ <span class="cline-any cline-yes">1076x</span>
2597
+ <span class="cline-any cline-yes">1076x</span>
2483
2598
  <span class="cline-any cline-yes">1x</span>
2484
2599
  <span class="cline-any cline-neutral">&nbsp;</span>
2485
2600
  <span class="cline-any cline-neutral">&nbsp;</span>
2486
2601
  <span class="cline-any cline-neutral">&nbsp;</span>
2487
2602
  <span class="cline-any cline-neutral">&nbsp;</span>
2488
2603
  <span class="cline-any cline-neutral">&nbsp;</span>
2489
- <span class="cline-any cline-yes">1017x</span>
2604
+ <span class="cline-any cline-yes">1076x</span>
2490
2605
  <span class="cline-any cline-yes">2x</span>
2491
2606
  <span class="cline-any cline-neutral">&nbsp;</span>
2492
2607
  <span class="cline-any cline-neutral">&nbsp;</span>
2493
2608
  <span class="cline-any cline-neutral">&nbsp;</span>
2494
2609
  <span class="cline-any cline-neutral">&nbsp;</span>
2495
2610
  <span class="cline-any cline-neutral">&nbsp;</span>
2496
- <span class="cline-any cline-yes">1017x</span>
2611
+ <span class="cline-any cline-yes">1076x</span>
2497
2612
  <span class="cline-any cline-yes">73x</span>
2498
2613
  <span class="cline-any cline-yes">73x</span>
2499
2614
  <span class="cline-any cline-yes">4x</span>
@@ -2507,7 +2622,7 @@
2507
2622
  <span class="cline-any cline-neutral">&nbsp;</span>
2508
2623
  <span class="cline-any cline-neutral">&nbsp;</span>
2509
2624
  <span class="cline-any cline-neutral">&nbsp;</span>
2510
- <span class="cline-any cline-yes">1017x</span>
2625
+ <span class="cline-any cline-yes">1076x</span>
2511
2626
  <span class="cline-any cline-neutral">&nbsp;</span>
2512
2627
  <span class="cline-any cline-neutral">&nbsp;</span>
2513
2628
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -2518,12 +2633,12 @@
2518
2633
  <span class="cline-any cline-neutral">&nbsp;</span>
2519
2634
  <span class="cline-any cline-neutral">&nbsp;</span>
2520
2635
  <span class="cline-any cline-neutral">&nbsp;</span>
2521
- <span class="cline-any cline-yes">1017x</span>
2636
+ <span class="cline-any cline-yes">1076x</span>
2522
2637
  <span class="cline-any cline-neutral">&nbsp;</span>
2523
2638
  <span class="cline-any cline-neutral">&nbsp;</span>
2524
2639
  <span class="cline-any cline-neutral">&nbsp;</span>
2525
- <span class="cline-any cline-yes">1054x</span>
2526
- <span class="cline-any cline-yes">179x</span>
2640
+ <span class="cline-any cline-yes">1097x</span>
2641
+ <span class="cline-any cline-yes">180x</span>
2527
2642
  <span class="cline-any cline-no">&nbsp;</span>
2528
2643
  <span class="cline-any cline-neutral">&nbsp;</span>
2529
2644
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -2531,7 +2646,7 @@
2531
2646
  <span class="cline-any cline-neutral">&nbsp;</span>
2532
2647
  <span class="cline-any cline-no">&nbsp;</span>
2533
2648
  <span class="cline-any cline-neutral">&nbsp;</span>
2534
- <span class="cline-any cline-yes">179x</span>
2649
+ <span class="cline-any cline-yes">180x</span>
2535
2650
  <span class="cline-any cline-no">&nbsp;</span>
2536
2651
  <span class="cline-any cline-neutral">&nbsp;</span>
2537
2652
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -2539,7 +2654,7 @@
2539
2654
  <span class="cline-any cline-neutral">&nbsp;</span>
2540
2655
  <span class="cline-any cline-no">&nbsp;</span>
2541
2656
  <span class="cline-any cline-neutral">&nbsp;</span>
2542
- <span class="cline-any cline-yes">179x</span>
2657
+ <span class="cline-any cline-yes">180x</span>
2543
2658
  <span class="cline-any cline-no">&nbsp;</span>
2544
2659
  <span class="cline-any cline-neutral">&nbsp;</span>
2545
2660
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -2547,27 +2662,27 @@
2547
2662
  <span class="cline-any cline-neutral">&nbsp;</span>
2548
2663
  <span class="cline-any cline-no">&nbsp;</span>
2549
2664
  <span class="cline-any cline-neutral">&nbsp;</span>
2550
- <span class="cline-any cline-yes">179x</span>
2551
- <span class="cline-any cline-yes">179x</span>
2552
- <span class="cline-any cline-yes">179x</span>
2665
+ <span class="cline-any cline-yes">180x</span>
2666
+ <span class="cline-any cline-yes">180x</span>
2667
+ <span class="cline-any cline-yes">180x</span>
2553
2668
  <span class="cline-any cline-yes">2x</span>
2554
2669
  <span class="cline-any cline-neutral">&nbsp;</span>
2555
2670
  <span class="cline-any cline-neutral">&nbsp;</span>
2556
2671
  <span class="cline-any cline-neutral">&nbsp;</span>
2557
2672
  <span class="cline-any cline-neutral">&nbsp;</span>
2558
2673
  <span class="cline-any cline-neutral">&nbsp;</span>
2559
- <span class="cline-any cline-yes">179x</span>
2674
+ <span class="cline-any cline-yes">180x</span>
2560
2675
  <span class="cline-any cline-yes">8x</span>
2561
2676
  <span class="cline-any cline-neutral">&nbsp;</span>
2562
2677
  <span class="cline-any cline-neutral">&nbsp;</span>
2563
2678
  <span class="cline-any cline-neutral">&nbsp;</span>
2564
2679
  <span class="cline-any cline-neutral">&nbsp;</span>
2565
2680
  <span class="cline-any cline-neutral">&nbsp;</span>
2566
- <span class="cline-any cline-yes">179x</span>
2681
+ <span class="cline-any cline-yes">180x</span>
2567
2682
  <span class="cline-any cline-neutral">&nbsp;</span>
2568
2683
  <span class="cline-any cline-neutral">&nbsp;</span>
2569
2684
  <span class="cline-any cline-neutral">&nbsp;</span>
2570
- <span class="cline-any cline-yes">875x</span>
2685
+ <span class="cline-any cline-yes">917x</span>
2571
2686
  <span class="cline-any cline-yes">126x</span>
2572
2687
  <span class="cline-any cline-no">&nbsp;</span>
2573
2688
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -2604,7 +2719,7 @@
2604
2719
  <span class="cline-any cline-neutral">&nbsp;</span>
2605
2720
  <span class="cline-any cline-neutral">&nbsp;</span>
2606
2721
  <span class="cline-any cline-neutral">&nbsp;</span>
2607
- <span class="cline-any cline-yes">749x</span>
2722
+ <span class="cline-any cline-yes">791x</span>
2608
2723
  <span class="cline-any cline-yes">119x</span>
2609
2724
  <span class="cline-any cline-no">&nbsp;</span>
2610
2725
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -2616,7 +2731,7 @@
2616
2731
  <span class="cline-any cline-neutral">&nbsp;</span>
2617
2732
  <span class="cline-any cline-neutral">&nbsp;</span>
2618
2733
  <span class="cline-any cline-neutral">&nbsp;</span>
2619
- <span class="cline-any cline-yes">630x</span>
2734
+ <span class="cline-any cline-yes">672x</span>
2620
2735
  <span class="cline-any cline-yes">192x</span>
2621
2736
  <span class="cline-any cline-no">&nbsp;</span>
2622
2737
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -2644,8 +2759,8 @@
2644
2759
  <span class="cline-any cline-neutral">&nbsp;</span>
2645
2760
  <span class="cline-any cline-neutral">&nbsp;</span>
2646
2761
  <span class="cline-any cline-neutral">&nbsp;</span>
2647
- <span class="cline-any cline-yes">438x</span>
2648
- <span class="cline-any cline-yes">434x</span>
2762
+ <span class="cline-any cline-yes">480x</span>
2763
+ <span class="cline-any cline-yes">476x</span>
2649
2764
  <span class="cline-any cline-neutral">&nbsp;</span>
2650
2765
  <span class="cline-any cline-neutral">&nbsp;</span>
2651
2766
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -2657,7 +2772,7 @@
2657
2772
  <span class="cline-any cline-neutral">&nbsp;</span>
2658
2773
  <span class="cline-any cline-no">&nbsp;</span>
2659
2774
  <span class="cline-any cline-neutral">&nbsp;</span>
2660
- <span class="cline-any cline-yes">434x</span>
2775
+ <span class="cline-any cline-yes">476x</span>
2661
2776
  <span class="cline-any cline-neutral">&nbsp;</span>
2662
2777
  <span class="cline-any cline-neutral">&nbsp;</span>
2663
2778
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -2670,7 +2785,7 @@
2670
2785
  <span class="cline-any cline-neutral">&nbsp;</span>
2671
2786
  <span class="cline-any cline-neutral">&nbsp;</span>
2672
2787
  <span class="cline-any cline-neutral">&nbsp;</span>
2673
- <span class="cline-any cline-yes">434x</span>
2788
+ <span class="cline-any cline-yes">476x</span>
2674
2789
  <span class="cline-any cline-neutral">&nbsp;</span>
2675
2790
  <span class="cline-any cline-neutral">&nbsp;</span>
2676
2791
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -2728,7 +2843,7 @@
2728
2843
  <span class="cline-any cline-neutral">&nbsp;</span>
2729
2844
  <span class="cline-any cline-neutral">&nbsp;</span>
2730
2845
  <span class="cline-any cline-neutral">&nbsp;</span>
2731
- <span class="cline-any cline-yes">669x</span>
2846
+ <span class="cline-any cline-yes">681x</span>
2732
2847
  <span class="cline-any cline-yes">71x</span>
2733
2848
  <span class="cline-any cline-neutral">&nbsp;</span>
2734
2849
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -2755,8 +2870,8 @@
2755
2870
  <span class="cline-any cline-neutral">&nbsp;</span>
2756
2871
  <span class="cline-any cline-yes">67x</span>
2757
2872
  <span class="cline-any cline-neutral">&nbsp;</span>
2758
- <span class="cline-any cline-yes">598x</span>
2759
- <span class="cline-any cline-yes">598x</span>
2873
+ <span class="cline-any cline-yes">610x</span>
2874
+ <span class="cline-any cline-yes">610x</span>
2760
2875
  <span class="cline-any cline-yes">6x</span>
2761
2876
  <span class="cline-any cline-neutral">&nbsp;</span>
2762
2877
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -2764,7 +2879,7 @@
2764
2879
  <span class="cline-any cline-neutral">&nbsp;</span>
2765
2880
  <span class="cline-any cline-yes">6x</span>
2766
2881
  <span class="cline-any cline-neutral">&nbsp;</span>
2767
- <span class="cline-any cline-yes">592x</span>
2882
+ <span class="cline-any cline-yes">604x</span>
2768
2883
  <span class="cline-any cline-neutral">&nbsp;</span>
2769
2884
  <span class="cline-any cline-neutral">&nbsp;</span>
2770
2885
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -2824,11 +2939,11 @@
2824
2939
  <span class="cline-any cline-neutral">&nbsp;</span>
2825
2940
  <span class="cline-any cline-neutral">&nbsp;</span>
2826
2941
  <span class="cline-any cline-neutral">&nbsp;</span>
2827
- <span class="cline-any cline-yes">230x</span>
2942
+ <span class="cline-any cline-yes">244x</span>
2828
2943
  <span class="cline-any cline-neutral">&nbsp;</span>
2829
- <span class="cline-any cline-yes">285x</span>
2944
+ <span class="cline-any cline-yes">299x</span>
2830
2945
  <span class="cline-any cline-yes">47x</span>
2831
- <span class="cline-any cline-yes">428x</span>
2946
+ <span class="cline-any cline-yes">432x</span>
2832
2947
  <span class="cline-any cline-neutral">&nbsp;</span>
2833
2948
  <span class="cline-any cline-neutral">&nbsp;</span>
2834
2949
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -2841,7 +2956,7 @@
2841
2956
  <span class="cline-any cline-neutral">&nbsp;</span>
2842
2957
  <span class="cline-any cline-neutral">&nbsp;</span>
2843
2958
  <span class="cline-any cline-neutral">&nbsp;</span>
2844
- <span class="cline-any cline-yes">285x</span>
2959
+ <span class="cline-any cline-yes">299x</span>
2845
2960
  <span class="cline-any cline-yes">2x</span>
2846
2961
  <span class="cline-any cline-no">&nbsp;</span>
2847
2962
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -2915,20 +3030,20 @@
2915
3030
  <span class="cline-any cline-neutral">&nbsp;</span>
2916
3031
  <span class="cline-any cline-neutral">&nbsp;</span>
2917
3032
  <span class="cline-any cline-neutral">&nbsp;</span>
2918
- <span class="cline-any cline-yes">73x</span>
2919
- <span class="cline-any cline-yes">73x</span>
2920
- <span class="cline-any cline-yes">73x</span>
3033
+ <span class="cline-any cline-yes">80x</span>
3034
+ <span class="cline-any cline-yes">80x</span>
3035
+ <span class="cline-any cline-yes">80x</span>
2921
3036
  <span class="cline-any cline-neutral">&nbsp;</span>
2922
- <span class="cline-any cline-yes">73x</span>
3037
+ <span class="cline-any cline-yes">80x</span>
2923
3038
  <span class="cline-any cline-neutral">&nbsp;</span>
2924
- <span class="cline-any cline-yes">73x</span>
2925
- <span class="cline-any cline-yes">367x</span>
3039
+ <span class="cline-any cline-yes">80x</span>
3040
+ <span class="cline-any cline-yes">381x</span>
2926
3041
  <span class="cline-any cline-no">&nbsp;</span>
2927
3042
  <span class="cline-any cline-neutral">&nbsp;</span>
2928
3043
  <span class="cline-any cline-neutral">&nbsp;</span>
2929
3044
  <span class="cline-any cline-neutral">&nbsp;</span>
2930
3045
  <span class="cline-any cline-neutral">&nbsp;</span>
2931
- <span class="cline-any cline-yes">73x</span>
3046
+ <span class="cline-any cline-yes">80x</span>
2932
3047
  <span class="cline-any cline-neutral">&nbsp;</span>
2933
3048
  <span class="cline-any cline-neutral">&nbsp;</span>
2934
3049
  <span class="cline-any cline-yes">20x</span>
@@ -2946,15 +3061,15 @@
2946
3061
  <span class="cline-any cline-neutral">&nbsp;</span>
2947
3062
  <span class="cline-any cline-neutral">&nbsp;</span>
2948
3063
  <span class="cline-any cline-neutral">&nbsp;</span>
2949
- <span class="cline-any cline-yes">73x</span>
3064
+ <span class="cline-any cline-yes">80x</span>
2950
3065
  <span class="cline-any cline-neutral">&nbsp;</span>
2951
- <span class="cline-any cline-yes">73x</span>
3066
+ <span class="cline-any cline-yes">80x</span>
2952
3067
  <span class="cline-any cline-neutral">&nbsp;</span>
2953
- <span class="cline-any cline-yes">73x</span>
3068
+ <span class="cline-any cline-yes">80x</span>
2954
3069
  <span class="cline-any cline-yes">4x</span>
2955
3070
  <span class="cline-any cline-neutral">&nbsp;</span>
2956
3071
  <span class="cline-any cline-neutral">&nbsp;</span>
2957
- <span class="cline-any cline-yes">73x</span>
3072
+ <span class="cline-any cline-yes">80x</span>
2958
3073
  <span class="cline-any cline-neutral">&nbsp;</span>
2959
3074
  <span class="cline-any cline-neutral">&nbsp;</span>
2960
3075
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -2973,7 +3088,7 @@
2973
3088
  <span class="cline-any cline-neutral">&nbsp;</span>
2974
3089
  <span class="cline-any cline-neutral">&nbsp;</span>
2975
3090
  <span class="cline-any cline-neutral">&nbsp;</span>
2976
- <span class="cline-any cline-yes">231x</span>
3091
+ <span class="cline-any cline-yes">245x</span>
2977
3092
  <span class="cline-any cline-no">&nbsp;</span>
2978
3093
  <span class="cline-any cline-neutral">&nbsp;</span>
2979
3094
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -2982,8 +3097,8 @@
2982
3097
  <span class="cline-any cline-neutral">&nbsp;</span>
2983
3098
  <span class="cline-any cline-neutral">&nbsp;</span>
2984
3099
  <span class="cline-any cline-neutral">&nbsp;</span>
2985
- <span class="cline-any cline-yes">286x</span>
2986
- <span class="cline-any cline-yes">231x</span>
3100
+ <span class="cline-any cline-yes">300x</span>
3101
+ <span class="cline-any cline-yes">245x</span>
2987
3102
  <span class="cline-any cline-neutral">&nbsp;</span>
2988
3103
  <span class="cline-any cline-no">&nbsp;</span>
2989
3104
  <span class="cline-any cline-no">&nbsp;</span>
@@ -2993,8 +3108,8 @@
2993
3108
  <span class="cline-any cline-neutral">&nbsp;</span>
2994
3109
  <span class="cline-any cline-neutral">&nbsp;</span>
2995
3110
  <span class="cline-any cline-neutral">&nbsp;</span>
2996
- <span class="cline-any cline-yes">231x</span>
2997
- <span class="cline-any cline-yes">231x</span>
3111
+ <span class="cline-any cline-yes">245x</span>
3112
+ <span class="cline-any cline-yes">245x</span>
2998
3113
  <span class="cline-any cline-neutral">&nbsp;</span>
2999
3114
  <span class="cline-any cline-neutral">&nbsp;</span>
3000
3115
  <span class="cline-any cline-no">&nbsp;</span>
@@ -3005,7 +3120,7 @@
3005
3120
  <span class="cline-any cline-neutral">&nbsp;</span>
3006
3121
  <span class="cline-any cline-neutral">&nbsp;</span>
3007
3122
  <span class="cline-any cline-neutral">&nbsp;</span>
3008
- <span class="cline-any cline-yes">73x</span>
3123
+ <span class="cline-any cline-yes">80x</span>
3009
3124
  <span class="cline-any cline-neutral">&nbsp;</span>
3010
3125
  <span class="cline-any cline-neutral">&nbsp;</span>
3011
3126
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -3028,23 +3143,23 @@
3028
3143
  <span class="cline-any cline-neutral">&nbsp;</span>
3029
3144
  <span class="cline-any cline-neutral">&nbsp;</span>
3030
3145
  <span class="cline-any cline-neutral">&nbsp;</span>
3031
- <span class="cline-any cline-yes">73x</span>
3032
- <span class="cline-any cline-yes">118x</span>
3146
+ <span class="cline-any cline-yes">80x</span>
3147
+ <span class="cline-any cline-yes">125x</span>
3033
3148
  <span class="cline-any cline-yes">1x</span>
3034
3149
  <span class="cline-any cline-neutral">&nbsp;</span>
3035
3150
  <span class="cline-any cline-neutral">&nbsp;</span>
3036
3151
  <span class="cline-any cline-neutral">&nbsp;</span>
3037
3152
  <span class="cline-any cline-neutral">&nbsp;</span>
3038
- <span class="cline-any cline-yes">73x</span>
3153
+ <span class="cline-any cline-yes">80x</span>
3039
3154
  <span class="cline-any cline-yes">2x</span>
3040
3155
  <span class="cline-any cline-no">&nbsp;</span>
3041
3156
  <span class="cline-any cline-neutral">&nbsp;</span>
3042
3157
  <span class="cline-any cline-neutral">&nbsp;</span>
3043
3158
  <span class="cline-any cline-neutral">&nbsp;</span>
3044
3159
  <span class="cline-any cline-neutral">&nbsp;</span>
3045
- <span class="cline-any cline-yes">73x</span>
3160
+ <span class="cline-any cline-yes">80x</span>
3046
3161
  <span class="cline-any cline-neutral">&nbsp;</span>
3047
- <span class="cline-any cline-yes">73x</span>
3162
+ <span class="cline-any cline-yes">80x</span>
3048
3163
  <span class="cline-any cline-neutral">&nbsp;</span>
3049
3164
  <span class="cline-any cline-neutral">&nbsp;</span>
3050
3165
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -3053,7 +3168,7 @@
3053
3168
  <span class="cline-any cline-neutral">&nbsp;</span>
3054
3169
  <span class="cline-any cline-neutral">&nbsp;</span>
3055
3170
  <span class="cline-any cline-neutral">&nbsp;</span>
3056
- <span class="cline-any cline-yes">126x</span>
3171
+ <span class="cline-any cline-yes">133x</span>
3057
3172
  <span class="cline-any cline-no">&nbsp;</span>
3058
3173
  <span class="cline-any cline-neutral">&nbsp;</span>
3059
3174
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -3061,7 +3176,7 @@
3061
3176
  <span class="cline-any cline-neutral">&nbsp;</span>
3062
3177
  <span class="cline-any cline-neutral">&nbsp;</span>
3063
3178
  <span class="cline-any cline-neutral">&nbsp;</span>
3064
- <span class="cline-any cline-yes">116x</span>
3179
+ <span class="cline-any cline-yes">123x</span>
3065
3180
  <span class="cline-any cline-neutral">&nbsp;</span>
3066
3181
  <span class="cline-any cline-no">&nbsp;</span>
3067
3182
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -3102,7 +3217,7 @@
3102
3217
  <span class="cline-any cline-neutral">&nbsp;</span>
3103
3218
  <span class="cline-any cline-neutral">&nbsp;</span>
3104
3219
  <span class="cline-any cline-neutral">&nbsp;</span>
3105
- <span class="cline-any cline-yes">58x</span>
3220
+ <span class="cline-any cline-yes">59x</span>
3106
3221
  <span class="cline-any cline-yes">2x</span>
3107
3222
  <span class="cline-any cline-neutral">&nbsp;</span>
3108
3223
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -3133,16 +3248,17 @@
3133
3248
  <span class="cline-any cline-neutral">&nbsp;</span>
3134
3249
  <span class="cline-any cline-neutral">&nbsp;</span>
3135
3250
  <span class="cline-any cline-neutral">&nbsp;</span>
3136
- <span class="cline-any cline-yes">264x</span>
3137
3251
  <span class="cline-any cline-neutral">&nbsp;</span>
3138
- <span class="cline-any cline-yes">264x</span>
3252
+ <span class="cline-any cline-yes">275x</span>
3139
3253
  <span class="cline-any cline-neutral">&nbsp;</span>
3254
+ <span class="cline-any cline-yes">275x</span>
3140
3255
  <span class="cline-any cline-neutral">&nbsp;</span>
3141
3256
  <span class="cline-any cline-neutral">&nbsp;</span>
3142
- <span class="cline-any cline-yes">264x</span>
3143
3257
  <span class="cline-any cline-neutral">&nbsp;</span>
3258
+ <span class="cline-any cline-yes">275x</span>
3144
3259
  <span class="cline-any cline-neutral">&nbsp;</span>
3145
- <span class="cline-any cline-yes">264x</span>
3260
+ <span class="cline-any cline-neutral">&nbsp;</span>
3261
+ <span class="cline-any cline-yes">275x</span>
3146
3262
  <span class="cline-any cline-yes">1x</span>
3147
3263
  <span class="cline-any cline-neutral">&nbsp;</span>
3148
3264
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -3151,31 +3267,33 @@
3151
3267
  <span class="cline-any cline-neutral">&nbsp;</span>
3152
3268
  <span class="cline-any cline-yes">1x</span>
3153
3269
  <span class="cline-any cline-neutral">&nbsp;</span>
3154
- <span class="cline-any cline-yes">263x</span>
3270
+ <span class="cline-any cline-yes">274x</span>
3155
3271
  <span class="cline-any cline-neutral">&nbsp;</span>
3156
- <span class="cline-any cline-yes">57x</span>
3272
+ <span class="cline-any cline-yes">58x</span>
3157
3273
  <span class="cline-any cline-neutral">&nbsp;</span>
3158
3274
  <span class="cline-any cline-neutral">&nbsp;</span>
3159
3275
  <span class="cline-any cline-neutral">&nbsp;</span>
3160
3276
  <span class="cline-any cline-neutral">&nbsp;</span>
3161
3277
  <span class="cline-any cline-neutral">&nbsp;</span>
3162
- <span class="cline-any cline-yes">57x</span>
3163
3278
  <span class="cline-any cline-neutral">&nbsp;</span>
3164
3279
  <span class="cline-any cline-neutral">&nbsp;</span>
3280
+ <span class="cline-any cline-yes">58x</span>
3165
3281
  <span class="cline-any cline-neutral">&nbsp;</span>
3166
3282
  <span class="cline-any cline-neutral">&nbsp;</span>
3167
3283
  <span class="cline-any cline-neutral">&nbsp;</span>
3168
3284
  <span class="cline-any cline-neutral">&nbsp;</span>
3169
3285
  <span class="cline-any cline-neutral">&nbsp;</span>
3170
- <span class="cline-any cline-yes">57x</span>
3171
- <span class="cline-any cline-no">&nbsp;</span>
3286
+ <span class="cline-any cline-neutral">&nbsp;</span>
3287
+ <span class="cline-any cline-neutral">&nbsp;</span>
3288
+ <span class="cline-any cline-yes">58x</span>
3289
+ <span class="cline-any cline-yes">1x</span>
3172
3290
  <span class="cline-any cline-neutral">&nbsp;</span>
3173
3291
  <span class="cline-any cline-neutral">&nbsp;</span>
3174
3292
  <span class="cline-any cline-neutral">&nbsp;</span>
3175
3293
  <span class="cline-any cline-neutral">&nbsp;</span>
3176
3294
  <span class="cline-any cline-neutral">&nbsp;</span>
3177
3295
  <span class="cline-any cline-neutral">&nbsp;</span>
3178
- <span class="cline-any cline-yes">57x</span>
3296
+ <span class="cline-any cline-yes">58x</span>
3179
3297
  <span class="cline-any cline-no">&nbsp;</span>
3180
3298
  <span class="cline-any cline-neutral">&nbsp;</span>
3181
3299
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -3183,9 +3301,9 @@
3183
3301
  <span class="cline-any cline-neutral">&nbsp;</span>
3184
3302
  <span class="cline-any cline-neutral">&nbsp;</span>
3185
3303
  <span class="cline-any cline-neutral">&nbsp;</span>
3186
- <span class="cline-any cline-yes">57x</span>
3304
+ <span class="cline-any cline-yes">58x</span>
3187
3305
  <span class="cline-any cline-neutral">&nbsp;</span>
3188
- <span class="cline-any cline-yes">206x</span>
3306
+ <span class="cline-any cline-yes">216x</span>
3189
3307
  <span class="cline-any cline-no">&nbsp;</span>
3190
3308
  <span class="cline-any cline-neutral">&nbsp;</span>
3191
3309
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -3194,7 +3312,7 @@
3194
3312
  <span class="cline-any cline-neutral">&nbsp;</span>
3195
3313
  <span class="cline-any cline-no">&nbsp;</span>
3196
3314
  <span class="cline-any cline-neutral">&nbsp;</span>
3197
- <span class="cline-any cline-yes">206x</span>
3315
+ <span class="cline-any cline-yes">216x</span>
3198
3316
  <span class="cline-any cline-no">&nbsp;</span>
3199
3317
  <span class="cline-any cline-neutral">&nbsp;</span>
3200
3318
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -3204,7 +3322,7 @@
3204
3322
  <span class="cline-any cline-no">&nbsp;</span>
3205
3323
  <span class="cline-any cline-neutral">&nbsp;</span>
3206
3324
  <span class="cline-any cline-neutral">&nbsp;</span>
3207
- <span class="cline-any cline-yes">206x</span>
3325
+ <span class="cline-any cline-yes">216x</span>
3208
3326
  <span class="cline-any cline-neutral">&nbsp;</span>
3209
3327
  <span class="cline-any cline-neutral">&nbsp;</span>
3210
3328
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -3276,7 +3394,7 @@
3276
3394
  <span class="cline-any cline-neutral">&nbsp;</span>
3277
3395
  <span class="cline-any cline-neutral">&nbsp;</span>
3278
3396
  <span class="cline-any cline-neutral">&nbsp;</span>
3279
- <span class="cline-any cline-yes">115x</span>
3397
+ <span class="cline-any cline-yes">122x</span>
3280
3398
  <span class="cline-any cline-yes">2x</span>
3281
3399
  <span class="cline-any cline-no">&nbsp;</span>
3282
3400
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -3298,35 +3416,35 @@
3298
3416
  <span class="cline-any cline-neutral">&nbsp;</span>
3299
3417
  <span class="cline-any cline-neutral">&nbsp;</span>
3300
3418
  <span class="cline-any cline-neutral">&nbsp;</span>
3301
- <span class="cline-any cline-yes">115x</span>
3302
- <span class="cline-any cline-yes">115x</span>
3419
+ <span class="cline-any cline-yes">122x</span>
3420
+ <span class="cline-any cline-yes">122x</span>
3303
3421
  <span class="cline-any cline-neutral">&nbsp;</span>
3304
- <span class="cline-any cline-yes">115x</span>
3422
+ <span class="cline-any cline-yes">122x</span>
3305
3423
  <span class="cline-any cline-yes">35x</span>
3306
3424
  <span class="cline-any cline-yes">74x</span>
3307
3425
  <span class="cline-any cline-neutral">&nbsp;</span>
3308
3426
  <span class="cline-any cline-neutral">&nbsp;</span>
3309
3427
  <span class="cline-any cline-neutral">&nbsp;</span>
3310
3428
  <span class="cline-any cline-neutral">&nbsp;</span>
3311
- <span class="cline-any cline-yes">115x</span>
3312
- <span class="cline-any cline-yes">92x</span>
3313
- <span class="cline-any cline-yes">92x</span>
3314
- <span class="cline-any cline-yes">264x</span>
3429
+ <span class="cline-any cline-yes">122x</span>
3430
+ <span class="cline-any cline-yes">99x</span>
3431
+ <span class="cline-any cline-yes">99x</span>
3432
+ <span class="cline-any cline-yes">275x</span>
3315
3433
  <span class="cline-any cline-neutral">&nbsp;</span>
3316
3434
  <span class="cline-any cline-neutral">&nbsp;</span>
3317
- <span class="cline-any cline-yes">264x</span>
3318
- <span class="cline-any cline-yes">58x</span>
3435
+ <span class="cline-any cline-yes">275x</span>
3436
+ <span class="cline-any cline-yes">59x</span>
3319
3437
  <span class="cline-any cline-neutral">&nbsp;</span>
3320
3438
  <span class="cline-any cline-neutral">&nbsp;</span>
3321
3439
  <span class="cline-any cline-neutral">&nbsp;</span>
3322
- <span class="cline-any cline-yes">58x</span>
3440
+ <span class="cline-any cline-yes">59x</span>
3323
3441
  <span class="cline-any cline-yes">3x</span>
3324
3442
  <span class="cline-any cline-neutral">&nbsp;</span>
3325
3443
  <span class="cline-any cline-neutral">&nbsp;</span>
3326
3444
  <span class="cline-any cline-neutral">&nbsp;</span>
3327
3445
  <span class="cline-any cline-neutral">&nbsp;</span>
3328
3446
  <span class="cline-any cline-neutral">&nbsp;</span>
3329
- <span class="cline-any cline-yes">55x</span>
3447
+ <span class="cline-any cline-yes">56x</span>
3330
3448
  <span class="cline-any cline-neutral">&nbsp;</span>
3331
3449
  <span class="cline-any cline-neutral">&nbsp;</span>
3332
3450
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -3336,8 +3454,8 @@
3336
3454
  <span class="cline-any cline-neutral">&nbsp;</span>
3337
3455
  <span class="cline-any cline-neutral">&nbsp;</span>
3338
3456
  <span class="cline-any cline-neutral">&nbsp;</span>
3339
- <span class="cline-any cline-yes">264x</span>
3340
- <span class="cline-any cline-yes">264x</span>
3457
+ <span class="cline-any cline-yes">275x</span>
3458
+ <span class="cline-any cline-yes">275x</span>
3341
3459
  <span class="cline-any cline-neutral">&nbsp;</span>
3342
3460
  <span class="cline-any cline-neutral">&nbsp;</span>
3343
3461
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -3351,26 +3469,26 @@
3351
3469
  <span class="cline-any cline-neutral">&nbsp;</span>
3352
3470
  <span class="cline-any cline-neutral">&nbsp;</span>
3353
3471
  <span class="cline-any cline-neutral">&nbsp;</span>
3354
- <span class="cline-any cline-yes">264x</span>
3355
- <span class="cline-any cline-yes">206x</span>
3356
- <span class="cline-any cline-yes">206x</span>
3472
+ <span class="cline-any cline-yes">275x</span>
3473
+ <span class="cline-any cline-yes">216x</span>
3474
+ <span class="cline-any cline-yes">216x</span>
3357
3475
  <span class="cline-any cline-neutral">&nbsp;</span>
3358
3476
  <span class="cline-any cline-neutral">&nbsp;</span>
3359
3477
  <span class="cline-any cline-neutral">&nbsp;</span>
3360
3478
  <span class="cline-any cline-neutral">&nbsp;</span>
3361
- <span class="cline-any cline-yes">206x</span>
3479
+ <span class="cline-any cline-yes">216x</span>
3362
3480
  <span class="cline-any cline-neutral">&nbsp;</span>
3363
3481
  <span class="cline-any cline-neutral">&nbsp;</span>
3364
3482
  <span class="cline-any cline-neutral">&nbsp;</span>
3365
3483
  <span class="cline-any cline-neutral">&nbsp;</span>
3366
- <span class="cline-any cline-yes">206x</span>
3484
+ <span class="cline-any cline-yes">216x</span>
3367
3485
  <span class="cline-any cline-neutral">&nbsp;</span>
3368
3486
  <span class="cline-any cline-neutral">&nbsp;</span>
3369
3487
  <span class="cline-any cline-neutral">&nbsp;</span>
3370
3488
  <span class="cline-any cline-neutral">&nbsp;</span>
3371
3489
  <span class="cline-any cline-neutral">&nbsp;</span>
3372
3490
  <span class="cline-any cline-neutral">&nbsp;</span>
3373
- <span class="cline-any cline-yes">264x</span>
3491
+ <span class="cline-any cline-yes">275x</span>
3374
3492
  <span class="cline-any cline-yes">2x</span>
3375
3493
  <span class="cline-any cline-neutral">&nbsp;</span>
3376
3494
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -3379,7 +3497,7 @@
3379
3497
  <span class="cline-any cline-neutral">&nbsp;</span>
3380
3498
  <span class="cline-any cline-neutral">&nbsp;</span>
3381
3499
  <span class="cline-any cline-neutral">&nbsp;</span>
3382
- <span class="cline-any cline-yes">264x</span>
3500
+ <span class="cline-any cline-yes">275x</span>
3383
3501
  <span class="cline-any cline-neutral">&nbsp;</span>
3384
3502
  <span class="cline-any cline-neutral">&nbsp;</span>
3385
3503
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -3390,7 +3508,7 @@
3390
3508
  <span class="cline-any cline-neutral">&nbsp;</span>
3391
3509
  <span class="cline-any cline-neutral">&nbsp;</span>
3392
3510
  <span class="cline-any cline-neutral">&nbsp;</span>
3393
- <span class="cline-any cline-yes">264x</span>
3511
+ <span class="cline-any cline-yes">275x</span>
3394
3512
  <span class="cline-any cline-yes">5x</span>
3395
3513
  <span class="cline-any cline-neutral">&nbsp;</span>
3396
3514
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -3405,12 +3523,12 @@
3405
3523
  <span class="cline-any cline-neutral">&nbsp;</span>
3406
3524
  <span class="cline-any cline-neutral">&nbsp;</span>
3407
3525
  <span class="cline-any cline-neutral">&nbsp;</span>
3408
- <span class="cline-any cline-yes">115x</span>
3526
+ <span class="cline-any cline-yes">122x</span>
3409
3527
  <span class="cline-any cline-yes">35x</span>
3410
3528
  <span class="cline-any cline-neutral">&nbsp;</span>
3411
3529
  <span class="cline-any cline-yes">74x</span>
3412
3530
  <span class="cline-any cline-yes">29x</span>
3413
- <span class="cline-any cline-yes">235x</span>
3531
+ <span class="cline-any cline-yes">243x</span>
3414
3532
  <span class="cline-any cline-neutral">&nbsp;</span>
3415
3533
  <span class="cline-any cline-neutral">&nbsp;</span>
3416
3534
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -3529,12 +3647,12 @@
3529
3647
  <span class="cline-any cline-neutral">&nbsp;</span>
3530
3648
  <span class="cline-any cline-neutral">&nbsp;</span>
3531
3649
  <span class="cline-any cline-neutral">&nbsp;</span>
3532
- <span class="cline-any cline-yes">115x</span>
3650
+ <span class="cline-any cline-yes">122x</span>
3533
3651
  <span class="cline-any cline-neutral">&nbsp;</span>
3534
- <span class="cline-any cline-yes">115x</span>
3652
+ <span class="cline-any cline-yes">122x</span>
3535
3653
  <span class="cline-any cline-neutral">&nbsp;</span>
3536
- <span class="cline-any cline-yes">230x</span>
3537
- <span class="cline-any cline-yes">230x</span>
3654
+ <span class="cline-any cline-yes">244x</span>
3655
+ <span class="cline-any cline-yes">244x</span>
3538
3656
  <span class="cline-any cline-neutral">&nbsp;</span>
3539
3657
  <span class="cline-any cline-neutral">&nbsp;</span>
3540
3658
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -3547,7 +3665,7 @@
3547
3665
  <span class="cline-any cline-neutral">&nbsp;</span>
3548
3666
  <span class="cline-any cline-neutral">&nbsp;</span>
3549
3667
  <span class="cline-any cline-neutral">&nbsp;</span>
3550
- <span class="cline-any cline-yes">230x</span>
3668
+ <span class="cline-any cline-yes">244x</span>
3551
3669
  <span class="cline-any cline-yes">18x</span>
3552
3670
  <span class="cline-any cline-neutral">&nbsp;</span>
3553
3671
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -3593,7 +3711,7 @@
3593
3711
  <span class="cline-any cline-neutral">&nbsp;</span>
3594
3712
  <span class="cline-any cline-neutral">&nbsp;</span>
3595
3713
  <span class="cline-any cline-neutral">&nbsp;</span>
3596
- <span class="cline-any cline-yes">73x</span>
3714
+ <span class="cline-any cline-yes">80x</span>
3597
3715
  <span class="cline-any cline-neutral">&nbsp;</span>
3598
3716
  <span class="cline-any cline-neutral">&nbsp;</span></td><td class="text"><pre class="prettyprint lang-js">import type { Schema, SchemaType } from "@featurevisor/types";
3599
3717
  import { z } from "zod";
@@ -3648,6 +3766,7 @@ function resolveVariableSchema(
3648
3766
  type?: string;
3649
3767
  items?: unknown;
3650
3768
  properties?: unknown;
3769
+ additionalProperties?: unknown;
3651
3770
  required?: string[];
3652
3771
  enum?: unknown[];
3653
3772
  const?: unknown;
@@ -3666,6 +3785,7 @@ function resolveVariableSchema(
3666
3785
  type?: string;
3667
3786
  items?: unknown;
3668
3787
  properties?: unknown;
3788
+ additionalProperties?: unknown;
3669
3789
  required?: string[];
3670
3790
  enum?: unknown[];
3671
3791
  const?: unknown;
@@ -3686,6 +3806,7 @@ function resolveVariableSchema(
3686
3806
  type?: string;
3687
3807
  items?: unknown;
3688
3808
  properties?: unknown;
3809
+ additionalProperties?: unknown;
3689
3810
  required?: string[];
3690
3811
  enum?: unknown[];
3691
3812
  const?: unknown;
@@ -3730,6 +3851,7 @@ function valueMatchesSchema(
3730
3851
  enum?: unknown[];
3731
3852
  oneOf?: unknown[];
3732
3853
  properties?: Record&lt;string, unknown&gt;;
3854
+ additionalProperties?: unknown;
3733
3855
  required?: string[];
3734
3856
  items?: unknown;
3735
3857
  minimum?: number;
@@ -3792,8 +3914,16 @@ function valueMatchesSchema(
3792
3914
  if (type === "object") {
3793
3915
  if (typeof value !== "object" || value === null || Array.isArray(value)) return false;
3794
3916
  const props = resolved.properties;
3795
- <span class="missing-if-branch" title="if path not taken" >I</span>if (!props || typeof props !== "object") <span class="cstat-no" title="statement not covered" >return true;</span>
3917
+ const additional = resolved.additionalProperties;
3796
3918
  const obj = value as Record&lt;string, unknown&gt;;
3919
+ <span class="missing-if-branch" title="if path not taken" >I</span>if ((!props || typeof props !== "object") &amp;&amp; (<span class="branch-2 cbranch-no" title="branch not covered" >!additional </span>|| <span class="branch-3 cbranch-no" title="branch not covered" >typeof additional !== "object")</span>) {
3920
+ <span class="cstat-no" title="statement not covered" > return true;</span>
3921
+ }
3922
+ <span class="missing-if-branch" title="if path not taken" >I</span>if (!props || typeof props !== "object") {
3923
+ <span class="cstat-no" title="statement not covered" > return Object.keys(obj).every(<span class="fstat-no" title="function not covered" >(k</span>ey) =&gt;</span>
3924
+ <span class="cstat-no" title="statement not covered" > valueMatchesSchema(additional as { [k: string]: unknown }, obj[key], schemasByKey),</span>
3925
+ );
3926
+ }
3797
3927
  const required = new Set(resolved.required || <span class="branch-1 cbranch-no" title="branch not covered" >[])</span>;
3798
3928
  for (const key of required) {
3799
3929
  <span class="missing-if-branch" title="if path not taken" >I</span>if (!Object.prototype.hasOwnProperty.call(obj, key)) <span class="cstat-no" title="statement not covered" >return false;</span>
@@ -3802,9 +3932,15 @@ function valueMatchesSchema(
3802
3932
  }
3803
3933
  for (const key of Object.keys(obj)) {
3804
3934
  const propSchema = props[key];
3805
- <span class="missing-if-branch" title="if path not taken" >I</span>if (!propSchema) <span class="cstat-no" title="statement not covered" >return false;</span>
3806
- <span class="missing-if-branch" title="if path not taken" >I</span>if (!valueMatchesSchema(propSchema as { [k: string]: unknown }, obj[key], schemasByKey))
3935
+ if (propSchema) {
3936
+ <span class="missing-if-branch" title="if path not taken" >I</span>if (!valueMatchesSchema(propSchema as { [k: string]: unknown }, obj[key], schemasByKey))
3937
+ <span class="cstat-no" title="statement not covered" > return false;</span>
3938
+ } else <span class="cstat-no" title="statement not covered" ><span class="missing-if-branch" title="else path not taken" >E</span>if (additional &amp;&amp; typeof additional === "object") {</span>
3939
+ <span class="cstat-no" title="statement not covered" > <span class="missing-if-branch" title="if path not taken" >I</span>if (!valueMatchesSchema(additional as { [k: string]: unknown }, obj[key], schemasByKey))</span>
3940
+ <span class="cstat-no" title="statement not covered" > return false;</span>
3941
+ } else {
3807
3942
  <span class="cstat-no" title="statement not covered" > return false;</span>
3943
+ }
3808
3944
  }
3809
3945
  return true;
3810
3946
  }
@@ -3856,6 +3992,7 @@ function valueDeepEqual(a: unknown, b: unknown): boolean {
3856
3992
  type SchemaLikeForRequired = {
3857
3993
  type?: string;
3858
3994
  properties?: Record&lt;string, unknown&gt;;
3995
+ additionalProperties?: unknown;
3859
3996
  required?: string[];
3860
3997
  items?: unknown;
3861
3998
  schema?: string;
@@ -3922,6 +4059,19 @@ function refineRequiredKeysInSchema(
3922
4059
  }
3923
4060
  }
3924
4061
  }
4062
+ const additionalProperties = (current as { additionalProperties?: unknown }).additionalProperties;
4063
+ if (
4064
+ additionalProperties &amp;&amp;
4065
+ typeof additionalProperties === "object" &amp;&amp;
4066
+ !Array.isArray(additionalProperties)
4067
+ ) {
4068
+ refineRequiredKeysInSchema(
4069
+ additionalProperties as SchemaLikeForRequired,
4070
+ [...pathPrefix, "additionalProperties"],
4071
+ ctx,
4072
+ schemasByKey,
4073
+ );
4074
+ }
3925
4075
  &nbsp;
3926
4076
  if (items &amp;&amp; typeof items === "object" &amp;&amp; !Array.isArray(items)) {
3927
4077
  refineRequiredKeysInSchema(
@@ -4050,6 +4200,7 @@ function refineVariableValueObject(
4050
4200
  projectConfig: ProjectConfig,
4051
4201
  variableSchema: {
4052
4202
  properties?: Record&lt;string, unknown&gt;;
4203
+ additionalProperties?: unknown;
4053
4204
  required?: string[];
4054
4205
  type: string;
4055
4206
  },
@@ -4061,6 +4212,7 @@ function refineVariableValueObject(
4061
4212
  ): void {
4062
4213
  const label = getVariableLabel(variableSchema, variableKey, path);
4063
4214
  const schemaProperties = variableSchema.properties;
4215
+ const additionalProperties = variableSchema.additionalProperties;
4064
4216
  &nbsp;
4065
4217
  if (schemaProperties &amp;&amp; typeof schemaProperties === "object") {
4066
4218
  const requiredKeys =
@@ -4082,8 +4234,18 @@ function refineVariableValueObject(
4082
4234
  &nbsp;
4083
4235
  for (const key of Object.keys(variableValue)) {
4084
4236
  const propSchema = schemaProperties[key];
4085
- <span class="missing-if-branch" title="if path not taken" >I</span>if (!propSchema) {
4086
- <span class="cstat-no" title="statement not covered" > ctx.addIssue({</span>
4237
+ if (!propSchema &amp;&amp; additionalProperties &amp;&amp; typeof additionalProperties === "object") {
4238
+ superRefineVariableValue(
4239
+ projectConfig,
4240
+ additionalProperties as Parameters&lt;typeof superRefineVariableValue&gt;[1],
4241
+ variableValue[key],
4242
+ [...path, key],
4243
+ ctx,
4244
+ key,
4245
+ schemasByKey,
4246
+ );
4247
+ } else if (!propSchema) {
4248
+ ctx.addIssue({
4087
4249
  code: z.ZodIssueCode.custom,
4088
4250
  message: `Unknown property "${key}" in variable "${label}" (not in schema)`,
4089
4251
  path: [...path, key],
@@ -4100,6 +4262,18 @@ function refineVariableValueObject(
4100
4262
  );
4101
4263
  }
4102
4264
  }
4265
+ } else if (additionalProperties &amp;&amp; typeof additionalProperties === "object") {
4266
+ for (const key of Object.keys(variableValue)) {
4267
+ superRefineVariableValue(
4268
+ projectConfig,
4269
+ additionalProperties as Parameters&lt;typeof superRefineVariableValue&gt;[1],
4270
+ variableValue[key],
4271
+ [...path, key],
4272
+ ctx,
4273
+ key,
4274
+ schemasByKey,
4275
+ );
4276
+ }
4103
4277
  } else {
4104
4278
  for (const key of Object.keys(variableValue)) {
4105
4279
  const propValue = variableValue[key];
@@ -4233,13 +4407,13 @@ function superRefineVariableValue(
4233
4407
  &nbsp;
4234
4408
  // string — only string allowed; schema minLength/maxLength/pattern applied when set
4235
4409
  if (expectedType === "string") {
4236
- <span class="missing-if-branch" title="if path not taken" >I</span>if (typeof variableValue !== "string") {
4237
- <span class="cstat-no" title="statement not covered" > ctx.addIssue({</span>
4410
+ if (typeof variableValue !== "string") {
4411
+ ctx.addIssue({
4238
4412
  code: z.ZodIssueCode.custom,
4239
4413
  message: `Variable "${label}" (type string) must be a string; got ${gotType}.`,
4240
4414
  path,
4241
4415
  });
4242
- <span class="cstat-no" title="statement not covered" > return;</span>
4416
+ return;
4243
4417
  }
4244
4418
  &nbsp;
4245
4419
  const strMinLen = (effectiveSchema as { minLength?: number }).minLength;
@@ -4877,6 +5051,7 @@ export function getFeatureZodSchema(
4877
5051
  type: z.union([z.literal("json"), propertyTypeEnum]).optional(),
4878
5052
  items: schemaZodSchema.optional(),
4879
5053
  properties: z.record(schemaZodSchema).optional(),
5054
+ additionalProperties: schemaZodSchema.optional(),
4880
5055
  required: z.array(z.string()).optional(),
4881
5056
  enum: z.array(variableValueZodSchema).optional(),
4882
5057
  const: variableValueZodSchema.optional(),
@@ -4912,7 +5087,7 @@ export function getFeatureZodSchema(
4912
5087
  ctx.addIssue({
4913
5088
  code: z.ZodIssueCode.custom,
4914
5089
  message:
4915
- "Variable schema cannot have both `schema` (reference) and inline properties (`type`, `oneOf`, `properties`, `required`, `items`). Use one or the other.",
5090
+ "Variable schema cannot have both `schema` (reference) and inline properties (`type`, `oneOf`, `properties`, `additionalProperties`, `required`, `items`). Use one or the other.",
4916
5091
  path: [],
4917
5092
  });
4918
5093
  return;
@@ -4921,9 +5096,11 @@ export function getFeatureZodSchema(
4921
5096
  const hasInlineStructure =
4922
5097
  ("type" in variableSchema &amp;&amp; <span class="branch-1 cbranch-no" title="branch not covered" >variableSchema.type != null)</span> ||
4923
5098
  ("properties" in variableSchema &amp;&amp; <span class="branch-3 cbranch-no" title="branch not covered" >variableSchema.properties != null)</span> ||
4924
- ("required" in variableSchema &amp;&amp; <span class="branch-5 cbranch-no" title="branch not covered" >variableSchema.required != null)</span> ||
4925
- ("items" in variableSchema &amp;&amp; <span class="branch-7 cbranch-no" title="branch not covered" >variableSchema.items != null)</span> ||
4926
- ("oneOf" in variableSchema &amp;&amp; <span class="branch-9 cbranch-no" title="branch not covered" >variableSchema.oneOf != null)</span>;
5099
+ ("additionalProperties" in variableSchema &amp;&amp;
5100
+ variableSchema.additionalProperties != null) ||
5101
+ ("required" in variableSchema &amp;&amp; <span class="branch-7 cbranch-no" title="branch not covered" >variableSchema.required != null)</span> ||
5102
+ ("items" in variableSchema &amp;&amp; <span class="branch-9 cbranch-no" title="branch not covered" >variableSchema.items != null)</span> ||
5103
+ ("oneOf" in variableSchema &amp;&amp; <span class="branch-11 cbranch-no" title="branch not covered" >variableSchema.oneOf != null)</span>;
4927
5104
  const hasInlineValidation =
4928
5105
  ("minimum" in variableSchema &amp;&amp; <span class="branch-1 cbranch-no" title="branch not covered" >variableSchema.minimum !== undefined)</span> ||
4929
5106
  ("maximum" in variableSchema &amp;&amp; <span class="branch-3 cbranch-no" title="branch not covered" >variableSchema.maximum !== undefined)</span> ||
@@ -4933,11 +5110,11 @@ export function getFeatureZodSchema(
4933
5110
  ("minItems" in variableSchema &amp;&amp; <span class="branch-11 cbranch-no" title="branch not covered" >variableSchema.minItems !== undefined)</span> ||
4934
5111
  ("maxItems" in variableSchema &amp;&amp; <span class="branch-13 cbranch-no" title="branch not covered" >variableSchema.maxItems !== undefined)</span> ||
4935
5112
  ("uniqueItems" in variableSchema &amp;&amp; <span class="branch-15 cbranch-no" title="branch not covered" >variableSchema.uniqueItems !== undefined)</span>;
4936
- <span class="missing-if-branch" title="if path not taken" >I</span>if (hasInlineStructure) {
4937
- <span class="cstat-no" title="statement not covered" > ctx.addIssue({</span>
5113
+ if (hasInlineStructure) {
5114
+ ctx.addIssue({
4938
5115
  code: z.ZodIssueCode.custom,
4939
5116
  message:
4940
- "When `schema` is set, do not set `type`, `oneOf`, `properties`, `required`, or `items`.",
5117
+ "When `schema` is set, do not set `type`, `oneOf`, `properties`, `additionalProperties`, `required`, or `items`.",
4941
5118
  path: [],
4942
5119
  });
4943
5120
  }
@@ -5368,7 +5545,7 @@ export function getFeatureZodSchema(
5368
5545
  <div class='footer quiet pad2 space-top1 center small'>
5369
5546
  Code coverage generated by
5370
5547
  <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
5371
- at 2026-02-26T22:05:09.172Z
5548
+ at 2026-02-27T20:35:38.828Z
5372
5549
  </div>
5373
5550
  <script src="../prettify.js"></script>
5374
5551
  <script>