Skip to content

Commit 3086a44

Browse files
committed
Refactor flag handling for better readability
1 parent bfbc9a9 commit 3086a44

File tree

1 file changed

+5
-13
lines changed

1 file changed

+5
-13
lines changed

src/index.js

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -89,12 +89,7 @@ function initialize(env, context, specifiedOptions, platform, extraOptionDefs) {
8989
const flagStore = {
9090
get(key) {
9191
// Check overrides first, then real flags
92-
if (
93-
flagOverrides &&
94-
utils.objectHasOwnProperty(flagOverrides, key) &&
95-
flagOverrides[key] &&
96-
!flagOverrides[key].deleted
97-
) {
92+
if (flagOverrides && utils.objectHasOwnProperty(flagOverrides, key) && flagOverrides[key]) {
9893
return flagOverrides[key];
9994
}
10095

@@ -951,9 +946,8 @@ function initialize(env, context, specifiedOptions, platform, extraOptionDefs) {
951946
const oldOverride = flagOverrides[key];
952947
const realFlag = flags[key];
953948

954-
if (oldOverride && !oldOverride.deleted) {
955-
mods[key] = { previous: oldOverride.value, current: realFlag ? getFlagDetail(realFlag) : undefined };
956-
}
949+
// Always create change event since we're removing an override
950+
mods[key] = { previous: oldOverride.value, current: realFlag ? getFlagDetail(realFlag) : undefined };
957951

958952
delete flagOverrides[key]; // Remove the override
959953
notifyInspectionFlagChanged({ key }, realFlag);
@@ -967,9 +961,7 @@ function initialize(env, context, specifiedOptions, platform, extraOptionDefs) {
967961
const oldOverride = flagOverrides[key];
968962
const realFlag = flags[key];
969963

970-
if (oldOverride && !oldOverride.deleted) {
971-
mods[key] = { previous: oldOverride.value, current: realFlag ? getFlagDetail(realFlag) : undefined };
972-
}
964+
mods[key] = { previous: oldOverride.value, current: realFlag ? getFlagDetail(realFlag) : undefined };
973965
});
974966

975967
flagOverrides = {}; // Clear all overrides
@@ -983,7 +975,7 @@ function initialize(env, context, specifiedOptions, platform, extraOptionDefs) {
983975
const result = {};
984976
Object.keys(flagOverrides).forEach(key => {
985977
const override = flagOverrides[key];
986-
if (override && !override.deleted) {
978+
if (override) {
987979
result[key] = override.value;
988980
}
989981
});

0 commit comments

Comments
 (0)