restructure sql modules to have flat imports

.changeset/forty-crews-bow.md

@@ -0,0 +1,15 @@
+---
+"@effect/sql-sqlite-react-native": minor
+"@effect/sql-sqlite-node": minor
+"@effect/sql-sqlite-wasm": minor
+"@effect/sql-sqlite-bun": minor
+"@effect/sql-drizzle": minor
+"@effect/sql-mysql2": minor
+"@effect/sql-mssql": minor
+"@effect/sql-pg": minor
+"@effect/sql": minor
+"@effect/cluster-workflow": patch
+"@effect/cluster": patch
+---
+
+restructure sql modules to have flat imports

packages/cluster-workflow/src/DurableExecutionJournal.ts

@@ -3,7 +3,7 @@
  */
 import * as DurableExecutionEvent from "@effect/cluster-workflow/DurableExecutionEvent"
 import * as Schema from "@effect/schema/Schema"
-import * as SqlClient from "@effect/sql/Client"
+import * as SqlClient from "@effect/sql/SqlClient"
 import * as Context from "effect/Context"
 import * as Effect from "effect/Effect"
 import * as Layer from "effect/Layer"
@@ -66,7 +66,7 @@ export const DurableExecutionJournal = Context.GenericTag<DurableExecutionJourna
  */
 export const make = ({ table }: DurableExecutionJournal.MakeOptions) =>
   Effect.gen(function*() {
-    const sql = yield* SqlClient.Client
+    const sql = yield* SqlClient.SqlClient
 
     yield* sql.onDialect({
       mssql: () =>

packages/cluster-workflow/test/DurableExecutionJournal.test.ts

@@ -3,8 +3,8 @@ import * as DurableExecutionJournal from "@effect/cluster-workflow/DurableExecut
 import * as NodeFileSystem from "@effect/platform-node/NodeFileSystem"
 import * as FileSystem from "@effect/platform/FileSystem"
 import * as Schema from "@effect/schema/Schema"
-import * as Sqlite from "@effect/sql-sqlite-node/Client"
-import * as SqlClient from "@effect/sql/Client"
+import * as Sqlite from "@effect/sql-sqlite-node/SqliteClient"
+import * as SqlClient from "@effect/sql/SqlClient"
 import * as Chunk from "effect/Chunk"
 import * as Effect from "effect/Effect"
 import * as Layer from "effect/Layer"
@@ -25,7 +25,7 @@ const runTest =
     Effect.gen(function*() {
       const sqlClient = yield* makeSqlClient
       const TestLive = DurableExecutionJournal.layer(options).pipe(
-        Layer.provideMerge(Layer.succeed(SqlClient.Client, sqlClient))
+        Layer.provideMerge(Layer.succeed(SqlClient.SqlClient, sqlClient))
       )
       yield* program.pipe(Effect.provide(TestLive))
     }).pipe(
@@ -38,7 +38,7 @@ const runTest =
 describe("DurableExecutionJournal", () => {
   it("should create the execution table upon layer creation", () =>
     Effect.gen(function*() {
-      const sql = yield* SqlClient.Client
+      const sql = yield* SqlClient.SqlClient
 
       const rows = yield* sql<{ table_name: string }>`
         SELECT name AS table_name
@@ -51,7 +51,7 @@ describe("DurableExecutionJournal", () => {
 
   it("should store the execution in the table upon append", () =>
     Effect.gen(function*() {
-      const sql = yield* SqlClient.Client
+      const sql = yield* SqlClient.SqlClient
       const journal = yield* DurableExecutionJournal.DurableExecutionJournal
 
       yield* journal.append(

packages/cluster/src/AtLeastOnceStorage.ts

@@ -2,8 +2,8 @@
  * @since 1.0.0
  */
 import type { Message } from "@effect/cluster/Message"
-import type { Client } from "@effect/sql/Client"
-import type { SqlError } from "@effect/sql/Error"
+import type { SqlClient } from "@effect/sql/SqlClient"
+import type { SqlError } from "@effect/sql/SqlError"
 import type { Tag } from "effect/Context"
 import type { Effect } from "effect/Effect"
 import type { Layer } from "effect/Layer"
@@ -93,4 +93,4 @@ export declare namespace AtLeastOnceStorage {
  */
 export const layer: (
   options: AtLeastOnceStorage.MakeOptions
-) => Layer<AtLeastOnceStorage, SqlError, Client | Serialization> = Internal.layer
+) => Layer<AtLeastOnceStorage, SqlError, SqlClient | Serialization> = Internal.layer

packages/cluster/src/internal/atLeastOnceStorage.ts

@@ -1,7 +1,7 @@
 import * as Schema from "@effect/schema/Schema"
-import * as SqlClient from "@effect/sql/Client"
-import type * as SqlError from "@effect/sql/Error"
-import * as SqlResolver from "@effect/sql/Resolver"
+import * as SqlClient from "@effect/sql/SqlClient"
+import type * as SqlError from "@effect/sql/SqlError"
+import * as SqlResolver from "@effect/sql/SqlResolver"
 import * as Context from "effect/Context"
 import * as Effect from "effect/Effect"
 import * as Layer from "effect/Layer"
@@ -31,10 +31,10 @@ export const atLeastOnceStorageTag: Context.Tag<
 const make = ({ table }: AtLeastOnceStorage.AtLeastOnceStorage.MakeOptions): Effect.Effect<
   AtLeastOnceStorage.AtLeastOnceStorage,
   SqlError.SqlError,
-  SqlClient.Client | Serialization.Serialization
+  SqlClient.SqlClient | Serialization.Serialization
 > =>
   Effect.gen(function*() {
-    const sql = yield* SqlClient.Client
+    const sql = yield* SqlClient.SqlClient
     const serialization = yield* InternalSerialization.serializationTag
 
     yield* sql.onDialect({
@@ -214,5 +214,5 @@ const make = ({ table }: AtLeastOnceStorage.AtLeastOnceStorage.MakeOptions): Eff
 export const layer = (options: AtLeastOnceStorage.AtLeastOnceStorage.MakeOptions): Layer.Layer<
   AtLeastOnceStorage.AtLeastOnceStorage,
   SqlError.SqlError,
-  SqlClient.Client | Serialization.Serialization
+  SqlClient.SqlClient | Serialization.Serialization
 > => Layer.effect(atLeastOnceStorageTag, make(options))

packages/cluster/test/AtLeastOnce.test.ts

@@ -13,8 +13,8 @@ import * as Storage from "@effect/cluster/Storage"
 import * as NodeFileSystem from "@effect/platform-node/NodeFileSystem"
 import * as FileSystem from "@effect/platform/FileSystem"
 import * as Schema from "@effect/schema/Schema"
-import * as Sqlite from "@effect/sql-sqlite-node/Client"
-import * as SqlClient from "@effect/sql/Client"
+import * as Sqlite from "@effect/sql-sqlite-node/SqliteClient"
+import * as SqlClient from "@effect/sql/SqlClient"
 import * as Duration from "effect/Duration"
 import * as Effect from "effect/Effect"
 import * as Exit from "effect/Exit"
@@ -62,7 +62,7 @@ const runTest =
         Layer.provideMerge(ShardingConfig.withDefaults({
           entityTerminationTimeout: Duration.seconds(4)
         })),
-        Layer.provideMerge(Layer.succeed(SqlClient.Client, sqlClient))
+        Layer.provideMerge(Layer.succeed(SqlClient.SqlClient, sqlClient))
       )
       yield* program.pipe(Effect.provide(TestLive))
     }).pipe(
@@ -75,7 +75,7 @@ const runTest =
 describe("AtLeastOnce", () => {
   it("should create the message table upon layer creation", () =>
     Effect.gen(function*() {
-      const sql = yield* SqlClient.Client
+      const sql = yield* SqlClient.SqlClient
 
       const rows = yield* sql<{ table_name: string }>`
         SELECT name AS table_name
@@ -90,7 +90,7 @@ describe("AtLeastOnce", () => {
 
   it("should store the message in the message table after sending", () =>
     Effect.gen(function*() {
-      const sql = yield* SqlClient.Client
+      const sql = yield* SqlClient.SqlClient
 
       yield* Sharding.registerScoped
 
@@ -115,7 +115,7 @@ describe("AtLeastOnce", () => {
 
   it("should mark a message as processed if the message state is processed", () =>
     Effect.gen(function*() {
-      const sql = yield* SqlClient.Client
+      const sql = yield* SqlClient.SqlClient
 
       yield* Sharding.registerScoped
 
@@ -143,7 +143,7 @@ describe("AtLeastOnce", () => {
 
   it("should not mark as processed if a message state is acknowledged", () =>
     Effect.gen(function*() {
-      const sql = yield* SqlClient.Client
+      const sql = yield* SqlClient.SqlClient
 
       yield* Sharding.registerScoped
 

packages/sql-drizzle/examples/sqlite.ts

@@ -1,12 +1,12 @@
-import * as Sql from "@effect/sql"
+import { SqlClient } from "@effect/sql"
 import * as SqliteDrizzle from "@effect/sql-drizzle/Sqlite"
-import * as Sqlite from "@effect/sql-sqlite-node"
+import { SqliteClient } from "@effect/sql-sqlite-node"
 import * as D from "drizzle-orm/sqlite-core"
 import { Config, Effect, Layer } from "effect"
 
 // setup
 
-const SqlLive = Sqlite.client.layer({
+const SqlLive = SqliteClient.layer({
   filename: Config.succeed("test.db")
 })
 const DrizzleLive = SqliteDrizzle.layer.pipe(
@@ -22,7 +22,7 @@ const users = D.sqliteTable("users", {
 })
 
 Effect.gen(function*() {
-  const sql = yield* Sql.client.Client
+  const sql = yield* SqlClient.SqlClient
   const db = yield* SqliteDrizzle.SqliteDrizzle
   yield* sql`CREATE TABLE IF NOT EXISTS users (id INTEGER PRIMARY KEY, name TEXT)`
   yield* db.delete(users)

packages/sql-drizzle/src/Mysql.ts

@@ -1,8 +1,8 @@
 /**
  * @since 1.0.0
  */
-import * as Client from "@effect/sql/Client"
-import type { SqlError } from "@effect/sql/Error"
+import * as Client from "@effect/sql/SqlClient"
+import type { SqlError } from "@effect/sql/SqlError"
 import { MySqlSelectBase } from "drizzle-orm/mysql-core"
 import type { MySqlRemoteDatabase } from "drizzle-orm/mysql-proxy"
 import { drizzle } from "drizzle-orm/mysql-proxy"
@@ -16,8 +16,8 @@ import { makeRemoteCallback, patch, registerDialect } from "./internal/patch.js"
  * @since 1.0.0
  * @category constructors
  */
-export const make: Effect.Effect<MySqlRemoteDatabase, never, Client.Client> = Effect.gen(function*() {
-  const client = yield* Client.Client
+export const make: Effect.Effect<MySqlRemoteDatabase, never, Client.SqlClient> = Effect.gen(function*() {
+  const client = yield* Client.SqlClient
   const db = drizzle(yield* makeRemoteCallback)
   registerDialect((db as any).dialect, client)
   return db
@@ -36,7 +36,7 @@ export class MysqlDrizzle extends Context.Tag("@effect/sql-drizzle/Mysql")<
  * @since 1.0.0
  * @category layers
  */
-export const layer: Layer.Layer<MysqlDrizzle, never, Client.Client> = Layer.effect(MysqlDrizzle, make)
+export const layer: Layer.Layer<MysqlDrizzle, never, Client.SqlClient> = Layer.effect(MysqlDrizzle, make)
 
 // patch
 

packages/sql-drizzle/src/Pg.ts

@@ -1,8 +1,8 @@
 /**
  * @since 1.0.0
  */
-import * as Client from "@effect/sql/Client"
-import type { SqlError } from "@effect/sql/Error"
+import * as Client from "@effect/sql/SqlClient"
+import type { SqlError } from "@effect/sql/SqlError"
 import { PgSelectBase } from "drizzle-orm/pg-core"
 import { drizzle } from "drizzle-orm/pg-proxy"
 import type { PgRemoteDatabase } from "drizzle-orm/pg-proxy"
@@ -16,8 +16,8 @@ import { makeRemoteCallback, patch, registerDialect } from "./internal/patch.js"
  * @since 1.0.0
  * @category constructors
  */
-export const make: Effect.Effect<PgRemoteDatabase, never, Client.Client> = Effect.gen(function*() {
-  const client = yield* Client.Client
+export const make: Effect.Effect<PgRemoteDatabase, never, Client.SqlClient> = Effect.gen(function*() {
+  const client = yield* Client.SqlClient
   const db = drizzle(yield* makeRemoteCallback)
   registerDialect((db as any).dialect, client)
   return db
@@ -36,7 +36,7 @@ export class PgDrizzle extends Context.Tag("@effect/sql-drizzle/Pg")<
  * @since 1.0.0
  * @category layers
  */
-export const layer: Layer.Layer<PgDrizzle, never, Client.Client> = Layer.effect(PgDrizzle, make)
+export const layer: Layer.Layer<PgDrizzle, never, Client.SqlClient> = Layer.effect(PgDrizzle, make)
 
 // patch
 

packages/sql-drizzle/src/Sqlite.ts

@@ -1,8 +1,8 @@
 /**
  * @since 1.0.0
  */
-import * as Client from "@effect/sql/Client"
-import type { SqlError } from "@effect/sql/Error"
+import * as Client from "@effect/sql/SqlClient"
+import type { SqlError } from "@effect/sql/SqlError"
 import { QueryPromise } from "drizzle-orm/query-promise"
 import { SQLiteSelectBase } from "drizzle-orm/sqlite-core"
 import type { SqliteRemoteDatabase } from "drizzle-orm/sqlite-proxy"
@@ -17,8 +17,8 @@ import { makeRemoteCallback, patch, registerDialect } from "./internal/patch.js"
  * @since 1.0.0
  * @category constructors
  */
-export const make: Effect.Effect<SqliteRemoteDatabase, never, Client.Client | Scope> = Effect.gen(function*() {
-  const client = yield* Client.Client
+export const make: Effect.Effect<SqliteRemoteDatabase, never, Client.SqlClient | Scope> = Effect.gen(function*() {
+  const client = yield* Client.SqlClient
   const db = drizzle(yield* makeRemoteCallback)
   registerDialect((db as any).dialect, client)
   return db
@@ -37,7 +37,7 @@ export class SqliteDrizzle extends Context.Tag("@effect/sql-drizzle/Sqlite")<
  * @since 1.0.0
  * @category layers
  */
-export const layer: Layer.Layer<SqliteDrizzle, never, Client.Client> = Layer.scoped(SqliteDrizzle, make)
+export const layer: Layer.Layer<SqliteDrizzle, never, Client.SqlClient> = Layer.scoped(SqliteDrizzle, make)
 
 // patch
 

packages/sql-drizzle/src/internal/patch.ts

@@ -1,5 +1,5 @@
-import * as Client from "@effect/sql/Client"
-import { SqlError } from "@effect/sql/Error"
+import * as Client from "@effect/sql/SqlClient"
+import { SqlError } from "@effect/sql/SqlError"
 import type { Statement } from "@effect/sql/Statement"
 import type { QueryPromise } from "drizzle-orm/query-promise"
 import * as DUtils from "drizzle-orm/utils"
@@ -10,11 +10,11 @@ import * as Runtime from "effect/Runtime"
 
 const clientRegistry = globalValue(
   "@effect/sql-drizzle/clientRegistry",
-  () => new WeakMap<any, Client.Client>()
+  () => new WeakMap<any, Client.SqlClient>()
 )
 
 /** @internal */
-export const registerDialect = (dialect: unknown, client: Client.Client) => {
+export const registerDialect = (dialect: unknown, client: Client.SqlClient) => {
   clientRegistry.set(dialect, client)
 }
 
@@ -63,7 +63,7 @@ export const patch = (prototype: any) => {
 
 /** @internal */
 export const makeRemoteCallback = Effect.gen(function*() {
-  const client = yield* Client.Client
+  const client = yield* Client.SqlClient
   const runtime = yield* Effect.runtime<never>()
   const runPromise = Runtime.runPromise(runtime)
   return (sql: string, params: Array<any>, method: "all" | "execute" | "get" | "values" | "run") => {

packages/sql-drizzle/test/Mysql.test.ts

@@ -1,4 +1,4 @@
-import * as Sql from "@effect/sql"
+import { SqlClient } from "@effect/sql"
 import { MysqlDrizzle } from "@effect/sql-drizzle/Mysql"
 import { assert, describe, it } from "@effect/vitest"
 import * as D from "drizzle-orm/mysql-core"
@@ -14,7 +14,7 @@ const users = D.mysqlTable("users", {
 describe.sequential("Mysql", () => {
   it.effect("works", () =>
     Effect.gen(function*() {
-      const sql = yield* Sql.client.Client
+      const sql = yield* SqlClient.SqlClient
       const db = yield* MysqlDrizzle
 
       yield* sql`CREATE TABLE users (id SERIAL PRIMARY KEY, name TEXT NOT NULL, snake_case TEXT NOT NULL)`
@@ -28,7 +28,7 @@ describe.sequential("Mysql", () => {
 
   it.effect("remote callback", () =>
     Effect.gen(function*(_) {
-      const sql = yield* Sql.client.Client
+      const sql = yield* SqlClient.SqlClient
       const db = yield* MysqlDrizzle
       yield* sql`CREATE TABLE users (id SERIAL PRIMARY KEY, name TEXT NOT NULL, snake_case TEXT NOT NULL)`
       yield* Effect.promise(() => db.insert(users).values({ name: "Alice", snakeCase: "snake" }))

packages/sql-drizzle/test/Pg.test.ts

@@ -1,4 +1,4 @@
-import * as Sql from "@effect/sql"
+import { SqlClient } from "@effect/sql"
 import { PgDrizzle } from "@effect/sql-drizzle/Pg"
 import { assert, describe, it } from "@effect/vitest"
 import * as D from "drizzle-orm/pg-core"
@@ -14,7 +14,7 @@ const users = D.pgTable("users", {
 describe.sequential("Pg", () => {
   it.effect("works", () =>
     Effect.gen(function*() {
-      const sql = yield* Sql.client.Client
+      const sql = yield* SqlClient.SqlClient
       const db = yield* PgDrizzle
 
       yield* sql`CREATE TABLE users (id SERIAL PRIMARY KEY, name TEXT NOT NULL, snake_case TEXT NOT NULL)`
@@ -30,7 +30,7 @@ describe.sequential("Pg", () => {
 
   it.effect("remote callback", () =>
     Effect.gen(function*(_) {
-      const sql = yield* Sql.client.Client
+      const sql = yield* SqlClient.SqlClient
       const db = yield* PgDrizzle
       yield* sql`CREATE TABLE users (id SERIAL PRIMARY KEY, name TEXT NOT NULL, snake_case TEXT NOT NULL)`
       yield* Effect.promise(() => db.insert(users).values({ name: "Alice", snakeCase: "snake" }))