Merge pull request #6 from sgomes/fix-links-from-unknown-timezones

Ensure there are no links from unknown timezones.
gilmoreorless · Feb 24, 2019 · d41cd47 · d41cd47
2 parents 5f899d6 + 2b1332e
commit d41cd47
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 3 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -1,7 +1,7 @@
 {
   "extends": "eslint:recommended",
   "parserOptions": {
-    "ecmaVersion": "2017"
+    "ecmaVersion": 2018
   },
   "env": {
     "es6": true,

diff --git a/src/index.js b/src/index.js
@@ -28,8 +28,13 @@ function filterData(tzdata, config, file) {
   const filteredData = moment.tz.filterLinkPack(
     {
       version: tzdata.version,
-      zones: newZonesData,
-      links: newLinksData.map(link => link.join('|')),
+      zones: newLinksData.reduce((zones, link) => {
+        const newEntry = { ...newZonesData.find(z => z.name === link[0]) };
+        newEntry.name = link[1];
+        zones.push(newEntry);
+        return zones;
+      }, newZonesData ),
+      links: [],
     },
     startYear,
     endYear

diff --git a/test/index.test.js b/test/index.test.js
@@ -212,6 +212,17 @@ describe('usage', () => {
       const zoneCount = data.zones.length + data.links.length;
       assert(zoneCount === moment.tz.names().length);
     });
+
+    it("does not include links from undefined timezones", async () => {
+      const { data } = await buildWebpack({
+        startYear: 2000
+      });
+      for (const link of data.links) {
+        const from = link.split('|')[0];
+        const matchingZone = data.zones.find(zone => zone.startsWith(from));
+        assert.notEqual(matchingZone, undefined, `'${from}' not in zones`);
+      }
+    });
   });
 
   describe('caching', () => {