eslint 9.22.0 → 9.23.0
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.
- package/README.md +47 -45
- package/bin/eslint.js +92 -90
- package/conf/default-cli-options.js +22 -22
- package/conf/ecma-version.js +1 -1
- package/conf/globals.js +97 -98
- package/conf/replacements.json +24 -20
- package/conf/rule-type-list.json +88 -92
- package/lib/api.js +12 -12
- package/lib/cli-engine/cli-engine.js +828 -808
- package/lib/cli-engine/file-enumerator.js +381 -387
- package/lib/cli-engine/formatters/formatters-meta.json +16 -16
- package/lib/cli-engine/formatters/html.js +107 -99
- package/lib/cli-engine/formatters/json-with-metadata.js +5 -5
- package/lib/cli-engine/formatters/json.js +2 -2
- package/lib/cli-engine/formatters/stylish.js +96 -75
- package/lib/cli-engine/hash.js +1 -1
- package/lib/cli-engine/index.js +1 -1
- package/lib/cli-engine/lint-result-cache.js +144 -145
- package/lib/cli-engine/load-rules.js +16 -16
- package/lib/cli.js +541 -457
- package/lib/config/config-loader.js +648 -618
- package/lib/config/config.js +247 -221
- package/lib/config/default-config.js +54 -45
- package/lib/config/flat-config-array.js +167 -172
- package/lib/config/flat-config-helpers.js +65 -68
- package/lib/config/flat-config-schema.js +375 -368
- package/lib/config/rule-validator.js +139 -144
- package/lib/config-api.js +2 -2
- package/lib/eslint/eslint-helpers.js +709 -679
- package/lib/eslint/eslint.js +944 -886
- package/lib/eslint/index.js +2 -2
- package/lib/eslint/legacy-eslint.js +576 -532
- package/lib/languages/js/index.js +263 -264
- package/lib/languages/js/source-code/index.js +1 -1
- package/lib/languages/js/source-code/source-code.js +1128 -1057
- package/lib/languages/js/source-code/token-store/backward-token-comment-cursor.js +39 -35
- package/lib/languages/js/source-code/token-store/backward-token-cursor.js +35 -36
- package/lib/languages/js/source-code/token-store/cursor.js +36 -36
- package/lib/languages/js/source-code/token-store/cursors.js +80 -52
- package/lib/languages/js/source-code/token-store/decorative-cursor.js +17 -18
- package/lib/languages/js/source-code/token-store/filter-cursor.js +19 -20
- package/lib/languages/js/source-code/token-store/forward-token-comment-cursor.js +40 -32
- package/lib/languages/js/source-code/token-store/forward-token-cursor.js +40 -41
- package/lib/languages/js/source-code/token-store/index.js +592 -498
- package/lib/languages/js/source-code/token-store/limit-cursor.js +17 -18
- package/lib/languages/js/source-code/token-store/padded-token-cursor.js +23 -16
- package/lib/languages/js/source-code/token-store/skip-cursor.js +19 -20
- package/lib/languages/js/source-code/token-store/utils.js +63 -60
- package/lib/languages/js/validate-language-options.js +104 -89
- package/lib/linter/apply-disable-directives.js +467 -383
- package/lib/linter/code-path-analysis/code-path-analyzer.js +650 -672
- package/lib/linter/code-path-analysis/code-path-segment.js +215 -216
- package/lib/linter/code-path-analysis/code-path-state.js +2118 -2096
- package/lib/linter/code-path-analysis/code-path.js +307 -319
- package/lib/linter/code-path-analysis/debug-helpers.js +183 -163
- package/lib/linter/code-path-analysis/fork-context.js +296 -271
- package/lib/linter/code-path-analysis/id-generator.js +22 -23
- package/lib/linter/file-context.js +119 -120
- package/lib/linter/index.js +3 -3
- package/lib/linter/interpolate.js +16 -16
- package/lib/linter/linter.js +2402 -2044
- package/lib/linter/node-event-generator.js +284 -225
- package/lib/linter/report-translator.js +256 -219
- package/lib/linter/rule-fixer.js +122 -124
- package/lib/linter/rules.js +35 -35
- package/lib/linter/safe-emitter.js +18 -18
- package/lib/linter/source-code-fixer.js +94 -92
- package/lib/linter/timing.js +104 -101
- package/lib/linter/vfile.js +70 -73
- package/lib/options.js +375 -361
- package/lib/rule-tester/index.js +1 -1
- package/lib/rule-tester/rule-tester.js +1307 -1045
- package/lib/rules/accessor-pairs.js +297 -262
- package/lib/rules/array-bracket-newline.js +249 -237
- package/lib/rules/array-bracket-spacing.js +262 -223
- package/lib/rules/array-callback-return.js +401 -355
- package/lib/rules/array-element-newline.js +357 -312
- package/lib/rules/arrow-body-style.js +399 -280
- package/lib/rules/arrow-parens.js +205 -172
- package/lib/rules/arrow-spacing.js +168 -162
- package/lib/rules/block-scoped-var.js +124 -122
- package/lib/rules/block-spacing.js +185 -175
- package/lib/rules/brace-style.js +261 -198
- package/lib/rules/callback-return.js +202 -189
- package/lib/rules/camelcase.js +402 -391
- package/lib/rules/capitalized-comments.js +252 -231
- package/lib/rules/class-methods-use-this.js +179 -171
- package/lib/rules/comma-dangle.js +378 -345
- package/lib/rules/comma-spacing.js +192 -194
- package/lib/rules/comma-style.js +374 -315
- package/lib/rules/complexity.js +172 -168
- package/lib/rules/computed-property-spacing.js +235 -210
- package/lib/rules/consistent-return.js +180 -169
- package/lib/rules/consistent-this.js +166 -146
- package/lib/rules/constructor-super.js +411 -403
- package/lib/rules/curly.js +406 -331
- package/lib/rules/default-case-last.js +37 -30
- package/lib/rules/default-case.js +88 -84
- package/lib/rules/default-param-last.js +68 -53
- package/lib/rules/dot-location.js +121 -109
- package/lib/rules/dot-notation.js +191 -155
- package/lib/rules/eol-last.js +121 -119
- package/lib/rules/eqeqeq.js +167 -154
- package/lib/rules/for-direction.js +145 -120
- package/lib/rules/func-call-spacing.js +260 -230
- package/lib/rules/func-name-matching.js +292 -208
- package/lib/rules/func-names.js +164 -163
- package/lib/rules/func-style.js +158 -126
- package/lib/rules/function-call-argument-newline.js +151 -128
- package/lib/rules/function-paren-newline.js +348 -290
- package/lib/rules/generator-star-spacing.js +228 -209
- package/lib/rules/getter-return.js +207 -171
- package/lib/rules/global-require.js +84 -73
- package/lib/rules/grouped-accessor-pairs.js +169 -149
- package/lib/rules/guard-for-in.js +71 -62
- package/lib/rules/handle-callback-err.js +107 -102
- package/lib/rules/id-blacklist.js +181 -198
- package/lib/rules/id-denylist.js +167 -186
- package/lib/rules/id-length.js +196 -170
- package/lib/rules/id-match.js +343 -288
- package/lib/rules/implicit-arrow-linebreak.js +101 -78
- package/lib/rules/indent-legacy.js +1343 -1117
- package/lib/rules/indent.js +2271 -1758
- package/lib/rules/index.js +317 -292
- package/lib/rules/init-declarations.js +115 -106
- package/lib/rules/jsx-quotes.js +93 -81
- package/lib/rules/key-spacing.js +749 -632
- package/lib/rules/keyword-spacing.js +647 -604
- package/lib/rules/line-comment-position.js +141 -127
- package/lib/rules/linebreak-style.js +106 -105
- package/lib/rules/lines-around-comment.js +539 -447
- package/lib/rules/lines-around-directive.js +232 -202
- package/lib/rules/lines-between-class-members.js +304 -233
- package/lib/rules/logical-assignment-operators.js +581 -398
- package/lib/rules/max-classes-per-file.js +68 -67
- package/lib/rules/max-depth.js +145 -142
- package/lib/rules/max-len.js +472 -433
- package/lib/rules/max-lines-per-function.js +200 -175
- package/lib/rules/max-lines.js +157 -161
- package/lib/rules/max-nested-callbacks.js +101 -103
- package/lib/rules/max-params.js +77 -75
- package/lib/rules/max-statements-per-line.js +204 -197
- package/lib/rules/max-statements.js +167 -163
- package/lib/rules/multiline-comment-style.js +636 -478
- package/lib/rules/multiline-ternary.js +240 -175
- package/lib/rules/new-cap.js +232 -212
- package/lib/rules/new-parens.js +87 -78
- package/lib/rules/newline-after-var.js +286 -249
- package/lib/rules/newline-before-return.js +228 -221
- package/lib/rules/newline-per-chained-call.js +141 -126
- package/lib/rules/no-alert.js +89 -78
- package/lib/rules/no-array-constructor.js +121 -112
- package/lib/rules/no-async-promise-executor.js +29 -23
- package/lib/rules/no-await-in-loop.js +68 -70
- package/lib/rules/no-bitwise.js +123 -99
- package/lib/rules/no-buffer-constructor.js +54 -46
- package/lib/rules/no-caller.js +38 -32
- package/lib/rules/no-case-declarations.js +60 -56
- package/lib/rules/no-catch-shadow.js +75 -72
- package/lib/rules/no-class-assign.js +50 -47
- package/lib/rules/no-compare-neg-zero.js +61 -47
- package/lib/rules/no-cond-assign.js +147 -131
- package/lib/rules/no-confusing-arrow.js +97 -80
- package/lib/rules/no-console.js +201 -198
- package/lib/rules/no-const-assign.js +46 -40
- package/lib/rules/no-constant-binary-expression.js +499 -404
- package/lib/rules/no-constant-condition.js +157 -142
- package/lib/rules/no-constructor-return.js +48 -48
- package/lib/rules/no-continue.js +24 -26
- package/lib/rules/no-control-regex.js +124 -120
- package/lib/rules/no-debugger.js +27 -29
- package/lib/rules/no-delete-var.js +28 -28
- package/lib/rules/no-div-regex.js +46 -40
- package/lib/rules/no-dupe-args.js +67 -68
- package/lib/rules/no-dupe-class-members.js +92 -88
- package/lib/rules/no-dupe-else-if.js +99 -76
- package/lib/rules/no-dupe-keys.js +132 -109
- package/lib/rules/no-duplicate-case.js +49 -42
- package/lib/rules/no-duplicate-imports.js +178 -175
- package/lib/rules/no-else-return.js +429 -384
- package/lib/rules/no-empty-character-class.js +56 -49
- package/lib/rules/no-empty-function.js +126 -127
- package/lib/rules/no-empty-pattern.js +62 -57
- package/lib/rules/no-empty-static-block.js +36 -34
- package/lib/rules/no-empty.js +97 -85
- package/lib/rules/no-eq-null.js +36 -31
- package/lib/rules/no-eval.js +255 -249
- package/lib/rules/no-ex-assign.js +41 -38
- package/lib/rules/no-extend-native.js +160 -158
- package/lib/rules/no-extra-bind.js +200 -189
- package/lib/rules/no-extra-boolean-cast.js +397 -347
- package/lib/rules/no-extra-label.js +149 -130
- package/lib/rules/no-extra-parens.js +1653 -1324
- package/lib/rules/no-extra-semi.js +145 -143
- package/lib/rules/no-fallthrough.js +198 -156
- package/lib/rules/no-floating-decimal.js +73 -65
- package/lib/rules/no-func-assign.js +53 -54
- package/lib/rules/no-global-assign.js +77 -72
- package/lib/rules/no-implicit-coercion.js +348 -292
- package/lib/rules/no-implicit-globals.js +157 -134
- package/lib/rules/no-implied-eval.js +139 -111
- package/lib/rules/no-import-assign.js +144 -158
- package/lib/rules/no-inline-comments.js +100 -94
- package/lib/rules/no-inner-declarations.js +114 -100
- package/lib/rules/no-invalid-regexp.js +221 -189
- package/lib/rules/no-invalid-this.js +122 -116
- package/lib/rules/no-irregular-whitespace.js +265 -251
- package/lib/rules/no-iterator.js +28 -32
- package/lib/rules/no-label-var.js +58 -61
- package/lib/rules/no-labels.js +137 -132
- package/lib/rules/no-lone-blocks.js +126 -122
- package/lib/rules/no-lonely-if.js +107 -76
- package/lib/rules/no-loop-func.js +233 -212
- package/lib/rules/no-loss-of-precision.js +215 -200
- package/lib/rules/no-magic-numbers.js +245 -217
- package/lib/rules/no-misleading-character-class.js +498 -445
- package/lib/rules/no-mixed-operators.js +187 -181
- package/lib/rules/no-mixed-requires.js +252 -239
- package/lib/rules/no-mixed-spaces-and-tabs.js +133 -120
- package/lib/rules/no-multi-assign.js +45 -43
- package/lib/rules/no-multi-spaces.js +162 -142
- package/lib/rules/no-multi-str.js +41 -40
- package/lib/rules/no-multiple-empty-lines.js +195 -157
- package/lib/rules/no-native-reassign.js +89 -84
- package/lib/rules/no-negated-condition.js +78 -74
- package/lib/rules/no-negated-in-lhs.js +44 -42
- package/lib/rules/no-nested-ternary.js +32 -31
- package/lib/rules/no-new-func.js +70 -61
- package/lib/rules/no-new-native-nonconstructor.js +42 -38
- package/lib/rules/no-new-object.js +47 -47
- package/lib/rules/no-new-require.js +47 -46
- package/lib/rules/no-new-symbol.js +51 -49
- package/lib/rules/no-new-wrappers.js +42 -40
- package/lib/rules/no-new.js +27 -28
- package/lib/rules/no-nonoctal-decimal-escape.js +140 -120
- package/lib/rules/no-obj-calls.js +65 -52
- package/lib/rules/no-object-constructor.js +103 -96
- package/lib/rules/no-octal-escape.js +39 -42
- package/lib/rules/no-octal.js +31 -31
- package/lib/rules/no-param-reassign.js +234 -216
- package/lib/rules/no-path-concat.js +65 -66
- package/lib/rules/no-plusplus.js +59 -60
- package/lib/rules/no-process-env.js +48 -47
- package/lib/rules/no-process-exit.js +53 -49
- package/lib/rules/no-promise-executor-return.js +213 -181
- package/lib/rules/no-proto.js +25 -28
- package/lib/rules/no-prototype-builtins.js +145 -123
- package/lib/rules/no-redeclare.js +153 -151
- package/lib/rules/no-regex-spaces.js +182 -160
- package/lib/rules/no-restricted-exports.js +207 -184
- package/lib/rules/no-restricted-globals.js +110 -111
- package/lib/rules/no-restricted-imports.js +656 -536
- package/lib/rules/no-restricted-modules.js +221 -201
- package/lib/rules/no-restricted-properties.js +180 -152
- package/lib/rules/no-restricted-syntax.js +55 -51
- package/lib/rules/no-return-assign.js +54 -49
- package/lib/rules/no-return-await.js +147 -123
- package/lib/rules/no-script-url.js +51 -44
- package/lib/rules/no-self-assign.js +147 -145
- package/lib/rules/no-self-compare.js +62 -45
- package/lib/rules/no-sequences.js +134 -115
- package/lib/rules/no-setter-return.js +184 -151
- package/lib/rules/no-shadow-restricted-names.js +60 -45
- package/lib/rules/no-shadow.js +341 -315
- package/lib/rules/no-spaced-func.js +81 -76
- package/lib/rules/no-sparse-arrays.js +53 -58
- package/lib/rules/no-sync.js +60 -59
- package/lib/rules/no-tabs.js +82 -71
- package/lib/rules/no-template-curly-in-string.js +32 -31
- package/lib/rules/no-ternary.js +24 -28
- package/lib/rules/no-this-before-super.js +320 -318
- package/lib/rules/no-throw-literal.js +30 -35
- package/lib/rules/no-trailing-spaces.js +198 -190
- package/lib/rules/no-undef-init.js +75 -60
- package/lib/rules/no-undef.js +50 -47
- package/lib/rules/no-undefined.js +72 -74
- package/lib/rules/no-underscore-dangle.js +369 -326
- package/lib/rules/no-unexpected-multiline.js +111 -101
- package/lib/rules/no-unmodified-loop-condition.js +253 -253
- package/lib/rules/no-unneeded-ternary.js +211 -146
- package/lib/rules/no-unreachable-loop.js +144 -141
- package/lib/rules/no-unreachable.js +254 -247
- package/lib/rules/no-unsafe-finally.js +92 -84
- package/lib/rules/no-unsafe-negation.js +104 -82
- package/lib/rules/no-unsafe-optional-chaining.js +191 -177
- package/lib/rules/no-unused-expressions.js +177 -161
- package/lib/rules/no-unused-labels.js +138 -123
- package/lib/rules/no-unused-private-class-members.js +205 -181
- package/lib/rules/no-unused-vars.js +1668 -1448
- package/lib/rules/no-use-before-define.js +228 -230
- package/lib/rules/no-useless-assignment.js +589 -510
- package/lib/rules/no-useless-backreference.js +211 -192
- package/lib/rules/no-useless-call.js +57 -52
- package/lib/rules/no-useless-catch.js +39 -39
- package/lib/rules/no-useless-computed-key.js +143 -114
- package/lib/rules/no-useless-concat.js +64 -59
- package/lib/rules/no-useless-constructor.js +157 -110
- package/lib/rules/no-useless-escape.js +341 -290
- package/lib/rules/no-useless-rename.js +182 -155
- package/lib/rules/no-useless-return.js +343 -311
- package/lib/rules/no-var.js +232 -211
- package/lib/rules/no-void.js +49 -47
- package/lib/rules/no-warning-comments.js +190 -185
- package/lib/rules/no-whitespace-before-property.js +130 -114
- package/lib/rules/no-with.js +23 -25
- package/lib/rules/nonblock-statement-body-position.js +148 -129
- package/lib/rules/object-curly-newline.js +305 -264
- package/lib/rules/object-curly-spacing.js +359 -313
- package/lib/rules/object-property-newline.js +136 -105
- package/lib/rules/object-shorthand.js +606 -501
- package/lib/rules/one-var-declaration-per-line.js +103 -99
- package/lib/rules/one-var.js +652 -536
- package/lib/rules/operator-assignment.js +218 -160
- package/lib/rules/operator-linebreak.js +294 -250
- package/lib/rules/padded-blocks.js +345 -307
- package/lib/rules/padding-line-between-statements.js +442 -438
- package/lib/rules/prefer-arrow-callback.js +361 -312
- package/lib/rules/prefer-const.js +417 -376
- package/lib/rules/prefer-destructuring.js +300 -278
- package/lib/rules/prefer-exponentiation-operator.js +175 -132
- package/lib/rules/prefer-named-capture-group.js +152 -139
- package/lib/rules/prefer-numeric-literals.js +120 -112
- package/lib/rules/prefer-object-has-own.js +115 -81
- package/lib/rules/prefer-object-spread.js +212 -192
- package/lib/rules/prefer-promise-reject-errors.js +139 -121
- package/lib/rules/prefer-reflect.js +126 -106
- package/lib/rules/prefer-regex-literals.js +577 -465
- package/lib/rules/prefer-rest-params.js +78 -79
- package/lib/rules/prefer-spread.js +46 -43
- package/lib/rules/prefer-template.js +265 -194
- package/lib/rules/quote-props.js +372 -306
- package/lib/rules/quotes.js +373 -325
- package/lib/rules/radix.js +151 -135
- package/lib/rules/require-atomic-updates.js +315 -284
- package/lib/rules/require-await.js +143 -115
- package/lib/rules/require-unicode-regexp.js +281 -176
- package/lib/rules/require-yield.js +52 -53
- package/lib/rules/rest-spread-spacing.js +127 -115
- package/lib/rules/semi-spacing.js +280 -249
- package/lib/rules/semi-style.js +175 -133
- package/lib/rules/semi.js +455 -435
- package/lib/rules/sort-imports.js +305 -232
- package/lib/rules/sort-keys.js +218 -187
- package/lib/rules/sort-vars.js +126 -92
- package/lib/rules/space-before-blocks.js +198 -188
- package/lib/rules/space-before-function-paren.js +185 -165
- package/lib/rules/space-in-parens.js +358 -287
- package/lib/rules/space-infix-ops.js +236 -200
- package/lib/rules/space-unary-ops.js +355 -297
- package/lib/rules/spaced-comment.js +362 -318
- package/lib/rules/strict.js +264 -229
- package/lib/rules/switch-colon-spacing.js +129 -121
- package/lib/rules/symbol-description.js +44 -47
- package/lib/rules/template-curly-spacing.js +147 -141
- package/lib/rules/template-tag-spacing.js +97 -87
- package/lib/rules/unicode-bom.js +53 -55
- package/lib/rules/use-isnan.js +236 -205
- package/lib/rules/utils/ast-utils.js +2039 -1860
- package/lib/rules/utils/char-source.js +162 -155
- package/lib/rules/utils/fix-tracker.js +83 -80
- package/lib/rules/utils/keywords.js +59 -59
- package/lib/rules/utils/lazy-loading-rule-map.js +79 -76
- package/lib/rules/utils/regular-expressions.js +32 -24
- package/lib/rules/utils/unicode/index.js +4 -4
- package/lib/rules/utils/unicode/is-combining-character.js +1 -1
- package/lib/rules/utils/unicode/is-emoji-modifier.js +1 -1
- package/lib/rules/utils/unicode/is-regional-indicator-symbol.js +1 -1
- package/lib/rules/utils/unicode/is-surrogate-pair.js +1 -1
- package/lib/rules/valid-typeof.js +152 -110
- package/lib/rules/vars-on-top.js +151 -144
- package/lib/rules/wrap-iife.js +203 -190
- package/lib/rules/wrap-regex.js +69 -57
- package/lib/rules/yield-star-spacing.js +144 -133
- package/lib/rules/yoda.js +282 -271
- package/lib/services/parser-service.js +35 -35
- package/lib/services/processor-service.js +66 -73
- package/lib/shared/ajv.js +14 -14
- package/lib/shared/assert.js +3 -4
- package/lib/shared/ast-utils.js +7 -6
- package/lib/shared/deep-merge-arrays.js +24 -22
- package/lib/shared/directives.js +3 -2
- package/lib/shared/flags.js +46 -17
- package/lib/shared/logging.js +24 -25
- package/lib/shared/option-utils.js +43 -36
- package/lib/shared/runtime-info.js +136 -127
- package/lib/shared/serialization.js +27 -27
- package/lib/shared/severity.js +22 -22
- package/lib/shared/stats.js +5 -5
- package/lib/shared/string-utils.js +16 -16
- package/lib/shared/text-table.js +28 -27
- package/lib/shared/traverser.js +153 -146
- package/lib/types/index.d.ts +2010 -1559
- package/lib/types/rules.d.ts +5253 -5140
- package/lib/types/use-at-your-own-risk.d.ts +32 -30
- package/lib/unsupported-api.js +5 -5
- package/messages/all-files-ignored.js +3 -3
- package/messages/all-matched-files-ignored.js +3 -3
- package/messages/config-file-missing.js +2 -2
- package/messages/config-plugin-missing.js +3 -3
- package/messages/config-serialize-function.js +9 -7
- package/messages/eslintrc-incompat.js +13 -15
- package/messages/eslintrc-plugins.js +3 -4
- package/messages/extend-config-missing.js +3 -3
- package/messages/failed-to-read-json.js +3 -3
- package/messages/file-not-found.js +3 -3
- package/messages/invalid-rule-options.js +2 -2
- package/messages/invalid-rule-severity.js +2 -2
- package/messages/no-config-found.js +3 -3
- package/messages/plugin-conflict.js +8 -8
- package/messages/plugin-invalid.js +3 -3
- package/messages/plugin-missing.js +3 -3
- package/messages/print-config-with-directory-path.js +2 -2
- package/messages/shared.js +6 -1
- package/messages/whitespace-found.js +3 -3
- package/package.json +11 -17
@@ -14,7 +14,7 @@
|
|
14
14
|
//------------------------------------------------------------------------------
|
15
15
|
|
16
16
|
const assert = require("../../shared/assert"),
|
17
|
-
|
17
|
+
CodePathSegment = require("./code-path-segment");
|
18
18
|
|
19
19
|
//------------------------------------------------------------------------------
|
20
20
|
// Helpers
|
@@ -26,7 +26,7 @@ const assert = require("../../shared/assert"),
|
|
26
26
|
* @returns {boolean} `true` if the segment is reachable.
|
27
27
|
*/
|
28
28
|
function isReachable(segment) {
|
29
|
-
|
29
|
+
return segment.reachable;
|
30
30
|
}
|
31
31
|
|
32
32
|
/**
|
@@ -54,44 +54,43 @@ function isReachable(segment) {
|
|
54
54
|
* @returns {Array<CodePathSegment>} An array of the newly-created segments.
|
55
55
|
*/
|
56
56
|
function createSegments(context, startIndex, endIndex, create) {
|
57
|
-
|
58
|
-
|
59
|
-
|
60
|
-
|
61
|
-
|
62
|
-
|
63
|
-
|
64
|
-
|
65
|
-
|
66
|
-
|
67
|
-
|
68
|
-
|
69
|
-
|
70
|
-
|
71
|
-
|
72
|
-
|
73
|
-
|
74
|
-
|
75
|
-
|
76
|
-
|
77
|
-
|
78
|
-
|
79
|
-
|
80
|
-
|
81
|
-
|
82
|
-
|
83
|
-
|
84
|
-
|
85
|
-
|
86
|
-
|
87
|
-
|
88
|
-
|
89
|
-
|
90
|
-
|
91
|
-
|
92
|
-
|
93
|
-
|
94
|
-
return segments;
|
57
|
+
/** @type {Array<Array<CodePathSegment>>} */
|
58
|
+
const list = context.segmentsList;
|
59
|
+
|
60
|
+
/*
|
61
|
+
* Both `startIndex` and `endIndex` work the same way: if the number is zero
|
62
|
+
* or more, then the number is used as-is. If the number is negative,
|
63
|
+
* then that number is added to the length of the segments list to
|
64
|
+
* determine the index to use. That means -1 for either argument
|
65
|
+
* is the last element, -2 is the second to last, and so on.
|
66
|
+
*
|
67
|
+
* So if `startIndex` is 0, `endIndex` is -1, and `list.length` is 3, the
|
68
|
+
* effective `startIndex` is 0 and the effective `endIndex` is 2, so this function
|
69
|
+
* will include items at indices 0, 1, and 2.
|
70
|
+
*
|
71
|
+
* Therefore, if `startIndex` is -1 and `endIndex` is -1, that means we'll only
|
72
|
+
* be using the last segment in `list`.
|
73
|
+
*/
|
74
|
+
const normalizedBegin =
|
75
|
+
startIndex >= 0 ? startIndex : list.length + startIndex;
|
76
|
+
const normalizedEnd = endIndex >= 0 ? endIndex : list.length + endIndex;
|
77
|
+
|
78
|
+
/** @type {Array<CodePathSegment>} */
|
79
|
+
const segments = [];
|
80
|
+
|
81
|
+
for (let i = 0; i < context.count; ++i) {
|
82
|
+
// this is passed into `new CodePathSegment` to add to code path.
|
83
|
+
const allPrevSegments = [];
|
84
|
+
|
85
|
+
for (let j = normalizedBegin; j <= normalizedEnd; ++j) {
|
86
|
+
allPrevSegments.push(list[j][i]);
|
87
|
+
}
|
88
|
+
|
89
|
+
// note: `create` is just a wrapper that augments `new CodePathSegment`.
|
90
|
+
segments.push(create(context.idGenerator.next(), allPrevSegments));
|
91
|
+
}
|
92
|
+
|
93
|
+
return segments;
|
95
94
|
}
|
96
95
|
|
97
96
|
/**
|
@@ -103,50 +102,56 @@ function createSegments(context, startIndex, endIndex, create) {
|
|
103
102
|
* @returns {Array<CodePathSegment>} The merged segments.
|
104
103
|
*/
|
105
104
|
function mergeExtraSegments(context, segments) {
|
106
|
-
|
107
|
-
|
108
|
-
|
109
|
-
|
110
|
-
|
111
|
-
|
112
|
-
|
113
|
-
|
114
|
-
|
115
|
-
|
116
|
-
|
117
|
-
|
118
|
-
|
119
|
-
|
120
|
-
|
121
|
-
|
122
|
-
|
123
|
-
|
124
|
-
|
125
|
-
|
126
|
-
|
127
|
-
|
128
|
-
|
129
|
-
|
130
|
-
|
131
|
-
|
132
|
-
|
133
|
-
|
134
|
-
|
135
|
-
|
136
|
-
|
137
|
-
|
138
|
-
|
139
|
-
|
140
|
-
|
141
|
-
|
142
|
-
|
143
|
-
|
144
|
-
|
145
|
-
|
146
|
-
|
147
|
-
|
148
|
-
|
149
|
-
|
105
|
+
let currentSegments = segments;
|
106
|
+
|
107
|
+
/*
|
108
|
+
* We need to ensure that the array returned from this function contains no more
|
109
|
+
* than the number of segments that the context allows. `context.count` indicates
|
110
|
+
* how many items should be in the returned array to ensure that the new segment
|
111
|
+
* entries will line up with the already existing segment entries.
|
112
|
+
*/
|
113
|
+
while (currentSegments.length > context.count) {
|
114
|
+
const merged = [];
|
115
|
+
|
116
|
+
/*
|
117
|
+
* Because `context.count` is a factor of 2 inside of a `finally` block,
|
118
|
+
* we can divide the segment count by 2 to merge the paths together.
|
119
|
+
* This loops through each segment in the list and creates a new `CodePathSegment`
|
120
|
+
* that has the segment and the segment two slots away as previous segments.
|
121
|
+
*
|
122
|
+
* If `currentSegments` is [a,b,c,d], this will create new segments e and f, such
|
123
|
+
* that:
|
124
|
+
*
|
125
|
+
* When `i` is 0:
|
126
|
+
* a->e
|
127
|
+
* c->e
|
128
|
+
*
|
129
|
+
* When `i` is 1:
|
130
|
+
* b->f
|
131
|
+
* d->f
|
132
|
+
*/
|
133
|
+
for (
|
134
|
+
let i = 0, length = Math.floor(currentSegments.length / 2);
|
135
|
+
i < length;
|
136
|
+
++i
|
137
|
+
) {
|
138
|
+
merged.push(
|
139
|
+
CodePathSegment.newNext(context.idGenerator.next(), [
|
140
|
+
currentSegments[i],
|
141
|
+
currentSegments[i + length],
|
142
|
+
]),
|
143
|
+
);
|
144
|
+
}
|
145
|
+
|
146
|
+
/*
|
147
|
+
* Go through the loop condition one more time to see if we have the
|
148
|
+
* number of segments for the context. If not, we'll keep merging paths
|
149
|
+
* of the merged segments until we get there.
|
150
|
+
*/
|
151
|
+
currentSegments = merged;
|
152
|
+
}
|
153
|
+
|
154
|
+
return currentSegments;
|
150
155
|
}
|
151
156
|
|
152
157
|
//------------------------------------------------------------------------------
|
@@ -157,193 +162,213 @@ function mergeExtraSegments(context, segments) {
|
|
157
162
|
* Manages the forking of code paths.
|
158
163
|
*/
|
159
164
|
class ForkContext {
|
160
|
-
|
161
|
-
|
162
|
-
|
163
|
-
|
164
|
-
|
165
|
-
|
166
|
-
|
167
|
-
|
168
|
-
|
169
|
-
|
170
|
-
|
171
|
-
|
172
|
-
|
173
|
-
|
174
|
-
|
175
|
-
|
176
|
-
|
177
|
-
|
178
|
-
|
179
|
-
|
180
|
-
|
181
|
-
|
182
|
-
|
183
|
-
|
184
|
-
|
185
|
-
|
186
|
-
|
187
|
-
|
188
|
-
|
189
|
-
|
190
|
-
|
191
|
-
|
192
|
-
|
193
|
-
|
194
|
-
|
195
|
-
|
196
|
-
|
197
|
-
|
198
|
-
|
199
|
-
|
200
|
-
|
201
|
-
|
202
|
-
|
203
|
-
|
204
|
-
|
205
|
-
|
206
|
-
|
207
|
-
|
208
|
-
|
209
|
-
|
210
|
-
|
211
|
-
|
212
|
-
|
213
|
-
|
214
|
-
|
215
|
-
|
216
|
-
|
217
|
-
|
218
|
-
|
219
|
-
|
220
|
-
|
221
|
-
|
222
|
-
|
223
|
-
|
224
|
-
|
225
|
-
|
226
|
-
|
227
|
-
|
228
|
-
|
229
|
-
|
230
|
-
|
231
|
-
|
232
|
-
|
233
|
-
|
234
|
-
|
235
|
-
|
236
|
-
|
237
|
-
|
238
|
-
|
239
|
-
|
240
|
-
|
241
|
-
|
242
|
-
|
243
|
-
|
244
|
-
|
245
|
-
|
246
|
-
|
247
|
-
|
248
|
-
|
249
|
-
|
250
|
-
|
251
|
-
|
252
|
-
|
253
|
-
|
254
|
-
|
255
|
-
|
256
|
-
|
257
|
-
|
258
|
-
|
259
|
-
|
260
|
-
|
261
|
-
|
262
|
-
|
263
|
-
|
264
|
-
|
265
|
-
|
266
|
-
|
267
|
-
|
268
|
-
|
269
|
-
|
270
|
-
|
271
|
-
|
272
|
-
|
273
|
-
|
274
|
-
|
275
|
-
|
276
|
-
|
277
|
-
|
278
|
-
|
279
|
-
|
280
|
-
|
281
|
-
|
282
|
-
|
283
|
-
|
284
|
-
|
285
|
-
|
286
|
-
|
287
|
-
|
288
|
-
|
289
|
-
|
290
|
-
|
291
|
-
|
292
|
-
|
293
|
-
|
294
|
-
|
295
|
-
|
296
|
-
|
297
|
-
|
298
|
-
|
299
|
-
|
300
|
-
|
301
|
-
|
302
|
-
|
303
|
-
|
304
|
-
|
305
|
-
|
306
|
-
|
307
|
-
|
308
|
-
|
309
|
-
|
310
|
-
|
311
|
-
|
312
|
-
|
313
|
-
|
314
|
-
|
315
|
-
|
316
|
-
|
317
|
-
|
318
|
-
|
319
|
-
|
320
|
-
|
321
|
-
|
322
|
-
|
323
|
-
|
324
|
-
|
325
|
-
|
326
|
-
|
327
|
-
|
328
|
-
|
329
|
-
|
330
|
-
|
331
|
-
|
332
|
-
|
333
|
-
|
334
|
-
|
335
|
-
|
336
|
-
|
337
|
-
|
338
|
-
|
339
|
-
|
340
|
-
|
341
|
-
|
342
|
-
|
343
|
-
|
344
|
-
|
345
|
-
|
346
|
-
|
165
|
+
/**
|
166
|
+
* Creates a new instance.
|
167
|
+
* @param {IdGenerator} idGenerator An identifier generator for segments.
|
168
|
+
* @param {ForkContext|null} upper The preceding fork context.
|
169
|
+
* @param {number} count The number of parallel segments in each element
|
170
|
+
* of `segmentsList`.
|
171
|
+
*/
|
172
|
+
constructor(idGenerator, upper, count) {
|
173
|
+
/**
|
174
|
+
* The ID generator that will generate segment IDs for any new
|
175
|
+
* segments that are created.
|
176
|
+
* @type {IdGenerator}
|
177
|
+
*/
|
178
|
+
this.idGenerator = idGenerator;
|
179
|
+
|
180
|
+
/**
|
181
|
+
* The preceding fork context.
|
182
|
+
* @type {ForkContext|null}
|
183
|
+
*/
|
184
|
+
this.upper = upper;
|
185
|
+
|
186
|
+
/**
|
187
|
+
* The number of elements in each element of `segmentsList`. In most
|
188
|
+
* cases, this is 1 but can be 2 when there is a `finally` present,
|
189
|
+
* which forks the code path outside of normal flow. In the case of nested
|
190
|
+
* `finally` blocks, this can be a multiple of 2.
|
191
|
+
* @type {number}
|
192
|
+
*/
|
193
|
+
this.count = count;
|
194
|
+
|
195
|
+
/**
|
196
|
+
* The segments within this context. Each element in this array has
|
197
|
+
* `count` elements that represent one step in each fork. For example,
|
198
|
+
* when `segmentsList` is `[[a, b], [c, d], [e, f]]`, there is one path
|
199
|
+
* a->c->e and one path b->d->f, and `count` is 2 because each element
|
200
|
+
* is an array with two elements.
|
201
|
+
* @type {Array<Array<CodePathSegment>>}
|
202
|
+
*/
|
203
|
+
this.segmentsList = [];
|
204
|
+
}
|
205
|
+
|
206
|
+
/**
|
207
|
+
* The segments that begin this fork context.
|
208
|
+
* @type {Array<CodePathSegment>}
|
209
|
+
*/
|
210
|
+
get head() {
|
211
|
+
const list = this.segmentsList;
|
212
|
+
|
213
|
+
return list.length === 0 ? [] : list.at(-1);
|
214
|
+
}
|
215
|
+
|
216
|
+
/**
|
217
|
+
* Indicates if the context contains no segments.
|
218
|
+
* @type {boolean}
|
219
|
+
*/
|
220
|
+
get empty() {
|
221
|
+
return this.segmentsList.length === 0;
|
222
|
+
}
|
223
|
+
|
224
|
+
/**
|
225
|
+
* Indicates if there are any segments that are reachable.
|
226
|
+
* @type {boolean}
|
227
|
+
*/
|
228
|
+
get reachable() {
|
229
|
+
const segments = this.head;
|
230
|
+
|
231
|
+
return segments.length > 0 && segments.some(isReachable);
|
232
|
+
}
|
233
|
+
|
234
|
+
/**
|
235
|
+
* Creates new segments in this context and appends them to the end of the
|
236
|
+
* already existing `CodePathSegment`s specified by `startIndex` and
|
237
|
+
* `endIndex`.
|
238
|
+
* @param {number} startIndex The index of the first segment in the context
|
239
|
+
* that should be specified as previous segments for the newly created segments.
|
240
|
+
* @param {number} endIndex The index of the last segment in the context
|
241
|
+
* that should be specified as previous segments for the newly created segments.
|
242
|
+
* @returns {Array<CodePathSegment>} An array of the newly created segments.
|
243
|
+
*/
|
244
|
+
makeNext(startIndex, endIndex) {
|
245
|
+
return createSegments(
|
246
|
+
this,
|
247
|
+
startIndex,
|
248
|
+
endIndex,
|
249
|
+
CodePathSegment.newNext,
|
250
|
+
);
|
251
|
+
}
|
252
|
+
|
253
|
+
/**
|
254
|
+
* Creates new unreachable segments in this context and appends them to the end of the
|
255
|
+
* already existing `CodePathSegment`s specified by `startIndex` and
|
256
|
+
* `endIndex`.
|
257
|
+
* @param {number} startIndex The index of the first segment in the context
|
258
|
+
* that should be specified as previous segments for the newly created segments.
|
259
|
+
* @param {number} endIndex The index of the last segment in the context
|
260
|
+
* that should be specified as previous segments for the newly created segments.
|
261
|
+
* @returns {Array<CodePathSegment>} An array of the newly created segments.
|
262
|
+
*/
|
263
|
+
makeUnreachable(startIndex, endIndex) {
|
264
|
+
return createSegments(
|
265
|
+
this,
|
266
|
+
startIndex,
|
267
|
+
endIndex,
|
268
|
+
CodePathSegment.newUnreachable,
|
269
|
+
);
|
270
|
+
}
|
271
|
+
|
272
|
+
/**
|
273
|
+
* Creates new segments in this context and does not append them to the end
|
274
|
+
* of the already existing `CodePathSegment`s specified by `startIndex` and
|
275
|
+
* `endIndex`. The `startIndex` and `endIndex` are only used to determine if
|
276
|
+
* the new segments should be reachable. If any of the segments in this range
|
277
|
+
* are reachable then the new segments are also reachable; otherwise, the new
|
278
|
+
* segments are unreachable.
|
279
|
+
* @param {number} startIndex The index of the first segment in the context
|
280
|
+
* that should be considered for reachability.
|
281
|
+
* @param {number} endIndex The index of the last segment in the context
|
282
|
+
* that should be considered for reachability.
|
283
|
+
* @returns {Array<CodePathSegment>} An array of the newly created segments.
|
284
|
+
*/
|
285
|
+
makeDisconnected(startIndex, endIndex) {
|
286
|
+
return createSegments(
|
287
|
+
this,
|
288
|
+
startIndex,
|
289
|
+
endIndex,
|
290
|
+
CodePathSegment.newDisconnected,
|
291
|
+
);
|
292
|
+
}
|
293
|
+
|
294
|
+
/**
|
295
|
+
* Adds segments to the head of this context.
|
296
|
+
* @param {Array<CodePathSegment>} segments The segments to add.
|
297
|
+
* @returns {void}
|
298
|
+
*/
|
299
|
+
add(segments) {
|
300
|
+
assert(
|
301
|
+
segments.length >= this.count,
|
302
|
+
`${segments.length} >= ${this.count}`,
|
303
|
+
);
|
304
|
+
this.segmentsList.push(mergeExtraSegments(this, segments));
|
305
|
+
}
|
306
|
+
|
307
|
+
/**
|
308
|
+
* Replaces the head segments with the given segments.
|
309
|
+
* The current head segments are removed.
|
310
|
+
* @param {Array<CodePathSegment>} replacementHeadSegments The new head segments.
|
311
|
+
* @returns {void}
|
312
|
+
*/
|
313
|
+
replaceHead(replacementHeadSegments) {
|
314
|
+
assert(
|
315
|
+
replacementHeadSegments.length >= this.count,
|
316
|
+
`${replacementHeadSegments.length} >= ${this.count}`,
|
317
|
+
);
|
318
|
+
this.segmentsList.splice(
|
319
|
+
-1,
|
320
|
+
1,
|
321
|
+
mergeExtraSegments(this, replacementHeadSegments),
|
322
|
+
);
|
323
|
+
}
|
324
|
+
|
325
|
+
/**
|
326
|
+
* Adds all segments of a given fork context into this context.
|
327
|
+
* @param {ForkContext} otherForkContext The fork context to add from.
|
328
|
+
* @returns {void}
|
329
|
+
*/
|
330
|
+
addAll(otherForkContext) {
|
331
|
+
assert(otherForkContext.count === this.count);
|
332
|
+
this.segmentsList.push(...otherForkContext.segmentsList);
|
333
|
+
}
|
334
|
+
|
335
|
+
/**
|
336
|
+
* Clears all segments in this context.
|
337
|
+
* @returns {void}
|
338
|
+
*/
|
339
|
+
clear() {
|
340
|
+
this.segmentsList = [];
|
341
|
+
}
|
342
|
+
|
343
|
+
/**
|
344
|
+
* Creates a new root context, meaning that there are no parent
|
345
|
+
* fork contexts.
|
346
|
+
* @param {IdGenerator} idGenerator An identifier generator for segments.
|
347
|
+
* @returns {ForkContext} New fork context.
|
348
|
+
*/
|
349
|
+
static newRoot(idGenerator) {
|
350
|
+
const context = new ForkContext(idGenerator, null, 1);
|
351
|
+
|
352
|
+
context.add([CodePathSegment.newRoot(idGenerator.next())]);
|
353
|
+
|
354
|
+
return context;
|
355
|
+
}
|
356
|
+
|
357
|
+
/**
|
358
|
+
* Creates an empty fork context preceded by a given context.
|
359
|
+
* @param {ForkContext} parentContext The parent fork context.
|
360
|
+
* @param {boolean} shouldForkLeavingPath Indicates that we are inside of
|
361
|
+
* a `finally` block and should therefore fork the path that leaves
|
362
|
+
* `finally`.
|
363
|
+
* @returns {ForkContext} New fork context.
|
364
|
+
*/
|
365
|
+
static newEmpty(parentContext, shouldForkLeavingPath) {
|
366
|
+
return new ForkContext(
|
367
|
+
parentContext.idGenerator,
|
368
|
+
parentContext,
|
369
|
+
(shouldForkLeavingPath ? 2 : 1) * parentContext.count,
|
370
|
+
);
|
371
|
+
}
|
347
372
|
}
|
348
373
|
|
349
374
|
module.exports = ForkContext;
|