From c1bd558e85c6b3237f6624aecb30fe71bf266df0 Mon Sep 17 00:00:00 2001 From: Andy Date: Fri, 6 Jan 2017 06:34:42 -0800 Subject: [PATCH] cldrjs: Convert cldr.js-supplemental.d.ts to module augmentation, and include in tests (#13777) --- cldrjs/cldr.js-event-tests.ts | 28 +++++++++++++++------------- cldrjs/cldr.js-supplemental.d.ts | 4 +++- cldrjs/tsconfig.json | 15 +++++++++------ 3 files changed, 27 insertions(+), 20 deletions(-) diff --git a/cldrjs/cldr.js-event-tests.ts b/cldrjs/cldr.js-event-tests.ts index 89d971a63b..c626e72663 100644 --- a/cldrjs/cldr.js-event-tests.ts +++ b/cldrjs/cldr.js-event-tests.ts @@ -15,19 +15,21 @@ Cldr.off("get", (path, value) => { console.log(value); }); -const cldr = new Cldr("en"); +{ + const cldr = new Cldr("en"); -cldr.on("get", (path, value) => { - console.log(path); - console.log(value); -}); + cldr.on("get", (path, value) => { + console.log(path); + console.log(value); + }); -cldr.once("get", (path, value) => { - console.log(path); - console.log(value); -}); + cldr.once("get", (path, value) => { + console.log(path); + console.log(value); + }); -cldr.off("get", (path, value) => { - console.log(path); - console.log(value); -}); + cldr.off("get", (path, value) => { + console.log(path); + console.log(value); + }); +} diff --git a/cldrjs/cldr.js-supplemental.d.ts b/cldrjs/cldr.js-supplemental.d.ts index 3b25e21962..84d6c45e3f 100644 --- a/cldrjs/cldr.js-supplemental.d.ts +++ b/cldrjs/cldr.js-supplemental.d.ts @@ -5,7 +5,9 @@ // The definition file for supplemental module. -declare namespace cldr { +import * as cldr from "cldrjs"; + +declare module "cldrjs" { interface TimeDataStatic { allowed(): string; preferred(): string; diff --git a/cldrjs/tsconfig.json b/cldrjs/tsconfig.json index 1eb80c431b..f7edc6e510 100644 --- a/cldrjs/tsconfig.json +++ b/cldrjs/tsconfig.json @@ -1,12 +1,8 @@ { - "files": [ - "index.d.ts", - "cldr.js-event-tests.ts" - ], "compilerOptions": { "module": "commonjs", "target": "es6", - "noImplicitAny": true, + "noImplicitAny": false, "noImplicitThis": true, "strictNullChecks": false, "baseUrl": "../", @@ -16,5 +12,12 @@ "types": [], "noEmit": true, "forceConsistentCasingInFileNames": true - } + }, + "files": [ + "index.d.ts", + "cldr.js-supplemental.d.ts", + "cldr.js-tests.ts", + "cldr.js-event-tests.ts", + "cldr.js-supplemental-tests.ts" + ] } \ No newline at end of file