@razaman2/reactive-view 0.0.23 → 0.0.25

package/dist/index.js

@@ -159,7 +159,7 @@ var import_vue = require("vue");
 
 // package.json
 var name = "@razaman2/reactive-view";
-var version = "0.0.23";
+var version = "0.0.25";
 
 // src/ReactiveView.ts
 var setup = {
@@ -221,10 +221,10 @@ var ReactiveView_default = {
     const ready = (0, import_vue.ref)(false);
     const instance = (0, import_vue.getCurrentInstance)();
     const deferred = (0, import_vue.ref)(typeof props.defer === "function" ? props.defer() : props.defer);
-    const state = typeof props.data === "function" ? props.data() : props.data;
-    const async = state instanceof Promise;
+    const data = typeof props.data === "function" ? props.data() : props.data;
+    const async = data instanceof Promise;
     if (props.debug) {
-      console.log("[ReactiveView]:", { props, context });
+      console.log("[ReactiveView]:", { props, context, isValid, ready, instance, deferred, data, async });
     }
     if (async && !((_a = instance.vnode.props) == null ? void 0 : _a.hasOwnProperty("defaultData"))) {
       console.error("[ReactiveView]: defaultData is required for async data.");
@@ -236,14 +236,15 @@ var ReactiveView_default = {
       ((_b = instance.vnode.props) == null ? void 0 : _b.hasOwnProperty("defaultData")) ? instance.vnode.props.defaultData : typeof ((_c = instance.vnode.props) == null ? void 0 : _c.data) === "object" ? Array.isArray(instance.vnode.props.data) ? [] : {} : ((_d = instance.vnode.props) == null ? void 0 : _d.hasOwnProperty("data")) ? (_e = instance.vnode.props) == null ? void 0 : _e.data : {}
     );
     const datatype = Array.isArray(defaultData) ? [] : {};
-    const data = async ? datatype : ((_f = instance.vnode.props) == null ? void 0 : _f.hasOwnProperty("data")) ? state : datatype;
     const config = {
-      name: props.modelName,
+      data: (0, import_vue.reactive)(
+        import_object_manager.default.on(async ? datatype : ((_f = instance.vnode.props) == null ? void 0 : _f.hasOwnProperty("data")) ? data : datatype).clone()
+      ),
       defaultData: import_object_manager.default.on(defaultData).clone(),
-      data: (0, import_vue.reactive)(import_object_manager.default.on(data).clone()),
       notifications: props.notifications,
       subscriptions: props.subscriptions,
-      logging: props.logging
+      logging: props.logging,
+      name: props.modelName
     };
     const model = new Proxy(props.model ? typeof props.model === "function" ? props.model(config) : props.model : new import_data_manager.default(config), {
       get(target, key, receiver) {
@@ -270,8 +271,7 @@ var ReactiveView_default = {
       const config2 = typeof context.attrs["onUpdate:data"] === "function" ? {
         callback: context.attrs["onUpdate:data"]
       } : (_a2 = context.attrs["onUpdate:data"]) != null ? _a2 : {};
-      console.log("log dataProp:", dataProp);
-      (0, import_vue.watch)(typeof dataProp === "function" || (0, import_vue.isRef)(dataProp) ? dataProp : () => dataProp, (after, before) => {
+      (0, import_vue.watch)(typeof dataProp === "function" || (0, import_vue.isRef)(dataProp) || (0, import_vue.isReactive)(dataProp) ? dataProp : () => dataProp, (after, before) => {
         var _a3;
         const diff = { before: import_object_manager.default.on(before).get(), after: import_object_manager.default.on(after).get() };
         if (typeof config2.callback === "function") {
@@ -281,13 +281,9 @@ var ReactiveView_default = {
         }
       }, config2.options);
     };
-    if (async) {
-      setTimeout(async () => {
-        watchDataProp(await state);
-      });
-    } else {
-      watchDataProp(state);
-    }
+    setTimeout(async () => {
+      watchDataProp(await data);
+    });
     setTimeout(async () => {
       var _a2;
       ready.value = (_a2 = await deferred.value) != null ? _a2 : true;
@@ -304,10 +300,11 @@ var ReactiveView_default = {
     const component = (0, import_vue.ref)({ parent: { self: instance.proxy }, self: { template, model, isValid } });
     if (access(component).ReactiveView) {
       component.value = [access(component)].reduce((options, parent) => {
-        var _a2;
+        var _a2, _b2;
         while (parent) {
           if (typeof parent.setup === "function") {
-            options = { parent: options, self: (_a2 = parent.setup(component, options)) != null ? _a2 : {} };
+            const ups = parent.setup(component, options);
+            options = { parent: options, self: (_b2 = (_a2 = ups.value) != null ? _a2 : ups) != null ? _b2 : {} };
             if (access(parent.$parent).ReactiveView) {
               break;
             } else {

package/dist/index.mjs

@@ -115,11 +115,11 @@ import { createVNode as createVNode2, isRef as isRef2 } from "vue";
 // src/ReactiveView.ts
 import ObjectManager from "@razaman2/object-manager";
 import DataManager from "@razaman2/data-manager";
-import { ref, reactive, watch, isRef, createVNode, getCurrentInstance } from "vue";
+import { ref, reactive, watch, isRef, isReactive, createVNode, getCurrentInstance } from "vue";
 
 // package.json
 var name = "@razaman2/reactive-view";
-var version = "0.0.23";
+var version = "0.0.25";
 
 // src/ReactiveView.ts
 var setup = {
@@ -181,10 +181,10 @@ var ReactiveView_default = {
     const ready = ref(false);
     const instance = getCurrentInstance();
     const deferred = ref(typeof props.defer === "function" ? props.defer() : props.defer);
-    const state = typeof props.data === "function" ? props.data() : props.data;
-    const async = state instanceof Promise;
+    const data = typeof props.data === "function" ? props.data() : props.data;
+    const async = data instanceof Promise;
     if (props.debug) {
-      console.log("[ReactiveView]:", { props, context });
+      console.log("[ReactiveView]:", { props, context, isValid, ready, instance, deferred, data, async });
     }
     if (async && !((_a = instance.vnode.props) == null ? void 0 : _a.hasOwnProperty("defaultData"))) {
       console.error("[ReactiveView]: defaultData is required for async data.");
@@ -196,14 +196,15 @@ var ReactiveView_default = {
       ((_b = instance.vnode.props) == null ? void 0 : _b.hasOwnProperty("defaultData")) ? instance.vnode.props.defaultData : typeof ((_c = instance.vnode.props) == null ? void 0 : _c.data) === "object" ? Array.isArray(instance.vnode.props.data) ? [] : {} : ((_d = instance.vnode.props) == null ? void 0 : _d.hasOwnProperty("data")) ? (_e = instance.vnode.props) == null ? void 0 : _e.data : {}
     );
     const datatype = Array.isArray(defaultData) ? [] : {};
-    const data = async ? datatype : ((_f = instance.vnode.props) == null ? void 0 : _f.hasOwnProperty("data")) ? state : datatype;
     const config = {
-      name: props.modelName,
+      data: reactive(
+        ObjectManager.on(async ? datatype : ((_f = instance.vnode.props) == null ? void 0 : _f.hasOwnProperty("data")) ? data : datatype).clone()
+      ),
       defaultData: ObjectManager.on(defaultData).clone(),
-      data: reactive(ObjectManager.on(data).clone()),
       notifications: props.notifications,
       subscriptions: props.subscriptions,
-      logging: props.logging
+      logging: props.logging,
+      name: props.modelName
     };
     const model = new Proxy(props.model ? typeof props.model === "function" ? props.model(config) : props.model : new DataManager(config), {
       get(target, key, receiver) {
@@ -230,8 +231,7 @@ var ReactiveView_default = {
       const config2 = typeof context.attrs["onUpdate:data"] === "function" ? {
         callback: context.attrs["onUpdate:data"]
       } : (_a2 = context.attrs["onUpdate:data"]) != null ? _a2 : {};
-      console.log("log dataProp:", dataProp);
-      watch(typeof dataProp === "function" || isRef(dataProp) ? dataProp : () => dataProp, (after, before) => {
+      watch(typeof dataProp === "function" || isRef(dataProp) || isReactive(dataProp) ? dataProp : () => dataProp, (after, before) => {
         var _a3;
         const diff = { before: ObjectManager.on(before).get(), after: ObjectManager.on(after).get() };
         if (typeof config2.callback === "function") {
@@ -241,13 +241,9 @@ var ReactiveView_default = {
         }
       }, config2.options);
     };
-    if (async) {
-      setTimeout(async () => {
-        watchDataProp(await state);
-      });
-    } else {
-      watchDataProp(state);
-    }
+    setTimeout(async () => {
+      watchDataProp(await data);
+    });
     setTimeout(async () => {
       var _a2;
       ready.value = (_a2 = await deferred.value) != null ? _a2 : true;
@@ -264,10 +260,11 @@ var ReactiveView_default = {
     const component = ref({ parent: { self: instance.proxy }, self: { template, model, isValid } });
     if (access(component).ReactiveView) {
       component.value = [access(component)].reduce((options, parent) => {
-        var _a2;
+        var _a2, _b2;
         while (parent) {
           if (typeof parent.setup === "function") {
-            options = { parent: options, self: (_a2 = parent.setup(component, options)) != null ? _a2 : {} };
+            const ups = parent.setup(component, options);
+            options = { parent: options, self: (_b2 = (_a2 = ups.value) != null ? _a2 : ups) != null ? _b2 : {} };
             if (access(parent.$parent).ReactiveView) {
               break;
             } else {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@razaman2/reactive-view",
-    "version": "0.0.23",
+    "version": "0.0.25",
     "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",