@prettier/plugin-pug
Advanced tools
Comparing version 1.0.0-alpha.10 to 1.0.0-alpha.11
# Next | ||
[diff](https://github.com/prettier/plugin-pug/compare/1.0.0-alpha.10...master) | ||
[diff](https://github.com/prettier/plugin-pug/compare/1.0.0-alpha.11...master) | ||
# 1.0.0-alpha.11 | ||
[diff](https://github.com/prettier/plugin-pug/compare/1.0.0-alpha.10...1.0.0-alpha.11) | ||
- Fix preceding div if there is a _normal_ class attribute | ||
- Improve interpolation in text and bindings | ||
- Introduce new option `attributeSeparator` ([#13]) | ||
Possible values: `always` and `as-needed` | ||
[#13]: https://github.com/prettier/plugin-pug/pull/13 | ||
# 1.0.0-alpha.10 | ||
@@ -6,0 +17,0 @@ |
"use strict"; | ||
var __assign = (this && this.__assign) || function () { | ||
__assign = Object.assign || function(t) { | ||
for (var s, i = 1, n = arguments.length; i < n; i++) { | ||
s = arguments[i]; | ||
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) | ||
t[p] = s[p]; | ||
} | ||
return t; | ||
}; | ||
return __assign.apply(this, arguments); | ||
}; | ||
exports.__esModule = true; | ||
@@ -6,2 +17,3 @@ var prettier_1 = require("prettier"); | ||
var logger_1 = require("./logger"); | ||
var options_1 = require("./options"); | ||
var makeString = prettier_1.util.makeString; | ||
@@ -61,2 +73,33 @@ var logger = logger_1.createLogger(console); | ||
} | ||
function formatText(text, singleQuote) { | ||
var result = ''; | ||
while (text) { | ||
var start = text.indexOf('{{'); | ||
if (start !== -1) { | ||
result += text.slice(0, start); | ||
text = text.substring(start + 2); | ||
var end = text.indexOf('}}'); | ||
if (end !== -1) { | ||
var code = text.slice(0, end); | ||
code = code.trim(); | ||
code = prettier_1.format(code, { parser: 'babel', singleQuote: !singleQuote, printWidth: 9000 }); | ||
if (code.endsWith(';\n')) { | ||
code = code.slice(0, -2); | ||
} | ||
result += "{{ " + code + " }}"; | ||
text = text.slice(end + 2); | ||
} | ||
else { | ||
result += '{{'; | ||
result += text; | ||
text = ''; | ||
} | ||
} | ||
else { | ||
result += text; | ||
text = ''; | ||
} | ||
} | ||
return result; | ||
} | ||
exports.plugin = { | ||
@@ -104,3 +147,3 @@ languages: [ | ||
print: function (path, _a, print) { | ||
var printWidth = _a.printWidth, singleQuote = _a.singleQuote, tabWidth = _a.tabWidth, useTabs = _a.useTabs; | ||
var printWidth = _a.printWidth, singleQuote = _a.singleQuote, tabWidth = _a.tabWidth, useTabs = _a.useTabs, attributeSeparator = _a.attributeSeparator; | ||
var tokens = path.stack[0]; | ||
@@ -114,2 +157,3 @@ var result = ''; | ||
var pipelessText = false; | ||
var alwaysUseAttributeSeparator = options_1.resolveAttributeSeparatorOption(attributeSeparator); | ||
var startTagPosition = 0; | ||
@@ -119,2 +163,3 @@ var startAttributePosition = 0; | ||
var wrapAttributes = false; | ||
var codeInterpolationOptions = { singleQuote: !singleQuote, printWidth: 9000 }; | ||
for (var index = 0; index < tokens.length; index++) { | ||
@@ -153,11 +198,11 @@ var token = tokens[index]; | ||
break; | ||
case 'attribute': | ||
case 'attribute': { | ||
if (token.name === 'class' && | ||
typeof token.val === 'string' && | ||
(token.val.startsWith('"') || token.val.startsWith("'"))) { | ||
var val_1 = token.val; | ||
val_1 = val_1.substring(1, val_1.length - 1); | ||
val_1 = val_1.trim(); | ||
val_1 = val_1.replace(/\s\s+/g, ' '); | ||
var classes = val_1.split(' '); | ||
var val = token.val; | ||
val = val.substring(1, val.length - 1); | ||
val = val.trim(); | ||
val = val.replace(/\s\s+/g, ' '); | ||
var classes = val.split(' '); | ||
var specialClasses = []; | ||
@@ -171,5 +216,6 @@ var validClassNameRegex = /^-?[_a-zA-Z]+[_a-zA-Z0-9-]*$/; | ||
} | ||
var position_1 = startAttributePosition; | ||
result = [result.slice(0, position_1), "." + className, result.slice(position_1)].join(''); | ||
var position = startAttributePosition; | ||
result = [result.slice(0, position), "." + className, result.slice(position)].join(''); | ||
startAttributePosition += 1 + className.length; | ||
result = result.replace(/div\./, '.'); | ||
} | ||
@@ -188,8 +234,8 @@ if (specialClasses.length > 0) { | ||
(token.val.startsWith('"') || token.val.startsWith("'"))) { | ||
var val_2 = token.val; | ||
val_2 = val_2.substring(1, val_2.length - 1); | ||
val_2 = val_2.trim(); | ||
var position_2 = startTagPosition; | ||
result = [result.slice(0, position_2), "#" + val_2, result.slice(position_2)].join(''); | ||
startAttributePosition += 1 + val_2.length; | ||
var val = token.val; | ||
val = val.substring(1, val.length - 1); | ||
val = val.trim(); | ||
var position = startTagPosition; | ||
result = [result.slice(0, position), "#" + val, result.slice(position)].join(''); | ||
startAttributePosition += 1 + val.length; | ||
result = result.replace(/div#/, '#'); | ||
@@ -205,3 +251,5 @@ if (previousToken.type === 'attribute' && previousToken.name !== 'class') { | ||
(!previousAttributeRemapped || hasNormalPreviousToken)) { | ||
result += ','; | ||
if (alwaysUseAttributeSeparator || /^(\(|\[|:).*/.test(token.name)) { | ||
result += ','; | ||
} | ||
if (!wrapAttributes) { | ||
@@ -223,30 +271,42 @@ result += ' '; | ||
else { | ||
var val_3 = token.val; | ||
if (token.name.startsWith(':') || token.name.startsWith('v-bind:')) { | ||
val_3 = val_3.trim(); | ||
val_3 = val_3.replace(/\s\s+/g, ' '); | ||
val_3 = val_3.replace('[ {', '[{').replace('} ]', '}]'); | ||
val_3 = val_3.replace('[ (', '[(').replace(') ]', ')]'); | ||
val_3 = val_3.replace('[ ', '[').replace(' ]', ']'); | ||
var type = quotationType(val_3); | ||
if ((type === 'SINGLE' && !singleQuote) || (type === 'DOUBLE' && singleQuote)) { | ||
val_3 = val_3.replace(/['"]/g, function (match) { return (match === '"' ? "'" : '"'); }); | ||
} | ||
var val = token.val; | ||
if (/^((v-bind|v-on)?:|v-model|@).*/.test(token.name)) { | ||
val = val.trim(); | ||
val = val.slice(1, -1); | ||
val = prettier_1.format(val, __assign({ parser: '__vue_expression' }, codeInterpolationOptions)); | ||
var quotes = singleQuote ? "'" : '"'; | ||
val = "" + quotes + val + quotes; | ||
} | ||
else if (/^(["']{{)(.*)(}}["'])$/.test(val_3)) { | ||
val_3 = val_3.slice(3, -3); | ||
val_3 = val_3.trim(); | ||
else if (/^(\(.*\)|\[.*\])$/.test(token.name)) { | ||
val = val.trim(); | ||
val = val.slice(1, -1); | ||
val = prettier_1.format(val, __assign({ parser: '__ng_interpolation' }, codeInterpolationOptions)); | ||
var quotes = singleQuote ? "'" : '"'; | ||
val_3 = quotes + "{{ " + val_3 + " }}" + quotes; | ||
val = "" + quotes + val + quotes; | ||
} | ||
else if (/^["'](.*)["']$/.test(val_3)) { | ||
val_3 = makeString(val_3.slice(1, -1), singleQuote ? "'" : '"', false); | ||
else if (/^\*.*$/.test(token.name)) { | ||
val = val.trim(); | ||
val = val.slice(1, -1); | ||
val = prettier_1.format(val, __assign({ parser: '__ng_directive' }, codeInterpolationOptions)); | ||
var quotes = singleQuote ? "'" : '"'; | ||
val = "" + quotes + val + quotes; | ||
} | ||
else if (val_3 === 'true') { | ||
else if (/^(["']{{)(.*)(}}["'])$/.test(val)) { | ||
val = val.slice(3, -3); | ||
val = val.trim(); | ||
val = val.replace(/\s\s+/g, ' '); | ||
var quotes = singleQuote ? "'" : '"'; | ||
val = quotes + "{{ " + val + " }}" + quotes; | ||
} | ||
else if (/^["'](.*)["']$/.test(val)) { | ||
val = makeString(val.slice(1, -1), singleQuote ? "'" : '"', false); | ||
} | ||
else if (val === 'true') { | ||
break; | ||
} | ||
else { | ||
val_3 = val_3.trim().replace(/\s\s+/g, ' '); | ||
if (val_3.startsWith('{ ')) { | ||
val_3 = "{" + val_3.substring(2, val_3.length); | ||
val = val.trim(); | ||
val = val.replace(/\s\s+/g, ' '); | ||
if (val.startsWith('{ ')) { | ||
val = "{" + val.substring(2, val.length); | ||
} | ||
@@ -257,5 +317,6 @@ } | ||
} | ||
result += "=" + val_3; | ||
result += "=" + val; | ||
} | ||
break; | ||
} | ||
case 'end-attributes': | ||
@@ -314,3 +375,3 @@ if (wrapAttributes) { | ||
break; | ||
case 'text': | ||
case 'text': { | ||
var val = token.val; | ||
@@ -359,11 +420,3 @@ val = val.replace(/\s\s+/g, ' '); | ||
val = val.trim(); | ||
if (val.startsWith('{{') && val.endsWith('}}')) { | ||
var code = val.substring(2, val.length - 2); | ||
code = code.trim(); | ||
code = prettier_1.format(code, { parser: 'babel', singleQuote: !singleQuote, printWidth: 9000 }); | ||
if (code.endsWith(';\n')) { | ||
code = code.slice(0, -2); | ||
} | ||
val = "{{ " + code + " }}"; | ||
} | ||
val = formatText(val, singleQuote); | ||
if (previousToken && (previousToken.type === 'tag' || previousToken.type === 'id')) { | ||
@@ -377,2 +430,3 @@ val = " " + val; | ||
break; | ||
} | ||
case 'interpolated-code': | ||
@@ -389,3 +443,3 @@ if (previousToken && previousToken.type === 'tag') { | ||
break; | ||
case 'id': | ||
case 'id': { | ||
var lastPositionOfNewline = result.lastIndexOf('\n'); | ||
@@ -413,2 +467,3 @@ if (lastPositionOfNewline === -1) { | ||
break; | ||
} | ||
case 'start-pipeless-text': | ||
@@ -460,22 +515,24 @@ pipelessText = true; | ||
break; | ||
case 'call': | ||
case 'call': { | ||
result = printIndent(previousToken, result, indent, indentLevel); | ||
result += "+" + token.val; | ||
var callArgs = token.args; | ||
if (callArgs) { | ||
callArgs = callArgs.trim(); | ||
callArgs = callArgs.replace(/\s\s+/g, ' '); | ||
result += "(" + callArgs + ")"; | ||
var args = token.args; | ||
if (args) { | ||
args = args.trim(); | ||
args = args.replace(/\s\s+/g, ' '); | ||
result += "(" + args + ")"; | ||
} | ||
break; | ||
case 'mixin': | ||
} | ||
case 'mixin': { | ||
result = printIndent(previousToken, result, indent, indentLevel); | ||
result += "mixin " + token.val; | ||
var mixinArgs = token.args; | ||
if (mixinArgs) { | ||
mixinArgs = mixinArgs.trim(); | ||
mixinArgs = mixinArgs.replace(/\s\s+/g, ' '); | ||
result += "(" + mixinArgs + ")"; | ||
var args = token.args; | ||
if (args) { | ||
args = args.trim(); | ||
args = args.replace(/\s\s+/g, ' '); | ||
result += "(" + args + ")"; | ||
} | ||
break; | ||
} | ||
case 'if': | ||
@@ -493,2 +550,5 @@ result = printIndent(previousToken, result, indent, indentLevel); | ||
break; | ||
case '&attributes': | ||
result += "&attributes(" + token.val + ")"; | ||
break; | ||
default: | ||
@@ -509,3 +569,3 @@ throw new Error('Unhandled token: ' + JSON.stringify(token)); | ||
}, | ||
options: [], | ||
options: options_1.options, | ||
defaultOptions: {} | ||
@@ -518,2 +578,2 @@ }; | ||
exports.defaultOptions = exports.plugin.defaultOptions; | ||
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"} | ||
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"} |
{ | ||
"name": "@prettier/plugin-pug", | ||
"version": "1.0.0-alpha.10", | ||
"version": "1.0.0-alpha.11", | ||
"description": "Prettier Pug Plugin", | ||
@@ -33,3 +33,3 @@ "main": "dist/index.js", | ||
"@types/jest": "~24.0.15", | ||
"@types/node": "~12.6.2", | ||
"@types/node": "~12.6.6", | ||
"@types/prettier": "~1.16.4", | ||
@@ -36,0 +36,0 @@ "@typescript-eslint/eslint-plugin": "~1.12.0", |
141
src/index.ts
@@ -5,2 +5,3 @@ import { AST, Doc, FastPath, format, Options, Parser, ParserOptions, Plugin, util } from 'prettier'; | ||
import { createLogger, Logger, LogLevel } from './logger'; | ||
import { options as pugOptions, PugParserOptions, resolveAttributeSeparatorOption } from './options'; | ||
import { AttributeToken, EndAttributesToken, Token } from './pug-token'; | ||
@@ -65,2 +66,32 @@ | ||
function formatText(text: string, singleQuote: boolean): string { | ||
let result: string = ''; | ||
while (text) { | ||
const start = text.indexOf('{{'); | ||
if (start !== -1) { | ||
result += text.slice(0, start); | ||
text = text.substring(start + 2); | ||
const end = text.indexOf('}}'); | ||
if (end !== -1) { | ||
let code = text.slice(0, end); | ||
code = code.trim(); | ||
code = format(code, { parser: 'babel', singleQuote: !singleQuote, printWidth: 9000 }); | ||
if (code.endsWith(';\n')) { | ||
code = code.slice(0, -2); | ||
} | ||
result += `{{ ${code} }}`; | ||
text = text.slice(end + 2); | ||
} else { | ||
result += '{{'; | ||
result += text; | ||
text = ''; | ||
} | ||
} else { | ||
result += text; | ||
text = ''; | ||
} | ||
} | ||
return result; | ||
} | ||
export const plugin: Plugin = { | ||
@@ -112,3 +143,3 @@ languages: [ | ||
path: FastPath, | ||
{ printWidth, singleQuote, tabWidth, useTabs }: ParserOptions, | ||
{ printWidth, singleQuote, tabWidth, useTabs, attributeSeparator }: ParserOptions & PugParserOptions, | ||
print: (path: FastPath) => Doc | ||
@@ -126,2 +157,4 @@ ): Doc { | ||
const alwaysUseAttributeSeparator: boolean = resolveAttributeSeparatorOption(attributeSeparator); | ||
let startTagPosition: number = 0; | ||
@@ -132,2 +165,4 @@ let startAttributePosition: number = 0; | ||
const codeInterpolationOptions = { singleQuote: !singleQuote, printWidth: 9000 }; | ||
for (let index: number = 0; index < tokens.length; index++) { | ||
@@ -166,3 +201,3 @@ const token: Token = tokens[index]; | ||
break; | ||
case 'attribute': | ||
case 'attribute': { | ||
if ( | ||
@@ -192,2 +227,3 @@ token.name === 'class' && | ||
startAttributePosition += 1 + className.length; | ||
result = result.replace(/div\./, '.'); | ||
} | ||
@@ -230,3 +266,5 @@ if (specialClasses.length > 0) { | ||
) { | ||
result += ','; | ||
if (alwaysUseAttributeSeparator || /^(\(|\[|:).*/.test(token.name)) { | ||
result += ','; | ||
} | ||
if (!wrapAttributes) { | ||
@@ -250,19 +288,38 @@ result += ' '; | ||
let val = token.val; | ||
if (token.name.startsWith(':') || token.name.startsWith('v-bind:')) { | ||
// Format Vue v-bind | ||
// Expect js-code | ||
if (/^((v-bind|v-on)?:|v-model|@).*/.test(token.name)) { | ||
// Format Vue expression | ||
val = val.trim(); | ||
val = val.replace(/\s\s+/g, ' '); | ||
val = val.replace('[ {', '[{').replace('} ]', '}]'); | ||
val = val.replace('[ (', '[(').replace(') ]', ')]'); | ||
val = val.replace('[ ', '[').replace(' ]', ']'); | ||
const type: QuotationType | undefined = quotationType(val); | ||
if ((type === 'SINGLE' && !singleQuote) || (type === 'DOUBLE' && singleQuote)) { | ||
// Swap single and double quotes | ||
val = val.replace(/['"]/g, (match) => (match === '"' ? "'" : '"')); | ||
} | ||
val = val.slice(1, -1); | ||
val = format(val, { | ||
parser: '__vue_expression' as any, | ||
...codeInterpolationOptions | ||
}); | ||
const quotes: "'" | '"' = singleQuote ? "'" : '"'; | ||
val = `${quotes}${val}${quotes}`; | ||
} else if (/^(\(.*\)|\[.*\])$/.test(token.name)) { | ||
// Format Angular action or binding | ||
val = val.trim(); | ||
val = val.slice(1, -1); | ||
val = format(val, { | ||
parser: '__ng_interpolation' as any, | ||
...codeInterpolationOptions | ||
}); | ||
const quotes: "'" | '"' = singleQuote ? "'" : '"'; | ||
val = `${quotes}${val}${quotes}`; | ||
} else if (/^\*.*$/.test(token.name)) { | ||
// Format Angular directive | ||
val = val.trim(); | ||
val = val.slice(1, -1); | ||
val = format(val, { parser: '__ng_directive' as any, ...codeInterpolationOptions }); | ||
const quotes: "'" | '"' = singleQuote ? "'" : '"'; | ||
val = `${quotes}${val}${quotes}`; | ||
} else if (/^(["']{{)(.*)(}}["'])$/.test(val)) { | ||
// Format Angular code | ||
// Format Angular interpolation | ||
val = val.slice(3, -3); | ||
val = val.trim(); | ||
val = val.replace(/\s\s+/g, ' '); | ||
// val = format(val, { | ||
// parser: '__ng_interpolation' as any, | ||
// ...codeInterpolationOptions | ||
// }); | ||
const quotes: "'" | '"' = singleQuote ? "'" : '"'; | ||
@@ -277,3 +334,4 @@ val = `${quotes}{{ ${val} }}${quotes}`; | ||
// The value is not quoted and may be js-code | ||
val = val.trim().replace(/\s\s+/g, ' '); | ||
val = val.trim(); | ||
val = val.replace(/\s\s+/g, ' '); | ||
if (val.startsWith('{ ')) { | ||
@@ -291,2 +349,3 @@ val = `{${val.substring(2, val.length)}`; | ||
break; | ||
} | ||
case 'end-attributes': | ||
@@ -349,3 +408,3 @@ if (wrapAttributes) { | ||
break; | ||
case 'text': | ||
case 'text': { | ||
let val = token.val; | ||
@@ -393,12 +452,3 @@ val = val.replace(/\s\s+/g, ' '); | ||
val = val.trim(); | ||
if (val.startsWith('{{') && val.endsWith('}}')) { | ||
// Format mustache code like in Vue | ||
let code: string = val.substring(2, val.length - 2); | ||
code = code.trim(); | ||
code = format(code, { parser: 'babel', singleQuote: !singleQuote, printWidth: 9000 }); | ||
if (code.endsWith(';\n')) { | ||
code = code.slice(0, -2); | ||
} | ||
val = `{{ ${code} }}`; | ||
} | ||
val = formatText(val, singleQuote); | ||
if (previousToken && (previousToken.type === 'tag' || previousToken.type === 'id')) { | ||
@@ -412,2 +462,3 @@ val = ` ${val}`; | ||
break; | ||
} | ||
case 'interpolated-code': | ||
@@ -424,3 +475,3 @@ if (previousToken && previousToken.type === 'tag') { | ||
break; | ||
case 'id': | ||
case 'id': { | ||
// Handle id attribute | ||
@@ -453,2 +504,3 @@ // Write css-id in front of css-classes | ||
break; | ||
} | ||
case 'start-pipeless-text': | ||
@@ -501,22 +553,24 @@ pipelessText = true; | ||
break; | ||
case 'call': | ||
case 'call': { | ||
result = printIndent(previousToken, result, indent, indentLevel); | ||
result += `+${token.val}`; | ||
let callArgs: string | null = token.args; | ||
if (callArgs) { | ||
callArgs = callArgs.trim(); | ||
callArgs = callArgs.replace(/\s\s+/g, ' '); | ||
result += `(${callArgs})`; | ||
let args: string | null = token.args; | ||
if (args) { | ||
args = args.trim(); | ||
args = args.replace(/\s\s+/g, ' '); | ||
result += `(${args})`; | ||
} | ||
break; | ||
case 'mixin': | ||
} | ||
case 'mixin': { | ||
result = printIndent(previousToken, result, indent, indentLevel); | ||
result += `mixin ${token.val}`; | ||
let mixinArgs: string | null = token.args; | ||
if (mixinArgs) { | ||
mixinArgs = mixinArgs.trim(); | ||
mixinArgs = mixinArgs.replace(/\s\s+/g, ' '); | ||
result += `(${mixinArgs})`; | ||
let args: string | null = token.args; | ||
if (args) { | ||
args = args.trim(); | ||
args = args.replace(/\s\s+/g, ' '); | ||
result += `(${args})`; | ||
} | ||
break; | ||
} | ||
case 'if': | ||
@@ -534,2 +588,5 @@ result = printIndent(previousToken, result, indent, indentLevel); | ||
break; | ||
case '&attributes': | ||
result += `&attributes(${token.val})`; | ||
break; | ||
default: | ||
@@ -557,3 +614,3 @@ throw new Error('Unhandled token: ' + JSON.stringify(token)); | ||
}, | ||
options: [], | ||
options: pugOptions as any, | ||
defaultOptions: {} | ||
@@ -560,0 +617,0 @@ }; |
@@ -183,2 +183,8 @@ export interface Loc { | ||
export interface AndAttributesToken { | ||
type: '&attributes'; | ||
loc: Loc; | ||
val: string; | ||
} | ||
export type Token = | ||
@@ -214,2 +220,3 @@ | TagToken | ||
| MixinBlockToken | ||
| ElseToken; | ||
| ElseToken | ||
| AndAttributesToken; |
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
96654
13
1545