@duxweb/dvha-core 1.0.25 → 1.0.27

package/dist/cjs/hooks/form.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const r=require("lodash-es"),u=require("vue"),l=require("./data.cjs");function b(a){const t=u.toRef(a,"form",{}),o=u.toRef(a,"id",void 0),i=u.ref(r.cloneDeep(t.value||{})),s=u.ref(r.cloneDeep(t.value||{})),n=u.computed(()=>a.action==="edit"||!!o.value),{data:m,isLoading:g,refetch:f}=l.useOne({get path(){return a.path||""},get id(){return o.value},options:{enabled:n.value},providerName:a.providerName}),c=()=>{let e={};n.value?e=r.cloneDeep(i.value):e=r.cloneDeep(s.value),Object.assign(t.value,e)};u.watch([o,n],async()=>{if(!n.value){c();return}await f();const e=r.cloneDeep(m.value?.data||{});Object.assign(t.value,e),Object.assign(i.value,e)},{immediate:!0});const d=l.useCreate({path:a.path??"",data:t.value,onSuccess:e=>{c(),a.onSuccess?.(e)},onError:e=>{a.onError?.(e)},providerName:a.providerName}),v=l.useUpdate({get path(){return a.path??""},get id(){return o.value},data:t.value,onSuccess:e=>{a.onSuccess?.(e)},onError:e=>{a.onError?.(e)},providerName:a.providerName}),D=e=>{n.value?v.mutate({id:o.value,data:e||t.value}):d.mutate({data:e||t.value})},h=u.computed(()=>g.value||d.isLoading.value||v.isLoading.value);return{form:t,initData:n.value?i.value:s.value,isLoading:h,isEdit:n,onSubmit:D,onReset:c}}exports.useForm=b;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const r=require("lodash-es"),n=require("vue"),s=require("./data.cjs");function b(a){const t=n.toRef(a,"form",{}),o=n.toRef(a,"id",void 0),i=n.ref(r.cloneDeep(t.value||{})),l=n.ref(r.cloneDeep(t.value||{})),u=n.computed(()=>a.action==="edit"||!!o.value),{data:m,isLoading:g,refetch:f}=s.useOne({get path(){return a.path||""},get id(){return o.value},options:{enabled:!1},providerName:a.providerName}),c=()=>{let e={};u.value?e=r.cloneDeep(i.value):e=r.cloneDeep(l.value),Object.assign(t.value,e)};n.watch([o,u],async()=>{if(!u.value){c();return}await f();const e=r.cloneDeep(m.value?.data||{});Object.assign(t.value,e),Object.assign(i.value,e)},{immediate:!0,deep:!0});const d=s.useCreate({path:a.path??"",data:t.value,onSuccess:e=>{c(),a.onSuccess?.(e)},onError:e=>{a.onError?.(e)},providerName:a.providerName}),v=s.useUpdate({get path(){return a.path??""},get id(){return o.value},data:t.value,onSuccess:e=>{a.onSuccess?.(e)},onError:e=>{a.onError?.(e)},providerName:a.providerName}),D=e=>{u.value?v.mutate({id:o.value,data:e||t.value}):d.mutate({data:e||t.value})},h=n.computed(()=>g.value||d.isLoading.value||v.isLoading.value);return{form:t,initData:u.value?i.value:l.value,isLoading:h,isEdit:u,onSubmit:D,onReset:c}}exports.useForm=b;

package/dist/cjs/hooks/json/vOn.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const v={name:"v-on",priority:60,process(u,c){const o={},s={};let i=!1;return Object.entries(c).forEach(([t,e])=>{if(t.startsWith("@")||t.startsWith("v-on:")){i=!0;const l=t.startsWith("@")?t.slice(1):t.slice(5),[r,...a]=l.split(".");if(!r){console.warn(`Invalid event name: ${t}`);return}const p=`on${r.charAt(0).toUpperCase()}${r.slice(1)}`,d=(n,...f)=>{a.includes("prevent")&&n.preventDefault?.(),a.includes("stop")&&n.stopPropagation?.();try{typeof e=="function"?e(n,...f):console.warn(`Invalid event handler type: ${typeof e}`)}catch(h){console.error(`Event handler execution error (${r}):`,h)}};o[p]=d}else s[t]=e}),i?{props:{...s,...o}}:null}};exports.vOnAdaptor=v;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const v={name:"v-on",priority:60,process(u,c){const o={},s={};let i=!1;return Object.entries(c).forEach(([t,e])=>{if(t.startsWith("@")||t.startsWith("v-on:")){i=!0;const l=t.startsWith("@")?t.slice(1):t.slice(5),[r,...a]=l.split(".");if(!r){console.warn(`Invalid event name: ${t}`);return}const p=`on${r.charAt(0).toUpperCase()}${r.slice(1)}`,d=(n,...f)=>{a.includes("prevent")&&n.preventDefault?.(),a.includes("stop")&&n.stopPropagation?.();try{if(typeof e=="function")return e(n,...f);console.warn(`Invalid event handler type: ${typeof e}`)}catch(h){console.error(`Event handler execution error (${r}):`,h)}};o[p]=d}else s[t]=e}),i?{props:{...s,...o}}:null}};exports.vOnAdaptor=v;

package/dist/cjs/hooks/json.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const s=require("vue"),v=require("../stores/jsonSchema.cjs"),N=require("./config.cjs"),P=require("./json/index.cjs"),V=require("./json/utils/contextManager.cjs");function $(n){return n.replace(/([a-z0-9])([A-Z])/g,"$1-$2").toLowerCase()}function b(n,m){Array.isArray(n)?n.forEach(c=>{const i=c;let d=i.name;!d&&i.__name&&(d=i.__name.replace(/\.(vue|ts|tsx|js|jsx)$/,"").split("/").pop()),d&&m.addComponent(s.markRaw(c),d)}):typeof n=="object"&&n!==null&&Object.entries(n).forEach(([c,i])=>{m.addComponent(s.markRaw(i),c)})}function z(n,m){const c=v.useJsonSchemaStore(m);n.jsonSchema?.components&&b(n.jsonSchema.components,c),n.manages?.forEach(i=>{i.jsonSchema?.components&&b(i.jsonSchema.components,c)})}function T(n){const m=N.useConfig(),c=v.useJsonSchemaStore(),i=[...P.defaultAdaptors,...m.jsonSchema?.adaptors||[],...n?.adaptors||[]];n?.components&&b(n.components,c);const d=s.computed(()=>s.isRef(n?.data)?n?.data.value:n?.data);function A(){return(s.isRef(n?.context)?n?.context.value:n?.context)||{}}function _(e){const o={};return Object.entries(e).forEach(([t,a])=>{if(t==="_context")return;const j=t==="modelValue"||t.startsWith("modelValue")||t!=="value"&&(t.includes("model")||t.includes("Model"));o[t]=j&&s.isRef(a)?s.unref(a):a}),o}function y(e,o,t){return typeof e=="string"?e:typeof e=="function"?y(e(o),o,t):Array.isArray(e)?e.flatMap(a=>y(a,o,t)).filter(Boolean):e?.tag?p(e,!0,t):e}function M(e,o,t){if(e)return typeof e=="string"?e:Array.isArray(e)?e.flatMap(a=>typeof a=="string"?a:p(a,o,t)).filter(Boolean):p(e,o,t)}function p(e,o=!1,t={}){const{tag:a,attrs:j={},children:O,slots:B}=e,h={...A(),...t};let g={...j};Object.keys(h).length>0&&(g={...g,...V.injectContext({},h)});for(const f of i){const r=f.process(e,g);if(r){if(g=r.props,r.skip)return null;if(r.nodes)return r.nodes.map(l=>{const S=l.attrs?._context||{};return p(l,o,{...h,...S})}).filter(Boolean)}}let u=typeof a=="string"&&(f=>{let r=c.getComponentByName(f);if(r)return r;const l=$(f);if(r=c.getComponentByName(l),r)return r;const S=f.replace(/-([a-z])/g,(R,w)=>w.toUpperCase()).replace(/^[a-z]/,R=>R.toUpperCase());return r=c.getComponentByName(S),r||null})(a)||a;typeof u!="string"&&typeof u=="object"&&(u=s.markRaw(u));const J=typeof u!="string",C=_(g);if(B&&J&&!o){const f={};return Object.entries(B).forEach(([r,l])=>{f[r]=(S={})=>y(l,S,h)}),s.h(u,C,f)}const x=M(O,o,h);return J&&x!==void 0?s.h(u,C,{default:()=>x}):s.h(u,C,x)}const q=s.defineComponent({name:"JsonSchemaRenderer",render(){return d.value?.map(e=>p(e)).filter(Boolean)||[]}});function E(e){return s.defineComponent({name:"DynamicJsonSchemaRenderer",render(){const o={...A(),...e.context};return e.data?.map(t=>p(t,!1,o)).filter(Boolean)}})}return{render:q,renderAsync:E}}exports.initJsonSchemaComponents=z;exports.useJsonSchema=T;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const s=require("vue"),v=require("../stores/jsonSchema.cjs"),N=require("./config.cjs"),V=require("./json/index.cjs"),$=require("./json/utils/contextManager.cjs");function z(n){return n.replace(/([a-z0-9])([A-Z])/g,"$1-$2").toLowerCase()}function b(n,m){Array.isArray(n)?n.forEach(c=>{const i=c;let d=i.name;!d&&i.__name&&(d=i.__name.replace(/\.(vue|ts|tsx|js|jsx)$/,"").split("/").pop()),d&&m.addComponent(s.markRaw(c),d)}):typeof n=="object"&&n!==null&&Object.entries(n).forEach(([c,i])=>{m.addComponent(s.markRaw(i),c)})}function P(n,m){const c=v.useJsonSchemaStore(m);n.jsonSchema?.components&&b(n.jsonSchema.components,c),n.manages?.forEach(i=>{i.jsonSchema?.components&&b(i.jsonSchema.components,c)})}function T(n){const m=N.useConfig(),c=v.useJsonSchemaStore(),i=[...V.defaultAdaptors,...m.jsonSchema?.adaptors||[],...n?.adaptors||[]];n?.components&&b(n.components,c);const d=s.computed(()=>s.isRef(n?.data)?n?.data.value:n?.data);function A(){return(s.isRef(n?.context)?n?.context.value:n?.context)||{}}function _(e){const r={};return Object.entries(e).forEach(([t,o])=>{if(t==="_context")return;const j=t==="modelValue"||t.startsWith("modelValue")||t!=="value"&&(t.includes("model")||t.includes("Model"));r[t]=j&&s.isRef(o)?s.unref(o):o}),r}function y(e,r,t){if(typeof e=="string")return e;if(typeof e=="function")return y(e(r),r,t);if(Array.isArray(e))return e.flatMap(o=>y(o,r,t)).filter(Boolean);if(e?.tag){const o={...t,...r};return p(e,!0,o)}return e}function M(e,r,t){if(e)return typeof e=="string"?e:Array.isArray(e)?e.flatMap(o=>typeof o=="string"?o:p(o,r,t)).filter(Boolean):p(e,r,t)}function p(e,r=!1,t={}){const{tag:o,attrs:j={},children:O,slots:B}=e,h={...A(),...t};let g={...j};Object.keys(h).length>0&&(g={...g,...$.injectContext({},h)});for(const f of i){const a=f.process(e,g);if(a){if(g=a.props,a.skip)return null;if(a.nodes)return a.nodes.map(l=>{const S=l.attrs?._context||{};return p(l,r,{...h,...S})}).filter(Boolean)}}let u=typeof o=="string"&&(f=>{let a=c.getComponentByName(f);if(a)return a;const l=z(f);if(a=c.getComponentByName(l),a)return a;const S=f.replace(/-([a-z])/g,(R,w)=>w.toUpperCase()).replace(/^[a-z]/,R=>R.toUpperCase());return a=c.getComponentByName(S),a||null})(o)||o;typeof u!="string"&&typeof u=="object"&&(u=s.markRaw(u));const J=typeof u!="string",C=_(g);if(B&&J&&!r){const f={};return Object.entries(B).forEach(([a,l])=>{f[a]=(S={})=>y(l,S,h)}),s.h(u,C,f)}const x=M(O,r,h);return J&&x!==void 0?s.h(u,C,{default:()=>x}):s.h(u,C,x)}const q=s.defineComponent({name:"JsonSchemaRenderer",render(){return d.value?.map(e=>p(e)).filter(Boolean)||[]}});function E(e){return s.defineComponent({name:"DynamicJsonSchemaRenderer",render(){const r={...A(),...e.context};return e.data?.map(t=>p(t,!1,r)).filter(Boolean)}})}return{render:q,renderAsync:E}}exports.initJsonSchemaComponents=P;exports.useJsonSchema=T;

package/dist/esm/hooks/form.js

@@ -1,8 +1,8 @@
 import { cloneDeep as i } from "lodash-es";
-import { toRef as d, ref as l, computed as m, watch as b } from "vue";
+import { toRef as v, ref as l, computed as m, watch as b } from "vue";
 import { useOne as E, useCreate as L, useUpdate as O } from "./data.js";
 function w(a) {
-  const t = d(a, "form", {}), u = d(a, "id", void 0), o = l(i(t.value || {})), v = l(i(t.value || {})), n = m(() => a.action === "edit" || !!u.value), { data: f, isLoading: g, refetch: h } = E({
+  const t = v(a, "form", {}), u = v(a, "id", void 0), o = l(i(t.value || {})), s = l(i(t.value || {})), n = m(() => a.action === "edit" || !!u.value), { data: f, isLoading: g, refetch: h } = E({
     get path() {
       return a.path || "";
     },
@@ -10,12 +10,12 @@ function w(a) {
       return u.value;
     },
     options: {
-      enabled: n.value
+      enabled: !1
     },
     providerName: a.providerName
   }), r = () => {
     let e = {};
-    n.value ? e = i(o.value) : e = i(v.value), Object.assign(t.value, e);
+    n.value ? e = i(o.value) : e = i(s.value), Object.assign(t.value, e);
   };
   b([u, n], async () => {
     if (!n.value) {
@@ -26,7 +26,8 @@ function w(a) {
     const e = i(f.value?.data || {});
     Object.assign(t.value, e), Object.assign(o.value, e);
   }, {
-    immediate: !0
+    immediate: !0,
+    deep: !0
   });
   const c = L({
     path: a.path ?? "",
@@ -38,7 +39,7 @@ function w(a) {
       a.onError?.(e);
     },
     providerName: a.providerName
-  }), s = O({
+  }), d = O({
     get path() {
       return a.path ?? "";
     },
@@ -54,16 +55,16 @@ function w(a) {
     },
     providerName: a.providerName
   }), D = (e) => {
-    n.value ? s.mutate({
+    n.value ? d.mutate({
       id: u.value,
       data: e || t.value
     }) : c.mutate({
       data: e || t.value
     });
-  }, N = m(() => g.value || c.isLoading.value || s.isLoading.value);
+  }, N = m(() => g.value || c.isLoading.value || d.isLoading.value);
   return {
     form: t,
-    initData: n.value ? o.value : v.value,
+    initData: n.value ? o.value : s.value,
     isLoading: N,
     isEdit: n,
     onSubmit: D,

package/dist/esm/hooks/json/vOn.js

@@ -7,17 +7,19 @@ const u = {
     return Object.entries(c).forEach(([t, e]) => {
       if (t.startsWith("@") || t.startsWith("v-on:")) {
         i = !0;
-        const l = t.startsWith("@") ? t.slice(1) : t.slice(5), [n, ...a] = l.split(".");
-        if (!n) {
+        const l = t.startsWith("@") ? t.slice(1) : t.slice(5), [r, ...a] = l.split(".");
+        if (!r) {
           console.warn(`Invalid event name: ${t}`);
           return;
         }
-        const p = `on${n.charAt(0).toUpperCase()}${n.slice(1)}`, f = (r, ...d) => {
-          a.includes("prevent") && r.preventDefault?.(), a.includes("stop") && r.stopPropagation?.();
+        const p = `on${r.charAt(0).toUpperCase()}${r.slice(1)}`, f = (n, ...d) => {
+          a.includes("prevent") && n.preventDefault?.(), a.includes("stop") && n.stopPropagation?.();
           try {
-            typeof e == "function" ? e(r, ...d) : console.warn(`Invalid event handler type: ${typeof e}`);
+            if (typeof e == "function")
+              return e(n, ...d);
+            console.warn(`Invalid event handler type: ${typeof e}`);
           } catch (h) {
-            console.error(`Event handler execution error (${n}):`, h);
+            console.error(`Event handler execution error (${r}):`, h);
           }
         };
         o[p] = f;

package/dist/esm/hooks/json.js

@@ -1,4 +1,4 @@
-import { computed as w, isRef as S, defineComponent as M, markRaw as A, h as b, unref as T } from "vue";
+import { computed as P, isRef as S, defineComponent as M, markRaw as A, h as b, unref as T } from "vue";
 import { useJsonSchemaStore as N } from "../stores/jsonSchema.js";
 import { useConfig as U } from "./config.js";
 import { defaultAdaptors as D } from "./json/index.js";
@@ -24,30 +24,40 @@ function K(n, u) {
 function Q(n) {
   const u = U(), s = N(), c = [...D, ...u.jsonSchema?.adaptors || [], ...n?.adaptors || []];
   n?.components && B(n.components, s);
-  const m = w(() => S(n?.data) ? n?.data.value : n?.data);
+  const m = P(() => S(n?.data) ? n?.data.value : n?.data);
   function _() {
     return (S(n?.context) ? n?.context.value : n?.context) || {};
   }
   function O(e) {
-    const o = {};
-    return Object.entries(e).forEach(([t, a]) => {
+    const r = {};
+    return Object.entries(e).forEach(([t, o]) => {
       if (t === "_context") return;
       const h = t === "modelValue" || t.startsWith("modelValue") || t !== "value" && (t.includes("model") || t.includes("Model"));
-      o[t] = h && S(a) ? T(a) : a;
-    }), o;
+      r[t] = h && S(o) ? T(o) : o;
+    }), r;
   }
-  function j(e, o, t) {
-    return typeof e == "string" ? e : typeof e == "function" ? j(e(o), o, t) : Array.isArray(e) ? e.flatMap((a) => j(a, o, t)).filter(Boolean) : e?.tag ? p(e, !0, t) : e;
+  function j(e, r, t) {
+    if (typeof e == "string") return e;
+    if (typeof e == "function") return j(e(r), r, t);
+    if (Array.isArray(e)) return e.flatMap((o) => j(o, r, t)).filter(Boolean);
+    if (e?.tag) {
+      const o = {
+        ...t,
+        ...r
+      };
+      return p(e, !0, o);
+    }
+    return e;
   }
-  function R(e, o, t) {
+  function R(e, r, t) {
     if (e)
-      return typeof e == "string" ? e : Array.isArray(e) ? e.flatMap((a) => typeof a == "string" ? a : p(a, o, t)).filter(Boolean) : p(e, o, t);
+      return typeof e == "string" ? e : Array.isArray(e) ? e.flatMap((o) => typeof o == "string" ? o : p(o, r, t)).filter(Boolean) : p(e, r, t);
   }
-  function p(e, o = !1, t = {}) {
+  function p(e, r = !1, t = {}) {
     const {
-      tag: a,
+      tag: o,
       attrs: h = {},
-      children: V,
+      children: $,
       slots: v
     } = e, l = {
       ..._(),
@@ -61,38 +71,38 @@ function Q(n) {
       ...F({}, l)
     });
     for (const i of c) {
-      const r = i.process(e, y);
-      if (r) {
-        if (y = r.props, r.skip) return null;
-        if (r.nodes)
-          return r.nodes.map((d) => {
+      const a = i.process(e, y);
+      if (a) {
+        if (y = a.props, a.skip) return null;
+        if (a.nodes)
+          return a.nodes.map((d) => {
             const g = d.attrs?._context || {};
-            return p(d, o, {
+            return p(d, r, {
               ...l,
               ...g
             });
           }).filter(Boolean);
       }
     }
-    let f = typeof a == "string" && ((i) => {
-      let r = s.getComponentByName(i);
-      if (r)
-        return r;
+    let f = typeof o == "string" && ((i) => {
+      let a = s.getComponentByName(i);
+      if (a)
+        return a;
       const d = G(i);
-      if (r = s.getComponentByName(d), r)
-        return r;
-      const g = i.replace(/-([a-z])/g, (J, $) => $.toUpperCase()).replace(/^[a-z]/, (J) => J.toUpperCase());
-      return r = s.getComponentByName(g), r || null;
-    })(a) || a;
+      if (a = s.getComponentByName(d), a)
+        return a;
+      const g = i.replace(/-([a-z])/g, (J, w) => w.toUpperCase()).replace(/^[a-z]/, (J) => J.toUpperCase());
+      return a = s.getComponentByName(g), a || null;
+    })(o) || o;
     typeof f != "string" && typeof f == "object" && (f = A(f));
     const E = typeof f != "string", x = O(y);
-    if (v && E && !o) {
+    if (v && E && !r) {
       const i = {};
-      return Object.entries(v).forEach(([r, d]) => {
-        i[r] = (g = {}) => j(d, g, l);
+      return Object.entries(v).forEach(([a, d]) => {
+        i[a] = (g = {}) => j(d, g, l);
       }), b(f, x, i);
     }
-    const C = R(V, o, l);
+    const C = R($, r, l);
     return E && C !== void 0 ? b(f, x, {
       default: () => C
     }) : b(f, x, C);
@@ -103,21 +113,21 @@ function Q(n) {
       return m.value?.map((e) => p(e)).filter(Boolean) || [];
     }
   });
-  function P(e) {
+  function V(e) {
     return /* @__PURE__ */ M({
       name: "DynamicJsonSchemaRenderer",
       render() {
-        const o = {
+        const r = {
           ..._(),
           ...e.context
         };
-        return e.data?.map((t) => p(t, !1, o)).filter(Boolean);
+        return e.data?.map((t) => p(t, !1, r)).filter(Boolean);
       }
     });
   }
   return {
     render: z,
-    renderAsync: P
+    renderAsync: V
   };
 }
 export {

package/dist/types/types/data.d.ts

@@ -48,7 +48,7 @@ export interface IDataProviderListOptions {
 }
 export interface IDataProviderCreateOptions {
     path?: string;
-    data: any;
+    data?: any;
     meta?: Record<string, any>;
 }
 export interface IDataProviderUpdateOptions extends IDataProviderCreateOptions {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@duxweb/dvha-core",
   "type": "module",
-  "version": "1.0.25",
+  "version": "1.0.27",
   "author": "DuxWeb",
   "license": "MIT",
   "repository": {