From 3b7351d9a04ecda004ed4c717d8a715ec0e7a52d Mon Sep 17 00:00:00 2001 From: harttle Date: Sun, 24 Feb 2019 05:03:59 +0800 Subject: [PATCH] chore: fix linting --- src/template/filter/filter.ts | 4 ---- src/template/value.ts | 25 ++++++++----------------- test/unit/template/filter/filter.ts | 2 +- 3 files changed, 9 insertions(+), 22 deletions(-) diff --git a/src/template/filter/filter.ts b/src/template/filter/filter.ts index 255dc1ad1..ed2216294 100644 --- a/src/template/filter/filter.ts +++ b/src/template/filter/filter.ts @@ -1,11 +1,7 @@ -import assert from 'src/util/assert' -import * as lexical from 'src/parser/lexical' import { evalValue } from 'src/render/syntax' import Scope from 'src/scope/scope' import { FilterImpl } from './filter-impl' -const valueRE = new RegExp(`${lexical.value.source}`, 'g') - export default class Filter { name: string impl: FilterImpl diff --git a/src/template/value.ts b/src/template/value.ts index 596cb8de9..69becf904 100644 --- a/src/template/value.ts +++ b/src/template/value.ts @@ -1,9 +1,7 @@ import { evalExp } from 'src/render/syntax' -import * as lexical from 'src/parser/lexical' import Filter from './filter/filter' import Scope from 'src/scope/scope' - enum ParseState { INIT = 0, FILTER_NAME = 1, @@ -18,7 +16,6 @@ export default class { * @param str value string, like: "i have a dream | truncate: 3 */ constructor (str: string, strictFilters: boolean) { - const N = str.length let buffer = '' let quoted = '' let state = ParseState.INIT @@ -27,23 +24,20 @@ export default class { let filterName = '' let filterArgs: string[] = [] - for(let i = 0; i < str.length; i++) { + for (let i = 0; i < str.length; i++) { if (quoted) { - if (str[i] == quoted) { + if (str[i] === quoted) { quoted = '' sealed = true } buffer += str[i] - } - else if (/\s/.test(str[i])) { + } else if (/\s/.test(str[i])) { if (!buffer) continue else sealed = true - } - else if (str[i] === '|') { + } else if (str[i] === '|') { if (state === ParseState.INIT) { this.initial = buffer - } - else { + } else { if (state === ParseState.FILTER_NAME) filterName = buffer else filterArgs.push(buffer) this.filters.push(new Filter(filterName, filterArgs, strictFilters)) @@ -53,19 +47,16 @@ export default class { state = ParseState.FILTER_NAME buffer = '' sealed = false - } - else if (state === ParseState.FILTER_NAME && str[i] === ':') { + } else if (state === ParseState.FILTER_NAME && str[i] === ':') { filterName = buffer state = ParseState.FILTER_ARG buffer = '' sealed = false - } - else if (state === ParseState.FILTER_ARG && str[i] === ',') { + } else if (state === ParseState.FILTER_ARG && str[i] === ',') { filterArgs.push(buffer) buffer = '' sealed = false - } - else if (sealed) continue + } else if (sealed) continue else { if ((str[i] === '"' || str[i] === "'") && !quoted) quoted = str[i] buffer += str[i] diff --git a/test/unit/template/filter/filter.ts b/test/unit/template/filter/filter.ts index 176db5d22..1c3ef28f1 100644 --- a/test/unit/template/filter/filter.ts +++ b/test/unit/template/filter/filter.ts @@ -35,7 +35,7 @@ describe('filter', function () { it('should render filters with argument', function () { Filter.register('add', (a, b) => a + b) - expect(new Filter('add', ["2"], false).render(3, scope)).to.equal(5) + expect(new Filter('add', ['2'], false).render(3, scope)).to.equal(5) }) it('should render filters with multiple arguments', function () {