From af699e147cfeceb93c77e3876016f89531488e85 Mon Sep 17 00:00:00 2001
From: Vasya Aksyonov <outring@gmail.com>
Date: Tue, 10 Mar 2015 21:13:39 +0500
Subject: [PATCH 1/2] Numeral commonjs modules support and tests

---
 numeraljs/numeraljs-commonjs-tests.ts | 44 +++++++++++++++++++++++++++
 numeraljs/numeraljs-tests.ts          |  3 +-
 numeraljs/numeraljs.d.ts              |  8 ++++-
 3 files changed, 53 insertions(+), 2 deletions(-)
 create mode 100644 numeraljs/numeraljs-commonjs-tests.ts

diff --git a/numeraljs/numeraljs-commonjs-tests.ts b/numeraljs/numeraljs-commonjs-tests.ts
new file mode 100644
index 0000000000..5e9af53884
--- /dev/null
+++ b/numeraljs/numeraljs-commonjs-tests.ts
@@ -0,0 +1,44 @@
+/// <reference path="numeraljs.d.ts" />
+import numeral = require("numeral");
+
+var valueFormat: string = numeral(1000).format('0,0');
+// '1,000'
+
+var valueUnformat: number = numeral().unformat('($10,000.00)');
+// '-10000'
+
+var value3: Numeral = numeral(1000);
+var added: Numeral = value3.add(10);
+// 1010
+
+var value4: Numeral = numeral(1000);
+var formatValue4a: string = value4.format('0,0');
+// '1,000'
+var formatValue4b: number = value4.value();
+// 1000
+
+var value5: Numeral = numeral();
+value5.set(1000);
+var value5Num: number = value5.value();
+// 1000
+
+var value6: Numeral = numeral(1000);
+var value: number = 100;
+var difference = value6.difference(value);
+// 900
+
+var value7: Numeral = numeral(0);
+numeral.zeroFormat('N/A');
+var zeroString: string = value7.format('0.0');
+// 'N/A'
+
+var a: Numeral = numeral(1000);
+var b: Numeral = numeral(a);
+var c: Numeral = a.clone();
+
+var aVal: number = a.set(2000).value();
+// 2000
+var bVal: number = b.value();
+// 1000
+var cVal: number = c.add(10).value();
+// 1010
diff --git a/numeraljs/numeraljs-tests.ts b/numeraljs/numeraljs-tests.ts
index 4dadb0c0b9..0b1bcff67b 100644
--- a/numeraljs/numeraljs-tests.ts
+++ b/numeraljs/numeraljs-tests.ts
@@ -1,4 +1,5 @@
 /// <reference path="numeraljs.d.ts" />
+
 var valueFormat: string = numeral(1000).format('0,0');
 // '1,000'
 
@@ -27,7 +28,7 @@ var difference = value6.difference(value);
 
 var value7: Numeral = numeral(0);
 numeral.zeroFormat('N/A');
-var zeroString: string = value7.format('0.0')
+var zeroString: string = value7.format('0.0');
 // 'N/A'
 
 var a: Numeral = numeral(1000);
diff --git a/numeraljs/numeraljs.d.ts b/numeraljs/numeraljs.d.ts
index e680806d12..1e600b91ce 100644
--- a/numeraljs/numeraljs.d.ts
+++ b/numeraljs/numeraljs.d.ts
@@ -39,4 +39,10 @@ interface Numeral {
 	difference(value: any): number;
 }
 
-declare var numeral: Numeral;
\ No newline at end of file
+declare var numeral: Numeral;
+
+declare module "numeral" {
+
+    export = Numeral;
+
+}
\ No newline at end of file

From 3256244dbaf99104c2738e67641da33a3af09a41 Mon Sep 17 00:00:00 2001
From: Vasya Aksyonov <outring@gmail.com>
Date: Tue, 10 Mar 2015 21:41:53 +0500
Subject: [PATCH 2/2] Export fix

---
 numeraljs/numeraljs.d.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/numeraljs/numeraljs.d.ts b/numeraljs/numeraljs.d.ts
index 1e600b91ce..779823056c 100644
--- a/numeraljs/numeraljs.d.ts
+++ b/numeraljs/numeraljs.d.ts
@@ -43,6 +43,6 @@ declare var numeral: Numeral;
 
 declare module "numeral" {
 
-    export = Numeral;
+    export = numeral;
 
-}
\ No newline at end of file
+}