github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-07 20:31:06 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #6 from overleaf/jpa-export-merge

Browse source 
[misc] expose merge function in a separate module
This commit is contained in:
Jakob Ackermann 2021-07-06 15:43:10 +02:00 committed by GitHub
commit 81f4c31208
3 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
libraries/settings/Settings.js
View file

@ -2,17 +2,7 @@ let defaults, possibleConfigFiles, settingsExist;
const fs = require("fs"); const fs = require("fs");
const path = require("path"); const path = require("path");
const env = (process.env.NODE_ENV || "development").toLowerCase(); const env = (process.env.NODE_ENV || "development").toLowerCase();
const { merge } = require('./merge');
const merge = function(settings, defaults) {
for (const [key, value] of Object.entries(settings)) {
if ((typeof(value) === "object") && !(value instanceof Array)) {
defaults[key] = merge(value, defaults[key] || {});
} else {
defaults[key] = value;
}
}
return defaults;
};
const defaultSettingsPath = path.normalize(__dirname + "/../../config/settings.defaults"); const defaultSettingsPath = path.normalize(__dirname + "/../../config/settings.defaults");

12
libraries/settings/merge.js Normal file
View file

@ -0,0 +1,12 @@
function merge(settings, defaults) {
for (const [key, value] of Object.entries(settings)) {
if ((typeof(value) === "object") && !(value instanceof Array)) {
defaults[key] = merge(value, defaults[key] || {});
} else {
defaults[key] = value;
}
}
return defaults;
}
module.exports = { merge };

2
libraries/settings/package.json
View file

@ -1,6 +1,6 @@
{ {
"name": "@overleaf/settings", "name": "@overleaf/settings",
"description": "A centralised settings system for Overleaf", "description": "A centralised settings system for Overleaf",
"version": "2.0.0", "version": "2.1.0",
"repository": "overleaf/settings-module" "repository": "overleaf/settings-module"
} }