updated 合称bug修复

bug修复及单元测试

src/module/data/pair.js

@@ -17,10 +17,13 @@ export default {
     'h,m#s,w':['婆媳'],
     '[f|m],[f|m]#[s|d],[s|d]':['祖孙'],
     'f,xb#xb,[s|d]':['叔侄'],
-    'f,xb,w#xb,[s|d]':['婶侄'],
+    'f,xb,w#h,xb,[s|d]':['婶侄'],
-    'f,[xs|xs,h]#xb,[s|d]':['姑侄'],
+    'f,xs#xb,[s|d]':['姑侄'],
-    'm,[xb|xb,w]#xs,[s|d]':['舅甥'],
+    'f,xs,h#w,xb,[s|d]':['姑侄'],
-    'm,[xs|xs,h]#xs,[s|d]':['姨甥'],
+    'm,xb#xs,[s|d]':['舅甥'],
+    'm,xb,w#h,xs,[s|d]':['舅甥'],
+    'm,xs#xs,[s|d]':['姨甥'],
+    'm,xs,h#w,xs,[s|d]':['姨甥'],
     'f,xb,s&o#f,xb,s&l':['堂兄弟'],
     'f,xb,s&o#f,xb,d&l':['堂兄妹'],
     'f,xb,d&o#f,xb,s&l':['堂姐弟'],

test/index.js

@@ -2,46 +2,64 @@
 var test = require('tape');
 var relationship = require('..');
 
-test('relationship.js show to be tested', function (t) {
+test('[call]', function (t) {
-    // console.log('[test]',relationship({text:'舅妈',target:'二舅',type:'pair'}));
+    t.deepEqual(relationship({text:'爸爸的哥哥的弟弟的儿子'}),['堂哥','堂弟','哥哥','弟弟','自己']);
-    // console.log('[test]',relationship({text:'姑姑',target:'叔叔',optimal:true}));
+    t.deepEqual(relationship({text:'爸爸的妹妹的女儿的老公'}),['姑表姐夫','姑表妹夫']);
-
+    t.deepEqual(relationship({text:'表姐的哥哥',sex:1}),['姑表哥','舅表哥']);
-    t.deepEqual(relationship({text:'儿子的爸爸的妈妈',sex:1}),['妈妈']);
+    t.deepEqual(relationship({text:'表姐的妹妹',sex:1}),['姑表姐','姑表妹','舅表姐','舅表妹']);
+    t.deepEqual(relationship({text:'弟弟的表哥',sex:1}),['姑表哥','姑表弟','舅表哥','舅表弟']);
+    t.deepEqual(relationship({text:'姐姐的老公的姐姐的老公'}),['姊妹姻姊妹壻']);
+    t.deepEqual(relationship({text:'哥哥的弟弟的爸爸的儿子',sex:1}),['哥哥','弟弟','自己']);
     t.deepEqual(relationship({text:'爱人',sex:1}),['老婆']);
     t.deepEqual(relationship({text:'爱人的爱人',sex:1}),['自己']);
     t.deepEqual(relationship({text:'老婆的爱人',sex:1}),['自己']);
     t.deepEqual(relationship({text:'老婆的老公',sex:1}),['自己']);
     t.deepEqual(relationship({text:'老婆的外孙的姥爷',sex:1}),['自己']);
-    t.deepEqual(relationship({text:'表姐的哥哥',sex:1}),['姑表哥','舅表哥']);
-    t.deepEqual(relationship({text:'表姐的妹妹',sex:1}),['姑表姐','姑表妹','舅表姐','舅表妹']);
-    t.deepEqual(relationship({text:'弟弟的表哥',sex:1}),['姑表哥','姑表弟','舅表哥','舅表弟']);
     t.deepEqual(relationship({text:'老公的老婆的儿子的爸爸',sex:0}),['老公']);
-    t.deepEqual(relationship({text:'哥哥的弟弟的爸爸的儿子',sex:1}),['哥哥','弟弟','自己']);
-    t.deepEqual(relationship({text:'爸爸的舅舅',sex:0,reverse:true}),['甥孙女']);
-    t.deepEqual(relationship({text:'舅爷爷',type:'chain'}),['爸爸的妈妈的兄弟']);
     t.deepEqual(relationship({text:'堂兄弟的孩子',sex:1}),['堂侄','堂侄女']);
+    t.deepEqual(relationship({text:'儿子的爸爸的妈妈',sex:1}),['妈妈']);
+    t.deepEqual(relationship({text:'岳母的配偶的孩子的爸爸'}),['岳父']);
+    t.end();
+});
+test('[target]', function (t) {
+    t.deepEqual(relationship({text:'我',target:'爸爸'}),['儿子','女儿']);
+    t.deepEqual(relationship({text:'老公的父母',target:'孩子'}),['爷爷','奶奶']);
+    t.deepEqual(relationship({text:'爱人',target:'娘家侄子'}),['姑丈']);
+    t.end();
+});
+test('[reverse]', function (t) {
+    t.deepEqual(relationship({text:'爸爸的舅舅',sex:0,reverse:true}),['甥孙女']);
     t.deepEqual(relationship({text:'岳母',target:'女儿',reverse:true}),['外孙女']);
     t.deepEqual(relationship({text:'姑妈',target:'舅妈',reverse:true}),['兄弟眷兄弟妇']);
     t.deepEqual(relationship({text:'舅妈',target:'女儿',reverse:true}),['姑甥孙女','姑甥外孙女']);
-    t.deepEqual(relationship({text:'老公的父母',target:'孩子'}),['爷爷','奶奶']);
-    t.deepEqual(relationship({text:'爸爸的哥哥的弟弟的儿子'}),['堂哥','堂弟','哥哥','弟弟','自己']);
     t.deepEqual(relationship({text:'外婆',target:'女婿',reverse:true}),['外曾孙女婿','外曾外孙女婿']);
-    t.deepEqual(relationship({text:'我',target:'爸爸'}),['儿子','女儿']);
+    t.end();
-    t.deepEqual(relationship({text:'爱人',target:'娘家侄子'}),['姑丈']);
+});
-    t.deepEqual(relationship({text:'岳母的配偶的孩子的爸爸'}),['岳父']);
+test('[type:chain]', function (t) {
-    t.deepEqual(relationship({text:'姐姐的老公的姐姐的老公'}),['姊妹姻姊妹壻']);
+    t.deepEqual(relationship({text:'舅爷爷',type:'chain'}),['爸爸的妈妈的兄弟']);
+    t.deepEqual(relationship({text:'妻儿',type:'chain'}),['老婆','儿子','女儿']);
+    t.deepEqual(relationship({text:'父母',target:'老公',type:'chain'}),['老婆的爸爸','老婆的妈妈']);
+    t.end();
+});
+test('[type:pair]', function (t) {
+    t.deepEqual(relationship({text:'舅妈',target:'哥哥',type:'pair'}),['舅甥']);
     t.deepEqual(relationship({text:'舅妈',target:'外婆',type:'pair'}),['婆媳']);
+    t.deepEqual(relationship({text:'舅妈',target:'二舅',type:'pair'}),['叔嫂','夫妻']);
+    t.deepEqual(relationship({text:'堂哥',target:'叔叔',type:'pair'}),['叔侄','父子']);
+    t.end();
+});
+test('[age]', function (t) {
     t.deepEqual(relationship({text:'妈妈的二哥'}),['二舅']);
     t.deepEqual(relationship({text:'爸爸的二哥'}),['二伯']);
-    t.deepEqual(relationship({text:'二舅妈',target:'二舅',type:'pair'}),['夫妻']);
-    t.deepEqual(relationship({text:'二舅妈',target:'大舅',type:'pair'}),['叔嫂']);
-    t.deepEqual(relationship({text:'舅妈',target:'二舅',type:'pair'}),['叔嫂','夫妻']);
     t.deepEqual(relationship({text:'二舅妈',target:'三舅'}),['二嫂']);
     t.deepEqual(relationship({text:'爸爸的二爸'}),['二爷爷']);
     t.deepEqual(relationship({text:'姑姑',target:'叔叔',optimal:true}),['姐姐','妹妹']);
     t.deepEqual(relationship({text:'大舅',target:'二舅的儿子'}),['伯父']);
-    t.deepEqual(relationship({text:'堂哥',target:'叔叔',type:'pair'}),['叔侄','父子']);
+    t.deepEqual(relationship({text:'二舅妈',target:'二舅',type:'pair'}),['夫妻']);
-    t.deepEqual(relationship({text:'爸爸的妹妹的女儿的老公'}),['姑表姐夫','姑表妹夫']);
+    t.deepEqual(relationship({text:'二舅妈',target:'大舅',type:'pair'}),['叔嫂']);
+    t.end();
+});
+test('[expression]', function (t) {
     t.deepEqual(relationship('外婆和奶奶之间是什么关系？'),['儿女亲家']);
     t.deepEqual(relationship('妈妈应该如何称呼姑姑'),['姑子']);
     t.deepEqual(relationship('姑奶奶是什么关系'),['爸爸的爸爸的姐妹']);

vue/index.html

@@ -16,8 +16,8 @@
         <title>亲戚计算器手机版 亲戚称呼计算器APP</title>
         <meta name="keywords" content="家庭称谓,亲戚称呼,亲戚称谓,亲戚叫法,亲戚关系计算器,亲戚计算器,称呼计算器,親戚關係稱呼,亲戚关系大全,叫什么,什么关系">
         <meta name="description" content="中国亲戚关系计算器手机版，走亲访友，逢年过节必备神器。它避免了叫错、不会叫亲戚的尴尬，人人必备家庭教育工具。">
-      <script type="module" crossorigin src="./assets/index.05002aa2.js"></script>
+      <script type="module" crossorigin src="./assets/index.431d846b.js"></script>
-      <link rel="stylesheet" href="./assets/index.e63eeab7.css">
+      <link rel="stylesheet" href="./assets/index.c15be9be.css">
     </head>
     <body>
         <noscript>