Skip to content
Open
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
31 changes: 27 additions & 4 deletions lib/core.js
Original file line number Diff line number Diff line change
Expand Up @@ -944,19 +944,42 @@
for(var key in r.data) {
var v = r.data[key];

// TODO: work with arrays?
if (v !== '' && v !== null && ((typeof v === 'string' && !/^\s+$/.test(v)) || typeof v === 'number' || typeof v === 'object')) {

// Check meta plugins order.
allResults.vars._sources = allResults.vars._sources || {};

var prevOrder = null, nextOrder = null, pluginId = allResults.vars._sources[key];
var prevOrder = null, nextOrder = null, prevPluginId = allResults.vars._sources[key];

if (pluginId && plugins[pluginId] && plugins[r.method.pluginId]) {
prevOrder = plugins[pluginId].order;
if (prevPluginId && plugins[prevPluginId] && plugins[r.method.pluginId]) {
prevOrder = plugins[prevPluginId].order;
nextOrder = plugins[r.method.pluginId].order;
}

if (!prevOrder || !nextOrder || prevOrder < nextOrder) {
var oldValue = allResults.vars[key];

var newValueOverrides = !prevOrder || !nextOrder || prevOrder < nextOrder;

if (typeof v === 'object' && typeof oldValue === 'object') {

if (newValueOverrides) {
// Override existing object.
Object.assign(oldValue, v);
} else {
// Reassign with old values on top.
allResults.vars[key] = Object.assign(v, oldValue);
}

if (!Array.isArray(allResults.vars._sources[key])) {
// Convert sources list to array.
allResults.vars._sources[key] = [allResults.vars._sources[key]];
}
allResults.vars._sources[key].push(r.method.pluginId);

} else if (newValueOverrides) {

// Assign new non object value.
allResults.vars[key] = v;
allResults.vars._sources[key] = r.method.pluginId;
}
Expand Down
Loading