cfsolve 0.1.2 → 0.1.3

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 (368) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +7 -0
  3. data/THIRD_PARTY_LICENSES/README.md +71 -254
  4. data/THIRD_PARTY_LICENSES/{derive_builder_macro-0.20.2/LICENSE-APACHE → bytecount-0.6.9/LICENSE.Apache2} +0 -1
  5. data/THIRD_PARTY_LICENSES/{darling-0.20.11/LICENSE → bytecount-0.6.9/LICENSE.MIT} +1 -3
  6. data/THIRD_PARTY_LICENSES/{ident_case-1.0.1/LICENSE → cobs-0.3.0/LICENSE-MIT} +1 -1
  7. data/THIRD_PARTY_LICENSES/cow-utils-0.1.3/LICENSE +21 -0
  8. data/THIRD_PARTY_LICENSES/{hashbrown-0.14.5 → embedded-io-0.4.0}/LICENSE-MIT +1 -1
  9. data/THIRD_PARTY_LICENSES/{ahash-0.8.12 → embedded-io-0.6.1}/LICENSE-MIT +1 -1
  10. data/THIRD_PARTY_LICENSES/{browserslist-data-0.1.4 → escape-simd-0.1.1}/LICENSE +1 -1
  11. data/THIRD_PARTY_LICENSES/escape-simd-0.1.1/NOTICE +62 -0
  12. data/THIRD_PARTY_LICENSES/json-escape-simd-3.1.3/LICENSE +21 -0
  13. data/THIRD_PARTY_LICENSES/{miette-7.6.0/LICENSE → json-escape-simd-3.1.3/LICENSE-APACHE} +0 -1
  14. data/THIRD_PARTY_LICENSES/json-escape-simd-3.1.3/NOTICE +62 -0
  15. data/THIRD_PARTY_LICENSES/memchr-2.8.3/UNLICENSE +24 -0
  16. data/THIRD_PARTY_LICENSES/{derive_builder_core-0.20.2 → nonmax-0.5.5}/LICENSE-APACHE +1 -2
  17. data/THIRD_PARTY_LICENSES/{dashmap-5.5.3/LICENSE → nonmax-0.5.5/LICENSE-MIT} +2 -4
  18. data/THIRD_PARTY_LICENSES/{rand-0.8.5 → num-bigint-0.5.1}/LICENSE-MIT +0 -1
  19. data/THIRD_PARTY_LICENSES/oxc-0.157.0/LICENSE +22 -0
  20. data/THIRD_PARTY_LICENSES/oxc-0.157.0/THIRD-PARTY-LICENSE +763 -0
  21. data/THIRD_PARTY_LICENSES/{browserslist-rs-0.19.0 → oxc-browserslist-5.0.1}/LICENSE +1 -0
  22. data/THIRD_PARTY_LICENSES/oxc_allocator-0.157.0/LICENSE +22 -0
  23. data/THIRD_PARTY_LICENSES/oxc_allocator-0.157.0/THIRD-PARTY-LICENSE +763 -0
  24. data/THIRD_PARTY_LICENSES/oxc_ast-0.157.0/LICENSE +22 -0
  25. data/THIRD_PARTY_LICENSES/oxc_ast-0.157.0/THIRD-PARTY-LICENSE +763 -0
  26. data/THIRD_PARTY_LICENSES/oxc_ast_macros-0.157.0/LICENSE +22 -0
  27. data/THIRD_PARTY_LICENSES/oxc_ast_macros-0.157.0/THIRD-PARTY-LICENSE +763 -0
  28. data/THIRD_PARTY_LICENSES/oxc_ast_visit-0.157.0/LICENSE +22 -0
  29. data/THIRD_PARTY_LICENSES/oxc_ast_visit-0.157.0/THIRD-PARTY-LICENSE +763 -0
  30. data/THIRD_PARTY_LICENSES/oxc_codegen-0.157.0/LICENSE +22 -0
  31. data/THIRD_PARTY_LICENSES/oxc_codegen-0.157.0/THIRD-PARTY-LICENSE +763 -0
  32. data/THIRD_PARTY_LICENSES/oxc_compat-0.157.0/LICENSE +22 -0
  33. data/THIRD_PARTY_LICENSES/oxc_compat-0.157.0/THIRD-PARTY-LICENSE +763 -0
  34. data/THIRD_PARTY_LICENSES/oxc_data_structures-0.157.0/LICENSE +22 -0
  35. data/THIRD_PARTY_LICENSES/oxc_data_structures-0.157.0/THIRD-PARTY-LICENSE +763 -0
  36. data/THIRD_PARTY_LICENSES/oxc_diagnostics-0.157.0/LICENSE +22 -0
  37. data/THIRD_PARTY_LICENSES/oxc_diagnostics-0.157.0/THIRD-PARTY-LICENSE +763 -0
  38. data/THIRD_PARTY_LICENSES/oxc_ecmascript-0.157.0/LICENSE +22 -0
  39. data/THIRD_PARTY_LICENSES/oxc_ecmascript-0.157.0/THIRD-PARTY-LICENSE +763 -0
  40. data/THIRD_PARTY_LICENSES/oxc_estree-0.157.0/LICENSE +22 -0
  41. data/THIRD_PARTY_LICENSES/oxc_estree-0.157.0/THIRD-PARTY-LICENSE +763 -0
  42. data/THIRD_PARTY_LICENSES/oxc_index-5.0.0/LICENSE +22 -0
  43. data/THIRD_PARTY_LICENSES/oxc_parser-0.157.0/LICENSE +22 -0
  44. data/THIRD_PARTY_LICENSES/oxc_parser-0.157.0/THIRD-PARTY-LICENSE +763 -0
  45. data/THIRD_PARTY_LICENSES/oxc_regular_expression-0.157.0/LICENSE +22 -0
  46. data/THIRD_PARTY_LICENSES/oxc_regular_expression-0.157.0/THIRD-PARTY-LICENSE +763 -0
  47. data/THIRD_PARTY_LICENSES/oxc_semantic-0.157.0/LICENSE +22 -0
  48. data/THIRD_PARTY_LICENSES/oxc_semantic-0.157.0/THIRD-PARTY-LICENSE +763 -0
  49. data/THIRD_PARTY_LICENSES/oxc_span-0.157.0/LICENSE +22 -0
  50. data/THIRD_PARTY_LICENSES/oxc_span-0.157.0/THIRD-PARTY-LICENSE +763 -0
  51. data/THIRD_PARTY_LICENSES/oxc_str-0.157.0/LICENSE +22 -0
  52. data/THIRD_PARTY_LICENSES/oxc_str-0.157.0/THIRD-PARTY-LICENSE +763 -0
  53. data/THIRD_PARTY_LICENSES/oxc_syntax-0.157.0/LICENSE +22 -0
  54. data/THIRD_PARTY_LICENSES/oxc_syntax-0.157.0/THIRD-PARTY-LICENSE +763 -0
  55. data/THIRD_PARTY_LICENSES/{fixedbitset-0.5.7 → postcard-1.1.3}/LICENSE-MIT +1 -1
  56. data/THIRD_PARTY_LICENSES/{bytes-str-0.2.7/LICENSE → self_cell-1.3.0/LICENSE-APACHE} +1 -2
  57. data/THIRD_PARTY_LICENSES/self_cell-1.3.0/LICENSE-GPLv2 +339 -0
  58. data/THIRD_PARTY_LICENSES/{darling_core-0.20.11 → smawk-0.3.3}/LICENSE +1 -1
  59. data/UPSTREAM.md +7 -5
  60. data/ext/cfsolve/Cargo.lock +534 -1727
  61. data/ext/cfsolve/Cargo.toml +4 -0
  62. data/ext/cfsolve/src/main.rs +1 -1
  63. data/lib/cfsolve/profiles/safari-26-ios/answers.json +266 -265
  64. data/lib/cfsolve/profiles/safari-26-ios/challenge-page-answers.json +312 -312
  65. data/lib/cfsolve/profiles/safari-26-ios.json +106 -152
  66. data/lib/cfsolve/version.rb +2 -2
  67. data/vendor/cfsolve/Cargo.lock +561 -1729
  68. data/vendor/cfsolve/Cargo.toml +26 -8
  69. data/vendor/cfsolve/README.md +4 -0
  70. data/vendor/cfsolve/examples/check_answers.rs +2 -2
  71. data/vendor/cfsolve/examples/compare_session.rs +1 -2
  72. data/vendor/cfsolve/examples/solver_profile.rs +84 -0
  73. data/vendor/cfsolve/examples/solver_smoke.rs +9 -8
  74. data/vendor/cfsolve/examples/stage2_snapshot.rs +2 -2
  75. data/vendor/cfsolve/examples/tls_echo.rs +3 -3
  76. data/vendor/cfsolve/examples/vm_snapshot.rs +32 -33
  77. data/vendor/cfsolve/profiles/safari-26-ios/answers.json +266 -265
  78. data/vendor/cfsolve/profiles/safari-26-ios/challenge-page-answers.json +312 -312
  79. data/vendor/cfsolve/profiles/safari-26-ios.json +106 -152
  80. data/vendor/cfsolve/src/bin/capture-proxy/main.rs +3 -2
  81. data/vendor/cfsolve/src/bin/challenge/cli.rs +8 -2
  82. data/vendor/cfsolve/src/bin/challenge/main.rs +7 -2
  83. data/vendor/cfsolve/src/capture/proxy/tests.rs +1 -1
  84. data/vendor/cfsolve/src/capture/proxy.rs +44 -13
  85. data/vendor/cfsolve/src/capture/sessions.rs +4 -3
  86. data/vendor/cfsolve/src/capture/upstream.rs +1 -1
  87. data/vendor/cfsolve/src/challenge/codec.rs +4 -2
  88. data/vendor/cfsolve/src/challenge/expression.rs +161 -117
  89. data/vendor/cfsolve/src/challenge/installed/audit.rs +11 -10
  90. data/vendor/cfsolve/src/challenge/installed.rs +13 -6
  91. data/vendor/cfsolve/src/challenge/merge.rs +120 -80
  92. data/vendor/cfsolve/src/challenge/orchestrator.rs +57 -44
  93. data/vendor/cfsolve/src/challenge/payload.rs +69 -31
  94. data/vendor/cfsolve/src/challenge/program.rs +197 -178
  95. data/vendor/cfsolve/src/challenge/reduced_timing.rs +55 -40
  96. data/vendor/cfsolve/src/challenge/source.rs +151 -96
  97. data/vendor/cfsolve/src/challenge/state.rs +180 -148
  98. data/vendor/cfsolve/src/challenge/tally.rs +64 -50
  99. data/vendor/cfsolve/src/challenge.rs +1 -0
  100. data/vendor/cfsolve/src/deobfuscate/analysis/bindings.rs +187 -185
  101. data/vendor/cfsolve/src/deobfuscate/analysis/effects.rs +42 -51
  102. data/vendor/cfsolve/src/deobfuscate/analysis/hoisting.rs +147 -228
  103. data/vendor/cfsolve/src/deobfuscate/analysis/properties.rs +250 -425
  104. data/vendor/cfsolve/src/deobfuscate/analysis/unconditional.rs +79 -0
  105. data/vendor/cfsolve/src/deobfuscate/analysis.rs +259 -41
  106. data/vendor/cfsolve/src/deobfuscate/argument_arrays.rs +70 -73
  107. data/vendor/cfsolve/src/deobfuscate/arrow_blocks.rs +91 -104
  108. data/vendor/cfsolve/src/deobfuscate/ast.rs +383 -0
  109. data/vendor/cfsolve/src/deobfuscate/bitwise.rs +44 -54
  110. data/vendor/cfsolve/src/deobfuscate/blocks.rs +36 -29
  111. data/vendor/cfsolve/src/deobfuscate/call_helpers.rs +80 -131
  112. data/vendor/cfsolve/src/deobfuscate/control_flow.rs +239 -297
  113. data/vendor/cfsolve/src/deobfuscate/copy_propagation.rs +114 -135
  114. data/vendor/cfsolve/src/deobfuscate/dead_branches.rs +62 -61
  115. data/vendor/cfsolve/src/deobfuscate/dead_properties.rs +197 -214
  116. data/vendor/cfsolve/src/deobfuscate/dispatch.rs +238 -298
  117. data/vendor/cfsolve/src/deobfuscate/encoded_strings.rs +198 -203
  118. data/vendor/cfsolve/src/deobfuscate/function_lengths.rs +32 -38
  119. data/vendor/cfsolve/src/deobfuscate/helper_objects.rs +338 -513
  120. data/vendor/cfsolve/src/deobfuscate/hygiene.rs +197 -0
  121. data/vendor/cfsolve/src/deobfuscate/int32_helpers.rs +121 -155
  122. data/vendor/cfsolve/src/deobfuscate/literals.rs +116 -67
  123. data/vendor/cfsolve/src/deobfuscate/loops.rs +43 -43
  124. data/vendor/cfsolve/src/deobfuscate/memoized_strings.rs +127 -131
  125. data/vendor/cfsolve/src/deobfuscate/merged_functions.rs +262 -220
  126. data/vendor/cfsolve/src/deobfuscate/pipeline.rs +199 -244
  127. data/vendor/cfsolve/src/deobfuscate/register_arrays.rs +353 -327
  128. data/vendor/cfsolve/src/deobfuscate/removal.rs +83 -52
  129. data/vendor/cfsolve/src/deobfuscate/simplify.rs +147 -0
  130. data/vendor/cfsolve/src/deobfuscate/state_machines.rs +88 -110
  131. data/vendor/cfsolve/src/deobfuscate/statements.rs +228 -228
  132. data/vendor/cfsolve/src/deobfuscate/static_members.rs +46 -31
  133. data/vendor/cfsolve/src/deobfuscate/testing.rs +49 -59
  134. data/vendor/cfsolve/src/deobfuscate/unused_bindings.rs +92 -102
  135. data/vendor/cfsolve/src/deobfuscate.rs +15 -11
  136. data/vendor/cfsolve/src/embedding_page/extra_params.rs +23 -18
  137. data/vendor/cfsolve/src/embedding_page/render_sample.rs +184 -147
  138. data/vendor/cfsolve/src/error.rs +40 -5
  139. data/vendor/cfsolve/src/fingerprint.rs +8 -2
  140. data/vendor/cfsolve/src/http/client.rs +7 -10
  141. data/vendor/cfsolve/src/http/requests.rs +2 -2
  142. data/vendor/cfsolve/src/js/ast.rs +479 -263
  143. data/vendor/cfsolve/src/lib.rs +1 -0
  144. data/vendor/cfsolve/src/listing/fold.rs +19 -9
  145. data/vendor/cfsolve/src/listing/query.rs +1 -47
  146. data/vendor/cfsolve/src/performance_clock.rs +20 -1
  147. data/vendor/cfsolve/src/profiling.rs +49 -0
  148. data/vendor/cfsolve/src/script.rs +35 -24
  149. data/vendor/cfsolve/src/session/challenge_page.rs +41 -21
  150. data/vendor/cfsolve/src/session/channel.rs +2 -2
  151. data/vendor/cfsolve/src/session/initial.rs +5 -5
  152. data/vendor/cfsolve/src/session/sink.rs +26 -1
  153. data/vendor/cfsolve/src/session/tests/challenge_page.rs +36 -1
  154. data/vendor/cfsolve/src/session.rs +1 -1
  155. data/vendor/cfsolve/src/solver.rs +3 -1
  156. data/vendor/cfsolve/src/stage2/analysis/audit.rs +4 -2
  157. data/vendor/cfsolve/src/stage2/analysis/envelope.rs +2 -1
  158. data/vendor/cfsolve/src/stage2/audit_globals.rs +142 -74
  159. data/vendor/cfsolve/src/stage2/benchmark.rs +62 -31
  160. data/vendor/cfsolve/src/stage2/call_stack.rs +1415 -1025
  161. data/vendor/cfsolve/src/stage2/challenge_page.rs +3 -2
  162. data/vendor/cfsolve/src/stage2/interaction/checkbox.rs +202 -150
  163. data/vendor/cfsolve/src/stage2/interaction/click.rs +2 -2
  164. data/vendor/cfsolve/src/stage2/interaction/plan.rs +5 -4
  165. data/vendor/cfsolve/src/stage2/payload/recover.rs +2 -2
  166. data/vendor/cfsolve/src/stage2/probes/clock.rs +1 -3
  167. data/vendor/cfsolve/src/stage2/probes/performance.rs +12 -8
  168. data/vendor/cfsolve/src/stage2/queries.rs +50 -0
  169. data/vendor/cfsolve/src/stage2/syntax.rs +88 -0
  170. data/vendor/cfsolve/src/stage2/trace.rs +134 -108
  171. data/vendor/cfsolve/src/stage2/vocabulary.rs +1 -11
  172. data/vendor/cfsolve/src/stage2.rs +2 -0
  173. data/vendor/cfsolve/src/vm/disassemble.rs +7 -3
  174. data/vendor/cfsolve/src/vm/dispatch.rs +93 -65
  175. data/vendor/cfsolve/src/vm/extract.rs +347 -250
  176. data/vendor/cfsolve/src/vm/interpret/access.rs +63 -48
  177. data/vendor/cfsolve/src/vm/interpret/builtin.rs +10 -10
  178. data/vendor/cfsolve/src/vm/interpret/call.rs +116 -52
  179. data/vendor/cfsolve/src/vm/interpret/compile.rs +79 -62
  180. data/vendor/cfsolve/src/vm/interpret/copies.rs +2 -2
  181. data/vendor/cfsolve/src/vm/interpret/evaluate/tests.rs +63 -42
  182. data/vendor/cfsolve/src/vm/interpret/evaluate.rs +65 -575
  183. data/vendor/cfsolve/src/vm/interpret/explore.rs +7 -10
  184. data/vendor/cfsolve/src/vm/interpret/formula.rs +131 -0
  185. data/vendor/cfsolve/src/vm/interpret/frozen.rs +3 -5
  186. data/vendor/cfsolve/src/vm/interpret/intrinsic.rs +123 -59
  187. data/vendor/cfsolve/src/vm/interpret/mix32.rs +189 -0
  188. data/vendor/cfsolve/src/vm/interpret/native_dispatch.rs +220 -0
  189. data/vendor/cfsolve/src/vm/interpret/pattern.rs +1736 -0
  190. data/vendor/cfsolve/src/vm/interpret/plan.rs +586 -338
  191. data/vendor/cfsolve/src/vm/interpret/register_helpers.rs +384 -0
  192. data/vendor/cfsolve/src/vm/interpret/run.rs +116 -45
  193. data/vendor/cfsolve/src/vm/interpret/semantics.rs +71 -46
  194. data/vendor/cfsolve/src/vm/interpret/setup.rs +80 -45
  195. data/vendor/cfsolve/src/vm/interpret/string_decoder.rs +482 -0
  196. data/vendor/cfsolve/src/vm/interpret.rs +9 -1
  197. data/vendor/cfsolve/src/vm/machine.rs +56 -49
  198. data/vendor/cfsolve/src/vm/output.rs +13 -5
  199. data/vendor/cfsolve/src/vm/packed_names.rs +11 -7
  200. data/vendor/cfsolve/src/vm/session.rs +185 -120
  201. data/vendor/cfsolve/src/vm/value.rs +22 -19
  202. data/vendor/cfsolve/src/vm.rs +2 -1
  203. data/vendor/cfsolve/vendor/btls-sys/Cargo.toml +3 -0
  204. data/vendor/cfsolve/vendor/btls-sys/build/main.rs +20 -0
  205. metadata +94 -178
  206. data/THIRD_PARTY_LICENSES/Inflector-0.11.4/LICENSE.md +0 -22
  207. data/THIRD_PARTY_LICENSES/arrayvec-0.7.6/LICENSE-MIT +0 -25
  208. data/THIRD_PARTY_LICENSES/ascii-1.1.0/LICENSE-APACHE +0 -201
  209. data/THIRD_PARTY_LICENSES/ascii-1.1.0/LICENSE-MIT +0 -22
  210. data/THIRD_PARTY_LICENSES/ast_node-5.0.0/LICENSE +0 -201
  211. data/THIRD_PARTY_LICENSES/better_scoped_tls-1.0.1/LICENSE +0 -201
  212. data/THIRD_PARTY_LICENSES/bitvec-1.0.1/LICENSE.txt +0 -21
  213. data/THIRD_PARTY_LICENSES/bstr-1.12.1/COPYING +0 -8
  214. data/THIRD_PARTY_LICENSES/bstr-1.12.1/LICENSE-MIT +0 -21
  215. data/THIRD_PARTY_LICENSES/cargo-platform-0.1.9/LICENSE-APACHE +0 -201
  216. data/THIRD_PARTY_LICENSES/cargo_metadata-0.19.2/LICENSE-MIT +0 -23
  217. data/THIRD_PARTY_LICENSES/darling_macro-0.20.11/LICENSE +0 -21
  218. data/THIRD_PARTY_LICENSES/debugid-0.8.0/LICENSE +0 -201
  219. data/THIRD_PARTY_LICENSES/derive_builder-0.20.2/LICENSE-MIT +0 -21
  220. data/THIRD_PARTY_LICENSES/derive_builder_core-0.20.2/LICENSE-MIT +0 -21
  221. data/THIRD_PARTY_LICENSES/derive_builder_macro-0.20.2/LICENSE-MIT +0 -21
  222. data/THIRD_PARTY_LICENSES/foldhash-0.1.5/LICENSE +0 -19
  223. data/THIRD_PARTY_LICENSES/from_variant-3.0.0/LICENSE +0 -201
  224. data/THIRD_PARTY_LICENSES/funty-2.0.0/LICENSE.txt +0 -21
  225. data/THIRD_PARTY_LICENSES/hashbrown-0.16.1/LICENSE-MIT +0 -25
  226. data/THIRD_PARTY_LICENSES/heck-0.5.0/LICENSE-APACHE +0 -201
  227. data/THIRD_PARTY_LICENSES/hermit-abi-0.5.2/LICENSE-APACHE +0 -201
  228. data/THIRD_PARTY_LICENSES/hermit-abi-0.5.2/LICENSE-MIT +0 -23
  229. data/THIRD_PARTY_LICENSES/hstr-3.0.3/LICENSE +0 -202
  230. data/THIRD_PARTY_LICENSES/if_chain-1.0.3/LICENSE-APACHE +0 -201
  231. data/THIRD_PARTY_LICENSES/if_chain-1.0.3/LICENSE-MIT +0 -25
  232. data/THIRD_PARTY_LICENSES/is-macro-0.3.7/LICENSE +0 -202
  233. data/THIRD_PARTY_LICENSES/itoa-1.0.17/LICENSE-MIT +0 -23
  234. data/THIRD_PARTY_LICENSES/jsonc-parser-0.26.3/LICENSE +0 -21
  235. data/THIRD_PARTY_LICENSES/lazy_static-1.5.0/LICENSE-APACHE +0 -201
  236. data/THIRD_PARTY_LICENSES/lazy_static-1.5.0/LICENSE-MIT +0 -25
  237. data/THIRD_PARTY_LICENSES/lru-0.16.2/LICENSE +0 -21
  238. data/THIRD_PARTY_LICENSES/memchr-2.7.6/COPYING +0 -3
  239. data/THIRD_PARTY_LICENSES/memchr-2.7.6/LICENSE-MIT +0 -21
  240. data/THIRD_PARTY_LICENSES/miette-derive-7.6.0/LICENSE +0 -229
  241. data/THIRD_PARTY_LICENSES/normpath-0.2.0/COPYRIGHT +0 -7
  242. data/THIRD_PARTY_LICENSES/normpath-0.2.0/LICENSE-MIT +0 -21
  243. data/THIRD_PARTY_LICENSES/normpath-0.2.0/LICENSE-THIRD-PARTY +0 -210
  244. data/THIRD_PARTY_LICENSES/num_cpus-1.17.0/LICENSE-APACHE +0 -201
  245. data/THIRD_PARTY_LICENSES/num_cpus-1.17.0/LICENSE-MIT +0 -20
  246. data/THIRD_PARTY_LICENSES/owo-colors-4.2.3/LICENSE +0 -21
  247. data/THIRD_PARTY_LICENSES/par-core-2.0.0/LICENSE +0 -202
  248. data/THIRD_PARTY_LICENSES/par-iter-2.0.0/LICENSE +0 -202
  249. data/THIRD_PARTY_LICENSES/path-clean-0.1.0/LICENSE-APACHE +0 -13
  250. data/THIRD_PARTY_LICENSES/path-clean-0.1.0/LICENSE-MIT +0 -18
  251. data/THIRD_PARTY_LICENSES/path-clean-1.0.1/LICENSE-APACHE +0 -13
  252. data/THIRD_PARTY_LICENSES/path-clean-1.0.1/LICENSE-MIT +0 -18
  253. data/THIRD_PARTY_LICENSES/pathdiff-0.2.3/LICENSE-APACHE +0 -201
  254. data/THIRD_PARTY_LICENSES/pathdiff-0.2.3/LICENSE-MIT +0 -23
  255. data/THIRD_PARTY_LICENSES/petgraph-0.7.1/LICENSE-APACHE +0 -201
  256. data/THIRD_PARTY_LICENSES/precomputed-map-0.2.0/LICENSE +0 -21
  257. data/THIRD_PARTY_LICENSES/preset_env_base-6.0.0/LICENSE +0 -201
  258. data/THIRD_PARTY_LICENSES/radium-0.7.0/LICENSE.txt +0 -21
  259. data/THIRD_PARTY_LICENSES/radix_fmt-1.0.0/LICENSE +0 -201
  260. data/THIRD_PARTY_LICENSES/rand-0.8.5/COPYRIGHT +0 -12
  261. data/THIRD_PARTY_LICENSES/rand-0.8.5/LICENSE-APACHE +0 -176
  262. data/THIRD_PARTY_LICENSES/rand_core-0.6.4/COPYRIGHT +0 -12
  263. data/THIRD_PARTY_LICENSES/rand_core-0.6.4/LICENSE-APACHE +0 -187
  264. data/THIRD_PARTY_LICENSES/rand_core-0.6.4/LICENSE-MIT +0 -26
  265. data/THIRD_PARTY_LICENSES/regress-0.10.5/LICENSE-APACHE +0 -201
  266. data/THIRD_PARTY_LICENSES/regress-0.10.5/LICENSE-MIT +0 -21
  267. data/THIRD_PARTY_LICENSES/ryu-1.0.22/LICENSE-APACHE +0 -176
  268. data/THIRD_PARTY_LICENSES/ryu-1.0.22/LICENSE-BOOST +0 -23
  269. data/THIRD_PARTY_LICENSES/scoped-tls-1.0.1/LICENSE-APACHE +0 -201
  270. data/THIRD_PARTY_LICENSES/scoped-tls-1.0.1/LICENSE-MIT +0 -25
  271. data/THIRD_PARTY_LICENSES/siphasher-0.3.11/COPYING +0 -7
  272. data/THIRD_PARTY_LICENSES/smallvec-1.15.1/LICENSE-APACHE +0 -201
  273. data/THIRD_PARTY_LICENSES/smartstring-1.0.1/LICENCE.md +0 -355
  274. data/THIRD_PARTY_LICENSES/st-map-0.2.4/LICENSE +0 -202
  275. data/THIRD_PARTY_LICENSES/static-map-macro-0.3.4/LICENSE +0 -202
  276. data/THIRD_PARTY_LICENSES/string_enum-1.0.2/LICENSE +0 -201
  277. data/THIRD_PARTY_LICENSES/strsim-0.11.1/LICENSE +0 -23
  278. data/THIRD_PARTY_LICENSES/swc-52.0.0/LICENSE +0 -201
  279. data/THIRD_PARTY_LICENSES/swc_allocator-4.0.1/LICENSE +0 -201
  280. data/THIRD_PARTY_LICENSES/swc_atoms-9.0.0/LICENSE +0 -201
  281. data/THIRD_PARTY_LICENSES/swc_common-18.0.1/LICENSE +0 -201
  282. data/THIRD_PARTY_LICENSES/swc_compiler_base-45.0.0/LICENSE +0 -201
  283. data/THIRD_PARTY_LICENSES/swc_config-3.1.2/LICENSE +0 -201
  284. data/THIRD_PARTY_LICENSES/swc_config_macro-1.0.1/LICENSE +0 -201
  285. data/THIRD_PARTY_LICENSES/swc_core-54.0.0/LICENSE +0 -201
  286. data/THIRD_PARTY_LICENSES/swc_ecma_ast-19.0.0/LICENSE +0 -201
  287. data/THIRD_PARTY_LICENSES/swc_ecma_codegen-21.0.0/LICENSE +0 -201
  288. data/THIRD_PARTY_LICENSES/swc_ecma_codegen_macros-2.0.2/LICENSE +0 -201
  289. data/THIRD_PARTY_LICENSES/swc_ecma_compat_bugfixes-39.0.0/LICENSE +0 -201
  290. data/THIRD_PARTY_LICENSES/swc_ecma_compat_common-30.0.0/LICENSE +0 -201
  291. data/THIRD_PARTY_LICENSES/swc_ecma_compat_es2015-39.0.0/LICENSE +0 -201
  292. data/THIRD_PARTY_LICENSES/swc_ecma_compat_es2016-35.0.0/LICENSE +0 -201
  293. data/THIRD_PARTY_LICENSES/swc_ecma_compat_es2017-35.0.0/LICENSE +0 -201
  294. data/THIRD_PARTY_LICENSES/swc_ecma_compat_es2018-36.0.0/LICENSE +0 -201
  295. data/THIRD_PARTY_LICENSES/swc_ecma_compat_es2019-35.0.0/LICENSE +0 -201
  296. data/THIRD_PARTY_LICENSES/swc_ecma_compat_es2020-37.0.0/LICENSE +0 -201
  297. data/THIRD_PARTY_LICENSES/swc_ecma_compat_es2021-35.0.0/LICENSE +0 -201
  298. data/THIRD_PARTY_LICENSES/swc_ecma_compat_es2022-37.0.0/LICENSE +0 -201
  299. data/THIRD_PARTY_LICENSES/swc_ecma_compat_es3-26.0.0/LICENSE +0 -201
  300. data/THIRD_PARTY_LICENSES/swc_ecma_ext_transforms-25.0.0/LICENSE +0 -201
  301. data/THIRD_PARTY_LICENSES/swc_ecma_hooks-0.3.0/LICENSE +0 -201
  302. data/THIRD_PARTY_LICENSES/swc_ecma_loader-18.0.0/LICENSE +0 -201
  303. data/THIRD_PARTY_LICENSES/swc_ecma_minifier-42.0.0/LICENSE +0 -201
  304. data/THIRD_PARTY_LICENSES/swc_ecma_parser-32.0.0/LICENSE +0 -201
  305. data/THIRD_PARTY_LICENSES/swc_ecma_preset_env-45.0.0/LICENSE +0 -201
  306. data/THIRD_PARTY_LICENSES/swc_ecma_transformer-6.0.0/LICENSE +0 -201
  307. data/THIRD_PARTY_LICENSES/swc_ecma_transforms-44.0.0/LICENSE +0 -201
  308. data/THIRD_PARTY_LICENSES/swc_ecma_transforms_base-35.0.0/LICENSE +0 -201
  309. data/THIRD_PARTY_LICENSES/swc_ecma_transforms_classes-35.0.0/LICENSE +0 -201
  310. data/THIRD_PARTY_LICENSES/swc_ecma_transforms_compat-40.0.0/LICENSE +0 -201
  311. data/THIRD_PARTY_LICENSES/swc_ecma_transforms_macros-1.0.1/LICENSE +0 -201
  312. data/THIRD_PARTY_LICENSES/swc_ecma_transforms_module-38.0.0/LICENSE +0 -201
  313. data/THIRD_PARTY_LICENSES/swc_ecma_transforms_optimization-37.0.0/LICENSE +0 -201
  314. data/THIRD_PARTY_LICENSES/swc_ecma_transforms_proposal-35.0.0/LICENSE +0 -201
  315. data/THIRD_PARTY_LICENSES/swc_ecma_transforms_react-38.0.0/LICENSE +0 -201
  316. data/THIRD_PARTY_LICENSES/swc_ecma_transforms_typescript-38.0.0/LICENSE +0 -201
  317. data/THIRD_PARTY_LICENSES/swc_ecma_usage_analyzer-27.0.0/LICENSE +0 -201
  318. data/THIRD_PARTY_LICENSES/swc_ecma_utils-25.0.0/LICENSE +0 -201
  319. data/THIRD_PARTY_LICENSES/swc_ecma_visit-19.0.0/LICENSE +0 -201
  320. data/THIRD_PARTY_LICENSES/swc_eq_ignore_macros-1.0.1/LICENSE +0 -201
  321. data/THIRD_PARTY_LICENSES/swc_error_reporters-20.0.0/LICENSE +0 -201
  322. data/THIRD_PARTY_LICENSES/swc_macros_common-1.0.1/LICENSE +0 -201
  323. data/THIRD_PARTY_LICENSES/swc_node_comments-18.0.0/LICENSE +0 -201
  324. data/THIRD_PARTY_LICENSES/swc_timer-1.0.0/LICENSE +0 -201
  325. data/THIRD_PARTY_LICENSES/swc_trace_macro-2.0.2/LICENSE +0 -201
  326. data/THIRD_PARTY_LICENSES/swc_transform_common-12.0.0/LICENSE +0 -201
  327. data/THIRD_PARTY_LICENSES/swc_visit-2.0.1/LICENSE +0 -201
  328. data/THIRD_PARTY_LICENSES/tap-1.0.1/LICENSE.txt +0 -21
  329. data/THIRD_PARTY_LICENSES/tracing-0.1.44/LICENSE +0 -25
  330. data/THIRD_PARTY_LICENSES/tracing-attributes-0.1.31/LICENSE +0 -25
  331. data/THIRD_PARTY_LICENSES/tracing-core-0.1.36/LICENSE +0 -25
  332. data/THIRD_PARTY_LICENSES/triomphe-0.1.15/LICENSE-APACHE +0 -201
  333. data/THIRD_PARTY_LICENSES/triomphe-0.1.15/LICENSE-MIT +0 -27
  334. data/THIRD_PARTY_LICENSES/unicode-width-0.1.14/LICENSE-APACHE +0 -201
  335. data/THIRD_PARTY_LICENSES/unicode-width-0.1.14/LICENSE-MIT +0 -25
  336. data/THIRD_PARTY_LICENSES/uuid-1.19.0/LICENSE-APACHE +0 -201
  337. data/THIRD_PARTY_LICENSES/uuid-1.19.0/LICENSE-MIT +0 -26
  338. data/THIRD_PARTY_LICENSES/vergen-9.0.6/LICENSE-APACHE +0 -201
  339. data/THIRD_PARTY_LICENSES/vergen-9.0.6/LICENSE-MIT +0 -25
  340. data/THIRD_PARTY_LICENSES/vergen-lib-0.1.6/LICENSE-APACHE +0 -201
  341. data/THIRD_PARTY_LICENSES/vergen-lib-0.1.6/LICENSE-MIT +0 -25
  342. data/THIRD_PARTY_LICENSES/wyz-0.5.1/LICENSE.txt +0 -21
  343. data/vendor/cfsolve/src/deobfuscate/analysis/globals.rs +0 -33
  344. data/vendor/cfsolve/src/deobfuscate/analysis/names.rs +0 -52
  345. /data/THIRD_PARTY_LICENSES/{derive_builder-0.20.2 → cobs-0.3.0}/LICENSE-APACHE +0 -0
  346. /data/THIRD_PARTY_LICENSES/{compact_str-0.7.1 → compact_str-0.10.0}/LICENSE +0 -0
  347. /data/THIRD_PARTY_LICENSES/{ahash-0.8.12 → embedded-io-0.4.0}/LICENSE-APACHE +0 -0
  348. /data/THIRD_PARTY_LICENSES/{arrayvec-0.7.6 → embedded-io-0.6.1}/LICENSE-APACHE +0 -0
  349. /data/THIRD_PARTY_LICENSES/{normpath-0.2.0 → escape-simd-0.1.1}/LICENSE-APACHE +0 -0
  350. /data/THIRD_PARTY_LICENSES/{bstr-1.12.1 → itertools-0.15.0}/LICENSE-APACHE +0 -0
  351. /data/THIRD_PARTY_LICENSES/{petgraph-0.7.1 → itertools-0.15.0}/LICENSE-MIT +0 -0
  352. /data/THIRD_PARTY_LICENSES/{itoa-1.0.17 → itoa-1.0.19}/LICENSE-APACHE +0 -0
  353. /data/THIRD_PARTY_LICENSES/{camino-1.2.2 → itoa-1.0.19}/LICENSE-MIT +0 -0
  354. /data/THIRD_PARTY_LICENSES/{globset-0.4.18 → memchr-2.8.3}/COPYING +0 -0
  355. /data/THIRD_PARTY_LICENSES/{globset-0.4.18 → memchr-2.8.3}/LICENSE-MIT +0 -0
  356. /data/THIRD_PARTY_LICENSES/{camino-1.2.2 → num-bigint-0.5.1}/LICENSE-APACHE +0 -0
  357. /data/THIRD_PARTY_LICENSES/{swc_sourcemap-9.3.4 → oxc_sourcemap-9.0.0}/LICENSE +0 -0
  358. /data/THIRD_PARTY_LICENSES/{phf-0.11.3 → phf-0.14.0}/LICENSE +0 -0
  359. /data/THIRD_PARTY_LICENSES/{phf_generator-0.11.3 → phf_generator-0.14.0}/LICENSE +0 -0
  360. /data/THIRD_PARTY_LICENSES/{phf_macros-0.11.3 → phf_macros-0.14.0}/LICENSE +0 -0
  361. /data/THIRD_PARTY_LICENSES/{phf_shared-0.11.3 → phf_shared-0.14.0}/LICENSE +0 -0
  362. /data/THIRD_PARTY_LICENSES/{fixedbitset-0.5.7 → postcard-1.1.3}/LICENSE-APACHE +0 -0
  363. /data/THIRD_PARTY_LICENSES/{hashbrown-0.14.5 → smallvec-1.16.5}/LICENSE-APACHE +0 -0
  364. /data/THIRD_PARTY_LICENSES/{smallvec-1.15.1 → smallvec-1.16.5}/LICENSE-MIT +0 -0
  365. /data/THIRD_PARTY_LICENSES/{unicode-width-0.1.14 → unicode-segmentation-1.13.3}/COPYRIGHT +0 -0
  366. /data/THIRD_PARTY_LICENSES/{hashbrown-0.16.1 → unicode-segmentation-1.13.3}/LICENSE-APACHE +0 -0
  367. /data/THIRD_PARTY_LICENSES/{heck-0.5.0 → unicode-segmentation-1.13.3}/LICENSE-MIT +0 -0
  368. /data/THIRD_PARTY_LICENSES/{cargo-platform-0.1.9 → zmij_ecma-1.0.23}/LICENSE-MIT +0 -0
@@ -9,350 +9,292 @@
9
9
  //! Removes order and cursor assignments only if they are used solely by the dispatcher or never
10
10
  //! mentioned after the loop in the same statement list.
11
11
 
12
- use swc_core::atoms::Atom;
13
- use swc_core::common::{Span, SyntaxContext};
14
- use swc_core::ecma::ast::{
15
- ArrowExpr, BlockStmt, BreakStmt, Class, ContinueStmt, Expr, ForStmt, Function, Id, LabeledStmt,
16
- Lit, MemberProp, Program, Stmt, SwitchCase, SwitchStmt, UpdateOp, VarDeclOrExpr,
12
+ use oxc::allocator::{CloneIn, GetAllocator, Vec};
13
+ use oxc::ast::ast::{
14
+ Expression, ForStatement, Program, SimpleAssignmentTarget, Statement, SwitchStatement,
17
15
  };
18
- use swc_core::ecma::visit::{Visit, VisitMut, VisitMutWith, VisitWith};
16
+ use oxc::ast_visit::{VisitMut, walk_mut};
17
+ use oxc::span::Span;
18
+ use oxc::syntax::operator::UpdateOperator;
19
19
 
20
- use super::analysis::{Analysis, Bindings, names};
21
- use super::{HashMap, HashSet};
22
- use crate::js::ast;
20
+ use super::analysis::{Analysis, Id};
21
+ use super::ast::LabeledContinue;
22
+ use super::{HashMap, ast};
23
23
 
24
- pub(super) fn run(program: &mut Program, analysis: &mut Analysis) -> bool {
25
- let mut unflatten = UnflattenSwitches {
26
- bindings: analysis.bindings(program),
24
+ pub(super) fn run<'a>(program: &mut Program<'a>, analysis: &mut Analysis<'a>) -> bool {
25
+ let mut unflatten = Unflatten {
26
+ analysis,
27
27
  changed: false,
28
28
  };
29
- program.visit_mut_with(&mut unflatten);
29
+ unflatten.visit_program(program);
30
30
  unflatten.changed
31
31
  }
32
32
 
33
- struct UnflattenSwitches<'bindings> {
34
- bindings: &'bindings Bindings,
35
- changed: bool,
36
- }
37
-
38
- impl UnflattenSwitches<'_> {
39
- /// Checks whether dispatcher setup for `bindings` must be preserved because later
40
- /// statements may use it.
41
- fn keeps_setup(&self, bindings: &[Id; 2], after: Option<&[Stmt]>) -> bool {
42
- bindings.iter().any(|id| self.bindings.references(id) > 1)
43
- && after.is_none_or(|after| names::mentions(after, bindings))
44
- }
45
-
46
- /// Expands a `for` dispatcher in execution order. Preserves leading initializer
47
- /// expressions and, if [`Self::keeps_setup`], the order and cursor assignments.
48
- fn unflatten_for(&self, for_statement: &ForStmt, after: Option<&[Stmt]>) -> Option<Stmt> {
49
- if is_true(for_statement.test.as_deref())
50
- && for_statement.update.is_none()
51
- && let Some(VarDeclOrExpr::Expr(initializer)) = &for_statement.init
52
- && let Expr::Seq(initializer) = &**initializer
53
- && let [prefix @ .., array_assignment, index_assignment] = initializer.exprs.as_slice()
54
- && let Some(order) = split_order(array_assignment)
55
- && let Some(index) = zero_index(index_assignment)
56
- && let Some(dispatcher) = Dispatcher::of(&for_statement.body)
57
- && dispatcher.array == order.array
58
- && dispatcher.index == index
59
- {
60
- let prefix = if self.keeps_setup(&dispatcher.bindings(), after) {
61
- &initializer.exprs[..]
62
- } else {
63
- prefix
64
- };
65
- flattened(&dispatcher, &order, prefix, for_statement.span)
66
- } else {
67
- None
68
- }
69
- }
70
- }
71
-
72
- impl VisitMut for UnflattenSwitches<'_> {
73
- /// A `for` dispatcher used directly as another statement's body has no following statement
74
- /// list to check.
75
- fn visit_mut_stmt(&mut self, statement: &mut Stmt) {
76
- statement.visit_mut_children_with(self);
77
-
78
- if let Stmt::For(for_statement) = statement
79
- && let Some(inlined) = self.unflatten_for(for_statement, None)
80
- {
81
- *statement = inlined;
82
- self.changed = true;
83
- }
84
- }
85
-
86
- fn visit_mut_stmts(&mut self, statements: &mut Vec<Stmt>) {
87
- // Unflatten statements below, where subsequent statements are available for analysis.
88
- for statement in statements.iter_mut() {
89
- statement.visit_mut_children_with(self);
90
- }
91
-
92
- let mut position = 0;
93
- while position < statements.len() {
94
- if let Stmt::For(for_statement) = &statements[position]
95
- && let Some(inlined) =
96
- self.unflatten_for(for_statement, Some(&statements[position + 1..]))
97
- {
98
- statements[position] = inlined;
99
- self.changed = true;
100
- } else if let Stmt::While(loop_) = &statements[position]
101
- && is_true(Some(&loop_.test))
102
- && let Some(dispatcher) = Dispatcher::of(&loop_.body)
103
- && let Some(setup) = Setup::find(&statements[..position], &dispatcher)
104
- && let Some(inlined) = flattened(&dispatcher, &setup.order, &[], loop_.span)
105
- {
106
- let bindings = dispatcher.bindings();
107
- statements[position] = inlined;
108
- self.changed = true;
109
- // The setup only fed the loop, unless something after it reads the order or the
110
- // cursor.
111
- if !self.keeps_setup(&bindings, Some(&statements[position + 1..])) {
112
- for index in setup.statements {
113
- statements.remove(index);
114
- }
115
- position -= setup.statements.len();
116
- }
117
- }
118
- position += 1;
119
- }
120
- }
121
- }
122
-
123
- /// Finds `order = "...".split(...)` and `cursor = 0` by scanning backward from a `while`
124
- /// dispatcher. Stops at any other reference to either binding.
125
- struct Setup {
126
- order: SplitOrder,
127
- /// Positions of the two setup statements, last first.
128
- statements: [usize; 2],
129
- }
130
-
131
- impl Setup {
132
- fn find(preceding: &[Stmt], dispatcher: &Dispatcher) -> Option<Self> {
133
- let bindings = dispatcher.bindings();
134
- let mut order = None;
135
- let mut cursor = None;
136
- let backwards = preceding.iter().enumerate().rev();
137
- for (position, statement) in backwards {
138
- if let Stmt::Expr(statement) = statement
139
- && order.is_none()
140
- && let Some(split) = split_order(&statement.expr)
141
- && split.array == dispatcher.array
142
- {
143
- order = Some((split, position));
144
- } else if let Stmt::Expr(statement) = statement
145
- && cursor.is_none()
146
- && zero_index(&statement.expr).is_some_and(|index| index == dispatcher.index)
147
- {
148
- cursor = Some(position);
149
- } else if names::mentions(statement, &bindings) {
150
- return None;
151
- }
152
- if let Some(cursor) = cursor
153
- && let Some((order, order_position)) = order.take()
154
- {
155
- return Some(Self {
156
- order,
157
- statements: [cursor.max(order_position), cursor.min(order_position)],
158
- });
159
- }
160
- }
161
- None
162
- }
163
- }
164
-
165
- fn is_true(test: Option<&Expr>) -> bool {
166
- matches!(test, Some(Expr::Lit(Lit::Bool(value))) if value.value)
167
- }
168
-
169
33
  /// `array = "b|a".split("|")`: the case labels in execution order and their separator.
170
- struct SplitOrder {
171
- array: Id,
172
- order: String,
173
- separator: String,
34
+ struct Order<'a> {
35
+ id: Id,
36
+ order: &'a str,
37
+ separator: &'a str,
174
38
  }
175
39
 
176
- fn split_order(expression: &Expr) -> Option<SplitOrder> {
177
- if let Some((array, value)) = ast::assignment(expression)
178
- && let Some((order, [separator])) = ast::method_call(value, "split")
179
- && separator.spread.is_none()
180
- && let Some(order) = ast::static_str(order)
181
- && let Some(separator) = ast::static_str(&separator.expr)
182
- && !separator.is_empty()
183
- {
184
- Some(SplitOrder {
185
- array,
186
- order: order.to_owned(),
187
- separator: separator.to_owned(),
188
- })
189
- } else {
190
- None
40
+ fn order<'a>(expression: &Expression<'a>, analysis: &Analysis<'a>) -> Option<Order<'a>> {
41
+ let (id, value) = analysis.assignment(expression)?;
42
+ let (order, [separator]) = ast::method_call(value, "split")? else {
43
+ return None;
44
+ };
45
+ let separator = ast::static_str(separator.as_expression()?)?;
46
+ if separator.is_empty() {
47
+ return None;
191
48
  }
49
+ Some(Order {
50
+ id,
51
+ order: ast::static_str(order)?,
52
+ separator,
53
+ })
192
54
  }
193
55
 
194
- /// `cursor = 0`: the cursor binding.
195
- fn zero_index(expression: &Expr) -> Option<Id> {
196
- let (index, value) = ast::assignment(expression)?;
197
- matches!(value, Expr::Lit(Lit::Num(value)) if value.value == 0.0).then_some(index)
56
+ /// Matches `cursor = 0` and returns the cursor binding.
57
+ fn zero(expression: &Expression<'_>, analysis: &Analysis<'_>) -> Option<Id> {
58
+ let Expression::AssignmentExpression(assignment) = expression.get_inner_expression() else {
59
+ return None;
60
+ };
61
+ if ast::number(&assignment.right) != Some(0.0) {
62
+ return None;
63
+ }
64
+ analysis.target_id(&assignment.left)
198
65
  }
199
66
 
200
- /// A loop body `{ switch (order[cursor++]) { ... } break; }`.
201
- struct Dispatcher<'body> {
202
- switch: &'body SwitchStmt,
203
- /// The syntax context of the loop body.
204
- context: SyntaxContext,
67
+ /// A loop body `{ switch (order[cursor++]) { ... } break; }` and its setup bindings.
68
+ struct Dispatcher<'b, 'a> {
69
+ switch: &'b SwitchStatement<'a>,
205
70
  array: Id,
206
71
  index: Id,
207
72
  }
208
73
 
209
- impl<'body> Dispatcher<'body> {
210
- fn of(body: &'body Stmt) -> Option<Self> {
211
- if let Stmt::Block(body) = body
212
- && let [Stmt::Switch(switch), Stmt::Break(break_statement)] = body.stmts.as_slice()
213
- && break_statement.label.is_none()
214
- && let Expr::Member(discriminant) = &*switch.discriminant
215
- && let Some(array) = discriminant.obj.as_ident()
216
- && let MemberProp::Computed(property) = &discriminant.prop
217
- && let Expr::Update(increment) = &*property.expr
218
- && increment.op == UpdateOp::PlusPlus
219
- && !increment.prefix
220
- && let Some(index) = increment.arg.as_ident()
221
- {
222
- Some(Self {
223
- switch,
224
- context: body.ctxt,
225
- array: array.to_id(),
226
- index: index.to_id(),
227
- })
228
- } else {
229
- None
230
- }
231
- }
232
-
233
- fn bindings(&self) -> [Id; 2] {
234
- [self.array.clone(), self.index.clone()]
74
+ impl Dispatcher<'_, '_> {
75
+ fn setup(&self) -> [Id; 2] {
76
+ [self.array, self.index]
235
77
  }
236
78
  }
237
79
 
238
- /// Orders case bodies after the leading loop initializer expressions. Returns `None` for
239
- /// unsupported cases and missing or unused labels.
240
- fn flattened(
241
- dispatcher: &Dispatcher,
242
- order: &SplitOrder,
243
- prefix: &[Box<Expr>],
244
- span: Span,
245
- ) -> Option<Stmt> {
246
- let mut cases = case_bodies(&dispatcher.switch.cases, &dispatcher.bindings())?;
247
- let mut statements: Vec<Stmt> = prefix
248
- .iter()
249
- .map(|expression| ast::expression_statement(expression.clone()))
250
- .collect();
251
- for label in order.order.split(&order.separator) {
252
- statements.extend(cases.remove(label)?);
80
+ fn dispatcher<'b, 'a>(
81
+ body: &'b Statement<'a>,
82
+ analysis: &Analysis<'a>,
83
+ ) -> Option<Dispatcher<'b, 'a>> {
84
+ let Statement::BlockStatement(block) = body else {
85
+ return None;
86
+ };
87
+ let [
88
+ Statement::SwitchStatement(switch),
89
+ Statement::BreakStatement(jump),
90
+ ] = block.body.as_slice()
91
+ else {
92
+ return None;
93
+ };
94
+ if jump.label.is_some() {
95
+ return None;
253
96
  }
254
- cases.is_empty().then(|| {
255
- Stmt::Block(BlockStmt {
256
- span,
257
- ctxt: dispatcher.context,
258
- stmts: statements,
259
- })
97
+ let Expression::ComputedMemberExpression(member) = switch.discriminant.get_inner_expression()
98
+ else {
99
+ return None;
100
+ };
101
+ let Expression::UpdateExpression(update) = member.expression.get_inner_expression() else {
102
+ return None;
103
+ };
104
+ if update.operator != UpdateOperator::Increment || update.prefix {
105
+ return None;
106
+ }
107
+ let SimpleAssignmentTarget::AssignmentTargetIdentifier(index) = &update.argument else {
108
+ return None;
109
+ };
110
+ Some(Dispatcher {
111
+ switch,
112
+ array: analysis.expression_id(&member.object)?,
113
+ index: analysis.id(index)?,
260
114
  })
261
115
  }
262
116
 
263
- /// Maps case labels to their bodies. Each body must continue the dispatcher or exit execution
264
- /// so the bodies can be concatenated. Rejects other jumps to the switch or dispatcher loop,
265
- /// since those targets will be removed. Also rejects bodies that read the order or cursor,
266
- /// whose values depend on the loop.
267
- fn case_bodies(cases: &[SwitchCase], bindings: &[Id; 2]) -> Option<HashMap<String, Vec<Stmt>>> {
268
- if cases
269
- .iter()
270
- .any(|case| names::mentions(&case.cons, bindings))
271
- {
272
- return None;
273
- }
274
- let mut bodies = HashMap::default();
275
- for case in cases {
276
- let label = case.test.as_deref().and_then(ast::static_str)?.to_owned();
277
- let mut statements = case.cons.clone();
278
- let continues_loop = matches!(
279
- statements.last(),
280
- Some(Stmt::Continue(continue_statement)) if continue_statement.label.is_none()
281
- );
282
- if continues_loop {
283
- statements.pop();
284
- } else if !matches!(statements.last(), Some(Stmt::Return(_) | Stmt::Throw(_))) {
117
+ /// Orders case bodies after any initializer prefix. Each case must continue the dispatcher or
118
+ /// return/throw, with no other jump to the removed loop or switch. Rejects bodies mentioning the
119
+ /// order or cursor, repeated or missing labels, and labels left unused by the order string.
120
+ fn flatten<'a>(
121
+ dispatcher: &Dispatcher<'_, 'a>,
122
+ order: &Order<'a>,
123
+ prefix: &[Expression<'a>],
124
+ span: Span,
125
+ analysis: &Analysis<'a>,
126
+ ) -> Option<Statement<'a>> {
127
+ let allocator = analysis.allocator();
128
+ let mut cases = HashMap::default();
129
+ for case in &dispatcher.switch.cases {
130
+ if ast::mentions(&case.consequent, &dispatcher.setup(), analysis) {
285
131
  return None;
286
132
  }
287
- let mut jumps = Jumps::default();
288
- statements.visit_with(&mut jumps);
289
- if jumps.leaves {
133
+ let label = ast::static_str(case.test.as_ref()?)?;
134
+ let mut body = case.consequent.clone_in_with_semantic_ids(allocator);
135
+ match body.last() {
136
+ Some(Statement::ContinueStatement(jump)) if jump.label.is_none() => {
137
+ body.pop();
138
+ }
139
+ Some(Statement::ReturnStatement(_) | Statement::ThrowStatement(_)) => {}
140
+ _ => return None,
141
+ }
142
+ if ast::escapes(&body, LabeledContinue::Inner) || cases.insert(label, body).is_some() {
290
143
  return None;
291
144
  }
292
- bodies.insert(label, statements);
293
145
  }
294
- Some(bodies)
146
+ let mut flattened = Vec::new_in(analysis);
147
+ for expression in prefix {
148
+ let expression = expression.clone_in_with_semantic_ids(allocator);
149
+ flattened.push(ast::expression_statement(expression, &analysis.ast))
150
+ }
151
+ for label in order.order.split(order.separator) {
152
+ flattened.extend(cases.remove(label)?)
153
+ }
154
+ cases
155
+ .is_empty()
156
+ .then(|| Statement::new_block_statement(span, flattened, analysis))
295
157
  }
296
158
 
297
- /// Detects jumps from case statements to enclosing constructs: unlabeled `break` or
298
- /// `continue` without an internal target, or `continue` to an external label. Labeled `break`
299
- /// remains valid because its target still encloses the expanded cases.
300
- #[derive(Default)]
301
- struct Jumps {
302
- /// Loops around the node, within the case.
303
- loops: usize,
304
- /// Loops and `switch` statements around the node, within the case.
305
- breakable: usize,
306
- /// Labels declared around the node, within the case.
307
- labels: HashSet<Atom>,
308
- leaves: bool,
159
+ struct Unflatten<'b, 'a> {
160
+ analysis: &'b Analysis<'a>,
161
+ changed: bool,
309
162
  }
310
163
 
311
- impl Visit for Jumps {
312
- fn visit_stmt(&mut self, statement: &Stmt) {
313
- let depth = usize::from(matches!(
314
- statement,
315
- Stmt::For(_) | Stmt::ForIn(_) | Stmt::ForOf(_) | Stmt::While(_) | Stmt::DoWhile(_)
316
- ));
317
- self.loops += depth;
318
- self.breakable += depth;
319
- statement.visit_children_with(self);
320
- self.loops -= depth;
321
- self.breakable -= depth;
164
+ impl<'a> Unflatten<'_, 'a> {
165
+ /// Keeps dispatcher setup when references after the loop may still need the order or cursor.
166
+ fn keeps_setup(
167
+ &self,
168
+ dispatcher: &Dispatcher<'_, 'a>,
169
+ after: Option<&[Statement<'a>]>,
170
+ ) -> bool {
171
+ let setup = dispatcher.setup();
172
+ setup
173
+ .iter()
174
+ .any(|id| self.analysis.bindings.references(id) > 1)
175
+ && after.is_none_or(|after| ast::mentions(after, &setup, self.analysis))
322
176
  }
323
177
 
324
- fn visit_break_stmt(&mut self, jump: &BreakStmt) {
325
- self.leaves |= jump.label.is_none() && self.breakable == 0;
178
+ /// Expands a `for` dispatcher, preserving initializer prefixes and any setup still needed
179
+ /// afterwards.
180
+ fn for_loop(
181
+ &self,
182
+ for_loop: &ForStatement<'a>,
183
+ after: Option<&[Statement<'a>]>,
184
+ ) -> Option<Statement<'a>> {
185
+ let test = for_loop.test.as_ref().and_then(ast::truthiness);
186
+ if for_loop.update.is_some() || test != Some(true) {
187
+ return None;
188
+ }
189
+ let Expression::SequenceExpression(init) = for_loop
190
+ .init
191
+ .as_ref()?
192
+ .as_expression()?
193
+ .get_inner_expression()
194
+ else {
195
+ return None;
196
+ };
197
+ let [prefix @ .., array, index] = init.expressions.as_slice() else {
198
+ return None;
199
+ };
200
+ let order = order(array, self.analysis)?;
201
+ let index = zero(index, self.analysis)?;
202
+ let dispatcher = dispatcher(&for_loop.body, self.analysis)?;
203
+ if dispatcher.array != order.id || dispatcher.index != index {
204
+ return None;
205
+ }
206
+ let prefix = if self.keeps_setup(&dispatcher, after) {
207
+ &init.expressions
208
+ } else {
209
+ prefix
210
+ };
211
+ flatten(&dispatcher, &order, prefix, for_loop.span, self.analysis)
326
212
  }
327
213
 
328
- fn visit_continue_stmt(&mut self, jump: &ContinueStmt) {
329
- self.leaves |= match &jump.label {
330
- Some(label) => !self.labels.contains(&label.sym),
331
- None => self.loops == 0,
214
+ /// Expands a `while (true)` dispatcher at `position`, removing its setup unless later
215
+ /// statements still need it, and returns the expansion's new position.
216
+ fn while_loop(
217
+ &mut self,
218
+ statements: &mut Vec<'a, Statement<'a>>,
219
+ position: usize,
220
+ ) -> Option<usize> {
221
+ let analysis = self.analysis;
222
+ let Statement::WhileStatement(while_loop) = &statements[position] else {
223
+ return None;
332
224
  };
225
+ if ast::truthiness(&while_loop.test) != Some(true) {
226
+ return None;
227
+ }
228
+ let dispatcher = dispatcher(&while_loop.body, analysis)?;
229
+ let setup = dispatcher.setup();
230
+ let mut setup_order = None;
231
+ let mut setup_index = None;
232
+ for earlier in (0..position).rev() {
233
+ let expression = match &statements[earlier] {
234
+ Statement::ExpressionStatement(statement) => Some(&statement.expression),
235
+ _ => None,
236
+ };
237
+ if let Some(expression) = expression
238
+ && setup_order.is_none()
239
+ && let Some(order) = order(expression, analysis)
240
+ && order.id == dispatcher.array
241
+ {
242
+ setup_order = Some((earlier, order));
243
+ } else if let Some(expression) = expression
244
+ && setup_index.is_none()
245
+ && zero(expression, analysis) == Some(dispatcher.index)
246
+ {
247
+ setup_index = Some(earlier)
248
+ } else if ast::mentions(&statements[earlier..=earlier], &setup, analysis) {
249
+ break;
250
+ }
251
+ if setup_order.is_some() && setup_index.is_some() {
252
+ break;
253
+ }
254
+ }
255
+ let ((order_position, order), index_position) = (setup_order?, setup_index?);
256
+ let flattened = flatten(&dispatcher, &order, &[], while_loop.span, analysis)?;
257
+ let keep = self.keeps_setup(&dispatcher, Some(&statements[position + 1..]));
258
+ statements[position] = flattened;
259
+ self.changed = true;
260
+ if keep {
261
+ return Some(position);
262
+ }
263
+ statements.remove(order_position.max(index_position));
264
+ statements.remove(order_position.min(index_position));
265
+ Some(position - 2)
333
266
  }
267
+ }
334
268
 
335
- fn visit_labeled_stmt(&mut self, labeled: &LabeledStmt) {
336
- let added = self.labels.insert(labeled.label.sym.clone());
337
- labeled.body.visit_with(self);
338
- if added {
339
- self.labels.remove(&labeled.label.sym);
269
+ impl<'a> VisitMut<'a> for Unflatten<'_, 'a> {
270
+ fn visit_statement(&mut self, statement: &mut Statement<'a>) {
271
+ walk_mut::walk_statement(self, statement);
272
+ if let Statement::ForStatement(for_loop) = statement
273
+ && let Some(flattened) = self.for_loop(for_loop, None)
274
+ {
275
+ *statement = flattened;
276
+ self.changed = true;
340
277
  }
341
278
  }
342
279
 
343
- fn visit_switch_stmt(&mut self, switch: &SwitchStmt) {
344
- switch.discriminant.visit_with(self);
345
- self.breakable += 1;
346
- switch.cases.visit_with(self);
347
- self.breakable -= 1;
280
+ fn visit_statements(&mut self, statements: &mut Vec<'a, Statement<'a>>) {
281
+ for statement in statements.iter_mut() {
282
+ walk_mut::walk_statement(self, statement)
283
+ }
284
+ let mut position = 0;
285
+ while position < statements.len() {
286
+ if let Statement::ForStatement(for_loop) = &statements[position] {
287
+ let after = &statements[position + 1..];
288
+ if let Some(flattened) = self.for_loop(for_loop, Some(after)) {
289
+ statements[position] = flattened;
290
+ self.changed = true;
291
+ }
292
+ } else if let Some(expanded) = self.while_loop(statements, position) {
293
+ position = expanded;
294
+ }
295
+ position += 1;
296
+ }
348
297
  }
349
-
350
- // Functions and classes have jump targets of their own.
351
- fn visit_function(&mut self, _: &Function) {}
352
-
353
- fn visit_arrow_expr(&mut self, _: &ArrowExpr) {}
354
-
355
- fn visit_class(&mut self, _: &Class) {}
356
298
  }
357
299
 
358
300
  #[cfg(test)]