@fangzhongya/vue-archive 0.0.36 → 0.0.37

package/dist/node/index.cjs

@@ -3157,7 +3157,21 @@ function getTypeValue(arr) {
   }
 }
 function setDataType(arr) {
-  return arr.join("|") || "any";
+  let ts = "";
+  arr.forEach((v, index) => {
+    v = v.trim();
+    if (v) {
+      if (ts) {
+        ts += " | ";
+      }
+      if (v === "Array") {
+        ts += "Array<any>";
+      } else {
+        ts += v;
+      }
+    }
+  });
+  return ts || "any";
 }
 var splitIgnoringNesting = (str, delimiter) => {
   let bracketStack = [];

package/dist/node/index.js

@@ -3142,7 +3142,21 @@ function getTypeValue(arr) {
   }
 }
 function setDataType(arr) {
-  return arr.join("|") || "any";
+  let ts = "";
+  arr.forEach((v, index) => {
+    v = v.trim();
+    if (v) {
+      if (ts) {
+        ts += " | ";
+      }
+      if (v === "Array") {
+        ts += "Array<any>";
+      } else {
+        ts += v;
+      }
+    }
+  });
+  return ts || "any";
 }
 var splitIgnoringNesting = (str, delimiter) => {
   let bracketStack = [];

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"),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;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const S=require("@fangzhongya/utils/basic/string/toFunction"),w=require("@fangzhongya/utils/basic/string/firstLower");function y(e){return e.replace(/\;(\s|\n\r)*$/,"")}function O(e){return e="let a = "+e,y(e).replace(/^let a = /,"")}function A(e){return y(e)}function x(e,n=""){let t=(e+"").trim().split(/\n/);return t=t.map(r=>n+r),t.join(`
+`)}function b(e=""){e=e.trim();let n=`[\\s|\\n|\\r]*\\{((.|
+|\r)+?)\\}[\\s|\\n|\\r]*`,r=new RegExp("^"+n+"$").exec(e);return r&&r.length>0?b(r[1]):e}const W=["Boolean","Any","String","Number","Array","Object","Function"];function k(e){return W.includes(e)?w.firstLower(e):e}function v(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=v(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 E(e,n){const t=T(e),r=h(n)[0];return r&&r!="any"?t==r:!0}function q(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 B(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 L(e){let n="";return e.forEach((t,r)=>{t=t.trim(),t&&(n&&(n+=" | "),t==="Array"?n+="Array<any>":n+=t)}),n||"any"}const g=(e,n)=>{let t=[],r=[],i="";for(let 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],j=i[0].length,c=t.substring(j).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:m}=C(f),$=h(m);return{name:u,prop:u,type:$[0],dataType:m,must:s,label:r,description:p}}).filter(Boolean)}Object.defineProperty(exports,"getFunctionFormat",{enumerable:!0,get:()=>S.getFunctionFormat});exports.getFunBody=b;exports.getObjType=T;exports.getSonType=h;exports.getString=q;exports.getTypeValue=F;exports.isDefaultType=B;exports.isTypeEqual=E;exports.parseParamString=M;exports.prettierArrFormat=A;exports.prettierFormat=y;exports.prettierObjFormat=O;exports.setDataType=L;exports.vueFormat=x;

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

@@ -3,13 +3,13 @@ import { firstLower as $ } from "@fangzhongya/utils/basic/string/firstLower";
 function h(e) {
   return e.replace(/\;(\s|\n\r)*$/, "");
 }
-function O(e) {
+function E(e) {
   return e = "let a = " + e, h(e).replace(/^let a = /, "");
 }
-function B(e) {
+function v(e) {
   return h(e);
 }
-function E(e, n = "") {
+function B(e, n = "") {
   let t = (e + "").trim().split(/\n/);
   return t = t.map((r) => n + r), t.join(`
 `);
@@ -32,7 +32,7 @@ const S = [
 function w(e) {
   return S.includes(e) ? $(e) : e;
 }
-function F(e) {
+function x(e) {
   let t = new RegExp("^([a-z|A-Z]+)\\<(.+)\\>$").exec(e);
   if (t && t.length > 0)
     return {
@@ -41,7 +41,7 @@ function F(e) {
     };
 }
 function m(e, n) {
-  let t = F(e);
+  let t = x(e);
   t ? (n.push(t.own), t.son && m(t.son, n)) : n.push(e);
 }
 function b(e) {
@@ -49,13 +49,13 @@ function b(e) {
   const n = [];
   return e && m(e, n), n;
 }
-function v(e) {
+function F(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 L(e, n) {
-  const t = v(e), r = b(n)[0];
+  const t = F(e), r = b(n)[0];
   return r && r != "any" ? t == r : !0;
 }
 function C(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 x(e) {
+function A(e) {
   switch ((e[0] || "any").toLowerCase()) {
     case "string":
       return '""';
@@ -78,7 +78,7 @@ function x(e) {
     case "number":
       return "0";
     case "array":
-      let t = x(e.splice(1));
+      let t = A(e.splice(1));
       return t = t == "undefined" ? "" : t, `[${t}]`;
     case "object":
       return "{}";
@@ -91,12 +91,15 @@ function x(e) {
   }
 }
 function R(e) {
-  return e.join("|") || "any";
+  let n = "";
+  return e.forEach((t, r) => {
+    t = t.trim(), t && (n && (n += " | "), t === "Array" ? n += "Array<any>" : n += t);
+  }), n || "any";
 }
 const g = (e, n) => {
   let t = [], r = [], i = "";
-  for (let a = 0; a < e.length; a++) {
-    const s = e[a];
+  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;
@@ -129,19 +132,19 @@ 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();
+    const u = 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));
+    for (let a = 0; a < c.length; a++) {
+      const o = c[a];
+      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 && a > 0) {
+        a == 1 && o !== "]" && o !== ">" && o !== ")" ? (f = "", p = c.substring(0)) : (f = c.substring(0, a + 1).trim(), p = c.substring(a + 1));
         break;
       }
     }
     const { type: k, dataType: y } = W(f), T = b(y);
     return {
-      name: a,
-      prop: a,
+      name: u,
+      prop: u,
       type: T[0],
       dataType: y,
       must: s,
@@ -153,16 +156,16 @@ function q(e) {
 export {
   j as getFunBody,
   M as getFunctionFormat,
-  v as getObjType,
+  F as getObjType,
   b as getSonType,
   C as getString,
-  x as getTypeValue,
+  A as getTypeValue,
   N as isDefaultType,
   L as isTypeEqual,
   q as parseParamString,
-  B as prettierArrFormat,
+  v as prettierArrFormat,
   h as prettierFormat,
-  O as prettierObjFormat,
+  E as prettierObjFormat,
   R as setDataType,
-  E as vueFormat
+  B as vueFormat
 };

package/package.json

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