Merge pull request #586 from spencermountain/dev

10.4.0

README.md

@@ -719,7 +719,7 @@ Some wikis, (like wikia) have intentionally disabled this.
 wikitext is (amazingly) used across all languages, wikis, and even in right-to-left languages.
 This parser actually does an okay job at it too.
 
-Wikipedia I18n langauge information for _Redirects, Infoboxes, Categories, and Images_ are included in the library, with pretty-decent coverage.
+Wikipedia I18n language information for _Redirects, Infoboxes, Categories, and Images_ are included in the library, with pretty-decent coverage.
 
 To improve coverage of i18n templates, use [wtf-plugin-i18n](./plugins/i18n)
 
@@ -730,12 +730,12 @@ Please make a PR if you see something missing for your language.
 
 ## Builds:
 
-this library ships seperate client-side and server-side builds, to preserve filesize.
+this library ships separate client-side and server-side builds, to preserve filesize.
 
 - _[./wtf_wikipedia-client.mjs](./builds/wtf_wikipedia-client.mjs)_ - as es-module (or Deno)
 - _[./wtf_wikipedia-client.min.js](./builds/wtf_wikipedia-client.min.js)_ - for production
 
-- _[./wtf_wikipedia.cjs](./builds/wtf_wikipedia.js)_ - node commonjs build
+- _[./wtf_wikipedia.cjs](./builds/wtf_wikipedia.cjs)_ - node commonjs build
 - _[./wtf_wikipedia.mjs](./builds/wtf_wikipedia.mjs)_ - node/deno/typescript esm build
 
 the browser version uses `fetch()` and the server version uses `require('https')`.

builds/wtf_wikipedia.cjs

@@ -13,7 +13,7 @@
    * @returns {{domain: string, title: string}} The domain and title of a url
    */
   const parseUrl = function (url) {
-    let parsed = new URL(url); // eslint-disable-line
+    let parsed = new URL(url); //eslint-disable-line
     let title = parsed.pathname.replace(/^\/(wiki\/)?/, '');
     title = decodeURIComponent(title);
     return {
@@ -1208,20 +1208,17 @@
       let name = t.template || '';
       // try i18n templates like 'stubo'
       if (allStubs.has(name)) {
-        // console.log(name)
         return true
       }
       // english forms
       if (name === 'stub' || name.endsWith('-stub')) {
-        // console.log(name)
         return true
       }
       // look for i18n in last-word, like {{foo-stubo}}
       let words = name.split(/[- ]/);
       if (words.length > 1) {
         let word = words[words.length - 1];
         if (allStubs.has(word)) {
-          // console.log(name)
           return true
         }
       }
@@ -2157,7 +2154,6 @@
       }
       //kill off just these just-anchor links [[#history]]
       // if (link.match(/^#/i)) {
-      //   console.log(s)
       //   return s
       // }
       //remove anchors from end [[toronto#history]]
@@ -8399,6 +8395,33 @@
     return str
   };
 
+  const toTextBritish = function (date) {
+    //eg '1995'
+    let str = String(date.year || '');
+    if (date.month !== undefined && months$1.hasOwnProperty(date.month) === true) {
+      if (date.date === undefined) {
+        //January 1995
+        str = `${months$1[date.month]} ${date.year}`;
+      } else {
+        //5 January 1995
+        str = `${date.date} ${months$1[date.month]} ${date.year}`;
+        //add times, if available
+        if (date.hour !== undefined && date.minute !== undefined) {
+          let time = `${pad(date.hour)}:${pad(date.minute)}`;
+          if (date.second !== undefined) {
+            time = time + ':' + pad(date.second);
+          }
+          str = time + ', ' + str;
+          //add timezone, if there, at the end in brackets
+        }
+        if (date.tz) {
+          str += ` (${date.tz})`;
+        }
+      }
+    }
+    return str
+  };
+
   // console.log(toText(ymd([2018, 3, 28])));
 
   //wrap it up as a template
@@ -8785,6 +8808,36 @@
     // 'birth date and age2': date,
     // 'age in years, months, weeks and days': true,
     // 'age as of date': true,
+    // https://en.wikipedia.org/wiki/Template:As_of
+    'as of': (tmpl) => {
+      let obj = parser(tmpl, ['year', 'month', 'day']);
+      if (obj.alt) {
+        return obj.alt
+      }
+      let out = 'As of ';
+      if (obj.since) {
+        out = 'Since ';
+      }
+      if (obj.lc) {
+        out = out.toLowerCase();
+      }
+      if (obj.bare) {
+        out = '';
+      }
+      if (obj.pre) {
+        out += obj.pre + ' ';
+      }
+      let format = toTextBritish;
+      if (obj.df == "US") {
+        format = toText;
+      }
+      let dateObj = ymd([obj.year, obj.month, obj.day]);
+      out += format(dateObj);
+      if (obj.post) {
+        out += obj.post;
+      }
+      return out
+    }
   };
 
   /**
@@ -9246,6 +9299,8 @@
     sports,
   );
 
+  /* eslint-disable no-console */
+
   let templates = Object.assign({}, textTmpl, dataTmpl, bothTmpl);
 
   Object.keys(aliases).forEach((k) => {
@@ -9255,8 +9310,6 @@
     templates[k] = templates[aliases[k]];
   });
 
-  // console.log(Object.keys(templates).length)
-
   const nums = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9'];
 
   //this gets all the {{template}} objects and decides how to parse them
@@ -10518,7 +10571,7 @@
     };
   });
 
-  const heading_reg = /^(={1,6})(.{1,200}?)={1,6}$/;
+  const heading_reg = /^(={1,6})(.{1,200}?)={1,6}$/; //eslint-disable-line
   const hasTemplate = /\{\{.+?\}\}/;
 
   const doInlineTemplates = function (wiki, doc) {
@@ -10666,6 +10719,8 @@
     return [categories, newWiki]
   };
 
+  /* eslint-disable no-console */
+
   const defaults$1 = {
     tables: true,
     lists: true,
@@ -11251,6 +11306,7 @@
    * @returns {null| Document | Document[]} null if there are no results or Document if there is one responses and Document array if there are multiple responses
    */
   const parseDoc = function (res, title) {
+    res = res || [];
     // filter out undefined
     res = res.filter((o) => o);
 
@@ -11303,6 +11359,7 @@
     }
   };
 
+  /* eslint-disable no-console */
   const isUrl = /^https?:\/\//;
 
   /**
@@ -11384,7 +11441,9 @@
       })
   };
 
-  var version = '10.3.2';
+  var version = '10.4.0';
+
+  /* eslint-disable no-console */
 
   /**
    * use the native client-side fetch function