split actor targets in bazel

anonrig · anonrig · commit 2b66215d7e4a · 2025-10-27T13:34:22.000-04:00
diff --git a/src/workerd/io/BUILD.bazel b/src/workerd/io/BUILD.bazel
@@ -87,8 +87,10 @@ wd_cc_library(
         ],
     }),
     implementation_deps = [
+        ":actor-storage",
         "//src/workerd/api:data-url",
         "//src/workerd/api/node:exceptions",
+        "//src/workerd/util:autogate",
         "//src/workerd/util:completion-membrane",
         "//src/workerd/util:perfetto",
         "//src/workerd/util:string-buffer",
@@ -100,8 +102,9 @@ wd_cc_library(
     ],
     visibility = ["//visibility:public"],
     deps = [
-        ":actor",
+        ":actor-cache",
         ":actor-id",
+        ":actor-sqlite",
         ":actor-storage_capnp",
         ":cdp_capnp",
         ":container_capnp",
@@ -154,35 +157,55 @@ wd_cc_library(
     ],
 )
 
-# TODO(cleanup): Split this up further.
 wd_cc_library(
-    name = "actor",
-    srcs = [
-        "actor-cache.c++",
-        "actor-sqlite.c++",
-        "actor-storage.c++",
-    ],
-    hdrs = [
-        "actor-cache.h",
-        "actor-sqlite.h",
-        "actor-storage.h",
-    ],
+    name = "actor-cache",
+    srcs = ["actor-cache.c++"],
+    hdrs = ["actor-cache.h"],
     implementation_deps = [
-        "@sqlite3",
+        ":actor-storage",
+        ":io-gate",
+        "//src/workerd/util:duration-exceeded-logger",
+        "//src/workerd/util:sentry",
     ],
     visibility = ["//visibility:public"],
     deps = [
         ":actor-storage_capnp",
+        "//src/workerd/jsg:exception",
+        "@capnp-cpp//src/capnp:capnp-rpc",
+        "@capnp-cpp//src/kj:kj-async",
+    ],
+)
+
+wd_cc_library(
+    name = "actor-sqlite",
+    srcs = ["actor-sqlite.c++"],
+    hdrs = ["actor-sqlite.h"],
+    implementation_deps = [
         ":io-gate",
         "//src/workerd/jsg:exception",
         "//src/workerd/util:autogate",
-        "//src/workerd/util:duration-exceeded-logger",
+        "@capnp-cpp//src/kj:kj",
+        "@sqlite3",
+    ],
+    visibility = ["//visibility:public"],
+    deps = [
+        ":actor-cache",
         "//src/workerd/util:sqlite",
-        "@capnp-cpp//src/capnp:capnp-rpc",
-        "@capnp-cpp//src/kj:kj-async",
     ],
 )
 
+wd_cc_library(
+    name = "actor-storage",
+    srcs = ["actor-storage.c++"],
+    hdrs = ["actor-storage.h"],
+    implementation_deps = [
+        ":actor-storage_capnp",
+        "//src/workerd/jsg:exception",
+    ],
+    visibility = ["//visibility:public"],
+    deps = ["@capnp-cpp//src/kj:kj"],
+)
+
 wd_cc_library(
     name = "frankenvalue",
     srcs = ["frankenvalue.c++"],
@@ -358,7 +381,7 @@ kj_test(
 kj_test(
     src = "actor-cache-test.c++",
     deps = [
-        ":actor",
+        ":actor-cache",
         ":io-gate",
         "//src/workerd/util:test",
         "//src/workerd/util:test-util",
@@ -368,8 +391,9 @@ kj_test(
 kj_test(
     src = "actor-sqlite-test.c++",
     deps = [
-        ":actor",
+        ":actor-sqlite",
         ":io-gate",
+        "//src/workerd/util:autogate",
         "//src/workerd/util:test",
         "//src/workerd/util:test-util",
     ],
diff --git a/src/workerd/io/actor-sqlite.h b/src/workerd/io/actor-sqlite.h
@@ -4,8 +4,7 @@
 
 #pragma once
 
-#include "actor-cache.h"
-
+#include <workerd/io/actor-cache.h>
 #include <workerd/util/sqlite-kv.h>
 #include <workerd/util/sqlite-metadata.h>
 
diff --git a/src/workerd/util/BUILD.bazel b/src/workerd/util/BUILD.bazel
@@ -195,6 +195,7 @@ wd_cc_library(
     hdrs = ["capnp-mock.h"],
     visibility = ["//visibility:public"],
     deps = [
+        "@capnp-cpp//src/capnp:capnp-rpc",
         "@capnp-cpp//src/capnp:capnpc",
     ],
 )

Original file line number	Diff line number	Diff line change
`@@ -195,6 +195,7 @@ wd_cc_library(`
`195`	`195`	`hdrs = ["capnp-mock.h"],`
`196`	`196`	`visibility = ["//visibility:public"],`
`197`	`197`	`deps = [`
	`198`	`+ "@capnp-cpp//src/capnp:capnp-rpc",`
`198`	`199`	`"@capnp-cpp//src/capnp:capnpc",`
`199`	`200`	`],`
`200`	`201`	`)`