Merge pull request #39 from wattanx/fix/support-other-default-pattern

fix(vue-script-setup-converter): support return statement

packages/vue-script-setup-converter/src/lib/converter/propsConverter.test.ts

@@ -214,6 +214,40 @@ const props = withDefaults(defineProps<Props>(), {
     expect(output).toBe(expected);
   });
 
+  it("default arrow function and return", () => {
+    const source = `<script lang="ts">
+  import { defineComponent, toRefs, computed, ref } from 'vue';
+  
+  export default defineComponent({
+    name: 'HelloWorld',
+    props: {
+      foo: {
+        type: Object,
+        default: () => {
+          return { msg: "Hello World" }
+        }
+      },
+      bar: {
+        type: Array,
+        default: () => {
+          return ["foo", "bar"]
+        }
+      }
+    }
+  })
+  </script>`;
+    const output = parseScript(source, "ts");
+
+    const expected = `type Props = { foo?: { msg: string }; bar?: string[] };
+const props = withDefaults(defineProps<Props>(), {
+  foo: () => ({ msg: "Hello World" }),
+  bar: () => ["foo", "bar"],
+});
+`;
+
+    expect(output).toBe(expected);
+  });
+
   it("non primitive", () => {
     const source = `<script lang="ts">
   import { defineComponent, toRefs, computed, ref, PropType } from 'vue';

packages/vue-script-setup-converter/src/lib/converter/propsConverter.ts

@@ -10,7 +10,7 @@ import {
   AsExpression,
   ArrowFunction,
 } from "ts-morph";
-import { getOptionsNode } from "../helper";
+import { getNodeByKind, getOptionsNode } from "../helper";
 
 export const convertProps = (node: CallExpression, lang: string = "js") => {
   const propsNode = getOptionsNode(node, "props");
@@ -257,6 +257,21 @@ const getPropTypeByDefault = (propsNode: MethodDeclaration) => {
 const getPropTypeByArrowFunction = (node: ArrowFunction) => {
   const body = node.getBody();
 
+  if (Node.isBlock(body)) {
+    const statement = body.getStatements()[0];
+
+    if (Node.isReturnStatement(statement)) {
+      const expression = statement.getExpression();
+
+      if (
+        Node.isObjectLiteralExpression(expression) ||
+        Node.isArrayLiteralExpression(expression)
+      ) {
+        return expression.getType().getText();
+      }
+    }
+  }
+
   if (Node.isArrayLiteralExpression(body)) {
     return body.getType().getText();
   }
@@ -313,6 +328,26 @@ const getPropsOption = (
     if (!initializer) {
       throw new Error("props property not found.");
     }
+
+    if (Node.isArrowFunction(initializer)) {
+      const returnStatement = getNodeByKind(
+        initializer,
+        SyntaxKind.ReturnStatement
+      ) as ReturnStatement;
+
+      if (!returnStatement) {
+        return initializer.getText();
+      }
+
+      const expression = returnStatement.getExpression();
+      if (
+        Node.isObjectLiteralExpression(expression) ||
+        Node.isArrayLiteralExpression(expression)
+      ) {
+        return `() => (${expression.getText()})`;
+      }
+    }
+
     if (
       isFalseKeyword(initializer.getKind()) ||
       isTrueKeyword(initializer.getKind())