Skip to content

[Breaking]: Don't return node.start & node.end #100

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 7, 2020
Merged

[Breaking]: Don't return node.start & node.end #100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 14 additions & 17 deletions __tests__/src/getProp-parser-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,45 +61,42 @@ function actualTest(parserName, test) {

assert.deepStrictEqual(
adjustLocations(sourceResult, offset),
adjustRangeStartAndEnd(targetResult),
adjustRange(targetResult),
);
}

function adjustRangeStartAndEnd({ name, value: { expression, ...value }, ...node }) {
function adjustRange({ name, value: { expression, ...value }, ...node }) {
return {
...adjustNodeRangeStartAndEnd(node),
name: adjustNodeRangeStartAndEnd(name),
...adjustNodeRange(node),
name: adjustNodeRange(name),
value: {
...adjustNodeRangeStartAndEnd(value),
...(expression
? { expression: adjustNodeRangeStartAndEndRecursively(expression) }
: {}
),
...adjustNodeRange(value),
...(expression ? { expression: adjustNodeRangeRecursively(expression) } : {}),
},
};
}

function adjustNodeRangeStartAndEnd(node) {
function adjustNodeRange(node) {
if (!node.loc) {
return node;
}

const [start, end] = node.range || [node.start, node.end];
return {
...node,
end,
end: undefined,
range: [start, end],
start,
start: undefined,
};
}

function adjustNodeRangeStartAndEndRecursively(node) {
function adjustNodeRangeRecursively(node) {
if (Array.isArray(node)) {
return node.map(adjustNodeRangeStartAndEndRecursively);
return node.map(adjustNodeRangeRecursively);
}

if (node && typeof node === 'object') {
return adjustNodeRangeStartAndEnd(mapValues(node, adjustNodeRangeStartAndEndRecursively));
return adjustNodeRange(mapValues(node, adjustNodeRangeRecursively));
}

return node;
Expand Down Expand Up @@ -143,7 +140,7 @@ function adjustNodeLocations(node, { startOffset, endOffset }) {
const [start, end] = node.range || [];
return {
...node,
end: node.end + endOffset,
end: undefined,
loc: {
...node.loc,
start: {
Expand All @@ -156,7 +153,7 @@ function adjustNodeLocations(node, { startOffset, endOffset }) {
},
},
range: [start + startOffset, end + endOffset],
start: node.start + startOffset,
start: undefined,
};
}

Expand Down
26 changes: 10 additions & 16 deletions src/getProp.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,43 +42,37 @@ function propertyToJSXAttribute(node) {
type: 'JSXAttribute',
name: { type: 'JSXIdentifier', name: key.name, ...getBaseProps(key) },
value: value.type === 'Literal'
? adjustRangeStartAndEndOfNode(value)
: {
type: 'JSXExpressionContainer',
expression: adjustExpressionRangeStartAndEnd(value),
...getBaseProps(value),
},
? adjustRangeOfNode(value)
: { type: 'JSXExpressionContainer', expression: adjustExpressionRange(value), ...getBaseProps(value) },
...getBaseProps(node),
};
}

function adjustRangeStartAndEndOfNode(node) {
function adjustRangeOfNode(node) {
const [start, end] = node.range || [node.start, node.end];

return {
...node,
end,
end: undefined,
range: [start, end],
start,
start: undefined,
};
}

function adjustExpressionRangeStartAndEnd({ expressions, quasis, ...expression }) {
function adjustExpressionRange({ expressions, quasis, ...expression }) {
return {
...adjustRangeStartAndEndOfNode(expression),
...(expressions ? { expressions: expressions.map(adjustRangeStartAndEndOfNode) } : {}),
...(quasis ? { quasis: quasis.map(adjustRangeStartAndEndOfNode) } : {}),
...adjustRangeOfNode(expression),
...(expressions ? { expressions: expressions.map(adjustRangeOfNode) } : {}),
...(quasis ? { quasis: quasis.map(adjustRangeOfNode) } : {}),
};
}

function getBaseProps({ loc, ...node }) {
const { end, range, start } = adjustRangeStartAndEndOfNode(node);
const { range } = adjustRangeOfNode(node);

return {
end,
loc: getBaseLocation(loc),
range,
start,
};
}

Expand Down