Skip to content

Commit f7e424e

Browse files
bershanskiybershanskiy
authored
Refactor: consistently mark class members public and static (darkreader#10708)
1 parent b75600f commit f7e424e

13 files changed

Lines changed: 329 additions & 319 deletions

‎src/background/config-manager.ts‎

Lines changed: 49 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -47,23 +47,23 @@ interface Config extends LocalConfig {
4747

4848
export default class ConfigManager {
4949
private static DARK_SITES_INDEX: SiteListIndex | null;
50-
static DYNAMIC_THEME_FIXES_INDEX: SitePropsIndex<DynamicThemeFix> | null;
51-
static DYNAMIC_THEME_FIXES_RAW: string | null;
52-
static INVERSION_FIXES_INDEX: SitePropsIndex<InversionFix> | null;
53-
static INVERSION_FIXES_RAW: string | null;
54-
static STATIC_THEMES_INDEX: SitePropsIndex<StaticTheme> | null;
55-
static STATIC_THEMES_RAW: string | null;
56-
static COLOR_SCHEMES_RAW: ParsedColorSchemeConfig | null;
57-
58-
static raw = {
50+
public static DYNAMIC_THEME_FIXES_INDEX: SitePropsIndex<DynamicThemeFix> | null;
51+
public static DYNAMIC_THEME_FIXES_RAW: string | null;
52+
public static INVERSION_FIXES_INDEX: SitePropsIndex<InversionFix> | null;
53+
public static INVERSION_FIXES_RAW: string | null;
54+
public static STATIC_THEMES_INDEX: SitePropsIndex<StaticTheme> | null;
55+
public static STATIC_THEMES_RAW: string | null;
56+
public static COLOR_SCHEMES_RAW: ParsedColorSchemeConfig | null;
57+
58+
public static raw = {
5959
darkSites: null as string | null,
6060
dynamicThemeFixes: null as string | null,
6161
inversionFixes: null as string | null,
6262
staticThemes: null as string | null,
6363
colorSchemes: null as string | null,
6464
};
6565

66-
static overrides = {
66+
public static overrides = {
6767
darkSites: null as string | null,
6868
dynamicThemeFixes: null as string | null,
6969
inversionFixes: null as string | null,
@@ -95,61 +95,61 @@ export default class ConfigManager {
9595
}
9696

9797
private static async loadColorSchemes({local}: LocalConfig) {
98-
const $config = await this.loadConfig({
98+
const $config = await ConfigManager.loadConfig({
9999
name: 'Color Schemes',
100100
local,
101101
localURL: CONFIG_URLs.colorSchemes.local,
102102
remoteURL: CONFIG_URLs.colorSchemes.remote,
103103
});
104-
this.raw.colorSchemes = $config;
105-
this.handleColorSchemes();
104+
ConfigManager.raw.colorSchemes = $config;
105+
ConfigManager.handleColorSchemes();
106106
}
107107

108108
private static async loadDarkSites({local}: LocalConfig) {
109-
const sites = await this.loadConfig({
109+
const sites = await ConfigManager.loadConfig({
110110
name: 'Dark Sites',
111111
local,
112112
localURL: CONFIG_URLs.darkSites.local,
113113
remoteURL: CONFIG_URLs.darkSites.remote,
114114
});
115-
this.raw.darkSites = sites;
116-
this.handleDarkSites();
115+
ConfigManager.raw.darkSites = sites;
116+
ConfigManager.handleDarkSites();
117117
}
118118

119119
private static async loadDynamicThemeFixes({local}: LocalConfig) {
120-
const fixes = await this.loadConfig({
120+
const fixes = await ConfigManager.loadConfig({
121121
name: 'Dynamic Theme Fixes',
122122
local,
123123
localURL: CONFIG_URLs.dynamicThemeFixes.local,
124124
remoteURL: CONFIG_URLs.dynamicThemeFixes.remote,
125125
});
126-
this.raw.dynamicThemeFixes = fixes;
127-
this.handleDynamicThemeFixes();
126+
ConfigManager.raw.dynamicThemeFixes = fixes;
127+
ConfigManager.handleDynamicThemeFixes();
128128
}
129129

130130
private static async loadInversionFixes({local}: LocalConfig) {
131-
const fixes = await this.loadConfig({
131+
const fixes = await ConfigManager.loadConfig({
132132
name: 'Inversion Fixes',
133133
local,
134134
localURL: CONFIG_URLs.inversionFixes.local,
135135
remoteURL: CONFIG_URLs.inversionFixes.remote,
136136
});
137-
this.raw.inversionFixes = fixes;
138-
this.handleInversionFixes();
137+
ConfigManager.raw.inversionFixes = fixes;
138+
ConfigManager.handleInversionFixes();
139139
}
140140

141141
private static async loadStaticThemes({local}: LocalConfig) {
142-
const themes = await this.loadConfig({
142+
const themes = await ConfigManager.loadConfig({
143143
name: 'Static Themes',
144144
local,
145145
localURL: CONFIG_URLs.staticThemes.local,
146146
remoteURL: CONFIG_URLs.staticThemes.remote,
147147
});
148-
this.raw.staticThemes = themes;
149-
this.handleStaticThemes();
148+
ConfigManager.raw.staticThemes = themes;
149+
ConfigManager.handleStaticThemes();
150150
}
151151

152-
static async load(config?: LocalConfig) {
152+
public static async load(config?: LocalConfig) {
153153
if (!config) {
154154
await UserStorage.loadSettings();
155155
config = {
@@ -158,49 +158,49 @@ export default class ConfigManager {
158158
}
159159

160160
await Promise.all([
161-
this.loadColorSchemes(config),
162-
this.loadDarkSites(config),
163-
this.loadDynamicThemeFixes(config),
164-
this.loadInversionFixes(config),
165-
this.loadStaticThemes(config),
161+
ConfigManager.loadColorSchemes(config),
162+
ConfigManager.loadDarkSites(config),
163+
ConfigManager.loadDynamicThemeFixes(config),
164+
ConfigManager.loadInversionFixes(config),
165+
ConfigManager.loadStaticThemes(config),
166166
]).catch((err) => console.error('Fatality', err));
167167
}
168168

169169
private static handleColorSchemes() {
170-
const $config = this.raw.colorSchemes;
170+
const $config = ConfigManager.raw.colorSchemes;
171171
const {result, error} = ParseColorSchemeConfig($config || '');
172172
if (error) {
173173
logWarn(`Color Schemes parse error, defaulting to fallback. ${error}.`);
174-
this.COLOR_SCHEMES_RAW = DEFAULT_COLORSCHEME;
174+
ConfigManager.COLOR_SCHEMES_RAW = DEFAULT_COLORSCHEME;
175175
return;
176176
}
177-
this.COLOR_SCHEMES_RAW = result;
177+
ConfigManager.COLOR_SCHEMES_RAW = result;
178178
}
179179

180180
private static handleDarkSites() {
181-
const $sites = this.overrides.darkSites || this.raw.darkSites;
182-
this.DARK_SITES_INDEX = indexSiteListConfig($sites || '');
181+
const $sites = ConfigManager.overrides.darkSites || ConfigManager.raw.darkSites;
182+
ConfigManager.DARK_SITES_INDEX = indexSiteListConfig($sites || '');
183183
}
184184

185-
static handleDynamicThemeFixes() {
186-
const $fixes = this.overrides.dynamicThemeFixes || this.raw.dynamicThemeFixes || '';
187-
this.DYNAMIC_THEME_FIXES_INDEX = indexSitesFixesConfig<DynamicThemeFix>($fixes);
188-
this.DYNAMIC_THEME_FIXES_RAW = $fixes;
185+
public static handleDynamicThemeFixes() {
186+
const $fixes = ConfigManager.overrides.dynamicThemeFixes || ConfigManager.raw.dynamicThemeFixes || '';
187+
ConfigManager.DYNAMIC_THEME_FIXES_INDEX = indexSitesFixesConfig<DynamicThemeFix>($fixes);
188+
ConfigManager.DYNAMIC_THEME_FIXES_RAW = $fixes;
189189
}
190190

191-
static handleInversionFixes() {
192-
const $fixes = this.overrides.inversionFixes || this.raw.inversionFixes || '';
193-
this.INVERSION_FIXES_INDEX = indexSitesFixesConfig<InversionFix>($fixes);
194-
this.INVERSION_FIXES_RAW = $fixes;
191+
public static handleInversionFixes() {
192+
const $fixes = ConfigManager.overrides.inversionFixes || ConfigManager.raw.inversionFixes || '';
193+
ConfigManager.INVERSION_FIXES_INDEX = indexSitesFixesConfig<InversionFix>($fixes);
194+
ConfigManager.INVERSION_FIXES_RAW = $fixes;
195195
}
196196

197-
static handleStaticThemes() {
198-
const $themes = this.overrides.staticThemes || this.raw.staticThemes || '';
199-
this.STATIC_THEMES_INDEX = indexSitesFixesConfig<StaticTheme>($themes);
200-
this.STATIC_THEMES_RAW = $themes;
197+
public static handleStaticThemes() {
198+
const $themes = ConfigManager.overrides.staticThemes || ConfigManager.raw.staticThemes || '';
199+
ConfigManager.STATIC_THEMES_INDEX = indexSitesFixesConfig<StaticTheme>($themes);
200+
ConfigManager.STATIC_THEMES_RAW = $themes;
201201
}
202202

203-
static isURLInDarkList(url: string): boolean {
203+
public static isURLInDarkList(url: string): boolean {
204204
return isURLInSiteList(url, ConfigManager.DARK_SITES_INDEX);
205205
}
206206
}

‎src/background/content-script-manager.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ export default class ContentScriptManager {
3434
* to be supported already...
3535
*/
3636

37-
static state: ContentScriptManagerState;
37+
public static state: ContentScriptManagerState;
3838

39-
static async registerScripts(updateContentScripts: () => Promise<void>) {
39+
public static async registerScripts(updateContentScripts: () => Promise<void>) {
4040
if (!__CHROMIUM_MV3__) {
4141
logWarn('ContentScriptManager is useful only within MV3 builds.');
4242
return;
@@ -98,7 +98,7 @@ export default class ContentScriptManager {
9898
));
9999
}
100100

101-
static async unregisterScripts() {
101+
public static async unregisterScripts() {
102102
if (!__CHROMIUM_MV3__) {
103103
logWarn('ContentScriptManager is useful only within MV3 builds.');
104104
return;

‎src/background/devtools.ts‎

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -96,16 +96,16 @@ export default class DevTools {
9696
private static onChange: () => void;
9797
private static store: DevToolsStorage;
9898

99-
static init(onChange: () => void) {
99+
public static init(onChange: () => void) {
100100
// Firefox don't seem to like using storage.local to store big data on the background-extension.
101101
// Disabling it for now and defaulting back to localStorage.
102-
if (typeof chrome.storage.local !== 'undefined' && chrome.storage.local !== null && !isFirefox) {
103-
this.store = new PersistentStorageWrapper();
102+
if (!isFirefox && typeof chrome.storage.local !== 'undefined' && chrome.storage.local !== null) {
103+
DevTools.store = new PersistentStorageWrapper();
104104
} else {
105-
this.store = new TempStorage();
105+
DevTools.store = new TempStorage();
106106
}
107-
this.loadConfigOverrides();
108-
this.onChange = onChange;
107+
DevTools.loadConfigOverrides();
108+
DevTools.onChange = onChange;
109109
}
110110

111111
private static KEY_DYNAMIC = 'dev_dynamic_theme_fixes';
@@ -118,25 +118,25 @@ export default class DevTools {
118118
inversionFixes,
119119
staticThemes
120120
] = await Promise.all([
121-
this.getSavedDynamicThemeFixes(),
122-
this.getSavedInversionFixes(),
123-
this.getSavedStaticThemes(),
121+
DevTools.getSavedDynamicThemeFixes(),
122+
DevTools.getSavedInversionFixes(),
123+
DevTools.getSavedStaticThemes(),
124124
]);
125125
ConfigManager.overrides.dynamicThemeFixes = dynamicThemeFixes || null;
126126
ConfigManager.overrides.inversionFixes = inversionFixes || null;
127127
ConfigManager.overrides.staticThemes = staticThemes || null;
128128
}
129129

130130
private static async getSavedDynamicThemeFixes() {
131-
return this.store.get(DevTools.KEY_DYNAMIC);
131+
return DevTools.store.get(DevTools.KEY_DYNAMIC);
132132
}
133133

134134
private static saveDynamicThemeFixes(text: string) {
135-
this.store.set(DevTools.KEY_DYNAMIC, text);
135+
DevTools.store.set(DevTools.KEY_DYNAMIC, text);
136136
}
137137

138-
static async getDynamicThemeFixesText() {
139-
let rawFixes = await this.getSavedDynamicThemeFixes();
138+
public static async getDynamicThemeFixesText() {
139+
let rawFixes = await DevTools.getSavedDynamicThemeFixes();
140140
if (!rawFixes) {
141141
await ConfigManager.load();
142142
rawFixes = ConfigManager.DYNAMIC_THEME_FIXES_RAW || '';
@@ -145,20 +145,20 @@ export default class DevTools {
145145
return formatDynamicThemeFixes(fixes);
146146
}
147147

148-
static resetDynamicThemeFixes() {
149-
this.store.remove(DevTools.KEY_DYNAMIC);
148+
public static resetDynamicThemeFixes() {
149+
DevTools.store.remove(DevTools.KEY_DYNAMIC);
150150
ConfigManager.overrides.dynamicThemeFixes = null;
151151
ConfigManager.handleDynamicThemeFixes();
152-
this.onChange();
152+
DevTools.onChange();
153153
}
154154

155-
static applyDynamicThemeFixes(text: string) {
155+
public static applyDynamicThemeFixes(text: string) {
156156
try {
157157
const formatted = formatDynamicThemeFixes(parseDynamicThemeFixes(text));
158158
ConfigManager.overrides.dynamicThemeFixes = formatted;
159159
ConfigManager.handleDynamicThemeFixes();
160-
this.saveDynamicThemeFixes(formatted);
161-
this.onChange();
160+
DevTools.saveDynamicThemeFixes(formatted);
161+
DevTools.onChange();
162162
return null;
163163
} catch (err) {
164164
return err;
@@ -173,8 +173,8 @@ export default class DevTools {
173173
this.store.set(DevTools.KEY_FILTER, text);
174174
}
175175

176-
static async getInversionFixesText() {
177-
let rawFixes = await this.getSavedInversionFixes();
176+
public static async getInversionFixesText() {
177+
let rawFixes = await DevTools.getSavedInversionFixes();
178178
if (!rawFixes) {
179179
await ConfigManager.load();
180180
rawFixes = ConfigManager.INVERSION_FIXES_RAW || '';
@@ -183,36 +183,36 @@ export default class DevTools {
183183
return formatInversionFixes(fixes);
184184
}
185185

186-
static resetInversionFixes() {
187-
this.store.remove(DevTools.KEY_FILTER);
186+
public static resetInversionFixes() {
187+
DevTools.store.remove(DevTools.KEY_FILTER);
188188
ConfigManager.overrides.inversionFixes = null;
189189
ConfigManager.handleInversionFixes();
190-
this.onChange();
190+
DevTools.onChange();
191191
}
192192

193-
static applyInversionFixes(text: string) {
193+
public static applyInversionFixes(text: string) {
194194
try {
195195
const formatted = formatInversionFixes(parseInversionFixes(text));
196196
ConfigManager.overrides.inversionFixes = formatted;
197197
ConfigManager.handleInversionFixes();
198-
this.saveInversionFixes(formatted);
199-
this.onChange();
198+
DevTools.saveInversionFixes(formatted);
199+
DevTools.onChange();
200200
return null;
201201
} catch (err) {
202202
return err;
203203
}
204204
}
205205

206206
private static async getSavedStaticThemes() {
207-
return this.store.get(DevTools.KEY_STATIC);
207+
return DevTools.store.get(DevTools.KEY_STATIC);
208208
}
209209

210210
private static saveStaticThemes(text: string) {
211-
this.store.set(DevTools.KEY_STATIC, text);
211+
DevTools.store.set(DevTools.KEY_STATIC, text);
212212
}
213213

214-
static async getStaticThemesText() {
215-
let rawThemes = await this.getSavedStaticThemes();
214+
public static async getStaticThemesText() {
215+
let rawThemes = await DevTools.getSavedStaticThemes();
216216
if (!rawThemes) {
217217
await ConfigManager.load();
218218
rawThemes = ConfigManager.STATIC_THEMES_RAW || '';
@@ -221,20 +221,20 @@ export default class DevTools {
221221
return formatStaticThemes(themes);
222222
}
223223

224-
static resetStaticThemes() {
225-
this.store.remove(DevTools.KEY_STATIC);
224+
public static resetStaticThemes() {
225+
DevTools.store.remove(DevTools.KEY_STATIC);
226226
ConfigManager.overrides.staticThemes = null;
227227
ConfigManager.handleStaticThemes();
228-
this.onChange();
228+
DevTools.onChange();
229229
}
230230

231-
static applyStaticThemes(text: string) {
231+
public static applyStaticThemes(text: string) {
232232
try {
233233
const formatted = formatStaticThemes(parseStaticThemes(text));
234234
ConfigManager.overrides.staticThemes = formatted;
235235
ConfigManager.handleStaticThemes();
236-
this.saveStaticThemes(formatted);
237-
this.onChange();
236+
DevTools.saveStaticThemes(formatted);
237+
DevTools.onChange();
238238
return null;
239239
} catch (err) {
240240
return err;

0 commit comments

Comments
 (0)