Merge asyncComputed with computed

this is a proof of concept that asyncComputed can be merged into computed and
the distinction between a normal computed and an async-computed can be made by
an extra keyword. The upside of this is that it fixes typings as we can rely on
the standard typings that come with Vue.js' computed properties.

Author: saraedum

Diff for: package.json

@@ -3,7 +3,7 @@
   "version": "3.5.0",
   "description": "Async computed properties for Vue",
   "main": "dist/vue-async-computed.js",
-  "types": "types/index.d.ts",
+  "types": "src/index.d.ts",
   "files": [
     "bin/",
     "dist/"

Diff for: types/index.d.ts renamed to src/index.d.ts

@@ -3,6 +3,7 @@ import Vue, { PluginFunction } from "vue";
 export interface IAsyncComputedOptions {
 	errorHandler?: (error: string | Error) => void;
 	useRawError?: boolean;
+	default?: any;
 }
 
 export default class AsyncComputed {
@@ -11,6 +12,32 @@ export default class AsyncComputed {
 	static version: string;
 }
 
+declare module "vue/types/options" {
+	interface ComputedOptions<T> {
+		asynchronous?: boolean;
+	}
+}
+
+interface IASyncComputedState {
+	state: "updating" | "success" | "error";
+	updating: boolean;
+	success: boolean;
+	error: boolean;
+	exception: Error | null;
+	update: () => void;
+}
+
+declare module "vue/types/vue" {
+	// tslint:disable-next-line:interface-name
+	interface Vue {
+		$asyncComputed: {[K: string]: IASyncComputedState };
+	}
+}
+
+// import { ThisTypedComponentOptionsWithArrayProps, ThisTypedComponentOptionsWithRecordProps } from "vue/types/options";
+
+/*
+
 type AsyncComputedGetter<T> = () => Promise<T>;
 interface IAsyncComputedProperty<T> {
 	default?: T | (() => T);
@@ -31,18 +58,3 @@ declare module "vue/types/options" {
 	}
 }
 
-interface IASyncComputedState {
-	state: "updating" | "success" | "error";
-	updating: boolean;
-	success: boolean;
-	error: boolean;
-	exception: Error | null;
-	update: () => void;
-}
-
-declare module "vue/types/vue" {
-	// tslint:disable-next-line:interface-name
-	interface Vue {
-		$asyncComputed: {[K: string]: IASyncComputedState };
-	}
-}

Diff for: src/index.js

@@ -24,8 +24,17 @@ const AsyncComputed = {
         const asyncComputed = this.$options.asyncComputed || {}
         this.$asyncComputed = {}
 
+        for (const key in this.$options.computed) {
+          if (this.$options.computed[key].asynchronous) {
+            asyncComputed[key] = this.$options.computed[key]
+            delete this.$options.computed[key]
+          }
+        }
+
         if (!Object.keys(asyncComputed).length) return
 
+        this.$options.asyncComputed = asyncComputed
+
         if (!this.$options.computed) this.$options.computed = {}
 
         for (const key in asyncComputed) {