@razaman2/reactive-view 0.0.34-beta.10 → 0.0.34-beta.12

package/dist/index.js

@@ -172,7 +172,7 @@ var import_vue = require("vue");
 
 // package.json
 var name = "@razaman2/reactive-view";
-var version = "0.0.34-beta.10";
+var version = "0.0.34-beta.12";
 
 // src/ReactiveView.ts
 var setup = {
@@ -187,15 +187,11 @@ var ReactiveView_default = {
       type: Boolean,
       default: true
     },
-    instance: {
-      default: () => (0, import_vue.ref)()
-    },
+    instance: { default: () => (0, import_vue.ref)() },
     notifications: Object,
     subscriptions: Object,
     beforeSetData: Function,
-    data: {
-      default: () => ({})
-    },
+    data: { default: () => ({}) },
     defaultData: {},
     getDefaultData: {
       type: Function,
@@ -370,6 +366,7 @@ var ReactiveView_default = {
 var import_vue2 = require("vue");
 var import_date_fns_tz = require("date-fns-tz");
 var import_tailwind_merge = require("tailwind-merge");
+console.log(`%c[ReactiveView]: ${version}`, "background-color: red; color: yellow;");
 var index_default = ReactiveView_default;
 function safeRequest(request) {
   return new Promise(async (resolve) => {
@@ -465,9 +462,8 @@ function access(view = {}, alternative) {
     });
   };
   try {
-    const component = typeof view === "function" ? view() : view;
-    const ref2 = (0, import_vue2.isRef)(component) ? component.value : component;
-    return resolve(ref2.ReactiveView ? access(ref2.instance) : ref2);
+    const component = (0, import_vue2.unref)(typeof view === "function" ? view() : view);
+    return resolve("instance" in component ? component.instance : component);
   } catch (e) {
     return resolve(view);
   }
@@ -551,7 +547,7 @@ 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 = (0, import_tailwind_merge.twMerge)(MergeStyles(classes).string, MergeStyles(typeof props.class === "function" ? props.class(classes) : props.class).string);
+        const finalClasses = (0, import_tailwind_merge.twMerge)(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]) => {
           var _a2;
@@ -568,11 +564,16 @@ var extendVnode = (component, element) => {
   });
 };
 var getData = (component, path, alternative) => {
-  return import_object_manager2.default.on((0, import_vue2.unref)(component.state)).get(dataPath(component, path), alternative);
+  const data = import_object_manager2.default.on((0, import_vue2.unref)(component.$attrs.state));
+  if (path) {
+    return data.get(dataPath(component, path), alternative);
+  } else {
+    return data.get();
+  }
 };
 var setData = (component, data, path) => {
   return component.$emit("update:state", {
-    before: import_object_manager2.default.on((0, import_vue2.unref)(component.state)).clone(),
+    before: import_object_manager2.default.on((0, import_vue2.unref)(component.$attrs.state)).clone(),
     after: path ? import_object_manager2.default.on({}).set(dataPath(component, path), data).get() : data
   });
 };

package/dist/index.mjs

@@ -128,7 +128,7 @@ import { ref, reactive, watch, isRef, isReactive, createVNode, getCurrentInstanc
 
 // package.json
 var name = "@razaman2/reactive-view";
-var version = "0.0.34-beta.10";
+var version = "0.0.34-beta.12";
 
 // src/ReactiveView.ts
 var setup = {
@@ -143,15 +143,11 @@ var ReactiveView_default = {
       type: Boolean,
       default: true
     },
-    instance: {
-      default: () => ref()
-    },
+    instance: { default: () => ref() },
     notifications: Object,
     subscriptions: Object,
     beforeSetData: Function,
-    data: {
-      default: () => ({})
-    },
+    data: { default: () => ({}) },
     defaultData: {},
     getDefaultData: {
       type: Function,
@@ -323,9 +319,10 @@ var ReactiveView_default = {
 };
 
 // src/index.ts
-import { h, unref as unref2, isRef as isRef2, toRaw, createVNode as createVNode2 } from "vue";
+import { h, unref as unref2, toRaw, createVNode as createVNode2 } from "vue";
 import { formatInTimeZone } from "date-fns-tz";
 import { twMerge } from "tailwind-merge";
+console.log(`%c[ReactiveView]: ${version}`, "background-color: red; color: yellow;");
 var index_default = ReactiveView_default;
 function safeRequest(request) {
   return new Promise(async (resolve) => {
@@ -421,9 +418,8 @@ function access(view = {}, alternative) {
     });
   };
   try {
-    const component = typeof view === "function" ? view() : view;
-    const ref2 = isRef2(component) ? component.value : component;
-    return resolve(ref2.ReactiveView ? access(ref2.instance) : ref2);
+    const component = unref2(typeof view === "function" ? view() : view);
+    return resolve("instance" in component ? component.instance : component);
   } catch (e) {
     return resolve(view);
   }
@@ -507,7 +503,7 @@ 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 = twMerge(MergeStyles(classes).string, MergeStyles(typeof props.class === "function" ? props.class(classes) : props.class).string);
+        const finalClasses = twMerge(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]) => {
           var _a2;
@@ -524,11 +520,16 @@ var extendVnode = (component, element) => {
   });
 };
 var getData = (component, path, alternative) => {
-  return ObjectManager2.on(unref2(component.state)).get(dataPath(component, path), alternative);
+  const data = ObjectManager2.on(unref2(component.$attrs.state));
+  if (path) {
+    return data.get(dataPath(component, path), alternative);
+  } else {
+    return data.get();
+  }
 };
 var setData = (component, data, path) => {
   return component.$emit("update:state", {
-    before: ObjectManager2.on(unref2(component.state)).clone(),
+    before: ObjectManager2.on(unref2(component.$attrs.state)).clone(),
     after: path ? ObjectManager2.on({}).set(dataPath(component, path), data).get() : data
   });
 };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@razaman2/reactive-view",
-    "version": "0.0.34-beta.10",
+    "version": "0.0.34-beta.12",
     "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",