perf: 手机号段增加192/6/7(#299)(#300)

fix: 修复16进制颜色无法匹配带 alpha 值的问题

.circleci/config.yml

@@ -5,9 +5,13 @@
 version: 2
 jobs:
     build:
+        filters:
+            branches:
+                ignore:
+                    - gh-pages
         docker:
         # specify the version you desire here
-        - image: circleci/node:8.9.4
+        - image: circleci/node:12.14.1
         
         # Specify service dependencies here if necessary
         # CircleCI maintains a library of pre-built images
@@ -26,7 +30,7 @@ jobs:
 
         # - run: yarn install
         # - run: yarn add codecov
-        - run: yarn add chalk
+        - run: yarn add chalk@2.4.2
 
         
 

.gitattributes

@@ -0,0 +1 @@
+packages/*/** linguist-vendored

.github/workflows/nodejs.yml

@@ -12,7 +12,7 @@ jobs:
     - name: Use Node.js 10.x
       uses: actions/setup-node@v1
       with:
-        version: 10.x
+        node-version: 10.x
     - name: test
       run: |
         npm i

.gitignore

@@ -1,5 +1,12 @@
 out
 node_modules
+coverage
+.nyc_output
 .vscode-test/
+.idea
+.vscode
+.DS_Store
 *.vsix
 yarn-error.log
+.rpt2_cache
+dist

CHANGELOG.md

@@ -1,7 +1,79 @@
 # 更新日志
 🚀 [提交问题](https://github.com/any86/any-rule/issues/new)
 
-### 0.1.1 (2020-02-20)
+### 0.3.18(2022-11-07)
+
+- 优化数字/货币金额(支持负数、千分位分隔符)
+- 优化小数(支持科学计数)
+- 优化缩短"用户名校验"正则长度
+- 增加户口薄正则
+- 增加军官证正则
+- 修复MAC地址的第二位一定是偶数(#264)
+
+### 0.3.13(2022-01-10)
+- 修正"网址"正则, 兼容更多符合的网址.
+- 修正澳门身份证错误.
+
+### 0.3.12(2021-10-20)
+- 修复网址中带有"()"不能通过.
+- 新增"整数"/"浮点数"等正则.
+
+### 0.3.11(2021-09-26)
+- 修复新版vscode中"@zz"字符失效.
+- 优化"身份证15/18"正则.
+
+### 0.3.10(2021-05-28)
+- 禁止"日期"可以通过"00"月和"00"日
+### 0.3.9(2021-04-20)
+- 新增"GUID/UUID"正则.
+- 修复ip中的"."没有被转义.
+
+
+### 0.3.8(2021-01-17)
+- 优化一些冗余的正则拼写
+- 修复新能源汽车不匹配第三位为字母的情况.
+- 座机电话兼容带分机号的情况.
+
+### 0.3.7(2020-11-25)
+- 修复"IPv4"不严格, 且增加端口校验.
+- 新增"座机电话(区号可选)"
+
+### 0.3.6(2020-08-03)
+- 新增"港澳台身份证"
+
+### 0.3.5(2020-07-18)
+- 修复"车牌号"可以通过"浙苏H6F681"的问题
+- 新增"数字和英文字母组成，并且同时含有数字和英文字母"
+
+### 0.3.4(2020-06-14)
+- 修正"车牌号(新能源+非新能源)"未对长度进行限制.
+- 修正"身份证"中月份可以匹配00月的bug.
+- 新增"匹配连续重复的字符"正则.
+- 修正座机支持4位区号，8位电话号.
+- 修正, 根据用户需求, "qq@qq"样式的email邮箱地址不再通过验证.
+
+### 0.3.3(2020-04-28)
+- 优化增加"身份证中日期的约束".
+- 优化"html注释|座机|密码"等正则.
+- 新增"mac地址"正则.
+
+### 0.3.2(2020-04-03)
+- 修复"linux文件夹"正则不能匹配"/".
+- 部分正则标题增加"英文关键字", 方便检索.
+
+### 0.3.1 (2020-03-12)
+- 修复"@zz唤醒"和"菜单唤醒"在某些机型下失效的bug.
+- 修复"设置后未生效".
+- 修改部分提示图标.
+- 合并'linux文件'和'linux文件夹'正则.
+- 新增'linux隐藏文件'正则.
+
+### 0.3.0 (2020-02-28)
+- 修改"zz."触发为"@zz"触发.
+- 增加右键唤醒正则菜单.
+![](https://user-gold-cdn.xitu.io/2020/2/28/1708764046b38231?w=381&h=413&f=png&s=73047)
+
+### 0.2.0 (2020-02-21)
 
 - 优化"zz."体验, 改用"quickPick"组件以支持"模糊搜索".
 ![gif](https://user-gold-cdn.xitu.io/2020/2/23/1706df78b18466fd?w=954&h=372&f=gif&s=1732199)
@@ -10,6 +82,7 @@
 ![](https://user-gold-cdn.xitu.io/2020/2/23/1706e32c3a6fb116?w=533&h=95&f=png&s=21563)
 
 ![](https://user-gold-cdn.xitu.io/2020/2/23/1706e349b600c28b?w=1151&h=500&f=png&s=45210)
+
 ### 0.1.0
 - 新增支持在代码任意位置输入"zz."唤醒正则列表.
 

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2021 Russell
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -1,39 +1,62 @@
-# 正则大全  ![已收录61条](https://img.shields.io/badge/已收录-61条-673ab7.svg) [![版本](https://badgen.net/vs-marketplace/v/russell.any-rule)](https://marketplace.visualstudio.com/items?itemName=russell.any-rule) [![安装量](https://badgen.net/vs-marketplace/i/russell.any-rule)](https://marketplace.visualstudio.com/items?itemName=russell.any-rule) [![下载量](https://badgen.net/vs-marketplace/d/russell.any-rule)](https://marketplace.visualstudio.com/items?itemName=russell.any-rule) ![MIT](https://img.shields.io/badge/license-MIT-F44336.svg) [![CircleCI](https://badgen.net/github/status/any86/any-rule/master/ci/circleci)](https://circleci.com/gh/any86/any-rule)
+# 正则大全  ![已收录84条](https://img.shields.io/badge/已收录-84条-673ab7.svg) [![版本](https://badgen.net/vs-marketplace/v/russell.any-rule)](https://marketplace.visualstudio.com/items?itemName=russell.any-rule) [![安装量](https://badgen.net/vs-marketplace/i/russell.any-rule)](https://marketplace.visualstudio.com/items?itemName=russell.any-rule) [![下载量](https://badgen.net/vs-marketplace/d/russell.any-rule)](https://marketplace.visualstudio.com/items?itemName=russell.any-rule) ![MIT](https://img.shields.io/badge/license-MIT-F44336.svg) [![CircleCI](https://badgen.net/github/status/any86/any-rule/master/ci/circleci)](https://circleci.com/gh/any86/any-rule)
 
-支持**web** / **vscode插件**2种查询方式.
+🦕支持**web** / **vscode** / **idea** / **Alfred Workflow**多平台
 
 ## :rocket:web版本
-https://any86.github.io/any-rule/
+https://any-rule.vercel.app/
 
 ## 🍭vscode插件
+
 ### 安装
 vscode应用商店中搜索"**any-rule**".
 
 ### 使用
 **方式1:**
-1. 安装完毕后按**F1**(或者ctrl+shift+p).
-2. 输入"**zz**"弹出正则列表.
-3. **输入关键词搜索**, 比如"手机".
 
-![预览gif](https://user-gold-cdn.xitu.io/2020/1/10/16f8e01a684a0a18?w=420&h=243&f=gif&s=414162)
+1. 按**F1**(mac下fn+F1)打开正则列表.
+2. **输入关键词搜索**, 比如"手机".
+
+![GIF](https://user-images.githubusercontent.com/8264787/146724787-888a8666-5d2a-4e5e-b383-aec7c53bd312.gif)
 
 **方式2:**
 
-1. 在代码的任意位置输入"**zz.**"弹出正则列表.
+右键选择"🦕正则大全".
-2. **输入关键词搜索**, 比如"手机".
 
-![预览gif](https://user-gold-cdn.xitu.io/2020/2/23/1706df78b18466fd?w=954&h=372&f=gif&s=1732199)
+![GIF](https://user-images.githubusercontent.com/8264787/146725447-4d92caed-2dd0-4f11-91d1-8da9cd8ff08b.gif)
 
-## 🦕图解正则
+**方式3:**
-在vscode中选择正则后, 可点击"🦕图解正则".
 
-![](https://user-gold-cdn.xitu.io/2020/2/23/1706e32c3a6fb116?w=533&h=95&f=png&s=21563)
+在代码任意位置输入"**@zz**".
+
+![GIF](https://user-images.githubusercontent.com/8264787/146725402-30b34119-b709-4d49-adb2-af8dbb786d3b.gif)
+
+## 👩‍🏫图解正则
+<details>
+<summary>查看详情</summary>
+每次在any-rule中选择正则后会弹出提示, 可点击"🤖图解正则".
+
+![image](https://user-images.githubusercontent.com/8264787/146726200-d97e48c3-df76-4531-8210-b6935fffb997.png)
 
 点击后可以看到正则解析, 方便大家学习.
 
-![](https://user-gold-cdn.xitu.io/2020/2/23/1706e349b600c28b?w=1151&h=500&f=png&s=45210)
+![image](https://user-images.githubusercontent.com/8264787/146726350-58166bf9-7f7f-4685-86aa-f055d0c0b914.png)
 
 **注意**: 图解直接使用了https://regexper.com, 在此对作者表示敬意和感谢.
+</details>
+
+## 社区版本
+
+社区版本非本人维护, 只是其他开发者使用了any-rule整理的正则内容, 如使用出现问题可直接与其开发者联系.
+
+[idea版](https://github.com/zhoriya/idea-rule)
+
+[Alfred Workflow版](https://github.com/cccyb/workflows)
+
+[hyjs: 函数封装版](https://github.com/heiyehk/hyjs/tree/main/packages/utils)
+
+[命令行版本](https://github.com/shenguanjiejie/workwork)
+
+[uTools版本](https://github.com/trentlee0/utools-any-rule)
 
 ## :fire:关于PR
 欢迎大家PR, 步骤如下:
@@ -44,25 +67,6 @@ vscode应用商店中搜索"**any-rule**".
 
 在此感谢大家对**any-rule**做出的贡献! 
 
-## 👽主要开发者
-按照加入时间排序
-<table>
-    <tr>
-        <td>
-            <a href="https://github.com/MrTenger"><img width="60" src="https://avatars3.githubusercontent.com/u/10781715?s=60&v=4"></a>
-        </td>
-        <td>
-            <a href="https://github.com/giraffeComing"><img width="60" src="https://avatars2.githubusercontent.com/u/14800669?s=460&v=4"></a>
-        </td>
-        <td>
-            <a href="https://github.com/microud"><img width="60" src="https://avatars1.githubusercontent.com/u/10163257?s=60&v=4"></a>
-        </td>
-        <td>
-            <a href="https://github.com/52cik"><img width="60" src="https://avatars0.githubusercontent.com/u/5033310?s=60&v=4"></a>
-        </td>
-    </tr>
-</table>
-
 ## 🍔正则
 
 ### 火车车次
@@ -80,9 +84,9 @@ vscode应用商店中搜索"**any-rule**".
 /^((ht|f)tps?:\/\/)?[\w-]+(\.[\w-]+)+:\d{1,5}\/?$/
 ```
 
-### 网址(支持端口和"?+参数"和"#+参数)
+### 网址(URL)
 ```javascript
-/^(((ht|f)tps?):\/\/)?[\w-]+(\.[\w-]+)+([\w.,@?^=%&:/~+#-]*[\w@?^=%&/~+#-])?$/
+/^(((ht|f)tps?):\/\/)?([^!@#$%^&*?.\s-]([^!@#$%^&*?.\s]{0,63}[^!@#$%^&*?.\s])?\.)+[a-z]{2,6}\/?/
 ```
 
 ### 统一社会信用代码
@@ -90,6 +94,11 @@ vscode应用商店中搜索"**any-rule**".
 /^[0-9A-HJ-NPQRTUWXY]{2}\d{6}[0-9A-HJ-NPQRTUWXY]{10}$/
 ```
 
+### 统一社会信用代码(宽松匹配)(15位/18位/20位数字/字母)
+```javascript
+/^(([0-9A-Za-z]{15})|([0-9A-Za-z]{18})|([0-9A-Za-z]{20}))$/
+```
+
 ### 迅雷链接
 ```javascript
 /^thunderx?:\/\/[a-zA-Z\d]+=$/
@@ -105,19 +114,24 @@ vscode应用商店中搜索"**any-rule**".
 /^magnet:\?xt=urn:btih:[0-9a-fA-F]{40,}.*$/
 ```
 
-### 子网掩码
+### 子网掩码(不包含 0.0.0.0)
 ```javascript
-/^(?:\d{1,2}|1\d\d|2[0-4]\d|25[0-5])(?:\.(?:\d{1,2}|1\d\d|2[0-4]\d|25[0-5])){3}$/
+/^(254|252|248|240|224|192|128)\.0\.0\.0|255\.(254|252|248|240|224|192|128|0)\.0\.0|255\.255\.(254|252|248|240|224|192|128|0)\.0|255\.255\.255\.(255|254|252|248|240|224|192|128|0)$/
 ```
 
-### linux"文件夹"路径
+### linux"隐藏文件"路径
 ```javascript
-/^(\/[^/]+)+\/?$/
+/^\/(?:[^/]+\/)*\.[^/]*/
 ```
 
-### linux"文件"路径
+### linux文件夹路径
 ```javascript
-/^(\/[^/]+)+$/
+/^\/(?:[^/]+\/)*$/
+```
+
+### linux文件路径
+```javascript
+/^\/(?:[^/]+\/)*[^/]+$/
 ```
 
 ### window"文件夹"路径
@@ -137,30 +151,35 @@ vscode应用商店中搜索"**any-rule**".
 
 ### 大于等于0, 小于等于150, 支持小数位出现5, 如145.5, 用于判断考卷分数
 ```javascript
-/^150$|^(?:\d|[1-9]\d|1[0-4]\d)(?:.5)?$/
+/^150$|^(?:\d|[1-9]\d|1[0-4]\d)(?:\.5)?$/
 ```
 
 ### html注释
 ```javascript
-/<!--[\s\S]*?-->/
+/<!--[\s\S]*?-->/g
 ```
 
 ### md5格式(32位)
 ```javascript
-/^([a-f\d]{32}|[A-F\d]{32})$/
+/^[a-fA-F0-9]{32}$/
 ```
 
-### 版本号格式必须为X.Y.Z
+### GUID/UUID
+```javascript
+/^[a-f\d]{4}(?:[a-f\d]{4}-){4}[a-f\d]{12}$/i
+```
+
+### 版本号(version)格式必须为X.Y.Z
 ```javascript
 /^\d+(?:\.\d+){2}$/
 ```
 
-### 视频链接地址（视频格式可按需增删）
+### 视频(video)链接地址（视频格式可按需增删）
 ```javascript
 /^https?:\/\/(.+\/)+.+(\.(swf|avi|flv|mpg|rm|mov|wav|asf|3gp|mkv|rmvb|mp4))$/i
 ```
 
-### 图片链接地址（图片格式可按需增删）
+### 图片(image)链接地址（图片格式可按需增删）
 ```javascript
 /^https?:\/\/(.+\/)+.+(\.(gif|png|jpg|jpeg|webp|svg|psd|bmp|tif))$/i
 ```
@@ -182,12 +201,7 @@ vscode应用商店中搜索"**any-rule**".
 
 ### 数字/货币金额（支持负数、千分位分隔符）
 ```javascript
-/^-?\d+(,\d{3})*(\.\d{1,2})?$/
+/^-?\d{1,3}(,\d{3})*(\.\d{1,2})?$/
-```
-
-### 数字/货币金额 (只支持正数、不支持校验千分位分隔符)
-```javascript
-/(?:^[1-9]([0-9]+)?(?:\.[0-9]{1,2})?$)|(?:^(?:0){1}$)|(?:^[0-9]\.[0-9](?:[0-9])?$)/
 ```
 
 ### 银行卡号（10到30位, 覆盖对公/私账户, 参考[微信支付](https://pay.weixin.qq.com/wiki/doc/api/xiaowei.php?chapter=22_1)）
@@ -202,67 +216,82 @@ vscode应用商店中搜索"**any-rule**".
 
 ### 英文姓名
 ```javascript
-/(^[a-zA-Z]{1}[a-zA-Z\s]{0,20}[a-zA-Z]{1}$)/
+/(^[a-zA-Z][a-zA-Z\s]{0,20}[a-zA-Z]$)/
 ```
 
 ### 车牌号(新能源)
 ```javascript
-/[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领 A-Z]{1}[A-HJ-NP-Z]{1}(([0-9]{5}[DF])|([DF][A-HJ-NP-Z0-9][0-9]{4}))$/
+/^[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领][A-HJ-NP-Z](([DF]((?![IO])[a-zA-Z0-9](?![IO]))[0-9]{4})|([0-9]{5}[DF]))$/
 ```
 
 ### 车牌号(非新能源)
 ```javascript
-/^[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领 A-Z]{1}[A-HJ-NP-Z]{1}[A-Z0-9]{4}[A-Z0-9挂学警港澳]{1}$/
+/^[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领][A-HJ-NP-Z][A-HJ-NP-Z0-9]{4}[A-HJ-NP-Z0-9挂学警港澳]$/
 ```
 
 ### 车牌号(新能源+非新能源)
 ```javascript
-/^(?:[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领 A-Z]{1}[A-HJ-NP-Z]{1}(?:(?:[0-9]{5}[DF])|(?:[DF](?:[A-HJ-NP-Z0-9])[0-9]{4})))|(?:[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领 A-Z]{1}[A-Z]{1}[A-HJ-NP-Z0-9]{4}[A-HJ-NP-Z0-9 挂学警港澳]{1})$/
+/^[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领][A-HJ-NP-Z][A-HJ-NP-Z0-9]{4,5}[A-HJ-NP-Z0-9挂学警港澳]$/
 ```
 
-### 手机号中国(严谨), 根据工信部2019年最新公布的手机号段
+### 手机号(mobile phone)中国(严谨), 根据工信部2019年最新公布的手机号段
 ```javascript
-/^(?:(?:\+|00)86)?1(?:(?:3[\d])|(?:4[5-7|9])|(?:5[0-3|5-9])|(?:6[5-7])|(?:7[0-8])|(?:8[\d])|(?:9[1|8|9]))\d{8}$/
+/^(?:(?:\+|00)86)?1(?:(?:3[\d])|(?:4[5-79])|(?:5[0-35-9])|(?:6[5-7])|(?:7[0-8])|(?:8[\d])|(?:9[01256789]))\d{8}$/
 ```
 
-### 手机号中国(宽松), 只要是13,14,15,16,17,18,19开头即可
+### 手机号(mobile phone)中国(宽松), 只要是13,14,15,16,17,18,19开头即可
 ```javascript
 /^(?:(?:\+|00)86)?1[3-9]\d{9}$/
 ```
 
-### 手机号中国(最宽松), 只要是1开头即可, 如果你的手机号是用来接收短信, 优先建议选择这一条
+### 手机号(mobile phone)中国(最宽松), 只要是1开头即可, 如果你的手机号是用来接收短信, 优先建议选择这一条
 ```javascript
 /^(?:(?:\+|00)86)?1\d{10}$/
 ```
 
-### 日期
+### 日期(宽松)
 ```javascript
-/^\d{4}(-)(1[0-2]|0?\d)\1([0-2]\d|\d|30|31)$/
+/^\d{1,4}(-)(1[0-2]|0?[1-9])\1(0?[1-9]|[1-2]\d|30|31)$/
+```
+
+### 日期(严谨, 支持闰年判断)
+```javascript
+/^(([0-9]{3}[1-9]|[0-9]{2}[1-9][0-9]{1}|[0-9]{1}[1-9][0-9]{2}|[1-9][0-9]{3})-(((0[13578]|1[02])-(0[1-9]|[12][0-9]|3[01]))|((0[469]|11)-(0[1-9]|[12][0-9]|30))|(02-(0[1-9]|[1][0-9]|2[0-8]))))|((([0-9]{2})(0[48]|[2468][048]|[13579][26])|((0[48]|[2468][048]|[3579][26])00))-02-29)$/
+```
+
+### 中国省
+```javascript
+/^浙江|上海|北京|天津|重庆|黑龙江|吉林|辽宁|内蒙古|河北|新疆|甘肃|青海|陕西|宁夏|河南|山东|山西|安徽|湖北|湖南|江苏|四川|贵州|云南|广西|西藏|江西|广东|福建|台湾|海南|香港|澳门$/
+```
+
+### 可以被moment转化成功的时间 YYYYMMDD HH:mm:ss
+```javascript
+/^\d{4}([/:-\S])(1[0-2]|0?[1-9])\1(0?[1-9]|[1-2]\d|30|31) (?:[01]\d|2[0-3]):[0-5]\d:[0-5]\d$/
 ```
 
 ### email(邮箱)
 ```javascript
-/^[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$/
+/^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/
 ```
 
-### 座机电话(国内),如: 0341-86091234
+### 座机(tel phone)电话(国内),如: 0341-86091234
 ```javascript
-/\d{3}-\d{8}|\d{4}-\d{7}/
+/^(?:(?:\d{3}-)?\d{8}|^(?:\d{4}-)?\d{7,8})(?:-\d+)?$/
 ```
 
 ### 身份证号(1代,15位数字)
 ```javascript
-/^\d{8}(0\d|10|11|12)([0-2]\d|30|31)\d{3}$/
+/^[1-9]\d{7}(?:0\d|10|11|12)(?:0[1-9]|[1-2][\d]|30|31)\d{3}$/
 ```
 
 ### 身份证号(2代,18位数字),最后一位是校验位,可能为数字或字符X
 ```javascript
-/^\d{6}(18|19|20)\d{2}(0\d|10|11|12)([0-2]\d|30|31)\d{3}[\dXx]$/
+/^[1-9]\d{5}(?:18|19|20)\d{2}(?:0[1-9]|10|11|12)(?:0[1-9]|[1-2]\d|30|31)\d{3}[\dXx]$/
 ```
 
 ### 身份证号, 支持1/2代(15位/18位数字)
 ```javascript
-/(^\d{8}(0\d|10|11|12)([0-2]\d|30|31)\d{3}$)|(^\d{6}(18|19|20)\d{2}(0\d|10|11|12)([0-2]\d|30|31)\d{3}(\d|X|x)$)/
+/^\d{6}((((((19|20)\d{2})(0[13-9]|1[012])(0[1-9]|[12]\d|30))|(((19|20)\d{2})(0[13578]|1[02])31)|((19|20)\d{2})02(0[1-9]|1\d|2[0-8])|((((19|20)([13579][26]|[2468][048]|0[48]))|(2000))0229))\d{3})|((((\d{2})(0[13-9]|1[012])(0[1-9]|[12]\d|30))|((\d{2})(0[13578]|1[02])31)|((\d{2})02(0[1-9]|1\d|2[0-8]))|(([13579][26]|[2468][048]|0[048])0229))\d{2}))(\d|X|x)$/
 ```
 
 ### 护照（包含香港、澳门）
@@ -280,14 +309,14 @@ vscode应用商店中搜索"**any-rule**".
 /^(?:[\u3400-\u4DB5\u4E00-\u9FEA\uFA0E\uFA0F\uFA11\uFA13\uFA14\uFA1F\uFA21\uFA23\uFA24\uFA27-\uFA29]|[\uD840-\uD868\uD86A-\uD86C\uD86F-\uD872\uD874-\uD879][\uDC00-\uDFFF]|\uD869[\uDC00-\uDED6\uDF00-\uDFFF]|\uD86D[\uDC00-\uDF34\uDF40-\uDFFF]|\uD86E[\uDC00-\uDC1D\uDC20-\uDFFF]|\uD873[\uDC00-\uDEA1\uDEB0-\uDFFF]|\uD87A[\uDC00-\uDFE0])+$/
 ```
 
-### 小数
+### 小数(支持科学计数)
 ```javascript
-/^\d+\.\d+$/
+/^[+-]?(\d+([.]\d*)?([eE][+-]?\d+)?|[.]\d+([eE][+-]?\d+)?)$/
 ```
 
-### 数字
+### 只包含数字
 ```javascript
-/^\d{1,}$/
+/^\d+$/
 ```
 
 ### html标签(宽松匹配)
@@ -295,6 +324,11 @@ vscode应用商店中搜索"**any-rule**".
 /<(\w+)[^>]*>(.*?<\/\1>)?/
 ```
 
+### 匹配中文汉字和中文标点
+```javascript
+/[\u4e00-\u9fa5|\u3002|\uff1f|\uff01|\uff0c|\u3001|\uff1b|\uff1a|\u201c|\u201d|\u2018|\u2019|\uff08|\uff09|\u300a|\u300b|\u3008|\u3009|\u3010|\u3011|\u300e|\u300f|\u300c|\u300d|\ufe43|\ufe44|\u3014|\u3015|\u2026|\u2014|\uff5e|\ufe4f|\uffe5]/
+```
+
 ### qq号格式正确
 ```javascript
 /^[1-9][0-9]{4,10}$/
@@ -322,30 +356,30 @@ vscode应用商店中搜索"**any-rule**".
 
 ### 密码强度校验，最少6位，包括至少1个大写字母，1个小写字母，1个数字，1个特殊字符
 ```javascript
-/^.*(?=.{6,})(?=.*\d)(?=.*[A-Z])(?=.*[a-z])(?=.*[!@#$%^&*? ]).*$/
+/^\S*(?=\S{6,})(?=\S*\d)(?=\S*[A-Z])(?=\S*[a-z])(?=\S*[!@#$%^&*? ])\S*$/
 ```
 
 ### 用户名校验，4到16位（字母，数字，下划线，减号）
 ```javascript
-/^[a-zA-Z0-9_-]{4,16}$/
+/^[\w-]{4,16}$/
 ```
 
-### ip-v4
+### ip-v4[:端口]
 ```javascript
-/^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/
+/^((\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.){3}(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])(?::(?:[0-9]|[1-9][0-9]{1,3}|[1-5][0-9]{4}|6[0-4][0-9]{3}|65[0-4][0-9]{2}|655[0-2][0-9]|6553[0-5]))?$/
 ```
 
-### ip-v6
+### ip-v6[:端口]
 ```javascript
-/^((([0-9A-Fa-f]{1,4}:){7}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){6}:[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){5}:([0-9A-Fa-f]{1,4}:)?[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){4}:([0-9A-Fa-f]{1,4}:){0,2}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){3}:([0-9A-Fa-f]{1,4}:){0,3}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){2}:([0-9A-Fa-f]{1,4}:){0,4}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){6}((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|(([0-9A-Fa-f]{1,4}:){0,5}:((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|(::([0-9A-Fa-f]{1,4}:){0,5}((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|([0-9A-Fa-f]{1,4}::([0-9A-Fa-f]{1,4}:){0,5}[0-9A-Fa-f]{1,4})|(::([0-9A-Fa-f]{1,4}:){0,6}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){1,7}:))$/i
+/(^(?:(?:(?:[0-9A-Fa-f]{1,4}:){7}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){6}:[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){5}:([0-9A-Fa-f]{1,4}:)?[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){4}:([0-9A-Fa-f]{1,4}:){0,2}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){3}:([0-9A-Fa-f]{1,4}:){0,3}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){2}:([0-9A-Fa-f]{1,4}:){0,4}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){6}((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|(([0-9A-Fa-f]{1,4}:){0,5}:((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|(::([0-9A-Fa-f]{1,4}:){0,5}((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|([0-9A-Fa-f]{1,4}::([0-9A-Fa-f]{1,4}:){0,5}[0-9A-Fa-f]{1,4})|(::([0-9A-Fa-f]{1,4}:){0,6}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){1,7}:))$)|(^\[(?:(?:(?:[0-9A-Fa-f]{1,4}:){7}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){6}:[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){5}:([0-9A-Fa-f]{1,4}:)?[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){4}:([0-9A-Fa-f]{1,4}:){0,2}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){3}:([0-9A-Fa-f]{1,4}:){0,3}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){2}:([0-9A-Fa-f]{1,4}:){0,4}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){6}((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|(([0-9A-Fa-f]{1,4}:){0,5}:((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|(::([0-9A-Fa-f]{1,4}:){0,5}((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|([0-9A-Fa-f]{1,4}::([0-9A-Fa-f]{1,4}:){0,5}[0-9A-Fa-f]{1,4})|(::([0-9A-Fa-f]{1,4}:){0,6}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){1,7}:))\](?::(?:[0-9]|[1-9][0-9]{1,3}|[1-5][0-9]{4}|6[0-4][0-9]{3}|65[0-4][0-9]{2}|655[0-2][0-9]|6553[0-5]))?$)/i
 ```
 
 ### 16进制颜色
 ```javascript
-/^#?([a-fA-F0-9]{6}|[a-fA-F0-9]{3})$/
+/^#?([a-fA-F0-9]{6}|[a-fA-F0-9]{3}|[a-fA-F0-9]{8}|[a-fA-F0-9]{4})$/
 ```
 
-### 微信号，6至20位，以字母开头，字母，数字，减号，下划线
+### 微信号(wx)，6至20位，以字母开头，字母，数字，减号，下划线
 ```javascript
 /^[a-zA-Z][-_a-zA-Z0-9]{5,19}$/
 ```
@@ -367,5 +401,90 @@ vscode应用商店中搜索"**any-rule**".
 
 ### java包名
 ```javascript
-/^([a-zA-Z_][a-zA-Z0-9_]*)+([.][a-zA-Z_][a-zA-Z0-9_]*)+$/
+/^([a-zA-Z_]\w*)+([.][a-zA-Z_]\w*)+$/
+```
+
+### mac地址
+```javascript
+/^(([a-f0-9][0,2,4,6,8,a,c,e]:([a-f0-9]{2}:){4})|([a-f0-9][0,2,4,6,8,a,c,e]-([a-f0-9]{2}-){4}))[a-f0-9]{2}$/i
+```
+
+### 匹配连续重复的字符
+```javascript
+/(.)\1+/
+```
+
+### 数字和英文字母组成，并且同时含有数字和英文字母
+```javascript
+/^(?=.*[a-zA-Z])(?=.*\d).+$/
+```
+
+### 香港身份证 
+```javascript
+/^[a-zA-Z]\d{6}\([\dA]\)$/
+```
+
+### 澳门身份证 
+```javascript
+/^[1|5|7]\d{6}\(\d\)$/
+```
+
+### 台湾身份证 
+```javascript
+/^[a-zA-Z][0-9]{9}$/
+```
+
+### 大写字母，小写字母，数字，特殊符号 `@#$%^&*`~()-+=` 中任意3项密码
+```javascript
+/^(?![a-zA-Z]+$)(?![A-Z0-9]+$)(?![A-Z\W_!@#$%^&*`~()-+=]+$)(?![a-z0-9]+$)(?![a-z\W_!@#$%^&*`~()-+=]+$)(?![0-9\W_!@#$%^&*`~()-+=]+$)[a-zA-Z0-9\W_!@#$%^&*`~()-+=]/
+```
+
+### ASCII码表中的全部的特殊字符
+```javascript
+/[\x21-\x2F\x3A-\x40\x5B-\x60\x7B-\x7E]+/
+```
+
+### 正整数，不包含0
+```javascript
+/^\+?[1-9]\d*$/
+```
+
+### 负整数，不包含0
+```javascript
+/^-[1-9]\d*$/
+```
+
+### 整数
+```javascript
+/^(?:0|(?:-?[1-9]\d*))$/
+```
+
+### 浮点数
+```javascript
+/^(-?[1-9]\d*\.\d+|-?0\.\d*[1-9]\d*|0\.0+)$/
+```
+
+### 浮点数(严格)
+```javascript
+/^(-?[1-9]\d*\.\d+|-?0\.\d*[1-9])$/
+```
+
+### email(支持中文邮箱)
+```javascript
+/^[A-Za-z0-9\u4e00-\u9fa5]+@[a-zA-Z0-9_-]+(\.[a-zA-Z0-9_-]+)+$/
+```
+
+### 域名(非网址, 不包含协议)
+```javascript
+/^([0-9a-zA-Z-]{1,}\.)+([a-zA-Z]{2,})$/
+```
+
+### 军官/士兵证
+```javascript
+/^[\u4E00-\u9FA5](字第)([0-9a-zA-Z]{4,8})(号?)$/
+```
+
+### 户口薄
+```javascript
+/(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/
 ```

package.json

@@ -3,21 +3,35 @@
     "publisher": "russell",
     "displayName": "any-rule",
     "description": "你要的\"正则\"都在这!",
-    "version": "0.1.1",
+    "version": "0.3.18",
+    "keywords": [
+        "vscode",
+        "typescript",
+        "regxp",
+        "正则"
+    ],
+    "husky": {
+        "hooks": {
+            "pre-push": "npm run test:rules"
+        }
+    },
     "scripts": {
         "build:md": "node ./scripts/md.js",
-        "build": "npm run test:rules && npm version patch && node ./scripts/genCommond.js && vsce package && npm run build:md",
+        "build": "npm run test:rules && npm version patch && node ./scripts/genCommond.js && vsce package --yarn && npm run build:md",
         "vscode:prepublish": "npm run compile",
-        "compile": "tsc -p ./",
+        "compile": "webpack --mode production",
         "watch": "tsc -watch -p ./",
         "pretest": "npm run compile",
         "test": "node ./out/test/runTest.js",
-        "test:rules": "node __test__/rule"
+        "test:rules": "node __test__/rule",
+        "release:demo": "cd packages/www && yarn release",
+        "dev:demo": "cd packages/www && yarn serve"
     },
     "engines": {
         "vscode": "^1.12.0"
     },
     "categories": [
+        "Snippets",
         "Other"
     ],
     "icon": "images/vscode-logo.png",
@@ -26,7 +40,7 @@
     },
     "repository": {
         "type": "git",
-        "url": "git+https://github.com/any86/any-rule.git"
+        "url": "https://github.com/any86/any-rule.git"
     },
     "activationEvents": [
         "*"
@@ -37,18 +51,27 @@
             "type": "object",
             "title": "any-rule",
             "properties": {
-                "AnyRule.triggerString": {
+                "any-rule.triggerString": {
                     "type": "string",
-                    "default": "zz.",
+                    "default": "@zz",
                     "description": "触发字符串"
                 },
-                "AnyRule.supportedLanguages": {
+                "any-rule.supportedLanguages": {
                     "type": "string",
-                    "default": "*, javascript, typescript, javascriptreact, typescriptreact, markdown, jsx, vue, html, json, plaintext, coffeescript",
+                    "default": "*,javascript,javascriptreact,typescript,typescriptreact,vue,vue-postcss,vue-sugarss,vue-html,json,jsonc,graphql,dart,sql,go,java,php,jade,python,swift,markdown",
-                    "description": "如果您的文件格式未被支持, 请在此处添加(⚡添加成功后需要重启vscode)"
+                    "description": "支持的开发语言(用','分割)"
                 }
             }
         },
+        "menus": {
+            "editor/context": [
+                {
+                    "when": "editorFocus",
+                    "command": "extension.rule.callByMenu",
+                    "group": "navigation"
+                }
+            ]
+        },
         "commands": [
             {
                 "command": "extension.rule0",
@@ -64,7 +87,7 @@
             },
             {
                 "command": "extension.rule3",
-                "title": "$(rocket) zz: 网址(支持端口和\"?+参数\"和\"#+参数)"
+                "title": "$(rocket) zz: 网址(URL)"
             },
             {
                 "command": "extension.rule4",
@@ -72,227 +95,323 @@
             },
             {
                 "command": "extension.rule5",
-                "title": "$(rocket) zz: 迅雷链接"
+                "title": "$(rocket) zz: 统一社会信用代码(宽松匹配)(15位/18位/20位数字/字母)"
             },
             {
                 "command": "extension.rule6",
-                "title": "$(rocket) zz: ed2k链接(宽松匹配)"
+                "title": "$(rocket) zz: 迅雷链接"
             },
             {
                 "command": "extension.rule7",
-                "title": "$(rocket) zz: 磁力链接(宽松匹配)"
+                "title": "$(rocket) zz: ed2k链接(宽松匹配)"
             },
             {
                 "command": "extension.rule8",
-                "title": "$(rocket) zz: 子网掩码"
+                "title": "$(rocket) zz: 磁力链接(宽松匹配)"
             },
             {
                 "command": "extension.rule9",
-                "title": "$(rocket) zz: linux\"文件夹\"路径"
+                "title": "$(rocket) zz: 子网掩码(不包含 0.0.0.0)"
             },
             {
                 "command": "extension.rule10",
-                "title": "$(rocket) zz: linux\"文件\"路径"
+                "title": "$(rocket) zz: linux\"隐藏文件\"路径"
             },
             {
                 "command": "extension.rule11",
-                "title": "$(rocket) zz: window\"文件夹\"路径"
+                "title": "$(rocket) zz: linux文件夹路径"
             },
             {
                 "command": "extension.rule12",
-                "title": "$(rocket) zz: window下\"文件\"路径"
+                "title": "$(rocket) zz: linux文件路径"
             },
             {
                 "command": "extension.rule13",
-                "title": "$(rocket) zz: 股票代码(A股)"
+                "title": "$(rocket) zz: window\"文件夹\"路径"
             },
             {
                 "command": "extension.rule14",
-                "title": "$(rocket) zz: 大于等于0, 小于等于150, 支持小数位出现5, 如145.5, 用于判断考卷分数"
+                "title": "$(rocket) zz: window下\"文件\"路径"
             },
             {
                 "command": "extension.rule15",
-                "title": "$(rocket) zz: html注释"
+                "title": "$(rocket) zz: 股票代码(A股)"
             },
             {
                 "command": "extension.rule16",
-                "title": "$(rocket) zz: md5格式(32位)"
+                "title": "$(rocket) zz: 大于等于0, 小于等于150, 支持小数位出现5, 如145.5, 用于判断考卷分数"
             },
             {
                 "command": "extension.rule17",
-                "title": "$(rocket) zz: 版本号格式必须为X.Y.Z"
+                "title": "$(rocket) zz: html注释"
             },
             {
                 "command": "extension.rule18",
-                "title": "$(rocket) zz: 视频链接地址（视频格式可按需增删）"
+                "title": "$(rocket) zz: md5格式(32位)"
             },
             {
                 "command": "extension.rule19",
-                "title": "$(rocket) zz: 图片链接地址（图片格式可按需增删）"
+                "title": "$(rocket) zz: GUID/UUID"
             },
             {
                 "command": "extension.rule20",
-                "title": "$(rocket) zz: 24小时制时间（HH:mm:ss）"
+                "title": "$(rocket) zz: 版本号(version)格式必须为X.Y.Z"
             },
             {
                 "command": "extension.rule21",
-                "title": "$(rocket) zz: 12小时制时间（hh:mm:ss）"
+                "title": "$(rocket) zz: 视频(video)链接地址（视频格式可按需增删）"
             },
             {
                 "command": "extension.rule22",
-                "title": "$(rocket) zz: base64格式"
+                "title": "$(rocket) zz: 图片(image)链接地址（图片格式可按需增删）"
             },
             {
                 "command": "extension.rule23",
-                "title": "$(rocket) zz: 数字/货币金额（支持负数、千分位分隔符）"
+                "title": "$(rocket) zz: 24小时制时间（HH:mm:ss）"
             },
             {
                 "command": "extension.rule24",
-                "title": "$(rocket) zz: 数字/货币金额 (只支持正数、不支持校验千分位分隔符)"
+                "title": "$(rocket) zz: 12小时制时间（hh:mm:ss）"
             },
             {
                 "command": "extension.rule25",
-                "title": "$(rocket) zz: 银行卡号（10到30位, 覆盖对公/私账户, 参考[微信支付](https://pay.weixin.qq.com/wiki/doc/api/xiaowei.php?chapter=22_1)）"
+                "title": "$(rocket) zz: base64格式"
             },
             {
                 "command": "extension.rule26",
-                "title": "$(rocket) zz: 中文姓名"
+                "title": "$(rocket) zz: 数字/货币金额（支持负数、千分位分隔符）"
             },
             {
                 "command": "extension.rule27",
-                "title": "$(rocket) zz: 英文姓名"
+                "title": "$(rocket) zz: 银行卡号（10到30位, 覆盖对公/私账户, 参考[微信支付](https://pay.weixin.qq.com/wiki/doc/api/xiaowei.php?chapter=22_1)）"
             },
             {
                 "command": "extension.rule28",
-                "title": "$(rocket) zz: 车牌号(新能源)"
+                "title": "$(rocket) zz: 中文姓名"
             },
             {
                 "command": "extension.rule29",
-                "title": "$(rocket) zz: 车牌号(非新能源)"
+                "title": "$(rocket) zz: 英文姓名"
             },
             {
                 "command": "extension.rule30",
-                "title": "$(rocket) zz: 车牌号(新能源+非新能源)"
+                "title": "$(rocket) zz: 车牌号(新能源)"
             },
             {
                 "command": "extension.rule31",
-                "title": "$(rocket) zz: 手机号中国(严谨), 根据工信部2019年最新公布的手机号段"
+                "title": "$(rocket) zz: 车牌号(非新能源)"
             },
             {
                 "command": "extension.rule32",
-                "title": "$(rocket) zz: 手机号中国(宽松), 只要是13,14,15,16,17,18,19开头即可"
+                "title": "$(rocket) zz: 车牌号(新能源+非新能源)"
             },
             {
                 "command": "extension.rule33",
-                "title": "$(rocket) zz: 手机号中国(最宽松), 只要是1开头即可, 如果你的手机号是用来接收短信, 优先建议选择这一条"
+                "title": "$(rocket) zz: 手机号(mobile phone)中国(严谨), 根据工信部2019年最新公布的手机号段"
             },
             {
                 "command": "extension.rule34",
-                "title": "$(rocket) zz: 日期"
+                "title": "$(rocket) zz: 手机号(mobile phone)中国(宽松), 只要是13,14,15,16,17,18,19开头即可"
             },
             {
                 "command": "extension.rule35",
-                "title": "$(rocket) zz: email(邮箱)"
+                "title": "$(rocket) zz: 手机号(mobile phone)中国(最宽松), 只要是1开头即可, 如果你的手机号是用来接收短信, 优先建议选择这一条"
             },
             {
                 "command": "extension.rule36",
-                "title": "$(rocket) zz: 座机电话(国内),如: 0341-86091234"
+                "title": "$(rocket) zz: 日期(宽松)"
             },
             {
                 "command": "extension.rule37",
-                "title": "$(rocket) zz: 身份证号(1代,15位数字)"
+                "title": "$(rocket) zz: 日期(严谨, 支持闰年判断)"
             },
             {
                 "command": "extension.rule38",
-                "title": "$(rocket) zz: 身份证号(2代,18位数字),最后一位是校验位,可能为数字或字符X"
+                "title": "$(rocket) zz: 中国省"
             },
             {
                 "command": "extension.rule39",
-                "title": "$(rocket) zz: 身份证号, 支持1/2代(15位/18位数字)"
+                "title": "$(rocket) zz: 可以被moment转化成功的时间 YYYYMMDD HH:mm:ss"
             },
             {
                 "command": "extension.rule40",
-                "title": "$(rocket) zz: 护照（包含香港、澳门）"
+                "title": "$(rocket) zz: email(邮箱)"
             },
             {
                 "command": "extension.rule41",
-                "title": "$(rocket) zz: 帐号是否合法(字母开头，允许5-16字节，允许字母数字下划线组合"
+                "title": "$(rocket) zz: 座机(tel phone)电话(国内),如: 0341-86091234"
             },
             {
                 "command": "extension.rule42",
-                "title": "$(rocket) zz: 中文/汉字"
+                "title": "$(rocket) zz: 身份证号(1代,15位数字)"
             },
             {
                 "command": "extension.rule43",
-                "title": "$(rocket) zz: 小数"
+                "title": "$(rocket) zz: 身份证号(2代,18位数字),最后一位是校验位,可能为数字或字符X"
             },
             {
                 "command": "extension.rule44",
-                "title": "$(rocket) zz: 数字"
+                "title": "$(rocket) zz: 身份证号, 支持1/2代(15位/18位数字)"
             },
             {
                 "command": "extension.rule45",
-                "title": "$(rocket) zz: html标签(宽松匹配)"
+                "title": "$(rocket) zz: 护照（包含香港、澳门）"
             },
             {
                 "command": "extension.rule46",
-                "title": "$(rocket) zz: qq号格式正确"
+                "title": "$(rocket) zz: 帐号是否合法(字母开头，允许5-16字节，允许字母数字下划线组合"
             },
             {
                 "command": "extension.rule47",
-                "title": "$(rocket) zz: 数字和字母组成"
+                "title": "$(rocket) zz: 中文/汉字"
             },
             {
                 "command": "extension.rule48",
-                "title": "$(rocket) zz: 英文字母"
+                "title": "$(rocket) zz: 小数(支持科学计数)"
             },
             {
                 "command": "extension.rule49",
-                "title": "$(rocket) zz: 小写英文字母组成"
+                "title": "$(rocket) zz: 只包含数字"
             },
             {
                 "command": "extension.rule50",
-                "title": "$(rocket) zz: 大写英文字母"
+                "title": "$(rocket) zz: html标签(宽松匹配)"
             },
             {
                 "command": "extension.rule51",
-                "title": "$(rocket) zz: 密码强度校验，最少6位，包括至少1个大写字母，1个小写字母，1个数字，1个特殊字符"
+                "title": "$(rocket) zz: 匹配中文汉字和中文标点"
             },
             {
                 "command": "extension.rule52",
-                "title": "$(rocket) zz: 用户名校验，4到16位（字母，数字，下划线，减号）"
+                "title": "$(rocket) zz: qq号格式正确"
             },
             {
                 "command": "extension.rule53",
-                "title": "$(rocket) zz: ip-v4"
+                "title": "$(rocket) zz: 数字和字母组成"
             },
             {
                 "command": "extension.rule54",
-                "title": "$(rocket) zz: ip-v6"
+                "title": "$(rocket) zz: 英文字母"
             },
             {
                 "command": "extension.rule55",
-                "title": "$(rocket) zz: 16进制颜色"
+                "title": "$(rocket) zz: 小写英文字母组成"
             },
             {
                 "command": "extension.rule56",
-                "title": "$(rocket) zz: 微信号，6至20位，以字母开头，字母，数字，减号，下划线"
+                "title": "$(rocket) zz: 大写英文字母"
             },
             {
                 "command": "extension.rule57",
-                "title": "$(rocket) zz: 邮政编码(中国)"
+                "title": "$(rocket) zz: 密码强度校验，最少6位，包括至少1个大写字母，1个小写字母，1个数字，1个特殊字符"
             },
             {
                 "command": "extension.rule58",
-                "title": "$(rocket) zz: 中文和数字"
+                "title": "$(rocket) zz: 用户名校验，4到16位（字母，数字，下划线，减号）"
             },
             {
                 "command": "extension.rule59",
-                "title": "$(rocket) zz: 不能包含字母"
+                "title": "$(rocket) zz: ip-v4[:端口]"
             },
             {
                 "command": "extension.rule60",
+                "title": "$(rocket) zz: ip-v6[:端口]"
+            },
+            {
+                "command": "extension.rule61",
+                "title": "$(rocket) zz: 16进制颜色"
+            },
+            {
+                "command": "extension.rule62",
+                "title": "$(rocket) zz: 微信号(wx)，6至20位，以字母开头，字母，数字，减号，下划线"
+            },
+            {
+                "command": "extension.rule63",
+                "title": "$(rocket) zz: 邮政编码(中国)"
+            },
+            {
+                "command": "extension.rule64",
+                "title": "$(rocket) zz: 中文和数字"
+            },
+            {
+                "command": "extension.rule65",
+                "title": "$(rocket) zz: 不能包含字母"
+            },
+            {
+                "command": "extension.rule66",
                 "title": "$(rocket) zz: java包名"
+            },
+            {
+                "command": "extension.rule67",
+                "title": "$(rocket) zz: mac地址"
+            },
+            {
+                "command": "extension.rule68",
+                "title": "$(rocket) zz: 匹配连续重复的字符"
+            },
+            {
+                "command": "extension.rule69",
+                "title": "$(rocket) zz: 数字和英文字母组成，并且同时含有数字和英文字母"
+            },
+            {
+                "command": "extension.rule70",
+                "title": "$(rocket) zz: 香港身份证 "
+            },
+            {
+                "command": "extension.rule71",
+                "title": "$(rocket) zz: 澳门身份证 "
+            },
+            {
+                "command": "extension.rule72",
+                "title": "$(rocket) zz: 台湾身份证 "
+            },
+            {
+                "command": "extension.rule73",
+                "title": "$(rocket) zz: 大写字母，小写字母，数字，特殊符号 `@#$%^&*`~()-+=` 中任意3项密码"
+            },
+            {
+                "command": "extension.rule74",
+                "title": "$(rocket) zz: ASCII码表中的全部的特殊字符"
+            },
+            {
+                "command": "extension.rule75",
+                "title": "$(rocket) zz: 正整数，不包含0"
+            },
+            {
+                "command": "extension.rule76",
+                "title": "$(rocket) zz: 负整数，不包含0"
+            },
+            {
+                "command": "extension.rule77",
+                "title": "$(rocket) zz: 整数"
+            },
+            {
+                "command": "extension.rule78",
+                "title": "$(rocket) zz: 浮点数"
+            },
+            {
+                "command": "extension.rule79",
+                "title": "$(rocket) zz: 浮点数(严格)"
+            },
+            {
+                "command": "extension.rule80",
+                "title": "$(rocket) zz: email(支持中文邮箱)"
+            },
+            {
+                "command": "extension.rule81",
+                "title": "$(rocket) zz: 域名(非网址, 不包含协议)"
+            },
+            {
+                "command": "extension.rule82",
+                "title": "$(rocket) zz: 军官/士兵证"
+            },
+            {
+                "command": "extension.rule83",
+                "title": "$(rocket) zz: 户口薄"
+            },
+            {
+                "command": "extension.rule.callByMenu",
+                "title": "🦕正则大全(84条)"
             }
         ]
     },
@@ -302,12 +421,19 @@
         "@types/node": "^10.12.21",
         "@types/vscode": "^1.12.0",
         "glob": "^7.1.4",
+        "husky": "^4.2.5",
         "mocha": "^6.1.4",
+        "qiniu-js": "^2.5.5",
+        "ts-loader": "^6.2.1",
         "tslint": "^5.12.1",
         "typescript": "^3.3.1",
-        "vscode-test": "^1.0.2"
+        "vsce": "^1.74.0",
+        "vscode-test": "^1.0.2",
+        "webpack": "^4.41.6",
+        "webpack-cli": "^3.3.11"
     },
     "dependencies": {
+        "axios": "^0.19.2",
         "transliteration": "^2.1.8"
     }
 }

packages/www/package.json

@@ -5,15 +5,17 @@
   "scripts": {
     "serve": "vue-cli-service serve",
     "build": "vue-cli-service build",
-    "build:demo": "npm run build && node ./scripts/demo",
+    "release": "npm run build && node ./scripts/demo",
-    "lint": "vue-cli-service lint"
+    "lint": "vue-cli-service lint",
+    "rm:nm":"rimraf node_modules"
   },
   "dependencies": {
     "clipboard": "^2.0.4",
     "core-js": "^2.6.5",
+    "crypto-js": "^4.0.0",
     "lodash": "^4.17.13",
-    "node-sass": "^4.12.0",
+    "node-sass": "^6.0.0",
-    "sass-loader": "^7.1.0",
+    "sass-loader": "^10.0.0",
     "vue": "^2.6.10"
   },
   "devDependencies": {

packages/www/public/index.html

@@ -6,6 +6,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width" />
     <link rel="icon" href="<%= BASE_URL %>favicon.ico">
+    <link rel="manifest" href="<%= BASE_URL %>manifest.json">
     <title>正则大全</title>
     <!-- 百度统计 -->
     <script>
@@ -23,6 +24,7 @@
         :root {
             --primary: #42b983;
         }
+
         * {
             padding: 0;
             margin: 0;
@@ -56,12 +58,16 @@
                 transform: rotate(360deg);
             }
         }
+
         .loading {
             animation: rotate 1s infinite linear;
             margin: 0;
             padding: 0;
             position: fixed;
-            top:0;left:0;right: 0;bottom:0;
+            top: 0;
+            left: 0;
+            right: 0;
+            bottom: 0;
             margin: auto;
             display: block;
             width: 100px;

packages/www/public/manifest.json

@@ -0,0 +1,15 @@
+{
+    "short_name": "any-rule",
+    "name": "正则大全",
+    "icons": [
+        {
+            "src": "/any-rule/icon.png",
+            "type": "image/png",
+            "sizes": "192x192"
+        }
+    ],
+    "background_color": "#2196F3",
+    "theme_color": "#2196F3",
+    "display": "standalone",
+    "start_url": "/any-rule"
+}

packages/www/src/App.vue

@@ -1,47 +1,52 @@
 <template>
     <main>
         <article class="fixed">
-            <a
-                onclick="_hmt.push(['_trackEvent', '交互', '点击github', '悬浮'])"
-                href="https://github.com/any86/any-rule"
-                target="_blank"
-                class="github"
-            >
-                <svg height="20" viewBox="0 0 16 16" version="1.1" width="20" aria-hidden="true">
-                    <path
-                        fill-rule="evenodd"
-                        d="M8 0C3.58 0 0 3.58 0 8c0 3.54 2.29 6.53 5.47 7.59.4.07.55-.17.55-.38 0-.19-.01-.82-.01-1.49-2.01.37-2.53-.49-2.69-.94-.09-.23-.48-.94-.82-1.13-.28-.15-.68-.52-.01-.53.63-.01 1.08.58 1.23.82.72 1.21 1.87.87 2.33.66.07-.52.28-.87.51-1.07-1.78-.2-3.64-.89-3.64-3.95 0-.87.31-1.59.82-2.15-.08-.2-.36-1.02.08-2.12 0 0 .67-.21 2.2.82.64-.18 1.32-.27 2-.27.68 0 1.36.09 2 .27 1.53-1.04 2.2-.82 2.2-.82.44 1.1.16 1.92.08 2.12.51.56.82 1.27.82 2.15 0 3.07-1.87 3.75-3.65 3.95.29.25.54.73.54 1.48 0 1.07-.01 1.93-.01 2.2 0 .21.15.46.55.38A8.013 8.013 0 0 0 16 8c0-4.42-3.58-8-8-8z"
-                    ></path>
-                </svg>
-                <span>github</span>
-            </a>
             <a
                 onclick="_hmt.push(['_trackEvent', '交互', '提问'])"
                 class="message"
                 href="https://github.com/any86/any-rule/issues/new"
                 target="_blank"
-            >提问</a>
+                ><svg
+                    style="margin-right: 8px"
+                    height="24"
+                    width="24"
+                    viewBox="0 0 16 16"
+                    version="1.1"
+                    aria-hidden="true"
+                >
+                    <path
+                        fill-rule="evenodd"
+                        fill="#fff"
+                        d="M8 0C3.58 0 0 3.58 0 8c0 3.54 2.29 6.53 5.47 7.59.4.07.55-.17.55-.38 0-.19-.01-.82-.01-1.49-2.01.37-2.53-.49-2.69-.94-.09-.23-.48-.94-.82-1.13-.28-.15-.68-.52-.01-.53.63-.01 1.08.58 1.23.82.72 1.21 1.87.87 2.33.66.07-.52.28-.87.51-1.07-1.78-.2-3.64-.89-3.64-3.95 0-.87.31-1.59.82-2.15-.08-.2-.36-1.02.08-2.12 0 0 .67-.21 2.2.82.64-.18 1.32-.27 2-.27.68 0 1.36.09 2 .27 1.53-1.04 2.2-.82 2.2-.82.44 1.1.16 1.92.08 2.12.51.56.82 1.27.82 2.15 0 3.07-1.87 3.75-3.65 3.95.29.25.54.73.54 1.48 0 1.07-.01 1.93-.01 2.2 0 .21.15.46.55.38A8.013 8.013 0 0 0 16 8c0-4.42-3.58-8-8-8z"
+                    ></path>
+                </svg>
+                提问</a
+            >
         </article>
         <header>
-            <h1>正则大全</h1>
-            
             <a
                 onclick="_hmt.push(['_trackEvent', '交互', '点击github', '头部'])"
-                style="margin-left:15px;color:#000;"
                 href="https://github.com/any86/any-rule"
                 target="_blank"
                 class="github"
             >
-                <svg height="20" viewBox="0 0 16 16" version="1.1" width="20" aria-hidden="true">
+                <!-- <svg height="32" viewBox="0 0 16 16" version="1.1" width="32" aria-hidden="true">
                     <path
                         fill-rule="evenodd"
                         d="M8 0C3.58 0 0 3.58 0 8c0 3.54 2.29 6.53 5.47 7.59.4.07.55-.17.55-.38 0-.19-.01-.82-.01-1.49-2.01.37-2.53-.49-2.69-.94-.09-.23-.48-.94-.82-1.13-.28-.15-.68-.52-.01-.53.63-.01 1.08.58 1.23.82.72 1.21 1.87.87 2.33.66.07-.52.28-.87.51-1.07-1.78-.2-3.64-.89-3.64-3.95 0-.87.31-1.59.82-2.15-.08-.2-.36-1.02.08-2.12 0 0 .67-.21 2.2.82.64-.18 1.32-.27 2-.27.68 0 1.36.09 2 .27 1.53-1.04 2.2-.82 2.2-.82.44 1.1.16 1.92.08 2.12.51.56.82 1.27.82 2.15 0 3.07-1.87 3.75-3.65 3.95.29.25.54.73.54 1.48 0 1.07-.01 1.93-.01 2.2 0 .21.15.46.55.38A8.013 8.013 0 0 0 16 8c0-4.42-3.58-8-8-8z"
                     ></path>
-                </svg>
+                </svg> -->
-                <span>github</span>
+                <h1>🦕正则大全</h1>
             </a>
 
-            <iframe style="display:block;margin-top:15px;" src="https://ghbtns.com/github-btn.html?user=any86&repo=any-rule&type=star&count=true" frameborder="0" scrolling="0" width="170px" height="20px"></iframe>
+            <iframe
+                style="display: block; margin-top: 15px"
+                src="https://ghbtns.com/github-btn.html?user=any86&repo=any-rule&type=star&count=true"
+                frameborder="0"
+                scrolling="0"
+                width="170px"
+                height="20px"
+            ></iframe>
 
             <input
                 ref="searchInput"
@@ -53,7 +58,7 @@
                 class="search-input"
                 placeholder="搜索关键词, 如'手机'"
                 type="text"
-            >
+            />
         </header>
 
         <article>
@@ -72,7 +77,8 @@
                             :href="`https://github.com/any86/any-rule/issues/new?title=我有更好的正则: ${title}`"
                             target="_blank"
                             class="btn-better"
-                        >我有更好的正则</a>
+                            >我有更好的正则</a
+                        >
                         <code ref="code" class="javascript">{{ rule }}</code>
                     </p>
                     <section class="verification">
@@ -87,7 +93,7 @@
                                 @compositionend="check(index, 'blur')"
                                 @blur="check(index, 'blur')"
                                 @keyup="check(index, 'keyup')"
-                            >
+                            />
                             <span class="btn-clear" @click="reset(index)">清空</span>
                         </label>
 
@@ -101,13 +107,9 @@
 
                     <section class="trigger">
                         <h3>验证时机</h3>
-                        <label>
+                        <label> <input v-model="list[index].events.blur" type="checkbox" /> blur </label>
-                            <input v-model="list[index].events.blur" type="checkbox"> blur
-                        </label>
 
-                        <label>
+                        <label> <input v-model="list[index].events.keyup" type="checkbox" /> keyup </label>
-                            <input v-model="list[index].events.keyup" type="checkbox"> keyup
-                        </label>
                     </section>
                 </li>
             </ul>
@@ -119,7 +121,6 @@
 <script>
 import RULES from '@/RULES';
 import ClipboardJS from 'clipboard';
-// import throttle from 'lodash/throttle';
 export default {
     name: 'app',
 
@@ -129,6 +130,7 @@ export default {
         Object.freeze(RULES);
 
         return {
+            token: '',
             timer: null,
             keyword: '',
             rules: RULES,
@@ -137,9 +139,9 @@ export default {
                 isOk: undefined,
                 events: {
                     blur: true,
-                    keyup: true
+                    keyup: true,
-                }
+                },
-            }))
+            })),
         };
     },
 
@@ -183,7 +185,7 @@ export default {
 
         search() {
             if ('' !== this.keyword) {
-                this.rules = this.rules.filter(({ title }) => -1 !== title.indexOf(this.keyword.toLowerCase()));
+                this.rules = this.rules.filter(({ title }) => -1 !== title.toLowerCase().indexOf(this.keyword.toLowerCase()));
             } else {
                 this.rules = RULES;
             }
@@ -225,8 +227,8 @@ export default {
                 /* eslint-disable */
                 _hmt.push(['_trackEvent', 'input框', this.rules[index].title, this.list[index].value]);
             }
-        }
+        },
-    }
+    },
 };
 </script>
 
@@ -271,18 +273,17 @@ main {
         z-index: 1986;
         right: 15px;
         bottom: 15px;
-        box-shadow: 1px 2px 3px rgba(0, 0, 0, 0.1);
-        border-radius: $radius;
-        overflow: hidden;
         > a {
             display: flex;
+            border-radius: $radius;
             align-content: center;
             align-items: center;
             justify-content: center;
             justify-items: center;
             font-size: 16px;
             text-align: center;
-            padding: 15px;
+            padding: 16px;
+            box-shadow: 1px 2px 3px 1px rgba(0, 0, 0, 0.1);
             &:active {
                 opacity: 0.6;
                 box-shadow: none;
@@ -306,6 +307,10 @@ main {
 
     header {
         padding: 15px;
+        position: sticky;
+        top: 0;
+        z-index: 99;
+        background: linear-gradient(180deg, white 80%, transparent);
         > .search-input {
             display: block;
             margin-top: 15px;
@@ -316,12 +321,15 @@ main {
             border-radius: $radius;
             box-shadow: 1px 2px 2px rgba(0, 0, 0, 0.1);
         }
+
+        // 标题
+        > .github {
+            display: inline-flex;
+            align-items: center;
+            color: #000;
+
             h1 {
-            display: inline-block;
+                margin-left: 8px;
-        }
-        >.github{display: inline-flex;
-            >span{
-                margin-left: 5px;
             }
         }
     }
@@ -336,7 +344,7 @@ main {
             border-color: #eee;
             border-width: 1px;
             border-style: solid;
-
+            box-shadow: 1px 2px 5px 1px rgba(0, 0, 0, 0.1);
             > .border {
                 position: absolute;
                 background: $primary;
@@ -350,6 +358,7 @@ main {
                 transition: all 600ms;
                 border-radius: $radius;
                 border-color: #eee;
+                box-shadow: none;
                 > .border {
                     animation: shrinkBorder 0.5s;
                     left: 0;
@@ -371,6 +380,7 @@ main {
                     color: #fff;
                     font-size: 12px;
                     cursor: pointer;
+                    box-shadow: 1px 2px 3px $primary;
                     &.success {
                         &:after {
                             content: '复制成功';
@@ -385,20 +395,24 @@ main {
                     }
                     &:active {
                         opacity: 0.6;
-                        color: #444;
+                        box-shadow: none;
                     }
 
                     &:hover {
-                        opacity: 0.6;
+                        transition: all 0.3s;
+                        color: rgba(255, 255, 255, 0.6)
                     }
                 }
 
                 > .btn-better {
                     @extend .btn-copy;
                     background-color: $danger;
+                    box-shadow: 1px 2px 3px $danger;
                 }
 
-                >code{word-break:break-word;}
+                > code {
+                    word-break: break-word;
+                }
             }
 
             > section.verification {
@@ -413,6 +427,7 @@ main {
                         border: 1px solid #ddd;
                         font-size: 16px;
                         & + .btn-clear {
+                            cursor: pointer;
                             padding: 5px;
                             color: #000;
                             display: inline-block;

packages/www/src/RULES.js

@@ -15,9 +15,13 @@ module.exports = [{
     counterExamples: ['192.168.1.1', 'https://www.jd.com']
 },
 {
-        title: '网址(支持端口和"?+参数"和"#+参数)',
+    // 参考: 
-        rule: /^(((ht|f)tps?):\/\/)?[\w-]+(\.[\w-]+)+([\w.,@?^=%&:/~+#-]*[\w@?^=%&/~+#-])?$/,
+    // https://baike.baidu.com/item/%E9%A1%B6%E7%BA%A7%E5%9F%9F%E5%90%8D#4_1
-        examples: ['www.qq.com', 'https://baidu.com', '360.com:8080/vue/#/a=1&b=2'],
+    // https://baike.baidu.com/item/%E9%A1%B6%E7%BA%A7%E5%9F%9F%E5%90%8D#7
+    // 也参考谷歌浏览器的地址栏, 如果输入非字母不会被识别为域名
+    title: '网址(URL)',
+    rule: /^(((ht|f)tps?):\/\/)?([^!@#$%^&*?.\s-]([^!@#$%^&*?.\s]{0,63}[^!@#$%^&*?.\s])?\.)+[a-z]{2,6}\/?/,
+    examples: ['www.qq.com', 'https://vuejs.org/v2/api/#v-model', 'www.qq.99', '//www.qq.com', 'www.腾讯.cs', 'ftp://baidu.qq', 'http://baidu.com', 'https://www.amap.com/search?id=BV10060895&city=420111&geoobj=113.207951%7C29.992557%7C115.785782%7C31.204369&query_type=IDQ&query=%E5%85%89%E8%B0%B7%E5%B9%BF%E5%9C%BA(%E5%9C%B0%E9%93%81%E7%AB%99)&zoom=10.15', '360.com:8080/vue/#/a=1&b=2'],
     counterExamples: ['....']
 },
 {
@@ -25,7 +29,11 @@ module.exports = [{
     rule: /^[0-9A-HJ-NPQRTUWXY]{2}\d{6}[0-9A-HJ-NPQRTUWXY]{10}$/,
     examples: ['91230184MA1BUFLT44', '92371000MA3MXH0E3W'],
 },
-
+{
+    title: '统一社会信用代码(宽松匹配)(15位/18位/20位数字/字母)',
+    rule: /^(([0-9A-Za-z]{15})|([0-9A-Za-z]{18})|([0-9A-Za-z]{20}))$/,
+    examples: ['91110108772551611J', '911101085923662400']
+},
 {
     title: '迅雷链接',
     rule: /^thunderx?:\/\/[a-zA-Z\d]+=$/,
@@ -44,19 +52,24 @@ module.exports = [{
     examples: ['magnet:?xt=urn:btih:40A89A6F4FB1498A98087109D012A9A851FBE0FC'],
 },
 {
-        title: '子网掩码',
+    title: '子网掩码(不包含 0.0.0.0)',
-        rule: /^(?:\d{1,2}|1\d\d|2[0-4]\d|25[0-5])(?:\.(?:\d{1,2}|1\d\d|2[0-4]\d|25[0-5])){3}$/,
+    rule: /^(254|252|248|240|224|192|128)\.0\.0\.0|255\.(254|252|248|240|224|192|128|0)\.0\.0|255\.255\.(254|252|248|240|224|192|128|0)\.0|255\.255\.255\.(255|254|252|248|240|224|192|128|0)$/,
-        examples: ['255.255.255.0', '255.224.0.0']
+    examples: ['255.255.255.0', '255.255.255.255', '255.240.0.0']
 },
 {
-        title: 'linux"文件夹"路径',
+    title: 'linux"隐藏文件"路径',
-        rule: /^(\/[^/]+)+\/?$/,
+    rule: /^\/(?:[^/]+\/)*\.[^/]*/,
-        examples: ['/usr/ad/dd', '/root/','/.gitignore']
+    examples: ['/usr/ad/.dd', '/root/.gitignore', '/.gitignore']
 },
 {
-        title: 'linux"文件"路径',
+    title: 'linux文件夹路径',
-        rule: /^(\/[^/]+)+$/,
+    rule: /^\/(?:[^/]+\/)*$/,
-        examples: ['/usr/ad/dd/a.js', '/root/b.ts']
+    examples: ['/usr/ad/dd/', '/', '/root/', '/ a a / a / a a /']
+},
+{
+    title: 'linux文件路径',
+    rule: /^\/(?:[^/]+\/)*[^/]+$/,
+    examples: ['/root/b.ts', '/root/abc']
 },
 {
     title: 'window"文件夹"路径',
@@ -75,33 +88,38 @@ module.exports = [{
 },
 {
     title: '大于等于0, 小于等于150, 支持小数位出现5, 如145.5, 用于判断考卷分数',
-        rule: /^150$|^(?:\d|[1-9]\d|1[0-4]\d)(?:.5)?$/,
+    rule: /^150$|^(?:\d|[1-9]\d|1[0-4]\d)(?:\.5)?$/,
     examples: [150, 100.5]
 },
 {
     title: 'html注释',
-        rule: /<!--[\s\S]*?-->/,
+    rule: /<!--[\s\S]*?-->/g,
-        examples: ['<!--<div class="_bubble"></div>-->']
+    examples: ['<!--<div class="_bubble"></div>--><div>chenguzhen87</div><div class="_bubble"></div>-->']
 },
 {
     title: 'md5格式(32位)',
-        rule: /^([a-f\d]{32}|[A-F\d]{32})$/,
+    rule: /^[a-fA-F0-9]{32}$/,
     examples: ['21fe181c5bfc16306a6828c1f7b762e8'],
 },
 {
-        title: '版本号格式必须为X.Y.Z',
+    title: 'GUID/UUID',
+    rule: /^[a-f\d]{4}(?:[a-f\d]{4}-){4}[a-f\d]{12}$/i,
+    examples: ['e155518c-ca1b-443c-9be9-fe90fdab7345', '41E3DAF5-6E37-4BCC-9F8E-0D9521E2AA8D', '00000000-0000-0000-0000-000000000000'],
+},
+{
+    title: '版本号(version)格式必须为X.Y.Z',
     rule: /^\d+(?:\.\d+){2}$/,
     examples: ['16.3.10']
 },
 {
-        title: '视频链接地址（视频格式可按需增删）',
+    title: '视频(video)链接地址（视频格式可按需增删）',
     rule: /^https?:\/\/(.+\/)+.+(\.(swf|avi|flv|mpg|rm|mov|wav|asf|3gp|mkv|rmvb|mp4))$/i,
     examples: ['http://www.abc.com/video/wc.avi']
 },
 {
-        title: '图片链接地址（图片格式可按需增删）',
+    title: '图片(image)链接地址（图片格式可按需增删）',
     rule: /^https?:\/\/(.+\/)+.+(\.(gif|png|jpg|jpeg|webp|svg|psd|bmp|tif))$/i,
-        examples: ['https://www.abc.com/logo.png']
+    examples: ['https://www.abc.com/logo.png', 'http://www.abc.com/logo.png']
 },
 {
     title: '24小时制时间（HH:mm:ss）',
@@ -121,14 +139,9 @@ module.exports = [{
 },
 {
     title: '数字/货币金额（支持负数、千分位分隔符）',
-        rule: /^-?\d+(,\d{3})*(\.\d{1,2})?$/,
+    rule: /^-?\d{1,3}(,\d{3})*(\.\d{1,2})?$/ ,
     examples: [100, -0.99, 3, 234.32, -1, 900, 235.09, '12,345,678.90']
 },
-    {
-        title: '数字/货币金额 (只支持正数、不支持校验千分位分隔符)',
-        rule: /(?:^[1-9]([0-9]+)?(?:\.[0-9]{1,2})?$)|(?:^(?:0){1}$)|(?:^[0-9]\.[0-9](?:[0-9])?$)/,
-        examples: [0.99, 8.99, 666]
-    },
 {
     title: '银行卡号（10到30位, 覆盖对公/私账户, 参考[微信支付](https://pay.weixin.qq.com/wiki/doc/api/xiaowei.php?chapter=22_1)）',
     rule: /^[1-9]\d{9,29}$/,
@@ -141,68 +154,93 @@ module.exports = [{
 },
 {
     title: '英文姓名',
-        rule: /(^[a-zA-Z]{1}[a-zA-Z\s]{0,20}[a-zA-Z]{1}$)/,
+    rule: /(^[a-zA-Z][a-zA-Z\s]{0,20}[a-zA-Z]$)/,
     examples: ['James', 'Kevin Wayne Durant', 'Dirk Nowitzki']
 },
 {
     title: '车牌号(新能源)',
-        rule: /[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领 A-Z]{1}[A-HJ-NP-Z]{1}(([0-9]{5}[DF])|([DF][A-HJ-NP-Z0-9][0-9]{4}))$/,
+    rule: /^[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领][A-HJ-NP-Z](([DF]((?![IO])[a-zA-Z0-9](?![IO]))[0-9]{4})|([0-9]{5}[DF]))$/,
-        examples: ['京AD92035', '甘G23459F'],
+    examples: ['京AD92035', '甘G23459F', '京A19203D'],
 },
 {
     title: '车牌号(非新能源)',
-        rule: /^[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领 A-Z]{1}[A-HJ-NP-Z]{1}[A-Z0-9]{4}[A-Z0-9挂学警港澳]{1}$/,
+    rule: /^[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领][A-HJ-NP-Z][A-HJ-NP-Z0-9]{4}[A-HJ-NP-Z0-9挂学警港澳]$/,
     examples: ['京A00599', '黑D23908']
 },
 {
     title: '车牌号(新能源+非新能源)',
-        rule: /^(?:[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领 A-Z]{1}[A-HJ-NP-Z]{1}(?:(?:[0-9]{5}[DF])|(?:[DF](?:[A-HJ-NP-Z0-9])[0-9]{4})))|(?:[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领 A-Z]{1}[A-Z]{1}[A-HJ-NP-Z0-9]{4}[A-HJ-NP-Z0-9 挂学警港澳]{1})$/,
+    rule: /^[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领][A-HJ-NP-Z][A-HJ-NP-Z0-9]{4,5}[A-HJ-NP-Z0-9挂学警港澳]$/,
-        examples: ['京A12345D', '京A00599']
+    examples: ['京A12345D', '京A00599', '京AD92035', '甘G23459F', '京AA92035'],
+    counterExamples: ['宁AD1234555555', '浙苏H6F681']
 },
 {
-        title: '手机号中国(严谨), 根据工信部2019年最新公布的手机号段',
+    title: '手机号(mobile phone)中国(严谨), 根据工信部最新公布的手机号段',
-        rule: /^(?:(?:\+|00)86)?1(?:(?:3[\d])|(?:4[5-7|9])|(?:5[0-3|5-9])|(?:6[5-7])|(?:7[0-8])|(?:8[\d])|(?:9[1|8|9]))\d{8}$/,
+    rule: /^(?:(?:\+|00)86)?1(?:(?:3[\d])|(?:4[5-79])|(?:5[0-35-9])|(?:6[5-7])|(?:7[0-8])|(?:8[\d])|(?:9[01256789]))\d{8}$/,
-        examples: ['008618311006933', '+8617888829981', '19119255642']
+    examples: ['008618311006933', '+8617888829981', '19119255642', '19519255642']
 },
 {
-        title: '手机号中国(宽松), 只要是13,14,15,16,17,18,19开头即可',
+    title: '手机号(mobile phone)中国(宽松), 只要是13,14,15,16,17,18,19开头即可',
     rule: /^(?:(?:\+|00)86)?1[3-9]\d{9}$/,
     examples: ['008618311006933', '+8617888829981', '19119255642']
 },
 {
-        title: '手机号中国(最宽松), 只要是1开头即可, 如果你的手机号是用来接收短信, 优先建议选择这一条',
+    title: '手机号(mobile phone)中国(最宽松), 只要是1开头即可, 如果你的手机号是用来接收短信, 优先建议选择这一条',
     rule: /^(?:(?:\+|00)86)?1\d{10}$/,
     examples: ['008618311006933', '+8617888829981', '19119255642']
 },
 {
-        title: '日期',
+    title: '日期(宽松)',
-        rule: /^\d{4}(-)(1[0-2]|0?\d)\1([0-2]\d|\d|30|31)$/,
+    rule: /^\d{1,4}(-)(1[0-2]|0?[1-9])\1(0?[1-9]|[1-2]\d|30|31)$/,
-        examples: ['1990-12-12', '2020-1-1']
+    examples: ['1990-12-12', '1-1-1', '0000-1-1'],
+    counterExamples: ['2020-00-01']
+},
+
+{
+    title: '日期(严谨, 支持闰年判断)',
+    rule: /^(([0-9]{3}[1-9]|[0-9]{2}[1-9][0-9]{1}|[0-9]{1}[1-9][0-9]{2}|[1-9][0-9]{3})-(((0[13578]|1[02])-(0[1-9]|[12][0-9]|3[01]))|((0[469]|11)-(0[1-9]|[12][0-9]|30))|(02-(0[1-9]|[1][0-9]|2[0-8]))))|((([0-9]{2})(0[48]|[2468][048]|[13579][26])|((0[48]|[2468][048]|[3579][26])00))-02-29)$/,
+    examples: ['1990-12-12', '2000-02-29'],
+    counterExamples: ['2021-02-29']
+},
+
+{
+    title: '中国省',
+    rule: /^浙江|上海|北京|天津|重庆|黑龙江|吉林|辽宁|内蒙古|河北|新疆|甘肃|青海|陕西|宁夏|河南|山东|山西|安徽|湖北|湖南|江苏|四川|贵州|云南|广西|西藏|江西|广东|福建|台湾|海南|香港|澳门$/,
+    examples: ['浙江', '台湾'],
+    counterExamples: ['哈尔滨']
+},
+
+{
+    title: '可以被moment转化成功的时间 YYYYMMDD HH:mm:ss',
+    rule: /^\d{4}([/:-\S])(1[0-2]|0?[1-9])\1(0?[1-9]|[1-2]\d|30|31) (?:[01]\d|2[0-3]):[0-5]\d:[0-5]\d$/,
+    examples: ['2020/01/01 23:59:59', '2020-01-01 00:00:00', '20200101 11:11:11'],
+    counterExamples: ['2020/00/01 23:59:59', '2020-01/01 23:59:59', '2020-01-01 23:59:61', '2020-01-0100:00:00',]
 },
 {
     title: 'email(邮箱)',
-        rule: /^[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$/,
+    rule: /^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/,
-        examples: ['90203918@qq.com', 'nbilly@126.com']
+    examples: ['90203918@qq.com', 'nbilly@126.com', '汉字@qq.com']
 },
+
 {
-        title: '座机电话(国内),如: 0341-86091234',
+    title: '座机(tel phone)电话(国内),如: 0341-86091234',
-        rule: /\d{3}-\d{8}|\d{4}-\d{7}/,
+    rule: /^(?:(?:\d{3}-)?\d{8}|^(?:\d{4}-)?\d{7,8})(?:-\d+)?$/,
-        examples: ['0936-4211235']
+    examples: ['0936-4211235', '89076543', '010-12345678-1234']
 },
+
 {
     title: '身份证号(1代,15位数字)',
-        rule: /^\d{8}(0\d|10|11|12)([0-2]\d|30|31)\d{3}$/,
+    rule: /^[1-9]\d{7}(?:0\d|10|11|12)(?:0[1-9]|[1-2][\d]|30|31)\d{3}$/,
-        examples: ['622001790131123']
+    examples: ['123456991010193']
 },
 {
     title: '身份证号(2代,18位数字),最后一位是校验位,可能为数字或字符X',
-        rule: /^\d{6}(18|19|20)\d{2}(0\d|10|11|12)([0-2]\d|30|31)\d{3}[\dXx]$/,
+    rule: /^[1-9]\d{5}(?:18|19|20)\d{2}(?:0[1-9]|10|11|12)(?:0[1-9]|[1-2]\d|30|31)\d{3}[\dXx]$/,
-        examples: ['62222319991205131x']
+    examples: ['12345619991205131x']
 },
 {
     title: '身份证号, 支持1/2代(15位/18位数字)',
-        rule: /(^\d{8}(0\d|10|11|12)([0-2]\d|30|31)\d{3}$)|(^\d{6}(18|19|20)\d{2}(0\d|10|11|12)([0-2]\d|30|31)\d{3}(\d|X|x)$)/,
+    rule: /^\d{6}((((((19|20)\d{2})(0[13-9]|1[012])(0[1-9]|[12]\d|30))|(((19|20)\d{2})(0[13578]|1[02])31)|((19|20)\d{2})02(0[1-9]|1\d|2[0-8])|((((19|20)([13579][26]|[2468][048]|0[48]))|(2000))0229))\d{3})|((((\d{2})(0[13-9]|1[012])(0[1-9]|[12]\d|30))|((\d{2})(0[13578]|1[02])31)|((\d{2})02(0[1-9]|1\d|2[0-8]))|(([13579][26]|[2468][048]|0[048])0229))\d{2}))(\d|X|x)$/,
-        examples: ['622223199912051311']
+    examples: ['622223199912051311', '12345619991205131x', '123456991010193']
 },
 {
     title: '护照（包含香港、澳门）',
@@ -221,13 +259,13 @@ module.exports = [{
     examples: ['正则', '前端']
 },
 {
-        title: '小数',
+    title: '小数(支持科学计数)',
-        rule: /^\d+\.\d+$/,
+    rule: /^[+-]?(\d+([.]\d*)?([eE][+-]?\d+)?|[.]\d+([eE][+-]?\d+)?)$/,
-        examples: ['0.0', '0.09']
+    examples: ['0.0', '0.09','4E+4']
 },
 {
-        title: '数字',
+    title: '只包含数字',
-        rule: /^\d{1,}$/,
+    rule: /^\d+$/,
     examples: [12345678]
 },
 {
@@ -235,6 +273,13 @@ module.exports = [{
     rule: /<(\w+)[^>]*>(.*?<\/\1>)?/,
     examples: ['<div id="app"> 2333 </div>', '<input type="text">', '<br>']
 },
+
+{
+    title: '匹配中文汉字和中文标点',
+    rule: /[\u4e00-\u9fa5|\u3002|\uff1f|\uff01|\uff0c|\u3001|\uff1b|\uff1a|\u201c|\u201d|\u2018|\u2019|\uff08|\uff09|\u300a|\u300b|\u3008|\u3009|\u3010|\u3011|\u300e|\u300f|\u300c|\u300d|\ufe43|\ufe44|\u3014|\u3015|\u2026|\u2014|\uff5e|\ufe4f|\uffe5]/,
+    examples: ["匹配中文汉字以及中文标点符号 。 ？ ！ ， 、 ； ： “ ” ‘ ' （ ） 《 》 〈 〉 【 】 『 』 「 」 ﹃ ﹄ 〔 〕 … — ～ ﹏ ￥"]
+},
+
 {
     title: 'qq号格式正确',
     rule: /^[1-9][0-9]{4,10}$/,
@@ -262,31 +307,31 @@ module.exports = [{
 },
 {
     title: '密码强度校验，最少6位，包括至少1个大写字母，1个小写字母，1个数字，1个特殊字符',
-        rule: /^.*(?=.{6,})(?=.*\d)(?=.*[A-Z])(?=.*[a-z])(?=.*[!@#$%^&*? ]).*$/,
+    rule: /^\S*(?=\S{6,})(?=\S*\d)(?=\S*[A-Z])(?=\S*[a-z])(?=\S*[!@#$%^&*? ])\S*$/,
     examples: ['Kd@curry666']
 },
 {
     title: '用户名校验，4到16位（字母，数字，下划线，减号）',
-        rule: /^[a-zA-Z0-9_-]{4,16}$/,
+    rule: /^[\w-]{4,16}$/,
     examples: ['xiaohua_qq']
 },
 {
-        title: 'ip-v4',
+    title: 'ip-v4[:端口]',
-        rule: /^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/,
+    rule: /^((\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.){3}(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])(?::(?:[0-9]|[1-9][0-9]{1,3}|[1-5][0-9]{4}|6[0-4][0-9]{3}|65[0-4][0-9]{2}|655[0-2][0-9]|6553[0-5]))?$/,
-        examples: ['172.16.0.0', '127.0.0.0']
+    examples: ['172.16.0.0', '172.16.0.0:8080', '127.0.0.0', '127.0.0.0:998']
 },
 {
-        title: 'ip-v6',
+    title: 'ip-v6[:端口]',
-        rule: /^((([0-9A-Fa-f]{1,4}:){7}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){6}:[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){5}:([0-9A-Fa-f]{1,4}:)?[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){4}:([0-9A-Fa-f]{1,4}:){0,2}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){3}:([0-9A-Fa-f]{1,4}:){0,3}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){2}:([0-9A-Fa-f]{1,4}:){0,4}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){6}((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|(([0-9A-Fa-f]{1,4}:){0,5}:((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|(::([0-9A-Fa-f]{1,4}:){0,5}((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|([0-9A-Fa-f]{1,4}::([0-9A-Fa-f]{1,4}:){0,5}[0-9A-Fa-f]{1,4})|(::([0-9A-Fa-f]{1,4}:){0,6}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){1,7}:))$/i,
+    rule: /(^(?:(?:(?:[0-9A-Fa-f]{1,4}:){7}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){6}:[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){5}:([0-9A-Fa-f]{1,4}:)?[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){4}:([0-9A-Fa-f]{1,4}:){0,2}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){3}:([0-9A-Fa-f]{1,4}:){0,3}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){2}:([0-9A-Fa-f]{1,4}:){0,4}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){6}((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|(([0-9A-Fa-f]{1,4}:){0,5}:((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|(::([0-9A-Fa-f]{1,4}:){0,5}((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|([0-9A-Fa-f]{1,4}::([0-9A-Fa-f]{1,4}:){0,5}[0-9A-Fa-f]{1,4})|(::([0-9A-Fa-f]{1,4}:){0,6}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){1,7}:))$)|(^\[(?:(?:(?:[0-9A-Fa-f]{1,4}:){7}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){6}:[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){5}:([0-9A-Fa-f]{1,4}:)?[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){4}:([0-9A-Fa-f]{1,4}:){0,2}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){3}:([0-9A-Fa-f]{1,4}:){0,3}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){2}:([0-9A-Fa-f]{1,4}:){0,4}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){6}((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|(([0-9A-Fa-f]{1,4}:){0,5}:((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|(::([0-9A-Fa-f]{1,4}:){0,5}((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|([0-9A-Fa-f]{1,4}::([0-9A-Fa-f]{1,4}:){0,5}[0-9A-Fa-f]{1,4})|(::([0-9A-Fa-f]{1,4}:){0,6}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){1,7}:))\](?::(?:[0-9]|[1-9][0-9]{1,3}|[1-5][0-9]{4}|6[0-4][0-9]{3}|65[0-4][0-9]{2}|655[0-2][0-9]|6553[0-5]))?$)/i,
-        examples: ['2031:0000:130f:0000:0000:09c0:876a:130b']
+    examples: ['2031:0000:130f:0000:0000:09c0:876a:130b', '[2031:0000:130f:0000:0000:09c0:876a:130b]:8080']
 },
 {
     title: '16进制颜色',
-        rule: /^#?([a-fA-F0-9]{6}|[a-fA-F0-9]{3})$/,
+    rule: /^#?([a-fA-F0-9]{6}|[a-fA-F0-9]{3}|[a-fA-F0-9]{8}|[a-fA-F0-9]{4})$/,
-        examples: ['#f00', '#F90', '#000', '#fe9de8']
+    examples: ['#f00', '#F90', '#000', '#fe9de8', '#f8f8f8ff', '#f003']
 },
 {
-        title: '微信号，6至20位，以字母开头，字母，数字，减号，下划线',
+    title: '微信号(wx)，6至20位，以字母开头，字母，数字，减号，下划线',
     rule: /^[a-zA-Z][-_a-zA-Z0-9]{5,19}$/,
     examples: ['github666', 'kd_-666']
 },
@@ -307,7 +352,106 @@ module.exports = [{
 },
 {
     title: 'java包名',
-        rule: /^([a-zA-Z_][a-zA-Z0-9_]*)+([.][a-zA-Z_][a-zA-Z0-9_]*)+$/,
+    rule: /^([a-zA-Z_]\w*)+([.][a-zA-Z_]\w*)+$/,
     examples: ['com.bbb.name']
-    }
+},
+{
+    title: 'mac地址',
+    rule: /^(([a-f0-9][0,2,4,6,8,a,c,e]:([a-f0-9]{2}:){4})|([a-f0-9][0,2,4,6,8,a,c,e]-([a-f0-9]{2}-){4}))[a-f0-9]{2}$/i,
+    examples: ['38:f9:d3:4b:f5:51', '00-0C-29-CA-E4-66']
+},
+{
+    title: '匹配连续重复的字符',
+    rule: /(.)\1+/,
+    examples: ['我我我', '112233', '11234']
+},
+{
+    title: '数字和英文字母组成，并且同时含有数字和英文字母',
+    rule: /^(?=.*[a-zA-Z])(?=.*\d).+$/,
+    examples: ['我a我1我', 'a对1']
+},
+{
+    title: '香港身份证 ',
+    rule: /^[a-zA-Z]\d{6}\([\dA]\)$/,
+    examples: ['K034169(1)']
+},
+{
+    // 参考: 
+    // https://baike.baidu.com/item/%E6%BE%B3%E9%97%A8%E5%B1%85%E6%B0%91%E8%BA%AB%E4%BB%BD%E8%AF%81/12509098?fr=aladdin#5
+    title: '澳门身份证 ',
+    rule: /^[1|5|7]\d{6}\(\d\)$/,
+    examples: ['5686611(1)']
+},
+{
+    title: '台湾身份证 ',
+    rule: /^[a-zA-Z][0-9]{9}$/,
+    examples: ['U193683453']
+},
+{
+    title: '大写字母，小写字母，数字，特殊符号 `@#$%^&*`~()-+=` 中任意3项密码',
+    rule: /^(?![a-zA-Z]+$)(?![A-Z0-9]+$)(?![A-Z\W_!@#$%^&*`~()-+=]+$)(?![a-z0-9]+$)(?![a-z\W_!@#$%^&*`~()-+=]+$)(?![0-9\W_!@#$%^&*`~()-+=]+$)[a-zA-Z0-9\W_!@#$%^&*`~()-+=]/,
+    examples: ['a1@', 'A1@', 'Aa@']
+},
+{
+    title: 'ASCII码表中的全部的特殊字符',
+    rule: /[\x21-\x2F\x3A-\x40\x5B-\x60\x7B-\x7E]+/,
+    examples: ["[", ".", "^", "&3%"]
+},
+{
+    title: '正整数，不包含0',
+    rule: /^\+?[1-9]\d*$/,
+    examples: [1231]
+},
+{
+    title: '负整数，不包含0',
+    rule: /^-[1-9]\d*$/,
+    examples: [-1231]
+},
+{
+    title: '整数',
+    rule: /^(?:0|(?:-?[1-9]\d*))$/,
+    examples: [-1231, 123, 0],
+    counterExamples: ['01']
+},
+{
+    title: '浮点数',
+    rule: /^(-?[1-9]\d*\.\d+|-?0\.\d*[1-9]\d*|0\.0+)$/,
+    examples: ["1.23", "-1.01", "0.00"]
+    // allow "1.23", allow "-0.1", allow "0.00", ban "-0.00", ban "2.", allow "2.0"
+},
+{
+    title: '浮点数(严格)',
+    rule: /^(-?[1-9]\d*\.\d+|-?0\.\d*[1-9])$/,
+    examples: ["1.23", "-1.01"]
+    // allow "1.23", allow "-0.1", ban "2.", ban "2.0"
+},
+{
+    title: 'email(支持中文邮箱)',
+    rule: /^[A-Za-z0-9\u4e00-\u9fa5]+@[a-zA-Z0-9_-]+(\.[a-zA-Z0-9_-]+)+$/,
+    examples: ['90203918@qq.com', 'nbilly@126.com', '啦啦啦@126.com']
+},
+
+{
+    title: '域名(非网址, 不包含协议)',
+    rule: /^([0-9a-zA-Z-]{1,}\.)+([a-zA-Z]{2,})$/,
+    examples: ['www.baidu.com',
+        'baidu.com',
+        'baidu.com.cn',
+        'api.baidu.com',
+        'nodejs.org',
+        'nodejs.cn'],
+    counterExamples: ['http://baidu.com', 'https://baidu.com', 'www.百度.com']
+},
+
+{
+    title: '军官/士兵证',
+    rule: /^[\u4E00-\u9FA5](字第)([0-9a-zA-Z]{4,8})(号?)$/,
+    examples: ['军字第2001988号', '士字第P011816X号'],
+},
+{
+    title: '户口薄',
+    rule: /(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/,
+    examples: ['441421999707223115'],
+},
+
 ];

packages/www/src/main.js

@@ -3,6 +3,12 @@ import App from './App.vue'
 
 Vue.config.productionTip = false
 
+if ('serviceWorker' in navigator) {
+    window.addEventListener('load', function() {
+        navigator.serviceWorker.register('./sw.js');
+    });
+}
+
 new Vue({
     render: h => h(App),
 }).$mount('#app')

packages/www/vue.config.js

@@ -1,5 +1,5 @@
 module.exports = {
-  publicPath: process.env.NODE_ENV === 'production'
+  // publicPath: process.env.NODE_ENV === 'production'
-  ? '/any-rule/'
+  // ? '/any-rule/'
-  : '/'
+  // : '/'
 }

rules.json

@@ -1 +0,0 @@
-[]

scripts/genCommond.js

@@ -9,6 +9,11 @@ pkg.contributes.commands = RULES.map((rule, index) => ({
     title: `$(rocket) zz: ${rule.title}`
 }));
 
+pkg.contributes.commands.push({
+    command: 'extension.rule.callByMenu',
+    title: `🦕正则大全(${RULES.length}条)`
+});
+
 // console.log(JSON.stringify(pkg));
 fs.writeFileSync('./package.json', JSON.stringify(pkg, null, 4), 'utf8');
 console.log(chalk.green('🚀 pkg文件修改完毕, 请等待生成vsc包...'));

scripts/md.js

@@ -24,40 +24,63 @@ const badges = [
 
 let content = `# 正则大全  ${badges.join(' ')}
 
-支持**web** / **vscode插件**2种查询方式.
+🦕支持**web** / **vscode** / **idea** / **Alfred Workflow**多平台
 
 ## :rocket:web版本
-https://any86.github.io/any-rule/
+https://any-rule.vercel.app/
 
 ## 🍭vscode插件
+
 ### 安装
 vscode应用商店中搜索"**any-rule**".
 
 ### 使用
 **方式1:**
-1. 安装完毕后按**F1**(或者ctrl+shift+p).
-2. 输入"**zz**"弹出正则列表.
-3. **输入关键词搜索**, 比如"手机".
 
-![预览gif](https://user-gold-cdn.xitu.io/2020/1/10/16f8e01a684a0a18?w=420&h=243&f=gif&s=414162)
+1. 按**F1**(mac下fn+F1)打开正则列表.
+2. **输入关键词搜索**, 比如"手机".
+
+![GIF](https://user-images.githubusercontent.com/8264787/146724787-888a8666-5d2a-4e5e-b383-aec7c53bd312.gif)
 
 **方式2:**
 
-1. 在代码的任意位置输入"**zz.**"弹出正则列表.
+右键选择"🦕正则大全".
-2. **输入关键词搜索**, 比如"手机".
 
-![预览gif](https://user-gold-cdn.xitu.io/2020/2/23/1706df78b18466fd?w=954&h=372&f=gif&s=1732199)
+![GIF](https://user-images.githubusercontent.com/8264787/146725447-4d92caed-2dd0-4f11-91d1-8da9cd8ff08b.gif)
 
-## 🦕图解正则
+**方式3:**
-在vscode中选择正则后, 可点击"🦕图解正则".
 
-![](https://user-gold-cdn.xitu.io/2020/2/23/1706e32c3a6fb116?w=533&h=95&f=png&s=21563)
+在代码任意位置输入"**@zz**".
+
+![GIF](https://user-images.githubusercontent.com/8264787/146725402-30b34119-b709-4d49-adb2-af8dbb786d3b.gif)
+
+## 👩‍🏫图解正则
+<details>
+<summary>查看详情</summary>
+每次在any-rule中选择正则后会弹出提示, 可点击"🤖图解正则".
+
+![image](https://user-images.githubusercontent.com/8264787/146726200-d97e48c3-df76-4531-8210-b6935fffb997.png)
 
 点击后可以看到正则解析, 方便大家学习.
 
-![](https://user-gold-cdn.xitu.io/2020/2/23/1706e349b600c28b?w=1151&h=500&f=png&s=45210)
+![image](https://user-images.githubusercontent.com/8264787/146726350-58166bf9-7f7f-4685-86aa-f055d0c0b914.png)
 
 **注意**: 图解直接使用了https://regexper.com, 在此对作者表示敬意和感谢.
+</details>
+
+## 社区版本
+
+社区版本非本人维护, 只是其他开发者使用了any-rule整理的正则内容, 如使用出现问题可直接与其开发者联系.
+
+[idea版](https://github.com/zhoriya/idea-rule)
+
+[Alfred Workflow版](https://github.com/cccyb/workflows)
+
+[hyjs: 函数封装版](https://github.com/heiyehk/hyjs/tree/main/packages/utils)
+
+[命令行版本](https://github.com/shenguanjiejie/workwork)
+
+[uTools版本](https://github.com/trentlee0/utools-any-rule)
 
 ## :fire:关于PR
 欢迎大家PR, 步骤如下:
@@ -68,25 +91,6 @@ vscode应用商店中搜索"**any-rule**".
 
 在此感谢大家对**any-rule**做出的贡献! 
 
-## 👽主要开发者
-按照加入时间排序
-<table>
-    <tr>
-        <td>
-            <a href="https://github.com/MrTenger"><img width="60" src="https://avatars3.githubusercontent.com/u/10781715?s=60&v=4"></a>
-        </td>
-        <td>
-            <a href="https://github.com/giraffeComing"><img width="60" src="https://avatars2.githubusercontent.com/u/14800669?s=460&v=4"></a>
-        </td>
-        <td>
-            <a href="https://github.com/microud"><img width="60" src="https://avatars1.githubusercontent.com/u/10163257?s=60&v=4"></a>
-        </td>
-        <td>
-            <a href="https://github.com/52cik"><img width="60" src="https://avatars0.githubusercontent.com/u/5033310?s=60&v=4"></a>
-        </td>
-    </tr>
-</table>
-
 ## 🍔正则
 `;
 

src/extension.ts

@@ -6,10 +6,12 @@ import {
 const RULES: { title: string, rule: RegExp, examples: string[] }[] = require('../packages/www/src/RULES.js');
 import useCommand from './useCommand';
 import useQuickPick from './useQuickPick';
+import useMenuCommand from './useMenuCommand';
 
 export function activate(context: ExtensionContext) {
 	useCommand(context, RULES);
 	useQuickPick(context, RULES);
+	useMenuCommand(context, RULES);
 }
 
 export function deactivate() { }

src/showResultMessage.ts

@@ -2,8 +2,8 @@ import { extensions, window, version, env, Uri, languages } from 'vscode';
 import { getCodeLanguage, getExtensionVersion } from './shared'
 import insertLog from './insertLog';
 
-const BUTTON_FEEDBACK = '🚀反馈问题';
+const BUTTON_FEEDBACK = '✋意见反馈';
-const BUTTON_DIAGRAMMATIZE = '🦕图解正则';
+const BUTTON_DIAGRAMMATIZE = '👩‍🏫图解正则';
 const BUTTON_CANCEL = '关闭';
 
 export default function (title: string, rule: string): void {

src/useMenuCommand.ts

@@ -0,0 +1,55 @@
+import { window, commands, Range, ExtensionContext } from "vscode";
+import { Rule } from './interface';
+import insertLog from './insertLog';
+import showResultMessage from './showResultMessage';
+
+export default function (context: ExtensionContext, RULES: Rule[]) {
+
+    const disposable = commands.registerCommand(`extension.rule.callByMenu`, () => {
+        // showQuickPick
+        window.showQuickPick(RULES.map(({ examples, title, rule }) => {
+            // const match = title.match(/\((.+)\)/);
+            return {
+                label: title,
+                // description: null !== match ? match[1] : '',
+                rule: String(rule), // 非标准字段, 仅仅为了传值
+                detail: `例如: ${examples.join(' 或 ')}`
+            };
+        }), {
+            placeHolder: '请输入关键词',
+            // onDidSelectItem(item){
+            // console.log(item)
+            // }
+        }).then(item => {
+            if (!item) return
+
+            const editor = window.activeTextEditor;
+            if (editor) {
+                const ruleString = String(item.rule);
+                const title = item.label;
+                const { selections } = editor;
+
+                editor.edit(editBuilder => {
+                    selections.forEach(selection => {
+                        const { start, end } = selection;
+                        const range = new Range(start, end);
+                        editBuilder.replace(range, ruleString);
+                    });
+                });
+
+                // 日志
+                insertLog({
+                    rule: ruleString,
+                    title,
+                    method: 'Menu'
+                });
+
+                showResultMessage(title, ruleString);
+            }
+
+        });
+
+
+    });
+    context.subscriptions.push(disposable);
+}

src/useQuickPick.ts

@@ -7,7 +7,13 @@ import showResultMessage from './showResultMessage';
 export default function (context: ExtensionContext, RULES: Rule[]) {
     // commands.registerCommand('functions.insertRegex', insertRule);
     // 不确定是不是都兼容"*", 保守    
-    const { supportedLanguages, triggerStringEnd } = getConfig();
+    let { supportedLanguages, triggerStringEnd } = getConfig();
+    workspace.onDidChangeConfiguration(() => {
+        const config = getConfig();
+        supportedLanguages = config.supportedLanguages;
+        triggerStringEnd = config.triggerStringEnd;
+    });
+
     const disposable = languages.registerCompletionItemProvider(supportedLanguages.split(','), {
         provideCompletionItems(document, position) {
             const { triggerString } = getConfig();
@@ -81,12 +87,16 @@ function insertRule(document: TextDocument, position: Position, ruleString: stri
 // 获取配置
 function getConfig() {
     const configuration = workspace.getConfiguration();
-    const { triggerString, supportedLanguages = '*' } = configuration.AnyRule;
+    const { triggerString, supportedLanguages } = configuration['any-rule'];
     const { length } = triggerString;
     const triggerStringStart = triggerString.substr(0, length - 1);
     const triggerStringEnd = triggerString.substr(-1);
-
+    console.log(supportedLanguages);
     return {
-        triggerStringStart, triggerStringEnd, triggerString, supportedLanguages
+        triggerStringStart,
+        triggerStringEnd,
+        triggerString,
+        // 预留
+        supportedLanguages
     }
 }

webpack.config.js

@@ -0,0 +1,42 @@
+// @ts-check
+
+'use strict';
+
+const path = require('path');
+
+/**@type {import('webpack').Configuration}*/
+const config = {
+    target: 'node', // vscode extensions run in a Node.js-context 📖 -> https://webpack.js.org/configuration/node/
+
+    entry: './src/extension.ts', // the entry point of this extension, 📖 -> https://webpack.js.org/configuration/entry-context/
+    output: {
+        // the bundle is stored in the 'dist' folder (check package.json), 📖 -> https://webpack.js.org/configuration/output/
+        path: path.resolve(__dirname, 'out'),
+        filename: 'extension.js',
+        libraryTarget: 'commonjs2',
+        devtoolModuleFilenameTemplate: '../[resource-path]'
+    },
+    devtool: 'source-map',
+    externals: {
+        vscode: 'commonjs vscode' // the vscode-module is created on-the-fly and must be excluded. Add other modules that cannot be webpack'ed, 📖 -> https://webpack.js.org/configuration/externals/
+    },
+    resolve: {
+        // support reading TypeScript and JavaScript files, 📖 -> https://github.com/TypeStrong/ts-loader
+        extensions: ['.ts', '.js']
+    },
+    module: {
+        rules: [
+            {
+                test: /\.ts$/,
+                exclude: /node_modules/,
+                use: [
+                    {
+                        loader: 'ts-loader'
+                    }
+                ]
+            }
+        ]
+    }
+};
+
+module.exports = config;