| 1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179 |
1×
1×
1×
1×
1×
1×
12×
12×
23×
19×
12×
12×
12×
12×
64×
64×
12×
12×
67×
64×
66×
2×
3×
62×
1×
2×
2×
2×
2×
2×
2×
2×
2×
2×
2×
2×
2×
2×
2×
2×
1×
2×
1×
4×
4×
4×
4×
4×
4×
20×
20×
4×
4×
1×
8×
8×
8×
8×
8×
8×
36×
34×
2×
2×
2×
4×
2×
2×
2×
2×
8×
2×
2×
2×
2×
2×
6×
1×
10×
| 'use strict';
var _ = require('lodash');
var semver = require('semver');
var inquirer = require('inquirer');
var fecom = require('../fecom');
var Component = require('./Component');
function buildConflictList(treeModel, installed) {
var nodes = treeModel.walk('DFS');
var toInstallAll = _.tail(nodes)
.filter(function (node) {
return !node.installed && !node.merged;
}).map(function (node) {
return new Component(node, 'remote');
});
var allComponents = toInstallAll.concat(installed);
// Check if components with same name belong to different owners
var componentList = _(allComponents)
.groupBy('name')
.value();
var conflictList = [];
_.invokeMap(componentList, function () {
var components = _(this).uniqBy('owner').value();
Iif (components.length > 1) {
conflictList.push({
name: components[0].name,
owners: components.map(function (component) {
return component.owner;
})
});
}
});
Iif (conflictList.length > 0) {
var err = new Error(fecom.i18n('COMPONENT_OWNERS_CONFLICT'));
err.conflictList = conflictList;
throw err;
}
return _(allComponents)
.groupBy(function (node) {
return node.owner + '/' + node.name;
})
.mapValues(function (list) {
if (list.some(function (component) {
return component.resolved;
})) {
return list.filter(function (component) {
return component.resolved;
}).slice(0, 1);
}
return list;
})
.value();
}
function resolveTreeConflict(treeModel, semantic, resolvedVersion, conflicts) {
var parsed = fecom.parse(semantic);
parsed.version = resolvedVersion;
var toResolve = _.filter(conflicts, parsed).slice(0, 1);
var toRemove = _.reject(conflicts, parsed);
var toResolvePaths = [];
var toRemovePaths = [];
toResolvePaths = toResolve.reduce(function (paths, component) {
paths = paths.concat(treeModel.findPathByNode(_.pick(component, ['name', 'owner', 'version'])));
return paths;
}, toResolvePaths);
toRemovePaths = toRemove.reduce(function (paths, component) {
paths = paths.concat(treeModel.findPathByNode(_.pick(component, ['name', 'owner', 'version'])));
return paths;
}, toRemovePaths);
toResolvePaths.forEach(function (path) {
treeModel.updateTreeByPath(path, { resolved: true });
});
toRemovePaths.forEach(function (path) {
treeModel.removeTreeByPath(path);
});
return treeModel;
}
function resolveConflictByAsk(treeModel, installed) {
var conflictList = buildConflictList(treeModel, installed);
var conflicted = '';
var conflicts = [];
var questions = [];
var choices = [];
_.forIn(conflictList, function (components, semantic) {
Eif (1 === components.length) {
return true;
}
conflicted = semantic;
conflicts = components;
choices = components.map(function (component) {
return {
name: component.version + ' ($0)'.replace('$0', fecom.i18n((component.type === 'local' ? 'INSTALLED' : 'TO_INSTALL'))),
value: component.version
};
});
choices = _.uniqBy(choices, 'value');
return false;
});
Iif (choices.length) {
questions = {
name: 'version',
message: 'Please choose a version: ',
type: 'list',
choices: choices
};
fecom.logger.info(fecom.i18n('COMPONENT_VERSION_CONFLICT', conflicted));
return inquirer.prompt(questions)
.then(function (answers) {
resolveTreeConflict(treeModel, conflicted, answers.version, conflicts);
return resolveConflictByAsk(treeModel, installed);
})
.then(function () {
return treeModel;
});
}
return treeModel;
}
function resolveConflictByLatest(treeModel, installed) {
var conflictList = buildConflictList(treeModel, installed);
var conflicted = '';
var conflictVersions = '';
var conflicts = [];
var resolved = null;
_.forIn(conflictList, function (components, semantic) {
if (1 === components.length) {
return true;
}
// Resolve conflict by latest
conflicted = semantic;
conflicts = components;
conflictVersions = components.map(function (component) {
return component.version;
}).join(',');
resolved = _.last(conflicts.sort(function (a, b) {
return semver.compare(a.version, b.version);
}));
Iif (_.uniqBy(conflicts, 'version').length === 1) {
resolved = null;
}
return false;
});
if (resolved) {
fecom.logger.info(fecom.i18n('MERGE_CONFLICT_VERSIONS', conflicted.yellow, conflictVersions.red, resolved.version.yellow));
return fecom.async(resolved)
.then(function (resolved) {
resolveTreeConflict(treeModel, conflicted, resolved.version, conflicts);
return resolveConflictByLatest(treeModel, installed);
})
.then(function () {
return treeModel;
});
}
return treeModel;
}
module.exports = function (treeModel, installed, strategy) {
return 'ask' === strategy ? resolveConflictByAsk(treeModel, installed) : resolveConflictByLatest(treeModel, installed);
}; |