From 043137e96497eda944701037b553a25c42d433d7 Mon Sep 17 00:00:00 2001 From: Keeko <787018661@qq.com> Date: Fri, 11 Mar 2022 16:30:39 +0800 Subject: [PATCH 1/4] =?UTF-8?q?[fix]=20=E4=BF=AE=E5=A4=8D=E6=95=B4?= =?UTF-8?q?=E6=95=B0=E9=80=BB=E8=BE=91,=20ban=20"022",=20allow=20"22"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 19 +++++++------------ packages/www/src/RULES.js | 2 +- 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index e5974b1..4e21777 100644 --- a/README.md +++ b/README.md @@ -2,11 +2,6 @@ 🦕支持**web** / **vscode** / **idea** / **Alfred Workflow**多平台 -## 🔥 我新开发的vscode插件 -**any-type, 一键JSON转Typescript类型** - -https://github.com/any86/any-type - ## :rocket:web版本 https://any86.github.io/any-rule/ @@ -49,7 +44,7 @@ vscode应用商店中搜索"**any-rule**". **注意**: 图解直接使用了https://regexper.com, 在此对作者表示敬意和感谢. -## 🥠社区版本 +## 社区版本 [idea版](https://github.com/zhoriya/idea-rule) [Alfred Workflow版](https://github.com/cccyb/workflows) @@ -119,17 +114,17 @@ vscode应用商店中搜索"**any-rule**". ### linux"隐藏文件"路径 ```javascript -/^\/(?:[^/]+\/)*\.[^/]*/ +/^\/(?:[^\/]+\/)*\.[^\/]*/ ``` ### linux文件夹路径 ```javascript -/^\/(?:[^/]+\/)*$/ +/^\/(?:[^\/]+\/)*$/ ``` ### linux文件路径 ```javascript -/^\/(?:[^/]+\/)*[^/]+$/ +/^\/(?:[^\/]+\/)*[^\/]+$/ ``` ### window"文件夹"路径 @@ -194,7 +189,7 @@ vscode应用商店中搜索"**any-rule**". ### base64格式 ```javascript -/^\s*data:(?:[a-z]+\/[a-z0-9-+.]+(?:;[a-z-]+=[a-z0-9-]+)?)?(?:;base64)?,([a-z0-9!$&',()*+;=\-._~:@/?%\s]*?)\s*$/i +/^\s*data:(?:[a-z]+\/[a-z0-9-+.]+(?:;[a-z-]+=[a-z0-9-]+)?)?(?:;base64)?,([a-z0-9!$&',()*+;=\-._~:@\/?%\s]*?)\s*$/i ``` ### 数字/货币金额（支持负数、千分位分隔符） @@ -259,7 +254,7 @@ vscode应用商店中搜索"**any-rule**". ### 可以被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$/ +/^\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(邮箱) @@ -439,7 +434,7 @@ vscode应用商店中搜索"**any-rule**". ### 整数 ```javascript -/^-?[0-9]\d*$/ +/^-?[1-9]\d*$/ ``` ### 浮点数 diff --git a/packages/www/src/RULES.js b/packages/www/src/RULES.js index 4228fef..9022fdb 100644 --- a/packages/www/src/RULES.js +++ b/packages/www/src/RULES.js @@ -387,7 +387,7 @@ module.exports = [{ }, { title: '整数', - rule: /^-?[0-9]\d*$/, + rule: /^-?[1-9]\d*$/, examples: [-1231, 123] }, { From 03471b003627c28a75d46c0caab76e323e757c3e Mon Sep 17 00:00:00 2001 From: Keeko <787018661@qq.com> Date: Fri, 11 Mar 2022 16:51:55 +0800 Subject: [PATCH 2/4] =?UTF-8?q?[feat]=20=E6=9B=B4=E6=96=B0=E6=B5=AE?= =?UTF-8?q?=E7=82=B9=E6=95=B0=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- packages/www/src/RULES.js | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 4e21777..ace4604 100644 --- a/README.md +++ b/README.md @@ -439,7 +439,7 @@ vscode应用商店中搜索"**any-rule**". ### 浮点数 ```javascript -/^(-?\d+)(\.\d+)?$/ +/^(-?[1-9]\d*\.\d+|-?0\.\d*[1-9]\d*|0\.0+)$/ ``` ### email(支持中文邮箱) diff --git a/packages/www/src/RULES.js b/packages/www/src/RULES.js index 9022fdb..94eb1d1 100644 --- a/packages/www/src/RULES.js +++ b/packages/www/src/RULES.js @@ -392,8 +392,9 @@ module.exports = [{ }, { title: '浮点数', - rule: /^(-?\d+)(\.\d+)?$/, - examples: [1.5] + 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", allow "2.0", ban "2." }, { title: 'email(支持中文邮箱)', From 5782ee1ddc5deb01327ab11ab92910dd0534f74c Mon Sep 17 00:00:00 2001 From: Keeko <787018661@qq.com> Date: Fri, 11 Mar 2022 17:03:36 +0800 Subject: [PATCH 3/4] =?UTF-8?q?[feat]=20=E6=96=B0=E5=A2=9E=20=E6=B5=AE?= =?UTF-8?q?=E7=82=B9=E6=95=B0(=E4=B8=A5=E6=A0=BC)=20=E6=AD=A3=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 7 ++++++- packages/www/src/RULES.js | 8 +++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index ace4604..25173ed 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# 正则大全 ![已收录77条](https://img.shields.io/badge/已收录-77条-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) +# 正则大全 ![已收录78条](https://img.shields.io/badge/已收录-78条-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** / **idea** / **Alfred Workflow**多平台 @@ -442,6 +442,11 @@ vscode应用商店中搜索"**any-rule**". /^(-?[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_-]+)+$/ diff --git a/packages/www/src/RULES.js b/packages/www/src/RULES.js index 94eb1d1..6e41c70 100644 --- a/packages/www/src/RULES.js +++ b/packages/www/src/RULES.js @@ -394,7 +394,13 @@ module.exports = [{ 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", allow "2.0", ban "2." + // 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(支持中文邮箱)', From 39143127bcc78622f97b7b8c5f34dc9292193191 Mon Sep 17 00:00:00 2001 From: Keeko <787018661@qq.com> Date: Fri, 11 Mar 2022 17:10:02 +0800 Subject: [PATCH 4/4] =?UTF-8?q?[feat]=20=E6=96=B0=E5=A2=9E=20ASCII?= =?UTF-8?q?=E7=A0=81=E8=A1=A8=E4=B8=AD=E7=9A=84=E5=85=A8=E9=83=A8=E7=9A=84?= =?UTF-8?q?=E7=89=B9=E6=AE=8A=E5=AD=97=E7=AC=A6=20=E6=AD=A3=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 7 ++++++- packages/www/src/RULES.js | 9 +++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 25173ed..74f9d17 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# 正则大全 ![已收录78条](https://img.shields.io/badge/已收录-78条-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) +# 正则大全 ![已收录79条](https://img.shields.io/badge/已收录-79条-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** / **idea** / **Alfred Workflow**多平台 @@ -422,6 +422,11 @@ vscode应用商店中搜索"**any-rule**". /^(?![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*$/ diff --git a/packages/www/src/RULES.js b/packages/www/src/RULES.js index 6e41c70..8481082 100644 --- a/packages/www/src/RULES.js +++ b/packages/www/src/RULES.js @@ -371,11 +371,16 @@ module.exports = [{ 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]