@fangzhongya/vue-archive 0.0.32 → 0.0.34

package/dist/node/index.cjs

@@ -3138,35 +3138,63 @@ 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) {
+    return { type: "any", dataType: ["any"] };
+  } else if (typeDef.startsWith("[") && typeDef.endsWith("]") || 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 parseParamString(input) {
-  return input.split(",").map((part) => {
-    const trimmedPart = part.trim();
-    const label = trimmedPart;
+  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();
@@ -3174,7 +3202,6 @@ function parseParamString(input) {
     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++) {
@@ -3185,18 +3212,23 @@ function parseParamString(input) {
         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);
+        if (i == 1 && char !== "]" && char !== ">" && char !== ")") {
+          t = "";
+          description = typeDef.substring(0);
+        } else {
+          t = typeDef.substring(0, i + 1).trim();
+          description = typeDef.substring(i + 1);
+        }
         break;
       }
     }
-    let tarr = getSonType(getType(t));
+    const { type, dataType } = parseTypeDefinition(t);
+    const tarr = getSonType(dataType);
     return {
       name,
       prop: name,
       type: tarr[0],
-      dataType: tarr,
+      dataType,
       must,
       label,
       description
@@ -3421,7 +3453,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];
@@ -3454,7 +3486,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,35 +3123,63 @@ 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) {
+    return { type: "any", dataType: ["any"] };
+  } else if (typeDef.startsWith("[") && typeDef.endsWith("]") || 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 parseParamString(input) {
-  return input.split(",").map((part) => {
-    const trimmedPart = part.trim();
-    const label = trimmedPart;
+  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();
@@ -3159,7 +3187,6 @@ function parseParamString(input) {
     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++) {
@@ -3170,18 +3197,23 @@ function parseParamString(input) {
         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);
+        if (i == 1 && char !== "]" && char !== ">" && char !== ")") {
+          t = "";
+          description = typeDef.substring(0);
+        } else {
+          t = typeDef.substring(0, i + 1).trim();
+          description = typeDef.substring(i + 1);
+        }
         break;
       }
     }
-    let tarr = getSonType(getType(t));
+    const { type, dataType } = parseTypeDefinition(t);
+    const tarr = getSonType(dataType);
     return {
       name,
       prop: name,
       type: tarr[0],
-      dataType: tarr,
+      dataType,
       must,
       label,
       description
@@ -3406,7 +3438,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];
@@ -3439,7 +3471,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/util.cjs

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

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

@@ -37,14 +37,6 @@ export declare function getString(st: unknown): string;
 export declare function isDefaultType(st: string): string;
 export declare function getTypeValue(arr: string[]): string;
 export declare function setDataType(arr: string[]): string;
-export declare function getParametersObj(cs: string): {
-    label: string;
-    prop: string;
-    must: boolean;
-    type: string;
-    dataType: string[];
-    description: string;
-}[];
 export declare function parseParamString(input: string): Array<{
     name: string;
     prop: string;

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

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

package/package.json

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