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

Jump to bottom

Fix error when using Angular pipes #86

Merged
merged 1 commit into from Jul 25, 2022
Merged

Fix error when using Angular pipes #86

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
25 changes: 22 additions & 3 deletions src/index.js
View file
Open in desktop
@@ -1,5 +1,6 @@
import prettier from 'prettier'
import prettierParserHTML from 'prettier/parser-html'
import prettierParserAngular from 'prettier/parser-angular'
import prettierParserPostCSS from 'prettier/parser-postcss'
import prettierParserBabel from 'prettier/parser-babel'
import prettierParserEspree from 'prettier/parser-espree'
Expand Down Expand Up @@ -177,13 +178,13 @@ function createParser(original, transform) {
contextMap.set(tailwindConfigPath, { context, hash })
}

transform(ast, { env: { context, generateRules } })
transform(ast, { env: { context, generateRules, parsers, options } })
return ast
},
}
}

function transformHtml(attributes, computedAttributes = []) {
function transformHtml(attributes, computedAttributes = [], computedType = 'js') {
let transform = (ast, { env }) => {
for (let attr of ast.attrs ?? []) {
if (attributes.includes(attr.name)) {
Expand All @@ -193,6 +194,24 @@ function transformHtml(attributes, computedAttributes = []) {
continue
}

if (computedType === 'angular') {
let directiveAst = prettierParserAngular.parsers.__ng_directive.parse(
attr.value,
env.parsers,
env.options
)
visit(directiveAst, {
StringLiteral(node) {
if (!node.value) return
attr.value =
attr.value.slice(0, node.start + 1) +
sortClasses(node.value, { env }) +
attr.value.slice(node.end - 1)
},
})
continue
}

let ast = recast.parse(`let __prettier_temp__ = ${attr.value}`, {
parser: prettierParserBabel.parsers['babel-ts'],
})
Expand Down Expand Up @@ -409,7 +428,7 @@ export const parsers = {
lwc: createParser(prettierParserHTML.parsers.lwc, transformHtml(['class'])),
angular: createParser(
prettierParserHTML.parsers.angular,
transformHtml(['class'], ['[ngClass]'])
transformHtml(['class'], ['[ngClass]'], 'angular')
),
vue: createParser(prettierParserHTML.parsers.vue, transformHtml(['class'], [':class'])),
css: createParser(prettierParserPostCSS.parsers.css, transformCss),
Expand Down
14 changes: 12 additions & 2 deletions tests/test.js
View file
Open in desktop
Expand Up @@ -158,8 +158,18 @@ let tests = {
lwc: html,
vue: [...vue, t`<div :class="\`${yes} \${someVar} ${yes} \${'${yes}'}\`"></div>`],
angular: [
...vue.map((test) => test.map((t) => t.replace(/:class=/g, '[ngClass]='))),
t`<div [ngClass]='\`${yes} \${someVar} ${yes} \${"${yes}"}\`'></div>`,
...html,
t`<div [ngClass]="'${yes}'"></div>`,
t`<!-- <div [ngClass]="'${no}'"></div> -->`,
t`<div [ngClass]></div>`,
t`<div [ngClass]=""></div>`,
t`<div [ngClass]="'${yes}' + '${yes}'"></div>`,
t`<div [ngClass]="['${yes}', '${yes}']"></div>`,
t`<div [ngClass]="[cond ? '${yes}' : '${yes}']"></div>`,
t`<div [ngClass]="[someVar ?? '${yes}']"></div>`,
t`<div [ngClass]="{ '${yes}': true }"></div>`,
t`<div [ngClass]="clsx('${yes}')"></div>`,
t`<div [ngClass]="{ '${yes}': (some.thing | urlPipe: { option: true } | async), '${yes}': true }"></div>`,
],
css: [...css, t`@apply ${yes} !important;`],
scss: [...css, t`@apply ${yes} #{!important};`],
Expand Down