refactor: remove some regexps (esm-dev#979)

code · Jan 5, 2025 · 014ac3f · 014ac3f
1 parent cc0e0fb
commit 014ac3f
Show file tree

Hide file tree

Showing 9 changed files with 160 additions and 125 deletions.
diff --git a/server/build.go b/server/build.go
@@ -453,9 +453,9 @@ func (ctx *BuildContext) buildModule(analyzeMode bool) (meta *BuildMeta, include
 						pkgName, _, subPath, _ := splitEsmPath(specifier)
 						if pkgName == ctx.esm.PkgName {
 							version = ctx.esm.PkgVersion
-						} else if v, ok := ctx.pkgJson.Dependencies[pkgName]; ok && regexpVersionStrict.MatchString(v) {
+						} else if v, ok := ctx.pkgJson.Dependencies[pkgName]; ok && isExactVersion(v) {
 							version = v
-						} else if v, ok := ctx.pkgJson.PeerDependencies[pkgName]; ok && regexpVersionStrict.MatchString(v) {
+						} else if v, ok := ctx.pkgJson.PeerDependencies[pkgName]; ok && isExactVersion(v) {
 							version = v
 						}
 						p := pkgName
@@ -866,7 +866,7 @@ func (ctx *BuildContext) buildModule(analyzeMode bool) (meta *BuildMeta, include
 					} else if version, ok := ctx.pkgJson.PeerDependencies["svelte"]; ok {
 						svelteVersion = version
 					}
-					if !regexpVersionStrict.MatchString(svelteVersion) {
+					if !isExactVersion(svelteVersion) {
 						info, err := ctx.npmrc.getPackageInfo("svelte", svelteVersion)
 						if err != nil {
 							return esbuild.OnLoadResult{}, errors.New("failed to get svelte package info")
@@ -900,7 +900,7 @@ func (ctx *BuildContext) buildModule(analyzeMode bool) (meta *BuildMeta, include
 					} else if version, ok := ctx.pkgJson.PeerDependencies["vue"]; ok {
 						vueVersion = version
 					}
-					if !regexpVersionStrict.MatchString(vueVersion) {
+					if !isExactVersion(vueVersion) {
 						info, err := ctx.npmrc.getPackageInfo("vue", vueVersion)
 						if err != nil {
 							return esbuild.OnLoadResult{}, errors.New("failed to get vue package info")

diff --git a/server/build_resolver.go b/server/build_resolver.go
@@ -923,11 +923,11 @@ func (ctx *BuildContext) resolveExternalModule(specifier string, kind api.Resolv
 
 	var isFixedVersion bool
 	if dep.GhPrefix {
-		isFixedVersion = isCommitish(dep.PkgVersion) || regexpVersionStrict.MatchString(strings.TrimPrefix(dep.PkgVersion, "v"))
+		isFixedVersion = isCommitish(dep.PkgVersion) || isExactVersion(strings.TrimPrefix(dep.PkgVersion, "v"))
 	} else if dep.PrPrefix {
 		isFixedVersion = true
 	} else {
-		isFixedVersion = regexpVersionStrict.MatchString(dep.PkgVersion)
+		isFixedVersion = isExactVersion(dep.PkgVersion)
 	}
 	if isFixedVersion {
 		buildArgsPrefix := ""
@@ -1013,7 +1013,7 @@ func (ctx *BuildContext) resloveDTS(entry BuildEntry) (string, error) {
 	}
 
 	// lookup types in @types scope
-	if pkgJson := ctx.pkgJson; pkgJson.Types == "" && !strings.HasPrefix(pkgJson.Name, "@types/") && regexpVersionStrict.MatchString(pkgJson.Version) {
+	if pkgJson := ctx.pkgJson; pkgJson.Types == "" && !strings.HasPrefix(pkgJson.Name, "@types/") && isExactVersion(pkgJson.Version) {
 		versionParts := strings.Split(pkgJson.Version, ".")
 		versions := []string{
 			versionParts[0] + "." + versionParts[1], // major.minor

diff --git a/server/cjs_module_lexer.go b/server/cjs_module_lexer.go
@@ -140,7 +140,7 @@ RETRY:
 		if strings.HasPrefix(line, "@") {
 			ret.Reexport = line[1:]
 			break
-		} else if regexpJSIdent.MatchString(line) && !isJsReservedWord(line) {
+		} else if isJsIdentifier(line) && !isJsReservedWord(line) {
 			ret.Exports = append(ret.Exports, line)
 		}
 	}

diff --git a/server/legacy_router.go b/server/legacy_router.go
@@ -107,10 +107,9 @@ func legacyESM(ctx *rex.Context, pathname string) any {
 	if ctx.R.URL.RawQuery != "" {
 		query = "?" + ctx.R.URL.RawQuery
 	}
-	isFixedVersion := regexpVersionStrict.MatchString(pkgVersion)
-	if !isFixedVersion {
+	if !isExactVersion(pkgVersion) {
 		npmrc := DefaultNpmRC()
-		pkgInfo, err := npmrc.fetchPackageInfo(pkgName, pkgVersion)
+		pkgInfo, err := npmrc.getPackageInfo(pkgName, pkgVersion)
 		if err != nil {
 			if strings.Contains(err.Error(), " not found") {
 				return rex.Status(404, err.Error())

diff --git a/server/loader_implements.go b/server/loader_implements.go
@@ -79,7 +79,7 @@ func resolveSvelteVersion(npmrc *NpmRC, importMap common.ImportMap) (svelteVersi
 			}
 		}
 	}
-	if !regexpVersionStrict.MatchString(svelteVersion) {
+	if !isExactVersion(svelteVersion) {
 		var info *PackageJSON
 		info, err = npmrc.getPackageInfo("svelte", svelteVersion)
 		if err != nil {
@@ -282,7 +282,7 @@ func resolveVueVersion(npmrc *NpmRC, importMap common.ImportMap) (vueVersion str
 			}
 		}
 	}
-	if !regexpVersionStrict.MatchString(vueVersion) {
+	if !isExactVersion(vueVersion) {
 		var info *PackageJSON
 		info, err = npmrc.getPackageInfo("vue", vueVersion)
 		if err != nil {