canada-api 1.0.2 → 1.0.3

package/README.md

@@ -5,7 +5,7 @@ Cross platform API for fetching public data from [canada.ca](https://www.canada.
 ## Install
 ### Browsers
 
-    <script src="https://cdn.jsdelivr.net/npm/canada-api@1.0.2"><script>
+    <script src="https://cdn.jsdelivr.net/npm/canada-api@1.0.3"><script>
 
 ### Nodejs
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "canada-api",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "Cross platform API to fetch data from canada.ca",
   "browser": "dist/ca.js",
   "main": "src/index.mjs",

package/src/index.mjs

@@ -28,7 +28,7 @@ const months = {
  */
 function parseDate(date) {
     let m = /^\w{3} (\w{3}) (\d{2}) (\d{4}) ([\d:]{8}) GMT([\-+]\d{4})$/.exec(date)
-    return m ? new Date(m[3] + '-' + months[m[1]] + '-' + m[2] + 'T' + m[4] + m[5]).getTime() : date
+    return m ? Date.parse(m[3] + '-' + months[m[1]] + '-' + m[2] + 'T' + m[4] + m[5]) : date
 }
 
 /**
@@ -116,7 +116,7 @@ function verifyResponse(response) {
 }
 
 /**
- * Get node children
+ * Get node children by parsing sitemaps
  * @param {string|Object} node 
  * @param {array} list Node list to extend
  * @returns {Object}
@@ -127,18 +127,15 @@ export function children(node) {
     return limiter.schedule(() => fetch(formatURL(node.path, '.sitemap.xml')))
         .then(verifyResponse)
         .then(response => response.text())
-        .then(xml => {
-            // Extract XML data
-            let locs = xml.match(/(?<=<loc>)[^<]+(?=<\/loc>)/g)
-            let mods = xml.match(/(?<=<lastmod>)[^<]+(?=<\/lastmod>)/g)
-            return locs.map((loc, index) => ({
-                path: normalizePath(loc),
-                lastmod: new Date(mods[index]).getTime()
-            }))
-        })
-        .catch(err => {
-            return err
-        })
+        .then(xml => xml.match(/<url>.*?<\/url>/g).map(url => {
+            let loc = url.match(/<loc>([^<]+)<\/loc>/)
+            let mod = url.match(/<lastmod>([^<]+)<\/lastmod>/)
+            return {
+                path: normalizePath(loc[1]),
+                lastmod: mod ? Date.parse(mod[1]) : null
+            }
+        }))
+        .catch(() => [])
 }
 
 /**
@@ -201,3 +198,4 @@ export function content(node) {
             return node
         })
 }
+