diff --git a/package-lock.json b/package-lock.json index 45f6e7583..37d0fff60 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "trilium", - "version": "0.55.1", + "version": "0.56.0-beta", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "trilium", - "version": "0.55.1", + "version": "0.56.0-beta", "hasInstallScript": true, "license": "AGPL-3.0-only", "dependencies": { diff --git a/package.json b/package.json index 0f5ac424c..3d12945ef 100644 --- a/package.json +++ b/package.json @@ -21,9 +21,9 @@ "build-frontend-docs": "rm -r ./docs/frontend_api && ./node_modules/.bin/jsdoc -c jsdoc-conf.json -d ./docs/frontend_api src/public/app/entities/*.js src/public/app/services/frontend_script_api.js src/public/app/widgets/collapsible_widget.js", "build-docs": "npm run build-backend-docs && npm run build-frontend-docs", "webpack": "npx webpack -c webpack-desktop.config.js && npx webpack -c webpack-mobile.config.js && npx webpack -c webpack-setup.config.js", - "test": "jasmine", + "test-jasmine": "jasmine", "test-es6": "node -r esm spec-es6/attribute_parser.spec.js ", - "test-all": "npm run test && npm run test-es6", + "test": "npm run test-jasmine && npm run test-es6", "postinstall": "rimraf ./node_modules/canvas" }, "dependencies": { diff --git a/src/services/search/services/parse.js b/src/services/search/services/parse.js index ee23f3807..ad88449e2 100644 --- a/src/services/search/services/parse.js +++ b/src/services/search/services/parse.js @@ -39,12 +39,25 @@ function getFulltext(tokens, searchContext) { } } +const OPERATORS = [ + "=", + "!=", + "*=*", + "*=", + "=*", + ">", + ">=", + "<", + "<=", + "%=" +]; + function isOperator(token) { if (Array.isArray(token)) { return false; } - return token.token.match(/^[!=<>*%]+$/); + return OPERATORS.includes(token.token); } function getExpression(tokens, searchContext, level = 0) {