@lcap/nasl 3.3.3-beta.8 → 3.3.6-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 (436) hide show
  1. package/.nyc_output/{78804420-ead6-486f-b682-ab54ccd95dc9.json → d58d92d8-c0d6-479b-9f82-1f4da8e73ff3.json} +1 -1
  2. package/.nyc_output/processinfo/d58d92d8-c0d6-479b-9f82-1f4da8e73ff3.json +1 -0
  3. package/.nyc_output/processinfo/index.json +1 -1
  4. package/coverage/index.html +126 -141
  5. package/coverage/src/automate/engine/index.html +1 -1
  6. package/coverage/src/automate/engine/utils.js.html +36 -36
  7. package/coverage/src/bak/index.html +14 -14
  8. package/coverage/src/bak/translator.js.html +57 -393
  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 +164 -593
  28. package/coverage/src/common/Command.ts.html +1 -1
  29. package/coverage/src/common/EventEmitter.ts.html +31 -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 -39
  35. package/coverage/src/concepts/Anchor__.ts.html +29 -86
  36. package/coverage/src/concepts/AnonymousFunction__.ts.html +169 -262
  37. package/coverage/src/concepts/App__.ts.html +152 -1205
  38. package/coverage/src/concepts/Argument__.ts.html +53 -137
  39. package/coverage/src/concepts/Assignee__.ts.html +34 -124
  40. package/coverage/src/concepts/AssignmentLine__.ts.html +15 -48
  41. package/coverage/src/concepts/Assignment__.ts.html +81 -213
  42. package/coverage/src/concepts/Attribute__.ts.html +14 -41
  43. package/coverage/src/concepts/AuthInterface__.ts.html +6 -9
  44. package/coverage/src/concepts/AuthLogicForCallInterface__.ts.html +144 -108
  45. package/coverage/src/concepts/AuthLogic__.ts.html +6 -18
  46. package/coverage/src/concepts/BackendVariable__.ts.html +48 -168
  47. package/coverage/src/concepts/Backend__.ts.html +28 -106
  48. package/coverage/src/concepts/BatchAssignment__.ts.html +169 -274
  49. package/coverage/src/concepts/BinaryExpression__.ts.html +129 -285
  50. package/coverage/src/concepts/BindAttribute__.ts.html +111 -522
  51. package/coverage/src/concepts/BindDirective__.ts.html +26 -131
  52. package/coverage/src/concepts/BindEvent__.ts.html +64 -160
  53. package/coverage/src/concepts/BindStyle__.ts.html +21 -78
  54. package/coverage/src/concepts/BooleanLiteral__.ts.html +20 -47
  55. package/coverage/src/concepts/CallAuthInterface__.ts.html +48 -105
  56. package/coverage/src/concepts/CallConnector__.ts.html +35 -62
  57. package/coverage/src/concepts/CallFunction__.ts.html +144 -288
  58. package/coverage/src/concepts/CallInterface__.ts.html +60 -93
  59. package/coverage/src/concepts/CallLogic__.ts.html +343 -292
  60. package/coverage/src/concepts/CallQueryComponent__.ts.html +93 -126
  61. package/coverage/src/concepts/Comment__.ts.html +10 -43
  62. package/coverage/src/concepts/CompletionProperty__.ts.html +13 -40
  63. package/coverage/src/concepts/ConfigGroup__.ts.html +20 -47
  64. package/coverage/src/concepts/ConfigPropertyValue__.ts.html +19 -22
  65. package/coverage/src/concepts/ConfigProperty__.ts.html +40 -97
  66. package/coverage/src/concepts/Configuration__.ts.html +21 -48
  67. package/coverage/src/concepts/Connection__.ts.html +22 -97
  68. package/coverage/src/concepts/ConnectorTrigger__.ts.html +6 -9
  69. package/coverage/src/concepts/Connector__.ts.html +38 -161
  70. package/coverage/src/concepts/Constant__.ts.html +24 -84
  71. package/coverage/src/concepts/DataSource__.ts.html +57 -111
  72. package/coverage/src/concepts/DatabaseTypeAnnotation__.ts.html +6 -9
  73. package/coverage/src/concepts/Destination__.ts.html +55 -97
  74. package/coverage/src/concepts/End__.ts.html +21 -51
  75. package/coverage/src/concepts/EntityIndex__.ts.html +10 -40
  76. package/coverage/src/concepts/EntityProperty__.ts.html +56 -164
  77. package/coverage/src/concepts/Entity__.ts.html +89 -167
  78. package/coverage/src/concepts/EnumItem__.ts.html +10 -40
  79. package/coverage/src/concepts/Enum__.ts.html +24 -84
  80. package/coverage/src/concepts/Event__.ts.html +14 -41
  81. package/coverage/src/concepts/ExternalDestination__.ts.html +21 -75
  82. package/coverage/src/concepts/ForEachStatement__.ts.html +64 -139
  83. package/coverage/src/concepts/FrontendLibrary__.ts.html +20 -71
  84. package/coverage/src/concepts/FrontendVariable__.ts.html +1 -1
  85. package/coverage/src/concepts/Frontend__.ts.html +57 -213
  86. package/coverage/src/concepts/Function__.ts.html +86 -239
  87. package/coverage/src/concepts/Identifier__.ts.html +72 -111
  88. package/coverage/src/concepts/IfStatement__.ts.html +75 -138
  89. package/coverage/src/concepts/Integration__.ts.html +19 -70
  90. package/coverage/src/concepts/InterfaceParam__.ts.html +21 -78
  91. package/coverage/src/concepts/Interface__.ts.html +60 -162
  92. package/coverage/src/concepts/JSBlock__.ts.html +11 -215
  93. package/coverage/src/concepts/JavaLogic__.ts.html +9 -42
  94. package/coverage/src/concepts/LogicItem__.ts.html +21 -51
  95. package/coverage/src/concepts/Logic__.ts.html +321 -405
  96. package/coverage/src/concepts/MatchCase__.ts.html +97 -181
  97. package/coverage/src/concepts/Match__.ts.html +59 -116
  98. package/coverage/src/concepts/MemberExpression__.ts.html +128 -182
  99. package/coverage/src/concepts/MicroApp__.ts.html +6 -9
  100. package/coverage/src/concepts/Module__.ts.html +18 -672
  101. package/coverage/src/concepts/MsgTriggerEvent__.ts.html +14 -41
  102. package/coverage/src/concepts/MsgTriggerLauncher__.ts.html +14 -41
  103. package/coverage/src/concepts/Namespace__.ts.html +91 -358
  104. package/coverage/src/concepts/NewComposite__.ts.html +125 -278
  105. package/coverage/src/concepts/NewList__.ts.html +57 -195
  106. package/coverage/src/concepts/NewMap__.ts.html +63 -168
  107. package/coverage/src/concepts/New__.ts.html +9 -39
  108. package/coverage/src/concepts/NullLiteral__.ts.html +9 -36
  109. package/coverage/src/concepts/NumericLiteral__.ts.html +33 -90
  110. package/coverage/src/concepts/OqlQueryComponent__.ts.html +35 -161
  111. package/coverage/src/concepts/OverriddenLogic__.ts.html +201 -324
  112. package/coverage/src/concepts/Param__.ts.html +75 -189
  113. package/coverage/src/concepts/Point__.ts.html +6 -9
  114. package/coverage/src/concepts/ProcessComponent__.ts.html +21 -72
  115. package/coverage/src/concepts/ProcessElement__.ts.html +115 -316
  116. package/coverage/src/concepts/ProcessOutcome__.ts.html +13 -85
  117. package/coverage/src/concepts/ProcessOutcomes__.ts.html +13 -85
  118. package/coverage/src/concepts/Process__.ts.html +70 -211
  119. package/coverage/src/concepts/QueryAggregateExpression__.ts.html +16 -67
  120. package/coverage/src/concepts/QueryFieldExpression__.ts.html +11 -41
  121. package/coverage/src/concepts/QueryFromExpression__.ts.html +21 -81
  122. package/coverage/src/concepts/QueryGroupByExpression__.ts.html +19 -70
  123. package/coverage/src/concepts/QueryJoinExpression__.ts.html +25 -85
  124. package/coverage/src/concepts/QueryLimitExpression__.ts.html +20 -77
  125. package/coverage/src/concepts/QueryOrderByExpression__.ts.html +20 -80
  126. package/coverage/src/concepts/QuerySelectExpression__.ts.html +15 -42
  127. package/coverage/src/concepts/Rect__.ts.html +6 -9
  128. package/coverage/src/concepts/Return__.ts.html +44 -164
  129. package/coverage/src/concepts/Role__.ts.html +15 -45
  130. package/coverage/src/concepts/SelectMembers__.ts.html +24 -81
  131. package/coverage/src/concepts/Slot__.ts.html +13 -40
  132. package/coverage/src/concepts/SqlQueryComponent__.ts.html +24 -84
  133. package/coverage/src/concepts/Start__.ts.html +9 -36
  134. package/coverage/src/concepts/StringInterpolation__.ts.html +29 -104
  135. package/coverage/src/concepts/StringLiteral__.ts.html +32 -62
  136. package/coverage/src/concepts/StructureProperty__.ts.html +23 -80
  137. package/coverage/src/concepts/Structure__.ts.html +32 -116
  138. package/coverage/src/concepts/SwitchCase__.ts.html +36 -87
  139. package/coverage/src/concepts/SwitchStatement__.ts.html +33 -90
  140. package/coverage/src/concepts/Theme__.ts.html +12 -15
  141. package/coverage/src/concepts/Transactional__.ts.html +6 -9
  142. package/coverage/src/concepts/TriggerEvent__.ts.html +14 -41
  143. package/coverage/src/concepts/TriggerLauncher__.ts.html +13 -46
  144. package/coverage/src/concepts/TypeAnnotation__.ts.html +116 -347
  145. package/coverage/src/concepts/TypeParam__.ts.html +12 -42
  146. package/coverage/src/concepts/UnaryExpression__.ts.html +27 -105
  147. package/coverage/src/concepts/Unparsed__.ts.html +12 -36
  148. package/coverage/src/concepts/UseComponent__.ts.html +6 -9
  149. package/coverage/src/concepts/ValidationRule__.ts.html +40 -79
  150. package/coverage/src/concepts/Variable__.ts.html +37 -157
  151. package/coverage/src/concepts/ViewBlock__.ts.html +6 -9
  152. package/coverage/src/concepts/ViewComponent__.ts.html +24 -99
  153. package/coverage/src/concepts/ViewElement__.ts.html +278 -692
  154. package/coverage/src/concepts/View__.ts.html +163 -517
  155. package/coverage/src/concepts/WhileStatement__.ts.html +55 -118
  156. package/coverage/src/concepts/basics/stdlib/index.html +1 -1
  157. package/coverage/src/concepts/basics/stdlib/index.ts.html +1 -1
  158. package/coverage/src/concepts/basics/stdlib/nasl.auth.ts.html +1 -1
  159. package/coverage/src/concepts/basics/stdlib/nasl.browser.ts.html +1 -1
  160. package/coverage/src/concepts/basics/stdlib/nasl.collection.ts.html +1 -1
  161. package/coverage/src/concepts/basics/stdlib/nasl.configuration.ts.html +1 -1
  162. package/coverage/src/concepts/basics/stdlib/nasl.core.ts.html +1 -1
  163. package/coverage/src/concepts/basics/stdlib/nasl.event.ts.html +1 -1
  164. package/coverage/src/concepts/basics/stdlib/nasl.http.ts.html +1 -1
  165. package/coverage/src/concepts/basics/stdlib/nasl.interface.ts.html +1 -1
  166. package/coverage/src/concepts/basics/stdlib/nasl.io.ts.html +1 -1
  167. package/coverage/src/concepts/basics/stdlib/nasl.logging.ts.html +1 -1
  168. package/coverage/src/concepts/basics/stdlib/nasl.process.ts.html +1 -1
  169. package/coverage/src/concepts/basics/stdlib/nasl.ui.ts.html +1 -1
  170. package/coverage/src/concepts/basics/stdlib/nasl.util.ts.html +3 -3
  171. package/coverage/src/concepts/basics/stdlib/nasl.validation.ts.html +1 -1
  172. package/coverage/src/concepts/basics/stdlib/reference2TypeAnnotationList.ts.html +1 -1
  173. package/coverage/src/concepts/basics/stdlib/timeZone.ts.html +1 -1
  174. package/coverage/src/concepts/basics/types/coreTypeList.ts.html +1 -1
  175. package/coverage/src/concepts/basics/types/index.html +1 -1
  176. package/coverage/src/concepts/basics/types/index.ts.html +1 -1
  177. package/coverage/src/concepts/index.html +965 -980
  178. package/coverage/src/concepts/index.ts.html +1 -1
  179. package/coverage/src/concepts/index__.ts.html +4 -7
  180. package/coverage/src/config.ts.html +1 -1
  181. package/coverage/src/decorators/index.html +5 -5
  182. package/coverage/src/decorators/index.ts.html +32 -32
  183. package/coverage/src/decorators/promise.ts.html +10 -10
  184. package/coverage/src/eventBus.ts.html +1 -1
  185. package/coverage/src/generator/compileComponent.ts.html +4 -4
  186. package/coverage/src/generator/genBundleFiles.ts.html +23 -17
  187. package/coverage/src/generator/genHash.ts.html +3 -3
  188. package/coverage/src/generator/genMetaData.ts.html +16 -103
  189. package/coverage/src/generator/genReleaseBody.ts.html +3 -3
  190. package/coverage/src/generator/icestark.ts.html +4 -10
  191. package/coverage/src/generator/index.html +21 -21
  192. package/coverage/src/generator/index.ts.html +1 -1
  193. package/coverage/src/generator/microApp.ts.html +1 -1
  194. package/coverage/src/generator/permission.ts.html +20 -92
  195. package/coverage/src/generator/qiankun.ts.html +3 -9
  196. package/coverage/src/generator/styleReplacer.ts.html +1 -1
  197. package/coverage/src/index.html +7 -7
  198. package/coverage/src/index.ts.html +4 -4
  199. package/coverage/src/manager/diagnostic.ts.html +14 -11
  200. package/coverage/src/manager/index.html +13 -13
  201. package/coverage/src/manager/stepRecorder.ts.html +1 -1
  202. package/coverage/src/natural/genNaturalTS.ts.html +1 -1
  203. package/coverage/src/natural/index.html +15 -15
  204. package/coverage/src/natural/index.ts.html +1 -1
  205. package/coverage/src/natural/naslStdlibMap.ts.html +1 -1
  206. package/coverage/src/natural/transformTSCode.ts.html +18 -78
  207. package/coverage/src/sentry/index.html +14 -14
  208. package/coverage/src/sentry/index.ts.html +32 -38
  209. package/coverage/src/server/createUiTs.ts.html +6 -15
  210. package/coverage/src/server/entity2LogicNamespace.ts.html +9 -9
  211. package/coverage/src/server/event.js.html +1 -1
  212. package/coverage/src/server/extendBaseNode.ts.html +4 -7
  213. package/coverage/src/server/formatTsUtils.ts.html +9 -9
  214. package/coverage/src/server/getConnector.ts.html +1 -1
  215. package/coverage/src/server/getExtensionModules.ts.html +1 -1
  216. package/coverage/src/server/getFunctions.ts.html +4 -4
  217. package/coverage/src/server/getInterfaces.ts.html +1 -1
  218. package/coverage/src/server/getLogging.ts.html +2 -2
  219. package/coverage/src/server/getLogics.ts.html +1 -1
  220. package/coverage/src/server/getMemberIdentifier.ts.html +119 -167
  221. package/coverage/src/server/getProcessComponents.ts.html +3 -3
  222. package/coverage/src/server/getProcesses.ts.html +1 -1
  223. package/coverage/src/server/getValidates.ts.html +4 -4
  224. package/coverage/src/server/index.html +34 -34
  225. package/coverage/src/server/index.ts.html +1 -1
  226. package/coverage/src/server/naslServer.ts.html +943 -1195
  227. package/coverage/src/server/naslStdlibMap.ts.html +1 -1
  228. package/coverage/src/server/process2LogicNamespace.ts.html +52 -52
  229. package/coverage/src/server/translator.ts.html +14 -50
  230. package/coverage/src/service/creator/add.configs.js.html +9 -27
  231. package/coverage/src/service/creator/errHandles.js.html +37 -19
  232. package/coverage/src/service/creator/index.html +22 -22
  233. package/coverage/src/service/creator/index.js.html +1 -1
  234. package/coverage/src/service/datasource/api.js.html +1 -1
  235. package/coverage/src/service/datasource/index.html +1 -1
  236. package/coverage/src/service/datasource/index.js.html +1 -1
  237. package/coverage/src/service/logic/api.js.html +1 -1
  238. package/coverage/src/service/logic/index.html +1 -1
  239. package/coverage/src/service/logic/index.js.html +1 -1
  240. package/coverage/src/service/storage/api.js.html +1 -1
  241. package/coverage/src/service/storage/index.html +29 -29
  242. package/coverage/src/service/storage/index.ts.html +1 -1
  243. package/coverage/src/service/storage/init.ts.html +601 -1534
  244. package/coverage/src/service/storage/jsoner.ts.html +13 -76
  245. package/coverage/src/service/storage/map.ts.html +3 -3
  246. package/coverage/src/service/storage/service.ts.html +1 -1
  247. package/coverage/src/service/storage/storagePoint.ts.html +1 -1
  248. package/coverage/src/templator/genCallComponentLogic.ts.html +1 -1
  249. package/coverage/src/templator/genCreateBlock.ts.html +56 -47
  250. package/coverage/src/templator/genCurdEditMultipleKeyBlock.ts.html +31 -49
  251. package/coverage/src/templator/genCurdMultipleKeyBlock.ts.html +89 -80
  252. package/coverage/src/templator/genEditTableBlock.ts.html +11 -80
  253. package/coverage/src/templator/genEnumSelectBlock.ts.html +1 -1
  254. package/coverage/src/templator/genGetBlock.ts.html +1 -1
  255. package/coverage/src/templator/genGridViewBlock.ts.html +1 -1
  256. package/coverage/src/templator/genListViewBlock.ts.html +1 -1
  257. package/coverage/src/templator/genQueryComponent.ts.html +1 -1
  258. package/coverage/src/templator/genSelectBlock.ts.html +1 -1
  259. package/coverage/src/templator/genTableBlock.ts.html +3 -66
  260. package/coverage/src/templator/genUpdateBlock.ts.html +36 -48
  261. package/coverage/src/templator/index.html +39 -39
  262. package/coverage/src/templator/index.ts.html +1 -1
  263. package/coverage/src/templator/utils.ts.html +11 -77
  264. package/coverage/src/translator/constant.ts.html +1 -1
  265. package/coverage/src/translator/index.html +21 -21
  266. package/coverage/src/translator/index.ts.html +1 -1
  267. package/coverage/src/translator/utils.ts.html +68 -389
  268. package/coverage/src/utils/cookie.ts.html +4 -4
  269. package/coverage/src/utils/env.ts.html +1 -1
  270. package/coverage/src/utils/index.html +51 -36
  271. package/coverage/src/utils/index.ts.html +22 -115
  272. package/coverage/src/utils/logger.ts.html +13 -13
  273. package/coverage/src/utils/sortTsString.ts.html +10 -25
  274. package/coverage/src/utils/string.ts.html +8 -110
  275. package/coverage/src/utils/time-slicing.ts.html +1 -1
  276. package/coverage/src/utils/traverse.ts.html +1 -1
  277. package/coverage/src/utils/window.ts.html +1 -1
  278. package/out/bak/translator.js.map +1 -1
  279. package/out/common/Command.js +1 -1
  280. package/out/common/Command.js.map +1 -1
  281. package/out/concepts/Argument__.js +7 -2
  282. package/out/concepts/Argument__.js.map +1 -1
  283. package/out/concepts/Assignment__.js +20 -3
  284. package/out/concepts/Assignment__.js.map +1 -1
  285. package/out/concepts/BackendVariable__.js +24 -2
  286. package/out/concepts/BackendVariable__.js.map +1 -1
  287. package/out/concepts/BinaryExpression__.js +40 -13
  288. package/out/concepts/BinaryExpression__.js.map +1 -1
  289. package/out/concepts/CallLogic__.js +7 -12
  290. package/out/concepts/CallLogic__.js.map +1 -1
  291. package/out/concepts/CountersignPolicy__.d.ts +26 -0
  292. package/out/concepts/CountersignPolicy__.js +73 -0
  293. package/out/concepts/CountersignPolicy__.js.map +1 -0
  294. package/out/concepts/ForEachStatement__.js +12 -26
  295. package/out/concepts/ForEachStatement__.js.map +1 -1
  296. package/out/concepts/Identifier__.js +3 -0
  297. package/out/concepts/Identifier__.js.map +1 -1
  298. package/out/concepts/JSBlock__.js +56 -0
  299. package/out/concepts/JSBlock__.js.map +1 -1
  300. package/out/concepts/LogicItem__.js +2 -1
  301. package/out/concepts/LogicItem__.js.map +1 -1
  302. package/out/concepts/Logic__.js +2 -0
  303. package/out/concepts/Logic__.js.map +1 -1
  304. package/out/concepts/Match__.js +1 -1
  305. package/out/concepts/Match__.js.map +1 -1
  306. package/out/concepts/MultiApprovalPolicy__.d.ts +24 -0
  307. package/out/concepts/MultiApprovalPolicy__.js +65 -0
  308. package/out/concepts/MultiApprovalPolicy__.js.map +1 -0
  309. package/out/concepts/NewComposite__.js +18 -10
  310. package/out/concepts/NewComposite__.js.map +1 -1
  311. package/out/concepts/NumericLiteral__.js +1 -1
  312. package/out/concepts/NumericLiteral__.js.map +1 -1
  313. package/out/concepts/Param__.js +24 -2
  314. package/out/concepts/Param__.js.map +1 -1
  315. package/out/concepts/ProcessElement__.d.ts +16 -0
  316. package/out/concepts/ProcessElement__.js +56 -1
  317. package/out/concepts/ProcessElement__.js.map +1 -1
  318. package/out/concepts/Return__.js +24 -2
  319. package/out/concepts/Return__.js.map +1 -1
  320. package/out/concepts/SequentialPolicy__.d.ts +18 -0
  321. package/out/concepts/SequentialPolicy__.js +54 -0
  322. package/out/concepts/SequentialPolicy__.js.map +1 -0
  323. package/out/concepts/Variable__.js +24 -2
  324. package/out/concepts/Variable__.js.map +1 -1
  325. package/out/concepts/ViewElement__.js.map +1 -1
  326. package/out/concepts/View__.js +2 -2
  327. package/out/concepts/View__.js.map +1 -1
  328. package/out/concepts/index__.d.ts +3 -0
  329. package/out/concepts/index__.js +3 -0
  330. package/out/concepts/index__.js.map +1 -1
  331. package/out/concepts/types__.d.ts +4 -1
  332. package/out/generator/genReleaseBody.js +2 -2
  333. package/out/generator/genReleaseBody.js.map +1 -1
  334. package/out/server/extendBaseNode.js +32 -1
  335. package/out/server/extendBaseNode.js.map +1 -1
  336. package/out/server/getLogics.d.ts +1 -0
  337. package/out/server/getLogics.js +6 -2
  338. package/out/server/getLogics.js.map +1 -1
  339. package/out/server/getProcesses.js +66 -6
  340. package/out/server/getProcesses.js.map +1 -1
  341. package/out/server/index.js +1 -0
  342. package/out/server/index.js.map +1 -1
  343. package/out/server/naslServer.js +2 -2
  344. package/out/server/naslServer.js.map +1 -1
  345. package/out/server/translator.js +3 -0
  346. package/out/server/translator.js.map +1 -1
  347. package/out/service/creator/errHandles.js +6 -3
  348. package/out/service/creator/errHandles.js.map +1 -1
  349. package/out/service/storage/init.js +2 -2
  350. package/out/service/storage/init.js.map +1 -1
  351. package/out/templator/genCreateBlock.js +9 -5
  352. package/out/templator/genCreateBlock.js.map +1 -1
  353. package/out/templator/genCurdEditMultipleKeyBlock.js +18 -12
  354. package/out/templator/genCurdEditMultipleKeyBlock.js.map +1 -1
  355. package/out/templator/genCurdMultipleKeyBlock.js +10 -8
  356. package/out/templator/genCurdMultipleKeyBlock.js.map +1 -1
  357. package/out/templator/genEditTableBlock.js +3 -2
  358. package/out/templator/genEditTableBlock.js.map +1 -1
  359. package/out/templator/genUpdateBlock.js +12 -9
  360. package/out/templator/genUpdateBlock.js.map +1 -1
  361. package/out/templator/utils.js.map +1 -1
  362. package/package.json +2 -2
  363. package/sandbox/stdlib/nasl.core.ts +2 -0
  364. package/sandbox/stdlib/nasl.util.ts +3 -3
  365. package/src/bak/translator.js +0 -1
  366. package/src/common/Command.ts +1 -1
  367. package/src/concepts/Argument__.ts +7 -2
  368. package/src/concepts/Assignment__.ts +31 -13
  369. package/src/concepts/BackendVariable__.ts +22 -3
  370. package/src/concepts/BinaryExpression__.ts +39 -13
  371. package/src/concepts/CallLogic__.ts +13 -23
  372. package/src/concepts/CountersignPolicy__.ts +77 -0
  373. package/src/concepts/ForEachStatement__.ts +17 -26
  374. package/src/concepts/Identifier__.ts +4 -1
  375. package/src/concepts/JSBlock__.ts +58 -0
  376. package/src/concepts/LogicItem__.ts +2 -2
  377. package/src/concepts/Logic__.ts +1 -0
  378. package/src/concepts/Match__.ts +1 -1
  379. package/src/concepts/MultiApprovalPolicy__.ts +69 -0
  380. package/src/concepts/NewComposite__.ts +18 -9
  381. package/src/concepts/NumericLiteral__.ts +1 -1
  382. package/src/concepts/Param__.ts +24 -2
  383. package/src/concepts/ProcessElement__.ts +70 -1
  384. package/src/concepts/Return__.ts +23 -3
  385. package/src/concepts/SequentialPolicy__.ts +58 -0
  386. package/src/concepts/Variable__.ts +23 -3
  387. package/src/concepts/ViewElement__.ts +6 -4
  388. package/src/concepts/View__.ts +5 -5
  389. package/src/concepts/index__.ts +3 -0
  390. package/src/concepts/types__.ts +6 -0
  391. package/src/generator/genReleaseBody.ts +40 -40
  392. package/src/server/extendBaseNode.ts +30 -2
  393. package/src/server/getLogics.ts +4 -0
  394. package/src/server/getProcesses.ts +66 -6
  395. package/src/server/index.ts +2 -1
  396. package/src/server/naslServer.ts +2 -2
  397. package/src/server/translator.ts +3 -0
  398. package/src/service/creator/errHandles.js +7 -4
  399. package/src/service/storage/init.ts +2 -2
  400. package/src/templator/genCreateBlock.ts +9 -5
  401. package/src/templator/genCurdEditMultipleKeyBlock.ts +19 -13
  402. package/src/templator/genCurdMultipleKeyBlock.ts +14 -11
  403. package/src/templator/genEditTableBlock.ts +4 -2
  404. package/src/templator/genUpdateBlock.ts +15 -12
  405. package/src/templator/utils.ts +8 -7
  406. package/test/concepts/anonymous-function/__snapshots__/toJS.spec.ts.snap +1 -1
  407. package/test/concepts/assignment/__snapshots__/toJS.spec.ts.snap +1 -1
  408. package/test/concepts/batch-assignment/__snapshots__/toJS.spec.ts.snap +2 -2
  409. package/test/concepts/binary-expression/__snapshots__/toJS.spec.ts.snap +3 -2
  410. package/test/concepts/call-interface/__snapshots__/toJS.spec.ts.snap +2 -2
  411. package/test/concepts/call-logic/__snapshots__/toJS.spec.ts.snap +3 -3
  412. package/test/concepts/match/__snapshots__/toJS.spec.ts.snap +1 -1
  413. package/test/concepts/numeric-literal/__snapshots__/toJS.spec.ts.snap +1 -1
  414. package/test/concepts/validation-rule/__snapshots__/toJS.spec.ts.snap +3 -3
  415. package/.nyc_output/processinfo/78804420-ead6-486f-b682-ab54ccd95dc9.json +0 -1
  416. package/coverage/cobertura-coverage.xml +0 -71878
  417. package/coverage/src/automate/engine/index.js.html +0 -1471
  418. package/coverage/src/automate/engine/operators.js.html +0 -862
  419. package/coverage/src/automate/engine/uniqueName.js.html +0 -412
  420. package/coverage/src/automate/engine/viewCache.js.html +0 -214
  421. package/coverage/src/automate/template/index.html +0 -116
  422. package/coverage/src/automate/template/myProcess.js.html +0 -34645
  423. package/coverage/src/common/utils.ts.html +0 -136
  424. package/coverage/src/concepts/DataElement__.ts.html +0 -118
  425. package/coverage/src/concepts/MetadataType__.ts.html +0 -2053
  426. package/coverage/src/utils/time-slicing/constant.ts.html +0 -196
  427. package/coverage/src/utils/time-slicing/controller.ts.html +0 -1111
  428. package/coverage/src/utils/time-slicing/index.html +0 -236
  429. package/coverage/src/utils/time-slicing/index.ts.html +0 -103
  430. package/coverage/src/utils/time-slicing/page-state.ts.html +0 -121
  431. package/coverage/src/utils/time-slicing/performance.ts.html +0 -253
  432. package/coverage/src/utils/time-slicing/runner.ts.html +0 -247
  433. package/coverage/src/utils/time-slicing/tool.ts.html +0 -220
  434. package/coverage/src/utils/time-slicing/utils.ts.html +0 -355
  435. package/coverage/src/utils/time-slicing/wrapper.ts.html +0 -259
  436. package/coverage/src/utils/time.ts.html +0 -118
package/coverage/src/concepts/Logic__.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">12.87% </span>
26
+ <span class="strong">11.14% </span>
27
27
  <span class="quiet">Statements</span>
28
- <span class='fraction'>115/893</span>
28
+ <span class='fraction'>97/870</span>
29
29
  </div>
30
30
 
31
31
 
32
32
  <div class='fl pad1y space-right2'>
33
- <span class="strong">7.42% </span>
33
+ <span class="strong">5.84% </span>
34
34
  <span class="quiet">Branches</span>
35
- <span class='fraction'>47/633</span>
35
+ <span class='fraction'>34/582</span>
36
36
  </div>
37
37
 
38
38
 
39
39
  <div class='fl pad1y space-right2'>
40
- <span class="strong">7.53% </span>
40
+ <span class="strong">6.33% </span>
41
41
  <span class="quiet">Functions</span>
42
- <span class='fraction'>11/146</span>
42
+ <span class='fraction'>9/142</span>
43
43
  </div>
44
44
 
45
45
 
46
46
  <div class='fl pad1y space-right2'>
47
- <span class="strong">12.6% </span>
47
+ <span class="strong">10.77% </span>
48
48
  <span class="quiet">Lines</span>
49
- <span class='fraction'>106/841</span>
49
+ <span class='fraction'>89/826</span>
50
50
  </div>
51
51
 
52
52
 
@@ -2504,42 +2504,7 @@
2504
2504
  <a name='L2439'></a><a href='#L2439'>2439</a>
2505
2505
  <a name='L2440'></a><a href='#L2440'>2440</a>
2506
2506
  <a name='L2441'></a><a href='#L2441'>2441</a>
2507
- <a name='L2442'></a><a href='#L2442'>2442</a>
2508
- <a name='L2443'></a><a href='#L2443'>2443</a>
2509
- <a name='L2444'></a><a href='#L2444'>2444</a>
2510
- <a name='L2445'></a><a href='#L2445'>2445</a>
2511
- <a name='L2446'></a><a href='#L2446'>2446</a>
2512
- <a name='L2447'></a><a href='#L2447'>2447</a>
2513
- <a name='L2448'></a><a href='#L2448'>2448</a>
2514
- <a name='L2449'></a><a href='#L2449'>2449</a>
2515
- <a name='L2450'></a><a href='#L2450'>2450</a>
2516
- <a name='L2451'></a><a href='#L2451'>2451</a>
2517
- <a name='L2452'></a><a href='#L2452'>2452</a>
2518
- <a name='L2453'></a><a href='#L2453'>2453</a>
2519
- <a name='L2454'></a><a href='#L2454'>2454</a>
2520
- <a name='L2455'></a><a href='#L2455'>2455</a>
2521
- <a name='L2456'></a><a href='#L2456'>2456</a>
2522
- <a name='L2457'></a><a href='#L2457'>2457</a>
2523
- <a name='L2458'></a><a href='#L2458'>2458</a>
2524
- <a name='L2459'></a><a href='#L2459'>2459</a>
2525
- <a name='L2460'></a><a href='#L2460'>2460</a>
2526
- <a name='L2461'></a><a href='#L2461'>2461</a>
2527
- <a name='L2462'></a><a href='#L2462'>2462</a>
2528
- <a name='L2463'></a><a href='#L2463'>2463</a>
2529
- <a name='L2464'></a><a href='#L2464'>2464</a>
2530
- <a name='L2465'></a><a href='#L2465'>2465</a>
2531
- <a name='L2466'></a><a href='#L2466'>2466</a>
2532
- <a name='L2467'></a><a href='#L2467'>2467</a>
2533
- <a name='L2468'></a><a href='#L2468'>2468</a>
2534
- <a name='L2469'></a><a href='#L2469'>2469</a>
2535
- <a name='L2470'></a><a href='#L2470'>2470</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">1x</span>
2536
- <span class="cline-any cline-neutral">&nbsp;</span>
2537
- <span class="cline-any cline-neutral">&nbsp;</span>
2538
- <span class="cline-any cline-neutral">&nbsp;</span>
2539
- <span class="cline-any cline-neutral">&nbsp;</span>
2540
- <span class="cline-any cline-neutral">&nbsp;</span>
2541
- <span class="cline-any cline-yes">1x</span>
2542
- <span class="cline-any cline-neutral">&nbsp;</span>
2507
+ <a name='L2442'></a><a href='#L2442'>2442</a></td><td class="line-coverage quiet"><span class="cline-any cline-neutral">&nbsp;</span>
2543
2508
  <span class="cline-any cline-yes">1x</span>
2544
2509
  <span class="cline-any cline-yes">1x</span>
2545
2510
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -2549,9 +2514,6 @@
2549
2514
  <span class="cline-any cline-neutral">&nbsp;</span>
2550
2515
  <span class="cline-any cline-neutral">&nbsp;</span>
2551
2516
  <span class="cline-any cline-neutral">&nbsp;</span>
2552
- <span class="cline-any cline-neutral">&nbsp;</span>
2553
- <span class="cline-any cline-neutral">&nbsp;</span>
2554
- <span class="cline-any cline-neutral">&nbsp;</span>
2555
2517
  <span class="cline-any cline-yes">1x</span>
2556
2518
  <span class="cline-any cline-yes">1x</span>
2557
2519
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -2559,7 +2521,7 @@
2559
2521
  <span class="cline-any cline-yes">1x</span>
2560
2522
  <span class="cline-any cline-yes">1x</span>
2561
2523
  <span class="cline-any cline-yes">1x</span>
2562
- <span class="cline-any cline-neutral">&nbsp;</span>
2524
+ <span class="cline-any cline-yes">1x</span>
2563
2525
  <span class="cline-any cline-neutral">&nbsp;</span>
2564
2526
  <span class="cline-any cline-neutral">&nbsp;</span>
2565
2527
  <span class="cline-any cline-yes">1x</span>
@@ -2572,7 +2534,6 @@
2572
2534
  <span class="cline-any cline-neutral">&nbsp;</span>
2573
2535
  <span class="cline-any cline-neutral">&nbsp;</span>
2574
2536
  <span class="cline-any cline-neutral">&nbsp;</span>
2575
- <span class="cline-any cline-yes">1x</span>
2576
2537
  <span class="cline-any cline-neutral">&nbsp;</span>
2577
2538
  <span class="cline-any cline-yes">1x</span>
2578
2539
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -2583,6 +2544,7 @@
2583
2544
  <span class="cline-any cline-yes">1x</span>
2584
2545
  <span class="cline-any cline-yes">1x</span>
2585
2546
  <span class="cline-any cline-yes">1x</span>
2547
+ <span class="cline-any cline-yes">1x</span>
2586
2548
  <span class="cline-any cline-neutral">&nbsp;</span>
2587
2549
  <span class="cline-any cline-neutral">&nbsp;</span>
2588
2550
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -2606,7 +2568,6 @@
2606
2568
  <span class="cline-any cline-neutral">&nbsp;</span>
2607
2569
  <span class="cline-any cline-neutral">&nbsp;</span>
2608
2570
  <span class="cline-any cline-neutral">&nbsp;</span>
2609
- <span class="cline-any cline-yes">1x</span>
2610
2571
  <span class="cline-any cline-neutral">&nbsp;</span>
2611
2572
  <span class="cline-any cline-neutral">&nbsp;</span>
2612
2573
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -2661,37 +2622,37 @@
2661
2622
  <span class="cline-any cline-neutral">&nbsp;</span>
2662
2623
  <span class="cline-any cline-neutral">&nbsp;</span>
2663
2624
  <span class="cline-any cline-neutral">&nbsp;</span>
2664
- <span class="cline-any cline-yes">260x</span>
2625
+ <span class="cline-any cline-yes">249x</span>
2665
2626
  <span class="cline-any cline-neutral">&nbsp;</span>
2666
2627
  <span class="cline-any cline-neutral">&nbsp;</span>
2667
2628
  <span class="cline-any cline-neutral">&nbsp;</span>
2668
2629
  <span class="cline-any cline-neutral">&nbsp;</span>
2669
2630
  <span class="cline-any cline-neutral">&nbsp;</span>
2670
- <span class="cline-any cline-yes">260x</span>
2631
+ <span class="cline-any cline-yes">249x</span>
2671
2632
  <span class="cline-any cline-neutral">&nbsp;</span>
2672
2633
  <span class="cline-any cline-neutral">&nbsp;</span>
2673
2634
  <span class="cline-any cline-neutral">&nbsp;</span>
2674
2635
  <span class="cline-any cline-neutral">&nbsp;</span>
2675
2636
  <span class="cline-any cline-neutral">&nbsp;</span>
2676
- <span class="cline-any cline-yes">260x</span>
2637
+ <span class="cline-any cline-yes">249x</span>
2677
2638
  <span class="cline-any cline-neutral">&nbsp;</span>
2678
2639
  <span class="cline-any cline-neutral">&nbsp;</span>
2679
2640
  <span class="cline-any cline-neutral">&nbsp;</span>
2680
2641
  <span class="cline-any cline-neutral">&nbsp;</span>
2681
2642
  <span class="cline-any cline-neutral">&nbsp;</span>
2682
- <span class="cline-any cline-yes">260x</span>
2643
+ <span class="cline-any cline-yes">249x</span>
2683
2644
  <span class="cline-any cline-neutral">&nbsp;</span>
2684
2645
  <span class="cline-any cline-neutral">&nbsp;</span>
2685
2646
  <span class="cline-any cline-neutral">&nbsp;</span>
2686
2647
  <span class="cline-any cline-neutral">&nbsp;</span>
2687
2648
  <span class="cline-any cline-neutral">&nbsp;</span>
2688
- <span class="cline-any cline-yes">260x</span>
2649
+ <span class="cline-any cline-yes">249x</span>
2689
2650
  <span class="cline-any cline-neutral">&nbsp;</span>
2690
2651
  <span class="cline-any cline-neutral">&nbsp;</span>
2691
2652
  <span class="cline-any cline-neutral">&nbsp;</span>
2692
2653
  <span class="cline-any cline-neutral">&nbsp;</span>
2693
2654
  <span class="cline-any cline-neutral">&nbsp;</span>
2694
- <span class="cline-any cline-yes">260x</span>
2655
+ <span class="cline-any cline-yes">249x</span>
2695
2656
  <span class="cline-any cline-neutral">&nbsp;</span>
2696
2657
  <span class="cline-any cline-neutral">&nbsp;</span>
2697
2658
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -2703,36 +2664,42 @@
2703
2664
  <span class="cline-any cline-neutral">&nbsp;</span>
2704
2665
  <span class="cline-any cline-neutral">&nbsp;</span>
2705
2666
  <span class="cline-any cline-neutral">&nbsp;</span>
2667
+ <span class="cline-any cline-neutral">&nbsp;</span>
2706
2668
  <span class="cline-any cline-no">&nbsp;</span>
2707
2669
  <span class="cline-any cline-neutral">&nbsp;</span>
2708
2670
  <span class="cline-any cline-neutral">&nbsp;</span>
2709
2671
  <span class="cline-any cline-neutral">&nbsp;</span>
2710
2672
  <span class="cline-any cline-neutral">&nbsp;</span>
2711
2673
  <span class="cline-any cline-neutral">&nbsp;</span>
2674
+ <span class="cline-any cline-neutral">&nbsp;</span>
2712
2675
  <span class="cline-any cline-no">&nbsp;</span>
2713
2676
  <span class="cline-any cline-neutral">&nbsp;</span>
2714
2677
  <span class="cline-any cline-neutral">&nbsp;</span>
2715
2678
  <span class="cline-any cline-neutral">&nbsp;</span>
2716
2679
  <span class="cline-any cline-neutral">&nbsp;</span>
2717
2680
  <span class="cline-any cline-neutral">&nbsp;</span>
2681
+ <span class="cline-any cline-neutral">&nbsp;</span>
2718
2682
  <span class="cline-any cline-yes">14x</span>
2719
2683
  <span class="cline-any cline-neutral">&nbsp;</span>
2720
2684
  <span class="cline-any cline-neutral">&nbsp;</span>
2721
2685
  <span class="cline-any cline-neutral">&nbsp;</span>
2722
2686
  <span class="cline-any cline-neutral">&nbsp;</span>
2723
2687
  <span class="cline-any cline-neutral">&nbsp;</span>
2688
+ <span class="cline-any cline-neutral">&nbsp;</span>
2724
2689
  <span class="cline-any cline-no">&nbsp;</span>
2725
2690
  <span class="cline-any cline-neutral">&nbsp;</span>
2726
2691
  <span class="cline-any cline-neutral">&nbsp;</span>
2727
2692
  <span class="cline-any cline-neutral">&nbsp;</span>
2728
2693
  <span class="cline-any cline-neutral">&nbsp;</span>
2729
2694
  <span class="cline-any cline-neutral">&nbsp;</span>
2695
+ <span class="cline-any cline-neutral">&nbsp;</span>
2730
2696
  <span class="cline-any cline-no">&nbsp;</span>
2731
2697
  <span class="cline-any cline-neutral">&nbsp;</span>
2732
2698
  <span class="cline-any cline-neutral">&nbsp;</span>
2733
2699
  <span class="cline-any cline-neutral">&nbsp;</span>
2734
2700
  <span class="cline-any cline-neutral">&nbsp;</span>
2735
2701
  <span class="cline-any cline-neutral">&nbsp;</span>
2702
+ <span class="cline-any cline-neutral">&nbsp;</span>
2736
2703
  <span class="cline-any cline-no">&nbsp;</span>
2737
2704
  <span class="cline-any cline-neutral">&nbsp;</span>
2738
2705
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -2740,9 +2707,9 @@
2740
2707
  <span class="cline-any cline-neutral">&nbsp;</span>
2741
2708
  <span class="cline-any cline-neutral">&nbsp;</span>
2742
2709
  <span class="cline-any cline-neutral">&nbsp;</span>
2743
- <span class="cline-any cline-yes">260x</span>
2744
- <span class="cline-any cline-yes">260x</span>
2745
- <span class="cline-any cline-yes">260x</span>
2710
+ <span class="cline-any cline-yes">249x</span>
2711
+ <span class="cline-any cline-yes">249x</span>
2712
+ <span class="cline-any cline-yes">249x</span>
2746
2713
  <span class="cline-any cline-neutral">&nbsp;</span>
2747
2714
  <span class="cline-any cline-neutral">&nbsp;</span>
2748
2715
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -2764,6 +2731,7 @@
2764
2731
  <span class="cline-any cline-neutral">&nbsp;</span>
2765
2732
  <span class="cline-any cline-neutral">&nbsp;</span>
2766
2733
  <span class="cline-any cline-neutral">&nbsp;</span>
2734
+ <span class="cline-any cline-neutral">&nbsp;</span>
2767
2735
  <span class="cline-any cline-no">&nbsp;</span>
2768
2736
  <span class="cline-any cline-neutral">&nbsp;</span>
2769
2737
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -2853,6 +2821,7 @@
2853
2821
  <span class="cline-any cline-no">&nbsp;</span>
2854
2822
  <span class="cline-any cline-neutral">&nbsp;</span>
2855
2823
  <span class="cline-any cline-neutral">&nbsp;</span>
2824
+ <span class="cline-any cline-neutral">&nbsp;</span>
2856
2825
  <span class="cline-any cline-no">&nbsp;</span>
2857
2826
  <span class="cline-any cline-neutral">&nbsp;</span>
2858
2827
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -3684,23 +3653,15 @@
3684
3653
  <span class="cline-any cline-neutral">&nbsp;</span>
3685
3654
  <span class="cline-any cline-no">&nbsp;</span>
3686
3655
  <span class="cline-any cline-no">&nbsp;</span>
3687
- <span class="cline-any cline-neutral">&nbsp;</span>
3688
- <span class="cline-any cline-no">&nbsp;</span>
3689
- <span class="cline-any cline-neutral">&nbsp;</span>
3690
- <span class="cline-any cline-no">&nbsp;</span>
3691
- <span class="cline-any cline-no">&nbsp;</span>
3692
- <span class="cline-any cline-neutral">&nbsp;</span>
3693
3656
  <span class="cline-any cline-no">&nbsp;</span>
3694
3657
  <span class="cline-any cline-no">&nbsp;</span>
3695
3658
  <span class="cline-any cline-no">&nbsp;</span>
3696
- <span class="cline-any cline-neutral">&nbsp;</span>
3697
3659
  <span class="cline-any cline-no">&nbsp;</span>
3698
3660
  <span class="cline-any cline-no">&nbsp;</span>
3699
3661
  <span class="cline-any cline-no">&nbsp;</span>
3700
3662
  <span class="cline-any cline-no">&nbsp;</span>
3701
3663
  <span class="cline-any cline-neutral">&nbsp;</span>
3702
3664
  <span class="cline-any cline-neutral">&nbsp;</span>
3703
- <span class="cline-any cline-neutral">&nbsp;</span>
3704
3665
  <span class="cline-any cline-no">&nbsp;</span>
3705
3666
  <span class="cline-any cline-neutral">&nbsp;</span>
3706
3667
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -3740,23 +3701,15 @@
3740
3701
  <span class="cline-any cline-neutral">&nbsp;</span>
3741
3702
  <span class="cline-any cline-no">&nbsp;</span>
3742
3703
  <span class="cline-any cline-no">&nbsp;</span>
3743
- <span class="cline-any cline-neutral">&nbsp;</span>
3744
- <span class="cline-any cline-no">&nbsp;</span>
3745
- <span class="cline-any cline-neutral">&nbsp;</span>
3746
- <span class="cline-any cline-no">&nbsp;</span>
3747
- <span class="cline-any cline-no">&nbsp;</span>
3748
- <span class="cline-any cline-neutral">&nbsp;</span>
3749
3704
  <span class="cline-any cline-no">&nbsp;</span>
3750
3705
  <span class="cline-any cline-no">&nbsp;</span>
3751
3706
  <span class="cline-any cline-no">&nbsp;</span>
3752
- <span class="cline-any cline-neutral">&nbsp;</span>
3753
3707
  <span class="cline-any cline-no">&nbsp;</span>
3754
3708
  <span class="cline-any cline-no">&nbsp;</span>
3755
3709
  <span class="cline-any cline-no">&nbsp;</span>
3756
3710
  <span class="cline-any cline-no">&nbsp;</span>
3757
3711
  <span class="cline-any cline-neutral">&nbsp;</span>
3758
3712
  <span class="cline-any cline-neutral">&nbsp;</span>
3759
- <span class="cline-any cline-neutral">&nbsp;</span>
3760
3713
  <span class="cline-any cline-no">&nbsp;</span>
3761
3714
  <span class="cline-any cline-neutral">&nbsp;</span>
3762
3715
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -3796,23 +3749,15 @@
3796
3749
  <span class="cline-any cline-neutral">&nbsp;</span>
3797
3750
  <span class="cline-any cline-no">&nbsp;</span>
3798
3751
  <span class="cline-any cline-no">&nbsp;</span>
3799
- <span class="cline-any cline-neutral">&nbsp;</span>
3800
- <span class="cline-any cline-no">&nbsp;</span>
3801
- <span class="cline-any cline-neutral">&nbsp;</span>
3802
- <span class="cline-any cline-no">&nbsp;</span>
3803
- <span class="cline-any cline-no">&nbsp;</span>
3804
- <span class="cline-any cline-neutral">&nbsp;</span>
3805
3752
  <span class="cline-any cline-no">&nbsp;</span>
3806
3753
  <span class="cline-any cline-no">&nbsp;</span>
3807
3754
  <span class="cline-any cline-no">&nbsp;</span>
3808
- <span class="cline-any cline-neutral">&nbsp;</span>
3809
3755
  <span class="cline-any cline-no">&nbsp;</span>
3810
3756
  <span class="cline-any cline-no">&nbsp;</span>
3811
3757
  <span class="cline-any cline-no">&nbsp;</span>
3812
3758
  <span class="cline-any cline-no">&nbsp;</span>
3813
3759
  <span class="cline-any cline-neutral">&nbsp;</span>
3814
3760
  <span class="cline-any cline-neutral">&nbsp;</span>
3815
- <span class="cline-any cline-neutral">&nbsp;</span>
3816
3761
  <span class="cline-any cline-no">&nbsp;</span>
3817
3762
  <span class="cline-any cline-neutral">&nbsp;</span>
3818
3763
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -3852,23 +3797,15 @@
3852
3797
  <span class="cline-any cline-neutral">&nbsp;</span>
3853
3798
  <span class="cline-any cline-no">&nbsp;</span>
3854
3799
  <span class="cline-any cline-no">&nbsp;</span>
3855
- <span class="cline-any cline-neutral">&nbsp;</span>
3856
- <span class="cline-any cline-no">&nbsp;</span>
3857
- <span class="cline-any cline-neutral">&nbsp;</span>
3858
- <span class="cline-any cline-no">&nbsp;</span>
3859
- <span class="cline-any cline-no">&nbsp;</span>
3860
- <span class="cline-any cline-neutral">&nbsp;</span>
3861
3800
  <span class="cline-any cline-no">&nbsp;</span>
3862
3801
  <span class="cline-any cline-no">&nbsp;</span>
3863
3802
  <span class="cline-any cline-no">&nbsp;</span>
3864
- <span class="cline-any cline-neutral">&nbsp;</span>
3865
3803
  <span class="cline-any cline-no">&nbsp;</span>
3866
3804
  <span class="cline-any cline-no">&nbsp;</span>
3867
3805
  <span class="cline-any cline-no">&nbsp;</span>
3868
3806
  <span class="cline-any cline-no">&nbsp;</span>
3869
3807
  <span class="cline-any cline-neutral">&nbsp;</span>
3870
3808
  <span class="cline-any cline-neutral">&nbsp;</span>
3871
- <span class="cline-any cline-neutral">&nbsp;</span>
3872
3809
  <span class="cline-any cline-no">&nbsp;</span>
3873
3810
  <span class="cline-any cline-neutral">&nbsp;</span>
3874
3811
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -3908,23 +3845,15 @@
3908
3845
  <span class="cline-any cline-neutral">&nbsp;</span>
3909
3846
  <span class="cline-any cline-no">&nbsp;</span>
3910
3847
  <span class="cline-any cline-no">&nbsp;</span>
3911
- <span class="cline-any cline-neutral">&nbsp;</span>
3912
- <span class="cline-any cline-no">&nbsp;</span>
3913
- <span class="cline-any cline-neutral">&nbsp;</span>
3914
- <span class="cline-any cline-no">&nbsp;</span>
3915
3848
  <span class="cline-any cline-no">&nbsp;</span>
3916
- <span class="cline-any cline-neutral">&nbsp;</span>
3917
3849
  <span class="cline-any cline-no">&nbsp;</span>
3918
3850
  <span class="cline-any cline-no">&nbsp;</span>
3919
3851
  <span class="cline-any cline-no">&nbsp;</span>
3920
- <span class="cline-any cline-neutral">&nbsp;</span>
3921
- <span class="cline-any cline-no">&nbsp;</span>
3922
3852
  <span class="cline-any cline-no">&nbsp;</span>
3923
3853
  <span class="cline-any cline-no">&nbsp;</span>
3924
3854
  <span class="cline-any cline-no">&nbsp;</span>
3925
3855
  <span class="cline-any cline-neutral">&nbsp;</span>
3926
3856
  <span class="cline-any cline-neutral">&nbsp;</span>
3927
- <span class="cline-any cline-neutral">&nbsp;</span>
3928
3857
  <span class="cline-any cline-no">&nbsp;</span>
3929
3858
  <span class="cline-any cline-neutral">&nbsp;</span>
3930
3859
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -3961,23 +3890,15 @@
3961
3890
  <span class="cline-any cline-neutral">&nbsp;</span>
3962
3891
  <span class="cline-any cline-no">&nbsp;</span>
3963
3892
  <span class="cline-any cline-no">&nbsp;</span>
3964
- <span class="cline-any cline-neutral">&nbsp;</span>
3965
- <span class="cline-any cline-no">&nbsp;</span>
3966
- <span class="cline-any cline-neutral">&nbsp;</span>
3967
3893
  <span class="cline-any cline-no">&nbsp;</span>
3968
3894
  <span class="cline-any cline-no">&nbsp;</span>
3969
- <span class="cline-any cline-neutral">&nbsp;</span>
3970
3895
  <span class="cline-any cline-no">&nbsp;</span>
3971
3896
  <span class="cline-any cline-no">&nbsp;</span>
3972
3897
  <span class="cline-any cline-no">&nbsp;</span>
3973
- <span class="cline-any cline-neutral">&nbsp;</span>
3974
- <span class="cline-any cline-no">&nbsp;</span>
3975
- <span class="cline-any cline-no">&nbsp;</span>
3976
3898
  <span class="cline-any cline-no">&nbsp;</span>
3977
3899
  <span class="cline-any cline-no">&nbsp;</span>
3978
3900
  <span class="cline-any cline-neutral">&nbsp;</span>
3979
3901
  <span class="cline-any cline-neutral">&nbsp;</span>
3980
- <span class="cline-any cline-neutral">&nbsp;</span>
3981
3902
  <span class="cline-any cline-no">&nbsp;</span>
3982
3903
  <span class="cline-any cline-neutral">&nbsp;</span>
3983
3904
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -4227,23 +4148,13 @@
4227
4148
  <span class="cline-any cline-neutral">&nbsp;</span>
4228
4149
  <span class="cline-any cline-neutral">&nbsp;</span>
4229
4150
  <span class="cline-any cline-yes">1x</span>
4230
- <span class="cline-any cline-neutral">&nbsp;</span>
4231
- <span class="cline-any cline-neutral">&nbsp;</span>
4232
- <span class="cline-any cline-neutral">&nbsp;</span>
4233
- <span class="cline-any cline-neutral">&nbsp;</span>
4234
- <span class="cline-any cline-neutral">&nbsp;</span>
4235
- <span class="cline-any cline-no">&nbsp;</span>
4236
4151
  <span class="cline-any cline-no">&nbsp;</span>
4237
4152
  <span class="cline-any cline-no">&nbsp;</span>
4238
4153
  <span class="cline-any cline-no">&nbsp;</span>
4239
4154
  <span class="cline-any cline-no">&nbsp;</span>
4240
- <span class="cline-any cline-neutral">&nbsp;</span>
4241
- <span class="cline-any cline-neutral">&nbsp;</span>
4242
- <span class="cline-any cline-neutral">&nbsp;</span>
4243
4155
  <span class="cline-any cline-no">&nbsp;</span>
4244
4156
  <span class="cline-any cline-no">&nbsp;</span>
4245
4157
  <span class="cline-any cline-neutral">&nbsp;</span>
4246
- <span class="cline-any cline-neutral">&nbsp;</span>
4247
4158
  <span class="cline-any cline-no">&nbsp;</span>
4248
4159
  <span class="cline-any cline-no">&nbsp;</span>
4249
4160
  <span class="cline-any cline-no">&nbsp;</span>
@@ -4252,11 +4163,13 @@
4252
4163
  <span class="cline-any cline-no">&nbsp;</span>
4253
4164
  <span class="cline-any cline-no">&nbsp;</span>
4254
4165
  <span class="cline-any cline-neutral">&nbsp;</span>
4166
+ <span class="cline-any cline-neutral">&nbsp;</span>
4255
4167
  <span class="cline-any cline-no">&nbsp;</span>
4256
4168
  <span class="cline-any cline-no">&nbsp;</span>
4257
4169
  <span class="cline-any cline-no">&nbsp;</span>
4258
4170
  <span class="cline-any cline-no">&nbsp;</span>
4259
4171
  <span class="cline-any cline-neutral">&nbsp;</span>
4172
+ <span class="cline-any cline-neutral">&nbsp;</span>
4260
4173
  <span class="cline-any cline-no">&nbsp;</span>
4261
4174
  <span class="cline-any cline-no">&nbsp;</span>
4262
4175
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -4279,10 +4192,12 @@
4279
4192
  <span class="cline-any cline-neutral">&nbsp;</span>
4280
4193
  <span class="cline-any cline-neutral">&nbsp;</span>
4281
4194
  <span class="cline-any cline-neutral">&nbsp;</span>
4195
+ <span class="cline-any cline-neutral">&nbsp;</span>
4282
4196
  <span class="cline-any cline-no">&nbsp;</span>
4283
4197
  <span class="cline-any cline-no">&nbsp;</span>
4284
4198
  <span class="cline-any cline-no">&nbsp;</span>
4285
4199
  <span class="cline-any cline-neutral">&nbsp;</span>
4200
+ <span class="cline-any cline-neutral">&nbsp;</span>
4286
4201
  <span class="cline-any cline-no">&nbsp;</span>
4287
4202
  <span class="cline-any cline-no">&nbsp;</span>
4288
4203
  <span class="cline-any cline-no">&nbsp;</span>
@@ -4294,19 +4209,16 @@
4294
4209
  <span class="cline-any cline-neutral">&nbsp;</span>
4295
4210
  <span class="cline-any cline-neutral">&nbsp;</span>
4296
4211
  <span class="cline-any cline-yes">1x</span>
4297
- <span class="cline-any cline-yes">18x</span>
4298
- <span class="cline-any cline-neutral">&nbsp;</span>
4299
- <span class="cline-any cline-yes">18x</span>
4300
4212
  <span class="cline-any cline-neutral">&nbsp;</span>
4301
- <span class="cline-any cline-yes">18x</span>
4302
- <span class="cline-any cline-yes">18x</span>
4213
+ <span class="cline-any cline-yes">7x</span>
4214
+ <span class="cline-any cline-yes">7x</span>
4303
4215
  <span class="cline-any cline-no">&nbsp;</span>
4304
- <span class="cline-any cline-yes">18x</span>
4305
4216
  <span class="cline-any cline-yes">7x</span>
4306
- <span class="cline-any cline-yes">11x</span>
4307
- <span class="cline-any cline-yes">11x</span>
4217
+ <span class="cline-any cline-yes">7x</span>
4218
+ <span class="cline-any cline-no">&nbsp;</span>
4219
+ <span class="cline-any cline-no">&nbsp;</span>
4308
4220
  <span class="cline-any cline-neutral">&nbsp;</span>
4309
- <span class="cline-any cline-yes">18x</span>
4221
+ <span class="cline-any cline-yes">7x</span>
4310
4222
  <span class="cline-any cline-no">&nbsp;</span>
4311
4223
  <span class="cline-any cline-no">&nbsp;</span>
4312
4224
  <span class="cline-any cline-no">&nbsp;</span>
@@ -4315,22 +4227,23 @@
4315
4227
  <span class="cline-any cline-no">&nbsp;</span>
4316
4228
  <span class="cline-any cline-neutral">&nbsp;</span>
4317
4229
  <span class="cline-any cline-neutral">&nbsp;</span>
4318
- <span class="cline-any cline-yes">18x</span>
4319
- <span class="cline-any cline-yes">11x</span>
4320
- <span class="cline-any cline-yes">11x</span>
4321
- <span class="cline-any cline-yes">15x</span>
4322
- <span class="cline-any cline-yes">15x</span>
4230
+ <span class="cline-any cline-yes">7x</span>
4231
+ <span class="cline-any cline-no">&nbsp;</span>
4232
+ <span class="cline-any cline-no">&nbsp;</span>
4233
+ <span class="cline-any cline-no">&nbsp;</span>
4234
+ <span class="cline-any cline-no">&nbsp;</span>
4323
4235
  <span class="cline-any cline-neutral">&nbsp;</span>
4324
- <span class="cline-any cline-yes">11x</span>
4236
+ <span class="cline-any cline-no">&nbsp;</span>
4325
4237
  <span class="cline-any cline-neutral">&nbsp;</span>
4326
4238
  <span class="cline-any cline-neutral">&nbsp;</span>
4327
4239
  <span class="cline-any cline-yes">7x</span>
4328
4240
  <span class="cline-any cline-neutral">&nbsp;</span>
4329
4241
  <span class="cline-any cline-neutral">&nbsp;</span>
4330
- <span class="cline-any cline-yes">18x</span>
4331
4242
  <span class="cline-any cline-neutral">&nbsp;</span>
4332
- <span class="cline-any cline-yes">18x</span>
4333
- <span class="cline-any cline-yes">172x</span>
4243
+ <span class="cline-any cline-yes">7x</span>
4244
+ <span class="cline-any cline-yes">7x</span>
4245
+ <span class="cline-any cline-yes">7x</span>
4246
+ <span class="cline-any cline-yes">309x</span>
4334
4247
  <span class="cline-any cline-yes">6x</span>
4335
4248
  <span class="cline-any cline-yes">6x</span>
4336
4249
  <span class="cline-any cline-yes">2x</span>
@@ -4362,35 +4275,61 @@
4362
4275
  <span class="cline-any cline-neutral">&nbsp;</span>
4363
4276
  <span class="cline-any cline-neutral">&nbsp;</span>
4364
4277
  <span class="cline-any cline-neutral">&nbsp;</span>
4278
+ <span class="cline-any cline-yes">309x</span>
4279
+ <span class="cline-any cline-no">&nbsp;</span>
4280
+ <span class="cline-any cline-no">&nbsp;</span>
4281
+ <span class="cline-any cline-neutral">&nbsp;</span>
4282
+ <span class="cline-any cline-neutral">&nbsp;</span>
4283
+ <span class="cline-any cline-neutral">&nbsp;</span>
4284
+ <span class="cline-any cline-neutral">&nbsp;</span>
4285
+ <span class="cline-any cline-yes">7x</span>
4286
+ <span class="cline-any cline-no">&nbsp;</span>
4287
+ <span class="cline-any cline-neutral">&nbsp;</span>
4288
+ <span class="cline-any cline-no">&nbsp;</span>
4289
+ <span class="cline-any cline-neutral">&nbsp;</span>
4290
+ <span class="cline-any cline-neutral">&nbsp;</span>
4291
+ <span class="cline-any cline-neutral">&nbsp;</span>
4292
+ <span class="cline-any cline-neutral">&nbsp;</span>
4293
+ <span class="cline-any cline-neutral">&nbsp;</span>
4294
+ <span class="cline-any cline-neutral">&nbsp;</span>
4295
+ <span class="cline-any cline-neutral">&nbsp;</span>
4296
+ <span class="cline-any cline-neutral">&nbsp;</span>
4297
+ <span class="cline-any cline-neutral">&nbsp;</span>
4298
+ <span class="cline-any cline-neutral">&nbsp;</span>
4299
+ <span class="cline-any cline-neutral">&nbsp;</span>
4300
+ <span class="cline-any cline-neutral">&nbsp;</span>
4301
+ <span class="cline-any cline-yes">7x</span>
4302
+ <span class="cline-any cline-no">&nbsp;</span>
4303
+ <span class="cline-any cline-no">&nbsp;</span>
4304
+ <span class="cline-any cline-neutral">&nbsp;</span>
4305
+ <span class="cline-any cline-yes">7x</span>
4306
+ <span class="cline-any cline-neutral">&nbsp;</span>
4365
4307
  <span class="cline-any cline-neutral">&nbsp;</span>
4366
- <span class="cline-any cline-yes">18x</span>
4367
- <span class="cline-any cline-yes">8x</span>
4368
- <span class="cline-any cline-yes">8x</span>
4308
+ <span class="cline-any cline-yes">7x</span>
4369
4309
  <span class="cline-any cline-neutral">&nbsp;</span>
4370
- <span class="cline-any cline-yes">18x</span>
4371
4310
  <span class="cline-any cline-neutral">&nbsp;</span>
4372
- <span class="cline-any cline-yes">18x</span>
4373
- <span class="cline-any cline-yes">18x</span>
4374
4311
  <span class="cline-any cline-no">&nbsp;</span>
4375
4312
  <span class="cline-any cline-no">&nbsp;</span>
4376
4313
  <span class="cline-any cline-no">&nbsp;</span>
4377
4314
  <span class="cline-any cline-neutral">&nbsp;</span>
4378
4315
  <span class="cline-any cline-neutral">&nbsp;</span>
4379
- <span class="cline-any cline-yes">18x</span>
4316
+ <span class="cline-any cline-yes">7x</span>
4380
4317
  <span class="cline-any cline-yes">3x</span>
4381
4318
  <span class="cline-any cline-yes">3x</span>
4382
4319
  <span class="cline-any cline-yes">3x</span>
4383
4320
  <span class="cline-any cline-yes">3x</span>
4384
4321
  <span class="cline-any cline-neutral">&nbsp;</span>
4385
4322
  <span class="cline-any cline-neutral">&nbsp;</span>
4386
- <span class="cline-any cline-yes">18x</span>
4387
- <span class="cline-any cline-yes">8x</span>
4388
- <span class="cline-any cline-yes">8x</span>
4389
- <span class="cline-any cline-yes">8x</span>
4390
- <span class="cline-any cline-yes">8x</span>
4323
+ <span class="cline-any cline-neutral">&nbsp;</span>
4324
+ <span class="cline-any cline-yes">7x</span>
4325
+ <span class="cline-any cline-no">&nbsp;</span>
4326
+ <span class="cline-any cline-no">&nbsp;</span>
4327
+ <span class="cline-any cline-no">&nbsp;</span>
4328
+ <span class="cline-any cline-no">&nbsp;</span>
4329
+ <span class="cline-any cline-neutral">&nbsp;</span>
4391
4330
  <span class="cline-any cline-neutral">&nbsp;</span>
4392
4331
  <span class="cline-any cline-neutral">&nbsp;</span>
4393
- <span class="cline-any cline-yes">18x</span>
4332
+ <span class="cline-any cline-yes">7x</span>
4394
4333
  <span class="cline-any cline-no">&nbsp;</span>
4395
4334
  <span class="cline-any cline-no">&nbsp;</span>
4396
4335
  <span class="cline-any cline-no">&nbsp;</span>
@@ -4472,11 +4411,12 @@
4472
4411
  <span class="cline-any cline-neutral">&nbsp;</span>
4473
4412
  <span class="cline-any cline-no">&nbsp;</span>
4474
4413
  <span class="cline-any cline-neutral">&nbsp;</span>
4475
- <span class="cline-any cline-yes">18x</span>
4476
- <span class="cline-any cline-yes">8x</span>
4414
+ <span class="cline-any cline-neutral">&nbsp;</span>
4415
+ <span class="cline-any cline-yes">7x</span>
4416
+ <span class="cline-any cline-no">&nbsp;</span>
4477
4417
  <span class="cline-any cline-neutral">&nbsp;</span>
4478
4418
  <span class="cline-any cline-neutral">&nbsp;</span>
4479
- <span class="cline-any cline-yes">10x</span>
4419
+ <span class="cline-any cline-yes">7x</span>
4480
4420
  <span class="cline-any cline-no">&nbsp;</span>
4481
4421
  <span class="cline-any cline-no">&nbsp;</span>
4482
4422
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -4484,27 +4424,30 @@
4484
4424
  <span class="cline-any cline-no">&nbsp;</span>
4485
4425
  <span class="cline-any cline-neutral">&nbsp;</span>
4486
4426
  <span class="cline-any cline-neutral">&nbsp;</span>
4487
- <span class="cline-any cline-yes">10x</span>
4427
+ <span class="cline-any cline-yes">7x</span>
4488
4428
  <span class="cline-any cline-yes">28x</span>
4489
4429
  <span class="cline-any cline-yes">28x</span>
4490
4430
  <span class="cline-any cline-neutral">&nbsp;</span>
4491
4431
  <span class="cline-any cline-neutral">&nbsp;</span>
4492
4432
  <span class="cline-any cline-neutral">&nbsp;</span>
4493
- <span class="cline-any cline-yes">18x</span>
4433
+ <span class="cline-any cline-neutral">&nbsp;</span>
4434
+ <span class="cline-any cline-yes">7x</span>
4494
4435
  <span class="cline-any cline-no">&nbsp;</span>
4495
4436
  <span class="cline-any cline-no">&nbsp;</span>
4496
4437
  <span class="cline-any cline-neutral">&nbsp;</span>
4497
- <span class="cline-any cline-yes">18x</span>
4498
- <span class="cline-any cline-yes">18x</span>
4499
- <span class="cline-any cline-yes">11x</span>
4500
4438
  <span class="cline-any cline-neutral">&nbsp;</span>
4501
- <span class="cline-any cline-yes">18x</span>
4502
- <span class="cline-any cline-yes">18x</span>
4439
+ <span class="cline-any cline-yes">7x</span>
4440
+ <span class="cline-any cline-yes">7x</span>
4441
+ <span class="cline-any cline-no">&nbsp;</span>
4442
+ <span class="cline-any cline-neutral">&nbsp;</span>
4443
+ <span class="cline-any cline-yes">7x</span>
4444
+ <span class="cline-any cline-yes">7x</span>
4503
4445
  <span class="cline-any cline-neutral">&nbsp;</span>
4504
4446
  <span class="cline-any cline-neutral">&nbsp;</span>
4505
4447
  <span class="cline-any cline-neutral">&nbsp;</span>
4506
4448
  <span class="cline-any cline-yes">1x</span>
4507
4449
  <span class="cline-any cline-neutral">&nbsp;</span>
4450
+ <span class="cline-any cline-neutral">&nbsp;</span>
4508
4451
  <span class="cline-any cline-no">&nbsp;</span>
4509
4452
  <span class="cline-any cline-no">&nbsp;</span>
4510
4453
  <span class="cline-any cline-no">&nbsp;</span>
@@ -4534,6 +4477,7 @@
4534
4477
  <span class="cline-any cline-no">&nbsp;</span>
4535
4478
  <span class="cline-any cline-no">&nbsp;</span>
4536
4479
  <span class="cline-any cline-no">&nbsp;</span>
4480
+ <span class="cline-any cline-no">&nbsp;</span>
4537
4481
  <span class="cline-any cline-neutral">&nbsp;</span>
4538
4482
  <span class="cline-any cline-no">&nbsp;</span>
4539
4483
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -4542,6 +4486,7 @@
4542
4486
  <span class="cline-any cline-no">&nbsp;</span>
4543
4487
  <span class="cline-any cline-no">&nbsp;</span>
4544
4488
  <span class="cline-any cline-no">&nbsp;</span>
4489
+ <span class="cline-any cline-no">&nbsp;</span>
4545
4490
  <span class="cline-any cline-neutral">&nbsp;</span>
4546
4491
  <span class="cline-any cline-neutral">&nbsp;</span>
4547
4492
  <span class="cline-any cline-no">&nbsp;</span>
@@ -4581,6 +4526,7 @@
4581
4526
  <span class="cline-any cline-no">&nbsp;</span>
4582
4527
  <span class="cline-any cline-no">&nbsp;</span>
4583
4528
  <span class="cline-any cline-no">&nbsp;</span>
4529
+ <span class="cline-any cline-no">&nbsp;</span>
4584
4530
  <span class="cline-any cline-neutral">&nbsp;</span>
4585
4531
  <span class="cline-any cline-no">&nbsp;</span>
4586
4532
  <span class="cline-any cline-no">&nbsp;</span>
@@ -4657,8 +4603,6 @@
4657
4603
  <span class="cline-any cline-neutral">&nbsp;</span>
4658
4604
  <span class="cline-any cline-neutral">&nbsp;</span>
4659
4605
  <span class="cline-any cline-no">&nbsp;</span>
4660
- <span class="cline-any cline-no">&nbsp;</span>
4661
- <span class="cline-any cline-neutral">&nbsp;</span>
4662
4606
  <span class="cline-any cline-neutral">&nbsp;</span>
4663
4607
  <span class="cline-any cline-no">&nbsp;</span>
4664
4608
  <span class="cline-any cline-no">&nbsp;</span>
@@ -4816,7 +4760,7 @@
4816
4760
  <span class="cline-any cline-neutral">&nbsp;</span>
4817
4761
  <span class="cline-any cline-neutral">&nbsp;</span>
4818
4762
  <span class="cline-any cline-neutral">&nbsp;</span>
4819
- <span class="cline-any cline-yes">260x</span>
4763
+ <span class="cline-any cline-yes">249x</span>
4820
4764
  <span class="cline-any cline-neutral">&nbsp;</span>
4821
4765
  <span class="cline-any cline-neutral">&nbsp;</span>
4822
4766
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -4895,10 +4839,10 @@
4895
4839
  <span class="cline-any cline-neutral">&nbsp;</span>
4896
4840
  <span class="cline-any cline-neutral">&nbsp;</span>
4897
4841
  <span class="cline-any cline-neutral">&nbsp;</span>
4898
- <span class="cline-any cline-yes">260x</span>
4842
+ <span class="cline-any cline-yes">249x</span>
4899
4843
  <span class="cline-any cline-neutral">&nbsp;</span>
4900
4844
  <span class="cline-any cline-neutral">&nbsp;</span>
4901
- <span class="cline-any cline-yes">260x</span>
4845
+ <span class="cline-any cline-yes">249x</span>
4902
4846
  <span class="cline-any cline-neutral">&nbsp;</span>
4903
4847
  <span class="cline-any cline-neutral">&nbsp;</span>
4904
4848
  <span class="cline-any cline-no">&nbsp;</span>
@@ -4962,7 +4906,7 @@
4962
4906
  <span class="cline-any cline-neutral">&nbsp;</span>
4963
4907
  <span class="cline-any cline-neutral">&nbsp;</span>
4964
4908
  <span class="cline-any cline-neutral">&nbsp;</span>
4965
- <span class="cline-any cline-yes">260x</span>
4909
+ <span class="cline-any cline-yes">249x</span>
4966
4910
  <span class="cline-any cline-neutral">&nbsp;</span>
4967
4911
  <span class="cline-any cline-neutral">&nbsp;</span>
4968
4912
  <span class="cline-any cline-no">&nbsp;</span>
@@ -5001,14 +4945,7 @@
5001
4945
  <span class="cline-any cline-neutral">&nbsp;</span>
5002
4946
  <span class="cline-any cline-neutral">&nbsp;</span>
5003
4947
  <span class="cline-any cline-neutral">&nbsp;</span>
5004
- <span class="cline-any cline-neutral">&nbsp;</span></td><td class="text"><pre class="prettyprint lang-js">import {
5005
- wrapForEachToGenerator as wrapForEach,
5006
- wrapIteratorToGenerator as wrapIterator,
5007
- runGeneratorSync as runSync,
5008
- returnOrigin,
5009
- } from '../utils/time-slicing';
5010
- import { waitOqlQueryComponentChildrenFinish } from '../common';
5011
- import type { EmbeddedTSFileGenerator } from '../utils';
4948
+ <span class="cline-any cline-neutral">&nbsp;</span></td><td class="text"><pre class="prettyprint lang-js">import { v4 as uuidv4 } from 'uuid';
5012
4949
  import { FrontendLibrary } from './FrontendLibrary__';
5013
4950
  import {
5014
4951
  TranslatorState,
@@ -5017,9 +4954,6 @@ import {
5017
4954
  indent,
5018
4955
  createCompilerState,
5019
4956
  embeddedTSEmitter,
5020
- withSourceMapGenerator,
5021
- withGenerator,
5022
- TranslatorGenerator,
5023
4957
  } from '../translator';
5024
4958
  import Namespace from './Namespace__';
5025
4959
  import CallQueryComponent from './CallQueryComponent__';
@@ -5035,6 +4969,7 @@ import TypeAnnotation from './TypeAnnotation__';
5035
4969
  import CallInterface from './CallInterface__';
5036
4970
  import CallLogic from './CallLogic__';
5037
4971
  import ViewElement from './ViewElement__';
4972
+ import { SynatxNode } from './types__';
5038
4973
  &nbsp;
5039
4974
  //================================================================================
5040
4975
  // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
@@ -5044,7 +4979,6 @@ import { EventPayload, Params } from '../common/EventEmitter';
5044
4979
  import { concept, excludedInJSON, property, className } from '../decorators';
5045
4980
  &nbsp;
5046
4981
  import * as utils from '../utils';
5047
- import { v4 as uuidv4 } from 'uuid';
5048
4982
  import BaseNode from '../common/BaseNode';
5049
4983
  import Transactional from './Transactional__';
5050
4984
  import TypeParam from './TypeParam__';
@@ -5073,7 +5007,6 @@ export class Logic extends BaseNode {
5073
5007
  /**
5074
5008
  * 产品概念
5075
5009
  */
5076
- @property('concept')
5077
5010
  // @ts-ignore
5078
5011
  readonly concept!: 'Logic' | 'AuthLogic' | 'AuthLogicForCallInterface';
5079
5012
  &nbsp;
@@ -5168,36 +5101,42 @@ export class Logic extends BaseNode {
5168
5101
  <span class="fstat-no" title="function not covered" > get m</span>odule() {
5169
5102
  <span class="cstat-no" title="statement not covered" > return this.getAncestor('Module') as Module;</span>
5170
5103
  }
5104
+ &nbsp;
5171
5105
  /**
5172
5106
  * 祖先 App
5173
5107
  */
5174
5108
  <span class="fstat-no" title="function not covered" > get a</span>pp() {
5175
5109
  <span class="cstat-no" title="statement not covered" > return this.getAncestor('App') as App;</span>
5176
5110
  }
5111
+ &nbsp;
5177
5112
  /**
5178
5113
  * 祖先 Connector
5179
5114
  */
5180
5115
  <span class="fstat-no" title="function not covered" > get c</span>onnector() {
5181
5116
  <span class="cstat-no" title="statement not covered" > return this.getAncestor('Connector') as Connector;</span>
5182
5117
  }
5118
+ &nbsp;
5183
5119
  /**
5184
5120
  * 祖先 View
5185
5121
  */
5186
5122
  get view() {
5187
5123
  return this.getAncestor('View') as View;
5188
5124
  }
5125
+ &nbsp;
5189
5126
  /**
5190
5127
  * 祖先 Frontend
5191
5128
  */
5192
5129
  <span class="fstat-no" title="function not covered" > get f</span>rontend() {
5193
5130
  <span class="cstat-no" title="statement not covered" > return this.getAncestor('Frontend') as Frontend;</span>
5194
5131
  }
5132
+ &nbsp;
5195
5133
  /**
5196
5134
  * 祖先 ProcessElement
5197
5135
  */
5198
5136
  <span class="fstat-no" title="function not covered" > get p</span>rocessElement() {
5199
5137
  <span class="cstat-no" title="statement not covered" > return this.getAncestor('ProcessElement') as ProcessElement;</span>
5200
5138
  }
5139
+ &nbsp;
5201
5140
  /**
5202
5141
  * 祖先 Process
5203
5142
  */
@@ -5209,7 +5148,7 @@ export class Logic extends BaseNode {
5209
5148
  * @param source 需要合并的部分参数
5210
5149
  */
5211
5150
  constructor(source?: Partial&lt;Logic&gt;) {
5212
- source = Object.assign({}, Logic.getDefaultOptions(), source);
5151
+ source = { ...Logic.getDefaultOptions(), ...source};
5213
5152
  super(source);
5214
5153
  super.subConstructor(source);
5215
5154
  }
@@ -5229,6 +5168,7 @@ export class Logic extends BaseNode {
5229
5168
  }
5230
5169
  <span class="cstat-no" title="statement not covered" > return params;</span>
5231
5170
  }
5171
+ &nbsp;
5232
5172
  /**
5233
5173
  * 设置逻辑名称
5234
5174
  */
@@ -5319,8 +5259,9 @@ export class Logic extends BaseNode {
5319
5259
  &nbsp;
5320
5260
  <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> {
5321
5261
  const excludedSet = <span class="cstat-no" title="statement not covered" >new Set(excludedList);</span>
5322
- <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>
5262
+ <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>
5323
5263
  }
5264
+ &nbsp;
5324
5265
  <span class="fstat-no" title="function not covered" > getTypeParamUniqueName(</span>name = <span class="branch-0 cbranch-no" title="branch not covered" >'typeParam1')</span> {
5325
5266
  <span class="cstat-no" title="statement not covered" > return utils.unique(name, this.getTypeParamExistingNames(), undefined, false);</span>
5326
5267
  }
@@ -6134,7 +6075,7 @@ export class Logic extends BaseNode {
6134
6075
  <span class="cstat-no" title="statement not covered" > if (typeof options === 'string') {</span>
6135
6076
  <span class="cstat-no" title="statement not covered" > transactional = this.transactional;</span>
6136
6077
  <span class="cstat-no" title="statement not covered" > if (!transactional) {</span>
6137
- <span class="cstat-no" title="statement not covered" > throw new Error('找不到事务 ' + options);</span>
6078
+ <span class="cstat-no" title="statement not covered" > throw new Error(`找不到事务 ${ options}`);</span>
6138
6079
  }
6139
6080
  } else {
6140
6081
  <span class="cstat-no" title="statement not covered" > transactional = options;</span>
@@ -6143,7 +6084,7 @@ export class Logic extends BaseNode {
6143
6084
  }
6144
6085
  &nbsp;
6145
6086
  <span class="fstat-no" title="function not covered" > __removeTransactional(</span>transactional: Transactional) {
6146
- const parentKey = <span class="cstat-no" title="statement not covered" >transactional.parentKey;</span>
6087
+ const {parentKey} = <span class="cstat-no" title="statement not covered" >transactional;</span>
6147
6088
  const params: Params = <span class="cstat-no" title="statement not covered" >{</span>
6148
6089
  parentNode: this,
6149
6090
  parentKey,
@@ -6153,21 +6094,13 @@ export class Logic extends BaseNode {
6153
6094
  };
6154
6095
  <span class="cstat-no" title="statement not covered" > if (parentKey) {</span>
6155
6096
  <span class="cstat-no" title="statement not covered" > params.parentKey = parentKey;</span>
6156
- // @ts-ignore
6157
- const t = <span class="cstat-no" title="statement not covered" >this.__v_raw || this;</span>
6158
- // @ts-ignore
6159
- const n = <span class="cstat-no" title="statement not covered" >transactional.__v_raw || transactional;</span>
6160
- <span class="cstat-no" title="statement not covered" > if (Array.isArray((t as any)[parentKey])) {</span>
6161
- // @ts-ignore
6162
- 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>
6097
+ <span class="cstat-no" title="statement not covered" > if (Array.isArray((this as any)[parentKey])) {</span>
6098
+ const index = (<span class="cstat-no" title="statement not covered" >this as any)[parentKey].indexOf(transactional);</span>
6163
6099
  <span class="cstat-no" title="statement not covered" > ~index &amp;&amp; (this as any)[parentKey].splice(index, 1);</span>
6164
6100
  <span class="cstat-no" title="statement not covered" > params.index = index;</span>
6165
- } else {
6166
- const q = (<span class="cstat-no" title="statement not covered" >t as any)[parentKey];</span>
6167
- <span class="cstat-no" title="statement not covered" > if ((q.__v_raw || q) === n) {</span>
6168
- <span class="cstat-no" title="statement not covered" > params.index = 0;</span>
6169
- (<span class="cstat-no" title="statement not covered" >this as any)[parentKey] = undefined;</span>
6170
- }
6101
+ } else <span class="cstat-no" title="statement not covered" >if ((this as any)[parentKey] === transactional) {</span>
6102
+ <span class="cstat-no" title="statement not covered" > params.index = 0;</span>
6103
+ (<span class="cstat-no" title="statement not covered" >this as any)[parentKey] = undefined;</span>
6171
6104
  }
6172
6105
  }
6173
6106
  <span class="cstat-no" title="statement not covered" > return params;</span>
@@ -6190,7 +6123,7 @@ export class Logic extends BaseNode {
6190
6123
  <span class="cstat-no" title="statement not covered" > if (typeof options === 'string') {</span>
6191
6124
  <span class="cstat-no" title="statement not covered" > typeParam = (this.typeParams as TypeParam[]).find(<span class="fstat-no" title="function not covered" >(i</span>tem) =&gt; <span class="cstat-no" title="statement not covered" >item.name === options)</span>;</span>
6192
6125
  <span class="cstat-no" title="statement not covered" > if (!typeParam) {</span>
6193
- <span class="cstat-no" title="statement not covered" > throw new Error('找不到类型参数 ' + options);</span>
6126
+ <span class="cstat-no" title="statement not covered" > throw new Error(`找不到类型参数 ${ options}`);</span>
6194
6127
  }
6195
6128
  } else {
6196
6129
  <span class="cstat-no" title="statement not covered" > typeParam = options;</span>
@@ -6199,7 +6132,7 @@ export class Logic extends BaseNode {
6199
6132
  }
6200
6133
  &nbsp;
6201
6134
  <span class="fstat-no" title="function not covered" > __removeTypeParam(</span>typeParam: TypeParam) {
6202
- const parentKey = <span class="cstat-no" title="statement not covered" >typeParam.parentKey;</span>
6135
+ const {parentKey} = <span class="cstat-no" title="statement not covered" >typeParam;</span>
6203
6136
  const params: Params = <span class="cstat-no" title="statement not covered" >{</span>
6204
6137
  parentNode: this,
6205
6138
  parentKey,
@@ -6209,21 +6142,13 @@ export class Logic extends BaseNode {
6209
6142
  };
6210
6143
  <span class="cstat-no" title="statement not covered" > if (parentKey) {</span>
6211
6144
  <span class="cstat-no" title="statement not covered" > params.parentKey = parentKey;</span>
6212
- // @ts-ignore
6213
- const t = <span class="cstat-no" title="statement not covered" >this.__v_raw || this;</span>
6214
- // @ts-ignore
6215
- const n = <span class="cstat-no" title="statement not covered" >typeParam.__v_raw || typeParam;</span>
6216
- <span class="cstat-no" title="statement not covered" > if (Array.isArray((t as any)[parentKey])) {</span>
6217
- // @ts-ignore
6218
- 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>
6145
+ <span class="cstat-no" title="statement not covered" > if (Array.isArray((this as any)[parentKey])) {</span>
6146
+ const index = (<span class="cstat-no" title="statement not covered" >this as any)[parentKey].indexOf(typeParam);</span>
6219
6147
  <span class="cstat-no" title="statement not covered" > ~index &amp;&amp; (this as any)[parentKey].splice(index, 1);</span>
6220
6148
  <span class="cstat-no" title="statement not covered" > params.index = index;</span>
6221
- } else {
6222
- const q = (<span class="cstat-no" title="statement not covered" >t as any)[parentKey];</span>
6223
- <span class="cstat-no" title="statement not covered" > if ((q.__v_raw || q) === n) {</span>
6224
- <span class="cstat-no" title="statement not covered" > params.index = 0;</span>
6225
- (<span class="cstat-no" title="statement not covered" >this as any)[parentKey] = undefined;</span>
6226
- }
6149
+ } else <span class="cstat-no" title="statement not covered" >if ((this as any)[parentKey] === typeParam) {</span>
6150
+ <span class="cstat-no" title="statement not covered" > params.index = 0;</span>
6151
+ (<span class="cstat-no" title="statement not covered" >this as any)[parentKey] = undefined;</span>
6227
6152
  }
6228
6153
  }
6229
6154
  <span class="cstat-no" title="statement not covered" > return params;</span>
@@ -6246,7 +6171,7 @@ export class Logic extends BaseNode {
6246
6171
  <span class="cstat-no" title="statement not covered" > if (typeof options === 'string') {</span>
6247
6172
  <span class="cstat-no" title="statement not covered" > param = (this.params as Param[]).find(<span class="fstat-no" title="function not covered" >(i</span>tem) =&gt; <span class="cstat-no" title="statement not covered" >item.name === options)</span>;</span>
6248
6173
  <span class="cstat-no" title="statement not covered" > if (!param) {</span>
6249
- <span class="cstat-no" title="statement not covered" > throw new Error('找不到输入参数 ' + options);</span>
6174
+ <span class="cstat-no" title="statement not covered" > throw new Error(`找不到输入参数 ${ options}`);</span>
6250
6175
  }
6251
6176
  } else {
6252
6177
  <span class="cstat-no" title="statement not covered" > param = options;</span>
@@ -6255,7 +6180,7 @@ export class Logic extends BaseNode {
6255
6180
  }
6256
6181
  &nbsp;
6257
6182
  <span class="fstat-no" title="function not covered" > __removeParam(</span>param: Param) {
6258
- const parentKey = <span class="cstat-no" title="statement not covered" >param.parentKey;</span>
6183
+ const {parentKey} = <span class="cstat-no" title="statement not covered" >param;</span>
6259
6184
  const params: Params = <span class="cstat-no" title="statement not covered" >{</span>
6260
6185
  parentNode: this,
6261
6186
  parentKey,
@@ -6265,21 +6190,13 @@ export class Logic extends BaseNode {
6265
6190
  };
6266
6191
  <span class="cstat-no" title="statement not covered" > if (parentKey) {</span>
6267
6192
  <span class="cstat-no" title="statement not covered" > params.parentKey = parentKey;</span>
6268
- // @ts-ignore
6269
- const t = <span class="cstat-no" title="statement not covered" >this.__v_raw || this;</span>
6270
- // @ts-ignore
6271
- const n = <span class="cstat-no" title="statement not covered" >param.__v_raw || param;</span>
6272
- <span class="cstat-no" title="statement not covered" > if (Array.isArray((t as any)[parentKey])) {</span>
6273
- // @ts-ignore
6274
- 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>
6193
+ <span class="cstat-no" title="statement not covered" > if (Array.isArray((this as any)[parentKey])) {</span>
6194
+ const index = (<span class="cstat-no" title="statement not covered" >this as any)[parentKey].indexOf(param);</span>
6275
6195
  <span class="cstat-no" title="statement not covered" > ~index &amp;&amp; (this as any)[parentKey].splice(index, 1);</span>
6276
6196
  <span class="cstat-no" title="statement not covered" > params.index = index;</span>
6277
- } else {
6278
- const q = (<span class="cstat-no" title="statement not covered" >t as any)[parentKey];</span>
6279
- <span class="cstat-no" title="statement not covered" > if ((q.__v_raw || q) === n) {</span>
6280
- <span class="cstat-no" title="statement not covered" > params.index = 0;</span>
6281
- (<span class="cstat-no" title="statement not covered" >this as any)[parentKey] = undefined;</span>
6282
- }
6197
+ } else <span class="cstat-no" title="statement not covered" >if ((this as any)[parentKey] === param) {</span>
6198
+ <span class="cstat-no" title="statement not covered" > params.index = 0;</span>
6199
+ (<span class="cstat-no" title="statement not covered" >this as any)[parentKey] = undefined;</span>
6283
6200
  }
6284
6201
  }
6285
6202
  <span class="cstat-no" title="statement not covered" > return params;</span>
@@ -6302,7 +6219,7 @@ export class Logic extends BaseNode {
6302
6219
  <span class="cstat-no" title="statement not covered" > if (typeof options === 'string') {</span>
6303
6220
  <span class="cstat-no" title="statement not covered" > ret = (this.returns as Return[]).find(<span class="fstat-no" title="function not covered" >(i</span>tem) =&gt; <span class="cstat-no" title="statement not covered" >item.name === options)</span>;</span>
6304
6221
  <span class="cstat-no" title="statement not covered" > if (!ret) {</span>
6305
- <span class="cstat-no" title="statement not covered" > throw new Error('找不到输出参数 ' + options);</span>
6222
+ <span class="cstat-no" title="statement not covered" > throw new Error(`找不到输出参数 ${ options}`);</span>
6306
6223
  }
6307
6224
  } else {
6308
6225
  <span class="cstat-no" title="statement not covered" > ret = options;</span>
@@ -6311,7 +6228,7 @@ export class Logic extends BaseNode {
6311
6228
  }
6312
6229
  &nbsp;
6313
6230
  <span class="fstat-no" title="function not covered" > __removeReturn(</span>ret: Return) {
6314
- const parentKey = <span class="cstat-no" title="statement not covered" >ret.parentKey;</span>
6231
+ const {parentKey} = <span class="cstat-no" title="statement not covered" >ret;</span>
6315
6232
  const params: Params = <span class="cstat-no" title="statement not covered" >{</span>
6316
6233
  parentNode: this,
6317
6234
  parentKey,
@@ -6321,21 +6238,13 @@ export class Logic extends BaseNode {
6321
6238
  };
6322
6239
  <span class="cstat-no" title="statement not covered" > if (parentKey) {</span>
6323
6240
  <span class="cstat-no" title="statement not covered" > params.parentKey = parentKey;</span>
6324
- // @ts-ignore
6325
- const t = <span class="cstat-no" title="statement not covered" >this.__v_raw || this;</span>
6326
- // @ts-ignore
6327
- const n = <span class="cstat-no" title="statement not covered" >ret.__v_raw || ret;</span>
6328
- <span class="cstat-no" title="statement not covered" > if (Array.isArray((t as any)[parentKey])) {</span>
6329
- // @ts-ignore
6330
- 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>
6241
+ <span class="cstat-no" title="statement not covered" > if (Array.isArray((this as any)[parentKey])) {</span>
6242
+ const index = (<span class="cstat-no" title="statement not covered" >this as any)[parentKey].indexOf(ret);</span>
6331
6243
  <span class="cstat-no" title="statement not covered" > ~index &amp;&amp; (this as any)[parentKey].splice(index, 1);</span>
6332
6244
  <span class="cstat-no" title="statement not covered" > params.index = index;</span>
6333
- } else {
6334
- const q = (<span class="cstat-no" title="statement not covered" >t as any)[parentKey];</span>
6335
- <span class="cstat-no" title="statement not covered" > if ((q.__v_raw || q) === n) {</span>
6336
- <span class="cstat-no" title="statement not covered" > params.index = 0;</span>
6337
- (<span class="cstat-no" title="statement not covered" >this as any)[parentKey] = undefined;</span>
6338
- }
6245
+ } else <span class="cstat-no" title="statement not covered" >if ((this as any)[parentKey] === ret) {</span>
6246
+ <span class="cstat-no" title="statement not covered" > params.index = 0;</span>
6247
+ (<span class="cstat-no" title="statement not covered" >this as any)[parentKey] = undefined;</span>
6339
6248
  }
6340
6249
  }
6341
6250
  <span class="cstat-no" title="statement not covered" > return params;</span>
@@ -6358,7 +6267,7 @@ export class Logic extends BaseNode {
6358
6267
  <span class="cstat-no" title="statement not covered" > if (typeof options === 'string') {</span>
6359
6268
  <span class="cstat-no" title="statement not covered" > variable = (this.variables as Variable[]).find(<span class="fstat-no" title="function not covered" >(i</span>tem) =&gt; <span class="cstat-no" title="statement not covered" >item.name === options)</span>;</span>
6360
6269
  <span class="cstat-no" title="statement not covered" > if (!variable) {</span>
6361
- <span class="cstat-no" title="statement not covered" > throw new Error('找不到变量 ' + options);</span>
6270
+ <span class="cstat-no" title="statement not covered" > throw new Error(`找不到变量 ${ options}`);</span>
6362
6271
  }
6363
6272
  } else {
6364
6273
  <span class="cstat-no" title="statement not covered" > variable = options;</span>
@@ -6367,7 +6276,7 @@ export class Logic extends BaseNode {
6367
6276
  }
6368
6277
  &nbsp;
6369
6278
  <span class="fstat-no" title="function not covered" > __removeVariable(</span>variable: Variable) {
6370
- const parentKey = <span class="cstat-no" title="statement not covered" >variable.parentKey;</span>
6279
+ const {parentKey} = <span class="cstat-no" title="statement not covered" >variable;</span>
6371
6280
  const params: Params = <span class="cstat-no" title="statement not covered" >{</span>
6372
6281
  parentNode: this,
6373
6282
  parentKey,
@@ -6377,21 +6286,13 @@ export class Logic extends BaseNode {
6377
6286
  };
6378
6287
  <span class="cstat-no" title="statement not covered" > if (parentKey) {</span>
6379
6288
  <span class="cstat-no" title="statement not covered" > params.parentKey = parentKey;</span>
6380
- // @ts-ignore
6381
- const t = <span class="cstat-no" title="statement not covered" >this.__v_raw || this;</span>
6382
- // @ts-ignore
6383
- const n = <span class="cstat-no" title="statement not covered" >variable.__v_raw || variable;</span>
6384
- <span class="cstat-no" title="statement not covered" > if (Array.isArray((t as any)[parentKey])) {</span>
6385
- // @ts-ignore
6386
- 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>
6289
+ <span class="cstat-no" title="statement not covered" > if (Array.isArray((this as any)[parentKey])) {</span>
6290
+ const index = (<span class="cstat-no" title="statement not covered" >this as any)[parentKey].indexOf(variable);</span>
6387
6291
  <span class="cstat-no" title="statement not covered" > ~index &amp;&amp; (this as any)[parentKey].splice(index, 1);</span>
6388
6292
  <span class="cstat-no" title="statement not covered" > params.index = index;</span>
6389
- } else {
6390
- const q = (<span class="cstat-no" title="statement not covered" >t as any)[parentKey];</span>
6391
- <span class="cstat-no" title="statement not covered" > if ((q.__v_raw || q) === n) {</span>
6392
- <span class="cstat-no" title="statement not covered" > params.index = 0;</span>
6393
- (<span class="cstat-no" title="statement not covered" >this as any)[parentKey] = undefined;</span>
6394
- }
6293
+ } else <span class="cstat-no" title="statement not covered" >if ((this as any)[parentKey] === variable) {</span>
6294
+ <span class="cstat-no" title="statement not covered" > params.index = 0;</span>
6295
+ (<span class="cstat-no" title="statement not covered" >this as any)[parentKey] = undefined;</span>
6395
6296
  }
6396
6297
  }
6397
6298
  <span class="cstat-no" title="statement not covered" > return params;</span>
@@ -6404,7 +6305,7 @@ export class Logic extends BaseNode {
6404
6305
  removeItemInBody(logicItem: LogicItem): void;
6405
6306
  &nbsp;
6406
6307
  <span class="fstat-no" title="function not covered" > removeItemInBody(</span>options: LogicItem) {
6407
- let logicItem: LogicItem = <span class="cstat-no" title="statement not covered" >options;</span>
6308
+ const logicItem: LogicItem = <span class="cstat-no" title="statement not covered" >options;</span>
6408
6309
  <span class="cstat-no" title="statement not covered" > return logicItem.delete();</span>
6409
6310
  }
6410
6311
  &nbsp;
@@ -6415,12 +6316,12 @@ export class Logic extends BaseNode {
6415
6316
  removeItemInPlayground(logicItem: LogicItem): void;
6416
6317
  &nbsp;
6417
6318
  <span class="fstat-no" title="function not covered" > removeItemInPlayground(</span>options: LogicItem) {
6418
- let logicItem: LogicItem = <span class="cstat-no" title="statement not covered" >options;</span>
6319
+ const logicItem: LogicItem = <span class="cstat-no" title="statement not covered" >options;</span>
6419
6320
  <span class="cstat-no" title="statement not covered" > return logicItem.delete();</span>
6420
6321
  }
6421
6322
  &nbsp;
6422
6323
  <span class="fstat-no" title="function not covered" > __removeLogicItem(</span>logicItem: LogicItem) {
6423
- const parentKey = <span class="cstat-no" title="statement not covered" >logicItem.parentKey;</span>
6324
+ const {parentKey} = <span class="cstat-no" title="statement not covered" >logicItem;</span>
6424
6325
  const params: Params = <span class="cstat-no" title="statement not covered" >{</span>
6425
6326
  parentNode: this,
6426
6327
  parentKey,
@@ -6430,21 +6331,13 @@ export class Logic extends BaseNode {
6430
6331
  };
6431
6332
  <span class="cstat-no" title="statement not covered" > if (parentKey) {</span>
6432
6333
  <span class="cstat-no" title="statement not covered" > params.parentKey = parentKey;</span>
6433
- // @ts-ignore
6434
- const t = <span class="cstat-no" title="statement not covered" >this.__v_raw || this;</span>
6435
- // @ts-ignore
6436
- const n = <span class="cstat-no" title="statement not covered" >logicItem.__v_raw || logicItem;</span>
6437
- <span class="cstat-no" title="statement not covered" > if (Array.isArray((t as any)[parentKey])) {</span>
6438
- // @ts-ignore
6439
- 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>
6334
+ <span class="cstat-no" title="statement not covered" > if (Array.isArray((this as any)[parentKey])) {</span>
6335
+ const index = (<span class="cstat-no" title="statement not covered" >this as any)[parentKey].indexOf(logicItem);</span>
6440
6336
  <span class="cstat-no" title="statement not covered" > ~index &amp;&amp; (this as any)[parentKey].splice(index, 1);</span>
6441
6337
  <span class="cstat-no" title="statement not covered" > params.index = index;</span>
6442
- } else {
6443
- const q = (<span class="cstat-no" title="statement not covered" >t as any)[parentKey];</span>
6444
- <span class="cstat-no" title="statement not covered" > if ((q.__v_raw || q) === n) {</span>
6445
- <span class="cstat-no" title="statement not covered" > params.index = 0;</span>
6446
- (<span class="cstat-no" title="statement not covered" >this as any)[parentKey] = undefined;</span>
6447
- }
6338
+ } else <span class="cstat-no" title="statement not covered" >if ((this as any)[parentKey] === logicItem) {</span>
6339
+ <span class="cstat-no" title="statement not covered" > params.index = 0;</span>
6340
+ (<span class="cstat-no" title="statement not covered" >this as any)[parentKey] = undefined;</span>
6448
6341
  }
6449
6342
  }
6450
6343
  <span class="cstat-no" title="statement not covered" > return params;</span>
@@ -6694,181 +6587,199 @@ export class Logic extends BaseNode {
6694
6587
  };
6695
6588
  }
6696
6589
  &nbsp;
6697
- @withSourceMapGenerator
6698
- <span class="fstat-no" title="function not covered" > *t</span>oEmbeddedTSInProcess(
6699
- state = <span class="branch-0 cbranch-no" title="branch not covered" >createCompilerState(),</span>
6700
- prependCode?: string,
6701
- noName?: boolean,
6702
- prefix?: boolean,
6703
- ): TranslatorGenerator {
6704
- const self = <span class="cstat-no" title="statement not covered" >this;</span>
6590
+ @withSourceMap()
6591
+ <span class="fstat-no" title="function not covered" > toEmbeddedTSInProcess(</span>state?: TranslatorState, prependCode?: string, noName?: boolean, prefix?: boolean): string {
6705
6592
  let code = <span class="cstat-no" title="statement not covered" >'';</span>
6706
- <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>
6707
- else <span class="cstat-no" title="statement not covered" >code += `function ${self.name}(`; </span>// 加空格会导致无法查询到引用
6708
- <span class="cstat-no" title="statement not covered" > yield* wrapForEach(</span>
6709
- // 加空格会导致无法查询到引用
6710
- self.params,
6711
- function* <span class="fstat-no" title="function not covered" >warpForEachGenerator(</span>param, index) {
6712
- <span class="cstat-no" title="statement not covered" > code += yield* param.toEmbeddedTS(shiftState(state, code, { inline: true }));</span>
6713
- <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>
6714
- },
6715
- );
6593
+ <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>
6594
+ else <span class="cstat-no" title="statement not covered" >code += `function ${this.name}(`; </span>// 加空格会导致无法查询到引用
6595
+ <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>
6596
+ <span class="cstat-no" title="statement not covered" > code += param.toEmbeddedTS(shiftState(state, code, { inline: true }));</span>
6597
+ <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>
6598
+ });
6716
6599
  <span class="cstat-no" title="statement not covered" > code += `) {\n`;</span>
6717
6600
  <span class="cstat-no" title="statement not covered" > code += prependCode || '';</span>
6718
6601
  <span class="cstat-no" title="statement not covered" > code += '\n';</span>
6719
- <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>
6602
+ <span class="cstat-no" title="statement not covered" > this.variables.forEach(<span class="fstat-no" title="function not covered" >(v</span>ariable) =&gt; {</span>
6720
6603
  <span class="cstat-no" title="statement not covered" > code += `${indent((state?.tabSize || 0) + 1)}let `;</span>
6721
- <span class="cstat-no" title="statement not covered" > code += yield* variable.toEmbeddedTS(shiftState(state, code, { inline: true }));</span>
6604
+ <span class="cstat-no" title="statement not covered" > code += variable.toEmbeddedTS(shiftState(state, code, { inline: true }));</span>
6722
6605
  <span class="cstat-no" title="statement not covered" > code += ';\n';</span>
6723
6606
  });
6724
- <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>
6607
+ &nbsp;
6608
+ <span class="cstat-no" title="statement not covered" > this.returns.forEach(<span class="fstat-no" title="function not covered" >(r</span>et) =&gt; {</span>
6725
6609
  <span class="cstat-no" title="statement not covered" > code += `${indent((state?.tabSize || 0) + 1)}let `;</span>
6726
- <span class="cstat-no" title="statement not covered" > code += yield* ret.toEmbeddedTS(shiftState(state, code, { inline: true }));</span>
6610
+ <span class="cstat-no" title="statement not covered" > code += ret.toEmbeddedTS(shiftState(state, code, { inline: true }));</span>
6727
6611
  <span class="cstat-no" title="statement not covered" > code += ';\n';</span>
6728
6612
  });
6729
- <span class="cstat-no" title="statement not covered" > if (!self.body.length &amp;&amp; self.returns.length) {</span>
6730
- <span class="cstat-no" title="statement not covered" > code += `${indent((state?.tabSize || 0) + 1)}return ${self.returns[0].name};\n`;</span>
6613
+ &nbsp;
6614
+ <span class="cstat-no" title="statement not covered" > if (!this.body.length &amp;&amp; this.returns.length) {</span>
6615
+ <span class="cstat-no" title="statement not covered" > code += `${indent((state?.tabSize || 0) + 1)}return ${this.returns[0].name};\n`;</span>
6731
6616
  } else {
6732
- <span class="cstat-no" title="statement not covered" > if ((self.parentNode as any).type === 'ExclusiveGateway') {</span>
6733
- <span class="cstat-no" title="statement not covered" > if (self.body.length &lt;= 1) {</span>
6617
+ <span class="cstat-no" title="statement not covered" > if ((this.parentNode as any).type === 'ExclusiveGateway') {</span>
6618
+ <span class="cstat-no" title="statement not covered" > if (this.body.length &lt;= 1) {</span>
6734
6619
  <span class="cstat-no" title="statement not covered" > code += indent((state?.tabSize || 0) + 1);</span>
6735
6620
  <span class="cstat-no" title="statement not covered" > code += 'const __LogicEmpty: any = null;';</span>
6736
6621
  }
6737
6622
  } else <span class="cstat-no" title="statement not covered" >if (</span>
6738
- self.body.length &lt;= 2 &amp;&amp;
6739
- !(self.parentNode instanceof Namespace) &amp;&amp;
6740
- !(self.parentNode instanceof Process)
6623
+ this.body.length &lt;= 2 &amp;&amp;
6624
+ !(this.parentNode instanceof Namespace) &amp;&amp;
6625
+ !(this.parentNode instanceof Process)
6741
6626
  ) {
6742
6627
  <span class="cstat-no" title="statement not covered" > code += indent((state?.tabSize || 0) + 1);</span>
6743
6628
  <span class="cstat-no" title="statement not covered" > code += `${indent(state?.tabSize || 0 + 4)}const __LogicEmpty: any = null;`;</span>
6744
6629
  }
6745
- <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>
6746
- <span class="cstat-no" title="statement not covered" > code += yield* item.toEmbeddedTS?.(shiftState(state, code, { tabSize: (state?.tabSize || 0) + 1 })) ?? returnOrigin('');</span>
6630
+ <span class="cstat-no" title="statement not covered" > this.body.forEach(<span class="fstat-no" title="function not covered" >(i</span>tem) =&gt; {</span>
6631
+ <span class="cstat-no" title="statement not covered" > code += item.toEmbeddedTS &amp;&amp; item.toEmbeddedTS(shiftState(state, code, { tabSize: (state?.tabSize || 0) + 1 }));</span>
6747
6632
  <span class="cstat-no" title="statement not covered" > code += ';\n';</span>
6748
6633
  });
6749
6634
  }
6635
+ &nbsp;
6750
6636
  // 在body渲染完成之后把其余的节点放到下面
6751
- <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>
6752
- <span class="cstat-no" title="statement not covered" > code += yield* item.toEmbeddedTS(shiftState(state, code, { tabSize: (state?.tabSize || 0) + 1 }));</span>
6637
+ <span class="cstat-no" title="statement not covered" > this.playground.forEach(<span class="fstat-no" title="function not covered" >(i</span>tem) =&gt; {</span>
6638
+ <span class="cstat-no" title="statement not covered" > code += item.toEmbeddedTS(shiftState(state, code, { tabSize: (state?.tabSize || 0) + 1 }));</span>
6753
6639
  <span class="cstat-no" title="statement not covered" > code += '\n';</span>
6754
6640
  });
6641
+ &nbsp;
6755
6642
  <span class="cstat-no" title="statement not covered" > code += `${indent(state?.tabSize || 0 + 4)}}`;</span>
6756
6643
  <span class="cstat-no" title="statement not covered" > code += '\n';</span>
6757
6644
  <span class="cstat-no" title="statement not covered" > return code;</span>
6758
6645
  }
6759
6646
  &nbsp;
6760
6647
  <span class="fstat-no" title="function not covered" > toEmbeddedTSNoExport(</span>state?: TranslatorState): string {
6761
- <span class="cstat-no" title="statement not covered" > return runSync(this.toEmbeddedTS(state, 'noExport'));</span>
6648
+ <span class="cstat-no" title="statement not covered" > return this.toEmbeddedTS(state, 'noExport');</span>
6762
6649
  }
6763
6650
  &nbsp;
6764
- @withSourceMapGenerator
6765
- *toEmbeddedTS(state = <span class="branch-0 cbranch-no" title="branch not covered" >createCompilerState(),</span> prefix?: string): TranslatorGenerator {
6766
- const self = this;
6767
- // 等待 oql 查询返回内容
6768
- yield waitOqlQueryComponentChildrenFinish(self);
6651
+ @withSourceMap()
6652
+ toEmbeddedTS(state?: TranslatorState, prefix?: string): string {
6769
6653
  // 如果传了不要前缀那就为空， 要不用传进来的，要是都没有就默认导出
6770
6654
  let code = '';
6771
6655
  <span class="missing-if-branch" title="if path not taken" >I</span>if (!prefix) {
6772
- <span class="cstat-no" title="statement not covered" > code += `export function ${self.name}`;</span>
6773
- } else if (prefix === 'noExport') {
6774
- code += `function ${self.name}`;
6775
- } else <span class="missing-if-branch" title="else path not taken" >E</span>if (prefix === 'inObject') {
6776
- code += `${self.name}`;
6656
+ <span class="cstat-no" title="statement not covered" > code += `export function ${this.name}`;</span>
6657
+ } else <span class="missing-if-branch" title="else path not taken" >E</span>if (prefix === 'noExport') {
6658
+ code += `function ${this.name}`;
6659
+ } else <span class="cstat-no" title="statement not covered" >if (prefix === 'inObject') {</span>
6660
+ <span class="cstat-no" title="statement not covered" > code += `${this.name}`;</span>
6777
6661
  }
6778
- <span class="missing-if-branch" title="if path not taken" >I</span>if (self.typeParams?.length) {
6662
+ <span class="missing-if-branch" title="if path not taken" >I</span>if (this.typeParams?.length) {
6779
6663
  <span class="cstat-no" title="statement not covered" > code += '&lt;';</span>
6780
- <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>
6781
- <span class="cstat-no" title="statement not covered" > code += yield* typeParam.toEmbeddedTS(shiftState(state, code, { inline: true }));</span>
6782
- <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>
6664
+ <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>
6665
+ <span class="cstat-no" title="statement not covered" > code += typeParam.toEmbeddedTS(shiftState(state, code, { inline: true }));</span>
6666
+ <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>
6783
6667
  });
6784
6668
  <span class="cstat-no" title="statement not covered" > code += '&gt;';</span>
6785
6669
  }
6786
6670
  // 有参数长度
6787
- if (self.params.length) {
6788
- code += '(';
6789
- yield* wrapForEach(self.params, function* warpForEachGenerator(param, index) {
6790
- code += yield* param.toEmbeddedTS(shiftState(state, code));
6791
- if (index !== self.params.length - 1) code += ', ';
6671
+ <span class="missing-if-branch" title="if path not taken" >I</span>if (this.params.length) {
6672
+ <span class="cstat-no" title="statement not covered" > code += '(';</span>
6673
+ <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>
6674
+ <span class="cstat-no" title="statement not covered" > code += param.toEmbeddedTS(shiftState(state, code));</span>
6675
+ <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>
6792
6676
  });
6793
- code += ')';
6677
+ <span class="cstat-no" title="statement not covered" > code += ')';</span>
6794
6678
  } else {
6795
6679
  // 没有参数的
6796
6680
  code += '()';
6797
6681
  }
6682
+ &nbsp;
6798
6683
  // 需要类型推导的局部变量/返回值需要调整申明顺序
6799
6684
  const advanceMap: Map&lt;Return | Variable, Assignment | BatchAssignment&gt; = new Map();
6800
- // const needGetSourceMapOqlList: Promise&lt;any&gt;[] = [];
6801
- yield* self.traverseChildrenGenerator(function* traverseChildrenGenerator(el) {
6685
+ const needGetSourceMapOqlList: Promise&lt;any&gt;[] = [];
6686
+ this.traverseChildren((el) =&gt; {
6802
6687
  if (el &amp;&amp; (el instanceof BatchAssignment || (el instanceof Assignment &amp;&amp; el.left?.name))) {
6803
6688
  <span class="missing-if-branch" title="else path not taken" >E</span>if (el instanceof Assignment) {
6804
- const advanceVar = self.variables?.find(
6689
+ const advanceVar = this.variables?.find(
6805
6690
  (variable) =&gt; !variable.typeAnnotation &amp;&amp; <span class="branch-1 cbranch-no" title="branch not covered" >el.left?.name === variable.name,</span>
6806
6691
  );
6807
6692
  <span class="missing-if-branch" title="if path not taken" >I</span>if (advanceVar &amp;&amp; <span class="branch-1 cbranch-no" title="branch not covered" >!advanceMap.get(advanceVar))</span> {
6808
6693
  <span class="cstat-no" title="statement not covered" > advanceMap.set(advanceVar, el);</span>
6809
6694
  }
6810
- const advanceRn = 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>;
6695
+ const advanceRn = 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>;
6811
6696
  <span class="missing-if-branch" title="if path not taken" >I</span>if (advanceRn &amp;&amp; <span class="branch-1 cbranch-no" title="branch not covered" >!advanceMap.get(advanceRn))</span> {
6812
6697
  <span class="cstat-no" title="statement not covered" > advanceMap.set(advanceRn, el);</span>
6813
6698
  }
6814
6699
  } else <span class="cstat-no" title="statement not covered" >if (el instanceof BatchAssignment) {</span>
6815
- <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>
6700
+ <span class="cstat-no" title="statement not covered" > el.assignmentLines.forEach(<span class="fstat-no" title="function not covered" >({</span> leftIndex }) =&gt; {</span>
6816
6701
  const leftCode =
6817
6702
  <span class="cstat-no" title="statement not covered" > leftIndex.length === 1</span>
6818
- ? yield* el.left.expression.toEmbeddedTS(shiftState(state, code, { inline: true }))
6819
- : yield* el.left.members[leftIndex[1]]?.toEmbeddedTS(shiftState(state, code, { inline: true })) ?? returnOrigin('');
6820
- const advanceVar = <span class="cstat-no" title="statement not covered" >self.variables?.find(</span>
6703
+ ? el.left.expression.toEmbeddedTS(shiftState(state, code, { inline: true }))
6704
+ : el.left.members[leftIndex[1]]?.toEmbeddedTS(shiftState(state, code, { inline: true }));
6705
+ const advanceVar = <span class="cstat-no" title="statement not covered" >this.variables?.find(</span>
6821
6706
  <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>
6822
6707
  );
6823
6708
  <span class="cstat-no" title="statement not covered" > if (advanceVar &amp;&amp; !advanceMap.get(advanceVar)) {</span>
6824
6709
  <span class="cstat-no" title="statement not covered" > advanceMap.set(advanceVar, el);</span>
6825
6710
  }
6826
- 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>
6711
+ 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>
6827
6712
  <span class="cstat-no" title="statement not covered" > if (advanceRn &amp;&amp; !advanceMap.get(advanceRn)) {</span>
6828
6713
  <span class="cstat-no" title="statement not covered" > advanceMap.set(advanceRn, el);</span>
6829
6714
  }
6830
6715
  });
6831
6716
  }
6832
6717
  }
6718
+ // 如果有sql查询组件就需要把他们存起来
6719
+ <span class="missing-if-branch" title="if path not taken" >I</span>if (el instanceof OqlQueryComponent) {
6720
+ <span class="cstat-no" title="statement not covered" > if (!el.codeSourceMap) {</span>
6721
+ <span class="cstat-no" title="statement not covered" > needGetSourceMapOqlList.push(el.requestEmbeddedTS());</span>
6722
+ }
6723
+ }
6833
6724
  });
6725
+ &nbsp;
6726
+ <span class="missing-if-branch" title="if path not taken" >I</span>if (needGetSourceMapOqlList.length) {
6727
+ <span class="cstat-no" title="statement not covered" > Promise.all(needGetSourceMapOqlList).then(<span class="fstat-no" title="function not covered" >() =</span>&gt; {</span>
6728
+ // 触发一下更新重新生成代码
6729
+ (<span class="cstat-no" title="statement not covered" >this.app as any)?.naslServer?.embeddedTSEmitter.emit('change', {</span>
6730
+ value: [
6731
+ {
6732
+ originEvent: {
6733
+ action: 'update',
6734
+ target: this,
6735
+ },
6736
+ },
6737
+ ],
6738
+ });
6739
+ });
6740
+ }
6834
6741
  // 兼容 return 没有类型情况
6835
- if (self.returns.length &amp;&amp; self.returns[0].typeAnnotation) {
6836
- code += ': ';
6837
- code += yield* self.returns[0].typeAnnotation?.toEmbeddedTS(shiftState(state, code, { inline: true })) ?? <span class="branch-1 cbranch-no" title="branch not covered" >returnOrigin('');</span>
6742
+ <span class="missing-if-branch" title="if path not taken" >I</span>if (this.returns.length &amp;&amp; <span class="branch-1 cbranch-no" title="branch not covered" >this.returns[0].typeAnnotation)</span> {
6743
+ <span class="cstat-no" title="statement not covered" > code += ': ';</span>
6744
+ <span class="cstat-no" title="statement not covered" > code += this.returns[0].typeAnnotation?.toEmbeddedTS(shiftState(state, code, { inline: true }));</span>
6838
6745
  }
6839
6746
  code += '{\n';
6747
+ &nbsp;
6840
6748
  // 用于虚拟节点的查找引用
6841
- <span class="missing-if-branch" title="else path not taken" >E</span>if (Array.isArray(self.virtualParams)) {
6842
- for (const param of self.virtualParams) {
6749
+ this.virtualParams &amp;&amp;
6750
+ Array.isArray(this.virtualParams) &amp;&amp;
6751
+ this.virtualParams.forEach(<span class="fstat-no" title="function not covered" >(p</span>aram) =&gt; {
6843
6752
  <span class="cstat-no" title="statement not covered" > code += indent((state?.tabSize || 0) + 1);</span>
6844
- <span class="cstat-no" title="statement not covered" > code += yield* param.toEmbeddedNameTS(shiftState(state, code, { inline: true }));</span>
6753
+ <span class="cstat-no" title="statement not covered" > code += param.toEmbeddedNameTS(shiftState(state, code, { inline: true }));</span>
6845
6754
  <span class="cstat-no" title="statement not covered" > code += '\n';</span>
6846
- }
6847
- }
6848
- yield* wrapForEach(self.variables, function* warpForEachGenerator(variable) {
6755
+ });
6756
+ &nbsp;
6757
+ this.variables.forEach((variable) =&gt; {
6849
6758
  <span class="missing-if-branch" title="else path not taken" >E</span>if (!advanceMap.get(variable)) {
6850
6759
  code += `${indent((state?.tabSize || <span class="branch-1 cbranch-no" title="branch not covered" >0)</span> + 1)}let `;
6851
- code += yield* variable.toEmbeddedTS(shiftState(state, code, { inline: true }));
6760
+ code += variable.toEmbeddedTS(shiftState(state, code, { inline: true }));
6852
6761
  code += ';\n';
6853
6762
  }
6854
6763
  });
6855
- yield* wrapForEach(self.returns, function* warpForEachGenerator(ret) {
6856
- <span class="missing-if-branch" title="else path not taken" >E</span>if (!advanceMap.get(ret)) {
6857
- code += `${indent((state?.tabSize || 0) + 1)}let `;
6858
- code += yield* ret.toEmbeddedTS(shiftState(state, code, { inline: true }));
6859
- code += ';\n';
6764
+ &nbsp;
6765
+ this.returns.forEach(<span class="fstat-no" title="function not covered" >(r</span>et) =&gt; {
6766
+ <span class="cstat-no" title="statement not covered" > if (!advanceMap.get(ret)) {</span>
6767
+ <span class="cstat-no" title="statement not covered" > code += `${indent((state?.tabSize || 0) + 1)}let `;</span>
6768
+ <span class="cstat-no" title="statement not covered" > code += ret.toEmbeddedTS(shiftState(state, code, { inline: true }));</span>
6769
+ <span class="cstat-no" title="statement not covered" > code += ';\n';</span>
6860
6770
  }
6861
6771
  });
6862
- yield* wrapIterator(advanceMap.entries(), function* <span class="fstat-no" title="function not covered" >warpForEachGenerator(</span>[node, assignment]) {
6772
+ &nbsp;
6773
+ advanceMap.forEach(<span class="fstat-no" title="function not covered" >(a</span>ssignment, node) =&gt; {
6863
6774
  <span class="cstat-no" title="statement not covered" > code += `${indent((state?.tabSize || 0) + 1)}// @ts-ignore\n`;</span>
6864
6775
  <span class="cstat-no" title="statement not covered" > code += `${indent((state?.tabSize || 0) + 1)}let `;</span>
6865
- <span class="cstat-no" title="statement not covered" > code += yield* node.toEmbeddedTS(shiftState(state, code, { inline: true }));</span>
6776
+ <span class="cstat-no" title="statement not covered" > code += node.toEmbeddedTS(shiftState(state, code, { inline: true }));</span>
6866
6777
  <span class="cstat-no" title="statement not covered" > if (assignment instanceof BatchAssignment) {</span>
6867
- <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>
6778
+ <span class="cstat-no" title="statement not covered" > assignment.assignmentLines.forEach(<span class="fstat-no" title="function not covered" >({</span> leftIndex, rightIndex }) =&gt; {</span>
6868
6779
  const leftCode =
6869
6780
  <span class="cstat-no" title="statement not covered" > leftIndex.length === 1</span>
6870
- ? yield* assignment.left.expression.toEmbeddedTS(shiftState(state, code, { inline: true }))
6871
- : yield* assignment.left.members[leftIndex[1]]?.toEmbeddedTS(shiftState(state, code, { inline: true })) ?? returnOrigin('');
6781
+ ? assignment.left.expression.toEmbeddedTS(shiftState(state, code, { inline: true }))
6782
+ : assignment.left.members[leftIndex[1]]?.toEmbeddedTS(shiftState(state, code, { inline: true }));
6872
6783
  <span class="cstat-no" title="statement not covered" > if (leftCode === node.name) {</span>
6873
6784
  const rightNode: any =
6874
6785
  <span class="cstat-no" title="statement not covered" > rightIndex.length === 1</span>
@@ -6878,18 +6789,18 @@ export class Logic extends BaseNode {
6878
6789
  <span class="cstat-no" title="statement not covered" > if (rightNode?.typeAnnotation &amp;&amp; !(rightNode instanceof CallQueryComponent &amp;&amp; !rightNode.isAutoInfer())) {</span>
6879
6790
  <span class="cstat-no" title="statement not covered" > if (rightNode.concept === 'NewComposite' &amp;&amp; rightNode.typeAnnotation?.typeKind === 'anonymousStructure') {</span>
6880
6791
  <span class="cstat-no" title="statement not covered" > code += '= ';</span>
6881
- <span class="cstat-no" title="statement not covered" > code += (yield* rightNode.getInitCode(shiftState(state, code, { inline: true }))) || 'null';</span>
6792
+ <span class="cstat-no" title="statement not covered" > code += rightNode.getInitCode(shiftState(state, code, { inline: true })) || 'null';</span>
6882
6793
  } else <span class="cstat-no" title="statement not covered" >if (rightNode.concept === 'NewComposite' &amp;&amp; rightNode.typeAnnotation?.typeKind === 'generic') {</span>
6883
6794
  <span class="cstat-no" title="statement not covered" > code += '= ';</span>
6884
- <span class="cstat-no" title="statement not covered" > code += (yield* rightNode.getNewCompositeCode(shiftState(state, code, { inline: true }))) || 'null';</span>
6795
+ <span class="cstat-no" title="statement not covered" > code += rightNode.getNewCompositeCode(shiftState(state, code, { inline: true })) || 'null';</span>
6885
6796
  } else {
6886
6797
  <span class="cstat-no" title="statement not covered" > code += ': ';</span>
6887
- <span class="cstat-no" title="statement not covered" > code += yield* rightNode.typeAnnotation?.toEmbeddedTS(shiftState(state, code, { inline: true })) ?? returnOrigin('null');</span>
6798
+ <span class="cstat-no" title="statement not covered" > code += rightNode.typeAnnotation?.toEmbeddedTS(shiftState(state, code, { inline: true })) || 'null';</span>
6888
6799
  }
6889
6800
  } else {
6890
6801
  <span class="cstat-no" title="statement not covered" > code += ' = ';</span>
6891
- const rightCode = <span class="cstat-no" title="statement not covered" >yield* rightNode?.toEmbeddedTS(shiftState(state, code, { inline: true })) ?? returnOrigin('');</span>
6892
- <span class="cstat-no" title="statement not covered" > code += yield* self.getRightCode(rightCode, assignment, rightNode);</span>
6802
+ const rightCode = <span class="cstat-no" title="statement not covered" >rightNode?.toEmbeddedTS(shiftState(state, code, { inline: true }));</span>
6803
+ <span class="cstat-no" title="statement not covered" > code += this.getRightCode(rightCode, assignment, rightNode);</span>
6893
6804
  }
6894
6805
  }
6895
6806
  });
@@ -6899,27 +6810,27 @@ export class Logic extends BaseNode {
6899
6810
  ) {
6900
6811
  const rightNode: any = <span class="cstat-no" title="statement not covered" >assignment.right;</span>
6901
6812
  <span class="cstat-no" title="statement not covered" > code += ' = ';</span>
6902
- <span class="cstat-no" title="statement not covered" > code += yield* rightNode.getInitCode(shiftState(state, code, { inline: true }));</span>
6813
+ <span class="cstat-no" title="statement not covered" > code += rightNode.getInitCode(shiftState(state, code, { inline: true }));</span>
6903
6814
  } else <span class="cstat-no" title="statement not covered" >if (</span>
6904
6815
  assignment.right?.concept === 'NewComposite' &amp;&amp;
6905
6816
  (assignment.right as any)?.typeAnnotation?.typeKind === 'anonymousStructure'
6906
6817
  ) {
6907
6818
  const rightNode: any = <span class="cstat-no" title="statement not covered" >assignment.right;</span>
6908
6819
  <span class="cstat-no" title="statement not covered" > code += ' = ';</span>
6909
- <span class="cstat-no" title="statement not covered" > code += yield* rightNode.getInitCode(shiftState(state, code, { inline: true }));</span>
6820
+ <span class="cstat-no" title="statement not covered" > code += rightNode.getInitCode(shiftState(state, code, { inline: true }));</span>
6910
6821
  } else <span class="cstat-no" title="statement not covered" >if (</span>
6911
6822
  assignment.right?.concept === 'NewComposite' &amp;&amp;
6912
6823
  (assignment.right as any)?.typeAnnotation?.typeKind === 'generic'
6913
6824
  ) {
6914
6825
  const rightNode: any = <span class="cstat-no" title="statement not covered" >assignment.right;</span>
6915
6826
  <span class="cstat-no" title="statement not covered" > code += ' = ';</span>
6916
- <span class="cstat-no" title="statement not covered" > code += (yield* rightNode.getNewCompositeCode(shiftState(state, code, { inline: true })));</span>
6827
+ <span class="cstat-no" title="statement not covered" > code += rightNode.getNewCompositeCode(shiftState(state, code, { inline: true }));</span>
6917
6828
  } else {
6918
6829
  const rightNode: any = <span class="cstat-no" title="statement not covered" >assignment.right;</span>
6919
6830
  // 当右边有明确类型时，直接使用其类型。旧版本数据查询不能直接使用其 typeAnnotation
6920
6831
  <span class="cstat-no" title="statement not covered" > if (rightNode?.typeAnnotation &amp;&amp; !(rightNode instanceof CallQueryComponent &amp;&amp; !rightNode.isAutoInfer())) {</span>
6921
6832
  <span class="cstat-no" title="statement not covered" > code += ': ';</span>
6922
- <span class="cstat-no" title="statement not covered" > code += yield* rightNode.typeAnnotation?.toEmbeddedTS(shiftState(state, code, { inline: true })) ?? returnOrigin('null');</span>
6833
+ <span class="cstat-no" title="statement not covered" > code += rightNode.typeAnnotation?.toEmbeddedTS(shiftState(state, code, { inline: true })) || 'null';</span>
6923
6834
  } else {
6924
6835
  <span class="cstat-no" title="statement not covered" > code += ' = ';</span>
6925
6836
  let rightCode = <span class="cstat-no" title="statement not covered" >'';</span>
@@ -6934,38 +6845,41 @@ export class Logic extends BaseNode {
6934
6845
  }
6935
6846
  <span class="cstat-no" title="statement not covered" > rightCode +=</span>
6936
6847
  rightNode &amp;&amp; rightNode.toEmbeddedTS
6937
- ? yield* rightNode.toEmbeddedTS(shiftState(state, code, { inline: true }))
6848
+ ? rightNode.toEmbeddedTS(shiftState(state, code, { inline: true }))
6938
6849
  : '__RIGHT__';
6939
- <span class="cstat-no" title="statement not covered" > code += yield* self.getRightCode(rightCode, assignment, rightNode);</span>
6850
+ <span class="cstat-no" title="statement not covered" > code += this.getRightCode(rightCode, assignment, rightNode);</span>
6940
6851
  }
6941
6852
  }
6942
6853
  <span class="cstat-no" title="statement not covered" > code += ';\n';</span>
6943
6854
  });
6944
- if (!self.body.length &amp;&amp; self.returns.length) {
6945
- code += `${indent((state?.tabSize || 0) + 1)}return ${self.returns[0].name};\n`;
6855
+ &nbsp;
6856
+ <span class="missing-if-branch" title="if path not taken" >I</span>if (!this.body.length &amp;&amp; <span class="branch-1 cbranch-no" title="branch not covered" >this.returns.length)</span> {
6857
+ <span class="cstat-no" title="statement not covered" > code += `${indent((state?.tabSize || 0) + 1)}return ${this.returns[0].name};\n`;</span>
6946
6858
  } else {
6947
6859
  // 如果长度小于2 并且不是虚拟节点就 加 报错，
6948
- <span class="missing-if-branch" title="if path not taken" >I</span>if (self.body.length &lt;= 2 &amp;&amp; !(self.parentNode instanceof Namespace)) {
6949
- <span class="cstat-no" title="statement not covered" > if (self.body.length &amp;&amp; self.body[0].concept === 'JavaLogic') {</span>
6860
+ <span class="missing-if-branch" title="if path not taken" >I</span>if (this.body.length &lt;= 2 &amp;&amp; <span class="branch-1 cbranch-no" title="branch not covered" >!(this.parentNode instanceof Namespace))</span> {
6861
+ <span class="cstat-no" title="statement not covered" > if (this.body.length &amp;&amp; this.body[0].concept === 'JavaLogic') {</span>
6950
6862
  <span class="cstat-no" title="statement not covered" > code += '';</span>
6951
6863
  } else {
6952
6864
  <span class="cstat-no" title="statement not covered" > code += indent((state?.tabSize || 0) + 1);</span>
6953
6865
  <span class="cstat-no" title="statement not covered" > code += 'const __LogicEmpty: any = null;';</span>
6954
6866
  }
6955
6867
  }
6956
- yield* wrapForEach(self.body, function* warpForEachGenerator(item) {
6957
- code += yield* item.toEmbeddedTS?.(shiftState(state, code, { tabSize: (state?.tabSize || <span class="branch-1 cbranch-no" title="branch not covered" >0)</span> + 1 })) ?? <span class="branch-1 cbranch-no" title="branch not covered" >returnOrigin('');</span>
6868
+ this.body.forEach((item) =&gt; {
6869
+ code += item.toEmbeddedTS &amp;&amp; item.toEmbeddedTS(shiftState(state, code, { tabSize: (state?.tabSize || <span class="branch-1 cbranch-no" title="branch not covered" >0)</span> + 1 }));
6958
6870
  code += ';\n';
6959
6871
  });
6960
6872
  }
6873
+ &nbsp;
6961
6874
  // 在body渲染完成之后把其余的节点放到下面
6962
- yield* wrapForEach(self.playground, function* <span class="fstat-no" title="function not covered" >warpForEachGenerator(</span>item) {
6963
- <span class="cstat-no" title="statement not covered" > code += yield* item.toEmbeddedTS(shiftState(state, code, { tabSize: (state?.tabSize || 0) + 1 }));</span>
6875
+ this.playground.forEach(<span class="fstat-no" title="function not covered" >(i</span>tem) =&gt; {
6876
+ <span class="cstat-no" title="statement not covered" > code += item.toEmbeddedTS(shiftState(state, code, { tabSize: (state?.tabSize || 0) + 1 }));</span>
6964
6877
  <span class="cstat-no" title="statement not covered" > code += ';\n';</span>
6965
6878
  });
6966
- code += `${indent(state?.tabSize || 0)}}`;
6967
- if (prefix === 'inObject') {
6968
- code += `,`;
6879
+ &nbsp;
6880
+ code += `${indent(state?.tabSize || <span class="branch-1 cbranch-no" title="branch not covered" >0)</span>}}`;
6881
+ <span class="missing-if-branch" title="if path not taken" >I</span>if (prefix === 'inObject') {
6882
+ <span class="cstat-no" title="statement not covered" > code += `,`;</span>
6969
6883
  }
6970
6884
  code += '\n';
6971
6885
  return code;
@@ -6973,6 +6887,7 @@ export class Logic extends BaseNode {
6973
6887
  &nbsp;
6974
6888
  @withSourceMap()
6975
6889
  <span class="fstat-no" title="function not covered" > toNaturalTS(</span>state = <span class="branch-0 cbranch-no" title="branch not covered" >createCompilerState(),</span> prefix?: string, logicName?: string, currentNode?: BaseNode): string {
6890
+ &nbsp;
6976
6891
  // 如果传了不要前缀那就为空， 要不用传进来的，要是都没有就默认导出
6977
6892
  let code = <span class="cstat-no" title="statement not covered" >'';</span>
6978
6893
  <span class="cstat-no" title="statement not covered" > if (currentNode === this) {</span>
@@ -6983,11 +6898,11 @@ ${indent(state.tabSize)} */\n`;
6983
6898
  <span class="cstat-no" title="statement not covered" > if (!logicName) {</span>
6984
6899
  const { name, parentNode } = <span class="cstat-no" title="statement not covered" >this;</span>
6985
6900
  <span class="cstat-no" title="statement not covered" > if (parentNode?.concept === 'View') {</span>
6986
- <span class="cstat-no" title="statement not covered" > logicName = `viewLogic_${name}`;</span>
6901
+ <span class="cstat-no" title="statement not covered" > logicName = `viewLogic_${name}`;</span>
6987
6902
  } else <span class="cstat-no" title="statement not covered" >if (parentNode?.concept === 'BindEvent') {</span>
6988
- <span class="cstat-no" title="statement not covered" > logicName = `on_${parentNode?.parentNode?.name}_${name}`;</span>
6903
+ <span class="cstat-no" title="statement not covered" > logicName = `on_${(parentNode?.parentNode)?.name}_${name}`;</span>
6989
6904
  } else {
6990
- <span class="cstat-no" title="statement not covered" > logicName = this.name;</span>
6905
+ <span class="cstat-no" title="statement not covered" > logicName = this.name;</span>
6991
6906
  }
6992
6907
  }
6993
6908
  &nbsp;
@@ -7002,7 +6917,8 @@ ${indent(state.tabSize)} */\n`;
7002
6917
  <span class="cstat-no" title="statement not covered" > code += '&lt;';</span>
7003
6918
  <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>
7004
6919
  <span class="cstat-no" title="statement not covered" > code += typeParam.toNaturalTS(shiftState(state, code, { inline: true }));</span>
7005
- <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>
6920
+ <span class="cstat-no" title="statement not covered" > if (typeParamIndex !== this.typeParams.length - 1)</span>
6921
+ <span class="cstat-no" title="statement not covered" > code += ', ';</span>
7006
6922
  });
7007
6923
  <span class="cstat-no" title="statement not covered" > code += '&gt;';</span>
7008
6924
  }
@@ -7010,7 +6926,8 @@ ${indent(state.tabSize)} */\n`;
7010
6926
  <span class="cstat-no" title="statement not covered" > code += '(';</span>
7011
6927
  <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>
7012
6928
  <span class="cstat-no" title="statement not covered" > code += param.toNaturalTS(shiftState(state, code, { inline: true }));</span>
7013
- <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>
6929
+ <span class="cstat-no" title="statement not covered" > if (index !== this.params.length - 1)</span>
6930
+ <span class="cstat-no" title="statement not covered" > code += ', ';</span>
7014
6931
  });
7015
6932
  &nbsp;
7016
6933
  <span class="cstat-no" title="statement not covered" > code += ')';</span>
@@ -7030,13 +6947,13 @@ ${indent(state.tabSize)} */\n`;
7030
6947
  <span class="cstat-no" title="statement not covered" > code += variable.toNaturalTS(shiftState(state, code, { inline: true }));</span>
7031
6948
  <span class="cstat-no" title="statement not covered" > code += ';\n';</span>
7032
6949
  });
7033
- &nbsp;
6950
+
7034
6951
  <span class="cstat-no" title="statement not covered" > this.returns.forEach(<span class="fstat-no" title="function not covered" >(r</span>et) =&gt; {</span>
7035
6952
  <span class="cstat-no" title="statement not covered" > code += `${indent(state.tabSize + 1)}let `;</span>
7036
6953
  <span class="cstat-no" title="statement not covered" > code += ret.toNaturalTS(shiftState(state, code, { inline: true }));</span>
7037
6954
  <span class="cstat-no" title="statement not covered" > code += ';\n';</span>
7038
6955
  });
7039
- &nbsp;
6956
+
7040
6957
  <span class="cstat-no" title="statement not covered" > if (!this.body.length &amp;&amp; this.returns.length) {</span>
7041
6958
  <span class="cstat-no" title="statement not covered" > if (!state.focusedNodePath || `${this.nodePath}.body[0]` === state.focusedNodePath)</span>
7042
6959
  <span class="cstat-no" title="statement not covered" > code += `${indent(state.tabSize + 1)}// 当前位置\n`;</span>
@@ -7045,11 +6962,12 @@ ${indent(state.tabSize)} */\n`;
7045
6962
  <span class="cstat-no" title="statement not covered" > this.body.forEach(<span class="fstat-no" title="function not covered" >(i</span>tem) =&gt; {</span>
7046
6963
  let partialCode = <span class="cstat-no" title="statement not covered" >'';</span>
7047
6964
  &nbsp;
7048
- <span class="cstat-no" title="statement not covered" > if (!state.focusedNodePath &amp;&amp; item.concept === 'End') <span class="cstat-no" title="statement not covered" >code += `${indent(state.tabSize + 1)}// 当前位置\n`;</span></span>
6965
+ <span class="cstat-no" title="statement not covered" > if (!state.focusedNodePath &amp;&amp; item.concept === 'End')</span>
6966
+ <span class="cstat-no" title="statement not covered" > code += `${indent(state.tabSize + 1)}// 当前位置\n`;</span>
7049
6967
  <span class="cstat-no" title="statement not covered" > if (item.toNaturalTS) {</span>
7050
6968
  <span class="cstat-no" title="statement not covered" > partialCode = item.toNaturalTS(shiftState(state, code, { tabSize: state.tabSize + 1 }));</span>
7051
6969
  } else <span class="cstat-no" title="statement not covered" >if (item.toEmbeddedTS) {</span>
7052
- <span class="cstat-no" title="statement not covered" > partialCode = runSync(item.toEmbeddedTS(shiftState(state, code, { tabSize: state.tabSize + 1 })));</span>
6970
+ <span class="cstat-no" title="statement not covered" > partialCode = item.toEmbeddedTS(shiftState(state, code, { tabSize: state.tabSize + 1 }));</span>
7053
6971
  }
7054
6972
  <span class="cstat-no" title="statement not covered" > if (partialCode.trim()) {</span>
7055
6973
  <span class="cstat-no" title="statement not covered" > code += partialCode;</span>
@@ -7057,7 +6975,7 @@ ${indent(state.tabSize)} */\n`;
7057
6975
  }
7058
6976
  });
7059
6977
  }
7060
- &nbsp;
6978
+
7061
6979
  <span class="cstat-no" title="statement not covered" > code += `${indent(state.tabSize)}}`;</span>
7062
6980
  }
7063
6981
  <span class="cstat-no" title="statement not covered" > if (prefix === 'inObject') {</span>
@@ -7067,7 +6985,7 @@ ${indent(state.tabSize)} */\n`;
7067
6985
  <span class="cstat-no" title="statement not covered" > return code;</span>
7068
6986
  }
7069
6987
  &nbsp;
7070
- <span class="fstat-no" title="function not covered" > *g</span>etRightCode(code: string, assignment: Assignment | BatchAssignment, rightNode: any) {
6988
+ <span class="fstat-no" title="function not covered" > getRightCode(</span>code: string, assignment: Assignment | BatchAssignment, rightNode: any): string {
7071
6989
  <span class="cstat-no" title="statement not covered" > code = code.replaceAll('\n', ' ');</span>
7072
6990
  <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>
7073
6991
  &nbsp;
@@ -7087,12 +7005,12 @@ ${indent(state.tabSize)} */\n`;
7087
7005
  // ForEachStatement 内部变量需要替换处理，如 item、index
7088
7006
  const forEachStatement = <span class="cstat-no" title="statement not covered" >assignment.getAncestor('ForEachStatement') as ForEachStatement;</span>
7089
7007
  <span class="cstat-no" title="statement not covered" > if (forEachStatement) {</span>
7090
- <span class="cstat-no" title="statement not covered" > code = yield* this.handleForEachCode(code, forEachStatement);</span>
7008
+ <span class="cstat-no" title="statement not covered" > code = this.handleForEachCode(code, forEachStatement);</span>
7091
7009
  }
7092
7010
  // Match 需要针对分支缩小类型范围
7093
7011
  const matchCase = <span class="cstat-no" title="statement not covered" >assignment.getAncestor('MatchCase') as MatchCase;</span>
7094
7012
  <span class="cstat-no" title="statement not covered" > if (matchCase) {</span>
7095
- <span class="cstat-no" title="statement not covered" > code = yield* this.handleMatchCaseCode(code, matchCase);</span>
7013
+ <span class="cstat-no" title="statement not covered" > code = this.handleMatchCaseCode(code, matchCase);</span>
7096
7014
  }
7097
7015
  <span class="cstat-no" title="statement not covered" > return code;</span>
7098
7016
  }
@@ -7115,39 +7033,37 @@ ${indent(state.tabSize)} */\n`;
7115
7033
  });
7116
7034
  }
7117
7035
  &nbsp;
7118
- <span class="fstat-no" title="function not covered" > *h</span>andleForEachCode(code: string, forEachStatement: ForEachStatement): Generator&lt;any, string, any&gt; {
7036
+ <span class="fstat-no" title="function not covered" > handleForEachCode(</span>code: string, forEachStatement: ForEachStatement): string {
7119
7037
  const { item, index, each } = <span class="cstat-no" title="statement not covered" >forEachStatement;</span>
7120
7038
  <span class="cstat-no" title="statement not covered" > if (code.includes(item.name)) {</span>
7121
- const eachTSCode = <span class="cstat-no" title="statement not covered" >each ? yield* each.toEmbeddedTS() : '__IDENTIFIER__';</span>
7039
+ const eachTSCode = <span class="cstat-no" title="statement not covered" >each ? each.toEmbeddedTS() : '__IDENTIFIER__'</span>
7122
7040
  <span class="cstat-no" title="statement not covered" > code = this.handleReplaceCode(</span>
7123
7041
  code,
7124
7042
  item.name,
7125
7043
  eachTSCode === '__IDENTIFIER__' ? eachTSCode : `${eachTSCode}.__get(0)`,
7126
7044
  );
7127
7045
  }
7128
- <span class="cstat-no" title="statement not covered" > if (code.includes(index.name)) {</span>
7129
- <span class="cstat-no" title="statement not covered" > code = this.handleReplaceCode(code, index.name, 'new nasl.core.Long(0)');</span>
7130
- }
7046
+ <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.Long(0)');</span></span>
7131
7047
  &nbsp;
7132
7048
  const parentForEachStatement = <span class="cstat-no" title="statement not covered" >forEachStatement.getAncestor('ForEachStatement') as ForEachStatement;</span>
7133
7049
  <span class="cstat-no" title="statement not covered" > if (parentForEachStatement) {</span>
7134
- <span class="cstat-no" title="statement not covered" > code = yield* this.handleForEachCode(code, parentForEachStatement);</span>
7050
+ <span class="cstat-no" title="statement not covered" > this.handleForEachCode(code, parentForEachStatement);</span>
7135
7051
  }
7136
7052
  <span class="cstat-no" title="statement not covered" > return code;</span>
7137
7053
  }
7138
7054
  &nbsp;
7139
- <span class="fstat-no" title="function not covered" > *h</span>andleMatchCaseCode(code: string, matchCase: MatchCase): Generator&lt;any, string, any&gt; {
7055
+ <span class="fstat-no" title="function not covered" > handleMatchCaseCode(</span>code: string, matchCase: MatchCase): string {
7140
7056
  const match = <span class="cstat-no" title="statement not covered" >matchCase.getAncestor('Match') as Match;</span>
7141
- const expressionTsCode = <span class="cstat-no" title="statement not covered" >yield* match.expression.toEmbeddedTS();</span>
7057
+ const expressionTsCode = <span class="cstat-no" title="statement not covered" >match.expression.toEmbeddedTS();</span>
7142
7058
  <span class="cstat-no" title="statement not covered" > if (code.includes(expressionTsCode)) {</span>
7143
7059
  let typeCode = <span class="cstat-no" title="statement not covered" >'';</span>
7144
- <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>
7060
+ <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>
7145
7061
  <span class="cstat-no" title="statement not covered" > if (pattern instanceof TypeAnnotation) {</span>
7146
7062
  <span class="cstat-no" title="statement not covered" > if (index === 0) {</span>
7147
- <span class="cstat-no" title="statement not covered" > typeCode += yield* pattern.toEmbeddedTS();</span>
7063
+ <span class="cstat-no" title="statement not covered" > typeCode += pattern.toEmbeddedTS();</span>
7148
7064
  } else {
7149
7065
  <span class="cstat-no" title="statement not covered" > typeCode += '|';</span>
7150
- <span class="cstat-no" title="statement not covered" > typeCode += yield* pattern.toEmbeddedTS();</span>
7066
+ <span class="cstat-no" title="statement not covered" > typeCode += pattern.toEmbeddedTS();</span>
7151
7067
  }
7152
7068
  }
7153
7069
  });
@@ -7157,7 +7073,7 @@ ${indent(state.tabSize)} */\n`;
7157
7073
  }
7158
7074
  const parentMatchCase = <span class="cstat-no" title="statement not covered" >match.getAncestor('MatchCase') as MatchCase;</span>
7159
7075
  <span class="cstat-no" title="statement not covered" > if (parentMatchCase) {</span>
7160
- <span class="cstat-no" title="statement not covered" > code = yield* this.handleMatchCaseCode(code, parentMatchCase);</span>
7076
+ <span class="cstat-no" title="statement not covered" > code = this.handleMatchCaseCode(code, parentMatchCase);</span>
7161
7077
  }
7162
7078
  <span class="cstat-no" title="statement not covered" > return code;</span>
7163
7079
  }
@@ -7261,12 +7177,12 @@ ${indent(state.tabSize)} */\n`;
7261
7177
  <span class="cstat-no" title="statement not covered" > return `/embedded/${this.app.name}${_path}/logics/${name}.ts`;</span>
7262
7178
  }
7263
7179
  &nbsp;
7264
- <span class="fstat-no" title="function not covered" > *t</span>oEmbeddedTSFile(): EmbeddedTSFileGenerator {
7180
+ <span class="fstat-no" title="function not covered" > toEmbeddedTSFile(</span>) {
7265
7181
  let code = <span class="cstat-no" title="statement not covered" >`namespace ${this.getTsNamespace()} {\n`;</span>
7266
7182
  &nbsp;
7267
7183
  const state = <span class="cstat-no" title="statement not covered" >createCompilerState(code, { tabSize: 1 });</span>
7268
7184
  <span class="cstat-no" title="statement not covered" > try {</span>
7269
- <span class="cstat-no" title="statement not covered" > code += yield* this.toEmbeddedTS(state);</span>
7185
+ <span class="cstat-no" title="statement not covered" > code += this.toEmbeddedTS(state);</span>
7270
7186
  } catch (err) {
7271
7187
  <span class="cstat-no" title="statement not covered" > console.log(err, `有问题翻译失败:${this.getTsNamespace()}.${this.name}`);</span>
7272
7188
  <span class="cstat-no" title="statement not covered" > code += '';</span>
@@ -7339,7 +7255,7 @@ ${indent(state.tabSize)} */\n`;
7339
7255
  <span class="fstat-no" title="function not covered" > delete(</span>) {
7340
7256
  let actionMsg = <span class="cstat-no" title="statement not covered" >'删除逻辑项';</span>
7341
7257
  <span class="cstat-no" title="statement not covered" > if (this.name) <span class="cstat-no" title="statement not covered" >actionMsg += `“${this.name}”`;</span></span>
7342
- <span class="cstat-no" title="statement not covered" > this.app?.emit('logicDeleted', { actionMsg: this.nodePath });</span>
7258
+ <span class="cstat-no" title="statement not covered" > this.app?.emit('logicDeleted', { actionMsg: this.nodePath})</span>
7343
7259
  <span class="cstat-no" title="statement not covered" > this.app?.emit('collect:start', {</span>
7344
7260
  actionMsg,
7345
7261
  });
@@ -7350,7 +7266,7 @@ ${indent(state.tabSize)} */\n`;
7350
7266
  const connector: Connector | null = <span class="cstat-no" title="statement not covered" >el?.getAncestor?.('Connector') as Connector;</span>
7351
7267
  <span class="cstat-no" title="statement not covered" > if (['CallAuthInterface', 'CallInterface'].includes(el?.concept) &amp;&amp; connector) {</span>
7352
7268
  const { calleeName } = <span class="cstat-no" title="statement not covered" >el as CallInterface;</span>
7353
- const targetInterface = <span class="cstat-no" title="statement not covered" >connector.interfaces.find(<span class="fstat-no" title="function not covered" >(i</span>) =&gt; <span class="cstat-no" title="statement not covered" >i.name === calleeName)</span>;</span>
7269
+ const targetInterface = <span class="cstat-no" title="statement not covered" >connector.interfaces.find(<span class="fstat-no" title="function not covered" >i </span>=&gt; <span class="cstat-no" title="statement not covered" >i.name === calleeName)</span>;</span>
7354
7270
  <span class="cstat-no" title="statement not covered" > if (targetInterface) {</span>
7355
7271
  const refs = <span class="cstat-no" title="statement not covered" >await (this.app as any)?.naslServer?._isHaveRef(targetInterface);</span>
7356
7272
  // 如果只有两个引用，则必然为自身以及当前logic引用，需要删除此接口
@@ -7477,7 +7393,7 @@ export default Logic;
7477
7393
  <div class='footer quiet pad2 space-top1 center small'>
7478
7394
  Code coverage generated by
7479
7395
  <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
7480
- at 2023-11-18T16:22:11.588Z
7396
+ at 2023-10-18T11:36:07.885Z
7481
7397
  </div>
7482
7398
  <script src="../../prettify.js"></script>
7483
7399
  <script>