@fangzhongya/vue-archive 0.0.68 → 0.0.69

package/dist/node/index.cjs

@@ -1249,22 +1249,21 @@ function getComponentsArr(urls, v, comRaw, com) {
       value.component = com[value.key];
       value.getRaw = getRawValue(comRaw, value.key);
       arr.push(value);
-    } else {
-      if (v.comprops && isComprops("/" + k, v.comprops) || v.curprops && isCurprops("/" + k, v.curprops)) {
-        let value2 = {};
-        value2.url = zv;
-        value2.comprops = v.comprops;
-        value2.curprops = v.curprops;
-        value2.value = k;
-        value2.dir = v.dir;
-        value2.cwd = v.cwd;
-        value2.suffix = getSuffix2(key);
-        value2.tdir = tdir;
-        value2.key = key;
-        value2.raw = "";
-        value2.getRaw = getRawValue(comRaw, key);
-        props2.push(value2);
-      }
+    }
+    if (v.comprops && isComprops("/" + k, v.comprops) || v.curprops && isCurprops("/" + k, v.curprops)) {
+      let value2 = {};
+      value2.url = zv;
+      value2.comprops = v.comprops;
+      value2.curprops = v.curprops;
+      value2.value = k;
+      value2.dir = v.dir;
+      value2.cwd = v.cwd;
+      value2.suffix = getSuffix2(key);
+      value2.tdir = tdir;
+      value2.key = key;
+      value2.raw = "";
+      value2.getRaw = getRawValue(comRaw, key);
+      props2.push(value2);
     }
   });
   return {

package/dist/node/index.js

@@ -1234,22 +1234,21 @@ function getComponentsArr(urls, v, comRaw, com) {
       value.component = com[value.key];
       value.getRaw = getRawValue(comRaw, value.key);
       arr.push(value);
-    } else {
-      if (v.comprops && isComprops("/" + k, v.comprops) || v.curprops && isCurprops("/" + k, v.curprops)) {
-        let value2 = {};
-        value2.url = zv;
-        value2.comprops = v.comprops;
-        value2.curprops = v.curprops;
-        value2.value = k;
-        value2.dir = v.dir;
-        value2.cwd = v.cwd;
-        value2.suffix = getSuffix2(key);
-        value2.tdir = tdir;
-        value2.key = key;
-        value2.raw = "";
-        value2.getRaw = getRawValue(comRaw, key);
-        props2.push(value2);
-      }
+    }
+    if (v.comprops && isComprops("/" + k, v.comprops) || v.curprops && isCurprops("/" + k, v.curprops)) {
+      let value2 = {};
+      value2.url = zv;
+      value2.comprops = v.comprops;
+      value2.curprops = v.curprops;
+      value2.value = k;
+      value2.dir = v.dir;
+      value2.cwd = v.cwd;
+      value2.suffix = getSuffix2(key);
+      value2.tdir = tdir;
+      value2.key = key;
+      value2.raw = "";
+      value2.getRaw = getRawValue(comRaw, key);
+      props2.push(value2);
     }
   });
   return {

package/dist/packages/utils/common.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const S=require("./storage.cjs");require("@fangzhongya/utils/basic/object/mergeObject");require("@fangzhongya/utils/basic/array/toggleArray");const N=require("@fangzhongya/utils/name/humpToLine"),R=require("@fangzhongya/utils/name/lineToLargeHump");require("@fangzhongya/utils/basic/string/appearNum");require("@fangzhongya/utils/basic/string/firstLower");require("@fangzhongya/utils/basic/array/duplicateRemoval");require("@fangzhongya/utils/basic/array/asyncMergeArray");require("@fangzhongya/utils/basic/string/firstUpper");const w=require("@fangzhongya/utils/urls/getSuffix");require("@fangzhongya/utils/basic/array/replaceAfter");const g=require("@fangzhongya/utils/judge/matchsStart"),q=require("@fangzhongya/utils/judge/matchsEnd"),$=["vue","js","ts"];function O(t){let e=N.humpToLine(t.name),r=[];return t.alias&&r.push(t.alias+"-"+e),r}function T(t,e,r){const s=g.matchsStart(t,e);return s&&r&&r.length>0?!g.matchsStart(t,r):s}function U(t,e,r){const s=q.matchsEnd(t,e);return s&&r&&r.length>0?!q.matchsEnd(t,r):s}function v(t,e,r){e.lastIndex=0;const s=e.exec(t);if(!s)return!1;const i=s.index;return t.substring(0,i).endsWith(r)}function z(t,e){e.lastIndex=0;const r=e.exec(t);if(!r)return"";const s=r.index;return t.substring(0,s)}function I(t){const e=r=>r.replace(/[.*+?^${}()|[\]\\]/g,"\\$&");return new RegExp(`${e(t)}$`)}function m(t,e){if(e&&e.length>0)for(const r of e)if(typeof r=="string"){if(t.endsWith(r)){const s=t.replace(I(r),"");if(s){const i=new RegExp("^.*/([^/]+)$");let n=s.match(i);if(n)return n[1]}}}else{const s=z(t,r);if(s){const i=new RegExp("^.*/([^/]+)$");let n=s.match(i);if(n)return n[1]}}return""}function d(t,e,r){const s=e.dir.replace(/^\.\/|((\.\.\/)+)/,"/");let i=t.indexOf(s),n=e.dir.substring(0,e.dir.indexOf(s))+t.substring(i),a="";if(e.getNameValue)a=e.getNameValue(t,e);else{const u=e.matchextss;u?a=m(t,[u]):a=m(t,e.matchexts)}if(a){let u={suffix:w.getSuffix(t),name:R.lineToLargeHump(a),value:a,adir:"",alias:e.alias,aliasNames:[],raw:"",getRaw:null,mds:[],tests:void 0,url:n,comprops:e.comprops,curprops:e.curprops,dir:e.dir,cwd:e.cwd,tdir:r,key:t};return u.aliasNames=O(u),u}}function K(t,e,r){for(const s of e){const i="/"+s;if(r&&r.length>0){for(const n of r)if(typeof n=="string"){if(t.endsWith(i+n))return!0}else if(v(t,n,i))return!0}else if(t.includes(s))return!0}return!1}function M(t,e,r,s){const i=[],n=s.matchextss;return n&&i.push(n),t.filter(a=>K(a,[e],i))[0]||""}function E(t,e,r,s,i){if(T(t,e.matchs,e.nomatchs)){let n=!1;if(e.isMatch?n=e.isMatch(t,"",[],e):n=U(t,e.matchexts,e.nomatchexts),n){const a=e.getMatchs,u=m(s,e.matchexts);if(a){const l=a(r,u,"component",e);return d(l,e,i)}else if(e.matchextss){const f=M([s],u,"component",e)||M(r,u,"component",e);if(f)return d(f,e,i)}else return d(s,e,i)}}}function L(t){S.setSession("aside.key",t)}function V(){return S.getSession("aside.key")}function W(t){let e=t.match(/\/([^\/]+)\/$/);return e&&e.length>1?e[1]:""}function b(t,e){if(e)for(let r=0;r<e.length;r++){const s=e[r];if(typeof s=="string"){if(t.includes(s))return!0}else if(s.test(t))return!0}return!1}function A(t,e){if(e)for(let r=0;r<e.length;r++){const s=e[r];if(typeof s=="string"){if(t.endsWith(s))return!0}else if(s.test(t))return!0}return!1}function D(t,e,r,s){const i=[],n=[],a=W(e.dir);return t.forEach(u=>{const l=e.dir.replace(/^\.\/|((\.\.\/)+)/,"/");let f=u.indexOf(l),x=e.dir.substring(0,e.dir.indexOf(l))+u.substring(f);const C=new RegExp("^"+e.dir);let p=x.replace(C,""),o=E(p,e,t,u,a);if(o)o.component=s[o.key],o.getRaw=h(r,o.key),n.push(o);else if(e.comprops&&b("/"+p,e.comprops)||e.curprops&&A("/"+p,e.curprops)){let c={};c.url=x,c.comprops=e.comprops,c.curprops=e.curprops,c.value=p,c.dir=e.dir,c.cwd=e.cwd,c.suffix=w.getSuffix(u),c.tdir=a,c.key=u,c.raw="",c.getRaw=h(r,u),i.push(c)}}),{props:i,components:n}}function h(t,e){return typeof t=="function"?t:t?t[e]:null}exports.defaultExtensions=$;exports.getAsideKey=V;exports.getComponentsArr=D;exports.getRawValue=h;exports.getUrlName=E;exports.isComprops=b;exports.isCurprops=A;exports.setAsideKey=L;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const S=require("./storage.cjs");require("@fangzhongya/utils/basic/object/mergeObject");require("@fangzhongya/utils/basic/array/toggleArray");const N=require("@fangzhongya/utils/name/humpToLine"),R=require("@fangzhongya/utils/name/lineToLargeHump");require("@fangzhongya/utils/basic/string/appearNum");require("@fangzhongya/utils/basic/string/firstLower");require("@fangzhongya/utils/basic/array/duplicateRemoval");require("@fangzhongya/utils/basic/array/asyncMergeArray");require("@fangzhongya/utils/basic/string/firstUpper");const w=require("@fangzhongya/utils/urls/getSuffix");require("@fangzhongya/utils/basic/array/replaceAfter");const g=require("@fangzhongya/utils/judge/matchsStart"),q=require("@fangzhongya/utils/judge/matchsEnd"),$=["vue","js","ts"];function O(t){let e=N.humpToLine(t.name),r=[];return t.alias&&r.push(t.alias+"-"+e),r}function T(t,e,r){const s=g.matchsStart(t,e);return s&&r&&r.length>0?!g.matchsStart(t,r):s}function U(t,e,r){const s=q.matchsEnd(t,e);return s&&r&&r.length>0?!q.matchsEnd(t,r):s}function v(t,e,r){e.lastIndex=0;const s=e.exec(t);if(!s)return!1;const i=s.index;return t.substring(0,i).endsWith(r)}function z(t,e){e.lastIndex=0;const r=e.exec(t);if(!r)return"";const s=r.index;return t.substring(0,s)}function I(t){const e=r=>r.replace(/[.*+?^${}()|[\]\\]/g,"\\$&");return new RegExp(`${e(t)}$`)}function m(t,e){if(e&&e.length>0)for(const r of e)if(typeof r=="string"){if(t.endsWith(r)){const s=t.replace(I(r),"");if(s){const i=new RegExp("^.*/([^/]+)$");let n=s.match(i);if(n)return n[1]}}}else{const s=z(t,r);if(s){const i=new RegExp("^.*/([^/]+)$");let n=s.match(i);if(n)return n[1]}}return""}function d(t,e,r){const s=e.dir.replace(/^\.\/|((\.\.\/)+)/,"/");let i=t.indexOf(s),n=e.dir.substring(0,e.dir.indexOf(s))+t.substring(i),a="";if(e.getNameValue)a=e.getNameValue(t,e);else{const u=e.matchextss;u?a=m(t,[u]):a=m(t,e.matchexts)}if(a){let u={suffix:w.getSuffix(t),name:R.lineToLargeHump(a),value:a,adir:"",alias:e.alias,aliasNames:[],raw:"",getRaw:null,mds:[],tests:void 0,url:n,comprops:e.comprops,curprops:e.curprops,dir:e.dir,cwd:e.cwd,tdir:r,key:t};return u.aliasNames=O(u),u}}function K(t,e,r){for(const s of e){const i="/"+s;if(r&&r.length>0){for(const n of r)if(typeof n=="string"){if(t.endsWith(i+n))return!0}else if(v(t,n,i))return!0}else if(t.includes(s))return!0}return!1}function M(t,e,r,s){const i=[],n=s.matchextss;return n&&i.push(n),t.filter(a=>K(a,[e],i))[0]||""}function E(t,e,r,s,i){if(T(t,e.matchs,e.nomatchs)){let n=!1;if(e.isMatch?n=e.isMatch(t,"",[],e):n=U(t,e.matchexts,e.nomatchexts),n){const a=e.getMatchs,u=m(s,e.matchexts);if(a){const l=a(r,u,"component",e);return d(l,e,i)}else if(e.matchextss){const f=M([s],u,"component",e)||M(r,u,"component",e);if(f)return d(f,e,i)}else return d(s,e,i)}}}function L(t){S.setSession("aside.key",t)}function V(){return S.getSession("aside.key")}function W(t){let e=t.match(/\/([^\/]+)\/$/);return e&&e.length>1?e[1]:""}function b(t,e){if(e)for(let r=0;r<e.length;r++){const s=e[r];if(typeof s=="string"){if(t.includes(s))return!0}else if(s.test(t))return!0}return!1}function A(t,e){if(e)for(let r=0;r<e.length;r++){const s=e[r];if(typeof s=="string"){if(t.endsWith(s))return!0}else if(s.test(t))return!0}return!1}function D(t,e,r,s){const i=[],n=[],a=W(e.dir);return t.forEach(u=>{const l=e.dir.replace(/^\.\/|((\.\.\/)+)/,"/");let f=u.indexOf(l),x=e.dir.substring(0,e.dir.indexOf(l))+u.substring(f);const C=new RegExp("^"+e.dir);let p=x.replace(C,""),o=E(p,e,t,u,a);if(o&&(o.component=s[o.key],o.getRaw=h(r,o.key),n.push(o)),e.comprops&&b("/"+p,e.comprops)||e.curprops&&A("/"+p,e.curprops)){let c={};c.url=x,c.comprops=e.comprops,c.curprops=e.curprops,c.value=p,c.dir=e.dir,c.cwd=e.cwd,c.suffix=w.getSuffix(u),c.tdir=a,c.key=u,c.raw="",c.getRaw=h(r,u),i.push(c)}}),{props:i,components:n}}function h(t,e){return typeof t=="function"?t:t?t[e]:null}exports.defaultExtensions=$;exports.getAsideKey=V;exports.getComponentsArr=D;exports.getRawValue=h;exports.getUrlName=E;exports.isComprops=b;exports.isCurprops=A;exports.setAsideKey=L;

package/dist/packages/utils/common.js

@@ -176,9 +176,7 @@ function ee(t, e, r, s) {
     let c = u.indexOf(f), h = e.dir.substring(0, e.dir.indexOf(f)) + u.substring(c);
     const E = new RegExp("^" + e.dir);
     let p = h.replace(E, ""), l = W(p, e, t, u, o);
-    if (l)
-      l.component = s[l.key], l.getRaw = w(r, l.key), n.push(l);
-    else if (e.comprops && T("/" + p, e.comprops) || e.curprops && V("/" + p, e.curprops)) {
+    if (l && (l.component = s[l.key], l.getRaw = w(r, l.key), n.push(l)), e.comprops && T("/" + p, e.comprops) || e.curprops && V("/" + p, e.curprops)) {
       let a = {};
       a.url = h, a.comprops = e.comprops, a.curprops = e.curprops, a.value = p, a.dir = e.dir, a.cwd = e.cwd, a.suffix = b(u), a.tdir = o, a.key = u, a.raw = "", a.getRaw = w(r, u), i.push(a);
     }

package/package.json

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