From 666b2a89448d0711c9f441f3365e9c5b92cf42ec Mon Sep 17 00:00:00 2001
From: imsenyu <imsenyu@gmail.com>
Date: Tue, 25 Mar 2025 23:57:36 +0800
Subject: [PATCH 01/18] feat: jsesc

---
 CMakeLists.txt                                |   4 +-
 src/babel/babel-arena/memory.hpp              |   2 +-
 .../babel-generator/generators/types.hpp      |   9 +-
 src/babel/babel-generator/index.h             |   6 +-
 src/babel/babel-generator/index.hpp           |   3 +-
 src/babel/babel-generator/printer.hpp         |   5 +-
 src/babel/babel-generator/test/index.hpp      |   4 +-
 src/babel/babel-parser/index.h                |  10 +-
 src/babel/babel-parser/index.hpp              |   4 +-
 src/benchmark/generate.hpp                    |   4 +-
 src/npm_modules/jsesc/jsesc.hpp               | 427 ++++++++++++++++++
 src/testrunner-babel-parser.cpp               |   2 +-
 12 files changed, 459 insertions(+), 21 deletions(-)
 create mode 100644 src/npm_modules/jsesc/jsesc.hpp

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8548984d..dadf7a22 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,7 +23,9 @@ if(${COVERAGE})
         )
     endif()
 endif()
-set(CMAKE_INTERPROCEDURAL_OPTIMIZATION TRUE)
+if(CMAKE_BUILD_TYPE STREQUAL "Release")
+    set(CMAKE_INTERPROCEDURAL_OPTIMIZATION TRUE)
+endif ()
 # compile
 if (MSVC)
     add_compile_options(/Zc:preprocessor)
diff --git a/src/babel/babel-arena/memory.hpp b/src/babel/babel-arena/memory.hpp
index d5cccb71..91724a1f 100644
--- a/src/babel/babel-arena/memory.hpp
+++ b/src/babel/babel-arena/memory.hpp
@@ -31,7 +31,7 @@ namespace BabelArena {
           approximate_size = codeSize * 10.0;
           break;
         case static_cast<size_t>(MemoryType::String):
-          approximate_size = codeSize / 50.0;
+          approximate_size = codeSize / 10.0;
           break;
         case static_cast<size_t>(MemoryType::Identifier):
           approximate_size = codeSize * 10.0;
diff --git a/src/babel/babel-generator/generators/types.hpp b/src/babel/babel-generator/generators/types.hpp
index c72adfa3..b3abc71f 100644
--- a/src/babel/babel-generator/generators/types.hpp
+++ b/src/babel/babel-generator/generators/types.hpp
@@ -5,6 +5,7 @@
 #include "../printer.hpp"
 #include "./index.h"
 #include "./methods.hpp"
+#include "../../../npm_modules/jsesc/jsesc.hpp"
 
 namespace BabelGenerator::Generators {
   using namespace BabelParser;
@@ -267,10 +268,10 @@ namespace BabelGenerator::Generators {
       _this.token(*raw);
       return;
     }
-    //
-    //  const val = jsesc(node.value, this.format.jsescOption);
-    //
-    //  this.token(val);
+
+    auto val = Jsesc::jsesc(_this.allocator, node->value);
+    // auto val = Jsesc::jsesc(_this.allocator, node->value, this.format.jsescOption);
+    _this.token(val);
   }
 
   DEF_GENERATOR(BigIntLiteral, node, _) {
diff --git a/src/babel/babel-generator/index.h b/src/babel/babel-generator/index.h
index e50473f6..54eb75a3 100644
--- a/src/babel/babel-generator/index.h
+++ b/src/babel/babel-generator/index.h
@@ -1,9 +1,13 @@
 #pragma once
 
 #include "../../base/unicode.hpp"
+#include "../../base/allocator.hpp"
 #include "../babel-types/ast-types/generated/enum.hpp"
 #include "../babel-types/ast-types/generated/index.hpp"
 
+namespace BabelArena {
+  class Memory;
+}
 namespace BabelGenerator {
 
   struct GeneratorResult {
@@ -130,5 +134,5 @@ namespace BabelGenerator {
     std::optional<BabelTypes::Enum::FormatImportAttributesKeyword::Value> importAttributesKeyword;
   };
   GeneratorResult
-  generate(PTR(BabelParser::Node::File) ast, GeneratorOptions opts = GeneratorOptions{}, std::optional<BASE::UStringView> code = std::nullopt);
+  generate(BabelArena::Memory& allocator, PTR(BabelParser::Node::File) ast, GeneratorOptions opts = GeneratorOptions{}, std::optional<BASE::UStringView> code = std::nullopt);
 } // namespace BabelGenerator
diff --git a/src/babel/babel-generator/index.hpp b/src/babel/babel-generator/index.hpp
index 1e58812d..1e303c77 100644
--- a/src/babel/babel-generator/index.hpp
+++ b/src/babel/babel-generator/index.hpp
@@ -148,6 +148,7 @@ namespace BabelGenerator {
    * @returns - an object containing the output code and source map.
    */
   GeneratorResult generate(
+    BabelArena::Memory& allocator,
     PTR(Node::File) ast, GeneratorOptions opts, std::optional<BASE::UStringView> code
     // code?: string | { [filename: string]: string },
   ) {
@@ -160,7 +161,7 @@ namespace BabelGenerator {
     //   (ast as any).tokens,
     //   typeof code === "string" ? code : null,
     // );
-    Printer::Printer printer(format, code);
+    Printer::Printer printer(*allocator.string(), format, code);
 
     return printer.generate(ast);
   }
diff --git a/src/babel/babel-generator/printer.hpp b/src/babel/babel-generator/printer.hpp
index 04ba4085..eae33094 100644
--- a/src/babel/babel-generator/printer.hpp
+++ b/src/babel/babel-generator/printer.hpp
@@ -169,7 +169,10 @@ namespace BabelGenerator::Printer {
     //  }
     //  declare _inputMap: TraceMap;
 
-    Printer(Format const &format, std::optional<BASE::UStringView> originalCode = std::nullopt) :
+    BASE::Memory::Allocator& allocator;
+
+    Printer(BASE::Memory::Allocator& allocator, Format const &format, std::optional<BASE::UStringView> originalCode = std::nullopt) :
+      allocator(allocator),
       format(format),
       _buf(format.indent.style[0], _originalCode ? _originalCode->size() : 0),
       _indentRepeat(format.indent.style.size()),
diff --git a/src/babel/babel-generator/test/index.hpp b/src/babel/babel-generator/test/index.hpp
index 0469bc3e..6fc98721 100644
--- a/src/babel/babel-generator/test/index.hpp
+++ b/src/babel/babel-generator/test/index.hpp
@@ -22,10 +22,10 @@ namespace BabelGenerator {
       if (!throwMsg.has_value()) {
         auto resultCode = BabelParser::withParser(
           actualCode, parserOpts,
-          [&](PTR(BabelParser::Node::File) file, BabelParser::Options::Options const &options)
+          [&](BabelArena::Memory& allocator, PTR(BabelParser::Node::File) file, BabelParser::Options::Options const &options)
           {
             auto generatorOptions = task.options.toGeneratorOptions();
-            auto result = BabelGenerator::generate(file, generatorOptions);
+            auto result = BabelGenerator::generate(allocator, file, generatorOptions);
             return result.code;
           }
         );
diff --git a/src/babel/babel-parser/index.h b/src/babel/babel-parser/index.h
index acec8eb9..93aeb860 100644
--- a/src/babel/babel-parser/index.h
+++ b/src/babel/babel-parser/index.h
@@ -14,15 +14,15 @@ namespace BabelParser {
   using ParseFunction = JSON(BASE::UStringView const &source, Options::PartialOptions);
 
   struct ParseArgumentedCallback {
-    using Callback = void (*)(PTR(BabelParser::Node::File), BabelParser::Options::Options const &, void *arguments);
+    using Callback = void (*)(BabelArena::Memory&, PTR(BabelParser::Node::File), BabelParser::Options::Options const &, void *arguments);
     void *arguments;
     Callback callback;
-    void invoke(PTR(BabelParser::Node::File) file, BabelParser::Options::Options const &options) { this->callback(file, options, this->arguments); }
+    void invoke(BabelArena::Memory& allocator, PTR(BabelParser::Node::File) file, BabelParser::Options::Options const &options) { this->callback(allocator, file, options, this->arguments); }
   };
   extern void withParserImpl(const BASE::UStringView &source, Options::PartialOptions partial, ParseArgumentedCallback callback);
   template<class CB>
   inline auto withParser(const BASE::UStringView &source, Options::PartialOptions partial, CB &&callback) {
-    using ReturnType = typename std::invoke_result_t<CB, PTR(BabelParser::Node::File), BabelParser::Options::Options const &>;
+    using ReturnType = typename std::invoke_result_t<CB, BabelArena::Memory&, PTR(BabelParser::Node::File), BabelParser::Options::Options const &>;
     struct Arguments {
       CB &&callback;
       std::optional<ReturnType> returnValue = std::nullopt;
@@ -33,10 +33,10 @@ namespace BabelParser {
       ParseArgumentedCallback{
         .arguments = &args,
         .callback =
-          [](PTR(BabelParser::Node::File) file, BabelParser::Options::Options const &options, void *_arguments)
+          [](BabelArena::Memory& allocator, PTR(BabelParser::Node::File) file, BabelParser::Options::Options const &options, void *_arguments)
         {
           auto const &arguments = static_cast<Arguments *>(_arguments);
-          arguments->returnValue = arguments->callback(file, options);
+          arguments->returnValue = arguments->callback(allocator, file, options);
         }
       }
     );
diff --git a/src/babel/babel-parser/index.hpp b/src/babel/babel-parser/index.hpp
index a0c14622..809edb37 100644
--- a/src/babel/babel-parser/index.hpp
+++ b/src/babel/babel-parser/index.hpp
@@ -56,7 +56,7 @@ namespace BabelParser {
       [&]<class PARSER>(PARSER &&parser)
       {
         auto file = parser.parse();
-        callback.invoke(file, options);
+        callback.invoke(allocator, file, options);
       },
       allocator, options, source
     );
@@ -92,7 +92,7 @@ namespace BabelParser {
     BASE::UString code;
     {
       STAT_TIMING(Generator, Generate)
-      code = std::move(BabelGenerator::generate(file).code);
+      code = std::move(BabelGenerator::generate(*allocator, file).code);
     }
     {
       STAT_TIMING(Runtime, Deallocation)
diff --git a/src/benchmark/generate.hpp b/src/benchmark/generate.hpp
index 7886b470..c3621cbb 100644
--- a/src/benchmark/generate.hpp
+++ b/src/benchmark/generate.hpp
@@ -30,10 +30,10 @@ static void BM_BabelGenerate(benchmark::State &state, std::string const &filenam
 
   auto ret = BabelParser::withParser(
     code, BabelParser::Options::PartialOptions{},
-    [&](PTR(BabelParser::Node::File) file, BabelParser::Options::Options const &options)
+    [&](BabelArena::Memory& allocator, PTR(BabelParser::Node::File) file, BabelParser::Options::Options const &options)
     {
       for (auto _ : state) {
-        auto code = BabelGenerator::generate(file).code;
+        auto code = BabelGenerator::generate(allocator, file).code;
         benchmark::DoNotOptimize(code);
       }
       return true;
diff --git a/src/npm_modules/jsesc/jsesc.hpp b/src/npm_modules/jsesc/jsesc.hpp
new file mode 100644
index 00000000..973af1d0
--- /dev/null
+++ b/src/npm_modules/jsesc/jsesc.hpp
@@ -0,0 +1,427 @@
+#pragma once
+
+#include "../../babel/babel-arena/index.hpp"
+#include "../../base/unicode.hpp"
+#include "../../base/string.hpp"
+#include "../../base/allocator.hpp"
+
+namespace Jsesc {
+//
+//const object = {};
+//const hasOwnProperty = object.hasOwnProperty;
+//const forOwn = (object, callback) => {
+//	for (const key in object) {
+//		if (hasOwnProperty.call(object, key)) {
+//			callback(key, object[key]);
+//		}
+//	}
+//};
+//
+//const extend = (destination, source) => {
+//	if (!source) {
+//		return destination;
+//	}
+//	forOwn(source, (key, value) => {
+//		destination[key] = value;
+//	});
+//	return destination;
+//};
+//
+//const forEach = (array, callback) => {
+//	const length = array.length;
+//	let index = -1;
+//	while (++index < length) {
+//		callback(array[index]);
+//	}
+//};
+//
+//const fourHexEscape = (hex) => {
+//	return '\\u' + ('0000' + hex).slice(-4);
+//}
+//
+  inline std::array<BASE::UChar, 4> hexadecimal(BASE::UChar code, bool lowercase, int* size = nullptr) {
+    std::array<BASE::UChar, 4> escaped{u'0',u'0',u'0',u'0'};
+    int i;
+    for(i = 3; i >= 0; i--) {
+      uint8_t ch = code % 16;
+      code = (code - ch) / 16;
+      if (ch < 10) {
+        escaped[i] = u'0' + ch;
+      } else if (!lowercase) {
+        escaped[i] = u'A' + ch - 10;
+      } else {
+        escaped[i] = u'a' + ch - 10;
+      }
+      if (!code) {
+        break;
+      }
+    }
+    if (size != nullptr) {
+      *size = 4 - i;
+    }
+    return escaped;
+  }
+  inline void fourHexEscape(BASE::String::Slices<BASE::UStringView>& str, BASE::UChar code, bool lowercase) {
+    auto const& hex = hexadecimal(code, lowercase);
+    str.add<2>(u"\\u");
+    str.add(hex[0]);
+    str.add(hex[1]);
+    str.add(hex[2]);
+    str.add(hex[3]);
+  }
+//const toString = object.toString;
+//const isArray = Array.isArray;
+//const isBuffer = (value) => {
+//	return typeof Buffer === 'function' && Buffer.isBuffer(value);
+//};
+//const isObject = (value) => {
+//	// This is a very simple check, but it’s good enough for what we need.
+//	return toString.call(value) == '[object Object]';
+//};
+//const isString = (value) => {
+//	return typeof value == 'string' ||
+//		toString.call(value) == '[object String]';
+//};
+//const isNumber = (value) => {
+//	return typeof value == 'number' ||
+//		toString.call(value) == '[object Number]';
+//};
+//const isFunction = (value) => {
+//	return typeof value == 'function';
+//};
+//const isMap = (value) => {
+//	return toString.call(value) == '[object Map]';
+//};
+//const isSet = (value) => {
+//	return toString.call(value) == '[object Set]';
+//};
+//
+///*--------------------------------------------------------------------------*/
+//
+//// https://mathiasbynens.be/notes/javascript-escapes#single
+//const singleEscapes = {
+//	'\\': '\\\\',
+//	'\b': '\\b',
+//	'\f': '\\f',
+//	'\n': '\\n',
+//	'\r': '\\r',
+//	'\t': '\\t'
+//	// `\v` is omitted intentionally, because in IE < 9, '\v' == 'v'.
+//	// '\v': '\\x0B'
+//};
+//const regexSingleEscape = /[\\\b\f\n\r\t]/;
+//
+//const regexDigit = /[0-9]/;
+//const regexWhitespace = /[\xA0\u1680\u2000-\u200A\u2028\u2029\u202F\u205F\u3000]/;
+//
+//const escapeEverythingRegex = /([\uD800-\uDBFF][\uDC00-\uDFFF])|([\uD800-\uDFFF])|(['"`])|[^]/g;
+//const escapeNonAsciiRegex = /([\uD800-\uDBFF][\uDC00-\uDFFF])|([\uD800-\uDFFF])|(['"`])|[^ !#-&\(-\[\]-_a-~]/g;
+//
+inline BASE::UStringViewArray<3> jsesc(BASE::Memory::Allocator& allocator, BASE::UStringView const& input) {
+//const jsesc = (argument, options) => {
+//	const increaseIndentation = () => {
+//		oldIndent = indent;
+//		++options.indentLevel;
+//		indent = options.indent.repeat(options.indentLevel)
+//	};
+	// Handle options
+  //     quotes: "double",
+  //     wrap: true,
+  //     minimal: process.env.BABEL_8_BREAKING ? true : false,
+  //     ...opts.jsescOption,
+
+  constexpr bool escapeEverything = false;
+  constexpr bool minimal = false;
+  constexpr bool isScriptContext = false;
+  constexpr BASE::UChar quote = u'\"';
+  constexpr bool wrap = true;
+  constexpr bool es6 = false;
+  constexpr bool json = false;
+  constexpr bool compact = true;
+  constexpr bool lowercaseHex = false;
+//	const defaults = {
+//		'escapeEverything': false,
+//		'minimal': false,
+//		'isScriptContext': false,
+//		'quotes': 'single',
+//		'wrap': false,
+//		'es6': false,
+//		'json': false,
+//		'compact': true,
+//		'lowercaseHex': false,
+//		'numbers': 'decimal',
+//		'indent': '\t',
+//		'indentLevel': 0,
+//		'__inline1__': false,
+//		'__inline2__': false
+//	};
+//	const json = options && options.json;
+//	if (json) {
+//		defaults.quotes = 'double';
+//		defaults.wrap = true;
+//	}
+//	options = extend(defaults, options);
+//	if (
+//		options.quotes != 'single' &&
+//		options.quotes != 'double' &&
+//		options.quotes != 'backtick'
+//	) {
+//		options.quotes = 'single';
+//	}
+//	const quote = options.quotes == 'double' ?
+//		'"' :
+//		(options.quotes == 'backtick' ?
+//			'`' :
+//			'\''
+//		);
+//	const compact = options.compact;
+//	const lowercaseHex = options.lowercaseHex;
+//	let indent = options.indent.repeat(options.indentLevel);
+//	let oldIndent = '';
+//	const inline1 = options.__inline1__;
+//	const inline2 = options.__inline2__;
+//	const newLine = compact ? '' : '\n';
+//	let result;
+//	let isEmpty = true;
+//	const useBinNumbers = options.numbers == 'binary';
+//	const useOctNumbers = options.numbers == 'octal';
+//	const useDecNumbers = options.numbers == 'decimal';
+//	const useHexNumbers = options.numbers == 'hexadecimal';
+//
+//	if (json && argument && isFunction(argument.toJSON)) {
+//		argument = argument.toJSON();
+//	}
+//
+//	if (!isString(argument)) {
+//		if (isMap(argument)) {
+//			if (argument.size == 0) {
+//				return 'new Map()';
+//			}
+//			if (!compact) {
+//				options.__inline1__ = true;
+//				options.__inline2__ = false;
+//			}
+//			return 'new Map(' + jsesc(Array.from(argument), options) + ')';
+//		}
+//		if (isSet(argument)) {
+//			if (argument.size == 0) {
+//				return 'new Set()';
+//			}
+//			return 'new Set(' + jsesc(Array.from(argument), options) + ')';
+//		}
+//		if (isBuffer(argument)) {
+//			if (argument.length == 0) {
+//				return 'Buffer.from([])';
+//			}
+//			return 'Buffer.from(' + jsesc(Array.from(argument), options) + ')';
+//		}
+//		if (isArray(argument)) {
+//			result = [];
+//			options.wrap = true;
+//			if (inline1) {
+//				options.__inline1__ = false;
+//				options.__inline2__ = true;
+//			}
+//			if (!inline2) {
+//				increaseIndentation();
+//			}
+//			forEach(argument, (value) => {
+//				isEmpty = false;
+//				if (inline2) {
+//					options.__inline2__ = false;
+//				}
+//				result.push(
+//					(compact || inline2 ? '' : indent) +
+//					jsesc(value, options)
+//				);
+//			});
+//			if (isEmpty) {
+//				return '[]';
+//			}
+//			if (inline2) {
+//				return '[' + result.join(', ') + ']';
+//			}
+//			return '[' + newLine + result.join(',' + newLine) + newLine +
+//				(compact ? '' : oldIndent) + ']';
+//		} else if (isNumber(argument)) {
+//			if (json) {
+//				// Some number values (e.g. `Infinity`) cannot be represented in JSON.
+//				return JSON.stringify(argument);
+//			}
+//			if (useDecNumbers) {
+//				return String(argument);
+//			}
+//			if (useHexNumbers) {
+//				let hexadecimal = argument.toString(16);
+//				if (!lowercaseHex) {
+//					hexadecimal = hexadecimal.toUpperCase();
+//				}
+//				return '0x' + hexadecimal;
+//			}
+//			if (useBinNumbers) {
+//				return '0b' + argument.toString(2);
+//			}
+//			if (useOctNumbers) {
+//				return '0o' + argument.toString(8);
+//			}
+//		} else if (!isObject(argument)) {
+//			if (json) {
+//				// For some values (e.g. `undefined`, `function` objects),
+//				// `JSON.stringify(value)` returns `undefined` (which isn’t valid
+//				// JSON) instead of `'null'`.
+//				return JSON.stringify(argument) || 'null';
+//			}
+//			return String(argument);
+//		} else { // it’s an object
+//			result = [];
+//			options.wrap = true;
+//			increaseIndentation();
+//			forOwn(argument, (key, value) => {
+//				isEmpty = false;
+//				result.push(
+//					(compact ? '' : indent) +
+//					jsesc(key, options) + ':' +
+//					(compact ? '' : ' ') +
+//					jsesc(value, options)
+//				);
+//			});
+//			if (isEmpty) {
+//				return '{}';
+//			}
+//			return '{' + newLine + result.join(',' + newLine) + newLine +
+//				(compact ? '' : oldIndent) + '}';
+//		}
+//	}
+//
+//	const regex = options.escapeEverything ? escapeEverythingRegex : escapeNonAsciiRegex;
+  BASE::String::Slices str{input, &allocator};
+  auto data = input.data();
+  size_t size = input.size();
+  size_t index = 0;
+  size_t next = 1;
+  for(;index < size;index = next, ++next) {
+    BASE::UChar current_char = data[index];
+    // if constexpr (quote == u'`') {
+    //   if (current_char == u'$' && next_char == u'{') {
+    //     str.add(u'\\');
+    //     str.add(index, ++next);
+    //     continue;
+    //   }
+    // }
+    if constexpr (!escapeEverything) {
+      if (
+        current_char == ' ' || current_char == '!' || (current_char >= '#' && current_char <= '&') ||
+        (current_char >= '(' && current_char <= '[') || (current_char >= ']' && current_char <= '_') || (current_char >= 'a' && current_char <= '~')
+      ) [[likely]] {
+        str.add(index, next);
+        continue;
+      }
+    }
+    if (
+      current_char >= 0xD800 && current_char <= 0xDBFF
+    ) [[unlikely]] {
+      BASE::UChar next_char = next < size ? data[next] : 0;
+      if (next_char >= 0xDC00 && next_char <= 0xDFFF) {
+        if constexpr (minimal) {
+          str.add(index, ++next);
+          continue;
+        } else {
+          if constexpr (es6) {
+            BASE::UCodePoint codePoint = (current_char - 0xD800) * 0x400 + next_char - 0xDC00 + 0x10000;
+            int hex_size = 0;
+            str.add<3>(u"\\u{");
+            auto const& hexFirst = hexadecimal(codePoint >> 32, lowercaseHex, &hex_size);
+            hex_size >= 4 ? str.add(hexFirst[0]) : void(0);
+            hex_size >= 3 ? str.add(hexFirst[1]) : void(0);
+            hex_size >= 2 ? str.add(hexFirst[2]) : void(0);
+            hex_size >= 1 ? str.add(hexFirst[3]) : void(0);
+            auto const& hexSecond = hexadecimal(codePoint % 0xFFFF, lowercaseHex, &hex_size);
+            str.add(hexSecond[0]);
+            str.add(hexSecond[1]);
+            str.add(hexSecond[2]);
+            str.add(hexSecond[3]);
+            str.add(u'}');
+          } else {
+            fourHexEscape(str, current_char, lowercaseHex);
+            fourHexEscape(str, next_char, lowercaseHex);
+          }
+          continue;
+        }
+      }
+    }
+    if (
+      current_char >= 0xD800 && current_char <= 0xDFFF
+    ) [[unlikely]] {
+      fourHexEscape(str, current_char, lowercaseHex);
+      continue;
+    }
+    if (
+      current_char == 0 &&
+      !json
+    ) [[unlikely]] {
+      BASE::UChar next_char = next < size ? data[next] : 0;
+      if (!(next_char >= u'0' && next_char <= u'9')) {
+        str.add<3>(u"\\0");
+        continue;
+      }
+    }
+    if ( current_char == u'\'' || current_char == u'"' || current_char == u'`') [[unlikely]] {
+      if (current_char == quote || escapeEverything) {
+        str.add(u'\\');
+      }
+      str.add(index, next);
+      continue;
+    }
+    if (current_char == u'\\' || current_char == u'\b' || current_char == u'\f' || current_char == u'\n' || current_char == u'\r' || current_char == u'\t') [[unlikely]] {
+      str.add(u'\\');
+      str.add(index, next);
+      continue;
+    }
+    if (minimal && !(
+      current_char == 0xa0 || current_char == 0x1680 ||
+      (current_char >= 0x2000 && current_char <= 0x200a) ||
+      current_char == 0x2028 || current_char == 0x2029 || current_char == 0x202f || current_char == 0x205f || current_char == 0x3000
+    )) [[likely]] {
+      str.add(index, next);
+      continue;
+    }
+
+    auto const& hex = hexadecimal(current_char, lowercaseHex);
+    if (json || current_char >= 256) {
+      str.add<2>(u"\\u");
+      str.add(hex[0]);
+      str.add(hex[1]);
+      str.add(hex[2]);
+      str.add(hex[3]);
+    } else {
+      str.add<2>(u"\\x");
+      str.add(hex[2]);
+      str.add(hex[3]);
+    }
+    continue;
+  }
+//	if (quote == '`') {
+//		result = result.replace(/\$\{/g, '\\${');
+//	}
+//	if (options.isScriptContext) {
+//		// https://mathiasbynens.be/notes/etago
+//		result = result
+//			.replace(/<\/(script|style)/gi, '<\\/$1')
+//			.replace(/<!--/g, json ? '\\u003C!--' : '\\x3C!--');
+//	}
+  auto strview = str.joinSlices();
+  if constexpr (wrap) {
+    if constexpr (quote == u'"') {
+      return BASE::UStringViewArray<3>(u"\"", strview, u"\"");
+    } else if constexpr (quote == u'\'') {
+      return BASE::UStringViewArray<3>(u"'", strview, u"'");
+    } else if constexpr (quote == u'`') {
+      return BASE::UStringViewArray<3>(u"`", strview, u"`");
+    } else {
+      unreachable();
+    }
+  } else {
+    return BASE::UStringViewArray<3>(u"", strview, u"");
+  }
+}
+}
\ No newline at end of file
diff --git a/src/testrunner-babel-parser.cpp b/src/testrunner-babel-parser.cpp
index e45eb09c..d1bcfa85 100644
--- a/src/testrunner-babel-parser.cpp
+++ b/src/testrunner-babel-parser.cpp
@@ -9,7 +9,7 @@ using JSON = nlohmann::json;
 inline JSON parseAsJSONWithClass(const BASE::UStringView &source, BabelParser::Options::PartialOptions partial) {
   return BabelParser::withParser(
     source, partial,
-    [&](PTR(BabelParser::Node::File) file, BabelParser::Options::Options const &options)
+    [&](BabelArena::Memory& _, PTR(BabelParser::Node::File) file, BabelParser::Options::Options const &options)
     {
       auto json = BabelParser::Writer::writeNodeToJSON(
         reinterpret_cast<BabelParser::Node::Node *>(file),

From 2cc38d34b6bc784d30e8cf6289825e9b99841801 Mon Sep 17 00:00:00 2001
From: imsenyu <imsenyu@gmail.com>
Date: Wed, 26 Mar 2025 00:12:09 +0800
Subject: [PATCH 02/18] fix: StringLiteral

---
 src/npm_modules/jsesc/jsesc.hpp | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/npm_modules/jsesc/jsesc.hpp b/src/npm_modules/jsesc/jsesc.hpp
index 973af1d0..b25d69e7 100644
--- a/src/npm_modules/jsesc/jsesc.hpp
+++ b/src/npm_modules/jsesc/jsesc.hpp
@@ -345,6 +345,7 @@ inline BASE::UStringViewArray<3> jsesc(BASE::Memory::Allocator& allocator, BASE:
             fourHexEscape(str, current_char, lowercaseHex);
             fourHexEscape(str, next_char, lowercaseHex);
           }
+          ++next;
           continue;
         }
       }
@@ -372,10 +373,14 @@ inline BASE::UStringViewArray<3> jsesc(BASE::Memory::Allocator& allocator, BASE:
       str.add(index, next);
       continue;
     }
-    if (current_char == u'\\' || current_char == u'\b' || current_char == u'\f' || current_char == u'\n' || current_char == u'\r' || current_char == u'\t') [[unlikely]] {
-      str.add(u'\\');
-      str.add(index, next);
-      continue;
+    switch (current_char) {
+      [[unlikely]] case u'\\': str.add<2>(u"\\\\"); continue;
+      [[unlikely]] case u'\b': str.add<2>(u"\\b"); continue;
+      [[unlikely]] case u'\f': str.add<2>(u"\\f"); continue;
+      [[unlikely]] case u'\n': str.add<2>(u"\\n"); continue;
+      [[unlikely]] case u'\r': str.add<2>(u"\\r"); continue;
+      [[unlikely]] case u'\t': str.add<2>(u"\\t"); continue;
+      [[likely]] default:break;
     }
     if (minimal && !(
       current_char == 0xa0 || current_char == 0x1680 ||

From 8b428035329cc8a120253d34e3a6deea752dd0cb Mon Sep 17 00:00:00 2001
From: imsenyu <imsenyu@gmail.com>
Date: Wed, 26 Mar 2025 23:24:50 +0800
Subject: [PATCH 03/18] feat: FixedNumber

---
 .../babel-generator/generators/types.hpp      | 10 +-
 src/babel/babel-generator/printer.hpp         |  2 +-
 src/babel/babel-parser/tokenizer/state.hpp    | 13 +--
 .../babel-parser/tokenizer/tokenizer.hpp      |  2 +-
 src/babel/babel-parser/types.hpp              | 12 ++-
 src/base/javascript.hpp                       | 41 ++++----
 src/base/number.hpp                           | 97 +++++++++++++++++++
 7 files changed, 138 insertions(+), 39 deletions(-)
 create mode 100644 src/base/number.hpp

diff --git a/src/babel/babel-generator/generators/types.hpp b/src/babel/babel-generator/generators/types.hpp
index b3abc71f..909ec9ab 100644
--- a/src/babel/babel-generator/generators/types.hpp
+++ b/src/babel/babel-generator/generators/types.hpp
@@ -248,15 +248,17 @@ namespace BabelGenerator::Generators {
     auto raw = _this.getPossibleRaw(node);
     //  const opts = this.format.jsescOption;
     auto value = node->value;
-    //  const str = value + "";
+    // const str = value + "";
     //  if (opts.numbers) {
     //    this.number(jsesc(value, opts), value);
     //  } else
     if (raw == std::nullopt) {
       unreachable();
-      //  _this.number(str, value); // normalize
-      //  } else if (this.format.minified) {
-      //    _this.number(raw->size() < str.length ? raw : str, value);
+      // _this.number(str, value); // normalize
+    } else if (_this.format.minified) {
+      value->withString([&](BASE::UStringView str){
+        _this.number(raw->size() < str.size() ? *raw : str, value);
+      });
     } else {
       _this.number(*raw, value);
     }
diff --git a/src/babel/babel-generator/printer.hpp b/src/babel/babel-generator/printer.hpp
index eae33094..67a760f2 100644
--- a/src/babel/babel-generator/printer.hpp
+++ b/src/babel/babel-generator/printer.hpp
@@ -398,7 +398,7 @@ namespace BabelGenerator::Printer {
       }
       return false;
     }
-    void number(BASE::UStringView str, std::optional<double> number) {
+    void number(BASE::UStringView str, std::optional<BASE::Number::FixedNumber> number) {
       // const NON_DECIMAL_LITERAL = /^0[box]/;
       this->word(str);
 
diff --git a/src/babel/babel-parser/tokenizer/state.hpp b/src/babel/babel-parser/tokenizer/state.hpp
index 2e951e90..ac58d62b 100644
--- a/src/babel/babel-parser/tokenizer/state.hpp
+++ b/src/babel/babel-parser/tokenizer/state.hpp
@@ -25,7 +25,8 @@ namespace BabelParser::Tokenizer::State {
   };
   union UnionValue {
     BASE::UStringView _string;
-    std::optional<double> _val;
+    std::optional<BASE::Number::FixedNumber> _val;
+    bool _bool;
     RegExpValue _regexp;
 
     UnionValue() {}
@@ -40,11 +41,11 @@ namespace BabelParser::Tokenizer::State {
     };
     Type type = Type::Null;
     UnionValue value;
-    Value(double value) : type(Type::Number) { this->value._val = value; }
-    Value(std::optional<double> value) : type(Type::Number) { this->value._val = value; }
+    Value(BASE::Number::FixedNumber value) : type(Type::Number) { this->value._val = value; }
+    Value(std::optional<BASE::Number::FixedNumber> value) : type(Type::Number) { this->value._val = value; }
     Value(BASE::UStringView value) : type(Type::String) { this->value._string = value; }
     Value(RegExpValue value) : type(Type::RegExp) { this->value._regexp = value; }
-    Value(bool value) : type(Type::Boolean) { this->value._val = value ? std::optional(1) : std::nullopt; }
+    Value(bool value) : type(Type::Boolean) { this->value._bool = value; }
     explicit Value() : type(Type::Null) {}
     bool has_value() const { return this->type != Type::Null; }
     const RegExpValue &regexp() const {
@@ -58,13 +59,13 @@ namespace BabelParser::Tokenizer::State {
     }
     bool operator==(BASE::UStringView str) const { return this->type == Type::String && this->value._string == str; }
 
-    const std::optional<double> &number() const {
+    const std::optional<BASE::Number::FixedNumber> &number() const {
       BASE_ASSERT(this->type == Type::Number, "state.value should be Number");
       return this->value._val;
     }
     bool boolean() const {
       BASE_ASSERT(this->type == Type::Boolean, "state.value should be Boolean");
-      return this->value._val.has_value();
+      return this->value._bool;
     }
   };
   struct PartialLookaheadState {
diff --git a/src/babel/babel-parser/tokenizer/tokenizer.hpp b/src/babel/babel-parser/tokenizer/tokenizer.hpp
index ff1ef0ad..01a6a1c4 100644
--- a/src/babel/babel-parser/tokenizer/tokenizer.hpp
+++ b/src/babel/babel-parser/tokenizer/tokenizer.hpp
@@ -1214,7 +1214,7 @@ namespace BabelParser::Tokenizer {
         return;
       }
 
-      this->finishToken(TokenType::$_num, val ? std::optional(static_cast<double>(*val)) : std::nullopt);
+      this->finishToken(TokenType::$_num, val ? std::optional(BASE::Number::FixedNumber{*val, 0}) : std::nullopt);
     }
 
     // Read an integer, octal integer, or floating-point number.
diff --git a/src/babel/babel-parser/types.hpp b/src/babel/babel-parser/types.hpp
index fc7399a0..20c3caa6 100644
--- a/src/babel/babel-parser/types.hpp
+++ b/src/babel/babel-parser/types.hpp
@@ -294,18 +294,20 @@ public:
   };
   class NumericLiteral : public Expression {
     DEFINE_NODE_IMPL_BODY(NumericLiteral)
-    std::optional<double> value;
-    std::optional<double> rawValue;
+    std::optional<BASE::Number::FixedNumber> value;
+    std::optional<BASE::Number::FixedNumber> rawValue;
     std::optional<BASE::UStringView> raw;
 
     explicit NumericLiteral(
-      PositionInfo const &pos, std::optional<double> const &value, std::optional<double> const &rawValue, std::optional<BASE::UStringView> const &raw
+      PositionInfo const &pos, std::optional<BASE::Number::FixedNumber> const &value, std::optional<BASE::Number::FixedNumber> const &rawValue, std::optional<BASE::UStringView> const &raw
     ) :
       Expression(TYPE, pos),
       value(value),
       rawValue(rawValue),
       raw(raw) {}
-    void format(Writer::NodeWriter &writer) const { writer.field("value", this->value); }
+    void format(Writer::NodeWriter &writer) const {
+      writer.field("value", this->value->to<double>());
+    }
   };
   class BigIntLiteral : public Expression {
     DEFINE_NODE_IMPL_BODY(BigIntLiteral)
@@ -2479,7 +2481,7 @@ public:
       if (this->value.type == Value::Type::String) {
         writer.field("value", this->value.string());
       } else if (this->value.type == Value::Type::Number) {
-        writer.field("value", this->value.number());
+        writer.field("value", this->value.number()->template to<double>());
       } else if (this->value.type == Value::Type::Boolean) {
         writer.field("value", this->value.boolean());
       } else if (this->value.type == Value::Type::RegExp) {
diff --git a/src/base/javascript.hpp b/src/base/javascript.hpp
index 55563b8f..d7e173ac 100644
--- a/src/base/javascript.hpp
+++ b/src/base/javascript.hpp
@@ -4,6 +4,7 @@
 #include <optional>
 #include <string>
 #include "./unicode.hpp"
+#include "number.hpp"
 #include "string.hpp"
 
 namespace BASE {
@@ -76,7 +77,7 @@ namespace BASE::JavaScript {
     return digit;
   }
 
-  static inline double SignedZero(bool sign) { return sign ? -0.0 : 0.0; }
+  static inline Number::FixedNumber SignedZero(bool sign) { return sign ? Number::FixedNumber{-0, 0} : Number::FixedNumber{0, 0}; }
 
   template<class Iterator>
   static inline bool Advance(Iterator *it, Iterator &end) {
@@ -101,7 +102,7 @@ namespace BASE::JavaScript {
     return result;
   }
 
-  static inline double stringToIeee(const BASE::UStringView &input, size_t length, size_t *processed_characters_count) {
+  static inline Number::FixedNumber stringToIeee(const BASE::UStringView &input, size_t length, size_t *processed_characters_count) {
     auto begin = input.begin();
     auto current = begin;
     auto end = current + length;
@@ -117,7 +118,7 @@ namespace BASE::JavaScript {
     // 5. Code before 'parsing_done' may rely on 'current != end'.
 
     if (current == end)
-      return 0.0;
+      return Number::FixedNumber{0, 0};
 
     // The longest form of simplified number is: "-<significant digits>.1eXXX\0".
     const int kBufferSize = kMaxSignificantDigits + 10;
@@ -137,7 +138,7 @@ namespace BASE::JavaScript {
       sign = (*current == u'-');
       ++current;
       if (current == end)
-        return 0.0;
+        return Number::FixedNumber{0, 0};
     }
 
     bool leading_zero = false;
@@ -175,7 +176,7 @@ namespace BASE::JavaScript {
     if (*current == '.') {
       if (Advance(&current, end)) {
         if (significant_digits == 0 && !leading_zero) {
-          return 0.0;
+          return Number::FixedNumber{0, 0};
         } else {
           goto parsing_done;
         }
@@ -215,7 +216,7 @@ namespace BASE::JavaScript {
       // If exponent < 0 then string was [+-]\.0*...
       // If significant_digits != 0 the string is not equal to 0.
       // Otherwise there are no digits in the string.
-      return 0.0;
+      return Number::FixedNumber{0, 0};
     }
 
     // Parse exponential part.
@@ -271,18 +272,14 @@ namespace BASE::JavaScript {
     // ASSERT(buffer_pos < kBufferSize);
     buffer[buffer_pos] = '\0';
 
-    double converted = static_cast<double>(ReadUint64(buffer, buffer_pos));
-    if (exponent > 0) {
-      while (exponent--) {
-        converted *= 10.0;
-      }
-    } else if (exponent < 0) {
-      while (exponent++) {
-        converted /= 10.0;
-      }
-    }
     *processed_characters_count = static_cast<size_t>(current - begin);
-    return sign ? -converted : converted;
+
+    int64_t converted = ReadUint64(buffer, buffer_pos);
+    while (converted % 10 == 0 && converted) {
+      converted /= 10;
+      exponent++;
+    }
+    return sign ? Number::FixedNumber{-converted, exponent} : Number::FixedNumber{converted, exponent};
   }
 
   static inline double parseIntOverflow(const BASE::UStringView &s, int radix) {
@@ -322,7 +319,7 @@ namespace BASE::JavaScript {
   }
 
   // ES5.1 15.1.2.2
-  inline std::optional<double> parseInt(const BASE::UStringView &s, int radix) {
+  inline std::optional<Number::FixedNumber> parseInt(const BASE::UStringView &s, int radix) {
     // 1. Let inputString be ToString(string).
     // 2. Let S be a newly created substring of inputString consisting of the first character that is not a
     //    StrWhiteSpaceChar and all characters following that character. (In other words, remove leading white
@@ -398,7 +395,7 @@ namespace BASE::JavaScript {
     }
 
     // 15. Return sign x number.
-    return sign * number;
+    return Number::FixedNumber(sign * number, 0);
   }
 
   inline int parseDouble(const BASE::UStringView &string, double &value) {
@@ -436,13 +433,13 @@ namespace BASE::JavaScript {
     return length;
   }
 
-  inline std::optional<double> parseFloat(const BASE::UStringView &s) {
+  inline std::optional<Number::FixedNumber> parseFloat(const BASE::UStringView &s) {
     unsigned size = s.length();
 
     if (size == 1) {
       BASE::UChar c = s[0];
       if (isASCIIDigit(c))
-        return c - '0';
+        return Number::FixedNumber(c - '0', 0);
       return std::nullopt;
     }
 
@@ -462,7 +459,7 @@ namespace BASE::JavaScript {
 
     size_t len = data.size() - i;
     size_t parsedLength = 0;
-    double number = stringToIeee(data.substr(i, len), len, &parsedLength);
+    Number::FixedNumber number = stringToIeee(data.substr(i, len), len, &parsedLength);
     // size_t parsedLength = parseDouble(data.substr(i, data.size() - i), number);
     if (parsedLength) {
       return number;
diff --git a/src/base/number.hpp b/src/base/number.hpp
new file mode 100644
index 00000000..9db7fa68
--- /dev/null
+++ b/src/base/number.hpp
@@ -0,0 +1,97 @@
+#pragma once
+
+#include <algorithm>
+#include <ostream>
+#include "./define.hpp"
+#include "./platform.h"
+#include "./unicode.hpp"
+
+namespace BASE::Number {
+  class FixedNumber {
+  private:
+    int64_t value_;
+    int64_t scale_;
+  public:
+    FixedNumber(int64_t v, int64_t s) : value_(v), scale_(s) {}
+    template<typename T>
+    T to() const {
+      int64_t abs_value = std::abs(value_);
+      int64_t int_part = abs_value;
+      int64_t fractional_part = 0;
+      T return_value;
+      if (scale_ < 0) {
+        int64_t divisor = static_cast<int64_t>(std::pow(10, -scale_));
+        int_part = abs_value / divisor;
+        fractional_part = abs_value % divisor;
+      }
+      if (scale_ < 0) {
+        double frac_part_double = fractional_part / std::pow(10.0, std::abs(scale_));
+        double int_part_double = static_cast<double>(int_part);
+        return_value = int_part_double + frac_part_double;
+      } else {
+        return_value = int_part * std::pow(10, scale_);
+      }
+      return return_value;
+    }
+    static BASE::UChar* writePositiveToBuffer(int64_t val, BASE::UChar* begin) {
+      BASE::UChar* current = begin;
+      do {
+        *current++ = '0' + (val % 10);
+        val /= 10;
+      } while (val > 0);
+      size_t len = current - begin;
+      for (int j = 0; j < len / 2; ++j) {
+        BASE::UChar temp = begin[j];
+        begin[j] = begin[len - j - 1];
+        begin[len - j - 1] = temp;
+      }
+      return current;
+    }
+    template<class CB>
+    void withString(CB&& callback) {
+      constexpr int bufferSize = 1024;
+      BASE::UChar buffer[bufferSize];
+      int64_t abs_value = std::abs(value_);
+      int64_t int_part = abs_value;
+      int64_t frac_part = 0;
+
+      BASE::UChar* current = buffer;
+      if (value_ < 0) {
+        *current++ = u'-';
+      }
+      if (scale_ < 0) {
+        int64_t divisor = static_cast<int64_t>(std::pow(10, -scale_));
+        int_part = abs_value / divisor;
+        frac_part = abs_value % divisor;
+      }
+      current = writePositiveToBuffer(int_part, current);
+      if (scale_ < 0) {
+        *current++ = u'.';
+        int64_t current_scale = -scale_;
+        while (--current_scale >= 0) {
+          *current++ = u'0';
+        }
+        current = writePositiveToBuffer(frac_part, current);
+      } else {
+        int64_t current_scale = scale_;
+        while (--current_scale >= 0) {
+          *current++ = u'0';
+        }
+      }
+      *current++ = 0;
+      if (current - buffer > bufferSize) {
+        unreachable();
+      }
+      callback(BASE::UStringView{buffer, static_cast<size_t>(current - buffer - 1)});
+    }
+    bool operator>(double v) const {
+      return this->template to<double>() > v;
+    }
+    bool operator>(int v) const {
+      return this->template to<int>() > v;
+    }
+    explicit operator int32_t() const {
+      return this->template to<int32_t>();
+    }
+  };
+}
\ No newline at end of file

From eaae6bea4e1abe9aa0bedfd583ae0f5a5094b285 Mon Sep 17 00:00:00 2001
From: imsenyu <imsenyu@gmail.com>
Date: Wed, 26 Mar 2025 23:29:23 +0800
Subject: [PATCH 04/18] fix: build

---
 src/base/number.hpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/base/number.hpp b/src/base/number.hpp
index 9db7fa68..4cc0ad1e 100644
--- a/src/base/number.hpp
+++ b/src/base/number.hpp
@@ -1,7 +1,6 @@
 #pragma once
 
-#include <algorithm>
-#include <ostream>
+#include <cmath>
 #include "./define.hpp"
 #include "./platform.h"
 #include "./unicode.hpp"

From 1e79485464f86ece59b47a13470ea0dcf774c718 Mon Sep 17 00:00:00 2001
From: imsenyu <imsenyu@gmail.com>
Date: Wed, 26 Mar 2025 23:40:37 +0800
Subject: [PATCH 05/18] test: fix babel-parser:core/uncategorised/354

---
 src/babel/babel-parser/types.hpp | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/babel/babel-parser/types.hpp b/src/babel/babel-parser/types.hpp
index 20c3caa6..e7f13e31 100644
--- a/src/babel/babel-parser/types.hpp
+++ b/src/babel/babel-parser/types.hpp
@@ -306,7 +306,11 @@ public:
       rawValue(rawValue),
       raw(raw) {}
     void format(Writer::NodeWriter &writer) const {
-      writer.field("value", this->value->to<double>());
+      if (auto value = this->value) {
+        writer.field("value", value->to<double>());
+      } else {
+        writer.field("value", std::nullopt);
+      }
     }
   };
   class BigIntLiteral : public Expression {
@@ -2481,7 +2485,11 @@ public:
       if (this->value.type == Value::Type::String) {
         writer.field("value", this->value.string());
       } else if (this->value.type == Value::Type::Number) {
-        writer.field("value", this->value.number()->template to<double>());
+        if (auto value = this->value.number()) {
+          writer.field("value", value->to<double>());
+        } else {
+          writer.field("value", std::nullopt);
+        }
       } else if (this->value.type == Value::Type::Boolean) {
         writer.field("value", this->value.boolean());
       } else if (this->value.type == Value::Type::RegExp) {

From b0c0e1adbea96bbbc4f166d3235bec6ce9d6c06c Mon Sep 17 00:00:00 2001
From: imsenyu <imsenyu@gmail.com>
Date: Thu, 27 Mar 2025 01:09:53 +0800
Subject: [PATCH 06/18] test: fix babel-generator:escapes/jsonEscape

---
 .../babel-generator/generators/types.hpp      |   3 +-
 src/babel/babel-generator/index.h             |   3 +-
 src/babel/babel-generator/index.hpp           |  13 +--
 src/babel/babel-generator/printer.hpp         |   3 +-
 src/npm_modules/jsesc/jsesc.hpp               | 105 +++++++++---------
 5 files changed, 65 insertions(+), 62 deletions(-)

diff --git a/src/babel/babel-generator/generators/types.hpp b/src/babel/babel-generator/generators/types.hpp
index 909ec9ab..6e241cc4 100644
--- a/src/babel/babel-generator/generators/types.hpp
+++ b/src/babel/babel-generator/generators/types.hpp
@@ -271,8 +271,7 @@ namespace BabelGenerator::Generators {
       return;
     }
 
-    auto val = Jsesc::jsesc(_this.allocator, node->value);
-    // auto val = Jsesc::jsesc(_this.allocator, node->value, this.format.jsescOption);
+    auto val = Jsesc::jsesc(_this.allocator, node->value, _this.format.jsescOption);
     _this.token(val);
   }
 
diff --git a/src/babel/babel-generator/index.h b/src/babel/babel-generator/index.h
index 54eb75a3..22521f8a 100644
--- a/src/babel/babel-generator/index.h
+++ b/src/babel/babel-generator/index.h
@@ -2,6 +2,7 @@
 
 #include "../../base/unicode.hpp"
 #include "../../base/allocator.hpp"
+#include "../../npm_modules/jsesc/jsesc.hpp"
 #include "../babel-types/ast-types/generated/enum.hpp"
 #include "../babel-types/ast-types/generated/index.hpp"
 
@@ -111,7 +112,7 @@ namespace BabelGenerator {
     /**
      * Options for outputting jsesc representation.
      */
-    // jsescOption?: jsescOptions;
+    std::optional<Jsesc::PartialOption> jsescOption;
 
     /**
      * For use with the recordAndTuple token.
diff --git a/src/babel/babel-generator/index.hpp b/src/babel/babel-generator/index.hpp
index 1e303c77..ba0344c3 100644
--- a/src/babel/babel-generator/index.hpp
+++ b/src/babel/babel-generator/index.hpp
@@ -57,19 +57,18 @@ namespace BabelGenerator {
           .adjustMultilineComment = true,
           .style = u"  ",
         },
-      // jsescOption: {
-      //   quotes: "double",
-      //   wrap: true,
-      //   minimal: process.env.BABEL_8_BREAKING ? true : false,
-      //   ...opts.jsescOption,
-      // },
+      .jsescOption = Jsesc::Option{
+        .quotes = u'"',
+        .wrap = true,
+        .minimal = BASE::process::env.BABEL_8_BREAKING ? true : false,
+      }.assign(opts.jsescOption.value_or(Jsesc::PartialOption{})),
       .topicToken = opts.topicToken,
       .importAttributesKeyword = opts.importAttributesKeyword,
     };
 
     if (!BASE::process::env.BABEL_8_BREAKING) {
       format.decoratorsBeforeExport = opts.decoratorsBeforeExport;
-      // format.jsescOption.json = opts.jsonCompatibleStrings;
+      format.jsescOption.json = opts.jsonCompatibleStrings.value_or(false);
       format.recordAndTupleSyntaxType = opts.recordAndTupleSyntaxType.value_or(RecordAndTupleSyntaxType::hash);
     }
 
diff --git a/src/babel/babel-generator/printer.hpp b/src/babel/babel-generator/printer.hpp
index 67a760f2..7318e8a4 100644
--- a/src/babel/babel-generator/printer.hpp
+++ b/src/babel/babel-generator/printer.hpp
@@ -34,6 +34,7 @@
 #include "./generators/index.h"
 #include "./node/index.hpp"
 #include "buffer.hpp"
+#include "../../npm_modules/jsesc/jsesc.hpp"
 
 namespace BabelGenerator::Printer {
 
@@ -104,7 +105,7 @@ namespace BabelGenerator::Printer {
      * @deprecated Removed in Babel 8, syntax type is always 'hash'
      */
     std::optional<RecordAndTupleSyntaxType::Value> recordAndTupleSyntaxType;
-    //  jsescOption: jsescOptions;
+    Jsesc::Option jsescOption;
     /**
      * @deprecated Removed in Babel 8, use `jsescOption` instead
      */
diff --git a/src/npm_modules/jsesc/jsesc.hpp b/src/npm_modules/jsesc/jsesc.hpp
index b25d69e7..cc62abf4 100644
--- a/src/npm_modules/jsesc/jsesc.hpp
+++ b/src/npm_modules/jsesc/jsesc.hpp
@@ -39,6 +39,42 @@ namespace Jsesc {
 //	return '\\u' + ('0000' + hex).slice(-4);
 //}
 //
+  struct PartialOption {
+    std::optional<BASE::UChar> quotes;
+    std::optional<bool> wrap;
+    std::optional<bool> minimal;
+    std::optional<bool> json;
+  };
+  struct Option {
+    //		'numbers': 'decimal',
+    //		'indent': '\t',
+    //		'indentLevel': 0,
+    //		'__inline1__': false,
+    //		'__inline2__': false
+    BASE::UChar quotes = u'\'';
+    bool wrap = false;
+    bool minimal = false;
+    bool json = false;
+    static constexpr bool escapeEverything = false;
+    static constexpr bool es6 = false;
+    static constexpr bool compact = true;
+    static constexpr bool lowercaseHex = false;
+    Option& assign(PartialOption const&opt) {
+      if (auto quotes = opt.quotes) {
+        this->quotes = *quotes;
+      }
+      if (auto wrap = opt.wrap) {
+        this->wrap = *wrap;
+      }
+      if (auto minimal = opt.minimal) {
+        this->minimal = *minimal;
+      }
+      if (auto json = opt.json) {
+        this->json = *json;
+      }
+      return *this;
+    }
+  };
   inline std::array<BASE::UChar, 4> hexadecimal(BASE::UChar code, bool lowercase, int* size = nullptr) {
     std::array<BASE::UChar, 4> escaped{u'0',u'0',u'0',u'0'};
     int i;
@@ -117,7 +153,7 @@ namespace Jsesc {
 //const escapeEverythingRegex = /([\uD800-\uDBFF][\uDC00-\uDFFF])|([\uD800-\uDFFF])|(['"`])|[^]/g;
 //const escapeNonAsciiRegex = /([\uD800-\uDBFF][\uDC00-\uDFFF])|([\uD800-\uDFFF])|(['"`])|[^ !#-&\(-\[\]-_a-~]/g;
 //
-inline BASE::UStringViewArray<3> jsesc(BASE::Memory::Allocator& allocator, BASE::UStringView const& input) {
+inline BASE::UStringViewArray<3> jsesc(BASE::Memory::Allocator& allocator, BASE::UStringView const& input, Option const& opts) {
 //const jsesc = (argument, options) => {
 //	const increaseIndentation = () => {
 //		oldIndent = indent;
@@ -130,52 +166,19 @@ inline BASE::UStringViewArray<3> jsesc(BASE::Memory::Allocator& allocator, BASE:
   //     minimal: process.env.BABEL_8_BREAKING ? true : false,
   //     ...opts.jsescOption,
 
-  constexpr bool escapeEverything = false;
-  constexpr bool minimal = false;
+  constexpr bool escapeEverything = Option::escapeEverything;
+  bool minimal = opts.minimal;
   constexpr bool isScriptContext = false;
-  constexpr BASE::UChar quote = u'\"';
-  constexpr bool wrap = true;
-  constexpr bool es6 = false;
-  constexpr bool json = false;
-  constexpr bool compact = true;
-  constexpr bool lowercaseHex = false;
-//	const defaults = {
-//		'escapeEverything': false,
-//		'minimal': false,
-//		'isScriptContext': false,
-//		'quotes': 'single',
-//		'wrap': false,
-//		'es6': false,
-//		'json': false,
-//		'compact': true,
-//		'lowercaseHex': false,
-//		'numbers': 'decimal',
-//		'indent': '\t',
-//		'indentLevel': 0,
-//		'__inline1__': false,
-//		'__inline2__': false
-//	};
-//	const json = options && options.json;
-//	if (json) {
-//		defaults.quotes = 'double';
-//		defaults.wrap = true;
-//	}
-//	options = extend(defaults, options);
-//	if (
-//		options.quotes != 'single' &&
-//		options.quotes != 'double' &&
-//		options.quotes != 'backtick'
-//	) {
-//		options.quotes = 'single';
-//	}
-//	const quote = options.quotes == 'double' ?
-//		'"' :
-//		(options.quotes == 'backtick' ?
-//			'`' :
-//			'\''
-//		);
-//	const compact = options.compact;
-//	const lowercaseHex = options.lowercaseHex;
+  BASE::UChar quote = opts.quotes;
+  bool wrap = opts.wrap;
+  constexpr bool es6 = Option::es6;
+  bool json = opts.json;
+  constexpr bool compact = Option::compact;
+  constexpr bool lowercaseHex = Option::lowercaseHex;
+	if (json) {
+		quote = u'"';
+		wrap = true;
+	}
 //	let indent = options.indent.repeat(options.indentLevel);
 //	let oldIndent = '';
 //	const inline1 = options.__inline1__;
@@ -322,7 +325,7 @@ inline BASE::UStringViewArray<3> jsesc(BASE::Memory::Allocator& allocator, BASE:
     ) [[unlikely]] {
       BASE::UChar next_char = next < size ? data[next] : 0;
       if (next_char >= 0xDC00 && next_char <= 0xDFFF) {
-        if constexpr (minimal) {
+        if (minimal) {
           str.add(index, ++next);
           continue;
         } else {
@@ -415,12 +418,12 @@ inline BASE::UStringViewArray<3> jsesc(BASE::Memory::Allocator& allocator, BASE:
 //			.replace(/<!--/g, json ? '\\u003C!--' : '\\x3C!--');
 //	}
   auto strview = str.joinSlices();
-  if constexpr (wrap) {
-    if constexpr (quote == u'"') {
+  if (wrap) {
+    if (quote == u'"') {
       return BASE::UStringViewArray<3>(u"\"", strview, u"\"");
-    } else if constexpr (quote == u'\'') {
+    } else if (quote == u'\'') {
       return BASE::UStringViewArray<3>(u"'", strview, u"'");
-    } else if constexpr (quote == u'`') {
+    } else if (quote == u'`') {
       return BASE::UStringViewArray<3>(u"`", strview, u"`");
     } else {
       unreachable();

From a13a3fb2634a8d79f56ee809f7ed26bf2a62c141 Mon Sep 17 00:00:00 2001
From: imsenyu <imsenyu@gmail.com>
Date: Fri, 28 Mar 2025 00:58:11 +0800
Subject: [PATCH 07/18] fix: generator token

---
 src/babel/babel-generator/generators/jsx.hpp               | 4 ++--
 src/babel/babel-generator/generators/template-literals.hpp | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/babel/babel-generator/generators/jsx.hpp b/src/babel/babel-generator/generators/jsx.hpp
index 457076f5..bfc39875 100644
--- a/src/babel/babel-generator/generators/jsx.hpp
+++ b/src/babel/babel-generator/generators/jsx.hpp
@@ -52,9 +52,9 @@ namespace BabelGenerator::Generators {
     auto raw = _this.getPossibleRaw(node);
 
     if (raw != std::nullopt) {
-      _this.token(*raw, true);
+      _this.template token<true>(*raw);
     } else {
-      _this.token(node->value, true);
+      _this.template token<true>(node->value);
     }
   }
 
diff --git a/src/babel/babel-generator/generators/template-literals.hpp b/src/babel/babel-generator/generators/template-literals.hpp
index 684c52be..bdc37112 100644
--- a/src/babel/babel-generator/generators/template-literals.hpp
+++ b/src/babel/babel-generator/generators/template-literals.hpp
@@ -25,7 +25,7 @@ namespace BabelGenerator::Generators {
       bool not_last = i + 1 < quasis->size();
       auto value = BASE::UStringViewArray<3>{i == 0 ? u"`" : u"}", quasis->at(i)->value.raw, not_last ? u"${" : u"`"};
       if (not_last) {
-        _this.token(value, true);
+        _this.template token<true>(value);
         _this.print(node->expressions->at(i));
 
         // In Babel 7 we have indivirual tokens for ${ and }, so the automatic
@@ -35,7 +35,7 @@ namespace BabelGenerator::Generators {
         //   if (token) _this._catchUpTo(token.loc.start);
         // }
       } else {
-        _this.token(value, true);
+        _this.template token<true>(value);
       }
     }
   }

From 9b00a37acc37d3afe594adddd995bd121b4f82e4 Mon Sep 17 00:00:00 2001
From: imsenyu <imsenyu@gmail.com>
Date: Sat, 29 Mar 2025 22:23:56 +0800
Subject: [PATCH 08/18] test: fix
 babel-generator:typescript/cast-need-parentheses-babel-7

---
 .../babel-generator/node/parentheses.hpp      |  4 ++++
 src/babel/babel-generator/test/index.hpp      | 21 +++++++++++--------
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/src/babel/babel-generator/node/parentheses.hpp b/src/babel/babel-generator/node/parentheses.hpp
index 820128de..06a52545 100644
--- a/src/babel/babel-generator/node/parentheses.hpp
+++ b/src/babel/babel-generator/node/parentheses.hpp
@@ -66,11 +66,15 @@ namespace BabelGenerator::Nodes::Parentheses {
       return getBinaryPrecedence(node->_operator);
     } else if constexpr (BabelTypes::IsLogicalExpression<T>) {
       return getBinaryPrecedence(node->_operator);
+    } else if constexpr (BabelTypes::IsTSAsExpression<T> || BabelTypes::IsTSSatisfiesExpression<T>) {
+      return getBinaryPrecedence(BinaryOperator::In);
     } else {
       if (nodeType == Node::Type::BinaryExpression) {
         return getBinaryPrecedence(NODEAS(node, BinaryExpression)->_operator);
       } else if (nodeType == Node::Type::LogicalExpression) {
         return getBinaryPrecedence(NODEAS(node, LogicalExpression)->_operator);
+      } else if (nodeType == Node::Type::TSAsExpression || nodeType == Node::Type::TSSatisfiesExpression) {
+        return getBinaryPrecedence(BinaryOperator::In);
       } else {
         return 0;
       }
diff --git a/src/babel/babel-generator/test/index.hpp b/src/babel/babel-generator/test/index.hpp
index 6fc98721..59523bb4 100644
--- a/src/babel/babel-generator/test/index.hpp
+++ b/src/babel/babel-generator/test/index.hpp
@@ -10,18 +10,19 @@
 namespace BabelGenerator {
   inline void runAutogeneratedTests(BASE::UStringView prefix, const BabelHelperFixtures::Test &task) {
     const auto &expected = task.expect;
-    const auto &actual = task.actual;
-    const auto &actualCode = actual.code;
+    const auto &_actual = task.actual;
+    const auto &code = _actual.code;
 
-    if (actualCode.size()) {
+    if (code.size()) {
       BabelParser::Options::PartialOptions parserOpts{task.options.toParserOptions()};
       parserOpts.strictMode = task.options.strictMode.value_or(false) == false ? false : true;
       parserOpts.sourceType = BabelParser::SourceType::Value::module;
 
       auto const &throwMsg = task.options.throws;
       if (!throwMsg.has_value()) {
-        auto resultCode = BabelParser::withParser(
-          actualCode, parserOpts,
+        std::cout << BASE::String::convertUTF16ToBasic(code) << std::endl;
+        auto actualCode = BabelParser::withParser(
+          code, parserOpts,
           [&](BabelArena::Memory& allocator, PTR(BabelParser::Node::File) file, BabelParser::Options::Options const &options)
           {
             auto generatorOptions = task.options.toGeneratorOptions();
@@ -29,15 +30,17 @@ namespace BabelGenerator {
             return result.code;
           }
         );
-        if (expected.code.size() == 0 && resultCode.size()) {
+        if (expected.code.size() == 0 && actualCode.size()) {
           // write
         } else {
           auto const &expectedCode = expected.code;
-          resultCode = BASE::String::removeTrailSpace(resultCode);
-          if (resultCode == expectedCode) {
+          actualCode = BASE::String::removeTrailSpace(actualCode);
+          if (actualCode == expectedCode) {
             std::cout << "PASS" << std::endl;
           } else {
-            throw BASE::JavaScript::Error(BASE::String::Concat(u"\nexpect: \n`", expectedCode, u"`\n, actual:\n`", resultCode, u"`"));
+            std::cout << "actual: " << BASE::String::convertUTF16ToBasic(actualCode) << std::endl;
+            std::cout << "expect: " << BASE::String::convertUTF16ToBasic(expectedCode) << std::endl;
+            throw BASE::JavaScript::Error(BASE::String::Concat(u"\nexpect: \n`", expectedCode, u"`\n, actual:\n`", actualCode, u"`"));
           }
         }
       }

From 7d8d3f6a2ad9a71a3fa62f7941aaa24d7d4f641d Mon Sep 17 00:00:00 2001
From: imsenyu <imsenyu@gmail.com>
Date: Sat, 29 Mar 2025 22:32:52 +0800
Subject: [PATCH 09/18] test: fix
 babel-generator:types/ModuleExpression-directives

---
 src/babel/babel-generator/generators/base.hpp | 30 ++++++++++++-------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/src/babel/babel-generator/generators/base.hpp b/src/babel/babel-generator/generators/base.hpp
index 38721020..3467c308 100644
--- a/src/babel/babel-generator/generators/base.hpp
+++ b/src/babel/babel-generator/generators/base.hpp
@@ -77,17 +77,25 @@ namespace BabelGenerator::Generators {
     // NOTE: In directives we can't change escapings,
     // because they change the behavior.
     // e.g. "us\x65 strict" (\x65 is e) is not a "use strict" directive.
-
-    //  if (!unescapedDoubleQuoteRE.test(value)) {
-    //    _this.token(`"${value}"`);
-    //  } else if (!unescapedSingleQuoteRE.test(value)) {
-    //    _this.token(`'${value}'`);
-    //  } else {
-    //    throw new Error(
-    //      "Malformed AST: it is not possible to print a directive containing" +
-    //        " both unescaped single and double quotes.",
-    //    );
-    //  }
+    size_t slash_count = 0;
+    bool is_double_escaped = false;
+    bool is_single_escaped = false;
+    for (auto ch: value) {
+      if (ch == u'\\') { slash_count++; }
+      else if (ch == u'\'') { is_single_escaped |= slash_count % 2 == 1; }
+      else if (ch == u'\"') { is_double_escaped |= slash_count % 2 == 1; }
+      else { slash_count = 0; }
+    }
+    if (!is_double_escaped) {
+      _this.token(BASE::UStringViewArray<3>{u"\"", value, u"\""});
+    } else if (!is_single_escaped) {
+      _this.token(BASE::UStringViewArray<3>{u"\'", value, u"\'"});
+    } else {
+      throw new BASE::JavaScript::Error(
+        u"Malformed AST: it is not possible to print a directive containing"
+          u" both unescaped single and double quotes."
+      );
+    }
   }
 
   DEF_GENERATOR(InterpreterDirective, node, _) {

From 381fc7eaeff6e7199eb5f7965550d9736aa87cdf Mon Sep 17 00:00:00 2001
From: imsenyu <imsenyu@gmail.com>
Date: Sat, 29 Mar 2025 22:39:26 +0800
Subject: [PATCH 10/18] test: fix
 babel-generator:typescript/class-method-computed

---
 src/babel/babel-generator/generators/methods.hpp | 14 +++++++-------
 src/babel/babel-parser/types.hpp                 |  2 ++
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/babel/babel-generator/generators/methods.hpp b/src/babel/babel-generator/generators/methods.hpp
index 76ce6ff0..174e949f 100644
--- a/src/babel/babel-generator/generators/methods.hpp
+++ b/src/babel/babel-generator/generators/methods.hpp
@@ -116,13 +116,13 @@ namespace BabelGenerator::Generators {
       _this.print(key);
     }
 
-    // if (
-    //   // @ts-expect-error optional is not in ObjectMethod
-    //   node->optional
-    // ) {
-    //   // TS
-    //   _this.token(u"?");
-    // }
+    if (
+      // @ts-expect-error optional is not in ObjectMethod
+      node->isOptional()
+    ) {
+      // TS
+      _this.token(u"?");
+    }
 
     _params(_this, node, node->computed && node->key()->type() != Node::Type::StringLiteral ? nullptr : node->key(), nullptr);
   }
diff --git a/src/babel/babel-parser/types.hpp b/src/babel/babel-parser/types.hpp
index e7f13e31..12fab8c2 100644
--- a/src/babel/babel-parser/types.hpp
+++ b/src/babel/babel-parser/types.hpp
@@ -1076,6 +1076,7 @@ public:
     bool isStatic() const { return _static; }
     void setStatic(bool v) { _static = v; }
     bool isAbstract() const { return modifier.isAbstract(); }
+    bool isOptional() const { return modifier.isOptional(); }
     VirtualClassMember(const Value &inter) :
       computed(inter.computed),
       _static(inter._static),
@@ -1301,6 +1302,7 @@ public:
     bool computed;
     bool method_; // TODO: Not in spec,
     bool isAbstract() const { return false; }
+    bool isOptional() const { return false; }
     void format(Writer::NodeWriter &writer) const {
       if (auto kind = this->kind) {
         writer.field("kind", MethodKind::toString(kind));

From c63ce877e422b74a224fd6426444dc4a48732b94 Mon Sep 17 00:00:00 2001
From: imsenyu <imsenyu@gmail.com>
Date: Sat, 29 Mar 2025 22:41:48 +0800
Subject: [PATCH 11/18] test: fix
 babel-generator:typescript/class-field-declare

---
 src/babel/babel-generator/generators/typescript.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/babel/babel-generator/generators/typescript.hpp b/src/babel/babel-generator/generators/typescript.hpp
index a6836bbd..2547204d 100644
--- a/src/babel/babel-generator/generators/typescript.hpp
+++ b/src/babel/babel-generator/generators/typescript.hpp
@@ -763,7 +763,7 @@ namespace BabelGenerator::Generators {
     printModifiersList(
       _this, node,
       Node::Modifier::Value{
-        (isField && node->modifier.isDeclare() ? Node::Modifier::Declare : Node::Modifier::Undefined) | node->modifier.getAccessibility()
+        (isField && node->isDeclare() ? Node::Modifier::Declare : Node::Modifier::Undefined) | node->modifier.getAccessibility()
       }
     );
     if (node->isStatic()) {

From 2217b060d8b7d4cfa2335721e4571033f61e59dc Mon Sep 17 00:00:00 2001
From: imsenyu <imsenyu@gmail.com>
Date: Sat, 29 Mar 2025 22:57:09 +0800
Subject: [PATCH 12/18] test: fix babel-generator:typescript/types-mapped

---
 .../babel-generator/generators/typescript.hpp | 22 +++++++++----------
 .../babel-parser/plugins/typescript/index.hpp |  2 +-
 src/babel/babel-parser/types.hpp              |  4 ++--
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/babel/babel-generator/generators/typescript.hpp b/src/babel/babel-generator/generators/typescript.hpp
index 2547204d..04003faf 100644
--- a/src/babel/babel-generator/generators/typescript.hpp
+++ b/src/babel/babel-generator/generators/typescript.hpp
@@ -399,7 +399,7 @@ namespace BabelGenerator::Generators {
     _this.print(node->indexType);
     _this.token(u"]");
   }
-
+  inline void tokenIfPlusMinus(Printer::Printer& self, Node::TypeScriptReadonlyOptionalFlag::Value tok);
   DEF_GENERATOR(TSMappedType, node, _) {
     auto nameType = node->nameType;
     auto optional = node->optional;
@@ -411,7 +411,7 @@ namespace BabelGenerator::Generators {
       {
         _this.space();
         if (readonly) {
-          // tokenIfPlusMinus(this, readonly);
+          tokenIfPlusMinus(_this, readonly);
           _this.word(u"readonly");
           _this.space();
         }
@@ -421,7 +421,7 @@ namespace BabelGenerator::Generators {
           _this.word(node->key->name->string());
         } else {
           // @ts-ignore(Babel 7 vs Babel 8) Babel 7 AST shape
-          // _this.word(node->typeParameter->name);
+          _this.word(node->typeParameter->name_->name->string());
         }
         _this.space();
         _this.word(u"in");
@@ -431,7 +431,7 @@ namespace BabelGenerator::Generators {
           _this.print(node->constraint);
         } else {
           // @ts-ignore(Babel 7 vs Babel 8) Babel 7 AST shape
-          // _this.print(node->typeParameter.constraint);
+          _this.print(node->typeParameter->constraint);
         }
         if (nameType) {
           _this.space();
@@ -441,7 +441,7 @@ namespace BabelGenerator::Generators {
         }
         _this.token(u"]");
         if (optional) {
-          // tokenIfPlusMinus(this, optional);
+          tokenIfPlusMinus(_this, optional);
           _this.token(u"?");
         }
         if (typeAnnotation) {
@@ -455,12 +455,12 @@ namespace BabelGenerator::Generators {
     _this.token(u"}");
   }
 
-  // function tokenIfPlusMinus(self: Printer, tok: true | "+" | "-") {
-  //   if (tok !== true) {
-  //     self.token(tok);
-  //   }
-  // }
-  //
+  inline void tokenIfPlusMinus(Printer::Printer& self, Node::TypeScriptReadonlyOptionalFlag::Value tok) {
+    if (tok != Node::TypeScriptReadonlyOptionalFlag::True) {
+      self.token(toString(tok));
+    }
+  }
+
   DEF_GENERATOR(TSLiteralType, node, _) { _this.print(node->literal); }
 
   template<typename T>
diff --git a/src/babel/babel-parser/plugins/typescript/index.hpp b/src/babel/babel-parser/plugins/typescript/index.hpp
index 3b2a589d..e8e5c701 100644
--- a/src/babel/babel-parser/plugins/typescript/index.hpp
+++ b/src/babel/babel-parser/plugins/typescript/index.hpp
@@ -1052,7 +1052,7 @@ namespace BabelParser::Plugins::TypeScript {
       this->expect(TokenType::$_bracketL);
       PTR(Node::Identifier) key = nullptr;
       PTR(Node::TSType) constraint = nullptr;
-      PTR(Node::TSType) typeParameter = nullptr;
+      PTR(Node::TSTypeParameter) typeParameter = nullptr;
       if (BASE::process::env.BABEL_8_BREAKING) {
         key = this->tsParseTypeParameterName();
         constraint = this->tsExpectThenParseType(TokenType::$_in);
diff --git a/src/babel/babel-parser/types.hpp b/src/babel/babel-parser/types.hpp
index 12fab8c2..cce572e4 100644
--- a/src/babel/babel-parser/types.hpp
+++ b/src/babel/babel-parser/types.hpp
@@ -3160,7 +3160,7 @@ public:
     TypeScriptReadonlyOptionalFlag::Value readonly;
     TypeScriptReadonlyOptionalFlag::Value optional;
     PTR(TSType) typeAnnotation;
-    PTR(TSType) typeParameter;
+    PTR(TSTypeParameter) typeParameter;
     PTR(TSType) nameType;
     explicit TSMappedType(
       PositionInfo const &pos,
@@ -3169,7 +3169,7 @@ public:
       TypeScriptReadonlyOptionalFlag::Value readonly,
       TypeScriptReadonlyOptionalFlag::Value optional,
       PTR(TSType) typeAnnotation,
-      PTR(TSType) typeParameter,
+      PTR(TSTypeParameter) typeParameter,
       PTR(TSType) nameType
     ) :
       TSType(TYPE, pos),

From 2e14c157755fd1df30f8f6bbf5e66219d8b9f3a2 Mon Sep 17 00:00:00 2001
From: imsenyu <imsenyu@gmail.com>
Date: Sat, 29 Mar 2025 23:56:35 +0800
Subject: [PATCH 13/18] test: fix babel-generator:escapes/numeric-literals

---
 .../babel-generator/generators/types.hpp      | 11 ++--
 src/babel/babel-generator/printer.hpp         |  3 +-
 src/babel/babel-helper-fixtures/index.hpp     | 38 ++++++++++++
 src/base/number.hpp                           | 30 ++++++++-
 src/npm_modules/jsesc/jsesc.hpp               | 62 ++++++++++++++++++-
 5 files changed, 133 insertions(+), 11 deletions(-)

diff --git a/src/babel/babel-generator/generators/types.hpp b/src/babel/babel-generator/generators/types.hpp
index 6e241cc4..7e426da5 100644
--- a/src/babel/babel-generator/generators/types.hpp
+++ b/src/babel/babel-generator/generators/types.hpp
@@ -246,13 +246,14 @@ namespace BabelGenerator::Generators {
 
   DEF_GENERATOR(NumericLiteral, node, _) {
     auto raw = _this.getPossibleRaw(node);
-    //  const opts = this.format.jsescOption;
+    auto const& opts = _this.format.jsescOption;
     auto value = node->value;
     // const str = value + "";
-    //  if (opts.numbers) {
-    //    this.number(jsesc(value, opts), value);
-    //  } else
-    if (raw == std::nullopt) {
+    if (opts.numbers) {
+      Jsesc::jsesc(_this.allocator, *value, opts, [&](auto&& str){
+        _this.number(str, value);
+      });
+    } else if (raw == std::nullopt) {
       unreachable();
       // _this.number(str, value); // normalize
     } else if (_this.format.minified) {
diff --git a/src/babel/babel-generator/printer.hpp b/src/babel/babel-generator/printer.hpp
index 7318e8a4..81d545b2 100644
--- a/src/babel/babel-generator/printer.hpp
+++ b/src/babel/babel-generator/printer.hpp
@@ -399,7 +399,8 @@ namespace BabelGenerator::Printer {
       }
       return false;
     }
-    void number(BASE::UStringView str, std::optional<BASE::Number::FixedNumber> number) {
+    template<BASE::IsStringViewOrArray STR>
+    void number(STR && str, std::optional<BASE::Number::FixedNumber> number) {
       // const NON_DECIMAL_LITERAL = /^0[box]/;
       this->word(str);
 
diff --git a/src/babel/babel-helper-fixtures/index.hpp b/src/babel/babel-helper-fixtures/index.hpp
index e2d56598..0a945536 100644
--- a/src/babel/babel-helper-fixtures/index.hpp
+++ b/src/babel/babel-helper-fixtures/index.hpp
@@ -84,6 +84,7 @@ namespace BabelHelperFixtures {
     std::optional<bool> decoratorsBeforeExport;
     std::optional<BASE::UString> importAttributesKeyword;
     std::optional<BASE::UString> topicToken;
+    std::optional<Jsesc::PartialOption> jsescOption;
 
     void assign(JSON const &json) {
       if (auto const &parserOpts = json.find("parserOpts"); parserOpts != json.end()) {
@@ -235,6 +236,42 @@ namespace BabelHelperFixtures {
       if (auto const &decoratorsBeforeExport = json.find("decoratorsBeforeExport"); decoratorsBeforeExport != json.end()) {
         this->decoratorsBeforeExport = decoratorsBeforeExport->get<bool>();
       }
+      if (auto const &jsescOption = json.find("jsescOption"); jsescOption != json.end()) {
+        if (jsescOption->is_object()) {
+          this->jsescOption = Jsesc::PartialOption{};
+          if (auto const& wrap = jsescOption->find("wrap"); wrap != jsescOption->end()) {
+            this->jsescOption->wrap = wrap->get<bool>();
+          }
+          if (auto const& minimal = jsescOption->find("minimal"); minimal != jsescOption->end()) {
+            this->jsescOption->minimal = minimal->get<bool>();
+          }
+          if (auto const& json = jsescOption->find("json"); json != jsescOption->end()) {
+            this->jsescOption->json = json->get<bool>();
+          }
+          if (auto const& lowercaseHex = jsescOption->find("lowercaseHex"); lowercaseHex != jsescOption->end()) {
+            this->jsescOption->lowercaseHex = lowercaseHex->get<bool>();
+          }
+          if (auto const& numbers = jsescOption->find("numbers"); numbers != jsescOption->end()) {
+            auto const& numbers_str = numbers->get<std::string>();
+            this->jsescOption->numbers = (
+              numbers_str == "binary" ? std::optional(2) :
+              numbers_str == "octal" ? std::optional(8) :
+              numbers_str == "decimal" ? std::optional(10) :
+              numbers_str == "hexadecimal" ? std::optional(16) :
+              std::nullopt
+            );
+          }
+          if (auto const& quotes = jsescOption->find("quotes"); quotes != jsescOption->end()) {
+            auto const& quotes_str = quotes->get<std::string>();
+            this->jsescOption->quotes = (
+              quotes_str == "double" ? std::optional(u'"') :
+              quotes_str == "single" ? std::optional(u'\'') :
+              quotes_str == "backtick" ? std::optional(u'`') :
+              std::nullopt
+            );
+          }
+        }
+      }
     }
     BabelGenerator::GeneratorOptions toGeneratorOptions() const {
       auto const &taskOptions = *this;
@@ -285,6 +322,7 @@ namespace BabelHelperFixtures {
         if (*topicToken == u"^^")
           generatorOptions.topicToken = BabelTypes::Enum::TopicToken::_uparrow2;
       }
+      generatorOptions.jsescOption = taskOptions.jsescOption;
       return generatorOptions;
     }
     BabelParser::Options::PartialOptions toParserOptions() const {
diff --git a/src/base/number.hpp b/src/base/number.hpp
index 4cc0ad1e..4b51368e 100644
--- a/src/base/number.hpp
+++ b/src/base/number.hpp
@@ -32,11 +32,22 @@ namespace BASE::Number {
       }
       return return_value;
     }
+    template<int HEX = 10, BASE::UChar ABASE = 0>
     static BASE::UChar* writePositiveToBuffer(int64_t val, BASE::UChar* begin) {
       BASE::UChar* current = begin;
       do {
-        *current++ = '0' + (val % 10);
-        val /= 10;
+        int64_t mod = val % HEX;
+
+        if constexpr (HEX == 16) {
+          if (mod >= 10) {
+            *current++ = ABASE + mod - 10;
+          } else {
+            *current++ = '0' + mod;
+          }
+        } else {
+          *current++ = '0' + mod;
+        }
+        val /= HEX;
       } while (val > 0);
       size_t len = current - begin;
       for (int j = 0; j < len / 2; ++j) {
@@ -46,8 +57,21 @@ namespace BASE::Number {
       }
       return current;
     }
+    template<int HEX, BASE::UChar ABASE, class CB>
+    void withHexString(CB&& callback) const {
+      constexpr int bufferSize = 1024;
+      BASE::UChar buffer[bufferSize];
+      int64_t int_part = value_ * std::pow(10, scale_);
+      BASE::UChar* current = buffer;
+      current = writePositiveToBuffer<HEX, ABASE>(int_part, current);
+      *current++ = 0;
+      if (current - buffer > bufferSize) {
+        unreachable();
+      }
+      callback(BASE::UStringView{buffer, static_cast<size_t>(current - buffer - 1)});
+    }
     template<class CB>
-    void withString(CB&& callback) {
+    void withString(CB&& callback) const {
       constexpr int bufferSize = 1024;
       BASE::UChar buffer[bufferSize];
       int64_t abs_value = std::abs(value_);
diff --git a/src/npm_modules/jsesc/jsesc.hpp b/src/npm_modules/jsesc/jsesc.hpp
index cc62abf4..ac7dad54 100644
--- a/src/npm_modules/jsesc/jsesc.hpp
+++ b/src/npm_modules/jsesc/jsesc.hpp
@@ -3,6 +3,7 @@
 #include "../../babel/babel-arena/index.hpp"
 #include "../../base/unicode.hpp"
 #include "../../base/string.hpp"
+#include "../../base/number.hpp"
 #include "../../base/allocator.hpp"
 
 namespace Jsesc {
@@ -40,10 +41,12 @@ namespace Jsesc {
 //}
 //
   struct PartialOption {
+    std::optional<uint8_t> numbers;
     std::optional<BASE::UChar> quotes;
     std::optional<bool> wrap;
     std::optional<bool> minimal;
     std::optional<bool> json;
+    std::optional<bool> lowercaseHex;
   };
   struct Option {
     //		'numbers': 'decimal',
@@ -51,6 +54,7 @@ namespace Jsesc {
     //		'indentLevel': 0,
     //		'__inline1__': false,
     //		'__inline2__': false
+    uint8_t numbers = 0;
     BASE::UChar quotes = u'\'';
     bool wrap = false;
     bool minimal = false;
@@ -58,8 +62,11 @@ namespace Jsesc {
     static constexpr bool escapeEverything = false;
     static constexpr bool es6 = false;
     static constexpr bool compact = true;
-    static constexpr bool lowercaseHex = false;
+    bool lowercaseHex = false;
     Option& assign(PartialOption const&opt) {
+      if (auto numbers = opt.numbers) {
+        this->numbers = *numbers;
+      }
       if (auto quotes = opt.quotes) {
         this->quotes = *quotes;
       }
@@ -71,6 +78,9 @@ namespace Jsesc {
       }
       if (auto json = opt.json) {
         this->json = *json;
+     }
+       if (auto lowercaseHex = opt.lowercaseHex) {
+        this->lowercaseHex = *lowercaseHex;
       }
       return *this;
     }
@@ -153,6 +163,54 @@ namespace Jsesc {
 //const escapeEverythingRegex = /([\uD800-\uDBFF][\uDC00-\uDFFF])|([\uD800-\uDFFF])|(['"`])|[^]/g;
 //const escapeNonAsciiRegex = /([\uD800-\uDBFF][\uDC00-\uDFFF])|([\uD800-\uDFFF])|(['"`])|[^ !#-&\(-\[\]-_a-~]/g;
 //
+template<class CB>
+inline void jsesc(BASE::Memory::Allocator& allocator, BASE::Number::FixedNumber const& input, Option const& opts, CB&& callback) {
+  constexpr bool escapeEverything = Option::escapeEverything;
+  bool minimal = opts.minimal;
+  constexpr bool isScriptContext = false;
+  BASE::UChar quote = opts.quotes;
+  bool wrap = opts.wrap;
+  constexpr bool es6 = Option::es6;
+  bool json = opts.json;
+  constexpr bool compact = Option::compact;
+  bool lowercaseHex = opts.lowercaseHex;
+	bool useBinNumbers = opts.numbers == 2;
+	bool useOctNumbers = opts.numbers == 8;
+	bool useDecNumbers = opts.numbers == 10;
+	bool useHexNumbers = opts.numbers == 16;
+
+  if (json) {
+    // Some number values (e.g. `Infinity`) cannot be represented in JSON.
+    unreachable();
+    // return JSON.stringify(argument);
+  }
+  if (useDecNumbers) {
+    // return String(argument);
+    input.template withHexString<10, 0>([&](auto&& str) {
+      callback(str);
+    });
+  } else if (useHexNumbers) {
+    if (!lowercaseHex) {
+      input.template withHexString<16, u'A'>([&](auto&& str) {
+        callback(BASE::UStringViewArray<2>{u"0x", str});
+      });
+    } else {
+      input.template withHexString<16, u'a'>([&](auto&& str) {
+        callback(BASE::UStringViewArray<2>{u"0x", str});
+      });
+    }
+  } else if (useBinNumbers) {
+    input.template withHexString<2, 0>([&](auto&& str) {
+      callback(BASE::UStringViewArray<2>{u"0b", str});
+    });
+  } else if (useOctNumbers) {
+    input.template withHexString<8, 0>([&](auto&& str) {
+      callback(BASE::UStringViewArray<2>{u"0o", str});
+    });
+  } else {
+    unreachable();
+  }
+}
 inline BASE::UStringViewArray<3> jsesc(BASE::Memory::Allocator& allocator, BASE::UStringView const& input, Option const& opts) {
 //const jsesc = (argument, options) => {
 //	const increaseIndentation = () => {
@@ -174,7 +232,7 @@ inline BASE::UStringViewArray<3> jsesc(BASE::Memory::Allocator& allocator, BASE:
   constexpr bool es6 = Option::es6;
   bool json = opts.json;
   constexpr bool compact = Option::compact;
-  constexpr bool lowercaseHex = Option::lowercaseHex;
+  bool lowercaseHex = opts.lowercaseHex;
 	if (json) {
 		quote = u'"';
 		wrap = true;

From 08f9000dccd810dadffe0222d6d18d089368cf86 Mon Sep 17 00:00:00 2001
From: imsenyu <imsenyu@gmail.com>
Date: Sat, 29 Mar 2025 23:57:08 +0800
Subject: [PATCH 14/18] chore

---
 src/babel/babel-generator/test/index.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/babel/babel-generator/test/index.hpp b/src/babel/babel-generator/test/index.hpp
index 59523bb4..9690f031 100644
--- a/src/babel/babel-generator/test/index.hpp
+++ b/src/babel/babel-generator/test/index.hpp
@@ -20,7 +20,7 @@ namespace BabelGenerator {
 
       auto const &throwMsg = task.options.throws;
       if (!throwMsg.has_value()) {
-        std::cout << BASE::String::convertUTF16ToBasic(code) << std::endl;
+        // std::cout << BASE::String::convertUTF16ToBasic(code) << std::endl;
         auto actualCode = BabelParser::withParser(
           code, parserOpts,
           [&](BabelArena::Memory& allocator, PTR(BabelParser::Node::File) file, BabelParser::Options::Options const &options)

From 6b7eef23ab1059cd25f63a926863c9989e8b4327 Mon Sep 17 00:00:00 2001
From: imsenyu <imsenyu@gmail.com>
Date: Sun, 30 Mar 2025 00:10:06 +0800
Subject: [PATCH 15/18] test: fix babel-generator:escapes/jsonEscape-babel-7

---
 src/babel/babel-helper-fixtures/index.hpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/babel/babel-helper-fixtures/index.hpp b/src/babel/babel-helper-fixtures/index.hpp
index 0a945536..b5bf6785 100644
--- a/src/babel/babel-helper-fixtures/index.hpp
+++ b/src/babel/babel-helper-fixtures/index.hpp
@@ -85,6 +85,7 @@ namespace BabelHelperFixtures {
     std::optional<BASE::UString> importAttributesKeyword;
     std::optional<BASE::UString> topicToken;
     std::optional<Jsesc::PartialOption> jsescOption;
+    std::optional<bool> jsonCompatibleStrings;
 
     void assign(JSON const &json) {
       if (auto const &parserOpts = json.find("parserOpts"); parserOpts != json.end()) {
@@ -236,6 +237,9 @@ namespace BabelHelperFixtures {
       if (auto const &decoratorsBeforeExport = json.find("decoratorsBeforeExport"); decoratorsBeforeExport != json.end()) {
         this->decoratorsBeforeExport = decoratorsBeforeExport->get<bool>();
       }
+      if (auto const &jsonCompatibleStrings = json.find("jsonCompatibleStrings"); jsonCompatibleStrings != json.end()) {
+        this->jsonCompatibleStrings = jsonCompatibleStrings->get<bool>();
+      }
       if (auto const &jsescOption = json.find("jsescOption"); jsescOption != json.end()) {
         if (jsescOption->is_object()) {
           this->jsescOption = Jsesc::PartialOption{};
@@ -323,6 +327,7 @@ namespace BabelHelperFixtures {
           generatorOptions.topicToken = BabelTypes::Enum::TopicToken::_uparrow2;
       }
       generatorOptions.jsescOption = taskOptions.jsescOption;
+      generatorOptions.jsonCompatibleStrings = taskOptions.jsonCompatibleStrings;
       return generatorOptions;
     }
     BabelParser::Options::PartialOptions toParserOptions() const {

From c23c4f5d2a0e7c95d527ce9e2df8d61be855886f Mon Sep 17 00:00:00 2001
From: imsenyu <imsenyu@gmail.com>
Date: Sun, 30 Mar 2025 00:17:59 +0800
Subject: [PATCH 16/18] test: fix babel-generator:edgecase/new-precedence

---
 src/babel/babel-generator/node/index.hpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/babel/babel-generator/node/index.hpp b/src/babel/babel-generator/node/index.hpp
index 2ddf39ec..1d69dab9 100644
--- a/src/babel/babel-generator/node/index.hpp
+++ b/src/babel/babel-generator/node/index.hpp
@@ -22,13 +22,13 @@ namespace BabelGenerator::Nodes {
 
   // const expandedWhitespaceNodes = expandAliases(whitespace.nodes);
 
-  // function isOrHasCallExpression(node: t.Node): boolean {
-  //   if (isCallExpression(node)) {
-  //     return true;
-  //   }
+  inline bool isOrHasCallExpression(PTR(Node::Node) node) {
+    if (BabelTypes::isCallExpression(node)) {
+      return true;
+    }
 
-  //   return isMemberExpression(node) && isOrHasCallExpression(node.object);
-  // }
+    return BabelTypes::isMemberExpression(node) && isOrHasCallExpression(NODEAS(node, MemberExpression)->object);
+  }
 
   // export function needsWhitespace(
   //   node: t.Node,
@@ -65,8 +65,8 @@ namespace BabelGenerator::Nodes {
     if (!parent)
       return false;
 
-    if (parent->type() == Node::Type::NewExpression && NODEAS(parent, NewExpression)->callee == node) {
-      // if (isOrHasCallExpression(node)) return true;
+    if (parent->type() == Node::Type::NewExpression && NODEAS(parent, NewExpression)->callee == node) [[unlikely]] {
+      if (isOrHasCallExpression(node)) return true;
     }
 
     //   if (isDecorator(parent)) {

From 4f0e647ce14e72cfe32699063fff6839a53ac61a Mon Sep 17 00:00:00 2001
From: imsenyu <imsenyu@gmail.com>
Date: Sun, 30 Mar 2025 00:21:24 +0800
Subject: [PATCH 17/18] test: fix
 babel-generator:decorators/decorator-parenthesized-expression

---
 src/babel/babel-generator/node/index.hpp | 43 ++++++++++++------------
 1 file changed, 22 insertions(+), 21 deletions(-)

diff --git a/src/babel/babel-generator/node/index.hpp b/src/babel/babel-generator/node/index.hpp
index 1d69dab9..3e00d02d 100644
--- a/src/babel/babel-generator/node/index.hpp
+++ b/src/babel/babel-generator/node/index.hpp
@@ -57,6 +57,7 @@ namespace BabelGenerator::Nodes {
   // export function needsWhitespaceAfter(node: t.Node, parent: t.Node) {
   //   return needsWhitespace(node, parent, 2);
   // }
+  inline bool isDecoratorMemberExpression(PTR(Node::Node) node);
 
   inline bool needsParens(
     PTR(Node::Node) node, PTR(Node::Node) parent, Node::Type nodeType, TokenContext::Type tokenContext = 0, bool inForInit = false
@@ -69,13 +70,13 @@ namespace BabelGenerator::Nodes {
       if (isOrHasCallExpression(node)) return true;
     }
 
-    //   if (isDecorator(parent)) {
-    //     return (
-    //       !isDecoratorMemberExpression(node) &&
-    //       !(isCallExpression(node) && isDecoratorMemberExpression(node.callee)) &&
-    //       !isParenthesizedExpression(node)
-    //     );
-    //   }
+    if (BabelTypes::isDecorator(parent)) [[unlikely]] {
+      return (
+        !isDecoratorMemberExpression(node) &&
+        !(BabelTypes::isCallExpression(node) && isDecoratorMemberExpression(NODEAS(node, CallExpression)->callee)) &&
+        !BabelTypes::isParenthesizedExpression(node)
+      );
+    }
 
     auto method = parenthesesMethods[nodeType];
     if (method) {
@@ -85,20 +86,20 @@ namespace BabelGenerator::Nodes {
     }
   }
 
-  // function isDecoratorMemberExpression(node: t.Node): boolean {
-  //   switch (node.type) {
-  //     case "Identifier":
-  //       return true;
-  //     case "MemberExpression":
-  //       return (
-  //         !node.computed &&
-  //         node.property.type === "Identifier" &&
-  //         isDecoratorMemberExpression(node.object)
-  //       );
-  //     default:
-  //       return false;
-  //   }
-  // }
+  inline bool isDecoratorMemberExpression(PTR(Node::Node) node) {
+    switch (node->type()) {
+      case Node::Type::Identifier:
+        return true;
+      case Node::Type::MemberExpression:
+        return (
+          !NODEAS(node, MemberExpression)->computed &&
+          NODEAS(node, MemberExpression)->property->type() == Node::Type::Identifier &&
+          isDecoratorMemberExpression(NODEAS(node, MemberExpression)->object)
+        );
+      default:
+        return false;
+    }
+  }
 
   // export function isLastChild(parent: t.Node, child: t.Node) {
   //   const visitorKeys = VISITOR_KEYS[parent.type];

From 5569757c2212fd093883f0adeeafbff35853acb6 Mon Sep 17 00:00:00 2001
From: imsenyu <imsenyu@gmail.com>
Date: Sun, 30 Mar 2025 00:40:22 +0800
Subject: [PATCH 18/18] chore: typescript

---
 src/babel/babel-generator/printer.hpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/babel/babel-generator/printer.hpp b/src/babel/babel-generator/printer.hpp
index 81d545b2..b66733ec 100644
--- a/src/babel/babel-generator/printer.hpp
+++ b/src/babel/babel-generator/printer.hpp
@@ -1437,9 +1437,9 @@ namespace BabelGenerator::Printer {
           if (commentsHead->next() == nullptr) {
             bool singleLine = comment->locStart().line() == comment->locEnd().line();
 
-            bool shouldSkipNewline = singleLine && !BabelTypes::isStatement(node) && !BabelTypes::isClassBody(parent) && true;
-            // !BabelTypes::isTSInterfaceBody(parent) &&
-            // !BabelTypes::isTSEnumMember(node);
+            bool shouldSkipNewline = singleLine && !BabelTypes::isStatement(node) && !BabelTypes::isClassBody(parent) &&
+              !BabelTypes::isTSInterfaceBody(parent) &&
+              !BabelTypes::isTSEnumMember(node);
 
             if constexpr (commentPos == CommentPosition::Leading) {
               if ((shouldSkipNewline && node->type() != Node::Type::ObjectExpression) ||
@@ -1455,8 +1455,8 @@ namespace BabelGenerator::Printer {
             }
           } else if (commentPos == CommentPosition::Inner &&
                      !(node->type() == Node::Type::ObjectExpression && NODEAS(node, ObjectExpression)->properties->size() > 1) &&
-                     node->type() != Node::Type::ClassBody && true
-                     // node->type() != Node::Type::TSInterfaceBody
+                     node->type() != Node::Type::ClassBody &&
+                     node->type() != Node::Type::TSInterfaceBody
           ) {
             // class X {
             //   /*:: a: number*/