ivue 1.5.6 → 1.5.8

package/README.md

@@ -2,7 +2,7 @@
 
 ## About
 
-`ivue` is a TypeScript class based composable architecture for Vue 3, that unlocks infinite scalability for Vue 3 based apps. It allows you to extend the regular Vue 3 in a simple and elegant way.
+`ivue` is a TypeScript class based composable architecture for Vue 3, that unlocks infinite scalability for Vue 3 based apps. It allows you to extend regular Vue 3 in a simple and elegant way.
 
 ## Features
 &ndash; Simple & Elegant Architecture<br />
@@ -22,12 +22,13 @@
 &ndash;&nbsp; Flexible like Composition API<br />
 &ndash;&nbsp; Extensible like TypeScript Class API<br />
 &ndash;&nbsp; Robust, Minimal, Opaque & Unobtrusive<br />
+&ndash;&nbsp; Pure Object Oriented Reactivity System based on Vue 3 Composition API<br />
 &ndash;&nbsp; 100% Vue 3 Compatible<br />
 &ndash;&nbsp; 100% Test Covered<br />
 &ndash;&nbsp; 100% Type Safe<br />
 &ndash;&nbsp; Production Ready<br />
 &ndash;&nbsp; Just <code>1.1kb</code> gzipped!<br />
-&ndash;&nbsp; 100% VSCode / Intellij IDE Auto-complete Intellisence<br />
+&ndash;&nbsp; 100% VSCode / Intellij IDE Auto-complete Intellisense<br />
 
 
 

package/dist/index.es.js

@@ -1,6 +1,6 @@
-import { reactive as R, computed as b, ref as v, shallowRef as A, toRef as m } from "vue";
+import { reactive as v, computed as b, ref as A, shallowRef as D, toRef as m } from "vue";
 const d = /* @__PURE__ */ new Map();
-function D(e) {
+function E(e) {
   if (d.has(e))
     return d.get(e);
   const o = /* @__PURE__ */ new Map();
@@ -12,9 +12,9 @@ function D(e) {
     }), t = Object.getPrototypeOf(t);
   return d.set(e, o), o;
 }
-function E(e, ...o) {
+function M(e, ...o) {
   var i, O;
-  const t = D(e), f = t != null && t.size ? {} : null, r = R(new e(...o));
+  const t = E(e), f = t != null && t.size ? {} : null, r = v(new e(...o));
   for (const [n, l] of t)
     ((i = e == null ? void 0 : e.ivue) == null ? void 0 : i[n]) !== !1 && Object.defineProperty(r, n, { get: l.get ? () => {
       var a, g;
@@ -62,28 +62,27 @@ function C(e) {
   while (e.constructor !== Object);
   return y.set(o, t), t;
 }
-const z = v, N = A;
+const z = A, N = D;
 function W(e, ...o) {
-  return typeof e == "function" ? M(e) ? E(e, ...o).toRefs(!0) : e(...o) : e;
+  return typeof e == "function" ? R(e) ? M(e, ...o).toRefs(!0) : e(...o) : e;
 }
-function M(e) {
+function R(e) {
   var o;
   return typeof e == "function" && !!e.prototype && !((o = Object.getOwnPropertyDescriptor(e, "prototype")) != null && o.writable);
 }
 function k(e, o) {
   for (const t in o)
-    typeof (e == null ? void 0 : e[t]) == "object" && (e == null ? void 0 : e[t]) !== null || M(e == null ? void 0 : e[t]) ? o[t].default = () => e == null ? void 0 : e[t] : o[t].default = e == null ? void 0 : e[t];
+    typeof (e == null ? void 0 : e[t]) == "object" && (e == null ? void 0 : e[t]) !== null || R(e == null ? void 0 : e[t]) ? o[t].default = () => e == null ? void 0 : e[t] : o[t].default = e == null ? void 0 : e[t];
   return o;
 }
 export {
   d as descriptorsMap,
-  D as getAllClassDescriptors,
+  E as getAllClassDescriptors,
   C as getAllClassProperties,
   z as iref,
-  M as isClass,
+  R as isClass,
   N as ishallowRef,
   W as iuse,
-  E as ivue,
-  y as propsMap,
+  M as ivue,
   k as propsWithDefaults
 };

package/dist/index.umd.js

@@ -1 +1 @@
-(function(c,f){typeof exports=="object"&&typeof module<"u"?f(exports,require("vue")):typeof define=="function"&&define.amd?define(["exports","vue"],f):f((c=typeof globalThis<"u"?globalThis:c||self).ivue={},c.Vue)})(this,function(c,f){"use strict";const y=new Map;function j(t){if(y.has(t))return y.get(t);const r=new Map;let e=t.prototype;for(;e.constructor!==Object;)Object.entries(Object.getOwnPropertyDescriptors(e)).forEach(([l,n])=>{const i=r.get(l);i!==n&&(n!=null&&n.get||n!=null&&n.set)&&(i!=null&&i.get&&(n.get=i==null?void 0:i.get),i!=null&&i.set&&(n.set=i==null?void 0:i.set),r.set(l,n))}),e=Object.getPrototypeOf(e);return y.set(t,r),r}function w(t,...r){var i,P;const e=j(t),l=e!=null&&e.size?{}:null,n=f.reactive(new t(...r));for(const[s,d]of e)((i=t==null?void 0:t.ivue)==null?void 0:i[s])!==!1&&Object.defineProperty(n,s,{get:d.get?()=>{var p,b;return s in l?l[s]:l[s]=f.computed({get:(p=d.get)==null?void 0:p.bind(n),set:(b=d.set)==null?void 0:b.bind(n)})}:void 0,set:(P=d.set)==null?void 0:P.bind(n),enumerable:!1});return Object.defineProperty(n,"toRefs",{get:()=>function(s,d,p){return function(b,S){var v,M;const g={};if(Array.isArray(b))for(let a=0;a<b.length;a++){const o=b[a];if(d.has(o))if(o in p)g[o]=p[o];else{const u=d.get(o);g[o]=p[o]=f.computed({get:(v=u==null?void 0:u.get)==null?void 0:v.bind(s),set:(M=u==null?void 0:u.set)==null?void 0:M.bind(s)})}else typeof s[o]=="function"?g[o]=s[o].bind(s):g[o]=f.toRef(s,o)}else{let a=new Set(m(s));d.forEach((o,u)=>{var R,A;g[u]=u in p?p[u]:p[u]=f.computed({get:(R=o.get)==null?void 0:R.bind(s),set:(A=o.set)==null?void 0:A.bind(s)}),a==null||a.delete(u)}),a.forEach(o=>{typeof s[o]=="function"?g[o]=s[o].bind(s):g[o]=f.toRef(s,o)}),a=null}return g}}(n,e,l),enumerable:!1}),"init"in n&&n.init(),n}const O=new Map;function m(t){if(O.has(t.constructor))return O.get(t.constructor);const r=t.constructor,e=new Set;do Object.getOwnPropertyNames(t).forEach(l=>{["caller","callee","arguments","constructor"].includes(l)||e.add(l)}),t=Object.getPrototypeOf(t);while(t.constructor!==Object);return O.set(r,e),e}const D=f.ref,E=f.shallowRef;function h(t){var r;return typeof t=="function"&&!!t.prototype&&!((r=Object.getOwnPropertyDescriptor(t,"prototype"))!=null&&r.writable)}c.descriptorsMap=y,c.getAllClassDescriptors=j,c.getAllClassProperties=m,c.iref=D,c.isClass=h,c.ishallowRef=E,c.iuse=function(t,...r){return typeof t=="function"?h(t)?w(t,...r).toRefs(!0):t(...r):t},c.ivue=w,c.propsMap=O,c.propsWithDefaults=function(t,r){for(const e in r)typeof(t==null?void 0:t[e])=="object"&&(t==null?void 0:t[e])!==null||h(t==null?void 0:t[e])?r[e].default=()=>t==null?void 0:t[e]:r[e].default=t==null?void 0:t[e];return r},Object.defineProperty(c,Symbol.toStringTag,{value:"Module"})});
+(function(c,f){typeof exports=="object"&&typeof module<"u"?f(exports,require("vue")):typeof define=="function"&&define.amd?define(["exports","vue"],f):f((c=typeof globalThis<"u"?globalThis:c||self).ivue={},c.Vue)})(this,function(c,f){"use strict";const y=new Map;function j(t){if(y.has(t))return y.get(t);const r=new Map;let e=t.prototype;for(;e.constructor!==Object;)Object.entries(Object.getOwnPropertyDescriptors(e)).forEach(([l,n])=>{const i=r.get(l);i!==n&&(n!=null&&n.get||n!=null&&n.set)&&(i!=null&&i.get&&(n.get=i==null?void 0:i.get),i!=null&&i.set&&(n.set=i==null?void 0:i.set),r.set(l,n))}),e=Object.getPrototypeOf(e);return y.set(t,r),r}function w(t,...r){var i,P;const e=j(t),l=e!=null&&e.size?{}:null,n=f.reactive(new t(...r));for(const[s,d]of e)((i=t==null?void 0:t.ivue)==null?void 0:i[s])!==!1&&Object.defineProperty(n,s,{get:d.get?()=>{var p,b;return s in l?l[s]:l[s]=f.computed({get:(p=d.get)==null?void 0:p.bind(n),set:(b=d.set)==null?void 0:b.bind(n)})}:void 0,set:(P=d.set)==null?void 0:P.bind(n),enumerable:!1});return Object.defineProperty(n,"toRefs",{get:()=>function(s,d,p){return function(b,S){var v,R;const g={};if(Array.isArray(b))for(let a=0;a<b.length;a++){const o=b[a];if(d.has(o))if(o in p)g[o]=p[o];else{const u=d.get(o);g[o]=p[o]=f.computed({get:(v=u==null?void 0:u.get)==null?void 0:v.bind(s),set:(R=u==null?void 0:u.set)==null?void 0:R.bind(s)})}else typeof s[o]=="function"?g[o]=s[o].bind(s):g[o]=f.toRef(s,o)}else{let a=new Set(m(s));d.forEach((o,u)=>{var M,A;g[u]=u in p?p[u]:p[u]=f.computed({get:(M=o.get)==null?void 0:M.bind(s),set:(A=o.set)==null?void 0:A.bind(s)}),a==null||a.delete(u)}),a.forEach(o=>{typeof s[o]=="function"?g[o]=s[o].bind(s):g[o]=f.toRef(s,o)}),a=null}return g}}(n,e,l),enumerable:!1}),"init"in n&&n.init(),n}const O=new Map;function m(t){if(O.has(t.constructor))return O.get(t.constructor);const r=t.constructor,e=new Set;do Object.getOwnPropertyNames(t).forEach(l=>{["caller","callee","arguments","constructor"].includes(l)||e.add(l)}),t=Object.getPrototypeOf(t);while(t.constructor!==Object);return O.set(r,e),e}const D=f.ref,E=f.shallowRef;function h(t){var r;return typeof t=="function"&&!!t.prototype&&!((r=Object.getOwnPropertyDescriptor(t,"prototype"))!=null&&r.writable)}c.descriptorsMap=y,c.getAllClassDescriptors=j,c.getAllClassProperties=m,c.iref=D,c.isClass=h,c.ishallowRef=E,c.iuse=function(t,...r){return typeof t=="function"?h(t)?w(t,...r).toRefs(!0):t(...r):t},c.ivue=w,c.propsWithDefaults=function(t,r){for(const e in r)typeof(t==null?void 0:t[e])=="object"&&(t==null?void 0:t[e])!==null||h(t==null?void 0:t[e])?r[e].default=()=>t==null?void 0:t[e]:r[e].default=t==null?void 0:t[e];return r},Object.defineProperty(c,Symbol.toStringTag,{value:"Module"})});

package/dist/ivue.d.ts

@@ -1,21 +1,17 @@
-import type { ComputedRef, ExtractPropTypes, Ref, ToRef } from 'vue';
+import type { ExtractPropTypes, Ref, ToRef } from 'vue';
 import type { Ref as DemiRef } from 'vue-demi';
 /** Types */
 /**
  * IVue core reactive instance type with an extended .toRefs() method added.
  */
-export declare type IVue<T extends AnyClass> = InstanceType<T> & ExtendWithToRefs<T>;
-/**
- * Extend with .toRefs() method, so that a reactive class can be converted to a composable definition.
- */
-export interface ExtendWithToRefs<T extends AnyClass> {
+export declare type IVue<T extends AnyClass> = InstanceType<T> & {
     toRefs: IVueToRefsFn<T>;
-}
+};
 /**
  * Type definition for `.toRefs()` method converts reactive class properties to composable .value properties.
  * But if props = true OR unwrap = true is specified, the refs will be unwrapped refs to be able to be merged with the the root class properties without losing reactivity.
  */
-export interface IVueToRefsFn<T extends AnyClass> {
+interface IVueToRefsFn<T extends AnyClass> {
     <P extends keyof InstanceType<T>>(props: P[]): Pick<IVueRefs<InstanceType<T>>, P>;
     <P extends keyof InstanceType<T>>(props: P[], unwrap: false): Pick<IVueRefs<InstanceType<T>>, P>;
     <P extends keyof InstanceType<T>>(props: P[], unwrap: true): Pick<InstanceType<T>, P>;
@@ -27,7 +23,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]>;
 };
 /**
@@ -37,17 +33,17 @@ export declare type IVueRefs<T = any> = {
  * are difficult to fully resolve to bare values without this utility.
  * Also support Vue 3 Demi for vue-use library support.
  */
-export declare type UnwrapRefRecursively<T = any> = T extends Ref | DemiRef ? UnwrapRefRecursively<T['value']> : T;
+declare type UnwrapRefRecursively<T = any> = T extends Ref | DemiRef ? UnwrapRefRecursively<T['value']> : T;
 /**
- * Helper type for Use type, unwraps any type of Vue 3 composable down to its bare types.
+ * Helper type for Use type, unwraps any type of Vue 3 composable return object down to its bare types.
  */
-export declare type Unwrap<T> = T extends Ref | DemiRef ? UnwrapRefRecursively<T> : {
+declare type UnwrapComposableRefs<T> = T extends Ref | DemiRef ? UnwrapRefRecursively<T> : {
     [K in keyof T]: T[K] extends Ref | DemiRef ? UnwrapRefRecursively<T[K]> : T[K];
 };
 /**
  * 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> : UnwrapComposableRefs<T extends AnyFn ? ReturnType<T> : T>;
 /**
  * Extracts object defined emit types by converting them to a plain interface
  */
@@ -76,11 +72,7 @@ export declare type AnyClass = abstract new (...args: any[]) => any;
 /**
  * Descriptors map type.
  */
-export declare type Descriptors = Map<string, PropertyDescriptor>;
-/**
- * Computeds hash map type.
- */
-export declare type Computeds = Record<string, ComputedRef>;
+declare type Descriptors = Map<string, PropertyDescriptor>;
 /**
  * Infer paramaters of a constructor function of a Class.
  */
@@ -152,11 +144,6 @@ export declare function getAllClassDescriptors(className: AnyClass): Descriptors
  * @returns {IVue<T>}
  */
 export declare function ivue<T extends AnyClass>(className: T, ...args: InferredArgs<T>): IVue<T>;
-/**
- * Store all props for each class prototype processed by:
- * @see {getAllClassProperties}
- */
-export declare const propsMap: Map<object, Set<string> | any>;
 /**
  * Get properties of an entire class prototype ancestors chain as a Map.
  */

package/lib/ivue.ts

@@ -8,20 +8,15 @@ import type { Ref as DemiRef } from 'vue-demi';
 /**
  * IVue core reactive instance type with an extended .toRefs() method added.
  */
-export type IVue<T extends AnyClass> = InstanceType<T> & ExtendWithToRefs<T>;
-
-/**
- * Extend with .toRefs() method, so that a reactive class can be converted to a composable definition.
- */
-export interface ExtendWithToRefs<T extends AnyClass> {
+export type IVue<T extends AnyClass> = InstanceType<T> & {
   toRefs: IVueToRefsFn<T>;
-}
+};
 
 /**
  * Type definition for `.toRefs()` method converts reactive class properties to composable .value properties.
  * But if props = true OR unwrap = true is specified, the refs will be unwrapped refs to be able to be merged with the the root class properties without losing reactivity.
  */
-export interface IVueToRefsFn<T extends AnyClass> {
+interface IVueToRefsFn<T extends AnyClass> {
   <P extends keyof InstanceType<T>>(props: P[]): Pick<
     IVueRefs<InstanceType<T>>,
     P
@@ -30,10 +25,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 +38,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]>;
 };
 
@@ -54,14 +49,14 @@ export type IVueRefs<T = any> = {
  * are difficult to fully resolve to bare values without this utility.
  * Also support Vue 3 Demi for vue-use library support.
  */
-export type UnwrapRefRecursively<T = any> = T extends Ref | DemiRef
+type UnwrapRefRecursively<T = any> = T extends Ref | DemiRef
   ? UnwrapRefRecursively<T['value']>
   : T;
 
 /**
- * Helper type for Use type, unwraps any type of Vue 3 composable down to its bare types.
+ * Helper type for Use type, unwraps any type of Vue 3 composable return object down to its bare types.
  */
-export type Unwrap<T> = T extends Ref | DemiRef
+type UnwrapComposableRefs<T> = T extends Ref | DemiRef
   ? UnwrapRefRecursively<T>
   : {
       [K in keyof T]: T[K] extends Ref | DemiRef
@@ -72,7 +67,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>
+  : UnwrapComposableRefs<T extends AnyFn ? ReturnType<T> : T>;
 
 /**
  * Extracts object defined emit types by converting them to a plain interface
@@ -112,12 +109,12 @@ export type AnyClass = abstract new (...args: any[]) => any;
 /**
  * Descriptors map type.
  */
-export type Descriptors = Map<string, PropertyDescriptor>;
+type Descriptors = Map<string, PropertyDescriptor>;
 
 /**
  * Computeds hash map type.
  */
-export type Computeds = Record<string, ComputedRef>;
+type Computeds = Record<string, ComputedRef>;
 
 /**
  * Infer paramaters of a constructor function of a Class.
@@ -296,7 +293,7 @@ export function ivue<T extends AnyClass>(
  * Store all props for each class prototype processed by:
  * @see {getAllClassProperties}
  */
-export const propsMap: Map<object, Set<string> | any> = new Map();
+const propsMap: Map<object, Set<string> | any> = new Map();
 
 /**
  * Get properties of an entire class prototype ancestors chain as a Map.
@@ -377,7 +374,7 @@ export function iuse<T extends AnyClass | AnyFn | Object | any>(
         (classFunctionObject as AnyFn)(
           ...(args as Parameters<T extends AnyFn ? AnyFn : any>)
         )
-    : (classFunctionObject as unknown as Unwrap<T>) /** Unwrap any other Object or any type down to its bare types. */;
+    : (classFunctionObject as unknown as Use<T>) /** Unwrap any other Object or any type down to its bare types. */;
 }
 
 /**
@@ -392,7 +389,7 @@ function ivueToRefs<T extends AnyClass>(
   vue: IVue<T>,
   descriptors: Descriptors,
   computeds: Computeds
-): ExtendWithToRefs<T>['toRefs'] {
+): IVueToRefsFn<T> {
   return function (
     props?: (keyof InstanceType<T>)[] | boolean,
     unwrap?: boolean /** This property helps with TypeScript function definition overloading of return types and is not being used inside the function itself. */

package/package.json

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