-
Notifications
You must be signed in to change notification settings - Fork 575
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.
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
Generate from angular selectors. ENG-7482 #1653
Merged
Merged
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
6888b88
Generate from angular selectors. ENG-7482
STRd6 1ce09e3
fmt
STRd6 a54c48d
Merge branch 'main' into generate-from-angular-selectors
STRd6 9ada8a4
using angular selector parser
STRd6 d7dee37
stringify values
STRd6 bd3c03a
expand tests
STRd6 2314e23
changeset
STRd6 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
import { parse } from '../../src/generators/angular/selector-parser.js'; | ||
|
||
describe('Angular selectors', () => { | ||
test('should parse gnarly selectors', () => { | ||
expect(parse('ccc.c1#wat[co].c2[counter="cool"]#wat[x=\'y\'].c3')).toEqual({ | ||
tagName: 'ccc', | ||
id: 'wat', | ||
classes: ['c1', 'c2', 'c3'], | ||
attributes: { | ||
co: undefined, | ||
counter: '"cool"', | ||
x: "'y'", | ||
}, | ||
}); | ||
}); | ||
}); |
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,67 @@ | ||
# Parser for angular selectors | ||
# https://angular.dev/guide/components/selectors#types-of-selectors | ||
liamdebeasi marked this conversation as resolved.
Show resolved
Hide resolved
|
||
# | ||
# to build: | ||
# ./node_modules/.bin/hera --libPath @danielx/hera/dist/machine.js < src/generators/angular/selector-parser.hera > src/generators/angular/selector-parser.js | ||
Selector | ||
TagName?:tagName Part*:parts -> | ||
const firstId = parts.find(([key]) => key === "id"); | ||
let id; | ||
if (firstId) { | ||
id = firstId[1]; | ||
} | ||
|
||
return { | ||
tagName, | ||
id, | ||
classes: parts.filter(([key]) => key === "class").map(([, value]) => value), | ||
attributes: Object.fromEntries(parts.filter(([key]) => key !== "id" && key !== "class")) | ||
} | ||
|
||
TagName | ||
Identifier | ||
|
||
Part | ||
Attribute | ||
Class | ||
Id | ||
|
||
Attribute | ||
"[" __ AttributeName __ "=" __ AttributeValue __ "]" -> | ||
return [$3, $7] | ||
"[" __ AttributeName __ "]" -> | ||
return [$3] | ||
|
||
AttributeValue | ||
$DoubleQuotedString | ||
$SingleQuotedString | ||
|
||
DoubleQuotedString | ||
"\"" /(?:\\.|[^"])*/ "\"" | ||
|
||
SingleQuotedString | ||
"'" /(?:\\.|[^'])*/ "'" | ||
|
||
Class | ||
"." Identifier -> | ||
return ["class", $2] | ||
|
||
Id | ||
"#" Identifier -> | ||
return ["id", $2] | ||
|
||
EscapeSequence | ||
"'" | ||
"\"" | ||
"\\" | ||
/./ -> | ||
return "\\" + $0 | ||
|
||
Identifier | ||
/[_a-zA-Z][_a-zA-Z0-9-]*/ -> $0 | ||
|
||
AttributeName | ||
Identifier | ||
|
||
__ | ||
/[ \t]*/ |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Are support for the
:not
pseudo-class and multiple selectors (e.g.foo, [bar]
) in scope? Both are supported by Angular: https://angular.dev/guide/components/selectors#types-of-selectorsThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
👍 I should add parsing for those. They don't affect the code generation but will need to be accounted for in the parsing.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ok great! Only other thing I can think of here is to add a test for those cases for parsing.