@fangzhongya/vue-archive 0.0.52 → 0.0.55

package/dist/node/index.cjs

@@ -2297,7 +2297,7 @@ function getLocalTextComponents(u) {
 var props = {
   name(obj) {
     if (obj.name) {
-      return obj.name.name;
+      return obj.name.name + obj.name.description;
     } else if (obj.props) {
       return obj.props.name;
     } else {
@@ -2306,7 +2306,7 @@ var props = {
   },
   description(obj) {
     if (obj.description && obj.description.name) {
-      return obj.description.name;
+      return obj.description.name + obj.description.description;
     } else if (obj.descriptions) {
       return obj.descriptions;
     } else if (obj.props) {
@@ -2317,7 +2317,7 @@ var props = {
   },
   type(obj) {
     if (obj.type) {
-      return obj.type.name;
+      return obj.type.type || obj.type.name + obj.type.description;
     } else if (obj.props) {
       return obj.props.type;
     } else {
@@ -2326,7 +2326,7 @@ var props = {
   },
   selectable(obj) {
     if (obj.selectable) {
-      return obj.selectable.description || obj.selectable.name;
+      return obj.selectable.name + obj.selectable.description;
     } else if (obj.props) {
       return obj.props.selectable;
     } else {
@@ -2335,7 +2335,7 @@ var props = {
   },
   default(obj) {
     if (obj.default) {
-      return obj.default.description || obj.default.name;
+      return obj.default.name + obj.default.description;
     } else if (obj.props) {
       return obj.props.default || "";
     } else {
@@ -2348,18 +2348,27 @@ var props = {
       if (t) {
         t = `[${t}]`;
       }
-      return t + (obj.return.description || obj.return.name);
+      return t + (obj.return.name + obj.return.description);
     } else if (obj.props) {
       return obj.props.return;
     } else {
       return "";
     }
+  },
+  required(obj) {
+    if (obj.required) {
+      return obj.required.name + obj.required.description;
+    } else if (obj.props) {
+      return obj.props.required;
+    } else {
+      return "";
+    }
   }
 };
 var emits = {
   name(obj) {
     if (obj.name) {
-      return obj.name.name;
+      return obj.name.name + obj.name.description;
     } else if (obj.emits) {
       return obj.emits.name;
     } else {
@@ -2368,7 +2377,7 @@ var emits = {
   },
   description(obj) {
     if (obj.description && obj.description.name) {
-      return obj.description.name;
+      return obj.description.name + obj.description.description;
     } else if (obj.descriptions) {
       return obj.descriptions;
     } else if (obj.emits) {
@@ -2379,7 +2388,7 @@ var emits = {
   },
   selectable(obj) {
     if (obj.selectable) {
-      return obj.selectable.description || obj.selectable.name;
+      return obj.selectable.name + obj.selectable.description;
     } else if (obj.emits) {
       return obj.emits.selectable;
     } else {
@@ -2390,7 +2399,7 @@ var emits = {
 var expose = {
   name(obj) {
     if (obj.name) {
-      return obj.name.name;
+      return obj.name.name + obj.name.description;
     } else if (obj.expose) {
       return obj.expose.name;
     } else {
@@ -2399,7 +2408,7 @@ var expose = {
   },
   description(obj) {
     if (obj.description && obj.description.name) {
-      return obj.description.name;
+      return obj.description.name + obj.description.description;
     } else if (obj.descriptions) {
       return obj.descriptions;
     } else if (obj.expose) {
@@ -2410,7 +2419,7 @@ var expose = {
   },
   selectable(obj) {
     if (obj.selectable) {
-      return obj.selectable.description || obj.selectable.name;
+      return obj.selectable.name + obj.selectable.description;
     } else if (obj.expose) {
       return obj.expose.selectable;
     } else {
@@ -2419,7 +2428,7 @@ var expose = {
   },
   type(obj) {
     if (obj.type) {
-      return obj.type.description || obj.type.name;
+      return obj.type.type || obj.type.name + obj.type.description;
     } else if (obj.expose) {
       return obj.expose.type;
     } else {
@@ -2432,7 +2441,7 @@ var expose = {
       if (t) {
         t = `[${t}]`;
       }
-      return t + (obj.return.description || obj.return.name);
+      return t + (obj.return.name + obj.return.description);
     } else if (obj.expose) {
       return obj.expose.return;
     } else {
@@ -2443,7 +2452,7 @@ var expose = {
 var slot = {
   name(obj) {
     if (obj.name) {
-      return obj.name.name;
+      return obj.name.name + obj.name.description;
     } else if (obj.slot) {
       return obj.slot.name;
     } else {
@@ -2452,7 +2461,7 @@ var slot = {
   },
   description(obj) {
     if (obj.description && obj.description.name) {
-      return obj.description.name;
+      return obj.description.name + obj.description.description;
     } else if (obj.descriptions) {
       return obj.descriptions;
     } else if (obj.slot) {
@@ -2463,7 +2472,7 @@ var slot = {
   },
   selectable(obj) {
     if (obj.selectable) {
-      return obj.selectable.description || obj.selectable.name;
+      return obj.selectable.name + obj.selectable.description;
     } else if (obj.slot) {
       return obj.slot.selectable;
     } else {
@@ -3170,7 +3179,9 @@ function getSonType(type) {
   return arr;
 }
 function getTypeValue(arr) {
-  const type = (arr[0] || "any").toLowerCase();
+  const t = arr[0] || "any";
+  let type = t.split("<")[0];
+  type = type.trim().toLowerCase();
   switch (type) {
     case "string":
       return '""';
@@ -3179,7 +3190,12 @@ function getTypeValue(arr) {
     case "number":
       return "0";
     case "array":
-      let v = getTypeValue(arr.splice(1));
+      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":
@@ -3371,9 +3387,13 @@ function getHmtl(propsname, param, value, slotValue, propsText, exposeText) {
       sarr.push(
         `// ${sp.description} ${sp.name}: {${sp.type}} (${sp.selectable})`
       );
-      if (typeof val == "function") {
+      if (typeof val == "function" || t.dataType.length == 1 && t.type == "function" && val) {
         sarr.push(
-          "const " + key + " = " + getFunctionBody(val, key, propsText)
+          "const " + key + " = " + getFunctionBody(
+            val,
+            key,
+            propsText
+          )
         );
       } else {
         if (is) {
@@ -3438,13 +3458,22 @@ function getHmtl(propsname, param, value, slotValue, propsText, exposeText) {
         }
       });
       if (v.type === "function") {
-        sarr.push(
-          `const ${m} = refDom.value?.${v.name}(${cs.join(", ")})`
-        );
+        if (s.return) {
+          sarr.push(
+            `const ${m} = refDom.value?.${v.name}(${cs.join(
+              ", "
+            )})`
+          );
+        } else {
+          sarr.push(`refDom.value?.${v.name}(${cs.join(", ")})`);
+        }
+        if (s.return) {
+          sarr.push(`console.log('${s.return}', ${m})`);
+        }
       } else {
         sarr.push(`const ${m} = refDom.value?.${v.name}`);
+        sarr.push(`console.log('${s.type || s.name}', ${m})`);
       }
-      sarr.push(`console.log('"${s.type}"', ${m})`);
     });
   }
   if (tarr.length > 0) {
@@ -3502,7 +3531,7 @@ function funstr(v) {
     let body = `{
 ${vueFormat(getFunBody(st.body), "   ")}
 }`;
-    return `function (${st.param}) ${body}`;
+    return `function (${st.param.split(",").map((v2) => v2 + ":any").join(",")}) ${body}`;
   } else {
     return "undefined";
   }
@@ -3530,11 +3559,7 @@ function getChange(str) {
 function setValStringify(v, key, propsText) {
   const text = propsText ? propsText[key] : "";
   if (text) {
-    if (typeof text == "string") {
-      return getObjValue(text);
-    } else {
-      return text;
-    }
+    return text;
   } else {
     if (typeof v == "string") {
       return getChange(v + "");
@@ -3572,7 +3597,6 @@ function getSpecType(val) {
       type = "choice";
     } else {
       if (type != "function" && arr.length > 1) {
-        console.log("type1", type, val);
         type = "select";
       }
     }
@@ -3676,6 +3700,7 @@ function getObj2(v) {
   let description = v.description;
   let defaults = v.default;
   let selectable = "";
+  let required = "";
   if (tag == "default") {
     name = name.trim();
     name = getDefault(name) || name;
@@ -3701,7 +3726,12 @@ function getObj2(v) {
       description = description.replace(rtr[0], "");
     }
   }
+  if (name.endsWith("*")) {
+    required = "*";
+    name = name.substring(0, name.length - 1);
+  }
   v.name = name;
+  v.required = required;
   v.default = defaults || "";
   v.description = description;
   v.selectable = selectable;
@@ -3746,6 +3776,7 @@ function setProps(obj) {
     "name",
     "type",
     "default",
+    "required",
     "selectable",
     "description",
     "descriptions",
@@ -3949,6 +3980,16 @@ var tprops = [
     label: "\u9ED8\u8BA4\u503C",
     prop: "default",
     formatter: props.default
+  },
+  {
+    label: "\u5FC5\u4F20",
+    prop: "required",
+    formatter: props.required
+  },
+  {
+    label: "\u65B9\u6CD5\u8FD4\u56DE\u503C",
+    prop: "return",
+    formatter: props.return
   }
 ];
 var temits = [
@@ -3986,9 +4027,16 @@ var texpose = [
   },
   {
     label: "\u8FD4\u56DE\u503C",
+    prop: "return",
+    formatter(obj) {
+      return expose.return(obj) || obj.expose.default || "";
+    }
+  },
+  {
+    label: "\u7C7B\u578B",
     prop: "type",
     formatter(obj) {
-      return expose.return(obj) ?? expose.type(obj);
+      return expose.type(obj) || "function";
     }
   }
 ];
@@ -4137,7 +4185,7 @@ function setVue(propsname, param, url) {
   res.forEach((v) => {
     exposeText[v.name] = {
       name: v.name,
-      type: "function"
+      type: v.type || v.default || "function"
     };
   });
   const html = getHmtl(propsname, param, propsObj, slotValue, {}, exposeText);
@@ -4219,9 +4267,9 @@ async function getCompoData(value) {
 function setValue(data, item, index, key) {
   let v;
   if (item.formatter) {
-    v = item.formatter(data, item, index, key);
+    v = item.formatter(data, item, index, key) || "";
   } else if (item.prop) {
-    v = data[item.prop];
+    v = data[item.prop] || "";
   } else {
     v = "";
   }

package/dist/node/index.js

@@ -2282,7 +2282,7 @@ function getLocalTextComponents(u) {
 var props = {
   name(obj) {
     if (obj.name) {
-      return obj.name.name;
+      return obj.name.name + obj.name.description;
     } else if (obj.props) {
       return obj.props.name;
     } else {
@@ -2291,7 +2291,7 @@ var props = {
   },
   description(obj) {
     if (obj.description && obj.description.name) {
-      return obj.description.name;
+      return obj.description.name + obj.description.description;
     } else if (obj.descriptions) {
       return obj.descriptions;
     } else if (obj.props) {
@@ -2302,7 +2302,7 @@ var props = {
   },
   type(obj) {
     if (obj.type) {
-      return obj.type.name;
+      return obj.type.type || obj.type.name + obj.type.description;
     } else if (obj.props) {
       return obj.props.type;
     } else {
@@ -2311,7 +2311,7 @@ var props = {
   },
   selectable(obj) {
     if (obj.selectable) {
-      return obj.selectable.description || obj.selectable.name;
+      return obj.selectable.name + obj.selectable.description;
     } else if (obj.props) {
       return obj.props.selectable;
     } else {
@@ -2320,7 +2320,7 @@ var props = {
   },
   default(obj) {
     if (obj.default) {
-      return obj.default.description || obj.default.name;
+      return obj.default.name + obj.default.description;
     } else if (obj.props) {
       return obj.props.default || "";
     } else {
@@ -2333,18 +2333,27 @@ var props = {
       if (t) {
         t = `[${t}]`;
       }
-      return t + (obj.return.description || obj.return.name);
+      return t + (obj.return.name + obj.return.description);
     } else if (obj.props) {
       return obj.props.return;
     } else {
       return "";
     }
+  },
+  required(obj) {
+    if (obj.required) {
+      return obj.required.name + obj.required.description;
+    } else if (obj.props) {
+      return obj.props.required;
+    } else {
+      return "";
+    }
   }
 };
 var emits = {
   name(obj) {
     if (obj.name) {
-      return obj.name.name;
+      return obj.name.name + obj.name.description;
     } else if (obj.emits) {
       return obj.emits.name;
     } else {
@@ -2353,7 +2362,7 @@ var emits = {
   },
   description(obj) {
     if (obj.description && obj.description.name) {
-      return obj.description.name;
+      return obj.description.name + obj.description.description;
     } else if (obj.descriptions) {
       return obj.descriptions;
     } else if (obj.emits) {
@@ -2364,7 +2373,7 @@ var emits = {
   },
   selectable(obj) {
     if (obj.selectable) {
-      return obj.selectable.description || obj.selectable.name;
+      return obj.selectable.name + obj.selectable.description;
     } else if (obj.emits) {
       return obj.emits.selectable;
     } else {
@@ -2375,7 +2384,7 @@ var emits = {
 var expose = {
   name(obj) {
     if (obj.name) {
-      return obj.name.name;
+      return obj.name.name + obj.name.description;
     } else if (obj.expose) {
       return obj.expose.name;
     } else {
@@ -2384,7 +2393,7 @@ var expose = {
   },
   description(obj) {
     if (obj.description && obj.description.name) {
-      return obj.description.name;
+      return obj.description.name + obj.description.description;
     } else if (obj.descriptions) {
       return obj.descriptions;
     } else if (obj.expose) {
@@ -2395,7 +2404,7 @@ var expose = {
   },
   selectable(obj) {
     if (obj.selectable) {
-      return obj.selectable.description || obj.selectable.name;
+      return obj.selectable.name + obj.selectable.description;
     } else if (obj.expose) {
       return obj.expose.selectable;
     } else {
@@ -2404,7 +2413,7 @@ var expose = {
   },
   type(obj) {
     if (obj.type) {
-      return obj.type.description || obj.type.name;
+      return obj.type.type || obj.type.name + obj.type.description;
     } else if (obj.expose) {
       return obj.expose.type;
     } else {
@@ -2417,7 +2426,7 @@ var expose = {
       if (t) {
         t = `[${t}]`;
       }
-      return t + (obj.return.description || obj.return.name);
+      return t + (obj.return.name + obj.return.description);
     } else if (obj.expose) {
       return obj.expose.return;
     } else {
@@ -2428,7 +2437,7 @@ var expose = {
 var slot = {
   name(obj) {
     if (obj.name) {
-      return obj.name.name;
+      return obj.name.name + obj.name.description;
     } else if (obj.slot) {
       return obj.slot.name;
     } else {
@@ -2437,7 +2446,7 @@ var slot = {
   },
   description(obj) {
     if (obj.description && obj.description.name) {
-      return obj.description.name;
+      return obj.description.name + obj.description.description;
     } else if (obj.descriptions) {
       return obj.descriptions;
     } else if (obj.slot) {
@@ -2448,7 +2457,7 @@ var slot = {
   },
   selectable(obj) {
     if (obj.selectable) {
-      return obj.selectable.description || obj.selectable.name;
+      return obj.selectable.name + obj.selectable.description;
     } else if (obj.slot) {
       return obj.slot.selectable;
     } else {
@@ -3155,7 +3164,9 @@ function getSonType(type) {
   return arr;
 }
 function getTypeValue(arr) {
-  const type = (arr[0] || "any").toLowerCase();
+  const t = arr[0] || "any";
+  let type = t.split("<")[0];
+  type = type.trim().toLowerCase();
   switch (type) {
     case "string":
       return '""';
@@ -3164,7 +3175,12 @@ function getTypeValue(arr) {
     case "number":
       return "0";
     case "array":
-      let v = getTypeValue(arr.splice(1));
+      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":
@@ -3356,9 +3372,13 @@ function getHmtl(propsname, param, value, slotValue, propsText, exposeText) {
       sarr.push(
         `// ${sp.description} ${sp.name}: {${sp.type}} (${sp.selectable})`
       );
-      if (typeof val == "function") {
+      if (typeof val == "function" || t.dataType.length == 1 && t.type == "function" && val) {
         sarr.push(
-          "const " + key + " = " + getFunctionBody(val, key, propsText)
+          "const " + key + " = " + getFunctionBody(
+            val,
+            key,
+            propsText
+          )
         );
       } else {
         if (is) {
@@ -3423,13 +3443,22 @@ function getHmtl(propsname, param, value, slotValue, propsText, exposeText) {
         }
       });
       if (v.type === "function") {
-        sarr.push(
-          `const ${m} = refDom.value?.${v.name}(${cs.join(", ")})`
-        );
+        if (s.return) {
+          sarr.push(
+            `const ${m} = refDom.value?.${v.name}(${cs.join(
+              ", "
+            )})`
+          );
+        } else {
+          sarr.push(`refDom.value?.${v.name}(${cs.join(", ")})`);
+        }
+        if (s.return) {
+          sarr.push(`console.log('${s.return}', ${m})`);
+        }
       } else {
         sarr.push(`const ${m} = refDom.value?.${v.name}`);
+        sarr.push(`console.log('${s.type || s.name}', ${m})`);
       }
-      sarr.push(`console.log('"${s.type}"', ${m})`);
     });
   }
   if (tarr.length > 0) {
@@ -3487,7 +3516,7 @@ function funstr(v) {
     let body = `{
 ${vueFormat(getFunBody(st.body), "   ")}
 }`;
-    return `function (${st.param}) ${body}`;
+    return `function (${st.param.split(",").map((v2) => v2 + ":any").join(",")}) ${body}`;
   } else {
     return "undefined";
   }
@@ -3515,11 +3544,7 @@ function getChange(str) {
 function setValStringify(v, key, propsText) {
   const text = propsText ? propsText[key] : "";
   if (text) {
-    if (typeof text == "string") {
-      return getObjValue(text);
-    } else {
-      return text;
-    }
+    return text;
   } else {
     if (typeof v == "string") {
       return getChange(v + "");
@@ -3557,7 +3582,6 @@ function getSpecType(val) {
       type = "choice";
     } else {
       if (type != "function" && arr.length > 1) {
-        console.log("type1", type, val);
         type = "select";
       }
     }
@@ -3661,6 +3685,7 @@ function getObj2(v) {
   let description = v.description;
   let defaults = v.default;
   let selectable = "";
+  let required = "";
   if (tag == "default") {
     name = name.trim();
     name = getDefault(name) || name;
@@ -3686,7 +3711,12 @@ function getObj2(v) {
       description = description.replace(rtr[0], "");
     }
   }
+  if (name.endsWith("*")) {
+    required = "*";
+    name = name.substring(0, name.length - 1);
+  }
   v.name = name;
+  v.required = required;
   v.default = defaults || "";
   v.description = description;
   v.selectable = selectable;
@@ -3731,6 +3761,7 @@ function setProps(obj) {
     "name",
     "type",
     "default",
+    "required",
     "selectable",
     "description",
     "descriptions",
@@ -3934,6 +3965,16 @@ var tprops = [
     label: "\u9ED8\u8BA4\u503C",
     prop: "default",
     formatter: props.default
+  },
+  {
+    label: "\u5FC5\u4F20",
+    prop: "required",
+    formatter: props.required
+  },
+  {
+    label: "\u65B9\u6CD5\u8FD4\u56DE\u503C",
+    prop: "return",
+    formatter: props.return
   }
 ];
 var temits = [
@@ -3971,9 +4012,16 @@ var texpose = [
   },
   {
     label: "\u8FD4\u56DE\u503C",
+    prop: "return",
+    formatter(obj) {
+      return expose.return(obj) || obj.expose.default || "";
+    }
+  },
+  {
+    label: "\u7C7B\u578B",
     prop: "type",
     formatter(obj) {
-      return expose.return(obj) ?? expose.type(obj);
+      return expose.type(obj) || "function";
     }
   }
 ];
@@ -4122,7 +4170,7 @@ function setVue(propsname, param, url) {
   res.forEach((v) => {
     exposeText[v.name] = {
       name: v.name,
-      type: "function"
+      type: v.type || v.default || "function"
     };
   });
   const html = getHmtl(propsname, param, propsObj, slotValue, {}, exposeText);
@@ -4204,9 +4252,9 @@ async function getCompoData(value) {
 function setValue(data, item, index, key) {
   let v;
   if (item.formatter) {
-    v = item.formatter(data, item, index, key);
+    v = item.formatter(data, item, index, key) || "";
   } else if (item.prop) {
-    v = data[item.prop];
+    v = data[item.prop] || "";
   } else {
     v = "";
   }