ivue 1.1.7 → 1.1.9

package/dist/src/ivue.d.ts

@@ -1,4 +1,5 @@
 import type { ComputedRef, ExtractPropTypes, Ref, ToRef, UnwrapNestedRefs } from 'vue';
+import type { Ref as DemiRef } from 'vue-demi';
 import { UnwrapRef } from 'vue';
 /** Types */
 /**
@@ -25,11 +26,9 @@ export declare type IVueRefs<T = any> = {
 /**
  * Unwraps the returned Refs of composable method T to a reactive type definition.
  */
-export declare type UseComposableReturn<T extends Record<string, Ref | any>> = {
-    [K in keyof T]: T[K] extends Ref ? T[K]['value'] extends Ref ? T[K]['value']['value'] : T[K]['value'] : T[K] extends {
-        value: any;
-    } ? T[K]['value'] : T[K];
-};
+export declare type UseComposableReturn<T> = {
+    [K in keyof T]: T[K] extends Ref | DemiRef ? T[K]['value'] | (T[K]['value'] extends object ? UseComposableReturn<T[K]> : never) : T[K];
+}[keyof T];
 export declare type UseComposable<T extends (...args: any[]) => any> = UseComposableReturn<ReturnType<T>>;
 /**
  * Extracts object defined emit types by converting them to a plain interface

package/docs/docs/components/usage/CounterComposablesDestructuring.vue

@@ -31,8 +31,6 @@ class Counter {
       sum: this.sum,
       total: this.total
     } = iuse(useMouse()));
-    const dark = iuse(useDark());
-    dark.value
   }
 }
 

package/docs/docs/components/usage/functions/useMouse.ts

@@ -8,9 +8,13 @@ export function useMouse() {
   function sum() {
     _sum.value = x.value + y.value;
   }
+  
+  const total2 = computed(() => {
+    return _sum;
+  });
 
   const total = computed(() => {
-    return _sum;
+    return total2;
   });
 
   return {

package/docs/package.json

@@ -18,7 +18,7 @@
     "eslint-plugin-import": "^2.29.1",
     "eslint-plugin-vue": "^9.14.1",
     "execa": "^8.0.0",
-    "ivue": "^1.1.6",
+    "ivue": "^1.1.8",
     "typescript": "^4.5.4",
     "vite-plugin-dynamic-import": "^1.5.0",
     "vite-tsconfig-paths": "^4.3.2",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ivue",
-  "version": "1.1.7",
+  "version": "1.1.9",
   "description": "Infinite Vue – Class Based Architecture for Vue 3",
   "type": "module",
   "exports": {
@@ -80,5 +80,6 @@
     "name": "Evgeny Kalashnikov",
     "email": "ekalashnikov@gmail.com"
   },
-  "license": "MIT"
+  "license": "MIT",
+  "dependencies": {}
 }

package/src/ivue.ts

@@ -41,16 +41,14 @@ export type IVueRefs<T = any> = {
 /**
  * Unwraps the returned Refs of composable method T to a reactive type definition.
  */
-export type UseComposableReturn<T extends Record<string, Ref | any>> =
-  T extends Ref | DemiRef
-    ? T['value']
-    : {
-        [K in keyof T]: T[K] extends Ref | DemiRef // Handle Ref
-          ? T[K]['value'] extends Ref | DemiRef // Handle Double Wrapped Ref: Most often a Ref that is inside a Computed Ref
-            ? T[K]['value']['value'] // Return doubly wrapped internal value
-            : T[K]['value'] // Handle Standard Ref or Computed Ref
-          : T[K]; // Handle non Ref property or method
-      };
+
+export type UseComposableReturn<T> = {
+  [K in keyof T]: T[K] extends Ref | DemiRef
+    ?
+        | T[K]['value']
+        | (T[K]['value'] extends object ? UseComposableReturn<T[K]> : never)
+    : T[K];
+}[keyof T];
 
 export type UseComposable<T extends (...args: any[]) => any> =
   UseComposableReturn<ReturnType<T>>;