ivue 1.2.0 → 1.2.1

package/dist/index.es.js

@@ -3,50 +3,50 @@ const d = /* @__PURE__ */ new Map();
 function D(e) {
   if (d.has(e))
     return d.get(e);
-  const o = /* @__PURE__ */ new Map();
+  const n = /* @__PURE__ */ new Map();
   let t = e.prototype;
   for (; t.constructor !== Object; )
     Object.entries(Object.getOwnPropertyDescriptors(t)).forEach(([f, r]) => {
-      const i = o.get(f);
-      i !== r && (r != null && r.get || r != null && r.set) && (i != null && i.get && (r.get = i == null ? void 0 : i.get), i != null && i.set && (r.set = i == null ? void 0 : i.set), o.set(f, r));
+      const i = n.get(f);
+      i !== r && (r != null && r.get || r != null && r.set) && (i != null && i.get && (r.get = i == null ? void 0 : i.get), i != null && i.set && (r.set = i == null ? void 0 : i.set), n.set(f, r));
     }), t = Object.getPrototypeOf(t);
-  return d.set(e, o), o;
+  return d.set(e, n), n;
 }
-function E(e, ...o) {
+function E(e, ...n) {
   var i, O;
-  const t = D(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 ? () => {
+  const t = D(e), f = t != null && t.size ? {} : null, r = v(new e(...n));
+  for (const [o, p] of t)
+    ((i = e == null ? void 0 : e.ivue) == null ? void 0 : i[o]) !== !1 && Object.defineProperty(r, o, { get: p.get ? () => {
       var u, g;
-      return n in f ? f[n] : f[n] = b({ get: (u = l.get) == null ? void 0 : u.bind(r), set: (g = l.set) == null ? void 0 : g.bind(r) });
-    } : void 0, set: (O = l.set) == null ? void 0 : O.bind(r), enumerable: !1 });
-  return Object.defineProperty(r, "toRefs", { get: () => function(n, l, u) {
+      return o in f ? f[o] : f[o] = b({ get: (u = p.get) == null ? void 0 : u.bind(r), set: (g = p.set) == null ? void 0 : g.bind(r) });
+    } : void 0, set: (O = p.set) == null ? void 0 : O.bind(r), enumerable: !1 });
+  return Object.defineProperty(r, "toRefs", { get: () => function(o, p, u) {
     return function(g) {
       var h, j;
-      const p = {};
+      const l = {};
       if (Array.isArray(g) && g.length)
         for (let a = 0; a < g.length; a++) {
           const s = g[a];
-          if (l.has(s))
+          if (p.has(s))
             if (s in u)
-              p[s] = u[s];
+              l[s] = u[s];
             else {
-              const c = l.get(s);
-              p[s] = u[s] = b({ get: (h = c == null ? void 0 : c.get) == null ? void 0 : h.bind(n), set: (j = c == null ? void 0 : c.set) == null ? void 0 : j.bind(n) });
+              const c = p.get(s);
+              l[s] = u[s] = b({ get: (h = c == null ? void 0 : c.get) == null ? void 0 : h.bind(o), set: (j = c == null ? void 0 : c.set) == null ? void 0 : j.bind(o) });
             }
           else
-            typeof n[s] == "function" ? p[s] = n[s].bind(n) : p[s] = m(n, s);
+            typeof o[s] == "function" ? l[s] = o[s].bind(o) : l[s] = m(o, s);
         }
       else {
-        let a = new Set(C(n));
-        l.forEach((s, c) => {
+        let a = new Set(C(o));
+        p.forEach((s, c) => {
           var w, P;
-          p[c] = c in u ? u[c] : u[c] = b({ get: (w = s.get) == null ? void 0 : w.bind(n), set: (P = s.set) == null ? void 0 : P.bind(n) }), a == null || a.delete(c);
+          l[c] = c in u ? u[c] : u[c] = b({ get: (w = s.get) == null ? void 0 : w.bind(o), set: (P = s.set) == null ? void 0 : P.bind(o) }), a == null || a.delete(c);
         }), a.forEach((s) => {
-          typeof n[s] == "function" ? p[s] = n[s].bind(n) : p[s] = m(n, s);
+          typeof o[s] == "function" ? l[s] = o[s].bind(o) : l[s] = m(o, s);
         }), a = null;
       }
-      return p;
+      return l;
     };
   }(r, t, f), enumerable: !1 }), "init" in r && r.init(), r;
 }
@@ -54,26 +54,26 @@ const y = /* @__PURE__ */ new Map();
 function C(e) {
   if (y.has(e.constructor))
     return y.get(e.constructor);
-  const o = e.constructor, t = /* @__PURE__ */ new Set();
+  const n = e.constructor, t = /* @__PURE__ */ new Set();
   do
     Object.getOwnPropertyNames(e).forEach((f) => {
       ["caller", "callee", "arguments", "constructor"].includes(f) || t.add(f);
     }), e = Object.getPrototypeOf(e);
   while (e.constructor !== Object);
-  return y.set(o, t), t;
+  return y.set(n, t), t;
 }
 const S = A;
-function x(e, ...o) {
-  return M(e) ? E(e, ...o).toRefs() : e;
+function x(e, ...n) {
+  return typeof e == "function" ? M(e) ? E(e, ...n).toRefs() : e(...n) : e;
 }
 function M(e) {
-  var o;
-  return typeof e == "function" && !!e.prototype && !((o = Object.getOwnPropertyDescriptor(e, "prototype")) != null && o.writable);
+  var n;
+  return typeof e == "function" && !!e.prototype && !((n = Object.getOwnPropertyDescriptor(e, "prototype")) != null && n.writable);
 }
-function z(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];
-  return o;
+function z(e, n) {
+  for (const t in n)
+    typeof (e == null ? void 0 : e[t]) == "object" && (e == null ? void 0 : e[t]) !== null || M(e == null ? void 0 : e[t]) ? n[t].default = () => e == null ? void 0 : e[t] : n[t].default = e == null ? void 0 : e[t];
+  return n;
 }
 export {
   d as descriptorsMap,

package/dist/index.umd.js

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

package/dist/src/ivue.d.ts

@@ -159,18 +159,23 @@ export declare function getAllClassProperties(obj: object): Set<string>;
  * @param val T
  * @returns {UnwrapRef<T>}
  */
-export declare const iref: <T = any>(value: T) => T;
+export declare const iref: <T = any>(value?: T | undefined) => T;
 /**
- * Two modes of operation:
+ * Three modes of operation:
  * 1. `iuse(useComposable(arg, arg2, arg3, ...))` converts the return types of a Composable / Ref to pure raw type definition.
  * Returns for all properties of an object an unwrapped raw type definition,
  * unwraps direct Refs & ComputedRefs as well down to their raw types.
  *
- * 2. `iuse(AnyClass, ...args)` If AnyClass is supplied and that class's arguments like so `iuse(AnyClass, ...args)`,
- * it returns an 'ivue(AnyClass, ...args).toRefs()` ivue object in Vee 3 Composable standard form for all properties but casts
- * their types as raw (non-Ref) types to fit with reactive() structure of the ivue class context.
+ * 2. `iuse(useComposable, arg, arg2, arg3, ...)` for cleaner syntax for #1, it does exactly the same thing but
+ * here the TypeScript inference works for composable function arguments to assist you with intellisence,
+ * like they work for constructor arguments in the cause of `ivue()` core function,
+ * making the API cleaner to look at and make it compatible with how this function operates with classes, see #3.
+ *
+ * 3. `iuse(AnyClass, ...args)` If AnyClass is supplied and that class's arguments into `iuse(AnyClass, ...args)`,
+ * it returns an 'ivue(AnyClass, ...args).toRefs()` object for all properties but casts
+ * their types as raw (no-Ref) types to fit with reactive() structure of the ivue class context.
  */
-export declare function iuse<T extends AnyClass | Object>(val?: T, ...args: InferredArgs<T>): T extends AnyClass ? InstanceType<T> : UnwrapComposableReturn<T>;
+export declare function iuse<T extends AnyClass | AnyFn | Object>(classFunctionObject?: T, ...args: T extends AnyClass ? InferredArgs<T> : T extends AnyFn ? Parameters<T extends (...args: any[]) => any ? T : any> : any): T extends AnyClass ? InstanceType<T> : T extends AnyFn ? UseComposable<T> : UnwrapComposableReturn<T>;
 /**
  * Vue props interface in defineComponent() style.
  */

package/docs/docs/components/usage/classes/CustomMouse.ts

@@ -1,5 +1,5 @@
 import { useMouse } from '@vueuse/core';
-import { iref, iuse, type UseComposable } from '../../../../../src/ivue';
+import { iref, iuse, type UseComposable } from 'ivue';
 
 type UseMouse = UseComposable<typeof useMouse>;
 

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.21",
+    "ivue": "^1.2.0",
     "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.2.0",
+  "version": "1.2.1",
   "description": "Infinite Vue – Class Based Architecture for Vue 3",
   "type": "module",
   "exports": {

package/src/ivue.ts

@@ -57,8 +57,9 @@ export type UnwrapComposableReturn<T> = T extends Ref | DemiRef
 /**
  * Fully unwraps to bare value types any Vue 3 composable return definition type.
  */
-export type UseComposable<T extends AnyFn> =
-  UnwrapComposableReturn<ReturnType<T>>;
+export type UseComposable<T extends AnyFn> = UnwrapComposableReturn<
+  ReturnType<T>
+>;
 
 /**
  * Extracts object defined emit types by converting them to a plain interface
@@ -139,10 +140,7 @@ export type IFnParameter<
 /**
  * Get function arguments Parmeters<F> parameter by key K
  */
-export type FnParameter<
-  F extends AnyFn,
-  K extends number
-> = Parameters<F>[K];
+export type FnParameter<F extends AnyFn, K extends number> = Parameters<F>[K];
 
 /**
  * Convert Union Type to Intersection Type.
@@ -322,28 +320,45 @@ export function getAllClassProperties(obj: object): Set<string> {
  * @param val T
  * @returns {UnwrapRef<T>}
  */
-export const iref = ref as <T = any>(value: T) => T;
+export const iref = ref as <T = any>(value?: T) => T;
 
 /**
- * Two modes of operation:
+ * Three modes of operation:
  * 1. `iuse(useComposable(arg, arg2, arg3, ...))` converts the return types of a Composable / Ref to pure raw type definition.
  * Returns for all properties of an object an unwrapped raw type definition,
  * unwraps direct Refs & ComputedRefs as well down to their raw types.
  *
- * 2. `iuse(AnyClass, ...args)` If AnyClass is supplied and that class's arguments like so `iuse(AnyClass, ...args)`,
- * it returns an 'ivue(AnyClass, ...args).toRefs()` ivue object in Vee 3 Composable standard form for all properties but casts
- * their types as raw (non-Ref) types to fit with reactive() structure of the ivue class context.
- */
-export function iuse<T extends AnyClass | Object>(
-  val?: T,
-  ...args: InferredArgs<T>
-): T extends AnyClass ? InstanceType<T> : UnwrapComposableReturn<T> {
-  return isClass(val)
-    ? ivue(
-        val as T extends AnyClass ? T : any,
-        ...(args as InferredArgs<T>)
-      ).toRefs()
-    : (val as unknown as UnwrapComposableReturn<T>);
+ * 2. `iuse(useComposable, arg, arg2, arg3, ...)` for cleaner syntax for #1, it does exactly the same thing but
+ * here the TypeScript inference works for composable function arguments to assist you with intellisence,
+ * like they work for constructor arguments in the cause of `ivue()` core function,
+ * making the API cleaner to look at and make it compatible with how this function operates with classes, see #3.
+ *
+ * 3. `iuse(AnyClass, ...args)` If AnyClass is supplied and that class's arguments into `iuse(AnyClass, ...args)`,
+ * it returns an 'ivue(AnyClass, ...args).toRefs()` object for all properties but casts
+ * their types as raw (no-Ref) types to fit with reactive() structure of the ivue class context.
+ */
+export function iuse<T extends AnyClass | AnyFn | Object>(
+  classFunctionObject?: T,
+  ...args: T extends AnyClass
+    ? InferredArgs<T>
+    : T extends AnyFn
+    ? Parameters<T extends (...args: any[]) => any ? T : any>
+    : any
+): T extends AnyClass
+  ? InstanceType<T>
+  : T extends AnyFn
+  ? UseComposable<T>
+  : UnwrapComposableReturn<T> {
+  return typeof classFunctionObject === 'function'
+    ? isClass(classFunctionObject)
+      ? ivue(
+          classFunctionObject as T extends AnyClass ? T : any,
+          ...(args as InferredArgs<T extends AnyClass ? T : any>)
+        ).toRefs()
+      : (classFunctionObject as AnyFn)(
+          ...(args as Parameters<T extends AnyFn ? AnyFn : any>)
+        )
+    : (classFunctionObject as unknown as UnwrapComposableReturn<T>);
 }
 
 /**