ivue 1.1.1 → 1.1.2

package/dist/src/ivue.d.ts

@@ -1,4 +1,4 @@
-import type { ComputedRef, ExtractPropTypes, ToRef, UnwrapNestedRefs } from 'vue';
+import type { ComputedRef, ExtractPropTypes, Ref, ToRef } from 'vue';
 import { UnwrapRef } from 'vue';
 /** Types */
 /**
@@ -25,12 +25,8 @@ 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 Object> = {
-    [K in keyof T]: T[K] extends {
-        value: any;
-    } ? T[K]['value'] extends {
-        value: any;
-    } ? T[K]['value']['value'] : T[K]['value'] : T[K];
+export declare type UseComposableReturn<T extends Record<string, Ref | any>> = T extends Ref ? T : {
+    [K in keyof T]: T[K] extends Ref ? T[K]['value'] extends Ref ? T[K]['value']['value'] : T[K]['value'] : T[K];
 };
 export declare type UseComposable<T extends (...args: any[]) => any> = UseComposableReturn<ReturnType<T>>;
 /**
@@ -154,7 +150,7 @@ export declare function iref<T>(val?: T): UnwrapRef<T>;
  * `iuse` stands for composable.
  * Returns unwrapped composable type definition without the Refs.
  */
-export declare function iuse<T extends Object>(val?: T): UseComposableReturn<UnwrapNestedRefs<T>>;
+export declare function iuse<T extends Object>(val?: T): UseComposableReturn<T>;
 /**
  * Convert reactive ivue class to Vue 3 refs.
  *

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.0",
+    "ivue": "^1.1.1",
     "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.1",
+  "version": "1.1.2",
   "description": "Infinite Vue – Class Based Architecture for Vue 3",
   "type": "module",
   "exports": {

package/src/ivue.ts

@@ -3,8 +3,8 @@
 import type {
   ComputedRef,
   ExtractPropTypes,
-  ToRef,
-  UnwrapNestedRefs,
+  Ref,
+  ToRef
 } from 'vue';
 import { UnwrapRef, computed, reactive, ref, toRef } from 'vue';
 
@@ -39,9 +39,9 @@ export type IVueRefs<T = any> = {
 /**
  * Unwraps the returned Refs of composable method T to a reactive type definition.
  */
-export type UseComposableReturn<T extends Object> = {
-  [K in keyof T]: T[K] extends { value: any } // Handle Ref
-    ? T[K]['value'] extends { value: any } // Handle Double Wrapped Ref: Most often a Ref that is inside a Computed Ref
+export type UseComposableReturn<T extends Record<string, Ref | any>> = T extends Ref ? T : {
+  [K in keyof T]: T[K] extends Ref // Handle Ref
+    ? T[K]['value'] extends Ref // 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
@@ -318,8 +318,8 @@ export function iref<T>(val?: T): UnwrapRef<T> {
  */
 export function iuse<T extends Object>(
   val?: T
-): UseComposableReturn<UnwrapNestedRefs<T>> {
-  return val as unknown as UseComposableReturn<UnwrapNestedRefs<T>>;
+): UseComposableReturn<T> {
+  return val as unknown as UseComposableReturn<T>;
 }
 
 /**