mediawiki-title - npm Package Compare versions

Comparing version 0.4.2 to 0.5.0

lib/index.js

@@ -70,3 +70,4 @@ "use strict";
         return ns.canonical && canonicalName(ns.canonical) === name
-        || ns['*'] && canonicalName(ns['*']) === name;
+            || ns['*'] && canonicalName(ns['*']) === name
+            || ns.name && canonicalName(ns.name) === name;
     });
@@ -76,3 +77,3 @@ if (!index) {
         index = arrayFind(siteInfo.namespacealiases, function(alias) {
-            return name === canonicalName(alias['*']);
+            return name === canonicalName(alias['*'] || alias.alias);
         });
@@ -150,3 +151,5 @@ if (index !== undefined) {
 Namespace.prototype.getNormalizedText = function() {
-    return this._siteInfo.namespaces[this._id + '']['*'].replace(/ /g, '_');
+    var nsInfo = this._siteInfo.namespaces[this._id + ''];
+    var nsName = nsInfo['*'] || nsInfo.name;
+    return nsName.replace(/ /g, '_');
 };
@@ -160,3 +163,4 @@
 Namespace.prototype.subpagesAllowed = function() {
-    return this._siteInfo.namespaces[this._id + ''].subpages !== undefined;
+    var subpages = this._siteInfo.namespaces[this._id + ''].subpages;
+    return subpages !== undefined && subpages !== false;
 };
@@ -163,0 +167,0 @@

package.json

 {
   "name": "mediawiki-title",
-  "version": "0.4.2",
+  "version": "0.5.0",
   "description": "Title normalization library for mediawiki",
@@ -5,0 +5,0 @@ "main": "lib/index.js",

README.md

@@ -200,5 +200,6 @@ # mediawiki-title [![npm version](https://badge.fury.io/js/mediawiki-title.svg)](https://badge.fury.io/js/mediawiki-title) [![Build Status](https://travis-ci.org/wikimedia/mediawiki-title.svg?branch=master)](https://travis-ci.org/wikimedia/mediawiki-title) [![Coverage Status](https://coveralls.io/repos/github/wikimedia/mediawiki-title/badge.svg?branch=master)](https://coveralls.io/github/wikimedia/mediawiki-title?branch=master) [![Dependencies](https://david-dm.org/wikimedia/mediawiki-title.svg?branch=master)](https://david-dm.org/wikimedia/mediawiki-title?branch=master)
 
-The library returns a [Bluebird](http://bluebirdjs.com) promise of a normalized title.
-Wiki-specific rules are fetched from the [api](https://en.wikipedia.org/w/api.php), and
-cached within the `Normalizer` instance, so reusing the instance is highly recommended.
+The library synchronously returns a normalized title. Wiki-specific rules should be fetched from the 
+[MediaWiki API](https://en.wikipedia.org/w/api.php?action=query&meta=siteinfo&siprop=general|namespaces|namespacealiases), 
+and cached outside of the library. The description of the required properties is available in the [SiteInfo](#SiteInfo)
+object docs.
 
@@ -205,0 +206,0 @@ ```javascript

test/index.js

@@ -13,295 +13,298 @@ 'use strict';
 
-var siteInfoCache = {};
-var getSiteInfo = function(domain) {
-    if (siteInfoCache[domain]) {
+function doTest(formatversion) {
+    var siteInfoCache = {};
+    var getSiteInfo = function(domain) {
+        if (siteInfoCache[domain]) {
+            return siteInfoCache[domain];
+        }
+
+        siteInfoCache[domain] = preq.post({
+            uri: 'https://' + domain + '/w/api.php',
+            body: {
+                action: 'query',
+                meta: 'siteinfo',
+                siprop: 'general|namespaces|namespacealiases',
+                format: 'json',
+                formatversion: formatversion
+            }
+        })
+        .then(function(res) {
+            return res.body.query;
+        });
         return siteInfoCache[domain];
-    }
+    };
 
-    siteInfoCache[domain] = preq.post({
-        uri: 'https://' + domain + '/w/api.php',
-        body: {
-            action: 'query',
-            meta: 'siteinfo',
-            siprop: 'general|namespaces|namespacealiases',
-            format: 'json'
-        }
-    })
-    .then(function(res) {
-        return res.body.query;
-    });
-    return siteInfoCache[domain];
-};
+    describe('Validation', function () {
+        var invalidTitles = [
+            ['foo�', 'title-invalid-utf8'],
+            ['', 'title-invalid-empty'],
+            [':', 'title-invalid-empty'],
+            ['__  __', 'title-invalid-empty'],
+            ['  __  ', 'title-invalid-empty'],
+            // Bad characters forbidden regardless of wgLegalTitleChars
+            ['A [ B', 'title-invalid-characters'],
+            ['A ] B', 'title-invalid-characters'],
+            ['A { B', 'title-invalid-characters'],
+            ['A } B', 'title-invalid-characters'],
+            ['A < B', 'title-invalid-characters'],
+            ['A > B', 'title-invalid-characters'],
+            ['A | B', 'title-invalid-characters'],
+            // URL encoding
+            ['A%20B', 'title-invalid-characters'],
+            ['A%23B', 'title-invalid-characters'],
+            ['A%2523B', 'title-invalid-characters'],
+            // XML/HTML character entity references
+            // Note: Commented out because they are not marked invalid by the PHP test as
+            // Title::newFromText runs Sanitizer::decodeCharReferencesAndNormalize first.
+            // 'A &eacute; B',
+            // 'A &#233; B',
+            // 'A &#x00E9; B',
+            // Subject of NS_TALK does not roundtrip to NS_MAIN
+            ['Talk:File:Example.svg', 'title-invalid-talk-namespace'],
+            // Directory navigation
+            ['.', 'title-invalid-relative'],
+            ['..', 'title-invalid-relative'],
+            ['./Sandbox', 'title-invalid-relative'],
+            ['../Sandbox', 'title-invalid-relative'],
+            ['Foo/./Sandbox', 'title-invalid-relative'],
+            ['Foo/../Sandbox', 'title-invalid-relative'],
+            ['Sandbox/.', 'title-invalid-relative'],
+            ['Sandbox/..', 'title-invalid-relative'],
+            // Tilde
+            ['A ~~~ Name', 'title-invalid-magic-tilde'],
+            ['A ~~~~ Signature', 'title-invalid-magic-tilde'],
+            ['A ~~~~~ Timestamp', 'title-invalid-magic-tilde'],
+            // Length
+            [ new Array(257).join('x'), 'title-invalid-too-long' ],
+            [ 'Special:' + new Array(514).join('x'), 'title-invalid-too-long' ],
+            // Namespace prefix without actual title
+            ['Talk:', 'title-invalid-empty'],
+            ['Talk:#', 'title-invalid-empty'],
+            ['Category: ', 'title-invalid-empty'],
+            ['Category: #bar', 'title-invalid-empty']];
 
-describe('Validation', function () {
-    var invalidTitles = [
-        ['foo�', 'title-invalid-utf8'],
-        ['', 'title-invalid-empty'],
-        [':', 'title-invalid-empty'],
-        ['__  __', 'title-invalid-empty'],
-        ['  __  ', 'title-invalid-empty'],
-        // Bad characters forbidden regardless of wgLegalTitleChars
-        ['A [ B', 'title-invalid-characters'],
-        ['A ] B', 'title-invalid-characters'],
-        ['A { B', 'title-invalid-characters'],
-        ['A } B', 'title-invalid-characters'],
-        ['A < B', 'title-invalid-characters'],
-        ['A > B', 'title-invalid-characters'],
-        ['A | B', 'title-invalid-characters'],
-        // URL encoding
-        ['A%20B', 'title-invalid-characters'],
-        ['A%23B', 'title-invalid-characters'],
-        ['A%2523B', 'title-invalid-characters'],
-        // XML/HTML character entity references
-        // Note: Commented out because they are not marked invalid by the PHP test as
-        // Title::newFromText runs Sanitizer::decodeCharReferencesAndNormalize first.
-        // 'A &eacute; B',
-        // 'A &#233; B',
-        // 'A &#x00E9; B',
-        // Subject of NS_TALK does not roundtrip to NS_MAIN
-        ['Talk:File:Example.svg', 'title-invalid-talk-namespace'],
-        // Directory navigation
-        ['.', 'title-invalid-relative'],
-        ['..', 'title-invalid-relative'],
-        ['./Sandbox', 'title-invalid-relative'],
-        ['../Sandbox', 'title-invalid-relative'],
-        ['Foo/./Sandbox', 'title-invalid-relative'],
-        ['Foo/../Sandbox', 'title-invalid-relative'],
-        ['Sandbox/.', 'title-invalid-relative'],
-        ['Sandbox/..', 'title-invalid-relative'],
-        // Tilde
-        ['A ~~~ Name', 'title-invalid-magic-tilde'],
-        ['A ~~~~ Signature', 'title-invalid-magic-tilde'],
-        ['A ~~~~~ Timestamp', 'title-invalid-magic-tilde'],
-        // Length
-        [ new Array(257).join('x'), 'title-invalid-too-long' ],
-        [ 'Special:' + new Array(514).join('x'), 'title-invalid-too-long' ],
-        // Namespace prefix without actual title
-        ['Talk:', 'title-invalid-empty'],
-        ['Talk:#', 'title-invalid-empty'],
-        ['Category: ', 'title-invalid-empty'],
-        ['Category: #bar', 'title-invalid-empty']];
+        invalidTitles.forEach(function(testCase) {
+            var name = testCase[0];
+            if (name.length > 20) {
+                name = testCase[0].substr(0, 20) + '...'
+            }
 
-    invalidTitles.forEach(function(testCase) {
-        var name = testCase[0];
-        if (name.length > 20) {
-            name = testCase[0].substr(0, 20) + '...'
-        }
-
-        it('should throw ' + testCase[1] + ' error for ' + name, function() {
-            return getSiteInfo('en.wikipedia.org')
-            .then(function(siteInfo) {
-                return Title.newFromText(testCase[0], siteInfo);
-            })
-            .then(function () {
-                throw new Error('Error should be thrown');
-            }, function (e) {
-                assert.deepEqual(e.message, testCase[1]);
+            it('should throw ' + testCase[1] + ' error for ' + name, function() {
+                return getSiteInfo('en.wikipedia.org')
+                .then(function(siteInfo) {
+                    return Title.newFromText(testCase[0], siteInfo);
+                })
+                .then(function () {
+                    throw new Error('Error should be thrown');
+                }, function (e) {
+                    assert.deepEqual(e.message, testCase[1]);
+                });
             });
         });
-    });
 
-    var validTitles = [
-        [ 'Sandbox' ],
-        [ 'A "B"' ],
-        [ 'A \'B\'' ],
-        [ '.com' ],
-        [ '~' ],
-        [ '#' ],
-        [ 'Test#Abc' ],
-        [ '"' ],
-        [ '\'' ],
-        [ 'Talk:Sandbox' ],
-        [ 'Talk:Foo:Sandbox' ],
-        [ 'File:Example.svg' ],
-        [ 'File_talk:Example.svg' ],
-        [ 'Foo/.../Sandbox' ],
-        [ 'Sandbox/...' ],
-        [ 'A~~' ],
-        [ ':A' ],
-        // Length is 256 total, but only title part matters
-        [ 'Category:' + new Array(248).join('x') ],
-        // Special pages can have longer titles
-        [ 'Special:' + new Array(500).join('x') ],
-        [ new Array(252).join('x') ],
-        [ '-' ],
-        [ 'aũ' ],
-        [ '"Believing_Women"_in_Islam._Unreading_Patriarchal_Interpretations_of_the_Qur\\\'ān']
-    ];
+        var validTitles = [
+            [ 'Sandbox' ],
+            [ 'A "B"' ],
+            [ 'A \'B\'' ],
+            [ '.com' ],
+            [ '~' ],
+            [ '#' ],
+            [ 'Test#Abc' ],
+            [ '"' ],
+            [ '\'' ],
+            [ 'Talk:Sandbox' ],
+            [ 'Talk:Foo:Sandbox' ],
+            [ 'File:Example.svg' ],
+            [ 'File_talk:Example.svg' ],
+            [ 'Foo/.../Sandbox' ],
+            [ 'Sandbox/...' ],
+            [ 'A~~' ],
+            [ ':A' ],
+            // Length is 256 total, but only title part matters
+            [ 'Category:' + new Array(248).join('x') ],
+            // Special pages can have longer titles
+            [ 'Special:' + new Array(500).join('x') ],
+            [ new Array(252).join('x') ],
+            [ '-' ],
+            [ 'aũ' ],
+            [ '"Believing_Women"_in_Islam._Unreading_Patriarchal_Interpretations_of_the_Qur\\\'ān']
+        ];
 
-    validTitles.forEach(function(title) {
-        var name = title[0];
-        if (name.length > 20) {
-            name = title[0].substr(0, 20) + '...'
-        }
+        validTitles.forEach(function(title) {
+            var name = title[0];
+            if (name.length > 20) {
+                name = title[0].substr(0, 20) + '...'
+            }
 
-        it(name + ' should be valid', function() {
-            return getSiteInfo('en.wikipedia.org')
-            .then(function(siteInfo) {
-                return Title.newFromText(title[0], siteInfo);
-            })
+            it(name + ' should be valid', function() {
+                return getSiteInfo('en.wikipedia.org')
+                .then(function(siteInfo) {
+                    return Title.newFromText(title[0], siteInfo);
+                })
+            });
         });
     });
-});
 
-describe('Normalization', function() {
-    var testCases = [
-        [ 'en.wikipedia.org', 'Test', 'Test'],
-        [ 'en.wikipedia.org', ':Test', 'Test'],
-        [ 'en.wikipedia.org', ': Test', 'Test'],
-        [ 'en.wikipedia.org', ':_Test_', 'Test'],
-        [ 'en.wikipedia.org', 'Foo:bar', 'Foo:bar'],
-        [ 'en.wikipedia.org', 'Talk: foo', 'Talk:Foo'],
-        [ 'en.wikipedia.org', 'int:eger', 'Int:eger'],
-        [ 'en.wikipedia.org', 'WP:eger', 'Wikipedia:Eger'],
-        // Special handling for `i` first character
-        [ 'tr.wikipedia.org', 'iTestTest', 'İTestTest'],
-        [ 'az.wikipedia.org', 'iTestTest', 'İTestTest'],
-        [ 'kk.wikipedia.org', 'iTestTest', 'İTestTest'],
-        [ 'kaa.wikipedia.org', 'iTestTest', 'İTestTest'],
-        // User IP sanitizations
-        [ 'en.wikipedia.org', 'User:::1', 'User:0:0:0:0:0:0:0:1'],
-        [ 'en.wikipedia.org', 'User:0:0:0:0:0:0:0:1', 'User:0:0:0:0:0:0:0:1'],
-        [ 'en.wikipedia.org', 'User:127.000.000.001', 'User:127.0.0.1'],
-        [ 'en.wikipedia.org', 'User:0.0.0.0', 'User:0.0.0.0' ],
-        [ 'en.wikipedia.org', 'User:00.00.00.00', 'User:0.0.0.0' ],
-        [ 'en.wikipedia.org', 'User:000.000.000.000', 'User:0.0.0.0'],
-        [ 'en.wikipedia.org', 'User:141.000.011.253', 'User:141.0.11.253' ],
-        [ 'en.wikipedia.org', 'User: 1.2.4.5', 'User:1.2.4.5' ],
-        [ 'en.wikipedia.org', 'User:01.02.04.05', 'User:1.2.4.5' ],
-        [ 'en.wikipedia.org', 'User:001.002.004.005', 'User:1.2.4.5' ],
-        [ 'en.wikipedia.org', 'User:010.0.000.1', 'User:10.0.0.1' ],
-        [ 'en.wikipedia.org', 'User:080.072.250.04', 'User:80.72.250.4' ],
-        [ 'en.wikipedia.org', 'User:Foo.1000.00', 'User:Foo.1000.00' ],
-        [ 'en.wikipedia.org', 'User:Bar.01', 'User:Bar.01' ],
-        [ 'en.wikipedia.org', 'User:Bar.010', 'User:Bar.010' ],
-        [ 'en.wikipedia.org', 'User:cebc:2004:f::', 'User:CEBC:2004:F:0:0:0:0:0' ],
-        [ 'en.wikipedia.org', 'User:::', 'User:0:0:0:0:0:0:0:0' ],
-        [ 'en.wikipedia.org', 'User:0:0:0:1::', 'User:0:0:0:1:0:0:0:0' ],
-        [ 'en.wikipedia.org', 'User:3f:535::e:fbb', 'User:3F:535:0:0:0:0:E:FBB' ],
-        [ 'en.wikipedia.org', 'User Talk:::1', 'User_talk:0:0:0:0:0:0:0:1'],
-        [ 'en.wikipedia.org', 'User_Talk:::1', 'User_talk:0:0:0:0:0:0:0:1'],
-        [ 'en.wikipedia.org', 'User_talk:::1', 'User_talk:0:0:0:0:0:0:0:1'],
-        [ 'en.wikipedia.org', 'User_talk:::1/24', 'User_talk:0:0:0:0:0:0:0:1/24'],
-        // Case-sensitive namespace
-        [ 'en.wikipedia.org', 'user:pchelolo', 'User:Pchelolo'],
-        [ 'en.wikipedia.org',
-            'list of Neighbours characters (2016)#Tom Quill',
-            'List_of_Neighbours_characters_(2016)']
+    describe('Normalization', function() {
+        var testCases = [
+            [ 'en.wikipedia.org', 'Test', 'Test'],
+            [ 'en.wikipedia.org', ':Test', 'Test'],
+            [ 'en.wikipedia.org', ': Test', 'Test'],
+            [ 'en.wikipedia.org', ':_Test_', 'Test'],
+            [ 'en.wikipedia.org', 'Foo:bar', 'Foo:bar'],
+            [ 'en.wikipedia.org', 'Talk: foo', 'Talk:Foo'],
+            [ 'en.wikipedia.org', 'int:eger', 'Int:eger'],
+            [ 'en.wikipedia.org', 'WP:eger', 'Wikipedia:Eger'],
+            // Special handling for `i` first character
+            [ 'tr.wikipedia.org', 'iTestTest', 'İTestTest'],
+            [ 'az.wikipedia.org', 'iTestTest', 'İTestTest'],
+            [ 'kk.wikipedia.org', 'iTestTest', 'İTestTest'],
+            [ 'kaa.wikipedia.org', 'iTestTest', 'İTestTest'],
+            // User IP sanitizations
+            [ 'en.wikipedia.org', 'User:::1', 'User:0:0:0:0:0:0:0:1'],
+            [ 'en.wikipedia.org', 'User:0:0:0:0:0:0:0:1', 'User:0:0:0:0:0:0:0:1'],
+            [ 'en.wikipedia.org', 'User:127.000.000.001', 'User:127.0.0.1'],
+            [ 'en.wikipedia.org', 'User:0.0.0.0', 'User:0.0.0.0' ],
+            [ 'en.wikipedia.org', 'User:00.00.00.00', 'User:0.0.0.0' ],
+            [ 'en.wikipedia.org', 'User:000.000.000.000', 'User:0.0.0.0'],
+            [ 'en.wikipedia.org', 'User:141.000.011.253', 'User:141.0.11.253' ],
+            [ 'en.wikipedia.org', 'User: 1.2.4.5', 'User:1.2.4.5' ],
+            [ 'en.wikipedia.org', 'User:01.02.04.05', 'User:1.2.4.5' ],
+            [ 'en.wikipedia.org', 'User:001.002.004.005', 'User:1.2.4.5' ],
+            [ 'en.wikipedia.org', 'User:010.0.000.1', 'User:10.0.0.1' ],
+            [ 'en.wikipedia.org', 'User:080.072.250.04', 'User:80.72.250.4' ],
+            [ 'en.wikipedia.org', 'User:Foo.1000.00', 'User:Foo.1000.00' ],
+            [ 'en.wikipedia.org', 'User:Bar.01', 'User:Bar.01' ],
+            [ 'en.wikipedia.org', 'User:Bar.010', 'User:Bar.010' ],
+            [ 'en.wikipedia.org', 'User:cebc:2004:f::', 'User:CEBC:2004:F:0:0:0:0:0' ],
+            [ 'en.wikipedia.org', 'User:::', 'User:0:0:0:0:0:0:0:0' ],
+            [ 'en.wikipedia.org', 'User:0:0:0:1::', 'User:0:0:0:1:0:0:0:0' ],
+            [ 'en.wikipedia.org', 'User:3f:535::e:fbb', 'User:3F:535:0:0:0:0:E:FBB' ],
+            [ 'en.wikipedia.org', 'User Talk:::1', 'User_talk:0:0:0:0:0:0:0:1'],
+            [ 'en.wikipedia.org', 'User_Talk:::1', 'User_talk:0:0:0:0:0:0:0:1'],
+            [ 'en.wikipedia.org', 'User_talk:::1', 'User_talk:0:0:0:0:0:0:0:1'],
+            [ 'en.wikipedia.org', 'User_talk:::1/24', 'User_talk:0:0:0:0:0:0:0:1/24'],
+            // Case-sensitive namespace
+            [ 'en.wikipedia.org', 'user:pchelolo', 'User:Pchelolo'],
+            [ 'en.wikipedia.org',
+                'list of Neighbours characters (2016)#Tom Quill',
+                'List_of_Neighbours_characters_(2016)']
 
-    ];
+        ];
 
-    testCases.forEach(function (test) {
-        it('For ' + test[0] + ' should normalize ' + test[1] + ' to ' + test[2], function() {
-            return getSiteInfo(test[0])
+        testCases.forEach(function (test) {
+            it('For ' + test[0] + ' should normalize ' + test[1] + ' to ' + test[2], function() {
+                return getSiteInfo(test[0])
+                .then(function(siteInfo) {
+                    return Title.newFromText(test[1], siteInfo).getPrefixedDBKey();
+                })
+                .then(function(res) {
+                    assert.deepEqual(res, test[2]);
+                });
+            });
+        });
+
+        it('Should normalize fragment', function() {
+            return getSiteInfo('en.wikipedia.org')
             .then(function(siteInfo) {
-                return Title.newFromText(test[1], siteInfo).getPrefixedDBKey();
+                return Title.newFromText('Test#some fragment', siteInfo);
             })
             .then(function(res) {
-                assert.deepEqual(res, test[2]);
+                assert.deepEqual(res.getFragment(), 'some_fragment');
             });
-        });
+        })
     });
 
-    it('Should normalize fragment', function() {
-        return getSiteInfo('en.wikipedia.org')
-        .then(function(siteInfo) {
-            return Title.newFromText('Test#some fragment', siteInfo);
-        })
-        .then(function(res) {
-            assert.deepEqual(res.getFragment(), 'some_fragment');
-        });
-    })
-});
+    describe('Utilities', function () {
+        var data = [
+            [
+                ' %!"$&\'()*,\\-.\\/0-9:;=?@A-Z\\\\^_`a-z~\\x80-\\xFF+',
+                ' %!"$&\'()*,\\-./0-9:;=?@A-Z\\\\\\^_`a-z~+\\u0080-\\uFFFF',
+            ],
+            [
+                'QWERTYf-\\xFF+',
+                'QWERTYf-\\x7F+\\u0080-\\uFFFF',
+            ],
+            [
+                'QWERTY\\x66-\\xFD+',
+                'QWERTYf-\\x7F+\\u0080-\\uFFFF',
+            ],
+            [
+                'QWERTYf-y+',
+                'QWERTYf-y+',
+            ],
+            [
+                'QWERTYf-\\x80+',
+                'QWERTYf-\\x7F+\\u0080-\\uFFFF',
+            ],
+            [
+                'QWERTY\\x66-\\x80+\\x23',
+                'QWERTYf-\\x7F+#\\u0080-\\uFFFF',
+            ],
+            [
+                'QWERTY\\x66-\\x80+\\xD3',
+                'QWERTYf-\\x7F+\\u0080-\\uFFFF',
+            ],
+            [
+                '\\\\\\x99',
+                '\\\\\\u0080-\\uFFFF',
+            ],
+            [
+                '-\\x99',
+                '\\-\\u0080-\\uFFFF',
+            ],
+            [
+                'QWERTY\\-\\x99',
+                'QWERTY\\-\\u0080-\\uFFFF',
+            ],
+            [
+                '\\\\x99',
+                '\\\\x99',
+            ],
+            [
+                'A-\\x9F',
+                'A-\\x7F\\u0080-\\uFFFF',
+            ],
+            [
+                '\\x66-\\x77QWERTY\\x88-\\x91FXZ',
+                'f-wQWERTYFXZ\\u0080-\\uFFFF',
+            ],
+            [
+                '\\x66-\\x99QWERTY\\xAA-\\xEEFXZ',
+                'f-\\x7FQWERTYFXZ\\u0080-\\uFFFF',
+            ]
+        ];
 
-describe('Utilities', function () {
-    var data = [
-        [
-            ' %!"$&\'()*,\\-.\\/0-9:;=?@A-Z\\\\^_`a-z~\\x80-\\xFF+',
-            ' %!"$&\'()*,\\-./0-9:;=?@A-Z\\\\\\^_`a-z~+\\u0080-\\uFFFF',
-        ],
-        [
-            'QWERTYf-\\xFF+',
-            'QWERTYf-\\x7F+\\u0080-\\uFFFF',
-        ],
-        [
-            'QWERTY\\x66-\\xFD+',
-            'QWERTYf-\\x7F+\\u0080-\\uFFFF',
-        ],
-        [
-            'QWERTYf-y+',
-            'QWERTYf-y+',
-        ],
-        [
-            'QWERTYf-\\x80+',
-            'QWERTYf-\\x7F+\\u0080-\\uFFFF',
-        ],
-        [
-            'QWERTY\\x66-\\x80+\\x23',
-            'QWERTYf-\\x7F+#\\u0080-\\uFFFF',
-        ],
-        [
-            'QWERTY\\x66-\\x80+\\xD3',
-            'QWERTYf-\\x7F+\\u0080-\\uFFFF',
-        ],
-        [
-            '\\\\\\x99',
-            '\\\\\\u0080-\\uFFFF',
-        ],
-        [
-            '-\\x99',
-            '\\-\\u0080-\\uFFFF',
-        ],
-        [
-            'QWERTY\\-\\x99',
-            'QWERTY\\-\\u0080-\\uFFFF',
-        ],
-        [
-            '\\\\x99',
-            '\\\\x99',
-        ],
-        [
-            'A-\\x9F',
-            'A-\\x7F\\u0080-\\uFFFF',
-        ],
-        [
-            '\\x66-\\x77QWERTY\\x88-\\x91FXZ',
-            'f-wQWERTYFXZ\\u0080-\\uFFFF',
-        ],
-        [
-            '\\x66-\\x99QWERTY\\xAA-\\xEEFXZ',
-            'f-\\x7FQWERTYFXZ\\u0080-\\uFFFF',
-        ]
-    ];
-
-    var idx = 0;
-    data.forEach(function(test) {
-        idx++;
-        it('Should covert byte range. Test ' + idx, function () {
-            assert.deepEqual(utils.convertByteClassToUnicodeClass(test[0]), test[1]);
+        var idx = 0;
+        data.forEach(function(test) {
+            idx++;
+            it('Should covert byte range. Test ' + idx, function () {
+                assert.deepEqual(utils.convertByteClassToUnicodeClass(test[0]), test[1]);
+            });
         });
-    });
 
-    it('Should fetch domains', function() {
-        return preq.get({
-            uri: 'https://en.wikipedia.org/w/api.php?action=sitematrix&format=json'
-        })
-        .then(function(res) {
-            return Object.keys(res.body.sitematrix)
-            .filter(function(idx) {
-                return idx !== 'count' && idx !== 'specials';
+        it('Should fetch domains', function() {
+            return preq.get({
+                uri: 'https://en.wikipedia.org/w/api.php?action=sitematrix&format=json'
             })
-            .map(function (idx) {
-                return res.body.sitematrix[idx].site[0].url.replace(/^https?:\/\//, '');
-            });
-        })
-        .then(function (domains) {
-            describe('Various domains', function() {
-                domains.forEach(function (domain) {
-                    it('Should work for ' + domain, function() {
-                        return getSiteInfo(domain)
-                        .then(function(siteInfo) {
-                            return Title.newFromText('1', siteInfo);
-                        })
-                        .then(function (res) {
-                            assert.deepEqual(res.getPrefixedDBKey(), '1');
+            .then(function(res) {
+                return Object.keys(res.body.sitematrix)
+                .filter(function(idx) {
+                    return idx !== 'count' && idx !== 'specials';
+                })
+                .map(function (idx) {
+                    return res.body.sitematrix[idx].site[0].url.replace(/^https?:\/\//, '');
+                });
+            })
+            .then(function (domains) {
+                describe('Various domains', function() {
+                    domains.forEach(function (domain) {
+                        it('Should work for ' + domain, function() {
+                            return getSiteInfo(domain)
+                            .then(function(siteInfo) {
+                                return Title.newFromText('1', siteInfo);
+                            })
+                            .then(function (res) {
+                                assert.deepEqual(res.getPrefixedDBKey(), '1');
+                            });
                         });
@@ -313,2 +316,5 @@ });
     });
-});
+}
+
+doTest(1);
+doTest(2);

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

43850

increased by3.63%

Lines of code

892

increased by1.02%

Number of lines in readme file

228

increased by0.44%

No dependency changes