@razaman2/reactive-view 0.0.34-beta.2 → 0.0.34-beta.4

package/dist/index.d.mts

@@ -53,7 +53,9 @@ declare const _default: {
         notifications: ObjectConstructor;
         subscriptions: ObjectConstructor;
         beforeSetData: FunctionConstructor;
-        data: {};
+        data: {
+            default: () => {};
+        };
         defaultData: {};
         getDefaultData: {
             type: FunctionConstructor;

package/dist/index.d.ts

@@ -53,7 +53,9 @@ declare const _default: {
         notifications: ObjectConstructor;
         subscriptions: ObjectConstructor;
         beforeSetData: FunctionConstructor;
-        data: {};
+        data: {
+            default: () => {};
+        };
         defaultData: {};
         getDefaultData: {
             type: FunctionConstructor;

package/dist/index.js

@@ -168,7 +168,7 @@ var import_vue = require("vue");
 
 // package.json
 var name = "@razaman2/reactive-view";
-var version = "0.0.34-beta.2";
+var version = "0.0.34-beta.4";
 
 // src/ReactiveView.ts
 var setup = {
@@ -189,7 +189,9 @@ var ReactiveView_default = {
     notifications: Object,
     subscriptions: Object,
     beforeSetData: Function,
-    data: {},
+    data: {
+      default: () => ({})
+    },
     defaultData: {},
     getDefaultData: {
       type: Function,
@@ -212,7 +214,7 @@ var ReactiveView_default = {
     }
   },
   setup(props, context) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i;
+    var _a, _b, _c, _d, _e, _f;
     const template = (component2, vue2) => {
       return (0, import_vue.createVNode)(
         "div",
@@ -224,21 +226,21 @@ var ReactiveView_default = {
     };
     const isValid = (0, import_vue.ref)(false);
     const isReady = (0, import_vue.ref)(false);
-    const isFunctionData = ["Function"].includes(((_a = props.data) != null ? _a : {}).constructor.name);
-    const isAsyncFunctionData = ["AsyncFunction"].includes(((_b = props.data) != null ? _b : {}).constructor.name);
-    const isPromiseData = ["Promise"].includes(((_c = props.data) != null ? _c : {}).constructor.name) || isAsyncFunctionData;
+    const isFunctionData = ["Function"].includes(props.data.constructor.name);
+    const isAsyncFunctionData = ["AsyncFunction"].includes(props.data.constructor.name);
+    const isPromiseData = ["Promise"].includes(props.data.constructor.name) || isAsyncFunctionData;
     const defer = (0, import_vue.ref)(typeof props.defer === "function" ? props.defer() : props.defer);
     const vue = (0, import_vue.getCurrentInstance)();
     if ((isPromiseData || isFunctionData) && !("defaultData" in vue.vnode.props)) {
       console.error("[ReactiveView]: defaultData is required for promise or async function data.");
     }
     const defaultData = props.getDefaultData(
-      ((_d = vue.vnode.props) == null ? void 0 : _d.hasOwnProperty("defaultData")) ? vue.vnode.props.defaultData : ((_e = vue.vnode.props) == null ? void 0 : _e.hasOwnProperty("data")) ? Array.isArray(vue.vnode.props.data) ? [] : {} : {}
+      ((_a = vue.vnode.props) == null ? void 0 : _a.hasOwnProperty("defaultData")) ? vue.vnode.props.defaultData : ((_b = vue.vnode.props) == null ? void 0 : _b.hasOwnProperty("data")) ? Array.isArray(vue.vnode.props.data) ? [] : {} : {}
     );
     const datatype = Array.isArray(defaultData) ? [] : {};
     const config = {
       data: (0, import_vue.reactive)(import_object_manager.default.on(
-        isPromiseData || isFunctionData || (0, import_vue.isRef)(props.data) || (0, import_vue.isReactive)(props.data) ? datatype : ((_f = vue.vnode.props) == null ? void 0 : _f.hasOwnProperty("data")) ? props.data : datatype
+        isPromiseData || isFunctionData || (0, import_vue.isRef)(props.data) || (0, import_vue.isReactive)(props.data) ? datatype : ((_c = vue.vnode.props) == null ? void 0 : _c.hasOwnProperty("data")) ? props.data : datatype
       ).clone()),
       defaultData: import_object_manager.default.on(defaultData).clone(),
       notifications: props.notifications,
@@ -295,9 +297,9 @@ var ReactiveView_default = {
       const config2 = typeof context.attrs["onUpdate:model"] === "function" ? {
         callback: context.attrs["onUpdate:model"],
         options: Object.assign(__spreadValues(__spreadValues({
-          deep: (_g = context.attrs["model:deep"]) != null ? _g : true
-        }, context.attrs["model:immediate"] ? { immediate: context.attrs["model:immediate"] } : {}), context.attrs["model:once"] ? { once: context.attrs["model:once"] } : {}), ((_h = context.attrs["onUpdate:model"]) != null ? _h : {}).options)
-      } : (_i = context.attrs["onUpdate:model"]) != null ? _i : {};
+          deep: (_d = context.attrs["model:deep"]) != null ? _d : true
+        }, context.attrs["model:immediate"] ? { immediate: context.attrs["model:immediate"] } : {}), context.attrs["model:once"] ? { once: context.attrs["model:once"] } : {}), ((_e = context.attrs["onUpdate:model"]) != null ? _e : {}).options)
+      } : (_f = context.attrs["onUpdate:model"]) != null ? _f : {};
       if (context.attrs["model:log"]) {
         console.log(`[ReactiveView]:model`, { config: config2 });
       }
@@ -346,6 +348,7 @@ var ReactiveView_default = {
 // src/index.ts
 var import_vue2 = require("vue");
 var import_date_fns_tz = require("date-fns-tz");
+var import_tailwind_merge = require("tailwind-merge");
 var index_default = ReactiveView_default;
 function safeRequest(request) {
   return new Promise(async (resolve) => {
@@ -375,7 +378,7 @@ function safeRequest(request) {
     }
   });
 }
-function getProps(props, param2) {
+function getProps(props = {}, param2) {
   var _a;
   const exclude = Array.isArray(param2) || typeof param2 === "string" ? param2 : param2.exclude;
   const exclusions = (Array.isArray(exclude) ? exclude : [exclude]).join("|");
@@ -527,22 +530,18 @@ var extendVnode = (component, element) => {
       return (props = {}, slots) => {
         var _a;
         const _b = getProps((_a = vnode.props) != null ? _a : {}, []), { class: classes, style: styles } = _b, rest = __objRest(_b, ["class", "style"]);
-        const finalClasses = MergeStyles(classes, typeof props.class === "function" ? props.class(classes) : props.class);
+        const finalClasses = (0, import_tailwind_merge.twMerge)(MergeStyles(classes).string, MergeStyles(typeof props.class === "function" ? props.class(classes) : props.class).string);
+        const finalStyles = MergeStyles(styles, typeof props.style === "function" ? props.style(styles) : props.style);
         const functionalProps = Object.entries(props).reduce((props2, [key2, value]) => {
-          if (![
-            "class"
-            /*, "style"*/
-          ].includes(key2) && typeof value === "function") {
-            props2[key2] = value(vnode.props[key2]);
+          var _a2;
+          if (!["class", "style"].includes(key2) && typeof value === "function") {
+            props2[key2] = value((_a2 = vnode.props) == null ? void 0 : _a2[key2]);
           }
           return props2;
         }, props);
-        const finalProps = Object.assign(rest, functionalProps, {
-          class: finalClasses
-          /*, style: finalStyles*/
-        });
-        const finalSlots = typeof slots === "function" ? slots(vnode.children) : vnode.children;
-        return (0, import_vue2.h)(["string", "undefined"].includes(typeof element) ? vnode : element, finalProps, finalSlots);
+        const finalProps = Object.assign(rest, functionalProps, { class: finalClasses, style: finalStyles });
+        const finalSlots = slots ? typeof slots === "function" ? slots(vnode.children) : slots : vnode.children;
+        return (0, import_vue2.h)(["undefined"].includes(typeof element) ? vnode.type : element, finalProps, finalSlots);
       };
     }
   });

package/dist/index.mjs

@@ -125,7 +125,7 @@ import { ref, reactive, watch, isRef, isReactive, createVNode, getCurrentInstanc
 
 // package.json
 var name = "@razaman2/reactive-view";
-var version = "0.0.34-beta.2";
+var version = "0.0.34-beta.4";
 
 // src/ReactiveView.ts
 var setup = {
@@ -146,7 +146,9 @@ var ReactiveView_default = {
     notifications: Object,
     subscriptions: Object,
     beforeSetData: Function,
-    data: {},
+    data: {
+      default: () => ({})
+    },
     defaultData: {},
     getDefaultData: {
       type: Function,
@@ -169,7 +171,7 @@ var ReactiveView_default = {
     }
   },
   setup(props, context) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i;
+    var _a, _b, _c, _d, _e, _f;
     const template = (component2, vue2) => {
       return createVNode(
         "div",
@@ -181,21 +183,21 @@ var ReactiveView_default = {
     };
     const isValid = ref(false);
     const isReady = ref(false);
-    const isFunctionData = ["Function"].includes(((_a = props.data) != null ? _a : {}).constructor.name);
-    const isAsyncFunctionData = ["AsyncFunction"].includes(((_b = props.data) != null ? _b : {}).constructor.name);
-    const isPromiseData = ["Promise"].includes(((_c = props.data) != null ? _c : {}).constructor.name) || isAsyncFunctionData;
+    const isFunctionData = ["Function"].includes(props.data.constructor.name);
+    const isAsyncFunctionData = ["AsyncFunction"].includes(props.data.constructor.name);
+    const isPromiseData = ["Promise"].includes(props.data.constructor.name) || isAsyncFunctionData;
     const defer = ref(typeof props.defer === "function" ? props.defer() : props.defer);
     const vue = getCurrentInstance();
     if ((isPromiseData || isFunctionData) && !("defaultData" in vue.vnode.props)) {
       console.error("[ReactiveView]: defaultData is required for promise or async function data.");
     }
     const defaultData = props.getDefaultData(
-      ((_d = vue.vnode.props) == null ? void 0 : _d.hasOwnProperty("defaultData")) ? vue.vnode.props.defaultData : ((_e = vue.vnode.props) == null ? void 0 : _e.hasOwnProperty("data")) ? Array.isArray(vue.vnode.props.data) ? [] : {} : {}
+      ((_a = vue.vnode.props) == null ? void 0 : _a.hasOwnProperty("defaultData")) ? vue.vnode.props.defaultData : ((_b = vue.vnode.props) == null ? void 0 : _b.hasOwnProperty("data")) ? Array.isArray(vue.vnode.props.data) ? [] : {} : {}
     );
     const datatype = Array.isArray(defaultData) ? [] : {};
     const config = {
       data: reactive(ObjectManager.on(
-        isPromiseData || isFunctionData || isRef(props.data) || isReactive(props.data) ? datatype : ((_f = vue.vnode.props) == null ? void 0 : _f.hasOwnProperty("data")) ? props.data : datatype
+        isPromiseData || isFunctionData || isRef(props.data) || isReactive(props.data) ? datatype : ((_c = vue.vnode.props) == null ? void 0 : _c.hasOwnProperty("data")) ? props.data : datatype
       ).clone()),
       defaultData: ObjectManager.on(defaultData).clone(),
       notifications: props.notifications,
@@ -252,9 +254,9 @@ var ReactiveView_default = {
       const config2 = typeof context.attrs["onUpdate:model"] === "function" ? {
         callback: context.attrs["onUpdate:model"],
         options: Object.assign(__spreadValues(__spreadValues({
-          deep: (_g = context.attrs["model:deep"]) != null ? _g : true
-        }, context.attrs["model:immediate"] ? { immediate: context.attrs["model:immediate"] } : {}), context.attrs["model:once"] ? { once: context.attrs["model:once"] } : {}), ((_h = context.attrs["onUpdate:model"]) != null ? _h : {}).options)
-      } : (_i = context.attrs["onUpdate:model"]) != null ? _i : {};
+          deep: (_d = context.attrs["model:deep"]) != null ? _d : true
+        }, context.attrs["model:immediate"] ? { immediate: context.attrs["model:immediate"] } : {}), context.attrs["model:once"] ? { once: context.attrs["model:once"] } : {}), ((_e = context.attrs["onUpdate:model"]) != null ? _e : {}).options)
+      } : (_f = context.attrs["onUpdate:model"]) != null ? _f : {};
       if (context.attrs["model:log"]) {
         console.log(`[ReactiveView]:model`, { config: config2 });
       }
@@ -303,6 +305,7 @@ var ReactiveView_default = {
 // src/index.ts
 import { createVNode as createVNode2, isRef as isRef2, h } from "vue";
 import { formatInTimeZone } from "date-fns-tz";
+import { twMerge } from "tailwind-merge";
 var index_default = ReactiveView_default;
 function safeRequest(request) {
   return new Promise(async (resolve) => {
@@ -332,7 +335,7 @@ function safeRequest(request) {
     }
   });
 }
-function getProps(props, param2) {
+function getProps(props = {}, param2) {
   var _a;
   const exclude = Array.isArray(param2) || typeof param2 === "string" ? param2 : param2.exclude;
   const exclusions = (Array.isArray(exclude) ? exclude : [exclude]).join("|");
@@ -484,22 +487,18 @@ var extendVnode = (component, element) => {
       return (props = {}, slots) => {
         var _a;
         const _b = getProps((_a = vnode.props) != null ? _a : {}, []), { class: classes, style: styles } = _b, rest = __objRest(_b, ["class", "style"]);
-        const finalClasses = MergeStyles(classes, typeof props.class === "function" ? props.class(classes) : props.class);
+        const finalClasses = twMerge(MergeStyles(classes).string, MergeStyles(typeof props.class === "function" ? props.class(classes) : props.class).string);
+        const finalStyles = MergeStyles(styles, typeof props.style === "function" ? props.style(styles) : props.style);
         const functionalProps = Object.entries(props).reduce((props2, [key2, value]) => {
-          if (![
-            "class"
-            /*, "style"*/
-          ].includes(key2) && typeof value === "function") {
-            props2[key2] = value(vnode.props[key2]);
+          var _a2;
+          if (!["class", "style"].includes(key2) && typeof value === "function") {
+            props2[key2] = value((_a2 = vnode.props) == null ? void 0 : _a2[key2]);
           }
           return props2;
         }, props);
-        const finalProps = Object.assign(rest, functionalProps, {
-          class: finalClasses
-          /*, style: finalStyles*/
-        });
-        const finalSlots = typeof slots === "function" ? slots(vnode.children) : vnode.children;
-        return h(["string", "undefined"].includes(typeof element) ? vnode : element, finalProps, finalSlots);
+        const finalProps = Object.assign(rest, functionalProps, { class: finalClasses, style: finalStyles });
+        const finalSlots = slots ? typeof slots === "function" ? slots(vnode.children) : slots : vnode.children;
+        return h(["undefined"].includes(typeof element) ? vnode.type : element, finalProps, finalSlots);
       };
     }
   });

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@razaman2/reactive-view",
-    "version": "0.0.34-beta.2",
+    "version": "0.0.34-beta.4",
     "description": "This library enables you to build vue apps in an object oriented way. It provides a convenient approach to extend and override ui components. It provides a built in eventing system along with component data management.",
     "main": "dist/index.js",
     "module": "dist/index.mjs",
@@ -26,10 +26,11 @@
         "@razaman2/object-manager": "^3.4.2",
         "date-fns": "^4.1.0",
         "date-fns-tz": "^3.2.0",
+        "tailwind-merge": "^3.3.1",
         "uuid": "^11.1.0"
     },
     "peerDependencies": {
-        "vue": "^3.5.18"
+        "vue": "^3.5.19"
     },
     "devDependencies": {
         "@types/uuid": "^10.0.0",