Skip to content
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

Use spread syntax for shallow clones #8

Merged
merged 4 commits into from
Jul 19, 2023
Merged

Use spread syntax for shallow clones #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c579bf0
Use spread syntax for shallow clones
remcohaszing Jun 15, 2023
9fbb129
Rename properties to fields
remcohaszing Jun 16, 2023
11912e4
Fit statement on single line
remcohaszing Jun 16, 2023
2511415
Replace destructuring syntax
remcohaszing Jun 17, 2023
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
45 changes: 11 additions & 34 deletions lib/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,11 +281,9 @@ export function buildJsx(tree, options) {

/** @type {MemberExpression | Literal | Identifier} */
let name
/** @type {Array<Property>} */
let fields = []
/** @type {Array<Property | SpreadElement>} */
const fields = []
/** @type {Array<Expression>} */
const objects = []
/** @type {Array<Expression | SpreadElement>} */
let parameters = []
/** @type {Expression | undefined} */
let key
Expand Down Expand Up @@ -314,12 +312,12 @@ export function buildJsx(tree, options) {
const attribute = attributes[index]

if (attribute.type === 'JSXSpreadAttribute') {
if (fields.length > 0) {
objects.push({type: 'ObjectExpression', properties: fields})
fields = []
if (attribute.argument.type === 'ObjectExpression') {
fields.push(...attribute.argument.properties)
} else {
fields.push({type: 'SpreadElement', argument: attribute.argument})
}

objects.push(attribute.argument)
spread = true
} else {
const prop = toProperty(attribute)
Expand Down Expand Up @@ -373,33 +371,11 @@ export function buildJsx(tree, options) {
parameters = children
}

if (fields.length > 0) {
objects.push({type: 'ObjectExpression', properties: fields})
}

/** @type {Expression | undefined} */
let props
/** @type {MemberExpression | Literal | Identifier} */
let callee

if (objects.length > 1) {
// Don’t mutate the first object, shallow clone instead.
if (objects[0].type !== 'ObjectExpression') {
objects.unshift({type: 'ObjectExpression', properties: []})
}

props = {
type: 'CallExpression',
callee: toMemberExpression('Object.assign'),
arguments: objects,
optional: false
}
} else if (objects.length > 0) {
props = objects[0]
}

if (automatic) {
parameters.push(props || {type: 'ObjectExpression', properties: []})
parameters.push({type: 'ObjectExpression', properties: fields})

if (key) {
parameters.push(key)
Expand Down Expand Up @@ -470,9 +446,10 @@ export function buildJsx(tree, options) {
}
// Classic.
else {
// There are props or children.
if (props || parameters.length > 0) {
parameters.unshift(props || {type: 'Literal', value: null})
if (fields.length > 0) {
parameters.unshift({type: 'ObjectExpression', properties: fields})
} else if (parameters.length > 0) {
parameters.unshift({type: 'Literal', value: null})
}

callee = toMemberExpression(
Expand Down
Loading