Release v2.2.3 (#73)

- dep(eslint): upgrade to v9
- when condensing whitespace, use global regex
- avoid a polynomial regex on uncontrolled data

Author: msimerson

.codeclimate.yml

@@ -1,9 +1,9 @@
 engines:
   eslint:
     enabled: true
-    channel: 'eslint-8'
+    channel: 'eslint-9'
     config:
-      config: '.eslintrc.yaml'
+      config: 'eslint.config.mjs'
 
 ratings:
   paths:

.eslintrc.yaml

@@ -4,6 +4,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/).
 
 ### Unreleased
 
+### [2.2.3] - 2025-01-13
+
+- dep(eslint): upgrade to v9
+
 ### [2.2.2] - 2024-04-29
 
 - doc(CONTRIBUTORS): added
@@ -87,3 +91,4 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/).
 [2.0.6]: https://github.com/haraka/node-address-rfc2822/releases/tag/2.0.6
 [0.0.2]: https://github.com/haraka/node-address-rfc2822/releases/tag/v0.0.2
 [2.2.2]: https://github.com/haraka/node-address-rfc2822/releases/tag/v2.2.2
+[2.2.3]: https://github.com/haraka/node-address-rfc2822/releases/tag/v2.2.3

.release

@@ -2,8 +2,9 @@
 
 This handcrafted artisinal software is brought to you by:
 
-| <img height="80" src="https://avatars.githubusercontent.com/u/261635?v=4"><br><a href="https://github.com/msimerson">msimerson</a> (<a href="https://github.com/haraka/node-address-rfc2822/commits?author=msimerson">39</a>) | <img height="80" src="https://avatars.githubusercontent.com/u/662371?v=4"><br><a href="https://github.com/baudehlo">baudehlo</a> (<a href="https://github.com/haraka/node-address-rfc2822/commits?author=baudehlo">13</a>) | <img height="80" src="https://avatars.githubusercontent.com/u/3326440?v=4"><br><a href="https://github.com/osm">osm</a> (<a href="https://github.com/haraka/node-address-rfc2822/commits?author=osm">2</a>) | <img height="80" src="https://avatars.githubusercontent.com/u/26602940?v=4"><br><a href="https://github.com/0xflotus">0xflotus</a> (<a href="https://github.com/haraka/node-address-rfc2822/commits?author=0xflotus">1</a>) | <img height="80" src="https://avatars.githubusercontent.com/u/362368?v=4"><br><a href="https://github.com/diasbruno">diasbruno</a> (<a href="https://github.com/haraka/node-address-rfc2822/commits?author=diasbruno">1</a>) | <img height="80" src="https://avatars.githubusercontent.com/u/3902676?v=4"><br><a href="https://github.com/kesselb">kesselb</a> (<a href="https://github.com/haraka/node-address-rfc2822/commits?author=kesselb">1</a>) | <img height="80" src="https://avatars.githubusercontent.com/u/260837?v=4"><br><a href="https://github.com/fionawhim">fionawhim</a> (<a href="https://github.com/haraka/node-address-rfc2822/commits?author=fionawhim">1</a>) |
+| <img height="80" src="https://avatars.githubusercontent.com/u/261635?v=4"><br><a href="https://github.com/msimerson">msimerson</a> (<a href="https://github.com/haraka/node-address-rfc2822/commits?author=msimerson">40</a>) | <img height="80" src="https://avatars.githubusercontent.com/u/662371?v=4"><br><a href="https://github.com/baudehlo">baudehlo</a> (<a href="https://github.com/haraka/node-address-rfc2822/commits?author=baudehlo">13</a>) | <img height="80" src="https://avatars.githubusercontent.com/u/3326440?v=4"><br><a href="https://github.com/osm">osm</a> (<a href="https://github.com/haraka/node-address-rfc2822/commits?author=osm">2</a>) | <img height="80" src="https://avatars.githubusercontent.com/u/26602940?v=4"><br><a href="https://github.com/0xflotus">0xflotus</a> (<a href="https://github.com/haraka/node-address-rfc2822/commits?author=0xflotus">1</a>) | <img height="80" src="https://avatars.githubusercontent.com/u/362368?v=4"><br><a href="https://github.com/diasbruno">diasbruno</a> (<a href="https://github.com/haraka/node-address-rfc2822/commits?author=diasbruno">1</a>) | <img height="80" src="https://avatars.githubusercontent.com/u/3902676?v=4"><br><a href="https://github.com/kesselb">kesselb</a> (<a href="https://github.com/haraka/node-address-rfc2822/commits?author=kesselb">1</a>) | <img height="80" src="https://avatars.githubusercontent.com/u/260837?v=4"><br><a href="https://github.com/fionawhim">fionawhim</a> (<a href="https://github.com/haraka/node-address-rfc2822/commits?author=fionawhim">1</a>) |
 | :---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: |
 |   <img height="80" src="https://avatars.githubusercontent.com/u/25829?v=4"><br><a href="https://github.com/markstos">markstos</a> (<a href="https://github.com/haraka/node-address-rfc2822/commits?author=markstos">1</a>)    |     <img height="80" src="https://avatars.githubusercontent.com/u/1705228?v=4"><br><a href="https://github.com/dwali">dwali</a> (<a href="https://github.com/haraka/node-address-rfc2822/commits?author=dwali">1</a>)      |
 
-<sub>this file is maintained by [.release](https://github.com/msimerson/.release)</sub>
+<sub>this file is generated by [.release](https://github.com/msimerson/.release).
+Contribute to this project to get your GitHub profile included here.</sub>

CHANGELOG.md

@@ -0,0 +1,25 @@
+import globals from 'globals'
+import path from 'node:path'
+import { fileURLToPath } from 'node:url'
+import js from '@eslint/js'
+import { FlatCompat } from '@eslint/eslintrc'
+
+const __filename = fileURLToPath(import.meta.url)
+const __dirname = path.dirname(__filename)
+const compat = new FlatCompat({
+  baseDirectory: __dirname,
+  recommendedConfig: js.configs.recommended,
+  allConfig: js.configs.all,
+})
+
+export default [
+  ...compat.extends('@haraka'),
+  {
+    languageOptions: {
+      globals: {
+        ...globals.node,
+        ...globals.mocha,
+      },
+    },
+  },
+]

CONTRIBUTORS.md

@@ -40,9 +40,7 @@ exports.parse = function parse(line, opts = null) {
     commaInDisplayName: allowCommaInDisplayName,
   })
 
-  if (!addr) throw new Error('No results')
-
-  // console.log("Parsed to: ", require('util').inspect(addr, {depth: 10, colors: true}));
+  if (!addr || addr.length === 0) throw new Error('No results')
 
   return addr.addresses.map(map_addresses)
 }
@@ -93,8 +91,7 @@ class Group {
 
     if (!(phrase && phrase.length)) phrase = this.comment
 
-    const name = _extract_name(phrase)
-    return name
+    return _extract_name(phrase)
   }
 }
 
@@ -233,7 +230,7 @@ function _extract_name(name) {
   if (/=?.*?\?=/.test(name)) return ''
 
   // trim & condense whitespace
-  name = name.trim().replace(/\s+/, ' ')
+  name = name.trim().replace(/\s+/g, ' ')
 
   // Disregard numeric names (e.g. 123456.1234@compuserve.com)
   if (/^[\d ]+$/.test(name)) return ''
@@ -247,7 +244,7 @@ function _extract_name(name) {
     name = name.slice(1, name.length - 1)
 
   name = name
-    .replace(/\(.*?\)/g, '') // remove minimal embedded comments
+    .replace(/\([^)]*\)/g, '') // remove minimal embedded comments
     .replace(/\\/g, '') // remove all escapes
 
   // remove internal quotation marks

eslint.config.mjs

@@ -1,6 +1,6 @@
 {
   "name": "address-rfc2822",
-  "version": "2.2.2",
+  "version": "2.2.3",
   "description": "RFC 2822 & 5322 (Header) email address parser",
   "main": "index.js",
   "files": [
@@ -18,8 +18,8 @@
   ],
   "scripts": {
     "format": "npm run prettier:fix && npm run lint:fix",
-    "lint": "npx eslint@^8 *.js test",
-    "lint:fix": "npx eslint@^8 *.js test --fix",
+    "lint": "npx eslint *.js test",
+    "lint:fix": "npx eslint *.js test --fix",
     "prettier": "npx prettier . --check",
     "prettier:fix": "npx prettier . --write --log-level=warn",
     "test": "npx mocha@10",
@@ -31,7 +31,7 @@
     "url": "https://github.com/haraka/node-address-rfc2822.git"
   },
   "devDependencies": {
-    "@haraka/eslint-config": "1.1.5"
+    "@haraka/eslint-config": "2.0.2"
   },
   "license": "MIT",
   "dependencies": {

index.js

@@ -40,43 +40,44 @@ describe('nameCase', function () {
 })
 
 describe('parseFrom', function () {
-  it('Travis CI <builds@travis-ci.org>', function (done) {
+  it('Travis CI <builds@travis-ci.org>', function () {
     try {
       const r = address.parseFrom('Travis CI <builds@travis-ci.org>')
-      assert.equal(r[0].address, 'builds@travis-ci.org')
-      // console.log(r);
+      assert.deepEqual(r[0], {
+        phrase: 'Travis CI',
+        comment: '',
+        address: 'builds@travis-ci.org',
+      })
     } catch (e) {
       console.error(e)
     }
-    done()
   })
-  it('root (Cron Daemon)', function (done) {
+
+  it('root (Cron Daemon)', function () {
     try {
       const r = address.parseFrom('root (Cron Daemon)')
-      assert.equal(r[0].address, '')
-      // console.log(r);
+      assert.deepEqual(r[0], { address: '' })
     } catch (e) {
       assert.equal(e.message, 'No results')
     }
-    done()
   })
 })
 
 describe('parseSender', function () {
-  it('"Anne Standley, PMPM" <info=protectmypublicmedia.org@mail172.atl101.mcdlv.net>', function (done) {
+  it('"Anne Standley, PMPM" <info=protectmypublicmedia.org@mail172.atl101.mcdlv.net>', function () {
     try {
       const r = address.parseSender(
         '"Anne Standley, PMPM" <info=protectmypublicmedia.org@mail172.atl101.mcdlv.net>',
       )
-      assert.equal(
-        r[0].address,
-        'info=protectmypublicmedia.org@mail172.atl101.mcdlv.net',
-      )
+      assert.deepEqual(r[0], {
+        address: 'info=protectmypublicmedia.org@mail172.atl101.mcdlv.net',
+        comment: '',
+        phrase: 'Anne Standley, PMPM',
+      })
       // console.log(r);
     } catch (e) {
       console.error(e)
     }
-    done()
   })
 })
 
@@ -86,7 +87,12 @@ describe('parseReplyTo', function () {
       const r = address.parseReplyTo(
         '=?utf-8?Q?Anne=20Standley=2C=20Protect=20My=20Public=20Media?= <info@protectmypublicmedia.org>',
       )
-      assert.equal(r[0].address, 'info@protectmypublicmedia.org')
+      assert.deepEqual(r[0], {
+        address: 'info@protectmypublicmedia.org',
+        comment: '',
+        phrase:
+          '=?utf-8?Q?Anne=20Standley=2C=20Protect=20My=20Public=20Media?=',
+      })
       // console.log(r);
     } catch (e) {
       console.error(e)