diff --git a/package.json b/package.json index f7f638d1..ca6f996e 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,8 @@ "lint": "biome lint --max-diagnostics=none src/ tests/", "preview": "pnpm run build:plain && npm version prerelease --preid=alpha --git-tag-version=false && npm pack", "preview:minor": "pnpm run build:plain && npm version preminor --preid=alpha --git-tag-version=false && npm pack", - "test": "vitest run --passWithNoTests" + "test": "vitest run --passWithNoTests", + "snapshot": "vitest -u" }, "dependencies": { "zod": "3.22.4" @@ -39,7 +40,7 @@ "@trivago/prettier-plugin-sort-imports": "4.2.1", "@types/node": "20.17.46", "esbuild": "0.25.0", - "prettier": "3.1.0", + "prettier": "3.7.3", "prettier-plugin-astro": "0.11.0", "prettier-plugin-svelte": "3.0.0", "rimraf": "5.0.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index d0e1e11a..0a067be5 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -17,7 +17,7 @@ importers: version: 2.0.0 '@trivago/prettier-plugin-sort-imports': specifier: 4.2.1 - version: 4.2.1(prettier@3.1.0) + version: 4.2.1(prettier@3.7.3) '@types/node': specifier: 20.17.46 version: 20.17.46 @@ -25,14 +25,14 @@ importers: specifier: 0.25.0 version: 0.25.0 prettier: - specifier: 3.1.0 - version: 3.1.0 + specifier: 3.7.3 + version: 3.7.3 prettier-plugin-astro: specifier: 0.11.0 version: 0.11.0 prettier-plugin-svelte: specifier: 3.0.0 - version: 3.0.0(prettier@3.1.0)(svelte@4.2.19) + version: 3.0.0(prettier@3.7.3)(svelte@4.2.19) rimraf: specifier: 5.0.1 version: 5.0.1 @@ -911,8 +911,8 @@ packages: prettier: ^3.0.0 svelte: ^3.2.0 || ^4.0.0-next.0 - prettier@3.1.0: - resolution: {integrity: sha512-TQLvXjq5IAibjh8EpBIkNKxO749UEWABoiIZehEPiY4GNpVdhaFKqSTu+QrlU6D2dPAfubRmtJTi4K4YkQ5eXw==} + prettier@3.7.3: + resolution: {integrity: sha512-QgODejq9K3OzoBbuyobZlUhznP5SKwPqp+6Q6xw6o8gnhr4O85L2U915iM2IDcfF2NPXVaM9zlo9tdwipnYwzg==} engines: {node: '>=14'} hasBin: true @@ -1491,7 +1491,7 @@ snapshots: '@sinclair/typebox@0.27.8': {} - '@trivago/prettier-plugin-sort-imports@4.2.1(prettier@3.1.0)': + '@trivago/prettier-plugin-sort-imports@4.2.1(prettier@3.7.3)': dependencies: '@babel/generator': 7.17.7 '@babel/parser': 7.27.2 @@ -1499,7 +1499,7 @@ snapshots: '@babel/types': 7.17.0 javascript-natural-sort: 0.7.1 lodash: 4.17.21 - prettier: 3.1.0 + prettier: 3.7.3 transitivePeerDependencies: - supports-color @@ -1844,15 +1844,15 @@ snapshots: prettier-plugin-astro@0.11.0: dependencies: '@astrojs/compiler': 1.8.2 - prettier: 3.1.0 + prettier: 3.7.3 sass-formatter: 0.7.9 - prettier-plugin-svelte@3.0.0(prettier@3.1.0)(svelte@4.2.19): + prettier-plugin-svelte@3.0.0(prettier@3.7.3)(svelte@4.2.19): dependencies: - prettier: 3.1.0 + prettier: 3.7.3 svelte: 4.2.19 - prettier@3.1.0: {} + prettier@3.7.3: {} pretty-format@29.7.0: dependencies: diff --git a/src/core-parts/finder.ts b/src/core-parts/finder.ts index e12f53f2..457b3213 100644 --- a/src/core-parts/finder.ts +++ b/src/core-parts/finder.ts @@ -1499,14 +1499,23 @@ export function findTargetClassNameNodesForHtml( */ const classNameNodes: ClassNameNode[] = []; - function recursion(node: unknown, parentNode?: { type?: unknown }): void { - if (!isTypeof(node, z.object({ type: z.string() }))) { + function recursion( + node: unknown, + parentNode?: { kind: string; type?: undefined } | { kind?: undefined; type: string }, + ): void { + if ( + !isTypeof(node, z.object({ kind: z.string() })) && + !isTypeof(node, z.object({ type: z.string() })) + ) { return; } + const nodeType = isTypeof(node, z.object({ kind: z.string() })) ? node.kind : node.type; + const parentNodeType = parentNode?.kind ?? parentNode?.type; + let recursiveProps: string[] = []; - switch (node.type) { + switch (nodeType) { case 'element': { recursiveProps = ['attrs', 'children']; break; @@ -1558,11 +1567,11 @@ export function findTargetClassNameNodesForHtml( node.sourceSpan.end.offset, ]; const currentASTNode: ASTNode = { - type: node.type, + type: nodeType, range: [currentNodeRangeStart, currentNodeRangeEnd], }; - switch (node.type) { + switch (nodeType) { case 'attribute': { nonCommentNodes.push(currentASTNode); @@ -1578,7 +1587,7 @@ export function findTargetClassNameNodesForHtml( name: z.string(), }), ) && - parentNode.type === 'element' && + parentNodeType === 'element' && isTypeof( node, z.object({ @@ -1779,14 +1788,23 @@ export function findTargetClassNameNodesForVue( */ const classNameNodes: ClassNameNode[] = []; - function recursion(node: unknown, parentNode?: { type?: unknown }): void { - if (!isTypeof(node, z.object({ type: z.string() }))) { + function recursion( + node: unknown, + parentNode?: { kind: string; type?: undefined } | { kind?: undefined; type: string }, + ): void { + if ( + !isTypeof(node, z.object({ kind: z.string() })) && + !isTypeof(node, z.object({ type: z.string() })) + ) { return; } + const nodeType = isTypeof(node, z.object({ kind: z.string() })) ? node.kind : node.type; + const parentNodeType = parentNode?.kind ?? parentNode?.type; + let recursiveProps: string[] = []; - switch (node.type) { + switch (nodeType) { case 'element': { recursiveProps = ['attrs', 'children']; break; @@ -1838,11 +1856,11 @@ export function findTargetClassNameNodesForVue( node.sourceSpan.end.offset, ]; const currentASTNode: ASTNode = { - type: node.type, + type: nodeType, range: [currentNodeRangeStart, currentNodeRangeEnd], }; - switch (node.type) { + switch (nodeType) { case 'attribute': { nonCommentNodes.push(currentASTNode); @@ -1860,7 +1878,7 @@ export function findTargetClassNameNodesForVue( name: z.string(), }), ) && - parentNode.type === 'element' && + parentNodeType === 'element' && isTypeof( node, z.object({ @@ -2074,14 +2092,23 @@ export function findTargetClassNameNodesForAngular( */ const classNameNodes: ClassNameNode[] = []; - function recursion(node: unknown, parentNode?: { type?: unknown }): void { - if (!isTypeof(node, z.object({ type: z.string() }))) { + function recursion( + node: unknown, + parentNode?: { kind: string; type?: undefined } | { kind?: undefined; type: string }, + ): void { + if ( + !isTypeof(node, z.object({ kind: z.string() })) && + !isTypeof(node, z.object({ type: z.string() })) + ) { return; } + const nodeType = isTypeof(node, z.object({ kind: z.string() })) ? node.kind : node.type; + const parentNodeType = parentNode?.kind ?? parentNode?.type; + let recursiveProps: string[] = []; - switch (node.type) { + switch (nodeType) { case 'angularControlFlowBlock': case 'root': { recursiveProps = ['children']; @@ -2134,11 +2161,11 @@ export function findTargetClassNameNodesForAngular( node.sourceSpan.end.offset, ]; const currentASTNode: ASTNode = { - type: node.type, + type: nodeType, range: [currentNodeRangeStart, currentNodeRangeEnd], }; - switch (node.type) { + switch (nodeType) { case 'attribute': { nonCommentNodes.push(currentASTNode); @@ -2156,7 +2183,7 @@ export function findTargetClassNameNodesForAngular( name: z.string(), }), ) && - parentNode.type === 'element' && + parentNodeType === 'element' && isTypeof( node, z.object({ diff --git a/src/parsers.ts b/src/parsers.ts index cbea2e7b..d56e97bc 100644 --- a/src/parsers.ts +++ b/src/parsers.ts @@ -23,9 +23,9 @@ async function advancedParse( defaultParser: Parser, options: ResolvedOptions, ): Promise { - const preprocessedText = defaultParser.preprocess + const preprocessedText = await (defaultParser.preprocess ? defaultParser.preprocess(text, options) - : text; + : text); let ast = await defaultParser.parse(preprocessedText, options); if (parserName === 'svelte') { diff --git a/tests/angular/string-literal-property/absolute.test.ts b/tests/angular/string-literal-property/absolute.test.ts index 224a582a..80798282 100644 --- a/tests/angular/string-literal-property/absolute.test.ts +++ b/tests/angular/string-literal-property/absolute.test.ts @@ -51,7 +51,7 @@ const fixtures: Fixture[] = [
@@ -80,7 +80,7 @@ const fixtures: Fixture[] = [
@@ -107,7 +107,7 @@ const fixtures: Fixture[] = [ [class]=" classNames({ 'lorem ipsum dolor sit amet consectetur adipiscing - elit proin': true + elit proin': true, }) " > @@ -134,7 +134,7 @@ const fixtures: Fixture[] = [ [class]=" classNames({ ' lorem ipsum dolor sit amet consectetur - adipiscing elit proin ': true + adipiscing elit proin ': true, }) " > @@ -166,7 +166,7 @@ const fixtures: Fixture[] = [ [class]=" classNames({ 'lorem ipsum dolor sit amet consectetur adipiscing - elit proin': true + elit proin': true, }) " > @@ -194,7 +194,7 @@ const fixtures: Fixture[] = [ classNames({ 'lorem ipsum dolor sit amet consectetur adipiscing elit proin ex massa hendrerit eu posuere eu - volutpat id neque pellentesque': true + volutpat id neque pellentesque': true, }) " > @@ -222,7 +222,7 @@ const fixtures: Fixture[] = [ classNames({ ' lorem ipsum dolor sit amet consectetur adipiscing elit proin ex massa hendrerit eu - posuere eu volutpat id neque pellentesque ': true + posuere eu volutpat id neque pellentesque ': true, }) " > @@ -255,7 +255,7 @@ const fixtures: Fixture[] = [ classNames({ 'lorem ipsum dolor sit amet consectetur adipiscing elit proin ex massa hendrerit eu posuere eu - volutpat id neque pellentesque': true + volutpat id neque pellentesque': true, }) " > @@ -282,7 +282,7 @@ const fixtures: Fixture[] = [ [class]=" classNames({ 'lorem ipsum dolor sit amet consectetur adipiscing - elit proin ex massa hendrerit eu posuere': true + elit proin ex massa hendrerit eu posuere': true, }) " > @@ -309,7 +309,7 @@ const fixtures: Fixture[] = [ [className]=" classNames({ 'lorem ipsum dolor sit amet consectetur adipiscing - elit proin ex massa hendrerit eu posuere': true + elit proin ex massa hendrerit eu posuere': true, }) " > @@ -336,7 +336,7 @@ const fixtures: Fixture[] = [ [attr.class]=" classNames({ 'lorem ipsum dolor sit amet consectetur adipiscing - elit proin ex massa hendrerit eu posuere': true + elit proin ex massa hendrerit eu posuere': true, }) " > @@ -363,7 +363,7 @@ const fixtures: Fixture[] = [ [ngClass]=" classNames({ 'lorem ipsum dolor sit amet consectetur adipiscing - elit proin ex massa hendrerit eu posuere': true + elit proin ex massa hendrerit eu posuere': true, }) " > diff --git a/tests/angular/string-literal-property/relative.test.ts b/tests/angular/string-literal-property/relative.test.ts index c0ebbf76..f02b6b06 100644 --- a/tests/angular/string-literal-property/relative.test.ts +++ b/tests/angular/string-literal-property/relative.test.ts @@ -51,7 +51,7 @@ const fixtures: Fixture[] = [
@@ -80,7 +80,7 @@ const fixtures: Fixture[] = [
@@ -106,7 +106,7 @@ const fixtures: Fixture[] = [
@@ -133,7 +133,7 @@ const fixtures: Fixture[] = [ [class]=" classNames({ ' lorem ipsum dolor sit amet consectetur adipiscing elit - proin ': true + proin ': true, }) " > @@ -152,7 +152,7 @@ const fixtures: Fixture[] = [ 'lorem ipsum dolor sit amet consectetur adipiscing elit - proin': true + proin': true, })">
@@ -164,7 +164,7 @@ const fixtures: Fixture[] = [
@@ -192,7 +192,7 @@ const fixtures: Fixture[] = [ classNames({ 'lorem ipsum dolor sit amet consectetur adipiscing elit proin ex massa hendrerit eu posuere eu volutpat id neque - pellentesque': true + pellentesque': true, }) " > @@ -220,7 +220,7 @@ const fixtures: Fixture[] = [ classNames({ ' lorem ipsum dolor sit amet consectetur adipiscing elit proin ex massa hendrerit eu posuere eu volutpat id neque - pellentesque ': true + pellentesque ': true, }) " > @@ -239,7 +239,7 @@ const fixtures: Fixture[] = [ 'lorem ipsum dolor sit amet consectetur adipiscing elit - proin ex massa hendrerit eu posuere eu volutpat id neque pellentesque': true + proin ex massa hendrerit eu posuere eu volutpat id neque pellentesque': true, })">
@@ -253,7 +253,7 @@ const fixtures: Fixture[] = [ classNames({ 'lorem ipsum dolor sit amet consectetur adipiscing elit proin ex massa hendrerit eu posuere eu volutpat id neque - pellentesque': true + pellentesque': true, }) " > @@ -280,7 +280,7 @@ const fixtures: Fixture[] = [ [class]=" classNames({ 'lorem ipsum dolor sit amet consectetur adipiscing elit proin - ex massa hendrerit eu posuere': true + ex massa hendrerit eu posuere': true, }) " > @@ -307,7 +307,7 @@ const fixtures: Fixture[] = [ [className]=" classNames({ 'lorem ipsum dolor sit amet consectetur adipiscing elit proin - ex massa hendrerit eu posuere': true + ex massa hendrerit eu posuere': true, }) " > @@ -334,7 +334,7 @@ const fixtures: Fixture[] = [ [attr.class]=" classNames({ 'lorem ipsum dolor sit amet consectetur adipiscing elit proin - ex massa hendrerit eu posuere': true + ex massa hendrerit eu posuere': true, }) " > @@ -361,7 +361,7 @@ const fixtures: Fixture[] = [ [ngClass]=" classNames({ 'lorem ipsum dolor sit amet consectetur adipiscing elit proin - ex massa hendrerit eu posuere': true + ex massa hendrerit eu posuere': true, }) " > diff --git a/tests/astro/issue-39/relative.test.ts b/tests/astro/issue-39/relative.test.ts index a49781fe..f701ca99 100644 --- a/tests/astro/issue-39/relative.test.ts +++ b/tests/astro/issue-39/relative.test.ts @@ -53,7 +53,7 @@ const combination = classNames( const combination = classNames( \`relative cursor-default select-none py-2 pl-10 pr-4 \${ active - ? \`bg-teal-600 \${ active ? "bg-teal-600 text-white" : "text-gray-900" } text-white\` + ? \`bg-teal-600 \${active ? "bg-teal-600 text-white" : "text-gray-900"} text-white\` : "text-gray-900" }\`, ); diff --git a/tests/astro/issue-68/__snapshots__/absolute.test.ts.snap b/tests/astro/issue-68/__snapshots__/absolute.test.ts.snap index 17fcbec7..03719a94 100644 --- a/tests/astro/issue-68/__snapshots__/absolute.test.ts.snap +++ b/tests/astro/issue-68/__snapshots__/absolute.test.ts.snap @@ -15,9 +15,8 @@ printWidth=80 (in snapshot) : \`flex min-h-10 w-max min-w-28 items-center justify-between gap-2 overflow-hidden rounded px-[max(1.5rem,_var(--radius))] py-5 text-center hover:shadow-md\` - } \${ - variant === "default" && "border border-bg-3 bg-bg-2 text-accent-1" - } \${ + } \${variant === "default" && "border border-bg-3 bg-bg-2 text-accent-1"} + \${ variant === "primary" && "active:accent-1 border border-accent-2 !bg-accent-1 text-bg-1" } \${variant === "outline" && "border border-current !bg-transparent"} diff --git a/tests/astro/issue-68/__snapshots__/relative.test.ts.snap b/tests/astro/issue-68/__snapshots__/relative.test.ts.snap index 82dd28dc..2002551e 100644 --- a/tests/astro/issue-68/__snapshots__/relative.test.ts.snap +++ b/tests/astro/issue-68/__snapshots__/relative.test.ts.snap @@ -13,7 +13,7 @@ printWidth=80 (in snapshot) ? "pb-2 text-accent-1 underline underline-offset-8 hover:underline-offset-[10px]" : \`flex min-h-10 w-max min-w-28 items-center justify-between gap-2 overflow-hidden rounded px-[max(1.5rem,_var(--radius))] py-5 text-center hover:shadow-md\` - } \${ variant === "default" && "border border-bg-3 bg-bg-2 text-accent-1" } \${ + } \${variant === "default" && "border border-bg-3 bg-bg-2 text-accent-1"} \${ variant === "primary" && "active:accent-1 border border-accent-2 !bg-accent-1 text-bg-1" } \${variant === "outline" && "border border-current !bg-transparent"} diff --git a/tests/babel/issue-39/absolute.test.ts b/tests/babel/issue-39/absolute.test.ts index e297db7d..56017a48 100644 --- a/tests/babel/issue-39/absolute.test.ts +++ b/tests/babel/issue-39/absolute.test.ts @@ -70,9 +70,8 @@ export default function ClassNameCb() { className={({ active }) => \`relative cursor-default select-none py-2 pl-10 pr-4 \${ active - ? \`bg-teal-600 \${ - active ? "bg-teal-600 text-white" : "text-gray-900" - } text-white\` + ? \`bg-teal-600 + \${active ? "bg-teal-600 text-white" : "text-gray-900"} text-white\` : "text-gray-900" }\` } diff --git a/tests/babel/issue-39/relative.test.ts b/tests/babel/issue-39/relative.test.ts index d5a87ee2..55d3303e 100644 --- a/tests/babel/issue-39/relative.test.ts +++ b/tests/babel/issue-39/relative.test.ts @@ -70,7 +70,7 @@ export default function ClassNameCb() { className={({ active }) => \`relative cursor-default select-none py-2 pl-10 pr-4 \${ active - ? \`bg-teal-600 \${ active ? "bg-teal-600 text-white" : "text-gray-900" } text-white\` + ? \`bg-teal-600 \${active ? "bg-teal-600 text-white" : "text-gray-900"} text-white\` : "text-gray-900" }\` } diff --git a/tests/babel/issue-68/__snapshots__/absolute.test.ts.snap b/tests/babel/issue-68/__snapshots__/absolute.test.ts.snap index 78478e75..dc21c351 100644 --- a/tests/babel/issue-68/__snapshots__/absolute.test.ts.snap +++ b/tests/babel/issue-68/__snapshots__/absolute.test.ts.snap @@ -15,9 +15,8 @@ export function Foo() { : \`flex min-h-10 w-max min-w-28 items-center justify-between gap-2 overflow-hidden rounded px-[max(1.5rem,_var(--radius))] py-5 text-center hover:shadow-md\` - } \${ - variant === "default" && "border border-bg-3 bg-bg-2 text-accent-1" - } \${ + } \${variant === "default" && "border border-bg-3 bg-bg-2 text-accent-1"} + \${ variant === "primary" && "active:accent-1 border border-accent-2 !bg-accent-1 text-bg-1" } \${variant === "outline" && "border border-current !bg-transparent"} diff --git a/tests/babel/issue-68/__snapshots__/relative.test.ts.snap b/tests/babel/issue-68/__snapshots__/relative.test.ts.snap index 751af472..0d0517b0 100644 --- a/tests/babel/issue-68/__snapshots__/relative.test.ts.snap +++ b/tests/babel/issue-68/__snapshots__/relative.test.ts.snap @@ -12,7 +12,7 @@ export function Foo() { ? "pb-2 text-accent-1 underline underline-offset-8 hover:underline-offset-[10px]" : \`flex min-h-10 w-max min-w-28 items-center justify-between gap-2 overflow-hidden rounded px-[max(1.5rem,_var(--radius))] py-5 text-center hover:shadow-md\` - } \${ variant === "default" && "border border-bg-3 bg-bg-2 text-accent-1" } \${ + } \${variant === "default" && "border border-bg-3 bg-bg-2 text-accent-1"} \${ variant === "primary" && "active:accent-1 border border-accent-2 !bg-accent-1 text-bg-1" } \${variant === "outline" && "border border-current !bg-transparent"} diff --git a/tests/svelte/issue-68/__snapshots__/absolute.test.ts.snap b/tests/svelte/issue-68/__snapshots__/absolute.test.ts.snap index 17fcbec7..03719a94 100644 --- a/tests/svelte/issue-68/__snapshots__/absolute.test.ts.snap +++ b/tests/svelte/issue-68/__snapshots__/absolute.test.ts.snap @@ -15,9 +15,8 @@ printWidth=80 (in snapshot) : \`flex min-h-10 w-max min-w-28 items-center justify-between gap-2 overflow-hidden rounded px-[max(1.5rem,_var(--radius))] py-5 text-center hover:shadow-md\` - } \${ - variant === "default" && "border border-bg-3 bg-bg-2 text-accent-1" - } \${ + } \${variant === "default" && "border border-bg-3 bg-bg-2 text-accent-1"} + \${ variant === "primary" && "active:accent-1 border border-accent-2 !bg-accent-1 text-bg-1" } \${variant === "outline" && "border border-current !bg-transparent"} diff --git a/tests/svelte/issue-68/__snapshots__/relative.test.ts.snap b/tests/svelte/issue-68/__snapshots__/relative.test.ts.snap index 82dd28dc..2002551e 100644 --- a/tests/svelte/issue-68/__snapshots__/relative.test.ts.snap +++ b/tests/svelte/issue-68/__snapshots__/relative.test.ts.snap @@ -13,7 +13,7 @@ printWidth=80 (in snapshot) ? "pb-2 text-accent-1 underline underline-offset-8 hover:underline-offset-[10px]" : \`flex min-h-10 w-max min-w-28 items-center justify-between gap-2 overflow-hidden rounded px-[max(1.5rem,_var(--radius))] py-5 text-center hover:shadow-md\` - } \${ variant === "default" && "border border-bg-3 bg-bg-2 text-accent-1" } \${ + } \${variant === "default" && "border border-bg-3 bg-bg-2 text-accent-1"} \${ variant === "primary" && "active:accent-1 border border-accent-2 !bg-accent-1 text-bg-1" } \${variant === "outline" && "border border-current !bg-transparent"} diff --git a/tests/typescript/issue-39/absolute.test.ts b/tests/typescript/issue-39/absolute.test.ts index 341f7e06..0f280e4f 100644 --- a/tests/typescript/issue-39/absolute.test.ts +++ b/tests/typescript/issue-39/absolute.test.ts @@ -70,9 +70,8 @@ export default function ClassNameCb() { className={({ active }) => \`relative cursor-default select-none py-2 pl-10 pr-4 \${ active - ? \`bg-teal-600 \${ - active ? "bg-teal-600 text-white" : "text-gray-900" - } text-white\` + ? \`bg-teal-600 + \${active ? "bg-teal-600 text-white" : "text-gray-900"} text-white\` : "text-gray-900" }\` } diff --git a/tests/typescript/issue-39/relative.test.ts b/tests/typescript/issue-39/relative.test.ts index 5ff64ba5..981af0fb 100644 --- a/tests/typescript/issue-39/relative.test.ts +++ b/tests/typescript/issue-39/relative.test.ts @@ -70,7 +70,7 @@ export default function ClassNameCb() { className={({ active }) => \`relative cursor-default select-none py-2 pl-10 pr-4 \${ active - ? \`bg-teal-600 \${ active ? "bg-teal-600 text-white" : "text-gray-900" } text-white\` + ? \`bg-teal-600 \${active ? "bg-teal-600 text-white" : "text-gray-900"} text-white\` : "text-gray-900" }\` } diff --git a/tests/typescript/issue-68/__snapshots__/absolute.test.ts.snap b/tests/typescript/issue-68/__snapshots__/absolute.test.ts.snap index 78478e75..dc21c351 100644 --- a/tests/typescript/issue-68/__snapshots__/absolute.test.ts.snap +++ b/tests/typescript/issue-68/__snapshots__/absolute.test.ts.snap @@ -15,9 +15,8 @@ export function Foo() { : \`flex min-h-10 w-max min-w-28 items-center justify-between gap-2 overflow-hidden rounded px-[max(1.5rem,_var(--radius))] py-5 text-center hover:shadow-md\` - } \${ - variant === "default" && "border border-bg-3 bg-bg-2 text-accent-1" - } \${ + } \${variant === "default" && "border border-bg-3 bg-bg-2 text-accent-1"} + \${ variant === "primary" && "active:accent-1 border border-accent-2 !bg-accent-1 text-bg-1" } \${variant === "outline" && "border border-current !bg-transparent"} diff --git a/tests/typescript/issue-68/__snapshots__/relative.test.ts.snap b/tests/typescript/issue-68/__snapshots__/relative.test.ts.snap index 751af472..0d0517b0 100644 --- a/tests/typescript/issue-68/__snapshots__/relative.test.ts.snap +++ b/tests/typescript/issue-68/__snapshots__/relative.test.ts.snap @@ -12,7 +12,7 @@ export function Foo() { ? "pb-2 text-accent-1 underline underline-offset-8 hover:underline-offset-[10px]" : \`flex min-h-10 w-max min-w-28 items-center justify-between gap-2 overflow-hidden rounded px-[max(1.5rem,_var(--radius))] py-5 text-center hover:shadow-md\` - } \${ variant === "default" && "border border-bg-3 bg-bg-2 text-accent-1" } \${ + } \${variant === "default" && "border border-bg-3 bg-bg-2 text-accent-1"} \${ variant === "primary" && "active:accent-1 border border-accent-2 !bg-accent-1 text-bg-1" } \${variant === "outline" && "border border-current !bg-transparent"} diff --git a/tests/typescript/string-literal-property/relative.test.ts b/tests/typescript/string-literal-property/relative.test.ts index 83ccc9e3..e43317d6 100644 --- a/tests/typescript/string-literal-property/relative.test.ts +++ b/tests/typescript/string-literal-property/relative.test.ts @@ -101,8 +101,7 @@ export function Foo({ children }) { return (
{children} @@ -156,8 +155,7 @@ export function Foo({ children }) { return (
{children} diff --git a/tests/typescript/template-literal-property/relative.test.ts b/tests/typescript/template-literal-property/relative.test.ts index eea34bd4..4748b90c 100644 --- a/tests/typescript/template-literal-property/relative.test.ts +++ b/tests/typescript/template-literal-property/relative.test.ts @@ -101,8 +101,7 @@ export function Foo({ children }) { return (
{children} @@ -156,8 +155,7 @@ export function Foo({ children }) { return (
{children} diff --git a/tests/vue/issue-39/absolute.test.ts b/tests/vue/issue-39/absolute.test.ts index 0105545d..ebe1a42b 100644 --- a/tests/vue/issue-39/absolute.test.ts +++ b/tests/vue/issue-39/absolute.test.ts @@ -61,9 +61,8 @@ const fixtures: Fixture[] = [ ({ active }) => \`relative cursor-default select-none py-2 pl-10 pr-4 \${ active - ? \`bg-teal-600 \${ - active ? 'bg-teal-600 text-white' : 'text-gray-900' - } text-white\` + ? \`bg-teal-600 + \${active ? 'bg-teal-600 text-white' : 'text-gray-900'} text-white\` : 'text-gray-900' }\` " diff --git a/tests/vue/issue-39/relative.test.ts b/tests/vue/issue-39/relative.test.ts index 516a3061..b88bb698 100644 --- a/tests/vue/issue-39/relative.test.ts +++ b/tests/vue/issue-39/relative.test.ts @@ -61,7 +61,7 @@ const fixtures: Fixture[] = [ ({ active }) => \`relative cursor-default select-none py-2 pl-10 pr-4 \${ active - ? \`bg-teal-600 \${ active ? 'bg-teal-600 text-white' : 'text-gray-900' } text-white\` + ? \`bg-teal-600 \${active ? 'bg-teal-600 text-white' : 'text-gray-900'} text-white\` : 'text-gray-900' }\` " diff --git a/tests/vue/issue-68/__snapshots__/absolute.test.ts.snap b/tests/vue/issue-68/__snapshots__/absolute.test.ts.snap index 3f8b10f2..47d2bd39 100644 --- a/tests/vue/issue-68/__snapshots__/absolute.test.ts.snap +++ b/tests/vue/issue-68/__snapshots__/absolute.test.ts.snap @@ -16,9 +16,8 @@ printWidth=80 (in snapshot) : \`flex min-h-10 w-max min-w-28 items-center justify-between gap-2 overflow-hidden rounded px-[max(1.5rem,_var(--radius))] py-5 text-center hover:shadow-md\` - } \${ - variant === 'default' && 'border border-bg-3 bg-bg-2 text-accent-1' - } \${ + } \${variant === 'default' && 'border border-bg-3 bg-bg-2 text-accent-1'} + \${ variant === 'primary' && 'active:accent-1 border border-accent-2 !bg-accent-1 text-bg-1' } \${variant === 'outline' && 'border border-current !bg-transparent'} diff --git a/tests/vue/issue-68/__snapshots__/relative.test.ts.snap b/tests/vue/issue-68/__snapshots__/relative.test.ts.snap index 4dc2e6be..f903a425 100644 --- a/tests/vue/issue-68/__snapshots__/relative.test.ts.snap +++ b/tests/vue/issue-68/__snapshots__/relative.test.ts.snap @@ -13,7 +13,7 @@ printWidth=80 (in snapshot) ? 'pb-2 text-accent-1 underline underline-offset-8 hover:underline-offset-[10px]' : \`flex min-h-10 w-max min-w-28 items-center justify-between gap-2 overflow-hidden rounded px-[max(1.5rem,_var(--radius))] py-5 text-center hover:shadow-md\` - } \${ variant === 'default' && 'border border-bg-3 bg-bg-2 text-accent-1' } \${ + } \${variant === 'default' && 'border border-bg-3 bg-bg-2 text-accent-1'} \${ variant === 'primary' && 'active:accent-1 border border-accent-2 !bg-accent-1 text-bg-1' } \${variant === 'outline' && 'border border-current !bg-transparent'}