Update type definitions to match the code implementation

Author: gilmoreorless

index.d.ts

@@ -1,16 +1,26 @@
-// Type definitions for moment-timezone.js 0.5
+// Type definitions for moment-timezone.js
 // Project: http://momentjs.com/timezone/
 // Definitions by: Michel Salib <https://github.com/michelsalib>
 //                 Alan Brazil Lins <https://github.com/alanblins>
 //                 Agustin Carrasco <https://github.com/asermax>
 //                 Borys Kupar <https://github.com/borys-kupar>
 //                 Anthony Rainer <https://github.com/pristinesource>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Migrated here from DefinitelyTyped in release [email protected]
+// Original source: https://github.com/DefinitelyTyped/DefinitelyTyped
+// Migrated here from DefinitelyTyped in release [email protected],
+// then maintained by the Moment team
 
 import moment = require('moment');
 
 declare module 'moment' {
+    /** Parsed / unpacked zone data. */
+    interface UnpackedZone {
+        name: string;
+        abbrs: string[];
+        untils: number[];
+        offsets: number[];
+        population?: number;
+    }
+
     interface MomentZone {
         name: string;
         abbrs: string[];
@@ -19,9 +29,13 @@ declare module 'moment' {
         population: number;
 
         abbr(timestamp: number): string;
+        /**
+         * @deprecated use `.utcOffset()`
+         */
         offset(timestamp: number): number;
         utcOffset(timestamp: number): number;
         parse(timestamp: number): number;
+        countries(): string[];
     }
 
     interface MomentZoneOffset {
@@ -43,15 +57,21 @@ declare module 'moment' {
         (date: moment.Moment, timezone: string): moment.Moment;
         (date: any, timezone: string): moment.Moment;
 
+        version: string;
+        dataVersion: string;
+        moveInvalidForward: boolean;
+        moveAmbiguousForward: boolean;
+
         zone(timezone: string): MomentZone | null;
+        Zone(packedZoneString?: string): MomentZone;
 
         add(packedZoneString: string): void;
         add(packedZoneString: string[]): void;
 
         link(packedLinkString: string): void;
         link(packedLinkString: string[]): void;
 
-        load(data: { version: string; links: string[]; zones: string[] }): void;
+        load(data: { version: string; links: string[]; zones: string[]; countries?: string[] }): void;
 
         names(): string[];
         zonesForCountry<T extends true>(country: string, with_offset: T): T extends true ? MomentZoneOffset[] : never;
@@ -60,8 +80,10 @@ declare module 'moment' {
         countries(): string[];
         guess(ignoreCache?: boolean): string;
 
-        setDefault(timezone?: string): Moment;
-        dataVersion: string;
+        setDefault(timezone?: string): typeof moment;
+
+        unpack(packedZoneString: string): UnpackedZone;
+        unpackBase60(packedString: string): number;
     }
 
     interface Moment {

moment-timezone-utils.d.ts

@@ -1,34 +1,27 @@
-import moment = require('moment');
-import { MomentTimezone } from "./index";
+import moment = require('./index');
 
 declare module 'moment' {
 
-    /** Parsed / unpacked zone data. */
-    interface UnpackedZone {
-        /** The uniquely identifying name of the time zone. */
-        name: string;
-        /** zone abbreviations */
-        abbrs: Array<string>;
-        /** (measured in milliseconds) */
-        untils: Array<number | null>;
-        /** (measured in minutes) */
-        offsets: Array<number>;
-    }
-
-    /** Bundle of zone data and links for multiple timezones */
+    /** Bundle of packed zone data and links for multiple timezones */
     interface PackedZoneBundle {
         version: string;
-        zones: Array<string>;
-        links: Array<string>;
+        zones: string[];
+        links: string[];
     }
 
-    /** Bundle of zone data and links for multiple timezones */
+    /** Bundle of raw zone data and links for multiple timezones */
     interface UnpackedZoneBundle {
         version: string;
-        zones: Array<UnpackedZone>;
-        links: Array<string>;
+        zones: UnpackedZone[];
+        links: string[];
     }
-    
+
+    /** Bundle of timezones for a single country */
+    interface UnpackedCountryData {
+        name: string;
+        zones: string[];
+    }
+
     /** extends MomentTimezone declared in index */
     interface MomentTimezone {
         /** Converts zone data in the unpacked format to the packed format. */
@@ -37,7 +30,11 @@ declare module 'moment' {
         /** Convert a base 10 number to a base 60 string. */
         packBase60(input: number, precision?: number): string;
 
-        /** Create links out of two zones that share data.
+        /** Converts country data in the unpacked format to a packed format. */
+        packCountry(unpacked: UnpackedCountryData): string;
+
+        /**
+         * Create links out of two or more zones that share data.
          * @returns A new ZoneBundle with duplicate zone data replaced by links
          */
         createLinks(unlinked: UnpackedZoneBundle): PackedZoneBundle;

typing-tests/moment-timezone-tests.ts

@@ -1,5 +1,4 @@
 import moment = require('../index');
-import { UnpackedZone } from '../moment-timezone-utils';
 
 const june = moment('2014-06-01T12:00:00Z');
 june.tz('America/Los_Angeles').format('ha z');
@@ -87,7 +86,7 @@ moment.tz.load({
     version : '2014e'
 });
 
-const unpacked: UnpackedZone = moment.tz.unpack('America/Los_Angeles|PST PDT|80 70|0101|1Lzm0 1zb0 Op0');
+const unpacked: moment.UnpackedZone = moment.tz.unpack('America/Los_Angeles|PST PDT|80 70|0101|1Lzm0 1zb0 Op0');
 const unpacked2: number = moment.tz.unpackBase60('1Lzm0');
 
 const v1: string = moment.tz.version;

typing-tests/moment-timezone-utils-tests.ts

@@ -4,14 +4,16 @@ const ZONE_A: moment.UnpackedZone = {
     name : "Test/A",
     abbrs   : ["ABC", "DEF", "GHI"],
     offsets : [10, 20, 30],
-    untils  : [-1000, 100, 200]
+    untils  : [-1000, 100, 200],
+    population : 2000
 };
 
 const ZONE_B = {
     name : "Test/B",
     abbrs   : ["ABC", "DEF", "GHI"],
     offsets : [10, 20, 30],
-    untils  : [-1000, 100, 200]
+    untils  : [-1000, 100, 200],
+    population : 0
 };
 
 const ZONE_C = {