cfsolve 0.1.2 → 0.1.4

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 (395) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +22 -0
  3. data/README.md +8 -3
  4. data/THIRD_PARTY_LICENSES/README.md +71 -254
  5. data/THIRD_PARTY_LICENSES/{derive_builder_macro-0.20.2/LICENSE-APACHE → bytecount-0.6.9/LICENSE.Apache2} +0 -1
  6. data/THIRD_PARTY_LICENSES/{darling-0.20.11/LICENSE → bytecount-0.6.9/LICENSE.MIT} +1 -3
  7. data/THIRD_PARTY_LICENSES/{ident_case-1.0.1/LICENSE → cobs-0.3.0/LICENSE-MIT} +1 -1
  8. data/THIRD_PARTY_LICENSES/cow-utils-0.1.3/LICENSE +21 -0
  9. data/THIRD_PARTY_LICENSES/{hashbrown-0.14.5 → embedded-io-0.4.0}/LICENSE-MIT +1 -1
  10. data/THIRD_PARTY_LICENSES/{ahash-0.8.12 → embedded-io-0.6.1}/LICENSE-MIT +1 -1
  11. data/THIRD_PARTY_LICENSES/{browserslist-data-0.1.4 → escape-simd-0.1.1}/LICENSE +1 -1
  12. data/THIRD_PARTY_LICENSES/escape-simd-0.1.1/NOTICE +62 -0
  13. data/THIRD_PARTY_LICENSES/json-escape-simd-3.1.3/LICENSE +21 -0
  14. data/THIRD_PARTY_LICENSES/{miette-7.6.0/LICENSE → json-escape-simd-3.1.3/LICENSE-APACHE} +0 -1
  15. data/THIRD_PARTY_LICENSES/json-escape-simd-3.1.3/NOTICE +62 -0
  16. data/THIRD_PARTY_LICENSES/memchr-2.8.3/UNLICENSE +24 -0
  17. data/THIRD_PARTY_LICENSES/{derive_builder_core-0.20.2 → nonmax-0.5.5}/LICENSE-APACHE +1 -2
  18. data/THIRD_PARTY_LICENSES/{dashmap-5.5.3/LICENSE → nonmax-0.5.5/LICENSE-MIT} +2 -4
  19. data/THIRD_PARTY_LICENSES/{rand-0.8.5 → num-bigint-0.5.1}/LICENSE-MIT +0 -1
  20. data/THIRD_PARTY_LICENSES/oxc-0.157.0/LICENSE +22 -0
  21. data/THIRD_PARTY_LICENSES/oxc-0.157.0/THIRD-PARTY-LICENSE +763 -0
  22. data/THIRD_PARTY_LICENSES/{browserslist-rs-0.19.0 → oxc-browserslist-5.0.1}/LICENSE +1 -0
  23. data/THIRD_PARTY_LICENSES/oxc_allocator-0.157.0/LICENSE +22 -0
  24. data/THIRD_PARTY_LICENSES/oxc_allocator-0.157.0/THIRD-PARTY-LICENSE +763 -0
  25. data/THIRD_PARTY_LICENSES/oxc_ast-0.157.0/LICENSE +22 -0
  26. data/THIRD_PARTY_LICENSES/oxc_ast-0.157.0/THIRD-PARTY-LICENSE +763 -0
  27. data/THIRD_PARTY_LICENSES/oxc_ast_macros-0.157.0/LICENSE +22 -0
  28. data/THIRD_PARTY_LICENSES/oxc_ast_macros-0.157.0/THIRD-PARTY-LICENSE +763 -0
  29. data/THIRD_PARTY_LICENSES/oxc_ast_visit-0.157.0/LICENSE +22 -0
  30. data/THIRD_PARTY_LICENSES/oxc_ast_visit-0.157.0/THIRD-PARTY-LICENSE +763 -0
  31. data/THIRD_PARTY_LICENSES/oxc_codegen-0.157.0/LICENSE +22 -0
  32. data/THIRD_PARTY_LICENSES/oxc_codegen-0.157.0/THIRD-PARTY-LICENSE +763 -0
  33. data/THIRD_PARTY_LICENSES/oxc_compat-0.157.0/LICENSE +22 -0
  34. data/THIRD_PARTY_LICENSES/oxc_compat-0.157.0/THIRD-PARTY-LICENSE +763 -0
  35. data/THIRD_PARTY_LICENSES/oxc_data_structures-0.157.0/LICENSE +22 -0
  36. data/THIRD_PARTY_LICENSES/oxc_data_structures-0.157.0/THIRD-PARTY-LICENSE +763 -0
  37. data/THIRD_PARTY_LICENSES/oxc_diagnostics-0.157.0/LICENSE +22 -0
  38. data/THIRD_PARTY_LICENSES/oxc_diagnostics-0.157.0/THIRD-PARTY-LICENSE +763 -0
  39. data/THIRD_PARTY_LICENSES/oxc_ecmascript-0.157.0/LICENSE +22 -0
  40. data/THIRD_PARTY_LICENSES/oxc_ecmascript-0.157.0/THIRD-PARTY-LICENSE +763 -0
  41. data/THIRD_PARTY_LICENSES/oxc_estree-0.157.0/LICENSE +22 -0
  42. data/THIRD_PARTY_LICENSES/oxc_estree-0.157.0/THIRD-PARTY-LICENSE +763 -0
  43. data/THIRD_PARTY_LICENSES/oxc_index-5.0.0/LICENSE +22 -0
  44. data/THIRD_PARTY_LICENSES/oxc_parser-0.157.0/LICENSE +22 -0
  45. data/THIRD_PARTY_LICENSES/oxc_parser-0.157.0/THIRD-PARTY-LICENSE +763 -0
  46. data/THIRD_PARTY_LICENSES/oxc_regular_expression-0.157.0/LICENSE +22 -0
  47. data/THIRD_PARTY_LICENSES/oxc_regular_expression-0.157.0/THIRD-PARTY-LICENSE +763 -0
  48. data/THIRD_PARTY_LICENSES/oxc_semantic-0.157.0/LICENSE +22 -0
  49. data/THIRD_PARTY_LICENSES/oxc_semantic-0.157.0/THIRD-PARTY-LICENSE +763 -0
  50. data/THIRD_PARTY_LICENSES/oxc_span-0.157.0/LICENSE +22 -0
  51. data/THIRD_PARTY_LICENSES/oxc_span-0.157.0/THIRD-PARTY-LICENSE +763 -0
  52. data/THIRD_PARTY_LICENSES/oxc_str-0.157.0/LICENSE +22 -0
  53. data/THIRD_PARTY_LICENSES/oxc_str-0.157.0/THIRD-PARTY-LICENSE +763 -0
  54. data/THIRD_PARTY_LICENSES/oxc_syntax-0.157.0/LICENSE +22 -0
  55. data/THIRD_PARTY_LICENSES/oxc_syntax-0.157.0/THIRD-PARTY-LICENSE +763 -0
  56. data/THIRD_PARTY_LICENSES/{fixedbitset-0.5.7 → postcard-1.1.3}/LICENSE-MIT +1 -1
  57. data/THIRD_PARTY_LICENSES/{bytes-str-0.2.7/LICENSE → self_cell-1.3.0/LICENSE-APACHE} +1 -2
  58. data/THIRD_PARTY_LICENSES/self_cell-1.3.0/LICENSE-GPLv2 +339 -0
  59. data/THIRD_PARTY_LICENSES/{darling_core-0.20.11 → smawk-0.3.3}/LICENSE +1 -1
  60. data/UPSTREAM.md +14 -6
  61. data/ext/cfsolve/Cargo.lock +534 -1727
  62. data/ext/cfsolve/Cargo.toml +4 -0
  63. data/ext/cfsolve/src/main.rs +1 -1
  64. data/lib/cfsolve/profiles/chrome-157-macos/answers.json +4777 -0
  65. data/lib/cfsolve/profiles/chrome-157-macos.json +613 -0
  66. data/lib/cfsolve/profiles/safari-26-ios/answers.json +266 -265
  67. data/lib/cfsolve/profiles/safari-26-ios/challenge-page-answers.json +312 -312
  68. data/lib/cfsolve/profiles/safari-26-ios.json +106 -152
  69. data/lib/cfsolve/version.rb +2 -2
  70. data/lib/cfsolve.rb +1 -1
  71. data/vendor/cfsolve/Cargo.lock +561 -1729
  72. data/vendor/cfsolve/Cargo.toml +26 -8
  73. data/vendor/cfsolve/README.md +57 -5
  74. data/vendor/cfsolve/examples/check_answers.rs +2 -2
  75. data/vendor/cfsolve/examples/compare_session.rs +1 -2
  76. data/vendor/cfsolve/examples/solver_profile.rs +84 -0
  77. data/vendor/cfsolve/examples/solver_smoke.rs +9 -8
  78. data/vendor/cfsolve/examples/stage2_snapshot.rs +2 -2
  79. data/vendor/cfsolve/examples/tls_echo.rs +3 -3
  80. data/vendor/cfsolve/examples/turnstile_smoke.rs +58 -0
  81. data/vendor/cfsolve/examples/vm_snapshot.rs +32 -33
  82. data/vendor/cfsolve/profiles/chrome-157-macos/answers.json +4777 -0
  83. data/vendor/cfsolve/profiles/chrome-157-macos.json +613 -0
  84. data/vendor/cfsolve/profiles/safari-26-ios/answers.json +266 -265
  85. data/vendor/cfsolve/profiles/safari-26-ios/challenge-page-answers.json +312 -312
  86. data/vendor/cfsolve/profiles/safari-26-ios.json +106 -152
  87. data/vendor/cfsolve/src/bin/capture-proxy/main.rs +3 -2
  88. data/vendor/cfsolve/src/bin/challenge/cli.rs +8 -2
  89. data/vendor/cfsolve/src/bin/challenge/main.rs +7 -2
  90. data/vendor/cfsolve/src/capture/proxy/tests.rs +1 -1
  91. data/vendor/cfsolve/src/capture/proxy.rs +44 -13
  92. data/vendor/cfsolve/src/capture/sessions.rs +4 -3
  93. data/vendor/cfsolve/src/capture/upstream.rs +1 -1
  94. data/vendor/cfsolve/src/challenge/codec.rs +4 -2
  95. data/vendor/cfsolve/src/challenge/expression.rs +161 -117
  96. data/vendor/cfsolve/src/challenge/installed/audit.rs +11 -10
  97. data/vendor/cfsolve/src/challenge/installed.rs +13 -6
  98. data/vendor/cfsolve/src/challenge/merge.rs +120 -80
  99. data/vendor/cfsolve/src/challenge/orchestrator.rs +57 -44
  100. data/vendor/cfsolve/src/challenge/payload.rs +69 -31
  101. data/vendor/cfsolve/src/challenge/program.rs +197 -178
  102. data/vendor/cfsolve/src/challenge/reduced_timing.rs +55 -40
  103. data/vendor/cfsolve/src/challenge/source.rs +151 -96
  104. data/vendor/cfsolve/src/challenge/state.rs +180 -148
  105. data/vendor/cfsolve/src/challenge/tally.rs +64 -50
  106. data/vendor/cfsolve/src/challenge.rs +1 -0
  107. data/vendor/cfsolve/src/deobfuscate/analysis/bindings.rs +187 -185
  108. data/vendor/cfsolve/src/deobfuscate/analysis/effects.rs +42 -51
  109. data/vendor/cfsolve/src/deobfuscate/analysis/hoisting.rs +147 -228
  110. data/vendor/cfsolve/src/deobfuscate/analysis/properties.rs +250 -425
  111. data/vendor/cfsolve/src/deobfuscate/analysis/unconditional.rs +79 -0
  112. data/vendor/cfsolve/src/deobfuscate/analysis.rs +259 -41
  113. data/vendor/cfsolve/src/deobfuscate/argument_arrays.rs +70 -73
  114. data/vendor/cfsolve/src/deobfuscate/arrow_blocks.rs +91 -104
  115. data/vendor/cfsolve/src/deobfuscate/ast.rs +383 -0
  116. data/vendor/cfsolve/src/deobfuscate/bitwise.rs +44 -54
  117. data/vendor/cfsolve/src/deobfuscate/blocks.rs +36 -29
  118. data/vendor/cfsolve/src/deobfuscate/call_helpers.rs +80 -131
  119. data/vendor/cfsolve/src/deobfuscate/control_flow.rs +239 -297
  120. data/vendor/cfsolve/src/deobfuscate/copy_propagation.rs +114 -135
  121. data/vendor/cfsolve/src/deobfuscate/dead_branches.rs +62 -61
  122. data/vendor/cfsolve/src/deobfuscate/dead_properties.rs +197 -214
  123. data/vendor/cfsolve/src/deobfuscate/dispatch.rs +238 -298
  124. data/vendor/cfsolve/src/deobfuscate/encoded_strings.rs +198 -203
  125. data/vendor/cfsolve/src/deobfuscate/function_lengths.rs +32 -38
  126. data/vendor/cfsolve/src/deobfuscate/helper_objects.rs +338 -513
  127. data/vendor/cfsolve/src/deobfuscate/hygiene.rs +197 -0
  128. data/vendor/cfsolve/src/deobfuscate/int32_helpers.rs +121 -155
  129. data/vendor/cfsolve/src/deobfuscate/literals.rs +116 -67
  130. data/vendor/cfsolve/src/deobfuscate/loops.rs +43 -43
  131. data/vendor/cfsolve/src/deobfuscate/memoized_strings.rs +127 -131
  132. data/vendor/cfsolve/src/deobfuscate/merged_functions.rs +262 -220
  133. data/vendor/cfsolve/src/deobfuscate/pipeline.rs +199 -244
  134. data/vendor/cfsolve/src/deobfuscate/register_arrays.rs +353 -327
  135. data/vendor/cfsolve/src/deobfuscate/removal.rs +83 -52
  136. data/vendor/cfsolve/src/deobfuscate/simplify.rs +147 -0
  137. data/vendor/cfsolve/src/deobfuscate/state_machines.rs +88 -110
  138. data/vendor/cfsolve/src/deobfuscate/statements.rs +228 -228
  139. data/vendor/cfsolve/src/deobfuscate/static_members.rs +46 -31
  140. data/vendor/cfsolve/src/deobfuscate/testing.rs +49 -59
  141. data/vendor/cfsolve/src/deobfuscate/unused_bindings.rs +92 -102
  142. data/vendor/cfsolve/src/deobfuscate.rs +15 -11
  143. data/vendor/cfsolve/src/embedding_page/extra_params.rs +132 -24
  144. data/vendor/cfsolve/src/embedding_page/page.rs +41 -1
  145. data/vendor/cfsolve/src/embedding_page/render_sample.rs +184 -147
  146. data/vendor/cfsolve/src/error.rs +40 -5
  147. data/vendor/cfsolve/src/fingerprint.rs +8 -2
  148. data/vendor/cfsolve/src/http/client.rs +7 -10
  149. data/vendor/cfsolve/src/http/requests.rs +2 -2
  150. data/vendor/cfsolve/src/js/ast.rs +479 -263
  151. data/vendor/cfsolve/src/lib.rs +1 -0
  152. data/vendor/cfsolve/src/listing/fold.rs +19 -9
  153. data/vendor/cfsolve/src/listing/query.rs +1 -47
  154. data/vendor/cfsolve/src/performance_clock.rs +20 -1
  155. data/vendor/cfsolve/src/profiling.rs +49 -0
  156. data/vendor/cfsolve/src/script.rs +35 -24
  157. data/vendor/cfsolve/src/session/challenge_page.rs +41 -21
  158. data/vendor/cfsolve/src/session/channel.rs +2 -2
  159. data/vendor/cfsolve/src/session/initial.rs +12 -11
  160. data/vendor/cfsolve/src/session/probes.rs +1 -0
  161. data/vendor/cfsolve/src/session/sink.rs +26 -1
  162. data/vendor/cfsolve/src/session/tests/challenge_page.rs +36 -1
  163. data/vendor/cfsolve/src/session.rs +1 -1
  164. data/vendor/cfsolve/src/solver.rs +3 -1
  165. data/vendor/cfsolve/src/stage2/analysis/analyze.rs +33 -4
  166. data/vendor/cfsolve/src/stage2/analysis/audit.rs +4 -2
  167. data/vendor/cfsolve/src/stage2/analysis/discovery.rs +13 -2
  168. data/vendor/cfsolve/src/stage2/analysis/envelope.rs +2 -1
  169. data/vendor/cfsolve/src/stage2/audit_globals.rs +142 -74
  170. data/vendor/cfsolve/src/stage2/benchmark.rs +113 -41
  171. data/vendor/cfsolve/src/stage2/call_stack.rs +1564 -1041
  172. data/vendor/cfsolve/src/stage2/challenge_page.rs +3 -2
  173. data/vendor/cfsolve/src/stage2/fixtures/encoded_benchmark_worker.js +1 -0
  174. data/vendor/cfsolve/src/stage2/interaction/checkbox.rs +202 -150
  175. data/vendor/cfsolve/src/stage2/interaction/click.rs +2 -2
  176. data/vendor/cfsolve/src/stage2/interaction/plan.rs +5 -4
  177. data/vendor/cfsolve/src/stage2/payload/recover.rs +2 -2
  178. data/vendor/cfsolve/src/stage2/probes/clock.rs +1 -3
  179. data/vendor/cfsolve/src/stage2/probes/dates.rs +44 -0
  180. data/vendor/cfsolve/src/stage2/probes/parent_info_array.rs +326 -0
  181. data/vendor/cfsolve/src/stage2/probes/performance.rs +12 -8
  182. data/vendor/cfsolve/src/stage2/probes/stack.rs +117 -4
  183. data/vendor/cfsolve/src/stage2/probes/websocket_echo.rs +80 -2
  184. data/vendor/cfsolve/src/stage2/probes.rs +1 -0
  185. data/vendor/cfsolve/src/stage2/queries.rs +50 -0
  186. data/vendor/cfsolve/src/stage2/reference.rs +5 -0
  187. data/vendor/cfsolve/src/stage2/registry.rs +8 -2
  188. data/vendor/cfsolve/src/stage2/replay.rs +34 -3
  189. data/vendor/cfsolve/src/stage2/stylesheets.rs +35 -0
  190. data/vendor/cfsolve/src/stage2/syntax.rs +88 -0
  191. data/vendor/cfsolve/src/stage2/trace.rs +134 -108
  192. data/vendor/cfsolve/src/stage2/value_labels.rs +185 -0
  193. data/vendor/cfsolve/src/stage2/vocabulary.rs +112 -17
  194. data/vendor/cfsolve/src/stage2.rs +3 -0
  195. data/vendor/cfsolve/src/vm/disassemble.rs +75 -7
  196. data/vendor/cfsolve/src/vm/dispatch.rs +93 -65
  197. data/vendor/cfsolve/src/vm/encoded_names.rs +635 -0
  198. data/vendor/cfsolve/src/vm/extract.rs +550 -250
  199. data/vendor/cfsolve/src/vm/fixtures/free_functions/README.md +9 -0
  200. data/vendor/cfsolve/src/vm/fixtures/free_functions/machine.js +7438 -0
  201. data/vendor/cfsolve/src/vm/fixtures/free_functions/program.base64 +1 -0
  202. data/vendor/cfsolve/src/vm/interpret/access.rs +71 -50
  203. data/vendor/cfsolve/src/vm/interpret/builtin.rs +10 -10
  204. data/vendor/cfsolve/src/vm/interpret/call.rs +116 -52
  205. data/vendor/cfsolve/src/vm/interpret/compile.rs +79 -62
  206. data/vendor/cfsolve/src/vm/interpret/copies.rs +2 -2
  207. data/vendor/cfsolve/src/vm/interpret/evaluate/tests.rs +63 -42
  208. data/vendor/cfsolve/src/vm/interpret/evaluate.rs +65 -575
  209. data/vendor/cfsolve/src/vm/interpret/explore.rs +7 -10
  210. data/vendor/cfsolve/src/vm/interpret/formula.rs +131 -0
  211. data/vendor/cfsolve/src/vm/interpret/frozen.rs +3 -5
  212. data/vendor/cfsolve/src/vm/interpret/intrinsic.rs +160 -58
  213. data/vendor/cfsolve/src/vm/interpret/mix32.rs +189 -0
  214. data/vendor/cfsolve/src/vm/interpret/native_dispatch.rs +220 -0
  215. data/vendor/cfsolve/src/vm/interpret/pattern.rs +1765 -0
  216. data/vendor/cfsolve/src/vm/interpret/plan.rs +586 -338
  217. data/vendor/cfsolve/src/vm/interpret/register_helpers.rs +392 -0
  218. data/vendor/cfsolve/src/vm/interpret/run.rs +120 -45
  219. data/vendor/cfsolve/src/vm/interpret/semantics.rs +71 -46
  220. data/vendor/cfsolve/src/vm/interpret/setup.rs +80 -45
  221. data/vendor/cfsolve/src/vm/interpret/string_decoder.rs +482 -0
  222. data/vendor/cfsolve/src/vm/interpret.rs +9 -1
  223. data/vendor/cfsolve/src/vm/machine.rs +116 -51
  224. data/vendor/cfsolve/src/vm/output.rs +19 -6
  225. data/vendor/cfsolve/src/vm/packed_names.rs +11 -7
  226. data/vendor/cfsolve/src/vm/registers.rs +35 -21
  227. data/vendor/cfsolve/src/vm/session.rs +189 -121
  228. data/vendor/cfsolve/src/vm/value.rs +22 -19
  229. data/vendor/cfsolve/src/vm.rs +3 -1
  230. data/vendor/cfsolve/vendor/btls-sys/Cargo.toml +3 -0
  231. data/vendor/cfsolve/vendor/btls-sys/build/main.rs +20 -0
  232. metadata +106 -178
  233. data/THIRD_PARTY_LICENSES/Inflector-0.11.4/LICENSE.md +0 -22
  234. data/THIRD_PARTY_LICENSES/arrayvec-0.7.6/LICENSE-MIT +0 -25
  235. data/THIRD_PARTY_LICENSES/ascii-1.1.0/LICENSE-APACHE +0 -201
  236. data/THIRD_PARTY_LICENSES/ascii-1.1.0/LICENSE-MIT +0 -22
  237. data/THIRD_PARTY_LICENSES/ast_node-5.0.0/LICENSE +0 -201
  238. data/THIRD_PARTY_LICENSES/better_scoped_tls-1.0.1/LICENSE +0 -201
  239. data/THIRD_PARTY_LICENSES/bitvec-1.0.1/LICENSE.txt +0 -21
  240. data/THIRD_PARTY_LICENSES/bstr-1.12.1/COPYING +0 -8
  241. data/THIRD_PARTY_LICENSES/bstr-1.12.1/LICENSE-MIT +0 -21
  242. data/THIRD_PARTY_LICENSES/cargo-platform-0.1.9/LICENSE-APACHE +0 -201
  243. data/THIRD_PARTY_LICENSES/cargo_metadata-0.19.2/LICENSE-MIT +0 -23
  244. data/THIRD_PARTY_LICENSES/darling_macro-0.20.11/LICENSE +0 -21
  245. data/THIRD_PARTY_LICENSES/debugid-0.8.0/LICENSE +0 -201
  246. data/THIRD_PARTY_LICENSES/derive_builder-0.20.2/LICENSE-MIT +0 -21
  247. data/THIRD_PARTY_LICENSES/derive_builder_core-0.20.2/LICENSE-MIT +0 -21
  248. data/THIRD_PARTY_LICENSES/derive_builder_macro-0.20.2/LICENSE-MIT +0 -21
  249. data/THIRD_PARTY_LICENSES/foldhash-0.1.5/LICENSE +0 -19
  250. data/THIRD_PARTY_LICENSES/from_variant-3.0.0/LICENSE +0 -201
  251. data/THIRD_PARTY_LICENSES/funty-2.0.0/LICENSE.txt +0 -21
  252. data/THIRD_PARTY_LICENSES/hashbrown-0.16.1/LICENSE-MIT +0 -25
  253. data/THIRD_PARTY_LICENSES/heck-0.5.0/LICENSE-APACHE +0 -201
  254. data/THIRD_PARTY_LICENSES/hermit-abi-0.5.2/LICENSE-APACHE +0 -201
  255. data/THIRD_PARTY_LICENSES/hermit-abi-0.5.2/LICENSE-MIT +0 -23
  256. data/THIRD_PARTY_LICENSES/hstr-3.0.3/LICENSE +0 -202
  257. data/THIRD_PARTY_LICENSES/if_chain-1.0.3/LICENSE-APACHE +0 -201
  258. data/THIRD_PARTY_LICENSES/if_chain-1.0.3/LICENSE-MIT +0 -25
  259. data/THIRD_PARTY_LICENSES/is-macro-0.3.7/LICENSE +0 -202
  260. data/THIRD_PARTY_LICENSES/itoa-1.0.17/LICENSE-MIT +0 -23
  261. data/THIRD_PARTY_LICENSES/jsonc-parser-0.26.3/LICENSE +0 -21
  262. data/THIRD_PARTY_LICENSES/lazy_static-1.5.0/LICENSE-APACHE +0 -201
  263. data/THIRD_PARTY_LICENSES/lazy_static-1.5.0/LICENSE-MIT +0 -25
  264. data/THIRD_PARTY_LICENSES/lru-0.16.2/LICENSE +0 -21
  265. data/THIRD_PARTY_LICENSES/memchr-2.7.6/COPYING +0 -3
  266. data/THIRD_PARTY_LICENSES/memchr-2.7.6/LICENSE-MIT +0 -21
  267. data/THIRD_PARTY_LICENSES/miette-derive-7.6.0/LICENSE +0 -229
  268. data/THIRD_PARTY_LICENSES/normpath-0.2.0/COPYRIGHT +0 -7
  269. data/THIRD_PARTY_LICENSES/normpath-0.2.0/LICENSE-MIT +0 -21
  270. data/THIRD_PARTY_LICENSES/normpath-0.2.0/LICENSE-THIRD-PARTY +0 -210
  271. data/THIRD_PARTY_LICENSES/num_cpus-1.17.0/LICENSE-APACHE +0 -201
  272. data/THIRD_PARTY_LICENSES/num_cpus-1.17.0/LICENSE-MIT +0 -20
  273. data/THIRD_PARTY_LICENSES/owo-colors-4.2.3/LICENSE +0 -21
  274. data/THIRD_PARTY_LICENSES/par-core-2.0.0/LICENSE +0 -202
  275. data/THIRD_PARTY_LICENSES/par-iter-2.0.0/LICENSE +0 -202
  276. data/THIRD_PARTY_LICENSES/path-clean-0.1.0/LICENSE-APACHE +0 -13
  277. data/THIRD_PARTY_LICENSES/path-clean-0.1.0/LICENSE-MIT +0 -18
  278. data/THIRD_PARTY_LICENSES/path-clean-1.0.1/LICENSE-APACHE +0 -13
  279. data/THIRD_PARTY_LICENSES/path-clean-1.0.1/LICENSE-MIT +0 -18
  280. data/THIRD_PARTY_LICENSES/pathdiff-0.2.3/LICENSE-APACHE +0 -201
  281. data/THIRD_PARTY_LICENSES/pathdiff-0.2.3/LICENSE-MIT +0 -23
  282. data/THIRD_PARTY_LICENSES/petgraph-0.7.1/LICENSE-APACHE +0 -201
  283. data/THIRD_PARTY_LICENSES/precomputed-map-0.2.0/LICENSE +0 -21
  284. data/THIRD_PARTY_LICENSES/preset_env_base-6.0.0/LICENSE +0 -201
  285. data/THIRD_PARTY_LICENSES/radium-0.7.0/LICENSE.txt +0 -21
  286. data/THIRD_PARTY_LICENSES/radix_fmt-1.0.0/LICENSE +0 -201
  287. data/THIRD_PARTY_LICENSES/rand-0.8.5/COPYRIGHT +0 -12
  288. data/THIRD_PARTY_LICENSES/rand-0.8.5/LICENSE-APACHE +0 -176
  289. data/THIRD_PARTY_LICENSES/rand_core-0.6.4/COPYRIGHT +0 -12
  290. data/THIRD_PARTY_LICENSES/rand_core-0.6.4/LICENSE-APACHE +0 -187
  291. data/THIRD_PARTY_LICENSES/rand_core-0.6.4/LICENSE-MIT +0 -26
  292. data/THIRD_PARTY_LICENSES/regress-0.10.5/LICENSE-APACHE +0 -201
  293. data/THIRD_PARTY_LICENSES/regress-0.10.5/LICENSE-MIT +0 -21
  294. data/THIRD_PARTY_LICENSES/ryu-1.0.22/LICENSE-APACHE +0 -176
  295. data/THIRD_PARTY_LICENSES/ryu-1.0.22/LICENSE-BOOST +0 -23
  296. data/THIRD_PARTY_LICENSES/scoped-tls-1.0.1/LICENSE-APACHE +0 -201
  297. data/THIRD_PARTY_LICENSES/scoped-tls-1.0.1/LICENSE-MIT +0 -25
  298. data/THIRD_PARTY_LICENSES/siphasher-0.3.11/COPYING +0 -7
  299. data/THIRD_PARTY_LICENSES/smallvec-1.15.1/LICENSE-APACHE +0 -201
  300. data/THIRD_PARTY_LICENSES/smartstring-1.0.1/LICENCE.md +0 -355
  301. data/THIRD_PARTY_LICENSES/st-map-0.2.4/LICENSE +0 -202
  302. data/THIRD_PARTY_LICENSES/static-map-macro-0.3.4/LICENSE +0 -202
  303. data/THIRD_PARTY_LICENSES/string_enum-1.0.2/LICENSE +0 -201
  304. data/THIRD_PARTY_LICENSES/strsim-0.11.1/LICENSE +0 -23
  305. data/THIRD_PARTY_LICENSES/swc-52.0.0/LICENSE +0 -201
  306. data/THIRD_PARTY_LICENSES/swc_allocator-4.0.1/LICENSE +0 -201
  307. data/THIRD_PARTY_LICENSES/swc_atoms-9.0.0/LICENSE +0 -201
  308. data/THIRD_PARTY_LICENSES/swc_common-18.0.1/LICENSE +0 -201
  309. data/THIRD_PARTY_LICENSES/swc_compiler_base-45.0.0/LICENSE +0 -201
  310. data/THIRD_PARTY_LICENSES/swc_config-3.1.2/LICENSE +0 -201
  311. data/THIRD_PARTY_LICENSES/swc_config_macro-1.0.1/LICENSE +0 -201
  312. data/THIRD_PARTY_LICENSES/swc_core-54.0.0/LICENSE +0 -201
  313. data/THIRD_PARTY_LICENSES/swc_ecma_ast-19.0.0/LICENSE +0 -201
  314. data/THIRD_PARTY_LICENSES/swc_ecma_codegen-21.0.0/LICENSE +0 -201
  315. data/THIRD_PARTY_LICENSES/swc_ecma_codegen_macros-2.0.2/LICENSE +0 -201
  316. data/THIRD_PARTY_LICENSES/swc_ecma_compat_bugfixes-39.0.0/LICENSE +0 -201
  317. data/THIRD_PARTY_LICENSES/swc_ecma_compat_common-30.0.0/LICENSE +0 -201
  318. data/THIRD_PARTY_LICENSES/swc_ecma_compat_es2015-39.0.0/LICENSE +0 -201
  319. data/THIRD_PARTY_LICENSES/swc_ecma_compat_es2016-35.0.0/LICENSE +0 -201
  320. data/THIRD_PARTY_LICENSES/swc_ecma_compat_es2017-35.0.0/LICENSE +0 -201
  321. data/THIRD_PARTY_LICENSES/swc_ecma_compat_es2018-36.0.0/LICENSE +0 -201
  322. data/THIRD_PARTY_LICENSES/swc_ecma_compat_es2019-35.0.0/LICENSE +0 -201
  323. data/THIRD_PARTY_LICENSES/swc_ecma_compat_es2020-37.0.0/LICENSE +0 -201
  324. data/THIRD_PARTY_LICENSES/swc_ecma_compat_es2021-35.0.0/LICENSE +0 -201
  325. data/THIRD_PARTY_LICENSES/swc_ecma_compat_es2022-37.0.0/LICENSE +0 -201
  326. data/THIRD_PARTY_LICENSES/swc_ecma_compat_es3-26.0.0/LICENSE +0 -201
  327. data/THIRD_PARTY_LICENSES/swc_ecma_ext_transforms-25.0.0/LICENSE +0 -201
  328. data/THIRD_PARTY_LICENSES/swc_ecma_hooks-0.3.0/LICENSE +0 -201
  329. data/THIRD_PARTY_LICENSES/swc_ecma_loader-18.0.0/LICENSE +0 -201
  330. data/THIRD_PARTY_LICENSES/swc_ecma_minifier-42.0.0/LICENSE +0 -201
  331. data/THIRD_PARTY_LICENSES/swc_ecma_parser-32.0.0/LICENSE +0 -201
  332. data/THIRD_PARTY_LICENSES/swc_ecma_preset_env-45.0.0/LICENSE +0 -201
  333. data/THIRD_PARTY_LICENSES/swc_ecma_transformer-6.0.0/LICENSE +0 -201
  334. data/THIRD_PARTY_LICENSES/swc_ecma_transforms-44.0.0/LICENSE +0 -201
  335. data/THIRD_PARTY_LICENSES/swc_ecma_transforms_base-35.0.0/LICENSE +0 -201
  336. data/THIRD_PARTY_LICENSES/swc_ecma_transforms_classes-35.0.0/LICENSE +0 -201
  337. data/THIRD_PARTY_LICENSES/swc_ecma_transforms_compat-40.0.0/LICENSE +0 -201
  338. data/THIRD_PARTY_LICENSES/swc_ecma_transforms_macros-1.0.1/LICENSE +0 -201
  339. data/THIRD_PARTY_LICENSES/swc_ecma_transforms_module-38.0.0/LICENSE +0 -201
  340. data/THIRD_PARTY_LICENSES/swc_ecma_transforms_optimization-37.0.0/LICENSE +0 -201
  341. data/THIRD_PARTY_LICENSES/swc_ecma_transforms_proposal-35.0.0/LICENSE +0 -201
  342. data/THIRD_PARTY_LICENSES/swc_ecma_transforms_react-38.0.0/LICENSE +0 -201
  343. data/THIRD_PARTY_LICENSES/swc_ecma_transforms_typescript-38.0.0/LICENSE +0 -201
  344. data/THIRD_PARTY_LICENSES/swc_ecma_usage_analyzer-27.0.0/LICENSE +0 -201
  345. data/THIRD_PARTY_LICENSES/swc_ecma_utils-25.0.0/LICENSE +0 -201
  346. data/THIRD_PARTY_LICENSES/swc_ecma_visit-19.0.0/LICENSE +0 -201
  347. data/THIRD_PARTY_LICENSES/swc_eq_ignore_macros-1.0.1/LICENSE +0 -201
  348. data/THIRD_PARTY_LICENSES/swc_error_reporters-20.0.0/LICENSE +0 -201
  349. data/THIRD_PARTY_LICENSES/swc_macros_common-1.0.1/LICENSE +0 -201
  350. data/THIRD_PARTY_LICENSES/swc_node_comments-18.0.0/LICENSE +0 -201
  351. data/THIRD_PARTY_LICENSES/swc_timer-1.0.0/LICENSE +0 -201
  352. data/THIRD_PARTY_LICENSES/swc_trace_macro-2.0.2/LICENSE +0 -201
  353. data/THIRD_PARTY_LICENSES/swc_transform_common-12.0.0/LICENSE +0 -201
  354. data/THIRD_PARTY_LICENSES/swc_visit-2.0.1/LICENSE +0 -201
  355. data/THIRD_PARTY_LICENSES/tap-1.0.1/LICENSE.txt +0 -21
  356. data/THIRD_PARTY_LICENSES/tracing-0.1.44/LICENSE +0 -25
  357. data/THIRD_PARTY_LICENSES/tracing-attributes-0.1.31/LICENSE +0 -25
  358. data/THIRD_PARTY_LICENSES/tracing-core-0.1.36/LICENSE +0 -25
  359. data/THIRD_PARTY_LICENSES/triomphe-0.1.15/LICENSE-APACHE +0 -201
  360. data/THIRD_PARTY_LICENSES/triomphe-0.1.15/LICENSE-MIT +0 -27
  361. data/THIRD_PARTY_LICENSES/unicode-width-0.1.14/LICENSE-APACHE +0 -201
  362. data/THIRD_PARTY_LICENSES/unicode-width-0.1.14/LICENSE-MIT +0 -25
  363. data/THIRD_PARTY_LICENSES/uuid-1.19.0/LICENSE-APACHE +0 -201
  364. data/THIRD_PARTY_LICENSES/uuid-1.19.0/LICENSE-MIT +0 -26
  365. data/THIRD_PARTY_LICENSES/vergen-9.0.6/LICENSE-APACHE +0 -201
  366. data/THIRD_PARTY_LICENSES/vergen-9.0.6/LICENSE-MIT +0 -25
  367. data/THIRD_PARTY_LICENSES/vergen-lib-0.1.6/LICENSE-APACHE +0 -201
  368. data/THIRD_PARTY_LICENSES/vergen-lib-0.1.6/LICENSE-MIT +0 -25
  369. data/THIRD_PARTY_LICENSES/wyz-0.5.1/LICENSE.txt +0 -21
  370. data/vendor/cfsolve/src/deobfuscate/analysis/globals.rs +0 -33
  371. data/vendor/cfsolve/src/deobfuscate/analysis/names.rs +0 -52
  372. /data/THIRD_PARTY_LICENSES/{derive_builder-0.20.2 → cobs-0.3.0}/LICENSE-APACHE +0 -0
  373. /data/THIRD_PARTY_LICENSES/{compact_str-0.7.1 → compact_str-0.10.0}/LICENSE +0 -0
  374. /data/THIRD_PARTY_LICENSES/{ahash-0.8.12 → embedded-io-0.4.0}/LICENSE-APACHE +0 -0
  375. /data/THIRD_PARTY_LICENSES/{arrayvec-0.7.6 → embedded-io-0.6.1}/LICENSE-APACHE +0 -0
  376. /data/THIRD_PARTY_LICENSES/{normpath-0.2.0 → escape-simd-0.1.1}/LICENSE-APACHE +0 -0
  377. /data/THIRD_PARTY_LICENSES/{bstr-1.12.1 → itertools-0.15.0}/LICENSE-APACHE +0 -0
  378. /data/THIRD_PARTY_LICENSES/{petgraph-0.7.1 → itertools-0.15.0}/LICENSE-MIT +0 -0
  379. /data/THIRD_PARTY_LICENSES/{itoa-1.0.17 → itoa-1.0.19}/LICENSE-APACHE +0 -0
  380. /data/THIRD_PARTY_LICENSES/{camino-1.2.2 → itoa-1.0.19}/LICENSE-MIT +0 -0
  381. /data/THIRD_PARTY_LICENSES/{globset-0.4.18 → memchr-2.8.3}/COPYING +0 -0
  382. /data/THIRD_PARTY_LICENSES/{globset-0.4.18 → memchr-2.8.3}/LICENSE-MIT +0 -0
  383. /data/THIRD_PARTY_LICENSES/{camino-1.2.2 → num-bigint-0.5.1}/LICENSE-APACHE +0 -0
  384. /data/THIRD_PARTY_LICENSES/{swc_sourcemap-9.3.4 → oxc_sourcemap-9.0.0}/LICENSE +0 -0
  385. /data/THIRD_PARTY_LICENSES/{phf-0.11.3 → phf-0.14.0}/LICENSE +0 -0
  386. /data/THIRD_PARTY_LICENSES/{phf_generator-0.11.3 → phf_generator-0.14.0}/LICENSE +0 -0
  387. /data/THIRD_PARTY_LICENSES/{phf_macros-0.11.3 → phf_macros-0.14.0}/LICENSE +0 -0
  388. /data/THIRD_PARTY_LICENSES/{phf_shared-0.11.3 → phf_shared-0.14.0}/LICENSE +0 -0
  389. /data/THIRD_PARTY_LICENSES/{fixedbitset-0.5.7 → postcard-1.1.3}/LICENSE-APACHE +0 -0
  390. /data/THIRD_PARTY_LICENSES/{hashbrown-0.14.5 → smallvec-1.16.5}/LICENSE-APACHE +0 -0
  391. /data/THIRD_PARTY_LICENSES/{smallvec-1.15.1 → smallvec-1.16.5}/LICENSE-MIT +0 -0
  392. /data/THIRD_PARTY_LICENSES/{unicode-width-0.1.14 → unicode-segmentation-1.13.3}/COPYRIGHT +0 -0
  393. /data/THIRD_PARTY_LICENSES/{hashbrown-0.16.1 → unicode-segmentation-1.13.3}/LICENSE-APACHE +0 -0
  394. /data/THIRD_PARTY_LICENSES/{heck-0.5.0 → unicode-segmentation-1.13.3}/LICENSE-MIT +0 -0
  395. /data/THIRD_PARTY_LICENSES/{cargo-platform-0.1.9 → zmij_ecma-1.0.23}/LICENSE-MIT +0 -0
@@ -6,19 +6,22 @@ use std::collections::{BTreeMap, HashMap};
6
6
 
7
7
  use anyhow::{Context, Result, bail, ensure};
8
8
  use indexmap::IndexMap;
9
- use serde::{Deserialize, Deserializer, Serialize};
10
- use swc_core::ecma::ast::{
11
- ArrowExpr, AssignExpr, AssignTarget, BinaryOp, CallExpr, Expr, FnDecl, Function, Id, IfStmt,
12
- MemberExpr, ObjectLit, SimpleAssignTarget, Stmt, VarDeclarator,
9
+ use oxc::ast::ast::{
10
+ ArrowFunctionExpression, AssignmentExpression, AssignmentTarget, BindingPattern,
11
+ CallExpression, Expression, Function, IfStatement, MemberExpression, ObjectExpression,
12
+ Statement, VariableDeclarator,
13
13
  };
14
- use swc_core::ecma::visit::{Visit, VisitWith};
14
+ use oxc::ast_visit::{Visit, walk};
15
+ use oxc::semantic::{ScopeFlags, SymbolId};
16
+ use oxc::syntax::operator::BinaryOperator;
17
+ use serde::{Deserialize, Deserializer, Serialize};
15
18
 
16
19
  use crate::candidates;
17
20
  use crate::challenge::payload::Field;
18
21
  use crate::challenge::reduced_timing::{self, ResourceTiming};
19
22
  use crate::challenge::tally::{self, CounterEvents, Tally};
20
23
  use crate::challenge::{expression, source};
21
- use crate::js::ast::{self, ParsedScript};
24
+ use crate::js::ast::{self, Binding, Script};
22
25
  use crate::js::{JsObject, JsValue, Options, Payload, json};
23
26
  use crate::resource_timing::LoadTiming;
24
27
 
@@ -47,7 +50,7 @@ pub struct Getter {
47
50
  pub option: String,
48
51
  /// The option holding the page origin, when the getter passes each render sample's stack
49
52
  /// through a helper that replaces URLs on that origin with indices (see
50
- /// [`crate::challenge::payload::split_page_urls`]).
53
+ /// `crate::challenge::payload::split_page_urls`).
51
54
  pub page_origin: Option<String>,
52
55
  }
53
56
 
@@ -165,22 +168,23 @@ fn unsigned<'de, D: Deserializer<'de>>(deserializer: D) -> Result<i64, D::Error>
165
168
  impl ScriptState {
166
169
  #[cfg(test)]
167
170
  pub(crate) fn from_javascript(javascript: &str) -> Result<Self> {
168
- let parsed = ast::parse_iframe_javascript(javascript)?;
169
- Self::from_parsed(&parsed, &source::bootstrap_options(&parsed))
171
+ let parsed = ast::ParsedScript::parse("t", javascript)?;
172
+ let script = parsed.script();
173
+ Self::from_script(script, &source::bootstrap_options(script))
170
174
  }
171
175
 
172
176
  /// Recovers the state of a parsed script, using bootstrap options to identify its payload
173
177
  /// template.
174
- pub(crate) fn from_parsed(parsed: &ParsedScript, options: &Options) -> Result<Self> {
175
- let script = &parsed.script;
178
+ pub(crate) fn from_script(script: Script<'_>, options: &Options) -> Result<Self> {
176
179
  let mut scopes = Scopes {
180
+ script,
177
181
  options,
178
182
  stack: Vec::new(),
179
183
  found: Vec::new(),
180
184
  };
181
- script.visit_with(&mut scopes);
182
- let mut sender = Sender::default();
183
- script.visit_with(&mut sender);
185
+ scopes.visit_program(script.program);
186
+ let mut sender = Sender::new(script);
187
+ sender.visit_program(script.program);
184
188
  let post_log = sender.post_log()?;
185
189
  let elapsed = candidates::at_most_one_distinct(sender.elapsed, "elapsed-time field")?;
186
190
  let sender_scope = elapsed.as_ref().map(|(scope, _)| *scope);
@@ -194,14 +198,14 @@ impl ScriptState {
194
198
  collected.into_iter().map(|(_, key)| key),
195
199
  "collected resource timing option",
196
200
  )?;
197
- let tallies = ast::in_declared_functions(script, |function| {
198
- tally::published_tally(function.function.body.as_ref()?)
201
+ let tallies = script.in_declared_functions(|function| {
202
+ tally::published_tally(script, function.body.as_ref()?)
199
203
  });
200
204
  let counters = candidates::at_most_one_distinct(tallies, "interaction tally")?;
201
205
  let timing = match collected {
202
206
  Some(option) => {
203
- let reductions = ast::in_declared_functions(script, |function| {
204
- reduced_timing::reduction(function.function.body.as_ref()?)
207
+ let reductions = script.in_declared_functions(|function| {
208
+ reduced_timing::reduction(script, function.body.as_ref()?)
205
209
  });
206
210
  candidates::at_most_one_distinct(reductions, "resource timing reducer")?
207
211
  .map(|fields| ResourceTiming { option, fields })
@@ -218,7 +222,7 @@ impl ScriptState {
218
222
  elapsed: elapsed.map(|(_, elapsed)| elapsed),
219
223
  forwarded: forwarded.into_iter().map(|(_, key)| key).collect(),
220
224
  timing,
221
- getters: distinct_getters(sender.getters, &sender.helpers)?,
225
+ getters: distinct_getters(script, sender.getters, &sender.helpers)?,
222
226
  post_log,
223
227
  })
224
228
  }
@@ -233,22 +237,19 @@ impl ScriptState {
233
237
  bail!("could not recover the iframe's input event counters: {reason}")
234
238
  }
235
239
 
236
- fn builds_payload(&self, option: &str) -> bool {
237
- self.marks
238
- .iter()
239
- .any(|mark| mark.option == option && mark.in_builder)
240
- }
241
-
242
240
  /// Identifies the interval measured by `difference`, using `merged` as the marked option.
243
241
  /// Returns no interval if the script never marks the later timestamp.
244
242
  fn span(&self, difference: &Difference, merged: Option<&str>) -> Option<Span> {
245
- let Difference { later, earlier } = difference;
246
- if !self.marks.iter().any(|mark| &mark.option == later) {
247
- return None;
248
- }
249
- Some(if self.builds_payload(later) {
243
+ // Whether any mark of the later timestamp is in the builder; `None` if it is never marked.
244
+ let in_builder = self
245
+ .marks
246
+ .iter()
247
+ .filter(|mark| mark.option == difference.later)
248
+ .map(|mark| mark.in_builder)
249
+ .max()?;
250
+ Some(if in_builder {
250
251
  Span::Collect
251
- } else if Some(earlier.as_str()) == merged {
252
+ } else if Some(difference.earlier.as_str()) == merged {
252
253
  Span::Handoff
253
254
  } else {
254
255
  Span::Initialise
@@ -341,7 +342,8 @@ enum Span {
341
342
  /// Groups timestamps by their innermost function and finds the function containing the payload
342
343
  /// template. A template in a nested callback may subtract timestamps set by different
343
344
  /// functions.
344
- struct Scopes<'options> {
345
+ struct Scopes<'options, 'a> {
346
+ script: Script<'a>,
345
347
  options: &'options Options,
346
348
  /// The enclosing functions, innermost last.
347
349
  stack: Vec<Scope>,
@@ -355,10 +357,10 @@ struct Scope {
355
357
  builds_payload: bool,
356
358
  }
357
359
 
358
- impl Scopes<'_> {
359
- fn within<N: VisitWith<Self>>(&mut self, node: &N) {
360
+ impl Scopes<'_, '_> {
361
+ fn within(&mut self, walk: impl FnOnce(&mut Self)) {
360
362
  self.stack.push(Scope::default());
361
- node.visit_children_with(self);
363
+ walk(self);
362
364
  let scope = self.stack.pop().expect("entered a scope first");
363
365
  let marks = scope.marks.into_iter().map(|option| Mark {
364
366
  option,
@@ -368,81 +370,85 @@ impl Scopes<'_> {
368
370
  }
369
371
  }
370
372
 
371
- impl Visit for Scopes<'_> {
372
- fn visit_function(&mut self, function: &Function) {
373
- self.within(function);
373
+ impl<'a> Visit<'a> for Scopes<'_, 'a> {
374
+ fn visit_function(&mut self, function: &Function<'a>, flags: ScopeFlags) {
375
+ self.within(|scopes| walk::walk_function(scopes, function, flags));
374
376
  }
375
377
 
376
- fn visit_arrow_expr(&mut self, arrow: &ArrowExpr) {
377
- self.within(arrow);
378
+ fn visit_arrow_function_expression(&mut self, arrow: &ArrowFunctionExpression<'a>) {
379
+ self.within(|scopes| walk::walk_arrow_function_expression(scopes, arrow));
378
380
  }
379
381
 
380
- fn visit_assign_expr(&mut self, assignment: &AssignExpr) {
382
+ fn visit_assignment_expression(&mut self, assignment: &AssignmentExpression<'a>) {
381
383
  if let Some(option) = expression::option_assignment(&assignment.left)
382
- && ast::is_date_now(&assignment.right)
384
+ && self.script.is_date_now(&assignment.right)
383
385
  && let Some(scope) = self.stack.last_mut()
384
386
  {
385
387
  scope.marks.push(option.to_owned());
386
388
  }
387
- assignment.visit_children_with(self);
389
+ walk::walk_assignment_expression(self, assignment);
388
390
  }
389
391
 
390
- fn visit_if_stmt(&mut self, conditional: &IfStmt) {
392
+ fn visit_if_statement(&mut self, conditional: &IfStatement<'a>) {
391
393
  let options = self.options;
392
394
  source::visit_taken_branches(self, conditional, options);
393
395
  }
394
396
 
395
- fn visit_object_lit(&mut self, object: &ObjectLit) {
397
+ fn visit_object_expression(&mut self, object: &ObjectExpression<'a>) {
396
398
  if source::is_payload_template(object, self.options)
397
399
  && let Some(scope) = self.stack.last_mut()
398
400
  {
399
401
  scope.builds_payload = true;
400
402
  }
401
- object.visit_children_with(self);
403
+ walk::walk_object_expression(self, object);
402
404
  }
403
405
  }
404
406
 
405
407
  /// Finds property writes that add payload fields or install namespace getters. Records the
406
408
  /// enclosing function for each write.
407
- #[derive(Default)]
408
- struct Sender {
409
+ struct Sender<'a> {
410
+ script: Script<'a>,
409
411
  entered: usize,
410
412
  scopes: Vec<usize>,
411
413
  elapsed: Vec<(usize, Elapsed)>,
412
414
  copies: Vec<(usize, String)>,
413
- getters: Vec<FoundGetter>,
415
+ getters: Vec<FoundGetter<'a>>,
414
416
  /// The first option each declared function reads, by binding.
415
- helpers: HashMap<Id, String>,
416
- pushes: Vec<Push>,
417
- entries: Vec<LogEntry>,
418
- stamps: Vec<Stamp>,
417
+ helpers: HashMap<SymbolId, String>,
418
+ pushes: Vec<Push<'a>>,
419
+ entries: Vec<LogEntry<'a>>,
420
+ stamps: Vec<Stamp<'a>>,
419
421
  }
420
422
 
421
423
  /// A namespace getter named `function` that returns the option `option`, rewriting each
422
424
  /// sample's stack with the declared function `rewrite`, if any.
423
- struct FoundGetter {
425
+ struct FoundGetter<'a> {
424
426
  function: String,
425
427
  option: String,
426
- rewrite: Option<Id>,
428
+ rewrite: Option<Binding<'a>>,
427
429
  }
428
430
 
429
431
  /// Finds `<sample>.s = <helper>(<sample>.s)`.
430
- #[derive(Default)]
431
- struct StackRewrite(Option<Id>);
432
+ struct StackRewrite<'a> {
433
+ script: Script<'a>,
434
+ helper: Option<Binding<'a>>,
435
+ }
432
436
 
433
- impl Visit for StackRewrite {
434
- fn visit_assign_expr(&mut self, assignment: &AssignExpr) {
435
- if let AssignTarget::Simple(SimpleAssignTarget::Member(target)) = &assignment.left
437
+ impl<'a> Visit<'a> for StackRewrite<'a> {
438
+ fn visit_assignment_expression(&mut self, assignment: &AssignmentExpression<'a>) {
439
+ if let Some(target) = assignment.left.as_member_expression()
436
440
  && ast::ident_property(target) == Some("s")
437
- && let Expr::Call(call) = &*assignment.right
438
- && let Some(helper) = call.callee.as_expr().and_then(|callee| callee.as_ident())
439
- && let [argument] = &call.args[..]
440
- && let Some(read) = argument.expr.as_member()
441
+ && let Expression::CallExpression(call) = &assignment.right
442
+ && let Expression::Identifier(helper) = &call.callee
443
+ && let [argument] = &call.arguments[..]
444
+ && let Some(read) = argument
445
+ .as_expression()
446
+ .and_then(Expression::as_member_expression)
441
447
  && ast::ident_property(read) == Some("s")
442
448
  {
443
- self.0 = Some(helper.to_id());
449
+ self.helper = Some(self.script.binding(helper));
444
450
  }
445
- assignment.visit_children_with(self);
451
+ walk::walk_assignment_expression(self, assignment);
446
452
  }
447
453
  }
448
454
 
@@ -450,35 +456,50 @@ impl Visit for StackRewrite {
450
456
  #[derive(Default)]
451
457
  struct OptionRead(Option<String>);
452
458
 
453
- impl Visit for OptionRead {
454
- fn visit_member_expr(&mut self, member: &MemberExpr) {
459
+ impl<'a> Visit<'a> for OptionRead {
460
+ fn visit_member_expression(&mut self, member: &MemberExpression<'a>) {
455
461
  if self.0.is_none()
456
- && expression::is_options(&member.obj)
457
- && let Some(option) = ast::member_str(&member.prop)
462
+ && expression::is_options(member.object())
463
+ && let Some(option) = ast::member_str(member)
458
464
  {
459
465
  self.0 = Some(option.to_owned());
460
466
  }
461
- member.visit_children_with(self);
467
+ walk::walk_member_expression(self, member);
462
468
  }
463
469
  }
464
470
 
465
471
  /// Matches `_cf_chl_opt.<log>.push(<local>)`.
466
- struct Push {
472
+ struct Push<'a> {
467
473
  log: String,
468
- local: String,
474
+ local: Binding<'a>,
469
475
  }
470
476
 
471
477
  /// Matches `<local>.<key> = <clock>()`.
472
- struct Stamp {
473
- local: String,
478
+ struct Stamp<'a> {
479
+ local: Binding<'a>,
474
480
  key: String,
475
481
  }
476
482
 
477
- impl Sender {
478
- fn within<N: VisitWith<Self>>(&mut self, node: &N) {
483
+ impl<'a> Sender<'a> {
484
+ fn new(script: Script<'a>) -> Self {
485
+ Self {
486
+ script,
487
+ entered: 0,
488
+ scopes: Vec::new(),
489
+ elapsed: Vec::new(),
490
+ copies: Vec::new(),
491
+ getters: Vec::new(),
492
+ helpers: HashMap::new(),
493
+ pushes: Vec::new(),
494
+ entries: Vec::new(),
495
+ stamps: Vec::new(),
496
+ }
497
+ }
498
+
499
+ fn within(&mut self, walk: impl FnOnce(&mut Self)) {
479
500
  self.entered += 1;
480
501
  self.scopes.push(self.entered);
481
- node.visit_children_with(self);
502
+ walk(self);
482
503
  self.scopes.pop();
483
504
  }
484
505
 
@@ -506,107 +527,114 @@ impl Sender {
506
527
 
507
528
  /// Finds a local initialized with a POST log entry: `{ url: new URL(...).href, count:
508
529
  /// _cf_chl_opt.<counter>, sent: clock() }`.
509
- struct LogEntry {
510
- local: String,
530
+ struct LogEntry<'a> {
531
+ local: Binding<'a>,
511
532
  fields: Vec<(String, Logged)>,
512
533
  counter: String,
513
534
  }
514
535
 
515
- impl LogEntry {
516
- fn read(local: &str, value: &Expr) -> Option<Self> {
517
- let Expr::Object(object) = value.unwrap_parens() else {
536
+ impl<'a> LogEntry<'a> {
537
+ fn read(local: Binding<'a>, value: &Expression<'_>) -> Option<Self> {
538
+ let Expression::ObjectExpression(object) = value.without_parentheses() else {
518
539
  return None;
519
540
  };
520
541
  let mut fields = Vec::new();
521
542
  let mut counter = None;
522
543
  for property in ast::key_values(object) {
523
- let value = property.value.unwrap_parens();
544
+ let value = property.value.without_parentheses();
524
545
  let logged = if let Some(option) = expression::option_key(value) {
525
546
  counter = Some(option.to_owned());
526
547
  Logged::Count
527
- } else if value.as_call().is_some_and(|call| call.args.is_empty()) {
548
+ } else if matches!(value, Expression::CallExpression(call) if call.arguments.is_empty())
549
+ {
528
550
  Logged::Sent
529
- } else if let Expr::Member(member) = value
530
- && ast::member_str(&member.prop) == Some("href")
531
- && member.obj.unwrap_parens().is_new()
551
+ } else if let Some(member) = value.as_member_expression()
552
+ && ast::member_str(member) == Some("href")
553
+ && matches!(
554
+ member.object().without_parentheses(),
555
+ Expression::NewExpression(_)
556
+ )
532
557
  {
533
558
  Logged::Url
534
559
  } else {
535
560
  return None;
536
561
  };
537
- fields.push((ast::key_str(&property.key)?.to_owned(), logged));
562
+ fields.push((
563
+ ast::key_str(&property.key, property.computed)?.to_owned(),
564
+ logged,
565
+ ));
538
566
  }
539
567
  let complete = fields.len() == 3
540
568
  && [Logged::Url, Logged::Count, Logged::Sent]
541
569
  .iter()
542
570
  .all(|logged| fields.iter().any(|(_, field)| field == logged));
543
571
  complete.then_some(Self {
544
- local: local.to_owned(),
572
+ local,
545
573
  fields,
546
574
  counter: counter?,
547
575
  })
548
576
  }
549
577
  }
550
578
 
551
- impl Visit for Sender {
552
- fn visit_function(&mut self, function: &Function) {
553
- self.within(function);
554
- }
555
-
556
- fn visit_fn_decl(&mut self, declaration: &FnDecl) {
557
- let mut read = OptionRead::default();
558
- declaration.function.visit_with(&mut read);
559
- if let Some(option) = read.0 {
560
- self.helpers.insert(declaration.ident.to_id(), option);
579
+ impl<'a> Visit<'a> for Sender<'a> {
580
+ fn visit_function(&mut self, function: &Function<'a>, flags: ScopeFlags) {
581
+ if function.is_declaration()
582
+ && let Some(name) = &function.id
583
+ {
584
+ let mut read = OptionRead::default();
585
+ read.visit_function(function, flags);
586
+ if let Some(option) = read.0 {
587
+ self.helpers.insert(name.symbol_id(), option);
588
+ }
561
589
  }
562
- declaration.visit_children_with(self);
590
+ self.within(|sender| walk::walk_function(sender, function, flags));
563
591
  }
564
592
 
565
- fn visit_arrow_expr(&mut self, arrow: &ArrowExpr) {
566
- self.within(arrow);
593
+ fn visit_arrow_function_expression(&mut self, arrow: &ArrowFunctionExpression<'a>) {
594
+ self.within(|sender| walk::walk_arrow_function_expression(sender, arrow));
567
595
  }
568
596
 
569
- fn visit_var_declarator(&mut self, declarator: &VarDeclarator) {
570
- if let Some(local) = declarator.name.as_ident()
597
+ fn visit_variable_declarator(&mut self, declarator: &VariableDeclarator<'a>) {
598
+ if let BindingPattern::BindingIdentifier(local) = &declarator.id
571
599
  && let Some(init) = &declarator.init
572
- && let Some(entry) = LogEntry::read(&local.sym, init)
600
+ && let Some(entry) = LogEntry::read(Binding::Symbol(local.symbol_id()), init)
573
601
  {
574
602
  self.entries.push(entry);
575
603
  }
576
- declarator.visit_children_with(self);
604
+ walk::walk_variable_declarator(self, declarator);
577
605
  }
578
606
 
579
- fn visit_call_expr(&mut self, call: &CallExpr) {
607
+ fn visit_call_expression(&mut self, call: &CallExpression<'a>) {
580
608
  // `_cf_chl_opt.<log>.push(<entry>)`
581
- if let Some(callee) = call.callee.as_expr().and_then(|callee| callee.as_member())
582
- && ast::member_str(&callee.prop) == Some("push")
583
- && let Some(option) = expression::option_key(&callee.obj)
584
- && let [entry] = &call.args[..]
585
- && let Some(local) = entry.expr.as_ident()
609
+ if let Some(callee) = call.callee.as_member_expression()
610
+ && ast::member_str(callee) == Some("push")
611
+ && let Some(option) = expression::option_key(callee.object())
612
+ && let [entry] = &call.arguments[..]
613
+ && let Some(Expression::Identifier(local)) = entry.as_expression()
586
614
  {
587
615
  self.pushes.push(Push {
588
616
  log: option.to_owned(),
589
- local: local.sym.to_string(),
617
+ local: self.script.binding(local),
590
618
  });
591
619
  }
592
- call.visit_children_with(self);
620
+ walk::walk_call_expression(self, call);
593
621
  }
594
622
 
595
- fn visit_assign_expr(&mut self, assignment: &AssignExpr) {
623
+ fn visit_assignment_expression(&mut self, assignment: &AssignmentExpression<'a>) {
596
624
  let scope = self.scopes.last().copied().unwrap_or_default();
597
- if let AssignTarget::Simple(SimpleAssignTarget::Ident(local)) = &assignment.left
598
- && let Some(entry) = LogEntry::read(&local.sym, &assignment.right)
625
+ if let AssignmentTarget::AssignmentTargetIdentifier(local) = &assignment.left
626
+ && let Some(entry) = LogEntry::read(self.script.binding(local), &assignment.right)
599
627
  {
600
628
  self.entries.push(entry);
601
629
  }
602
- if let AssignTarget::Simple(SimpleAssignTarget::Member(target)) = &assignment.left
630
+ if let Some(target) = assignment.left.as_member_expression()
603
631
  && let Some(key) = ast::ident_property(target)
604
632
  {
605
- match &*assignment.right {
633
+ match &assignment.right {
606
634
  // `payload.<key> = Date.now() - _cf_chl_opt.<mark>`
607
- Expr::Bin(binary)
608
- if binary.op == BinaryOp::Sub
609
- && ast::is_date_now(&binary.left)
635
+ Expression::BinaryExpression(binary)
636
+ if binary.operator == BinaryOperator::Subtraction
637
+ && self.script.is_date_now(&binary.left)
610
638
  && let Some(mark) = expression::option_key(&binary.right) =>
611
639
  {
612
640
  let elapsed = Elapsed {
@@ -616,18 +644,24 @@ impl Visit for Sender {
616
644
  self.elapsed.push((scope, elapsed));
617
645
  }
618
646
  // `<namespace>.<key> = function () { var ...; local = _cf_chl_opt.<option>; ... }`
619
- Expr::Fn(getter)
620
- if let Some(body) = &getter.function.body
621
- && let Some(first) = body.stmts.iter().find_map(Stmt::as_expr)
622
- && let Expr::Assign(first) = &*first.expr
647
+ Expression::FunctionExpression(getter)
648
+ if let Some(body) = &getter.body
649
+ && let Some(Statement::ExpressionStatement(first)) =
650
+ body.statements.iter().find(|statement| {
651
+ matches!(statement, Statement::ExpressionStatement(_))
652
+ })
653
+ && let Expression::AssignmentExpression(first) = &first.expression
623
654
  && let Some(option) = expression::option_key(&first.right) =>
624
655
  {
625
- let mut rewrite = StackRewrite::default();
626
- getter.function.visit_with(&mut rewrite);
656
+ let mut rewrite = StackRewrite {
657
+ script: self.script,
658
+ helper: None,
659
+ };
660
+ rewrite.visit_function(getter, ScopeFlags::Function);
627
661
  self.getters.push(FoundGetter {
628
662
  function: key.to_owned(),
629
663
  option: option.to_owned(),
630
- rewrite: rewrite.0,
664
+ rewrite: rewrite.helper,
631
665
  });
632
666
  }
633
667
  // `payload.<key> = _cf_chl_opt.<key>`
@@ -635,27 +669,28 @@ impl Visit for Sender {
635
669
  self.copies.push((scope, key.to_owned()));
636
670
  }
637
671
  // `entry.<key> = clock()`
638
- Expr::Call(call)
639
- if call.args.is_empty()
640
- && let Some(local) = target.obj.as_ident() =>
672
+ Expression::CallExpression(call)
673
+ if call.arguments.is_empty()
674
+ && let Expression::Identifier(local) = target.object() =>
641
675
  {
642
676
  self.stamps.push(Stamp {
643
- local: local.sym.to_string(),
677
+ local: self.script.binding(local),
644
678
  key: key.to_owned(),
645
679
  });
646
680
  }
647
681
  _ => {}
648
682
  }
649
683
  }
650
- assignment.visit_children_with(self);
684
+ walk::walk_assignment_expression(self, assignment);
651
685
  }
652
686
  }
653
687
 
654
688
  /// Resolves each getter's stack rewrite to the option its helper reads. Rejects a getter name
655
689
  /// that returns different options.
656
690
  fn distinct_getters(
657
- getters: Vec<FoundGetter>,
658
- helpers: &HashMap<Id, String>,
691
+ script: Script<'_>,
692
+ getters: Vec<FoundGetter<'_>>,
693
+ helpers: &HashMap<SymbolId, String>,
659
694
  ) -> Result<BTreeMap<String, Getter>> {
660
695
  let mut distinct = BTreeMap::new();
661
696
  for found in getters {
@@ -663,11 +698,13 @@ fn distinct_getters(
663
698
  let page_origin = found
664
699
  .rewrite
665
700
  .map(|helper| {
666
- helpers.get(&helper).cloned().with_context(|| {
667
- format!(
668
- "getter {function} rewrites stacks with unknown helper {}",
669
- helper.0
670
- )
701
+ let declared = match helper {
702
+ Binding::Symbol(symbol) => helpers.get(&symbol),
703
+ Binding::Global(_) => None,
704
+ };
705
+ declared.cloned().with_context(|| {
706
+ let name = script.name(helper);
707
+ format!("getter {function} rewrites stacks with unknown helper {name}")
671
708
  })
672
709
  })
673
710
  .transpose()?;
@@ -797,12 +834,7 @@ mod tests {
797
834
  .enumerate()
798
835
  .map(|(index, (later, earlier))| {
799
836
  let text = format!("e._cf_chl_opt.{later} - e._cf_chl_opt.{earlier}");
800
- Field {
801
- name: format!("f{index}"),
802
- expression: ast::parse_expression("t", &text).unwrap(),
803
- text,
804
- bootstrap_value: None,
805
- }
837
+ Field::parse(format!("f{index}"), text, None).unwrap()
806
838
  })
807
839
  .collect();
808
840
  let intervals = &Intervals {