feat(isValidNodeImport): mark unknown /es/ path as invalid without …

…depending on syntax detection (resolves #23)
unjs · Sep 20, 2022 · 70e2141 · 70e2141
1 parent 6b5df10
commit 70e2141
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/src/syntax.ts b/src/syntax.ts
@@ -77,7 +77,7 @@ export async function isValidNodeImport (id: string, _opts: ValidNodeImportOptio
   const pkg = await readPackageJSON(resolvedPath).catch(() => null)
   if (pkg?.type === 'module') { return true }
 
-  if (resolvedPath.match(/\.(\w+-)?esm?(-\w+)?\.js$/)) {
+  if (resolvedPath.match(/\.(\w+-)?esm?(-\w+)?\.js$|\/(esm?)\//)) {
     return false
   }
 

diff --git a/test/fixture/imports/js-esm/es/index.js b/test/fixture/imports/js-esm/es/index.js
@@ -0,0 +1,2 @@
+// @ts-ignore
+console.log(await Promise.resolve('foo'))
diff --git a/test/fixture/imports/js-esm/es/index.mjs b/test/fixture/imports/js-esm/es/index.mjs
@@ -0,0 +1,2 @@
+// @ts-ignore
+console.log(await Promise.resolve('foo'))
diff --git a/test/syntax.test.ts b/test/syntax.test.ts
@@ -55,15 +55,20 @@ const nodeImportTests = {
   [join(import.meta.url, '../fixture/imports/esm')]: true,
   [join(import.meta.url, '../fixture/imports/esm-module')]: true,
   [join(import.meta.url, '../fixture/imports/js-cjs')]: true,
-  [join(import.meta.url, '../fixture/imports/js-esm')]: false
+  [join(import.meta.url, '../fixture/imports/js-esm')]: false,
+  [join(import.meta.url, '../fixture/imports/js-esm/es/index.mjs')]: true,
+  [join(import.meta.url, '../fixture/imports/js-esm/es/index.js')]: false
 }
 
 describe('isValidNodeImport', () => {
   for (const [input, result] of Object.entries(nodeImportTests)) {
     it(input, async () => {
       try {
         expect(await isValidNodeImport(input)).to.equal(result)
-      } catch (e) {
+      } catch (err) {
+        if (result !== 'error') {
+          throw err
+        }
         expect(result).to.equal('error')
       }
     })