@fangzhongya/vue-archive 0.0.16 → 0.0.17

package/dist/node/index.cjs

@@ -1702,7 +1702,8 @@ function setExampleObj(dir, example, vexample, comRaw) {
       });
     }
   }
-  obj.examplessRaw = arrraw;
+  obj.exampless = [...new Set(obj.exampless)];
+  obj.examplessRaw = [...new Set(arrraw)];
   obj.examplesRaw = void 0;
   exampleObj[dir] = obj;
 }
@@ -1931,9 +1932,21 @@ function getTestArrs(arr, com, exa) {
   const testurl = com.url.substring(0, com.url.lastIndexOf("/" + com.value + "/")) + "/" + com.value;
   const testsNanme = exa.testsNanme || "/tests/";
   if (typeof testsNanme == "string") {
-    exa.exampless.forEach((key) => {
+    exa.examplessRaw.forEach((key) => {
       if (key.startsWith(testurl + "/")) {
-        if (key.startsWith(testurl + testsNanme)) {
+        if (key == testurl + exa.md + ".md") {
+          com.mds = com.mds || [];
+          com.mds.push({
+            topurl: testurl,
+            comkey: com.key,
+            suffix: getSuffix2(key),
+            name: com.name,
+            value: com.value,
+            key,
+            raw: "",
+            getRaw: getRawValue(examplesRawObj, key)
+          });
+        } else if (key.startsWith(testurl + testsNanme)) {
           const reg = new RegExp(
             "/([^/]+)/index\\." + defaultExtensions.join("|") + "$"
           );
@@ -1941,45 +1954,45 @@ function getTestArrs(arr, com, exa) {
             "/([^/]+)\\." + defaultExtensions.join("|") + "$"
           );
           let ms = key.match(reg) || key.match(reg2);
-          let value = "";
-          if (ms && ms.length > 1) {
-            value = ms[1];
-          }
-          arr[key] = {
-            topurl: testurl,
-            name: com.value,
-            value,
-            suffix: getSuffix2(key),
-            comname: com.name,
-            comkey: com.key,
-            key,
-            dir: com.dir,
-            url: key,
-            component: examplesObj[key],
-            raw: "",
-            getRaw: getRawValue(examplesRawObj, key)
-          };
-        } else {
-          if (key == testurl + exa.md + ".md") {
-            com.mds = com.mds || [];
-            com.mds.push({
+          if (ms && ms.length > 0) {
+            let value = "";
+            if (ms && ms.length > 1) {
+              value = ms[1];
+            }
+            arr[key] = {
               topurl: testurl,
-              comkey: com.key,
+              name: com.value,
+              value,
               suffix: getSuffix2(key),
-              name: com.name,
-              value: com.value,
+              comname: com.name,
+              comkey: com.key,
               key,
+              dir: com.dir,
+              url: key,
+              component: examplesObj[key],
               raw: "",
               getRaw: getRawValue(examplesRawObj, key)
-            });
+            };
           }
         }
       }
     });
   } else {
-    exa.exampless.forEach((key) => {
+    exa.examplessRaw.forEach((key) => {
       if (key.startsWith(testurl + "/")) {
-        if (testsNanme.test(key)) {
+        if (key == testurl + exa.md + ".md") {
+          com.mds = com.mds || [];
+          com.mds.push({
+            topurl: testurl,
+            comkey: com.key,
+            suffix: getSuffix2(key),
+            name: com.name,
+            value: com.value,
+            key,
+            raw: "",
+            getRaw: getRawValue(examplesRawObj, key)
+          });
+        } else if (testsNanme.test(key)) {
           const reg = new RegExp(
             "/([^/]+)/index\\." + defaultExtensions.join("|") + "$"
           );
@@ -1987,37 +2000,25 @@ function getTestArrs(arr, com, exa) {
             "/([^/]+)\\." + defaultExtensions.join("|") + "$"
           );
           let ms = key.match(reg) || key.match(reg2);
-          let value = "";
-          if (ms && ms.length > 1) {
-            value = ms[1];
-          }
-          arr[key] = {
-            topurl: testurl,
-            name: com.value,
-            value,
-            suffix: getSuffix2(key),
-            comname: com.name,
-            comkey: com.key,
-            key,
-            dir: com.dir,
-            url: key,
-            component: examplesObj[key],
-            raw: "",
-            getRaw: getRawValue(examplesRawObj, key)
-          };
-        } else {
-          if (key == testurl + exa.md + ".md") {
-            com.mds = com.mds || [];
-            com.mds.push({
+          if (ms && ms.length > 0) {
+            let value = "";
+            if (ms && ms.length > 1) {
+              value = ms[1];
+            }
+            arr[key] = {
               topurl: testurl,
-              comkey: com.key,
+              name: com.value,
+              value,
               suffix: getSuffix2(key),
-              name: com.name,
-              value: com.value,
+              comname: com.name,
+              comkey: com.key,
               key,
+              dir: com.dir,
+              url: key,
+              component: examplesObj[key],
               raw: "",
               getRaw: getRawValue(examplesRawObj, key)
-            });
+            };
           }
         }
       }
@@ -3580,7 +3581,7 @@ function getName(obj) {
 }
 function gettests(obj, arr, n) {
   const tests = getTestName(obj.key);
-  if (tests && tests.length > 1 && configObj.generatetype != 3) {
+  if (tests && tests.length > 1 && configObj.generate?.type != 3) {
     asyncMergeArray(tests, (res, _reject, zv, inde) => {
       getLocalTextTests(zv).then((text) => {
         arr.push(`### \u793A\u4F8B` + inde + 1);
@@ -3610,19 +3611,27 @@ function gettests(obj, arr, n) {
       []
     );
     arr.push(...setDom(dom));
-    const name = "cs";
-    let key = configObj.example.dir + "/" + getLevelUrl(configObj.example.level, obj) + "/" + obj.value + "/" + name + "/index.vue";
-    key = key.replace(/\/\//g, "/").replace(/\/\//g, "/");
+    const v = configObj.generate?.vue || "cs/index.vue";
+    let key = configObj.example.dir + "/" + getLevelUrl(configObj.example.level, obj) + "/" + obj.value + "/" + v;
+    if (configObj.generate?.tests) {
+      const testurl = obj.url.substring(
+        0,
+        obj.url.lastIndexOf("/" + obj.value + "/")
+      ) + "/" + obj.value;
+      const testsNanme = configObj.generate.testsNanme || "/tests/";
+      key = testurl + testsNanme + v;
+    }
+    key = key.replace(/\/\//g, "/");
     arr.push(
       ...setTestUrl(obj, {
         key,
-        value: name
+        value: v
       })
     );
-    if (configObj.generatetype != 2) {
+    if (configObj.generate?.type != 2) {
       setVue(getName(obj), n, (0, import_node_path.join)(configObj.dir, key));
     }
-    if (configObj.generatetype != 3) {
+    if (configObj.generate?.type != 3) {
       setMd(obj, arr);
     }
   }
@@ -3703,14 +3712,19 @@ function setVue(propsname, param, url) {
   const html = getHmtl(propsname, propsObj);
   Fang.fileOpen(url, html);
 }
+function getMdurl(obj) {
+  const v = configObj.generate?.md || obj.value + ".md";
+  if (configObj.generate?.tests) {
+    const testurl = obj.url.substring(0, obj.url.lastIndexOf("/" + obj.value + "/")) + "/" + obj.value;
+    const testsNanme = configObj.generate.testsNanme || "/tests/";
+    return (0, import_node_path.join)(configObj.dir, testurl + testsNanme, v);
+  }
+  return (0, import_node_path.join)(configObj.dir, configObj.outDir, v);
+}
 var lss = 0;
 function setMd(obj, arr) {
   lss++;
-  const sc = (0, import_node_path.join)(
-    configObj.dir,
-    configObj.outDir,
-    "/" + obj.value + "/index.md"
-  );
+  const sc = getMdurl(obj);
   Fang.fileOpen(sc, arr.join("\n\n"));
   if (comps.length == lss) {
     if (configObj._callback_) {
@@ -3721,11 +3735,7 @@ function setMd(obj, arr) {
 function setTestUrl(obj, test) {
   const arr = [];
   const tu = (0, import_node_path.join)(configObj.dir, test.key);
-  const sc = (0, import_node_path.join)(
-    configObj.dir,
-    configObj.outDir,
-    "/" + obj.value + "/index.md"
-  );
+  const sc = getMdurl(obj);
   const url = getImportUrl(sc, tu);
   if (configObj.setTest) {
     arr.push(...configObj.setTest(url, test, obj));

package/dist/node/index.js

@@ -1687,7 +1687,8 @@ function setExampleObj(dir, example, vexample, comRaw) {
       });
     }
   }
-  obj.examplessRaw = arrraw;
+  obj.exampless = [...new Set(obj.exampless)];
+  obj.examplessRaw = [...new Set(arrraw)];
   obj.examplesRaw = void 0;
   exampleObj[dir] = obj;
 }
@@ -1916,9 +1917,21 @@ function getTestArrs(arr, com, exa) {
   const testurl = com.url.substring(0, com.url.lastIndexOf("/" + com.value + "/")) + "/" + com.value;
   const testsNanme = exa.testsNanme || "/tests/";
   if (typeof testsNanme == "string") {
-    exa.exampless.forEach((key) => {
+    exa.examplessRaw.forEach((key) => {
       if (key.startsWith(testurl + "/")) {
-        if (key.startsWith(testurl + testsNanme)) {
+        if (key == testurl + exa.md + ".md") {
+          com.mds = com.mds || [];
+          com.mds.push({
+            topurl: testurl,
+            comkey: com.key,
+            suffix: getSuffix2(key),
+            name: com.name,
+            value: com.value,
+            key,
+            raw: "",
+            getRaw: getRawValue(examplesRawObj, key)
+          });
+        } else if (key.startsWith(testurl + testsNanme)) {
           const reg = new RegExp(
             "/([^/]+)/index\\." + defaultExtensions.join("|") + "$"
           );
@@ -1926,45 +1939,45 @@ function getTestArrs(arr, com, exa) {
             "/([^/]+)\\." + defaultExtensions.join("|") + "$"
           );
           let ms = key.match(reg) || key.match(reg2);
-          let value = "";
-          if (ms && ms.length > 1) {
-            value = ms[1];
-          }
-          arr[key] = {
-            topurl: testurl,
-            name: com.value,
-            value,
-            suffix: getSuffix2(key),
-            comname: com.name,
-            comkey: com.key,
-            key,
-            dir: com.dir,
-            url: key,
-            component: examplesObj[key],
-            raw: "",
-            getRaw: getRawValue(examplesRawObj, key)
-          };
-        } else {
-          if (key == testurl + exa.md + ".md") {
-            com.mds = com.mds || [];
-            com.mds.push({
+          if (ms && ms.length > 0) {
+            let value = "";
+            if (ms && ms.length > 1) {
+              value = ms[1];
+            }
+            arr[key] = {
               topurl: testurl,
-              comkey: com.key,
+              name: com.value,
+              value,
               suffix: getSuffix2(key),
-              name: com.name,
-              value: com.value,
+              comname: com.name,
+              comkey: com.key,
               key,
+              dir: com.dir,
+              url: key,
+              component: examplesObj[key],
               raw: "",
               getRaw: getRawValue(examplesRawObj, key)
-            });
+            };
           }
         }
       }
     });
   } else {
-    exa.exampless.forEach((key) => {
+    exa.examplessRaw.forEach((key) => {
       if (key.startsWith(testurl + "/")) {
-        if (testsNanme.test(key)) {
+        if (key == testurl + exa.md + ".md") {
+          com.mds = com.mds || [];
+          com.mds.push({
+            topurl: testurl,
+            comkey: com.key,
+            suffix: getSuffix2(key),
+            name: com.name,
+            value: com.value,
+            key,
+            raw: "",
+            getRaw: getRawValue(examplesRawObj, key)
+          });
+        } else if (testsNanme.test(key)) {
           const reg = new RegExp(
             "/([^/]+)/index\\." + defaultExtensions.join("|") + "$"
           );
@@ -1972,37 +1985,25 @@ function getTestArrs(arr, com, exa) {
             "/([^/]+)\\." + defaultExtensions.join("|") + "$"
           );
           let ms = key.match(reg) || key.match(reg2);
-          let value = "";
-          if (ms && ms.length > 1) {
-            value = ms[1];
-          }
-          arr[key] = {
-            topurl: testurl,
-            name: com.value,
-            value,
-            suffix: getSuffix2(key),
-            comname: com.name,
-            comkey: com.key,
-            key,
-            dir: com.dir,
-            url: key,
-            component: examplesObj[key],
-            raw: "",
-            getRaw: getRawValue(examplesRawObj, key)
-          };
-        } else {
-          if (key == testurl + exa.md + ".md") {
-            com.mds = com.mds || [];
-            com.mds.push({
+          if (ms && ms.length > 0) {
+            let value = "";
+            if (ms && ms.length > 1) {
+              value = ms[1];
+            }
+            arr[key] = {
               topurl: testurl,
-              comkey: com.key,
+              name: com.value,
+              value,
               suffix: getSuffix2(key),
-              name: com.name,
-              value: com.value,
+              comname: com.name,
+              comkey: com.key,
               key,
+              dir: com.dir,
+              url: key,
+              component: examplesObj[key],
               raw: "",
               getRaw: getRawValue(examplesRawObj, key)
-            });
+            };
           }
         }
       }
@@ -3565,7 +3566,7 @@ function getName(obj) {
 }
 function gettests(obj, arr, n) {
   const tests = getTestName(obj.key);
-  if (tests && tests.length > 1 && configObj.generatetype != 3) {
+  if (tests && tests.length > 1 && configObj.generate?.type != 3) {
     asyncMergeArray(tests, (res, _reject, zv, inde) => {
       getLocalTextTests(zv).then((text) => {
         arr.push(`### \u793A\u4F8B` + inde + 1);
@@ -3595,19 +3596,27 @@ function gettests(obj, arr, n) {
       []
     );
     arr.push(...setDom(dom));
-    const name = "cs";
-    let key = configObj.example.dir + "/" + getLevelUrl(configObj.example.level, obj) + "/" + obj.value + "/" + name + "/index.vue";
-    key = key.replace(/\/\//g, "/").replace(/\/\//g, "/");
+    const v = configObj.generate?.vue || "cs/index.vue";
+    let key = configObj.example.dir + "/" + getLevelUrl(configObj.example.level, obj) + "/" + obj.value + "/" + v;
+    if (configObj.generate?.tests) {
+      const testurl = obj.url.substring(
+        0,
+        obj.url.lastIndexOf("/" + obj.value + "/")
+      ) + "/" + obj.value;
+      const testsNanme = configObj.generate.testsNanme || "/tests/";
+      key = testurl + testsNanme + v;
+    }
+    key = key.replace(/\/\//g, "/");
     arr.push(
       ...setTestUrl(obj, {
         key,
-        value: name
+        value: v
       })
     );
-    if (configObj.generatetype != 2) {
+    if (configObj.generate?.type != 2) {
       setVue(getName(obj), n, join4(configObj.dir, key));
     }
-    if (configObj.generatetype != 3) {
+    if (configObj.generate?.type != 3) {
       setMd(obj, arr);
     }
   }
@@ -3688,14 +3697,19 @@ function setVue(propsname, param, url) {
   const html = getHmtl(propsname, propsObj);
   Fang.fileOpen(url, html);
 }
+function getMdurl(obj) {
+  const v = configObj.generate?.md || obj.value + ".md";
+  if (configObj.generate?.tests) {
+    const testurl = obj.url.substring(0, obj.url.lastIndexOf("/" + obj.value + "/")) + "/" + obj.value;
+    const testsNanme = configObj.generate.testsNanme || "/tests/";
+    return join4(configObj.dir, testurl + testsNanme, v);
+  }
+  return join4(configObj.dir, configObj.outDir, v);
+}
 var lss = 0;
 function setMd(obj, arr) {
   lss++;
-  const sc = join4(
-    configObj.dir,
-    configObj.outDir,
-    "/" + obj.value + "/index.md"
-  );
+  const sc = getMdurl(obj);
   Fang.fileOpen(sc, arr.join("\n\n"));
   if (comps.length == lss) {
     if (configObj._callback_) {
@@ -3706,11 +3720,7 @@ function setMd(obj, arr) {
 function setTestUrl(obj, test) {
   const arr = [];
   const tu = join4(configObj.dir, test.key);
-  const sc = join4(
-    configObj.dir,
-    configObj.outDir,
-    "/" + obj.value + "/index.md"
-  );
+  const sc = getMdurl(obj);
   const url = getImportUrl(sc, tu);
   if (configObj.setTest) {
     arr.push(...configObj.setTest(url, test, obj));

package/package.json

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