@budibase/server 1.4.17 → 1.4.18-alpha.1

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 (250) hide show
  1. package/Dockerfile +2 -0
  2. package/builder/assets/{index.2062efc5.js → index.7bac432b.js} +296 -292
  3. package/builder/assets/index.ffaba7b0.css +6 -0
  4. package/builder/index.html +2 -2
  5. package/coverage/clover.xml +144 -182
  6. package/coverage/coverage-final.json +34 -36
  7. package/coverage/lcov-report/api/controllers/apikeys.js.html +1 -1
  8. package/coverage/lcov-report/api/controllers/automation.js.html +1 -1
  9. package/coverage/lcov-report/api/controllers/backup.js.html +1 -1
  10. package/coverage/lcov-report/api/controllers/cloud.js.html +1 -1
  11. package/coverage/lcov-report/api/controllers/datasource.js.html +1 -1
  12. package/coverage/lcov-report/api/controllers/dev.js.html +1 -1
  13. package/coverage/lcov-report/api/controllers/index.html +9 -24
  14. package/coverage/lcov-report/api/controllers/integration.js.html +2 -2
  15. package/coverage/lcov-report/api/controllers/layout.js.html +1 -1
  16. package/coverage/lcov-report/api/controllers/metadata.js.html +1 -1
  17. package/coverage/lcov-report/api/controllers/migrations.js.html +1 -1
  18. package/coverage/lcov-report/api/controllers/permission.js.html +1 -1
  19. package/coverage/lcov-report/api/controllers/query/index.html +1 -1
  20. package/coverage/lcov-report/api/controllers/query/validation.js.html +1 -1
  21. package/coverage/lcov-report/api/controllers/role.js.html +1 -1
  22. package/coverage/lcov-report/api/controllers/routing.js.html +1 -1
  23. package/coverage/lcov-report/api/controllers/row/external.js.html +1 -1
  24. package/coverage/lcov-report/api/controllers/row/index.html +5 -5
  25. package/coverage/lcov-report/api/controllers/row/internal.js.html +4 -4
  26. package/coverage/lcov-report/api/controllers/row/internalSearch.js.html +1 -1
  27. package/coverage/lcov-report/api/controllers/row/staticFormula.js.html +1 -1
  28. package/coverage/lcov-report/api/controllers/row/utils.js.html +1 -1
  29. package/coverage/lcov-report/api/controllers/script.js.html +1 -1
  30. package/coverage/lcov-report/api/controllers/table/bulkFormula.js.html +1 -1
  31. package/coverage/lcov-report/api/controllers/table/external.js.html +1 -1
  32. package/coverage/lcov-report/api/controllers/table/index.html +1 -1
  33. package/coverage/lcov-report/api/controllers/table/index.js.html +1 -1
  34. package/coverage/lcov-report/api/controllers/templates.js.html +1 -1
  35. package/coverage/lcov-report/api/controllers/user.js.html +1 -1
  36. package/coverage/lcov-report/api/controllers/view/exporters.js.html +1 -1
  37. package/coverage/lcov-report/api/controllers/view/index.html +1 -1
  38. package/coverage/lcov-report/api/controllers/view/index.js.html +1 -1
  39. package/coverage/lcov-report/api/controllers/view/utils.js.html +1 -1
  40. package/coverage/lcov-report/api/controllers/view/viewBuilder.js.html +1 -1
  41. package/coverage/lcov-report/api/controllers/webhook.js.html +1 -1
  42. package/coverage/lcov-report/api/index.html +1 -1
  43. package/coverage/lcov-report/api/index.js.html +1 -1
  44. package/coverage/lcov-report/api/routes/analytics.js.html +2 -2
  45. package/coverage/lcov-report/api/routes/apikeys.js.html +2 -2
  46. package/coverage/lcov-report/api/routes/automation.js.html +2 -2
  47. package/coverage/lcov-report/api/routes/backup.js.html +2 -2
  48. package/coverage/lcov-report/api/routes/cloud.js.html +2 -2
  49. package/coverage/lcov-report/api/routes/component.js.html +2 -2
  50. package/coverage/lcov-report/api/routes/datasource.js.html +2 -2
  51. package/coverage/lcov-report/api/routes/deploy.js.html +2 -2
  52. package/coverage/lcov-report/api/routes/dev.js.html +2 -2
  53. package/coverage/lcov-report/api/routes/index.html +5 -20
  54. package/coverage/lcov-report/api/routes/integration.js.html +2 -2
  55. package/coverage/lcov-report/api/routes/layout.js.html +2 -2
  56. package/coverage/lcov-report/api/routes/metadata.js.html +2 -2
  57. package/coverage/lcov-report/api/routes/migrations.js.html +2 -2
  58. package/coverage/lcov-report/api/routes/permission.js.html +2 -2
  59. package/coverage/lcov-report/api/routes/query.js.html +2 -2
  60. package/coverage/lcov-report/api/routes/role.js.html +2 -2
  61. package/coverage/lcov-report/api/routes/routing.js.html +2 -2
  62. package/coverage/lcov-report/api/routes/screen.js.html +2 -2
  63. package/coverage/lcov-report/api/routes/script.js.html +2 -2
  64. package/coverage/lcov-report/api/routes/table.js.html +2 -2
  65. package/coverage/lcov-report/api/routes/templates.js.html +2 -2
  66. package/coverage/lcov-report/api/routes/user.js.html +2 -2
  67. package/coverage/lcov-report/api/routes/utils/index.html +1 -1
  68. package/coverage/lcov-report/api/routes/utils/validators.js.html +1 -1
  69. package/coverage/lcov-report/api/routes/view.js.html +2 -2
  70. package/coverage/lcov-report/api/routes/webhook.js.html +2 -2
  71. package/coverage/lcov-report/automations/actions.js.html +1 -1
  72. package/coverage/lcov-report/automations/automationUtils.js.html +1 -1
  73. package/coverage/lcov-report/automations/bullboard.js.html +1 -1
  74. package/coverage/lcov-report/automations/index.html +1 -1
  75. package/coverage/lcov-report/automations/index.js.html +1 -1
  76. package/coverage/lcov-report/automations/steps/bash.js.html +1 -1
  77. package/coverage/lcov-report/automations/steps/delay.js.html +1 -1
  78. package/coverage/lcov-report/automations/steps/discord.js.html +1 -1
  79. package/coverage/lcov-report/automations/steps/executeQuery.js.html +1 -1
  80. package/coverage/lcov-report/automations/steps/executeScript.js.html +1 -1
  81. package/coverage/lcov-report/automations/steps/filter.js.html +1 -1
  82. package/coverage/lcov-report/automations/steps/index.html +1 -1
  83. package/coverage/lcov-report/automations/steps/integromat.js.html +1 -1
  84. package/coverage/lcov-report/automations/steps/loop.js.html +1 -1
  85. package/coverage/lcov-report/automations/steps/outgoingWebhook.js.html +1 -1
  86. package/coverage/lcov-report/automations/steps/queryRows.js.html +1 -1
  87. package/coverage/lcov-report/automations/steps/sendSmtpEmail.js.html +52 -4
  88. package/coverage/lcov-report/automations/steps/serverLog.js.html +1 -1
  89. package/coverage/lcov-report/automations/steps/slack.js.html +1 -1
  90. package/coverage/lcov-report/automations/steps/updateRow.js.html +1 -1
  91. package/coverage/lcov-report/automations/steps/utils.js.html +1 -1
  92. package/coverage/lcov-report/automations/steps/zapier.js.html +1 -1
  93. package/coverage/lcov-report/automations/triggerInfo/app.js.html +1 -1
  94. package/coverage/lcov-report/automations/triggerInfo/cron.js.html +1 -1
  95. package/coverage/lcov-report/automations/triggerInfo/index.html +1 -1
  96. package/coverage/lcov-report/automations/triggerInfo/index.js.html +1 -1
  97. package/coverage/lcov-report/automations/triggerInfo/rowDeleted.js.html +1 -1
  98. package/coverage/lcov-report/automations/triggerInfo/rowSaved.js.html +1 -1
  99. package/coverage/lcov-report/automations/triggerInfo/rowUpdated.js.html +1 -1
  100. package/coverage/lcov-report/automations/triggerInfo/webhook.js.html +1 -1
  101. package/coverage/lcov-report/automations/triggers.js.html +1 -1
  102. package/coverage/lcov-report/constants/index.html +1 -1
  103. package/coverage/lcov-report/constants/index.js.html +1 -1
  104. package/coverage/lcov-report/constants/layouts.js.html +1 -1
  105. package/coverage/lcov-report/constants/screens.js.html +1 -1
  106. package/coverage/lcov-report/db/inMemoryView.js.html +1 -1
  107. package/coverage/lcov-report/db/index.html +5 -5
  108. package/coverage/lcov-report/db/index.js.html +4 -4
  109. package/coverage/lcov-report/db/linkedRows/LinkController.js.html +1 -1
  110. package/coverage/lcov-report/db/linkedRows/index.html +1 -1
  111. package/coverage/lcov-report/db/linkedRows/index.js.html +11 -11
  112. package/coverage/lcov-report/db/linkedRows/linkUtils.js.html +7 -7
  113. package/coverage/lcov-report/db/newid.js.html +1 -1
  114. package/coverage/lcov-report/db/utils.js.html +1 -1
  115. package/coverage/lcov-report/events/AutomationEmitter.js.html +1 -1
  116. package/coverage/lcov-report/events/index.html +1 -1
  117. package/coverage/lcov-report/events/index.js.html +1 -1
  118. package/coverage/lcov-report/events/utils.js.html +1 -1
  119. package/coverage/lcov-report/index.html +34 -34
  120. package/coverage/lcov-report/integrations/tests/TestConfiguration.js.html +1 -1
  121. package/coverage/lcov-report/integrations/tests/index.html +1 -1
  122. package/coverage/lcov-report/middleware/appInfo.js.html +1 -1
  123. package/coverage/lcov-report/middleware/builder.js.html +1 -1
  124. package/coverage/lcov-report/middleware/currentapp.js.html +1 -1
  125. package/coverage/lcov-report/middleware/index.html +1 -1
  126. package/coverage/lcov-report/middleware/joi-validator.js.html +1 -1
  127. package/coverage/lcov-report/middleware/publicApi.js.html +1 -1
  128. package/coverage/lcov-report/middleware/resourceId.js.html +1 -1
  129. package/coverage/lcov-report/middleware/selfhost.js.html +1 -1
  130. package/coverage/lcov-report/middleware/utils.js.html +1 -1
  131. package/coverage/lcov-report/utilities/budibaseDir.js.html +1 -1
  132. package/coverage/lcov-report/utilities/centralPath.js.html +1 -1
  133. package/coverage/lcov-report/utilities/csvParser.js.html +1 -1
  134. package/coverage/lcov-report/utilities/global.js.html +19 -13
  135. package/coverage/lcov-report/utilities/index.html +24 -24
  136. package/coverage/lcov-report/utilities/index.js.html +1 -1
  137. package/coverage/lcov-report/utilities/queue/inMemoryQueue.js.html +1 -1
  138. package/coverage/lcov-report/utilities/queue/index.html +1 -1
  139. package/coverage/lcov-report/utilities/routing/index.html +1 -1
  140. package/coverage/lcov-report/utilities/routing/index.js.html +1 -1
  141. package/coverage/lcov-report/utilities/rowProcessor/index.html +1 -1
  142. package/coverage/lcov-report/utilities/rowProcessor/index.js.html +12 -12
  143. package/coverage/lcov-report/utilities/rowProcessor/utils.js.html +8 -8
  144. package/coverage/lcov-report/utilities/scriptRunner.js.html +1 -1
  145. package/coverage/lcov-report/utilities/security.js.html +1 -1
  146. package/coverage/lcov-report/utilities/statusCodes.js.html +1 -1
  147. package/coverage/lcov-report/utilities/usageQuota/index.html +1 -1
  148. package/coverage/lcov-report/utilities/usageQuota/rows.js.html +1 -1
  149. package/coverage/lcov-report/utilities/usageQuota/usageQuoteReset.js.html +1 -1
  150. package/coverage/lcov-report/utilities/users.js.html +21 -12
  151. package/coverage/lcov-report/utilities/workerRequests.js.html +33 -3
  152. package/coverage/lcov.info +236 -290
  153. package/dist/api/controllers/application.js +2 -0
  154. package/dist/api/controllers/auth.js +58 -49
  155. package/dist/api/controllers/integration.js +1 -1
  156. package/dist/api/controllers/row/internal.js +1 -1
  157. package/dist/api/routes/analytics.js +1 -1
  158. package/dist/api/routes/apikeys.js +1 -1
  159. package/dist/api/routes/auth.js +31 -4
  160. package/dist/api/routes/automation.js +1 -1
  161. package/dist/api/routes/backup.js +1 -1
  162. package/dist/api/routes/cloud.js +1 -1
  163. package/dist/api/routes/component.js +1 -1
  164. package/dist/api/routes/datasource.js +1 -1
  165. package/dist/api/routes/deploy.js +1 -1
  166. package/dist/api/routes/dev.js +1 -1
  167. package/dist/api/routes/integration.js +1 -1
  168. package/dist/api/routes/layout.js +1 -1
  169. package/dist/api/routes/metadata.js +1 -1
  170. package/dist/api/routes/migrations.js +1 -1
  171. package/dist/api/routes/permission.js +1 -1
  172. package/dist/api/routes/public/applications.js +5 -0
  173. package/dist/api/routes/public/queries.js +2 -0
  174. package/dist/api/routes/public/rows.js +5 -0
  175. package/dist/api/routes/public/tables.js +5 -0
  176. package/dist/api/routes/public/users.js +5 -0
  177. package/dist/api/routes/query.js +1 -1
  178. package/dist/api/routes/role.js +1 -1
  179. package/dist/api/routes/routing.js +1 -1
  180. package/dist/api/routes/screen.js +1 -1
  181. package/dist/api/routes/script.js +1 -1
  182. package/dist/api/routes/table.js +1 -1
  183. package/dist/api/routes/templates.js +1 -1
  184. package/dist/api/routes/user.js +1 -1
  185. package/dist/api/routes/view.js +1 -1
  186. package/dist/api/routes/webhook.js +1 -1
  187. package/dist/automations/steps/sendSmtpEmail.js +10 -2
  188. package/dist/db/index.js +1 -1
  189. package/dist/middleware/authorized.js +2 -2
  190. package/dist/migrations/functions/usageQuotas/syncApps.js +2 -1
  191. package/dist/migrations/functions/usageQuotas/syncRows.js +2 -1
  192. package/dist/package.json +6 -6
  193. package/dist/tsconfig.build.tsbuildinfo +1 -1
  194. package/dist/utilities/global.js +6 -3
  195. package/dist/utilities/users.js +4 -2
  196. package/dist/utilities/workerRequests.js +3 -1
  197. package/package.json +7 -7
  198. package/scripts/dev/manage.js +1 -0
  199. package/specs/openapi.json +22 -0
  200. package/specs/openapi.yaml +22 -0
  201. package/src/api/controllers/application.ts +3 -7
  202. package/src/api/controllers/{auth.js → auth.ts} +20 -18
  203. package/src/api/controllers/integration.js +1 -1
  204. package/src/api/controllers/row/internal.js +1 -1
  205. package/src/api/routes/analytics.js +1 -1
  206. package/src/api/routes/apikeys.js +1 -1
  207. package/src/api/routes/auth.ts +8 -0
  208. package/src/api/routes/automation.js +1 -1
  209. package/src/api/routes/backup.js +1 -1
  210. package/src/api/routes/cloud.js +1 -1
  211. package/src/api/routes/component.js +1 -1
  212. package/src/api/routes/datasource.js +1 -1
  213. package/src/api/routes/deploy.js +1 -1
  214. package/src/api/routes/dev.js +1 -1
  215. package/src/api/routes/integration.js +1 -1
  216. package/src/api/routes/layout.js +1 -1
  217. package/src/api/routes/metadata.js +1 -1
  218. package/src/api/routes/migrations.js +1 -1
  219. package/src/api/routes/permission.js +1 -1
  220. package/src/api/routes/public/applications.ts +5 -0
  221. package/src/api/routes/public/queries.ts +2 -0
  222. package/src/api/routes/public/rows.ts +5 -0
  223. package/src/api/routes/public/tables.ts +5 -0
  224. package/src/api/routes/public/users.ts +5 -0
  225. package/src/api/routes/query.js +1 -1
  226. package/src/api/routes/role.js +1 -1
  227. package/src/api/routes/routing.js +1 -1
  228. package/src/api/routes/screen.js +1 -1
  229. package/src/api/routes/script.js +1 -1
  230. package/src/api/routes/table.js +1 -1
  231. package/src/api/routes/templates.js +1 -1
  232. package/src/api/routes/tests/row.spec.js +3 -1
  233. package/src/api/routes/user.js +1 -1
  234. package/src/api/routes/view.js +1 -1
  235. package/src/api/routes/webhook.js +1 -1
  236. package/src/automations/steps/sendSmtpEmail.js +18 -2
  237. package/src/db/index.js +1 -1
  238. package/src/definitions/openapi.ts +134 -447
  239. package/src/middleware/authorized.ts +2 -2
  240. package/src/migrations/functions/usageQuotas/syncApps.ts +2 -1
  241. package/src/migrations/functions/usageQuotas/syncRows.ts +2 -1
  242. package/src/migrations/functions/usageQuotas/tests/syncApps.spec.ts +2 -1
  243. package/src/migrations/functions/usageQuotas/tests/syncRows.spec.ts +2 -1
  244. package/src/utilities/global.js +6 -4
  245. package/src/utilities/users.js +5 -2
  246. package/src/utilities/workerRequests.js +11 -1
  247. package/builder/assets/index.91c8117f.css +0 -6
  248. package/coverage/lcov-report/api/controllers/auth.js.html +0 -292
  249. package/coverage/lcov-report/api/routes/auth.js.html +0 -109
  250. package/src/api/routes/auth.js +0 -8
package/builder/index.html CHANGED
@@ -10,8 +10,8 @@
10
10
  href="https://fonts.googleapis.com/css2?family=Source+Sans+Pro:wght@400;600;700&display=swap"
11
11
  rel="stylesheet"
12
12
  />
13
- <script type="module" crossorigin src="/builder/assets/index.2062efc5.js"></script>
14
- <link rel="stylesheet" href="/builder/assets/index.91c8117f.css">
13
+ <script type="module" crossorigin src="/builder/assets/index.7bac432b.js"></script>
14
+ <link rel="stylesheet" href="/builder/assets/index.ffaba7b0.css">
15
15
  </head>
16
16
  <body id="app">
17
17
 
package/coverage/clover.xml CHANGED
@@ -1,7 +1,7 @@
1
1
  <?xml version="1.0" encoding="UTF-8"?>
2
- <coverage generated="1664205589978" clover="3.2.0">
3
- <project timestamp="1664205589978" name="All files">
4
- <metrics statements="4138" coveredstatements="3019" conditionals="1763" coveredconditionals="967" methods="613" coveredmethods="431" elements="6514" coveredelements="4417" complexity="0" loc="4138" ncloc="4138" packages="22" files="124" classes="124"/>
2
+ <coverage generated="1664215053049" clover="3.2.0">
3
+ <project timestamp="1664215053049" name="All files">
4
+ <metrics statements="4106" coveredstatements="2991" conditionals="1763" coveredconditionals="966" methods="611" coveredmethods="429" elements="6480" coveredelements="4386" complexity="0" loc="4106" ncloc="4106" packages="22" files="122" classes="122"/>
5
5
  <package name="api">
6
6
  <metrics statements="35" coveredstatements="34" conditionals="5" coveredconditionals="2" methods="4" coveredmethods="4"/>
7
7
  <file name="index.js" path="/home/runner/work/budibase/budibase/packages/server/src/api/index.js">
@@ -44,7 +44,7 @@
44
44
  </file>
45
45
  </package>
46
46
  <package name="api.controllers">
47
- <metrics statements="931" coveredstatements="657" conditionals="290" coveredconditionals="130" methods="135" coveredmethods="89"/>
47
+ <metrics statements="899" coveredstatements="630" conditionals="280" coveredconditionals="125" methods="133" coveredmethods="87"/>
48
48
  <file name="apikeys.js" path="/home/runner/work/budibase/budibase/packages/server/src/api/controllers/apikeys.js">
49
49
  <metrics statements="24" coveredstatements="24" conditionals="4" coveredconditionals="2" methods="4" coveredmethods="4"/>
50
50
  <line num="1" count="28" type="stmt"/>
@@ -72,41 +72,6 @@
72
72
  <line num="45" count="1" type="stmt"/>
73
73
  <line num="46" count="1" type="stmt"/>
74
74
  </file>
75
- <file name="auth.js" path="/home/runner/work/budibase/budibase/packages/server/src/api/controllers/auth.js">
76
- <metrics statements="32" coveredstatements="27" conditionals="10" coveredconditionals="5" methods="2" coveredmethods="2"/>
77
- <line num="1" count="28" type="stmt"/>
78
- <line num="2" count="28" type="stmt"/>
79
- <line num="3" count="28" type="stmt"/>
80
- <line num="4" count="28" type="stmt"/>
81
- <line num="5" count="28" type="stmt"/>
82
- <line num="10" count="28" type="stmt"/>
83
- <line num="11" count="1" type="cond" truecount="1" falsecount="1"/>
84
- <line num="12" count="1" type="stmt"/>
85
- <line num="16" count="28" type="stmt"/>
86
- <line num="17" count="1" type="cond" truecount="1" falsecount="1"/>
87
- <line num="24" count="1" type="stmt"/>
88
- <line num="26" count="1" type="stmt"/>
89
- <line num="28" count="1" type="stmt"/>
90
- <line num="30" count="1" type="cond" truecount="1" falsecount="1"/>
91
- <line num="31" count="1" type="stmt"/>
92
- <line num="33" count="1" type="stmt"/>
93
- <line num="34" count="1" type="stmt"/>
94
- <line num="35" count="1" type="stmt"/>
95
- <line num="36" count="1" type="stmt"/>
96
- <line num="38" count="0" type="stmt"/>
97
- <line num="40" count="0" type="stmt"/>
98
- <line num="47" count="1" type="cond" truecount="1" falsecount="1"/>
99
- <line num="48" count="0" type="stmt"/>
100
- <line num="51" count="1" type="cond" truecount="1" falsecount="1"/>
101
- <line num="52" count="1" type="stmt"/>
102
- <line num="56" count="1" type="stmt"/>
103
- <line num="57" count="1" type="stmt"/>
104
- <line num="58" count="1" type="stmt"/>
105
- <line num="60" count="0" type="stmt"/>
106
- <line num="62" count="1" type="stmt"/>
107
- <line num="65" count="0" type="stmt"/>
108
- <line num="68" count="1" type="stmt"/>
109
- </file>
110
75
  <file name="automation.js" path="/home/runner/work/budibase/budibase/packages/server/src/api/controllers/automation.js">
111
76
  <metrics statements="131" coveredstatements="110" conditionals="40" coveredconditionals="25" methods="24" coveredmethods="20"/>
112
77
  <line num="1" count="44" type="stmt"/>
@@ -1047,7 +1012,7 @@
1047
1012
  </file>
1048
1013
  </package>
1049
1014
  <package name="api.controllers.row">
1050
- <metrics statements="665" coveredstatements="432" conditionals="315" coveredconditionals="150" methods="94" coveredmethods="58"/>
1015
+ <metrics statements="665" coveredstatements="432" conditionals="317" coveredconditionals="152" methods="94" coveredmethods="58"/>
1051
1016
  <file name="external.js" path="/home/runner/work/budibase/budibase/packages/server/src/api/controllers/row/external.js">
1052
1017
  <metrics statements="120" coveredstatements="18" conditionals="54" coveredconditionals="0" methods="15" coveredmethods="0"/>
1053
1018
  <line num="6" count="45" type="stmt"/>
@@ -1172,7 +1137,7 @@
1172
1137
  <line num="252" count="0" type="stmt"/>
1173
1138
  </file>
1174
1139
  <file name="internal.js" path="/home/runner/work/budibase/budibase/packages/server/src/api/controllers/row/internal.js">
1175
- <metrics statements="221" coveredstatements="192" conditionals="68" coveredconditionals="44" methods="26" coveredmethods="24"/>
1140
+ <metrics statements="221" coveredstatements="192" conditionals="70" coveredconditionals="46" methods="26" coveredmethods="24"/>
1176
1141
  <line num="1" count="45" type="stmt"/>
1177
1142
  <line num="8" count="45" type="stmt"/>
1178
1143
  <line num="9" count="45" type="stmt"/>
@@ -1324,7 +1289,7 @@
1324
1289
  <line num="330" count="2" type="stmt"/>
1325
1290
  <line num="331" count="2" type="stmt"/>
1326
1291
  <line num="334" count="45" type="stmt"/>
1327
- <line num="336" count="4" type="cond" truecount="1" falsecount="1"/>
1292
+ <line num="336" count="4" type="cond" truecount="3" falsecount="1"/>
1328
1293
  <line num="337" count="0" type="stmt"/>
1329
1294
  <line num="340" count="4" type="stmt"/>
1330
1295
  <line num="341" count="4" type="stmt"/>
@@ -2276,7 +2241,7 @@
2276
2241
  </file>
2277
2242
  </package>
2278
2243
  <package name="api.routes">
2279
- <metrics statements="191" coveredstatements="184" conditionals="4" coveredconditionals="2" methods="1" coveredmethods="1"/>
2244
+ <metrics statements="186" coveredstatements="179" conditionals="4" coveredconditionals="2" methods="1" coveredmethods="1"/>
2280
2245
  <file name="analytics.js" path="/home/runner/work/budibase/budibase/packages/server/src/api/routes/analytics.js">
2281
2246
  <metrics statements="6" coveredstatements="6" conditionals="0" coveredconditionals="0" methods="0" coveredmethods="0"/>
2282
2247
  <line num="1" count="28" type="stmt"/>
@@ -2296,14 +2261,6 @@
2296
2261
  <line num="8" count="28" type="stmt"/>
2297
2262
  <line num="12" count="28" type="stmt"/>
2298
2263
  </file>
2299
- <file name="auth.js" path="/home/runner/work/budibase/budibase/packages/server/src/api/routes/auth.js">
2300
- <metrics statements="5" coveredstatements="5" conditionals="0" coveredconditionals="0" methods="0" coveredmethods="0"/>
2301
- <line num="1" count="28" type="stmt"/>
2302
- <line num="2" count="28" type="stmt"/>
2303
- <line num="4" count="28" type="stmt"/>
2304
- <line num="6" count="28" type="stmt"/>
2305
- <line num="8" count="28" type="stmt"/>
2306
- </file>
2307
2264
  <file name="automation.js" path="/home/runner/work/budibase/budibase/packages/server/src/api/routes/automation.js">
2308
2265
  <metrics statements="10" coveredstatements="10" conditionals="0" coveredconditionals="0" methods="0" coveredmethods="0"/>
2309
2266
  <line num="1" count="28" type="stmt"/>
@@ -3004,15 +2961,15 @@
3004
2961
  <line num="1" count="45" type="stmt"/>
3005
2962
  <line num="2" count="45" type="stmt"/>
3006
2963
  <line num="4" count="45" type="stmt"/>
3007
- <line num="51" count="45" type="stmt"/>
3008
- <line num="52" count="0" type="stmt"/>
3009
- <line num="53" count="0" type="cond" truecount="0" falsecount="2"/>
3010
- <line num="54" count="0" type="stmt"/>
3011
- <line num="56" count="0" type="cond" truecount="0" falsecount="2"/>
3012
- <line num="57" count="0" type="stmt"/>
3013
- <line num="58" count="0" type="stmt"/>
3014
- <line num="59" count="0" type="stmt"/>
3015
- <line num="64" count="0" type="stmt"/>
2964
+ <line num="59" count="45" type="stmt"/>
2965
+ <line num="60" count="0" type="stmt"/>
2966
+ <line num="61" count="0" type="cond" truecount="0" falsecount="2"/>
2967
+ <line num="62" count="0" type="stmt"/>
2968
+ <line num="64" count="0" type="cond" truecount="0" falsecount="2"/>
2969
+ <line num="65" count="0" type="stmt"/>
2970
+ <line num="66" count="0" type="stmt"/>
2971
+ <line num="75" count="0" type="stmt"/>
2972
+ <line num="80" count="0" type="stmt"/>
3016
2973
  </file>
3017
2974
  <file name="serverLog.js" path="/home/runner/work/budibase/budibase/packages/server/src/automations/steps/serverLog.js">
3018
2975
  <metrics statements="5" coveredstatements="2" conditionals="0" coveredconditionals="0" methods="1" coveredmethods="0"/>
@@ -3174,7 +3131,7 @@
3174
3131
  </file>
3175
3132
  </package>
3176
3133
  <package name="db">
3177
- <metrics statements="145" coveredstatements="115" conditionals="59" coveredconditionals="19" methods="38" coveredmethods="27"/>
3134
+ <metrics statements="145" coveredstatements="115" conditionals="61" coveredconditionals="21" methods="38" coveredmethods="27"/>
3178
3135
  <file name="inMemoryView.js" path="/home/runner/work/budibase/budibase/packages/server/src/db/inMemoryView.js">
3179
3136
  <metrics statements="23" coveredstatements="4" conditionals="8" coveredconditionals="0" methods="4" coveredmethods="0"/>
3180
3137
  <line num="1" count="45" type="stmt"/>
@@ -3202,12 +3159,12 @@
3202
3159
  <line num="47" count="0" type="stmt"/>
3203
3160
  </file>
3204
3161
  <file name="index.js" path="/home/runner/work/budibase/budibase/packages/server/src/db/index.js">
3205
- <metrics statements="8" coveredstatements="8" conditionals="2" coveredconditionals="1" methods="1" coveredmethods="1"/>
3162
+ <metrics statements="8" coveredstatements="8" conditionals="4" coveredconditionals="3" methods="1" coveredmethods="1"/>
3206
3163
  <line num="1" count="45" type="stmt"/>
3207
3164
  <line num="2" count="45" type="stmt"/>
3208
3165
  <line num="4" count="45" type="stmt"/>
3209
3166
  <line num="5" count="72" type="stmt"/>
3210
- <line num="10" count="72" type="cond" truecount="1" falsecount="1"/>
3167
+ <line num="10" count="72" type="cond" truecount="3" falsecount="1"/>
3211
3168
  <line num="11" count="72" type="stmt"/>
3212
3169
  <line num="12" count="72" type="stmt"/>
3213
3170
  <line num="15" count="72" type="stmt"/>
@@ -3547,9 +3504,9 @@
3547
3504
  <line num="136" count="1" type="stmt"/>
3548
3505
  <line num="138" count="0" type="stmt"/>
3549
3506
  <line num="149" count="45" type="stmt"/>
3550
- <line num="150" count="124" type="stmt"/>
3551
- <line num="151" count="124" type="cond" truecount="2" falsecount="0"/>
3552
- <line num="152" count="94" type="stmt"/>
3507
+ <line num="150" count="125" type="stmt"/>
3508
+ <line num="151" count="125" type="cond" truecount="2" falsecount="0"/>
3509
+ <line num="152" count="95" type="stmt"/>
3553
3510
  <line num="155" count="30" type="stmt"/>
3554
3511
  <line num="156" count="25" type="stmt"/>
3555
3512
  <line num="159" count="30" type="stmt"/>
@@ -3567,12 +3524,12 @@
3567
3524
  <line num="174" count="18" type="stmt"/>
3568
3525
  <line num="179" count="30" type="stmt"/>
3569
3526
  <line num="188" count="45" type="stmt"/>
3570
- <line num="190" count="39" type="stmt"/>
3571
- <line num="191" count="39" type="stmt"/>
3572
- <line num="193" count="47" type="stmt"/>
3573
- <line num="194" count="47" type="stmt"/>
3574
- <line num="195" count="133" type="cond" truecount="4" falsecount="0"/>
3575
- <line num="196" count="124" type="stmt"/>
3527
+ <line num="190" count="40" type="stmt"/>
3528
+ <line num="191" count="40" type="stmt"/>
3529
+ <line num="193" count="48" type="stmt"/>
3530
+ <line num="194" count="48" type="stmt"/>
3531
+ <line num="195" count="138" type="cond" truecount="4" falsecount="0"/>
3532
+ <line num="196" count="129" type="stmt"/>
3576
3533
  <line num="198" count="9" type="stmt"/>
3577
3534
  <line num="199" count="9" type="stmt"/>
3578
3535
  <line num="200" count="9" type="cond" truecount="1" falsecount="1"/>
@@ -3582,7 +3539,7 @@
3582
3539
  <line num="204" count="8" type="stmt"/>
3583
3540
  <line num="206" count="9" type="stmt"/>
3584
3541
  <line num="208" count="9" type="stmt"/>
3585
- <line num="211" count="39" type="stmt"/>
3542
+ <line num="211" count="40" type="stmt"/>
3586
3543
  </file>
3587
3544
  <file name="linkUtils.js" path="/home/runner/work/budibase/budibase/packages/server/src/db/linkedRows/linkUtils.js">
3588
3545
  <metrics statements="54" coveredstatements="50" conditionals="26" coveredconditionals="20" methods="13" coveredmethods="13"/>
@@ -3620,14 +3577,14 @@
3620
3577
  <line num="80" count="30" type="stmt"/>
3621
3578
  <line num="81" count="33" type="stmt"/>
3622
3579
  <line num="85" count="45" type="stmt"/>
3623
- <line num="86" count="124" type="stmt"/>
3624
- <line num="87" count="344" type="stmt"/>
3580
+ <line num="86" count="125" type="stmt"/>
3581
+ <line num="87" count="349" type="stmt"/>
3625
3582
  <line num="88" count="53" type="stmt"/>
3626
3583
  <line num="91" count="45" type="stmt"/>
3627
- <line num="92" count="76" type="stmt"/>
3628
- <line num="93" count="76" type="stmt"/>
3629
- <line num="94" count="76" type="cond" truecount="2" falsecount="0"/>
3630
- <line num="95" count="49" type="stmt"/>
3584
+ <line num="92" count="77" type="stmt"/>
3585
+ <line num="93" count="77" type="stmt"/>
3586
+ <line num="94" count="77" type="cond" truecount="2" falsecount="0"/>
3587
+ <line num="95" count="50" type="stmt"/>
3631
3588
  <line num="97" count="27" type="stmt"/>
3632
3589
  <line num="98" count="27" type="cond" truecount="1" falsecount="1"/>
3633
3590
  <line num="99" count="27" type="stmt"/>
@@ -3913,7 +3870,7 @@
3913
3870
  </file>
3914
3871
  </package>
3915
3872
  <package name="utilities">
3916
- <metrics statements="358" coveredstatements="259" conditionals="152" coveredconditionals="92" methods="70" coveredmethods="49"/>
3873
+ <metrics statements="363" coveredstatements="263" conditionals="158" coveredconditionals="92" methods="70" coveredmethods="49"/>
3917
3874
  <file name="budibaseDir.js" path="/home/runner/work/budibase/budibase/packages/server/src/utilities/budibaseDir.js">
3918
3875
  <metrics statements="2" coveredstatements="2" conditionals="0" coveredconditionals="0" methods="0" coveredmethods="0"/>
3919
3876
  <line num="1" count="47" type="stmt"/>
@@ -4003,7 +3960,7 @@
4003
3960
  <line num="140" count="46" type="stmt"/>
4004
3961
  </file>
4005
3962
  <file name="global.js" path="/home/runner/work/budibase/budibase/packages/server/src/utilities/global.js">
4006
- <metrics statements="68" coveredstatements="54" conditionals="37" coveredconditionals="28" methods="16" coveredmethods="11"/>
3963
+ <metrics statements="70" coveredstatements="55" conditionals="41" coveredconditionals="27" methods="16" coveredmethods="11"/>
4007
3964
  <line num="4" count="51" type="stmt"/>
4008
3965
  <line num="5" count="51" type="stmt"/>
4009
3966
  <line num="6" count="51" type="stmt"/>
@@ -4031,47 +3988,49 @@
4031
3988
  <line num="38" count="0" type="stmt"/>
4032
3989
  <line num="41" count="240" type="stmt"/>
4033
3990
  <line num="42" count="240" type="stmt"/>
4034
- <line num="46" count="0" type="stmt"/>
3991
+ <line num="46" count="0" type="cond" truecount="0" falsecount="4"/>
4035
3992
  <line num="47" count="0" type="stmt"/>
4036
3993
  <line num="49" count="0" type="stmt"/>
4037
- <line num="53" count="236" type="cond" truecount="1" falsecount="1"/>
4038
- <line num="54" count="236" type="stmt"/>
4039
- <line num="56" count="236" type="stmt"/>
4040
- <line num="57" count="236" type="cond" truecount="3" falsecount="1"/>
4041
- <line num="58" count="0" type="stmt"/>
4042
- <line num="61" count="236" type="stmt"/>
4043
- <line num="64" count="51" type="stmt"/>
4044
- <line num="67" count="234" type="stmt"/>
3994
+ <line num="50" count="0" type="stmt"/>
3995
+ <line num="54" count="236" type="cond" truecount="1" falsecount="1"/>
3996
+ <line num="55" count="236" type="stmt"/>
3997
+ <line num="57" count="236" type="stmt"/>
3998
+ <line num="58" count="236" type="cond" truecount="3" falsecount="1"/>
3999
+ <line num="59" count="0" type="stmt"/>
4000
+ <line num="62" count="236" type="stmt"/>
4001
+ <line num="65" count="51" type="stmt"/>
4045
4002
  <line num="68" count="234" type="stmt"/>
4046
- <line num="71" count="51" type="stmt"/>
4047
- <line num="72" count="2" type="stmt"/>
4003
+ <line num="69" count="234" type="stmt"/>
4004
+ <line num="72" count="51" type="stmt"/>
4048
4005
  <line num="73" count="2" type="stmt"/>
4049
- <line num="76" count="51" type="stmt"/>
4050
- <line num="77" count="2" type="stmt"/>
4006
+ <line num="74" count="2" type="stmt"/>
4007
+ <line num="77" count="51" type="stmt"/>
4051
4008
  <line num="78" count="2" type="stmt"/>
4052
- <line num="81" count="51" type="cond" truecount="1" falsecount="0"/>
4053
- <line num="82" count="32" type="stmt"/>
4054
- <line num="83" count="32" type="stmt"/>
4055
- <line num="85" count="32" type="cond" truecount="2" falsecount="0"/>
4056
- <line num="86" count="30" type="stmt"/>
4057
- <line num="87" count="30" type="stmt"/>
4058
- <line num="88" count="0" type="stmt"/>
4059
- <line num="91" count="2" type="stmt"/>
4060
- <line num="97" count="7" type="stmt"/>
4061
- <line num="99" count="32" type="stmt"/>
4062
- <line num="100" count="7" type="stmt"/>
4009
+ <line num="79" count="2" type="stmt"/>
4010
+ <line num="80" count="2" type="stmt"/>
4011
+ <line num="83" count="51" type="cond" truecount="1" falsecount="0"/>
4012
+ <line num="84" count="32" type="stmt"/>
4013
+ <line num="85" count="32" type="stmt"/>
4014
+ <line num="87" count="32" type="cond" truecount="2" falsecount="0"/>
4015
+ <line num="88" count="30" type="stmt"/>
4016
+ <line num="89" count="30" type="stmt"/>
4017
+ <line num="90" count="0" type="stmt"/>
4018
+ <line num="93" count="2" type="stmt"/>
4019
+ <line num="99" count="7" type="stmt"/>
4020
+ <line num="101" count="32" type="stmt"/>
4063
4021
  <line num="102" count="7" type="stmt"/>
4064
- <line num="103" count="7" type="stmt"/>
4065
4022
  <line num="104" count="7" type="stmt"/>
4066
- <line num="106" count="32" type="cond" truecount="1" falsecount="1"/>
4067
- <line num="107" count="0" type="stmt"/>
4068
- <line num="110" count="32" type="stmt"/>
4069
- <line num="113" count="51" type="stmt"/>
4070
- <line num="114" count="30" type="stmt"/>
4071
- <line num="115" count="30" type="stmt"/>
4072
- <line num="116" count="0" type="stmt"/>
4073
- <line num="117" count="0" type="cond" truecount="0" falsecount="2"/>
4074
- <line num="119" count="0" type="stmt"/>
4023
+ <line num="105" count="7" type="stmt"/>
4024
+ <line num="106" count="7" type="stmt"/>
4025
+ <line num="108" count="32" type="cond" truecount="1" falsecount="1"/>
4026
+ <line num="109" count="0" type="stmt"/>
4027
+ <line num="112" count="32" type="stmt"/>
4028
+ <line num="115" count="51" type="stmt"/>
4029
+ <line num="116" count="30" type="stmt"/>
4030
+ <line num="117" count="30" type="stmt"/>
4031
+ <line num="118" count="0" type="stmt"/>
4032
+ <line num="119" count="0" type="cond" truecount="0" falsecount="2"/>
4033
+ <line num="121" count="0" type="stmt"/>
4075
4034
  </file>
4076
4035
  <file name="index.js" path="/home/runner/work/budibase/budibase/packages/server/src/utilities/index.js">
4077
4036
  <metrics statements="80" coveredstatements="65" conditionals="32" coveredconditionals="17" methods="17" coveredmethods="16"/>
@@ -4208,31 +4167,34 @@
4208
4167
  <line num="1" count="0" type="stmt"/>
4209
4168
  </file>
4210
4169
  <file name="users.js" path="/home/runner/work/budibase/budibase/packages/server/src/utilities/users.js">
4211
- <metrics statements="24" coveredstatements="19" conditionals="8" coveredconditionals="6" methods="2" coveredmethods="2"/>
4170
+ <metrics statements="27" coveredstatements="22" conditionals="10" coveredconditionals="7" methods="2" coveredmethods="2"/>
4212
4171
  <line num="1" count="46" type="stmt"/>
4213
4172
  <line num="2" count="46" type="stmt"/>
4214
4173
  <line num="3" count="46" type="stmt"/>
4215
4174
  <line num="4" count="46" type="stmt"/>
4216
- <line num="6" count="46" type="stmt"/>
4217
- <line num="7" count="2" type="stmt"/>
4175
+ <line num="5" count="46" type="stmt"/>
4176
+ <line num="7" count="46" type="stmt"/>
4177
+ <line num="8" count="2" type="stmt"/>
4218
4178
  <line num="9" count="2" type="stmt"/>
4219
- <line num="11" count="2" type="stmt"/>
4179
+ <line num="10" count="2" type="stmt"/>
4220
4180
  <line num="12" count="2" type="stmt"/>
4221
- <line num="15" count="2" type="stmt"/>
4181
+ <line num="13" count="2" type="stmt"/>
4222
4182
  <line num="16" count="2" type="stmt"/>
4223
- <line num="18" count="2" type="stmt"/>
4224
- <line num="27" count="46" type="stmt"/>
4225
- <line num="28" count="2" type="cond" truecount="1" falsecount="1"/>
4226
- <line num="29" count="0" type="stmt"/>
4227
- <line num="31" count="2" type="cond" truecount="4" falsecount="0"/>
4228
- <line num="32" count="1" type="stmt"/>
4229
- <line num="34" count="2" type="cond" truecount="1" falsecount="1"/>
4230
- <line num="35" count="2" type="stmt"/>
4231
- <line num="37" count="0" type="stmt"/>
4232
- <line num="38" count="0" type="stmt"/>
4183
+ <line num="17" count="2" type="stmt"/>
4184
+ <line num="19" count="2" type="stmt"/>
4185
+ <line num="20" count="2" type="stmt"/>
4186
+ <line num="30" count="46" type="stmt"/>
4187
+ <line num="31" count="2" type="cond" truecount="1" falsecount="1"/>
4188
+ <line num="32" count="0" type="stmt"/>
4189
+ <line num="34" count="2" type="cond" truecount="4" falsecount="0"/>
4190
+ <line num="35" count="1" type="stmt"/>
4191
+ <line num="37" count="2" type="cond" truecount="1" falsecount="1"/>
4192
+ <line num="38" count="2" type="stmt"/>
4233
4193
  <line num="40" count="0" type="stmt"/>
4234
- <line num="42" count="0" type="stmt"/>
4235
- <line num="44" count="2" type="stmt"/>
4194
+ <line num="41" count="0" type="stmt"/>
4195
+ <line num="43" count="0" type="stmt"/>
4196
+ <line num="45" count="0" type="stmt"/>
4197
+ <line num="47" count="2" type="stmt"/>
4236
4198
  </file>
4237
4199
  <file name="workerRequests.js" path="/home/runner/work/budibase/budibase/packages/server/src/utilities/workerRequests.js">
4238
4200
  <metrics statements="65" coveredstatements="31" conditionals="26" coveredconditionals="10" methods="12" coveredmethods="3"/>
@@ -4267,40 +4229,40 @@
4267
4229
  <line num="51" count="22" type="stmt"/>
4268
4230
  <line num="54" count="45" type="stmt"/>
4269
4231
  <line num="57" count="45" type="stmt"/>
4270
- <line num="59" count="0" type="stmt"/>
4271
- <line num="73" count="0" type="stmt"/>
4272
- <line num="76" count="45" type="cond" truecount="0" falsecount="1"/>
4273
- <line num="77" count="0" type="stmt"/>
4274
- <line num="78" count="0" type="stmt"/>
4232
+ <line num="67" count="0" type="stmt"/>
4275
4233
  <line num="83" count="0" type="stmt"/>
4276
- <line num="84" count="0" type="cond" truecount="0" falsecount="2"/>
4277
- <line num="85" count="0" type="stmt"/>
4234
+ <line num="86" count="45" type="cond" truecount="0" falsecount="1"/>
4278
4235
  <line num="87" count="0" type="stmt"/>
4279
- <line num="90" count="45" type="stmt"/>
4280
- <line num="91" count="22" type="stmt"/>
4281
- <line num="92" count="22" type="stmt"/>
4282
- <line num="98" count="22" type="stmt"/>
4283
- <line num="101" count="45" type="stmt"/>
4284
- <line num="102" count="0" type="stmt"/>
4285
- <line num="107" count="0" type="stmt"/>
4286
- <line num="110" count="45" type="stmt"/>
4287
- <line num="111" count="0" type="stmt"/>
4288
- <line num="116" count="0" type="stmt"/>
4289
- <line num="119" count="45" type="stmt"/>
4290
- <line num="120" count="0" type="stmt"/>
4291
- <line num="127" count="0" type="stmt"/>
4292
- <line num="130" count="45" type="stmt"/>
4293
- <line num="131" count="0" type="stmt"/>
4294
- <line num="138" count="0" type="stmt"/>
4295
- <line num="141" count="45" type="stmt"/>
4296
- <line num="142" count="0" type="stmt"/>
4297
- <line num="146" count="0" type="stmt"/>
4298
- <line num="149" count="45" type="stmt"/>
4299
- <line num="150" count="0" type="stmt"/>
4300
- <line num="154" count="0" type="stmt"/>
4301
- <line num="157" count="45" type="stmt"/>
4302
- <line num="158" count="0" type="stmt"/>
4303
- <line num="162" count="0" type="stmt"/>
4236
+ <line num="88" count="0" type="stmt"/>
4237
+ <line num="93" count="0" type="stmt"/>
4238
+ <line num="94" count="0" type="cond" truecount="0" falsecount="2"/>
4239
+ <line num="95" count="0" type="stmt"/>
4240
+ <line num="97" count="0" type="stmt"/>
4241
+ <line num="100" count="45" type="stmt"/>
4242
+ <line num="101" count="22" type="stmt"/>
4243
+ <line num="102" count="22" type="stmt"/>
4244
+ <line num="108" count="22" type="stmt"/>
4245
+ <line num="111" count="45" type="stmt"/>
4246
+ <line num="112" count="0" type="stmt"/>
4247
+ <line num="117" count="0" type="stmt"/>
4248
+ <line num="120" count="45" type="stmt"/>
4249
+ <line num="121" count="0" type="stmt"/>
4250
+ <line num="126" count="0" type="stmt"/>
4251
+ <line num="129" count="45" type="stmt"/>
4252
+ <line num="130" count="0" type="stmt"/>
4253
+ <line num="137" count="0" type="stmt"/>
4254
+ <line num="140" count="45" type="stmt"/>
4255
+ <line num="141" count="0" type="stmt"/>
4256
+ <line num="148" count="0" type="stmt"/>
4257
+ <line num="151" count="45" type="stmt"/>
4258
+ <line num="152" count="0" type="stmt"/>
4259
+ <line num="156" count="0" type="stmt"/>
4260
+ <line num="159" count="45" type="stmt"/>
4261
+ <line num="160" count="0" type="stmt"/>
4262
+ <line num="164" count="0" type="stmt"/>
4263
+ <line num="167" count="45" type="stmt"/>
4264
+ <line num="168" count="0" type="stmt"/>
4265
+ <line num="172" count="0" type="stmt"/>
4304
4266
  </file>
4305
4267
  </package>
4306
4268
  <package name="utilities.queue">
@@ -4441,22 +4403,22 @@
4441
4403
  <line num="249" count="79" type="stmt"/>
4442
4404
  <line num="253" count="85" type="stmt"/>
4443
4405
  <line num="265" count="45" type="cond" truecount="1" falsecount="0"/>
4444
- <line num="266" count="124" type="stmt"/>
4445
- <line num="267" count="124" type="cond" truecount="2" falsecount="0"/>
4446
- <line num="268" count="104" type="stmt"/>
4447
- <line num="269" count="104" type="stmt"/>
4448
- <line num="272" count="124" type="stmt"/>
4449
- <line num="275" count="124" type="stmt"/>
4450
- <line num="278" count="124" type="stmt"/>
4451
- <line num="279" count="344" type="cond" truecount="2" falsecount="0"/>
4406
+ <line num="266" count="125" type="stmt"/>
4407
+ <line num="267" count="125" type="cond" truecount="2" falsecount="0"/>
4408
+ <line num="268" count="105" type="stmt"/>
4409
+ <line num="269" count="105" type="stmt"/>
4410
+ <line num="272" count="125" type="stmt"/>
4411
+ <line num="275" count="125" type="stmt"/>
4412
+ <line num="278" count="125" type="stmt"/>
4413
+ <line num="279" count="349" type="cond" truecount="2" falsecount="0"/>
4452
4414
  <line num="280" count="8" type="stmt"/>
4453
4415
  <line num="281" count="8" type="cond" truecount="4" falsecount="0"/>
4454
4416
  <line num="282" count="2" type="stmt"/>
4455
4417
  <line num="284" count="6" type="stmt"/>
4456
4418
  <line num="285" count="2" type="stmt"/>
4457
- <line num="290" count="124" type="cond" truecount="2" falsecount="0"/>
4458
- <line num="291" count="39" type="stmt"/>
4459
- <line num="293" count="124" type="cond" truecount="2" falsecount="0"/>
4419
+ <line num="290" count="125" type="cond" truecount="2" falsecount="0"/>
4420
+ <line num="291" count="40" type="stmt"/>
4421
+ <line num="293" count="125" type="cond" truecount="2" falsecount="0"/>
4460
4422
  <line num="306" count="45" type="stmt"/>
4461
4423
  <line num="307" count="14" type="stmt"/>
4462
4424
  <line num="308" count="14" type="cond" truecount="1" falsecount="1"/>
@@ -4501,20 +4463,20 @@
4501
4463
  <line num="27" count="0" type="stmt"/>
4502
4464
  <line num="29" count="2" type="stmt"/>
4503
4465
  <line num="35" count="45" type="stmt"/>
4504
- <line num="40" count="302" type="stmt"/>
4505
- <line num="41" count="302" type="cond" truecount="2" falsecount="0"/>
4466
+ <line num="40" count="303" type="stmt"/>
4467
+ <line num="41" count="303" type="cond" truecount="2" falsecount="0"/>
4506
4468
  <line num="42" count="178" type="stmt"/>
4507
4469
  <line num="43" count="178" type="cond" truecount="2" falsecount="0"/>
4508
- <line num="45" count="302" type="stmt"/>
4509
- <line num="46" count="846" type="stmt"/>
4510
- <line num="47" count="846" type="cond" truecount="1" falsecount="1"/>
4511
- <line num="52" count="846" type="stmt"/>
4470
+ <line num="45" count="303" type="stmt"/>
4471
+ <line num="46" count="851" type="stmt"/>
4472
+ <line num="47" count="851" type="cond" truecount="1" falsecount="1"/>
4473
+ <line num="52" count="851" type="stmt"/>
4512
4474
  <line num="55" count="0" type="stmt"/>
4513
4475
  <line num="56" count="0" type="cond" truecount="0" falsecount="2"/>
4514
4476
  <line num="57" count="0" type="stmt"/>
4515
4477
  <line num="58" count="0" type="cond" truecount="0" falsecount="2"/>
4516
4478
  <line num="59" count="0" type="stmt"/>
4517
- <line num="66" count="302" type="cond" truecount="2" falsecount="0"/>
4479
+ <line num="66" count="303" type="cond" truecount="2" falsecount="0"/>
4518
4480
  <line num="73" count="45" type="stmt"/>
4519
4481
  <line num="74" count="0" type="stmt"/>
4520
4482
  <line num="75" count="0" type="stmt"/>