@fangzhongya/vue-archive 0.0.76 → 0.0.78

package/dist/packages/components/use/set-props.d.ts

@@ -40,5 +40,5 @@ declare const _default: DefineComponent<ExtractPropTypes<{
     };
 }>> & Readonly<{
     onChange?: ((...args: any[]) => any) | undefined;
-}>, {}, {}, {}, {}, string, ComponentProvideOptions, true, {}, any>;
+}>, {}, {}, {}, {}, string, ComponentProvideOptions, true, {}, HTMLDivElement>;
 export default _default;

package/dist/packages/components/use/set-props.vue.cjs

@@ -1 +1 @@
-"use strict";const s=require("vue"),T=require("./retrie/index.vue.cjs");;/* empty css                    */const o=require("./code.cjs"),k={key:0,class:"set-props"},x=s.defineComponent({__name:"set-props",props:{name:String,list:Array},emits:["change"],setup(i,{emit:p}){const l=i,f=p,a=s.ref({}),m=s.ref(0),c=s.ref({}),r=s.ref([]);function d(){c.value={};const n=[];l.list?.forEach(t=>{let e=t.name;if(!e.includes(".")&&(e=(e.split("/")[0]||"").trim(),e)){const y=o.getDefaultValue(t,!1);c.value[e]=y;const{arr:g,type:b,dataType:V}=o.getSpecType(t);a.value[e]=g;let q={label:_(e,t),prop:e,type:b,dataType:V,select:e};n.push(q)}}),r.value=n}function _(n,t){let e=n+": { "+(t.type||"any")+" } "+t.description;return t.default&&(e+=" 默认值="+t.default),t.selectable&&(e+=" 可选值="+t.selectable),e}function h(n,t){let e=Object.assign({},n);f("change",e,t)}let u;function v(){clearTimeout(u),u=setTimeout(()=>{d()},400)}return s.watch(()=>l.name,()=>{r.value=[],v()},{immediate:!0}),(n,t)=>r.value&&r.value.length>0?(s.openBlock(),s.createElementBlock("div",k,[s.createVNode(T,{refresh:m.value,modelValue:c.value,selects:a.value,list:r.value,name:l.name,onQuery:h},null,8,["refresh","modelValue","selects","list","name"])])):s.createCommentVNode("",!0)}});module.exports=x;
+"use strict";const s=require("vue"),T=require("./retrie/index.vue.cjs");;/* empty css                    */const o=require("./code.cjs"),x={class:"set-props"},j=s.defineComponent({__name:"set-props",props:{name:String,list:Array},emits:["change"],setup(i,{emit:p}){const r=i,f=p,a=s.ref({}),m=s.ref(0),l=s.ref({}),c=s.ref([]);function _(){l.value={};const n=[];r.list?.forEach(t=>{let e=t.name;if(!e.includes(".")&&(e=(e.split("/")[0]||"").trim(),e)){const b=o.getDefaultValue(t,!1);l.value[e]=b;const{arr:g,type:v,dataType:V}=o.getSpecType(t);a.value[e]=g;let q={label:d(e,t),prop:e,type:v,dataType:V,select:e};n.push(q)}}),c.value=n}function d(n,t){let e=n+": { "+(t.type||"any")+" } "+t.description;return t.default&&(e+=" 默认值="+t.default),t.selectable&&(e+=" 可选值="+t.selectable),e}function h(n,t){let e=Object.assign({},n);f("change",e,t)}let u;function y(){clearTimeout(u),u=setTimeout(()=>{_()},400)}return s.watch(()=>r.name,()=>{c.value=[],y()},{immediate:!0}),(n,t)=>(s.openBlock(),s.createElementBlock("div",x,[s.createVNode(T,{refresh:m.value,modelValue:l.value,selects:a.value,list:c.value,name:r.name,onQuery:h},null,8,["refresh","modelValue","selects","list","name"])]))}});module.exports=j;

package/dist/packages/components/use/set-props.vue.js

@@ -1,11 +1,8 @@
-import { defineComponent as T, ref as n, watch as k, createElementBlock as j, createCommentVNode as x, openBlock as B, createVNode as C } from "vue";
+import { defineComponent as T, ref as l, watch as j, createElementBlock as k, openBlock as x, createVNode as B } from "vue";
 import E from "./retrie/index.vue.js";
 /* empty css                  */
-import { getDefaultValue as N, getSpecType as S } from "./code.js";
-const w = {
-  key: 0,
-  class: "set-props"
-}, R = /* @__PURE__ */ T({
+import { getDefaultValue as S, getSpecType as w } from "./code.js";
+const A = { class: "set-props" }, Q = /* @__PURE__ */ T({
   __name: "set-props",
   props: {
     name: String,
@@ -13,17 +10,17 @@ const w = {
   },
   emits: ["change"],
   setup(i, { emit: u }) {
-    const a = i, m = u, r = n({}), p = n(0), o = n({}), l = n([]);
+    const n = i, m = u, r = l({}), p = l(0), a = l({}), o = l([]);
     function f() {
-      o.value = {};
+      a.value = {};
       const s = [];
-      a.list?.forEach((t) => {
+      n.list?.forEach((t) => {
         let e = t.name;
         if (!e.includes(".") && (e = (e.split("/")[0] || "").trim(), e)) {
-          const y = N(t, !1);
-          o.value[e] = y;
-          const { arr: b, type: g, dataType: V } = S(t);
-          r.value[e] = b;
+          const b = S(t, !1);
+          a.value[e] = b;
+          const { arr: y, type: g, dataType: V } = w(t);
+          r.value[e] = y;
           let v = {
             label: d(e, t),
             prop: e,
@@ -33,7 +30,7 @@ const w = {
           };
           s.push(v);
         }
-      }), l.value = s;
+      }), o.value = s;
     }
     function d(s, t) {
       let e = s + ": { " + (t.type || "any") + " } " + t.description;
@@ -49,26 +46,26 @@ const w = {
         f();
       }, 400);
     }
-    return k(
-      () => a.name,
+    return j(
+      () => n.name,
       () => {
-        l.value = [], _();
+        o.value = [], _();
       },
       {
         immediate: !0
       }
-    ), (s, t) => l.value && l.value.length > 0 ? (B(), j("div", w, [
-      C(E, {
+    ), (s, t) => (x(), k("div", A, [
+      B(E, {
         refresh: p.value,
-        modelValue: o.value,
+        modelValue: a.value,
         selects: r.value,
-        list: l.value,
-        name: a.name,
+        list: o.value,
+        name: n.name,
         onQuery: h
       }, null, 8, ["refresh", "modelValue", "selects", "list", "name"])
-    ])) : x("", !0);
+    ]));
   }
 });
 export {
-  R as default
+  Q as default
 };

package/dist/packages/components/use/util.cjs

@@ -1,3 +1,3 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const O=require("../../config.cjs"),A=require("@fangzhongya/utils/basic/string/toFunction"),x=require("@fangzhongya/utils/basic/string/firstLower");let c=e=>e;const f=O.getConfig("prettier");f&&Promise.resolve().then(()=>require("./prettier.cjs")).then(e=>{c=e.getFormat});function g(e){return f?c(e,"js"):e.replace(/\;(\s|\n\r)*$/,"")}async function q(e){return e="let a = "+e,(await g(e)).replace(/^let a = /,"")}function W(e){return g(e)}async function k(e){return!/^\s*function/.test(e)&&!/^\s*\([^\)]*\)\s*\=\>/.test(e)?(e="function a"+e,(await g(e)).replace(/^function a/,"")):await g(e)}function C(e){return f?c(e,"html"):e}function E(e){return f?c(e,"ts"):e}function B(e){return f?c(e,"js"):e}function L(e){return f?c(e,"css"):e}function P(e,r=""){let t=(e+"").trim().split(/\n/);return t=t.map(n=>r+n),t.join(`
-`)}function F(e=""){e=e.trim();let r=`[\\s|\\n|\\r]*\\{((.|
-|\r)+?)\\}[\\s|\\n|\\r]*`,n=new RegExp("^"+r+"$").exec(e);return n&&n.length>0?F(n[1]):e}const H=["Boolean","Any","String","Number","Array","Object","Function"];function J(e){return H.includes(e)?x.firstLower(e):e}function M(e){let t=new RegExp("^([a-z|A-Z]+)\\<(.+)\\>$").exec(e);if(t&&t.length>0)return{own:J(t[1]),son:t[2]}}function j(e,r){let t=M(e);t?(r.push(t.own),t.son&&j(t.son,r)):r.push(e)}function b(e){e instanceof Array&&(e=e[0]);const r=[];return e&&j(e,r),r}function v(e){const r=Object.prototype.toString.call(e);let n=/^\[[O|o]bject (.*)\]$/.exec(r),i=typeof e;return n&&n.length>0&&(i=n[1].toLowerCase()),i}function N(e,r){const t=v(e),n=b(r)[0];return n&&n!="any"?t==n:!0}function R(e){if(typeof e=="string"){let r=!1;return(/^\'(.|\n|\r)*\'$/.test(e)||/^\"(.|\n|\r)*\"$/.test(e)||/^\`(.|\n|\r)*\`$/.test(e))&&(r=!0),r&&(e=e.substring(1,e.length-1)),e+""}else return typeof e=="object"&&e?e.toString():typeof e>"u"||typeof e=="object"&&!e?"":e+""}function V(e){const r=typeof e;if(r=="string"){e=(e+"").replace(/^(\s|\n|r)*/,"").replace(/(\s|\n|r)*$/,"");let t="";return/^\'(.|\n|\r)*\'$/.test(e)||/^\"(.|\n|\r)*\"$/.test(e)||/^\`(.|\n|\r)*\`$/.test(e)?t="string":/^\[(.|\n|\r)*\]$/.test(e)?t="array":/^\{(.|\n|\r)*\}$/.test(e)?t="object":/^[0-9]*$/.test(e)?t="number":e==="true"||e==="false"?t="boolean":e=="undefined"?t="undefined":e=="null"?t="null":e&&(t="string"),t}else return r==="object"?e instanceof Array?"array":r===null?"null":r:r}function $(e){const r=e[0]||"any";let t=r.split("<")[0];switch(t=t.trim().toLowerCase(),t){case"string":return'""';case"boolean":return"false";case"number":return"0";case"array":let n=r.indexOf("<"),i=r.substring(r.indexOf("<")+1,r.length-1)||"";n==-1&&(i="any");let o=$(d(i).dataType);return o=o=="undefined"?"":o,`[${o}]`;case"object":return"{}";case"function":return"()=>{}";case"any":return'""';default:return"undefined"}}function z(e){let r="";return e.forEach((t,n)=>{t=t.trim(),t&&(r&&(r+=" | "),t==="Array"?r+="Array<any>":r+=t)}),r||"any"}const y=(e,r)=>{let t=[],n=[],i="";for(let o=0;o<e.length;o++){const s=e[o];s==="["||s==="<"||s==="("?(t.push(s),i+=s):s==="]"&&t.length>0&&t[t.length-1]==="["||s===">"&&t.length>0&&t[t.length-1]==="<"||s===")"&&t.length>0&&t[t.length-1]==="("?(t.pop(),i+=s):s===r&&t.length===0?(n.push(i.trim()),i=""):i+=s}return i.trim()!==""&&n.push(i.trim()),n},d=e=>{if(e)if(e.startsWith("[")&&e.endsWith("]")||e.startsWith("(")&&e.endsWith(")")){const r=e.slice(1,-1).trim();if(!r)return{type:"any",dataType:["any"]};const t=y(r,",");return{type:t[0]||"any",dataType:t}}else if(e.startsWith("<")&&e.endsWith(">")){const r=e.slice(1,-1).trim();if(!r)return{type:"any",dataType:["any"]};const t=y(r,"|");return{type:t[0]||"any",dataType:t}}else{const r=y(e,",");return{type:r[0]||"any",dataType:r}}else return{type:"any",dataType:["any"]}};function I(e){return y(e,",").map(t=>{const n=t.trim(),i=t.match(/^([^:?]+)(\??):/);if(!i)return null;const o=i[1].trim(),s=!i[2],S=i[0].length,p=t.substring(S).trim();let a=[],h="",m="";for(let l=0;l<p.length;l++){const u=p[l];if(u==="["||u==="<"||u==="("?a.push(u):(u==="]"&&a[a.length-1]==="["||u===">"&&a[a.length-1]==="<"||u===")"&&a[a.length-1]==="(")&&a.pop(),a.length===0&&l>0){l==1&&u!=="]"&&u!==">"&&u!==")"?(h="",m=p.substring(0)):(h=p.substring(0,l+1).trim(),m=p.substring(l+1));break}}const{type:Z,dataType:T}=d(h),w=b(T);return{name:o,prop:o,type:w[0],dataType:T,must:s,label:n,description:m}}).filter(Boolean)}Object.defineProperty(exports,"getFunctionFormat",{enumerable:!0,get:()=>A.getFunctionFormat});exports.getFunBody=F;exports.getObjType=v;exports.getSonType=b;exports.getString=R;exports.getTypeValue=$;exports.isDefaultType=V;exports.isTypeEqual=N;exports.parseParamString=I;exports.parseTypeDefinition=d;exports.prettierArrFormat=W;exports.prettierCss=L;exports.prettierFormat=g;exports.prettierFunFormat=k;exports.prettierHtml=C;exports.prettierJs=B;exports.prettierObjFormat=q;exports.prettierTs=E;exports.setDataType=z;exports.vueFormat=P;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const A=require("../../config.cjs"),W=require("@fangzhongya/utils/basic/string/toFunction"),k=require("@fangzhongya/utils/basic/string/firstLower");let c=e=>e;const f=A.getConfig("prettier");f&&Promise.resolve().then(()=>require("./prettier.cjs")).then(e=>{c=e.getFormat});function g(e){return f?c(e,"js"):e.replace(/\;(\s|\n\r)*$/,"")}async function q(e){return e="let a = "+e,(await g(e)).replace(/^let a = /,"")}function C(e){return g(e)}async function L(e){return!/^\s*function/.test(e)&&!/^\s*\([^\)]*\)\s*\=\>/.test(e)?(e="function a"+e,(await g(e)).replace(/^function a/,"")):await g(e)}function B(e){return f?c(e,"html"):e}function E(e){return f?c(e,"ts"):e}function x(e){return f?c(e,"js"):e}function N(e){return f?c(e,"css"):e}function P(e,t=""){let r=(e+"").trim().split(/\n/);return r=r.map(n=>t+n),r.join(`
+`)}function v(e=""){e=e.trim();let t=`[\\s|\\n|\\r]*\\{((.|
+|\r)+?)\\}[\\s|\\n|\\r]*`,n=new RegExp("^"+t+"$").exec(e);return n&&n.length>0?v(n[1]):e}const z=["Boolean","Any","String","Number","Array","Object","Function"];function H(e){return z.includes(e)?k.firstLower(e):e}function I(e){if(typeof e=="string"){let t=!1;return(/^\'(.|\n|\r)*\'$/.test(e)||/^\"(.|\n|\r)*\"$/.test(e)||/^\`(.|\n|\r)*\`$/.test(e))&&(t=!0),t&&(e=e.substring(1,e.length-1)),e+""}else return typeof e=="object"&&e?e.toString():typeof e>"u"||typeof e=="object"&&!e?"":e+""}function J(e){const t=typeof e;if(t=="string"){e=(e+"").replace(/^(\s|\n|r)*/,"").replace(/(\s|\n|r)*$/,"");let r="";return/^\'(.|\n|\r)*\'$/.test(e)||/^\"(.|\n|\r)*\"$/.test(e)||/^\`(.|\n|\r)*\`$/.test(e)?r="string":/^\[(.|\n|\r)*\]$/.test(e)?r="array":/^\{(.|\n|\r)*\}$/.test(e)?r="object":/^[0-9]*$/.test(e)?r="number":e==="true"||e==="false"?r="boolean":e=="undefined"?r="undefined":e=="null"?r="null":e&&(r="string"),r}else return t==="object"?e instanceof Array?"array":t===null?"null":t:t}const y=(e,t)=>{let r=[],n=[],i="";for(let u=0;u<e.length;u++){const s=e[u];s==="["||s==="<"||s==="("?(r.push(s),i+=s):s==="]"&&r.length>0&&r[r.length-1]==="["||s===">"&&r.length>0&&r[r.length-1]==="<"||s===")"&&r.length>0&&r[r.length-1]==="("?(r.pop(),i+=s):s===t&&r.length===0?(n.push(i.trim()),i=""):i+=s}return i.trim()!==""&&n.push(i.trim()),n},M=e=>{let t=[],r=!1,n=!1,i=0;for(let u=0;u<e.length;u++){const s=e[u];if(s==="["||s==="<"||s==="("?(n=!0,t.push(s),s=="["&&(r=!0),i==0&&(i=u)):(s==="]"&&t[t.length-1]==="["||s===">"&&t[t.length-1]==="<"||s===")"&&t[t.length-1]==="(")&&t.pop(),n&&t.length===0)return r&&i+1==u?{top:"Array",type:e.substring(0,i)}:{top:e.substring(0,i),type:e.substring(i+1,u)}}return{top:e,type:""}},d=e=>{if(e)if(e.startsWith("[")&&e.endsWith("]")||e.startsWith("(")&&e.endsWith(")")){const t=e.slice(1,-1).trim();return t?y(t,","):["any"]}else{if(e.startsWith("{")&&e.endsWith("}"))return["Object"];if(e.startsWith("<")&&e.endsWith(">")){const t=e.slice(1,-1).trim();return t?y(t,"|"):["any"]}else return y(e,",")}else return["any"]};function V(e){return y(e,",").map(r=>{const n=r.trim(),i=r.match(/^([^:?]+)(\??):/);if(!i)return null;const u=i[1].trim(),s=!i[2],w=i[0].length,p=r.substring(w).trim();let l=[],m="",b="";for(let a=0;a<p.length;a++){const o=p[a];if(o==="["||o==="<"||o==="("||o==="{"?l.push(o):(o==="]"&&l[l.length-1]==="["||o===">"&&l[l.length-1]==="<"||o==="}"&&l[l.length-1]==="{"||o===")"&&l[l.length-1]==="(")&&l.pop(),l.length===0&&a>0){a==1&&o!=="]"&&o!==">"&&o!=="}"&&o!==")"?(m="",b=p.substring(0)):(m=p.substring(0,a+1).trim(),b=p.substring(a+1));break}}const O=d(m),F=T(O);return{name:u,prop:u,type:h(F),dataType:F,must:s,label:n,description:b}}).filter(Boolean)}function j(e){return e.map(r=>{if(typeof r=="string")return r.toLowerCase()==="array"?"Array<any>":r;if(r.children&&r.children.length>0){const n=j(r.children);return r.value+"<"+n+">"}else{const n=r.value;return n.toLowerCase()==="array"?"Array<any>":n}}).join(" | ")||"any"}function T(e){const t=[];return e.forEach(r=>{const n=M(r);if(n.type){const i=d(n.type),u=T(i);t.push({label:r,value:n.top,children:u})}else t.push(n.top)}),t}function D(e){let t="";return typeof e=="string"?t=e:t=e.value,H(t||"any")}function h(e){const t=e[0]||"any";return D(t)}function $(e){const t=e[0];switch(h(e)){case"string":return'""';case"boolean":return"false";case"number":return"0";case"array":if(typeof t=="string")return"[]";{let n=t.children;if(n&&n.length>0){let i=$([n[0]]);return i=i=="undefined"?"":i,`[${i}]`}else return"[]"}case"object":return"{}";case"function":return"()=>{}";case"any":return'""';default:return"undefined"}}function S(e){const t=Object.prototype.toString.call(e);let n=/^\[[O|o]bject (.*)\]$/.exec(t),i=typeof e;return n&&n.length>0&&(i=n[1].toLowerCase()),i}function R(e,t){const r=S(e),n=h(t);return n&&n!="any"?r==n:!0}Object.defineProperty(exports,"getFunctionFormat",{enumerable:!0,get:()=>W.getFunctionFormat});exports.getDataType=T;exports.getDataTypeType=h;exports.getFunBody=v;exports.getObjType=S;exports.getString=I;exports.getTypeValue=$;exports.isDefaultType=J;exports.isTypeEqual=R;exports.parseParamString=V;exports.parseTypeDefinition=d;exports.prettierArrFormat=C;exports.prettierCss=N;exports.prettierFormat=g;exports.prettierFunFormat=L;exports.prettierHtml=B;exports.prettierJs=x;exports.prettierObjFormat=q;exports.prettierTs=E;exports.setDataType=j;exports.vueFormat=P;

package/dist/packages/components/use/util.d.ts

@@ -11,25 +11,6 @@ export declare function prettierVue(st: string): any;
 export declare function vueFormat(st: string, kg?: string): string;
 export declare function getFunBody(sr?: string): string;
 export { getFunctionFormat } from '@fangzhongya/utils/basic/string/toFunction';
-/**
- * 解析array<string> 类型数组
- * @param {*} type
- * @returns
- */
-export declare function getSonType(type: Array<string> | string): string[];
-/**
- * 获取当前对象的类型
- * @param {*} obj
- * @returns
- */
-export declare function getObjType(obj: unknown): string;
-/**
- * 配置类型是否匹配
- * @param {*} obj
- * @param {*} type
- * @returns
- */
-export declare function isTypeEqual(obj: unknown, type: string[] | string): boolean;
 /**
  * 获取字符串, 去掉头尾''标识
  * @param {*} st
@@ -40,18 +21,35 @@ export declare function getString(st: unknown): string;
  * 配置字符串的类型
  */
 export declare function isDefaultType(st: any): string;
-export declare function getTypeValue(arr: string[]): string;
-export declare function setDataType(arr: string[]): string;
-export declare const parseTypeDefinition: (typeDef: string) => {
-    type: string;
-    dataType: string[];
+export declare const parseTypeDefinition: (typeDef: string) => string[];
+export type DataType = string | {
+    label: string;
+    value: string;
+    children?: DataType[];
 };
 export declare function parseParamString(input: string): Array<{
     name: string;
     prop: string;
     type: string;
-    dataType: string[];
+    dataType: DataType[];
     must: boolean;
     label: string;
     description: string;
 }>;
+export declare function setDataType(arr: DataType[]): string;
+export declare function getDataType(arr: string[]): DataType[];
+export declare function getDataTypeType(dataType: DataType[]): string;
+export declare function getTypeValue(arr: DataType[]): string;
+/**
+ * 获取当前对象的类型
+ * @param {*} obj
+ * @returns
+ */
+export declare function getObjType(obj: unknown): string;
+/**
+ * 配置类型是否匹配
+ * @param {*} obj
+ * @param {*} type
+ * @returns
+ */
+export declare function isTypeEqual(obj: unknown, dataType: DataType[]): boolean;

package/dist/packages/components/use/util.js

@@ -1,5 +1,5 @@
 import { getConfig as F } from "../../config.js";
-import { getFunctionFormat as X } from "@fangzhongya/utils/basic/string/toFunction";
+import { getFunctionFormat as Y } from "@fangzhongya/utils/basic/string/toFunction";
 import { firstLower as w } from "@fangzhongya/utils/basic/string/firstLower";
 let c = (e) => e;
 const f = F("prettier");
@@ -9,39 +9,39 @@ f && import("./prettier.js").then((e) => {
 function y(e) {
   return f ? c(e, "js") : e.replace(/\;(\s|\n\r)*$/, "");
 }
-async function L(e) {
+async function N(e) {
   return e = "let a = " + e, (await y(e)).replace(/^let a = /, "");
 }
-function N(e) {
+function z(e) {
   return y(e);
 }
-async function R(e) {
+async function I(e) {
   return !/^\s*function/.test(e) && !/^\s*\([^\)]*\)\s*\=\>/.test(e) ? (e = "function a" + e, (await y(e)).replace(/^function a/, "")) : await y(e);
 }
 function q(e) {
   return f ? c(e, "html") : e;
 }
-function z(e) {
+function H(e) {
   return f ? c(e, "ts") : e;
 }
-function H(e) {
+function J(e) {
   return f ? c(e, "js") : e;
 }
-function I(e) {
+function M(e) {
   return f ? c(e, "css") : e;
 }
-function J(e, n = "") {
-  let t = (e + "").trim().split(/\n/);
-  return t = t.map((r) => n + r), t.join(`
+function R(e, t = "") {
+  let r = (e + "").trim().split(/\n/);
+  return r = r.map((n) => t + n), r.join(`
 `);
 }
-function x(e = "") {
+function S(e = "") {
   e = e.trim();
-  let n = `[\\s|\\n|\\r]*\\{((.|
-|\r)+?)\\}[\\s|\\n|\\r]*`, r = new RegExp("^" + n + "$").exec(e);
-  return r && r.length > 0 ? x(r[1]) : e;
+  let t = `[\\s|\\n|\\r]*\\{((.|
+|\r)+?)\\}[\\s|\\n|\\r]*`, n = new RegExp("^" + t + "$").exec(e);
+  return n && n.length > 0 ? S(n[1]) : e;
 }
-const S = [
+const A = [
   "Boolean",
   "Any",
   "String",
@@ -50,159 +50,184 @@ const S = [
   "Object",
   "Function"
 ];
-function A(e) {
-  return S.includes(e) ? w(e) : e;
-}
-function O(e) {
-  let t = new RegExp("^([a-z|A-Z]+)\\<(.+)\\>$").exec(e);
-  if (t && t.length > 0)
-    return {
-      own: A(t[1]),
-      son: t[2]
-    };
-}
-function b(e, n) {
-  let t = O(e);
-  t ? (n.push(t.own), t.son && b(t.son, n)) : n.push(e);
-}
-function T(e) {
-  e instanceof Array && (e = e[0]);
-  const n = [];
-  return e && b(e, n), n;
-}
 function W(e) {
-  const n = Object.prototype.toString.call(e);
-  let r = /^\[[O|o]bject (.*)\]$/.exec(n), i = typeof e;
-  return r && r.length > 0 && (i = r[1].toLowerCase()), i;
-}
-function M(e, n) {
-  const t = W(e), r = T(n)[0];
-  return r && r != "any" ? t == r : !0;
+  return A.includes(e) ? w(e) : e;
 }
 function V(e) {
   if (typeof e == "string") {
-    let n = !1;
-    return (/^\'(.|\n|\r)*\'$/.test(e) || /^\"(.|\n|\r)*\"$/.test(e) || /^\`(.|\n|\r)*\`$/.test(e)) && (n = !0), n && (e = e.substring(1, e.length - 1)), e + "";
+    let t = !1;
+    return (/^\'(.|\n|\r)*\'$/.test(e) || /^\"(.|\n|\r)*\"$/.test(e) || /^\`(.|\n|\r)*\`$/.test(e)) && (t = !0), t && (e = e.substring(1, e.length - 1)), e + "";
   } else return typeof e == "object" && e ? e.toString() : typeof e > "u" || typeof e == "object" && !e ? "" : e + "";
 }
-function Z(e) {
-  const n = typeof e;
-  if (n == "string") {
+function G(e) {
+  const t = typeof e;
+  if (t == "string") {
     e = (e + "").replace(/^(\s|\n|r)*/, "").replace(/(\s|\n|r)*$/, "");
-    let t = "";
-    return /^\'(.|\n|\r)*\'$/.test(e) || /^\"(.|\n|\r)*\"$/.test(e) || /^\`(.|\n|\r)*\`$/.test(e) ? t = "string" : /^\[(.|\n|\r)*\]$/.test(e) ? t = "array" : /^\{(.|\n|\r)*\}$/.test(e) ? t = "object" : /^[0-9]*$/.test(e) ? t = "number" : e === "true" || e === "false" ? t = "boolean" : e == "undefined" ? t = "undefined" : e == "null" ? t = "null" : e && (t = "string"), t;
+    let r = "";
+    return /^\'(.|\n|\r)*\'$/.test(e) || /^\"(.|\n|\r)*\"$/.test(e) || /^\`(.|\n|\r)*\`$/.test(e) ? r = "string" : /^\[(.|\n|\r)*\]$/.test(e) ? r = "array" : /^\{(.|\n|\r)*\}$/.test(e) ? r = "object" : /^[0-9]*$/.test(e) ? r = "number" : e === "true" || e === "false" ? r = "boolean" : e == "undefined" ? r = "undefined" : e == "null" ? r = "null" : e && (r = "string"), r;
   } else
-    return n === "object" ? e instanceof Array ? "array" : n === null ? "null" : n : n;
+    return t === "object" ? e instanceof Array ? "array" : t === null ? "null" : t : t;
 }
-function k(e) {
-  const n = e[0] || "any";
-  let t = n.split("<")[0];
-  switch (t = t.trim().toLowerCase(), t) {
-    case "string":
-      return '""';
-    case "boolean":
-      return "false";
-    case "number":
-      return "0";
-    case "array":
-      let r = n.indexOf("<"), i = n.substring(n.indexOf("<") + 1, n.length - 1) || "";
-      r == -1 && (i = "any");
-      let o = k($(i).dataType);
-      return o = o == "undefined" ? "" : o, `[${o}]`;
-    case "object":
-      return "{}";
-    case "function":
-      return "()=>{}";
-    case "any":
-      return '""';
-    default:
-      return "undefined";
+const g = (e, t) => {
+  let r = [], n = [], i = "";
+  for (let l = 0; l < e.length; l++) {
+    const s = e[l];
+    s === "[" || s === "<" || s === "(" ? (r.push(s), i += s) : s === "]" && r.length > 0 && r[r.length - 1] === "[" || s === ">" && r.length > 0 && r[r.length - 1] === "<" || s === ")" && r.length > 0 && r[r.length - 1] === "(" ? (r.pop(), i += s) : s === t && r.length === 0 ? (n.push(i.trim()), i = "") : i += s;
   }
-}
-function G(e) {
-  let n = "";
-  return e.forEach((t, r) => {
-    t = t.trim(), t && (n && (n += " | "), t === "Array" ? n += "Array<any>" : n += t);
-  }), n || "any";
-}
-const g = (e, n) => {
-  let t = [], r = [], i = "";
-  for (let o = 0; o < e.length; o++) {
-    const s = e[o];
-    s === "[" || s === "<" || s === "(" ? (t.push(s), i += s) : s === "]" && t.length > 0 && t[t.length - 1] === "[" || s === ">" && t.length > 0 && t[t.length - 1] === "<" || s === ")" && t.length > 0 && t[t.length - 1] === "(" ? (t.pop(), i += s) : s === n && t.length === 0 ? (r.push(i.trim()), i = "") : i += s;
+  return i.trim() !== "" && n.push(i.trim()), n;
+}, k = (e) => {
+  let t = [], r = !1, n = !1, i = 0;
+  for (let l = 0; l < e.length; l++) {
+    const s = e[l];
+    if (s === "[" || s === "<" || s === "(" ? (n = !0, t.push(s), s == "[" && (r = !0), i == 0 && (i = l)) : (s === "]" && t[t.length - 1] === "[" || s === ">" && t[t.length - 1] === "<" || s === ")" && t[t.length - 1] === "(") && t.pop(), n && t.length === 0)
+      return r && i + 1 == l ? {
+        top: "Array",
+        type: e.substring(0, i)
+      } : {
+        top: e.substring(0, i),
+        type: e.substring(i + 1, l)
+      };
   }
-  return i.trim() !== "" && r.push(i.trim()), r;
-}, $ = (e) => {
+  return {
+    top: e,
+    type: ""
+  };
+}, v = (e) => {
   if (e)
     if (e.startsWith("[") && e.endsWith("]") || e.startsWith("(") && e.endsWith(")")) {
-      const n = e.slice(1, -1).trim();
-      if (!n) return { type: "any", dataType: ["any"] };
-      const t = g(n, ",");
-      return {
-        type: t[0] || "any",
-        dataType: t
-      };
-    } else if (e.startsWith("<") && e.endsWith(">")) {
-      const n = e.slice(1, -1).trim();
-      if (!n) return { type: "any", dataType: ["any"] };
-      const t = g(n, "|");
-      return {
-        type: t[0] || "any",
-        dataType: t
-      };
+      const t = e.slice(1, -1).trim();
+      return t ? g(t, ",") : ["any"];
     } else {
-      const n = g(e, ",");
-      return {
-        type: n[0] || "any",
-        dataType: n
-      };
+      if (e.startsWith("{") && e.endsWith("}"))
+        return ["Object"];
+      if (e.startsWith("<") && e.endsWith(">")) {
+        const t = e.slice(1, -1).trim();
+        return t ? g(t, "|") : ["any"];
+      } else
+        return g(e, ",");
     }
-  else return { type: "any", dataType: ["any"] };
+  else return ["any"];
 };
 function K(e) {
-  return g(e, ",").map((t) => {
-    const r = t.trim(), i = t.match(/^([^:?]+)(\??):/);
+  return g(e, ",").map((r) => {
+    const n = r.trim(), i = r.match(/^([^:?]+)(\??):/);
     if (!i) return null;
-    const o = i[1].trim(), s = !i[2], j = i[0].length, p = t.substring(j).trim();
-    let l = [], h = "", m = "";
+    const l = i[1].trim(), s = !i[2], j = i[0].length, p = r.substring(j).trim();
+    let u = [], h = "", m = "";
     for (let a = 0; a < p.length; a++) {
-      const u = p[a];
-      if (u === "[" || u === "<" || u === "(" ? l.push(u) : (u === "]" && l[l.length - 1] === "[" || u === ">" && l[l.length - 1] === "<" || u === ")" && l[l.length - 1] === "(") && l.pop(), l.length === 0 && a > 0) {
-        a == 1 && u !== "]" && u !== ">" && u !== ")" ? (h = "", m = p.substring(0)) : (h = p.substring(0, a + 1).trim(), m = p.substring(a + 1));
+      const o = p[a];
+      if (o === "[" || o === "<" || o === "(" || o === "{" ? u.push(o) : (o === "]" && u[u.length - 1] === "[" || o === ">" && u[u.length - 1] === "<" || o === "}" && u[u.length - 1] === "{" || o === ")" && u[u.length - 1] === "(") && u.pop(), u.length === 0 && a > 0) {
+        a == 1 && o !== "]" && o !== ">" && o !== "}" && o !== ")" ? (h = "", m = p.substring(0)) : (h = p.substring(0, a + 1).trim(), m = p.substring(a + 1));
         break;
       }
     }
-    const { type: C, dataType: d } = $(h), v = T(d);
+    const $ = v(h), d = T($);
     return {
-      name: o,
-      prop: o,
-      type: v[0],
+      name: l,
+      prop: l,
+      type: b(d),
       dataType: d,
       must: s,
-      label: r,
+      label: n,
       description: m
     };
   }).filter(Boolean);
 }
+function O(e) {
+  return e.map((r) => {
+    if (typeof r == "string")
+      return r.toLowerCase() === "array" ? "Array<any>" : r;
+    if (r.children && r.children.length > 0) {
+      const n = O(r.children);
+      return r.value + "<" + n + ">";
+    } else {
+      const n = r.value;
+      return n.toLowerCase() === "array" ? "Array<any>" : n;
+    }
+  }).join(" | ") || "any";
+}
+function T(e) {
+  const t = [];
+  return e.forEach((r) => {
+    const n = k(r);
+    if (n.type) {
+      const i = v(n.type), l = T(i);
+      t.push({
+        label: r,
+        value: n.top,
+        children: l
+      });
+    } else
+      t.push(n.top);
+  }), t;
+}
+function x(e) {
+  let t = "";
+  return typeof e == "string" ? t = e : t = e.value, W(t || "any");
+}
+function b(e) {
+  const t = e[0] || "any";
+  return x(t);
+}
+function C(e) {
+  const t = e[0];
+  switch (b(e)) {
+    case "string":
+      return '""';
+    case "boolean":
+      return "false";
+    case "number":
+      return "0";
+    case "array":
+      if (typeof t == "string")
+        return "[]";
+      {
+        let n = t.children;
+        if (n && n.length > 0) {
+          let i = C([n[0]]);
+          return i = i == "undefined" ? "" : i, `[${i}]`;
+        } else
+          return "[]";
+      }
+    case "object":
+      return "{}";
+    case "function":
+      return "()=>{}";
+    case "any":
+      return '""';
+    default:
+      return "undefined";
+  }
+}
+function L(e) {
+  const t = Object.prototype.toString.call(e);
+  let n = /^\[[O|o]bject (.*)\]$/.exec(t), i = typeof e;
+  return n && n.length > 0 && (i = n[1].toLowerCase()), i;
+}
+function Q(e, t) {
+  const r = L(e), n = b(t);
+  return n && n != "any" ? r == n : !0;
+}
 export {
-  x as getFunBody,
-  X as getFunctionFormat,
-  W as getObjType,
-  T as getSonType,
+  T as getDataType,
+  b as getDataTypeType,
+  S as getFunBody,
+  Y as getFunctionFormat,
+  L as getObjType,
   V as getString,
-  k as getTypeValue,
-  Z as isDefaultType,
-  M as isTypeEqual,
+  C as getTypeValue,
+  G as isDefaultType,
+  Q as isTypeEqual,
   K as parseParamString,
-  $ as parseTypeDefinition,
-  N as prettierArrFormat,
-  I as prettierCss,
+  v as parseTypeDefinition,
+  z as prettierArrFormat,
+  M as prettierCss,
   y as prettierFormat,
-  R as prettierFunFormat,
+  I as prettierFunFormat,
   q as prettierHtml,
-  H as prettierJs,
-  L as prettierObjFormat,
-  z as prettierTs,
-  G as setDataType,
-  J as vueFormat
+  J as prettierJs,
+  N as prettierObjFormat,
+  H as prettierTs,
+  O as setDataType,
+  R as vueFormat
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@fangzhongya/vue-archive",
   "private": false,
-  "version": "0.0.76",
+  "version": "0.0.78",
   "type": "module",
   "description ": "vue 组件注释生成文档",
   "author": "fangzhongya ",
@@ -30,7 +30,7 @@
     "tsup": "^8.5.0",
     "typescript": "^5.9.2",
     "unplugin-vue-components": "^29.0.0",
-    "vite": "^7.1.2",
+    "vite": "^7.1.3",
     "vite-plugin-dts": "4.5.4",
     "vitest": "^3.2.4",
     "vue-router": "^4.5.1",