@lcap/nasl 3.3.3-beta.8 → 3.3.5-beta.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 (309) hide show
  1. package/.nyc_output/{78804420-ead6-486f-b682-ab54ccd95dc9.json → b920244d-8d01-4e76-be5a-95132217c5a1.json} +1 -1
  2. package/.nyc_output/processinfo/b920244d-8d01-4e76-be5a-95132217c5a1.json +1 -0
  3. package/.nyc_output/processinfo/index.json +1 -1
  4. package/coverage/index.html +113 -128
  5. package/coverage/src/automate/engine/index.html +1 -1
  6. package/coverage/src/automate/engine/utils.js.html +26 -26
  7. package/coverage/src/bak/index.html +15 -15
  8. package/coverage/src/bak/translator.js.html +63 -390
  9. package/coverage/src/breakpoint/generator/AfterStartNode.ts.html +1 -1
  10. package/coverage/src/breakpoint/generator/BeforeEndNode.ts.html +1 -1
  11. package/coverage/src/breakpoint/generator/BreakpointNode.ts.html +1 -1
  12. package/coverage/src/breakpoint/generator/CallbackNode.ts.html +1 -1
  13. package/coverage/src/breakpoint/generator/index.html +1 -1
  14. package/coverage/src/breakpoint/generator/index.ts.html +1 -1
  15. package/coverage/src/breakpoint/index.html +1 -1
  16. package/coverage/src/breakpoint/index.ts.html +1 -1
  17. package/coverage/src/breakpoint/shared/constants.ts.html +1 -1
  18. package/coverage/src/breakpoint/shared/index.html +1 -1
  19. package/coverage/src/breakpoint/shared/index.ts.html +1 -1
  20. package/coverage/src/breakpoint/shared/operations.ts.html +2 -2
  21. package/coverage/src/breakpoint/shared/socket.ts.html +1 -1
  22. package/coverage/src/breakpoint/shared/utils.ts.html +1 -1
  23. package/coverage/src/breakpoint/store/core.ts.html +3 -3
  24. package/coverage/src/breakpoint/store/dock.ts.html +1 -1
  25. package/coverage/src/breakpoint/store/index.html +1 -1
  26. package/coverage/src/breakpoint/store/index.ts.html +1 -1
  27. package/coverage/src/common/BaseNode.ts.html +370 -592
  28. package/coverage/src/common/Command.ts.html +1 -1
  29. package/coverage/src/common/EventEmitter.ts.html +34 -31
  30. package/coverage/src/common/Messager.ts.html +1 -1
  31. package/coverage/src/common/asyncFuncMap.ts.html +1 -1
  32. package/coverage/src/common/index.html +23 -38
  33. package/coverage/src/common/index.ts.html +4 -7
  34. package/coverage/src/concepts/Abort__.ts.html +9 -36
  35. package/coverage/src/concepts/Anchor__.ts.html +22 -58
  36. package/coverage/src/concepts/AnonymousFunction__.ts.html +77 -107
  37. package/coverage/src/concepts/App__.ts.html +253 -907
  38. package/coverage/src/concepts/Argument__.ts.html +54 -195
  39. package/coverage/src/concepts/Assignee__.ts.html +70 -79
  40. package/coverage/src/concepts/AssignmentLine__.ts.html +21 -33
  41. package/coverage/src/concepts/Assignment__.ts.html +49 -130
  42. package/coverage/src/concepts/Attribute__.ts.html +179 -20
  43. package/coverage/src/concepts/AuthInterface__.ts.html +1 -1
  44. package/coverage/src/concepts/AuthLogicForCallInterface__.ts.html +161 -98
  45. package/coverage/src/concepts/AuthLogic__.ts.html +1 -1
  46. package/coverage/src/concepts/BackendVariable__.ts.html +226 -139
  47. package/coverage/src/concepts/Backend__.ts.html +35 -86
  48. package/coverage/src/concepts/BatchAssignment__.ts.html +65 -95
  49. package/coverage/src/concepts/BinaryExpression__.ts.html +89 -218
  50. package/coverage/src/concepts/BindAttribute__.ts.html +125 -440
  51. package/coverage/src/concepts/BindDirective__.ts.html +40 -64
  52. package/coverage/src/concepts/BindEvent__.ts.html +71 -86
  53. package/coverage/src/concepts/BindStyle__.ts.html +34 -58
  54. package/coverage/src/concepts/BooleanLiteral__.ts.html +8 -32
  55. package/coverage/src/concepts/CallAuthInterface__.ts.html +57 -87
  56. package/coverage/src/concepts/CallConnector__.ts.html +35 -59
  57. package/coverage/src/concepts/CallFunction__.ts.html +145 -247
  58. package/coverage/src/concepts/CallInterface__.ts.html +77 -53
  59. package/coverage/src/concepts/CallLogic__.ts.html +181 -244
  60. package/coverage/src/concepts/CallQueryComponent__.ts.html +181 -103
  61. package/coverage/src/concepts/Comment__.ts.html +10 -40
  62. package/coverage/src/concepts/CompletionProperty__.ts.html +17 -23
  63. package/coverage/src/concepts/ConfigGroup__.ts.html +27 -27
  64. package/coverage/src/concepts/ConfigPropertyValue__.ts.html +1 -1
  65. package/coverage/src/concepts/ConfigProperty__.ts.html +36 -66
  66. package/coverage/src/concepts/Configuration__.ts.html +27 -27
  67. package/coverage/src/concepts/Connection__.ts.html +29 -77
  68. package/coverage/src/concepts/ConnectorTrigger__.ts.html +1 -1
  69. package/coverage/src/concepts/Connector__.ts.html +92 -80
  70. package/coverage/src/concepts/Constant__.ts.html +222 -72
  71. package/coverage/src/concepts/DataSource__.ts.html +32 -59
  72. package/coverage/src/concepts/DatabaseTypeAnnotation__.ts.html +1 -1
  73. package/coverage/src/{utils/time-slicing/controller.ts.html → concepts/DefaultValue__.ts.html} +294 -459
  74. package/coverage/src/concepts/Destination__.ts.html +67 -79
  75. package/coverage/src/concepts/End__.ts.html +21 -48
  76. package/coverage/src/concepts/EntityIndex__.ts.html +17 -35
  77. package/coverage/src/concepts/EntityProperty__.ts.html +208 -118
  78. package/coverage/src/concepts/Entity__.ts.html +123 -81
  79. package/coverage/src/concepts/EnumItem__.ts.html +10 -37
  80. package/coverage/src/concepts/Enum__.ts.html +32 -65
  81. package/coverage/src/concepts/Event__.ts.html +21 -21
  82. package/coverage/src/concepts/ExternalDestination__.ts.html +30 -57
  83. package/coverage/src/concepts/ForEachStatement__.ts.html +89 -98
  84. package/coverage/src/concepts/FrontendLibrary__.ts.html +35 -35
  85. package/coverage/src/concepts/FrontendVariable__.ts.html +1 -1
  86. package/coverage/src/concepts/Frontend__.ts.html +93 -132
  87. package/coverage/src/concepts/Function__.ts.html +98 -131
  88. package/coverage/src/concepts/Identifier__.ts.html +67 -103
  89. package/coverage/src/concepts/IfStatement__.ts.html +67 -88
  90. package/coverage/src/concepts/Integration__.ts.html +31 -37
  91. package/coverage/src/concepts/InterfaceParam__.ts.html +179 -65
  92. package/coverage/src/concepts/Interface__.ts.html +74 -107
  93. package/coverage/src/concepts/JSBlock__.ts.html +11 -212
  94. package/coverage/src/concepts/JavaLogic__.ts.html +9 -39
  95. package/coverage/src/concepts/LogicItem__.ts.html +17 -44
  96. package/coverage/src/concepts/Logic__.ts.html +503 -263
  97. package/coverage/src/concepts/MatchCase__.ts.html +87 -126
  98. package/coverage/src/concepts/Match__.ts.html +56 -74
  99. package/coverage/src/concepts/MemberExpression__.ts.html +59 -95
  100. package/coverage/src/concepts/MicroApp__.ts.html +1 -1
  101. package/coverage/src/concepts/Module__.ts.html +136 -625
  102. package/coverage/src/concepts/MsgTriggerEvent__.ts.html +21 -21
  103. package/coverage/src/concepts/MsgTriggerLauncher__.ts.html +21 -21
  104. package/coverage/src/concepts/Namespace__.ts.html +178 -166
  105. package/coverage/src/concepts/NewComposite__.ts.html +178 -295
  106. package/coverage/src/concepts/NewList__.ts.html +75 -129
  107. package/coverage/src/concepts/NewMap__.ts.html +139 -100
  108. package/coverage/src/concepts/New__.ts.html +9 -39
  109. package/coverage/src/concepts/NullLiteral__.ts.html +5 -29
  110. package/coverage/src/concepts/NumericLiteral__.ts.html +29 -65
  111. package/coverage/src/concepts/OqlQueryComponent__.ts.html +39 -69
  112. package/coverage/src/concepts/OverriddenLogic__.ts.html +264 -234
  113. package/coverage/src/concepts/Param__.ts.html +154 -196
  114. package/coverage/src/concepts/Point__.ts.html +1 -1
  115. package/coverage/src/concepts/ProcessComponent__.ts.html +36 -36
  116. package/coverage/src/concepts/ProcessElement__.ts.html +285 -183
  117. package/coverage/src/concepts/ProcessOutcome__.ts.html +13 -82
  118. package/coverage/src/concepts/ProcessOutcomes__.ts.html +20 -80
  119. package/coverage/src/concepts/Process__.ts.html +284 -122
  120. package/coverage/src/concepts/QueryAggregateExpression__.ts.html +20 -50
  121. package/coverage/src/concepts/QueryFieldExpression__.ts.html +11 -38
  122. package/coverage/src/concepts/QueryFromExpression__.ts.html +29 -62
  123. package/coverage/src/concepts/QueryGroupByExpression__.ts.html +23 -53
  124. package/coverage/src/concepts/QueryJoinExpression__.ts.html +41 -62
  125. package/coverage/src/concepts/QueryLimitExpression__.ts.html +29 -59
  126. package/coverage/src/concepts/QueryOrderByExpression__.ts.html +29 -62
  127. package/coverage/src/concepts/QuerySelectExpression__.ts.html +22 -22
  128. package/coverage/src/concepts/Rect__.ts.html +1 -1
  129. package/coverage/src/concepts/Return__.ts.html +187 -148
  130. package/coverage/src/concepts/Role__.ts.html +15 -42
  131. package/coverage/src/concepts/SelectMembers__.ts.html +31 -55
  132. package/coverage/src/concepts/Slot__.ts.html +17 -23
  133. package/coverage/src/concepts/SqlQueryComponent__.ts.html +28 -67
  134. package/coverage/src/concepts/Start__.ts.html +5 -29
  135. package/coverage/src/concepts/StringInterpolation__.ts.html +31 -79
  136. package/coverage/src/concepts/StringLiteral__.ts.html +26 -53
  137. package/coverage/src/concepts/StructureProperty__.ts.html +175 -64
  138. package/coverage/src/concepts/Structure__.ts.html +73 -67
  139. package/coverage/src/concepts/SwitchCase__.ts.html +45 -66
  140. package/coverage/src/concepts/SwitchStatement__.ts.html +28 -58
  141. package/coverage/src/concepts/Theme__.ts.html +7 -7
  142. package/coverage/src/concepts/Transactional__.ts.html +1 -1
  143. package/coverage/src/concepts/TriggerEvent__.ts.html +21 -21
  144. package/coverage/src/concepts/TriggerLauncher__.ts.html +13 -43
  145. package/coverage/src/concepts/TypeAnnotation__.ts.html +106 -223
  146. package/coverage/src/concepts/TypeParam__.ts.html +11 -38
  147. package/coverage/src/concepts/UnaryExpression__.ts.html +28 -73
  148. package/coverage/src/concepts/Unparsed__.ts.html +6 -27
  149. package/coverage/src/concepts/UseComponent__.ts.html +1 -1
  150. package/coverage/src/concepts/ValidationRule__.ts.html +57 -60
  151. package/coverage/src/concepts/Variable__.ts.html +238 -142
  152. package/coverage/src/concepts/ViewBlock__.ts.html +1 -1
  153. package/coverage/src/concepts/ViewComponent__.ts.html +80 -8
  154. package/coverage/src/concepts/ViewElement__.ts.html +238 -463
  155. package/coverage/src/concepts/View__.ts.html +296 -251
  156. package/coverage/src/concepts/WhileStatement__.ts.html +54 -75
  157. package/coverage/src/concepts/basics/stdlib/index.html +8 -8
  158. package/coverage/src/concepts/basics/stdlib/index.ts.html +1 -1
  159. package/coverage/src/concepts/basics/stdlib/nasl.auth.ts.html +1 -1
  160. package/coverage/src/concepts/basics/stdlib/nasl.browser.ts.html +1 -1
  161. package/coverage/src/concepts/basics/stdlib/nasl.collection.ts.html +1 -1
  162. package/coverage/src/concepts/basics/stdlib/nasl.configuration.ts.html +1 -1
  163. package/coverage/src/concepts/basics/stdlib/nasl.core.ts.html +1 -1
  164. package/coverage/src/concepts/basics/stdlib/nasl.event.ts.html +1 -1
  165. package/coverage/src/concepts/basics/stdlib/nasl.http.ts.html +1 -1
  166. package/coverage/src/concepts/basics/stdlib/nasl.interface.ts.html +1 -1
  167. package/coverage/src/concepts/basics/stdlib/nasl.io.ts.html +1 -1
  168. package/coverage/src/concepts/basics/stdlib/nasl.logging.ts.html +1 -1
  169. package/coverage/src/concepts/basics/stdlib/nasl.process.ts.html +1 -1
  170. package/coverage/src/concepts/basics/stdlib/nasl.ui.ts.html +1 -1
  171. package/coverage/src/concepts/basics/stdlib/nasl.util.ts.html +130 -19
  172. package/coverage/src/concepts/basics/stdlib/nasl.validation.ts.html +1 -1
  173. package/coverage/src/concepts/basics/stdlib/reference2TypeAnnotationList.ts.html +1 -1
  174. package/coverage/src/concepts/basics/stdlib/timeZone.ts.html +1 -1
  175. package/coverage/src/concepts/basics/types/coreTypeList.ts.html +1 -1
  176. package/coverage/src/concepts/basics/types/index.html +1 -1
  177. package/coverage/src/concepts/basics/types/index.ts.html +1 -1
  178. package/coverage/src/concepts/index.html +858 -858
  179. package/coverage/src/concepts/index.ts.html +1 -1
  180. package/coverage/src/concepts/index__.ts.html +2 -2
  181. package/coverage/src/config.ts.html +1 -1
  182. package/coverage/src/decorators/index.html +16 -16
  183. package/coverage/src/decorators/index.ts.html +40 -31
  184. package/coverage/src/decorators/promise.ts.html +10 -10
  185. package/coverage/src/eventBus.ts.html +1 -1
  186. package/coverage/src/generator/compileComponent.ts.html +4 -4
  187. package/coverage/src/generator/genBundleFiles.ts.html +23 -17
  188. package/coverage/src/generator/genHash.ts.html +3 -3
  189. package/coverage/src/generator/genMetaData.ts.html +31 -76
  190. package/coverage/src/generator/genReleaseBody.ts.html +4 -4
  191. package/coverage/src/generator/icestark.ts.html +4 -10
  192. package/coverage/src/generator/index.html +20 -20
  193. package/coverage/src/generator/index.ts.html +1 -1
  194. package/coverage/src/generator/microApp.ts.html +1 -1
  195. package/coverage/src/generator/permission.ts.html +20 -92
  196. package/coverage/src/generator/qiankun.ts.html +3 -9
  197. package/coverage/src/generator/styleReplacer.ts.html +1 -1
  198. package/coverage/src/index.html +1 -1
  199. package/coverage/src/index.ts.html +7 -4
  200. package/coverage/src/manager/diagnostic.ts.html +14 -11
  201. package/coverage/src/manager/index.html +13 -13
  202. package/coverage/src/manager/stepRecorder.ts.html +1 -1
  203. package/coverage/src/natural/genNaturalTS.ts.html +1 -1
  204. package/coverage/src/natural/index.html +1 -1
  205. package/coverage/src/natural/index.ts.html +1 -1
  206. package/coverage/src/natural/naslStdlibMap.ts.html +1 -1
  207. package/coverage/src/natural/transformTSCode.ts.html +1 -1
  208. package/coverage/src/sentry/index.html +14 -14
  209. package/coverage/src/sentry/index.ts.html +32 -38
  210. package/coverage/src/server/createUiTs.ts.html +1 -1
  211. package/coverage/src/server/entity2LogicNamespace.ts.html +1 -1
  212. package/coverage/src/server/event.js.html +1 -1
  213. package/coverage/src/server/extendBaseNode.ts.html +4 -7
  214. package/coverage/src/server/formatTsUtils.ts.html +2 -2
  215. package/coverage/src/server/getConnector.ts.html +1 -1
  216. package/coverage/src/server/getExtensionModules.ts.html +1 -1
  217. package/coverage/src/server/getFunctions.ts.html +4 -4
  218. package/coverage/src/server/getInterfaces.ts.html +1 -1
  219. package/coverage/src/server/getLogging.ts.html +2 -2
  220. package/coverage/src/server/getLogics.ts.html +1 -1
  221. package/coverage/src/server/getMemberIdentifier.ts.html +128 -131
  222. package/coverage/src/server/getProcessComponents.ts.html +3 -3
  223. package/coverage/src/server/getProcesses.ts.html +1 -1
  224. package/coverage/src/server/getValidates.ts.html +4 -4
  225. package/coverage/src/server/index.html +26 -26
  226. package/coverage/src/server/index.ts.html +1 -1
  227. package/coverage/src/server/naslServer.ts.html +880 -1177
  228. package/coverage/src/server/naslStdlibMap.ts.html +1 -1
  229. package/coverage/src/server/process2LogicNamespace.ts.html +52 -52
  230. package/coverage/src/server/translator.ts.html +14 -50
  231. package/coverage/src/service/creator/add.configs.js.html +2 -2
  232. package/coverage/src/service/creator/errHandles.js.html +1 -1
  233. package/coverage/src/service/creator/index.html +1 -1
  234. package/coverage/src/service/creator/index.js.html +1 -1
  235. package/coverage/src/service/datasource/api.js.html +1 -1
  236. package/coverage/src/service/datasource/index.html +1 -1
  237. package/coverage/src/service/datasource/index.js.html +1 -1
  238. package/coverage/src/service/logic/api.js.html +1 -1
  239. package/coverage/src/service/logic/index.html +1 -1
  240. package/coverage/src/service/logic/index.js.html +1 -1
  241. package/coverage/src/service/storage/api.js.html +1 -1
  242. package/coverage/src/service/storage/index.html +27 -27
  243. package/coverage/src/service/storage/index.ts.html +1 -1
  244. package/coverage/src/service/storage/init.ts.html +137 -110
  245. package/coverage/src/service/storage/jsoner.ts.html +13 -76
  246. package/coverage/src/service/storage/map.ts.html +3 -3
  247. package/coverage/src/service/storage/service.ts.html +1 -1
  248. package/coverage/src/service/storage/storagePoint.ts.html +1 -1
  249. package/coverage/src/templator/genCallComponentLogic.ts.html +1 -1
  250. package/coverage/src/templator/genCreateBlock.ts.html +56 -47
  251. package/coverage/src/templator/genCurdEditMultipleKeyBlock.ts.html +31 -49
  252. package/coverage/src/templator/genCurdMultipleKeyBlock.ts.html +89 -80
  253. package/coverage/src/templator/genEditTableBlock.ts.html +9 -12
  254. package/coverage/src/templator/genEnumSelectBlock.ts.html +1 -1
  255. package/coverage/src/templator/genGetBlock.ts.html +1 -1
  256. package/coverage/src/templator/genGridViewBlock.ts.html +1 -1
  257. package/coverage/src/templator/genListViewBlock.ts.html +1 -1
  258. package/coverage/src/templator/genQueryComponent.ts.html +1 -1
  259. package/coverage/src/templator/genSelectBlock.ts.html +1 -1
  260. package/coverage/src/templator/genTableBlock.ts.html +1 -1
  261. package/coverage/src/templator/genUpdateBlock.ts.html +36 -48
  262. package/coverage/src/templator/index.html +39 -39
  263. package/coverage/src/templator/index.ts.html +1 -1
  264. package/coverage/src/templator/utils.ts.html +11 -77
  265. package/coverage/src/translator/constant.ts.html +1 -1
  266. package/coverage/src/translator/index.html +21 -21
  267. package/coverage/src/translator/index.ts.html +1 -1
  268. package/coverage/src/translator/utils.ts.html +68 -389
  269. package/coverage/src/utils/cookie.ts.html +4 -4
  270. package/coverage/src/utils/env.ts.html +1 -1
  271. package/coverage/src/utils/index.html +41 -26
  272. package/coverage/src/utils/index.ts.html +9 -63
  273. package/coverage/src/utils/logger.ts.html +13 -13
  274. package/coverage/src/utils/sortTsString.ts.html +10 -25
  275. package/coverage/src/utils/string.ts.html +8 -110
  276. package/coverage/src/utils/time-slicing.ts.html +1 -1
  277. package/coverage/src/utils/traverse.ts.html +1 -1
  278. package/coverage/src/utils/window.ts.html +1 -1
  279. package/out/common/Command.js +1 -1
  280. package/out/common/Command.js.map +1 -1
  281. package/out/concepts/Match__.js +1 -1
  282. package/out/concepts/Match__.js.map +1 -1
  283. package/out/concepts/View__.js +2 -2
  284. package/out/concepts/View__.js.map +1 -1
  285. package/package.json +1 -1
  286. package/src/common/Command.ts +1 -1
  287. package/src/concepts/Match__.ts +1 -1
  288. package/src/concepts/View__.ts +5 -5
  289. package/.nyc_output/processinfo/78804420-ead6-486f-b682-ab54ccd95dc9.json +0 -1
  290. package/coverage/cobertura-coverage.xml +0 -71878
  291. package/coverage/src/automate/engine/index.js.html +0 -1471
  292. package/coverage/src/automate/engine/operators.js.html +0 -862
  293. package/coverage/src/automate/engine/uniqueName.js.html +0 -412
  294. package/coverage/src/automate/engine/viewCache.js.html +0 -214
  295. package/coverage/src/automate/template/index.html +0 -116
  296. package/coverage/src/automate/template/myProcess.js.html +0 -34645
  297. package/coverage/src/common/utils.ts.html +0 -136
  298. package/coverage/src/concepts/DataElement__.ts.html +0 -118
  299. package/coverage/src/concepts/MetadataType__.ts.html +0 -2053
  300. package/coverage/src/utils/time-slicing/constant.ts.html +0 -196
  301. package/coverage/src/utils/time-slicing/index.html +0 -236
  302. package/coverage/src/utils/time-slicing/index.ts.html +0 -103
  303. package/coverage/src/utils/time-slicing/page-state.ts.html +0 -121
  304. package/coverage/src/utils/time-slicing/performance.ts.html +0 -253
  305. package/coverage/src/utils/time-slicing/runner.ts.html +0 -247
  306. package/coverage/src/utils/time-slicing/tool.ts.html +0 -220
  307. package/coverage/src/utils/time-slicing/utils.ts.html +0 -355
  308. package/coverage/src/utils/time-slicing/wrapper.ts.html +0 -259
  309. package/coverage/src/utils/time.ts.html +0 -118
package/coverage/src/concepts/OverriddenLogic__.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">7.2% </span>
26
+ <span class="strong">7.17% </span>
27
27
  <span class="quiet">Statements</span>
28
- <span class='fraction'>57/791</span>
28
+ <span class='fraction'>56/780</span>
29
29
  </div>
30
30
 
31
31
 
32
32
  <div class='fl pad1y space-right2'>
33
33
  <span class="strong">0% </span>
34
34
  <span class="quiet">Branches</span>
35
- <span class='fraction'>0/538</span>
35
+ <span class='fraction'>0/511</span>
36
36
  </div>
37
37
 
38
38
 
39
39
  <div class='fl pad1y space-right2'>
40
- <span class="strong">2.14% </span>
40
+ <span class="strong">2.2% </span>
41
41
  <span class="quiet">Functions</span>
42
- <span class='fraction'>3/140</span>
42
+ <span class='fraction'>3/136</span>
43
43
  </div>
44
44
 
45
45
 
46
46
  <div class='fl pad1y space-right2'>
47
- <span class="strong">6.61% </span>
47
+ <span class="strong">6.53% </span>
48
48
  <span class="quiet">Lines</span>
49
- <span class='fraction'>49/741</span>
49
+ <span class='fraction'>48/735</span>
50
50
  </div>
51
51
 
52
52
 
@@ -2348,14 +2348,17 @@
2348
2348
  <a name='L2283'></a><a href='#L2283'>2283</a>
2349
2349
  <a name='L2284'></a><a href='#L2284'>2284</a>
2350
2350
  <a name='L2285'></a><a href='#L2285'>2285</a>
2351
- <a name='L2286'></a><a href='#L2286'>2286</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">1x</span>
2352
- <span class="cline-any cline-neutral">&nbsp;</span>
2353
- <span class="cline-any cline-neutral">&nbsp;</span>
2354
- <span class="cline-any cline-neutral">&nbsp;</span>
2355
- <span class="cline-any cline-neutral">&nbsp;</span>
2356
- <span class="cline-any cline-neutral">&nbsp;</span>
2357
- <span class="cline-any cline-neutral">&nbsp;</span>
2358
- <span class="cline-any cline-yes">1x</span>
2351
+ <a name='L2286'></a><a href='#L2286'>2286</a>
2352
+ <a name='L2287'></a><a href='#L2287'>2287</a>
2353
+ <a name='L2288'></a><a href='#L2288'>2288</a>
2354
+ <a name='L2289'></a><a href='#L2289'>2289</a>
2355
+ <a name='L2290'></a><a href='#L2290'>2290</a>
2356
+ <a name='L2291'></a><a href='#L2291'>2291</a>
2357
+ <a name='L2292'></a><a href='#L2292'>2292</a>
2358
+ <a name='L2293'></a><a href='#L2293'>2293</a>
2359
+ <a name='L2294'></a><a href='#L2294'>2294</a>
2360
+ <a name='L2295'></a><a href='#L2295'>2295</a>
2361
+ <a name='L2296'></a><a href='#L2296'>2296</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">1x</span>
2359
2362
  <span class="cline-any cline-yes">1x</span>
2360
2363
  <span class="cline-any cline-neutral">&nbsp;</span>
2361
2364
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -2364,10 +2367,6 @@
2364
2367
  <span class="cline-any cline-neutral">&nbsp;</span>
2365
2368
  <span class="cline-any cline-neutral">&nbsp;</span>
2366
2369
  <span class="cline-any cline-neutral">&nbsp;</span>
2367
- <span class="cline-any cline-neutral">&nbsp;</span>
2368
- <span class="cline-any cline-neutral">&nbsp;</span>
2369
- <span class="cline-any cline-neutral">&nbsp;</span>
2370
- <span class="cline-any cline-yes">1x</span>
2371
2370
  <span class="cline-any cline-yes">1x</span>
2372
2371
  <span class="cline-any cline-yes">1x</span>
2373
2372
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -2375,7 +2374,7 @@
2375
2374
  <span class="cline-any cline-yes">1x</span>
2376
2375
  <span class="cline-any cline-yes">1x</span>
2377
2376
  <span class="cline-any cline-yes">1x</span>
2378
- <span class="cline-any cline-neutral">&nbsp;</span>
2377
+ <span class="cline-any cline-yes">1x</span>
2379
2378
  <span class="cline-any cline-neutral">&nbsp;</span>
2380
2379
  <span class="cline-any cline-neutral">&nbsp;</span>
2381
2380
  <span class="cline-any cline-yes">1x</span>
@@ -2463,42 +2462,68 @@
2463
2462
  <span class="cline-any cline-neutral">&nbsp;</span>
2464
2463
  <span class="cline-any cline-neutral">&nbsp;</span>
2465
2464
  <span class="cline-any cline-neutral">&nbsp;</span>
2465
+ <span class="cline-any cline-neutral">&nbsp;</span>
2466
+ <span class="cline-any cline-neutral">&nbsp;</span>
2466
2467
  <span class="cline-any cline-yes">1x</span>
2467
2468
  <span class="cline-any cline-neutral">&nbsp;</span>
2468
2469
  <span class="cline-any cline-neutral">&nbsp;</span>
2469
2470
  <span class="cline-any cline-neutral">&nbsp;</span>
2470
2471
  <span class="cline-any cline-neutral">&nbsp;</span>
2471
2472
  <span class="cline-any cline-neutral">&nbsp;</span>
2473
+ <span class="cline-any cline-neutral">&nbsp;</span>
2474
+ <span class="cline-any cline-neutral">&nbsp;</span>
2475
+ <span class="cline-any cline-neutral">&nbsp;</span>
2476
+ <span class="cline-any cline-neutral">&nbsp;</span>
2472
2477
  <span class="cline-any cline-yes">12x</span>
2473
2478
  <span class="cline-any cline-neutral">&nbsp;</span>
2474
2479
  <span class="cline-any cline-neutral">&nbsp;</span>
2475
2480
  <span class="cline-any cline-neutral">&nbsp;</span>
2476
2481
  <span class="cline-any cline-neutral">&nbsp;</span>
2477
2482
  <span class="cline-any cline-neutral">&nbsp;</span>
2483
+ <span class="cline-any cline-neutral">&nbsp;</span>
2484
+ <span class="cline-any cline-neutral">&nbsp;</span>
2485
+ <span class="cline-any cline-neutral">&nbsp;</span>
2486
+ <span class="cline-any cline-neutral">&nbsp;</span>
2478
2487
  <span class="cline-any cline-yes">12x</span>
2479
2488
  <span class="cline-any cline-neutral">&nbsp;</span>
2480
2489
  <span class="cline-any cline-neutral">&nbsp;</span>
2481
2490
  <span class="cline-any cline-neutral">&nbsp;</span>
2482
2491
  <span class="cline-any cline-neutral">&nbsp;</span>
2483
2492
  <span class="cline-any cline-neutral">&nbsp;</span>
2493
+ <span class="cline-any cline-neutral">&nbsp;</span>
2494
+ <span class="cline-any cline-neutral">&nbsp;</span>
2495
+ <span class="cline-any cline-neutral">&nbsp;</span>
2496
+ <span class="cline-any cline-neutral">&nbsp;</span>
2484
2497
  <span class="cline-any cline-yes">12x</span>
2485
2498
  <span class="cline-any cline-neutral">&nbsp;</span>
2486
2499
  <span class="cline-any cline-neutral">&nbsp;</span>
2487
2500
  <span class="cline-any cline-neutral">&nbsp;</span>
2488
2501
  <span class="cline-any cline-neutral">&nbsp;</span>
2489
2502
  <span class="cline-any cline-neutral">&nbsp;</span>
2503
+ <span class="cline-any cline-neutral">&nbsp;</span>
2504
+ <span class="cline-any cline-neutral">&nbsp;</span>
2505
+ <span class="cline-any cline-neutral">&nbsp;</span>
2506
+ <span class="cline-any cline-neutral">&nbsp;</span>
2490
2507
  <span class="cline-any cline-yes">12x</span>
2491
2508
  <span class="cline-any cline-neutral">&nbsp;</span>
2492
2509
  <span class="cline-any cline-neutral">&nbsp;</span>
2493
2510
  <span class="cline-any cline-neutral">&nbsp;</span>
2494
2511
  <span class="cline-any cline-neutral">&nbsp;</span>
2495
2512
  <span class="cline-any cline-neutral">&nbsp;</span>
2513
+ <span class="cline-any cline-neutral">&nbsp;</span>
2514
+ <span class="cline-any cline-neutral">&nbsp;</span>
2515
+ <span class="cline-any cline-neutral">&nbsp;</span>
2516
+ <span class="cline-any cline-neutral">&nbsp;</span>
2496
2517
  <span class="cline-any cline-yes">12x</span>
2497
2518
  <span class="cline-any cline-neutral">&nbsp;</span>
2498
2519
  <span class="cline-any cline-neutral">&nbsp;</span>
2499
2520
  <span class="cline-any cline-neutral">&nbsp;</span>
2500
2521
  <span class="cline-any cline-neutral">&nbsp;</span>
2501
2522
  <span class="cline-any cline-neutral">&nbsp;</span>
2523
+ <span class="cline-any cline-neutral">&nbsp;</span>
2524
+ <span class="cline-any cline-neutral">&nbsp;</span>
2525
+ <span class="cline-any cline-neutral">&nbsp;</span>
2526
+ <span class="cline-any cline-neutral">&nbsp;</span>
2502
2527
  <span class="cline-any cline-yes">12x</span>
2503
2528
  <span class="cline-any cline-neutral">&nbsp;</span>
2504
2529
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -3479,18 +3504,14 @@
3479
3504
  <span class="cline-any cline-neutral">&nbsp;</span>
3480
3505
  <span class="cline-any cline-no">&nbsp;</span>
3481
3506
  <span class="cline-any cline-no">&nbsp;</span>
3482
- <span class="cline-any cline-neutral">&nbsp;</span>
3483
- <span class="cline-any cline-no">&nbsp;</span>
3484
3507
  <span class="cline-any cline-no">&nbsp;</span>
3485
3508
  <span class="cline-any cline-no">&nbsp;</span>
3486
- <span class="cline-any cline-neutral">&nbsp;</span>
3487
3509
  <span class="cline-any cline-no">&nbsp;</span>
3488
3510
  <span class="cline-any cline-no">&nbsp;</span>
3489
3511
  <span class="cline-any cline-no">&nbsp;</span>
3490
3512
  <span class="cline-any cline-no">&nbsp;</span>
3491
3513
  <span class="cline-any cline-neutral">&nbsp;</span>
3492
3514
  <span class="cline-any cline-neutral">&nbsp;</span>
3493
- <span class="cline-any cline-neutral">&nbsp;</span>
3494
3515
  <span class="cline-any cline-no">&nbsp;</span>
3495
3516
  <span class="cline-any cline-neutral">&nbsp;</span>
3496
3517
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -3535,18 +3556,14 @@
3535
3556
  <span class="cline-any cline-neutral">&nbsp;</span>
3536
3557
  <span class="cline-any cline-no">&nbsp;</span>
3537
3558
  <span class="cline-any cline-no">&nbsp;</span>
3538
- <span class="cline-any cline-neutral">&nbsp;</span>
3539
- <span class="cline-any cline-no">&nbsp;</span>
3540
3559
  <span class="cline-any cline-no">&nbsp;</span>
3541
3560
  <span class="cline-any cline-no">&nbsp;</span>
3542
- <span class="cline-any cline-neutral">&nbsp;</span>
3543
3561
  <span class="cline-any cline-no">&nbsp;</span>
3544
3562
  <span class="cline-any cline-no">&nbsp;</span>
3545
3563
  <span class="cline-any cline-no">&nbsp;</span>
3546
3564
  <span class="cline-any cline-no">&nbsp;</span>
3547
3565
  <span class="cline-any cline-neutral">&nbsp;</span>
3548
3566
  <span class="cline-any cline-neutral">&nbsp;</span>
3549
- <span class="cline-any cline-neutral">&nbsp;</span>
3550
3567
  <span class="cline-any cline-no">&nbsp;</span>
3551
3568
  <span class="cline-any cline-neutral">&nbsp;</span>
3552
3569
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -3591,16 +3608,12 @@
3591
3608
  <span class="cline-any cline-neutral">&nbsp;</span>
3592
3609
  <span class="cline-any cline-no">&nbsp;</span>
3593
3610
  <span class="cline-any cline-no">&nbsp;</span>
3594
- <span class="cline-any cline-neutral">&nbsp;</span>
3595
3611
  <span class="cline-any cline-no">&nbsp;</span>
3596
3612
  <span class="cline-any cline-no">&nbsp;</span>
3597
3613
  <span class="cline-any cline-no">&nbsp;</span>
3598
- <span class="cline-any cline-neutral">&nbsp;</span>
3599
3614
  <span class="cline-any cline-no">&nbsp;</span>
3600
3615
  <span class="cline-any cline-no">&nbsp;</span>
3601
3616
  <span class="cline-any cline-no">&nbsp;</span>
3602
- <span class="cline-any cline-no">&nbsp;</span>
3603
- <span class="cline-any cline-neutral">&nbsp;</span>
3604
3617
  <span class="cline-any cline-neutral">&nbsp;</span>
3605
3618
  <span class="cline-any cline-neutral">&nbsp;</span>
3606
3619
  <span class="cline-any cline-no">&nbsp;</span>
@@ -3647,18 +3660,14 @@
3647
3660
  <span class="cline-any cline-neutral">&nbsp;</span>
3648
3661
  <span class="cline-any cline-no">&nbsp;</span>
3649
3662
  <span class="cline-any cline-no">&nbsp;</span>
3650
- <span class="cline-any cline-neutral">&nbsp;</span>
3651
3663
  <span class="cline-any cline-no">&nbsp;</span>
3652
3664
  <span class="cline-any cline-no">&nbsp;</span>
3653
3665
  <span class="cline-any cline-no">&nbsp;</span>
3654
- <span class="cline-any cline-neutral">&nbsp;</span>
3655
- <span class="cline-any cline-no">&nbsp;</span>
3656
3666
  <span class="cline-any cline-no">&nbsp;</span>
3657
3667
  <span class="cline-any cline-no">&nbsp;</span>
3658
3668
  <span class="cline-any cline-no">&nbsp;</span>
3659
3669
  <span class="cline-any cline-neutral">&nbsp;</span>
3660
3670
  <span class="cline-any cline-neutral">&nbsp;</span>
3661
- <span class="cline-any cline-neutral">&nbsp;</span>
3662
3671
  <span class="cline-any cline-no">&nbsp;</span>
3663
3672
  <span class="cline-any cline-neutral">&nbsp;</span>
3664
3673
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -3703,18 +3712,14 @@
3703
3712
  <span class="cline-any cline-neutral">&nbsp;</span>
3704
3713
  <span class="cline-any cline-no">&nbsp;</span>
3705
3714
  <span class="cline-any cline-no">&nbsp;</span>
3706
- <span class="cline-any cline-neutral">&nbsp;</span>
3707
- <span class="cline-any cline-no">&nbsp;</span>
3708
3715
  <span class="cline-any cline-no">&nbsp;</span>
3709
3716
  <span class="cline-any cline-no">&nbsp;</span>
3710
- <span class="cline-any cline-neutral">&nbsp;</span>
3711
3717
  <span class="cline-any cline-no">&nbsp;</span>
3712
3718
  <span class="cline-any cline-no">&nbsp;</span>
3713
3719
  <span class="cline-any cline-no">&nbsp;</span>
3714
3720
  <span class="cline-any cline-no">&nbsp;</span>
3715
3721
  <span class="cline-any cline-neutral">&nbsp;</span>
3716
3722
  <span class="cline-any cline-neutral">&nbsp;</span>
3717
- <span class="cline-any cline-neutral">&nbsp;</span>
3718
3723
  <span class="cline-any cline-no">&nbsp;</span>
3719
3724
  <span class="cline-any cline-neutral">&nbsp;</span>
3720
3725
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -3756,16 +3761,12 @@
3756
3761
  <span class="cline-any cline-neutral">&nbsp;</span>
3757
3762
  <span class="cline-any cline-no">&nbsp;</span>
3758
3763
  <span class="cline-any cline-no">&nbsp;</span>
3759
- <span class="cline-any cline-neutral">&nbsp;</span>
3760
3764
  <span class="cline-any cline-no">&nbsp;</span>
3761
3765
  <span class="cline-any cline-no">&nbsp;</span>
3762
3766
  <span class="cline-any cline-no">&nbsp;</span>
3763
- <span class="cline-any cline-neutral">&nbsp;</span>
3764
3767
  <span class="cline-any cline-no">&nbsp;</span>
3765
3768
  <span class="cline-any cline-no">&nbsp;</span>
3766
3769
  <span class="cline-any cline-no">&nbsp;</span>
3767
- <span class="cline-any cline-no">&nbsp;</span>
3768
- <span class="cline-any cline-neutral">&nbsp;</span>
3769
3770
  <span class="cline-any cline-neutral">&nbsp;</span>
3770
3771
  <span class="cline-any cline-neutral">&nbsp;</span>
3771
3772
  <span class="cline-any cline-no">&nbsp;</span>
@@ -4024,22 +4025,12 @@
4024
4025
  <span class="cline-any cline-neutral">&nbsp;</span>
4025
4026
  <span class="cline-any cline-neutral">&nbsp;</span>
4026
4027
  <span class="cline-any cline-yes">1x</span>
4027
- <span class="cline-any cline-neutral">&nbsp;</span>
4028
- <span class="cline-any cline-neutral">&nbsp;</span>
4029
- <span class="cline-any cline-neutral">&nbsp;</span>
4030
- <span class="cline-any cline-neutral">&nbsp;</span>
4031
- <span class="cline-any cline-neutral">&nbsp;</span>
4032
4028
  <span class="cline-any cline-no">&nbsp;</span>
4033
4029
  <span class="cline-any cline-no">&nbsp;</span>
4034
4030
  <span class="cline-any cline-no">&nbsp;</span>
4035
4031
  <span class="cline-any cline-no">&nbsp;</span>
4036
4032
  <span class="cline-any cline-no">&nbsp;</span>
4037
- <span class="cline-any cline-neutral">&nbsp;</span>
4038
- <span class="cline-any cline-neutral">&nbsp;</span>
4039
- <span class="cline-any cline-neutral">&nbsp;</span>
4040
4033
  <span class="cline-any cline-no">&nbsp;</span>
4041
- <span class="cline-any cline-no">&nbsp;</span>
4042
- <span class="cline-any cline-neutral">&nbsp;</span>
4043
4034
  <span class="cline-any cline-neutral">&nbsp;</span>
4044
4035
  <span class="cline-any cline-no">&nbsp;</span>
4045
4036
  <span class="cline-any cline-no">&nbsp;</span>
@@ -4049,11 +4040,13 @@
4049
4040
  <span class="cline-any cline-no">&nbsp;</span>
4050
4041
  <span class="cline-any cline-no">&nbsp;</span>
4051
4042
  <span class="cline-any cline-neutral">&nbsp;</span>
4043
+ <span class="cline-any cline-neutral">&nbsp;</span>
4052
4044
  <span class="cline-any cline-no">&nbsp;</span>
4053
4045
  <span class="cline-any cline-no">&nbsp;</span>
4054
4046
  <span class="cline-any cline-no">&nbsp;</span>
4055
4047
  <span class="cline-any cline-no">&nbsp;</span>
4056
4048
  <span class="cline-any cline-neutral">&nbsp;</span>
4049
+ <span class="cline-any cline-neutral">&nbsp;</span>
4057
4050
  <span class="cline-any cline-no">&nbsp;</span>
4058
4051
  <span class="cline-any cline-no">&nbsp;</span>
4059
4052
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -4076,10 +4069,12 @@
4076
4069
  <span class="cline-any cline-neutral">&nbsp;</span>
4077
4070
  <span class="cline-any cline-neutral">&nbsp;</span>
4078
4071
  <span class="cline-any cline-neutral">&nbsp;</span>
4072
+ <span class="cline-any cline-neutral">&nbsp;</span>
4079
4073
  <span class="cline-any cline-no">&nbsp;</span>
4080
4074
  <span class="cline-any cline-no">&nbsp;</span>
4081
4075
  <span class="cline-any cline-no">&nbsp;</span>
4082
4076
  <span class="cline-any cline-neutral">&nbsp;</span>
4077
+ <span class="cline-any cline-neutral">&nbsp;</span>
4083
4078
  <span class="cline-any cline-no">&nbsp;</span>
4084
4079
  <span class="cline-any cline-no">&nbsp;</span>
4085
4080
  <span class="cline-any cline-no">&nbsp;</span>
@@ -4091,9 +4086,6 @@
4091
4086
  <span class="cline-any cline-neutral">&nbsp;</span>
4092
4087
  <span class="cline-any cline-neutral">&nbsp;</span>
4093
4088
  <span class="cline-any cline-yes">1x</span>
4094
- <span class="cline-any cline-no">&nbsp;</span>
4095
- <span class="cline-any cline-neutral">&nbsp;</span>
4096
- <span class="cline-any cline-no">&nbsp;</span>
4097
4089
  <span class="cline-any cline-neutral">&nbsp;</span>
4098
4090
  <span class="cline-any cline-no">&nbsp;</span>
4099
4091
  <span class="cline-any cline-no">&nbsp;</span>
@@ -4124,6 +4116,7 @@
4124
4116
  <span class="cline-any cline-no">&nbsp;</span>
4125
4117
  <span class="cline-any cline-neutral">&nbsp;</span>
4126
4118
  <span class="cline-any cline-neutral">&nbsp;</span>
4119
+ <span class="cline-any cline-neutral">&nbsp;</span>
4127
4120
  <span class="cline-any cline-no">&nbsp;</span>
4128
4121
  <span class="cline-any cline-no">&nbsp;</span>
4129
4122
  <span class="cline-any cline-no">&nbsp;</span>
@@ -4159,15 +4152,39 @@
4159
4152
  <span class="cline-any cline-neutral">&nbsp;</span>
4160
4153
  <span class="cline-any cline-neutral">&nbsp;</span>
4161
4154
  <span class="cline-any cline-neutral">&nbsp;</span>
4155
+ <span class="cline-any cline-no">&nbsp;</span>
4156
+ <span class="cline-any cline-no">&nbsp;</span>
4157
+ <span class="cline-any cline-no">&nbsp;</span>
4158
+ <span class="cline-any cline-neutral">&nbsp;</span>
4159
+ <span class="cline-any cline-neutral">&nbsp;</span>
4160
+ <span class="cline-any cline-neutral">&nbsp;</span>
4162
4161
  <span class="cline-any cline-neutral">&nbsp;</span>
4163
4162
  <span class="cline-any cline-no">&nbsp;</span>
4164
4163
  <span class="cline-any cline-no">&nbsp;</span>
4164
+ <span class="cline-any cline-neutral">&nbsp;</span>
4165
4165
  <span class="cline-any cline-no">&nbsp;</span>
4166
4166
  <span class="cline-any cline-neutral">&nbsp;</span>
4167
+ <span class="cline-any cline-neutral">&nbsp;</span>
4168
+ <span class="cline-any cline-neutral">&nbsp;</span>
4169
+ <span class="cline-any cline-neutral">&nbsp;</span>
4170
+ <span class="cline-any cline-neutral">&nbsp;</span>
4171
+ <span class="cline-any cline-neutral">&nbsp;</span>
4172
+ <span class="cline-any cline-neutral">&nbsp;</span>
4173
+ <span class="cline-any cline-neutral">&nbsp;</span>
4174
+ <span class="cline-any cline-neutral">&nbsp;</span>
4175
+ <span class="cline-any cline-neutral">&nbsp;</span>
4176
+ <span class="cline-any cline-neutral">&nbsp;</span>
4177
+ <span class="cline-any cline-neutral">&nbsp;</span>
4178
+ <span class="cline-any cline-no">&nbsp;</span>
4179
+ <span class="cline-any cline-no">&nbsp;</span>
4167
4180
  <span class="cline-any cline-no">&nbsp;</span>
4168
4181
  <span class="cline-any cline-neutral">&nbsp;</span>
4169
4182
  <span class="cline-any cline-no">&nbsp;</span>
4183
+ <span class="cline-any cline-neutral">&nbsp;</span>
4184
+ <span class="cline-any cline-neutral">&nbsp;</span>
4170
4185
  <span class="cline-any cline-no">&nbsp;</span>
4186
+ <span class="cline-any cline-neutral">&nbsp;</span>
4187
+ <span class="cline-any cline-neutral">&nbsp;</span>
4171
4188
  <span class="cline-any cline-no">&nbsp;</span>
4172
4189
  <span class="cline-any cline-no">&nbsp;</span>
4173
4190
  <span class="cline-any cline-no">&nbsp;</span>
@@ -4180,6 +4197,7 @@
4180
4197
  <span class="cline-any cline-no">&nbsp;</span>
4181
4198
  <span class="cline-any cline-neutral">&nbsp;</span>
4182
4199
  <span class="cline-any cline-neutral">&nbsp;</span>
4200
+ <span class="cline-any cline-neutral">&nbsp;</span>
4183
4201
  <span class="cline-any cline-no">&nbsp;</span>
4184
4202
  <span class="cline-any cline-no">&nbsp;</span>
4185
4203
  <span class="cline-any cline-no">&nbsp;</span>
@@ -4187,6 +4205,7 @@
4187
4205
  <span class="cline-any cline-no">&nbsp;</span>
4188
4206
  <span class="cline-any cline-neutral">&nbsp;</span>
4189
4207
  <span class="cline-any cline-neutral">&nbsp;</span>
4208
+ <span class="cline-any cline-neutral">&nbsp;</span>
4190
4209
  <span class="cline-any cline-no">&nbsp;</span>
4191
4210
  <span class="cline-any cline-no">&nbsp;</span>
4192
4211
  <span class="cline-any cline-no">&nbsp;</span>
@@ -4260,6 +4279,7 @@
4260
4279
  <span class="cline-any cline-neutral">&nbsp;</span>
4261
4280
  <span class="cline-any cline-no">&nbsp;</span>
4262
4281
  <span class="cline-any cline-neutral">&nbsp;</span>
4282
+ <span class="cline-any cline-neutral">&nbsp;</span>
4263
4283
  <span class="cline-any cline-no">&nbsp;</span>
4264
4284
  <span class="cline-any cline-no">&nbsp;</span>
4265
4285
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -4274,10 +4294,12 @@
4274
4294
  <span class="cline-any cline-neutral">&nbsp;</span>
4275
4295
  <span class="cline-any cline-neutral">&nbsp;</span>
4276
4296
  <span class="cline-any cline-neutral">&nbsp;</span>
4297
+ <span class="cline-any cline-neutral">&nbsp;</span>
4277
4298
  <span class="cline-any cline-no">&nbsp;</span>
4278
4299
  <span class="cline-any cline-no">&nbsp;</span>
4279
4300
  <span class="cline-any cline-no">&nbsp;</span>
4280
4301
  <span class="cline-any cline-neutral">&nbsp;</span>
4302
+ <span class="cline-any cline-neutral">&nbsp;</span>
4281
4303
  <span class="cline-any cline-no">&nbsp;</span>
4282
4304
  <span class="cline-any cline-no">&nbsp;</span>
4283
4305
  <span class="cline-any cline-no">&nbsp;</span>
@@ -4345,8 +4367,6 @@
4345
4367
  <span class="cline-any cline-neutral">&nbsp;</span>
4346
4368
  <span class="cline-any cline-neutral">&nbsp;</span>
4347
4369
  <span class="cline-any cline-no">&nbsp;</span>
4348
- <span class="cline-any cline-no">&nbsp;</span>
4349
- <span class="cline-any cline-neutral">&nbsp;</span>
4350
4370
  <span class="cline-any cline-neutral">&nbsp;</span>
4351
4371
  <span class="cline-any cline-no">&nbsp;</span>
4352
4372
  <span class="cline-any cline-no">&nbsp;</span>
@@ -4633,14 +4653,7 @@
4633
4653
  <span class="cline-any cline-neutral">&nbsp;</span>
4634
4654
  <span class="cline-any cline-neutral">&nbsp;</span>
4635
4655
  <span class="cline-any cline-neutral">&nbsp;</span>
4636
- <span class="cline-any cline-neutral">&nbsp;</span></td><td class="text"><pre class="prettyprint lang-js">import {
4637
- wrapForEachToGenerator as wrapForEach,
4638
- wrapIteratorToGenerator as wrapIterator,
4639
- runGeneratorSync as runSync,
4640
- returnOrigin,
4641
- } from '../utils/time-slicing';
4642
- import type { EmbeddedTSFileGenerator } from '../utils';
4643
- import { FrontendLibrary } from './FrontendLibrary__';
4656
+ <span class="cline-any cline-neutral">&nbsp;</span></td><td class="text"><pre class="prettyprint lang-js">import { FrontendLibrary } from './FrontendLibrary__';
4644
4657
  import {
4645
4658
  TranslatorState,
4646
4659
  shiftState,
@@ -4648,11 +4661,7 @@ import {
4648
4661
  indent,
4649
4662
  createCompilerState,
4650
4663
  embeddedTSEmitter,
4651
- withSourceMapGenerator,
4652
- withGenerator,
4653
- TranslatorGenerator,
4654
4664
  } from '../translator';
4655
- import { waitOqlQueryComponentChildrenFinish } from '../common';
4656
4665
  import Namespace from './Namespace__';
4657
4666
  import CallQueryComponent from './CallQueryComponent__';
4658
4667
  import ForEachStatement from './ForEachStatement__';
@@ -4746,44 +4755,70 @@ export class OverriddenLogic extends BaseNode {
4746
4755
  /**
4747
4756
  * 事务
4748
4757
  */
4749
- @property('Transactional')
4758
+ @property({
4759
+ objectRef: 'Transactional',
4760
+ })
4750
4761
  // @ts-ignore
4751
4762
  transactional!: Transactional;
4752
4763
  &nbsp;
4753
4764
  /**
4754
4765
  * 类型参数列表
4755
4766
  */
4756
- @property('TypeParam')
4767
+ @property({
4768
+ objectRef: 'TypeParam',
4769
+ isArray: true,
4770
+ defaultValue: null,
4771
+ })
4757
4772
  typeParams: Array&lt;TypeParam&gt; = null;
4758
4773
  &nbsp;
4759
4774
  /**
4760
4775
  * 输入参数列表
4761
4776
  */
4762
- @property('Param')
4777
+ @property({
4778
+ objectRef: 'Param',
4779
+ isArray: true,
4780
+ defaultValue: [],
4781
+ })
4763
4782
  params: Array&lt;Param&gt; = [];
4764
4783
  &nbsp;
4765
4784
  /**
4766
4785
  * 输出参数列表
4767
4786
  */
4768
- @property('Return')
4787
+ @property({
4788
+ objectRef: 'Return',
4789
+ isArray: true,
4790
+ defaultValue: [],
4791
+ })
4769
4792
  returns: Array&lt;Return&gt; = [];
4770
4793
  &nbsp;
4771
4794
  /**
4772
4795
  * 变量列表
4773
4796
  */
4774
- @property('Variable')
4797
+ @property({
4798
+ objectRef: 'Variable',
4799
+ isArray: true,
4800
+ defaultValue: [],
4801
+ })
4775
4802
  variables: Array&lt;Variable&gt; = [];
4776
4803
  &nbsp;
4777
4804
  /**
4778
4805
  * 逻辑项列表
4779
4806
  */
4780
- @property('LogicItem')
4807
+ @property({
4808
+ objectRef: 'LogicItem',
4809
+ isArray: true,
4810
+ defaultValue: [],
4811
+ })
4781
4812
  body: Array&lt;LogicItem&gt; = [];
4782
4813
  &nbsp;
4783
4814
  /**
4784
4815
  * 逻辑项列表
4785
4816
  */
4786
- @property('LogicItem')
4817
+ @property({
4818
+ objectRef: 'LogicItem',
4819
+ isArray: true,
4820
+ defaultValue: [],
4821
+ })
4787
4822
  playground: Array&lt;LogicItem&gt; = [];
4788
4823
  &nbsp;
4789
4824
  /**
@@ -4925,7 +4960,7 @@ export class OverriddenLogic extends BaseNode {
4925
4960
  &nbsp;
4926
4961
  <span class="fstat-no" title="function not covered" > getTypeParamExistingNames(</span>excludedList: Array&lt;TypeParam&gt; = <span class="branch-0 cbranch-no" title="branch not covered" >[])</span> {
4927
4962
  const excludedSet = <span class="cstat-no" title="statement not covered" >new Set(excludedList);</span>
4928
- <span class="cstat-no" title="statement not covered" > return ((this.typeParams as TypeParam[]) || []).filter(<span class="fstat-no" title="function not covered" >(i</span>tem) =&gt; <span class="cstat-no" title="statement not covered" >!excludedSet.has(item))</span>.map(<span class="fstat-no" title="function not covered" >(i</span>tem) =&gt; <span class="cstat-no" title="statement not covered" >item?.name)</span>;</span>
4963
+ <span class="cstat-no" title="statement not covered" > return ((this.typeParams as TypeParam[]) || []).filter(<span class="fstat-no" title="function not covered" >(i</span>tem) =&gt; <span class="cstat-no" title="statement not covered" >!excludedSet.has(item))</span>.map(<span class="fstat-no" title="function not covered" >(i</span>tem) =&gt; <span class="cstat-no" title="statement not covered" >item.name)</span>;</span>
4929
4964
  }
4930
4965
  <span class="fstat-no" title="function not covered" > getTypeParamUniqueName(</span>name = <span class="branch-0 cbranch-no" title="branch not covered" >'typeParam1')</span> {
4931
4966
  <span class="cstat-no" title="statement not covered" > return utils.unique(name, this.getTypeParamExistingNames(), undefined, false);</span>
@@ -5764,16 +5799,12 @@ export class OverriddenLogic extends BaseNode {
5764
5799
  // @ts-ignore
5765
5800
  const n = <span class="cstat-no" title="statement not covered" >transactional.__v_raw || transactional;</span>
5766
5801
  <span class="cstat-no" title="statement not covered" > if (Array.isArray((t as any)[parentKey])) {</span>
5767
- // @ts-ignore
5768
- const index = (<span class="cstat-no" title="statement not covered" >t as any)[parentKey].findIndex(<span class="fstat-no" title="function not covered" >(e</span>l) =&gt; <span class="cstat-no" title="statement not covered" >(el.__v_raw || el) === n)</span>;</span>
5802
+ const index = (<span class="cstat-no" title="statement not covered" >t as any)[parentKey].indexOf(n);</span>
5769
5803
  <span class="cstat-no" title="statement not covered" > ~index &amp;&amp; (this as any)[parentKey].splice(index, 1);</span>
5770
5804
  <span class="cstat-no" title="statement not covered" > params.index = index;</span>
5771
- } else {
5772
- const q = (<span class="cstat-no" title="statement not covered" >t as any)[parentKey];</span>
5773
- <span class="cstat-no" title="statement not covered" > if ((q.__v_raw || q) === n) {</span>
5774
- <span class="cstat-no" title="statement not covered" > params.index = 0;</span>
5775
- (<span class="cstat-no" title="statement not covered" >this as any)[parentKey] = undefined;</span>
5776
- }
5805
+ } else <span class="cstat-no" title="statement not covered" >if ((t as any)[parentKey] === n) {</span>
5806
+ <span class="cstat-no" title="statement not covered" > params.index = 0;</span>
5807
+ (<span class="cstat-no" title="statement not covered" >this as any)[parentKey] = undefined;</span>
5777
5808
  }
5778
5809
  }
5779
5810
  <span class="cstat-no" title="statement not covered" > return params;</span>
@@ -5820,16 +5851,12 @@ export class OverriddenLogic extends BaseNode {
5820
5851
  // @ts-ignore
5821
5852
  const n = <span class="cstat-no" title="statement not covered" >typeParam.__v_raw || typeParam;</span>
5822
5853
  <span class="cstat-no" title="statement not covered" > if (Array.isArray((t as any)[parentKey])) {</span>
5823
- // @ts-ignore
5824
- const index = (<span class="cstat-no" title="statement not covered" >t as any)[parentKey].findIndex(<span class="fstat-no" title="function not covered" >(e</span>l) =&gt; <span class="cstat-no" title="statement not covered" >(el.__v_raw || el) === n)</span>;</span>
5854
+ const index = (<span class="cstat-no" title="statement not covered" >t as any)[parentKey].indexOf(n);</span>
5825
5855
  <span class="cstat-no" title="statement not covered" > ~index &amp;&amp; (this as any)[parentKey].splice(index, 1);</span>
5826
5856
  <span class="cstat-no" title="statement not covered" > params.index = index;</span>
5827
- } else {
5828
- const q = (<span class="cstat-no" title="statement not covered" >t as any)[parentKey];</span>
5829
- <span class="cstat-no" title="statement not covered" > if ((q.__v_raw || q) === n) {</span>
5830
- <span class="cstat-no" title="statement not covered" > params.index = 0;</span>
5831
- (<span class="cstat-no" title="statement not covered" >this as any)[parentKey] = undefined;</span>
5832
- }
5857
+ } else <span class="cstat-no" title="statement not covered" >if ((t as any)[parentKey] === n) {</span>
5858
+ <span class="cstat-no" title="statement not covered" > params.index = 0;</span>
5859
+ (<span class="cstat-no" title="statement not covered" >this as any)[parentKey] = undefined;</span>
5833
5860
  }
5834
5861
  }
5835
5862
  <span class="cstat-no" title="statement not covered" > return params;</span>
@@ -5876,16 +5903,12 @@ export class OverriddenLogic extends BaseNode {
5876
5903
  // @ts-ignore
5877
5904
  const n = <span class="cstat-no" title="statement not covered" >param.__v_raw || param;</span>
5878
5905
  <span class="cstat-no" title="statement not covered" > if (Array.isArray((t as any)[parentKey])) {</span>
5879
- // @ts-ignore
5880
- const index = (<span class="cstat-no" title="statement not covered" >t as any)[parentKey].findIndex(<span class="fstat-no" title="function not covered" >(e</span>l) =&gt; <span class="cstat-no" title="statement not covered" >(el.__v_raw || el) === n)</span>;</span>
5906
+ const index = (<span class="cstat-no" title="statement not covered" >t as any)[parentKey].indexOf(n);</span>
5881
5907
  <span class="cstat-no" title="statement not covered" > ~index &amp;&amp; (this as any)[parentKey].splice(index, 1);</span>
5882
5908
  <span class="cstat-no" title="statement not covered" > params.index = index;</span>
5883
- } else {
5884
- const q = (<span class="cstat-no" title="statement not covered" >t as any)[parentKey];</span>
5885
- <span class="cstat-no" title="statement not covered" > if ((q.__v_raw || q) === n) {</span>
5886
- <span class="cstat-no" title="statement not covered" > params.index = 0;</span>
5887
- (<span class="cstat-no" title="statement not covered" >this as any)[parentKey] = undefined;</span>
5888
- }
5909
+ } else <span class="cstat-no" title="statement not covered" >if ((t as any)[parentKey] === n) {</span>
5910
+ <span class="cstat-no" title="statement not covered" > params.index = 0;</span>
5911
+ (<span class="cstat-no" title="statement not covered" >this as any)[parentKey] = undefined;</span>
5889
5912
  }
5890
5913
  }
5891
5914
  <span class="cstat-no" title="statement not covered" > return params;</span>
@@ -5932,16 +5955,12 @@ export class OverriddenLogic extends BaseNode {
5932
5955
  // @ts-ignore
5933
5956
  const n = <span class="cstat-no" title="statement not covered" >ret.__v_raw || ret;</span>
5934
5957
  <span class="cstat-no" title="statement not covered" > if (Array.isArray((t as any)[parentKey])) {</span>
5935
- // @ts-ignore
5936
- const index = (<span class="cstat-no" title="statement not covered" >t as any)[parentKey].findIndex(<span class="fstat-no" title="function not covered" >(e</span>l) =&gt; <span class="cstat-no" title="statement not covered" >(el.__v_raw || el) === n)</span>;</span>
5958
+ const index = (<span class="cstat-no" title="statement not covered" >t as any)[parentKey].indexOf(n);</span>
5937
5959
  <span class="cstat-no" title="statement not covered" > ~index &amp;&amp; (this as any)[parentKey].splice(index, 1);</span>
5938
5960
  <span class="cstat-no" title="statement not covered" > params.index = index;</span>
5939
- } else {
5940
- const q = (<span class="cstat-no" title="statement not covered" >t as any)[parentKey];</span>
5941
- <span class="cstat-no" title="statement not covered" > if ((q.__v_raw || q) === n) {</span>
5942
- <span class="cstat-no" title="statement not covered" > params.index = 0;</span>
5943
- (<span class="cstat-no" title="statement not covered" >this as any)[parentKey] = undefined;</span>
5944
- }
5961
+ } else <span class="cstat-no" title="statement not covered" >if ((t as any)[parentKey] === n) {</span>
5962
+ <span class="cstat-no" title="statement not covered" > params.index = 0;</span>
5963
+ (<span class="cstat-no" title="statement not covered" >this as any)[parentKey] = undefined;</span>
5945
5964
  }
5946
5965
  }
5947
5966
  <span class="cstat-no" title="statement not covered" > return params;</span>
@@ -5988,16 +6007,12 @@ export class OverriddenLogic extends BaseNode {
5988
6007
  // @ts-ignore
5989
6008
  const n = <span class="cstat-no" title="statement not covered" >variable.__v_raw || variable;</span>
5990
6009
  <span class="cstat-no" title="statement not covered" > if (Array.isArray((t as any)[parentKey])) {</span>
5991
- // @ts-ignore
5992
- const index = (<span class="cstat-no" title="statement not covered" >t as any)[parentKey].findIndex(<span class="fstat-no" title="function not covered" >(e</span>l) =&gt; <span class="cstat-no" title="statement not covered" >(el.__v_raw || el) === n)</span>;</span>
6010
+ const index = (<span class="cstat-no" title="statement not covered" >t as any)[parentKey].indexOf(n);</span>
5993
6011
  <span class="cstat-no" title="statement not covered" > ~index &amp;&amp; (this as any)[parentKey].splice(index, 1);</span>
5994
6012
  <span class="cstat-no" title="statement not covered" > params.index = index;</span>
5995
- } else {
5996
- const q = (<span class="cstat-no" title="statement not covered" >t as any)[parentKey];</span>
5997
- <span class="cstat-no" title="statement not covered" > if ((q.__v_raw || q) === n) {</span>
5998
- <span class="cstat-no" title="statement not covered" > params.index = 0;</span>
5999
- (<span class="cstat-no" title="statement not covered" >this as any)[parentKey] = undefined;</span>
6000
- }
6013
+ } else <span class="cstat-no" title="statement not covered" >if ((t as any)[parentKey] === n) {</span>
6014
+ <span class="cstat-no" title="statement not covered" > params.index = 0;</span>
6015
+ (<span class="cstat-no" title="statement not covered" >this as any)[parentKey] = undefined;</span>
6001
6016
  }
6002
6017
  }
6003
6018
  <span class="cstat-no" title="statement not covered" > return params;</span>
@@ -6041,16 +6056,12 @@ export class OverriddenLogic extends BaseNode {
6041
6056
  // @ts-ignore
6042
6057
  const n = <span class="cstat-no" title="statement not covered" >logicItem.__v_raw || logicItem;</span>
6043
6058
  <span class="cstat-no" title="statement not covered" > if (Array.isArray((t as any)[parentKey])) {</span>
6044
- // @ts-ignore
6045
- const index = (<span class="cstat-no" title="statement not covered" >t as any)[parentKey].findIndex(<span class="fstat-no" title="function not covered" >(e</span>l) =&gt; <span class="cstat-no" title="statement not covered" >(el.__v_raw || el) === n)</span>;</span>
6059
+ const index = (<span class="cstat-no" title="statement not covered" >t as any)[parentKey].indexOf(n);</span>
6046
6060
  <span class="cstat-no" title="statement not covered" > ~index &amp;&amp; (this as any)[parentKey].splice(index, 1);</span>
6047
6061
  <span class="cstat-no" title="statement not covered" > params.index = index;</span>
6048
- } else {
6049
- const q = (<span class="cstat-no" title="statement not covered" >t as any)[parentKey];</span>
6050
- <span class="cstat-no" title="statement not covered" > if ((q.__v_raw || q) === n) {</span>
6051
- <span class="cstat-no" title="statement not covered" > params.index = 0;</span>
6052
- (<span class="cstat-no" title="statement not covered" >this as any)[parentKey] = undefined;</span>
6053
- }
6062
+ } else <span class="cstat-no" title="statement not covered" >if ((t as any)[parentKey] === n) {</span>
6063
+ <span class="cstat-no" title="statement not covered" > params.index = 0;</span>
6064
+ (<span class="cstat-no" title="statement not covered" >this as any)[parentKey] = undefined;</span>
6054
6065
  }
6055
6066
  }
6056
6067
  <span class="cstat-no" title="statement not covered" > return params;</span>
@@ -6307,181 +6318,199 @@ export class OverriddenLogic extends BaseNode {
6307
6318
  };
6308
6319
  }
6309
6320
  &nbsp;
6310
- @withSourceMapGenerator
6311
- <span class="fstat-no" title="function not covered" > *t</span>oEmbeddedTSInProcess(
6312
- state = <span class="branch-0 cbranch-no" title="branch not covered" >createCompilerState(),</span>
6313
- prependCode?: string,
6314
- noName?: boolean,
6315
- prefix?: boolean,
6316
- ): TranslatorGenerator {
6317
- const self = <span class="cstat-no" title="statement not covered" >this;</span>
6321
+ @withSourceMap()
6322
+ <span class="fstat-no" title="function not covered" > toEmbeddedTSInProcess(</span>state?: TranslatorState, prependCode?: string, noName?: boolean, prefix?: boolean): string {
6318
6323
  let code = <span class="cstat-no" title="statement not covered" >'';</span>
6319
- <span class="cstat-no" title="statement not covered" > if (!prefix) <span class="cstat-no" title="statement not covered" >code += `${noName ? '' : `${self.name}:`} function(`;</span></span>
6320
- else <span class="cstat-no" title="statement not covered" >code += `function ${self.name}(`; </span>// 加空格会导致无法查询到引用
6321
- <span class="cstat-no" title="statement not covered" > yield* wrapForEach(</span>
6322
- // 加空格会导致无法查询到引用
6323
- self.params,
6324
- function* <span class="fstat-no" title="function not covered" >warpForEachGenerator(</span>param, index) {
6325
- <span class="cstat-no" title="statement not covered" > code += yield* param.toEmbeddedTS(shiftState(state, code, { inline: true }));</span>
6326
- <span class="cstat-no" title="statement not covered" > if (index !== self.params.length - 1) <span class="cstat-no" title="statement not covered" >code += ', ';</span></span>
6327
- },
6328
- );
6324
+ <span class="cstat-no" title="statement not covered" > if (!prefix) <span class="cstat-no" title="statement not covered" >code += `${noName ? '' : `${this.name}:`} function(`;</span></span>
6325
+ else <span class="cstat-no" title="statement not covered" >code += `function ${this.name}(`; </span>// 加空格会导致无法查询到引用
6326
+ <span class="cstat-no" title="statement not covered" > this.params.forEach(<span class="fstat-no" title="function not covered" >(p</span>aram, index) =&gt; {</span>
6327
+ <span class="cstat-no" title="statement not covered" > code += param.toEmbeddedTS(shiftState(state, code, { inline: true }));</span>
6328
+ <span class="cstat-no" title="statement not covered" > if (index !== this.params.length - 1) <span class="cstat-no" title="statement not covered" >code += ', ';</span></span>
6329
+ });
6329
6330
  <span class="cstat-no" title="statement not covered" > code += `) {\n`;</span>
6330
6331
  <span class="cstat-no" title="statement not covered" > code += prependCode || '';</span>
6331
6332
  <span class="cstat-no" title="statement not covered" > code += '\n';</span>
6332
- <span class="cstat-no" title="statement not covered" > yield* wrapForEach(self.variables, function* <span class="fstat-no" title="function not covered" >warpForEachGenerator(</span>variable) {</span>
6333
+ <span class="cstat-no" title="statement not covered" > this.variables.forEach(<span class="fstat-no" title="function not covered" >(v</span>ariable) =&gt; {</span>
6333
6334
  <span class="cstat-no" title="statement not covered" > code += `${indent((state?.tabSize || 0) + 1)}let `;</span>
6334
- <span class="cstat-no" title="statement not covered" > code += yield* variable.toEmbeddedTS(shiftState(state, code, { inline: true }));</span>
6335
+ <span class="cstat-no" title="statement not covered" > code += variable.toEmbeddedTS(shiftState(state, code, { inline: true }));</span>
6335
6336
  <span class="cstat-no" title="statement not covered" > code += ';\n';</span>
6336
6337
  });
6337
- <span class="cstat-no" title="statement not covered" > yield* wrapForEach(self.returns, function* <span class="fstat-no" title="function not covered" >warpForEachGenerator(</span>ret) {</span>
6338
+ &nbsp;
6339
+ <span class="cstat-no" title="statement not covered" > this.returns.forEach(<span class="fstat-no" title="function not covered" >(r</span>et) =&gt; {</span>
6338
6340
  <span class="cstat-no" title="statement not covered" > code += `${indent((state?.tabSize || 0) + 1)}let `;</span>
6339
- <span class="cstat-no" title="statement not covered" > code += yield* ret.toEmbeddedTS(shiftState(state, code, { inline: true }));</span>
6341
+ <span class="cstat-no" title="statement not covered" > code += ret.toEmbeddedTS(shiftState(state, code, { inline: true }));</span>
6340
6342
  <span class="cstat-no" title="statement not covered" > code += ';\n';</span>
6341
6343
  });
6342
- <span class="cstat-no" title="statement not covered" > if (!self.body.length &amp;&amp; self.returns.length) {</span>
6343
- <span class="cstat-no" title="statement not covered" > code += `${indent((state?.tabSize || 0) + 1)}return ${self.returns[0].name};\n`;</span>
6344
+ &nbsp;
6345
+ <span class="cstat-no" title="statement not covered" > if (!this.body.length &amp;&amp; this.returns.length) {</span>
6346
+ <span class="cstat-no" title="statement not covered" > code += `${indent((state?.tabSize || 0) + 1)}return ${this.returns[0].name};\n`;</span>
6344
6347
  } else {
6345
- <span class="cstat-no" title="statement not covered" > if ((self.parentNode as any).type === 'ExclusiveGateway') {</span>
6346
- <span class="cstat-no" title="statement not covered" > if (self.body.length &lt;= 1) {</span>
6348
+ <span class="cstat-no" title="statement not covered" > if ((this.parentNode as any).type === 'ExclusiveGateway') {</span>
6349
+ <span class="cstat-no" title="statement not covered" > if (this.body.length &lt;= 1) {</span>
6347
6350
  <span class="cstat-no" title="statement not covered" > code += indent((state?.tabSize || 0) + 1);</span>
6348
6351
  <span class="cstat-no" title="statement not covered" > code += 'const __LogicEmpty: any = null;';</span>
6349
6352
  }
6350
6353
  } else <span class="cstat-no" title="statement not covered" >if (</span>
6351
- self.body.length &lt;= 2 &amp;&amp;
6352
- !(self.parentNode instanceof Namespace) &amp;&amp;
6353
- !(self.parentNode instanceof Process)
6354
+ this.body.length &lt;= 2 &amp;&amp;
6355
+ !(this.parentNode instanceof Namespace) &amp;&amp;
6356
+ !(this.parentNode instanceof Process)
6354
6357
  ) {
6355
6358
  <span class="cstat-no" title="statement not covered" > code += indent((state?.tabSize || 0) + 1);</span>
6356
6359
  <span class="cstat-no" title="statement not covered" > code += `${indent(state?.tabSize || 0 + 4)}const __LogicEmpty: any = null;`;</span>
6357
6360
  }
6358
- <span class="cstat-no" title="statement not covered" > yield* wrapForEach(self.body, function* <span class="fstat-no" title="function not covered" >warpForEachGenerator(</span>item) {</span>
6359
- <span class="cstat-no" title="statement not covered" > code += yield* item.toEmbeddedTS?.(shiftState(state, code, { tabSize: (state?.tabSize || 0) + 1 })) ?? returnOrigin('');</span>
6361
+ <span class="cstat-no" title="statement not covered" > this.body.forEach(<span class="fstat-no" title="function not covered" >(i</span>tem) =&gt; {</span>
6362
+ <span class="cstat-no" title="statement not covered" > code += item.toEmbeddedTS &amp;&amp; item.toEmbeddedTS(shiftState(state, code, { tabSize: (state?.tabSize || 0) + 1 }));</span>
6360
6363
  <span class="cstat-no" title="statement not covered" > code += ';\n';</span>
6361
6364
  });
6362
6365
  }
6366
+ &nbsp;
6363
6367
  // 在body渲染完成之后把其余的节点放到下面
6364
- <span class="cstat-no" title="statement not covered" > yield* wrapForEach(self.playground, function* <span class="fstat-no" title="function not covered" >warpForEachGenerator(</span>item) {</span>
6365
- <span class="cstat-no" title="statement not covered" > code += yield* item.toEmbeddedTS(shiftState(state, code, { tabSize: (state?.tabSize || 0) + 1 }));</span>
6368
+ <span class="cstat-no" title="statement not covered" > this.playground.forEach(<span class="fstat-no" title="function not covered" >(i</span>tem) =&gt; {</span>
6369
+ <span class="cstat-no" title="statement not covered" > code += item.toEmbeddedTS(shiftState(state, code, { tabSize: (state?.tabSize || 0) + 1 }));</span>
6366
6370
  <span class="cstat-no" title="statement not covered" > code += '\n';</span>
6367
6371
  });
6372
+ &nbsp;
6368
6373
  <span class="cstat-no" title="statement not covered" > code += `${indent(state?.tabSize || 0 + 4)}}`;</span>
6369
6374
  <span class="cstat-no" title="statement not covered" > code += '\n';</span>
6370
6375
  <span class="cstat-no" title="statement not covered" > return code;</span>
6371
6376
  }
6372
6377
  &nbsp;
6373
6378
  <span class="fstat-no" title="function not covered" > toEmbeddedTSNoExport(</span>state?: TranslatorState): string {
6374
- <span class="cstat-no" title="statement not covered" > return runSync(this.toEmbeddedTS(state, 'noExport'));</span>
6379
+ <span class="cstat-no" title="statement not covered" > return this.toEmbeddedTS(state, 'noExport');</span>
6375
6380
  }
6376
6381
  &nbsp;
6377
- @withSourceMapGenerator
6378
- <span class="fstat-no" title="function not covered" > *t</span>oEmbeddedTS(state = <span class="branch-0 cbranch-no" title="branch not covered" >createCompilerState(),</span> prefix?: string): TranslatorGenerator {
6379
- const self = <span class="cstat-no" title="statement not covered" >this;</span>
6380
- // 等待 oql 查询返回内容
6381
- <span class="cstat-no" title="statement not covered" > yield waitOqlQueryComponentChildrenFinish(self);</span>
6382
+ @withSourceMap()
6383
+ <span class="fstat-no" title="function not covered" > toEmbeddedTS(</span>state?: TranslatorState, prefix?: string): string {
6382
6384
  // 如果传了不要前缀那就为空， 要不用传进来的，要是都没有就默认导出
6383
6385
  let code = <span class="cstat-no" title="statement not covered" >'';</span>
6384
6386
  <span class="cstat-no" title="statement not covered" > if (!prefix) {</span>
6385
- <span class="cstat-no" title="statement not covered" > code += `export function ${self.name}`;</span>
6387
+ <span class="cstat-no" title="statement not covered" > code += `export function ${this.name}`;</span>
6386
6388
  } else <span class="cstat-no" title="statement not covered" >if (prefix === 'noExport') {</span>
6387
- <span class="cstat-no" title="statement not covered" > code += `function ${self.name}`;</span>
6389
+ <span class="cstat-no" title="statement not covered" > code += `function ${this.name}`;</span>
6388
6390
  } else <span class="cstat-no" title="statement not covered" >if (prefix === 'inObject') {</span>
6389
- <span class="cstat-no" title="statement not covered" > code += `${self.name}`;</span>
6391
+ <span class="cstat-no" title="statement not covered" > code += `${this.name}`;</span>
6390
6392
  }
6391
- <span class="cstat-no" title="statement not covered" > if (self.typeParams?.length) {</span>
6393
+ <span class="cstat-no" title="statement not covered" > if (this.typeParams?.length) {</span>
6392
6394
  <span class="cstat-no" title="statement not covered" > code += '&lt;';</span>
6393
- <span class="cstat-no" title="statement not covered" > yield* wrapForEach(self.typeParams, function* <span class="fstat-no" title="function not covered" >warpForEachGenerator(</span>typeParam, typeParamIndex) {</span>
6394
- <span class="cstat-no" title="statement not covered" > code += yield* typeParam.toEmbeddedTS(shiftState(state, code, { inline: true }));</span>
6395
- <span class="cstat-no" title="statement not covered" > if (typeParamIndex !== self.typeParams.length - 1) <span class="cstat-no" title="statement not covered" >code += ', ';</span></span>
6395
+ <span class="cstat-no" title="statement not covered" > this.typeParams.forEach(<span class="fstat-no" title="function not covered" >(t</span>ypeParam, typeParamIndex) =&gt; {</span>
6396
+ <span class="cstat-no" title="statement not covered" > code += typeParam.toEmbeddedTS(shiftState(state, code, { inline: true }));</span>
6397
+ <span class="cstat-no" title="statement not covered" > if (typeParamIndex !== this.typeParams.length - 1) <span class="cstat-no" title="statement not covered" >code += ', ';</span></span>
6396
6398
  });
6397
6399
  <span class="cstat-no" title="statement not covered" > code += '&gt;';</span>
6398
6400
  }
6399
6401
  // 有参数长度
6400
- <span class="cstat-no" title="statement not covered" > if (self.params.length) {</span>
6402
+ <span class="cstat-no" title="statement not covered" > if (this.params.length) {</span>
6401
6403
  <span class="cstat-no" title="statement not covered" > code += '(';</span>
6402
- <span class="cstat-no" title="statement not covered" > yield* wrapForEach(self.params, function* <span class="fstat-no" title="function not covered" >warpForEachGenerator(</span>param, index) {</span>
6403
- <span class="cstat-no" title="statement not covered" > code += yield* param.toEmbeddedTS(shiftState(state, code));</span>
6404
- <span class="cstat-no" title="statement not covered" > if (index !== self.params.length - 1) <span class="cstat-no" title="statement not covered" >code += ', ';</span></span>
6404
+ <span class="cstat-no" title="statement not covered" > this.params.forEach(<span class="fstat-no" title="function not covered" >(p</span>aram, index) =&gt; {</span>
6405
+ <span class="cstat-no" title="statement not covered" > code += param.toEmbeddedTS(shiftState(state, code));</span>
6406
+ <span class="cstat-no" title="statement not covered" > if (index !== this.params.length - 1) <span class="cstat-no" title="statement not covered" >code += ', ';</span></span>
6405
6407
  });
6406
6408
  <span class="cstat-no" title="statement not covered" > code += ')';</span>
6407
6409
  } else {
6408
6410
  // 没有参数的
6409
6411
  <span class="cstat-no" title="statement not covered" > code += '()';</span>
6410
6412
  }
6413
+ &nbsp;
6411
6414
  // 需要类型推导的局部变量/返回值需要调整申明顺序
6412
6415
  const advanceMap: Map&lt;Return | Variable, Assignment | BatchAssignment&gt; = <span class="cstat-no" title="statement not covered" >new Map();</span>
6413
6416
  const needGetSourceMapOqlList: Promise&lt;any&gt;[] = <span class="cstat-no" title="statement not covered" >[];</span>
6414
- <span class="cstat-no" title="statement not covered" > yield* self.traverseChildrenGenerator(function* <span class="fstat-no" title="function not covered" >traverseChildrenGenerator(</span>el) {</span>
6417
+ <span class="cstat-no" title="statement not covered" > this.traverseChildren(<span class="fstat-no" title="function not covered" >(e</span>l) =&gt; {</span>
6415
6418
  <span class="cstat-no" title="statement not covered" > if (el &amp;&amp; (el instanceof BatchAssignment || (el instanceof Assignment &amp;&amp; el.left?.name))) {</span>
6416
6419
  <span class="cstat-no" title="statement not covered" > if (el instanceof Assignment) {</span>
6417
- const advanceVar = <span class="cstat-no" title="statement not covered" >self.variables?.find(</span>
6420
+ const advanceVar = <span class="cstat-no" title="statement not covered" >this.variables?.find(</span>
6418
6421
  <span class="fstat-no" title="function not covered" > (v</span>ariable) =&gt; <span class="cstat-no" title="statement not covered" >!variable.typeAnnotation &amp;&amp; el.left?.name === variable.name,</span>
6419
6422
  );
6420
6423
  <span class="cstat-no" title="statement not covered" > if (advanceVar &amp;&amp; !advanceMap.get(advanceVar)) {</span>
6421
6424
  <span class="cstat-no" title="statement not covered" > advanceMap.set(advanceVar, el);</span>
6422
6425
  }
6423
- const advanceRn = <span class="cstat-no" title="statement not covered" >self.returns?.find(<span class="fstat-no" title="function not covered" >(r</span>et) =&gt; <span class="cstat-no" title="statement not covered" >!ret.typeAnnotation &amp;&amp; el.left?.name === ret.name)</span>;</span>
6426
+ const advanceRn = <span class="cstat-no" title="statement not covered" >this.returns?.find(<span class="fstat-no" title="function not covered" >(r</span>et) =&gt; <span class="cstat-no" title="statement not covered" >!ret.typeAnnotation &amp;&amp; el.left?.name === ret.name)</span>;</span>
6424
6427
  <span class="cstat-no" title="statement not covered" > if (advanceRn &amp;&amp; !advanceMap.get(advanceRn)) {</span>
6425
6428
  <span class="cstat-no" title="statement not covered" > advanceMap.set(advanceRn, el);</span>
6426
6429
  }
6427
6430
  } else <span class="cstat-no" title="statement not covered" >if (el instanceof BatchAssignment) {</span>
6428
- <span class="cstat-no" title="statement not covered" > yield* wrapForEach(el.assignmentLines, function* <span class="fstat-no" title="function not covered" >warpForEachGenerator(</span>{ leftIndex }) {</span>
6431
+ <span class="cstat-no" title="statement not covered" > el.assignmentLines.forEach(<span class="fstat-no" title="function not covered" >({</span> leftIndex }) =&gt; {</span>
6429
6432
  const leftCode =
6430
6433
  <span class="cstat-no" title="statement not covered" > leftIndex.length === 1</span>
6431
- ? yield* el.left.expression.toEmbeddedTS(shiftState(state, code, { inline: true }))
6432
- : yield* el.left.members[leftIndex[1]]?.toEmbeddedTS(shiftState(state, code, { inline: true })) ?? returnOrigin('');
6433
- const advanceVar = <span class="cstat-no" title="statement not covered" >self.variables?.find(</span>
6434
+ ? el.left.expression.toEmbeddedTS(shiftState(state, code, { inline: true }))
6435
+ : el.left.members[leftIndex[1]]?.toEmbeddedTS(shiftState(state, code, { inline: true }));
6436
+ const advanceVar = <span class="cstat-no" title="statement not covered" >this.variables?.find(</span>
6434
6437
  <span class="fstat-no" title="function not covered" > (v</span>ariable) =&gt; <span class="cstat-no" title="statement not covered" >!variable.typeAnnotation &amp;&amp; leftCode === variable.name,</span>
6435
6438
  );
6436
6439
  <span class="cstat-no" title="statement not covered" > if (advanceVar &amp;&amp; !advanceMap.get(advanceVar)) {</span>
6437
6440
  <span class="cstat-no" title="statement not covered" > advanceMap.set(advanceVar, el);</span>
6438
6441
  }
6439
- const advanceRn = <span class="cstat-no" title="statement not covered" >self.returns?.find(<span class="fstat-no" title="function not covered" >(r</span>et) =&gt; <span class="cstat-no" title="statement not covered" >!ret.typeAnnotation &amp;&amp; leftCode === ret.name)</span>;</span>
6442
+ const advanceRn = <span class="cstat-no" title="statement not covered" >this.returns?.find(<span class="fstat-no" title="function not covered" >(r</span>et) =&gt; <span class="cstat-no" title="statement not covered" >!ret.typeAnnotation &amp;&amp; leftCode === ret.name)</span>;</span>
6440
6443
  <span class="cstat-no" title="statement not covered" > if (advanceRn &amp;&amp; !advanceMap.get(advanceRn)) {</span>
6441
6444
  <span class="cstat-no" title="statement not covered" > advanceMap.set(advanceRn, el);</span>
6442
6445
  }
6443
6446
  });
6444
6447
  }
6445
6448
  }
6449
+ // 如果有sql查询组件就需要把他们存起来
6450
+ <span class="cstat-no" title="statement not covered" > if (el instanceof OqlQueryComponent) {</span>
6451
+ <span class="cstat-no" title="statement not covered" > if (!el.codeSourceMap) {</span>
6452
+ <span class="cstat-no" title="statement not covered" > needGetSourceMapOqlList.push(el.requestEmbeddedTS());</span>
6453
+ }
6454
+ }
6446
6455
  });
6456
+ &nbsp;
6457
+ <span class="cstat-no" title="statement not covered" > if (needGetSourceMapOqlList.length) {</span>
6458
+ <span class="cstat-no" title="statement not covered" > Promise.all(needGetSourceMapOqlList).then(<span class="fstat-no" title="function not covered" >() =</span>&gt; {</span>
6459
+ // 触发一下更新重新生成代码
6460
+ (<span class="cstat-no" title="statement not covered" >this.app as any)?.naslServer?.embeddedTSEmitter.emit('change', {</span>
6461
+ value: [
6462
+ {
6463
+ originEvent: {
6464
+ action: 'update',
6465
+ target: this,
6466
+ },
6467
+ },
6468
+ ],
6469
+ });
6470
+ });
6471
+ }
6447
6472
  // 兼容 return 没有类型情况
6448
- <span class="cstat-no" title="statement not covered" > if (self.returns.length &amp;&amp; self.returns[0].typeAnnotation) {</span>
6473
+ <span class="cstat-no" title="statement not covered" > if (this.returns.length &amp;&amp; this.returns[0].typeAnnotation) {</span>
6449
6474
  <span class="cstat-no" title="statement not covered" > code += ': ';</span>
6450
- <span class="cstat-no" title="statement not covered" > code += yield* self.returns[0].typeAnnotation?.toEmbeddedTS(shiftState(state, code, { inline: true })) ?? returnOrigin('');</span>
6475
+ <span class="cstat-no" title="statement not covered" > code += this.returns[0].typeAnnotation?.toEmbeddedTS(shiftState(state, code, { inline: true }));</span>
6451
6476
  }
6452
6477
  <span class="cstat-no" title="statement not covered" > code += '{\n';</span>
6478
+ &nbsp;
6453
6479
  // 用于虚拟节点的查找引用
6454
- <span class="cstat-no" title="statement not covered" > if (Array.isArray(self.virtualParams)) {</span>
6455
- <span class="cstat-no" title="statement not covered" > for (const param of self.virtualParams) {</span>
6480
+ <span class="cstat-no" title="statement not covered" > this.virtualParams &amp;&amp;</span>
6481
+ Array.isArray(this.virtualParams) &amp;&amp;
6482
+ this.virtualParams.forEach(<span class="fstat-no" title="function not covered" >(p</span>aram) =&gt; {
6456
6483
  <span class="cstat-no" title="statement not covered" > code += indent((state?.tabSize || 0) + 1);</span>
6457
- <span class="cstat-no" title="statement not covered" > code += yield* param.toEmbeddedNameTS(shiftState(state, code, { inline: true }));</span>
6484
+ <span class="cstat-no" title="statement not covered" > code += param.toEmbeddedNameTS(shiftState(state, code, { inline: true }));</span>
6458
6485
  <span class="cstat-no" title="statement not covered" > code += '\n';</span>
6459
- }
6460
- }
6461
- <span class="cstat-no" title="statement not covered" > yield* wrapForEach(self.variables, function* <span class="fstat-no" title="function not covered" >warpForEachGenerator(</span>variable) {</span>
6486
+ });
6487
+ &nbsp;
6488
+ <span class="cstat-no" title="statement not covered" > this.variables.forEach(<span class="fstat-no" title="function not covered" >(v</span>ariable) =&gt; {</span>
6462
6489
  <span class="cstat-no" title="statement not covered" > if (!advanceMap.get(variable)) {</span>
6463
6490
  <span class="cstat-no" title="statement not covered" > code += `${indent((state?.tabSize || 0) + 1)}let `;</span>
6464
- <span class="cstat-no" title="statement not covered" > code += yield* variable.toEmbeddedTS(shiftState(state, code, { inline: true }));</span>
6491
+ <span class="cstat-no" title="statement not covered" > code += variable.toEmbeddedTS(shiftState(state, code, { inline: true }));</span>
6465
6492
  <span class="cstat-no" title="statement not covered" > code += ';\n';</span>
6466
6493
  }
6467
6494
  });
6468
- <span class="cstat-no" title="statement not covered" > yield* wrapForEach(self.returns, function* <span class="fstat-no" title="function not covered" >warpForEachGenerator(</span>ret) {</span>
6495
+ &nbsp;
6496
+ <span class="cstat-no" title="statement not covered" > this.returns.forEach(<span class="fstat-no" title="function not covered" >(r</span>et) =&gt; {</span>
6469
6497
  <span class="cstat-no" title="statement not covered" > if (!advanceMap.get(ret)) {</span>
6470
6498
  <span class="cstat-no" title="statement not covered" > code += `${indent((state?.tabSize || 0) + 1)}let `;</span>
6471
- <span class="cstat-no" title="statement not covered" > code += yield* ret.toEmbeddedTS(shiftState(state, code, { inline: true }));</span>
6499
+ <span class="cstat-no" title="statement not covered" > code += ret.toEmbeddedTS(shiftState(state, code, { inline: true }));</span>
6472
6500
  <span class="cstat-no" title="statement not covered" > code += ';\n';</span>
6473
6501
  }
6474
6502
  });
6475
- <span class="cstat-no" title="statement not covered" > yield* wrapIterator(advanceMap.entries(), function* <span class="fstat-no" title="function not covered" >warpForEachGenerator(</span>[node, assignment]) {</span>
6503
+ &nbsp;
6504
+ <span class="cstat-no" title="statement not covered" > advanceMap.forEach(<span class="fstat-no" title="function not covered" >(a</span>ssignment, node) =&gt; {</span>
6476
6505
  <span class="cstat-no" title="statement not covered" > code += `${indent((state?.tabSize || 0) + 1)}// @ts-ignore\n`;</span>
6477
6506
  <span class="cstat-no" title="statement not covered" > code += `${indent((state?.tabSize || 0) + 1)}let `;</span>
6478
- <span class="cstat-no" title="statement not covered" > code += yield* node.toEmbeddedTS(shiftState(state, code, { inline: true }));</span>
6507
+ <span class="cstat-no" title="statement not covered" > code += node.toEmbeddedTS(shiftState(state, code, { inline: true }));</span>
6479
6508
  <span class="cstat-no" title="statement not covered" > if (assignment instanceof BatchAssignment) {</span>
6480
- <span class="cstat-no" title="statement not covered" > yield* wrapForEach(assignment.assignmentLines, function* <span class="fstat-no" title="function not covered" >warpForEachGenerator(</span>{ leftIndex, rightIndex }) {</span>
6509
+ <span class="cstat-no" title="statement not covered" > assignment.assignmentLines.forEach(<span class="fstat-no" title="function not covered" >({</span> leftIndex, rightIndex }) =&gt; {</span>
6481
6510
  const leftCode =
6482
6511
  <span class="cstat-no" title="statement not covered" > leftIndex.length === 1</span>
6483
- ? yield* assignment.left.expression.toEmbeddedTS(shiftState(state, code, { inline: true }))
6484
- : yield* assignment.left.members[leftIndex[1]]?.toEmbeddedTS(shiftState(state, code, { inline: true })) ?? returnOrigin('');
6512
+ ? assignment.left.expression.toEmbeddedTS(shiftState(state, code, { inline: true }))
6513
+ : assignment.left.members[leftIndex[1]]?.toEmbeddedTS(shiftState(state, code, { inline: true }));
6485
6514
  <span class="cstat-no" title="statement not covered" > if (leftCode === node.name) {</span>
6486
6515
  const rightNode: any =
6487
6516
  <span class="cstat-no" title="statement not covered" > rightIndex.length === 1</span>
@@ -6493,11 +6522,11 @@ export class OverriddenLogic extends BaseNode {
6493
6522
  !(rightNode instanceof CallQueryComponent &amp;&amp; rightNode.ideVersion !== '2.11')
6494
6523
  ) {
6495
6524
  <span class="cstat-no" title="statement not covered" > code += ': ';</span>
6496
- <span class="cstat-no" title="statement not covered" > code += yield* rightNode.typeAnnotation?.toEmbeddedTS(shiftState(state, code, { inline: true })) ?? returnOrigin('null');</span>
6525
+ <span class="cstat-no" title="statement not covered" > code += rightNode.typeAnnotation?.toEmbeddedTS(shiftState(state, code, { inline: true })) || 'null';</span>
6497
6526
  } else {
6498
6527
  <span class="cstat-no" title="statement not covered" > code += ' = ';</span>
6499
- const rightCode = <span class="cstat-no" title="statement not covered" >yield* rightNode?.toEmbeddedTS(shiftState(state, code, { inline: true })) ?? returnOrigin('');</span>
6500
- <span class="cstat-no" title="statement not covered" > code += yield* self.getRightCode(rightCode, assignment, rightNode);</span>
6528
+ const rightCode = <span class="cstat-no" title="statement not covered" >rightNode?.toEmbeddedTS(shiftState(state, code, { inline: true }));</span>
6529
+ <span class="cstat-no" title="statement not covered" > code += this.getRightCode(rightCode, assignment, rightNode);</span>
6501
6530
  }
6502
6531
  }
6503
6532
  });
@@ -6507,14 +6536,14 @@ export class OverriddenLogic extends BaseNode {
6507
6536
  ) {
6508
6537
  const rightNode: any = <span class="cstat-no" title="statement not covered" >assignment.right;</span>
6509
6538
  <span class="cstat-no" title="statement not covered" > code += ' = ';</span>
6510
- <span class="cstat-no" title="statement not covered" > code += yield* rightNode.getInitCode(shiftState(state, code, { inline: true }));</span>
6539
+ <span class="cstat-no" title="statement not covered" > code += rightNode.getInitCode(shiftState(state, code, { inline: true }));</span>
6511
6540
  } else <span class="cstat-no" title="statement not covered" >if (</span>
6512
6541
  assignment.right?.concept === 'NewComposite' &amp;&amp;
6513
6542
  (assignment.right as any)?.typeAnnotation?.typeKind === 'anonymousStructure'
6514
6543
  ) {
6515
6544
  const rightNode: any = <span class="cstat-no" title="statement not covered" >assignment.right;</span>
6516
6545
  <span class="cstat-no" title="statement not covered" > code += ' = ';</span>
6517
- <span class="cstat-no" title="statement not covered" > code += yield* rightNode.getInitCode(shiftState(state, code, { inline: true }));</span>
6546
+ <span class="cstat-no" title="statement not covered" > code += rightNode.getInitCode(shiftState(state, code, { inline: true }));</span>
6518
6547
  } else {
6519
6548
  const rightNode: any = <span class="cstat-no" title="statement not covered" >assignment.right;</span>
6520
6549
  // 当右边有明确类型时，直接使用其类型。旧版本数据查询不能直接使用其 typeAnnotation
@@ -6523,7 +6552,7 @@ export class OverriddenLogic extends BaseNode {
6523
6552
  !(rightNode instanceof CallQueryComponent &amp;&amp; rightNode.ideVersion !== '2.11')
6524
6553
  ) {
6525
6554
  <span class="cstat-no" title="statement not covered" > code += ': ';</span>
6526
- <span class="cstat-no" title="statement not covered" > code += yield* rightNode.typeAnnotation?.toEmbeddedTS(shiftState(state, code, { inline: true })) ?? returnOrigin('null');</span>
6555
+ <span class="cstat-no" title="statement not covered" > code += rightNode.typeAnnotation?.toEmbeddedTS(shiftState(state, code, { inline: true })) || 'null';</span>
6527
6556
  } else {
6528
6557
  <span class="cstat-no" title="statement not covered" > code += ' = ';</span>
6529
6558
  let rightCode = <span class="cstat-no" title="statement not covered" >'';</span>
@@ -6538,31 +6567,34 @@ export class OverriddenLogic extends BaseNode {
6538
6567
  }
6539
6568
  <span class="cstat-no" title="statement not covered" > rightCode +=</span>
6540
6569
  rightNode &amp;&amp; rightNode.toEmbeddedTS
6541
- ? yield* rightNode.toEmbeddedTS(shiftState(state, code, { inline: true }))
6570
+ ? rightNode.toEmbeddedTS(shiftState(state, code, { inline: true }))
6542
6571
  : '__RIGHT__';
6543
- <span class="cstat-no" title="statement not covered" > code += yield* self.getRightCode(rightCode, assignment, rightNode);</span>
6572
+ <span class="cstat-no" title="statement not covered" > code += this.getRightCode(rightCode, assignment, rightNode);</span>
6544
6573
  }
6545
6574
  }
6546
6575
  <span class="cstat-no" title="statement not covered" > code += ';\n';</span>
6547
6576
  });
6548
- <span class="cstat-no" title="statement not covered" > if (!self.body.length &amp;&amp; self.returns.length) {</span>
6549
- <span class="cstat-no" title="statement not covered" > code += `${indent((state?.tabSize || 0) + 1)}return ${self.returns[0].name};\n`;</span>
6577
+ &nbsp;
6578
+ <span class="cstat-no" title="statement not covered" > if (!this.body.length &amp;&amp; this.returns.length) {</span>
6579
+ <span class="cstat-no" title="statement not covered" > code += `${indent((state?.tabSize || 0) + 1)}return ${this.returns[0].name};\n`;</span>
6550
6580
  } else {
6551
6581
  // 如果长度小于2 并且不是虚拟节点就 加 报错，
6552
- <span class="cstat-no" title="statement not covered" > if (self.body.length &lt;= 2 &amp;&amp; !(self.parentNode instanceof Namespace)) {</span>
6582
+ <span class="cstat-no" title="statement not covered" > if (this.body.length &lt;= 2 &amp;&amp; !(this.parentNode instanceof Namespace)) {</span>
6553
6583
  <span class="cstat-no" title="statement not covered" > code += indent((state?.tabSize || 0) + 1);</span>
6554
6584
  <span class="cstat-no" title="statement not covered" > code += 'const __LogicEmpty: any = null;';</span>
6555
6585
  }
6556
- <span class="cstat-no" title="statement not covered" > yield* wrapForEach(self.body, function* <span class="fstat-no" title="function not covered" >warpForEachGenerator(</span>item) {</span>
6557
- <span class="cstat-no" title="statement not covered" > code += yield* item.toEmbeddedTS?.(shiftState(state, code, { tabSize: (state?.tabSize || 0) + 1 })) ?? returnOrigin('');</span>
6586
+ <span class="cstat-no" title="statement not covered" > this.body.forEach(<span class="fstat-no" title="function not covered" >(i</span>tem) =&gt; {</span>
6587
+ <span class="cstat-no" title="statement not covered" > code += item.toEmbeddedTS &amp;&amp; item.toEmbeddedTS(shiftState(state, code, { tabSize: (state?.tabSize || 0) + 1 }));</span>
6558
6588
  <span class="cstat-no" title="statement not covered" > code += ';\n';</span>
6559
6589
  });
6560
6590
  }
6591
+ &nbsp;
6561
6592
  // 在body渲染完成之后把其余的节点放到下面
6562
- <span class="cstat-no" title="statement not covered" > yield* wrapForEach(self.playground, function* <span class="fstat-no" title="function not covered" >warpForEachGenerator(</span>item) {</span>
6563
- <span class="cstat-no" title="statement not covered" > code += yield* item.toEmbeddedTS(shiftState(state, code, { tabSize: (state?.tabSize || 0) + 1 }));</span>
6593
+ <span class="cstat-no" title="statement not covered" > this.playground.forEach(<span class="fstat-no" title="function not covered" >(i</span>tem) =&gt; {</span>
6594
+ <span class="cstat-no" title="statement not covered" > code += item.toEmbeddedTS(shiftState(state, code, { tabSize: (state?.tabSize || 0) + 1 }));</span>
6564
6595
  <span class="cstat-no" title="statement not covered" > code += ';\n';</span>
6565
6596
  });
6597
+ &nbsp;
6566
6598
  <span class="cstat-no" title="statement not covered" > code += `${indent(state?.tabSize || 0)}}`;</span>
6567
6599
  <span class="cstat-no" title="statement not covered" > if (prefix === 'inObject') {</span>
6568
6600
  <span class="cstat-no" title="statement not covered" > code += `,`;</span>
@@ -6571,7 +6603,7 @@ export class OverriddenLogic extends BaseNode {
6571
6603
  <span class="cstat-no" title="statement not covered" > return code;</span>
6572
6604
  }
6573
6605
  &nbsp;
6574
- <span class="fstat-no" title="function not covered" > *g</span>etRightCode(code: string, assignment: Assignment | BatchAssignment, rightNode: any) {
6606
+ <span class="fstat-no" title="function not covered" > getRightCode(</span>code: string, assignment: Assignment | BatchAssignment, rightNode: any): string {
6575
6607
  <span class="cstat-no" title="statement not covered" > code = code.replaceAll('\n', ' ');</span>
6576
6608
  <span class="cstat-no" title="statement not covered" > if (assignment instanceof Assignment &amp;&amp; !assignment.right) <span class="cstat-no" title="statement not covered" >return code;</span></span>
6577
6609
  &nbsp;
@@ -6591,12 +6623,12 @@ export class OverriddenLogic extends BaseNode {
6591
6623
  // ForEachStatement 内部变量需要替换处理，如 item、index
6592
6624
  const forEachStatement = <span class="cstat-no" title="statement not covered" >assignment.getAncestor('ForEachStatement') as ForEachStatement;</span>
6593
6625
  <span class="cstat-no" title="statement not covered" > if (forEachStatement) {</span>
6594
- <span class="cstat-no" title="statement not covered" > code = yield* this.handleForEachCode(code, forEachStatement);</span>
6626
+ <span class="cstat-no" title="statement not covered" > code = this.handleForEachCode(code, forEachStatement);</span>
6595
6627
  }
6596
6628
  // Match 需要针对分支缩小类型范围
6597
6629
  const matchCase = <span class="cstat-no" title="statement not covered" >assignment.getAncestor('MatchCase') as MatchCase;</span>
6598
6630
  <span class="cstat-no" title="statement not covered" > if (matchCase) {</span>
6599
- <span class="cstat-no" title="statement not covered" > code = yield* this.handleMatchCaseCode(code, matchCase);</span>
6631
+ <span class="cstat-no" title="statement not covered" > code = this.handleMatchCaseCode(code, matchCase);</span>
6600
6632
  }
6601
6633
  <span class="cstat-no" title="statement not covered" > return code;</span>
6602
6634
  }
@@ -6619,39 +6651,37 @@ export class OverriddenLogic extends BaseNode {
6619
6651
  });
6620
6652
  }
6621
6653
  &nbsp;
6622
- <span class="fstat-no" title="function not covered" > *h</span>andleForEachCode(code: string, forEachStatement: ForEachStatement): Generator&lt;any, string, any&gt; {
6654
+ <span class="fstat-no" title="function not covered" > handleForEachCode(</span>code: string, forEachStatement: ForEachStatement): string {
6623
6655
  const { item, index, each } = <span class="cstat-no" title="statement not covered" >forEachStatement;</span>
6624
6656
  <span class="cstat-no" title="statement not covered" > if (code.includes(item.name)) {</span>
6625
- const eachTSCode = <span class="cstat-no" title="statement not covered" >each ? yield* each.toEmbeddedTS() : '__IDENTIFIER__';</span>
6657
+ const eachTSCode = <span class="cstat-no" title="statement not covered" >each ? each.toEmbeddedTS() : '__IDENTIFIER__';</span>
6626
6658
  <span class="cstat-no" title="statement not covered" > code = this.handleReplaceCode(</span>
6627
6659
  code,
6628
6660
  item.name,
6629
6661
  eachTSCode === '__IDENTIFIER__' ? eachTSCode : `${eachTSCode}.__get(0)`,
6630
6662
  );
6631
6663
  }
6632
- <span class="cstat-no" title="statement not covered" > if (code.includes(index.name)) {</span>
6633
- <span class="cstat-no" title="statement not covered" > code = this.handleReplaceCode(code, index.name, 'new nasl.core.Integer(0)');</span>
6634
- }
6664
+ <span class="cstat-no" title="statement not covered" > if (code.includes(index.name)) <span class="cstat-no" title="statement not covered" >code = this.handleReplaceCode(code, index.name, 'new nasl.core.Integer(0)');</span></span>
6635
6665
  &nbsp;
6636
6666
  const parentForEachStatement = <span class="cstat-no" title="statement not covered" >forEachStatement.getAncestor('ForEachStatement') as ForEachStatement;</span>
6637
6667
  <span class="cstat-no" title="statement not covered" > if (parentForEachStatement) {</span>
6638
- <span class="cstat-no" title="statement not covered" > code = yield* this.handleForEachCode(code, parentForEachStatement);</span>
6668
+ <span class="cstat-no" title="statement not covered" > this.handleForEachCode(code, parentForEachStatement);</span>
6639
6669
  }
6640
6670
  <span class="cstat-no" title="statement not covered" > return code;</span>
6641
6671
  }
6642
6672
  &nbsp;
6643
- <span class="fstat-no" title="function not covered" > *h</span>andleMatchCaseCode(code: string, matchCase: MatchCase): Generator&lt;any, string, any&gt; {
6673
+ <span class="fstat-no" title="function not covered" > handleMatchCaseCode(</span>code: string, matchCase: MatchCase): string {
6644
6674
  const match = <span class="cstat-no" title="statement not covered" >matchCase.getAncestor('Match') as Match;</span>
6645
- const expressionTsCode = <span class="cstat-no" title="statement not covered" >yield* match.expression.toEmbeddedTS();</span>
6675
+ const expressionTsCode = <span class="cstat-no" title="statement not covered" >match.expression.toEmbeddedTS();</span>
6646
6676
  <span class="cstat-no" title="statement not covered" > if (code.includes(expressionTsCode)) {</span>
6647
6677
  let typeCode = <span class="cstat-no" title="statement not covered" >'';</span>
6648
- <span class="cstat-no" title="statement not covered" > yield* wrapForEach(matchCase.patterns, function* <span class="fstat-no" title="function not covered" >wrapForEach(</span>pattern, index) {</span>
6678
+ <span class="cstat-no" title="statement not covered" > matchCase.patterns.forEach(<span class="fstat-no" title="function not covered" >(p</span>attern, index) =&gt; {</span>
6649
6679
  <span class="cstat-no" title="statement not covered" > if (pattern instanceof TypeAnnotation) {</span>
6650
6680
  <span class="cstat-no" title="statement not covered" > if (index === 0) {</span>
6651
- <span class="cstat-no" title="statement not covered" > typeCode += yield* pattern.toEmbeddedTS();</span>
6681
+ <span class="cstat-no" title="statement not covered" > typeCode += pattern.toEmbeddedTS();</span>
6652
6682
  } else {
6653
6683
  <span class="cstat-no" title="statement not covered" > typeCode += '|';</span>
6654
- <span class="cstat-no" title="statement not covered" > typeCode += yield* pattern.toEmbeddedTS();</span>
6684
+ <span class="cstat-no" title="statement not covered" > typeCode += pattern.toEmbeddedTS();</span>
6655
6685
  }
6656
6686
  }
6657
6687
  });
@@ -6661,7 +6691,7 @@ export class OverriddenLogic extends BaseNode {
6661
6691
  }
6662
6692
  const parentMatchCase = <span class="cstat-no" title="statement not covered" >match.getAncestor('MatchCase') as MatchCase;</span>
6663
6693
  <span class="cstat-no" title="statement not covered" > if (parentMatchCase) {</span>
6664
- <span class="cstat-no" title="statement not covered" > code = yield* this.handleMatchCaseCode(code, parentMatchCase);</span>
6694
+ <span class="cstat-no" title="statement not covered" > code = this.handleMatchCaseCode(code, parentMatchCase);</span>
6665
6695
  }
6666
6696
  <span class="cstat-no" title="statement not covered" > return code;</span>
6667
6697
  }
@@ -6741,12 +6771,12 @@ export class OverriddenLogic extends BaseNode {
6741
6771
  <span class="cstat-no" title="statement not covered" > return `/embedded/${this.app.name}${_path}/overriddenLogics/${name}.ts`;</span>
6742
6772
  }
6743
6773
  &nbsp;
6744
- <span class="fstat-no" title="function not covered" > *t</span>oEmbeddedTSFile(): EmbeddedTSFileGenerator {
6774
+ <span class="fstat-no" title="function not covered" > toEmbeddedTSFile(</span>) {
6745
6775
  let code = <span class="cstat-no" title="statement not covered" >`namespace ${this.getTsNamespace()} {\n`;</span>
6746
6776
  &nbsp;
6747
6777
  const state = <span class="cstat-no" title="statement not covered" >createCompilerState(code, { tabSize: 1 });</span>
6748
6778
  <span class="cstat-no" title="statement not covered" > try {</span>
6749
- <span class="cstat-no" title="statement not covered" > code += yield* this.toEmbeddedTS(state);</span>
6779
+ <span class="cstat-no" title="statement not covered" > code += this.toEmbeddedTS(state);</span>
6750
6780
  } catch (err) {
6751
6781
  <span class="cstat-no" title="statement not covered" > console.log(err, '有问题翻译失败');</span>
6752
6782
  <span class="cstat-no" title="statement not covered" > code += '';</span>
@@ -6925,7 +6955,7 @@ export default OverriddenLogic;
6925
6955
  <div class='footer quiet pad2 space-top1 center small'>
6926
6956
  Code coverage generated by
6927
6957
  <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
6928
- at 2023-11-18T16:22:11.588Z
6958
+ at 2023-10-27T11:50:55.546Z
6929
6959
  </div>
6930
6960
  <script src="../../prettify.js"></script>
6931
6961
  <script>