@prettier/plugin-pug - npm Package Compare versions

Comparing version 1.0.0-alpha.1 to 1.0.0-alpha.2

CHANGELOG.md

@@ -0,5 +1,49 @@
+# Next
+
+[diff](https://github.com/Shinigami92/prettier-plugin-pug/compare/1.0.0-alpha.2...master)
+
+# 1.0.0-alpha.2
+
+[diff](https://github.com/Shinigami92/prettier-plugin-pug/compare/1.0.0-alpha.1...1.0.0-alpha.2)
+
+-   Correct some unnecessary blank lines
+
+-   Correct a missing whitespace after `interpolated-code` token
+
+-   Handle new Tokens
+
+    -   [`block`](https://pugjs.org/language/inheritance.html#block-append-prepend)
+    -   [`extends`](https://pugjs.org/language/inheritance.html)
+    -   [`path`](https://pugjs.org/language/inheritance.html)
+    -   [`start-pug-interpolation`](https://pugjs.org/language/interpolation.html#tag-interpolation)
+    -   [`end-pug-interpolation`](https://pugjs.org/language/interpolation.html#tag-interpolation)
+    -   [`include`](https://pugjs.org/language/includes.html)
+    -   [`filter`](https://pugjs.org/language/filters.html)
+
+-   Improve space formatting
+
+    Use recommended solutions [link](https://pugjs.org/language/plain-text.html#recommended-solutions)
+
+    ```pug
+    //- Input
+    v-btn(color="primary", name="save", @click="save", :disabled="saving", :loading="saving")
+      v-icon save
+      |  {{ $t('mylangkeys.crud.save') }}
+
+    //- Output (1.0.0-alpha.1)
+    v-btn(color="primary", name="save", @click="save", :disabled="saving", :loading="saving")
+      v-icon save
+      | {{ $t('mylangkeys.crud.save') }}
+
+    //- Output (next)
+    v-btn(color="primary", name="save", @click="save", :disabled="saving", :loading="saving")
+      v-icon save
+      |
+      | {{ $t('mylangkeys.crud.save') }}
+    ```
+
 # 1.0.0-alpha.1
 
-[diff](https://github.com/Shinigami92/prettier-plugin-pug/compare/5fb671e3fbaa03be554c78f9be1ea53cfdadd78a...4dfab822c00202ce0d3eb5a1881451801597b749)
+[diff](https://github.com/Shinigami92/prettier-plugin-pug/compare/5fb671e3fbaa03be554c78f9be1ea53cfdadd78a...1.0.0-alpha.1)
 
 -   Initial alpha release

dist/index.js

@@ -111,3 +111,5 @@ "use strict";
                             if (previousToken) {
-                                if (previousToken.type !== 'indent') {
+                                if (previousToken.type === 'start-pug-interpolation') {
+                                }
+                                else if (previousToken.type !== 'indent') {
                                     result += indent.repeat(indentLevel);
@@ -218,3 +220,3 @@ }
                             }
-                            if (nextToken && nextToken.type === 'text') {
+                            if (nextToken && (nextToken.type === 'text' || nextToken.type === 'path')) {
                                 result += ' ';
@@ -233,3 +235,5 @@ }
                                 }
-                                if (previousToken.type !== 'text') {
+                                if (previousToken.type !== 'text' &&
+                                    previousToken.type !== 'outdent' &&
+                                    previousToken.type !== 'tag') {
                                     result += '\n';
@@ -273,2 +277,4 @@ }
                         case 'text':
+                            var val = token.val;
+                            val = val.replace(/\s\s+/g, ' ');
                             if (previousToken) {
@@ -279,2 +285,6 @@ switch (previousToken.type) {
                                             result += indent.repeat(indentLevel);
+                                            if (/^ .+$/.test(val)) {
+                                                result += '|\n';
+                                                result += indent.repeat(indentLevel);
+                                            }
                                             result += '|';
@@ -296,6 +306,9 @@ if (/.*\S.*/.test(token.val)) {
                                         break;
+                                    case 'interpolated-code':
+                                        if (/^ .+$/.test(val)) {
+                                            result += ' ';
+                                        }
+                                        break;
                                 }
                             }
-                            var val = token.val;
-                            val = val.replace(/\s\s+/g, ' ');
                             val = val.trim();
@@ -355,2 +368,33 @@ if (val.startsWith('{{') && val.endsWith('}}')) {
                             break;
+                        case 'block':
+                            if (previousToken && previousToken.type === 'indent') {
+                                result += indent;
+                            }
+                            result += 'block ';
+                            if (token.mode !== 'replace') {
+                                result += token.mode;
+                            }
+                            result += token.val;
+                            break;
+                        case 'extends':
+                            result += 'extends ';
+                            break;
+                        case 'path':
+                            result += token.val;
+                            break;
+                        case 'start-pug-interpolation':
+                            result += '#[';
+                            break;
+                        case 'end-pug-interpolation':
+                            result += ']';
+                            break;
+                        case 'include':
+                            if (previousToken && previousToken.type === 'indent') {
+                                result += indent;
+                            }
+                            result += 'include';
+                            break;
+                        case 'filter':
+                            result += ":" + token.val;
+                            break;
                         default:
@@ -379,2 +423,2 @@ throw new Error('Unhandled token: ' + JSON.stringify(token));
 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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"}

package.json

 {
 	"name": "@prettier/plugin-pug",
-	"version": "1.0.0-alpha.1",
+	"version": "1.0.0-alpha.2",
 	"description": "Prettier Pug Plugin",
@@ -5,0 +5,0 @@ "main": "dist/index.js",

README.md

@@ -1,3 +0,1 @@
-# Currently not published and in heavy development
-
 <p align="center">
@@ -4,0 +2,0 @@ &nbsp;&nbsp;<img alt="Prettier"

src/index.ts

@@ -108,3 +108,5 @@ import { AST, Doc, FastPath, Options, Parser, ParserOptions, Plugin } from 'prettier';
 							if (previousToken) {
-								if (previousToken.type !== 'indent') {
+								if (previousToken.type === 'start-pug-interpolation') {
+									// Don't indent
+								} else if (previousToken.type !== 'indent') {
 									result += indent.repeat(indentLevel);
@@ -231,3 +233,3 @@ } else {
 							}
-							if (nextToken && nextToken.type === 'text') {
+							if (nextToken && (nextToken.type === 'text' || nextToken.type === 'path')) {
 								result += ' ';
@@ -244,6 +246,10 @@ }
 								if (token.loc.start.line - previousToken.loc.end.line >= 1) {
-									// Insert an empty extra line
+									// Insert one extra blank line
 									result += '\n';
 								}
-								if (previousToken.type !== 'text') {
+								if (
+									previousToken.type !== 'text' &&
+									previousToken.type !== 'outdent' &&
+									previousToken.type !== 'tag'
+								) {
 									result += '\n';
@@ -284,3 +290,3 @@ }
 							if (previousToken && token.loc.start.line - previousToken.loc.end.line > 1) {
-								// Insert an empty extra line
+								// Insert one extra blank line
 								result += '\n';
@@ -291,2 +297,4 @@ }
 						case 'text':
+							let val = token.val;
+							val = val.replace(/\s\s+/g, ' ');
 							if (previousToken) {
@@ -297,2 +305,6 @@ switch (previousToken.type) {
 											result += indent.repeat(indentLevel);
+											if (/^ .+$/.test(val)) {
+												result += '|\n';
+												result += indent.repeat(indentLevel);
+											}
 											result += '|';
@@ -313,6 +325,9 @@ if (/.*\S.*/.test(token.val)) {
 										break;
+									case 'interpolated-code':
+										if (/^ .+$/.test(val)) {
+											result += ' ';
+										}
+										break;
 								}
 							}
-							let val = token.val;
-							val = val.replace(/\s\s+/g, ' ');
 							val = val.trim();
@@ -377,2 +392,33 @@ // Format mustache code like in Vue
 							break;
+						case 'block':
+							if (previousToken && previousToken.type === 'indent') {
+								result += indent;
+							}
+							result += 'block ';
+							if (token.mode !== 'replace') {
+								result += token.mode;
+							}
+							result += token.val;
+							break;
+						case 'extends':
+							result += 'extends ';
+							break;
+						case 'path':
+							result += token.val;
+							break;
+						case 'start-pug-interpolation':
+							result += '#[';
+							break;
+						case 'end-pug-interpolation':
+							result += ']';
+							break;
+						case 'include':
+							if (previousToken && previousToken.type === 'indent') {
+								result += indent;
+							}
+							result += 'include';
+							break;
+						case 'filter':
+							result += `:${token.val}`;
+							break;
 						default:
@@ -379,0 +425,0 @@ throw new Error('Unhandled token: ' + JSON.stringify(token));

src/pug-token.ts

@@ -113,2 +113,41 @@ export interface Loc {
 
+export interface BlockToken {
+	type: 'block';
+	loc: Loc;
+	val: string;
+	mode: 'replace' | 'prepend' | 'append';
+}
+
+export interface ExtendsToken {
+	type: 'extends';
+	loc: Loc;
+}
+
+export interface PathToken {
+	type: 'path';
+	loc: Loc;
+	val: string;
+}
+
+export interface StartPugInterpolationToken {
+	type: 'start-pug-interpolation';
+	loc: Loc;
+}
+
+export interface EndPugInterpolationToken {
+	type: 'end-pug-interpolation';
+	loc: Loc;
+}
+
+export interface IncludeToken {
+	type: 'include';
+	loc: Loc;
+}
+
+export interface FilterToken {
+	type: 'filter';
+	loc: Loc;
+	val: string;
+}
+
 export type Token =
@@ -132,2 +171,9 @@ | TagToken
 	| DoctypeToken
-	| DotToken;
+	| DotToken
+	| BlockToken
+	| ExtendsToken
+	| PathToken
+	| StartPugInterpolationToken
+	| EndPugInterpolationToken
+	| IncludeToken
+	| FilterToken;

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

70488

increased by11.31%

Lines of code

1148

increased by12.66%

Worsened metrics

Number of lines in readme file

114

decreased by-1.72%

No dependency changes