@fangzhongya/vue-archive 0.0.31 → 0.0.33

package/dist/node/index.cjs

@@ -3138,53 +3138,99 @@ function getTypeValue(arr) {
       return "undefined";
   }
 }
-function getType(str) {
-  let arr = [];
-  if (str) {
-    str = (str + "").trim();
-    if (str.startsWith("[")) {
-      str = str.substring(1, str.lastIndexOf("]"));
-      arr = str.split(",");
+function setDataType(arr) {
+  return arr.join("|") || "any";
+}
+var splitIgnoringNesting = (str, delimiter) => {
+  let bracketStack = [];
+  let parts = [];
+  let current = "";
+  for (let i = 0; i < str.length; i++) {
+    const char = str[i];
+    if (char === "[" || char === "<" || char === "(") {
+      bracketStack.push(char);
+      current += char;
+    } else if (char === "]" && bracketStack.length > 0 && bracketStack[bracketStack.length - 1] === "[" || char === ">" && bracketStack.length > 0 && bracketStack[bracketStack.length - 1] === "<" || char === ")" && bracketStack.length > 0 && bracketStack[bracketStack.length - 1] === "(") {
+      bracketStack.pop();
+      current += char;
+    } else if (char === delimiter && bracketStack.length === 0) {
+      parts.push(current.trim());
+      current = "";
     } else {
-      const reg = /^\<([a-z|\<|\>|\|]+)\>/;
-      let rts = reg.exec(str);
-      if (rts && rts.length > 0) {
-        let ass = rts[1];
-        arr = ass.split("|");
-      } else {
-        arr = ["any"];
-      }
+      current += char;
     }
+  }
+  if (current.trim() !== "") {
+    parts.push(current.trim());
+  }
+  return parts;
+};
+var parseTypeDefinition = (typeDef) => {
+  if (!typeDef || typeDef === "[]") {
+    return { type: "any", dataType: ["any"] };
+  } else if (typeDef.startsWith("[") && typeDef.endsWith("]")) {
+    const inner = typeDef.slice(1, -1).trim();
+    if (!inner) return { type: "any", dataType: ["any"] };
+    const types = splitIgnoringNesting(inner, ",");
+    return {
+      type: types[0] || "any",
+      dataType: types
+    };
+  } else if (typeDef.startsWith("<") && typeDef.endsWith(">")) {
+    const inner = typeDef.slice(1, -1).trim();
+    if (!inner) return { type: "any", dataType: ["any"] };
+    const types = splitIgnoringNesting(inner, "|");
+    return {
+      type: types[0] || "any",
+      dataType: types
+    };
   } else {
-    arr = ["any"];
+    return {
+      type: typeDef,
+      dataType: [typeDef]
+    };
   }
-  return arr.map((o) => conversionType(o));
-}
-function setDataType(arr) {
-  return arr.join("|") || "any";
-}
-function getParametersObj(cs) {
-  let arrs = cs.split(",");
-  return arrs.map((key) => {
-    key = key.trim();
-    let must = true;
-    let vs = key.split(":");
-    let name = vs[0].trim();
-    if (name.endsWith("?")) {
-      must = false;
-      name = name.substring(0, name.length - 1);
+};
+function parseParamString(input) {
+  const parts = splitIgnoringNesting(input, ",");
+  return parts.map((trimmedPart) => {
+    const label = trimmedPart.trim();
+    const nameMatch = trimmedPart.match(/^([^:?]+)(\??):/);
+    if (!nameMatch) return null;
+    const name = nameMatch[1].trim();
+    const must = !nameMatch[2];
+    const typeDefStart = nameMatch[0].length;
+    const typeDef = trimmedPart.substring(typeDefStart).trim();
+    let bracketStack = [];
+    let endIndex = -1;
+    let t = "";
+    let description = "";
+    for (let i = 0; i < typeDef.length; i++) {
+      const char = typeDef[i];
+      if (char === "[" || char === "<" || char === "(") {
+        bracketStack.push(char);
+      } else if (char === "]" && bracketStack[bracketStack.length - 1] === "[" || char === ">" && bracketStack[bracketStack.length - 1] === "<" || char === ")" && bracketStack[bracketStack.length - 1] === "(") {
+        bracketStack.pop();
+      }
+      if (bracketStack.length === 0 && i > 0) {
+        endIndex = i == 1 ? 0 : i;
+        t = typeDef.substring(0, endIndex + 1).trim();
+        description = typeDef.substring(endIndex + 1);
+        break;
+      }
     }
-    let t = vs[1] || "";
-    let tarr = getSonType(getType(t));
+    const { type, dataType } = parseTypeDefinition(t);
+    const tarr = getSonType(dataType);
     return {
-      label: key,
+      name,
       prop: name,
-      must,
       type: tarr[0],
-      dataType: tarr,
-      description: t.substring(t.lastIndexOf("]") + 1).trim()
+      dataType,
+      must,
+      label,
+      description
     };
-  });
+  }).filter(Boolean);
 }
 
 // packages/components/use/code.ts
@@ -3233,12 +3279,13 @@ function getHmtl(propsname, param, value, slotValue, propsText, exposeText) {
       tarr.push("            @" + name + '="' + strs + '"');
       const sp = getSpecObjs(es, name) || {};
       const s = sp.selectable || "";
-      const css = getParametersObj(s);
+      const css = parseParamString(s);
+      console.log(css);
       const cs = getParameStr(css);
       sarr.push(`// ${sp.description} ${sp.name}: (${sp.selectable})`);
       sarr.push("function " + strs + "(" + cs + ") {");
       css.forEach((o) => {
-        const name2 = o.prop || "arr";
+        const name2 = o.name || "arr";
         sarr.push("   console.log('" + o.label + "', " + name2 + ")");
       });
       sarr.push("}");
@@ -3292,11 +3339,11 @@ function getHmtl(propsname, param, value, slotValue, propsText, exposeText) {
         `// ${s.description} ${s.name}\uFF1A(${s.selectable}) ${s.type}`
       );
       const m = v.name + "Value";
-      const css = getParametersObj(s?.selectable || "");
+      const css = parseParamString(s?.selectable || "");
       const cs = [];
       const ps2 = v.params || [];
       css.forEach((c, index) => {
-        const prop = c.prop;
+        const prop = c.name;
         if (prop) {
           const key = prop + v.name;
           const val = ps2[index];
@@ -3403,7 +3450,7 @@ function setValStringify(v, key, propsText) {
   }
 }
 function getSpecType(val) {
-  let tarr = getType2(val?.type);
+  let tarr = getType(val?.type);
   let type = "any";
   if (tarr.length == 1) {
     type = tarr[0].split("<")[0];
@@ -3436,7 +3483,7 @@ function getSpecType(val) {
     dataType: tarr
   };
 }
-function getType2(value) {
+function getType(value) {
   let arr = [];
   let str = (value || "").trim().toLowerCase();
   str.split(",").forEach((v) => {

package/dist/node/index.js

@@ -3123,53 +3123,99 @@ function getTypeValue(arr) {
       return "undefined";
   }
 }
-function getType(str) {
-  let arr = [];
-  if (str) {
-    str = (str + "").trim();
-    if (str.startsWith("[")) {
-      str = str.substring(1, str.lastIndexOf("]"));
-      arr = str.split(",");
+function setDataType(arr) {
+  return arr.join("|") || "any";
+}
+var splitIgnoringNesting = (str, delimiter) => {
+  let bracketStack = [];
+  let parts = [];
+  let current = "";
+  for (let i = 0; i < str.length; i++) {
+    const char = str[i];
+    if (char === "[" || char === "<" || char === "(") {
+      bracketStack.push(char);
+      current += char;
+    } else if (char === "]" && bracketStack.length > 0 && bracketStack[bracketStack.length - 1] === "[" || char === ">" && bracketStack.length > 0 && bracketStack[bracketStack.length - 1] === "<" || char === ")" && bracketStack.length > 0 && bracketStack[bracketStack.length - 1] === "(") {
+      bracketStack.pop();
+      current += char;
+    } else if (char === delimiter && bracketStack.length === 0) {
+      parts.push(current.trim());
+      current = "";
     } else {
-      const reg = /^\<([a-z|\<|\>|\|]+)\>/;
-      let rts = reg.exec(str);
-      if (rts && rts.length > 0) {
-        let ass = rts[1];
-        arr = ass.split("|");
-      } else {
-        arr = ["any"];
-      }
+      current += char;
     }
+  }
+  if (current.trim() !== "") {
+    parts.push(current.trim());
+  }
+  return parts;
+};
+var parseTypeDefinition = (typeDef) => {
+  if (!typeDef || typeDef === "[]") {
+    return { type: "any", dataType: ["any"] };
+  } else if (typeDef.startsWith("[") && typeDef.endsWith("]")) {
+    const inner = typeDef.slice(1, -1).trim();
+    if (!inner) return { type: "any", dataType: ["any"] };
+    const types = splitIgnoringNesting(inner, ",");
+    return {
+      type: types[0] || "any",
+      dataType: types
+    };
+  } else if (typeDef.startsWith("<") && typeDef.endsWith(">")) {
+    const inner = typeDef.slice(1, -1).trim();
+    if (!inner) return { type: "any", dataType: ["any"] };
+    const types = splitIgnoringNesting(inner, "|");
+    return {
+      type: types[0] || "any",
+      dataType: types
+    };
   } else {
-    arr = ["any"];
+    return {
+      type: typeDef,
+      dataType: [typeDef]
+    };
   }
-  return arr.map((o) => conversionType(o));
-}
-function setDataType(arr) {
-  return arr.join("|") || "any";
-}
-function getParametersObj(cs) {
-  let arrs = cs.split(",");
-  return arrs.map((key) => {
-    key = key.trim();
-    let must = true;
-    let vs = key.split(":");
-    let name = vs[0].trim();
-    if (name.endsWith("?")) {
-      must = false;
-      name = name.substring(0, name.length - 1);
+};
+function parseParamString(input) {
+  const parts = splitIgnoringNesting(input, ",");
+  return parts.map((trimmedPart) => {
+    const label = trimmedPart.trim();
+    const nameMatch = trimmedPart.match(/^([^:?]+)(\??):/);
+    if (!nameMatch) return null;
+    const name = nameMatch[1].trim();
+    const must = !nameMatch[2];
+    const typeDefStart = nameMatch[0].length;
+    const typeDef = trimmedPart.substring(typeDefStart).trim();
+    let bracketStack = [];
+    let endIndex = -1;
+    let t = "";
+    let description = "";
+    for (let i = 0; i < typeDef.length; i++) {
+      const char = typeDef[i];
+      if (char === "[" || char === "<" || char === "(") {
+        bracketStack.push(char);
+      } else if (char === "]" && bracketStack[bracketStack.length - 1] === "[" || char === ">" && bracketStack[bracketStack.length - 1] === "<" || char === ")" && bracketStack[bracketStack.length - 1] === "(") {
+        bracketStack.pop();
+      }
+      if (bracketStack.length === 0 && i > 0) {
+        endIndex = i == 1 ? 0 : i;
+        t = typeDef.substring(0, endIndex + 1).trim();
+        description = typeDef.substring(endIndex + 1);
+        break;
+      }
     }
-    let t = vs[1] || "";
-    let tarr = getSonType(getType(t));
+    const { type, dataType } = parseTypeDefinition(t);
+    const tarr = getSonType(dataType);
     return {
-      label: key,
+      name,
       prop: name,
-      must,
       type: tarr[0],
-      dataType: tarr,
-      description: t.substring(t.lastIndexOf("]") + 1).trim()
+      dataType,
+      must,
+      label,
+      description
     };
-  });
+  }).filter(Boolean);
 }
 
 // packages/components/use/code.ts
@@ -3218,12 +3264,13 @@ function getHmtl(propsname, param, value, slotValue, propsText, exposeText) {
       tarr.push("            @" + name + '="' + strs + '"');
       const sp = getSpecObjs(es, name) || {};
       const s = sp.selectable || "";
-      const css = getParametersObj(s);
+      const css = parseParamString(s);
+      console.log(css);
       const cs = getParameStr(css);
       sarr.push(`// ${sp.description} ${sp.name}: (${sp.selectable})`);
       sarr.push("function " + strs + "(" + cs + ") {");
       css.forEach((o) => {
-        const name2 = o.prop || "arr";
+        const name2 = o.name || "arr";
         sarr.push("   console.log('" + o.label + "', " + name2 + ")");
       });
       sarr.push("}");
@@ -3277,11 +3324,11 @@ function getHmtl(propsname, param, value, slotValue, propsText, exposeText) {
         `// ${s.description} ${s.name}\uFF1A(${s.selectable}) ${s.type}`
       );
       const m = v.name + "Value";
-      const css = getParametersObj(s?.selectable || "");
+      const css = parseParamString(s?.selectable || "");
       const cs = [];
       const ps2 = v.params || [];
       css.forEach((c, index) => {
-        const prop = c.prop;
+        const prop = c.name;
         if (prop) {
           const key = prop + v.name;
           const val = ps2[index];
@@ -3388,7 +3435,7 @@ function setValStringify(v, key, propsText) {
   }
 }
 function getSpecType(val) {
-  let tarr = getType2(val?.type);
+  let tarr = getType(val?.type);
   let type = "any";
   if (tarr.length == 1) {
     type = tarr[0].split("<")[0];
@@ -3421,7 +3468,7 @@ function getSpecType(val) {
     dataType: tarr
   };
 }
-function getType2(value) {
+function getType(value) {
   let arr = [];
   let str = (value || "").trim().toLowerCase();
   str.split(",").forEach((v) => {

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

@@ -1,4 +1,4 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});require("@fangzhongya/utils/basic/object/mergeObject");require("@fangzhongya/utils/basic/array/toggleArray");const B=require("@fangzhongya/utils/name/humpToLine");require("@fangzhongya/utils/name/lineToLargeHump");require("@fangzhongya/utils/basic/string/appearNum");const C=require("@fangzhongya/utils/basic/string/firstLower");require("@fangzhongya/utils/basic/array/duplicateRemoval");require("@fangzhongya/utils/basic/array/asyncMergeArray");const V=require("@fangzhongya/utils/basic/string/firstUpper");require("@fangzhongya/utils/urls/getSuffix");require("@fangzhongya/utils/basic/array/replaceAfter");const g=require("./util.cjs"),S=require("../../utils/props.cjs"),H=require("@fangzhongya/utils/basic/string/toFunction"),J=["class"];function j(s,t){return s.filter(e=>e.name==t)[0]}function N(s){return s.map(t=>(t.prop||"...arr")+":"+g.setDataType(t.dataType)).join(",")}function A(s,t,e,o,m,$){const f=[],n=[];let b=!0;const L=S.getPropsValue(t.propss||[]),P=S.getEmitsValue(t.emitss||[]),x=S.getExposeValue(t.exposes||[]),z=S.getSlotValue(t.slots||[]);Object.keys(e).forEach(r=>{let p=e[r];if(/^on[A-Z]/.test(r)&&typeof p=="function"){let i=r.substring(2);const c=r.split(":");let a;if(c.length>1?(a=c[0]+c.slice(1).map(l=>V.firstUpper(l)).join(""),i=C.firstLower(i)):(a=c[0],i=B.humpToLine(i)),c.includes("-")){let l=a.split("-");l=l.map((h,T)=>T!=0?V.firstUpper(h):h),a=l.join("")}f.push("            @"+i+'="'+a+'"');const u=j(P,i)||{},y=u.selectable||"",q=g.getParametersObj(y),d=N(q);n.push(`// ${u.description} ${u.name}: (${u.selectable})`),n.push("function "+a+"("+d+") {"),q.forEach(l=>{const h=l.prop||"arr";n.push("   console.log('"+l.label+"', "+h+")")}),n.push("}")}else{let i=r;J.includes(r)&&(i=r+"1"),f.push("            :"+r+'="'+i+'"');const c=j(L,r)||{},a=D(c);if(n.push(`// ${c.description} ${c.name}: {${c.type}} (${c.selectable})`),typeof p=="function")n.push("const "+r+" = "+F(p,r,m));else if(b&&(b=!1,n.unshift("import { ref } from 'vue';")),typeof p>"u"){const u=g.getTypeValue(a.dataType);u=="()=>{}"?n.push("const "+i+" = "+u+";"):n.push("const "+i+" = ref("+(u==="undefined"?"":u)+");")}else{let u=E(p,r,m);n.push("const "+i+" = ref("+u+");")}}});const O=Object.values($||{});O.length>0&&(b&&(b=!1,n.unshift("import { ref } from 'vue';")),f.unshift('            ref="refDom"'),n.push("const refDom = ref()"),O.forEach(r=>{const p=j(x,r.name)||{};n.push(`// ${p.description} ${p.name}：(${p.selectable}) ${p.type}`);const i=r.name+"Value",c=g.getParametersObj(p?.selectable||""),a=[],u=r.params||[];c.forEach((y,q)=>{const d=y.prop;if(d){const l=d+r.name,h=u[q];if(n.push(`// ${y.label}`),typeof h=="function")n.push("const "+l+" = "+F(h,d,r.text));else if(typeof h>"u")n.push("const "+l+" = "+g.getTypeValue(y.dataType)+";");else{let T=E(h,d,r.text);n.push("const "+l+" = "+T+";")}a.push(l)}}),r.type==="function"?n.push(`const ${i} = refDom.value?.${r.name}(${a.join(", ")})`):n.push(`const ${i} = refDom.value?.${r.name}`),n.push(`console.log('"${p.type}"', ${i})`)})),f.length>0&&f.unshift("");const U=M(o,z);return`<!--${s}-->
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});require("@fangzhongya/utils/basic/object/mergeObject");require("@fangzhongya/utils/basic/array/toggleArray");const B=require("@fangzhongya/utils/name/humpToLine");require("@fangzhongya/utils/name/lineToLargeHump");require("@fangzhongya/utils/basic/string/appearNum");const C=require("@fangzhongya/utils/basic/string/firstLower");require("@fangzhongya/utils/basic/array/duplicateRemoval");require("@fangzhongya/utils/basic/array/asyncMergeArray");const F=require("@fangzhongya/utils/basic/string/firstUpper");require("@fangzhongya/utils/urls/getSuffix");require("@fangzhongya/utils/basic/array/replaceAfter");const g=require("./util.cjs"),q=require("../../utils/props.cjs"),H=require("@fangzhongya/utils/basic/string/toFunction"),J=["class"];function j(s,t){return s.filter(e=>e.name==t)[0]}function N(s){return s.map(t=>(t.prop||"...arr")+":"+g.setDataType(t.dataType)).join(",")}function A(s,t,e,o,m,$){const f=[],n=[];let S=!0;const L=q.getPropsValue(t.propss||[]),P=q.getEmitsValue(t.emitss||[]),x=q.getExposeValue(t.exposes||[]),z=q.getSlotValue(t.slots||[]);Object.keys(e).forEach(r=>{let a=e[r];if(/^on[A-Z]/.test(r)&&typeof a=="function"){let i=r.substring(2);const c=r.split(":");let p;if(c.length>1?(p=c[0]+c.slice(1).map(l=>F.firstUpper(l)).join(""),i=C.firstLower(i)):(p=c[0],i=B.humpToLine(i)),c.includes("-")){let l=p.split("-");l=l.map((h,T)=>T!=0?F.firstUpper(h):h),p=l.join("")}f.push("            @"+i+'="'+p+'"');const u=j(P,i)||{},y=u.selectable||"",b=g.parseParamString(y);console.log(b);const d=N(b);n.push(`// ${u.description} ${u.name}: (${u.selectable})`),n.push("function "+p+"("+d+") {"),b.forEach(l=>{const h=l.name||"arr";n.push("   console.log('"+l.label+"', "+h+")")}),n.push("}")}else{let i=r;J.includes(r)&&(i=r+"1"),f.push("            :"+r+'="'+i+'"');const c=j(L,r)||{},p=D(c);if(n.push(`// ${c.description} ${c.name}: {${c.type}} (${c.selectable})`),typeof a=="function")n.push("const "+r+" = "+O(a,r,m));else if(S&&(S=!1,n.unshift("import { ref } from 'vue';")),typeof a>"u"){const u=g.getTypeValue(p.dataType);u=="()=>{}"?n.push("const "+i+" = "+u+";"):n.push("const "+i+" = ref("+(u==="undefined"?"":u)+");")}else{let u=E(a,r,m);n.push("const "+i+" = ref("+u+");")}}});const V=Object.values($||{});V.length>0&&(S&&(S=!1,n.unshift("import { ref } from 'vue';")),f.unshift('            ref="refDom"'),n.push("const refDom = ref()"),V.forEach(r=>{const a=j(x,r.name)||{};n.push(`// ${a.description} ${a.name}：(${a.selectable}) ${a.type}`);const i=r.name+"Value",c=g.parseParamString(a?.selectable||""),p=[],u=r.params||[];c.forEach((y,b)=>{const d=y.name;if(d){const l=d+r.name,h=u[b];if(n.push(`// ${y.label}`),typeof h=="function")n.push("const "+l+" = "+O(h,d,r.text));else if(typeof h>"u")n.push("const "+l+" = "+g.getTypeValue(y.dataType)+";");else{let T=E(h,d,r.text);n.push("const "+l+" = "+T+";")}p.push(l)}}),r.type==="function"?n.push(`const ${i} = refDom.value?.${r.name}(${p.join(", ")})`):n.push(`const ${i} = refDom.value?.${r.name}`),n.push(`console.log('"${a.type}"', ${i})`)})),f.length>0&&f.unshift("");const U=M(o,z);return`<!--${s}-->
 <template>
     <div>
         <${s}${f.join(`
@@ -14,6 +14,6 @@ ${n.join(`
 `}function M(s={},t){const e=[];return Object.keys(s).forEach(o=>{const m=j(t,o)||{},$=s[o];if($){const f=`            <!-- ${m.description} ${m.name}：(${m.selectable}) -->
             <template #${o}="scope">
 ${g.vueFormat($,"                ")}
-            </template>`;e.push(f)}}),e&&e.length>0&&e.unshift(""),e}function F(s,t,e){const o=e?e[t]:"";return o||w(s.toString())}function w(s){const t=H.getFunctionFormat(g.prettierFormat(s));if(t){let e=`{
+            </template>`;e.push(f)}}),e&&e.length>0&&e.unshift(""),e}function O(s,t,e){const o=e?e[t]:"";return o||w(s.toString())}function w(s){const t=H.getFunctionFormat(g.prettierFormat(s));if(t){let e=`{
 ${g.vueFormat(g.getFunBody(t.body),"   ")}
 }`;return`function (${t.param}) ${e}`}else return"undefined"}function Z(s){const t=s.trim();return/^\(/.test(t)?w(t):JSON.stringify(s)}function E(s,t,e){const o=e?e[t]:"";return o||(typeof s=="string"?Z(s+""):JSON.stringify(s))}function D(s){let t=G(s?.type),e="any";t.length==1&&(e=t[0].split("<")[0]);const o=e;let m=(s?.selectable||"").trim(),$=[];return m&&e!="boolean"&&(m.split(",").forEach(f=>{if(f){let n=f.split(":");$.push({label:f,prop:n[0].trim()})}}),e=="function"?e="function":e=="array"?e="choice":e="select"),{arr:$,zdtype:o,type:e,dataType:t}}function G(s){let t=[];return(s||"").trim().toLowerCase().split(",").forEach(o=>{o=o.trim(),o&&t.push(o)}),[...new Set(t)].sort()}exports.getHmtl=A;exports.getSpecType=D;exports.setValStringify=E;

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

@@ -6,22 +6,22 @@ import "@fangzhongya/utils/basic/string/appearNum";
 import { firstLower as N } from "@fangzhongya/utils/basic/string/firstLower";
 import "@fangzhongya/utils/basic/array/duplicateRemoval";
 import "@fangzhongya/utils/basic/array/asyncMergeArray";
-import { firstUpper as O } from "@fangzhongya/utils/basic/string/firstUpper";
+import { firstUpper as V } from "@fangzhongya/utils/basic/string/firstUpper";
 import "@fangzhongya/utils/urls/getSuffix";
 import "@fangzhongya/utils/basic/array/replaceAfter";
-import { getParametersObj as V, getTypeValue as F, setDataType as A, vueFormat as w, prettierFormat as H, getFunBody as U } from "./util.js";
+import { parseParamString as F, getTypeValue as O, setDataType as A, vueFormat as w, prettierFormat as H, getFunBody as U } from "./util.js";
 import { getPropsValue as Z, getEmitsValue as q, getExposeValue as G, getSlotValue as I } from "../../utils/props.js";
 import { getFunctionFormat as K } from "@fangzhongya/utils/basic/string/toFunction";
 const M = ["class"];
-function j(s, e) {
+function S(s, e) {
   return s.filter((t) => t.name == e)[0];
 }
 function Q(s) {
   return s.map((e) => (e.prop || "...arr") + ":" + A(e.dataType)).join(",");
 }
 function at(s, e, t, r, m, $) {
-  const f = [], n = [];
-  let y = !0;
+  const p = [], n = [];
+  let b = !0;
   const z = Z(e.propss || []), L = q(e.emitss || []), P = G(e.exposes || []), B = I(e.slots || []);
   Object.keys(t).forEach((o) => {
     let u = t[o];
@@ -29,28 +29,30 @@ function at(s, e, t, r, m, $) {
       let i = o.substring(2);
       const c = o.split(":");
       let a;
-      if (c.length > 1 ? (a = c[0] + c.slice(1).map((p) => O(p)).join(""), i = N(i)) : (a = c[0], i = J(i)), c.includes("-")) {
-        let p = a.split("-");
-        p = p.map((h, S) => S != 0 ? O(h) : h), a = p.join("");
+      if (c.length > 1 ? (a = c[0] + c.slice(1).map((f) => V(f)).join(""), i = N(i)) : (a = c[0], i = J(i)), c.includes("-")) {
+        let f = a.split("-");
+        f = f.map((h, j) => j != 0 ? V(h) : h), a = f.join("");
       }
-      f.push("            @" + i + '="' + a + '"');
-      const l = j(L, i) || {}, d = l.selectable || "", b = V(d), g = Q(b);
-      n.push(`// ${l.description} ${l.name}: (${l.selectable})`), n.push("function " + a + "(" + g + ") {"), b.forEach((p) => {
-        const h = p.prop || "arr";
-        n.push("   console.log('" + p.label + "', " + h + ")");
+      p.push("            @" + i + '="' + a + '"');
+      const l = S(L, i) || {}, d = l.selectable || "", y = F(d);
+      console.log(y);
+      const g = Q(y);
+      n.push(`// ${l.description} ${l.name}: (${l.selectable})`), n.push("function " + a + "(" + g + ") {"), y.forEach((f) => {
+        const h = f.name || "arr";
+        n.push("   console.log('" + f.label + "', " + h + ")");
       }), n.push("}");
     } else {
       let i = o;
-      M.includes(o) && (i = o + "1"), f.push("            :" + o + '="' + i + '"');
-      const c = j(z, o) || {}, a = X(c);
+      M.includes(o) && (i = o + "1"), p.push("            :" + o + '="' + i + '"');
+      const c = S(z, o) || {}, a = X(c);
       if (n.push(
         `// ${c.description} ${c.name}: {${c.type}} (${c.selectable})`
       ), typeof u == "function")
         n.push(
           "const " + o + " = " + T(u, o, m)
         );
-      else if (y && (y = !1, n.unshift("import { ref } from 'vue';")), typeof u > "u") {
-        const l = F(a.dataType);
+      else if (b && (b = !1, n.unshift("import { ref } from 'vue';")), typeof u > "u") {
+        const l = O(a.dataType);
         l == "()=>{}" ? n.push("const " + i + " = " + l + ";") : n.push(
           "const " + i + " = ref(" + (l === "undefined" ? "" : l) + ");"
         );
@@ -61,39 +63,39 @@ function at(s, e, t, r, m, $) {
     }
   });
   const E = Object.values($ || {});
-  E.length > 0 && (y && (y = !1, n.unshift("import { ref } from 'vue';")), f.unshift('            ref="refDom"'), n.push("const refDom = ref()"), E.forEach((o) => {
-    const u = j(P, o.name) || {};
+  E.length > 0 && (b && (b = !1, n.unshift("import { ref } from 'vue';")), p.unshift('            ref="refDom"'), n.push("const refDom = ref()"), E.forEach((o) => {
+    const u = S(P, o.name) || {};
     n.push(
       `// ${u.description} ${u.name}：(${u.selectable}) ${u.type}`
     );
-    const i = o.name + "Value", c = V(u?.selectable || ""), a = [], l = o.params || [];
-    c.forEach((d, b) => {
-      const g = d.prop;
+    const i = o.name + "Value", c = F(u?.selectable || ""), a = [], l = o.params || [];
+    c.forEach((d, y) => {
+      const g = d.name;
       if (g) {
-        const p = g + o.name, h = l[b];
+        const f = g + o.name, h = l[y];
         if (n.push(`// ${d.label}`), typeof h == "function")
           n.push(
-            "const " + p + " = " + T(h, g, o.text)
+            "const " + f + " = " + T(h, g, o.text)
           );
         else if (typeof h > "u")
           n.push(
-            "const " + p + " = " + F(d.dataType) + ";"
+            "const " + f + " = " + O(d.dataType) + ";"
           );
         else {
-          let S = D(h, g, o.text);
-          n.push("const " + p + " = " + S + ";");
+          let j = D(h, g, o.text);
+          n.push("const " + f + " = " + j + ";");
         }
-        a.push(p);
+        a.push(f);
       }
     }), o.type === "function" ? n.push(
       `const ${i} = refDom.value?.${o.name}(${a.join(", ")})`
     ) : n.push(`const ${i} = refDom.value?.${o.name}`), n.push(`console.log('"${u.type}"', ${i})`);
-  })), f.length > 0 && f.unshift("");
+  })), p.length > 0 && p.unshift("");
   const C = R(r, B);
   return `<!--${s}-->
 <template>
     <div>
-        <${s}${f.join(`
+        <${s}${p.join(`
 `)}>${C.join(`
 `)}
         </${s}>
@@ -108,13 +110,13 @@ ${n.join(`
 function R(s = {}, e) {
   const t = [];
   return Object.keys(s).forEach((r) => {
-    const m = j(e, r) || {}, $ = s[r];
+    const m = S(e, r) || {}, $ = s[r];
     if ($) {
-      const f = `            <!-- ${m.description} ${m.name}：(${m.selectable}) -->
+      const p = `            <!-- ${m.description} ${m.name}：(${m.selectable}) -->
             <template #${r}="scope">
 ${w($, "                ")}
             </template>`;
-      t.push(f);
+      t.push(p);
     }
   }), t && t.length > 0 && t.unshift(""), t;
 }
@@ -145,11 +147,11 @@ function X(s) {
   e.length == 1 && (t = e[0].split("<")[0]);
   const r = t;
   let m = (s?.selectable || "").trim(), $ = [];
-  return m && t != "boolean" && (m.split(",").forEach((f) => {
-    if (f) {
-      let n = f.split(":");
+  return m && t != "boolean" && (m.split(",").forEach((p) => {
+    if (p) {
+      let n = p.split(":");
       $.push({
-        label: f,
+        label: p,
         prop: n[0].trim()
       });
     }

package/dist/packages/components/use/retrie/expose/index.vue.cjs

@@ -1 +1 @@
-"use strict";const e=require("vue"),d=require("../../util.cjs"),g=require("../index.vue.cjs");;/* empty css              */const y={class:"expose"},h={class:"expose-label"},x={class:"expose-return"},b=e.defineComponent({__name:"index",props:{getRef:{type:Function},name:String,value:{type:Object}},emits:["change"],setup(p,{emit:v}){const a=p,m=v,c=e.ref(""),o=e.ref(""),i=e.ref([]),f=e.computed(()=>{i.value=[];const t=a.value;if(t&&t.name){let l=(t.selectable+"").trim();if(c.value=t.name+": "+t.description+" 入参=("+l+") 返回值: "+t.type,l){let n=d.getParametersObj(l);return n.forEach(r=>{i.value.push(r.prop)}),n}}return[]});function _(t,l){let n=a.getRef?a.getRef():void 0,r=a.value?.name;if(r){let u=i.value.map(s=>t[s]);if(n&&n[r]){if(typeof n[r]=="function"){let s=n[r](...u);o.value=JSON.stringify(s)}else{let s=n[r];s instanceof HTMLDivElement?o.value=s.outerHTML:o.value=JSON.stringify(s)}m("change",r,u,typeof n[r],l)}}else console.log("请选择方法")}return(t,l)=>(e.openBlock(),e.createElementBlock("div",y,[e.createElementVNode("div",h,e.toDisplayString(c.value||"请选择方法"),1),e.createVNode(g,{list:f.value,name:a.name,queryName:"调用",onQuery:_},null,8,["list","name"]),e.createElementVNode("div",x,e.toDisplayString(a.value?.type)+"返回值："+e.toDisplayString(o.value),1)]))}});module.exports=b;
+"use strict";const e=require("vue"),d=require("../../util.cjs"),g=require("../index.vue.cjs");;/* empty css              */const y={class:"expose"},h={class:"expose-label"},x={class:"expose-return"},S=e.defineComponent({__name:"index",props:{getRef:{type:Function},name:String,value:{type:Object}},emits:["change"],setup(p,{emit:m}){const s=p,v=m,c=e.ref(""),i=e.ref(""),o=e.ref([]),f=e.computed(()=>{o.value=[];const n=s.value;if(n&&n.name){let l=(n.selectable+"").trim();if(c.value=n.name+": "+n.description+" 入参=("+l+") 返回值: "+n.type,l){let r=d.parseParamString(l);return r.forEach(t=>{t.prop=t.name,o.value.push(t.name)}),r}}return[]});function _(n,l){let r=s.getRef?s.getRef():void 0,t=s.value?.name;if(t){let u=o.value.map(a=>n[a]);if(r&&r[t]){if(typeof r[t]=="function"){let a=r[t](...u);i.value=JSON.stringify(a)}else{let a=r[t];a instanceof HTMLDivElement?i.value=a.outerHTML:i.value=JSON.stringify(a)}v("change",t,u,typeof r[t],l)}}else console.log("请选择方法")}return(n,l)=>(e.openBlock(),e.createElementBlock("div",y,[e.createElementVNode("div",h,e.toDisplayString(c.value||"请选择方法"),1),e.createVNode(g,{list:f.value,name:s.name,queryName:"调用",onQuery:_},null,8,["list","name"]),e.createElementVNode("div",x,e.toDisplayString(s.value?.type)+"返回值："+e.toDisplayString(i.value),1)]))}});module.exports=S;

package/dist/packages/components/use/retrie/expose/index.vue.js

@@ -1,8 +1,8 @@
-import { defineComponent as y, ref as i, computed as h, createElementBlock as b, openBlock as x, createElementVNode as p, createVNode as N, toDisplayString as c } from "vue";
-import { getParametersObj as E } from "../../util.js";
-import O from "../index.vue.js";
+import { defineComponent as y, ref as i, computed as h, createElementBlock as x, openBlock as b, createElementVNode as p, createVNode as N, toDisplayString as c } from "vue";
+import { parseParamString as S } from "../../util.js";
+import E from "../index.vue.js";
 /* empty css            */
-const S = { class: "expose" }, j = { class: "expose-label" }, R = { class: "expose-return" }, J = /* @__PURE__ */ y({
+const O = { class: "expose" }, R = { class: "expose-label" }, j = { class: "expose-return" }, J = /* @__PURE__ */ y({
   __name: "index",
   props: {
     getRef: {
@@ -15,46 +15,46 @@ const S = { class: "expose" }, j = { class: "expose-label" }, R = { class: "expo
   },
   emits: ["change"],
   setup(f, { emit: v }) {
-    const a = f, d = v, u = i(""), r = i(""), s = i([]), _ = h(() => {
+    const o = f, d = v, m = i(""), r = i(""), s = i([]), _ = h(() => {
       s.value = [];
-      const e = a.value;
-      if (e && e.name) {
-        let l = (e.selectable + "").trim();
-        if (u.value = e.name + ": " + e.description + " 入参=(" + l + ") 返回值: " + e.type, l) {
-          let t = E(l);
-          return t.forEach((n) => {
-            s.value.push(n.prop);
-          }), t;
+      const t = o.value;
+      if (t && t.name) {
+        let l = (t.selectable + "").trim();
+        if (m.value = t.name + ": " + t.description + " 入参=(" + l + ") 返回值: " + t.type, l) {
+          let n = S(l);
+          return n.forEach((e) => {
+            e.prop = e.name, s.value.push(e.name);
+          }), n;
         }
       }
       return [];
     });
-    function g(e, l) {
-      let t = a.getRef ? a.getRef() : void 0, n = a.value?.name;
-      if (n) {
-        let m = s.value.map((o) => e[o]);
-        if (t && t[n]) {
-          if (typeof t[n] == "function") {
-            let o = t[n](...m);
-            r.value = JSON.stringify(o);
+    function g(t, l) {
+      let n = o.getRef ? o.getRef() : void 0, e = o.value?.name;
+      if (e) {
+        let u = s.value.map((a) => t[a]);
+        if (n && n[e]) {
+          if (typeof n[e] == "function") {
+            let a = n[e](...u);
+            r.value = JSON.stringify(a);
           } else {
-            let o = t[n];
-            o instanceof HTMLDivElement ? r.value = o.outerHTML : r.value = JSON.stringify(o);
+            let a = n[e];
+            a instanceof HTMLDivElement ? r.value = a.outerHTML : r.value = JSON.stringify(a);
           }
-          d("change", n, m, typeof t[n], l);
+          d("change", e, u, typeof n[e], l);
         }
       } else
         console.log("请选择方法");
     }
-    return (e, l) => (x(), b("div", S, [
-      p("div", j, c(u.value || "请选择方法"), 1),
-      N(O, {
+    return (t, l) => (b(), x("div", O, [
+      p("div", R, c(m.value || "请选择方法"), 1),
+      N(E, {
         list: _.value,
-        name: a.name,
+        name: o.name,
         queryName: "调用",
         onQuery: g
       }, null, 8, ["list", "name"]),
-      p("div", R, c(a.value?.type) + "返回值：" + c(r.value), 1)
+      p("div", j, c(o.value?.type) + "返回值：" + c(r.value), 1)
     ]));
   }
 });

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

@@ -1,3 +1,3 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const b=require("@fangzhongya/utils/basic/string/toFunction"),m=require("@fangzhongya/utils/basic/string/firstLower");function l(e){return e.replace(/\;(\s|\n\r)*$/,"")}function d(e){return e="let a = "+e,l(e).replace(/^let a = /,"")}function j(e){return l(e)}function T(e,t=""){let r=(e+"").trim().split(/\n/);return r=r.map(n=>t+n),r.join(`
-`)}function f(e=""){e=e.trim();let t=`[\\s|\\n|\\r]*\\{((.|
-|\r)+?)\\}[\\s|\\n|\\r]*`,n=new RegExp("^"+t+"$").exec(e);return n&&n.length>0?f(n[1]):e}const F=["Boolean","Any","String","Number","Array","Object","Function"];function c(e){return F.includes(e)?m.firstLower(e):e}function $(e){let r=new RegExp("^([a-z|A-Z]+)\\<(.+)\\>$").exec(e);if(r&&r.length>0)return{own:c(r[1]),son:r[2]}}function p(e,t){let r=$(e);r?(t.push(r.own),r.son&&p(r.son,t)):t.push(e)}function s(e){e instanceof Array&&(e=e[0]);const t=[];return e&&p(e,t),t}function g(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 O(e,t){const r=g(e),n=s(t)[0];return n&&n!="any"?r==n:!0}function h(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 v(e){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}function y(e){switch((e[0]||"any").toLowerCase()){case"string":return'""';case"boolean":return"false";case"number":return"0";case"array":let r=y(e.splice(1));return r=r=="undefined"?"":r,`[${r}]`;case"object":return"{}";case"function":return"()=>{}";case"any":return'""';default:return"undefined"}}function w(e){let t=[];if(e)if(e=(e+"").trim(),e.startsWith("["))e=e.substring(1,e.lastIndexOf("]")),t=e.split(",");else{let n=/^\<([a-z|\<|\>|\|]+)\>/.exec(e);n&&n.length>0?t=n[1].split("|"):t=["any"]}else t=["any"];return t.map(r=>c(r))}function S(e){return e.join("|")||"any"}function x(e){return e.split(",").map(r=>{r=r.trim();let n=!0,i=r.split(":"),u=i[0].trim();u.endsWith("?")&&(n=!1,u=u.substring(0,u.length-1));let o=i[1]||"",a=s(w(o));return{label:r,prop:u,must:n,type:a[0],dataType:a,description:o.substring(o.lastIndexOf("]")+1).trim()}})}Object.defineProperty(exports,"getFunctionFormat",{enumerable:!0,get:()=>b.getFunctionFormat});exports.getFunBody=f;exports.getObjType=g;exports.getParametersObj=x;exports.getSonType=s;exports.getString=h;exports.getTypeValue=y;exports.isDefaultType=v;exports.isTypeEqual=O;exports.prettierArrFormat=j;exports.prettierFormat=l;exports.prettierObjFormat=d;exports.setDataType=S;exports.vueFormat=T;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const v=require("@fangzhongya/utils/basic/string/toFunction"),w=require("@fangzhongya/utils/basic/string/firstLower");function g(e){return e.replace(/\;(\s|\n\r)*$/,"")}function O(e){return e="let a = "+e,g(e).replace(/^let a = /,"")}function x(e){return g(e)}function A(e,n=""){let t=(e+"").trim().split(/\n/);return t=t.map(r=>n+r),t.join(`
+`)}function d(e=""){e=e.trim();let n=`[\\s|\\n|\\r]*\\{((.|
+|\r)+?)\\}[\\s|\\n|\\r]*`,r=new RegExp("^"+n+"$").exec(e);return r&&r.length>0?d(r[1]):e}const k=["Boolean","Any","String","Number","Array","Object","Function"];function q(e){return k.includes(e)?w.firstLower(e):e}function B(e){let t=new RegExp("^([a-z|A-Z]+)\\<(.+)\\>$").exec(e);if(t&&t.length>0)return{own:q(t[1]),son:t[2]}}function T(e,n){let t=B(e);t?(n.push(t.own),t.son&&T(t.son,n)):n.push(e)}function y(e){e instanceof Array&&(e=e[0]);const n=[];return e&&T(e,n),n}function j(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 E(e,n){const t=j(e),r=y(n)[0];return r&&r!="any"?t==r:!0}function L(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+""}else return typeof e=="object"&&e?e.toString():typeof e>"u"||typeof e=="object"&&!e?"":e+""}function W(e){e=(e+"").replace(/^(\s|\n|r)*/,"").replace(/(\s|\n|r)*$/,"");let n="";return/^\'(.|\n|\r)*\'$/.test(e)||/^\"(.|\n|\r)*\"$/.test(e)||/^\`(.|\n|\r)*\`$/.test(e)?n="string":/^\[(.|\n|\r)*\]$/.test(e)?n="array":/^\{(.|\n|\r)*\}$/.test(e)?n="object":/^[0-9]*$/.test(e)?n="number":e==="true"||e==="false"?n="boolean":e=="undefined"?n="undefined":e=="null"?n="null":e&&(n="string"),n}function F(e){switch((e[0]||"any").toLowerCase()){case"string":return'""';case"boolean":return"false";case"number":return"0";case"array":let t=F(e.splice(1));return t=t=="undefined"?"":t,`[${t}]`;case"object":return"{}";case"function":return"()=>{}";case"any":return'""';default:return"undefined"}}function C(e){return e.join("|")||"any"}const p=(e,n)=>{let t=[],r=[],i="";for(let a=0;a<e.length;a++){const o=e[a];o==="["||o==="<"||o==="("?(t.push(o),i+=o):o==="]"&&t.length>0&&t[t.length-1]==="["||o===">"&&t.length>0&&t[t.length-1]==="<"||o===")"&&t.length>0&&t[t.length-1]==="("?(t.pop(),i+=o):o===n&&t.length===0?(r.push(i.trim()),i=""):i+=o}return i.trim()!==""&&r.push(i.trim()),r},I=e=>{if(!e||e==="[]")return{type:"any",dataType:["any"]};if(e.startsWith("[")&&e.endsWith("]")){const n=e.slice(1,-1).trim();if(!n)return{type:"any",dataType:["any"]};const t=p(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=p(n,"|");return{type:t[0]||"any",dataType:t}}else return{type:e,dataType:[e]}};function M(e){return p(e,",").map(t=>{const r=t.trim(),i=t.match(/^([^:?]+)(\??):/);if(!i)return null;const a=i[1].trim(),o=!i[2],$=i[0].length,c=t.substring($).trim();let s=[],f=-1,h="",m="";for(let u=0;u<c.length;u++){const l=c[u];if(l==="["||l==="<"||l==="("?s.push(l):(l==="]"&&s[s.length-1]==="["||l===">"&&s[s.length-1]==="<"||l===")"&&s[s.length-1]==="(")&&s.pop(),s.length===0&&u>0){f=u==1?0:u,h=c.substring(0,f+1).trim(),m=c.substring(f+1);break}}const{type:N,dataType:b}=I(h),S=y(b);return{name:a,prop:a,type:S[0],dataType:b,must:o,label:r,description:m}}).filter(Boolean)}Object.defineProperty(exports,"getFunctionFormat",{enumerable:!0,get:()=>v.getFunctionFormat});exports.getFunBody=d;exports.getObjType=j;exports.getSonType=y;exports.getString=L;exports.getTypeValue=F;exports.isDefaultType=W;exports.isTypeEqual=E;exports.parseParamString=M;exports.prettierArrFormat=x;exports.prettierFormat=g;exports.prettierObjFormat=O;exports.setDataType=C;exports.vueFormat=A;

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

@@ -45,3 +45,12 @@ export declare function getParametersObj(cs: string): {
     dataType: string[];
     description: string;
 }[];
+export declare function parseParamString(input: string): Array<{
+    name: string;
+    prop: string;
+    type: string;
+    dataType: string[];
+    must: boolean;
+    label: string;
+    description: string;
+}>;

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

@@ -1,26 +1,26 @@
-import { getFunctionFormat as L } from "@fangzhongya/utils/basic/string/toFunction";
-import { firstLower as p } from "@fangzhongya/utils/basic/string/firstLower";
-function s(e) {
+import { getFunctionFormat as V } from "@fangzhongya/utils/basic/string/toFunction";
+import { firstLower as j } from "@fangzhongya/utils/basic/string/firstLower";
+function m(e) {
   return e.replace(/\;(\s|\n\r)*$/, "");
 }
-function h(e) {
-  return e = "let a = " + e, s(e).replace(/^let a = /, "");
+function B(e) {
+  return e = "let a = " + e, m(e).replace(/^let a = /, "");
 }
-function T(e) {
-  return s(e);
+function E(e) {
+  return m(e);
 }
-function x(e, t = "") {
-  let n = (e + "").trim().split(/\n/);
-  return n = n.map((r) => t + r), n.join(`
+function L(e, n = "") {
+  let t = (e + "").trim().split(/\n/);
+  return t = t.map((r) => n + r), t.join(`
 `);
 }
-function g(e = "") {
+function S(e = "") {
   e = e.trim();
-  let t = `[\\s|\\n|\\r]*\\{((.|
-|\r)+?)\\}[\\s|\\n|\\r]*`, r = new RegExp("^" + t + "$").exec(e);
-  return r && r.length > 0 ? g(r[1]) : e;
+  let n = `[\\s|\\n|\\r]*\\{((.|
+|\r)+?)\\}[\\s|\\n|\\r]*`, r = new RegExp("^" + n + "$").exec(e);
+  return r && r.length > 0 ? S(r[1]) : e;
 }
-const y = [
+const w = [
   "Boolean",
   "Any",
   "String",
@@ -29,47 +29,47 @@ const y = [
   "Object",
   "Function"
 ];
-function f(e) {
-  return y.includes(e) ? p(e) : e;
+function x(e) {
+  return w.includes(e) ? j(e) : e;
 }
-function m(e) {
-  let n = new RegExp("^([a-z|A-Z]+)\\<(.+)\\>$").exec(e);
-  if (n && n.length > 0)
+function F(e) {
+  let t = new RegExp("^([a-z|A-Z]+)\\<(.+)\\>$").exec(e);
+  if (t && t.length > 0)
     return {
-      own: f(n[1]),
-      son: n[2]
+      own: x(t[1]),
+      son: t[2]
     };
 }
-function a(e, t) {
-  let n = m(e);
-  n ? (t.push(n.own), n.son && a(n.son, t)) : t.push(e);
+function d(e, n) {
+  let t = F(e);
+  t ? (n.push(t.own), t.son && d(t.son, n)) : n.push(e);
 }
-function c(e) {
+function b(e) {
   e instanceof Array && (e = e[0]);
-  const t = [];
-  return e && a(e, t), t;
+  const n = [];
+  return e && d(e, n), n;
 }
-function b(e) {
-  const t = Object.prototype.toString.call(e);
-  let r = /^\[[O|o]bject (.*)\]$/.exec(t), i = typeof e;
+function v(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 v(e, t) {
-  const n = b(e), r = c(t)[0];
-  return r && r != "any" ? n == r : !0;
+function C(e, n) {
+  const t = v(e), r = b(n)[0];
+  return r && r != "any" ? t == r : !0;
 }
-function w(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 + "";
+    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 + "";
   } else return typeof e == "object" && e ? e.toString() : typeof e > "u" || typeof e == "object" && !e ? "" : e + "";
 }
-function F(e) {
+function N(e) {
   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 n = "";
+  return /^\'(.|\n|\r)*\'$/.test(e) || /^\"(.|\n|\r)*\"$/.test(e) || /^\`(.|\n|\r)*\`$/.test(e) ? n = "string" : /^\[(.|\n|\r)*\]$/.test(e) ? n = "array" : /^\{(.|\n|\r)*\}$/.test(e) ? n = "object" : /^[0-9]*$/.test(e) ? n = "number" : e === "true" || e === "false" ? n = "boolean" : e == "undefined" ? n = "undefined" : e == "null" ? n = "null" : e && (n = "string"), n;
 }
-function d(e) {
+function k(e) {
   switch ((e[0] || "any").toLowerCase()) {
     case "string":
       return '""';
@@ -78,8 +78,8 @@ function d(e) {
     case "number":
       return "0";
     case "array":
-      let n = d(e.splice(1));
-      return n = n == "undefined" ? "" : n, `[${n}]`;
+      let t = k(e.splice(1));
+      return t = t == "undefined" ? "" : t, `[${t}]`;
     case "object":
       return "{}";
     case "function":
@@ -90,51 +90,79 @@ function d(e) {
       return "undefined";
   }
 }
-function $(e) {
-  let t = [];
-  if (e)
-    if (e = (e + "").trim(), e.startsWith("["))
-      e = e.substring(1, e.lastIndexOf("]")), t = e.split(",");
-    else {
-      let r = /^\<([a-z|\<|\>|\|]+)\>/.exec(e);
-      r && r.length > 0 ? t = r[1].split("|") : t = ["any"];
-    }
-  else
-    t = ["any"];
-  return t.map((n) => f(n));
-}
-function O(e) {
+function R(e) {
   return e.join("|") || "any";
 }
-function A(e) {
-  return e.split(",").map((n) => {
-    n = n.trim();
-    let r = !0, i = n.split(":"), l = i[0].trim();
-    l.endsWith("?") && (r = !1, l = l.substring(0, l.length - 1));
-    let u = i[1] || "", o = c($(u));
+const p = (e, n) => {
+  let t = [], r = [], i = "";
+  for (let u = 0; u < e.length; u++) {
+    const s = e[u];
+    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() !== "" && r.push(i.trim()), r;
+}, A = (e) => {
+  if (!e || e === "[]")
+    return { type: "any", dataType: ["any"] };
+  if (e.startsWith("[") && e.endsWith("]")) {
+    const n = e.slice(1, -1).trim();
+    if (!n) return { type: "any", dataType: ["any"] };
+    const t = p(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 = p(n, "|");
+    return {
+      type: t[0] || "any",
+      dataType: t
+    };
+  } else
+    return {
+      type: e,
+      dataType: [e]
+    };
+};
+function q(e) {
+  return p(e, ",").map((t) => {
+    const r = t.trim(), i = t.match(/^([^:?]+)(\??):/);
+    if (!i) return null;
+    const u = i[1].trim(), s = !i[2], T = i[0].length, c = t.substring(T).trim();
+    let o = [], f = -1, g = "", y = "";
+    for (let a = 0; a < c.length; a++) {
+      const l = c[a];
+      if (l === "[" || l === "<" || l === "(" ? o.push(l) : (l === "]" && o[o.length - 1] === "[" || l === ">" && o[o.length - 1] === "<" || l === ")" && o[o.length - 1] === "(") && o.pop(), o.length === 0 && a > 0) {
+        f = a == 1 ? 0 : a, g = c.substring(0, f + 1).trim(), y = c.substring(f + 1);
+        break;
+      }
+    }
+    const { type: O, dataType: h } = A(g), $ = b(h);
     return {
-      label: n,
-      prop: l,
-      must: r,
-      type: o[0],
-      dataType: o,
-      description: u.substring(u.lastIndexOf("]") + 1).trim()
+      name: u,
+      prop: u,
+      type: $[0],
+      dataType: h,
+      must: s,
+      label: r,
+      description: y
     };
-  });
+  }).filter(Boolean);
 }
 export {
-  g as getFunBody,
-  L as getFunctionFormat,
-  b as getObjType,
-  A as getParametersObj,
-  c as getSonType,
-  w as getString,
-  d as getTypeValue,
-  F as isDefaultType,
-  v as isTypeEqual,
-  T as prettierArrFormat,
-  s as prettierFormat,
-  h as prettierObjFormat,
-  O as setDataType,
-  x as vueFormat
+  S as getFunBody,
+  V as getFunctionFormat,
+  v as getObjType,
+  b as getSonType,
+  I as getString,
+  k as getTypeValue,
+  N as isDefaultType,
+  C as isTypeEqual,
+  q as parseParamString,
+  E as prettierArrFormat,
+  m as prettierFormat,
+  B as prettierObjFormat,
+  R as setDataType,
+  L as vueFormat
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@fangzhongya/vue-archive",
   "private": false,
-  "version": "0.0.31",
+  "version": "0.0.33",
   "type": "module",
   "description ": "vue 组件注释生成文档",
   "author": "fangzhongya ",