Use bun.ComptimeStringMap instead of std.StaticStringMap (oven-sh…

…#12351) Co-authored-by: Jarred-Sumner <Jarred-Sumner@users.noreply.github.com>
anonrig · Jul 5, 2024 · ee25618 · ee25618
1 parent 4f3ef07
commit ee25618
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 25 deletions.
diff --git a/src/bun.js/ipc.zig b/src/bun.js/ipc.zig
@@ -23,7 +23,7 @@ pub const Mode = enum {
     /// This must match the behavior of node.js, and supports bun <--> node.js/etc communication.
     json,
 
-    const Map = std.StaticStringMap(Mode).initComptime(.{
+    const Map = bun.ComptimeStringMap(Mode, .{
         .{ "advanced", .advanced },
         .{ "json", .json },
     });

diff --git a/src/js_lexer_tables.zig b/src/js_lexer_tables.zig
@@ -7,6 +7,7 @@ const unicode = std.unicode;
 const default_allocator = bun.default_allocator;
 const string = @import("string_types.zig").string;
 const CodePoint = @import("string_types.zig").CodePoint;
+const ComptimeStringMap = bun.ComptimeStringMap;
 
 pub const T = enum(u8) {
     t_end_of_file,
@@ -159,7 +160,7 @@ pub const T = enum(u8) {
     }
 };
 
-pub const Keywords = std.StaticStringMap(T).initComptime(.{
+pub const Keywords = ComptimeStringMap(T, .{
     .{ "break", .t_break },
     .{ "case", .t_case },
     .{ "catch", .t_catch },
@@ -198,7 +199,7 @@ pub const Keywords = std.StaticStringMap(T).initComptime(.{
     .{ "with", .t_with },
 });
 
-pub const StrictModeReservedWords = std.StaticStringMap(void).initComptime(.{
+pub const StrictModeReservedWords = ComptimeStringMap(void, .{
     .{ "implements", {} },
     .{ "interface", {} },
     .{ "let", {} },
@@ -210,7 +211,7 @@ pub const StrictModeReservedWords = std.StaticStringMap(void).initComptime(.{
     .{ "yield", {} },
 });
 
-pub const StrictModeReservedWordsRemap = std.StaticStringMap(string).initComptime(.{
+pub const StrictModeReservedWordsRemap = ComptimeStringMap(string, .{
     .{ "implements", "_implements" },
     .{ "interface", "_interface" },
     .{ "let", "_let" },
@@ -235,7 +236,7 @@ pub const PropertyModifierKeyword = enum {
     p_set,
     p_static,
 
-    pub const List = std.StaticStringMap(PropertyModifierKeyword).initComptime(.{
+    pub const List = ComptimeStringMap(PropertyModifierKeyword, .{
         .{ "abstract", .p_abstract },
         .{ "async", .p_async },
         .{ "declare", .p_declare },
@@ -250,7 +251,7 @@ pub const PropertyModifierKeyword = enum {
     });
 };
 
-pub const TypeScriptAccessibilityModifier = std.StaticStringMap(void).initComptime(.{
+pub const TypeScriptAccessibilityModifier = ComptimeStringMap(void, .{
     .{ "override", void },
     .{ "private", void },
     .{ "protected", void },
@@ -519,7 +520,7 @@ pub const TypescriptStmtKeyword = enum {
     ts_stmt_global,
     ts_stmt_declare,
 
-    pub const List = std.StaticStringMap(TypescriptStmtKeyword).initComptime(.{
+    pub const List = ComptimeStringMap(TypescriptStmtKeyword, .{
         .{
             "type",
             TypescriptStmtKeyword.ts_stmt_type,
@@ -552,7 +553,7 @@ pub const TypescriptStmtKeyword = enum {
 };
 
 //  Error: meta is a void element tag and must neither have `children` nor use `dangerouslySetInnerHTML`.
-pub const ChildlessJSXTags = std.StaticStringMap(void).initComptime(.{
+pub const ChildlessJSXTags = ComptimeStringMap(void, .{
     .{ "area", void },
     .{ "base", void },
     .{ "br", void },
@@ -572,7 +573,7 @@ pub const ChildlessJSXTags = std.StaticStringMap(void).initComptime(.{
 });
 
 // In a microbenchmark, this outperforms
-pub const jsxEntity = std.StaticStringMap(CodePoint).initComptime(.{
+pub const jsxEntity = ComptimeStringMap(CodePoint, .{
     .{ "Aacute", @as(CodePoint, 0x00C1) },
     .{ "aacute", @as(CodePoint, 0x00E1) },
     .{ "Acirc", @as(CodePoint, 0x00C2) },

diff --git a/src/js_parser.zig b/src/js_parser.zig
@@ -1013,7 +1013,7 @@ pub const TypeScript = struct {
                 else => return null,
             }
         }
-        pub const IMap = std.StaticStringMap(Kind).initComptime(.{
+        pub const IMap = bun.ComptimeStringMap(Kind, .{
             .{ "unique", .unique },
             .{ "abstract", .abstract },
             .{ "asserts", .asserts },
@@ -2560,7 +2560,7 @@ const AsyncPrefixExpression = enum(u2) {
     is_async,
     is_await,
 
-    const map = std.StaticStringMap(AsyncPrefixExpression).initComptime(.{
+    const map = bun.ComptimeStringMap(AsyncPrefixExpression, .{
         .{ "yield", .is_yield },
         .{ "await", .is_await },
         .{ "async", .is_async },

diff --git a/src/open.zig b/src/open.zig
@@ -66,7 +66,7 @@ pub const Editor = enum(u8) {
     const StringMap = std.EnumMap(Editor, string);
     const StringArrayMap = std.EnumMap(Editor, []const [:0]const u8);
 
-    const name_map = std.StaticStringMap(Editor).initComptime(.{
+    const name_map = bun.ComptimeStringMap(Editor, .{
         .{ "sublime", .sublime },
         .{ "subl", .sublime },
         .{ "vscode", .vscode },

diff --git a/src/options.zig b/src/options.zig
@@ -298,7 +298,7 @@ pub const ExternalModules = struct {
         "zlib",
     };
 
-    pub const NodeBuiltinsMap = std.StaticStringMap(void).initComptime(.{
+    pub const NodeBuiltinsMap = bun.ComptimeStringMap(void, .{
         .{ "_http_agent", {} },
         .{ "_http_client", {} },
         .{ "_http_common", {} },
@@ -370,7 +370,7 @@ pub const ModuleType = enum {
     cjs,
     esm,
 
-    pub const List = std.StaticStringMap(ModuleType).initComptime(.{
+    pub const List = bun.ComptimeStringMap(ModuleType, .{
         .{ "commonjs", ModuleType.cjs },
         .{ "module", ModuleType.esm },
     });

diff --git a/src/resolver/tsconfig_json.zig b/src/resolver/tsconfig_json.zig
@@ -67,7 +67,7 @@ pub const TSConfigJSON = struct {
         remove,
         invalid,
 
-        pub const List = std.StaticStringMap(ImportsNotUsedAsValue).initComptime(.{
+        pub const List = bun.ComptimeStringMap(ImportsNotUsedAsValue, .{
             .{ "preserve", .preserve },
             .{ "error", .err },
             .{ "remove", .remove },

diff --git a/test/js/node/timers.promises/timers.promises.test.ts b/test/js/node/timers.promises/timers.promises.test.ts
@@ -5,21 +5,21 @@ describe("setTimeout", () => {
   it("abort() does not emit global error", async () => {
     let unhandledRejectionCaught = false;
 
-    const catchUnhandledRejection = () =>  {
+    const catchUnhandledRejection = () => {
       unhandledRejectionCaught = true;
     };
-    process.on('unhandledRejection', catchUnhandledRejection);
-    
+    process.on("unhandledRejection", catchUnhandledRejection);
+
     const c = new AbortController();
 
     global.setTimeout(() => c.abort());
 
     await setTimeout(100, undefined, { signal: c.signal }).catch(() => "aborted");
 
     // let unhandledRejection to be fired
-    await setTimeout(100)
+    await setTimeout(100);
 
-    process.off('unhandledRejection', catchUnhandledRejection);
+    process.off("unhandledRejection", catchUnhandledRejection);
 
     expect(c.signal.aborted).toBe(true);
     expect(unhandledRejectionCaught).toBe(false);
@@ -30,21 +30,21 @@ describe("setImmediate", () => {
   it("abort() does not emit global error", async () => {
     let unhandledRejectionCaught = false;
 
-    const catchUnhandledRejection = () =>  {
+    const catchUnhandledRejection = () => {
       unhandledRejectionCaught = true;
     };
-    process.on('unhandledRejection', catchUnhandledRejection);
-    
+    process.on("unhandledRejection", catchUnhandledRejection);
+
     const c = new AbortController();
 
     global.setImmediate(() => c.abort());
 
     await setImmediate(undefined, { signal: c.signal }).catch(() => "aborted");
 
     // let unhandledRejection to be fired
-    await setTimeout(100)
+    await setTimeout(100);
 
-    process.off('unhandledRejection', catchUnhandledRejection);
+    process.off("unhandledRejection", catchUnhandledRejection);
 
     expect(c.signal.aborted).toBe(true);
     expect(unhandledRejectionCaught).toBe(false);