deps: update to cjs-module-lexer@1.2.2

PR-URL: nodejs#39402 Backport-PR-URL: nodejs#39422 Reviewed-By: Bradley Farias <bradley.meck@gmail.com> Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com> Reviewed-By: Zijian Liu <lxxyxzj@gmail.com> Reviewed-By: Michaël Zasso <targos@protonmail.com> Reviewed-By: Jan Krems <jan.krems@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
guybedford · Jul 26, 2021 · 1d8fb25 · 1d8fb25
1 parent 1b7af5b
commit 1d8fb25
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 9 deletions.
diff --git a/deps/cjs-module-lexer/CHANGELOG.md b/deps/cjs-module-lexer/CHANGELOG.md
@@ -1,3 +1,6 @@
+1.2.2
+- Fix RollupJS reexports bug (https://github.com/guybedford/cjs-module-lexer/pull/59)
+
 1.2.1
 - Support Unicode escapes in strings (https://github.com/guybedford/cjs-module-lexer/pull/55)
 - Filter export strings to valid surrogate pairs (https://github.com/guybedford/cjs-module-lexer/pull/56)

diff --git a/deps/cjs-module-lexer/README.md b/deps/cjs-module-lexer/README.md
@@ -113,7 +113,7 @@ EXPORT_STAR_LIB: `Object.keys(` IDENTIFIER$1 `).forEach(function (` IDENTIFIER$2
         (`if (` IDENTIFIER$2 `in` EXPORTS_IDENTIFIER `&&` EXPORTS_IDENTIFIER `[` IDENTIFIER$2 `] ===` IDENTIFIER$1 `[` IDENTIFIER$2 `]) return` `;`)?
       )?
     ) |
-    `if (` IDENTIFIER$2 `!==` ( `'default'` | `"default"` ) (`&& !` (`Object` `.prototype`? `.hasOwnProperty.call(`  IDENTIFIER$1 `, ` IDENTIFIER$2 `)` | IDENTIFIER$1 `.hasOwnProperty(` IDENTIFIER$2 `)`))? `)`
+    `if (` IDENTIFIER$2 `!==` ( `'default'` | `"default"` ) (`&& !` (`Object` `.prototype`? `.hasOwnProperty.call(`  IDENTIFIER `, ` IDENTIFIER$2 `)` | IDENTIFIER `.hasOwnProperty(` IDENTIFIER$2 `)`))? `)`
   )
   (
     EXPORTS_IDENTIFIER `[` IDENTIFIER$2 `] =` IDENTIFIER$1 `[` IDENTIFIER$2 `]` `;`? |

diff --git a/deps/cjs-module-lexer/dist/lexer.js b/deps/cjs-module-lexer/dist/lexer.js
diff --git a/deps/cjs-module-lexer/dist/lexer.mjs b/deps/cjs-module-lexer/dist/lexer.mjs
diff --git a/deps/cjs-module-lexer/lexer.js b/deps/cjs-module-lexer/lexer.js
@@ -651,8 +651,10 @@ function tryParseObjectDefineOrKeys (keys) {
             if (ch !== 33/*!*/) break;
             pos += 1;
             ch = commentWhitespace();
-            if (source.startsWith(id, pos)) {
-              pos += id.length;
+            if (ch === 79/*O*/ && source.startsWith('bject', pos + 1) && source[pos + 6] === '.') {
+              if (!tryParseObjectHasOwnProperty(it_id)) break;
+            }
+            else if (identifier()) {
               ch = commentWhitespace();
               if (ch !== 46/*.*/) break;
               pos++;
@@ -669,7 +671,7 @@ function tryParseObjectDefineOrKeys (keys) {
               if (ch !== 41/*)*/) break;
               pos += 1;
             }
-            else if (!tryParseObjectHasOwnProperty(it_id)) break;
+            else break;
             ch = commentWhitespace();
           }
           if (ch !== 41/*)*/) break;

diff --git a/deps/cjs-module-lexer/package.json b/deps/cjs-module-lexer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cjs-module-lexer",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "description": "Lexes CommonJS modules, returning their named exports metadata",
   "main": "lexer.js",
   "exports": {

diff --git a/doc/api/esm.md b/doc/api/esm.md
@@ -1284,7 +1284,7 @@ success!
 [`Uint8Array`]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Uint8Array
 [dynamic instantiate hook]: #esm_code_dynamicinstantiate_code_hook
 [`util.TextDecoder`]: util.md#util_class_util_textdecoder
-[cjs-module-lexer]: https://github.com/guybedford/cjs-module-lexer/tree/1.2.1
+[cjs-module-lexer]: https://github.com/guybedford/cjs-module-lexer/tree/1.2.2
 [special scheme]: https://url.spec.whatwg.org/#special-scheme
 [the official standard format]: https://tc39.github.io/ecma262/#sec-modules
 [transpiler loader example]: #esm_transpiler_loader