Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 7 additions & 20 deletions lib/util/customConfig.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,9 @@ try {
}

const CHECK_REFRESH_RATE = 1_000;
let previousConfig = null;
let lastCheck = null;
let mergedConfig = null;
let lastModifiedDate = null;
let mergedConfig = new Map();
let lastModifiedDate = new Map();

/**
* @see https://stackoverflow.com/questions/9210542/node-js-require-cache-possible-to-invalidate
Expand Down Expand Up @@ -48,9 +47,9 @@ function loadConfig(config) {
if (stats === null) {
// Default to no config
loadedConfig = {};
} else if (lastModifiedDate !== mtime) {
} else if (lastModifiedDate.get(resolvedPath) !== mtime) {
// Load the config based on path
lastModifiedDate = mtime;
lastModifiedDate.set(resolvedPath, mtime);
loadedConfig = requireUncached(resolvedPath);
} else {
// Unchanged config
Expand All @@ -70,31 +69,19 @@ function loadConfig(config) {
}
}

function convertConfigToString(config) {
switch (typeof config) {
case 'string':
return config;
case 'object':
return JSON.stringify(config);
default:
return config.toString();
}
}

function resolve(twConfig) {
const newConfig = convertConfigToString(twConfig) !== convertConfigToString(previousConfig);
const newConfig = mergedConfig.get(twConfig) === undefined;
const now = Date.now();
const expired = now - lastCheck > CHECK_REFRESH_RATE;
if (newConfig || expired) {
previousConfig = twConfig;
lastCheck = now;
const userConfig = loadConfig(twConfig);
// userConfig is null when config file was not modified
if (userConfig !== null) {
mergedConfig = resolveConfig(userConfig);
mergedConfig.set(twConfig, resolveConfig(userConfig));
}
}
return mergedConfig;
return mergedConfig.get(twConfig);
}

module.exports = {
Expand Down