fix: issue with functions in useStore for typescript (#1576)

BuilderIO · Oct 1, 2024 · d59d328 · d59d328
1 parent 7e2c95f
commit d59d328
Show file tree

Hide file tree

Showing 13 changed files with 29 additions and 24 deletions.
diff --git a/.changeset/lemon-melons-build.md b/.changeset/lemon-melons-build.md
@@ -0,0 +1,5 @@
+---
+'@builder.io/mitosis': patch
+---
+
+[Angular, React, Vue] fix: issue with functions inside `useStore` missing ReturnType<...> when using `typescript: true` in config
diff --git a/packages/core/src/__tests__/__snapshots__/angular.import.test.ts.snap b/packages/core/src/__tests__/__snapshots__/angular.import.test.ts.snap
@@ -13957,14 +13957,14 @@ type GetterStore = {
 })
 export default class TypeGetterStore {
  name: GetterStore[\\"name\\"] = \\"test\\";
- getName(): GetterStore[\\"getName\\"] {
+ getName(): ReturnType<GetterStore[\\"getName\\"]> {
  if (this.name === \\"a\\") {
  return \\"b\\";
  }
 
  return this.name;
  }
- get test(): GetterStore[\\"test\\"] {
+ get test(): ReturnType<GetterStore[\\"test\\"]> {
  return \\"test\\";
  }
 }

diff --git a/packages/core/src/__tests__/__snapshots__/angular.mapper.test.ts.snap b/packages/core/src/__tests__/__snapshots__/angular.mapper.test.ts.snap
@@ -14181,14 +14181,14 @@ type GetterStore = {
 })
 export default class TypeGetterStore {
  name: GetterStore[\\"name\\"] = \\"test\\";
- getName(): GetterStore[\\"getName\\"] {
+ getName(): ReturnType<GetterStore[\\"getName\\"]> {
  if (this.name === \\"a\\") {
  return \\"b\\";
  }
 
  return this.name;
  }
- get test(): GetterStore[\\"test\\"] {
+ get test(): ReturnType<GetterStore[\\"test\\"]> {
  return \\"test\\";
  }
 }

diff --git a/packages/core/src/__tests__/__snapshots__/angular.state.test.ts.snap b/packages/core/src/__tests__/__snapshots__/angular.state.test.ts.snap
@@ -14388,14 +14388,14 @@ type GetterStore = {
 })
 export default class TypeGetterStore {
  name: GetterStore[\\"name\\"] = \\"test\\";
- getName(): GetterStore[\\"getName\\"] {
+ getName(): ReturnType<GetterStore[\\"getName\\"]> {
  if (this.name === \\"a\\") {
  return \\"b\\";
  }
 
  return this.name;
  }
- get test(): GetterStore[\\"test\\"] {
+ get test(): ReturnType<GetterStore[\\"test\\"]> {
  return \\"test\\";
  }
 }

diff --git a/packages/core/src/__tests__/__snapshots__/angular.styles.test.ts.snap b/packages/core/src/__tests__/__snapshots__/angular.styles.test.ts.snap
@@ -12530,14 +12530,14 @@ type GetterStore = {
 })
 export default class TypeGetterStore {
  name: GetterStore[\\"name\\"] = \\"test\\";
- getName(): GetterStore[\\"getName\\"] {
+ getName(): ReturnType<GetterStore[\\"getName\\"]> {
  if (this.name === \\"a\\") {
  return \\"b\\";
  }
 
  return this.name;
  }
- get test(): GetterStore[\\"test\\"] {
+ get test(): ReturnType<GetterStore[\\"test\\"]> {
  return \\"test\\";
  }
 }

diff --git a/packages/core/src/__tests__/__snapshots__/angular.test.ts.snap b/packages/core/src/__tests__/__snapshots__/angular.test.ts.snap
@@ -26271,14 +26271,14 @@ type GetterStore = {
 })
 export default class TypeGetterStore {
  name: GetterStore[\\"name\\"] = \\"test\\";
- getName(): GetterStore[\\"getName\\"] {
+ getName(): ReturnType<GetterStore[\\"getName\\"]> {
  if (this.name === \\"a\\") {
  return \\"b\\";
  }
 
  return this.name;
  }
- get test(): GetterStore[\\"test\\"] {
+ get test(): ReturnType<GetterStore[\\"test\\"]> {
  return \\"test\\";
  }
 }
@@ -26319,14 +26319,14 @@ type GetterStore = {
 })
 export default class TypeGetterStore {
  name: GetterStore[\\"name\\"] = \\"test\\";
- getName(): GetterStore[\\"getName\\"] {
+ getName(): ReturnType<GetterStore[\\"getName\\"]> {
  if (this.name === \\"a\\") {
  return \\"b\\";
  }
 
  return this.name;
  }
- get test(): GetterStore[\\"test\\"] {
+ get test(): ReturnType<GetterStore[\\"test\\"]> {
  return \\"test\\";
  }
 }

diff --git a/packages/core/src/__tests__/__snapshots__/preact.test.ts.snap b/packages/core/src/__tests__/__snapshots__/preact.test.ts.snap
@@ -7153,15 +7153,15 @@ type GetterStore = {
 function TypeGetterStore(props: any) {
  const [name, setName] = useState<GetterStore[\\"name\\"]>(() => \\"test\\");
 
- function getName(): GetterStore[\\"getName\\"] {
+ function getName(): ReturnType<GetterStore[\\"getName\\"]> {
  if (name === \\"a\\") {
  return \\"b\\";
  }
 
  return name;
  }
 
- function test(): GetterStore[\\"test\\"] {
+ function test(): ReturnType<GetterStore[\\"test\\"]> {
  return \\"test\\";
  }
 

diff --git a/packages/core/src/__tests__/__snapshots__/react-native.test.ts.snap b/packages/core/src/__tests__/__snapshots__/react-native.test.ts.snap
@@ -9806,15 +9806,15 @@ type GetterStore = {
 function TypeGetterStore(props: any) {
  const [name, setName] = useState<GetterStore[\\"name\\"]>(() => \\"test\\");
 
- function getName(): GetterStore[\\"getName\\"] {
+ function getName(): ReturnType<GetterStore[\\"getName\\"]> {
  if (name === \\"a\\") {
  return \\"b\\";
  }
 
  return name;
  }
 
- function test(): GetterStore[\\"test\\"] {
+ function test(): ReturnType<GetterStore[\\"test\\"]> {
  return \\"test\\";
  }
 

diff --git a/packages/core/src/__tests__/__snapshots__/react.test.ts.snap b/packages/core/src/__tests__/__snapshots__/react.test.ts.snap
@@ -6962,15 +6962,15 @@ type GetterStore = {
 function TypeGetterStore(props: any) {
  const [name, setName] = useState<GetterStore[\\"name\\"]>(() => \\"test\\");
 
- function getName(): GetterStore[\\"getName\\"] {
+ function getName(): ReturnType<GetterStore[\\"getName\\"]> {
  if (name === \\"a\\") {
  return \\"b\\";
  }
 
  return name;
  }
 
- function test(): GetterStore[\\"test\\"] {
+ function test(): ReturnType<GetterStore[\\"test\\"]> {
  return \\"test\\";
  }
 

diff --git a/packages/core/src/__tests__/__snapshots__/rsc.test.ts.snap b/packages/core/src/__tests__/__snapshots__/rsc.test.ts.snap
@@ -6436,15 +6436,15 @@ type GetterStore = {
 function TypeGetterStore(props: any) {
  const [name, setName] = useState<GetterStore[\\"name\\"]>(() => \\"test\\");
 
- function getName(): GetterStore[\\"getName\\"] {
+ function getName(): ReturnType<GetterStore[\\"getName\\"]> {
  if (name === \\"a\\") {
  return \\"b\\";
  }
 
  return name;
  }
 
- function test(): GetterStore[\\"test\\"] {
+ function test(): ReturnType<GetterStore[\\"test\\"]> {
  return \\"test\\";
  }
 

diff --git a/packages/core/src/__tests__/__snapshots__/taro.test.ts.snap b/packages/core/src/__tests__/__snapshots__/taro.test.ts.snap
@@ -7114,15 +7114,15 @@ import { View, Text } from \\"@tarojs/components\\";
 function TypeGetterStore(props: any) {
  const [name, setName] = useState<GetterStore[\\"name\\"]>(() => \\"test\\");
 
- function getName(): GetterStore[\\"getName\\"] {
+ function getName(): ReturnType<GetterStore[\\"getName\\"]> {
  if (name === \\"a\\") {
  return \\"b\\";
  }
 
  return name;
  }
 
- function test(): GetterStore[\\"test\\"] {
+ function test(): ReturnType<GetterStore[\\"test\\"]> {
  return \\"test\\";
  }
 

diff --git a/packages/core/src/__tests__/__snapshots__/vue-composition.test.ts.snap b/packages/core/src/__tests__/__snapshots__/vue-composition.test.ts.snap
@@ -6359,7 +6359,7 @@ const test = computed(() => {
  return \\"test\\";
 });
 
-function getName(): GetterStore[\\"getName\\"] {
+function getName(): ReturnType<GetterStore[\\"getName\\"]> {
  if (name.value === \\"a\\") {
  return \\"b\\";
  }

diff --git a/packages/core/src/helpers/get-typed-function.ts b/packages/core/src/helpers/get-typed-function.ts
@@ -16,5 +16,5 @@ export const getTypedFunction = (code: string, typescript?: boolean, typeParamet
  const preType = code.slice(0, firstParenthesisIndex - 1);
  const postType = code.slice(firstParenthesisIndex, code.length);
 
- return [preType, ': ', typeParameter, postType].join('');
+ return [preType, ': ', `ReturnType<${typeParameter}>`, postType].join('');
 };