From 2c6ca7e5e2d9736f11b29eba6375075dfbf8c388 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B7=AF=E4=BA=BA=E7=94=B2?= Date: Tue, 30 Jul 2024 00:32:40 +0800 Subject: [PATCH] =?UTF-8?q?updated=20=E4=BF=AE=E5=A4=8D=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dist/lang/relationship.zh-HK.min.js | 4 ++-- dist/lang/relationship.zh-HK.min.mjs | 4 ++-- dist/relationship.min.js | 4 ++-- dist/relationship.min.mjs | 4 ++-- src/module/cache.js | 11 +++++++++-- src/module/data/branch.js | 2 -- src/module/data/input.js | 8 ++++++-- src/module/data/main.js | 4 ---- src/module/data/sort.js | 11 +++++++++++ src/module/id.js | 10 ++++++---- 10 files changed, 40 insertions(+), 22 deletions(-) create mode 100644 src/module/data/sort.js diff --git a/dist/lang/relationship.zh-HK.min.js b/dist/lang/relationship.zh-HK.min.js index f1740a9..2405d9f 100644 --- a/dist/lang/relationship.zh-HK.min.js +++ b/dist/lang/relationship.zh-HK.min.js @@ -8,6 +8,6 @@ * Released under the MIT License * https://github.com/mumuy/relationship * - * Created on: 2024-07-29 + * Created on: 2024-07-30 */ -!function(s,f){"object"==typeof exports&&"undefined"!=typeof module?module.exports=f():"function"==typeof define&&define.amd?define(f):(s="undefined"!=typeof globalThis?globalThis:s||self).relationship=f()}(this,(function(){"use strict";function s(s,f){(null==f||f>s.length)&&(f=s.length);for(var x=0,d=new Array(f);x=s.length?{done:!0}:{done:!1,value:s[d++]}},e:function(s){throw s},f:m}}throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}var o,r=!0,e=!1;return{s:function(){x=x.call(s)},n:function(){var s=x.next();return r=s.done,s},e:function(s){e=!0,o=s},f:function(){try{r||null==x.return||x.return()}finally{if(e)throw o}}}}function b(s,f){(null==f||f>s.length)&&(f=s.length);for(var x=0,d=new Array(f);x1&&void 0!==arguments[1]?arguments[1]:-1,x=s.split(",").map((function(s){var f=s.replace(/&[ol\d]+/,"");return k[f][0]})).join("的");return f>-1&&k[f+","+s]&&(0==f?x="(女性)"+x:1==f&&(x="(男性)"+x)),x}var q=Object.assign({},O,{xb:["兄弟","晜弟","親兄弟","同胞兄弟"],"xb,w":["兄弟媳婦","兄弟婦"],xs:["姐妹","親姐妹","同胞姐妹"],"xs,h":["姐妹夫","姊妹婿"],"f,xb":["伯叔父","幾爸爸","幾爸","幾爹"],"f,xb,w":["伯叔母","幾媽媽","幾媽","幾娘"],"h,xb":["伯叔"],"h,xb,w":["妯娌","娣姒","娣姒姊妹","嬸子"]}),z={},B=function(s){q[s].forEach((function(f){void 0===z[f]&&(z[f]=[]),z[f].push(s)}))};for(var D in q)B(D);function F(s,f){var x="undefined"!=typeof Symbol&&s[Symbol.iterator]||s["@@iterator"];if(!x){if(Array.isArray(s)||(x=function(s,f){if(!s)return;if("string"==typeof s)return H(s,f);var x=Object.prototype.toString.call(s).slice(8,-1);"Object"===x&&s.constructor&&(x=s.constructor.name);if("Map"===x||"Set"===x)return Array.from(s);if("Arguments"===x||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(x))return H(s,f)}(s))||f&&s&&"number"==typeof s.length){x&&(s=x);var d=0,m=function(){};return{s:m,n:function(){return d>=s.length?{done:!0}:{done:!1,value:s[d++]}},e:function(s){throw s},f:m}}throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}var b,o=!0,r=!1;return{s:function(){x=x.call(s)},n:function(){var s=x.next();return o=s.done,s},e:function(s){r=!0,b=s},f:function(){try{o||null==x.return||x.return()}finally{if(r)throw b}}}}function H(s,f){(null==f||f>s.length)&&(f=s.length);for(var x=0,d=new Array(f);x-1)d=m;else if(b>-1&&-1==m)d=b;else{if(b!=m)return[];d=b}}var o=P(s.from,d),r=P(s.to,d);if(!o.length||!r.length)return[];var e=[];return o.forEach((function(f){r.forEach((function(x){var m=d,b=","+x;if(b.match(/,([fhs1](&[ol\d]+)?|[olx]b)(&[ol\d]+)?$/)&&(m=1),b.match(/,([mwd0](&[ol\d]+)?|[olx]s)(&[ol\d]+)?$/)&&(m=0),f&&x){var o=s.optimal;if((f.match(/&\d+/)||x.match(/&\d+/))&&(o=!0),o){var r=function(s){for(var f=s.from,x=s.to,d=s.sex,m=f.split(","),b=x.split(","),o=0;o+w?m[o]=m[o].replace(/^[xol]b|^s/,"lb").replace(/^[xol]s|^d/,"ls"):+t<+w&&(m[o]=m[o].replace(/^[xol]b|^s/,"ob").replace(/^[xol]s|^d/,"os")),f=m.slice(o).join(","),x=b.slice(o+1).join(","),d=b[o].match(/^([fhs1](&[ol\d]+)?|[olx]b)(&[ol\d]+)?/)?1:0;else if(s.optimal){var M,n;if(t=(null===(M=m[o].match(/([xol])[bs]/))||void 0===M?void 0:M[1])||"",w=(null===(n=b[o].match(/([xol])[bs]/))||void 0===n?void 0:n[1])||"","x"==t||"x"==w){f=m.slice(o+1).join(","),x=b.slice(o+1).join(","),d=m[o].match(/^([fhs1](&[ol\d]+)?|[olx]b)(&[ol\d]+)?/)?1:0;continue}}}break}f=m.slice(o+1).join(","),x=b.slice(o+1).join(","),d=m[o].match(/^([fhs1](&[ol\d]+)?|[olx]b)(&[ol\d]+)?/)?1:0}return{from:f,to:x,sex:d}}({from:f,to:x,sex:d,optimal:s.optimal});f=r.from,x=r.to,d=r.sex}}(x?N(x,d):[""]).forEach((function(s){var x=(s?","+s:"")+(f?","+f:"");e.push({selector:x,sex:m})}))}))})),e}function L(s){var f=[],x={};return function s(d){var m="";if(!x[d]){x[d]=!0;do{m=d;var b,r=F(o);try{for(r.s();!(b=r.n()).done;){var e=b.value;if((d=d.replace(e.exp,e.str)).includes("#"))return d.split("#").forEach(s),!1}}catch(s){r.e(s)}finally{r.f()}}while(m!=d);if(d.match(/,[mwd0](&[ol\d+])?,w|,[hfs1](&[ol\d]+)?,h/))return!1;f.push(d)}}(s),f}function P(s,f){if(s.match(/^,/)||(s=","+s),f<0)s.match(/^,[w1]/)?f=1:s.match(/^,[h0]/)&&(f=0);else{if(1==f&&s.match(/^,[h0]/))return[];if(0==f&&s.match(/^,[w1]/))return[]}if(f>-1&&!s.includes(",1")&&!s.includes(",0")&&(s=","+f+s),s.match(/,[mwd0](&[ol\d]+)?,w|,[hfs1](&[ol\d]+)?,h/))return[];var x=L(s).map((function(s){return s.replace(/,[01]/,"").substr(1)}));return I(x)}var Q=function(s){"string"==typeof s&&(s=function(s){var f,x=m(d);try{for(x.s();!(f=x.n()).done;){var b=f.value,o=s.match(b.exp);if(o)return b.opt(o)}}catch(s){x.e(s)}finally{x.f()}return{}}(s));var f=Object.assign({text:"",target:"",sex:-1,type:"default",reverse:!1,mode:"default",optimal:!1},s);!function(s){if(O=Object.assign({},j),s&&A[s])for(var f in A[s])O[f]=[].concat(A[s][f],j[f]||[])}(f.mode);var b=J(f.text),o=J(f.target);o.length||(o=[""]);var r=[];return b.forEach((function(s){o.forEach((function(x){K({from:s,to:x,sex:f.sex,optimal:f.optimal}).forEach((function(s){(s?P(s.selector,s.sex):[]).forEach((function(x){var d=[x],m=s.sex;f.reverse&&(d=N(x,m),m=x.match(/([fhs1](&[ol\d]+)?|[olx]b)$/)?1:0),"chain"==f.type?d.forEach((function(f){var x=U(f,s.sex);x&&r.push(x)})):"pair"==f.type?(d=N(x,s.sex)).forEach((function(s){var f=function(s,f){var x=[],d=[],m=[];s=s.replace(/&\d+/g,""),f=f.replace(/&\d+/g,"");var b=s.replace(/([ol])([bs])/g,"x$2"),o=f.replace(/([ol])([bs])/g,"x$2"),r=s.replace(/&[ol]/g,""),e=f.replace(/&[ol]/g,"");for(var h in t){var l=h.split("#");if(l.length>1){var w=P(l[0]),M=P(l[1]),n=w.map((function(s){return s.replace(/&[ol\d]+/,"").replace(/([ol])([bs])/,"x$2")})),a=M.map((function(s){return s.replace(/&[ol\d]+/,"").replace(/([ol])([bs])/,"x$2")}));(w.includes(s)&&M.includes(f)||w.includes(f)&&M.includes(s))&&x.push(t[h][0]),(n.includes(b)&&a.includes(o)||n.includes(o)&&a.includes(b))&&d.push(t[h][0]),(n.includes(r)&&a.includes(e)||n.includes(e)&&a.includes(r))&&m.push(t[h][0])}}return x.length||(x=d),x.length||(x=m),x}(x,s);r=r.concat(f)})):d.forEach((function(s){var f=C(s);f.length||(f=C(m+","+s)),r=r.concat(f)}))}))}))}))})),x(new Set(r))};return Q.data=O,Q.dataCount=Object.keys(O).length,Q.setMode=function(s,f){A[s]=Object.assign(A[s]||{},f)},Q})); +!function(s,f){"object"==typeof exports&&"undefined"!=typeof module?module.exports=f():"function"==typeof define&&define.amd?define(f):(s="undefined"!=typeof globalThis?globalThis:s||self).relationship=f()}(this,(function(){"use strict";function s(s,f){(null==f||f>s.length)&&(f=s.length);for(var x=0,d=new Array(f);x=s.length?{done:!0}:{done:!1,value:s[d++]}},e:function(s){throw s},f:m}}throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}var o,r=!0,e=!1;return{s:function(){x=x.call(s)},n:function(){var s=x.next();return r=s.done,s},e:function(s){e=!0,o=s},f:function(){try{r||null==x.return||x.return()}finally{if(e)throw o}}}}function b(s,f){(null==f||f>s.length)&&(f=s.length);for(var x=0,d=new Array(f);x1&&void 0!==arguments[1]?arguments[1]:-1,x=s.split(",").map((function(s){var f=s.replace(/&[ol\d]+/,"");return U[f][0]})).join("的");return f>-1&&U[f+","+s]&&(0==f?x="(女性)"+x:1==f&&(x="(男性)"+x)),x}var z={xb:["兄弟","晜弟","親兄弟","同胞兄弟"],"xb,w":["兄弟媳婦","兄弟婦"],xs:["姐妹","親姐妹","同胞姐妹"],"xs,h":["姐妹夫","姊妹婿"],"f,xb":["伯叔父"],"f,xb,w":["伯叔母"],"f,f,xb":["從祖祖父","從祖父"],"f,f,xb,w":["從祖祖母","從祖母"],"m,f,xb":["外從祖祖父"],"m,f,xb,w":["外從祖祖母"],"h,xb":["伯叔"],"h,xb,w":["妯娌","娣姒","娣姒姊妹","嬸子"]},B=Object.assign({},N);for(var D in z)B[D]=(B[D]||[]).concat(z[D]);for(var F in w)B[F]=(B[F]||[]).concat(w[F]);var H={},J=function(s){B[s].forEach((function(f){void 0===H[f]&&(H[f]=[]),H[f].push(s)}))};for(var K in B)J(K);function L(s,f){var x="undefined"!=typeof Symbol&&s[Symbol.iterator]||s["@@iterator"];if(!x){if(Array.isArray(s)||(x=function(s,f){if(!s)return;if("string"==typeof s)return P(s,f);var x=Object.prototype.toString.call(s).slice(8,-1);"Object"===x&&s.constructor&&(x=s.constructor.name);if("Map"===x||"Set"===x)return Array.from(s);if("Arguments"===x||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(x))return P(s,f)}(s))||f&&s&&"number"==typeof s.length){x&&(s=x);var d=0,m=function(){};return{s:m,n:function(){return d>=s.length?{done:!0}:{done:!1,value:s[d++]}},e:function(s){throw s},f:m}}throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}var b,o=!0,r=!1;return{s:function(){x=x.call(s)},n:function(){var s=x.next();return o=s.done,s},e:function(s){r=!0,b=s},f:function(){try{o||null==x.return||x.return()}finally{if(r)throw b}}}}function P(s,f){(null==f||f>s.length)&&(f=s.length);for(var x=0,d=new Array(f);x-1)d=m;else if(b>-1&&-1==m)d=b;else{if(b!=m)return[];d=b}}var o=X(s.from,d),r=X(s.to,d);if(!o.length||!r.length)return[];var e=[];return o.forEach((function(f){r.forEach((function(x){var m=d,b=","+x;if(b.match(/,([fhs1](&[ol\d]+)?|[olx]b)(&[ol\d]+)?$/)&&(m=1),b.match(/,([mwd0](&[ol\d]+)?|[olx]s)(&[ol\d]+)?$/)&&(m=0),f&&x){var o=s.optimal;if((f.match(/&\d+/)||x.match(/&\d+/))&&(o=!0),o){var r=function(s){for(var f=s.from,x=s.to,d=s.sex,m=f.split(","),b=x.split(","),o=0;o+w?m[o]=m[o].replace(/^[xol]b|^s/,"lb").replace(/^[xol]s|^d/,"ls"):+t<+w&&(m[o]=m[o].replace(/^[xol]b|^s/,"ob").replace(/^[xol]s|^d/,"os")),f=m.slice(o).join(","),x=b.slice(o+1).join(","),d=b[o].match(/^([fhs1](&[ol\d]+)?|[olx]b)(&[ol\d]+)?/)?1:0;else if(s.optimal){var M,n;if(t=(null===(M=m[o].match(/([xol])[bs]/))||void 0===M?void 0:M[1])||"",w=(null===(n=b[o].match(/([xol])[bs]/))||void 0===n?void 0:n[1])||"","x"==t||"x"==w){f=m.slice(o+1).join(","),x=b.slice(o+1).join(","),d=m[o].match(/^([fhs1](&[ol\d]+)?|[olx]b)(&[ol\d]+)?/)?1:0;continue}}}break}f=m.slice(o+1).join(","),x=b.slice(o+1).join(","),d=m[o].match(/^([fhs1](&[ol\d]+)?|[olx]b)(&[ol\d]+)?/)?1:0}return{from:f,to:x,sex:d}}({from:f,to:x,sex:d,optimal:s.optimal});f=r.from,x=r.to,d=r.sex}}(x?I(x,d):[""]).forEach((function(s){var x=(s?","+s:"")+(f?","+f:"");e.push({selector:x,sex:m})}))}))})),e}function V(s){var f=[],x={};return function s(d){var m="";if(!x[d]){x[d]=!0;do{m=d;var b,r=L(o);try{for(r.s();!(b=r.n()).done;){var e=b.value;if((d=d.replace(e.exp,e.str)).includes("#"))return d.split("#").forEach(s),!1}}catch(s){r.e(s)}finally{r.f()}}while(m!=d);if(d.match(/,[mwd0](&[ol\d+])?,w|,[hfs1](&[ol\d]+)?,h/))return!1;f.push(d)}}(s),f}function X(s,f){if(s.match(/^,/)||(s=","+s),f<0)s.match(/^,[w1]/)?f=1:s.match(/^,[h0]/)&&(f=0);else{if(1==f&&s.match(/^,[h0]/))return[];if(0==f&&s.match(/^,[w1]/))return[]}if(f>-1&&!s.includes(",1")&&!s.includes(",0")&&(s=","+f+s),s.match(/,[mwd0](&[ol\d]+)?,w|,[hfs1](&[ol\d]+)?,h/))return[];var x=V(s).map((function(s){return s.replace(/,[01]/,"").substr(1)}));return T(x)}var Y=function(s){"string"==typeof s&&(s=function(s){var f,x=m(d);try{for(x.s();!(f=x.n()).done;){var b=f.value,o=s.match(b.exp);if(o)return b.opt(o)}}catch(s){x.e(s)}finally{x.f()}return{}}(s));var f=Object.assign({text:"",target:"",sex:-1,type:"default",reverse:!1,mode:"default",optimal:!1},s);!function(s){if(N=Object.assign({},A),s&&O[s])for(var f in O[s])N[f]=[].concat(O[s][f],A[f]||[])}(f.mode);var b=Q(f.text),o=Q(f.target);o.length||(o=[""]);var r=[];return b.forEach((function(s){o.forEach((function(x){R({from:s,to:x,sex:f.sex,optimal:f.optimal}).forEach((function(s){(s?X(s.selector,s.sex):[]).forEach((function(x){var d=[x],m=s.sex;f.reverse&&(d=I(x,m),m=x.match(/([fhs1](&[ol\d]+)?|[olx]b)$/)?1:0),"chain"==f.type?d.forEach((function(f){var x=q(f,s.sex);x&&r.push(x)})):"pair"==f.type?(d=I(x,s.sex)).forEach((function(s){var f=function(s,f){var x=[],d=[],m=[];s=s.replace(/&\d+/g,""),f=f.replace(/&\d+/g,"");var b=s.replace(/([ol])([bs])/g,"x$2"),o=f.replace(/([ol])([bs])/g,"x$2"),r=s.replace(/&[ol]/g,""),e=f.replace(/&[ol]/g,"");for(var h in t){var l=h.split("#");if(l.length>1){var w=X(l[0]),M=X(l[1]),n=w.map((function(s){return s.replace(/&[ol\d]+/,"").replace(/([ol])([bs])/,"x$2")})),a=M.map((function(s){return s.replace(/&[ol\d]+/,"").replace(/([ol])([bs])/,"x$2")}));(w.includes(s)&&M.includes(f)||w.includes(f)&&M.includes(s))&&x.push(t[h][0]),(n.includes(b)&&a.includes(o)||n.includes(o)&&a.includes(b))&&d.push(t[h][0]),(n.includes(r)&&a.includes(e)||n.includes(e)&&a.includes(r))&&m.push(t[h][0])}}return x.length||(x=d),x.length||(x=m),x}(x,s);r=r.concat(f)})):d.forEach((function(s){var f=k(s);f.length||(f=k(m+","+s)),r=r.concat(f)}))}))}))}))})),x(new Set(r))};return Y.data=N,Y.dataCount=Object.keys(N).length,Y.setMode=function(s,f){O[s]=Object.assign(O[s]||{},f)},Y})); diff --git a/dist/lang/relationship.zh-HK.min.mjs b/dist/lang/relationship.zh-HK.min.mjs index e212919..f20e4e8 100644 --- a/dist/lang/relationship.zh-HK.min.mjs +++ b/dist/lang/relationship.zh-HK.min.mjs @@ -8,6 +8,6 @@ * Released under the MIT License * https://github.com/mumuy/relationship * - * Created on: 2024-07-29 + * Created on: 2024-07-30 */ -function s(s,f){(null==f||f>s.length)&&(f=s.length);for(var x=0,d=new Array(f);x=s.length?{done:!0}:{done:!1,value:s[d++]}},e:function(s){throw s},f:m}}throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}var o,r=!0,h=!1;return{s:function(){x=x.call(s)},n:function(){var s=x.next();return r=s.done,s},e:function(s){h=!0,o=s},f:function(){try{r||null==x.return||x.return()}finally{if(h)throw o}}}}function b(s,f){(null==f||f>s.length)&&(f=s.length);for(var x=0,d=new Array(f);x1&&void 0!==arguments[1]?arguments[1]:-1,x=s.split(",").map((function(s){var f=s.replace(/&[ol\d]+/,"");return k[f][0]})).join("的");return f>-1&&k[f+","+s]&&(0==f?x="(女性)"+x:1==f&&(x="(男性)"+x)),x}var q=Object.assign({},O,{xb:["兄弟","晜弟","親兄弟","同胞兄弟"],"xb,w":["兄弟媳婦","兄弟婦"],xs:["姐妹","親姐妹","同胞姐妹"],"xs,h":["姐妹夫","姊妹婿"],"f,xb":["伯叔父","幾爸爸","幾爸","幾爹"],"f,xb,w":["伯叔母","幾媽媽","幾媽","幾娘"],"h,xb":["伯叔"],"h,xb,w":["妯娌","娣姒","娣姒姊妹","嬸子"]}),z={},B=function(s){q[s].forEach((function(f){void 0===z[f]&&(z[f]=[]),z[f].push(s)}))};for(var D in q)B(D);function F(s,f){var x="undefined"!=typeof Symbol&&s[Symbol.iterator]||s["@@iterator"];if(!x){if(Array.isArray(s)||(x=function(s,f){if(!s)return;if("string"==typeof s)return H(s,f);var x=Object.prototype.toString.call(s).slice(8,-1);"Object"===x&&s.constructor&&(x=s.constructor.name);if("Map"===x||"Set"===x)return Array.from(s);if("Arguments"===x||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(x))return H(s,f)}(s))||f&&s&&"number"==typeof s.length){x&&(s=x);var d=0,m=function(){};return{s:m,n:function(){return d>=s.length?{done:!0}:{done:!1,value:s[d++]}},e:function(s){throw s},f:m}}throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}var b,o=!0,r=!1;return{s:function(){x=x.call(s)},n:function(){var s=x.next();return o=s.done,s},e:function(s){r=!0,b=s},f:function(){try{o||null==x.return||x.return()}finally{if(r)throw b}}}}function H(s,f){(null==f||f>s.length)&&(f=s.length);for(var x=0,d=new Array(f);x-1)d=m;else if(b>-1&&-1==m)d=b;else{if(b!=m)return[];d=b}}var o=P(s.from,d),r=P(s.to,d);if(!o.length||!r.length)return[];var h=[];return o.forEach((function(f){r.forEach((function(x){var m=d,b=","+x;if(b.match(/,([fhs1](&[ol\d]+)?|[olx]b)(&[ol\d]+)?$/)&&(m=1),b.match(/,([mwd0](&[ol\d]+)?|[olx]s)(&[ol\d]+)?$/)&&(m=0),f&&x){var o=s.optimal;if((f.match(/&\d+/)||x.match(/&\d+/))&&(o=!0),o){var r=function(s){for(var f=s.from,x=s.to,d=s.sex,m=f.split(","),b=x.split(","),o=0;o+w?m[o]=m[o].replace(/^[xol]b|^s/,"lb").replace(/^[xol]s|^d/,"ls"):+t<+w&&(m[o]=m[o].replace(/^[xol]b|^s/,"ob").replace(/^[xol]s|^d/,"os")),f=m.slice(o).join(","),x=b.slice(o+1).join(","),d=b[o].match(/^([fhs1](&[ol\d]+)?|[olx]b)(&[ol\d]+)?/)?1:0;else if(s.optimal){var M,n;if(t=(null===(M=m[o].match(/([xol])[bs]/))||void 0===M?void 0:M[1])||"",w=(null===(n=b[o].match(/([xol])[bs]/))||void 0===n?void 0:n[1])||"","x"==t||"x"==w){f=m.slice(o+1).join(","),x=b.slice(o+1).join(","),d=m[o].match(/^([fhs1](&[ol\d]+)?|[olx]b)(&[ol\d]+)?/)?1:0;continue}}}break}f=m.slice(o+1).join(","),x=b.slice(o+1).join(","),d=m[o].match(/^([fhs1](&[ol\d]+)?|[olx]b)(&[ol\d]+)?/)?1:0}return{from:f,to:x,sex:d}}({from:f,to:x,sex:d,optimal:s.optimal});f=r.from,x=r.to,d=r.sex}}(x?N(x,d):[""]).forEach((function(s){var x=(s?","+s:"")+(f?","+f:"");h.push({selector:x,sex:m})}))}))})),h}function L(s){var f=[],x={};return function s(d){var m="";if(!x[d]){x[d]=!0;do{m=d;var b,r=F(o);try{for(r.s();!(b=r.n()).done;){var h=b.value;if((d=d.replace(h.exp,h.str)).includes("#"))return d.split("#").forEach(s),!1}}catch(s){r.e(s)}finally{r.f()}}while(m!=d);if(d.match(/,[mwd0](&[ol\d+])?,w|,[hfs1](&[ol\d]+)?,h/))return!1;f.push(d)}}(s),f}function P(s,f){if(s.match(/^,/)||(s=","+s),f<0)s.match(/^,[w1]/)?f=1:s.match(/^,[h0]/)&&(f=0);else{if(1==f&&s.match(/^,[h0]/))return[];if(0==f&&s.match(/^,[w1]/))return[]}if(f>-1&&!s.includes(",1")&&!s.includes(",0")&&(s=","+f+s),s.match(/,[mwd0](&[ol\d]+)?,w|,[hfs1](&[ol\d]+)?,h/))return[];var x=L(s).map((function(s){return s.replace(/,[01]/,"").substr(1)}));return I(x)}var Q=function(s){"string"==typeof s&&(s=function(s){var f,x=m(d);try{for(x.s();!(f=x.n()).done;){var b=f.value,o=s.match(b.exp);if(o)return b.opt(o)}}catch(s){x.e(s)}finally{x.f()}return{}}(s));var f=Object.assign({text:"",target:"",sex:-1,type:"default",reverse:!1,mode:"default",optimal:!1},s);!function(s){if(O=Object.assign({},j),s&&A[s])for(var f in A[s])O[f]=[].concat(A[s][f],j[f]||[])}(f.mode);var b=J(f.text),o=J(f.target);o.length||(o=[""]);var r=[];return b.forEach((function(s){o.forEach((function(x){K({from:s,to:x,sex:f.sex,optimal:f.optimal}).forEach((function(s){(s?P(s.selector,s.sex):[]).forEach((function(x){var d=[x],m=s.sex;f.reverse&&(d=N(x,m),m=x.match(/([fhs1](&[ol\d]+)?|[olx]b)$/)?1:0),"chain"==f.type?d.forEach((function(f){var x=U(f,s.sex);x&&r.push(x)})):"pair"==f.type?(d=N(x,s.sex)).forEach((function(s){var f=function(s,f){var x=[],d=[],m=[];s=s.replace(/&\d+/g,""),f=f.replace(/&\d+/g,"");var b=s.replace(/([ol])([bs])/g,"x$2"),o=f.replace(/([ol])([bs])/g,"x$2"),r=s.replace(/&[ol]/g,""),h=f.replace(/&[ol]/g,"");for(var e in t){var l=e.split("#");if(l.length>1){var w=P(l[0]),M=P(l[1]),n=w.map((function(s){return s.replace(/&[ol\d]+/,"").replace(/([ol])([bs])/,"x$2")})),a=M.map((function(s){return s.replace(/&[ol\d]+/,"").replace(/([ol])([bs])/,"x$2")}));(w.includes(s)&&M.includes(f)||w.includes(f)&&M.includes(s))&&x.push(t[e][0]),(n.includes(b)&&a.includes(o)||n.includes(o)&&a.includes(b))&&d.push(t[e][0]),(n.includes(r)&&a.includes(h)||n.includes(h)&&a.includes(r))&&m.push(t[e][0])}}return x.length||(x=d),x.length||(x=m),x}(x,s);r=r.concat(f)})):d.forEach((function(s){var f=T(s);f.length||(f=T(m+","+s)),r=r.concat(f)}))}))}))}))})),x(new Set(r))};Q.data=O,Q.dataCount=Object.keys(O).length,Q.setMode=function(s,f){A[s]=Object.assign(A[s]||{},f)};export{Q as default}; +function s(s,f){(null==f||f>s.length)&&(f=s.length);for(var x=0,d=new Array(f);x=s.length?{done:!0}:{done:!1,value:s[d++]}},e:function(s){throw s},f:m}}throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}var o,r=!0,h=!1;return{s:function(){x=x.call(s)},n:function(){var s=x.next();return r=s.done,s},e:function(s){h=!0,o=s},f:function(){try{r||null==x.return||x.return()}finally{if(h)throw o}}}}function b(s,f){(null==f||f>s.length)&&(f=s.length);for(var x=0,d=new Array(f);x1&&void 0!==arguments[1]?arguments[1]:-1,x=s.split(",").map((function(s){var f=s.replace(/&[ol\d]+/,"");return U[f][0]})).join("的");return f>-1&&U[f+","+s]&&(0==f?x="(女性)"+x:1==f&&(x="(男性)"+x)),x}var z={xb:["兄弟","晜弟","親兄弟","同胞兄弟"],"xb,w":["兄弟媳婦","兄弟婦"],xs:["姐妹","親姐妹","同胞姐妹"],"xs,h":["姐妹夫","姊妹婿"],"f,xb":["伯叔父"],"f,xb,w":["伯叔母"],"f,f,xb":["從祖祖父","從祖父"],"f,f,xb,w":["從祖祖母","從祖母"],"m,f,xb":["外從祖祖父"],"m,f,xb,w":["外從祖祖母"],"h,xb":["伯叔"],"h,xb,w":["妯娌","娣姒","娣姒姊妹","嬸子"]},B=Object.assign({},N);for(var D in z)B[D]=(B[D]||[]).concat(z[D]);for(var F in w)B[F]=(B[F]||[]).concat(w[F]);var H={},J=function(s){B[s].forEach((function(f){void 0===H[f]&&(H[f]=[]),H[f].push(s)}))};for(var K in B)J(K);function L(s,f){var x="undefined"!=typeof Symbol&&s[Symbol.iterator]||s["@@iterator"];if(!x){if(Array.isArray(s)||(x=function(s,f){if(!s)return;if("string"==typeof s)return P(s,f);var x=Object.prototype.toString.call(s).slice(8,-1);"Object"===x&&s.constructor&&(x=s.constructor.name);if("Map"===x||"Set"===x)return Array.from(s);if("Arguments"===x||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(x))return P(s,f)}(s))||f&&s&&"number"==typeof s.length){x&&(s=x);var d=0,m=function(){};return{s:m,n:function(){return d>=s.length?{done:!0}:{done:!1,value:s[d++]}},e:function(s){throw s},f:m}}throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}var b,o=!0,r=!1;return{s:function(){x=x.call(s)},n:function(){var s=x.next();return o=s.done,s},e:function(s){r=!0,b=s},f:function(){try{o||null==x.return||x.return()}finally{if(r)throw b}}}}function P(s,f){(null==f||f>s.length)&&(f=s.length);for(var x=0,d=new Array(f);x-1)d=m;else if(b>-1&&-1==m)d=b;else{if(b!=m)return[];d=b}}var o=X(s.from,d),r=X(s.to,d);if(!o.length||!r.length)return[];var h=[];return o.forEach((function(f){r.forEach((function(x){var m=d,b=","+x;if(b.match(/,([fhs1](&[ol\d]+)?|[olx]b)(&[ol\d]+)?$/)&&(m=1),b.match(/,([mwd0](&[ol\d]+)?|[olx]s)(&[ol\d]+)?$/)&&(m=0),f&&x){var o=s.optimal;if((f.match(/&\d+/)||x.match(/&\d+/))&&(o=!0),o){var r=function(s){for(var f=s.from,x=s.to,d=s.sex,m=f.split(","),b=x.split(","),o=0;o+w?m[o]=m[o].replace(/^[xol]b|^s/,"lb").replace(/^[xol]s|^d/,"ls"):+t<+w&&(m[o]=m[o].replace(/^[xol]b|^s/,"ob").replace(/^[xol]s|^d/,"os")),f=m.slice(o).join(","),x=b.slice(o+1).join(","),d=b[o].match(/^([fhs1](&[ol\d]+)?|[olx]b)(&[ol\d]+)?/)?1:0;else if(s.optimal){var M,n;if(t=(null===(M=m[o].match(/([xol])[bs]/))||void 0===M?void 0:M[1])||"",w=(null===(n=b[o].match(/([xol])[bs]/))||void 0===n?void 0:n[1])||"","x"==t||"x"==w){f=m.slice(o+1).join(","),x=b.slice(o+1).join(","),d=m[o].match(/^([fhs1](&[ol\d]+)?|[olx]b)(&[ol\d]+)?/)?1:0;continue}}}break}f=m.slice(o+1).join(","),x=b.slice(o+1).join(","),d=m[o].match(/^([fhs1](&[ol\d]+)?|[olx]b)(&[ol\d]+)?/)?1:0}return{from:f,to:x,sex:d}}({from:f,to:x,sex:d,optimal:s.optimal});f=r.from,x=r.to,d=r.sex}}(x?I(x,d):[""]).forEach((function(s){var x=(s?","+s:"")+(f?","+f:"");h.push({selector:x,sex:m})}))}))})),h}function V(s){var f=[],x={};return function s(d){var m="";if(!x[d]){x[d]=!0;do{m=d;var b,r=L(o);try{for(r.s();!(b=r.n()).done;){var h=b.value;if((d=d.replace(h.exp,h.str)).includes("#"))return d.split("#").forEach(s),!1}}catch(s){r.e(s)}finally{r.f()}}while(m!=d);if(d.match(/,[mwd0](&[ol\d+])?,w|,[hfs1](&[ol\d]+)?,h/))return!1;f.push(d)}}(s),f}function X(s,f){if(s.match(/^,/)||(s=","+s),f<0)s.match(/^,[w1]/)?f=1:s.match(/^,[h0]/)&&(f=0);else{if(1==f&&s.match(/^,[h0]/))return[];if(0==f&&s.match(/^,[w1]/))return[]}if(f>-1&&!s.includes(",1")&&!s.includes(",0")&&(s=","+f+s),s.match(/,[mwd0](&[ol\d]+)?,w|,[hfs1](&[ol\d]+)?,h/))return[];var x=V(s).map((function(s){return s.replace(/,[01]/,"").substr(1)}));return C(x)}var Y=function(s){"string"==typeof s&&(s=function(s){var f,x=m(d);try{for(x.s();!(f=x.n()).done;){var b=f.value,o=s.match(b.exp);if(o)return b.opt(o)}}catch(s){x.e(s)}finally{x.f()}return{}}(s));var f=Object.assign({text:"",target:"",sex:-1,type:"default",reverse:!1,mode:"default",optimal:!1},s);!function(s){if(N=Object.assign({},A),s&&O[s])for(var f in O[s])N[f]=[].concat(O[s][f],A[f]||[])}(f.mode);var b=Q(f.text),o=Q(f.target);o.length||(o=[""]);var r=[];return b.forEach((function(s){o.forEach((function(x){R({from:s,to:x,sex:f.sex,optimal:f.optimal}).forEach((function(s){(s?X(s.selector,s.sex):[]).forEach((function(x){var d=[x],m=s.sex;f.reverse&&(d=I(x,m),m=x.match(/([fhs1](&[ol\d]+)?|[olx]b)$/)?1:0),"chain"==f.type?d.forEach((function(f){var x=q(f,s.sex);x&&r.push(x)})):"pair"==f.type?(d=I(x,s.sex)).forEach((function(s){var f=function(s,f){var x=[],d=[],m=[];s=s.replace(/&\d+/g,""),f=f.replace(/&\d+/g,"");var b=s.replace(/([ol])([bs])/g,"x$2"),o=f.replace(/([ol])([bs])/g,"x$2"),r=s.replace(/&[ol]/g,""),h=f.replace(/&[ol]/g,"");for(var e in t){var l=e.split("#");if(l.length>1){var w=X(l[0]),M=X(l[1]),n=w.map((function(s){return s.replace(/&[ol\d]+/,"").replace(/([ol])([bs])/,"x$2")})),a=M.map((function(s){return s.replace(/&[ol\d]+/,"").replace(/([ol])([bs])/,"x$2")}));(w.includes(s)&&M.includes(f)||w.includes(f)&&M.includes(s))&&x.push(t[e][0]),(n.includes(b)&&a.includes(o)||n.includes(o)&&a.includes(b))&&d.push(t[e][0]),(n.includes(r)&&a.includes(h)||n.includes(h)&&a.includes(r))&&m.push(t[e][0])}}return x.length||(x=d),x.length||(x=m),x}(x,s);r=r.concat(f)})):d.forEach((function(s){var f=k(s);f.length||(f=k(m+","+s)),r=r.concat(f)}))}))}))}))})),x(new Set(r))};Y.data=N,Y.dataCount=Object.keys(N).length,Y.setMode=function(s,f){O[s]=Object.assign(O[s]||{},f)};export{Y as default}; diff --git a/dist/relationship.min.js b/dist/relationship.min.js index 032d97c..2f87f5d 100644 --- a/dist/relationship.min.js +++ b/dist/relationship.min.js @@ -8,6 +8,6 @@ * Released under the MIT License * https://github.com/mumuy/relationship * - * Created on: 2024-07-29 + * Created on: 2024-07-30 */ -!function(s,f){"object"==typeof exports&&"undefined"!=typeof module?module.exports=f():"function"==typeof define&&define.amd?define(f):(s="undefined"!=typeof globalThis?globalThis:s||self).relationship=f()}(this,(function(){"use strict";function s(s,f){(null==f||f>s.length)&&(f=s.length);for(var x=0,d=new Array(f);x=s.length?{done:!0}:{done:!1,value:s[d++]}},e:function(s){throw s},f:m}}throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}var o,r=!0,e=!1;return{s:function(){x=x.call(s)},n:function(){var s=x.next();return r=s.done,s},e:function(s){e=!0,o=s},f:function(){try{r||null==x.return||x.return()}finally{if(e)throw o}}}}function b(s,f){(null==f||f>s.length)&&(f=s.length);for(var x=0,d=new Array(f);x1&&void 0!==arguments[1]?arguments[1]:-1,x=s.split(",").map((function(s){var f=s.replace(/&[ol\d]+/,"");return k[f][0]})).join("的");return f>-1&&k[f+","+s]&&(0==f?x="(女性)"+x:1==f&&(x="(男性)"+x)),x}var q=Object.assign({},O,{xb:["兄弟","晜弟","亲兄弟","同胞兄弟"],"xb,w":["兄弟媳妇","兄弟妇"],xs:["姐妹","亲姐妹","同胞姐妹"],"xs,h":["姐妹夫","姊妹婿"],"f,xb":["伯叔父","几爸爸","几爸","几爹"],"f,xb,w":["伯叔母","几妈妈","几妈","几娘"],"h,xb":["伯叔"],"h,xb,w":["妯娌","娣姒","娣姒姊妹","婶子"]}),z={},B=function(s){q[s].forEach((function(f){void 0===z[f]&&(z[f]=[]),z[f].push(s)}))};for(var D in q)B(D);function F(s,f){var x="undefined"!=typeof Symbol&&s[Symbol.iterator]||s["@@iterator"];if(!x){if(Array.isArray(s)||(x=function(s,f){if(!s)return;if("string"==typeof s)return H(s,f);var x=Object.prototype.toString.call(s).slice(8,-1);"Object"===x&&s.constructor&&(x=s.constructor.name);if("Map"===x||"Set"===x)return Array.from(s);if("Arguments"===x||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(x))return H(s,f)}(s))||f&&s&&"number"==typeof s.length){x&&(s=x);var d=0,m=function(){};return{s:m,n:function(){return d>=s.length?{done:!0}:{done:!1,value:s[d++]}},e:function(s){throw s},f:m}}throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}var b,o=!0,r=!1;return{s:function(){x=x.call(s)},n:function(){var s=x.next();return o=s.done,s},e:function(s){r=!0,b=s},f:function(){try{o||null==x.return||x.return()}finally{if(r)throw b}}}}function H(s,f){(null==f||f>s.length)&&(f=s.length);for(var x=0,d=new Array(f);x-1)d=m;else if(b>-1&&-1==m)d=b;else{if(b!=m)return[];d=b}}var o=P(s.from,d),r=P(s.to,d);if(!o.length||!r.length)return[];var e=[];return o.forEach((function(f){r.forEach((function(x){var m=d,b=","+x;if(b.match(/,([fhs1](&[ol\d]+)?|[olx]b)(&[ol\d]+)?$/)&&(m=1),b.match(/,([mwd0](&[ol\d]+)?|[olx]s)(&[ol\d]+)?$/)&&(m=0),f&&x){var o=s.optimal;if((f.match(/&\d+/)||x.match(/&\d+/))&&(o=!0),o){var r=function(s){for(var f=s.from,x=s.to,d=s.sex,m=f.split(","),b=x.split(","),o=0;o+w?m[o]=m[o].replace(/^[xol]b|^s/,"lb").replace(/^[xol]s|^d/,"ls"):+t<+w&&(m[o]=m[o].replace(/^[xol]b|^s/,"ob").replace(/^[xol]s|^d/,"os")),f=m.slice(o).join(","),x=b.slice(o+1).join(","),d=b[o].match(/^([fhs1](&[ol\d]+)?|[olx]b)(&[ol\d]+)?/)?1:0;else if(s.optimal){var M,n;if(t=(null===(M=m[o].match(/([xol])[bs]/))||void 0===M?void 0:M[1])||"",w=(null===(n=b[o].match(/([xol])[bs]/))||void 0===n?void 0:n[1])||"","x"==t||"x"==w){f=m.slice(o+1).join(","),x=b.slice(o+1).join(","),d=m[o].match(/^([fhs1](&[ol\d]+)?|[olx]b)(&[ol\d]+)?/)?1:0;continue}}}break}f=m.slice(o+1).join(","),x=b.slice(o+1).join(","),d=m[o].match(/^([fhs1](&[ol\d]+)?|[olx]b)(&[ol\d]+)?/)?1:0}return{from:f,to:x,sex:d}}({from:f,to:x,sex:d,optimal:s.optimal});f=r.from,x=r.to,d=r.sex}}(x?N(x,d):[""]).forEach((function(s){var x=(s?","+s:"")+(f?","+f:"");e.push({selector:x,sex:m})}))}))})),e}function L(s){var f=[],x={};return function s(d){var m="";if(!x[d]){x[d]=!0;do{m=d;var b,r=F(o);try{for(r.s();!(b=r.n()).done;){var e=b.value;if((d=d.replace(e.exp,e.str)).includes("#"))return d.split("#").forEach(s),!1}}catch(s){r.e(s)}finally{r.f()}}while(m!=d);if(d.match(/,[mwd0](&[ol\d+])?,w|,[hfs1](&[ol\d]+)?,h/))return!1;f.push(d)}}(s),f}function P(s,f){if(s.match(/^,/)||(s=","+s),f<0)s.match(/^,[w1]/)?f=1:s.match(/^,[h0]/)&&(f=0);else{if(1==f&&s.match(/^,[h0]/))return[];if(0==f&&s.match(/^,[w1]/))return[]}if(f>-1&&!s.includes(",1")&&!s.includes(",0")&&(s=","+f+s),s.match(/,[mwd0](&[ol\d]+)?,w|,[hfs1](&[ol\d]+)?,h/))return[];var x=L(s).map((function(s){return s.replace(/,[01]/,"").substr(1)}));return I(x)}var Q=function(s){"string"==typeof s&&(s=function(s){var f,x=m(d);try{for(x.s();!(f=x.n()).done;){var b=f.value,o=s.match(b.exp);if(o)return b.opt(o)}}catch(s){x.e(s)}finally{x.f()}return{}}(s));var f=Object.assign({text:"",target:"",sex:-1,type:"default",reverse:!1,mode:"default",optimal:!1},s);!function(s){if(O=Object.assign({},j),s&&A[s])for(var f in A[s])O[f]=[].concat(A[s][f],j[f]||[])}(f.mode);var b=J(f.text),o=J(f.target);o.length||(o=[""]);var r=[];return b.forEach((function(s){o.forEach((function(x){K({from:s,to:x,sex:f.sex,optimal:f.optimal}).forEach((function(s){(s?P(s.selector,s.sex):[]).forEach((function(x){var d=[x],m=s.sex;f.reverse&&(d=N(x,m),m=x.match(/([fhs1](&[ol\d]+)?|[olx]b)$/)?1:0),"chain"==f.type?d.forEach((function(f){var x=U(f,s.sex);x&&r.push(x)})):"pair"==f.type?(d=N(x,s.sex)).forEach((function(s){var f=function(s,f){var x=[],d=[],m=[];s=s.replace(/&\d+/g,""),f=f.replace(/&\d+/g,"");var b=s.replace(/([ol])([bs])/g,"x$2"),o=f.replace(/([ol])([bs])/g,"x$2"),r=s.replace(/&[ol]/g,""),e=f.replace(/&[ol]/g,"");for(var h in t){var l=h.split("#");if(l.length>1){var w=P(l[0]),M=P(l[1]),n=w.map((function(s){return s.replace(/&[ol\d]+/,"").replace(/([ol])([bs])/,"x$2")})),a=M.map((function(s){return s.replace(/&[ol\d]+/,"").replace(/([ol])([bs])/,"x$2")}));(w.includes(s)&&M.includes(f)||w.includes(f)&&M.includes(s))&&x.push(t[h][0]),(n.includes(b)&&a.includes(o)||n.includes(o)&&a.includes(b))&&d.push(t[h][0]),(n.includes(r)&&a.includes(e)||n.includes(e)&&a.includes(r))&&m.push(t[h][0])}}return x.length||(x=d),x.length||(x=m),x}(x,s);r=r.concat(f)})):d.forEach((function(s){var f=C(s);f.length||(f=C(m+","+s)),r=r.concat(f)}))}))}))}))})),x(new Set(r))};return Q.data=O,Q.dataCount=Object.keys(O).length,Q.setMode=function(s,f){A[s]=Object.assign(A[s]||{},f)},Q})); +!function(s,f){"object"==typeof exports&&"undefined"!=typeof module?module.exports=f():"function"==typeof define&&define.amd?define(f):(s="undefined"!=typeof globalThis?globalThis:s||self).relationship=f()}(this,(function(){"use strict";function s(s,f){(null==f||f>s.length)&&(f=s.length);for(var x=0,d=new Array(f);x=s.length?{done:!0}:{done:!1,value:s[d++]}},e:function(s){throw s},f:m}}throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}var o,r=!0,e=!1;return{s:function(){x=x.call(s)},n:function(){var s=x.next();return r=s.done,s},e:function(s){e=!0,o=s},f:function(){try{r||null==x.return||x.return()}finally{if(e)throw o}}}}function b(s,f){(null==f||f>s.length)&&(f=s.length);for(var x=0,d=new Array(f);x1&&void 0!==arguments[1]?arguments[1]:-1,x=s.split(",").map((function(s){var f=s.replace(/&[ol\d]+/,"");return U[f][0]})).join("的");return f>-1&&U[f+","+s]&&(0==f?x="(女性)"+x:1==f&&(x="(男性)"+x)),x}var z={xb:["兄弟","晜弟","亲兄弟","同胞兄弟"],"xb,w":["兄弟媳妇","兄弟妇"],xs:["姐妹","亲姐妹","同胞姐妹"],"xs,h":["姐妹夫","姊妹婿"],"f,xb":["伯叔父"],"f,xb,w":["伯叔母"],"f,f,xb":["从祖祖父","从祖父"],"f,f,xb,w":["从祖祖母","从祖母"],"m,f,xb":["外从祖祖父"],"m,f,xb,w":["外从祖祖母"],"h,xb":["伯叔"],"h,xb,w":["妯娌","娣姒","娣姒姊妹","婶子"]},B=Object.assign({},N);for(var D in z)B[D]=(B[D]||[]).concat(z[D]);for(var F in w)B[F]=(B[F]||[]).concat(w[F]);var H={},J=function(s){B[s].forEach((function(f){void 0===H[f]&&(H[f]=[]),H[f].push(s)}))};for(var K in B)J(K);function L(s,f){var x="undefined"!=typeof Symbol&&s[Symbol.iterator]||s["@@iterator"];if(!x){if(Array.isArray(s)||(x=function(s,f){if(!s)return;if("string"==typeof s)return P(s,f);var x=Object.prototype.toString.call(s).slice(8,-1);"Object"===x&&s.constructor&&(x=s.constructor.name);if("Map"===x||"Set"===x)return Array.from(s);if("Arguments"===x||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(x))return P(s,f)}(s))||f&&s&&"number"==typeof s.length){x&&(s=x);var d=0,m=function(){};return{s:m,n:function(){return d>=s.length?{done:!0}:{done:!1,value:s[d++]}},e:function(s){throw s},f:m}}throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}var b,o=!0,r=!1;return{s:function(){x=x.call(s)},n:function(){var s=x.next();return o=s.done,s},e:function(s){r=!0,b=s},f:function(){try{o||null==x.return||x.return()}finally{if(r)throw b}}}}function P(s,f){(null==f||f>s.length)&&(f=s.length);for(var x=0,d=new Array(f);x-1)d=m;else if(b>-1&&-1==m)d=b;else{if(b!=m)return[];d=b}}var o=X(s.from,d),r=X(s.to,d);if(!o.length||!r.length)return[];var e=[];return o.forEach((function(f){r.forEach((function(x){var m=d,b=","+x;if(b.match(/,([fhs1](&[ol\d]+)?|[olx]b)(&[ol\d]+)?$/)&&(m=1),b.match(/,([mwd0](&[ol\d]+)?|[olx]s)(&[ol\d]+)?$/)&&(m=0),f&&x){var o=s.optimal;if((f.match(/&\d+/)||x.match(/&\d+/))&&(o=!0),o){var r=function(s){for(var f=s.from,x=s.to,d=s.sex,m=f.split(","),b=x.split(","),o=0;o+w?m[o]=m[o].replace(/^[xol]b|^s/,"lb").replace(/^[xol]s|^d/,"ls"):+t<+w&&(m[o]=m[o].replace(/^[xol]b|^s/,"ob").replace(/^[xol]s|^d/,"os")),f=m.slice(o).join(","),x=b.slice(o+1).join(","),d=b[o].match(/^([fhs1](&[ol\d]+)?|[olx]b)(&[ol\d]+)?/)?1:0;else if(s.optimal){var M,n;if(t=(null===(M=m[o].match(/([xol])[bs]/))||void 0===M?void 0:M[1])||"",w=(null===(n=b[o].match(/([xol])[bs]/))||void 0===n?void 0:n[1])||"","x"==t||"x"==w){f=m.slice(o+1).join(","),x=b.slice(o+1).join(","),d=m[o].match(/^([fhs1](&[ol\d]+)?|[olx]b)(&[ol\d]+)?/)?1:0;continue}}}break}f=m.slice(o+1).join(","),x=b.slice(o+1).join(","),d=m[o].match(/^([fhs1](&[ol\d]+)?|[olx]b)(&[ol\d]+)?/)?1:0}return{from:f,to:x,sex:d}}({from:f,to:x,sex:d,optimal:s.optimal});f=r.from,x=r.to,d=r.sex}}(x?I(x,d):[""]).forEach((function(s){var x=(s?","+s:"")+(f?","+f:"");e.push({selector:x,sex:m})}))}))})),e}function V(s){var f=[],x={};return function s(d){var m="";if(!x[d]){x[d]=!0;do{m=d;var b,r=L(o);try{for(r.s();!(b=r.n()).done;){var e=b.value;if((d=d.replace(e.exp,e.str)).includes("#"))return d.split("#").forEach(s),!1}}catch(s){r.e(s)}finally{r.f()}}while(m!=d);if(d.match(/,[mwd0](&[ol\d+])?,w|,[hfs1](&[ol\d]+)?,h/))return!1;f.push(d)}}(s),f}function X(s,f){if(s.match(/^,/)||(s=","+s),f<0)s.match(/^,[w1]/)?f=1:s.match(/^,[h0]/)&&(f=0);else{if(1==f&&s.match(/^,[h0]/))return[];if(0==f&&s.match(/^,[w1]/))return[]}if(f>-1&&!s.includes(",1")&&!s.includes(",0")&&(s=","+f+s),s.match(/,[mwd0](&[ol\d]+)?,w|,[hfs1](&[ol\d]+)?,h/))return[];var x=V(s).map((function(s){return s.replace(/,[01]/,"").substr(1)}));return T(x)}var Y=function(s){"string"==typeof s&&(s=function(s){var f,x=m(d);try{for(x.s();!(f=x.n()).done;){var b=f.value,o=s.match(b.exp);if(o)return b.opt(o)}}catch(s){x.e(s)}finally{x.f()}return{}}(s));var f=Object.assign({text:"",target:"",sex:-1,type:"default",reverse:!1,mode:"default",optimal:!1},s);!function(s){if(N=Object.assign({},A),s&&O[s])for(var f in O[s])N[f]=[].concat(O[s][f],A[f]||[])}(f.mode);var b=Q(f.text),o=Q(f.target);o.length||(o=[""]);var r=[];return b.forEach((function(s){o.forEach((function(x){R({from:s,to:x,sex:f.sex,optimal:f.optimal}).forEach((function(s){(s?X(s.selector,s.sex):[]).forEach((function(x){var d=[x],m=s.sex;f.reverse&&(d=I(x,m),m=x.match(/([fhs1](&[ol\d]+)?|[olx]b)$/)?1:0),"chain"==f.type?d.forEach((function(f){var x=q(f,s.sex);x&&r.push(x)})):"pair"==f.type?(d=I(x,s.sex)).forEach((function(s){var f=function(s,f){var x=[],d=[],m=[];s=s.replace(/&\d+/g,""),f=f.replace(/&\d+/g,"");var b=s.replace(/([ol])([bs])/g,"x$2"),o=f.replace(/([ol])([bs])/g,"x$2"),r=s.replace(/&[ol]/g,""),e=f.replace(/&[ol]/g,"");for(var h in t){var l=h.split("#");if(l.length>1){var w=X(l[0]),M=X(l[1]),n=w.map((function(s){return s.replace(/&[ol\d]+/,"").replace(/([ol])([bs])/,"x$2")})),a=M.map((function(s){return s.replace(/&[ol\d]+/,"").replace(/([ol])([bs])/,"x$2")}));(w.includes(s)&&M.includes(f)||w.includes(f)&&M.includes(s))&&x.push(t[h][0]),(n.includes(b)&&a.includes(o)||n.includes(o)&&a.includes(b))&&d.push(t[h][0]),(n.includes(r)&&a.includes(e)||n.includes(e)&&a.includes(r))&&m.push(t[h][0])}}return x.length||(x=d),x.length||(x=m),x}(x,s);r=r.concat(f)})):d.forEach((function(s){var f=k(s);f.length||(f=k(m+","+s)),r=r.concat(f)}))}))}))}))})),x(new Set(r))};return Y.data=N,Y.dataCount=Object.keys(N).length,Y.setMode=function(s,f){O[s]=Object.assign(O[s]||{},f)},Y})); diff --git a/dist/relationship.min.mjs b/dist/relationship.min.mjs index 2fb5cab..a3beadc 100644 --- a/dist/relationship.min.mjs +++ b/dist/relationship.min.mjs @@ -8,6 +8,6 @@ * Released under the MIT License * https://github.com/mumuy/relationship * - * Created on: 2024-07-29 + * Created on: 2024-07-30 */ -function s(s,f){(null==f||f>s.length)&&(f=s.length);for(var x=0,d=new Array(f);x=s.length?{done:!0}:{done:!1,value:s[d++]}},e:function(s){throw s},f:m}}throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}var o,r=!0,h=!1;return{s:function(){x=x.call(s)},n:function(){var s=x.next();return r=s.done,s},e:function(s){h=!0,o=s},f:function(){try{r||null==x.return||x.return()}finally{if(h)throw o}}}}function b(s,f){(null==f||f>s.length)&&(f=s.length);for(var x=0,d=new Array(f);x1&&void 0!==arguments[1]?arguments[1]:-1,x=s.split(",").map((function(s){var f=s.replace(/&[ol\d]+/,"");return k[f][0]})).join("的");return f>-1&&k[f+","+s]&&(0==f?x="(女性)"+x:1==f&&(x="(男性)"+x)),x}var q=Object.assign({},O,{xb:["兄弟","晜弟","亲兄弟","同胞兄弟"],"xb,w":["兄弟媳妇","兄弟妇"],xs:["姐妹","亲姐妹","同胞姐妹"],"xs,h":["姐妹夫","姊妹婿"],"f,xb":["伯叔父","几爸爸","几爸","几爹"],"f,xb,w":["伯叔母","几妈妈","几妈","几娘"],"h,xb":["伯叔"],"h,xb,w":["妯娌","娣姒","娣姒姊妹","婶子"]}),z={},B=function(s){q[s].forEach((function(f){void 0===z[f]&&(z[f]=[]),z[f].push(s)}))};for(var D in q)B(D);function F(s,f){var x="undefined"!=typeof Symbol&&s[Symbol.iterator]||s["@@iterator"];if(!x){if(Array.isArray(s)||(x=function(s,f){if(!s)return;if("string"==typeof s)return H(s,f);var x=Object.prototype.toString.call(s).slice(8,-1);"Object"===x&&s.constructor&&(x=s.constructor.name);if("Map"===x||"Set"===x)return Array.from(s);if("Arguments"===x||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(x))return H(s,f)}(s))||f&&s&&"number"==typeof s.length){x&&(s=x);var d=0,m=function(){};return{s:m,n:function(){return d>=s.length?{done:!0}:{done:!1,value:s[d++]}},e:function(s){throw s},f:m}}throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}var b,o=!0,r=!1;return{s:function(){x=x.call(s)},n:function(){var s=x.next();return o=s.done,s},e:function(s){r=!0,b=s},f:function(){try{o||null==x.return||x.return()}finally{if(r)throw b}}}}function H(s,f){(null==f||f>s.length)&&(f=s.length);for(var x=0,d=new Array(f);x-1)d=m;else if(b>-1&&-1==m)d=b;else{if(b!=m)return[];d=b}}var o=P(s.from,d),r=P(s.to,d);if(!o.length||!r.length)return[];var h=[];return o.forEach((function(f){r.forEach((function(x){var m=d,b=","+x;if(b.match(/,([fhs1](&[ol\d]+)?|[olx]b)(&[ol\d]+)?$/)&&(m=1),b.match(/,([mwd0](&[ol\d]+)?|[olx]s)(&[ol\d]+)?$/)&&(m=0),f&&x){var o=s.optimal;if((f.match(/&\d+/)||x.match(/&\d+/))&&(o=!0),o){var r=function(s){for(var f=s.from,x=s.to,d=s.sex,m=f.split(","),b=x.split(","),o=0;o+w?m[o]=m[o].replace(/^[xol]b|^s/,"lb").replace(/^[xol]s|^d/,"ls"):+t<+w&&(m[o]=m[o].replace(/^[xol]b|^s/,"ob").replace(/^[xol]s|^d/,"os")),f=m.slice(o).join(","),x=b.slice(o+1).join(","),d=b[o].match(/^([fhs1](&[ol\d]+)?|[olx]b)(&[ol\d]+)?/)?1:0;else if(s.optimal){var M,n;if(t=(null===(M=m[o].match(/([xol])[bs]/))||void 0===M?void 0:M[1])||"",w=(null===(n=b[o].match(/([xol])[bs]/))||void 0===n?void 0:n[1])||"","x"==t||"x"==w){f=m.slice(o+1).join(","),x=b.slice(o+1).join(","),d=m[o].match(/^([fhs1](&[ol\d]+)?|[olx]b)(&[ol\d]+)?/)?1:0;continue}}}break}f=m.slice(o+1).join(","),x=b.slice(o+1).join(","),d=m[o].match(/^([fhs1](&[ol\d]+)?|[olx]b)(&[ol\d]+)?/)?1:0}return{from:f,to:x,sex:d}}({from:f,to:x,sex:d,optimal:s.optimal});f=r.from,x=r.to,d=r.sex}}(x?N(x,d):[""]).forEach((function(s){var x=(s?","+s:"")+(f?","+f:"");h.push({selector:x,sex:m})}))}))})),h}function L(s){var f=[],x={};return function s(d){var m="";if(!x[d]){x[d]=!0;do{m=d;var b,r=F(o);try{for(r.s();!(b=r.n()).done;){var h=b.value;if((d=d.replace(h.exp,h.str)).includes("#"))return d.split("#").forEach(s),!1}}catch(s){r.e(s)}finally{r.f()}}while(m!=d);if(d.match(/,[mwd0](&[ol\d+])?,w|,[hfs1](&[ol\d]+)?,h/))return!1;f.push(d)}}(s),f}function P(s,f){if(s.match(/^,/)||(s=","+s),f<0)s.match(/^,[w1]/)?f=1:s.match(/^,[h0]/)&&(f=0);else{if(1==f&&s.match(/^,[h0]/))return[];if(0==f&&s.match(/^,[w1]/))return[]}if(f>-1&&!s.includes(",1")&&!s.includes(",0")&&(s=","+f+s),s.match(/,[mwd0](&[ol\d]+)?,w|,[hfs1](&[ol\d]+)?,h/))return[];var x=L(s).map((function(s){return s.replace(/,[01]/,"").substr(1)}));return I(x)}var Q=function(s){"string"==typeof s&&(s=function(s){var f,x=m(d);try{for(x.s();!(f=x.n()).done;){var b=f.value,o=s.match(b.exp);if(o)return b.opt(o)}}catch(s){x.e(s)}finally{x.f()}return{}}(s));var f=Object.assign({text:"",target:"",sex:-1,type:"default",reverse:!1,mode:"default",optimal:!1},s);!function(s){if(O=Object.assign({},j),s&&A[s])for(var f in A[s])O[f]=[].concat(A[s][f],j[f]||[])}(f.mode);var b=J(f.text),o=J(f.target);o.length||(o=[""]);var r=[];return b.forEach((function(s){o.forEach((function(x){K({from:s,to:x,sex:f.sex,optimal:f.optimal}).forEach((function(s){(s?P(s.selector,s.sex):[]).forEach((function(x){var d=[x],m=s.sex;f.reverse&&(d=N(x,m),m=x.match(/([fhs1](&[ol\d]+)?|[olx]b)$/)?1:0),"chain"==f.type?d.forEach((function(f){var x=U(f,s.sex);x&&r.push(x)})):"pair"==f.type?(d=N(x,s.sex)).forEach((function(s){var f=function(s,f){var x=[],d=[],m=[];s=s.replace(/&\d+/g,""),f=f.replace(/&\d+/g,"");var b=s.replace(/([ol])([bs])/g,"x$2"),o=f.replace(/([ol])([bs])/g,"x$2"),r=s.replace(/&[ol]/g,""),h=f.replace(/&[ol]/g,"");for(var e in t){var l=e.split("#");if(l.length>1){var w=P(l[0]),M=P(l[1]),n=w.map((function(s){return s.replace(/&[ol\d]+/,"").replace(/([ol])([bs])/,"x$2")})),a=M.map((function(s){return s.replace(/&[ol\d]+/,"").replace(/([ol])([bs])/,"x$2")}));(w.includes(s)&&M.includes(f)||w.includes(f)&&M.includes(s))&&x.push(t[e][0]),(n.includes(b)&&a.includes(o)||n.includes(o)&&a.includes(b))&&d.push(t[e][0]),(n.includes(r)&&a.includes(h)||n.includes(h)&&a.includes(r))&&m.push(t[e][0])}}return x.length||(x=d),x.length||(x=m),x}(x,s);r=r.concat(f)})):d.forEach((function(s){var f=T(s);f.length||(f=T(m+","+s)),r=r.concat(f)}))}))}))}))})),x(new Set(r))};Q.data=O,Q.dataCount=Object.keys(O).length,Q.setMode=function(s,f){A[s]=Object.assign(A[s]||{},f)};export{Q as default}; +function s(s,f){(null==f||f>s.length)&&(f=s.length);for(var x=0,d=new Array(f);x=s.length?{done:!0}:{done:!1,value:s[d++]}},e:function(s){throw s},f:m}}throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}var o,r=!0,h=!1;return{s:function(){x=x.call(s)},n:function(){var s=x.next();return r=s.done,s},e:function(s){h=!0,o=s},f:function(){try{r||null==x.return||x.return()}finally{if(h)throw o}}}}function b(s,f){(null==f||f>s.length)&&(f=s.length);for(var x=0,d=new Array(f);x1&&void 0!==arguments[1]?arguments[1]:-1,x=s.split(",").map((function(s){var f=s.replace(/&[ol\d]+/,"");return U[f][0]})).join("的");return f>-1&&U[f+","+s]&&(0==f?x="(女性)"+x:1==f&&(x="(男性)"+x)),x}var z={xb:["兄弟","晜弟","亲兄弟","同胞兄弟"],"xb,w":["兄弟媳妇","兄弟妇"],xs:["姐妹","亲姐妹","同胞姐妹"],"xs,h":["姐妹夫","姊妹婿"],"f,xb":["伯叔父"],"f,xb,w":["伯叔母"],"f,f,xb":["从祖祖父","从祖父"],"f,f,xb,w":["从祖祖母","从祖母"],"m,f,xb":["外从祖祖父"],"m,f,xb,w":["外从祖祖母"],"h,xb":["伯叔"],"h,xb,w":["妯娌","娣姒","娣姒姊妹","婶子"]},B=Object.assign({},N);for(var D in z)B[D]=(B[D]||[]).concat(z[D]);for(var F in w)B[F]=(B[F]||[]).concat(w[F]);var H={},J=function(s){B[s].forEach((function(f){void 0===H[f]&&(H[f]=[]),H[f].push(s)}))};for(var K in B)J(K);function L(s,f){var x="undefined"!=typeof Symbol&&s[Symbol.iterator]||s["@@iterator"];if(!x){if(Array.isArray(s)||(x=function(s,f){if(!s)return;if("string"==typeof s)return P(s,f);var x=Object.prototype.toString.call(s).slice(8,-1);"Object"===x&&s.constructor&&(x=s.constructor.name);if("Map"===x||"Set"===x)return Array.from(s);if("Arguments"===x||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(x))return P(s,f)}(s))||f&&s&&"number"==typeof s.length){x&&(s=x);var d=0,m=function(){};return{s:m,n:function(){return d>=s.length?{done:!0}:{done:!1,value:s[d++]}},e:function(s){throw s},f:m}}throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}var b,o=!0,r=!1;return{s:function(){x=x.call(s)},n:function(){var s=x.next();return o=s.done,s},e:function(s){r=!0,b=s},f:function(){try{o||null==x.return||x.return()}finally{if(r)throw b}}}}function P(s,f){(null==f||f>s.length)&&(f=s.length);for(var x=0,d=new Array(f);x-1)d=m;else if(b>-1&&-1==m)d=b;else{if(b!=m)return[];d=b}}var o=X(s.from,d),r=X(s.to,d);if(!o.length||!r.length)return[];var h=[];return o.forEach((function(f){r.forEach((function(x){var m=d,b=","+x;if(b.match(/,([fhs1](&[ol\d]+)?|[olx]b)(&[ol\d]+)?$/)&&(m=1),b.match(/,([mwd0](&[ol\d]+)?|[olx]s)(&[ol\d]+)?$/)&&(m=0),f&&x){var o=s.optimal;if((f.match(/&\d+/)||x.match(/&\d+/))&&(o=!0),o){var r=function(s){for(var f=s.from,x=s.to,d=s.sex,m=f.split(","),b=x.split(","),o=0;o+w?m[o]=m[o].replace(/^[xol]b|^s/,"lb").replace(/^[xol]s|^d/,"ls"):+t<+w&&(m[o]=m[o].replace(/^[xol]b|^s/,"ob").replace(/^[xol]s|^d/,"os")),f=m.slice(o).join(","),x=b.slice(o+1).join(","),d=b[o].match(/^([fhs1](&[ol\d]+)?|[olx]b)(&[ol\d]+)?/)?1:0;else if(s.optimal){var M,n;if(t=(null===(M=m[o].match(/([xol])[bs]/))||void 0===M?void 0:M[1])||"",w=(null===(n=b[o].match(/([xol])[bs]/))||void 0===n?void 0:n[1])||"","x"==t||"x"==w){f=m.slice(o+1).join(","),x=b.slice(o+1).join(","),d=m[o].match(/^([fhs1](&[ol\d]+)?|[olx]b)(&[ol\d]+)?/)?1:0;continue}}}break}f=m.slice(o+1).join(","),x=b.slice(o+1).join(","),d=m[o].match(/^([fhs1](&[ol\d]+)?|[olx]b)(&[ol\d]+)?/)?1:0}return{from:f,to:x,sex:d}}({from:f,to:x,sex:d,optimal:s.optimal});f=r.from,x=r.to,d=r.sex}}(x?I(x,d):[""]).forEach((function(s){var x=(s?","+s:"")+(f?","+f:"");h.push({selector:x,sex:m})}))}))})),h}function V(s){var f=[],x={};return function s(d){var m="";if(!x[d]){x[d]=!0;do{m=d;var b,r=L(o);try{for(r.s();!(b=r.n()).done;){var h=b.value;if((d=d.replace(h.exp,h.str)).includes("#"))return d.split("#").forEach(s),!1}}catch(s){r.e(s)}finally{r.f()}}while(m!=d);if(d.match(/,[mwd0](&[ol\d+])?,w|,[hfs1](&[ol\d]+)?,h/))return!1;f.push(d)}}(s),f}function X(s,f){if(s.match(/^,/)||(s=","+s),f<0)s.match(/^,[w1]/)?f=1:s.match(/^,[h0]/)&&(f=0);else{if(1==f&&s.match(/^,[h0]/))return[];if(0==f&&s.match(/^,[w1]/))return[]}if(f>-1&&!s.includes(",1")&&!s.includes(",0")&&(s=","+f+s),s.match(/,[mwd0](&[ol\d]+)?,w|,[hfs1](&[ol\d]+)?,h/))return[];var x=V(s).map((function(s){return s.replace(/,[01]/,"").substr(1)}));return C(x)}var Y=function(s){"string"==typeof s&&(s=function(s){var f,x=m(d);try{for(x.s();!(f=x.n()).done;){var b=f.value,o=s.match(b.exp);if(o)return b.opt(o)}}catch(s){x.e(s)}finally{x.f()}return{}}(s));var f=Object.assign({text:"",target:"",sex:-1,type:"default",reverse:!1,mode:"default",optimal:!1},s);!function(s){if(N=Object.assign({},A),s&&O[s])for(var f in O[s])N[f]=[].concat(O[s][f],A[f]||[])}(f.mode);var b=Q(f.text),o=Q(f.target);o.length||(o=[""]);var r=[];return b.forEach((function(s){o.forEach((function(x){R({from:s,to:x,sex:f.sex,optimal:f.optimal}).forEach((function(s){(s?X(s.selector,s.sex):[]).forEach((function(x){var d=[x],m=s.sex;f.reverse&&(d=I(x,m),m=x.match(/([fhs1](&[ol\d]+)?|[olx]b)$/)?1:0),"chain"==f.type?d.forEach((function(f){var x=q(f,s.sex);x&&r.push(x)})):"pair"==f.type?(d=I(x,s.sex)).forEach((function(s){var f=function(s,f){var x=[],d=[],m=[];s=s.replace(/&\d+/g,""),f=f.replace(/&\d+/g,"");var b=s.replace(/([ol])([bs])/g,"x$2"),o=f.replace(/([ol])([bs])/g,"x$2"),r=s.replace(/&[ol]/g,""),h=f.replace(/&[ol]/g,"");for(var e in t){var l=e.split("#");if(l.length>1){var w=X(l[0]),M=X(l[1]),n=w.map((function(s){return s.replace(/&[ol\d]+/,"").replace(/([ol])([bs])/,"x$2")})),a=M.map((function(s){return s.replace(/&[ol\d]+/,"").replace(/([ol])([bs])/,"x$2")}));(w.includes(s)&&M.includes(f)||w.includes(f)&&M.includes(s))&&x.push(t[e][0]),(n.includes(b)&&a.includes(o)||n.includes(o)&&a.includes(b))&&d.push(t[e][0]),(n.includes(r)&&a.includes(h)||n.includes(h)&&a.includes(r))&&m.push(t[e][0])}}return x.length||(x=d),x.length||(x=m),x}(x,s);r=r.concat(f)})):d.forEach((function(s){var f=k(s);f.length||(f=k(m+","+s)),r=r.concat(f)}))}))}))}))})),x(new Set(r))};Y.data=N,Y.dataCount=Object.keys(N).length,Y.setMode=function(s,f){O[s]=Object.assign(O[s]||{},f)};export{Y as default}; diff --git a/src/module/cache.js b/src/module/cache.js index f143558..2ddecf2 100644 --- a/src/module/cache.js +++ b/src/module/cache.js @@ -2,11 +2,18 @@ * 缓存数据 */ import _input from './data/input.js'; +import _sort from './data/sort.js'; import {modeData} from './mode.js'; -let _hash = Object.assign({},modeData,_input); -let cacheData = {}; +let _hash = Object.assign({},modeData); +for(let key in _input){ + _hash[key] = (_hash[key]||[]).concat(_input[key]); +} +for(let key in _sort){ + _hash[key] = (_hash[key]||[]).concat(_sort[key]); +} +let cacheData = {}; for(let key in _hash){ _hash[key].forEach(function(name){ if(typeof cacheData[name]=='undefined'){ diff --git a/src/module/data/branch.js b/src/module/data/branch.js index 2c869c3..cbb95f9 100644 --- a/src/module/data/branch.js +++ b/src/module/data/branch.js @@ -3,8 +3,6 @@ */ export default { // 其他旁系 - '{G2}':['祖父'], - '{G2},w':['祖母'], '{G2},s':['父'], '{G2},s,w':['母'], '{G2},s,s':['兄弟'], diff --git a/src/module/data/input.js b/src/module/data/input.js index 7a0967c..2df6744 100644 --- a/src/module/data/input.js +++ b/src/module/data/input.js @@ -6,8 +6,12 @@ export default { 'xb,w':['兄弟媳妇','兄弟妇'], 'xs':['姐妹','亲姐妹','同胞姐妹'], 'xs,h':['姐妹夫','姊妹婿'], - 'f,xb':['伯叔父','几爸爸','几爸','几爹'], - 'f,xb,w':['伯叔母','几妈妈','几妈','几娘'], + 'f,xb':['伯叔父'], + 'f,xb,w':['伯叔母'], + 'f,f,xb':['从祖祖父','从祖父'], + 'f,f,xb,w':['从祖祖母','从祖母'], + 'm,f,xb':['外从祖祖父'], + 'm,f,xb,w':['外从祖祖母'], 'h,xb':['伯叔'], 'h,xb,w':['妯娌','娣姒','娣姒姊妹','婶子'], }; diff --git a/src/module/data/main.js b/src/module/data/main.js index b618842..33cca66 100644 --- a/src/module/data/main.js +++ b/src/module/data/main.js @@ -55,8 +55,6 @@ export default { 'f,f,ob,w':['伯婆','姆婆','大奶奶','伯娭毑'], 'f,f,lb':['叔公','叔祖','叔翁','小爷爷','晚公','幺爷','细嗲'], 'f,f,lb,w':['叔婆','婶婆','小奶奶','叔娭毑','晚婆','幺奶'], - 'f,f,xb':['伯叔祖父','从祖父','几爷爷','几大爷','几嗲','几爷','几公'], - 'f,f,xb,w':['伯叔祖母','从祖母','几奶奶','几大娘','几奶','几婆'], 'f,f,xs':['姑奶奶','祖姑','姑奶','恩婆','姑娭毑'], 'f,f,xs,h':['姑爷爷','祖姑丈','恩爹','姑丈公','丈公'], 'f,m,ob':['大舅爷','大舅爹'], @@ -71,8 +69,6 @@ export default { 'm,f,ob,w':['伯外婆','外姆婆','大外婆','大姥姥','大姥奶'], 'm,f,lb':['叔外公','外叔祖','叔外祖','小外公','小姥爷','小外爷'], 'm,f,lb,w':['叔外婆','外婶婆','小外婆','小姥姥','婶姥姥','小姥奶'], - 'm,f,xb':['堂外祖父','几外公','几姥爷','几外爷'], - 'm,f,xb,w':['堂外祖母','几外婆','几姥姥','几姥奶','几外奶','几姥'], 'm,f,xs':['姑外婆','姑婆','恩婆'], 'm,f,xs,h':['姑外公','姑公','恩爹','外姑丈公','外丈公'], 'm,m,xb':['舅外公','舅公','舅爹'], diff --git a/src/module/data/sort.js b/src/module/data/sort.js new file mode 100644 index 0000000..9cad487 --- /dev/null +++ b/src/module/data/sort.js @@ -0,0 +1,11 @@ +/* + * 排序字段 +*/ +export default { + 'f,xb':['几爸爸','几爸','几爹'], + 'f,xb,w':['几妈妈','几妈','几娘'], + 'f,f,xb':['几爷爷','几大爷','几嗲','几爷','几公'], + 'f,f,xb,w':['几奶奶','几大娘','几奶','几婆'], + 'm,f,xb':['几外公','几姥爷','几外爷'], + 'm,f,xb,w':['几外婆','几姥姥','几姥奶','几外奶','几姥'], +}; \ No newline at end of file diff --git a/src/module/id.js b/src/module/id.js index 3ddcb40..64756b8 100644 --- a/src/module/id.js +++ b/src/module/id.js @@ -2,6 +2,7 @@ * 标识符 - 唯一性关系链,将【关系链】转换成【中文表述】 */ import _pair from './data/pair.js'; +import _sort from './data/sort.js'; import {number2zh} from './unit.js'; import {selector2id} from './selector.js'; @@ -99,9 +100,12 @@ export function getItemsById(id){ let num = id.match(/&([\d]+)(,[hw])?$/)[1]; let zh = number2zh(num); id = id.replace(/&\d+/g,''); - if(modeData[id]){ - let item = ''; + if(_sort[id]){ + let item = _sort[id][0].replace('几',zh); + items.push(item); + }else if(modeData[id]){ let gen = getGenById(id); + let item = ''; if(gen<3&&!id.match(/[hw],/)){ modeData[id].forEach(function(name){ if(!item&&name.includes('几')){ @@ -112,8 +116,6 @@ export function getItemsById(id){ item = modeData[id][0]; item = item.match(/^[大小]/)?item.replace(/^[大小]/,zh):zh+item; } - }else{ - item = modeData[id][0] } items.push(item); }