only support range like 0-9, a-z in []

demo/test/test.yaml

@@ -4,182 +4,239 @@ author: zentao
 version: 1.0
 
 fields:
-  - field: test1
-    from: base.name.letters.v1.yaml
-    use: letters
-    postfix: "\t"
-
-  - field: test2
-    from: base.name.numbers.v1.yaml
-    use: numbers
-    postfix: "\t"
-
-  - field: test3
-    from: name.en.given.v1
-    select: name
-    where: "`index`='b'"
-    postfix: "\t"
-
-  - field: test4
-    from: name.en.family.v1
-    select: name
-    where: "`index`='c'"
-    postfix: "\t"
-
-  - field: test5
-    from: base.name.enreal.v1.yaml
-    use: common
-    prefix: "["
-    postfix: "]\t"
-
-  - field: test6
-    from: base.name.enreal.v1.yaml
-    use: male_common
-    prefix: "["
-    postfix: "]\t"
-
-  - field: test7
-    from: base.name.enreal.v1.yaml
-    use: female_with_middle
-    prefix: "["
-    postfix: "]\t"
-
-  - field: test8
-    from: base.name.cnreal.v1.yaml
-    use: two
-    prefix: "["
-    postfix: "]\t"
-
-  - field: test9
-    from: base.name.cnreal.v1.yaml
-    use: male_three
-    prefix: "["
-    postfix: "]\t"
-
-  - field: test10
-    from: base.name.cnreal.v1.yaml
-    use: female_four
-    prefix: "["
-    postfix: "]\t"
-
-  - field: test10
-    from: base.name.enaccount.v1.yaml
-    use: common
-    prefix: "["
-    postfix: "]\t"
-  - field: test11
-    from: base.name.enaccount.v1.yaml
-    use: common_underline
-    prefix: "["
-    postfix: "]\t"
-  - field: test12
-    from: base.name.enaccount.v1.yaml
-    use: common_dot
-    prefix: "["
-    postfix: "]\t"
-  - field: test13
-    from: base.name.enaccount.v1.yaml
-    use: reverse
-    prefix: "["
-    postfix: "]\t"
-
-  - field: test14
-    from: base.name.cnaccount.v1.yaml
-    use: common
-    prefix: "["
-    postfix: "]\t"
-  - field: test15
-    from: base.name.cnaccount.v1.yaml
-    use: common_underline
-    prefix: "["
-    postfix: "]\t"
-  - field: test16
-    from: base.name.cnaccount.v1.yaml
-    use: common_dot
-    prefix: "["
-    postfix: "]\t"
-  - field: test17
-    from: base.name.cnaccount.v1.yaml
-    use: reverse
-    prefix: "["
-    postfix: "]\t"
-  - field: test18
-    from: base.name.cnaccount.v1.yaml
-    use: family
-    prefix: "["
-    postfix: "]\t"
-  - field: test19
-    from: base.name.cnaccount.v1.yaml
-    use: given
-    prefix: "["
-    postfix: "]\t"
-
-  - field: test20
-    from: base.domain.domain.v1.yaml
-    use: one_number_at_common
-    prefix: ""
-    postfix: "\t"
-  - field: test21
-    from: base.domain.domain.v1.yaml
-    use: one_number_at_cn
+  #account
+#  - field: test1
+#    from: base.name.letters.v1.yaml
+#    use: letters
+#    postfix: "\t"
+#
+#  - field: test2
+#    from: base.name.numbers.v1.yaml
+#    use: numbers
+#    postfix: "\t"
+#
+#  - field: test3
+#    from: name.en.given.v1
+#    select: name
+#    where: "`index`='b'"
+#    postfix: "\t"
+#
+#  - field: test4
+#    from: name.en.family.v1
+#    select: name
+#    where: "`index`='c'"
+#    postfix: "\t"
+#
+#  - field: test5
+#    from: base.name.enreal.v1.yaml
+#    use: common
+#    prefix: "["
+#    postfix: "]\t"
+#
+#  - field: test6
+#    from: base.name.enreal.v1.yaml
+#    use: male_common
+#    prefix: "["
+#    postfix: "]\t"
+#
+#  - field: test7
+#    from: base.name.enreal.v1.yaml
+#    use: female_with_middle
+#    prefix: "["
+#    postfix: "]\t"
+#
+#  - field: test8
+#    from: base.name.cnreal.v1.yaml
+#    use: two
+#    prefix: "["
+#    postfix: "]\t"
+#
+#  - field: test9
+#    from: base.name.cnreal.v1.yaml
+#    use: male_three
+#    prefix: "["
+#    postfix: "]\t"
+#
+#  - field: test10
+#    from: base.name.cnreal.v1.yaml
+#    use: female_four
+#    prefix: "["
+#    postfix: "]\t"
+#
+#  - field: test10
+#    from: base.name.enaccount.v1.yaml
+#    use: common
+#    prefix: "["
+#    postfix: "]\t"
+#  - field: test11
+#    from: base.name.enaccount.v1.yaml
+#    use: common_underline
+#    prefix: "["
+#    postfix: "]\t"
+#  - field: test12
+#    from: base.name.enaccount.v1.yaml
+#    use: common_dot
+#    prefix: "["
+#    postfix: "]\t"
+#  - field: test13
+#    from: base.name.enaccount.v1.yaml
+#    use: reverse
+#    prefix: "["
+#    postfix: "]\t"
+#
+#  - field: test14
+#    from: base.name.cnaccount.v1.yaml
+#    use: common
+#    prefix: "["
+#    postfix: "]\t"
+#  - field: test15
+#    from: base.name.cnaccount.v1.yaml
+#    use: common_underline
+#    prefix: "["
+#    postfix: "]\t"
+#  - field: test16
+#    from: base.name.cnaccount.v1.yaml
+#    use: common_dot
+#    prefix: "["
+#    postfix: "]\t"
+#  - field: test17
+#    from: base.name.cnaccount.v1.yaml
+#    use: reverse
+#    prefix: "["
+#    postfix: "]\t"
+#  - field: test18
+#    from: base.name.cnaccount.v1.yaml
+#    use: family
+#    prefix: "["
+#    postfix: "]\t"
+#  - field: test19
+#    from: base.name.cnaccount.v1.yaml
+#    use: given
+#    prefix: "["
+#    postfix: "]\t"
+
+  # domain
+#  - field: test20
+#    from: base.domain.domain.v1.yaml
+#    use: one_number_at_common
+#    prefix: ""
+#    postfix: "\t"
+#  - field: test21
+#    from: base.domain.domain.v1.yaml
+#    use: one_number_at_cn
+#    prefix: ""
+#    postfix: "\t"
+#  - field: test22
+#    from: base.domain.domain.v1.yaml
+#    use: one_number_at_new
+#    prefix: ""
+#    postfix: "\t"
+#
+#  - field: test23
+#    from: base.domain.domain.v1.yaml
+#    use: one_letter_at_common
+#    prefix: ""
+#    postfix: "\t"
+#  - field: test24
+#    from: base.domain.domain.v1.yaml
+#    use: one_letter_at_cn
+#    prefix: ""
+#    postfix: "\t"
+#  - field: test25
+#    from: base.domain.domain.v1.yaml
+#    use: one_letter_at_new
+#    prefix: ""
+#    postfix: "\t"
+#
+#  - field: test26
+#    from: base.domain.domain.v1.yaml
+#    use: numbers_at_common
+#    prefix: ""
+#    postfix: "\t"
+#  - field: test27
+#    from: base.domain.domain.v1.yaml
+#    use: numbers_at_cn
+#    prefix: ""
+#    postfix: "\t"
+#  - field: test28
+#    from: base.domain.domain.v1.yaml
+#    use: numbers_at_new
+#    prefix: ""
+#    postfix: "\t"
+#
+#  - field: test29
+#    from: base.domain.domain.v1.yaml
+#    use: letters_at_common
+#    prefix: ""
+#    postfix: "\t"
+#  - field: test30
+#    from: base.domain.domain.v1.yaml
+#    use: letters_at_cn
+#    prefix: ""
+#    postfix: "\t"
+#  - field: test31
+#    from: base.domain.domain.v1.yaml
+#    use: letters_at_new
+#    prefix: ""
+#    postfix: "\t"
+#
+#  - field: test32
+#    from: base.domain.domain.v1.yaml
+#    use: mixed_at_common
+#    prefix: ""
+#    postfix: "\t"
+#  - field: test33
+#    from: base.domain.domain.v1.yaml
+#    use: mixed_at_cn
+#    prefix: ""
+#    postfix: "\t"
+#  - field: test34
+#    from: base.domain.domain.v1.yaml
+#    use: mixed_at_new
+#    prefix: ""
+#    postfix: "\t"
+
+  #email
+  - field: test35
+    from: base.email.email.v1.yaml
+    use: number_with_esp
     prefix: ""
     postfix: "\t"
-  - field: test22
-    from: base.domain.domain.v1.yaml
-    use: one_number_at_new
+  - field: test36
+    from: base.email.email.v1.yaml
+    use: number_with_self
     prefix: ""
     postfix: "\t"
 
-  - field: test23
-    from: base.domain.domain.v1.yaml
-    use: one_letter_at_common
+  - field: test37
+    from: base.email.email.v1.yaml
+    use: letter_with_esp
     prefix: ""
     postfix: "\t"
-  - field: test24
-    from: base.domain.domain.v1.yaml
-    use: one_letter_at_cn
-    prefix: ""
-    postfix: "\t"
-  - field: test25
-    from: base.domain.domain.v1.yaml
-    use: one_letter_at_new
+  - field: test38
+    from: base.email.email.v1.yaml
+    use: letter_with_self
     prefix: ""
     postfix: "\t"
 
-  - field: test26
-    from: base.domain.domain.v1.yaml
-    use: numbers_at_common
+  - field: test39
+    from: base.email.email.v1.yaml
+    use: western_with_esp
     prefix: ""
     postfix: "\t"
-  - field: test27
-    from: base.domain.domain.v1.yaml
-    use: numbers_at_cn
-    prefix: ""
-    postfix: "\t"
-  - field: test28
-    from: base.domain.domain.v1.yaml
-    use: numbers_at_new
+  - field: test40
+    from: base.email.email.v1.yaml
+    use: western_with_self
     prefix: ""
     postfix: "\t"
 
-  - field: test29
-    from: base.domain.domain.v1.yaml
-    use: mixed_at_common
-    prefix: ""
-    postfix: "\t"
-  - field: test30
-    from: base.domain.domain.v1.yaml
-    use: mixed_at_cn
+  - field: test41
+    from: base.email.email.v1.yaml
+    use: pinyin_with_esp
     prefix: ""
     postfix: "\t"
-  - field: test31
-    from: base.domain.domain.v1.yaml
-    use: mixed_at_new
-    prefix: ""
-    postfix: "\t"
-
-  - field: test32
-    from: base.domain.esp.v1.yaml
-    use: esp
+  - field: test42
+    from: base.email.email.v1.yaml
+    use: pinyin_with_self
     prefix: ""
     postfix: "\t"
\ No newline at end of file

yaml/base/domain/domain.v1.yaml

@@ -5,167 +5,166 @@ version: 1.0
 
 field: domain
 instances:
-#  - instance: one_number_at_common
-#    note: 单数字域名
-#    fields:
-#      - field: part1
-#        range: 1-9
-#        rand: true
-#        postfix: "."
-#      - field: part2
-#        from: base.domain.postfix.v1.yaml
-#        use: all
-#  - instance: one_number_at_cn
-#    note: 单数字CN域名
-#    prefix:
-#    fields:
-#      - field: part1
-#        range: 1-9
-#        postfix: "."
-#      - field: part2
-#        from: base.domain.postfix.v1.yaml
-#        use: cn
-#  - instance: one_number_at_new
-#    note: 单数字新域名
-#    prefix:
-#    fields:
-#      - field: part1
-#        range: 1-9
-#        postfix: "."
-#      - field: part2
-#        from: base.domain.postfix.v1.yaml
-#        use: new
-#
-#  - instance: one_letter_at_common
-#    note: 单字母域名
-#    prefix:
-#    fields:
-#      - field: part1
-#        range: a-z
-#        postfix: "."
-#      - field: part2
-#        from: base.domain.postfix.v1.yaml
-#        use: all
-#  - instance: one_letter_at_cn
-#    note: 单字母CN域名
-#    prefix:
-#    fields:
-#      - field: part1
-#        range: a-z
-#        postfix: "."
-#      - field: part2
-#        from: base.domain.postfix.v1.yaml
-#        use: cn
-#  - instance: one_letter_at_new
-#    note: 单字母新域名
-#    prefix:
-#    fields:
-#      - field: part1
-#        range: a-z
-#        postfix: "."
-#      - field: part2
-#        from: base.domain.postfix.v1.yaml
-#        use: new
-#
-#  - instance: numbers_at_common
-#    note: 纯数字域名
-#    prefix:
-#    fields:
-#      - field: part1
-#        range: 0-9
-#        loop: 5-8
-#        postfix: "."
-#      - field: part2
-#        from: base.domain.postfix.v1.yaml
-#        use: all
-#  - instance: numbers_at_cn
-#    note: 纯数字CN域名
-#    prefix:
-#    fields:
-#      - field: part1
-#        range: 0-9
-#        loop: 5-8
-#        postfix: "."
-#      - field: part2
-#        from: base.domain.postfix.v1.yaml
-#        use: cn
-#  - instance: numbers_at_new
-#    note: 纯数字新域名
-#    prefix:
-#    fields:
-#      - field: part1
-#        range: a-z
-#        loop: 5-8
-#        postfix: "."
-#      - field: part2
-#        from: base.domain.postfix.v1.yaml
-#        use: new
-#
-#  - instance: letters_at_common
-#    note: 纯字母域名
-#    prefix:
-#    fields:
-#      - field: part1
-#        range: a-z
-#        loop: 5-8
-#        postfix: "."
-#      - field: part2
-#        from: base.domain.postfix.v1.yaml
-#        use: all
-#  - instance: letters_at_cn
-#    note: 纯字母CN域名
-#    prefix:
-#    fields:
-#      - field: part1
-#        range: a-z
-#        loop: 5-8
-#        postfix: "."
-#      - field: part2
-#        from: base.domain.postfix.v1.yaml
-#        use: cn
-#  - instance: letters_at_new
-#    note: 纯字母新域名
-#    prefix:
-#    fields:
-#      - field: part1
-#        range: a-z
-#        loop: 5-8
-#        postfix: "."
-#      - field: part2
-#        from: base.domain.postfix.v1.yaml
-#        use: new
+  - instance: one_number_at_common
+    note: 单数字域名
+    fields:
+      - field: part1
+        range: 1-9
+        rand: true
+        postfix: "."
+      - field: part2
+        from: base.domain.postfix.v1.yaml
+        use: all
+  - instance: one_number_at_cn
+    note: 单数字CN域名
+    prefix:
+    fields:
+      - field: part1
+        range: 1-9
+        postfix: "."
+      - field: part2
+        from: base.domain.postfix.v1.yaml
+        use: cn
+  - instance: one_number_at_new
+    note: 单数字新域名
+    prefix:
+    fields:
+      - field: part1
+        range: 1-9
+        postfix: "."
+      - field: part2
+        from: base.domain.postfix.v1.yaml
+        use: new
+
+  - instance: one_letter_at_common
+    note: 单字母域名
+    prefix:
+    fields:
+      - field: part1
+        range: a-z
+        postfix: "."
+      - field: part2
+        from: base.domain.postfix.v1.yaml
+        use: all
+  - instance: one_letter_at_cn
+    note: 单字母CN域名
+    prefix:
+    fields:
+      - field: part1
+        range: a-z
+        postfix: "."
+      - field: part2
+        from: base.domain.postfix.v1.yaml
+        use: cn
+  - instance: one_letter_at_new
+    note: 单字母新域名
+    prefix:
+    fields:
+      - field: part1
+        range: a-z
+        postfix: "."
+      - field: part2
+        from: base.domain.postfix.v1.yaml
+        use: new
+
+  - instance: numbers_at_common
+    note: 纯数字域名
+    prefix:
+    fields:
+      - field: part1
+        range: 0-9
+        loop: 5-8
+        postfix: "."
+      - field: part2
+        from: base.domain.postfix.v1.yaml
+        use: all
+  - instance: numbers_at_cn
+    note: 纯数字CN域名
+    prefix:
+    fields:
+      - field: part1
+        range: 0-9
+        loop: 5-8
+        postfix: "."
+      - field: part2
+        from: base.domain.postfix.v1.yaml
+        use: cn
+  - instance: numbers_at_new
+    note: 纯数字新域名
+    prefix:
+    fields:
+      - field: part1
+        range: a-z
+        loop: 5-8
+        postfix: "."
+      - field: part2
+        from: base.domain.postfix.v1.yaml
+        use: new
+
+  - instance: letters_at_common
+    note: 纯字母域名
+    prefix:
+    fields:
+      - field: part1
+        range: a-z
+        loop: 5-8
+        postfix: "."
+      - field: part2
+        from: base.domain.postfix.v1.yaml
+        use: all
+  - instance: letters_at_cn
+    note: 纯字母CN域名
+    prefix:
+    fields:
+      - field: part1
+        range: a-z
+        loop: 5-8
+        postfix: "."
+      - field: part2
+        from: base.domain.postfix.v1.yaml
+        use: cn
+  - instance: letters_at_new
+    note: 纯字母新域名
+    prefix:
+    fields:
+      - field: part1
+        range: a-z
+        loop: 5-8
+        postfix: "."
+      - field: part2
+        from: base.domain.postfix.v1.yaml
+        use: new
 
   - instance: mixed_at_common
     note: 字母和数字域名
     prefix:
     fields:
       - field: part1
-        range: [1-2.01,a-c,0-3]
+        range: [a-z,0-9]:R
         loop: 5-8
-        loopfix: "|"
         postfix: "."
       - field: part2
         from: base.domain.postfix.v1.yaml
         use: all
-#  - instance: mixed_at_cn
-#    note: 字母和数字CN域名
-#    prefix:
-#    fields:
-#      - field: part1
-#        range: [a-z,0-9]:R
-#        loop: 5-8
-#        postfix: "."
-#      - field: part2
-#        from: base.domain.postfix.v1.yaml
-#        use: cn
-#  - instance: mixed_at_new
-#    note: 字母和数字新域名
-#    prefix:
-#    fields:
-#      - field: part1
-#        range: [a-z,0-9]:R
-#        loop: 5-8
-#        postfix: "."
-#      - field: part2
-#        from: base.domain.postfix.v1.yaml
-#        use: new
\ No newline at end of file
+  - instance: mixed_at_cn
+    note: 字母和数字CN域名
+    prefix:
+    fields:
+      - field: part1
+        range: [a-z,0-9]:R
+        loop: 5-8
+        postfix: "."
+      - field: part2
+        from: base.domain.postfix.v1.yaml
+        use: cn
+  - instance: mixed_at_new
+    note: 字母和数字新域名
+    prefix:
+    fields:
+      - field: part1
+        range: [a-z,0-9]:R
+        loop: 5-8
+        postfix: "."
+      - field: part2
+        from: base.domain.postfix.v1.yaml
+        use: new
\ No newline at end of file

yaml/base/email/email.v1.yaml

@@ -3,7 +3,7 @@ desc:
 author: zentao
 version: 1.0
 
-field: domain
+field: email
 instances:
   - instance: number_with_esp
     note: 数字加服务商域名
@@ -14,7 +14,7 @@ instances:
         postfix: "."
       - field: part2
         from: base.domain.domain.v1.yaml
-        use: esp
+        use: mixed_at_common
   - instance: number_with_self
     note: 数字加自有域名
     prefix:
@@ -25,7 +25,7 @@ instances:
         postfix: "."
       - field: part2
         from: base.domain.domain.v1.yaml
-        use: self
+        use: mixed_at_common
 
   - instance: letter_with_esp
     note: 字母加服务商域名
@@ -37,7 +37,7 @@ instances:
         postfix: "."
       - field: part2
         from: base.domain.domain.v1.yaml
-        use: esp
+        use: mixed_at_cn
   - instance: letter_with_self
     note: 字母加自有域名
     prefix:
@@ -48,7 +48,7 @@ instances:
         postfix: "."
       - field: part2
         from: base.domain.domain.v1.yaml
-        use: self
+        use: mixed_at_cn
 
   - instance: western_with_esp
     note: 单词加服务商域名
@@ -60,7 +60,7 @@ instances:
         postfix: "."
       - field: part2
         from: base.domain.domain.v1.yaml
-        use: esp
+        use: mixed_at_new
   - instance: western_with_self
     note: 单词加自有域名
     prefix:
@@ -71,7 +71,7 @@ instances:
         postfix: "."
       - field: part2
         from: base.domain.domain.v1.yaml
-        use: self
+        use: mixed_at_new
 
   - instance: pinyin_with_esp
     note: 拼音加服务商域名
@@ -83,7 +83,7 @@ instances:
         postfix: "."
       - field: part2
         from: base.domain.domain.v1.yaml
-        use: esp
+        use: mixed_at_common
   - instance: pinyin_with_self
     note: 拼音加自有域名
     prefix:
@@ -94,32 +94,4 @@ instances:
         postfix: "."
       - field: part2
         from: base.domain.domain.v1.yaml
-        use: self
-
-  - instance: pinyin_with_self
-    note: 拼音加自有域名
-    prefix:
-    fields:
-      - field: part1
-        from: words.v1
-        select: pinyin
-        postfix: "."
-      - field: part2
-        from: base.domain.domain.v1.yaml
-        use: self
-
-  - instance: western_with_custom
-    note: 单词加后缀生成域名
-    prefix:
-    fields:
-      - field: part1
-        from: base.name.letters.v1.yaml
-        select: letters
-        postfix: "."
-      - field: part2
-        from: words.v1
-        select: en
-        postfix: "."
-      - field: part3
-        from: base.domain.postfix.v1.yaml
-        use: common
\ No newline at end of file
+        use: mixed_at_common
\ No newline at end of file