(feat) support style directive (#274)

Requires Svelte 3.46.1 or later
sveltejs · Jan 13, 2022 · ec6539e · ec6539e
1 parent d97d7f6
commit ec6539e
Show file tree

Hide file tree

Showing 9 changed files with 57 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## 2.6.0 (Unreleased)
 
 * (feat) Support `@const` tag ([#272](https://github.com/sveltejs/prettier-plugin-svelte/issues/272))
+* (feat) Support `style` directive (requires Svelte 3.46.1 or later) ([#274](https://github.com/sveltejs/prettier-plugin-svelte/issues/274))
 
 ## 2.5.1
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -37,7 +37,7 @@
         "prettier": "^2.4.1",
         "rollup": "2.36.0",
         "rollup-plugin-typescript": "1.0.1",
-        "svelte": "^3.46.0",
+        "svelte": "^3.46.1",
         "ts-node": "^9.1.1",
         "tslib": "^2.0.3",
         "typescript": "4.1.3"

diff --git a/src/print/index.ts b/src/print/index.ts
@@ -44,6 +44,7 @@ import {
     IfBlockNode,
     Node,
     OptionsNode,
+    StyleDirectiveNode,
     TextNode,
 } from './nodes';
 
@@ -572,6 +573,28 @@ export function print(path: FastPath, options: ParserOptions, print: PrintFn): D
                     ? ''
                     : concat(['=', ...printJsExpression()]),
             ]);
+        case 'StyleDirective':
+            if (isOrCanBeConvertedToShorthand(node)) {
+                if (options.svelteStrictMode) {
+                    return concat([line, 'style:', node.name, '="{', node.name, '}"']);
+                } else if (options.svelteAllowShorthand) {
+                    return concat([line, 'style:', node.name]);
+                } else {
+                    return concat([line, 'style:', node.name, '={', node.name, '}']);
+                }
+            } else {
+                if (node.value === true) {
+                    return concat([line, 'style:', node.name]);
+                }
+
+                const quotes = !isLoneMustacheTag(node.value) || options.svelteStrictMode;
+                const attrNodeValue = printAttributeNodeValue(path, print, quotes, node);
+                if (quotes) {
+                    return concat([line, 'style:', node.name, '=', '"', attrNodeValue, '"']);
+                } else {
+                    return concat([line, 'style:', node.name, '=', attrNodeValue]);
+                }
+            }
         case 'Let':
             return concat([
                 line,
@@ -732,7 +755,7 @@ function printAttributeNodeValue(
     path: FastPath<any>,
     print: PrintFn,
     quotes: boolean,
-    node: AttributeNode,
+    node: AttributeNode | StyleDirectiveNode,
 ) {
     const valueDocs = path.map((childPath) => childPath.call(print), 'value');
 

diff --git a/src/print/node-helpers.ts b/src/print/node-helpers.ts
@@ -20,6 +20,7 @@ import {
     ThenBlockNode,
     CommentNode,
     SlotTemplateNode,
+    StyleDirectiveNode,
 } from './nodes';
 import { blockElements, TagName } from '../lib/elements';
 import { FastPath, ParserOptions } from 'prettier';
@@ -281,7 +282,7 @@ export function isAttributeShorthand(node: true | Node[]): node is [AttributeSho
 /**
  * True if node is of type `{a}` or `a={a}`
  */
-export function isOrCanBeConvertedToShorthand(node: AttributeNode): boolean {
+export function isOrCanBeConvertedToShorthand(node: AttributeNode | StyleDirectiveNode): boolean {
     if (isAttributeShorthand(node.value)) {
         return true;
     }

diff --git a/src/print/nodes.ts b/src/print/nodes.ts
@@ -119,6 +119,12 @@ export interface ClassNode extends BaseNode {
     expression: Node;
 }
 
+export interface StyleDirectiveNode extends BaseNode {
+    type: 'StyleDirective';
+    name: string;
+    value: Node[] | true;
+}
+
 export interface LetNode extends BaseNode {
     type: 'Let';
     name: string;
@@ -285,6 +291,7 @@ export type Node =
     | EventHandlerNode
     | BindingNode
     | ClassNode
+    | StyleDirectiveNode
     | LetNode
     | DebugTagNode
     | RefNode

diff --git a/test/formatting/samples/style-directive/input.html b/test/formatting/samples/style-directive/input.html
@@ -0,0 +1,4 @@
+<div style:background=green />
+<div style:background="{color}" />
+<div style:background='prefix{color}suffix' />
+<div style:background={background} />
diff --git a/test/formatting/samples/style-directive/output.html b/test/formatting/samples/style-directive/output.html
@@ -0,0 +1,4 @@
+<div style:background="green" />
+<div style:background={color} />
+<div style:background="prefix{color}suffix" />
+<div style:background />
diff --git a/test/printer/samples/style-directive.html b/test/printer/samples/style-directive.html
@@ -0,0 +1,7 @@
+<div style:background="green" />
+<div style:background={color} />
+<div style:background="prefix{color}suffix" />
+<div style:background="{color}suffix" />
+<div style:background="prefix{color}" />
+<div style:background={`prefix${color}`} />
+<div style:background />