From d5b9916b2f534af639357b1e541cebedcc443577 Mon Sep 17 00:00:00 2001 From: harttle Date: Tue, 26 Feb 2019 23:51:15 +0800 Subject: [PATCH] refactor: Drop.prototype.value => valueOf --- src/drop/blank-drop.ts | 2 +- src/drop/empty-drop.ts | 2 +- src/drop/idrop.ts | 4 ++-- src/drop/null-drop.ts | 4 ++-- src/render/syntax.ts | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/drop/blank-drop.ts b/src/drop/blank-drop.ts index b9dd815fe..01b0f5d96 100644 --- a/src/drop/blank-drop.ts +++ b/src/drop/blank-drop.ts @@ -5,7 +5,7 @@ import { EmptyDrop } from '../drop/empty-drop' export class BlankDrop extends EmptyDrop { equals (value: any) { if (value === false) return true - if (isNil(isDrop(value) ? value.value() : value)) return true + if (isNil(isDrop(value) ? value.valueOf() : value)) return true if (isString(value)) return /^\s*$/.test(value) return super.equals(value) } diff --git a/src/drop/empty-drop.ts b/src/drop/empty-drop.ts index bd752c209..fb6bb1331 100644 --- a/src/drop/empty-drop.ts +++ b/src/drop/empty-drop.ts @@ -21,7 +21,7 @@ export class EmptyDrop extends Drop implements IDrop, IComparable { leq () { return false } - value () { + valueOf () { return '' } } diff --git a/src/drop/idrop.ts b/src/drop/idrop.ts index 0089e9e25..0110260c7 100644 --- a/src/drop/idrop.ts +++ b/src/drop/idrop.ts @@ -2,9 +2,9 @@ import { Drop } from './drop' import { isFunction } from '../util/underscore' export interface IDrop { - value(): any + valueOf(): any } export function isDrop (value: any): value is IDrop { - return value instanceof Drop && isFunction((value as any).value) + return value instanceof Drop && isFunction((value as any).valueOf) } diff --git a/src/drop/null-drop.ts b/src/drop/null-drop.ts index f6734c971..29a45960a 100644 --- a/src/drop/null-drop.ts +++ b/src/drop/null-drop.ts @@ -6,7 +6,7 @@ import { BlankDrop } from '../drop/blank-drop' export class NullDrop extends Drop implements IDrop, IComparable { equals (value: any) { - return isNil(isDrop(value) ? value.value() : value) || value instanceof BlankDrop + return isNil(isDrop(value) ? value.valueOf() : value) || value instanceof BlankDrop } gt () { return false @@ -20,7 +20,7 @@ export class NullDrop extends Drop implements IDrop, IComparable { leq () { return false } - value () { + valueOf () { return null } } diff --git a/src/render/syntax.ts b/src/render/syntax.ts index fe03533ab..efadc1890 100644 --- a/src/render/syntax.ts +++ b/src/render/syntax.ts @@ -74,7 +74,7 @@ export function parseExp (exp: string, scope: Scope): any { export function evalExp (str: string, scope: Scope): any { const value = parseExp(str, scope) - return isDrop(value) ? value.value() : value + return isDrop(value) ? value.valueOf() : value } function parseValue (str: string, scope: Scope): any { @@ -93,7 +93,7 @@ function parseValue (str: string, scope: Scope): any { export function evalValue (str: string, scope: Scope): any { const value = parseValue(str, scope) - return isDrop(value) ? value.value() : value + return isDrop(value) ? value.valueOf() : value } export function isTruthy (val: any): boolean {