feat(overmind-vue): improve typing

Author: christianalfoni

packages/node_modules/overmind-vue/src/Index.test.ts

@@ -8,11 +8,12 @@ const dom = new JSDOM()
 
 describe('Vue', () => {
   it('should mount with connected app', () => {
-    const app = new Overmind({
+    const config = {
       state: {
         foo: 'bar',
       },
-    })
+    }
+    const app = new Overmind(config)
     const connect = createConnect(app)
     const vm = new Vue(
       connect({
@@ -22,11 +23,12 @@ describe('Vue', () => {
     expect(vm.overmind.state.foo).toBe('bar')
   })
   it('should mount with custom connected app', () => {
-    const app = new Overmind({
+    const config = {
       state: {
         foo: 'bar',
       },
-    })
+    }
+    const app = new Overmind(config)
     const connect = createConnect(app)
     const vm = new Vue(
       connect(

packages/node_modules/overmind-vue/src/index.ts

@@ -1,4 +1,5 @@
-import { EventType, MODE_SSR } from 'overmind'
+import { Component, ComponentOptions } from 'vue'
+import { EventType, MODE_SSR, IConfiguration, Overmind } from 'overmind'
 
 const OVERMIND = Symbol('OVERMIND')
 const IS_PRODUCTION = process.env.NODE_ENV === 'production'
@@ -143,21 +144,26 @@ export const createPlugin = (overmind) => ({
   },
 })
 
-export const createConnect = (overmind) => (...args) => {
-  let options = args.length === 1 ? args[0] : args[1]
-  let propsCallback = args.length === 1 ? null : args[0]
 
-  if (propsCallback && typeof propsCallback !== 'function') {
-    throw new Error(
-      `OVERMIND-VUE: When passing two arguments to "connect", the first has to be a function. You can alternatively only pass a single argument, which is the component`
-    )
-  }
 
-  return {
-    ...options,
-    mixins: (options.mixins ? options.mixins : []).concat(
-      createMixin(overmind, propsCallback, true)
-    ),
-    overmind,
-  } as any
-}
+export function createConnect<T extends Overmind<any>>(overmind: T):
+  <P extends { [key: string]: any }, C extends ComponentOptions<any>>(propsCallback: ((overmind: T) => P) | C, component?: C) => C {
+  return (componentOrPropsCallback, maybeComponent) => {
+    const options = (maybeComponent || componentOrPropsCallback) as ComponentOptions<any>
+    const propsCallback = maybeComponent ? componentOrPropsCallback : null
+
+    if (propsCallback && typeof propsCallback !== 'function') {
+      throw new Error(
+        `OVERMIND-VUE: When passing two arguments to "connect", the first has to be a function. You can alternatively only pass a single argument, which is the component`
+      )
+    }
+
+    return {
+      ...options,
+      mixins: (options.mixins ? options.mixins : []).concat(
+        createMixin(overmind, propsCallback, true)
+      ),
+      overmind,
+    } as any
+  }
+}