@fangzhongya/vue-archive 0.0.33 → 0.0.34

package/dist/node/index.cjs

@@ -3166,9 +3166,9 @@ var splitIgnoringNesting = (str, delimiter) => {
   return parts;
 };
 var parseTypeDefinition = (typeDef) => {
-  if (!typeDef || typeDef === "[]") {
+  if (!typeDef) {
     return { type: "any", dataType: ["any"] };
-  } else if (typeDef.startsWith("[") && typeDef.endsWith("]")) {
+  } 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, ",");
@@ -3202,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++) {
@@ -3213,9 +3212,13 @@ 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;
       }
     }

package/dist/node/index.js

@@ -3151,9 +3151,9 @@ var splitIgnoringNesting = (str, delimiter) => {
   return parts;
 };
 var parseTypeDefinition = (typeDef) => {
-  if (!typeDef || typeDef === "[]") {
+  if (!typeDef) {
     return { type: "any", dataType: ["any"] };
-  } else if (typeDef.startsWith("[") && typeDef.endsWith("]")) {
+  } 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, ",");
@@ -3187,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++) {
@@ -3198,9 +3197,13 @@ 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;
       }
     }

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

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

package/package.json

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