diff -Nru node-regenerate-1.3.3/debian/changelog node-regenerate-1.4.0/debian/changelog --- node-regenerate-1.3.3/debian/changelog 2017-09-24 18:39:50.000000000 +0000 +++ node-regenerate-1.4.0/debian/changelog 2018-05-15 13:56:28.000000000 +0000 @@ -1,3 +1,14 @@ +node-regenerate (1.4.0-1) unstable; urgency=medium + + * New upstream release. + * Refresh packaging: + - Bump dh compat to 11. + - Bump std-ver to 4.1.4. + - Use my debian.org mail address. + - Point to the salsa repository. + + -- Julien Puydt Tue, 15 May 2018 15:56:28 +0200 + node-regenerate (1.3.3-1) unstable; urgency=medium * New upstream release. diff -Nru node-regenerate-1.3.3/debian/compat node-regenerate-1.4.0/debian/compat --- node-regenerate-1.3.3/debian/compat 2017-09-24 18:39:50.000000000 +0000 +++ node-regenerate-1.4.0/debian/compat 2018-05-15 13:56:28.000000000 +0000 @@ -1 +1 @@ -10 +11 diff -Nru node-regenerate-1.3.3/debian/control node-regenerate-1.4.0/debian/control --- node-regenerate-1.3.3/debian/control 2017-09-24 18:39:50.000000000 +0000 +++ node-regenerate-1.4.0/debian/control 2018-05-15 13:56:28.000000000 +0000 @@ -2,12 +2,12 @@ Section: javascript Priority: optional Maintainer: Debian Javascript Maintainers -Uploaders: Julien Puydt -Build-Depends: debhelper (>= 10) , nodejs -Standards-Version: 4.1.0 +Uploaders: Julien Puydt +Build-Depends: debhelper (>= 11) , nodejs +Standards-Version: 4.1.4 Homepage: https://mths.be/regenerate -Vcs-Git: https://anonscm.debian.org/git/pkg-javascript/node-regenerate.git -Vcs-Browser: https://anonscm.debian.org/git/pkg-javascript/node-regenerate.git +Vcs-Git: https://salsa.debian.org/js-team/node-regenerate.git +Vcs-Browser: https://salsa.debian.org/js/node-regenerate Package: node-regenerate Architecture: all diff -Nru node-regenerate-1.3.3/debian/copyright node-regenerate-1.4.0/debian/copyright --- node-regenerate-1.3.3/debian/copyright 2017-09-24 18:39:50.000000000 +0000 +++ node-regenerate-1.4.0/debian/copyright 2018-05-15 13:56:28.000000000 +0000 @@ -4,11 +4,11 @@ Source: https://mths.be/regenerate Files: * -Copyright: 2015 Mathias Bynens +Copyright: 2015-2018 Mathias Bynens License: Expat Files: debian/* -Copyright: 2015-2016 Julien Puydt +Copyright: 2015-2018 Julien Puydt License: Expat License: Expat diff -Nru node-regenerate-1.3.3/debian/rules node-regenerate-1.4.0/debian/rules --- node-regenerate-1.3.3/debian/rules 2017-09-24 18:39:50.000000000 +0000 +++ node-regenerate-1.4.0/debian/rules 2018-05-15 13:56:28.000000000 +0000 @@ -1,7 +1,4 @@ #!/usr/bin/make -f -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 - %: dh $@ diff -Nru node-regenerate-1.3.3/debian/source/lintian-overrides node-regenerate-1.4.0/debian/source/lintian-overrides --- node-regenerate-1.3.3/debian/source/lintian-overrides 2017-09-24 18:39:50.000000000 +0000 +++ node-regenerate-1.4.0/debian/source/lintian-overrides 2018-05-15 13:56:28.000000000 +0000 @@ -1,2 +1,2 @@ # Testing against the ECMAScript standard -node-regenerate source: source-is-missing tests/tests.js line length is 7214 characters (>512) +node-regenerate source: source-is-missing tests/tests.js line length is 7206 characters (>512) diff -Nru node-regenerate-1.3.3/package.json node-regenerate-1.4.0/package.json --- node-regenerate-1.3.3/package.json 2017-09-18 14:17:44.000000000 +0000 +++ node-regenerate-1.4.0/package.json 2018-05-12 23:14:09.000000000 +0000 @@ -1,6 +1,6 @@ { "name": "regenerate", - "version": "1.3.3", + "version": "1.4.0", "description": "Generate JavaScript-compatible regular expressions based on a given set of Unicode symbols or code points.", "homepage": "https://mths.be/regenerate", "main": "regenerate.js", diff -Nru node-regenerate-1.3.3/regenerate.js node-regenerate-1.4.0/regenerate.js --- node-regenerate-1.3.3/regenerate.js 2017-09-18 14:17:44.000000000 +0000 +++ node-regenerate-1.4.0/regenerate.js 2018-05-12 23:14:09.000000000 +0000 @@ -533,13 +533,21 @@ else if (codePoint == 0x0D) { string = '\\r'; } + else if (codePoint == 0x2D) { + // https://mathiasbynens.be/notes/javascript-escapes#hexadecimal + // Note: `-` (U+002D HYPHEN-MINUS) is escaped in this way rather + // than by backslash-escaping, in case the output is used outside + // of a character class in a `u` RegExp. /\-/u throws, but + // /\x2D/u is fine. + string = '\\x2D'; + } else if (codePoint == 0x5C) { string = '\\\\'; } else if ( codePoint == 0x24 || (codePoint >= 0x28 && codePoint <= 0x2B) || - (codePoint >= 0x2D && codePoint <= 0x2F) || + codePoint == 0x2E || codePoint == 0x2F || codePoint == 0x3F || (codePoint >= 0x5B && codePoint <= 0x5E) || (codePoint >= 0x7B && codePoint <= 0x7D) @@ -547,9 +555,10 @@ // The code point maps to an unsafe printable ASCII character; // backslash-escape it. Here’s the list of those symbols: // - // $()*+-./?[\]^{|} + // $()*+./?[\]^{|} // - // See #7 for more info. + // This matches SyntaxCharacters as well as `/` (U+002F SOLIDUS). + // https://tc39.github.io/ecma262/#prod-SyntaxCharacter string = '\\' + stringFromCharCode(codePoint); } else if (codePoint >= 0x20 && codePoint <= 0x7E) { @@ -563,7 +572,6 @@ string = stringFromCharCode(codePoint); } else if (codePoint <= 0xFF) { - // https://mathiasbynens.be/notes/javascript-escapes#hexadecimal string = '\\x' + pad(hex(codePoint), 2); } else { // `codePoint <= 0xFFFF` holds true. diff -Nru node-regenerate-1.3.3/tests/tests.js node-regenerate-1.4.0/tests/tests.js --- node-regenerate-1.3.3/tests/tests.js 2017-09-18 14:17:44.000000000 +0000 +++ node-regenerate-1.4.0/tests/tests.js 2018-05-12 23:14:09.000000000 +0000 @@ -315,8 +315,8 @@ 'toString escapes special characters using single escapes' ); equal( - set.clone().add('a', '.', '-', ']').toString(), - '[\\x03\\n\\-\\.\\]a]|\\uD834\\uDF06', + set.clone().add('a', '.', '-', ']', '/').toString(), + '[\\x03\\n\\x2D-\\/\\]a]|\\uD834\\uDF06', 'toString uses hexadecimal and Unicode escapes when appropriate' ); deepEqual(