From 9e0ddf7118931009951dc1f21943d3340256885d Mon Sep 17 00:00:00 2001
From: Roy Li <me@dada.li>
Date: Thu, 9 Jul 2020 13:01:30 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20filter=20=E8=A1=8C=E4=B8=BA=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

BREAKING CHANGE: useProviders, discardProviders 默认为严格模式
---
 lib/misc/deprecation.ts |  2 --
 lib/utils/filter.ts     | 17 ++---------------
 2 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/lib/misc/deprecation.ts b/lib/misc/deprecation.ts
index 2bee87c14..943fe8148 100644
--- a/lib/misc/deprecation.ts
+++ b/lib/misc/deprecation.ts
@@ -1,4 +1,2 @@
-export const DEP003 = 'useProvider 将在之后版本改为默认使用严格模式';
-export const DEP004 = 'discardProviders 将在之后版本改为默认使用严格模式';
 export const DEP005 = 'surgioConfig.surgeConfig.shadowsocksFormat: "custom" 已不推荐使用，请改为 "ss"';
 export const DEP006 = 'surgioConfig.surgeConfig.v2ray: "external" 已不推荐使用，请改为 "native"';
diff --git a/lib/utils/filter.ts b/lib/utils/filter.ts
index f5c04f6c6..960b401d4 100644
--- a/lib/utils/filter.ts
+++ b/lib/utils/filter.ts
@@ -1,13 +1,8 @@
 import _ from 'lodash';
-import { deprecate } from 'util';
 
-import { DEP003, DEP004 } from '../misc/deprecation';
 import flag, { TAIWAN } from '../misc/flag_cn';
 import { NodeNameFilterType, NodeTypeEnum, SimpleNodeConfig, SortedNodeNameFilterType } from '../types';
 
-const showDEP003 = deprecate(_.noop, DEP003, 'DEP003');
-const showDEP004 = deprecate(_.noop, DEP004, 'DEP004');
-
 // tslint:disable-next-line:max-classes-per-file
 export class SortFilterWithSortedFilters implements SortedNodeNameFilterType {
   public supportSort = true;
@@ -100,29 +95,21 @@ export const useRegexp = (regexp: RegExp): NodeNameFilterType => {
   return item => regexp.test(item.nodeName);
 };
 
-export const useProviders = (keywords: ReadonlyArray<string>, isStrict?: boolean): NodeNameFilterType => {
+export const useProviders = (keywords: ReadonlyArray<string>, isStrict = true): NodeNameFilterType => {
   // istanbul ignore next
   if (!Array.isArray(keywords)) {
     throw new Error('keywords 请使用数组');
   }
 
-  if (!isStrict) {
-    showDEP003();
-  }
-
   return item => keywords.some(keyword => isStrict ? item?.provider?.name === keyword : item?.provider?.name.includes(keyword));
 };
 
-export const discardProviders = (keywords: ReadonlyArray<string>, isStrict?: boolean): NodeNameFilterType => {
+export const discardProviders = (keywords: ReadonlyArray<string>, isStrict = true): NodeNameFilterType => {
   // istanbul ignore next
   if (!Array.isArray(keywords)) {
     throw new Error('keywords 请使用数组');
   }
 
-  if (!isStrict) {
-    showDEP004();
-  }
-
   return item => !keywords.some(keyword => isStrict ? item?.provider?.name === keyword : item?.provider?.name.includes(keyword));
 };