Skip to content

Commit 4dcdea1

Browse files
committed
feature(@putout/compare) baseNode -> templateNode
1 parent 534d6a5 commit 4dcdea1

File tree

2 files changed

+28
-28
lines changed

2 files changed

+28
-28
lines changed

packages/compare/lib/compare.js

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -78,41 +78,41 @@ module.exports.getValues = getValues;
7878
module.exports.setValues = setValues;
7979
module.exports.getTemplateValues = getTemplateValues;
8080

81-
function compare(path, base) {
81+
function compare(path, template) {
8282
const node = parseNode(path);
83-
const baseNode = parseNode(base);
83+
const templateNode = parseNode(template);
8484

85-
if (isEqualAnyObject(node, baseNode))
85+
if (isEqualAnyObject(node, templateNode))
8686
return true;
8787

88-
if (isEqualAnyArray(node, baseNode))
88+
if (isEqualAnyArray(node, templateNode))
8989
return true;
9090

91-
if (isEqualNop(node, baseNode))
91+
if (isEqualNop(node, templateNode))
9292
return true;
9393

94-
if (isPath(path) && !isEqualType(node, baseNode)) {
95-
const {type} = baseNode;
94+
if (isPath(path) && !isEqualType(node, templateNode)) {
95+
const {type} = templateNode;
9696
const newPathNode = findParent(path, type);
9797

98-
return superCompareIterate(newPathNode, baseNode);
98+
return superCompareIterate(newPathNode, templateNode);
9999
}
100100

101-
return superCompareIterate(node, baseNode);
101+
return superCompareIterate(node, templateNode);
102102
}
103103

104-
module.exports.compareAny = (path, baseNodes) => {
105-
for (const base of baseNodes) {
106-
if (compare(path, base))
104+
module.exports.compareAny = (path, templateNodes) => {
105+
for (const template of templateNodes) {
106+
if (compare(path, template))
107107
return true;
108108
}
109109

110110
return false;
111111
};
112112

113-
module.exports.compareAll = (path, baseNodes) => {
114-
for (const base of baseNodes) {
115-
if (!compare(path, base))
113+
module.exports.compareAll = (path, templateNodes) => {
114+
for (const template of templateNodes) {
115+
if (!compare(path, template))
116116
return false;
117117
}
118118

@@ -133,25 +133,25 @@ const ignore = [
133133
'trailingComments',
134134
];
135135

136-
function superCompareIterate(node, base) {
137-
let item = [node, base];
136+
function superCompareIterate(node, template) {
137+
let item = [node, template];
138138

139139
const array = [item];
140140
const templateStore = {};
141141
const add = superPush(array);
142142

143143
while (item = array.pop()) {
144-
const [node, base] = item;
144+
const [node, template] = item;
145145

146146
if (!node)
147147
return false;
148148

149-
for (const key of keys(base)) {
149+
for (const key of keys(template)) {
150150
if (ignore.includes(key))
151151
continue;
152152

153153
const nodeValue = extractExpression(node[key]);
154-
const value = extractExpression(base[key]);
154+
const value = extractExpression(template[key]);
155155

156156
const is = superCompare(nodeValue, value, {
157157
add,

packages/compare/lib/is.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -159,31 +159,31 @@ module.exports.isImports = (a) => {
159159
const __OBJECT_TYPE = 'ObjectPattern|ObjectExpression';
160160
const __ARRAY_TYPE = 'ArrayPattern|ArrayExpression';
161161

162-
module.exports.isEqualAnyArray = (node, baseNode) => {
163-
if (!isAnyArray(baseNode))
162+
module.exports.isEqualAnyArray = (node, templateNode) => {
163+
if (!isAnyArray(templateNode))
164164
return false;
165165

166166
const {type} = node;
167167
return __ARRAY_TYPE.includes(type);
168168
};
169169

170-
module.exports.isEqualAnyObject = (node, baseNode) => {
171-
if (!isAnyObject(baseNode))
170+
module.exports.isEqualAnyObject = (node, templateNode) => {
171+
if (!isAnyObject(templateNode))
172172
return false;
173173

174174
const {type} = node;
175175
return __OBJECT_TYPE.includes(type);
176176
};
177177

178-
module.exports.isEqualBody = (node, baseNode) => {
179-
if (!isBody(baseNode))
178+
module.exports.isEqualBody = (node, templateNode) => {
179+
if (!isBody(templateNode))
180180
return false;
181181

182182
return node.type === 'BlockStatement';
183183
};
184184

185-
module.exports.isEqualNop = (node, baseNode) => {
186-
if (!isNop(baseNode))
185+
module.exports.isEqualNop = (node, templateNode) => {
186+
if (!isNop(templateNode))
187187
return false;
188188

189189
if (!isFunction(node))

0 commit comments

Comments
 (0)