@fangzhongya/vue-archive 0.0.76 → 0.0.78

package/dist/node/index.cjs

@@ -3334,84 +3334,6 @@ function conversionType(type) {
     return type;
   }
 }
-function sonType(type) {
-  let reg = new RegExp("^([a-z|A-Z]+)\\<(.+)\\>$");
-  let vts = reg.exec(type);
-  if (vts && vts.length > 0) {
-    return {
-      own: conversionType(vts[1]),
-      son: vts[2]
-    };
-  }
-}
-function sonTypes(type, arr) {
-  let obj2 = sonType(type);
-  if (obj2) {
-    arr.push(obj2.own);
-    if (obj2.son) {
-      sonTypes(obj2.son, arr);
-    }
-  } else {
-    arr.push(type);
-  }
-}
-function getSonType(type) {
-  if (type instanceof Array) {
-    type = type[0];
-  }
-  const arr = [];
-  if (type) {
-    sonTypes(type, arr);
-  }
-  return arr;
-}
-function getTypeValue(arr) {
-  const t = arr[0] || "any";
-  let type = t.split("<")[0];
-  type = type.trim().toLowerCase();
-  switch (type) {
-    case "string":
-      return '""';
-    case "boolean":
-      return "false";
-    case "number":
-      return "0";
-    case "array":
-      let i = t.indexOf("<");
-      let st = t.substring(t.indexOf("<") + 1, t.length - 1) || "";
-      if (i == -1) {
-        st = "any";
-      }
-      let v = getTypeValue(parseTypeDefinition(st).dataType);
-      v = v == "undefined" ? "" : v;
-      return `[${v}]`;
-    case "object":
-      return "{}";
-    case "function":
-      return "()=>{}";
-    case "any":
-      return '""';
-    default:
-      return "undefined";
-  }
-}
-function setDataType(arr) {
-  let ts2 = "";
-  arr.forEach((v, index) => {
-    v = v.trim();
-    if (v) {
-      if (ts2) {
-        ts2 += " | ";
-      }
-      if (v === "Array") {
-        ts2 += "Array<any>";
-      } else {
-        ts2 += v;
-      }
-    }
-  });
-  return ts2 || "any";
-}
 var splitIgnoringNesting = (str, delimiter) => {
   let bracketStack = [];
   let parts = [];
@@ -3436,31 +3358,63 @@ var splitIgnoringNesting = (str, delimiter) => {
   }
   return parts;
 };
+var splitIgnoring = (str) => {
+  let bracketStack = [];
+  let isArr = false;
+  let is = false;
+  let top = 0;
+  for (let i = 0; i < str.length; i++) {
+    const char = str[i];
+    if (char === "[" || char === "<" || char === "(") {
+      is = true;
+      bracketStack.push(char);
+      if (char == "[") {
+        isArr = true;
+      }
+      if (top == 0) {
+        top = i;
+      }
+    } else if (char === "]" && bracketStack[bracketStack.length - 1] === "[" || char === ">" && bracketStack[bracketStack.length - 1] === "<" || char === ")" && bracketStack[bracketStack.length - 1] === "(") {
+      bracketStack.pop();
+    }
+    if (is && bracketStack.length === 0) {
+      if (isArr) {
+        if (top + 1 == i) {
+          return {
+            top: "Array",
+            type: str.substring(0, top)
+          };
+        }
+      }
+      return {
+        top: str.substring(0, top),
+        type: str.substring(top + 1, i)
+      };
+    }
+  }
+  return {
+    top: str,
+    type: ""
+  };
+};
 var parseTypeDefinition = (typeDef) => {
   if (!typeDef) {
-    return { type: "any", dataType: ["any"] };
+    return ["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"] };
+    if (!inner) return ["any"];
     const types = splitIgnoringNesting(inner, ",");
-    return {
-      type: types[0] || "any",
-      dataType: types
-    };
+    return types;
+  } else if (typeDef.startsWith("{") && typeDef.endsWith("}")) {
+    return ["Object"];
   } else if (typeDef.startsWith("<") && typeDef.endsWith(">")) {
     const inner = typeDef.slice(1, -1).trim();
-    if (!inner) return { type: "any", dataType: ["any"] };
+    if (!inner) return ["any"];
     const types = splitIgnoringNesting(inner, "|");
-    return {
-      type: types[0] || "any",
-      dataType: types
-    };
+    return types;
   } else {
     const types = splitIgnoringNesting(typeDef, ",");
-    return {
-      type: types[0] || "any",
-      dataType: types
-    };
+    return types;
   }
 };
 function parseParamString(input) {
@@ -3478,13 +3432,13 @@ function parseParamString(input) {
     let description = "";
     for (let i = 0; i < typeDef.length; i++) {
       const char = typeDef[i];
-      if (char === "[" || char === "<" || char === "(") {
+      if (char === "[" || char === "<" || char === "(" || char === "{") {
         bracketStack.push(char);
-      } else if (char === "]" && bracketStack[bracketStack.length - 1] === "[" || char === ">" && bracketStack[bracketStack.length - 1] === "<" || char === ")" && bracketStack[bracketStack.length - 1] === "(") {
+      } else if (char === "]" && bracketStack[bracketStack.length - 1] === "[" || char === ">" && bracketStack[bracketStack.length - 1] === "<" || char === "}" && bracketStack[bracketStack.length - 1] === "{" || char === ")" && bracketStack[bracketStack.length - 1] === "(") {
         bracketStack.pop();
       }
       if (bracketStack.length === 0 && i > 0) {
-        if (i == 1 && char !== "]" && char !== ">" && char !== ")") {
+        if (i == 1 && char !== "]" && char !== ">" && char !== "}" && char !== ")") {
           t = "";
           description = typeDef.substring(0);
         } else {
@@ -3494,19 +3448,105 @@ function parseParamString(input) {
         break;
       }
     }
-    const { type, dataType } = parseTypeDefinition(t);
-    const tarr = getSonType(dataType);
+    const dataType = parseTypeDefinition(t);
+    const tarr = getDataType(dataType);
     return {
       name,
       prop: name,
-      type: tarr[0],
-      dataType,
+      type: getDataTypeType(tarr),
+      dataType: tarr,
       must,
       label,
       description
     };
   }).filter(Boolean);
 }
+function setDataType(arr) {
+  const v = arr.map((v2) => {
+    if (typeof v2 == "string") {
+      if (v2.toLowerCase() === "array") {
+        return "Array<any>";
+      }
+      return v2;
+    } else {
+      if (v2.children && v2.children.length > 0) {
+        const vz = setDataType(v2.children);
+        return v2.value + "<" + vz + ">";
+      } else {
+        const z = v2.value;
+        if (z.toLowerCase() === "array") {
+          return "Array<any>";
+        }
+        return z;
+      }
+    }
+  }).join(" | ");
+  return v || "any";
+}
+function getDataType(arr) {
+  const value = [];
+  arr.forEach((v) => {
+    const ss = splitIgnoring(v);
+    if (ss.type) {
+      const dataType = parseTypeDefinition(ss.type);
+      const children = getDataType(dataType);
+      value.push({
+        label: v,
+        value: ss.top,
+        children
+      });
+    } else {
+      value.push(ss.top);
+    }
+  });
+  return value;
+}
+function getTypeName(type) {
+  let t = "";
+  if (typeof type == "string") {
+    t = type;
+  } else {
+    t = type.value;
+  }
+  return conversionType(t || "any");
+}
+function getDataTypeType(dataType) {
+  const type = dataType[0] || "any";
+  return getTypeName(type);
+}
+function getTypeValue(arr) {
+  const dataType = arr[0];
+  let type = getDataTypeType(arr);
+  switch (type) {
+    case "string":
+      return '""';
+    case "boolean":
+      return "false";
+    case "number":
+      return "0";
+    case "array":
+      if (typeof dataType === "string") {
+        return `[]`;
+      } else {
+        let st = dataType.children;
+        if (st && st.length > 0) {
+          let v = getTypeValue([st[0]]);
+          v = v == "undefined" ? "" : v;
+          return `[${v}]`;
+        } else {
+          return `[]`;
+        }
+      }
+    case "object":
+      return "{}";
+    case "function":
+      return "()=>{}";
+    case "any":
+      return '""';
+    default:
+      return "undefined";
+  }
+}
 
 // packages/components/use/code.ts
 var keywords = ["class"];
@@ -3759,11 +3799,8 @@ function setValStringify(v, key, propsText) {
   }
 }
 function getSpecType(val) {
-  let ds = parseTypeDefinition(val?.type);
-  let tarr = ds.dataType;
-  let type = ds.type;
-  type = type.split("<")[0];
-  type = type.trim().toLowerCase();
+  let tarr = getDataType(parseTypeDefinition(val?.type));
+  let type = getDataTypeType(tarr);
   if (tarr.length > 1) {
     type = "any";
   }
@@ -3799,7 +3836,7 @@ function getSpecType(val) {
 }
 function getObjValue(d, type) {
   try {
-    if (type?.toLowerCase() == "function") {
+    if (type == "function") {
       if (typeof d === "string") {
         if (/^\((.|\n|\r)*\)$/.test(d)) {
           d = d.substring(1, d.length - 1);
@@ -3820,10 +3857,10 @@ function getDefaultValue(obj2, is = true) {
   const v = getTypeValue(vo.dataType);
   if (is) {
     const d = (obj2.default || "").trim();
-    return getObjValue(d || v, vo.dataType[0]);
+    return getObjValue(d || v, getDataTypeType(vo.dataType));
   } else {
     const d = (obj2.default || "").trim();
-    return getObjValue(d, vo.dataType[0]);
+    return getObjValue(d, getDataTypeType(vo.dataType));
   }
 }
 

package/dist/node/index.js

@@ -3316,84 +3316,6 @@ function conversionType(type) {
     return type;
   }
 }
-function sonType(type) {
-  let reg = new RegExp("^([a-z|A-Z]+)\\<(.+)\\>$");
-  let vts = reg.exec(type);
-  if (vts && vts.length > 0) {
-    return {
-      own: conversionType(vts[1]),
-      son: vts[2]
-    };
-  }
-}
-function sonTypes(type, arr) {
-  let obj2 = sonType(type);
-  if (obj2) {
-    arr.push(obj2.own);
-    if (obj2.son) {
-      sonTypes(obj2.son, arr);
-    }
-  } else {
-    arr.push(type);
-  }
-}
-function getSonType(type) {
-  if (type instanceof Array) {
-    type = type[0];
-  }
-  const arr = [];
-  if (type) {
-    sonTypes(type, arr);
-  }
-  return arr;
-}
-function getTypeValue(arr) {
-  const t = arr[0] || "any";
-  let type = t.split("<")[0];
-  type = type.trim().toLowerCase();
-  switch (type) {
-    case "string":
-      return '""';
-    case "boolean":
-      return "false";
-    case "number":
-      return "0";
-    case "array":
-      let i = t.indexOf("<");
-      let st = t.substring(t.indexOf("<") + 1, t.length - 1) || "";
-      if (i == -1) {
-        st = "any";
-      }
-      let v = getTypeValue(parseTypeDefinition(st).dataType);
-      v = v == "undefined" ? "" : v;
-      return `[${v}]`;
-    case "object":
-      return "{}";
-    case "function":
-      return "()=>{}";
-    case "any":
-      return '""';
-    default:
-      return "undefined";
-  }
-}
-function setDataType(arr) {
-  let ts2 = "";
-  arr.forEach((v, index) => {
-    v = v.trim();
-    if (v) {
-      if (ts2) {
-        ts2 += " | ";
-      }
-      if (v === "Array") {
-        ts2 += "Array<any>";
-      } else {
-        ts2 += v;
-      }
-    }
-  });
-  return ts2 || "any";
-}
 var splitIgnoringNesting = (str, delimiter) => {
   let bracketStack = [];
   let parts = [];
@@ -3418,31 +3340,63 @@ var splitIgnoringNesting = (str, delimiter) => {
   }
   return parts;
 };
+var splitIgnoring = (str) => {
+  let bracketStack = [];
+  let isArr = false;
+  let is = false;
+  let top = 0;
+  for (let i = 0; i < str.length; i++) {
+    const char = str[i];
+    if (char === "[" || char === "<" || char === "(") {
+      is = true;
+      bracketStack.push(char);
+      if (char == "[") {
+        isArr = true;
+      }
+      if (top == 0) {
+        top = i;
+      }
+    } else if (char === "]" && bracketStack[bracketStack.length - 1] === "[" || char === ">" && bracketStack[bracketStack.length - 1] === "<" || char === ")" && bracketStack[bracketStack.length - 1] === "(") {
+      bracketStack.pop();
+    }
+    if (is && bracketStack.length === 0) {
+      if (isArr) {
+        if (top + 1 == i) {
+          return {
+            top: "Array",
+            type: str.substring(0, top)
+          };
+        }
+      }
+      return {
+        top: str.substring(0, top),
+        type: str.substring(top + 1, i)
+      };
+    }
+  }
+  return {
+    top: str,
+    type: ""
+  };
+};
 var parseTypeDefinition = (typeDef) => {
   if (!typeDef) {
-    return { type: "any", dataType: ["any"] };
+    return ["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"] };
+    if (!inner) return ["any"];
     const types = splitIgnoringNesting(inner, ",");
-    return {
-      type: types[0] || "any",
-      dataType: types
-    };
+    return types;
+  } else if (typeDef.startsWith("{") && typeDef.endsWith("}")) {
+    return ["Object"];
   } else if (typeDef.startsWith("<") && typeDef.endsWith(">")) {
     const inner = typeDef.slice(1, -1).trim();
-    if (!inner) return { type: "any", dataType: ["any"] };
+    if (!inner) return ["any"];
     const types = splitIgnoringNesting(inner, "|");
-    return {
-      type: types[0] || "any",
-      dataType: types
-    };
+    return types;
   } else {
     const types = splitIgnoringNesting(typeDef, ",");
-    return {
-      type: types[0] || "any",
-      dataType: types
-    };
+    return types;
   }
 };
 function parseParamString(input) {
@@ -3460,13 +3414,13 @@ function parseParamString(input) {
     let description = "";
     for (let i = 0; i < typeDef.length; i++) {
       const char = typeDef[i];
-      if (char === "[" || char === "<" || char === "(") {
+      if (char === "[" || char === "<" || char === "(" || char === "{") {
         bracketStack.push(char);
-      } else if (char === "]" && bracketStack[bracketStack.length - 1] === "[" || char === ">" && bracketStack[bracketStack.length - 1] === "<" || char === ")" && bracketStack[bracketStack.length - 1] === "(") {
+      } else if (char === "]" && bracketStack[bracketStack.length - 1] === "[" || char === ">" && bracketStack[bracketStack.length - 1] === "<" || char === "}" && bracketStack[bracketStack.length - 1] === "{" || char === ")" && bracketStack[bracketStack.length - 1] === "(") {
         bracketStack.pop();
       }
       if (bracketStack.length === 0 && i > 0) {
-        if (i == 1 && char !== "]" && char !== ">" && char !== ")") {
+        if (i == 1 && char !== "]" && char !== ">" && char !== "}" && char !== ")") {
           t = "";
           description = typeDef.substring(0);
         } else {
@@ -3476,19 +3430,105 @@ function parseParamString(input) {
         break;
       }
     }
-    const { type, dataType } = parseTypeDefinition(t);
-    const tarr = getSonType(dataType);
+    const dataType = parseTypeDefinition(t);
+    const tarr = getDataType(dataType);
     return {
       name,
       prop: name,
-      type: tarr[0],
-      dataType,
+      type: getDataTypeType(tarr),
+      dataType: tarr,
       must,
       label,
       description
     };
   }).filter(Boolean);
 }
+function setDataType(arr) {
+  const v = arr.map((v2) => {
+    if (typeof v2 == "string") {
+      if (v2.toLowerCase() === "array") {
+        return "Array<any>";
+      }
+      return v2;
+    } else {
+      if (v2.children && v2.children.length > 0) {
+        const vz = setDataType(v2.children);
+        return v2.value + "<" + vz + ">";
+      } else {
+        const z = v2.value;
+        if (z.toLowerCase() === "array") {
+          return "Array<any>";
+        }
+        return z;
+      }
+    }
+  }).join(" | ");
+  return v || "any";
+}
+function getDataType(arr) {
+  const value = [];
+  arr.forEach((v) => {
+    const ss = splitIgnoring(v);
+    if (ss.type) {
+      const dataType = parseTypeDefinition(ss.type);
+      const children = getDataType(dataType);
+      value.push({
+        label: v,
+        value: ss.top,
+        children
+      });
+    } else {
+      value.push(ss.top);
+    }
+  });
+  return value;
+}
+function getTypeName(type) {
+  let t = "";
+  if (typeof type == "string") {
+    t = type;
+  } else {
+    t = type.value;
+  }
+  return conversionType(t || "any");
+}
+function getDataTypeType(dataType) {
+  const type = dataType[0] || "any";
+  return getTypeName(type);
+}
+function getTypeValue(arr) {
+  const dataType = arr[0];
+  let type = getDataTypeType(arr);
+  switch (type) {
+    case "string":
+      return '""';
+    case "boolean":
+      return "false";
+    case "number":
+      return "0";
+    case "array":
+      if (typeof dataType === "string") {
+        return `[]`;
+      } else {
+        let st = dataType.children;
+        if (st && st.length > 0) {
+          let v = getTypeValue([st[0]]);
+          v = v == "undefined" ? "" : v;
+          return `[${v}]`;
+        } else {
+          return `[]`;
+        }
+      }
+    case "object":
+      return "{}";
+    case "function":
+      return "()=>{}";
+    case "any":
+      return '""';
+    default:
+      return "undefined";
+  }
+}
 
 // packages/components/use/code.ts
 var keywords = ["class"];
@@ -3741,11 +3781,8 @@ function setValStringify(v, key, propsText) {
   }
 }
 function getSpecType(val) {
-  let ds = parseTypeDefinition(val?.type);
-  let tarr = ds.dataType;
-  let type = ds.type;
-  type = type.split("<")[0];
-  type = type.trim().toLowerCase();
+  let tarr = getDataType(parseTypeDefinition(val?.type));
+  let type = getDataTypeType(tarr);
   if (tarr.length > 1) {
     type = "any";
   }
@@ -3781,7 +3818,7 @@ function getSpecType(val) {
 }
 function getObjValue(d, type) {
   try {
-    if (type?.toLowerCase() == "function") {
+    if (type == "function") {
       if (typeof d === "string") {
         if (/^\((.|\n|\r)*\)$/.test(d)) {
           d = d.substring(1, d.length - 1);
@@ -3802,10 +3839,10 @@ function getDefaultValue(obj2, is = true) {
   const v = getTypeValue(vo.dataType);
   if (is) {
     const d = (obj2.default || "").trim();
-    return getObjValue(d || v, vo.dataType[0]);
+    return getObjValue(d || v, getDataTypeType(vo.dataType));
   } else {
     const d = (obj2.default || "").trim();
-    return getObjValue(d, vo.dataType[0]);
+    return getObjValue(d, getDataTypeType(vo.dataType));
   }
 }