WORKSPACE

@@ -53,25 +53,11 @@ load("@rules_python//python:repositories.bzl", "py_repositories", "python_regist
 
 py_repositories()
 
-http_archive(
-    name = "com_google_benchmark",
-    integrity = "sha256-a8GApX0j1NlRVRn5KwyD1hsFtbqxiJYfNqx7BrDZ6c4=",
-    strip_prefix = "benchmark-1.8.3",
-    url = "https://github.com/google/benchmark/archive/refs/tags/v1.8.3.tar.gz",
-)
-
 # These are part of what's needed to get `bazel query 'deps(//...)'`, to work, but this is difficult to support
 # based on our dependencies – just use cquery instead.
 # load("@com_google_benchmark//:bazel/benchmark_deps.bzl", "benchmark_deps")
 # benchmark_deps()
 
-http_archive(
-    name = "brotli",
-    sha256 = "e720a6ca29428b803f4ad165371771f5398faba397edf6778837a18599ea13ff",
-    strip_prefix = "brotli-1.1.0",
-    urls = ["https://github.com/google/brotli/archive/refs/tags/v1.1.0.tar.gz"],
-)
-
 http_archive(
     name = "nbytes",
     build_file = "//:build/BUILD.nbytes",

build/deps/build_deps.jsonc

@@ -242,6 +242,14 @@
       "file_regex": "wpt-.*.tar.gz",
       "build_file": "//:build/BUILD.wpt",
       "freeze_version": "wpt-afa16aa1d"
-     }
+    },
+    // microbenchmark
+    {
+      "type": "github_release",
+      "name": "com_google_benchmark",
+      "owner": "google",
+      "repo": "benchmark",
+      "file_regex": "benchmark-*\\.tar\\.gz"
+    }
   ]
 }

build/deps/deps.jsonc

@@ -85,6 +85,13 @@
       "owner": "protocolbuffers",
       "repo": "protobuf",
       "file_regex": "protobuf-.*\\.tar\\.gz"
+    },
+    {
+      "type": "github_release",
+      "name": "brotli",
+      "owner": "google",
+      "repo": "brotli",
+      "file_regex": "brotli-*\\.tar\\.gz"
     }
   ]
 }

build/deps/gen/build_deps.bzl

@@ -19,6 +19,7 @@ load("@//build/deps:gen/dep_cargo_bazel_win_x64.bzl", "dep_cargo_bazel_win_x64")
 load("@//build/deps:gen/dep_clang_format_darwin_arm64.bzl", "dep_clang_format_darwin_arm64")
 load("@//build/deps:gen/dep_clang_format_linux_amd64.bzl", "dep_clang_format_linux_amd64")
 load("@//build/deps:gen/dep_clang_format_linux_arm64.bzl", "dep_clang_format_linux_arm64")
+load("@//build/deps:gen/dep_com_google_benchmark.bzl", "dep_com_google_benchmark")
 load("@//build/deps:gen/dep_cxxbridge_cmd.bzl", "dep_cxxbridge_cmd")
 load("@//build/deps:gen/dep_ruff_darwin_arm64.bzl", "dep_ruff_darwin_arm64")
 load("@//build/deps:gen/dep_ruff_linux_amd64.bzl", "dep_ruff_linux_amd64")
@@ -62,3 +63,4 @@ def deps_gen():
     dep_ruff_linux_arm64()
     dep_ruff_linux_amd64()
     dep_wpt()
+    dep_com_google_benchmark()

build/deps/gen/dep_brotli.bzl

@@ -0,0 +1,18 @@
+# WARNING: THIS FILE IS AUTOGENERATED BY update-deps.py DO NOT EDIT
+
+load("@//:build/http.bzl", "http_archive")
+
+TAG_NAME = "v1.1.0"
+URL = "https://api.github.com/repos/google/brotli/tarball/v1.1.0"
+STRIP_PREFIX = "google-brotli-ed738e8"
+SHA256 = "10973f4b4199eafa1d5735ef661ddb2ec2f97319ee9fd1824d4aabe08cff5265"
+TYPE = "tgz"
+
+def dep_brotli():
+    http_archive(
+        name = "brotli",
+        url = URL,
+        strip_prefix = STRIP_PREFIX,
+        type = TYPE,
+        sha256 = SHA256,
+    )

build/deps/gen/dep_capnp_cpp.bzl

@@ -2,11 +2,11 @@
 
 load("@//:build/http.bzl", "http_archive")
 
-URL = "https://github.com/capnproto/capnproto/tarball/20af9fe2de10a2e7f621a212351d20860cc32a0d"
-STRIP_PREFIX = "capnproto-capnproto-20af9fe/c++"
-SHA256 = "96cfddf676babe345bf321ccfaabb855dfe7dc127e69c4fdd959abd52de47721"
+URL = "https://github.com/capnproto/capnproto/tarball/f8bcd72a0a469414b5fcbebb0192adfb6440396b"
+STRIP_PREFIX = "capnproto-capnproto-f8bcd72/c++"
+SHA256 = "e20b5919a86c121d4407cc19b589e4e26fd0e7ee980121f9c641d17ce84584a7"
 TYPE = "tgz"
-COMMIT = "20af9fe2de10a2e7f621a212351d20860cc32a0d"
+COMMIT = "f8bcd72a0a469414b5fcbebb0192adfb6440396b"
 
 def dep_capnp_cpp():
     http_archive(

build/deps/gen/dep_com_google_benchmark.bzl

@@ -0,0 +1,18 @@
+# WARNING: THIS FILE IS AUTOGENERATED BY update-deps.py DO NOT EDIT
+
+load("@//:build/http.bzl", "http_archive")
+
+TAG_NAME = "v1.9.1"
+URL = "https://api.github.com/repos/google/benchmark/tarball/v1.9.1"
+STRIP_PREFIX = "google-benchmark-96afad5"
+SHA256 = "6e8bd8a610ad0c6814af4b3ae930517dd00fa69caf6f6f4667270fae8d47b53d"
+TYPE = "tgz"
+
+def dep_com_google_benchmark():
+    http_archive(
+        name = "com_google_benchmark",
+        url = URL,
+        strip_prefix = STRIP_PREFIX,
+        type = TYPE,
+        sha256 = SHA256,
+    )

build/deps/gen/dep_simdutf.bzl

@@ -2,10 +2,10 @@
 
 load("@//:build/http.bzl", "http_archive")
 
-TAG_NAME = "v6.2.0"
-URL = "https://github.com/simdutf/simdutf/releases/download/v6.2.0/singleheader.zip"
+TAG_NAME = "v6.3.1"
+URL = "https://github.com/simdutf/simdutf/releases/download/v6.3.1/singleheader.zip"
 STRIP_PREFIX = ""
-SHA256 = "66c85f591133e3baa23cc441d6e2400dd2c94c4902820734ddbcd9e04dd3988b"
+SHA256 = "7cdd0777bf81ad5f21f9627f8aa740aaa413302b0bd8c86dffc2e6c2685009d1"
 TYPE = "zip"
 
 def dep_simdutf():

build/deps/gen/deps.bzl

@@ -1,6 +1,7 @@
 # WARNING: THIS FILE IS AUTOGENERATED BY update-deps.py DO NOT EDIT
 
 load("@//build/deps:gen/dep_ada_url.bzl", "dep_ada_url")
+load("@//build/deps:gen/dep_brotli.bzl", "dep_brotli")
 load("@//build/deps:gen/dep_capnp_cpp.bzl", "dep_capnp_cpp")
 load("@//build/deps:gen/dep_com_google_protobuf.bzl", "dep_com_google_protobuf")
 load("@//build/deps:gen/dep_dawn.bzl", "dep_dawn")
@@ -20,3 +21,4 @@ def deps_gen():
     dep_vulkan_headers()
     dep_spirv_headers()
     dep_com_google_protobuf()
+    dep_brotli()

src/cloudflare/internal/d1-api.ts

@@ -2,8 +2,6 @@
 // Licensed under the Apache 2.0 license found in the LICENSE file or at:
 //     https://opensource.org/licenses/Apache-2.0
 
-import flags from 'workerd:compatibility-flags';
-
 interface Fetcher {
   fetch: typeof fetch;
 }
@@ -96,7 +94,9 @@ class D1Database {
     return this.alwaysPrimarySession.exec(query);
   }
 
-  // DEPRECATED, TO BE REMOVED WITH NEXT BREAKING CHANGE
+  /**
+   * @deprecated
+   */
   public async dump(): Promise<ArrayBuffer> {
     return this.alwaysPrimarySession.dump();
   }
@@ -108,13 +108,13 @@ class D1DatabaseWithSessionAPI extends D1Database {
   }
 
   public withSession(
-    constraintOrToken: D1SessionBookmarkOrConstraint | null | undefined
+    constraintOrBookmark?: D1SessionBookmarkOrConstraint
   ): D1DatabaseSession {
-    constraintOrToken = constraintOrToken?.trim();
-    if (constraintOrToken == null || constraintOrToken === '') {
-      constraintOrToken = D1_SESSION_CONSTRAINT_FIRST_UNCONSTRAINED;
+    constraintOrBookmark = constraintOrBookmark?.trim();
+    if (constraintOrBookmark == null || constraintOrBookmark === '') {
+      constraintOrBookmark = D1_SESSION_CONSTRAINT_FIRST_UNCONSTRAINED;
     }
-    return new D1DatabaseSession(this.fetcher, constraintOrToken);
+    return new D1DatabaseSession(this.fetcher, constraintOrBookmark);
   }
 }
 
@@ -341,7 +341,10 @@ class D1DatabaseSessionAlwaysPrimary extends D1DatabaseSession {
     }
   }
 
-  // DEPRECATED, TO BE REMOVED WITH NEXT BREAKING CHANGE
+  /**
+   * DEPRECATED, TO BE REMOVED WITH NEXT BREAKING CHANGE
+   * Only applies to the deprecated v1 alpha databases.
+   */
   public async dump(): Promise<ArrayBuffer> {
     const response = await this._wrappedFetch('http://d1/dump', {
       method: 'POST',
@@ -570,8 +573,5 @@ async function toJson<T = unknown>(response: Response): Promise<T> {
 }
 
 export default function makeBinding(env: { fetcher: Fetcher }): D1Database {
-  if (flags.enableD1WithSessionsAPI) {
-    return new D1DatabaseWithSessionAPI(env.fetcher);
-  }
-  return new D1Database(env.fetcher);
+  return new D1DatabaseWithSessionAPI(env.fetcher);
 }

src/cloudflare/internal/pipeline-transform.ts

@@ -82,7 +82,7 @@ export class PipelineTransformImpl<
 
   // called by the dispatcher to validate that run is properly implemented by the subclass
   // @ts-expect-error thinks ping is never used
-  private _ping(): Promise<void> {
+  private async _ping(): Promise<void> {
     // making sure the function was overridden by an implementing subclass
     if (this.run !== PipelineTransformImpl.prototype.run) {
       return Promise.resolve();

src/cloudflare/internal/test/d1/d1-api-test-with-sessions.js

@@ -97,17 +97,17 @@ async function testD1ApiWithSessionsTokensHandling(DB, envD1MockFetcher) {
     true
   );
 
-  // Assert tokens sent by the DEFAULT DB.withSessions()
+  // Assert tokens sent by the DEFAULT DB.withSession()
   await resetCommitTokens(envD1MockFetcher);
   await testD1ApiQueriesHappyPath(DB.withSession());
   await assertTokensSentReceived('first-unconstrained');
 
-  // Assert tokens sent by the DB.withSessions("first-unconstrained")
+  // Assert tokens sent by the DB.withSession("first-unconstrained")
   await resetCommitTokens(envD1MockFetcher);
   await testD1ApiQueriesHappyPath(DB.withSession('first-unconstrained'));
   await assertTokensSentReceived('first-unconstrained');
 
-  // Assert tokens sent by the DB.withSessions("first-primary")
+  // Assert tokens sent by the DB.withSession("first-primary")
   await resetCommitTokens(envD1MockFetcher);
   await testD1ApiQueriesHappyPath(DB.withSession('first-primary'));
   await assertTokensSentReceived('first-primary');

src/cloudflare/internal/test/d1/d1-api-test-with-sessions.wd-test

@@ -12,7 +12,7 @@ const unitTests :Workerd.Config = (
         compatibilityDate = "2023-01-15",
 
         # NOTE: We provide the extra compatibility flag to enable the Sessions API.
-        compatibilityFlags = ["nodejs_compat", "enable_d1_with_sessions_api"],
+        compatibilityFlags = ["nodejs_compat"],
 
         bindings = [
         (

src/cloudflare/internal/test/pipeline-transform/transform-test.js

@@ -4,7 +4,7 @@
 //     https://opensource.org/licenses/Apache-2.0
 
 import assert from 'node:assert';
-import { PipelineTransformationEntrypoint } from 'cloudflare:pipeline-transform';
+import { PipelineTransformationEntrypoint } from 'cloudflare:pipelines';
 
 // this is how "Pipeline" would be implemented by the user
 const customTransform = class MyEntrypoint extends PipelineTransformationEntrypoint {