@effect/sql-mssql 0.50.0 → 4.0.0-beta.0

package/package.json

@@ -1,88 +1,63 @@
 {
   "name": "@effect/sql-mssql",
-  "version": "0.50.0",
-  "description": "A Microsoft SQL Server toolkit for Effect",
+  "version": "4.0.0-beta.0",
+  "type": "module",
   "license": "MIT",
+  "description": "A Microsoft SQL Server toolkit for Effect",
+  "homepage": "https://effect.website",
   "repository": {
     "type": "git",
-    "url": "https://github.com/Effect-TS/effect.git",
-    "directory": "packages/sql-mssql"
+    "url": "https://github.com/Effect-TS/effect-smol.git",
+    "directory": "packages/sql/mssql"
   },
-  "sideEffects": [],
-  "homepage": "https://effect.website",
-  "dependencies": {
-    "tedious": "^18.3.0"
+  "bugs": {
+    "url": "https://github.com/Effect-TS/effect-smol/issues"
   },
-  "peerDependencies": {
-    "@effect/experimental": "^0.58.0",
-    "@effect/platform": "^0.94.0",
-    "@effect/sql": "^0.49.0",
-    "effect": "^3.19.13"
+  "tags": [
+    "typescript",
+    "sql",
+    "database"
+  ],
+  "keywords": [
+    "typescript",
+    "sql",
+    "database"
+  ],
+  "sideEffects": [],
+  "exports": {
+    "./package.json": "./package.json",
+    ".": "./dist/index.js",
+    "./*": "./dist/*.js",
+    "./internal/*": null,
+    "./*/index": null
   },
+  "files": [
+    "src/**/*.ts",
+    "dist/**/*.js",
+    "dist/**/*.js.map",
+    "dist/**/*.d.ts",
+    "dist/**/*.d.ts.map"
+  ],
   "publishConfig": {
+    "access": "public",
     "provenance": true
   },
-  "main": "./dist/cjs/index.js",
-  "module": "./dist/esm/index.js",
-  "types": "./dist/dts/index.d.ts",
-  "exports": {
-    "./package.json": "./package.json",
-    ".": {
-      "types": "./dist/dts/index.d.ts",
-      "import": "./dist/esm/index.js",
-      "default": "./dist/cjs/index.js"
-    },
-    "./.index": {
-      "types": "./dist/dts/.index.d.ts",
-      "import": "./dist/esm/.index.js",
-      "default": "./dist/cjs/.index.js"
-    },
-    "./MssqlClient": {
-      "types": "./dist/dts/MssqlClient.d.ts",
-      "import": "./dist/esm/MssqlClient.js",
-      "default": "./dist/cjs/MssqlClient.js"
-    },
-    "./MssqlMigrator": {
-      "types": "./dist/dts/MssqlMigrator.d.ts",
-      "import": "./dist/esm/MssqlMigrator.js",
-      "default": "./dist/cjs/MssqlMigrator.js"
-    },
-    "./Parameter": {
-      "types": "./dist/dts/Parameter.d.ts",
-      "import": "./dist/esm/Parameter.js",
-      "default": "./dist/cjs/Parameter.js"
-    },
-    "./Procedure": {
-      "types": "./dist/dts/Procedure.d.ts",
-      "import": "./dist/esm/Procedure.js",
-      "default": "./dist/cjs/Procedure.js"
-    },
-    "./index": {
-      "types": "./dist/dts/index.d.ts",
-      "import": "./dist/esm/index.js",
-      "default": "./dist/cjs/index.js"
-    }
+  "devDependencies": {
+    "effect": "^4.0.0-beta.0"
+  },
+  "peerDependencies": {
+    "effect": "^4.0.0-beta.0"
+  },
+  "dependencies": {
+    "tedious": "^19.2.0"
   },
-  "typesVersions": {
-    "*": {
-      ".index": [
-        "./dist/dts/.index.d.ts"
-      ],
-      "MssqlClient": [
-        "./dist/dts/MssqlClient.d.ts"
-      ],
-      "MssqlMigrator": [
-        "./dist/dts/MssqlMigrator.d.ts"
-      ],
-      "Parameter": [
-        "./dist/dts/Parameter.d.ts"
-      ],
-      "Procedure": [
-        "./dist/dts/Procedure.d.ts"
-      ],
-      "index": [
-        "./dist/dts/index.d.ts"
-      ]
-    }
+  "scripts": {
+    "codegen": "effect-utils codegen",
+    "build": "tsc -b tsconfig.json && pnpm babel",
+    "build:tsgo": "tsgo -b tsconfig.json && pnpm babel",
+    "babel": "babel dist --plugins annotate-pure-calls --out-dir dist --source-maps",
+    "check": "tsc -b tsconfig.json",
+    "test": "vitest",
+    "coverage": "vitest --coverage"
   }
 }

package/src/MssqlClient.ts

@@ -1,14 +1,7 @@
 /**
  * @since 1.0.0
  */
-import * as Reactivity from "@effect/experimental/Reactivity"
-import * as Client from "@effect/sql/SqlClient"
-import type { Connection } from "@effect/sql/SqlConnection"
-import { SqlError } from "@effect/sql/SqlError"
-import * as Statement from "@effect/sql/Statement"
 import * as Config from "effect/Config"
-import type { ConfigError } from "effect/ConfigError"
-import * as Context from "effect/Context"
 import * as Duration from "effect/Duration"
 import * as Effect from "effect/Effect"
 import { identity } from "effect/Function"
@@ -16,12 +9,19 @@ import * as Layer from "effect/Layer"
 import * as Pool from "effect/Pool"
 import * as Redacted from "effect/Redacted"
 import * as Scope from "effect/Scope"
+import * as ServiceMap from "effect/ServiceMap"
+import * as Stream from "effect/Stream"
+import * as Reactivity from "effect/unstable/reactivity/Reactivity"
+import * as Client from "effect/unstable/sql/SqlClient"
+import type { Connection } from "effect/unstable/sql/SqlConnection"
+import { SqlError } from "effect/unstable/sql/SqlError"
+import * as Statement from "effect/unstable/sql/Statement"
 import * as Tedious from "tedious"
-import type { ConnectionOptions } from "tedious/lib/connection.js"
-import type { DataType } from "tedious/lib/data-type.js"
-import type { ParameterOptions } from "tedious/lib/request.js"
-import type { Parameter } from "./Parameter.js"
-import type * as Procedure from "./Procedure.js"
+import type { ConnectionOptions } from "tedious/lib/connection.ts"
+import type { DataType } from "tedious/lib/data-type.ts"
+import type { ParameterOptions } from "tedious/lib/request.ts"
+import type { Parameter } from "./Parameter.ts"
+import type * as Procedure from "./Procedure.ts"
 
 const ATTR_DB_SYSTEM_NAME = "db.system.name"
 const ATTR_DB_NAMESPACE = "db.namespace"
@@ -68,7 +68,7 @@ export interface MssqlClient extends Client.SqlClient {
  * @category tags
  * @since 1.0.0
  */
-export const MssqlClient = Context.GenericTag<MssqlClient>("@effect/sql-mssql/MssqlClient")
+export const MssqlClient = ServiceMap.Service<MssqlClient>("@effect/sql-mssql/MssqlClient")
 
 /**
  * @category models
@@ -91,7 +91,7 @@ export interface MssqlClientConfig {
   readonly maxConnections?: number | undefined
   readonly connectionTTL?: Duration.DurationInput | undefined
 
-  readonly parameterTypes?: Record<string, DataType> | undefined
+  readonly parameterTypes?: Record<Statement.PrimitiveKind, DataType> | undefined
 
   readonly spanAttributes?: Record<string, unknown> | undefined
 
@@ -111,7 +111,7 @@ interface MssqlConnection extends Connection {
   readonly rollback: (name?: string) => Effect.Effect<void, SqlError>
 }
 
-const TransactionConnection = Client.TransactionConnection as unknown as Context.Tag<
+const TransactionConnection = Client.TransactionConnection as unknown as ServiceMap.Service<
   readonly [conn: MssqlConnection, counter: number],
   readonly [conn: MssqlConnection, counter: number]
 >
@@ -140,7 +140,7 @@ export const make = (
       [ATTR_SERVER_PORT, options.port ?? 1433]
     ]
 
-    // eslint-disable-next-line prefer-const
+    // oxlint-disable-next-line prefer-const
     let pool: Pool.Pool<MssqlConnection, SqlError>
 
     const makeConnection = Effect.gen(function*() {
@@ -150,7 +150,7 @@ export const make = (
           database: options.database,
           trustServerCertificate: options.trustServer ?? true,
           connectTimeout: options.connectTimeout
-            ? Duration.toMillis(Duration.decode(options.connectTimeout))
+            ? Duration.toMillis(Duration.fromDurationInputUnsafe(options.connectTimeout))
             : undefined,
           rowCollectionOnRequestCompletion: true,
           useColumnNames: false,
@@ -171,7 +171,7 @@ export const make = (
 
       yield* Effect.addFinalizer(() => Effect.sync(() => conn.close()))
 
-      yield* Effect.async<void, SqlError>((resume) => {
+      yield* Effect.callback<void, SqlError>((resume) => {
         conn.connect((cause) => {
           if (cause) {
             resume(Effect.fail(new SqlError({ cause, message: "Failed to connect" })))
@@ -186,7 +186,7 @@ export const make = (
         values?: ReadonlyArray<any>,
         rowsAsArray = false
       ) =>
-        Effect.async<any, SqlError>((resume) => {
+        Effect.callback<any, SqlError>((resume) => {
           const req = new Tedious.Request(sql, (cause, _rowCount, result) => {
             if (cause) {
               resume(Effect.fail(new SqlError({ cause, message: "Failed to execute statement" })))
@@ -208,7 +208,7 @@ export const make = (
               const name = numberToParamName(i)
 
               if (isMssqlParam(value)) {
-                req.addParameter(name, value.i0, value.i1, value.i2)
+                req.addParameter(name, value.paramA, value.paramB, value.paramC)
               } else {
                 const kind = Statement.primitiveKind(value)
                 const type = parameterTypes[kind]
@@ -225,7 +225,7 @@ export const make = (
         procedure: Procedure.ProcedureWithValues<any, any, any>,
         transformRows: ((rows: ReadonlyArray<any>) => ReadonlyArray<any>) | undefined
       ) =>
-        Effect.async<any, SqlError>((resume) => {
+        Effect.callback<any, SqlError>((resume) => {
           const result: Record<string, any> = {}
 
           const req = new Tedious.Request(
@@ -283,12 +283,12 @@ export const make = (
           return this.execute(sql, params, transformRows)
         },
         executeStream() {
-          return Effect.dieMessage("executeStream not implemented")
+          return Stream.die("executeStream not implemented")
         },
         call(procedure, transformRows) {
           return runProcedure(procedure, transformRows)
         },
-        begin: Effect.async<void, SqlError>((resume) => {
+        begin: Effect.callback<void, SqlError>((resume) => {
           conn.beginTransaction((cause) => {
             if (cause) {
               resume(Effect.fail(new SqlError({ cause, message: "Failed to begin transaction" })))
@@ -297,7 +297,7 @@ export const make = (
             }
           })
         }),
-        commit: Effect.async<void, SqlError>((resume) => {
+        commit: Effect.callback<void, SqlError>((resume) => {
           conn.commitTransaction((cause) => {
             if (cause) {
               resume(Effect.fail(new SqlError({ cause, message: "Failed to commit transaction" })))
@@ -307,7 +307,7 @@ export const make = (
           })
         }),
         savepoint: (name: string) =>
-          Effect.async<void, SqlError>((resume) => {
+          Effect.callback<void, SqlError>((resume) => {
             conn.saveTransaction((cause) => {
               if (cause) {
                 resume(Effect.fail(new SqlError({ cause, message: "Failed to create savepoint" })))
@@ -317,7 +317,7 @@ export const make = (
             }, name)
           }),
         rollback: (name?: string) =>
-          Effect.async<void, SqlError>((resume) => {
+          Effect.callback<void, SqlError>((resume) => {
             conn.rollbackTransaction((cause) => {
               if (cause) {
                 resume(Effect.fail(new SqlError({ cause, message: "Failed to rollback transaction" })))
@@ -328,10 +328,10 @@ export const make = (
           })
       })
 
-      yield* Effect.async<never, unknown>((resume) => {
+      yield* Effect.callback<never, unknown>((resume) => {
         conn.on("error", (_) => resume(Effect.fail(_)))
       }).pipe(
-        Effect.catchAll(() => Pool.invalidate(pool, connection)),
+        Effect.catch(() => Pool.invalidate(pool, connection)),
         Effect.interruptible,
         Effect.forkScoped
       )
@@ -347,31 +347,30 @@ export const make = (
       timeToLiveStrategy: "creation"
     })
 
-    yield* pool.get.pipe(
+    yield* Pool.get(pool).pipe(
       Effect.tap((connection) => connection.executeUnprepared("SELECT 1", [], undefined)),
       Effect.mapError(({ cause }) => new SqlError({ cause, message: "MssqlClient: Failed to connect" })),
       Effect.scoped,
-      Effect.timeoutFail({
+      Effect.timeoutOrElse({
         duration: options.connectTimeout ?? Duration.seconds(5),
         onTimeout: () =>
-          new SqlError({
-            message: "MssqlClient: Connection timeout",
-            cause: new Error("connection timeout")
-          })
+          Effect.fail(
+            new SqlError({
+              message: "MssqlClient: Connection timeout",
+              cause: new Error("connection timeout")
+            })
+          )
       })
     )
 
     const withTransaction = Client.makeWithTransaction({
-      transactionTag: TransactionConnection,
+      transactionService: TransactionConnection,
       spanAttributes,
-      acquireConnection: Effect.flatMap(
-        Scope.make(),
-        (scope) =>
-          Effect.map(
-            Scope.extend(Pool.get(pool), scope),
-            (conn) => [scope, conn] as const
-          )
-      ),
+      acquireConnection: Effect.gen(function*() {
+        const scope = Scope.makeUnsafe()
+        const conn = yield* Scope.provide(Pool.get(pool), scope)
+        return [scope, conn] as const
+      }),
       begin: (conn) => conn.begin,
       savepoint: (conn, id) => conn.savepoint(`effect_sql_${id}`),
       commit: (conn) => conn.commit,
@@ -381,7 +380,7 @@ export const make = (
 
     return identity<MssqlClient>(Object.assign(
       yield* Client.make({
-        acquirer: pool.get,
+        acquirer: Pool.get(pool),
         compiler,
         spanAttributes,
         transformRows
@@ -394,16 +393,16 @@ export const make = (
           type: DataType,
           value: unknown,
           options: ParameterOptions = {}
-        ) => mssqlParam(type, value, options),
+        ) => Statement.fragment([mssqlParam(type, value, options)]),
         call: <
           I extends Record<string, Parameter<any>>,
           O extends Record<string, Parameter<any>>,
           A
         >(
           procedure: Procedure.ProcedureWithValues<I, O, A>
-        ) => Effect.scoped(Effect.flatMap(pool.get, (_) => _.call(procedure, transformRows))),
+        ) => Effect.scoped(Effect.flatMap(Pool.get(pool), (_) => _.call(procedure, transformRows))),
         withoutTransforms() {
-          const statement = Statement.make(pool.get, compiler.withoutTransform, spanAttributes, undefined)
+          const statement = Statement.make(Pool.get(pool), compiler.withoutTransform, spanAttributes, undefined)
           const client = Object.assign(
             statement,
             this,
@@ -415,7 +414,7 @@ export const make = (
                 A
               >(
                 procedure: Procedure.ProcedureWithValues<I, O, A>
-              ) => Effect.scoped(Effect.flatMap(pool.get, (_) => _.call(procedure, undefined)))
+              ) => Effect.scoped(Effect.flatMap(Pool.get(pool), (_) => _.call(procedure, undefined)))
             }
           )
           ;(client as any).safe = client
@@ -430,15 +429,17 @@ export const make = (
  * @category layers
  * @since 1.0.0
  */
-export const layerConfig = (
-  config: Config.Config.Wrap<MssqlClientConfig>
-): Layer.Layer<Client.SqlClient | MssqlClient, ConfigError | SqlError> =>
-  Layer.scopedContext(
-    Config.unwrap(config).pipe(
+export const layerConfig: (
+  config: Config.Wrap<MssqlClientConfig>
+) => Layer.Layer<Client.SqlClient | MssqlClient, Config.ConfigError | SqlError> = (
+  config: Config.Wrap<MssqlClientConfig>
+): Layer.Layer<Client.SqlClient | MssqlClient, Config.ConfigError | SqlError> =>
+  Layer.effectServices(
+    Config.unwrap(config).asEffect().pipe(
       Effect.flatMap(make),
       Effect.map((client) =>
-        Context.make(MssqlClient, client).pipe(
-          Context.add(Client.SqlClient, client)
+        ServiceMap.make(MssqlClient, client).pipe(
+          ServiceMap.add(Client.SqlClient, client)
         )
       )
     )
@@ -450,11 +451,11 @@ export const layerConfig = (
  */
 export const layer = (
   config: MssqlClientConfig
-): Layer.Layer<Client.SqlClient | MssqlClient, ConfigError | SqlError> =>
-  Layer.scopedContext(
+): Layer.Layer<Client.SqlClient | MssqlClient, never | SqlError> =>
+  Layer.effectServices(
     Effect.map(make(config), (client) =>
-      Context.make(MssqlClient, client).pipe(
-        Context.add(Client.SqlClient, client)
+      ServiceMap.make(MssqlClient, client).pipe(
+        ServiceMap.add(Client.SqlClient, client)
       ))
   ).pipe(Layer.provide(Reactivity.layer))
 
@@ -519,8 +520,7 @@ export const defaultParameterTypes: Record<Statement.PrimitiveKind, DataType> =
   Date: Tedious.TYPES.DateTime,
   Uint8Array: Tedious.TYPES.VarBinary,
   Int8Array: Tedious.TYPES.VarBinary,
-  null: Tedious.TYPES.Bit,
-  object: Tedious.TYPES.NVarChar
+  null: Tedious.TYPES.Bit
 }
 
 // custom types

package/src/MssqlMigrator.ts

@@ -1,21 +1,16 @@
 /**
  * @since 1.0.0
  */
-import * as Migrator from "@effect/sql/Migrator"
-import type * as Client from "@effect/sql/SqlClient"
-import type { SqlError } from "@effect/sql/SqlError"
 import type * as Effect from "effect/Effect"
 import * as Layer from "effect/Layer"
+import * as Migrator from "effect/unstable/sql/Migrator"
+import type * as Client from "effect/unstable/sql/SqlClient"
+import type { SqlError } from "effect/unstable/sql/SqlError"
 
 /**
  * @since 1.0.0
  */
-export * from "@effect/sql/Migrator"
-
-/**
- * @since 1.0.0
- */
-export * from "@effect/sql/Migrator/FileSystem"
+export * from "effect/unstable/sql/Migrator"
 
 /**
  * @category constructor

package/src/Parameter.ts

@@ -2,27 +2,27 @@
  * @since 1.0.0
  */
 import { identity } from "effect/Function"
-import type { DataType } from "tedious/lib/data-type.js"
-import type { ParameterOptions } from "tedious/lib/request.js"
+import type { DataType } from "tedious/lib/data-type.ts"
+import type { ParameterOptions } from "tedious/lib/request.ts"
 
 /**
  * @category type id
  * @since 1.0.0
  */
-export const ParameterId = Symbol.for("@sqlfx/mssql/Parameter")
+export const TypeId: TypeId = "~@effect/sql-mssql/Parameter"
 
 /**
  * @category type id
  * @since 1.0.0
  */
-export type ParameterId = typeof ParameterId
+export type TypeId = "~@effect/sql-mssql/Parameter"
 
 /**
  * @category model
  * @since 1.0.0
  */
-export interface Parameter<A> {
-  readonly [ParameterId]: (_: never) => A
+export interface Parameter<out A> {
+  readonly [TypeId]: (_: never) => A
   readonly _tag: "Parameter"
   readonly name: string
   readonly type: DataType
@@ -38,7 +38,7 @@ export const make = <A>(
   type: DataType,
   options: ParameterOptions = {}
 ): Parameter<A> => ({
-  [ParameterId]: identity,
+  [TypeId]: identity,
   _tag: "Parameter",
   name,
   type,

package/src/Procedure.ts

@@ -1,26 +1,26 @@
 /**
  * @since 1.0.0
  */
-import type { Row } from "@effect/sql/SqlConnection"
 import { identity } from "effect/Function"
 import type { Pipeable } from "effect/Pipeable"
 import { pipeArguments } from "effect/Pipeable"
 import type { Covariant } from "effect/Types"
-import type { DataType } from "tedious/lib/data-type.js"
-import type { ParameterOptions } from "tedious/lib/request.js"
-import * as Parameter from "./Parameter.js"
+import type { Row } from "effect/unstable/sql/SqlConnection"
+import type { DataType } from "tedious/lib/data-type.ts"
+import type { ParameterOptions } from "tedious/lib/request.ts"
+import * as Parameter from "./Parameter.ts"
 
 /**
  * @category type id
  * @since 1.0.0
  */
-export const TypeId: unique symbol = Symbol.for("@effect/sql-mssql/Procedure")
+export const TypeId: TypeId = "~@effect/sql-mssql/Procedure"
 
 /**
  * @category type id
  * @since 1.0.0
  */
-export type TypeId = typeof TypeId
+export type TypeId = "~@effect/sql-mssql/Procedure"
 
 /**
  * @category model

package/src/index.ts

@@ -9,22 +9,24 @@ export {
   TYPES as MssqlTypes
 } from "tedious"
 
+// @barrel: Auto-generated exports. Do not edit manually.
+
 /**
  * @since 1.0.0
  */
-export * as MssqlClient from "./MssqlClient.js"
+export * as MssqlClient from "./MssqlClient.ts"
 
 /**
  * @since 1.0.0
  */
-export * as MssqlMigrator from "./MssqlMigrator.js"
+export * as MssqlMigrator from "./MssqlMigrator.ts"
 
 /**
  * @since 1.0.0
  */
-export * as Parameter from "./Parameter.js"
+export * as Parameter from "./Parameter.ts"
 
 /**
  * @since 1.0.0
  */
-export * as Procedure from "./Procedure.js"
+export * as Procedure from "./Procedure.ts"

package/.index/package.json

@@ -1,6 +0,0 @@
-{
-  "sideEffects": [],
-  "main": "../dist/cjs/.index.js",
-  "module": "../dist/esm/.index.js",
-  "types": "../dist/dts/.index.d.ts"
-}

package/MssqlClient/package.json

@@ -1,6 +0,0 @@
-{
-  "sideEffects": [],
-  "main": "../dist/cjs/MssqlClient.js",
-  "module": "../dist/esm/MssqlClient.js",
-  "types": "../dist/dts/MssqlClient.d.ts"
-}

package/MssqlMigrator/package.json

@@ -1,6 +0,0 @@
-{
-  "sideEffects": [],
-  "main": "../dist/cjs/MssqlMigrator.js",
-  "module": "../dist/esm/MssqlMigrator.js",
-  "types": "../dist/dts/MssqlMigrator.d.ts"
-}

package/Parameter/package.json

@@ -1,6 +0,0 @@
-{
-  "sideEffects": [],
-  "main": "../dist/cjs/Parameter.js",
-  "module": "../dist/esm/Parameter.js",
-  "types": "../dist/dts/Parameter.d.ts"
-}

package/Procedure/package.json

@@ -1,6 +0,0 @@
-{
-  "sideEffects": [],
-  "main": "../dist/cjs/Procedure.js",
-  "module": "../dist/esm/Procedure.js",
-  "types": "../dist/dts/Procedure.d.ts"
-}