vhad/DefinitelyTyped
1
0
Fork 0
mirror of https://github.com/gosticks/DefinitelyTyped.git synced 2026-10-07 00:07:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Removed declare namespace hack

Browse Source 
Fixed tests to use require instead of import from
Removed useless Currencies union
This commit is contained in:
Kanat Kubash
2018-03-04 13:12:27 +06:00
parent a6476a715f
commit 70742da0d0
3 changed files with 150 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files
types/js-money/index.d.ts
Vendored
+148 -169
View File
@@ -5,28 +5,9 @@
import { Currency } from './lib/currency';
type Currencies = 'USD' | 'CAD' | 'EUR' | 'BTC' | 'AED' | 'AFN'
| 'ALL' | 'AMD' | 'ARS' | 'AUD' | 'AZN' | 'BAM' | 'BDT'
| 'BGN' | 'BHD' | 'BIF' | 'BND' | 'BOB' | 'BRL' | 'BWP'
| 'BYR' | 'BZD' | 'CDF' | 'CHF' | 'CLP' | 'CNY' | 'COP'
| 'CRC' | 'CVE' | 'CZK' | 'DJF' | 'DKK' | 'DOP' | 'DZD'
| 'EEK' | 'EGP' | 'ERN' | 'ETB' | 'GBP' | 'GEL' | 'GHS'
| 'GNF' | 'GTQ' | 'HKD' | 'HNL' | 'HRK' | 'HUF' | 'IDR'
| 'ILS' | 'INR' | 'IQD' | 'IRR' | 'ISK' | 'JMD' | 'JOD'
| 'JPY' | 'KES' | 'KHR' | 'KMF' | 'KRW' | 'KWD' | 'KZT'
| 'LAK' | 'LBP' | 'LKR' | 'LTL' | 'LVL' | 'LYD' | 'MAD'
| 'MDL' | 'MGA' | 'MKD' | 'MMK' | 'MOP' | 'MUR' | 'MXN'
| 'MYR' | 'MZN' | 'NAD' | 'NGN' | 'NIO' | 'NOK' | 'NPR'
| 'NZD' | 'OMR' | 'PAB' | 'PEN' | 'PHP' | 'PKR' | 'PLN'
| 'PYG' | 'QAR' | 'RON' | 'RSD' | 'RUB' | 'RWF' | 'SAR'
| 'SDG' | 'SEK' | 'SGD' | 'SOS' | 'SYP' | 'THB' | 'TND'
| 'TOP' | 'TRY' | 'TTD' | 'TWD' | 'TZS' | 'UAH' | 'UGX'
| 'UYU' | 'UZS' | 'VEF' | 'VND' | 'XAF' | 'XOF' | 'YER'
| 'ZAR' | 'ZMK' | string;
interface MoneyObjectOut {
amount: number;
currency: string;
amount: number;
currency: string;
}
type Rounders = 'round' | 'floor' | 'ceil';
@@ -34,154 +15,152 @@ type Rounders = 'round' | 'floor' | 'ceil';
type RoundFunction = (num: number) => number;
declare class Money {
constructor(amount: number, currency: Currencies | Currency);
amount: number;
currency: string;
static fromInteger(amount: number, currency: Currencies | Currency): Money;
static fromDecimal(amount: number, currency: Currencies | Currency, rounder?: Rounders | RoundFunction): Money;
equals(other: Money): boolean;
add(other: Money): Money;
subtract(other: Money): Money;
multiply(multiplier: number, rounder?: RoundFunction): Money;
divide(divisor: number, rounder?: RoundFunction): Money;
allocate(ratios: number[]): Money[];
compare(other: Money): number;
greaterThan(other: Money): boolean;
greaterThanOrEqual(other: Money): boolean;
lessThan(other: Money): boolean;
lessThanOrEqual(other: Money): boolean;
isZero(): boolean;
isPositive(): boolean;
isNegative(): boolean;
toDecimal(): number;
toString(): string;
toJSON(): MoneyObjectOut;
getAmount(): number;
getCurrency(): string;
//#region Currencies
static USD: Currency;
static CAD: Currency;
static EUR: Currency;
static BTC: Currency;
static AED: Currency;
static AFN: Currency;
static ALL: Currency;
static AMD: Currency;
static ARS: Currency;
static AUD: Currency;
static AZN: Currency;
static BAM: Currency;
static BDT: Currency;
static BGN: Currency;
static BHD: Currency;
static BIF: Currency;
static BND: Currency;
static BOB: Currency;
static BRL: Currency;
static BWP: Currency;
static BYR: Currency;
static BZD: Currency;
static CDF: Currency;
static CHF: Currency;
static CLP: Currency;
static CNY: Currency;
static COP: Currency;
static CRC: Currency;
static CVE: Currency;
static CZK: Currency;
static DJF: Currency;
static DKK: Currency;
static DOP: Currency;
static DZD: Currency;
static EEK: Currency;
static EGP: Currency;
static ERN: Currency;
static ETB: Currency;
static GBP: Currency;
static GEL: Currency;
static GHS: Currency;
static GNF: Currency;
static GTQ: Currency;
static HKD: Currency;
static HNL: Currency;
static HRK: Currency;
static HUF: Currency;
static IDR: Currency;
static ILS: Currency;
static INR: Currency;
static IQD: Currency;
static IRR: Currency;
static ISK: Currency;
static JMD: Currency;
static JOD: Currency;
static JPY: Currency;
static KES: Currency;
static KHR: Currency;
static KMF: Currency;
static KRW: Currency;
static KWD: Currency;
static KZT: Currency;
static LAK: Currency;
static LBP: Currency;
static LKR: Currency;
static LTL: Currency;
static LVL: Currency;
static LYD: Currency;
static MAD: Currency;
static MDL: Currency;
static MGA: Currency;
static MKD: Currency;
static MMK: Currency;
static MOP: Currency;
static MUR: Currency;
static MXN: Currency;
static MYR: Currency;
static MZN: Currency;
static NAD: Currency;
static NGN: Currency;
static NIO: Currency;
static NOK: Currency;
static NPR: Currency;
static NZD: Currency;
static OMR: Currency;
static PAB: Currency;
static PEN: Currency;
static PHP: Currency;
static PKR: Currency;
static PLN: Currency;
static PYG: Currency;
static QAR: Currency;
static RON: Currency;
static RSD: Currency;
static RUB: Currency;
static RWF: Currency;
static SAR: Currency;
static SDG: Currency;
static SEK: Currency;
static SGD: Currency;
static SOS: Currency;
static SYP: Currency;
static THB: Currency;
static TND: Currency;
static TOP: Currency;
static TRY: Currency;
static TTD: Currency;
static TWD: Currency;
static TZS: Currency;
static UAH: Currency;
static UGX: Currency;
static UYU: Currency;
static UZS: Currency;
static VEF: Currency;
static VND: Currency;
static XAF: Currency;
static XOF: Currency;
static YER: Currency;
static ZAR: Currency;
static ZMK: Currency;
//#endregion
constructor(amount: number, currency: string | Currency);
amount: number;
currency: string;
static fromInteger(amount: number, currency: string | Currency): Money;
static fromDecimal(amount: number, currency: string | Currency, rounder?: Rounders | RoundFunction): Money;
equals(other: Money): boolean;
add(other: Money): Money;
subtract(other: Money): Money;
multiply(multiplier: number, rounder?: RoundFunction): Money;
divide(divisor: number, rounder?: RoundFunction): Money;
allocate(ratios: number[]): Money[];
compare(other: Money): number;
greaterThan(other: Money): boolean;
greaterThanOrEqual(other: Money): boolean;
lessThan(other: Money): boolean;
lessThanOrEqual(other: Money): boolean;
isZero(): boolean;
isPositive(): boolean;
isNegative(): boolean;
toDecimal(): number;
toString(): string;
toJSON(): MoneyObjectOut;
getAmount(): number;
getCurrency(): string;
//#region Currencies
static USD: Currency;
static CAD: Currency;
static EUR: Currency;
static BTC: Currency;
static AED: Currency;
static AFN: Currency;
static ALL: Currency;
static AMD: Currency;
static ARS: Currency;
static AUD: Currency;
static AZN: Currency;
static BAM: Currency;
static BDT: Currency;
static BGN: Currency;
static BHD: Currency;
static BIF: Currency;
static BND: Currency;
static BOB: Currency;
static BRL: Currency;
static BWP: Currency;
static BYR: Currency;
static BZD: Currency;
static CDF: Currency;
static CHF: Currency;
static CLP: Currency;
static CNY: Currency;
static COP: Currency;
static CRC: Currency;
static CVE: Currency;
static CZK: Currency;
static DJF: Currency;
static DKK: Currency;
static DOP: Currency;
static DZD: Currency;
static EEK: Currency;
static EGP: Currency;
static ERN: Currency;
static ETB: Currency;
static GBP: Currency;
static GEL: Currency;
static GHS: Currency;
static GNF: Currency;
static GTQ: Currency;
static HKD: Currency;
static HNL: Currency;
static HRK: Currency;
static HUF: Currency;
static IDR: Currency;
static ILS: Currency;
static INR: Currency;
static IQD: Currency;
static IRR: Currency;
static ISK: Currency;
static JMD: Currency;
static JOD: Currency;
static JPY: Currency;
static KES: Currency;
static KHR: Currency;
static KMF: Currency;
static KRW: Currency;
static KWD: Currency;
static KZT: Currency;
static LAK: Currency;
static LBP: Currency;
static LKR: Currency;
static LTL: Currency;
static LVL: Currency;
static LYD: Currency;
static MAD: Currency;
static MDL: Currency;
static MGA: Currency;
static MKD: Currency;
static MMK: Currency;
static MOP: Currency;
static MUR: Currency;
static MXN: Currency;
static MYR: Currency;
static MZN: Currency;
static NAD: Currency;
static NGN: Currency;
static NIO: Currency;
static NOK: Currency;
static NPR: Currency;
static NZD: Currency;
static OMR: Currency;
static PAB: Currency;
static PEN: Currency;
static PHP: Currency;
static PKR: Currency;
static PLN: Currency;
static PYG: Currency;
static QAR: Currency;
static RON: Currency;
static RSD: Currency;
static RUB: Currency;
static RWF: Currency;
static SAR: Currency;
static SDG: Currency;
static SEK: Currency;
static SGD: Currency;
static SOS: Currency;
static SYP: Currency;
static THB: Currency;
static TND: Currency;
static TOP: Currency;
static TRY: Currency;
static TTD: Currency;
static TWD: Currency;
static TZS: Currency;
static UAH: Currency;
static UGX: Currency;
static UYU: Currency;
static UZS: Currency;
static VEF: Currency;
static VND: Currency;
static XAF: Currency;
static XOF: Currency;
static YER: Currency;
static ZAR: Currency;
static ZMK: Currency;
//#endregion
}
/// to supress new Money() error
declare namespace Money { }
export = Money;
types/js-money/js-money-tests.ts
+2 -2
View File
@@ -1,5 +1,5 @@
import * as Money from "js-money";
import * as CurrencyObjects from "js-money/lib/currency";
import Money = require('js-money');
import * as CurrencyObjects from 'js-money/lib/currency';
const money = new Money(1500, 'USD');
const other = new Money(100, Money.THB);
types/js-money/lib/currency.d.ts
Vendored
-2
View File
@@ -138,7 +138,5 @@ declare namespace Currencies {
}
}
declare var Currencies: Currencies.Currencies;
export = Currencies;