From 386c77c9c6f51bc305d19ab34e90b5de39110479 Mon Sep 17 00:00:00 2001 From: zernonia Date: Tue, 18 Jun 2024 16:49:17 +0800 Subject: [PATCH] fix: prevent transforming importDeclaration --- .../cli/src/utils/transformers/transform-tw-prefix.ts | 5 +++++ .../__snapshots__/transform-tw-prefix.test.ts.snap | 10 +++++++++- packages/cli/test/utils/transform-tw-prefix.test.ts | 11 ++++++++++- 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/packages/cli/src/utils/transformers/transform-tw-prefix.ts b/packages/cli/src/utils/transformers/transform-tw-prefix.ts index 5911f327..07328032 100644 --- a/packages/cli/src/utils/transformers/transform-tw-prefix.ts +++ b/packages/cli/src/utils/transformers/transform-tw-prefix.ts @@ -31,6 +31,11 @@ export const transformTwPrefixes: Transformer = async ({ return sourceFile const value = node.getText() + + // Do not parse imported packages/files + if (node.getParent().getKind() === SyntaxKind.ImportDeclaration) + return + const hasClosingDoubleQuote = value.match(/"/g)?.length === 2 const hasFunction = value.startsWith('"cn(') if (value.search('\'') === -1 && hasClosingDoubleQuote && !hasFunction) { diff --git a/packages/cli/test/utils/__snapshots__/transform-tw-prefix.test.ts.snap b/packages/cli/test/utils/__snapshots__/transform-tw-prefix.test.ts.snap index 1737c025..d69c22ac 100644 --- a/packages/cli/test/utils/__snapshots__/transform-tw-prefix.test.ts.snap +++ b/packages/cli/test/utils/__snapshots__/transform-tw-prefix.test.ts.snap @@ -1,7 +1,8 @@ // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html exports[`transform tailwind prefix 1`] = ` -"const testVariants = cva( +"import { cva } from "class-variance-authority"; +export const testVariants = cva( "tw-bg-background hover:tw-bg-muted tw-text-primary-foreground sm:focus:tw-text-accent-foreground", { variants: { @@ -54,6 +55,13 @@ exports[`transform tailwind prefix 4`] = ` ) " :class="cn(buttonVariants({ variant, size }), props.class)" + :class=" + cn( + buttonVariants({ 'outline' }), + props.class, + 'tw-bg-background' + ) + " > foo diff --git a/packages/cli/test/utils/transform-tw-prefix.test.ts b/packages/cli/test/utils/transform-tw-prefix.test.ts index e1ff6c75..ad72c51f 100644 --- a/packages/cli/test/utils/transform-tw-prefix.test.ts +++ b/packages/cli/test/utils/transform-tw-prefix.test.ts @@ -6,7 +6,9 @@ it('transform tailwind prefix', async () => { expect( await transform({ filename: 'test.ts', - raw: `const testVariants = cva( + raw: `import { cva } from "class-variance-authority" + + export const testVariants = cva( 'bg-background hover:bg-muted text-primary-foreground sm:focus:text-accent-foreground', { variants: { @@ -88,6 +90,13 @@ it('transform tailwind prefix', async () => { id="testing" v-bind="props" @click="handleSomething" :data-test="true" :class="cn('bg-background hover:bg-muted', true && 'text-primary-foreground sm:focus:text-accent-foreground')" :class="cn(buttonVariants({ variant, size }), props.class)" + :class=" + cn( + buttonVariants({ 'outline' }), + props.class, + 'bg-background' + ) + " > foo