-
-
Notifications
You must be signed in to change notification settings - Fork 32.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[pigment] Handle more scenarios while transforming
sx prop. This now provides the ability to have simple expressions like conditional and logical expressions in the sx prop code.
- Loading branch information
1 parent
ad760f7
commit 54d319b
Showing
11 changed files
with
231 additions
and
105 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,69 +1,83 @@ | ||
| import { addNamed } from '@babel/helper-module-imports'; | ||
| import { declare } from '@babel/helper-plugin-utils'; | ||
| import { sxObjectExtractor } from './sxObjectExtractor'; | ||
| import { NodePath } from '@babel/core'; | ||
| import * as Types from '@babel/types'; | ||
| import { sxPropConvertor } from './sxPropConverter'; | ||
|
|
||
| export const babelPlugin = declare((api) => { | ||
| api.assertVersion(7); | ||
| const { types: t } = api; | ||
| return { | ||
| name: '@pigmentcss/zero-babel-plugin', | ||
| visitor: { | ||
| JSXAttribute(path) { | ||
| const namePath = path.get('name'); | ||
| const openingElement = path.findParent((p) => p.isJSXOpeningElement()); | ||
| if ( | ||
| !openingElement || | ||
| !openingElement.isJSXOpeningElement() || | ||
| !namePath.isJSXIdentifier() || | ||
| namePath.node.name !== 'sx' | ||
| ) { | ||
| return; | ||
| } | ||
| const tagName = openingElement.get('name'); | ||
| if (!tagName.isJSXIdentifier()) { | ||
| return; | ||
| } | ||
| const valuePath = path.get('value'); | ||
| if (!valuePath.isJSXExpressionContainer()) { | ||
| return; | ||
| } | ||
| const expressionPath = valuePath.get('expression'); | ||
| if (!expressionPath.isExpression()) { | ||
| return; | ||
| } | ||
| if (!expressionPath.isObjectExpression() && !expressionPath.isArrowFunctionExpression()) { | ||
| return; | ||
| } | ||
| sxObjectExtractor(expressionPath); | ||
| const sxIdentifier = addNamed(namePath, 'sx', process.env.PACKAGE_NAME as string); | ||
| expressionPath.replaceWith( | ||
| t.callExpression(sxIdentifier, [expressionPath.node, t.identifier(tagName.node.name)]), | ||
| ); | ||
| }, | ||
| ObjectProperty(path) { | ||
| // @TODO - Maybe add support for React.createElement calls as well. | ||
| // Right now, it only checks for jsx(),jsxs(),jsxDEV() and jsxsDEV() calls. | ||
| const keyPath = path.get('key'); | ||
| if (!keyPath.isIdentifier() || keyPath.node.name !== 'sx') { | ||
| return; | ||
| } | ||
| const valuePath = path.get('value'); | ||
| if (!valuePath.isObjectExpression() && !valuePath.isArrowFunctionExpression()) { | ||
| return; | ||
| } | ||
| const parentJsxCall = path.findParent((p) => p.isCallExpression()); | ||
| if (!parentJsxCall || !parentJsxCall.isCallExpression()) { | ||
| return; | ||
| } | ||
| const callee = parentJsxCall.get('callee'); | ||
| if (!callee.isIdentifier() || !callee.node.name.includes('jsx')) { | ||
| return; | ||
| } | ||
| const jsxElement = parentJsxCall.get('arguments')[0]; | ||
| sxObjectExtractor(valuePath); | ||
| const sxIdentifier = addNamed(keyPath, 'sx', process.env.PACKAGE_NAME as string); | ||
| valuePath.replaceWith(t.callExpression(sxIdentifier, [valuePath.node, jsxElement.node])); | ||
| }, | ||
| }, | ||
| function replaceNodePath( | ||
| expressionPath: NodePath<Types.Expression>, | ||
| namePath: NodePath<Types.JSXIdentifier | Types.Identifier>, | ||
| importName: string, | ||
| t: typeof Types, | ||
| tagName: NodePath<Types.JSXIdentifier | Types.Identifier>, | ||
| ) { | ||
| const sxIdentifier = addNamed(namePath, importName, process.env.PACKAGE_NAME as string); | ||
|
|
||
| const wrapWithSxCall = (expPath: NodePath<Types.Expression>) => { | ||
| expPath.replaceWith( | ||
| t.callExpression(sxIdentifier, [expPath.node, t.identifier(tagName.node.name)]), | ||
| ); | ||
| }; | ||
| }); | ||
|
|
||
| sxPropConvertor(expressionPath, wrapWithSxCall); | ||
| // wrapWithSxCall(expressionPath); | ||
| } | ||
|
|
||
| export const babelPlugin = declare<{ propName?: string; importName?: string }>( | ||
| (api, { propName = 'sx', importName = 'sx' }) => { | ||
| api.assertVersion(7); | ||
| const { types: t } = api; | ||
| return { | ||
| name: '@pigmentcss/zero-babel-plugin', | ||
| visitor: { | ||
| JSXAttribute(path) { | ||
| const namePath = path.get('name'); | ||
| const openingElement = path.findParent((p) => p.isJSXOpeningElement()); | ||
| if ( | ||
| !openingElement || | ||
| !openingElement.isJSXOpeningElement() || | ||
| !namePath.isJSXIdentifier() || | ||
| namePath.node.name !== propName | ||
| ) { | ||
| return; | ||
| } | ||
| const tagName = openingElement.get('name'); | ||
| if (!tagName.isJSXIdentifier()) { | ||
| return; | ||
| } | ||
| const valuePath = path.get('value'); | ||
| if (!valuePath.isJSXExpressionContainer()) { | ||
| return; | ||
| } | ||
| const expressionPath = valuePath.get('expression'); | ||
| if (!expressionPath.isExpression()) { | ||
| return; | ||
| } | ||
| replaceNodePath(expressionPath, namePath, importName, t, tagName); | ||
| }, | ||
| ObjectProperty(path) { | ||
| // @TODO - Maybe add support for React.createElement calls as well. | ||
| // Right now, it only checks for jsx(),jsxs(),jsxDEV() and jsxsDEV() calls. | ||
| const keyPath = path.get('key'); | ||
| if (!keyPath.isIdentifier() || keyPath.node.name !== propName) { | ||
| return; | ||
| } | ||
| const valuePath = path.get('value'); | ||
| if (!valuePath.isObjectExpression() && !valuePath.isArrowFunctionExpression()) { | ||
| return; | ||
| } | ||
| const parentJsxCall = path.findParent((p) => p.isCallExpression()); | ||
| if (!parentJsxCall || !parentJsxCall.isCallExpression()) { | ||
| return; | ||
| } | ||
| const callee = parentJsxCall.get('callee'); | ||
| if (!callee.isIdentifier() || !callee.node.name.includes('jsx')) { | ||
| return; | ||
| } | ||
| const jsxElement = parentJsxCall.get('arguments')[0] as NodePath<Types.Identifier>; | ||
| replaceNodePath(valuePath, keyPath, importName, t, jsxElement); | ||
| }, | ||
| }, | ||
| }; | ||
| }, | ||
| ); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| import { NodePath } from '@babel/core'; | ||
| import { ArrowFunctionExpression, Expression, ObjectExpression } from '@babel/types'; | ||
| import { sxObjectExtractor } from './sxObjectExtractor'; | ||
|
|
||
| function isAllowedExpression( | ||
| node: NodePath<Expression>, | ||
| ): node is NodePath<ObjectExpression> | NodePath<ArrowFunctionExpression> { | ||
| return node.isObjectExpression() || node.isArrowFunctionExpression(); | ||
| } | ||
|
|
||
| export function sxPropConvertor( | ||
| node: NodePath<Expression>, | ||
| wrapWithSxCall: (expPath: NodePath<Expression>) => void, | ||
| ) { | ||
| if (node.isConditionalExpression()) { | ||
| const consequent = node.get('consequent'); | ||
| const alternate = node.get('alternate'); | ||
|
|
||
| if (isAllowedExpression(consequent)) { | ||
| sxObjectExtractor(consequent); | ||
| wrapWithSxCall(consequent); | ||
| } | ||
| if (isAllowedExpression(alternate)) { | ||
| sxObjectExtractor(alternate); | ||
| wrapWithSxCall(alternate); | ||
| } | ||
| } else if (node.isLogicalExpression()) { | ||
| const right = node.get('right'); | ||
| if (isAllowedExpression(right)) { | ||
| sxObjectExtractor(right); | ||
| wrapWithSxCall(right); | ||
| } | ||
| } else if (isAllowedExpression(node)) { | ||
| wrapWithSxCall(node); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| import { SliderRail } from './styled.input'; | ||
|
|
||
| function App() { | ||
| return <SliderRail sx={{ color: 'red' }} />; | ||
| } | ||
|
|
||
| function App2(props) { | ||
| return ( | ||
| <SliderRail | ||
| sx={ | ||
| props.variant === 'secondary' | ||
| ? { color: props.isRed ? 'red' : 'blue' } | ||
| : { backgroundColor: 'blue', color: 'white' } | ||
| } | ||
| /> | ||
| ); | ||
| } | ||
|
|
||
| function App3(props) { | ||
| return ( | ||
| <SliderRail sx={props.variant === 'secondary' && { color: props.isRed ? 'red' : 'blue' }} /> | ||
| ); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| .soujkwr.s1ne1757{color:red;} | ||
| .soujkwr.s1novky8{color:var(--s1novky8-0);} | ||
| .soujkwr.s1dedx85{background-color:blue;color:white;} | ||
| .soujkwr.s37rrrj{color:var(--s37rrrj-0);} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| import { SliderRail } from './styled.input'; | ||
| import { jsx as _jsx } from "react/jsx-runtime"; | ||
| function App() { | ||
| return /*#__PURE__*/_jsx(SliderRail, { | ||
| sx: "s1ne1757" | ||
| }); | ||
| } | ||
| function App2(props) { | ||
| return /*#__PURE__*/_jsx(SliderRail, { | ||
| sx: props.variant === 'secondary' ? { | ||
| className: "s1novky8", | ||
| vars: { | ||
| "s1novky8-0": [props.isRed ? 'red' : 'blue', false] | ||
| } | ||
| } : "s1dedx85" | ||
| }); | ||
| } | ||
| function App3(props) { | ||
| return /*#__PURE__*/_jsx(SliderRail, { | ||
| sx: props.variant === 'secondary' && { | ||
| className: "s37rrrj", | ||
| vars: { | ||
| "s37rrrj-0": [props.isRed ? 'red' : 'blue', false] | ||
| } | ||
| } | ||
| }); | ||
| } |
Oops, something went wrong.