fix: 编译器转义target异常

eavidy · Sep 9, 2023 · 6533f21 · 6533f21
1 parent ca7a75f
commit 6533f21
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 10 deletions.
diff --git a/src/compiler/errors.cts b/src/compiler/errors.cts
@@ -13,4 +13,3 @@ export class NoCompileError extends Error {
  );
  }
 }
-console.log(home);
diff --git a/src/compiler/swc-complier.cts b/src/compiler/swc-complier.cts
@@ -80,7 +80,7 @@ export function transform(source: string, path: string, options?: Options) {
 function TsConfigToSwcConfig(filename?: string, options: ts.CompilerOptions = {}): SwcOptions {
  const { target, module } = options;
  let swcTarget: JscTarget = (
- target === ScriptTarget.ESNext ? "esnext" : ScriptTarget[target as any].toLowerCase()
+ (target as any as ScriptTarget) === ScriptTarget.ESNext ? "esnext" : ScriptTarget[target as any]?.toLowerCase()
  ) as any;
 
  let swcModule: string = "es6";

diff --git a/src/hook_config.cts b/src/hook_config.cts
@@ -1,7 +1,6 @@
 import type ts from "typescript";
 import * as Path from "node:path";
-import { ModuleKind, jsonToTsConfig, parseJson, readTsConfigFileSync } from "./util/tslib.js";
-import { getESVersion } from "./lib/es.js";
+import { ModuleKind, ScriptTarget, jsonToTsConfig, parseJson, readTsConfigFileSync } from "./util/tslib.js";
 interface ProcessEnv {
  SAME_PARSER?: string;
  TS_COMPILER_OPTIONS?: string;
@@ -35,7 +34,7 @@ function getDefaultCompilerOptions() {
  //解析环境变量中的编译选项
  let fileContent = process.env["TS_COMPILER_OPTIONS"];
  if (fileContent) Object.assign(compilerOptions, jsonToTsConfig(parseJson(fileContent)));
- if (!compilerOptions.target) compilerOptions.target = getESVersion() - 13;
+ if (!compilerOptions.target) compilerOptions.target = ScriptTarget.ES2022 as any;
  return compilerOptions;
 }
 const DEFAULT_COMPILER_OPTIONS = getDefaultCompilerOptions();

diff --git a/src/lib/es.ts b/src/lib/es.ts
@@ -10,4 +10,3 @@ export function getESVersion(): number {
  return version;
 }
 declare let Array: any;
-console.log(getESVersion());
diff --git a/src/util/tslib.ts b/src/util/tslib.ts
@@ -66,10 +66,10 @@ export function jsonToTsConfig(json: RawTsCompilerOptions, safe?: boolean) {
  let tsConfig: ts.CompilerOptions = { ...json };
  if (json.target) {
  let targetKey: any = (json.target as string).toUpperCase();
- if (targetKey === "ESNEXT") tsConfig.target = ScriptTarget.ESNext;
- else if (targetKey.startsWith("ES")) tsConfig.target = ScriptTarget[targetKey] as any as ScriptTarget;
- else if (targetKey === "LATEST") tsConfig.target = ScriptTarget.Latest;
- else if (targetKey === "JSON") tsConfig.target = ScriptTarget.JSON;
+ if (targetKey === "ESNEXT") tsConfig.target = ScriptTarget.ESNext as any;
+ else if (targetKey.startsWith("ES")) tsConfig.target = ScriptTarget[targetKey] as any;
+ else if (targetKey === "LATEST") tsConfig.target = ScriptTarget.Latest as any;
+ else if (targetKey === "JSON") tsConfig.target = ScriptTarget.JSON as any;
  else if (!safe) throw new FelidError("target");
  }
  if (json.moduleResolution) {
@@ -106,6 +106,8 @@ enum ScriptTarget {
  ES2020 = 7,
  ES2021 = 8,
  ES2022 = 9,
+ ES2023 = 10,
+ ES2024 = 11,
  ESNext = 99,
  JSON = 100,
  Latest = 99,
@@ -135,6 +137,10 @@ class FelidError extends Error {
  super(`The value of Field ${felid} is incorrect`);
  }
 }
+export type CompilerOptions = Omit<ts.CompilerOptions, "target" | "moduleResolution"> & {
+ target: ScriptTarget;
+ moduleResolution: ModuleKind;
+};
 export type RawTsCompilerOptions = {
  [key in keyof ts.CompilerOptions]: ts.CompilerOptions[key] extends string | boolean | undefined | null
  ? ts.CompilerOptions[key]