From 4d52f20499666d9a8c626a981dc2497d2e24e471 Mon Sep 17 00:00:00 2001
From: yeliex <yeliex@yeliex.com>
Date: Mon, 27 May 2024 14:46:52 +0800
Subject: [PATCH] fix: fix ts extention detect regex, close #775 #774 #772

---
 .../__tests__/extention/extention.spec.ts     | 38 +++++++++++++++++++
 packages/integrate/package.json               |  4 +-
 packages/integrate/tsconfig.json              |  8 +++-
 packages/register/register.ts                 |  4 +-
 pnpm-lock.yaml                                |  6 +++
 5 files changed, 55 insertions(+), 5 deletions(-)
 create mode 100644 packages/integrate/__tests__/extention/extention.spec.ts

diff --git a/packages/integrate/__tests__/extention/extention.spec.ts b/packages/integrate/__tests__/extention/extention.spec.ts
new file mode 100644
index 000000000..0d078b8ec
--- /dev/null
+++ b/packages/integrate/__tests__/extention/extention.spec.ts
@@ -0,0 +1,38 @@
+import { AVAILABLE_EXTENSION_PATTERN, AVAILABLE_TS_EXTENSION_PATTERN } from '@swc-node/register/register.ts'
+import test from 'ava'
+import * as ts from 'typescript'
+
+const tsExtensions = [ts.Extension.Ts, ts.Extension.Tsx, ts.Extension.Mts, ts.Extension.Cts]
+const nonTsExtensions = [ts.Extension.Js, ts.Extension.Jsx, ts.Extension.Mjs, ts.Extension.Cjs, '.es6', '.es']
+const defaultExtensions = [...tsExtensions, ...nonTsExtensions]
+const ignoreExtensions = ['.txt', '.json', '.xml']
+
+test(`AVAILABLE_TS_EXTENSION_PATTERN matches TypeScript extensions`, (t) => {
+  tsExtensions.forEach((ext) => {
+    t.true(AVAILABLE_TS_EXTENSION_PATTERN.test(`file${ext}`))
+  })
+})
+
+test(`AVAILABLE_TS_EXTENSION_PATTERN does not match d.ts`, (t) => {
+  tsExtensions.forEach((ext) => {
+    t.false(AVAILABLE_TS_EXTENSION_PATTERN.test(`file.d${ext}`))
+  })
+})
+
+test(`AVAILABLE_TS_EXTENSION_PATTERN does not match non-ts extensions`, (t) => {
+  ;[...nonTsExtensions, ...ignoreExtensions].forEach((ext) => {
+    t.false(AVAILABLE_TS_EXTENSION_PATTERN.test(`file${ext}`))
+  })
+})
+
+test(`AVAILABLE_EXTENSION_PATTERN matches default extensions`, (t) => {
+  defaultExtensions.forEach((ext) => {
+    t.true(AVAILABLE_EXTENSION_PATTERN.test(`file${ext}`))
+  })
+})
+
+test(`AVAILABLE_EXTENSION_PATTERN does not match non-default extensions`, (t) => {
+  ignoreExtensions.forEach((ext) => {
+    t.false(AVAILABLE_EXTENSION_PATTERN.test(`file${ext}`))
+  })
+})
diff --git a/packages/integrate/package.json b/packages/integrate/package.json
index 0af73506a..e8b565788 100644
--- a/packages/integrate/package.json
+++ b/packages/integrate/package.json
@@ -21,12 +21,14 @@
   "devDependencies": {
     "@swc/helpers": "^0.5.11",
     "@swc-node/core": "^1.13.0",
+    "@swc-node/register": "workspace:*",
     "@types/jest": "^29.5.12",
     "@types/react": "^18.3.1",
     "@types/react-dom": "^18.3.0",
     "jest": "^29.7.0",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
-    "sinon": "^17.0.1"
+    "sinon": "^17.0.1",
+    "typescript": "^5.4.5"
   }
 }
diff --git a/packages/integrate/tsconfig.json b/packages/integrate/tsconfig.json
index 9ae841d91..4fded3862 100644
--- a/packages/integrate/tsconfig.json
+++ b/packages/integrate/tsconfig.json
@@ -6,13 +6,17 @@
     "outDir": "./lib",
     "jsx": "react-jsx",
     "types": ["node", "jest"],
+    "allowImportingTsExtensions": true
   },
   "references": [
     {
-      "path": "../core",
+      "path": "../core"
     },
+    {
+      "path": "../register"
+    }
   ],
   "include": ["."],
   "files": ["./package.json"],
-  "exclude": ["lib"],
+  "exclude": ["lib"]
 }
diff --git a/packages/register/register.ts b/packages/register/register.ts
index 0f80a1055..89a579dc4 100644
--- a/packages/register/register.ts
+++ b/packages/register/register.ts
@@ -19,12 +19,12 @@ const DEFAULT_EXTENSIONS = [
 ]
 
 export const AVAILABLE_TS_EXTENSION_PATTERN = new RegExp(
-  `(?<!\\.d(${[ts.Extension.Ts, ts.Extension.Tsx, ts.Extension.Mts, ts.Extension.Cts].map((ext) => ext.replace(/^\./, '\\.')).join('|')}))$`,
+  `((?<!\\.d)(${[ts.Extension.Ts, ts.Extension.Tsx, ts.Extension.Mts, ts.Extension.Cts].map((ext) => ext.replace(/^\./, '\\.')).join('|')}))$`,
   'i',
 )
 
 export const AVAILABLE_EXTENSION_PATTERN = new RegExp(
-  `(?<!\\.d(${DEFAULT_EXTENSIONS.map((ext) => ext.replace(/^\./, '\\.')).join('|')}))$`,
+  `((?<!\\.d)(${DEFAULT_EXTENSIONS.map((ext) => ext.replace(/^\./, '\\.')).join('|')}))$`,
   'i',
 )
 
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 4c51c0297..54c620e22 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -122,6 +122,9 @@ importers:
       '@swc-node/core':
         specifier: ^1.13.0
         version: link:../core
+      '@swc-node/register':
+        specifier: workspace:*
+        version: link:../register
       '@swc/helpers':
         specifier: ^0.5.11
         version: 0.5.11
@@ -146,6 +149,9 @@ importers:
       sinon:
         specifier: ^17.0.1
         version: 17.0.1
+      typescript:
+        specifier: ^5.4.5
+        version: 5.4.5
 
   packages/integrate-module:
     dependencies: