Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: fixed an error in the vue component editor(https://github.com/wi… #10283

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/integrations/vue/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
"@types/chai": "^4.3.10",
"astro": "workspace:*",
"astro-scripts": "workspace:*",
"chai": "^4.3.10",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We don't use chai anymore, you'll have to use node:assert/strict

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok!

"cheerio": "1.0.0-rc.12",
"linkedom": "^0.16.4",
"vite": "^5.1.4",
Expand Down
8 changes: 4 additions & 4 deletions packages/integrations/vue/src/editor.cts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ export function toTSX(code: string, className: string): string {
const { scriptSetup } = parsedResult.descriptor;

if (scriptSetup) {
const definePropsType = scriptSetup.content.match(/defineProps<([\s\S]+?)>\s?\(\)/);
const codeWithoutComments = scriptSetup.content.replace(/\/\/.*|\/\*[\s\S]*?\*\//g, '');
const definePropsType = codeWithoutComments.match(/defineProps<([\s\S]+?)>\s?\(\)/);
const propsGeneric = scriptSetup.attrs.generic;
const propsGenericType = propsGeneric ? `<${propsGeneric}>` : '';

Expand All @@ -40,11 +41,10 @@ export function toTSX(code: string, className: string): string {
// TODO. Find a way to support generics when using defineProps without passing explicit types.
// Right now something like this `defineProps({ prop: { type: Array as PropType<T[]> } })`
// won't be correctly typed in Astro.
const defineProps = scriptSetup.content.match(/defineProps\([\s\S]+\)/);

const defineProps = codeWithoutComments.match(/defineProps\([\s\S]+?\)/);
if (defineProps) {
result = `
import { defineProps } from '@vue/runtime-core';
import { defineProps } from 'vue';

${regularScriptBlockContent}

Expand Down
47 changes: 47 additions & 0 deletions packages/integrations/vue/test/toTsx.test.cts
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
import { toTSX } from '../src/editor.cts';
import { describe, it} from 'node:test';
import { expect } from 'chai';

describe('toTSX function', () => {
it('should correctly transform Vue code to TSX with comments', () => {
const vueCode = `
<template>
<div>{{ msg }}</div>
</template>

<script setup>
// This is a comment in script setup
// defineProps(['msg']);
// console.log('foo)
</script>
`;

const className = 'MyComponent';
const result = toTSX(vueCode, className);

// Replace the expectations below with the expected result based on your logic
expect(result).to.equal(`export default function ${className}__AstroComponent_(_props: Record<string, any>): any {}`);
});
it('should correctly transform Vue code to TSX', () => {
const vueCode = `
<template>
<div @click="handleClick">{{ msg }}</div>
</template>

<script setup>
const props defineProps({
msg: String
});
const handleClick = () => {
console.log('foo');
}
</script>
`;

const className = 'MyComponent';
const result = toTSX(vueCode, className);

expect(result.replace(/\s/g, '')).
to.equal(`import{defineProps}from'vue';constProps=defineProps({msg:String})exportdefaultfunction${className}__AstroComponent_(_props:typeofProps):any{<div></div>}`);
});
});
160 changes: 124 additions & 36 deletions pnpm-lock.yaml
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You have to revert this file too @phk422

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading