Taichi Masuyama 4 лет назад
Родитель
Сommit
9449d55a54
2 измененных файлов с 5 добавлено и 15 удалено
  1. 5 3
      packages/app/src/server/service/search.ts
  2. 0 12
      packages/app/src/utils/named-query.ts

+ 5 - 3
packages/app/src/server/service/search.ts

@@ -15,7 +15,6 @@ import PrivateLegacyPagesDelegator from './search-delegator/private-legacy-pages
 
 import { PageModel } from '../models/page';
 import { serializeUserSecurely } from '../models/serializers/user-serializer';
-import { nqStringRegExp, parseNQString } from '~/utils/named-query';
 
 import { ObjectIdLike } from '../interfaces/mongoose-utils';
 
@@ -224,13 +223,16 @@ class SearchService implements SearchQueryParser, SearchResolver {
     // eslint-disable-next-line no-param-reassign
     queryString = normalizeQueryString(queryString);
 
+    const regexp = new RegExp(/^\[nq:.+\]$/g); // https://regex101.com/r/FzDUvT/1
+    const replaceRegexp = new RegExp(/\[nq:|\]/g);
+
     // when Normal Query
-    if (!nqStringRegExp.test(queryString)) {
+    if (!regexp.test(queryString)) {
       return { queryString, terms: this.parseQueryString(queryString) };
     }
 
     // when Named Query
-    const name = parseNQString(queryString);
+    const name = queryString.replace(replaceRegexp, '');
     const nq = await NamedQuery.findOne({ name });
 
     // will delegate to full-text search

+ 0 - 12
packages/app/src/utils/named-query.ts

@@ -1,12 +0,0 @@
-export const nqStringRegExp = new RegExp(/^\[nq:.+\]$/g); // https://regex101.com/r/FzDUvT/1
-export const nqReplaceRegExp = new RegExp(/\[nq:|\]/g);
-
-export const isNQ = (queryString: string): boolean => {
-  return nqStringRegExp.test(queryString);
-};
-
-export const parseNQString = (queryString: string): string => {
-  if (!isNQ(queryString)) throw Error('This queryString does not have the named query format.');
-
-  return queryString.replace(nqReplaceRegExp, '');
-};