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(ng,vue): do not normalize attribute names #5549

Merged
merged 2 commits into from Nov 26, 2018
Merged

fix(ng,vue): do not normalize attribute names #5549

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
86d4609
test: add tests
ikatyang Nov 25, 2018
66596cf
fix(ng,vue): do not normalize attribute names
ikatyang Nov 25, 2018
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
44 changes: 27 additions & 17 deletions src/language-html/parser-html.js
View file
Open in desktop
Expand Up @@ -7,7 +7,10 @@ const createError = require("../common/parser-create-error");
const { Node } = require("./ast");
const { parseIeConditionalComment } = require("./conditional-comment");

function ngHtmlParser(input, { recognizeSelfClosing, normalizeTagName }) {
function ngHtmlParser(
input,
{ recognizeSelfClosing, normalizeTagName, normalizeAttributeName }
) {
const parser = require("angular-html-parser");
const {
RecursiveVisitor,
Expand Down Expand Up @@ -109,19 +112,21 @@ function ngHtmlParser(input, { recognizeSelfClosing, normalizeTagName }) {
);
}

const CURRENT_HTML_ELEMENT_ATTRIBUTES =
HTML_ELEMENT_ATTRIBUTES[node.name] || Object.create(null);
node.attrs.forEach(attr => {
if (!attr.namespace) {
attr.name = lowerCaseIfFn(
attr.name,
lowerCasedAttrName =>
node.name in HTML_ELEMENT_ATTRIBUTES &&
(lowerCasedAttrName in HTML_ELEMENT_ATTRIBUTES["*"] ||
lowerCasedAttrName in CURRENT_HTML_ELEMENT_ATTRIBUTES)
);
}
});
if (normalizeAttributeName) {
const CURRENT_HTML_ELEMENT_ATTRIBUTES =
HTML_ELEMENT_ATTRIBUTES[node.name] || Object.create(null);
node.attrs.forEach(attr => {
if (!attr.namespace) {
attr.name = lowerCaseIfFn(
attr.name,
lowerCasedAttrName =>
node.name in HTML_ELEMENT_ATTRIBUTES &&
(lowerCasedAttrName in HTML_ELEMENT_ATTRIBUTES["*"] ||
lowerCasedAttrName in CURRENT_HTML_ELEMENT_ATTRIBUTES)
);
}
});
}
}
};

Expand Down Expand Up @@ -249,14 +254,16 @@ function locEnd(node) {

function createParser({
recognizeSelfClosing = false,
normalizeTagName = false
normalizeTagName = false,
normalizeAttributeName = false
} = {}) {
return {
preprocess: text => text.replace(/\r\n?/g, "\n"),
parse: (text, parsers, options) =>
_parse(text, options, {
recognizeSelfClosing,
normalizeTagName
normalizeTagName,
normalizeAttributeName
}),
hasPragma,
astFormat: "html",
Expand All @@ -267,7 +274,10 @@ function createParser({

module.exports = {
parsers: {
html: createParser({ normalizeTagName: true }),
html: createParser({
normalizeTagName: true,
normalizeAttributeName: true
}),
angular: createParser(),
vue: createParser({ recognizeSelfClosing: true })
}
Expand Down
61 changes: 61 additions & 0 deletions tests/html_angular/__snapshots__/jsfmt.spec.js.snap
View file
Open in desktop
@@ -1,5 +1,66 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports[`attr-name.component.html 1`] = `
====================================options=====================================
parsers: ["angular"]
printWidth: 80
| printWidth
=====================================input======================================
<div someDirective itemType="x"></div>

=====================================output=====================================
<div someDirective itemType="x"></div>

================================================================================
`;

exports[`attr-name.component.html 2`] = `
====================================options=====================================
parsers: ["angular"]
printWidth: 80
trailingComma: "es5"
| printWidth
=====================================input======================================
<div someDirective itemType="x"></div>

=====================================output=====================================
<div someDirective itemType="x"></div>

================================================================================
`;

exports[`attr-name.component.html 3`] = `
====================================options=====================================
parsers: ["angular"]
printWidth: 1
| printWidth
=====================================input======================================
<div someDirective itemType="x"></div>

=====================================output=====================================
<div
someDirective
itemType="x"
></div>

================================================================================
`;

exports[`attr-name.component.html 4`] = `
====================================options=====================================
htmlWhitespaceSensitivity: "ignore"
parsers: ["angular"]
printWidth: 80
| printWidth
=====================================input======================================
<div someDirective itemType="x"></div>

=====================================output=====================================
<div someDirective itemType="x"></div>

================================================================================
`;

exports[`attributes.component.html 1`] = `
====================================options=====================================
parsers: ["angular"]
Expand Down
1 change: 1 addition & 0 deletions tests/html_angular/attr-name.component.html
View file
Open in desktop
@@ -0,0 +1 @@
<div someDirective itemType="x"></div>