ivue 1.5.6 → 1.5.7

package/dist/ivue.d.ts

@@ -27,7 +27,7 @@ export interface IVueToRefsFn<T extends AnyClass> {
  * Converts a class properties to a composable .value Refs using ToRef vue type,
  * also knows NOT to convert functions to .value Refs but to leave them as is.
  */
-export declare type IVueRefs<T = any> = {
+export declare type IVueRefs<T> = {
     [K in keyof T]: T[K] extends Function ? T[K] : ToRef<T[K]>;
 };
 /**
@@ -47,7 +47,7 @@ export declare type Unwrap<T> = T extends Ref | DemiRef ? UnwrapRefRecursively<T
 /**
  * Fully unwraps to bare value types any Vue 3 composable return definition type.
  */
-export declare type Use<T = any> = Unwrap<T extends AnyFn ? ReturnType<T> : T>;
+export declare type Use<T = any> = T extends Ref | DemiRef ? UnwrapRefRecursively<T> : Unwrap<T extends AnyFn ? ReturnType<T> : T>;
 /**
  * Extracts object defined emit types by converting them to a plain interface
  */

package/lib/ivue.ts

@@ -30,10 +30,10 @@ export interface IVueToRefsFn<T extends AnyClass> {
     IVueRefs<InstanceType<T>>,
     P
   >;
-  <P extends keyof InstanceType<T>>(
-    props: P[],
-    unwrap: true
-  ): Pick<InstanceType<T>, P>;
+  <P extends keyof InstanceType<T>>(props: P[], unwrap: true): Pick<
+    InstanceType<T>,
+    P
+  >;
   (props: true): InstanceType<T>;
   (props: false): IVueRefs<InstanceType<T>>;
   (): IVueRefs<InstanceType<T>>;
@@ -43,7 +43,7 @@ export interface IVueToRefsFn<T extends AnyClass> {
  * Converts a class properties to a composable .value Refs using ToRef vue type,
  * also knows NOT to convert functions to .value Refs but to leave them as is.
  */
-export type IVueRefs<T = any> = {
+export type IVueRefs<T> = {
   [K in keyof T]: T[K] extends Function ? T[K] : ToRef<T[K]>;
 };
 
@@ -72,7 +72,9 @@ export type Unwrap<T> = T extends Ref | DemiRef
 /**
  * Fully unwraps to bare value types any Vue 3 composable return definition type.
  */
-export type Use<T = any> = Unwrap<T extends AnyFn ? ReturnType<T> : T>;
+export type Use<T = any> = T extends Ref | DemiRef
+  ? UnwrapRefRecursively<T>
+  : Unwrap<T extends AnyFn ? ReturnType<T> : T>;
 
 /**
  * Extracts object defined emit types by converting them to a plain interface

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ivue",
-  "version": "1.5.6",
+  "version": "1.5.7",
   "description": "Infinite Vue – Class Based Architecture for Vue 3",
   "type": "module",
   "exports": {