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
@@ -8,294 +8,287 @@
8
8
  //! conditional values into `if` branches so only the selected expression runs. Runs after
9
9
  //! simplification, which could otherwise combine the statements again.
10
10
 
11
- use std::mem;
12
-
13
- use swc_core::common::Span;
14
- use swc_core::common::util::take::Take;
15
- use swc_core::ecma::ast::{
16
- AssignOp, BinaryOp, CondExpr, Decl, Expr, IfStmt, LabeledStmt, Lit, Program, ReturnStmt, Stmt,
17
- ThrowStmt, UnaryExpr, UnaryOp, VarDeclKind, VarDeclOrExpr,
11
+ use oxc::allocator::{TakeIn, Vec};
12
+ use oxc::ast::ast::{
13
+ ConditionalExpression, Expression, LabeledStatement, Program, Statement,
14
+ VariableDeclarationKind,
18
15
  };
19
- use swc_core::ecma::visit::{VisitMut, VisitMutWith};
16
+ use oxc::ast_visit::{VisitMut, walk_mut};
17
+ use oxc::span::{GetSpan, SPAN, Span};
18
+ use oxc::syntax::operator::{AssignmentOperator, LogicalOperator, UnaryOperator};
20
19
 
21
20
  use super::analysis::Analysis;
22
- use crate::js::ast;
21
+ use super::ast;
23
22
 
24
- pub(super) fn run(program: &mut Program, _: &mut Analysis) -> bool {
25
- let mut expand = ExpandStatements { changed: false };
26
- program.visit_mut_with(&mut expand);
23
+ pub(super) fn run<'a>(program: &mut Program<'a>, analysis: &mut Analysis<'a>) -> bool {
24
+ let mut expand = Expand {
25
+ analysis,
26
+ changed: false,
27
+ };
28
+ expand.visit_program(program);
27
29
  expand.changed
28
30
  }
29
31
 
30
- struct ExpandStatements {
32
+ struct Expand<'b, 'a> {
33
+ analysis: &'b Analysis<'a>,
31
34
  changed: bool,
32
35
  }
33
36
 
34
- impl VisitMut for ExpandStatements {
35
- fn visit_mut_stmts(&mut self, statements: &mut Vec<Stmt>) {
36
- let mut expanded = Vec::with_capacity(statements.len());
37
- for mut statement in mem::take(statements) {
38
- statement.visit_mut_children_with(self);
39
- expanded.extend(self.expand(statement));
40
- }
41
- *statements = expanded;
42
- }
43
-
44
- fn visit_mut_stmt(&mut self, statement: &mut Stmt) {
45
- statement.visit_mut_children_with(self);
46
- let statements = self.expand(statement.take());
47
- // This position accepts one statement. Wrap multi-statement expansions in a block.
48
- *statement = match <[Stmt; 1]>::try_from(statements) {
49
- Ok([single]) => single,
50
- Err(statements) => ast::block(statements),
51
- };
52
- }
37
+ /// The statement that applies to each arm of an expanded conditional.
38
+ enum Arm {
39
+ Expression,
40
+ Return,
41
+ Throw,
42
+ }
53
43
 
54
- fn visit_mut_labeled_stmt(&mut self, statement: &mut LabeledStmt) {
55
- // A label on a loop must stay on the loop for `continue label`.
56
- // In particular, do not replace its body with a block of lifted initializers.
57
- if let Stmt::Labeled(nested) = &mut *statement.body {
58
- self.visit_mut_labeled_stmt(nested);
59
- } else {
60
- statement.body.visit_mut_children_with(self);
44
+ /// Keeps `name = (effects, function () {})` and equivalent arrow and class sequences intact.
45
+ /// Removing the sequence could give the anonymous value an inferred `.name` it did not have.
46
+ fn anonymous(expression: &Expression<'_>) -> bool {
47
+ match expression.get_inner_expression() {
48
+ Expression::SequenceExpression(sequence) => {
49
+ sequence.expressions.last().is_some_and(anonymous)
61
50
  }
51
+ Expression::FunctionExpression(function) => function.id.is_none(),
52
+ Expression::ClassExpression(class) => class.id.is_none(),
53
+ Expression::ArrowFunctionExpression(_) => true,
54
+ _ => false,
62
55
  }
63
56
  }
64
57
 
65
- /// A statement evaluating an expression taken out of a larger one.
66
- fn expression_statement(expression: Box<Expr>) -> Stmt {
67
- guard_directive(ast::expression_statement(expression))
68
- }
69
-
70
- /// Wrap newly exposed string statements in a block so they cannot become function or script
71
- /// directives.
72
- fn guard_directive(statement: Stmt) -> Stmt {
73
- if is_string_statement(&statement) {
74
- ast::block(vec![statement])
75
- } else {
76
- statement
58
+ impl<'a> Expand<'_, 'a> {
59
+ /// Wraps newly exposed string statements in a block so they cannot become directives.
60
+ fn statement(&self, expression: Expression<'a>) -> Statement<'a> {
61
+ let builder = &self.analysis.ast;
62
+ let span = expression.span();
63
+ let string = matches!(expression, Expression::StringLiteral(_));
64
+ let statement = ast::expression_statement(expression, builder);
65
+ if string {
66
+ Statement::new_block_statement(span, Vec::from_array_in([statement], builder), builder)
67
+ } else {
68
+ statement
69
+ }
77
70
  }
78
- }
79
-
80
- fn is_string_statement(statement: &Stmt) -> bool {
81
- matches!(
82
- statement,
83
- Stmt::Expr(statement) if matches!(&*statement.expr, Expr::Lit(Lit::Str(_)))
84
- )
85
- }
86
71
 
87
- /// Keeps sequences such as `name = (effects, function () {})`. Removing the sequence would give
88
- /// the function an inferred `.name` that the original did not have.
89
- fn ends_with_anonymous_function(expression: &Expr) -> bool {
90
- match expression {
91
- Expr::Paren(paren) => ends_with_anonymous_function(&paren.expr),
92
- Expr::Seq(sequence) => sequence
93
- .exprs
94
- .last()
95
- .is_some_and(|last| ends_with_anonymous_function(last)),
96
- Expr::Fn(function) => function.ident.is_none(),
97
- Expr::Class(class) => class.ident.is_none(),
98
- Expr::Arrow(_) => true,
99
- _ => false,
72
+ /// Moves leading sequence operands into `prefix` as statements and returns the final value.
73
+ /// Callers use this only where lifting operands preserves evaluation order.
74
+ fn split(
75
+ &mut self,
76
+ expression: Expression<'a>,
77
+ prefix: &mut Vec<'a, Statement<'a>>,
78
+ ) -> Expression<'a> {
79
+ match expression {
80
+ Expression::ParenthesizedExpression(parenthesized) => {
81
+ self.changed = true;
82
+ self.split(parenthesized.unbox().expression, prefix)
83
+ }
84
+ Expression::SequenceExpression(sequence) => {
85
+ let mut expressions = sequence.unbox().expressions;
86
+ let last = expressions
87
+ .pop()
88
+ .expect("a JavaScript sequence is nonempty");
89
+ self.changed = true;
90
+ for expression in expressions {
91
+ let statement = self.statement(expression);
92
+ prefix.extend(self.expand(statement))
93
+ }
94
+ self.split(last, prefix)
95
+ }
96
+ expression => expression,
97
+ }
100
98
  }
101
- }
102
99
 
103
- impl ExpandStatements {
104
- /// Applies the same statement to either arm of a conditional value.
100
+ /// Turns a conditional into an `if` statement that applies `arm` to each branch.
105
101
  fn conditional(
106
102
  &mut self,
107
- conditional: CondExpr,
103
+ conditional: ConditionalExpression<'a>,
108
104
  span: Span,
109
- statement: impl Fn(Box<Expr>) -> Stmt,
110
- ) -> Stmt {
105
+ arm: Arm,
106
+ ) -> Statement<'a> {
107
+ let builder = &self.analysis.ast;
111
108
  self.changed = true;
112
- Stmt::If(IfStmt {
113
- span,
114
- test: conditional.test,
115
- cons: Box::new(ast::block(self.expand(statement(conditional.cons)))),
116
- alt: Some(Box::new(ast::block(
117
- self.expand(statement(conditional.alt)),
118
- ))),
119
- })
120
- }
121
-
122
- /// Moves sequence operands into statements only where evaluation order and values are
123
- /// preserved. Leaves commas in callees, assignment targets, and loop tests or updates in
124
- /// place.
125
- fn split_sequence(&mut self, mut expression: Box<Expr>) -> (Vec<Stmt>, Box<Expr>) {
126
- while let Expr::Paren(paren) = *expression {
127
- expression = paren.expr;
128
- self.changed = true;
129
- }
130
- if let Expr::Seq(sequence) = &mut *expression
131
- && let Some(last) = sequence.exprs.pop()
132
- {
133
- self.changed = true;
134
- let mut prefix = Vec::new();
135
- for expression in mem::take(&mut sequence.exprs) {
136
- prefix.extend(self.expand(expression_statement(expression)));
137
- }
138
- let (tail_prefix, last) = self.split_sequence(last);
139
- prefix.extend(tail_prefix);
140
- (prefix, last)
141
- } else {
142
- (vec![], expression)
143
- }
109
+ let mut branch = |expression| {
110
+ let statement = match arm {
111
+ Arm::Expression => self.statement(expression),
112
+ Arm::Return => Statement::new_return_statement(span, Some(expression), builder),
113
+ Arm::Throw => Statement::new_throw_statement(span, expression, builder),
114
+ };
115
+ Statement::new_block_statement(span, self.expand(statement), builder)
116
+ };
117
+ let consequent = branch(conditional.consequent);
118
+ let alternate = branch(conditional.alternate);
119
+ Statement::new_if_statement(span, conditional.test, consequent, Some(alternate), builder)
144
120
  }
145
121
 
146
- fn expand(&mut self, statement: Stmt) -> Vec<Stmt> {
147
- let mut prefix = Vec::new();
122
+ /// Lifts commas and conditional values only at safe statement positions. Member assignment
123
+ /// receivers and keys, compound assignments, callees, loop tests, and loop updates keep their
124
+ /// original evaluation sites. Variable initializers also retain earlier lexical initialization.
125
+ fn expand(&mut self, statement: Statement<'a>) -> Vec<'a, Statement<'a>> {
126
+ let builder = &self.analysis.ast;
127
+ let mut prefix = Vec::new_in(builder);
148
128
  let mut statement = match statement {
149
- // A string statement stays as written: it may be a directive.
150
- statement if is_string_statement(&statement) => return vec![statement],
151
- Stmt::Expr(mut statement) => {
152
- (prefix, statement.expr) = self.split_sequence(statement.expr);
153
- // `name = (first(), value)` evaluates `first()` before the store, and a
154
- // plain identifier target has nothing to evaluate ahead of it.
155
- if let Expr::Assign(assignment) = &mut *statement.expr
156
- && assignment.op == AssignOp::Assign
157
- && assignment.left.as_ident().is_some()
158
- && !ends_with_anonymous_function(&assignment.right)
129
+ Statement::ExpressionStatement(statement)
130
+ if matches!(statement.expression, Expression::StringLiteral(_)) =>
131
+ {
132
+ return Vec::from_array_in([Statement::ExpressionStatement(statement)], builder);
133
+ }
134
+ Statement::ExpressionStatement(mut statement) => {
135
+ let expression = statement.expression.take_in(builder);
136
+ statement.expression = self.split(expression, &mut prefix);
137
+ if let Expression::AssignmentExpression(assignment) = &mut statement.expression
138
+ && assignment.operator == AssignmentOperator::Assign
139
+ && self.analysis.target_id(&assignment.left).is_some()
140
+ && !anonymous(&assignment.right)
159
141
  {
160
- let (effects, value) = self.split_sequence(assignment.right.take());
161
- prefix.extend(effects);
162
- assignment.right = value;
142
+ assignment.right = self.split(assignment.right.take_in(builder), &mut prefix);
163
143
  }
164
- match *statement.expr {
165
- Expr::Cond(conditional) => {
166
- self.conditional(conditional, statement.span, expression_statement)
144
+ let span = statement.span;
145
+ match statement.unbox().expression {
146
+ Expression::ConditionalExpression(conditional) => {
147
+ self.conditional(conditional.unbox(), span, Arm::Expression)
167
148
  }
168
- Expr::Bin(binary)
169
- if matches!(binary.op, BinaryOp::LogicalAnd | BinaryOp::LogicalOr) =>
149
+ Expression::LogicalExpression(logical)
150
+ if logical.operator != LogicalOperator::Coalesce =>
170
151
  {
171
152
  self.changed = true;
172
- let test = if binary.op == BinaryOp::LogicalOr {
173
- Box::new(Expr::Unary(UnaryExpr {
174
- span: binary.span,
175
- op: UnaryOp::Bang,
176
- arg: binary.left,
177
- }))
178
- } else {
179
- binary.left
153
+ let logical = logical.unbox();
154
+ let test = match logical.operator {
155
+ LogicalOperator::Or => Expression::new_unary_expression(
156
+ logical.span,
157
+ UnaryOperator::LogicalNot,
158
+ logical.left,
159
+ builder,
160
+ ),
161
+ _ => logical.left,
180
162
  };
181
- Stmt::If(IfStmt {
182
- span: statement.span,
183
- test,
184
- cons: Box::new(ast::block(
185
- self.expand(expression_statement(binary.right)),
186
- )),
187
- alt: None,
188
- })
189
- }
190
- // Splitting or removing parentheses can expose a string.
191
- expression => {
192
- statement.expr = Box::new(expression);
193
- guard_directive(Stmt::Expr(statement))
163
+ let body = self.statement(logical.right);
164
+ let body = Statement::new_block_statement(span, self.expand(body), builder);
165
+ Statement::new_if_statement(span, test, body, None, builder)
194
166
  }
167
+ expression => self.statement(expression),
195
168
  }
196
169
  }
197
- Stmt::Return(mut statement) => {
198
- let Some(argument) = statement.arg.take() else {
199
- return vec![Stmt::Return(statement)];
200
- };
201
- let (effects, argument) = self.split_sequence(argument);
202
- prefix = effects;
203
- match *argument {
204
- Expr::Cond(conditional) => {
205
- self.conditional(conditional, statement.span, |arg| {
206
- Stmt::Return(ReturnStmt {
207
- span: statement.span,
208
- arg: Some(arg),
209
- })
210
- })
170
+ Statement::ReturnStatement(mut statement) => {
171
+ let argument = statement.argument.take();
172
+ match argument.map(|argument| self.split(argument, &mut prefix)) {
173
+ Some(Expression::ConditionalExpression(conditional)) => {
174
+ self.conditional(conditional.unbox(), statement.span, Arm::Return)
211
175
  }
212
- Expr::Unary(unary) if unary.op == UnaryOp::Void => {
176
+ Some(Expression::UnaryExpression(unary))
177
+ if unary.operator == UnaryOperator::Void =>
178
+ {
213
179
  self.changed = true;
214
- prefix.extend(self.expand(expression_statement(unary.arg)));
215
- Stmt::Return(statement)
180
+ let effect = self.statement(unary.unbox().argument);
181
+ prefix.extend(self.expand(effect));
182
+ Statement::ReturnStatement(statement)
216
183
  }
217
184
  argument => {
218
- statement.arg = Some(Box::new(argument));
219
- Stmt::Return(statement)
185
+ statement.argument = argument;
186
+ Statement::ReturnStatement(statement)
220
187
  }
221
188
  }
222
189
  }
223
- Stmt::Throw(mut statement) => {
224
- (prefix, statement.arg) = self.split_sequence(statement.arg);
225
- if let Expr::Cond(conditional) = *statement.arg {
226
- self.conditional(conditional, statement.span, |arg| {
227
- Stmt::Throw(ThrowStmt {
228
- span: statement.span,
229
- arg,
230
- })
231
- })
232
- } else {
233
- Stmt::Throw(statement)
190
+ Statement::ThrowStatement(mut statement) => {
191
+ match self.split(statement.argument.take_in(builder), &mut prefix) {
192
+ Expression::ConditionalExpression(conditional) => {
193
+ self.conditional(conditional.unbox(), statement.span, Arm::Throw)
194
+ }
195
+ argument => {
196
+ statement.argument = argument;
197
+ Statement::ThrowStatement(statement)
198
+ }
234
199
  }
235
200
  }
236
- Stmt::Switch(mut statement) => {
237
- (prefix, statement.discriminant) = self.split_sequence(statement.discriminant);
238
- Stmt::Switch(statement)
201
+ Statement::SwitchStatement(mut statement) => {
202
+ let discriminant = statement.discriminant.take_in(builder);
203
+ statement.discriminant = self.split(discriminant, &mut prefix);
204
+ Statement::SwitchStatement(statement)
239
205
  }
240
- // In `var name = (first(), value)`, `first()` runs before the value is stored. Moving
241
- // it before earlier uninitialized `var` declarations is safe because those declarations
242
- // do nothing: `var a, b = (a = f(), v)`. This would be unsafe with `let` or `const`,
243
- // because `a` would not yet be initialized.
244
- Stmt::Decl(Decl::Var(mut declaration)) => {
245
- let storing = match declaration.kind {
246
- VarDeclKind::Var => declaration
247
- .decls
206
+ Statement::VariableDeclaration(mut declaration) => {
207
+ let first = match declaration.kind {
208
+ VariableDeclarationKind::Var => declaration
209
+ .declarations
248
210
  .iter()
249
211
  .position(|declarator| declarator.init.is_some()),
250
- VarDeclKind::Let | VarDeclKind::Const => Some(0),
212
+ _ => Some(0),
251
213
  };
252
- if let Some(declarator) = storing.and_then(|at| declaration.decls.get_mut(at))
253
- && let Some(init) = &mut declarator.init
254
- && !ends_with_anonymous_function(init)
214
+ let declarations = &mut declaration.declarations;
215
+ if let Some(declarator) = first.and_then(|first| declarations.get_mut(first))
216
+ && let Some(init) = declarator.init.take_if(|init| !anonymous(init))
255
217
  {
256
- (prefix, *init) = self.split_sequence(init.take());
218
+ declarator.init = Some(self.split(init, &mut prefix))
257
219
  }
258
- Stmt::Decl(Decl::Var(declaration))
220
+ Statement::VariableDeclaration(declaration)
259
221
  }
260
- Stmt::For(mut statement) => {
261
- statement.init = match statement.init.take() {
262
- Some(VarDeclOrExpr::Expr(initializer)) => {
263
- self.changed = true;
264
- prefix.extend(self.expand(expression_statement(initializer)));
265
- None
266
- }
267
- initializer => initializer,
268
- };
269
- Stmt::For(statement)
222
+ Statement::ForStatement(mut statement) => {
223
+ if let Some(init) = statement.init.take_if(|init| init.is_expression()) {
224
+ let init = self.statement(init.into_expression());
225
+ prefix.extend(self.expand(init));
226
+ self.changed = true
227
+ }
228
+ Statement::ForStatement(statement)
270
229
  }
271
230
  statement => statement,
272
231
  };
273
- // Conditions created above can themselves have a comma prefix.
274
- if let Stmt::If(conditional) = &mut statement {
275
- let (effects, test) = self.split_sequence(conditional.test.take());
276
- prefix.extend(effects);
277
- conditional.test = test;
232
+ if let Statement::IfStatement(statement) = &mut statement {
233
+ statement.test = self.split(statement.test.take_in(builder), &mut prefix)
278
234
  }
279
235
  prefix.push(statement);
280
236
  prefix
281
237
  }
282
238
  }
283
239
 
240
+ impl<'a> VisitMut<'a> for Expand<'_, 'a> {
241
+ fn visit_statements(&mut self, statements: &mut Vec<'a, Statement<'a>>) {
242
+ let mut expanded = Vec::new_in(&self.analysis.ast);
243
+ for mut statement in statements.take_in(&self.analysis.ast) {
244
+ walk_mut::walk_statement(self, &mut statement);
245
+ expanded.extend(self.expand(statement));
246
+ }
247
+ *statements = expanded;
248
+ }
249
+
250
+ fn visit_statement(&mut self, statement: &mut Statement<'a>) {
251
+ walk_mut::walk_statement(self, statement);
252
+ let builder = &self.analysis.ast;
253
+ let mut expanded = self.expand(statement.take_in(builder));
254
+ *statement = if expanded.len() == 1 {
255
+ expanded.pop().expect("one statement")
256
+ } else {
257
+ Statement::new_block_statement(SPAN, expanded, builder)
258
+ }
259
+ }
260
+
261
+ /// Keeps a labeled loop directly under its label, so lifted statements cannot break
262
+ /// `continue label`.
263
+ fn visit_labeled_statement(&mut self, statement: &mut LabeledStatement<'a>) {
264
+ if let Statement::LabeledStatement(nested) = &mut statement.body {
265
+ self.visit_labeled_statement(nested)
266
+ } else {
267
+ walk_mut::walk_statement(self, &mut statement.body)
268
+ }
269
+ }
270
+ }
271
+
284
272
  #[cfg(test)]
285
273
  mod tests {
286
274
  use crate::deobfuscate::testing;
287
275
 
288
276
  #[test]
289
277
  fn expands_sequences_conditionals_and_void_returns() {
290
- let transform = |source: &str| testing::rewrite(source, super::run, /* fix= */ true);
278
+ let transform = |source: &str| testing::rewrite(source, super::run);
291
279
  let output = transform(
292
280
  "function f(flag) { first(), second(); flag && (third(), fourth()); \
293
281
  flag || fallback(); return before(), flag ? (yes(), result()) : void no(); }",
294
282
  );
295
283
  testing::assert_contains(
296
284
  &output,
297
- &["if (flag)", "if (!flag)", "return result();"],
298
- &["first(); second();", "no(); return;"],
285
+ &[
286
+ "if (flag)",
287
+ "if (!flag)",
288
+ "return result();",
289
+ "first(); second();",
290
+ "no(); return;",
291
+ ],
299
292
  );
300
293
  testing::assert_lacks(&output, &["&&", " ? "]);
301
294
  let output = transform(
@@ -305,13 +298,17 @@ mod tests {
305
298
  );
306
299
  testing::assert_contains(
307
300
  &output,
308
- &["throw one;", "throw two;"],
309
- &["before(); if (flag)", "select(); switch(flag)"],
301
+ &[
302
+ "throw one;",
303
+ "throw two;",
304
+ "before(); if (flag)",
305
+ "select(); switch(flag)",
306
+ ],
310
307
  );
311
308
  assert!(!output.contains("throw prepare()"), "{output}");
312
309
  // A single-statement body expands without changing which `if` an `else` binds to.
313
310
  let output = transform("function f(a, b) { if (a) b ? yes() : no(); else other(); }");
314
- testing::assert_contains(&output, &["if (a)", "if (b)"], &[]);
311
+ testing::assert_contains(&output, &["if (a)", "if (b)"]);
315
312
  assert_eq!(output.matches("else").count(), 2, "{output}");
316
313
  assert!(!output.contains('?'), "{output}");
317
314
  assert_eq!(transform(&output), output);
@@ -319,7 +316,7 @@ mod tests {
319
316
 
320
317
  #[test]
321
318
  fn preserves_evaluation_order_frequency_labels_and_references() {
322
- let transform = |source: &str| testing::rewrite(source, super::run, /* fix= */ true);
319
+ let transform = |source: &str| testing::rewrite(source, super::run);
323
320
  // Only sequences assigned to identifiers are lifted out of assignments.
324
321
  let output = transform(
325
322
  "function f(a, b, obj) { a = (b = obj.x, first(), b + 1); \
@@ -334,8 +331,6 @@ mod tests {
334
331
  "obj[key()] = (effect(), value)",
335
332
  "obj.y = (effect(), value)",
336
333
  "a += (effect(), 1)",
337
- ],
338
- &[
339
334
  "effect(); a = function named() {}",
340
335
  "b = obj.x; first(); a = b + 1;",
341
336
  ],
@@ -347,8 +342,11 @@ mod tests {
347
342
  );
348
343
  testing::assert_contains(
349
344
  &output,
350
- &["w = (third(), more)", "g = (effect(), function() {})"],
351
- &["first(); if (flag) { second(); } var v = value"],
345
+ &[
346
+ "w = (third(), more)",
347
+ "g = (effect(), function() {})",
348
+ "first(); if (flag) { second(); } var v = value",
349
+ ],
352
350
  );
353
351
  // Earlier uninitialized `var` declarations have no effect.
354
352
  let output = transform(
@@ -356,8 +354,10 @@ mod tests {
356
354
  );
357
355
  testing::assert_contains(
358
356
  &output,
359
- &["d = (c = second(), other)"],
360
- &["a = first(); var a, b = value;"],
357
+ &[
358
+ "d = (c = second(), other)",
359
+ "a = first(); var a, b = value;",
360
+ ],
361
361
  );
362
362
  let output = transform(
363
363
  "function f() { for (start(), setup(); test(), ready; tick(), step()) body(); \
@@ -374,8 +374,8 @@ mod tests {
374
374
  "for(let i = 0;",
375
375
  "while(poll(), ready)",
376
376
  "while (poll(), ready)",
377
+ "start(); setup();",
377
378
  ],
378
- &["start(); setup();"],
379
379
  );
380
380
  let output = transform(
381
381
  r#"function f() { (0, obj.method)(); (0, eval)("x");
@@ -387,6 +387,6 @@ mod tests {
387
387
  "consume(first(), (second(), third()))",
388
388
  "return left && right;",
389
389
  ];
390
- testing::assert_contains(&output, &expected, &[]);
390
+ testing::assert_contains(&output, &expected);
391
391
  }
392
392
  }