@razaman2/reactive-view 0.0.34-beta.28 → 0.0.34-beta.29

package/dist/index.js

@@ -1,7 +1,9 @@
 "use strict";
 var __create = Object.create;
 var __defProp = Object.defineProperty;
+var __defProps = Object.defineProperties;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __getProtoOf = Object.getPrototypeOf;
@@ -19,6 +21,7 @@ var __spreadValues = (a, b) => {
     }
   return a;
 };
+var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 var __objRest = (source, exclude) => {
   var target = {};
   for (var prop in source)
@@ -174,7 +177,7 @@ var import_vue = require("vue");
 
 // package.json
 var name = "@razaman2/reactive-view";
-var version = "0.0.34-beta.28";
+var version = "0.0.34-beta.29";
 
 // src/ReactiveView.ts
 var setup = {
@@ -255,12 +258,12 @@ var ReactiveView_default = {
       console.error("[ReactiveView]: defaultData is required for promise or async function data.");
     }
     const defaultData = props.getDefaultData(
-      "defaultData" in vue.vnode.props ? vue.vnode.props.defaultData : "data" in vue.vnode.props ? Array.isArray(vue.vnode.props.data) ? [] : {} : {}
+      "defaultData" in vue.vnode.props ? vue.vnode.props.defaultData : "data" in vue.vnode.props ? Array.isArray((0, import_vue.isRef)(vue.vnode.props.data) ? (0, import_vue.unref)(vue.vnode.props.data) : vue.vnode.props.data) ? [] : {} : {}
     );
     const datatype = Array.isArray(defaultData) ? [] : {};
     const normalize = (data) => {
       if (props.debug) {
-        console.warn(`[ReactiveView]: using beta props data in [${props.modelName}] component`, { vue, data, defaultData, ref: (0, import_vue.isRef)(data), reactive: (0, import_vue.isReactive)(data) });
+        console.warn(`[ReactiveView]: using beta props data in [${props.modelName}] component`, { vue, data, defaultData, isRef: (0, import_vue.isRef)(data), isReactive: (0, import_vue.isReactive)(data) });
       }
       if ((0, import_vue.isReactive)(data)) {
         return data;
@@ -315,7 +318,7 @@ var ReactiveView_default = {
     });
     const component = (0, import_vue.ref)({ parent: { self: vue.proxy }, self: { template, model, diff, dataPath: dataPath2, isValid } });
     if (props.debug) {
-      console.log("[ReactiveView]:", { props, context, vue, defer, config, model, component, datatype, defaultData, isValid, isReady, isFunctionData, isAsyncFunctionData, isPromiseData });
+      console.warn("[ReactiveView]:", { props, context, vue, defer, config, model, component, datatype, defaultData, isValid, isReady, isFunctionData, isAsyncFunctionData, isPromiseData });
     }
     const watchDataProp = (dataProp) => {
       var _a2, _b2, _c2, _d2;
@@ -326,7 +329,7 @@ var ReactiveView_default = {
         }, context.attrs["data:immediate"] ? { immediate: context.attrs["data:immediate"] } : {}), context.attrs["data:once"] ? { once: context.attrs["data:once"] } : {}), ((_d2 = context.attrs["onUpdate:data"]) != null ? _d2 : {}).options)
       };
       if (context.attrs["data:log"]) {
-        console.log(`[ReactiveView]:data`, { config: config2, dataProp });
+        console.warn(`[ReactiveView]:data`, { config: config2, dataProp });
       }
       (0, import_vue.watch)(isFunctionData || (0, import_vue.isRef)(dataProp) || (0, import_vue.isReactive)(dataProp) ? dataProp : () => dataProp, (after, before) => {
         var _a3;
@@ -345,7 +348,7 @@ var ReactiveView_default = {
         }, context.attrs["model:immediate"] ? { immediate: context.attrs["model:immediate"] } : {}), context.attrs["model:once"] ? { once: context.attrs["model:once"] } : {}), ((_f = context.attrs["onUpdate:model"]) != null ? _f : {}).options)
       } : (_g = context.attrs["onUpdate:model"]) != null ? _g : {};
       if (context.attrs["model:log"]) {
-        console.log(`[ReactiveView]:model`, { config: config2 });
+        console.warn(`[ReactiveView]:model`, { config: config2 });
       }
       (0, import_vue.watch)(() => import_object_manager.default.on(model.getData()).clone(), (after, before) => {
         config2.callback(access(component).diff(import_object_manager.default.on(before), import_object_manager.default.on(after)), { component });
@@ -362,11 +365,14 @@ var ReactiveView_default = {
           ]) : [props.data];
           (0, import_vue.watch)(isRefData ? data : isFunctionData ? data : typeof data === "function" ? data : () => data, (after, before) => {
             var _a3;
-            const callback = context.attrs["data:callback"];
-            if (typeof callback === "function") {
-              model.replaceData((_a3 = callback(access(component).diff(import_object_manager.default.on(before), import_object_manager.default.on(after)), { component })) != null ? _a3 : after);
-            } else {
-              model.replaceData(after);
+            if (before !== void 0 || after !== void 0) {
+              const callback = context.attrs["data:callback"];
+              if (typeof callback === "function") {
+                const diff2 = access(component).diff(import_object_manager.default.on(before), import_object_manager.default.on(after));
+                model.replaceData((_a3 = callback(diff2, { component })) != null ? _a3 : after);
+              } else {
+                model.replaceData(after);
+              }
             }
           }, {
             immediate: (_b2 = context.attrs["data:immediate"]) != null ? _b2 : true,
@@ -623,6 +629,7 @@ var extendVnode = (component, element) => {
   });
 };
 function defineReactiveView(param1, param2) {
+  const instance = (0, import_vue2.ref)();
   return (0, import_vue2.defineComponent)({
     name: param1 == null ? void 0 : param1.modelName,
     props: __spreadValues({ setup }, param1 ? param1.props : {}),
@@ -630,12 +637,14 @@ function defineReactiveView(param1, param2) {
       const _a = param1 != null ? param1 : {}, { setup: setup2, props } = _a, rest = __objRest(_a, ["setup", "props"]);
       return (component) => {
         const props2 = Object.entries(rest).reduce((props3, [key, val]) => {
-          return Object.assign(props3, { [key]: typeof val === "function" ? val(component) : val });
+          return Object.assign(props3, { [key]: typeof val === "function" ? val(component, instance) : val });
         }, {});
         const slots = typeof (param1 == null ? void 0 : param1.slots) === "function" ? param1.slots(component) : Array.isArray(param1 == null ? void 0 : param1.slots) ? () => param1.slots : param1 == null ? void 0 : param1.slots;
-        return (0, import_vue2.createVNode)(param2 != null ? param2 : ReactiveView_default, __spreadValues(__spreadValues({}, props2), Object.assign({}, props2, typeof setup2 === "function" ? {
+        return (0, import_vue2.createVNode)(param2 != null ? param2 : ReactiveView_default, __spreadProps(__spreadValues(__spreadValues({}, props2), Object.assign({}, props2, typeof setup2 === "function" ? {
           setup: (self, parent) => setup2(self, parent, component)
-        } : {})), slots);
+        } : {})), {
+          instance
+        }), slots);
       };
     }
   });

package/dist/index.mjs

@@ -1,4 +1,6 @@
 var __defProp = Object.defineProperty;
+var __defProps = Object.defineProperties;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
 var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __propIsEnum = Object.prototype.propertyIsEnumerable;
@@ -14,6 +16,7 @@ var __spreadValues = (a, b) => {
     }
   return a;
 };
+var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 var __objRest = (source, exclude) => {
   var target = {};
   for (var prop in source)
@@ -124,11 +127,11 @@ var Subscriptions = _Subscriptions;
 // src/ReactiveView.ts
 import ObjectManager from "@razaman2/object-manager";
 import DataManager from "@razaman2/data-manager";
-import { ref, reactive, watch, isRef, isReactive, createVNode, getCurrentInstance } from "vue";
+import { ref, reactive, watch, isRef, isReactive, createVNode, getCurrentInstance, unref } from "vue";
 
 // package.json
 var name = "@razaman2/reactive-view";
-var version = "0.0.34-beta.28";
+var version = "0.0.34-beta.29";
 
 // src/ReactiveView.ts
 var setup = {
@@ -209,12 +212,12 @@ var ReactiveView_default = {
       console.error("[ReactiveView]: defaultData is required for promise or async function data.");
     }
     const defaultData = props.getDefaultData(
-      "defaultData" in vue.vnode.props ? vue.vnode.props.defaultData : "data" in vue.vnode.props ? Array.isArray(vue.vnode.props.data) ? [] : {} : {}
+      "defaultData" in vue.vnode.props ? vue.vnode.props.defaultData : "data" in vue.vnode.props ? Array.isArray(isRef(vue.vnode.props.data) ? unref(vue.vnode.props.data) : vue.vnode.props.data) ? [] : {} : {}
     );
     const datatype = Array.isArray(defaultData) ? [] : {};
     const normalize = (data) => {
       if (props.debug) {
-        console.warn(`[ReactiveView]: using beta props data in [${props.modelName}] component`, { vue, data, defaultData, ref: isRef(data), reactive: isReactive(data) });
+        console.warn(`[ReactiveView]: using beta props data in [${props.modelName}] component`, { vue, data, defaultData, isRef: isRef(data), isReactive: isReactive(data) });
       }
       if (isReactive(data)) {
         return data;
@@ -269,7 +272,7 @@ var ReactiveView_default = {
     });
     const component = ref({ parent: { self: vue.proxy }, self: { template, model, diff, dataPath: dataPath2, isValid } });
     if (props.debug) {
-      console.log("[ReactiveView]:", { props, context, vue, defer, config, model, component, datatype, defaultData, isValid, isReady, isFunctionData, isAsyncFunctionData, isPromiseData });
+      console.warn("[ReactiveView]:", { props, context, vue, defer, config, model, component, datatype, defaultData, isValid, isReady, isFunctionData, isAsyncFunctionData, isPromiseData });
     }
     const watchDataProp = (dataProp) => {
       var _a2, _b2, _c2, _d2;
@@ -280,7 +283,7 @@ var ReactiveView_default = {
         }, context.attrs["data:immediate"] ? { immediate: context.attrs["data:immediate"] } : {}), context.attrs["data:once"] ? { once: context.attrs["data:once"] } : {}), ((_d2 = context.attrs["onUpdate:data"]) != null ? _d2 : {}).options)
       };
       if (context.attrs["data:log"]) {
-        console.log(`[ReactiveView]:data`, { config: config2, dataProp });
+        console.warn(`[ReactiveView]:data`, { config: config2, dataProp });
       }
       watch(isFunctionData || isRef(dataProp) || isReactive(dataProp) ? dataProp : () => dataProp, (after, before) => {
         var _a3;
@@ -299,7 +302,7 @@ var ReactiveView_default = {
         }, context.attrs["model:immediate"] ? { immediate: context.attrs["model:immediate"] } : {}), context.attrs["model:once"] ? { once: context.attrs["model:once"] } : {}), ((_f = context.attrs["onUpdate:model"]) != null ? _f : {}).options)
       } : (_g = context.attrs["onUpdate:model"]) != null ? _g : {};
       if (context.attrs["model:log"]) {
-        console.log(`[ReactiveView]:model`, { config: config2 });
+        console.warn(`[ReactiveView]:model`, { config: config2 });
       }
       watch(() => ObjectManager.on(model.getData()).clone(), (after, before) => {
         config2.callback(access(component).diff(ObjectManager.on(before), ObjectManager.on(after)), { component });
@@ -316,11 +319,14 @@ var ReactiveView_default = {
           ]) : [props.data];
           watch(isRefData ? data : isFunctionData ? data : typeof data === "function" ? data : () => data, (after, before) => {
             var _a3;
-            const callback = context.attrs["data:callback"];
-            if (typeof callback === "function") {
-              model.replaceData((_a3 = callback(access(component).diff(ObjectManager.on(before), ObjectManager.on(after)), { component })) != null ? _a3 : after);
-            } else {
-              model.replaceData(after);
+            if (before !== void 0 || after !== void 0) {
+              const callback = context.attrs["data:callback"];
+              if (typeof callback === "function") {
+                const diff2 = access(component).diff(ObjectManager.on(before), ObjectManager.on(after));
+                model.replaceData((_a3 = callback(diff2, { component })) != null ? _a3 : after);
+              } else {
+                model.replaceData(after);
+              }
             }
           }, {
             immediate: (_b2 = context.attrs["data:immediate"]) != null ? _b2 : true,
@@ -372,7 +378,7 @@ var ReactiveView_default = {
 };
 
 // src/index.ts
-import { h, unref, toRaw, createApp, createVNode as createVNode2, defineComponent } from "vue";
+import { h, ref as ref2, unref as unref2, toRaw, createApp, createVNode as createVNode2, defineComponent } from "vue";
 import { formatInTimeZone } from "date-fns-tz";
 import { twMerge } from "tailwind-merge";
 console.log(`%c[ReactiveView]: ${version}`, "background-color: red; color: yellow;");
@@ -472,7 +478,7 @@ function access(view = {}, alternative) {
     });
   };
   try {
-    const component = (_a = unref(typeof view === "function" ? view() : view)) != null ? _a : {};
+    const component = (_a = unref2(typeof view === "function" ? view() : view)) != null ? _a : {};
     return resolve("instance" in component ? component.instance : component);
   } catch (e) {
     return resolve(view);
@@ -577,6 +583,7 @@ var extendVnode = (component, element) => {
   });
 };
 function defineReactiveView(param1, param2) {
+  const instance = ref2();
   return defineComponent({
     name: param1 == null ? void 0 : param1.modelName,
     props: __spreadValues({ setup }, param1 ? param1.props : {}),
@@ -584,12 +591,14 @@ function defineReactiveView(param1, param2) {
       const _a = param1 != null ? param1 : {}, { setup: setup2, props } = _a, rest = __objRest(_a, ["setup", "props"]);
       return (component) => {
         const props2 = Object.entries(rest).reduce((props3, [key, val]) => {
-          return Object.assign(props3, { [key]: typeof val === "function" ? val(component) : val });
+          return Object.assign(props3, { [key]: typeof val === "function" ? val(component, instance) : val });
         }, {});
         const slots = typeof (param1 == null ? void 0 : param1.slots) === "function" ? param1.slots(component) : Array.isArray(param1 == null ? void 0 : param1.slots) ? () => param1.slots : param1 == null ? void 0 : param1.slots;
-        return createVNode2(param2 != null ? param2 : ReactiveView_default, __spreadValues(__spreadValues({}, props2), Object.assign({}, props2, typeof setup2 === "function" ? {
+        return createVNode2(param2 != null ? param2 : ReactiveView_default, __spreadProps(__spreadValues(__spreadValues({}, props2), Object.assign({}, props2, typeof setup2 === "function" ? {
           setup: (self, parent) => setup2(self, parent, component)
-        } : {})), slots);
+        } : {})), {
+          instance
+        }), slots);
       };
     }
   });
@@ -652,7 +661,7 @@ var setData = (component, data, path) => {
   return "state" in vue ? diff : vue.$emit("update:state", diff);
 };
 var componentState = (component) => {
-  return unref("state" in component ? component.state : component.$attrs.state);
+  return unref2("state" in component ? component.state : component.$attrs.state);
 };
 var dataPath = (component, path) => {
   return typeof component.$attrs["data:path"] === "function" ? component.$attrs["data:path"](path) : path;

package/package.json

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