|
5 | 5 |
|
6 | 6 | "use strict"; |
7 | 7 |
|
| 8 | +const isDependencyKind = require("../../graph/isDependencyKind"); |
8 | 9 | const { isInlinedUsedName } = require("../../optimize/InlineExports"); |
9 | 10 |
|
10 | 11 | /** @import { Expression } from "estree" */ |
@@ -210,11 +211,11 @@ const buildFrameLivenessFormula = (parser, frame) => { |
210 | 211 | /** @type {Map<number, ESMImportSpecifierDependency>} */ |
211 | 212 | const depByRangeStart = new Map(); |
212 | 213 | for (let i = /** @type {number} */ (frame.depStart); i < deps.length; i++) { |
213 | | - const dep = /** @type {ESMEvaluatedImportSpecifierDependency} */ (deps[i]); |
| 214 | + const dep = deps[i]; |
214 | 215 | // Exclude `"x" in ns` evaluated deps; those feed the presence formula only. |
215 | 216 | if ( |
216 | | - dep.isHarmonyImportSpecifier === true && |
217 | | - dep.isHarmonyEvaluatedImportSpecifier !== true && |
| 217 | + isDependencyKind(dep, "esm-import-specifier") && |
| 218 | + !dep.is("esm-evaluated-import-specifier") && |
218 | 219 | dep.range |
219 | 220 | ) { |
220 | 221 | depByRangeStart.set(dep.range[0], dep); |
@@ -333,8 +334,8 @@ const buildFramePresenceFormula = (parser, frame) => { |
333 | 334 | /** @type {Map<number, ESMEvaluatedImportSpecifierDependency>} */ |
334 | 335 | const depByRangeStart = new Map(); |
335 | 336 | for (let i = /** @type {number} */ (frame.depStart); i < deps.length; i++) { |
336 | | - const dep = /** @type {ESMEvaluatedImportSpecifierDependency} */ (deps[i]); |
337 | | - if (dep.isHarmonyEvaluatedImportSpecifier === true && dep.range) { |
| 337 | + const dep = deps[i]; |
| 338 | + if (isDependencyKind(dep, "esm-evaluated-import-specifier") && dep.range) { |
338 | 339 | depByRangeStart.set(dep.range[0], dep); |
339 | 340 | } |
340 | 341 | } |
|
0 commit comments