Merge with master

.gitignore

@@ -1,4 +1,5 @@
 node_modules
 .vscode
+.history
 plugin.js
 plugin.js.map

CHANGELOG.md

@@ -1,5 +1,11 @@
 # prettier-plugin-svelte changelog
 
+## 1.1.1
+
+* Fix bug that breaks plugin when using Prettier v2.1.x ([#123](https://github.com/sveltejs/prettier-plugin-svelte/issues/123))
+* Fix incorrectly escaped regexp which broke style tags followed by "s" ([#118](https://github.com/sveltejs/prettier-plugin-svelte/issues/118))
+* Write to console.error to prevent crash and erasion of files ([#115](https://github.com/sveltejs/prettier-plugin-svelte/issues/115))
+
 ## 1.1.0
 
 * Support `<!-- prettier-ignore -->` comments ([#59](https://github.com/sveltejs/prettier-plugin-svelte/issues/59))

package.json

@@ -1,6 +1,6 @@
 {
     "name": "prettier-plugin-svelte",
-    "version": "1.1.0",
+    "version": "1.1.1",
     "description": "Svelte plugin for prettier",
     "main": "plugin.js",
     "files": [
@@ -29,9 +29,9 @@
     "homepage": "https://github.com/sveltejs/prettier-plugin-svelte#readme",
     "devDependencies": {
         "@types/node": "^10.12.18",
-        "@types/prettier": "^2.0.0",
+        "@types/prettier": "^2.0.2",
         "ava": "1.2.0",
-        "prettier": "^2.0.0",
+        "prettier": "^2.1.0",
         "rollup": "1.1.2",
         "rollup-plugin-commonjs": "9.2.0",
         "rollup-plugin-node-resolve": "4.0.0",

src/index.ts

@@ -1,5 +1,6 @@
 import { SupportLanguage, Parser, Printer } from 'prettier';
 import { print } from './print';
+import { ASTNode } from './print/nodes';
 import { embed } from './embed';
 import { snipTagContent } from './lib/snipTagContent';
 
@@ -21,9 +22,9 @@ export const languages: Partial<SupportLanguage>[] = [
 
 export const parsers: Record<string, Parser> = {
     svelte: {
-        parse: text => {
+        parse: (text) => {
             try {
-                return require(`svelte/compiler`).parse(text);
+                return <ASTNode>{ ...require(`svelte/compiler`).parse(text), __isRoot: true };
             } catch (err) {
                 err.loc = {
                     start: err.start,
@@ -34,7 +35,7 @@ export const parsers: Record<string, Parser> = {
                 throw err;
             }
         },
-        preprocess: text => {
+        preprocess: (text) => {
             text = snipTagContent('style', text);
             text = snipTagContent('script', text, '{}');
             return text.trim();

src/lib/snipTagContent.ts

@@ -1,5 +1,5 @@
 export function snipTagContent(tagName: string, source: string, placeholder = ''): string {
-    const regex = new RegExp(`[\s\n]*<${tagName}([^]*?)>([^]*?)<\/${tagName}>[\s\n]*`, 'gi');
+    const regex = new RegExp(`[\\s\n]*<${tagName}([^]*?)>([^]*?)<\/${tagName}>[\\s\n]*`, 'gi');
     return source.replace(regex, (_, attributes, content) => {
         const encodedContent = Buffer.from(content).toString('base64');
         return `<${tagName}${attributes} ✂prettier:content✂="${encodedContent}">${placeholder}</${tagName}>`;

src/print/helpers.ts

@@ -15,8 +15,12 @@ export interface ASTNode {
     module?: ScriptNode;
 }
 
+/**
+ * Determines whether or not given node
+ * is the root of the Svelte AST.
+ */
 export function isASTNode(n: any): n is ASTNode {
-    return 'html' in n && 'tokens' in n;
+    return n && n.__isRoot;
 }
 
 export function isPreTagContent(path: FastPath): boolean {

src/print/index.ts

@@ -470,6 +470,7 @@ export function print(path: FastPath, options: ParserOptions, print: PrintFn): D
             return concat([line, '{...', printJS(path, print, 'expression'), '}']);
     }
 
+    console.error(JSON.stringify(node, null, 4));
     throw new Error('unknown node type: ' + node.type);
 }
 
@@ -695,6 +696,6 @@ function expandNode(node): string {
             return ' ...' + node.argument.name;
     }
 
-    console.log(JSON.stringify(node, null, 4));
+    console.error(JSON.stringify(node, null, 4));
     throw new Error('unknown node type: ' + node.type);
 }

src/print/nodes.ts

@@ -285,3 +285,26 @@ export type Node =
     | ModuleScriptNode
     | BodyNode
     | OptionsNode;
+
+/**
+ * The Svelte AST root node
+ */
+export interface ASTNode {
+    html: Node;
+    css?: Node & {
+        attributes: Node[];
+        children: Node[];
+        content: Node & {
+            styles: string;
+        };
+    };
+    js?: ScriptNode;
+    instance?: ScriptNode;
+    module?: ScriptNode;
+    /**
+     * This is not actually part of the Svelte parser output,
+     * but we add it afterwards to make sure we can distinguish
+     * the root node from other nodes afterwards.
+     */
+    __isRoot: boolean;
+}

test/printer/samples/s-after-style-tag.html

@@ -0,0 +1,5 @@
+<style>
+
+</style>
+
+sssssweet

test/printer/samples/script-inside-comment.html

@@ -1 +1 @@
-<!-- <script>alert(1)</script> -->
+<!--<script>alert(1)</script>-->

test/printer/samples/style-inside-comment.html

@@ -1 +1 @@
-<!-- <style>div { color: red }</style> -->
+<!--<style>div { color: red }</style>-->