diff --git a/package.json b/package.json index a3b399094ae..3b2251dd195 100644 --- a/package.json +++ b/package.json @@ -49,6 +49,7 @@ "@effect/dtslint": "^0.1.2", "@effect/eslint-plugin": "^0.2.0", "@effect/language-service": "^0.1.0", + "@effect/vitest": "workspace:^", "@eslint/compat": "1.1.1", "@eslint/eslintrc": "3.1.0", "@eslint/js": "9.9.1", diff --git a/packages/ai/ai/tsconfig.src.json b/packages/ai/ai/tsconfig.src.json index be27b3befb9..ab6a1110343 100644 --- a/packages/ai/ai/tsconfig.src.json +++ b/packages/ai/ai/tsconfig.src.json @@ -1,7 +1,10 @@ { "extends": "../../../tsconfig.base.json", "include": ["src"], - "references": [{ "path": "../../effect" }, { "path": "../../platform" }], + "references": [ + { "path": "../../effect/tsconfig.src.json" }, + { "path": "../../platform/tsconfig.src.json" } + ], "compilerOptions": { "tsBuildInfoFile": ".tsbuildinfo/src.tsbuildinfo", "rootDir": "src", diff --git a/packages/ai/ai/tsconfig.test.json b/packages/ai/ai/tsconfig.test.json index 4781a0a2a51..95f3ae8f876 100644 --- a/packages/ai/ai/tsconfig.test.json +++ b/packages/ai/ai/tsconfig.test.json @@ -3,9 +3,7 @@ "include": ["test"], "references": [ { "path": "tsconfig.src.json" }, - { "path": "../../effect" }, - { "path": "../../platform" }, - { "path": "../../vitest" } + { "path": "../../vitest/tsconfig.src.json" } ], "compilerOptions": { "tsBuildInfoFile": ".tsbuildinfo/test.tsbuildinfo", diff --git a/packages/ai/ai/vitest.config.ts b/packages/ai/ai/vitest.config.ts index 5242d41c5dc..bf29895f858 100644 --- a/packages/ai/ai/vitest.config.ts +++ b/packages/ai/ai/vitest.config.ts @@ -1,6 +1,6 @@ -import { mergeConfig, type UserConfigExport } from "vitest/config" +import { mergeConfig, type ViteUserConfig } from "vitest/config" import shared from "../../../vitest.shared.js" -const config: UserConfigExport = {} +const config: ViteUserConfig = {} export default mergeConfig(shared, config) diff --git a/packages/ai/openai/tsconfig.build.json b/packages/ai/openai/tsconfig.build.json index 48f83a47219..4021ab28144 100644 --- a/packages/ai/openai/tsconfig.build.json +++ b/packages/ai/openai/tsconfig.build.json @@ -1,8 +1,8 @@ { "extends": "./tsconfig.src.json", "references": [ - { "path": "../../effect/tsconfig.build.json" }, { "path": "../ai/tsconfig.build.json" }, + { "path": "../../effect/tsconfig.build.json" }, { "path": "../../experimental/tsconfig.build.json" }, { "path": "../../platform/tsconfig.build.json" } ], diff --git a/packages/ai/openai/tsconfig.src.json b/packages/ai/openai/tsconfig.src.json index 354a8aec057..01ab4fcfc0d 100644 --- a/packages/ai/openai/tsconfig.src.json +++ b/packages/ai/openai/tsconfig.src.json @@ -1,11 +1,11 @@ { "extends": "../../../tsconfig.base.json", - "include": ["src", "../../experimental/src/Sse.ts"], + "include": ["src"], "references": [ - { "path": "../../effect" }, - { "path": "../ai" }, - { "path": "../../experimental" }, - { "path": "../../platform" } + { "path": "../ai/tsconfig.src.json" }, + { "path": "../../effect/tsconfig.src.json" }, + { "path": "../../experimental/tsconfig.src.json" }, + { "path": "../../platform/tsconfig.src.json" } ], "compilerOptions": { "tsBuildInfoFile": ".tsbuildinfo/src.tsbuildinfo", diff --git a/packages/ai/openai/tsconfig.test.json b/packages/ai/openai/tsconfig.test.json index dba1449e956..95f3ae8f876 100644 --- a/packages/ai/openai/tsconfig.test.json +++ b/packages/ai/openai/tsconfig.test.json @@ -3,11 +3,7 @@ "include": ["test"], "references": [ { "path": "tsconfig.src.json" }, - { "path": "../../effect" }, - { "path": "../ai" }, - { "path": "../../experimental" }, - { "path": "../../platform" }, - { "path": "../../vitest" } + { "path": "../../vitest/tsconfig.src.json" } ], "compilerOptions": { "tsBuildInfoFile": ".tsbuildinfo/test.tsbuildinfo", diff --git a/packages/ai/openai/vitest.config.ts b/packages/ai/openai/vitest.config.ts index 5242d41c5dc..bf29895f858 100644 --- a/packages/ai/openai/vitest.config.ts +++ b/packages/ai/openai/vitest.config.ts @@ -1,6 +1,6 @@ -import { mergeConfig, type UserConfigExport } from "vitest/config" +import { mergeConfig, type ViteUserConfig } from "vitest/config" import shared from "../../../vitest.shared.js" -const config: UserConfigExport = {} +const config: ViteUserConfig = {} export default mergeConfig(shared, config) diff --git a/packages/cli/test/Args.test.ts b/packages/cli/test/Args.test.ts index 2f238b36882..67c83b817f4 100644 --- a/packages/cli/test/Args.test.ts +++ b/packages/cli/test/Args.test.ts @@ -4,11 +4,11 @@ import * as HelpDoc from "@effect/cli/HelpDoc" import * as ValidationError from "@effect/cli/ValidationError" import { FileSystem, Path } from "@effect/platform" import { NodeContext } from "@effect/platform-node" +import { describe, expect, it } from "@effect/vitest" import * as Array from "effect/Array" import * as Effect from "effect/Effect" import * as Option from "effect/Option" import * as Schema from "effect/Schema" -import { describe, expect, it } from "vitest" const runEffect = ( self: Effect.Effect diff --git a/packages/cli/test/AutoCorrect.test.ts b/packages/cli/test/AutoCorrect.test.ts index fe0ac3840b9..27afdd78b77 100644 --- a/packages/cli/test/AutoCorrect.test.ts +++ b/packages/cli/test/AutoCorrect.test.ts @@ -1,6 +1,6 @@ import * as AutoCorrect from "@effect/cli/AutoCorrect" import * as CliConfig from "@effect/cli/CliConfig" -import { describe, expect, it } from "vitest" +import { describe, expect, it } from "@effect/vitest" describe("AutoCorrect", () => { it("should calculate the correct Levenstein distance between two strings", () => { diff --git a/packages/cli/test/CliApp.test.ts b/packages/cli/test/CliApp.test.ts index 73d13b235f4..4ff3dfeb92f 100644 --- a/packages/cli/test/CliApp.test.ts +++ b/packages/cli/test/CliApp.test.ts @@ -5,8 +5,8 @@ import * as HelpDoc from "@effect/cli/HelpDoc" import * as MockConsole from "@effect/cli/test/services/MockConsole" import * as ValidationError from "@effect/cli/ValidationError" import { NodeContext } from "@effect/platform-node" +import { describe, expect, it } from "@effect/vitest" import { Array, Console, Effect, FiberRef, Layer, LogLevel } from "effect" -import { describe, expect, it } from "vitest" const MainLive = Effect.gen(function*(_) { const console = yield* _(MockConsole.make) diff --git a/packages/cli/test/Command.test.ts b/packages/cli/test/Command.test.ts index 15be9e08bfd..5bc878d4237 100644 --- a/packages/cli/test/Command.test.ts +++ b/packages/cli/test/Command.test.ts @@ -1,7 +1,7 @@ import { Args, Command, Options } from "@effect/cli" import { NodeContext } from "@effect/platform-node" +import { assert, describe, it } from "@effect/vitest" import { Config, ConfigProvider, Context, Effect, Layer } from "effect" -import { assert, describe, it } from "vitest" const git = Command.make("git", { verbose: Options.boolean("verbose").pipe( diff --git a/packages/cli/test/CommandDescriptor.test.ts b/packages/cli/test/CommandDescriptor.test.ts index 000fb44a179..7e669c2bbd7 100644 --- a/packages/cli/test/CommandDescriptor.test.ts +++ b/packages/cli/test/CommandDescriptor.test.ts @@ -11,8 +11,8 @@ import * as WordCount from "@effect/cli/test/utils/wc" import * as ValidationError from "@effect/cli/ValidationError" import * as NodeContext from "@effect/platform-node/NodeContext" import * as Doc from "@effect/printer/Doc" +import { describe, expect, it } from "@effect/vitest" import { Array, Effect, Option, String } from "effect" -import { describe, expect, it } from "vitest" const runEffect = ( self: Effect.Effect diff --git a/packages/cli/test/ConfigFile.test.ts b/packages/cli/test/ConfigFile.test.ts index 386a5362c24..8cebfaeb0ed 100644 --- a/packages/cli/test/ConfigFile.test.ts +++ b/packages/cli/test/ConfigFile.test.ts @@ -2,9 +2,9 @@ import * as ConfigFile from "@effect/cli/ConfigFile" import type { FileSystem } from "@effect/platform" import { Path } from "@effect/platform" import { NodeContext } from "@effect/platform-node" +import { assert, describe, it } from "@effect/vitest" import * as Config from "effect/Config" import * as Effect from "effect/Effect" -import { assert, describe, it } from "vitest" const runEffect = ( self: Effect.Effect diff --git a/packages/cli/test/Options.test.ts b/packages/cli/test/Options.test.ts index 8ed7b09fa29..d0c68367ab1 100644 --- a/packages/cli/test/Options.test.ts +++ b/packages/cli/test/Options.test.ts @@ -5,6 +5,7 @@ import * as ValidationError from "@effect/cli/ValidationError" import * as NodeContext from "@effect/platform-node/NodeContext" import * as FileSystem from "@effect/platform/FileSystem" import * as Path from "@effect/platform/Path" +import { assert, describe, expect, it } from "@effect/vitest" import { BigDecimal } from "effect" import * as Array from "effect/Array" import * as Data from "effect/Data" @@ -14,7 +15,6 @@ import { identity } from "effect/Function" import * as HashMap from "effect/HashMap" import * as Option from "effect/Option" import * as Schema from "effect/Schema" -import { assert, describe, expect, it } from "vitest" const firstName = Options.text("firstName").pipe(Options.withAlias("f")) const lastName = Options.text("lastName") diff --git a/packages/cli/test/Primitive.test.ts b/packages/cli/test/Primitive.test.ts index 6b8c26617ac..4daf57caa19 100644 --- a/packages/cli/test/Primitive.test.ts +++ b/packages/cli/test/Primitive.test.ts @@ -2,9 +2,9 @@ import * as CliConfig from "@effect/cli/CliConfig" import * as Primitive from "@effect/cli/Primitive" import type { FileSystem } from "@effect/platform" import { NodeFileSystem } from "@effect/platform-node" +import { describe, expect, it } from "@effect/vitest" import { Array, Effect, Equal, Function, Option } from "effect" import * as fc from "effect/FastCheck" -import { describe, expect, it } from "vitest" const runEffect = (self: Effect.Effect): Promise => Effect.provide(self, NodeFileSystem.layer).pipe(Effect.runPromise) diff --git a/packages/cli/test/Prompt.test.ts b/packages/cli/test/Prompt.test.ts index d6dc530fab4..80562914dd2 100644 --- a/packages/cli/test/Prompt.test.ts +++ b/packages/cli/test/Prompt.test.ts @@ -5,12 +5,12 @@ import * as MockTerminal from "@effect/cli/test/services/MockTerminal" import { NodeFileSystem, NodePath } from "@effect/platform-node" import * as Ansi from "@effect/printer-ansi/Ansi" import * as Doc from "@effect/printer-ansi/AnsiDoc" +import { describe, expect, it } from "@effect/vitest" import * as Console from "effect/Console" import * as Effect from "effect/Effect" import * as Fiber from "effect/Fiber" import * as Layer from "effect/Layer" import * as Redacted from "effect/Redacted" -import { describe, expect, it } from "vitest" const MainLive = Effect.gen(function*() { const console = yield* MockConsole.make diff --git a/packages/cli/test/Wizard.test.ts b/packages/cli/test/Wizard.test.ts index 877bd4a2b12..2bf1410b05e 100644 --- a/packages/cli/test/Wizard.test.ts +++ b/packages/cli/test/Wizard.test.ts @@ -5,11 +5,11 @@ import * as MockConsole from "@effect/cli/test/services/MockConsole" import * as MockTerminal from "@effect/cli/test/services/MockTerminal" import {} from "@effect/platform" import { NodeFileSystem, NodePath } from "@effect/platform-node" +import { describe, expect, it } from "@effect/vitest" import { Array, Effect } from "effect" import * as Console from "effect/Console" import * as Fiber from "effect/Fiber" import * as Layer from "effect/Layer" -import { describe, expect, it } from "vitest" const MainLive = Effect.gen(function*(_) { const console = yield* _(MockConsole.make) diff --git a/packages/cli/tsconfig.examples.json b/packages/cli/tsconfig.examples.json index b244aaebd18..fa42c7fa532 100644 --- a/packages/cli/tsconfig.examples.json +++ b/packages/cli/tsconfig.examples.json @@ -3,11 +3,7 @@ "include": ["examples"], "references": [ { "path": "tsconfig.src.json" }, - { "path": "../effect" }, - { "path": "../printer" }, - { "path": "../printer-ansi" }, - { "path": "../platform" }, - { "path": "../platform-node" } + { "path": "../platform-node/tsconfig.src.json" } ], "compilerOptions": { "types": ["node"], diff --git a/packages/cli/tsconfig.src.json b/packages/cli/tsconfig.src.json index d6e3c3ae5f4..74de5089faa 100644 --- a/packages/cli/tsconfig.src.json +++ b/packages/cli/tsconfig.src.json @@ -2,11 +2,10 @@ "extends": "../../tsconfig.base.json", "include": ["src"], "references": [ - { "path": "../effect" }, - { "path": "../printer" }, - { "path": "../printer-ansi" }, - { "path": "../platform" }, - { "path": "../platform-node" } + { "path": "../effect/tsconfig.src.json" }, + { "path": "../printer/tsconfig.src.json" }, + { "path": "../printer-ansi/tsconfig.src.json" }, + { "path": "../platform/tsconfig.src.json" } ], "compilerOptions": { "types": ["node"], diff --git a/packages/cli/tsconfig.test.json b/packages/cli/tsconfig.test.json index b0f22e2d302..0fc1f0e30b6 100644 --- a/packages/cli/tsconfig.test.json +++ b/packages/cli/tsconfig.test.json @@ -3,11 +3,8 @@ "include": ["test"], "references": [ { "path": "tsconfig.src.json" }, - { "path": "../effect" }, - { "path": "../printer" }, - { "path": "../printer-ansi" }, - { "path": "../platform" }, - { "path": "../platform-node" } + { "path": "../vitest/tsconfig.src.json" }, + { "path": "../platform-node/tsconfig.src.json" } ], "compilerOptions": { "types": ["node"], diff --git a/packages/cli/vitest.config.ts b/packages/cli/vitest.config.ts index 0411095f257..578d0667249 100644 --- a/packages/cli/vitest.config.ts +++ b/packages/cli/vitest.config.ts @@ -1,6 +1,6 @@ -import { mergeConfig, type UserConfigExport } from "vitest/config" +import { mergeConfig, type ViteUserConfig } from "vitest/config" import shared from "../../vitest.shared.js" -const config: UserConfigExport = {} +const config: ViteUserConfig = {} export default mergeConfig(shared, config) diff --git a/packages/cluster-browser/tsconfig.src.json b/packages/cluster-browser/tsconfig.src.json index 2d72ee5c023..943311bfa0e 100644 --- a/packages/cluster-browser/tsconfig.src.json +++ b/packages/cluster-browser/tsconfig.src.json @@ -1,7 +1,10 @@ { "extends": "../../tsconfig.base.json", "include": ["src"], - "references": [{ "path": "../effect" }, { "path": "../rpc" }], + "references": [ + { "path": "../effect/tsconfig.src.json" }, + { "path": "../rpc/tsconfig.src.json" } + ], "compilerOptions": { "tsBuildInfoFile": ".tsbuildinfo/src.tsbuildinfo", "rootDir": "src", diff --git a/packages/cluster-browser/tsconfig.test.json b/packages/cluster-browser/tsconfig.test.json index f2d078bbe35..185e7065e44 100644 --- a/packages/cluster-browser/tsconfig.test.json +++ b/packages/cluster-browser/tsconfig.test.json @@ -2,7 +2,8 @@ "extends": "../../tsconfig.base.json", "include": ["test"], "references": [ - { "path": "tsconfig.src.json" } + { "path": "tsconfig.src.json" }, + { "path": "../vitest/tsconfig.src.json" } ], "compilerOptions": { "tsBuildInfoFile": ".tsbuildinfo/test.tsbuildinfo", diff --git a/packages/cluster-browser/vitest.config.ts b/packages/cluster-browser/vitest.config.ts index 0411095f257..578d0667249 100644 --- a/packages/cluster-browser/vitest.config.ts +++ b/packages/cluster-browser/vitest.config.ts @@ -1,6 +1,6 @@ -import { mergeConfig, type UserConfigExport } from "vitest/config" +import { mergeConfig, type ViteUserConfig } from "vitest/config" import shared from "../../vitest.shared.js" -const config: UserConfigExport = {} +const config: ViteUserConfig = {} export default mergeConfig(shared, config) diff --git a/packages/cluster-node/tsconfig.examples.json b/packages/cluster-node/tsconfig.examples.json index 4ae9e909b19..c2399082336 100644 --- a/packages/cluster-node/tsconfig.examples.json +++ b/packages/cluster-node/tsconfig.examples.json @@ -1,13 +1,10 @@ { "extends": "../../tsconfig.base.json", - "include": [ - "examples" - ], + "include": ["examples"], "references": [ { "path": "tsconfig.src.json" }, - { "path": "../rpc-http" }, - { "path": "../platform" }, - { "path": "../platform-node" } + { "path": "../rpc-http/tsconfig.src.json" }, + { "path": "../platform-node/tsconfig.src.json" } ], "compilerOptions": { "types": ["node"], diff --git a/packages/cluster-node/tsconfig.src.json b/packages/cluster-node/tsconfig.src.json index a0dbf713b39..ddcb3a4103e 100644 --- a/packages/cluster-node/tsconfig.src.json +++ b/packages/cluster-node/tsconfig.src.json @@ -2,9 +2,9 @@ "extends": "../../tsconfig.base.json", "include": ["src"], "references": [ - { "path": "../effect" }, - { "path": "../cluster" }, - { "path": "../rpc" } + { "path": "../effect/tsconfig.src.json" }, + { "path": "../cluster/tsconfig.src.json" }, + { "path": "../rpc/tsconfig.src.json" } ], "compilerOptions": { "types": ["node"], diff --git a/packages/cluster-node/tsconfig.test.json b/packages/cluster-node/tsconfig.test.json index 47c64b0464e..a8deae274fd 100644 --- a/packages/cluster-node/tsconfig.test.json +++ b/packages/cluster-node/tsconfig.test.json @@ -1,10 +1,9 @@ { "extends": "../../tsconfig.base.json", - "include": [ - "test" - ], + "include": ["test"], "references": [ - { "path": "tsconfig.src.json" } + { "path": "tsconfig.src.json" }, + { "path": "../vitest/tsconfig.src.json" } ], "compilerOptions": { "types": ["node"], diff --git a/packages/cluster-node/vitest.config.ts b/packages/cluster-node/vitest.config.ts index 0411095f257..578d0667249 100644 --- a/packages/cluster-node/vitest.config.ts +++ b/packages/cluster-node/vitest.config.ts @@ -1,6 +1,6 @@ -import { mergeConfig, type UserConfigExport } from "vitest/config" +import { mergeConfig, type ViteUserConfig } from "vitest/config" import shared from "../../vitest.shared.js" -const config: UserConfigExport = {} +const config: ViteUserConfig = {} export default mergeConfig(shared, config) diff --git a/packages/cluster-workflow/test/CrashableRuntime.test.ts b/packages/cluster-workflow/test/CrashableRuntime.test.ts index 936a2152eac..5928f90e425 100644 --- a/packages/cluster-workflow/test/CrashableRuntime.test.ts +++ b/packages/cluster-workflow/test/CrashableRuntime.test.ts @@ -5,10 +5,10 @@ import * as LogLevel from "effect/LogLevel" import * as Option from "effect/Option" import * as Ref from "effect/Ref" +import { describe, expect, it } from "@effect/vitest" import * as Duration from "effect/Duration" import * as Effect from "effect/Effect" import { pipe } from "effect/Function" -import { describe, expect, it } from "vitest" describe.concurrent("CrashableRuntime", () => { const withTestEnv = (fa: Effect.Effect) => pipe(fa, Logger.withMinimumLogLevel(LogLevel.Info)) diff --git a/packages/cluster-workflow/test/DurableExecutionJournal.test.ts b/packages/cluster-workflow/test/DurableExecutionJournal.test.ts index 797ae2ce928..2fd8d90d07d 100644 --- a/packages/cluster-workflow/test/DurableExecutionJournal.test.ts +++ b/packages/cluster-workflow/test/DurableExecutionJournal.test.ts @@ -5,12 +5,12 @@ import * as NodeFileSystem from "@effect/platform-node/NodeFileSystem" import * as FileSystem from "@effect/platform/FileSystem" import * as Sqlite from "@effect/sql-sqlite-node/SqliteClient" import * as SqlClient from "@effect/sql/SqlClient" +import { describe, expect, it } from "@effect/vitest" import * as Chunk from "effect/Chunk" import * as Effect from "effect/Effect" import * as Layer from "effect/Layer" import * as Schema from "effect/Schema" import * as Stream from "effect/Stream" -import { describe, expect, it } from "vitest" const makeSqlClient = Effect.gen(function*() { const fs = yield* FileSystem.FileSystem diff --git a/packages/cluster-workflow/test/Workflow.test.ts b/packages/cluster-workflow/test/Workflow.test.ts index 7c018cc577a..02de052a6cf 100644 --- a/packages/cluster-workflow/test/Workflow.test.ts +++ b/packages/cluster-workflow/test/Workflow.test.ts @@ -8,6 +8,7 @@ import * as utils from "@effect/cluster-workflow/test/utils" import * as Workflow from "@effect/cluster-workflow/Workflow" import * as WorkflowEngine from "@effect/cluster-workflow/WorkflowEngine" import * as Message from "@effect/cluster/Message" +import { describe, expect, it } from "@effect/vitest" import * as Chunk from "effect/Chunk" import * as Deferred from "effect/Deferred" import * as Effect from "effect/Effect" @@ -18,7 +19,6 @@ import * as LogLevel from "effect/LogLevel" import * as Ref from "effect/Ref" import * as Schema from "effect/Schema" import * as Stream from "effect/Stream" -import { describe, expect, it } from "vitest" describe.concurrent("Workflow", () => { const withTestEnv = (fa: Effect.Effect) => diff --git a/packages/cluster-workflow/test/utils.ts b/packages/cluster-workflow/test/utils.ts index 4c2183c0b2d..8defa0db9c8 100644 --- a/packages/cluster-workflow/test/utils.ts +++ b/packages/cluster-workflow/test/utils.ts @@ -1,10 +1,10 @@ import * as Activity from "@effect/cluster-workflow/Activity" +import { vi } from "@effect/vitest" +import type { Mock } from "@effect/vitest" import * as Effect from "effect/Effect" import type * as Exit from "effect/Exit" import { pipe } from "effect/Function" import type * as Schema from "effect/Schema" -import { vi } from "vitest" -import type { Mock } from "vitest" export function mockEffect( impl: () => Exit.Exit diff --git a/packages/cluster-workflow/tsconfig.build.json b/packages/cluster-workflow/tsconfig.build.json index 8f6e6ec87dd..b0f922cb5c2 100644 --- a/packages/cluster-workflow/tsconfig.build.json +++ b/packages/cluster-workflow/tsconfig.build.json @@ -2,7 +2,8 @@ "extends": "./tsconfig.src.json", "references": [ { "path": "../effect/tsconfig.build.json" }, - { "path": "../cluster/tsconfig.build.json" } + { "path": "../cluster/tsconfig.build.json" }, + { "path": "../sql/tsconfig.build.json" } ], "compilerOptions": { "tsBuildInfoFile": ".tsbuildinfo/build.tsbuildinfo", diff --git a/packages/cluster-workflow/tsconfig.src.json b/packages/cluster-workflow/tsconfig.src.json index bfe4147871a..82e4bca0114 100644 --- a/packages/cluster-workflow/tsconfig.src.json +++ b/packages/cluster-workflow/tsconfig.src.json @@ -1,7 +1,11 @@ { "extends": "../../tsconfig.base.json", "include": ["src"], - "references": [{ "path": "../effect" }, { "path": "../cluster" }], + "references": [ + { "path": "../effect/tsconfig.src.json" }, + { "path": "../cluster/tsconfig.src.json" }, + { "path": "../sql/tsconfig.src.json" } + ], "compilerOptions": { "tsBuildInfoFile": ".tsbuildinfo/src.tsbuildinfo", "rootDir": "src", diff --git a/packages/cluster-workflow/tsconfig.test.json b/packages/cluster-workflow/tsconfig.test.json index c4b3a08f05b..bee04c6ee3f 100644 --- a/packages/cluster-workflow/tsconfig.test.json +++ b/packages/cluster-workflow/tsconfig.test.json @@ -1,10 +1,10 @@ { "extends": "../../tsconfig.base.json", - "include": [ - "test" - ], + "include": ["test"], "references": [ - { "path": "tsconfig.src.json" } + { "path": "tsconfig.src.json" }, + { "path": "../vitest/tsconfig.src.json" }, + { "path": "../sql-sqlite-node/tsconfig.src.json" } ], "compilerOptions": { "tsBuildInfoFile": ".tsbuildinfo/test.tsbuildinfo", diff --git a/packages/cluster-workflow/vitest.config.ts b/packages/cluster-workflow/vitest.config.ts index 0411095f257..578d0667249 100644 --- a/packages/cluster-workflow/vitest.config.ts +++ b/packages/cluster-workflow/vitest.config.ts @@ -1,6 +1,6 @@ -import { mergeConfig, type UserConfigExport } from "vitest/config" +import { mergeConfig, type ViteUserConfig } from "vitest/config" import shared from "../../vitest.shared.js" -const config: UserConfigExport = {} +const config: ViteUserConfig = {} export default mergeConfig(shared, config) diff --git a/packages/cluster/test/AtLeastOnce.test.ts b/packages/cluster/test/AtLeastOnce.test.ts index 7f7294d863d..7c3d134c2d1 100644 --- a/packages/cluster/test/AtLeastOnce.test.ts +++ b/packages/cluster/test/AtLeastOnce.test.ts @@ -15,6 +15,7 @@ import * as NodeFileSystem from "@effect/platform-node/NodeFileSystem" import * as FileSystem from "@effect/platform/FileSystem" import * as Sqlite from "@effect/sql-sqlite-node/SqliteClient" import * as SqlClient from "@effect/sql/SqlClient" +import { describe, expect, it } from "@effect/vitest" import * as Duration from "effect/Duration" import * as Effect from "effect/Effect" import * as Exit from "effect/Exit" @@ -22,7 +23,6 @@ import { pipe } from "effect/Function" import * as Layer from "effect/Layer" import * as PrimaryKey from "effect/PrimaryKey" import * as Schema from "effect/Schema" -import { describe, expect, it } from "vitest" class SampleMessage extends Schema.TaggedRequest()( "SampleMessage", diff --git a/packages/cluster/test/RecipientAddress.test.ts b/packages/cluster/test/RecipientAddress.test.ts index e2ca418cc6f..10d2362b641 100644 --- a/packages/cluster/test/RecipientAddress.test.ts +++ b/packages/cluster/test/RecipientAddress.test.ts @@ -1,7 +1,7 @@ import * as RecipientAddress from "@effect/cluster/RecipientAddress" +import { describe, expect, it } from "@effect/vitest" import { equals } from "effect/Equal" import * as Hash from "effect/Hash" -import { describe, expect, it } from "vitest" describe.concurrent("RecipientAddress", () => { it("Expect equals to work as expected", () => { diff --git a/packages/cluster/test/RecipientBehaviour.test.ts b/packages/cluster/test/RecipientBehaviour.test.ts index b34a0ea5054..78ca49a2b82 100644 --- a/packages/cluster/test/RecipientBehaviour.test.ts +++ b/packages/cluster/test/RecipientBehaviour.test.ts @@ -5,6 +5,7 @@ import * as RecipientBehaviour from "@effect/cluster/RecipientBehaviour" import * as RecipientBehaviourContext from "@effect/cluster/RecipientBehaviourContext" import * as RecipientType from "@effect/cluster/RecipientType" import * as ShardId from "@effect/cluster/ShardId" +import { describe, expect, it } from "@effect/vitest" import * as Deferred from "effect/Deferred" import * as Effect from "effect/Effect" import * as Exit from "effect/Exit" @@ -15,7 +16,6 @@ import * as LogLevel from "effect/LogLevel" import * as Queue from "effect/Queue" import * as Schema from "effect/Schema" import * as Scope from "effect/Scope" -import { describe, expect, it } from "vitest" class Sample extends Message.TaggedMessage()("Sample", Schema.Never, Schema.Number, { id: Schema.String diff --git a/packages/cluster/test/RecipientType.test.ts b/packages/cluster/test/RecipientType.test.ts index 59b11d38a58..bbf4cea8aad 100644 --- a/packages/cluster/test/RecipientType.test.ts +++ b/packages/cluster/test/RecipientType.test.ts @@ -1,9 +1,9 @@ import * as Message from "@effect/cluster/Message" import * as RecipientType from "@effect/cluster/RecipientType" +import { describe, expect, it } from "@effect/vitest" import { equals } from "effect/Equal" import * as Hash from "effect/Hash" import * as Schema from "effect/Schema" -import { describe, expect, it } from "vitest" class Sample extends Message.TaggedMessage()("Sample", Schema.Never, Schema.Number, { id: Schema.String diff --git a/packages/cluster/test/ShardManager.test.ts b/packages/cluster/test/ShardManager.test.ts index 08513812df5..a27b803f1b7 100644 --- a/packages/cluster/test/ShardManager.test.ts +++ b/packages/cluster/test/ShardManager.test.ts @@ -9,12 +9,12 @@ import * as PodsHealth from "@effect/cluster/PodsHealth" import * as ShardId from "@effect/cluster/ShardId" import * as ShardManager from "@effect/cluster/ShardManager" import * as Storage from "@effect/cluster/Storage" +import { describe, expect, it } from "@effect/vitest" import * as Effect from "effect/Effect" import { pipe } from "effect/Function" import * as HashMap from "effect/HashMap" import * as Layer from "effect/Layer" import * as Option from "effect/Option" -import { describe, expect, it } from "vitest" describe.concurrent("ShardManagerSpec", () => { const pod1 = PodWithMetadata.make(Pod.make(PodAddress.make("1", 1), "1.0.0"), 0) diff --git a/packages/cluster/test/Sharding.test.ts b/packages/cluster/test/Sharding.test.ts index 20600c64112..ee5ffa1a1df 100644 --- a/packages/cluster/test/Sharding.test.ts +++ b/packages/cluster/test/Sharding.test.ts @@ -11,6 +11,7 @@ import * as ShardingConfig from "@effect/cluster/ShardingConfig" import * as ShardingException from "@effect/cluster/ShardingException" import * as ShardManagerClient from "@effect/cluster/ShardManagerClient" import * as Storage from "@effect/cluster/Storage" +import { describe, expect, it } from "@effect/vitest" import * as Cause from "effect/Cause" import * as Context from "effect/Context" import * as Deferred from "effect/Deferred" @@ -28,7 +29,6 @@ import * as PrimaryKey from "effect/PrimaryKey" import * as Queue from "effect/Queue" import * as Ref from "effect/Ref" import * as Schema from "effect/Schema" -import { describe, expect, it } from "vitest" interface SampleService { value: number diff --git a/packages/cluster/tsconfig.src.json b/packages/cluster/tsconfig.src.json index 5636abbdfa8..9e0e7df98db 100644 --- a/packages/cluster/tsconfig.src.json +++ b/packages/cluster/tsconfig.src.json @@ -2,9 +2,9 @@ "extends": "../../tsconfig.base.json", "include": ["src"], "references": [ - { "path": "../effect" }, - { "path": "../platform" }, - { "path": "../sql" } + { "path": "../effect/tsconfig.src.json" }, + { "path": "../platform/tsconfig.src.json" }, + { "path": "../sql/tsconfig.src.json" } ], "compilerOptions": { "tsBuildInfoFile": ".tsbuildinfo/src.tsbuildinfo", diff --git a/packages/cluster/tsconfig.test.json b/packages/cluster/tsconfig.test.json index 671911fe3c2..bee04c6ee3f 100644 --- a/packages/cluster/tsconfig.test.json +++ b/packages/cluster/tsconfig.test.json @@ -3,11 +3,8 @@ "include": ["test"], "references": [ { "path": "tsconfig.src.json" }, - { "path": "../effect" }, - { "path": "../platform" }, - { "path": "../platform-node" }, - { "path": "../sql" }, - { "path": "../sql-sqlite-node" } + { "path": "../vitest/tsconfig.src.json" }, + { "path": "../sql-sqlite-node/tsconfig.src.json" } ], "compilerOptions": { "tsBuildInfoFile": ".tsbuildinfo/test.tsbuildinfo", diff --git a/packages/cluster/vitest.config.ts b/packages/cluster/vitest.config.ts index 0411095f257..578d0667249 100644 --- a/packages/cluster/vitest.config.ts +++ b/packages/cluster/vitest.config.ts @@ -1,6 +1,6 @@ -import { mergeConfig, type UserConfigExport } from "vitest/config" +import { mergeConfig, type ViteUserConfig } from "vitest/config" import shared from "../../vitest.shared.js" -const config: UserConfigExport = {} +const config: ViteUserConfig = {} export default mergeConfig(shared, config) diff --git a/packages/effect/test/Array.test.ts b/packages/effect/test/Array.test.ts index 465a701c850..53dcdfb94e3 100644 --- a/packages/effect/test/Array.test.ts +++ b/packages/effect/test/Array.test.ts @@ -1,3 +1,4 @@ +import { describe, it } from "@effect/vitest" import { Array as Arr, Either, @@ -11,7 +12,6 @@ import { String as Str } from "effect" import { assertNone, assertSome, deepStrictEqual, strictEqual, throws } from "effect/test/util" -import { describe, it } from "vitest" const symA = Symbol.for("a") const symB = Symbol.for("b") diff --git a/packages/effect/test/BigDecimal.test.ts b/packages/effect/test/BigDecimal.test.ts index fc814fbd715..c7de8b03c1a 100644 --- a/packages/effect/test/BigDecimal.test.ts +++ b/packages/effect/test/BigDecimal.test.ts @@ -1,3 +1,4 @@ +import { describe, it } from "@effect/vitest" import { BigDecimal, Equal, FastCheck as fc, Option } from "effect" import { assertFalse, @@ -9,7 +10,6 @@ import { strictEqual, throws } from "effect/test/util" -import { describe, it } from "vitest" const $ = BigDecimal.unsafeFromString diff --git a/packages/effect/test/BigInt.test.ts b/packages/effect/test/BigInt.test.ts index 0eee411d1a9..4b5c426b168 100644 --- a/packages/effect/test/BigInt.test.ts +++ b/packages/effect/test/BigInt.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import { BigInt as BigInt_, pipe } from "effect" import { assertFalse, assertNone, assertSome, assertTrue, deepStrictEqual, strictEqual, throws } from "effect/test/util" -import { describe, it } from "vitest" describe("BigInt", () => { it("sign", () => { diff --git a/packages/effect/test/Boolean.test.ts b/packages/effect/test/Boolean.test.ts index 933b3e40b4e..5d85208900f 100644 --- a/packages/effect/test/Boolean.test.ts +++ b/packages/effect/test/Boolean.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import { Boolean, pipe } from "effect" import { assertFalse, assertTrue, deepStrictEqual } from "effect/test/util" -import { describe, it } from "vitest" describe("Boolean", () => { it("isBoolean", () => { diff --git a/packages/effect/test/Brand.test.ts b/packages/effect/test/Brand.test.ts index 0568e82f6de..11bc1e32858 100644 --- a/packages/effect/test/Brand.test.ts +++ b/packages/effect/test/Brand.test.ts @@ -1,3 +1,4 @@ +import { describe, it } from "@effect/vitest" import { Brand, Option } from "effect" import { assertFalse, @@ -9,7 +10,6 @@ import { strictEqual, throws } from "effect/test/util" -import { describe, it } from "vitest" declare const IntTypeId: unique symbol type Int = number & Brand.Brand diff --git a/packages/effect/test/Cache.test.ts b/packages/effect/test/Cache.test.ts index 45b4781e74a..d976cada745 100644 --- a/packages/effect/test/Cache.test.ts +++ b/packages/effect/test/Cache.test.ts @@ -1,8 +1,7 @@ +import { describe, it } from "@effect/vitest" import { Cache, Effect } from "effect" import { strictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" import * as TestClock from "effect/TestClock" -import { describe } from "vitest" describe("Cache", () => { it.effect("should not increment cache hits on expired entries", () => diff --git a/packages/effect/test/Cause.test.ts b/packages/effect/test/Cause.test.ts index f414856ebec..6393bc23edf 100644 --- a/packages/effect/test/Cause.test.ts +++ b/packages/effect/test/Cause.test.ts @@ -1,3 +1,4 @@ +import { describe, it } from "@effect/vitest" import { Array as Arr, Cause, Effect, Equal, FastCheck as fc, FiberId, Hash, Option, Predicate } from "effect" import { NodeInspectSymbol } from "effect/Inspectable" import * as internal from "effect/internal/cause" @@ -12,7 +13,6 @@ import { strictEqual } from "effect/test/util" import { causes, equalCauses, errorCauseFunctions, errors } from "effect/test/utils/cause" -import { describe, it } from "vitest" describe("Cause", () => { const empty = Cause.empty diff --git a/packages/effect/test/Channel/constructors.test.ts b/packages/effect/test/Channel/constructors.test.ts index 9d551f759e1..b26cb89d6ed 100644 --- a/packages/effect/test/Channel/constructors.test.ts +++ b/packages/effect/test/Channel/constructors.test.ts @@ -1,10 +1,9 @@ +import { describe, it } from "@effect/vitest" import * as Channel from "effect/Channel" import * as Chunk from "effect/Chunk" import * as Effect from "effect/Effect" import * as Exit from "effect/Exit" import { assertTrue, deepStrictEqual, strictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" -import { describe } from "vitest" describe("Channel", () => { it.effect("succeed", () => diff --git a/packages/effect/test/Channel/environment.test.ts b/packages/effect/test/Channel/environment.test.ts index 8f8ad4dd58e..1c6e1060e08 100644 --- a/packages/effect/test/Channel/environment.test.ts +++ b/packages/effect/test/Channel/environment.test.ts @@ -1,3 +1,4 @@ +import { describe, it } from "@effect/vitest" import * as Channel from "effect/Channel" import * as Context from "effect/Context" import * as Effect from "effect/Effect" @@ -5,8 +6,6 @@ import * as Equal from "effect/Equal" import { pipe } from "effect/Function" import * as Hash from "effect/Hash" import { deepStrictEqual, strictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" -import { describe } from "vitest" const NumberServiceSymbolKey = "effect/test/NumberService" diff --git a/packages/effect/test/Channel/error-handling.test.ts b/packages/effect/test/Channel/error-handling.test.ts index 1d857c90a2b..bbe9f1f7ee0 100644 --- a/packages/effect/test/Channel/error-handling.test.ts +++ b/packages/effect/test/Channel/error-handling.test.ts @@ -1,3 +1,4 @@ +import { describe, it } from "@effect/vitest" import * as Channel from "effect/Channel" import * as Deferred from "effect/Deferred" import * as Effect from "effect/Effect" @@ -5,8 +6,6 @@ import * as Exit from "effect/Exit" import { pipe } from "effect/Function" import * as Ref from "effect/Ref" import { assertTrue, deepStrictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" -import { describe } from "vitest" describe("Channel", () => { it.effect("catchAll - structure confusion", () => diff --git a/packages/effect/test/Channel/finalization.test.ts b/packages/effect/test/Channel/finalization.test.ts index e26aacd4463..996e1f9485d 100644 --- a/packages/effect/test/Channel/finalization.test.ts +++ b/packages/effect/test/Channel/finalization.test.ts @@ -1,11 +1,10 @@ +import { describe, it } from "@effect/vitest" import * as Channel from "effect/Channel" import * as Effect from "effect/Effect" import * as Exit from "effect/Exit" import { pipe } from "effect/Function" import * as Ref from "effect/Ref" import { assertTrue, deepStrictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" -import { describe } from "vitest" interface First { readonly _tag: "First" diff --git a/packages/effect/test/Channel/foreign.test.ts b/packages/effect/test/Channel/foreign.test.ts index 10cc6fff300..a0527417b77 100644 --- a/packages/effect/test/Channel/foreign.test.ts +++ b/packages/effect/test/Channel/foreign.test.ts @@ -1,8 +1,7 @@ +import { describe, it } from "@effect/vitest" import { Channel, Context, Effect, Either, Exit, Option, pipe, Random } from "effect" import { strictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" import { unify } from "effect/Unify" -import { describe } from "vitest" describe("Channel.Foreign", () => { it.effect("Tag", () => diff --git a/packages/effect/test/Channel/interruption.test.ts b/packages/effect/test/Channel/interruption.test.ts index 040d6615835..8a8a2a58b38 100644 --- a/packages/effect/test/Channel/interruption.test.ts +++ b/packages/effect/test/Channel/interruption.test.ts @@ -1,3 +1,4 @@ +import { describe, it } from "@effect/vitest" import * as Channel from "effect/Channel" import * as Deferred from "effect/Deferred" import * as Effect from "effect/Effect" @@ -5,8 +6,6 @@ import * as Fiber from "effect/Fiber" import { pipe } from "effect/Function" import * as Ref from "effect/Ref" import { assertLeft, assertTrue, strictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" -import { describe } from "vitest" describe("Channel", () => { it.effect("interruptWhen - interrupts the current element", () => diff --git a/packages/effect/test/Channel/mapping.test.ts b/packages/effect/test/Channel/mapping.test.ts index bf3633aa432..37cec6fd4ea 100644 --- a/packages/effect/test/Channel/mapping.test.ts +++ b/packages/effect/test/Channel/mapping.test.ts @@ -1,3 +1,4 @@ +import { describe, it } from "@effect/vitest" import * as Array from "effect/Array" import * as Channel from "effect/Channel" import * as ChildExecutorDecision from "effect/ChildExecutorDecision" @@ -8,10 +9,8 @@ import { constVoid, pipe } from "effect/Function" import * as Option from "effect/Option" import * as Ref from "effect/Ref" import { assertTrue, deepStrictEqual, strictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" import * as UpstreamPullRequest from "effect/UpstreamPullRequest" import * as UpstreamPullStrategy from "effect/UpstreamPullStrategy" -import { describe } from "vitest" interface First { readonly _tag: "First" diff --git a/packages/effect/test/Channel/merging.test.ts b/packages/effect/test/Channel/merging.test.ts index 11b3d9ae3dd..c7f03be4369 100644 --- a/packages/effect/test/Channel/merging.test.ts +++ b/packages/effect/test/Channel/merging.test.ts @@ -1,3 +1,4 @@ +import { describe, it } from "@effect/vitest" import * as Cause from "effect/Cause" import * as Channel from "effect/Channel" import * as Deferred from "effect/Deferred" @@ -7,8 +8,6 @@ import { constTrue, pipe } from "effect/Function" import * as MergeDecision from "effect/MergeDecision" import * as Ref from "effect/Ref" import { deepStrictEqual, strictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" -import { describe } from "vitest" describe("Channel", () => { it.effect("mergeWith - simple merge", () => diff --git a/packages/effect/test/Channel/reading.test.ts b/packages/effect/test/Channel/reading.test.ts index ff3b858b390..dce6272d132 100644 --- a/packages/effect/test/Channel/reading.test.ts +++ b/packages/effect/test/Channel/reading.test.ts @@ -1,3 +1,4 @@ +import { describe, it } from "@effect/vitest" import * as Array from "effect/Array" import * as Channel from "effect/Channel" import * as Chunk from "effect/Chunk" @@ -11,8 +12,6 @@ import * as Option from "effect/Option" import * as Random from "effect/Random" import * as Ref from "effect/Ref" import { deepStrictEqual, strictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" -import { describe } from "vitest" export const mapper = ( f: (a: A) => B diff --git a/packages/effect/test/Channel/scoping.test.ts b/packages/effect/test/Channel/scoping.test.ts index a72e4981d95..470cb68373c 100644 --- a/packages/effect/test/Channel/scoping.test.ts +++ b/packages/effect/test/Channel/scoping.test.ts @@ -1,3 +1,4 @@ +import { describe, it } from "@effect/vitest" import * as Cause from "effect/Cause" import * as Channel from "effect/Channel" import * as Deferred from "effect/Deferred" @@ -7,11 +8,9 @@ import * as FiberId from "effect/FiberId" import { pipe } from "effect/Function" import * as Ref from "effect/Ref" import { assertLeft, strictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" -import { describe } from "vitest" describe("Channel", () => { - it.it("acquireUseReleaseOut - acquire is executed uninterruptibly", async () => { + it("acquireUseReleaseOut - acquire is executed uninterruptibly", async () => { const latch = Deferred.unsafeMake(FiberId.none) const program = Effect.gen(function*() { const ref = yield* (Ref.make(0)) @@ -32,7 +31,7 @@ describe("Channel", () => { strictEqual(result, 0) }, 35_000) - it.it("scoped closes the scope", async () => { + it("scoped closes the scope", async () => { const latch = Deferred.unsafeMake(FiberId.none) const program = Effect.gen(function*() { const ref = yield* (Ref.make(0)) diff --git a/packages/effect/test/Channel/sequencing.test.ts b/packages/effect/test/Channel/sequencing.test.ts index 08388d04547..55e3badfd32 100644 --- a/packages/effect/test/Channel/sequencing.test.ts +++ b/packages/effect/test/Channel/sequencing.test.ts @@ -1,11 +1,10 @@ +import { describe, it } from "@effect/vitest" import * as Channel from "effect/Channel" import * as Chunk from "effect/Chunk" import * as Effect from "effect/Effect" import * as Exit from "effect/Exit" import { pipe } from "effect/Function" import { assertTrue, deepStrictEqual, strictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" -import { describe } from "vitest" describe("Channel", () => { it.effect("flatMap - simple", () => diff --git a/packages/effect/test/Channel/stack-safety.test.ts b/packages/effect/test/Channel/stack-safety.test.ts index a12e40fdf51..b6c2e78e33c 100644 --- a/packages/effect/test/Channel/stack-safety.test.ts +++ b/packages/effect/test/Channel/stack-safety.test.ts @@ -1,10 +1,9 @@ +import { describe, it } from "@effect/vitest" import * as Channel from "effect/Channel" import * as Chunk from "effect/Chunk" import * as Effect from "effect/Effect" import { pipe } from "effect/Function" import { deepStrictEqual, strictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" -import { describe } from "vitest" describe("Channel", () => { it.effect("mapOut is stack safe", () => diff --git a/packages/effect/test/Chunk.test.ts b/packages/effect/test/Chunk.test.ts index 51358b8c8a4..4bfb55a1a1c 100644 --- a/packages/effect/test/Chunk.test.ts +++ b/packages/effect/test/Chunk.test.ts @@ -1,3 +1,4 @@ +import { describe, it } from "@effect/vitest" import { Array as RA, Chunk, @@ -22,7 +23,6 @@ import { strictEqual, throws } from "effect/test/util" -import { describe, it } from "vitest" const assertTuple = ( actual: [Chunk.Chunk, Chunk.Chunk], diff --git a/packages/effect/test/Config.test.ts b/packages/effect/test/Config.test.ts index 008b58e4b27..cd013674096 100644 --- a/packages/effect/test/Config.test.ts +++ b/packages/effect/test/Config.test.ts @@ -1,3 +1,4 @@ +import { describe, it } from "@effect/vitest" import { Cause, Chunk, @@ -15,7 +16,6 @@ import { Secret } from "effect" import { assertFailure, assertSuccess, assertTrue, deepStrictEqual, strictEqual } from "effect/test/util" -import { describe, it } from "vitest" const assertConfigError = ( config: Config.Config, diff --git a/packages/effect/test/ConfigProvider.test.ts b/packages/effect/test/ConfigProvider.test.ts index 5c0dac4b434..2c2c1896f0f 100644 --- a/packages/effect/test/ConfigProvider.test.ts +++ b/packages/effect/test/ConfigProvider.test.ts @@ -1,3 +1,4 @@ +import { describe, it } from "@effect/vitest" import { Cause, Chunk, @@ -15,8 +16,6 @@ import { Secret } from "effect" import { assertNone, assertTrue, deepStrictEqual, strictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" -import { describe } from "vitest" interface HostPort { readonly host: string diff --git a/packages/effect/test/Context.test.ts b/packages/effect/test/Context.test.ts index 54ee7f98d30..70bd1f0ed56 100644 --- a/packages/effect/test/Context.test.ts +++ b/packages/effect/test/Context.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import { Context, Differ, Option, pipe } from "effect" import { assertFalse, assertNone, assertSome, assertTrue, deepStrictEqual, strictEqual, throws } from "effect/test/util" -import { describe, it } from "vitest" interface A { a: number diff --git a/packages/effect/test/Cron.test.ts b/packages/effect/test/Cron.test.ts index 2e4e3bd3f79..7f4e78aabb8 100644 --- a/packages/effect/test/Cron.test.ts +++ b/packages/effect/test/Cron.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import { Cron, DateTime, Either, Equal, Option } from "effect" import { assertFalse, assertTrue, deepStrictEqual, throws } from "effect/test/util" -import { describe, it } from "vitest" const match = (input: Cron.Cron | string, date: DateTime.DateTime.Input) => Cron.match(Cron.isCron(input) ? input : Cron.unsafeParse(input), date) diff --git a/packages/effect/test/Data.test.ts b/packages/effect/test/Data.test.ts index f2fe35d6ddf..587e6f6835d 100644 --- a/packages/effect/test/Data.test.ts +++ b/packages/effect/test/Data.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import { Data, Equal, pipe } from "effect" import { assertFalse, assertTrue, deepStrictEqual, strictEqual } from "effect/test/util" -import { describe, it } from "vitest" describe("Data", () => { it("struct", () => { diff --git a/packages/effect/test/DateTime.test.ts b/packages/effect/test/DateTime.test.ts index 90999a5c84f..ca478cff990 100644 --- a/packages/effect/test/DateTime.test.ts +++ b/packages/effect/test/DateTime.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import { DateTime, Duration, Effect, Option, TestClock } from "effect" import { assertRight, deepStrictEqual, strictEqual } from "effect/test/util" -import { describe, it } from "./utils/extend.js" const setTo2024NZ = TestClock.setTime(new Date("2023-12-31T11:00:00.000Z").getTime()) diff --git a/packages/effect/test/Deferred.test.ts b/packages/effect/test/Deferred.test.ts index d185ddb362a..5db59af56bb 100644 --- a/packages/effect/test/Deferred.test.ts +++ b/packages/effect/test/Deferred.test.ts @@ -1,7 +1,6 @@ +import { describe, it } from "@effect/vitest" import { Deferred, Effect, Exit, Option, pipe, Ref } from "effect" import { assertFalse, assertTrue, deepStrictEqual, strictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" -import { describe } from "vitest" describe("Deferred", () => { it.effect("complete a deferred using succeed", () => diff --git a/packages/effect/test/Differ.test.ts b/packages/effect/test/Differ.test.ts index 8809726bd61..c63648f1d48 100644 --- a/packages/effect/test/Differ.test.ts +++ b/packages/effect/test/Differ.test.ts @@ -1,6 +1,6 @@ +import { describe, it as it_ } from "@effect/vitest" import { Array as Arr, Chunk, Differ, Equal, HashMap, HashSet, pipe } from "effect" import { assertTrue, deepStrictEqual } from "effect/test/util" -import { describe, it as it_ } from "vitest" function diffLaws( differ: Differ.Differ, diff --git a/packages/effect/test/Duration.test.ts b/packages/effect/test/Duration.test.ts index 5c97b2d2bae..e733e7677b1 100644 --- a/packages/effect/test/Duration.test.ts +++ b/packages/effect/test/Duration.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import { Duration, Equal, pipe } from "effect" import { assertFalse, assertNone, assertSome, assertTrue, deepStrictEqual, strictEqual, throws } from "effect/test/util" -import { describe, it } from "vitest" describe("Duration", () => { it("decode", () => { diff --git a/packages/effect/test/Effect/acquire-release.test.ts b/packages/effect/test/Effect/acquire-release.test.ts index 9c3a07e0dc5..12d13535e86 100644 --- a/packages/effect/test/Effect/acquire-release.test.ts +++ b/packages/effect/test/Effect/acquire-release.test.ts @@ -1,3 +1,4 @@ +import { describe, it } from "@effect/vitest" import * as Cause from "effect/Cause" import * as Chunk from "effect/Chunk" import * as Effect from "effect/Effect" @@ -6,8 +7,6 @@ import * as Exit from "effect/Exit" import { pipe } from "effect/Function" import * as Ref from "effect/Ref" import { assertTrue, strictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" -import { describe } from "vitest" describe("Effect", () => { it.effect("acquireUseRelease - happy path", () => diff --git a/packages/effect/test/Effect/applicative.test.ts b/packages/effect/test/Effect/applicative.test.ts index e8a11533105..29bbf7f3d66 100644 --- a/packages/effect/test/Effect/applicative.test.ts +++ b/packages/effect/test/Effect/applicative.test.ts @@ -1,7 +1,6 @@ +import { describe, it } from "@effect/vitest" import { Effect, pipe } from "effect" import { assertLeft, strictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" -import { describe } from "vitest" describe("Effect", () => { const add = (a: number) => (b: number) => a + b diff --git a/packages/effect/test/Effect/async.test.ts b/packages/effect/test/Effect/async.test.ts index b8d78cbca3d..2515162aab1 100644 --- a/packages/effect/test/Effect/async.test.ts +++ b/packages/effect/test/Effect/async.test.ts @@ -1,3 +1,4 @@ +import { describe, it } from "@effect/vitest" import * as Cause from "effect/Cause" import * as Chunk from "effect/Chunk" import * as Deferred from "effect/Deferred" @@ -10,7 +11,6 @@ import * as Option from "effect/Option" import * as Ref from "effect/Ref" import * as Runtime from "effect/Runtime" import { assertNone, assertSome, deepStrictEqual, strictEqual } from "effect/test/util" -import { describe, it } from "effect/test/utils/extend" describe("Effect", () => { it.effect("simple async must return", () => diff --git a/packages/effect/test/Effect/caching.test.ts b/packages/effect/test/Effect/caching.test.ts index b67f20905e5..88fdc260f79 100644 --- a/packages/effect/test/Effect/caching.test.ts +++ b/packages/effect/test/Effect/caching.test.ts @@ -1,11 +1,10 @@ +import { describe, it } from "@effect/vitest" import * as Duration from "effect/Duration" import * as Effect from "effect/Effect" import { pipe } from "effect/Function" import * as Ref from "effect/Ref" import { assertTrue, strictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" import * as TestClock from "effect/TestClock" -import { describe } from "vitest" describe("Effect", () => { it.effect("cached - returns new instances after duration", () => diff --git a/packages/effect/test/Effect/cause-rendering.test.ts b/packages/effect/test/Effect/cause-rendering.test.ts index 60444815484..07c2f08505a 100644 --- a/packages/effect/test/Effect/cause-rendering.test.ts +++ b/packages/effect/test/Effect/cause-rendering.test.ts @@ -1,7 +1,6 @@ +import { describe, expect, it } from "@effect/vitest" import { Cause, Effect, Option, pipe } from "effect" -import { assertFalse, assertTrue, strictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" -import { describe } from "vitest" +import { assertFalse, assertIncludes, assertTrue, strictEqual } from "effect/test/util" describe("Effect", () => { it.effect("Cause should include span data", () => @@ -14,10 +13,10 @@ describe("Effect", () => { ) ))) const rendered = Cause.pretty(cause) - assertTrue(rendered.includes("spanA")) - assertTrue(rendered.includes("cause-rendering.test.ts:11:18")) - assertTrue(rendered.includes("spanB")) - assertTrue(rendered.includes("cause-rendering.test.ts:10:16")) + assertIncludes(rendered, "spanA") + assertIncludes(rendered, "cause-rendering.test.ts:10:18") + assertIncludes(rendered, "spanB") + assertIncludes(rendered, "cause-rendering.test.ts:9:16") })) it.effect("catchTag should not invalidate traces", () => Effect.gen(function*() { @@ -111,10 +110,9 @@ describe("Effect", () => { strictEqual(prettyErrors.length, 1) const error = prettyErrors[0] strictEqual(error.name, "Error") - assertTrue(!error.stack?.includes("/internal/")) - assertTrue(error.stack?.includes("cause-rendering.test.ts:106")) - assertTrue(error.stack?.includes("span-123")) - assertTrue(error.stack?.includes("cause-rendering.test.ts:109")) + assertIncludes(error.stack, "cause-rendering.test.ts:105") + assertIncludes(error.stack, "span-123") + assertIncludes(error.stack, "cause-rendering.test.ts:108") })) it.effect("includes span name in stack", () => @@ -138,7 +136,7 @@ describe("Effect", () => { it.effect.skip("shows assertion message", () => Effect.gen(function*() { yield* Effect.void - it.expect({ foo: "ok" }).toStrictEqual({ foo: "bar" }) + expect({ foo: "ok" }).toStrictEqual({ foo: "bar" }) })) it.effect("multiline message", () => diff --git a/packages/effect/test/Effect/collecting.test.ts b/packages/effect/test/Effect/collecting.test.ts index 3f26fec617f..4a36c8239a9 100644 --- a/packages/effect/test/Effect/collecting.test.ts +++ b/packages/effect/test/Effect/collecting.test.ts @@ -1,7 +1,6 @@ +import { describe, it } from "@effect/vitest" import { Cause, Effect, pipe, Ref } from "effect" import { deepStrictEqual, notDeepStrictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" -import { describe } from "vitest" describe("Effect", () => { describe("all", () => { diff --git a/packages/effect/test/Effect/concurrency.test.ts b/packages/effect/test/Effect/concurrency.test.ts index fdbb69a7472..21909e25c16 100644 --- a/packages/effect/test/Effect/concurrency.test.ts +++ b/packages/effect/test/Effect/concurrency.test.ts @@ -1,3 +1,4 @@ +import { describe, it } from "@effect/vitest" import * as Deferred from "effect/Deferred" import * as Duration from "effect/Duration" import * as Effect from "effect/Effect" @@ -7,10 +8,8 @@ import * as Fiber from "effect/Fiber" import { pipe } from "effect/Function" import * as Ref from "effect/Ref" import { assertFalse, assertLeft, assertRight, assertTrue, deepStrictEqual, strictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" import { withLatch } from "effect/test/utils/latch" import { adjust } from "effect/TestClock" -import { describe } from "vitest" export const ExampleError = new Error("Oh noes!") diff --git a/packages/effect/test/Effect/constructors.test.ts b/packages/effect/test/Effect/constructors.test.ts index d3e3c2a3fc5..06762f63c89 100644 --- a/packages/effect/test/Effect/constructors.test.ts +++ b/packages/effect/test/Effect/constructors.test.ts @@ -1,7 +1,6 @@ +import { describe, it } from "@effect/vitest" import * as Effect from "effect/Effect" import { assertNone, assertSome, strictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" -import { describe } from "vitest" describe("Effect", () => { it.effect("can lift a value to an option", () => diff --git a/packages/effect/test/Effect/destructors.test.ts b/packages/effect/test/Effect/destructors.test.ts index c1bf7b5719a..aef2156ec6c 100644 --- a/packages/effect/test/Effect/destructors.test.ts +++ b/packages/effect/test/Effect/destructors.test.ts @@ -1,3 +1,4 @@ +import { describe, it } from "@effect/vitest" import { Cause, Effect, Option, pipe } from "effect" import { assertFailure, @@ -9,8 +10,6 @@ import { assertTrue, strictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" -import { describe } from "vitest" const ExampleError = new Error("Oh noes!") diff --git a/packages/effect/test/Effect/do-notation.test.ts b/packages/effect/test/Effect/do-notation.test.ts index 91c29ed1f57..e03ab4b8d4f 100644 --- a/packages/effect/test/Effect/do-notation.test.ts +++ b/packages/effect/test/Effect/do-notation.test.ts @@ -1,9 +1,9 @@ +import { describe, it } from "@effect/vitest" import * as Effect from "effect/Effect" import * as Either from "effect/Either" import { pipe } from "effect/Function" import * as Option from "effect/Option" import * as Util from "effect/test/util" -import { describe, it } from "vitest" const expectRight = (e: Effect.Effect, expected: R) => { Util.deepStrictEqual(Effect.runSync(Effect.either(e)), Either.right(expected)) diff --git a/packages/effect/test/Effect/environment.test.ts b/packages/effect/test/Effect/environment.test.ts index a029831ac84..0cae197e188 100644 --- a/packages/effect/test/Effect/environment.test.ts +++ b/packages/effect/test/Effect/environment.test.ts @@ -1,10 +1,9 @@ +import { describe, it } from "@effect/vitest" import * as Context from "effect/Context" import * as Effect from "effect/Effect" import { pipe } from "effect/Function" import * as Layer from "effect/Layer" import { deepStrictEqual, strictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" -import { describe } from "vitest" interface NumberService { readonly n: number diff --git a/packages/effect/test/Effect/error-handling.test.ts b/packages/effect/test/Effect/error-handling.test.ts index db653aee8ee..bd0ad407b91 100644 --- a/packages/effect/test/Effect/error-handling.test.ts +++ b/packages/effect/test/Effect/error-handling.test.ts @@ -1,3 +1,4 @@ +import { describe, it } from "@effect/vitest" import * as Cause from "effect/Cause" import * as Chunk from "effect/Chunk" import * as Effect from "effect/Effect" @@ -9,10 +10,8 @@ import { constFalse, constTrue, identity, pipe } from "effect/Function" import * as Option from "effect/Option" import { assertLeft, assertTrue, deepStrictEqual, strictEqual } from "effect/test/util" import { causesArb } from "effect/test/utils/cause" -import * as it from "effect/test/utils/extend" import { assertType, satisfies } from "effect/test/utils/types" import * as fc from "fast-check" -import { describe } from "vitest" const ExampleError = new Error("Oh noes!") @@ -401,7 +400,7 @@ describe("Effect", () => { ) assertTrue(result) })) - it.it("orElse - is associative", async () => { + it("orElse - is associative", async () => { const smallInts = fc.integer({ min: 0, max: 100 }) const causes = causesArb(1, smallInts, fc.string()) const successes = smallInts.map(Effect.succeed) diff --git a/packages/effect/test/Effect/error.test.ts b/packages/effect/test/Effect/error.test.ts index 9d137343970..d384cf4c0a6 100644 --- a/packages/effect/test/Effect/error.test.ts +++ b/packages/effect/test/Effect/error.test.ts @@ -1,7 +1,6 @@ +import { describe, it } from "@effect/vitest" import { Cause, Data, Effect, pipe } from "effect" -import { assertTrue, deepStrictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" -import { describe } from "vitest" +import { assertIncludes, assertTrue, deepStrictEqual } from "effect/test/util" class TestError extends Data.TaggedError("TestError")<{}> {} @@ -12,7 +11,7 @@ describe("Effect", () => { const log = Cause.pretty(cause) assertTrue(log.includes("TestError")) if (typeof window === "undefined") { - assertTrue(log.replaceAll("\\", "/").includes("test/Effect/error.test.ts:11:77")) + assertIncludes(log.replaceAll("\\", "/"), "test/Effect/error.test.ts:10:77") } assertTrue(log.includes("at A")) })) @@ -30,9 +29,9 @@ describe("Effect", () => { ) const log = Cause.pretty(cause) if (typeof window === "undefined") { - assertTrue(log.replaceAll("\\", "/").includes("test/Effect/error.test.ts:25")) + assertIncludes(log.replaceAll("\\", "/"), "test/Effect/error.test.ts:24") } - assertTrue(log.includes("at A")) + assertIncludes(log, "at A") })) it.effect("allow message prop", () => @@ -51,29 +50,29 @@ describe("Effect", () => { Effect.flip ) const log = Cause.pretty(cause) - assertTrue(log.includes("Failure: some message")) + assertIncludes(log, "Failure: some message") if (typeof window === "undefined") { - assertTrue(log.replaceAll("\\", "/").includes("test/Effect/error.test.ts:47")) + assertIncludes(log.replaceAll("\\", "/"), "test/Effect/error.test.ts:46") } - assertTrue(log.includes("at A")) + assertIncludes(log, "at A") })) if (typeof window === "undefined") { // eslint-disable-next-line @typescript-eslint/no-var-requires const { inspect } = require("node:util") - it.it("inspect", () => { + it("inspect", () => { class MessageError extends Data.TaggedError("MessageError") { get message() { return "fail" } } const err = new MessageError() - assertTrue(inspect(err).includes("MessageError: fail")) - assertTrue(inspect(err).replaceAll("\\", "/").includes("test/Effect/error.test.ts:71")) + assertIncludes(inspect(err), "MessageError: fail") + assertIncludes(inspect(err).replaceAll("\\", "/"), "test/Effect/error.test.ts:70") }) - it.it("toString", () => { + it("toString", () => { class MessageError extends Data.TaggedError("MessageError") { toString() { return "fail" @@ -83,7 +82,7 @@ describe("Effect", () => { deepStrictEqual(new MessageError().toJSON(), { _tag: "MessageError" }) }) - it.it("cause", () => { + it("cause", () => { class MessageError extends Data.TaggedError("MessageError")<{ cause: unknown }> {} @@ -91,7 +90,7 @@ describe("Effect", () => { }) } - it.it("toJSON", () => { + it("toJSON", () => { class MessageError extends Data.TaggedError("MessageError")<{}> {} deepStrictEqual(new MessageError().toJSON(), { _tag: "MessageError" }) }) diff --git a/packages/effect/test/Effect/filtering.test.ts b/packages/effect/test/Effect/filtering.test.ts index 921143d9739..39f52cf9d33 100644 --- a/packages/effect/test/Effect/filtering.test.ts +++ b/packages/effect/test/Effect/filtering.test.ts @@ -1,11 +1,10 @@ +import { describe, it } from "@effect/vitest" import * as Cause from "effect/Cause" import * as Effect from "effect/Effect" import * as Either from "effect/Either" import { pipe } from "effect/Function" import * as Ref from "effect/Ref" import { assertLeft, assertRight, deepStrictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" -import { describe } from "vitest" const exactlyOnce = ( value: A, diff --git a/packages/effect/test/Effect/finalization.test.ts b/packages/effect/test/Effect/finalization.test.ts index 3690634b106..2c9059ddf7a 100644 --- a/packages/effect/test/Effect/finalization.test.ts +++ b/packages/effect/test/Effect/finalization.test.ts @@ -1,3 +1,4 @@ +import { describe, it } from "@effect/vitest" import * as Array from "effect/Array" import * as Cause from "effect/Cause" import * as Chunk from "effect/Chunk" @@ -10,8 +11,6 @@ import { identity, pipe } from "effect/Function" import * as Option from "effect/Option" import * as Ref from "effect/Ref" import { assertFalse, assertTrue, deepStrictEqual, strictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" -import { describe } from "vitest" const ExampleError = new Error("Oh noes!") diff --git a/packages/effect/test/Effect/fn.test.ts b/packages/effect/test/Effect/fn.test.ts index 8023127e713..fecee234b09 100644 --- a/packages/effect/test/Effect/fn.test.ts +++ b/packages/effect/test/Effect/fn.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import { Cause, Effect } from "effect" import { assertTrue, strictEqual } from "effect/test/util" -import { describe, it } from "effect/test/utils/extend" describe("Effect.fn", () => { it.effect("catches defects in the function", () => diff --git a/packages/effect/test/Effect/foreign.test.ts b/packages/effect/test/Effect/foreign.test.ts index 3f069c94377..9c8a20a35d2 100644 --- a/packages/effect/test/Effect/foreign.test.ts +++ b/packages/effect/test/Effect/foreign.test.ts @@ -1,9 +1,8 @@ +import { describe, it } from "@effect/vitest" import { Cause, Context, Effect, Either, Exit, Option, pipe } from "effect" import { nextInt } from "effect/Random" import { assertLeft, deepStrictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" import { unify } from "effect/Unify" -import { describe } from "vitest" describe("Foreign", () => { it.effect("Unify", () => diff --git a/packages/effect/test/Effect/forking.test.ts b/packages/effect/test/Effect/forking.test.ts index 8310cc23797..364e11a1ede 100644 --- a/packages/effect/test/Effect/forking.test.ts +++ b/packages/effect/test/Effect/forking.test.ts @@ -1,3 +1,4 @@ +import { describe, it } from "@effect/vitest" import * as Cause from "effect/Cause" import * as Deferred from "effect/Deferred" import * as Effect from "effect/Effect" @@ -7,8 +8,6 @@ import { pipe } from "effect/Function" import * as Option from "effect/Option" import * as Ref from "effect/Ref" import { assertFalse, assertTrue, deepStrictEqual, strictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" -import { describe } from "vitest" describe("Effect", () => { it.effect("fork - propagates interruption", () => diff --git a/packages/effect/test/Effect/interruption.test.ts b/packages/effect/test/Effect/interruption.test.ts index 83a6c5059aa..12cc4fd4109 100644 --- a/packages/effect/test/Effect/interruption.test.ts +++ b/packages/effect/test/Effect/interruption.test.ts @@ -1,3 +1,4 @@ +import { describe, it } from "@effect/vitest" import * as Array from "effect/Array" import * as Cause from "effect/Cause" import * as Chunk from "effect/Chunk" @@ -14,10 +15,8 @@ import * as MutableRef from "effect/MutableRef" import * as Option from "effect/Option" import * as Ref from "effect/Ref" import { assertFalse, assertSome, assertTrue, deepStrictEqual, strictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" import { withLatch, withLatchAwait } from "effect/test/utils/latch" import * as TestClock from "effect/TestClock" -import { describe } from "vitest" describe("Effect", () => { it.effect("sync forever is interruptible", () => diff --git a/packages/effect/test/Effect/join-order.test.ts b/packages/effect/test/Effect/join-order.test.ts index 8ab8a51d78d..f2893131661 100644 --- a/packages/effect/test/Effect/join-order.test.ts +++ b/packages/effect/test/Effect/join-order.test.ts @@ -1,10 +1,9 @@ +import { describe, it } from "@effect/vitest" import * as Effect from "effect/Effect" import * as Fiber from "effect/Fiber" import * as FiberRef from "effect/FiberRef" import { strictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" import * as TestClock from "effect/TestClock" -import { describe } from "vitest" describe("Effect", () => { it.effect("zip/all joins fibers in the correct order", () => diff --git a/packages/effect/test/Effect/latch.test.ts b/packages/effect/test/Effect/latch.test.ts index 8685a685c6f..691bebd85db 100644 --- a/packages/effect/test/Effect/latch.test.ts +++ b/packages/effect/test/Effect/latch.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import { Effect, Exit } from "effect" import { deepStrictEqual, strictEqual } from "effect/test/util" -import { describe, it } from "effect/test/utils/extend" describe("Latch", () => { it.effect("open works", () => diff --git a/packages/effect/test/Effect/lifting.test.ts b/packages/effect/test/Effect/lifting.test.ts index d6bc295a946..dfe5feb4874 100644 --- a/packages/effect/test/Effect/lifting.test.ts +++ b/packages/effect/test/Effect/lifting.test.ts @@ -1,8 +1,7 @@ +import { describe, it } from "@effect/vitest" import * as Effect from "effect/Effect" import { pipe } from "effect/Function" import { strictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" -import { describe } from "vitest" describe("Effect", () => { it.effect("liftPredicate", () => { diff --git a/packages/effect/test/Effect/mapping.test.ts b/packages/effect/test/Effect/mapping.test.ts index 3c1f5c1f202..7e5e551aff9 100644 --- a/packages/effect/test/Effect/mapping.test.ts +++ b/packages/effect/test/Effect/mapping.test.ts @@ -1,11 +1,10 @@ +import { describe, it } from "@effect/vitest" import * as Cause from "effect/Cause" import * as Effect from "effect/Effect" import * as Exit from "effect/Exit" import { identity, pipe } from "effect/Function" import * as Ref from "effect/Ref" import { assertFalse, assertLeft, assertTrue, deepStrictEqual, strictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" -import { describe } from "vitest" const ExampleError = new Error("Oh noes!") diff --git a/packages/effect/test/Effect/memoization.test.ts b/packages/effect/test/Effect/memoization.test.ts index a151c5a3d0f..fea58e127ec 100644 --- a/packages/effect/test/Effect/memoization.test.ts +++ b/packages/effect/test/Effect/memoization.test.ts @@ -1,11 +1,10 @@ +import { describe, it } from "@effect/vitest" import { notStrictEqual } from "assert" import * as Effect from "effect/Effect" import { pipe } from "effect/Function" import * as Random from "effect/Random" import * as Ref from "effect/Ref" import { strictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" -import { describe } from "vitest" describe("Effect", () => { it.effect("non-memoized returns new instances on repeated calls", () => diff --git a/packages/effect/test/Effect/promise.test.ts b/packages/effect/test/Effect/promise.test.ts index c14cf6a33f6..eab87f01ef5 100644 --- a/packages/effect/test/Effect/promise.test.ts +++ b/packages/effect/test/Effect/promise.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import { Cause, Effect, Option } from "effect" import { assertFailure, assertSuccess, assertTrue } from "effect/test/util" -import { describe, it } from "vitest" const succeedPromiseLike: PromiseLike = { // @ts-ignore diff --git a/packages/effect/test/Effect/provide-runtime.test.ts b/packages/effect/test/Effect/provide-runtime.test.ts index 768a974dfee..091f7b02a0e 100644 --- a/packages/effect/test/Effect/provide-runtime.test.ts +++ b/packages/effect/test/Effect/provide-runtime.test.ts @@ -1,3 +1,4 @@ +import { describe, it } from "@effect/vitest" import * as Context from "effect/Context" import * as Effect from "effect/Effect" import * as Equal from "effect/Equal" @@ -8,8 +9,6 @@ import * as Layer from "effect/Layer" import * as RuntimeFlags from "effect/RuntimeFlags" import * as Scope from "effect/Scope" import { assertFalse, assertTrue, deepStrictEqual, strictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" -import { describe } from "vitest" interface A { readonly value: number @@ -43,7 +42,7 @@ describe("Effect", () => { Effect.provide(Layer.succeed(SomeService, someServiceImpl)) ) }) - it.it("provideSomeRuntime", async () => { + it("provideSomeRuntime", async () => { const { runtime, scope } = await Effect.runPromise( Effect.flatMap(Scope.make(), (scope) => Effect.map( diff --git a/packages/effect/test/Effect/query-deadlock.test.ts b/packages/effect/test/Effect/query-deadlock.test.ts index 78b903dfd37..cc7500fdb4c 100644 --- a/packages/effect/test/Effect/query-deadlock.test.ts +++ b/packages/effect/test/Effect/query-deadlock.test.ts @@ -1,10 +1,9 @@ +import { describe, it } from "@effect/vitest" import * as Effect from "effect/Effect" import * as Exit from "effect/Exit" import { pipe } from "effect/Function" import * as Request from "effect/Request" import * as Resolver from "effect/RequestResolver" -import * as it from "effect/test/utils/extend" -import { describe } from "vitest" export const userIds: ReadonlyArray = [1, 1] @@ -26,7 +25,7 @@ const getUserNameById = (id: number) => Effect.request(GetNameById({ id }), User const getAllUserNames = Effect.forEach([1, 1], getUserNameById, { batching: true }) describe("Effect", () => { - it.it("requests are executed correctly", () => + it("requests are executed correctly", () => Effect.runPromise( Effect.gen(function*() { yield* pipe( diff --git a/packages/effect/test/Effect/query-nested.test.ts b/packages/effect/test/Effect/query-nested.test.ts index a799dc5daa2..3e617f9ba46 100644 --- a/packages/effect/test/Effect/query-nested.test.ts +++ b/packages/effect/test/Effect/query-nested.test.ts @@ -1,3 +1,4 @@ +import { describe, it } from "@effect/vitest" import * as Array from "effect/Array" import * as Context from "effect/Context" import { seconds } from "effect/Duration" @@ -6,8 +7,6 @@ import * as Layer from "effect/Layer" import * as Request from "effect/Request" import * as Resolver from "effect/RequestResolver" import { strictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" -import { describe } from "vitest" interface Counter { readonly _: unique symbol diff --git a/packages/effect/test/Effect/query-repro.test.ts b/packages/effect/test/Effect/query-repro.test.ts index 371978f8676..170442684c1 100644 --- a/packages/effect/test/Effect/query-repro.test.ts +++ b/packages/effect/test/Effect/query-repro.test.ts @@ -1,10 +1,9 @@ +import { describe, it } from "@effect/vitest" import * as Effect from "effect/Effect" import * as Layer from "effect/Layer" import * as Request from "effect/Request" import * as RequestResolver from "effect/RequestResolver" import { strictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" -import { describe } from "vitest" export class FindIntraday extends Request.TaggedClass("FindIntraday") {} diff --git a/packages/effect/test/Effect/query.test.ts b/packages/effect/test/Effect/query.test.ts index dfe181b557e..29982f09ef6 100644 --- a/packages/effect/test/Effect/query.test.ts +++ b/packages/effect/test/Effect/query.test.ts @@ -1,3 +1,4 @@ +import { describe, it } from "@effect/vitest" import * as Array from "effect/Array" import * as Cause from "effect/Cause" import * as Context from "effect/Context" @@ -10,10 +11,8 @@ import * as Layer from "effect/Layer" import * as Request from "effect/Request" import * as Resolver from "effect/RequestResolver" import { assertTrue, deepStrictEqual, strictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" import * as TestClock from "effect/TestClock" import type { Concurrency } from "effect/Types" -import { describe } from "vitest" import { pipe } from "../../src/index.js" interface Counter { diff --git a/packages/effect/test/Effect/racing.test.ts b/packages/effect/test/Effect/racing.test.ts index 6ecd6016f96..8a770497144 100644 --- a/packages/effect/test/Effect/racing.test.ts +++ b/packages/effect/test/Effect/racing.test.ts @@ -1,9 +1,8 @@ +import { describe, it } from "@effect/vitest" import * as Duration from "effect/Duration" import * as Effect from "effect/Effect" import { pipe } from "effect/Function" import { strictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" -import { describe } from "vitest" describe("Effect", () => { it.effect("returns first success", () => diff --git a/packages/effect/test/Effect/rendezvous.test.ts b/packages/effect/test/Effect/rendezvous.test.ts index eeeff6d5587..e41bf9ffe4c 100644 --- a/packages/effect/test/Effect/rendezvous.test.ts +++ b/packages/effect/test/Effect/rendezvous.test.ts @@ -1,10 +1,9 @@ +import { describe, it } from "@effect/vitest" import * as Effect from "effect/Effect" import * as Fiber from "effect/Fiber" import * as Queue from "effect/Queue" import { deepStrictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" import * as TestClock from "effect/TestClock" -import { describe } from "vitest" describe("Effect", () => { it.effect("bounded 0 is rendezvous", () => diff --git a/packages/effect/test/Effect/repeating.test.ts b/packages/effect/test/Effect/repeating.test.ts index c7815316f07..1b34955b5a8 100644 --- a/packages/effect/test/Effect/repeating.test.ts +++ b/packages/effect/test/Effect/repeating.test.ts @@ -1,10 +1,9 @@ +import { describe, it } from "@effect/vitest" import * as Effect from "effect/Effect" import { constFalse, constTrue, pipe } from "effect/Function" import * as Ref from "effect/Ref" import * as Schedule from "effect/Schedule" import { deepStrictEqual, strictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" -import { describe } from "vitest" describe("Effect", () => { it.effect("succeeds eventually", () => diff --git a/packages/effect/test/Effect/retrying.test.ts b/packages/effect/test/Effect/retrying.test.ts index e7a808ebc8e..78f6a7d50b8 100644 --- a/packages/effect/test/Effect/retrying.test.ts +++ b/packages/effect/test/Effect/retrying.test.ts @@ -1,10 +1,9 @@ +import { describe, it } from "@effect/vitest" import * as Effect from "effect/Effect" import { constFalse, constTrue, pipe } from "effect/Function" import * as Ref from "effect/Ref" import * as Schedule from "effect/Schedule" import { strictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" -import { describe } from "vitest" describe("Effect", () => { it.effect("retry/until - retries until condition is true", () => diff --git a/packages/effect/test/Effect/runtimeFlags.test.ts b/packages/effect/test/Effect/runtimeFlags.test.ts index 97b52027234..57b5ee50225 100644 --- a/packages/effect/test/Effect/runtimeFlags.test.ts +++ b/packages/effect/test/Effect/runtimeFlags.test.ts @@ -1,13 +1,12 @@ +import { describe, it } from "@effect/vitest" import * as Effect from "effect/Effect" import { pipe } from "effect/Function" import * as Flags from "effect/RuntimeFlags" import * as Patch from "effect/RuntimeFlagsPatch" import { assertFalse, assertTrue } from "effect/test/util" -import * as it from "effect/test/utils/extend" -import { describe } from "vitest" describe("Effect", () => { - it.it("should enable flags in the current fiber", () => + it("should enable flags in the current fiber", () => Effect.runPromise(Effect.gen(function*() { const before = yield* Effect.getRuntimeFlags assertFalse(Flags.isEnabled(before, Flags.OpSupervision)) @@ -15,7 +14,7 @@ describe("Effect", () => { const after = yield* Effect.getRuntimeFlags assertTrue(Flags.isEnabled(after, Flags.OpSupervision)) }))) - it.it("should enable flags in the wrapped effect", () => + it("should enable flags in the wrapped effect", () => Effect.runPromise(Effect.gen(function*() { const before = yield* Effect.getRuntimeFlags assertFalse(Flags.isEnabled(before, Flags.OpSupervision)) diff --git a/packages/effect/test/Effect/scheduler.test.ts b/packages/effect/test/Effect/scheduler.test.ts index b082c035c68..4f785648eac 100644 --- a/packages/effect/test/Effect/scheduler.test.ts +++ b/packages/effect/test/Effect/scheduler.test.ts @@ -1,9 +1,8 @@ +import { describe, it } from "@effect/vitest" import * as Effect from "effect/Effect" import { pipe } from "effect/Function" import * as Scheduler from "effect/Scheduler" import { deepStrictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" -import { describe } from "vitest" describe("Effect", () => { it.effect("matrix schedules according to priority", () => diff --git a/packages/effect/test/Effect/scheduling.test.ts b/packages/effect/test/Effect/scheduling.test.ts index 375cac7e548..d325208bc10 100644 --- a/packages/effect/test/Effect/scheduling.test.ts +++ b/packages/effect/test/Effect/scheduling.test.ts @@ -1,3 +1,4 @@ +import { describe, it } from "@effect/vitest" import * as Clock from "effect/Clock" import * as Duration from "effect/Duration" import * as Effect from "effect/Effect" @@ -5,9 +6,7 @@ import { pipe } from "effect/Function" import * as Ref from "effect/Ref" import * as Schedule from "effect/Schedule" import { deepStrictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" import * as TestClock from "effect/TestClock" -import { describe } from "vitest" describe("Effect", () => { it.effect("schedule - runs effect for each recurrence of the schedule", () => diff --git a/packages/effect/test/Effect/scope-ref.test.ts b/packages/effect/test/Effect/scope-ref.test.ts index 7f0ea02b3a2..193dd7c8247 100644 --- a/packages/effect/test/Effect/scope-ref.test.ts +++ b/packages/effect/test/Effect/scope-ref.test.ts @@ -1,3 +1,4 @@ +import { describe, it } from "@effect/vitest" import { GenericTag } from "effect/Context" import * as Effect from "effect/Effect" import * as FiberRef from "effect/FiberRef" @@ -6,8 +7,6 @@ import * as Layer from "effect/Layer" import * as List from "effect/List" import * as Logger from "effect/Logger" import { deepStrictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" -import { describe } from "vitest" const ref = FiberRef.unsafeMake(List.empty()) const env = GenericTag<"context", number>("context") diff --git a/packages/effect/test/Effect/semaphore.test.ts b/packages/effect/test/Effect/semaphore.test.ts index 87912a1966e..f68885f05aa 100644 --- a/packages/effect/test/Effect/semaphore.test.ts +++ b/packages/effect/test/Effect/semaphore.test.ts @@ -1,9 +1,8 @@ +import { describe, it } from "@effect/vitest" import * as D from "effect/Duration" import * as Effect from "effect/Effect" import { strictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" import * as TestClock from "effect/TestClock" -import { describe } from "vitest" describe("Effect", () => { it.effect("semaphore works", () => diff --git a/packages/effect/test/Effect/sequencing.test.ts b/packages/effect/test/Effect/sequencing.test.ts index e61b484d0f0..8b93f0eda5d 100644 --- a/packages/effect/test/Effect/sequencing.test.ts +++ b/packages/effect/test/Effect/sequencing.test.ts @@ -1,3 +1,4 @@ +import { describe, it } from "@effect/vitest" import * as Cause from "effect/Cause" import * as Deferred from "effect/Deferred" import * as Effect from "effect/Effect" @@ -9,8 +10,6 @@ import * as HashSet from "effect/HashSet" import * as Option from "effect/Option" import * as Ref from "effect/Ref" import { assertFalse, assertLeft, assertTrue, deepStrictEqual, strictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" -import { describe } from "vitest" describe("Effect", () => { it.effect("andThen", () => diff --git a/packages/effect/test/Effect/service.test.ts b/packages/effect/test/Effect/service.test.ts index af6db511d7b..29e756a0aca 100644 --- a/packages/effect/test/Effect/service.test.ts +++ b/packages/effect/test/Effect/service.test.ts @@ -1,3 +1,4 @@ +import { describe, it } from "@effect/vitest" import { Cause } from "effect" import * as Context from "effect/Context" import * as Effect from "effect/Effect" @@ -5,7 +6,6 @@ import { pipe } from "effect/Function" import * as Layer from "effect/Layer" import * as Scope from "effect/Scope" import { assertTrue, deepStrictEqual, strictEqual } from "effect/test/util" -import { describe, it } from "effect/test/utils/extend" class Prefix extends Effect.Service()("Prefix", { sync: () => ({ diff --git a/packages/effect/test/Effect/stack-safety.test.ts b/packages/effect/test/Effect/stack-safety.test.ts index 460cbf438a8..4ce09b62d1e 100644 --- a/packages/effect/test/Effect/stack-safety.test.ts +++ b/packages/effect/test/Effect/stack-safety.test.ts @@ -1,9 +1,8 @@ +import { describe, it } from "@effect/vitest" import * as Effect from "effect/Effect" import { constVoid, identity, pipe } from "effect/Function" import * as Ref from "effect/Ref" import { assertTrue, deepStrictEqual, strictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" -import { describe } from "vitest" const deepMapEffect = (n: number): Effect.Effect => { const loop = (n: number, acc: Effect.Effect): Effect.Effect => { diff --git a/packages/effect/test/Effect/structural.test.ts b/packages/effect/test/Effect/structural.test.ts index 0f160f76b59..0cfa1e6c83f 100644 --- a/packages/effect/test/Effect/structural.test.ts +++ b/packages/effect/test/Effect/structural.test.ts @@ -1,11 +1,10 @@ +import { describe, it } from "@effect/vitest" import * as Effect from "effect/Effect" import * as Either from "effect/Either" import { pipe } from "effect/Function" import * as Option from "effect/Option" import { assertLeft, assertNone, assertRight, assertSome, deepStrictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" import { assertType, satisfies } from "effect/test/utils/types" -import { describe } from "vitest" describe("Effect", () => { describe("all", () => { diff --git a/packages/effect/test/Effect/sync.test.ts b/packages/effect/test/Effect/sync.test.ts index 2277465bc50..0f8512d79e9 100644 --- a/packages/effect/test/Effect/sync.test.ts +++ b/packages/effect/test/Effect/sync.test.ts @@ -1,10 +1,9 @@ +import { describe, expect, it } from "@effect/vitest" import * as Cause from "effect/Cause" import * as Effect from "effect/Effect" import * as Exit from "effect/Exit" import { pipe } from "effect/Function" import { assertLeft, assertTrue, deepStrictEqual, strictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" -import { describe } from "vitest" const sum = (n: number): number => { if (n < 0) { @@ -14,14 +13,14 @@ const sum = (n: number): number => { } describe("Effect", () => { - it.it("runSyncExit with async is a defect with stack", () => { + it("runSyncExit with async is a defect with stack", () => { const exit = Effect.runSyncExit( Effect.promise(() => Promise.resolve(0)).pipe(Effect.withSpan("asyncSpan")) ) if (Exit.isFailure(exit)) { - it.expect(Cause.pretty(exit.cause)).toContain("asyncSpan") + expect(Cause.pretty(exit.cause)).toContain("asyncSpan") } else { - it.expect(exit._tag).toBe("Failure") + expect(exit._tag).toBe("Failure") } }) it.effect("sync - effect", () => @@ -35,7 +34,7 @@ describe("Effect", () => { const result = yield* (sumEffect(1000)) strictEqual(result, sum(1000)) })) - it.it("sync - must be lazy", async () => { + it("sync - must be lazy", async () => { let program try { program = Effect.sync(() => { @@ -48,7 +47,7 @@ describe("Effect", () => { const result = await Effect.runPromise(program) assertTrue(result) }) - it.it("suspend - must be lazy", async () => { + it("suspend - must be lazy", async () => { let program try { program = Effect.suspend(() => { diff --git a/packages/effect/test/Effect/tapping.test.ts b/packages/effect/test/Effect/tapping.test.ts index 06a39df9616..13ee28edaf0 100644 --- a/packages/effect/test/Effect/tapping.test.ts +++ b/packages/effect/test/Effect/tapping.test.ts @@ -1,7 +1,7 @@ +import { describe, it } from "@effect/vitest" import * as Effect from "effect/Effect" import { pipe } from "effect/Function" import { strictEqual } from "effect/test/util" -import { describe, it } from "vitest" class TestError1 { readonly _tag = "TestError1" diff --git a/packages/effect/test/Effect/timeout.test.ts b/packages/effect/test/Effect/timeout.test.ts index e3c7fa9ba81..e40bc51643e 100644 --- a/packages/effect/test/Effect/timeout.test.ts +++ b/packages/effect/test/Effect/timeout.test.ts @@ -1,3 +1,4 @@ +import { describe, it } from "@effect/vitest" import * as Cause from "effect/Cause" import * as Duration from "effect/Duration" import * as Effect from "effect/Effect" @@ -5,9 +6,7 @@ import * as Exit from "effect/Exit" import * as Fiber from "effect/Fiber" import { constFalse, pipe } from "effect/Function" import { assertNone, assertTrue, deepStrictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" import * as TestClock from "effect/TestClock" -import { describe } from "vitest" describe("Effect", () => { it.effect("timeout produces a useful error message", () => diff --git a/packages/effect/test/Effect/traversing.test.ts b/packages/effect/test/Effect/traversing.test.ts index 89c580d8d95..773a6e6d9f6 100644 --- a/packages/effect/test/Effect/traversing.test.ts +++ b/packages/effect/test/Effect/traversing.test.ts @@ -1,3 +1,4 @@ +import { describe, it } from "@effect/vitest" import * as Array from "effect/Array" import * as Cause from "effect/Cause" import * as Chunk from "effect/Chunk" @@ -8,8 +9,6 @@ import * as Fiber from "effect/Fiber" import { constVoid, identity, pipe } from "effect/Function" import * as Ref from "effect/Ref" import { assertFalse, assertLeft, assertTrue, deepStrictEqual, strictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" -import { describe } from "vitest" describe("Effect", () => { it.effect("dropWhile - happy path", () => diff --git a/packages/effect/test/Effect/tryPromise.test.ts b/packages/effect/test/Effect/tryPromise.test.ts index 7e9f463d802..94dc4a59474 100644 --- a/packages/effect/test/Effect/tryPromise.test.ts +++ b/packages/effect/test/Effect/tryPromise.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import { Cause, Effect, Option } from "effect" import { assertLeft, assertSuccess, assertTrue, deepStrictEqual, strictEqual } from "effect/test/util" -import { describe, it } from "effect/test/utils/extend" describe("Effect", () => { it("tryPromise - success, no catch, no AbortSignal", async () => { diff --git a/packages/effect/test/Effect/validation.test.ts b/packages/effect/test/Effect/validation.test.ts index c18e213ba85..852e4a67063 100644 --- a/packages/effect/test/Effect/validation.test.ts +++ b/packages/effect/test/Effect/validation.test.ts @@ -1,11 +1,10 @@ +import { describe, it } from "@effect/vitest" import * as Cause from "effect/Cause" import * as Effect from "effect/Effect" import * as Either from "effect/Either" import { pipe } from "effect/Function" import * as Ref from "effect/Ref" import { assertLeft, deepStrictEqual, strictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" -import { describe } from "vitest" describe("Effect", () => { it.effect("validate - fails", () => diff --git a/packages/effect/test/Either.test.ts b/packages/effect/test/Either.test.ts index 903d94e2e59..3b090229d72 100644 --- a/packages/effect/test/Either.test.ts +++ b/packages/effect/test/Either.test.ts @@ -1,3 +1,4 @@ +import { describe, it } from "@effect/vitest" import { Chunk, Either, flow, Number as Num, Option, pipe, String as Str } from "effect" import { assertFalse, @@ -10,7 +11,6 @@ import { strictEqual, throws } from "effect/test/util" -import { describe, it } from "vitest" describe("Either", () => { it("gen", () => { diff --git a/packages/effect/test/Encoding.test.ts b/packages/effect/test/Encoding.test.ts index 5bee34daa28..59b60e6dceb 100644 --- a/packages/effect/test/Encoding.test.ts +++ b/packages/effect/test/Encoding.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import { Either, Encoding } from "effect" import { assertTrue, deepStrictEqual, strictEqual } from "effect/test/util" -import { describe, it } from "vitest" describe("Base64", () => { const valid: Array<[string, string]> = [ diff --git a/packages/effect/test/Equivalence.test.ts b/packages/effect/test/Equivalence.test.ts index 9c2bbe9a3fe..437b6c35923 100644 --- a/packages/effect/test/Equivalence.test.ts +++ b/packages/effect/test/Equivalence.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import { Equivalence, pipe } from "effect" import { assertFalse, assertTrue } from "effect/test/util" -import { describe, it } from "vitest" describe("Equivalence", () => { it("array", () => { diff --git a/packages/effect/test/Exit.test.ts b/packages/effect/test/Exit.test.ts index 792a6e0b1f0..af5f8bd5f3a 100644 --- a/packages/effect/test/Exit.test.ts +++ b/packages/effect/test/Exit.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import { Exit } from "effect" import { deepStrictEqual } from "effect/test/util" -import { describe, it } from "vitest" describe("Exit", () => { describe("toJSON", () => { diff --git a/packages/effect/test/Fiber.test.ts b/packages/effect/test/Fiber.test.ts index 4086997483d..9ec4ad18281 100644 --- a/packages/effect/test/Fiber.test.ts +++ b/packages/effect/test/Fiber.test.ts @@ -1,3 +1,4 @@ +import { describe, it } from "@effect/vitest" import * as Array from "effect/Array" import * as Chunk from "effect/Chunk" import * as Deferred from "effect/Deferred" @@ -12,9 +13,7 @@ import * as HashSet from "effect/HashSet" import * as Queue from "effect/Queue" import * as Ref from "effect/Ref" import { assertTrue, deepStrictEqual, strictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" import { withLatch } from "effect/test/utils/latch" -import { describe } from "vitest" const initial = "initial" const update = "update" diff --git a/packages/effect/test/FiberHandle.test.ts b/packages/effect/test/FiberHandle.test.ts index 89f9a4fa5e7..4420368f1bb 100644 --- a/packages/effect/test/FiberHandle.test.ts +++ b/packages/effect/test/FiberHandle.test.ts @@ -1,7 +1,6 @@ +import { describe, it } from "@effect/vitest" import { Deferred, Effect, Exit, Fiber, FiberHandle, pipe, Ref } from "effect" import { assertFalse, assertTrue, strictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" -import { describe } from "vitest" describe("FiberHandle", () => { it.effect("interrupts fibers", () => diff --git a/packages/effect/test/FiberMap.test.ts b/packages/effect/test/FiberMap.test.ts index 905aaeb198e..52168868399 100644 --- a/packages/effect/test/FiberMap.test.ts +++ b/packages/effect/test/FiberMap.test.ts @@ -1,7 +1,6 @@ +import { describe, it } from "@effect/vitest" import { Array, Deferred, Effect, Exit, Fiber, FiberMap, pipe, Ref, Scope } from "effect" import { assertFalse, assertTrue, strictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" -import { describe } from "vitest" describe("FiberMap", () => { it.effect("interrupts fibers", () => diff --git a/packages/effect/test/FiberRef.test.ts b/packages/effect/test/FiberRef.test.ts index 0e5942ab25f..e7d3af432ad 100644 --- a/packages/effect/test/FiberRef.test.ts +++ b/packages/effect/test/FiberRef.test.ts @@ -1,3 +1,4 @@ +import { describe, it } from "@effect/vitest" import * as Chunk from "effect/Chunk" import * as Clock from "effect/Clock" import * as Deferred from "effect/Deferred" @@ -9,8 +10,6 @@ import { constant, constTrue, identity, pipe } from "effect/Function" import * as Option from "effect/Option" import * as Runtime from "effect/Runtime" import { assertTrue, strictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" -import { describe } from "vitest" const initial = "initial" const update = "update" diff --git a/packages/effect/test/FiberRefs.test.ts b/packages/effect/test/FiberRefs.test.ts index b15e33e92f6..7de54570898 100644 --- a/packages/effect/test/FiberRefs.test.ts +++ b/packages/effect/test/FiberRefs.test.ts @@ -1,3 +1,4 @@ +import { describe, it } from "@effect/vitest" import * as Cause from "effect/Cause" import * as Effect from "effect/Effect" import * as Exit from "effect/Exit" @@ -11,8 +12,6 @@ import * as Option from "effect/Option" import * as Queue from "effect/Queue" import * as Scope from "effect/Scope" import { assertTrue, deepStrictEqual, strictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" -import { describe } from "vitest" describe("FiberRefs", () => { it.scoped("propagate FiberRef values across fiber boundaries", () => @@ -34,7 +33,7 @@ describe("FiberRefs", () => { const result = yield* Fiber.join(consumer) assertTrue(result) })) - it.it("interruptedCause", () => { + it("interruptedCause", () => { const parent = FiberId.make(1, Date.now()) as FiberId.Runtime const child = FiberId.make(2, Date.now()) as FiberId.Runtime const parentFiberRefs = FiberRefs.unsafeMake(new Map()) @@ -48,7 +47,7 @@ describe("FiberRefs", () => { }) describe("currentLogAnnotations", () => { - it.it("doesnt leak", () => { + it("doesnt leak", () => { Effect.void.pipe(Effect.annotateLogs("test", "abc"), Effect.runSync) strictEqual(FiberRef.currentLogAnnotations.pipe(FiberRef.get, Effect.map(HashMap.size), Effect.runSync), 0) }) diff --git a/packages/effect/test/FiberSet.test.ts b/packages/effect/test/FiberSet.test.ts index 53335a53402..2c224c46aff 100644 --- a/packages/effect/test/FiberSet.test.ts +++ b/packages/effect/test/FiberSet.test.ts @@ -1,7 +1,6 @@ +import { describe, it } from "@effect/vitest" import { Array, Deferred, Effect, Exit, Fiber, FiberSet, pipe, Ref, Scope } from "effect" import { assertFalse, assertTrue, strictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" -import { describe } from "vitest" describe("FiberSet", () => { it.effect("interrupts fibers", () => diff --git a/packages/effect/test/Function.test.ts b/packages/effect/test/Function.test.ts index 40425ff4d80..eb430730d36 100644 --- a/packages/effect/test/Function.test.ts +++ b/packages/effect/test/Function.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import { Function, String } from "effect" import { deepStrictEqual, strictEqual, throws } from "effect/test/util" -import { describe, it } from "vitest" const f = (n: number): number => n + 1 const g = (n: number) => n * 2 diff --git a/packages/effect/test/GlobalValue.test.ts b/packages/effect/test/GlobalValue.test.ts index 83411351955..4158c14453e 100644 --- a/packages/effect/test/GlobalValue.test.ts +++ b/packages/effect/test/GlobalValue.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import * as G from "effect/GlobalValue" import { strictEqual } from "effect/test/util" -import { describe, it } from "vitest" const a = G.globalValue("id", () => ({})) const b = G.globalValue("id", () => ({})) diff --git a/packages/effect/test/Hash.test.ts b/packages/effect/test/Hash.test.ts index 1e6368b518c..a0161429115 100644 --- a/packages/effect/test/Hash.test.ts +++ b/packages/effect/test/Hash.test.ts @@ -1,3 +1,4 @@ +import { describe, it } from "@effect/vitest" import * as Equal from "effect/Equal" import { absurd, identity } from "effect/Function" import * as Hash from "effect/Hash" @@ -5,7 +6,6 @@ import * as HashSet from "effect/HashSet" import * as Option from "effect/Option" import { assertFalse, assertTrue, strictEqual } from "effect/test/util" import * as Utils from "effect/Utils" -import { describe, it } from "vitest" describe("Hash", () => { it("structural", () => { diff --git a/packages/effect/test/HashMap.test.ts b/packages/effect/test/HashMap.test.ts index 86b579fdbd0..2e299736ba7 100644 --- a/packages/effect/test/HashMap.test.ts +++ b/packages/effect/test/HashMap.test.ts @@ -1,10 +1,10 @@ +import { describe, it } from "@effect/vitest" import * as Equal from "effect/Equal" import { pipe } from "effect/Function" import * as Hash from "effect/Hash" import * as HM from "effect/HashMap" import * as Option from "effect/Option" import { assertFalse, assertNone, assertSome, assertTrue, deepStrictEqual, strictEqual, throws } from "effect/test/util" -import { describe, it } from "vitest" class Key implements Equal.Equal { constructor(readonly n: number) {} diff --git a/packages/effect/test/HashSet.test.ts b/packages/effect/test/HashSet.test.ts index 65baefd49d9..d44425f4d31 100644 --- a/packages/effect/test/HashSet.test.ts +++ b/packages/effect/test/HashSet.test.ts @@ -1,9 +1,9 @@ +import { describe, it } from "@effect/vitest" import * as Equal from "effect/Equal" import { pipe } from "effect/Function" import * as Hash from "effect/Hash" import * as HashSet from "effect/HashSet" import { assertFalse, assertTrue, deepStrictEqual, strictEqual } from "effect/test/util" -import { describe, it } from "vitest" class Value implements Equal.Equal { constructor(readonly n: number) {} diff --git a/packages/effect/test/Inspectable.test.ts b/packages/effect/test/Inspectable.test.ts index 40413009886..64106d40227 100644 --- a/packages/effect/test/Inspectable.test.ts +++ b/packages/effect/test/Inspectable.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import * as Inspectable from "effect/Inspectable" import { strictEqual } from "effect/test/util" -import { describe, it } from "vitest" describe("Inspectable", () => { describe("toString", () => { diff --git a/packages/effect/test/Iterable.test.ts b/packages/effect/test/Iterable.test.ts index 21709266432..452ecaaddd4 100644 --- a/packages/effect/test/Iterable.test.ts +++ b/packages/effect/test/Iterable.test.ts @@ -1,10 +1,10 @@ +import { describe, it } from "@effect/vitest" import { pipe } from "effect/Function" import * as Iter from "effect/Iterable" import * as Number from "effect/Number" import * as O from "effect/Option" import type { Predicate } from "effect/Predicate" import { assertFalse, assertNone, assertSome, assertTrue, deepStrictEqual, strictEqual } from "effect/test/util" -import { describe, it } from "vitest" const symA = Symbol.for("a") const symB = Symbol.for("b") diff --git a/packages/effect/test/KeyedPool.test.ts b/packages/effect/test/KeyedPool.test.ts index a330b039e7b..55c8c17a2a3 100644 --- a/packages/effect/test/KeyedPool.test.ts +++ b/packages/effect/test/KeyedPool.test.ts @@ -1,3 +1,4 @@ +import { describe, it } from "@effect/vitest" import * as Array from "effect/Array" import * as Duration from "effect/Duration" import * as Effect from "effect/Effect" @@ -7,9 +8,7 @@ import * as KeyedPool from "effect/KeyedPool" import * as Random from "effect/Random" import * as Ref from "effect/Ref" import { strictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" import * as TestClock from "effect/TestClock" -import { describe } from "vitest" describe("KeyedPool", () => { it.scoped("acquire release many successfully while other key is blocked", () => diff --git a/packages/effect/test/Layer.test.ts b/packages/effect/test/Layer.test.ts index 580bd4d1052..74174632bfe 100644 --- a/packages/effect/test/Layer.test.ts +++ b/packages/effect/test/Layer.test.ts @@ -1,3 +1,4 @@ +import { describe, it } from "@effect/vitest" import * as Chunk from "effect/Chunk" import * as Context from "effect/Context" import * as Deferred from "effect/Deferred" @@ -12,8 +13,6 @@ import * as Ref from "effect/Ref" import * as Schedule from "effect/Schedule" import * as Scope from "effect/Scope" import { assertTrue, deepStrictEqual, strictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" -import { describe } from "vitest" export const acquire1 = "Acquiring Module 1" export const acquire2 = "Acquiring Module 2" diff --git a/packages/effect/test/List.test.ts b/packages/effect/test/List.test.ts index da3d736d539..a350fbb5657 100644 --- a/packages/effect/test/List.test.ts +++ b/packages/effect/test/List.test.ts @@ -1,3 +1,4 @@ +import { describe, it } from "@effect/vitest" import * as Array from "effect/Array" import * as Chunk from "effect/Chunk" import * as Duration from "effect/Duration" @@ -6,7 +7,6 @@ import { equals, symbol } from "effect/Equal" import * as List from "effect/List" import * as Option from "effect/Option" import { assertFalse, assertNone, assertSome, assertTrue, deepStrictEqual, strictEqual, throws } from "effect/test/util" -import { describe, it } from "vitest" const testStructuralSharing = (a: List.List, b: List.List, n = 0): number | undefined => { if (a === b) { diff --git a/packages/effect/test/LogLevel.test.ts b/packages/effect/test/LogLevel.test.ts index 37d046a3b9e..d5819170da3 100644 --- a/packages/effect/test/LogLevel.test.ts +++ b/packages/effect/test/LogLevel.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import * as LogLevel from "effect/LogLevel" import { strictEqual } from "effect/test/util" -import { describe, it } from "vitest" describe("LogLevel", () => { it("fromLiteral", () => { diff --git a/packages/effect/test/Logger.test.ts b/packages/effect/test/Logger.test.ts index 6f979de219c..fb53130ee9a 100644 --- a/packages/effect/test/Logger.test.ts +++ b/packages/effect/test/Logger.test.ts @@ -1,3 +1,4 @@ +import { afterEach, beforeEach, describe, it, vi } from "@effect/vitest" import { Cause, Chunk, @@ -14,8 +15,6 @@ import { } from "effect" import { logLevelInfo } from "effect/internal/core" import { assertFalse, assertTrue, deepStrictEqual, strictEqual } from "effect/test/util" -import { describe, it } from "effect/test/utils/extend" -import { afterEach, beforeEach, vi } from "vitest" describe("Logger", () => { it("isLogger", () => { diff --git a/packages/effect/test/Mailbox.test.ts b/packages/effect/test/Mailbox.test.ts index 5f34c1bf0c6..9acff3cc6ca 100644 --- a/packages/effect/test/Mailbox.test.ts +++ b/packages/effect/test/Mailbox.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import { Chunk, Effect, Exit, Fiber, Mailbox, Stream } from "effect" import { assertFalse, assertNone, assertTrue, deepStrictEqual, strictEqual } from "effect/test/util" -import { describe, it } from "effect/test/utils/extend" describe("Mailbox", () => { it.effect("offerAll with capacity", () => diff --git a/packages/effect/test/ManagedRuntime.test.ts b/packages/effect/test/ManagedRuntime.test.ts index 7b80d9445a9..ad4e3a91f22 100644 --- a/packages/effect/test/ManagedRuntime.test.ts +++ b/packages/effect/test/ManagedRuntime.test.ts @@ -1,10 +1,10 @@ +import { describe, it, test } from "@effect/vitest" import { FiberRefs, List, ManagedRuntime } from "effect" import * as Context from "effect/Context" import * as Effect from "effect/Effect" import * as FiberRef from "effect/FiberRef" import * as Layer from "effect/Layer" import { deepStrictEqual, strictEqual } from "effect/test/util" -import { describe, it, test } from "effect/test/utils/extend" describe("ManagedRuntime", () => { test("memoizes the layer build", async () => { diff --git a/packages/effect/test/Match.test.ts b/packages/effect/test/Match.test.ts index b44c9f84ad8..0560e1b9ab2 100644 --- a/packages/effect/test/Match.test.ts +++ b/packages/effect/test/Match.test.ts @@ -1,3 +1,4 @@ +import { describe, it } from "@effect/vitest" import * as E from "effect/Either" import { pipe } from "effect/Function" import * as M from "effect/Match" @@ -5,7 +6,6 @@ import * as O from "effect/Option" import * as Predicate from "effect/Predicate" import { assertFalse, assertLeft, assertRight, assertSome, assertTrue, strictEqual } from "effect/test/util" import { assertType } from "effect/test/utils/types" -import { describe, it } from "vitest" describe("Match", () => { it("exhaustive", () => { diff --git a/packages/effect/test/Metric.test.ts b/packages/effect/test/Metric.test.ts index a376a9cc933..959e92626a5 100644 --- a/packages/effect/test/Metric.test.ts +++ b/packages/effect/test/Metric.test.ts @@ -1,3 +1,4 @@ +import { describe, it } from "@effect/vitest" import { Array, Clock, @@ -16,8 +17,6 @@ import { Schedule } from "effect" import { assertTrue, deepStrictEqual, strictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" -import { describe } from "vitest" const labels = [MetricLabel.make("x", "a"), MetricLabel.make("y", "b")] diff --git a/packages/effect/test/Micro.test.ts b/packages/effect/test/Micro.test.ts index 0169051e02b..5e1e9a7c4ae 100644 --- a/packages/effect/test/Micro.test.ts +++ b/packages/effect/test/Micro.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import { Cause, Context, Effect, Either, Exit, Fiber, Micro, Option, pipe } from "effect" import { assertFalse, assertTrue, deepStrictEqual, strictEqual } from "effect/test/util" -import { describe, it } from "effect/test/utils/extend" class ATag extends Context.Tag("ATag")() {} class TestError extends Micro.TaggedError("TestError") {} diff --git a/packages/effect/test/MutableHashMap.test.ts b/packages/effect/test/MutableHashMap.test.ts index 1c078d22509..7dc1efe1f25 100644 --- a/packages/effect/test/MutableHashMap.test.ts +++ b/packages/effect/test/MutableHashMap.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import { Equal, Hash, MutableHashMap as HM, Option, pipe } from "effect" import { assertFalse, assertNone, assertSome, assertTrue, deepStrictEqual, strictEqual } from "effect/test/util" -import { describe, it } from "vitest" class Key implements Equal.Equal { constructor(readonly a: number, readonly b: number) {} diff --git a/packages/effect/test/MutableHashSet.test.ts b/packages/effect/test/MutableHashSet.test.ts index b8e6478cb6e..e50ac750d09 100644 --- a/packages/effect/test/MutableHashSet.test.ts +++ b/packages/effect/test/MutableHashSet.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import { Equal, Hash, MutableHashSet } from "effect" import { deepStrictEqual, strictEqual } from "effect/test/util" -import { describe, it } from "vitest" class Value implements Equal.Equal { constructor(readonly a: number, readonly b: number) {} diff --git a/packages/effect/test/MutableList.test.ts b/packages/effect/test/MutableList.test.ts index 623e39f8dab..f232ca6267b 100644 --- a/packages/effect/test/MutableList.test.ts +++ b/packages/effect/test/MutableList.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import { MutableList, pipe } from "effect" import { assertFalse, assertTrue, deepStrictEqual, strictEqual } from "effect/test/util" -import { describe, it } from "vitest" describe("MutableList", () => { it("toString", () => { diff --git a/packages/effect/test/MutableQueue.test.ts b/packages/effect/test/MutableQueue.test.ts index 5f895e4fde3..0ecaa2443b8 100644 --- a/packages/effect/test/MutableQueue.test.ts +++ b/packages/effect/test/MutableQueue.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import { MutableQueue } from "effect" import { assertFalse, assertTrue, deepStrictEqual, strictEqual } from "effect/test/util" -import { describe, it } from "vitest" describe("MutableQueue", () => { it("toString", () => { diff --git a/packages/effect/test/MutableRef.test.ts b/packages/effect/test/MutableRef.test.ts index 9a9ef84f223..daab995e4a0 100644 --- a/packages/effect/test/MutableRef.test.ts +++ b/packages/effect/test/MutableRef.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import { Chunk, MutableRef } from "effect" import { deepStrictEqual, strictEqual } from "effect/test/util" -import { describe, it } from "vitest" describe("MutableRef", () => { it("toString", () => { diff --git a/packages/effect/test/NonEmptyIterable.test.ts b/packages/effect/test/NonEmptyIterable.test.ts index 3ca21786314..740b0efad71 100644 --- a/packages/effect/test/NonEmptyIterable.test.ts +++ b/packages/effect/test/NonEmptyIterable.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import { Chunk, NonEmptyIterable } from "effect" import { deepStrictEqual, strictEqual, throws } from "effect/test/util" -import { describe, it } from "vitest" describe("NonEmptyIterable", () => { it("should get head and rest", () => { diff --git a/packages/effect/test/Number.test.ts b/packages/effect/test/Number.test.ts index 0ce3875a249..272a491f6c0 100644 --- a/packages/effect/test/Number.test.ts +++ b/packages/effect/test/Number.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import { Number, pipe } from "effect" import { assertFalse, assertNone, assertSome, assertTrue, strictEqual } from "effect/test/util" -import { describe, it } from "vitest" describe("Number", () => { it("isNumber", () => { diff --git a/packages/effect/test/Option.test.ts b/packages/effect/test/Option.test.ts index f0c8540df83..46fb791d44a 100644 --- a/packages/effect/test/Option.test.ts +++ b/packages/effect/test/Option.test.ts @@ -1,6 +1,6 @@ +import { assertType, describe, it } from "@effect/vitest" import { Chunk, Either, Equal, Hash, Number as N, Option, pipe, String as S } from "effect" import { assertFalse, assertNone, assertSome, assertTrue, deepStrictEqual, strictEqual, throws } from "effect/test/util" -import { assertType, describe, it } from "vitest" const gt2 = (n: number): boolean => n > 2 diff --git a/packages/effect/test/Order.test.ts b/packages/effect/test/Order.test.ts index 64218360847..c7884caffff 100644 --- a/packages/effect/test/Order.test.ts +++ b/packages/effect/test/Order.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import { Array as Arr, Order, pipe } from "effect" import { assertFalse, assertTrue, deepStrictEqual, strictEqual } from "effect/test/util" -import { describe, it } from "vitest" describe("Order", () => { it("struct", () => { diff --git a/packages/effect/test/Ordering.test.ts b/packages/effect/test/Ordering.test.ts index 5155a442271..b67789da1eb 100644 --- a/packages/effect/test/Ordering.test.ts +++ b/packages/effect/test/Ordering.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import { Ordering } from "effect" import { strictEqual } from "effect/test/util" -import { describe, it } from "vitest" describe("Ordering", () => { it("match", () => { diff --git a/packages/effect/test/Pipeable.test.ts b/packages/effect/test/Pipeable.test.ts index 168323e64e9..ab10f07b16e 100644 --- a/packages/effect/test/Pipeable.test.ts +++ b/packages/effect/test/Pipeable.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import { Option } from "effect" import { assertSome } from "effect/test/util" -import { describe, it } from "vitest" describe("Pipeable", () => { it("pipeArguments", () => { diff --git a/packages/effect/test/Pool.test.ts b/packages/effect/test/Pool.test.ts index be53cfd2ec1..3ad41cb648f 100644 --- a/packages/effect/test/Pool.test.ts +++ b/packages/effect/test/Pool.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import { Deferred, Duration, Effect, Exit, Fiber, pipe, Pool, Ref, Scope, TestClock, TestServices } from "effect" import { assertNone, deepStrictEqual, strictEqual } from "effect/test/util" -import { describe, it } from "effect/test/utils/extend" describe("Pool", () => { it.scoped("preallocates pool items", () => diff --git a/packages/effect/test/Predicate.test.ts b/packages/effect/test/Predicate.test.ts index f4289d56c3b..126f2e25cac 100644 --- a/packages/effect/test/Predicate.test.ts +++ b/packages/effect/test/Predicate.test.ts @@ -1,7 +1,7 @@ +import { describe, it } from "@effect/vitest" import { constFalse, constTrue, pipe } from "effect/Function" import * as _ from "effect/Predicate" import { assertFalse, assertTrue } from "effect/test/util" -import { describe, it } from "vitest" const isPositive: _.Predicate = (n) => n > 0 const isNegative: _.Predicate = (n) => n < 0 diff --git a/packages/effect/test/PubSub.test.ts b/packages/effect/test/PubSub.test.ts index 3e98414defe..e74bb967f6e 100644 --- a/packages/effect/test/PubSub.test.ts +++ b/packages/effect/test/PubSub.test.ts @@ -1,7 +1,6 @@ +import { describe, it } from "@effect/vitest" import { Array, Chunk, Deferred, Effect, Fiber, pipe, PubSub, Queue } from "effect" import { assertSome, deepStrictEqual, strictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" -import { describe } from "vitest" describe("PubSub", () => { it.effect("publishAll - capacity 2 (BoundedPubSubPow2)", () => { diff --git a/packages/effect/test/Queue.test.ts b/packages/effect/test/Queue.test.ts index 590b42dc80b..a5610cbd04a 100644 --- a/packages/effect/test/Queue.test.ts +++ b/packages/effect/test/Queue.test.ts @@ -1,3 +1,4 @@ +import { describe, it } from "@effect/vitest" import { Array, Cause, Chunk, Deferred, Effect, Exit, Fiber, identity, pipe, Queue, Ref } from "effect" import { assertFalse, @@ -8,8 +9,6 @@ import { deepStrictEqual, strictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" -import { describe } from "vitest" export const waitForValue = (ref: Effect.Effect, value: A): Effect.Effect => { return ref.pipe(Effect.zipLeft(Effect.yieldNow()), Effect.repeat({ until: (a) => value === a })) diff --git a/packages/effect/test/Random.test.ts b/packages/effect/test/Random.test.ts index 15a46af13ee..3c016072a8f 100644 --- a/packages/effect/test/Random.test.ts +++ b/packages/effect/test/Random.test.ts @@ -1,7 +1,6 @@ +import { describe, it } from "@effect/vitest" import { Array, Cause, Chunk, Data, Effect, Random } from "effect" import { assertTrue, deepStrictEqual, strictEqual } from "effect/test/util" -import { it } from "effect/test/utils/extend" -import { describe } from "vitest" describe("Random", () => { it.effect("integer is correctly distributed", () => diff --git a/packages/effect/test/RateLimiter.test.ts b/packages/effect/test/RateLimiter.test.ts index 0c43245202c..68beb484392 100644 --- a/packages/effect/test/RateLimiter.test.ts +++ b/packages/effect/test/RateLimiter.test.ts @@ -1,7 +1,6 @@ +import { describe, it } from "@effect/vitest" import { Array, Clock, Deferred, Effect, Fiber, Function, Option, pipe, RateLimiter, Ref, TestClock } from "effect" import { assertFalse, assertLeft, assertTrue, deepStrictEqual, strictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" -import { describe } from "vitest" describe("RateLimiter", () => { describe.concurrent("fixed-window", () => { diff --git a/packages/effect/test/RcMap.test.ts b/packages/effect/test/RcMap.test.ts index bfec4aa4f84..2c52b1c2627 100644 --- a/packages/effect/test/RcMap.test.ts +++ b/packages/effect/test/RcMap.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import { Cause, Data, Effect, Exit, RcMap, Scope, TestClock } from "effect" import { assertTrue, deepStrictEqual, strictEqual } from "effect/test/util" -import { describe, it } from "effect/test/utils/extend" describe("RcMap", () => { it.effect("deallocation", () => diff --git a/packages/effect/test/RcRef.test.ts b/packages/effect/test/RcRef.test.ts index 4f1a058b889..e0688f70173 100644 --- a/packages/effect/test/RcRef.test.ts +++ b/packages/effect/test/RcRef.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import { Effect, Exit, RcRef, Scope, TestClock } from "effect" import { assertTrue, strictEqual } from "effect/test/util" -import { describe, it } from "effect/test/utils/extend" describe("RcRef", () => { it.effect("deallocation", () => diff --git a/packages/effect/test/Record.test.ts b/packages/effect/test/Record.test.ts index 239d92f4707..e625ddea6a4 100644 --- a/packages/effect/test/Record.test.ts +++ b/packages/effect/test/Record.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import { Either, Number as N, Option, pipe, Record as R } from "effect" import { assertFalse, assertNone, assertSome, assertTrue, deepStrictEqual } from "effect/test/util" -import { describe, it } from "vitest" const symA = Symbol.for("a") const symB = Symbol.for("b") diff --git a/packages/effect/test/RedBlackTree.test.ts b/packages/effect/test/RedBlackTree.test.ts index 2dfd95258cd..e171d28d702 100644 --- a/packages/effect/test/RedBlackTree.test.ts +++ b/packages/effect/test/RedBlackTree.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import { Equal, Hash, Number as Num, Option, Order, pipe, RedBlackTree } from "effect" import { assertTrue, deepStrictEqual, strictEqual } from "effect/test/util" -import { describe, it } from "vitest" describe("RedBlackTree", () => { it("toString", () => { diff --git a/packages/effect/test/Redacted.test.ts b/packages/effect/test/Redacted.test.ts index 165b22002b1..7270250c6bb 100644 --- a/packages/effect/test/Redacted.test.ts +++ b/packages/effect/test/Redacted.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import { Chunk, Equal, Hash, Redacted, Secret } from "effect" import { assertFalse, assertTrue, strictEqual, throws } from "effect/test/util" -import { describe, it } from "vitest" describe("Redacted", () => { it("chunk constructor", () => { diff --git a/packages/effect/test/Ref.test.ts b/packages/effect/test/Ref.test.ts index 4b331992edc..883aa7e2046 100644 --- a/packages/effect/test/Ref.test.ts +++ b/packages/effect/test/Ref.test.ts @@ -1,7 +1,6 @@ +import { describe, it } from "@effect/vitest" import { Effect, Option, pipe, Readable, Ref } from "effect" import { assertTrue, deepStrictEqual, strictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" -import { describe } from "vitest" const current = "value" const update = "new value" diff --git a/packages/effect/test/RegExp.test.ts b/packages/effect/test/RegExp.test.ts index 6faece89b88..129a254713d 100644 --- a/packages/effect/test/RegExp.test.ts +++ b/packages/effect/test/RegExp.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import { RegExp } from "effect" import { assertFalse, assertTrue, strictEqual } from "effect/test/util" -import { describe, it } from "vitest" describe("RegExp", () => { it("isRegExp", () => { diff --git a/packages/effect/test/Reloadable.test.ts b/packages/effect/test/Reloadable.test.ts index bba8bf67d05..b20821fab13 100644 --- a/packages/effect/test/Reloadable.test.ts +++ b/packages/effect/test/Reloadable.test.ts @@ -1,8 +1,7 @@ +import { describe, it } from "@effect/vitest" import { Context, Effect, Layer, pipe, Reloadable } from "effect" import { strictEqual } from "effect/test/util" import * as Counter from "effect/test/utils/counter" -import * as it from "effect/test/utils/extend" -import { describe } from "vitest" const DummyServiceTypeId = Symbol.for("effect/test/Reloadable/DummyService") type DummyServiceTypeId = typeof DummyServiceTypeId diff --git a/packages/effect/test/Resource.test.ts b/packages/effect/test/Resource.test.ts index 67673211a39..a066df2d5d8 100644 --- a/packages/effect/test/Resource.test.ts +++ b/packages/effect/test/Resource.test.ts @@ -1,8 +1,7 @@ +import { describe, it } from "@effect/vitest" import { Duration, Effect, Either, identity, pipe, Ref, Resource, Schedule } from "effect" import { strictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" import * as TestClock from "effect/TestClock" -import { describe } from "vitest" describe("Resource", () => { it.scoped("manual", () => diff --git a/packages/effect/test/Runtime.test.ts b/packages/effect/test/Runtime.test.ts index 46a6fa82614..22a46959960 100644 --- a/packages/effect/test/Runtime.test.ts +++ b/packages/effect/test/Runtime.test.ts @@ -1,7 +1,6 @@ +import { describe, it } from "@effect/vitest" import { Effect, Exit, FiberRef, Layer, pipe, Runtime } from "effect" import { assertTrue, deepStrictEqual, strictEqual } from "effect/test/util" -import { describe } from "vitest" -import * as it from "./utils/extend.js" describe("Runtime", () => { it.effect("setFiberRef", () => @@ -29,7 +28,7 @@ describe("Runtime", () => { deepStrictEqual(result, { value: 0 }) })) - it.it("runPromiseExit/signal", async () => { + it("runPromiseExit/signal", async () => { const aborted = AbortSignal.abort() assertTrue( Exit.isInterrupted(await Runtime.runPromiseExit(Runtime.defaultRuntime)(Effect.never, { signal: aborted })) diff --git a/packages/effect/test/RuntimeFlags.test.ts b/packages/effect/test/RuntimeFlags.test.ts index 6ac79e75be0..b4d222c33c8 100644 --- a/packages/effect/test/RuntimeFlags.test.ts +++ b/packages/effect/test/RuntimeFlags.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import { FastCheck as fc, pipe, RuntimeFlags, RuntimeFlagsPatch } from "effect" import { assertFalse, assertTrue, strictEqual } from "effect/test/util" -import { describe, it } from "vitest" const arbRuntimeFlag = fc.constantFrom( RuntimeFlags.None, diff --git a/packages/effect/test/STM.test.ts b/packages/effect/test/STM.test.ts index 4297fcc1ef5..753432ddb92 100644 --- a/packages/effect/test/STM.test.ts +++ b/packages/effect/test/STM.test.ts @@ -1,3 +1,4 @@ +import { describe, it } from "@effect/vitest" import { Cause, Chunk, @@ -27,8 +28,6 @@ import { deepStrictEqual, strictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" -import { describe } from "vitest" interface STMEnv { readonly ref: TRef.TRef @@ -776,21 +775,21 @@ describe("STM", () => { deepStrictEqual(Array.from(result), input) })) - it.it("reduce - with a successful step function sums the list properly", () => + it("reduce - with a successful step function sums the list properly", () => fc.assert(fc.asyncProperty(fc.array(fc.integer()), async (array) => { const transaction = pipe(array, STM.reduce(0, (acc, curr) => STM.succeed(acc + curr))) const result = await Effect.runPromise(STM.commit(transaction)) strictEqual(result, array.reduce((acc, curr) => acc + curr, 0)) }))) - it.it("reduce - with a failing step function returns a failed transaction", () => + it("reduce - with a failing step function returns a failed transaction", () => fc.assert(fc.asyncProperty(fc.array(fc.integer(), { minLength: 1 }), async (array) => { const transaction = pipe(array, STM.reduce(0, () => STM.fail("Ouch"))) const result = await Effect.runPromise(Effect.exit(STM.commit(transaction))) deepStrictEqual(result, Exit.fail("Ouch")) }))) - it.it("reduce - run sequentially from left to right", () => + it("reduce - run sequentially from left to right", () => fc.assert(fc.asyncProperty(fc.array(fc.integer(), { minLength: 1 }), async (array) => { const transaction = pipe( array, @@ -823,21 +822,21 @@ describe("STM", () => { strictEqual(result, 1) })) - it.it("reduceRight - with a successful step function sums the list properly", () => + it("reduceRight - with a successful step function sums the list properly", () => fc.assert(fc.asyncProperty(fc.array(fc.integer()), async (array) => { const transaction = pipe(array, STM.reduceRight(0, (acc, curr) => STM.succeed(acc + curr))) const result = await Effect.runPromise(STM.commit(transaction)) strictEqual(result, array.reduce((acc, curr) => acc + curr, 0)) }))) - it.it("reduceRight - with a failing step function returns a failed transaction", () => + it("reduceRight - with a failing step function returns a failed transaction", () => fc.assert(fc.asyncProperty(fc.array(fc.integer(), { minLength: 1 }), async (array) => { const transaction = pipe(array, STM.reduceRight(0, () => STM.fail("Ouch"))) const result = await Effect.runPromise(Effect.exit(STM.commit(transaction))) deepStrictEqual(result, Exit.fail("Ouch")) }))) - it.it("reduceRight - run sequentially from right to left", () => + it("reduceRight - run sequentially from right to left", () => fc.assert(fc.asyncProperty(fc.array(fc.integer(), { minLength: 1 }), async (array) => { const transaction = pipe( array, diff --git a/packages/effect/test/Schedule.test.ts b/packages/effect/test/Schedule.test.ts index c6b3a741b12..49840c842bb 100644 --- a/packages/effect/test/Schedule.test.ts +++ b/packages/effect/test/Schedule.test.ts @@ -1,3 +1,4 @@ +import { describe, it } from "@effect/vitest" import { Array, Cause, @@ -17,9 +18,7 @@ import { } from "effect" import { constVoid } from "effect/Function" import { assertTrue, deepStrictEqual, strictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" import * as TestClock from "effect/TestClock" -import { describe } from "vitest" describe("Schedule", () => { it.effect("collect all inputs into a list as long as the condition f holds", () => diff --git a/packages/effect/test/Schema/Arbitrary/Arbitrary.test.ts b/packages/effect/test/Schema/Arbitrary/Arbitrary.test.ts index b9946fdfc4c..82e35fbd753 100644 --- a/packages/effect/test/Schema/Arbitrary/Arbitrary.test.ts +++ b/packages/effect/test/Schema/Arbitrary/Arbitrary.test.ts @@ -1,7 +1,7 @@ +import { describe, it } from "@effect/vitest" import { Arbitrary, FastCheck as fc, Order, Predicate, Schema as S, SchemaAST as AST } from "effect" import * as Util from "effect/test/Schema/TestUtils" import { assertTrue, deepStrictEqual, fail, strictEqual, throws } from "effect/test/util" -import { describe, it } from "vitest" const expectConstraints = ( schema: S.Schema, diff --git a/packages/effect/test/Schema/Arbitrary/Class.test.ts b/packages/effect/test/Schema/Arbitrary/Class.test.ts index 5230a685ba0..8daba149fa4 100644 --- a/packages/effect/test/Schema/Arbitrary/Class.test.ts +++ b/packages/effect/test/Schema/Arbitrary/Class.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("Class", () => { it("required property signature", () => { diff --git a/packages/effect/test/Schema/JSONSchema.test.ts b/packages/effect/test/Schema/JSONSchema.test.ts index ebbf7bba0f4..f4e5fdbaa3b 100644 --- a/packages/effect/test/Schema/JSONSchema.test.ts +++ b/packages/effect/test/Schema/JSONSchema.test.ts @@ -1,3 +1,4 @@ +import { describe, it } from "@effect/vitest" import Ajv from "ajv" import * as A from "effect/Arbitrary" import * as JSONSchema from "effect/JSONSchema" @@ -5,7 +6,6 @@ import * as Schema from "effect/Schema" import * as AST from "effect/SchemaAST" import { assertFalse, assertTrue, deepStrictEqual, throws } from "effect/test/util" import * as fc from "fast-check" -import { describe, it } from "vitest" type Root = JSONSchema.JsonSchema7Root diff --git a/packages/effect/test/Schema/ParseResult.test.ts b/packages/effect/test/Schema/ParseResult.test.ts index 5e70fa092d7..e4bab1e09d6 100644 --- a/packages/effect/test/Schema/ParseResult.test.ts +++ b/packages/effect/test/Schema/ParseResult.test.ts @@ -1,3 +1,4 @@ +import { describe, it } from "@effect/vitest" import { Cause, Effect, Either, ParseResult } from "effect" import * as S from "effect/Schema" import * as AST from "effect/SchemaAST" @@ -11,7 +12,6 @@ import { throws } from "effect/test/util" import { inspect } from "node:util" -import { describe, it } from "vitest" const asEffect = (either: Either.Either): Effect.Effect => either diff --git a/packages/effect/test/Schema/ParseResultFormatter.test.ts b/packages/effect/test/Schema/ParseResultFormatter.test.ts index 366b7f73a63..0cefecc15ea 100644 --- a/packages/effect/test/Schema/ParseResultFormatter.test.ts +++ b/packages/effect/test/Schema/ParseResultFormatter.test.ts @@ -1,3 +1,4 @@ +import { describe, it } from "@effect/vitest" import * as Context from "effect/Context" import * as Effect from "effect/Effect" import * as Either from "effect/Either" @@ -9,7 +10,6 @@ import type { ParseOptions } from "effect/SchemaAST" import * as AST from "effect/SchemaAST" import * as Util from "effect/test/Schema/TestUtils" import { assertLeft } from "effect/test/util" -import { describe, it } from "vitest" const options: ParseOptions = { errors: "all", onExcessProperty: "error" } diff --git a/packages/effect/test/Schema/Pretty.test.ts b/packages/effect/test/Schema/Pretty.test.ts index 0053badbc00..c8ff0d90595 100644 --- a/packages/effect/test/Schema/Pretty.test.ts +++ b/packages/effect/test/Schema/Pretty.test.ts @@ -1,10 +1,10 @@ +import { describe, it } from "@effect/vitest" import { isUnknown } from "effect/Predicate" import * as Pretty from "effect/Pretty" import * as S from "effect/Schema" import * as AST from "effect/SchemaAST" import * as Util from "effect/test/Schema/TestUtils" import { strictEqual, throws } from "effect/test/util" -import { describe, it } from "vitest" describe("Pretty", () => { it("make", () => { diff --git a/packages/effect/test/Schema/Schema/Any/Any.test.ts b/packages/effect/test/Schema/Schema/Any/Any.test.ts index d65f80e0dc3..d78274e9a62 100644 --- a/packages/effect/test/Schema/Schema/Any/Any.test.ts +++ b/packages/effect/test/Schema/Schema/Any/Any.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("Any", () => { const schema = S.Any diff --git a/packages/effect/test/Schema/Schema/Array/Array.test.ts b/packages/effect/test/Schema/Schema/Array/Array.test.ts index ca0d1ec5da2..fb663af9285 100644 --- a/packages/effect/test/Schema/Schema/Array/Array.test.ts +++ b/packages/effect/test/Schema/Schema/Array/Array.test.ts @@ -1,9 +1,9 @@ +import { describe, it } from "@effect/vitest" import * as Either from "effect/Either" import * as ParseResult from "effect/ParseResult" import * as S from "effect/Schema" import * as AST from "effect/SchemaAST" import { deepStrictEqual, strictEqual } from "effect/test/util" -import { describe, it } from "vitest" describe("Array", () => { it("annotations()", () => { diff --git a/packages/effect/test/Schema/Schema/Array/head.test.ts b/packages/effect/test/Schema/Schema/Array/head.test.ts index 8339825be6d..4c36ab2094a 100644 --- a/packages/effect/test/Schema/Schema/Array/head.test.ts +++ b/packages/effect/test/Schema/Schema/Array/head.test.ts @@ -1,7 +1,7 @@ +import { describe, it } from "@effect/vitest" import * as Option from "effect/Option" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("head", () => { it("decoding", async () => { diff --git a/packages/effect/test/Schema/Schema/Array/headNonEmpty.test.ts b/packages/effect/test/Schema/Schema/Array/headNonEmpty.test.ts index 09788c6954e..bce86e1b1d8 100644 --- a/packages/effect/test/Schema/Schema/Array/headNonEmpty.test.ts +++ b/packages/effect/test/Schema/Schema/Array/headNonEmpty.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("headNonEmpty", () => { it("decoding", async () => { diff --git a/packages/effect/test/Schema/Schema/Array/headOrElse.test.ts b/packages/effect/test/Schema/Schema/Array/headOrElse.test.ts index 9e98242f64b..0482256ef85 100644 --- a/packages/effect/test/Schema/Schema/Array/headOrElse.test.ts +++ b/packages/effect/test/Schema/Schema/Array/headOrElse.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("headOrElse", () => { it("decoding (without fallback)", async () => { diff --git a/packages/effect/test/Schema/Schema/Array/itemsCount.test.ts b/packages/effect/test/Schema/Schema/Array/itemsCount.test.ts index 24f015f37d3..84576559e9b 100644 --- a/packages/effect/test/Schema/Schema/Array/itemsCount.test.ts +++ b/packages/effect/test/Schema/Schema/Array/itemsCount.test.ts @@ -1,7 +1,7 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" import { throws } from "effect/test/util" -import { describe, it } from "vitest" describe("itemsCount", () => { it("should throw for invalid argument", () => { diff --git a/packages/effect/test/Schema/Schema/Array/maxItems.test.ts b/packages/effect/test/Schema/Schema/Array/maxItems.test.ts index f67a0aba3fd..cf4455b6e59 100644 --- a/packages/effect/test/Schema/Schema/Array/maxItems.test.ts +++ b/packages/effect/test/Schema/Schema/Array/maxItems.test.ts @@ -1,7 +1,7 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" import { throws } from "effect/test/util" -import { describe, it } from "vitest" describe("maxItems", () => { it("should throw for invalid argument", () => { diff --git a/packages/effect/test/Schema/Schema/Array/minItems.test.ts b/packages/effect/test/Schema/Schema/Array/minItems.test.ts index 0fe240040ca..a94afa6a4e3 100644 --- a/packages/effect/test/Schema/Schema/Array/minItems.test.ts +++ b/packages/effect/test/Schema/Schema/Array/minItems.test.ts @@ -1,7 +1,7 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" import { throws } from "effect/test/util" -import { describe, it } from "vitest" describe("minItems", () => { it("should throw for invalid argument", () => { diff --git a/packages/effect/test/Schema/Schema/ArrayEnsure.test.ts b/packages/effect/test/Schema/Schema/ArrayEnsure.test.ts index 863ee7b6c06..060922c3c9a 100644 --- a/packages/effect/test/Schema/Schema/ArrayEnsure.test.ts +++ b/packages/effect/test/Schema/Schema/ArrayEnsure.test.ts @@ -1,8 +1,8 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as AST from "effect/SchemaAST" import * as Util from "effect/test/Schema/TestUtils" import { deepStrictEqual } from "effect/test/util" -import { describe, it } from "vitest" describe("ArrayEnsure", () => { it("annotations()", () => { diff --git a/packages/effect/test/Schema/Schema/ArrayFormatterIssue/ArrayFormatterIssue.test.ts b/packages/effect/test/Schema/Schema/ArrayFormatterIssue/ArrayFormatterIssue.test.ts index 7e7620eabed..b546e11d73d 100644 --- a/packages/effect/test/Schema/Schema/ArrayFormatterIssue/ArrayFormatterIssue.test.ts +++ b/packages/effect/test/Schema/Schema/ArrayFormatterIssue/ArrayFormatterIssue.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("ArrayFormatterIssue", () => { const schema = S.ArrayFormatterIssue diff --git a/packages/effect/test/Schema/Schema/BigDecimal/BigDecimal.test.ts b/packages/effect/test/Schema/Schema/BigDecimal/BigDecimal.test.ts index d05761b5fb4..46661d54264 100644 --- a/packages/effect/test/Schema/Schema/BigDecimal/BigDecimal.test.ts +++ b/packages/effect/test/Schema/Schema/BigDecimal/BigDecimal.test.ts @@ -1,7 +1,7 @@ +import { describe, it } from "@effect/vitest" import { BigDecimal } from "effect" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("BigDecimal", () => { const schema = S.BigDecimal diff --git a/packages/effect/test/Schema/Schema/BigDecimal/BigDecimalFromNumber.test.ts b/packages/effect/test/Schema/Schema/BigDecimal/BigDecimalFromNumber.test.ts index 4056fd96d5f..54baf1c735e 100644 --- a/packages/effect/test/Schema/Schema/BigDecimal/BigDecimalFromNumber.test.ts +++ b/packages/effect/test/Schema/Schema/BigDecimal/BigDecimalFromNumber.test.ts @@ -1,7 +1,7 @@ +import { describe, it } from "@effect/vitest" import { BigDecimal } from "effect" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("BigDecimalFromNumber", () => { const schema = S.BigDecimalFromNumber diff --git a/packages/effect/test/Schema/Schema/BigDecimal/BigDecimalFromSelf.test.ts b/packages/effect/test/Schema/Schema/BigDecimal/BigDecimalFromSelf.test.ts index eb654f2b557..f95ab4ef0c7 100644 --- a/packages/effect/test/Schema/Schema/BigDecimal/BigDecimalFromSelf.test.ts +++ b/packages/effect/test/Schema/Schema/BigDecimal/BigDecimalFromSelf.test.ts @@ -1,8 +1,8 @@ +import { describe, it } from "@effect/vitest" import { BigDecimal } from "effect" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" import { assertFalse, assertTrue } from "effect/test/util" -import { describe, it } from "vitest" describe("BigDecimalFromSelf", () => { const schema = S.BigDecimalFromSelf diff --git a/packages/effect/test/Schema/Schema/BigDecimal/NegativeBigDecimalFromSelf.test.ts b/packages/effect/test/Schema/Schema/BigDecimal/NegativeBigDecimalFromSelf.test.ts index e0bed520ebc..b55f0b05c23 100644 --- a/packages/effect/test/Schema/Schema/BigDecimal/NegativeBigDecimalFromSelf.test.ts +++ b/packages/effect/test/Schema/Schema/BigDecimal/NegativeBigDecimalFromSelf.test.ts @@ -1,7 +1,7 @@ +import { describe, it } from "@effect/vitest" import { BigDecimal } from "effect" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("NegativeBigDecimalFromSelf", () => { const schema = S.NegativeBigDecimalFromSelf diff --git a/packages/effect/test/Schema/Schema/BigDecimal/NonNegativeBigDecimalFromSelf.test.ts b/packages/effect/test/Schema/Schema/BigDecimal/NonNegativeBigDecimalFromSelf.test.ts index b10dc215b43..654f8756dd1 100644 --- a/packages/effect/test/Schema/Schema/BigDecimal/NonNegativeBigDecimalFromSelf.test.ts +++ b/packages/effect/test/Schema/Schema/BigDecimal/NonNegativeBigDecimalFromSelf.test.ts @@ -1,7 +1,7 @@ +import { describe, it } from "@effect/vitest" import { BigDecimal } from "effect" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("NonNegativeBigDecimalFromSelf", () => { const schema = S.NonNegativeBigDecimalFromSelf diff --git a/packages/effect/test/Schema/Schema/BigDecimal/NonPositiveBigDecimalFromSelf.test.ts b/packages/effect/test/Schema/Schema/BigDecimal/NonPositiveBigDecimalFromSelf.test.ts index 09ccb55b9cb..63d690ebd44 100644 --- a/packages/effect/test/Schema/Schema/BigDecimal/NonPositiveBigDecimalFromSelf.test.ts +++ b/packages/effect/test/Schema/Schema/BigDecimal/NonPositiveBigDecimalFromSelf.test.ts @@ -1,7 +1,7 @@ +import { describe, it } from "@effect/vitest" import { BigDecimal } from "effect" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("NonPositiveBigDecimalFromSelf", () => { const schema = S.NonPositiveBigDecimalFromSelf diff --git a/packages/effect/test/Schema/Schema/BigDecimal/PositiveBigDecimalFromSelf.test.ts b/packages/effect/test/Schema/Schema/BigDecimal/PositiveBigDecimalFromSelf.test.ts index 65ff8a462ca..9896df7529b 100644 --- a/packages/effect/test/Schema/Schema/BigDecimal/PositiveBigDecimalFromSelf.test.ts +++ b/packages/effect/test/Schema/Schema/BigDecimal/PositiveBigDecimalFromSelf.test.ts @@ -1,7 +1,7 @@ +import { describe, it } from "@effect/vitest" import { BigDecimal } from "effect" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("PositiveBigDecimalFromSelf", () => { const schema = S.PositiveBigDecimalFromSelf diff --git a/packages/effect/test/Schema/Schema/BigDecimal/betweenBigDecimal.test.ts b/packages/effect/test/Schema/Schema/BigDecimal/betweenBigDecimal.test.ts index e5254fb6a6c..51b9a589f6b 100644 --- a/packages/effect/test/Schema/Schema/BigDecimal/betweenBigDecimal.test.ts +++ b/packages/effect/test/Schema/Schema/BigDecimal/betweenBigDecimal.test.ts @@ -1,7 +1,7 @@ +import { describe, it } from "@effect/vitest" import { BigDecimal } from "effect" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" const max = BigDecimal.make(1n, 0) const min = BigDecimal.make(-1n, 0) diff --git a/packages/effect/test/Schema/Schema/BigDecimal/clampBigDecimal.test.ts b/packages/effect/test/Schema/Schema/BigDecimal/clampBigDecimal.test.ts index 291a7723456..3e2987f803d 100644 --- a/packages/effect/test/Schema/Schema/BigDecimal/clampBigDecimal.test.ts +++ b/packages/effect/test/Schema/Schema/BigDecimal/clampBigDecimal.test.ts @@ -1,7 +1,7 @@ +import { describe, it } from "@effect/vitest" import { BigDecimal } from "effect" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("clampBigDecimal", () => { it("decoding", async () => { diff --git a/packages/effect/test/Schema/Schema/BigDecimal/greaterThanBigDecimal.test.ts b/packages/effect/test/Schema/Schema/BigDecimal/greaterThanBigDecimal.test.ts index 2aaea50f8e0..3cf0000894d 100644 --- a/packages/effect/test/Schema/Schema/BigDecimal/greaterThanBigDecimal.test.ts +++ b/packages/effect/test/Schema/Schema/BigDecimal/greaterThanBigDecimal.test.ts @@ -1,7 +1,7 @@ +import { describe, it } from "@effect/vitest" import { BigDecimal } from "effect" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("greaterThanBigDecimal", () => { const min = BigDecimal.fromNumber(10) diff --git a/packages/effect/test/Schema/Schema/BigDecimal/greaterThanOrEqualToBigDecimal.test.ts b/packages/effect/test/Schema/Schema/BigDecimal/greaterThanOrEqualToBigDecimal.test.ts index 7137d9e6f44..78e8c59718d 100644 --- a/packages/effect/test/Schema/Schema/BigDecimal/greaterThanOrEqualToBigDecimal.test.ts +++ b/packages/effect/test/Schema/Schema/BigDecimal/greaterThanOrEqualToBigDecimal.test.ts @@ -1,7 +1,7 @@ +import { describe, it } from "@effect/vitest" import { BigDecimal } from "effect" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("greaterThanOrEqualToBigDecimal", () => { const min = BigDecimal.fromNumber(10) diff --git a/packages/effect/test/Schema/Schema/BigDecimal/lessThanBigDecimal.test.ts b/packages/effect/test/Schema/Schema/BigDecimal/lessThanBigDecimal.test.ts index d753ad06058..9729831c4ab 100644 --- a/packages/effect/test/Schema/Schema/BigDecimal/lessThanBigDecimal.test.ts +++ b/packages/effect/test/Schema/Schema/BigDecimal/lessThanBigDecimal.test.ts @@ -1,7 +1,7 @@ +import { describe, it } from "@effect/vitest" import { BigDecimal } from "effect" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("lessThanBigDecimal", () => { const max = BigDecimal.fromNumber(5) diff --git a/packages/effect/test/Schema/Schema/BigDecimal/lessThanOrEqualToBigDecimal.test.ts b/packages/effect/test/Schema/Schema/BigDecimal/lessThanOrEqualToBigDecimal.test.ts index bcba60d9b4d..a257219f622 100644 --- a/packages/effect/test/Schema/Schema/BigDecimal/lessThanOrEqualToBigDecimal.test.ts +++ b/packages/effect/test/Schema/Schema/BigDecimal/lessThanOrEqualToBigDecimal.test.ts @@ -1,7 +1,7 @@ +import { describe, it } from "@effect/vitest" import { BigDecimal } from "effect" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("lessThanOrEqualToBigDecimal", () => { const max = BigDecimal.unsafeFromNumber(5) diff --git a/packages/effect/test/Schema/Schema/BigInt/BigInt.test.ts b/packages/effect/test/Schema/Schema/BigInt/BigInt.test.ts index 0ea941da3ea..f2ef82e6e48 100644 --- a/packages/effect/test/Schema/Schema/BigInt/BigInt.test.ts +++ b/packages/effect/test/Schema/Schema/BigInt/BigInt.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("BigInt", () => { const schema = S.BigInt diff --git a/packages/effect/test/Schema/Schema/BigInt/BigIntFromNumber.test.ts b/packages/effect/test/Schema/Schema/BigInt/BigIntFromNumber.test.ts index a432a4dd1f2..d5d543f4914 100644 --- a/packages/effect/test/Schema/Schema/BigInt/BigIntFromNumber.test.ts +++ b/packages/effect/test/Schema/Schema/BigInt/BigIntFromNumber.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("BigIntFromNumber", () => { const schema = S.BigIntFromNumber diff --git a/packages/effect/test/Schema/Schema/BigInt/BigIntFromSelf.test.ts b/packages/effect/test/Schema/Schema/BigInt/BigIntFromSelf.test.ts index bac62fa2087..a0157582c13 100644 --- a/packages/effect/test/Schema/Schema/BigInt/BigIntFromSelf.test.ts +++ b/packages/effect/test/Schema/Schema/BigInt/BigIntFromSelf.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("BigIntFromSelf", () => { const schema = S.BigIntFromSelf diff --git a/packages/effect/test/Schema/Schema/BigInt/NegativeBigIntFromSelf.test.ts b/packages/effect/test/Schema/Schema/BigInt/NegativeBigIntFromSelf.test.ts index 2c149788090..98cf5c91fa4 100644 --- a/packages/effect/test/Schema/Schema/BigInt/NegativeBigIntFromSelf.test.ts +++ b/packages/effect/test/Schema/Schema/BigInt/NegativeBigIntFromSelf.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("NegativeBigIntFromSelf", () => { const schema = S.NegativeBigIntFromSelf diff --git a/packages/effect/test/Schema/Schema/BigInt/NonNegativeBigIntFromSelf.test.ts b/packages/effect/test/Schema/Schema/BigInt/NonNegativeBigIntFromSelf.test.ts index c5cf86b9690..64fb231a5ef 100644 --- a/packages/effect/test/Schema/Schema/BigInt/NonNegativeBigIntFromSelf.test.ts +++ b/packages/effect/test/Schema/Schema/BigInt/NonNegativeBigIntFromSelf.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("NonNegativeBigIntFromSelf", () => { const schema = S.NonNegativeBigIntFromSelf diff --git a/packages/effect/test/Schema/Schema/BigInt/NonPositiveBigIntFromSelf.test.ts b/packages/effect/test/Schema/Schema/BigInt/NonPositiveBigIntFromSelf.test.ts index 5f4e902cf13..913bbd49ea2 100644 --- a/packages/effect/test/Schema/Schema/BigInt/NonPositiveBigIntFromSelf.test.ts +++ b/packages/effect/test/Schema/Schema/BigInt/NonPositiveBigIntFromSelf.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("NonPositiveBigIntFromSelf", () => { const schema = S.NonPositiveBigIntFromSelf diff --git a/packages/effect/test/Schema/Schema/BigInt/PositiveBigIntFromSelf.test.ts b/packages/effect/test/Schema/Schema/BigInt/PositiveBigIntFromSelf.test.ts index 89872e4f8f6..cb564ce8505 100644 --- a/packages/effect/test/Schema/Schema/BigInt/PositiveBigIntFromSelf.test.ts +++ b/packages/effect/test/Schema/Schema/BigInt/PositiveBigIntFromSelf.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("PositiveBigIntFromSelf", () => { const schema = S.PositiveBigIntFromSelf diff --git a/packages/effect/test/Schema/Schema/BigInt/betweenBigInt.test.ts b/packages/effect/test/Schema/Schema/BigInt/betweenBigInt.test.ts index 233f7952c9f..ce1655f11c4 100644 --- a/packages/effect/test/Schema/Schema/BigInt/betweenBigInt.test.ts +++ b/packages/effect/test/Schema/Schema/BigInt/betweenBigInt.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("betweenBigInt", () => { const schema = S.BigIntFromSelf.pipe(S.betweenBigInt(-1n, 1n)).annotations({ diff --git a/packages/effect/test/Schema/Schema/BigInt/clampBigInt.test.ts b/packages/effect/test/Schema/Schema/BigInt/clampBigInt.test.ts index 5ea66499462..5b2b81e54e5 100644 --- a/packages/effect/test/Schema/Schema/BigInt/clampBigInt.test.ts +++ b/packages/effect/test/Schema/Schema/BigInt/clampBigInt.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("clampBigInt", () => { it("decoding", async () => { diff --git a/packages/effect/test/Schema/Schema/BigInt/greaterThanBigInt.test.ts b/packages/effect/test/Schema/Schema/BigInt/greaterThanBigInt.test.ts index e8f5e18fe54..03119cc9eed 100644 --- a/packages/effect/test/Schema/Schema/BigInt/greaterThanBigInt.test.ts +++ b/packages/effect/test/Schema/Schema/BigInt/greaterThanBigInt.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("greaterThanBigInt", () => { const schema = S.BigIntFromSelf.pipe(S.greaterThanBigInt(0n)) diff --git a/packages/effect/test/Schema/Schema/BigInt/greaterThanOrEqualToBigInt.test.ts b/packages/effect/test/Schema/Schema/BigInt/greaterThanOrEqualToBigInt.test.ts index 3ef3e3ad5c2..15c52e4cbfd 100644 --- a/packages/effect/test/Schema/Schema/BigInt/greaterThanOrEqualToBigInt.test.ts +++ b/packages/effect/test/Schema/Schema/BigInt/greaterThanOrEqualToBigInt.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("greaterThanOrEqualToBigInt", () => { const schema = S.BigIntFromSelf.pipe(S.greaterThanOrEqualToBigInt(0n)) diff --git a/packages/effect/test/Schema/Schema/BigInt/lessThanBigInt.test.ts b/packages/effect/test/Schema/Schema/BigInt/lessThanBigInt.test.ts index 767dd5e52b8..8eb9846cdfb 100644 --- a/packages/effect/test/Schema/Schema/BigInt/lessThanBigInt.test.ts +++ b/packages/effect/test/Schema/Schema/BigInt/lessThanBigInt.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("lessThanBigInt", () => { const schema = S.BigIntFromSelf.pipe(S.lessThanBigInt(0n)) diff --git a/packages/effect/test/Schema/Schema/BigInt/lessThanOrEqualToBigInt.test.ts b/packages/effect/test/Schema/Schema/BigInt/lessThanOrEqualToBigInt.test.ts index 28557e49d28..a0c7a99f698 100644 --- a/packages/effect/test/Schema/Schema/BigInt/lessThanOrEqualToBigInt.test.ts +++ b/packages/effect/test/Schema/Schema/BigInt/lessThanOrEqualToBigInt.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("lessThanOrEqualToBigInt", () => { const schema = S.BigIntFromSelf.pipe(S.lessThanOrEqualToBigInt(0n)) diff --git a/packages/effect/test/Schema/Schema/Boolean/Boolean.test.ts b/packages/effect/test/Schema/Schema/Boolean/Boolean.test.ts index d17e8e5519f..527cd502d9b 100644 --- a/packages/effect/test/Schema/Schema/Boolean/Boolean.test.ts +++ b/packages/effect/test/Schema/Schema/Boolean/Boolean.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("Boolean", () => { const schema = S.Boolean diff --git a/packages/effect/test/Schema/Schema/Boolean/BooleanFromString.test.ts b/packages/effect/test/Schema/Schema/Boolean/BooleanFromString.test.ts index 2dc9e1d8456..b5c8ab46d1b 100644 --- a/packages/effect/test/Schema/Schema/Boolean/BooleanFromString.test.ts +++ b/packages/effect/test/Schema/Schema/Boolean/BooleanFromString.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("BooleanFromString", () => { const schema = S.BooleanFromString diff --git a/packages/effect/test/Schema/Schema/Boolean/BooleanFromUnknown.test.ts b/packages/effect/test/Schema/Schema/Boolean/BooleanFromUnknown.test.ts index ee5e42d08ca..6604fe7c3bf 100644 --- a/packages/effect/test/Schema/Schema/Boolean/BooleanFromUnknown.test.ts +++ b/packages/effect/test/Schema/Schema/Boolean/BooleanFromUnknown.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("BooleanFromUnknown", () => { const schema = S.BooleanFromUnknown diff --git a/packages/effect/test/Schema/Schema/Boolean/Not.test.ts b/packages/effect/test/Schema/Schema/Boolean/Not.test.ts index 25415af2a0a..48c6560c924 100644 --- a/packages/effect/test/Schema/Schema/Boolean/Not.test.ts +++ b/packages/effect/test/Schema/Schema/Boolean/Not.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("Not", () => { const schema = S.Not diff --git a/packages/effect/test/Schema/Schema/Cause/Cause.test.ts b/packages/effect/test/Schema/Schema/Cause/Cause.test.ts index f2e7d4b79a8..6342ddb6200 100644 --- a/packages/effect/test/Schema/Schema/Cause/Cause.test.ts +++ b/packages/effect/test/Schema/Schema/Cause/Cause.test.ts @@ -1,8 +1,8 @@ +import { describe, it } from "@effect/vitest" import { Cause, FiberId } from "effect" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" import { assertTrue, deepStrictEqual, strictEqual } from "effect/test/util" -import { describe, it } from "vitest" describe("Cause", () => { it("test roundtrip consistency", () => { diff --git a/packages/effect/test/Schema/Schema/Cause/CauseFromSelf.test.ts b/packages/effect/test/Schema/Schema/Cause/CauseFromSelf.test.ts index 56751f2ab15..7f817f285bc 100644 --- a/packages/effect/test/Schema/Schema/Cause/CauseFromSelf.test.ts +++ b/packages/effect/test/Schema/Schema/Cause/CauseFromSelf.test.ts @@ -1,8 +1,8 @@ +import { describe, it } from "@effect/vitest" import * as Cause from "effect/Cause" import * as FiberId from "effect/FiberId" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("CauseFromSelf", () => { it("arbitrary", () => { diff --git a/packages/effect/test/Schema/Schema/Chunk/Chunk.test.ts b/packages/effect/test/Schema/Schema/Chunk/Chunk.test.ts index 07b217977b7..3a8bec0c5df 100644 --- a/packages/effect/test/Schema/Schema/Chunk/Chunk.test.ts +++ b/packages/effect/test/Schema/Schema/Chunk/Chunk.test.ts @@ -1,7 +1,7 @@ +import { describe, it } from "@effect/vitest" import * as C from "effect/Chunk" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("Chunk", () => { it("test roundtrip consistency", () => { diff --git a/packages/effect/test/Schema/Schema/Chunk/ChunkFromSelf.test.ts b/packages/effect/test/Schema/Schema/Chunk/ChunkFromSelf.test.ts index 7f425814844..d5b83fc397c 100644 --- a/packages/effect/test/Schema/Schema/Chunk/ChunkFromSelf.test.ts +++ b/packages/effect/test/Schema/Schema/Chunk/ChunkFromSelf.test.ts @@ -1,9 +1,9 @@ +import { describe, it } from "@effect/vitest" import * as C from "effect/Chunk" import * as P from "effect/ParseResult" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" import { assertFalse, assertTrue } from "effect/test/util" -import { describe, it } from "vitest" describe("ChunkFromSelf", () => { it("test roundtrip consistency", () => { diff --git a/packages/effect/test/Schema/Schema/Chunk/NonEmptyChunk.test.ts b/packages/effect/test/Schema/Schema/Chunk/NonEmptyChunk.test.ts index 003efa4c8a4..fc04edac45f 100644 --- a/packages/effect/test/Schema/Schema/Chunk/NonEmptyChunk.test.ts +++ b/packages/effect/test/Schema/Schema/Chunk/NonEmptyChunk.test.ts @@ -1,7 +1,7 @@ +import { describe, it } from "@effect/vitest" import * as C from "effect/Chunk" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("NonEmptyChunk", () => { it("test roundtrip consistency", () => { diff --git a/packages/effect/test/Schema/Schema/Chunk/NonEmptyChunkFromSelf.test.ts b/packages/effect/test/Schema/Schema/Chunk/NonEmptyChunkFromSelf.test.ts index 925ad9ed20d..eafa7bbb419 100644 --- a/packages/effect/test/Schema/Schema/Chunk/NonEmptyChunkFromSelf.test.ts +++ b/packages/effect/test/Schema/Schema/Chunk/NonEmptyChunkFromSelf.test.ts @@ -1,10 +1,10 @@ +import { describe, it } from "@effect/vitest" import * as Arbitrary from "effect/Arbitrary" import * as C from "effect/Chunk" import * as FastCheck from "effect/FastCheck" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" import { assertFalse, assertTrue } from "effect/test/util" -import { describe, it } from "vitest" describe("NonEmptyChunkFromSelf", () => { it("test roundtrip consistency", () => { diff --git a/packages/effect/test/Schema/Schema/Class/Class.test.ts b/packages/effect/test/Schema/Schema/Class/Class.test.ts index f5ee4b4d3da..02edf927736 100644 --- a/packages/effect/test/Schema/Schema/Class/Class.test.ts +++ b/packages/effect/test/Schema/Schema/Class/Class.test.ts @@ -1,7 +1,7 @@ +import { describe, it } from "@effect/vitest" import { Context, Data, Effect, Equal, JSONSchema, ParseResult, Schema as S, SchemaAST as AST } from "effect" import * as Util from "effect/test/Schema/TestUtils" import { assertFalse, assertSome, assertTrue, deepStrictEqual, strictEqual, throws } from "effect/test/util" -import { describe, it } from "vitest" class Person extends S.Class("Person")({ id: S.Number, diff --git a/packages/effect/test/Schema/Schema/Class/TaggedClass.test.ts b/packages/effect/test/Schema/Schema/Class/TaggedClass.test.ts index 230e201d717..900a85fffd6 100644 --- a/packages/effect/test/Schema/Schema/Class/TaggedClass.test.ts +++ b/packages/effect/test/Schema/Schema/Class/TaggedClass.test.ts @@ -1,8 +1,8 @@ +import { describe, it } from "@effect/vitest" import { pipe, Struct } from "effect" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" import { assertFalse, assertTrue, deepStrictEqual, strictEqual, throws } from "effect/test/util" -import { describe, it } from "vitest" describe("TaggedClass", () => { it("the constructor should add a `_tag` field", () => { diff --git a/packages/effect/test/Schema/Schema/Class/TaggedError.test.ts b/packages/effect/test/Schema/Schema/Class/TaggedError.test.ts index 18893b58f3d..f34281652ca 100644 --- a/packages/effect/test/Schema/Schema/Class/TaggedError.test.ts +++ b/packages/effect/test/Schema/Schema/Class/TaggedError.test.ts @@ -1,8 +1,8 @@ +import { describe, it } from "@effect/vitest" import { Cause, Effect, Inspectable, Schema } from "effect" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" import { assertTrue, deepStrictEqual, strictEqual } from "effect/test/util" -import { describe, it } from "vitest" describe("TaggedError", () => { it("should expose the fields and the tag", () => { diff --git a/packages/effect/test/Schema/Schema/Class/TaggedRequest.test.ts b/packages/effect/test/Schema/Schema/Class/TaggedRequest.test.ts index eb1c73d6a5d..61971f43160 100644 --- a/packages/effect/test/Schema/Schema/Class/TaggedRequest.test.ts +++ b/packages/effect/test/Schema/Schema/Class/TaggedRequest.test.ts @@ -1,3 +1,4 @@ +import { describe, it } from "@effect/vitest" import { Context, Effect, Exit } from "effect" import * as Equal from "effect/Equal" import * as ParseResult from "effect/ParseResult" @@ -5,7 +6,6 @@ import * as Request from "effect/Request" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" import { assertTrue, deepStrictEqual, strictEqual } from "effect/test/util" -import { describe, it } from "vitest" const Name = Context.GenericTag<"Name", string>("Name") const NameString = S.String.pipe( diff --git a/packages/effect/test/Schema/Schema/Class/extend.test.ts b/packages/effect/test/Schema/Schema/Class/extend.test.ts index c7d47e1a519..e680e28ac61 100644 --- a/packages/effect/test/Schema/Schema/Class/extend.test.ts +++ b/packages/effect/test/Schema/Schema/Class/extend.test.ts @@ -1,7 +1,7 @@ +import { describe, it } from "@effect/vitest" import { JSONSchema, Schema as S, SchemaAST as AST } from "effect" import * as Util from "effect/test/Schema/TestUtils" import { assertSome, assertTrue, deepStrictEqual, strictEqual } from "effect/test/util" -import { describe, it } from "vitest" class Person extends S.Class("Person")({ id: S.Number, diff --git a/packages/effect/test/Schema/Schema/Class/transformOrFail.test.ts b/packages/effect/test/Schema/Schema/Class/transformOrFail.test.ts index 66854912bfd..ccf39f71d0f 100644 --- a/packages/effect/test/Schema/Schema/Class/transformOrFail.test.ts +++ b/packages/effect/test/Schema/Schema/Class/transformOrFail.test.ts @@ -1,9 +1,9 @@ +import { describe, it } from "@effect/vitest" import * as Option from "effect/Option" import * as ParseResult from "effect/ParseResult" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" import { assertTrue, deepStrictEqual, strictEqual } from "effect/test/util" -import { describe, it } from "vitest" class Person extends S.Class("Person")({ id: S.Number, diff --git a/packages/effect/test/Schema/Schema/Class/transformOrFailFrom.test.ts b/packages/effect/test/Schema/Schema/Class/transformOrFailFrom.test.ts index 3923b9638ad..47cd4ccfc52 100644 --- a/packages/effect/test/Schema/Schema/Class/transformOrFailFrom.test.ts +++ b/packages/effect/test/Schema/Schema/Class/transformOrFailFrom.test.ts @@ -1,9 +1,9 @@ +import { describe, it } from "@effect/vitest" import * as Option from "effect/Option" import * as ParseResult from "effect/ParseResult" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" import { assertTrue, deepStrictEqual, strictEqual } from "effect/test/util" -import { describe, it } from "vitest" class Person extends S.Class("Person")({ id: S.Number, diff --git a/packages/effect/test/Schema/Schema/Config/Config.test.ts b/packages/effect/test/Schema/Schema/Config/Config.test.ts index 3404399390a..202825ef206 100644 --- a/packages/effect/test/Schema/Schema/Config/Config.test.ts +++ b/packages/effect/test/Schema/Schema/Config/Config.test.ts @@ -1,7 +1,7 @@ +import { describe, it } from "@effect/vitest" import type { Config } from "effect" import { Cause, ConfigError, ConfigProvider, Effect, Schema } from "effect" import { assertFailure, assertSuccess } from "effect/test/util" -import { describe, it } from "vitest" /** * Asserts that loading a configuration with invalid data fails with the expected error. diff --git a/packages/effect/test/Schema/Schema/Data/Data.test.ts b/packages/effect/test/Schema/Schema/Data/Data.test.ts index 29170d15d70..261ab080a62 100644 --- a/packages/effect/test/Schema/Schema/Data/Data.test.ts +++ b/packages/effect/test/Schema/Schema/Data/Data.test.ts @@ -1,7 +1,7 @@ +import { describe, it } from "@effect/vitest" import * as Data from "effect/Data" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("Data", () => { it("test roundtrip consistency", () => { diff --git a/packages/effect/test/Schema/Schema/Data/DataFromSelf.test.ts b/packages/effect/test/Schema/Schema/Data/DataFromSelf.test.ts index bc1a09722a2..7af6de258fc 100644 --- a/packages/effect/test/Schema/Schema/Data/DataFromSelf.test.ts +++ b/packages/effect/test/Schema/Schema/Data/DataFromSelf.test.ts @@ -1,9 +1,9 @@ +import { describe, it } from "@effect/vitest" import * as Data from "effect/Data" import * as P from "effect/ParseResult" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" import { assertFalse, assertTrue } from "effect/test/util" -import { describe, it } from "vitest" describe("DataFromSelf", () => { it("test roundtrip consistency", () => { diff --git a/packages/effect/test/Schema/Schema/Date/Date.test.ts b/packages/effect/test/Schema/Schema/Date/Date.test.ts index bf66fa020a0..7e965ac61f2 100644 --- a/packages/effect/test/Schema/Schema/Date/Date.test.ts +++ b/packages/effect/test/Schema/Schema/Date/Date.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("Date", () => { const schema = S.Date diff --git a/packages/effect/test/Schema/Schema/Date/DateFromNumber.test.ts b/packages/effect/test/Schema/Schema/Date/DateFromNumber.test.ts index 9fd74183786..8f919111bca 100644 --- a/packages/effect/test/Schema/Schema/Date/DateFromNumber.test.ts +++ b/packages/effect/test/Schema/Schema/Date/DateFromNumber.test.ts @@ -1,7 +1,7 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" import { assertTrue, strictEqual } from "effect/test/util" -import { describe, it } from "vitest" describe("DateFromNumber", () => { it("decoding", async () => { diff --git a/packages/effect/test/Schema/Schema/Date/DateFromSelf.test.ts b/packages/effect/test/Schema/Schema/Date/DateFromSelf.test.ts index 01265efd01f..397d5e8dae4 100644 --- a/packages/effect/test/Schema/Schema/Date/DateFromSelf.test.ts +++ b/packages/effect/test/Schema/Schema/Date/DateFromSelf.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("DateFromSelf", () => { it("test roundtrip consistency", () => { diff --git a/packages/effect/test/Schema/Schema/Date/betweenDate.test.ts b/packages/effect/test/Schema/Schema/Date/betweenDate.test.ts index 8fd11ee1d7f..6f5ca8a681b 100644 --- a/packages/effect/test/Schema/Schema/Date/betweenDate.test.ts +++ b/packages/effect/test/Schema/Schema/Date/betweenDate.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("betweenDate", () => { const schema = S.DateFromSelf.pipe(S.betweenDate(new Date(-1), new Date(1))) diff --git a/packages/effect/test/Schema/Schema/Date/greaterThanDate.test.ts b/packages/effect/test/Schema/Schema/Date/greaterThanDate.test.ts index 167da6239fe..2113060b5ef 100644 --- a/packages/effect/test/Schema/Schema/Date/greaterThanDate.test.ts +++ b/packages/effect/test/Schema/Schema/Date/greaterThanDate.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("greaterThanDate", () => { const schema = S.DateFromSelf.pipe(S.greaterThanDate(new Date(0))) diff --git a/packages/effect/test/Schema/Schema/Date/greaterThanOrEqualToDate.test.ts b/packages/effect/test/Schema/Schema/Date/greaterThanOrEqualToDate.test.ts index a1f21710f1c..96a945d95b1 100644 --- a/packages/effect/test/Schema/Schema/Date/greaterThanOrEqualToDate.test.ts +++ b/packages/effect/test/Schema/Schema/Date/greaterThanOrEqualToDate.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("greaterThanOrEqualToDate", () => { const schema = S.DateFromSelf.pipe(S.greaterThanOrEqualToDate(new Date(0))) diff --git a/packages/effect/test/Schema/Schema/Date/lessThanDate.test.ts b/packages/effect/test/Schema/Schema/Date/lessThanDate.test.ts index b1319f560db..e017dce8ef1 100644 --- a/packages/effect/test/Schema/Schema/Date/lessThanDate.test.ts +++ b/packages/effect/test/Schema/Schema/Date/lessThanDate.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("lessThanDate", () => { const schema = S.DateFromSelf.pipe(S.lessThanDate(new Date(0))) diff --git a/packages/effect/test/Schema/Schema/Date/lessThanOrEqualToDate.test.ts b/packages/effect/test/Schema/Schema/Date/lessThanOrEqualToDate.test.ts index 07819a4f8f6..c27bf16a386 100644 --- a/packages/effect/test/Schema/Schema/Date/lessThanOrEqualToDate.test.ts +++ b/packages/effect/test/Schema/Schema/Date/lessThanOrEqualToDate.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("lessThanOrEqualToDate", () => { const schema = S.DateFromSelf.pipe(S.lessThanOrEqualToDate(new Date(0))) diff --git a/packages/effect/test/Schema/Schema/DateTime/DateTimeUtc.test.ts b/packages/effect/test/Schema/Schema/DateTime/DateTimeUtc.test.ts index 4a5815f196f..3609de47376 100644 --- a/packages/effect/test/Schema/Schema/DateTime/DateTimeUtc.test.ts +++ b/packages/effect/test/Schema/Schema/DateTime/DateTimeUtc.test.ts @@ -1,7 +1,7 @@ +import { describe, it } from "@effect/vitest" import { DateTime } from "effect" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("DateTimeUtc", () => { const schema = S.DateTimeUtc diff --git a/packages/effect/test/Schema/Schema/DateTime/DateTimeUtcFromDate.test.ts b/packages/effect/test/Schema/Schema/DateTime/DateTimeUtcFromDate.test.ts index 39b32f1371c..f9f56ab7d22 100644 --- a/packages/effect/test/Schema/Schema/DateTime/DateTimeUtcFromDate.test.ts +++ b/packages/effect/test/Schema/Schema/DateTime/DateTimeUtcFromDate.test.ts @@ -1,8 +1,8 @@ +import { describe, it } from "@effect/vitest" import * as DateTime from "effect/DateTime" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" import { deepStrictEqual } from "effect/test/util" -import { describe, it } from "vitest" describe("DateTimeUtcFromDate", () => { const schema = S.DateTimeUtcFromDate diff --git a/packages/effect/test/Schema/Schema/DateTime/DateTimeUtcFromNumber.test.ts b/packages/effect/test/Schema/Schema/DateTime/DateTimeUtcFromNumber.test.ts index 77134c2222f..6f5e96dcf0d 100644 --- a/packages/effect/test/Schema/Schema/DateTime/DateTimeUtcFromNumber.test.ts +++ b/packages/effect/test/Schema/Schema/DateTime/DateTimeUtcFromNumber.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("DateTimeUtcFromNumber", () => { const schema = S.DateTimeUtcFromNumber diff --git a/packages/effect/test/Schema/Schema/DateTime/DateTimeUtcFromSelf.test.ts b/packages/effect/test/Schema/Schema/DateTime/DateTimeUtcFromSelf.test.ts index b91f6c8a793..dd179924d96 100644 --- a/packages/effect/test/Schema/Schema/DateTime/DateTimeUtcFromSelf.test.ts +++ b/packages/effect/test/Schema/Schema/DateTime/DateTimeUtcFromSelf.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("DateTimeUtcFromSelf", () => { const schema = S.DateTimeUtcFromSelf diff --git a/packages/effect/test/Schema/Schema/DateTime/DateTimeZoned.test.ts b/packages/effect/test/Schema/Schema/DateTime/DateTimeZoned.test.ts index 4feb63f5f9d..12ca81dc820 100644 --- a/packages/effect/test/Schema/Schema/DateTime/DateTimeZoned.test.ts +++ b/packages/effect/test/Schema/Schema/DateTime/DateTimeZoned.test.ts @@ -1,7 +1,7 @@ +import { describe, it } from "@effect/vitest" import { DateTime } from "effect" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("DateTimeZoned", () => { const schema = S.DateTimeZoned diff --git a/packages/effect/test/Schema/Schema/DateTime/DateTimeZonedFromSelf.test.ts b/packages/effect/test/Schema/Schema/DateTime/DateTimeZonedFromSelf.test.ts index 810c5eae227..8efe2d1b683 100644 --- a/packages/effect/test/Schema/Schema/DateTime/DateTimeZonedFromSelf.test.ts +++ b/packages/effect/test/Schema/Schema/DateTime/DateTimeZonedFromSelf.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("DateTimeZonedFromSelf", () => { const schema = S.DateTimeZonedFromSelf diff --git a/packages/effect/test/Schema/Schema/DateTime/TimeZone.test.ts b/packages/effect/test/Schema/Schema/DateTime/TimeZone.test.ts index 78030391f18..45f4565a173 100644 --- a/packages/effect/test/Schema/Schema/DateTime/TimeZone.test.ts +++ b/packages/effect/test/Schema/Schema/DateTime/TimeZone.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("TimeZone", () => { const schema = S.TimeZone diff --git a/packages/effect/test/Schema/Schema/DateTime/TimeZoneFromSelf.test.ts b/packages/effect/test/Schema/Schema/DateTime/TimeZoneFromSelf.test.ts index 937d945a024..1df6fedc996 100644 --- a/packages/effect/test/Schema/Schema/DateTime/TimeZoneFromSelf.test.ts +++ b/packages/effect/test/Schema/Schema/DateTime/TimeZoneFromSelf.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("TimeZoneFromSelf", () => { const schema = S.TimeZoneFromSelf diff --git a/packages/effect/test/Schema/Schema/DateTime/TimeZoneNamed.test.ts b/packages/effect/test/Schema/Schema/DateTime/TimeZoneNamed.test.ts index c3fdcd0d5dc..5809c611dc0 100644 --- a/packages/effect/test/Schema/Schema/DateTime/TimeZoneNamed.test.ts +++ b/packages/effect/test/Schema/Schema/DateTime/TimeZoneNamed.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("TimeZoneNamed", () => { const schema = S.TimeZoneNamed diff --git a/packages/effect/test/Schema/Schema/DateTime/TimeZoneNamedFromSelf.test.ts b/packages/effect/test/Schema/Schema/DateTime/TimeZoneNamedFromSelf.test.ts index 7df82da37b3..03db8dd1cca 100644 --- a/packages/effect/test/Schema/Schema/DateTime/TimeZoneNamedFromSelf.test.ts +++ b/packages/effect/test/Schema/Schema/DateTime/TimeZoneNamedFromSelf.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("TimeZoneNamedFromSelf", () => { const schema = S.TimeZoneNamedFromSelf diff --git a/packages/effect/test/Schema/Schema/DateTime/TimeZoneOffset.test.ts b/packages/effect/test/Schema/Schema/DateTime/TimeZoneOffset.test.ts index fef13b23197..6eca53109fb 100644 --- a/packages/effect/test/Schema/Schema/DateTime/TimeZoneOffset.test.ts +++ b/packages/effect/test/Schema/Schema/DateTime/TimeZoneOffset.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("TimeZoneOffset", () => { const schema = S.TimeZoneOffset diff --git a/packages/effect/test/Schema/Schema/DateTime/TimeZoneOffsetFromSelf.test.ts b/packages/effect/test/Schema/Schema/DateTime/TimeZoneOffsetFromSelf.test.ts index f48fc39b1ab..b498895155c 100644 --- a/packages/effect/test/Schema/Schema/DateTime/TimeZoneOffsetFromSelf.test.ts +++ b/packages/effect/test/Schema/Schema/DateTime/TimeZoneOffsetFromSelf.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("TimeZoneOffsetFromSelf", () => { const schema = S.TimeZoneOffsetFromSelf diff --git a/packages/effect/test/Schema/Schema/DecodingFallbackAnnotation.test.ts b/packages/effect/test/Schema/Schema/DecodingFallbackAnnotation.test.ts index 2dec506c9fc..edc95257ed0 100644 --- a/packages/effect/test/Schema/Schema/DecodingFallbackAnnotation.test.ts +++ b/packages/effect/test/Schema/Schema/DecodingFallbackAnnotation.test.ts @@ -1,8 +1,8 @@ +import { describe, it } from "@effect/vitest" import { Effect, Either } from "effect" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" import { deepStrictEqual } from "effect/test/util" -import { describe, it } from "vitest" describe("DecodingFallbackAnnotation", () => { it("using Either", async () => { diff --git a/packages/effect/test/Schema/Schema/Defect/Defect.test.ts b/packages/effect/test/Schema/Schema/Defect/Defect.test.ts index f30e87e94ec..da01cb9d9a7 100644 --- a/packages/effect/test/Schema/Schema/Defect/Defect.test.ts +++ b/packages/effect/test/Schema/Schema/Defect/Defect.test.ts @@ -1,7 +1,7 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" import { assertTrue, deepStrictEqual, strictEqual } from "effect/test/util" -import { describe, it } from "vitest" describe("Defect", () => { describe("decoding", () => { diff --git a/packages/effect/test/Schema/Schema/Duration/Duration.test.ts b/packages/effect/test/Schema/Schema/Duration/Duration.test.ts index 5864d5041d7..0bcf9f0cbf2 100644 --- a/packages/effect/test/Schema/Schema/Duration/Duration.test.ts +++ b/packages/effect/test/Schema/Schema/Duration/Duration.test.ts @@ -1,7 +1,7 @@ +import { describe, it } from "@effect/vitest" import { Duration } from "effect" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("Duration", () => { const schema = S.Duration diff --git a/packages/effect/test/Schema/Schema/Duration/DurationFromMillis.test.ts b/packages/effect/test/Schema/Schema/Duration/DurationFromMillis.test.ts index 34b358894a0..8974ab34ad0 100644 --- a/packages/effect/test/Schema/Schema/Duration/DurationFromMillis.test.ts +++ b/packages/effect/test/Schema/Schema/Duration/DurationFromMillis.test.ts @@ -1,7 +1,7 @@ +import { describe, it } from "@effect/vitest" import { Duration } from "effect" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("DurationFromMillis", () => { const schema = S.DurationFromMillis diff --git a/packages/effect/test/Schema/Schema/Duration/DurationFromNanos.test.ts b/packages/effect/test/Schema/Schema/Duration/DurationFromNanos.test.ts index 040637af33d..1252c6cfc96 100644 --- a/packages/effect/test/Schema/Schema/Duration/DurationFromNanos.test.ts +++ b/packages/effect/test/Schema/Schema/Duration/DurationFromNanos.test.ts @@ -1,7 +1,7 @@ +import { describe, it } from "@effect/vitest" import { Duration } from "effect" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("DurationFromNanos", () => { const schema = S.DurationFromNanos diff --git a/packages/effect/test/Schema/Schema/Duration/DurationFromSelf.test.ts b/packages/effect/test/Schema/Schema/Duration/DurationFromSelf.test.ts index 5b9c798a809..737508a581f 100644 --- a/packages/effect/test/Schema/Schema/Duration/DurationFromSelf.test.ts +++ b/packages/effect/test/Schema/Schema/Duration/DurationFromSelf.test.ts @@ -1,7 +1,7 @@ +import { describe, it } from "@effect/vitest" import { Duration } from "effect" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("DurationFromSelf", () => { const schema = S.DurationFromSelf diff --git a/packages/effect/test/Schema/Schema/Duration/betweenDuration.test.ts b/packages/effect/test/Schema/Schema/Duration/betweenDuration.test.ts index af7eb69f5ed..7b66e0e6c89 100644 --- a/packages/effect/test/Schema/Schema/Duration/betweenDuration.test.ts +++ b/packages/effect/test/Schema/Schema/Duration/betweenDuration.test.ts @@ -1,7 +1,7 @@ +import { describe, it } from "@effect/vitest" import { Duration } from "effect" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("betweenDuration", () => { const schema = S.DurationFromSelf.pipe( diff --git a/packages/effect/test/Schema/Schema/Duration/clampDuration.test.ts b/packages/effect/test/Schema/Schema/Duration/clampDuration.test.ts index e96406214a0..586daf2dd14 100644 --- a/packages/effect/test/Schema/Schema/Duration/clampDuration.test.ts +++ b/packages/effect/test/Schema/Schema/Duration/clampDuration.test.ts @@ -1,7 +1,7 @@ +import { describe, it } from "@effect/vitest" import { Duration } from "effect" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("clampDuration", () => { it("decoding", async () => { diff --git a/packages/effect/test/Schema/Schema/Duration/greaterThanDuration.test.ts b/packages/effect/test/Schema/Schema/Duration/greaterThanDuration.test.ts index c173928b87f..b7b0e4fa841 100644 --- a/packages/effect/test/Schema/Schema/Duration/greaterThanDuration.test.ts +++ b/packages/effect/test/Schema/Schema/Duration/greaterThanDuration.test.ts @@ -1,7 +1,7 @@ +import { describe, it } from "@effect/vitest" import { Duration } from "effect" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("greaterThanDuration", () => { const schema = S.DurationFromSelf.pipe(S.greaterThanDuration("5 seconds")) diff --git a/packages/effect/test/Schema/Schema/Duration/greaterThanOrEqualToDuration.test.ts b/packages/effect/test/Schema/Schema/Duration/greaterThanOrEqualToDuration.test.ts index b531e7d16b9..5c6ff6c3571 100644 --- a/packages/effect/test/Schema/Schema/Duration/greaterThanOrEqualToDuration.test.ts +++ b/packages/effect/test/Schema/Schema/Duration/greaterThanOrEqualToDuration.test.ts @@ -1,7 +1,7 @@ +import { describe, it } from "@effect/vitest" import { Duration } from "effect" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("greaterThanOrEqualToDuration", () => { const schema = S.DurationFromSelf.pipe(S.greaterThanOrEqualToDuration("5 seconds")) diff --git a/packages/effect/test/Schema/Schema/Duration/lessThanDuration.test.ts b/packages/effect/test/Schema/Schema/Duration/lessThanDuration.test.ts index 8f314bbbb19..0b97fd4e378 100644 --- a/packages/effect/test/Schema/Schema/Duration/lessThanDuration.test.ts +++ b/packages/effect/test/Schema/Schema/Duration/lessThanDuration.test.ts @@ -1,7 +1,7 @@ +import { describe, it } from "@effect/vitest" import { Duration } from "effect" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("lessThanDuration", () => { const schema = S.DurationFromSelf.pipe(S.lessThanDuration("5 seconds")) diff --git a/packages/effect/test/Schema/Schema/Duration/lessThanOrEqualToDuration.test.ts b/packages/effect/test/Schema/Schema/Duration/lessThanOrEqualToDuration.test.ts index 2f5683bda32..6522b3e46bd 100644 --- a/packages/effect/test/Schema/Schema/Duration/lessThanOrEqualToDuration.test.ts +++ b/packages/effect/test/Schema/Schema/Duration/lessThanOrEqualToDuration.test.ts @@ -1,7 +1,7 @@ +import { describe, it } from "@effect/vitest" import { Duration } from "effect" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("lessThanOrEqualToDuration", () => { const schema = S.DurationFromSelf.pipe(S.lessThanOrEqualToDuration("5 seconds")) diff --git a/packages/effect/test/Schema/Schema/Either/Either.test.ts b/packages/effect/test/Schema/Schema/Either/Either.test.ts index 9d154b9b76f..13aaad90553 100644 --- a/packages/effect/test/Schema/Schema/Either/Either.test.ts +++ b/packages/effect/test/Schema/Schema/Either/Either.test.ts @@ -1,7 +1,7 @@ +import { describe, it } from "@effect/vitest" import * as E from "effect/Either" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("Either", () => { it("test roundtrip consistency", () => { diff --git a/packages/effect/test/Schema/Schema/Either/EitherFromSelf.test.ts b/packages/effect/test/Schema/Schema/Either/EitherFromSelf.test.ts index db7ece8afca..9e6977b923e 100644 --- a/packages/effect/test/Schema/Schema/Either/EitherFromSelf.test.ts +++ b/packages/effect/test/Schema/Schema/Either/EitherFromSelf.test.ts @@ -1,9 +1,9 @@ +import { describe, it } from "@effect/vitest" import * as E from "effect/Either" import * as P from "effect/ParseResult" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" import { assertFalse, assertTrue } from "effect/test/util" -import { describe, it } from "vitest" describe("EitherFromSelf", () => { it("arbitrary", () => { diff --git a/packages/effect/test/Schema/Schema/Either/EitherFromUnion.test.ts b/packages/effect/test/Schema/Schema/Either/EitherFromUnion.test.ts index 34b9d10f657..0c1c0adae16 100644 --- a/packages/effect/test/Schema/Schema/Either/EitherFromUnion.test.ts +++ b/packages/effect/test/Schema/Schema/Either/EitherFromUnion.test.ts @@ -1,8 +1,8 @@ +import { describe, it } from "@effect/vitest" import * as E from "effect/Either" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" import { assertTrue } from "effect/test/util" -import { describe, it } from "vitest" describe("EitherFromUnion", () => { it("test roundtrip consistency", () => { diff --git a/packages/effect/test/Schema/Schema/Enums/Enums.test.ts b/packages/effect/test/Schema/Schema/Enums/Enums.test.ts index 162776df81b..d922aca6be6 100644 --- a/packages/effect/test/Schema/Schema/Enums/Enums.test.ts +++ b/packages/effect/test/Schema/Schema/Enums/Enums.test.ts @@ -1,7 +1,7 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" import { strictEqual } from "effect/test/util" -import { describe, it } from "vitest" describe("Enums", () => { it("enums should be exposed", () => { diff --git a/packages/effect/test/Schema/Schema/Exit/Exit.test.ts b/packages/effect/test/Schema/Schema/Exit/Exit.test.ts index dbbbfce2122..106f757567a 100644 --- a/packages/effect/test/Schema/Schema/Exit/Exit.test.ts +++ b/packages/effect/test/Schema/Schema/Exit/Exit.test.ts @@ -1,7 +1,7 @@ +import { describe, it } from "@effect/vitest" import { Exit } from "effect" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("Exit", () => { it("test roundtrip consistency", () => { diff --git a/packages/effect/test/Schema/Schema/Exit/ExitFromSelf.test.ts b/packages/effect/test/Schema/Schema/Exit/ExitFromSelf.test.ts index b941b2eb64a..069ac8d45d3 100644 --- a/packages/effect/test/Schema/Schema/Exit/ExitFromSelf.test.ts +++ b/packages/effect/test/Schema/Schema/Exit/ExitFromSelf.test.ts @@ -1,7 +1,7 @@ +import { describe, it } from "@effect/vitest" import * as Exit from "effect/Exit" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("ExitFromSelf", () => { it("arbitrary", () => { diff --git a/packages/effect/test/Schema/Schema/FiberId/FiberId.test.ts b/packages/effect/test/Schema/Schema/FiberId/FiberId.test.ts index a5e729d1f59..3aa1edd2781 100644 --- a/packages/effect/test/Schema/Schema/FiberId/FiberId.test.ts +++ b/packages/effect/test/Schema/Schema/FiberId/FiberId.test.ts @@ -1,7 +1,7 @@ +import { describe, it } from "@effect/vitest" import * as FiberId from "effect/FiberId" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("FiberId", () => { it("test roundtrip consistency", () => { diff --git a/packages/effect/test/Schema/Schema/FiberId/FiberIdFromSelf.test.ts b/packages/effect/test/Schema/Schema/FiberId/FiberIdFromSelf.test.ts index 978a4566a77..623a16d28f9 100644 --- a/packages/effect/test/Schema/Schema/FiberId/FiberIdFromSelf.test.ts +++ b/packages/effect/test/Schema/Schema/FiberId/FiberIdFromSelf.test.ts @@ -1,7 +1,7 @@ +import { describe, it } from "@effect/vitest" import * as FiberId from "effect/FiberId" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("FiberIdFromSelf", () => { it("arbitrary", () => { diff --git a/packages/effect/test/Schema/Schema/HashMap/HashMap.test.ts b/packages/effect/test/Schema/Schema/HashMap/HashMap.test.ts index 88fcdb643e6..4307fd53c99 100644 --- a/packages/effect/test/Schema/Schema/HashMap/HashMap.test.ts +++ b/packages/effect/test/Schema/Schema/HashMap/HashMap.test.ts @@ -1,7 +1,7 @@ +import { describe, it } from "@effect/vitest" import * as HashMap from "effect/HashMap" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("HashMap", () => { it("test roundtrip consistency", () => { diff --git a/packages/effect/test/Schema/Schema/HashMap/HashMapFromSelf.test.ts b/packages/effect/test/Schema/Schema/HashMap/HashMapFromSelf.test.ts index 16e81c80e9a..a600fd095e2 100644 --- a/packages/effect/test/Schema/Schema/HashMap/HashMapFromSelf.test.ts +++ b/packages/effect/test/Schema/Schema/HashMap/HashMapFromSelf.test.ts @@ -1,9 +1,9 @@ +import { describe, it } from "@effect/vitest" import * as HashMap from "effect/HashMap" import * as P from "effect/ParseResult" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" import { assertFalse, assertTrue } from "effect/test/util" -import { describe, it } from "vitest" describe("HashMapFromSelf", () => { it("test roundtrip consistency", () => { diff --git a/packages/effect/test/Schema/Schema/HashSet/HashSet.test.ts b/packages/effect/test/Schema/Schema/HashSet/HashSet.test.ts index 04838593ad8..2b955e9ac25 100644 --- a/packages/effect/test/Schema/Schema/HashSet/HashSet.test.ts +++ b/packages/effect/test/Schema/Schema/HashSet/HashSet.test.ts @@ -1,7 +1,7 @@ +import { describe, it } from "@effect/vitest" import * as HashSet from "effect/HashSet" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("HashSet", () => { it("test roundtrip consistency", () => { diff --git a/packages/effect/test/Schema/Schema/HashSet/HashSetFromSelf.test.ts b/packages/effect/test/Schema/Schema/HashSet/HashSetFromSelf.test.ts index 1cb77c412b2..bf6284d8e54 100644 --- a/packages/effect/test/Schema/Schema/HashSet/HashSetFromSelf.test.ts +++ b/packages/effect/test/Schema/Schema/HashSet/HashSetFromSelf.test.ts @@ -1,9 +1,9 @@ +import { describe, it } from "@effect/vitest" import * as HashSet from "effect/HashSet" import * as P from "effect/ParseResult" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" import { assertFalse, assertTrue } from "effect/test/util" -import { describe, it } from "vitest" describe("HashSetFromSelf", () => { it("test roundtrip consistency", () => { diff --git a/packages/effect/test/Schema/Schema/List/List.test.ts b/packages/effect/test/Schema/Schema/List/List.test.ts index 7baf76fa532..1d3d881dda6 100644 --- a/packages/effect/test/Schema/Schema/List/List.test.ts +++ b/packages/effect/test/Schema/Schema/List/List.test.ts @@ -1,7 +1,7 @@ +import { describe, it } from "@effect/vitest" import * as List from "effect/List" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("List", () => { it("test roundtrip consistency", () => { diff --git a/packages/effect/test/Schema/Schema/List/ListFromSelf.test.ts b/packages/effect/test/Schema/Schema/List/ListFromSelf.test.ts index bbb8ef3e49a..7c384cac869 100644 --- a/packages/effect/test/Schema/Schema/List/ListFromSelf.test.ts +++ b/packages/effect/test/Schema/Schema/List/ListFromSelf.test.ts @@ -1,9 +1,9 @@ +import { describe, it } from "@effect/vitest" import * as List from "effect/List" import * as P from "effect/ParseResult" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" import { assertFalse, assertTrue } from "effect/test/util" -import { describe, it } from "vitest" describe("ListFromSelf", () => { it("test roundtrip consistency", () => { diff --git a/packages/effect/test/Schema/Schema/Literal/Literal.test.ts b/packages/effect/test/Schema/Schema/Literal/Literal.test.ts index 31d5cf9344a..e5f7f7e9aa3 100644 --- a/packages/effect/test/Schema/Schema/Literal/Literal.test.ts +++ b/packages/effect/test/Schema/Schema/Literal/Literal.test.ts @@ -1,8 +1,8 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as AST from "effect/SchemaAST" import * as Util from "effect/test/Schema/TestUtils" import { deepStrictEqual } from "effect/test/util" -import { describe, it } from "vitest" describe("Literal", () => { it("annotations()", () => { diff --git a/packages/effect/test/Schema/Schema/Map/Map.test.ts b/packages/effect/test/Schema/Schema/Map/Map.test.ts index 999d40b45ea..4904c0c2dfe 100644 --- a/packages/effect/test/Schema/Schema/Map/Map.test.ts +++ b/packages/effect/test/Schema/Schema/Map/Map.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import { strictEqual } from "effect/test/util" -import { describe, it } from "vitest" describe("Map", () => { it("description", () => { diff --git a/packages/effect/test/Schema/Schema/Map/MapFromRecord.test.ts b/packages/effect/test/Schema/Schema/Map/MapFromRecord.test.ts index bc57f979e07..07d24698bd1 100644 --- a/packages/effect/test/Schema/Schema/Map/MapFromRecord.test.ts +++ b/packages/effect/test/Schema/Schema/Map/MapFromRecord.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("MapFromRecord", () => { it("decoding", async () => { diff --git a/packages/effect/test/Schema/Schema/Map/MapFromSelf.test.ts b/packages/effect/test/Schema/Schema/Map/MapFromSelf.test.ts index 85764018efd..ba5ccdfe4cf 100644 --- a/packages/effect/test/Schema/Schema/Map/MapFromSelf.test.ts +++ b/packages/effect/test/Schema/Schema/Map/MapFromSelf.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import { strictEqual } from "effect/test/util" -import { describe, it } from "vitest" describe("MapFromSelf", () => { it("description", () => { diff --git a/packages/effect/test/Schema/Schema/Never/Never.test.ts b/packages/effect/test/Schema/Schema/Never/Never.test.ts index d0351b821d4..ebbcde62483 100644 --- a/packages/effect/test/Schema/Schema/Never/Never.test.ts +++ b/packages/effect/test/Schema/Schema/Never/Never.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("Never", () => { const schema = S.Never diff --git a/packages/effect/test/Schema/Schema/NonEmptyArrayEnsure.test.ts b/packages/effect/test/Schema/Schema/NonEmptyArrayEnsure.test.ts index 6263dc465b6..4ce3548b5ce 100644 --- a/packages/effect/test/Schema/Schema/NonEmptyArrayEnsure.test.ts +++ b/packages/effect/test/Schema/Schema/NonEmptyArrayEnsure.test.ts @@ -1,8 +1,8 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as AST from "effect/SchemaAST" import * as Util from "effect/test/Schema/TestUtils" import { deepStrictEqual } from "effect/test/util" -import { describe, it } from "vitest" describe("NonEmptyArrayEnsure", () => { it("annotations()", () => { diff --git a/packages/effect/test/Schema/Schema/Number/JsonNumber.test.ts b/packages/effect/test/Schema/Schema/Number/JsonNumber.test.ts index 7ab0a393e59..c216e5964f1 100644 --- a/packages/effect/test/Schema/Schema/Number/JsonNumber.test.ts +++ b/packages/effect/test/Schema/Schema/Number/JsonNumber.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("JsonNumber", () => { it("test roundtrip consistency", () => { diff --git a/packages/effect/test/Schema/Schema/Number/Number.test.ts b/packages/effect/test/Schema/Schema/Number/Number.test.ts index 8a1c7cd2153..8f5f6388eb9 100644 --- a/packages/effect/test/Schema/Schema/Number/Number.test.ts +++ b/packages/effect/test/Schema/Schema/Number/Number.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("Number", () => { const schema = S.Number diff --git a/packages/effect/test/Schema/Schema/Number/between.test.ts b/packages/effect/test/Schema/Schema/Number/between.test.ts index 8ce3b759b22..bb6214acfe1 100644 --- a/packages/effect/test/Schema/Schema/Number/between.test.ts +++ b/packages/effect/test/Schema/Schema/Number/between.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("between", () => { const schema = S.Number.pipe(S.between(-1, 1)).annotations({ diff --git a/packages/effect/test/Schema/Schema/Number/clamp.test.ts b/packages/effect/test/Schema/Schema/Number/clamp.test.ts index 29a91253ed8..76128b1fd43 100644 --- a/packages/effect/test/Schema/Schema/Number/clamp.test.ts +++ b/packages/effect/test/Schema/Schema/Number/clamp.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("clamp", () => { it("decoding", async () => { diff --git a/packages/effect/test/Schema/Schema/Number/finite.test.ts b/packages/effect/test/Schema/Schema/Number/finite.test.ts index cc26e0b9144..ec63ee688a5 100644 --- a/packages/effect/test/Schema/Schema/Number/finite.test.ts +++ b/packages/effect/test/Schema/Schema/Number/finite.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("Finite", () => { const schema = S.Finite diff --git a/packages/effect/test/Schema/Schema/Number/greaterThan.test.ts b/packages/effect/test/Schema/Schema/Number/greaterThan.test.ts index 8c3b06e559c..9e56efad290 100644 --- a/packages/effect/test/Schema/Schema/Number/greaterThan.test.ts +++ b/packages/effect/test/Schema/Schema/Number/greaterThan.test.ts @@ -1,8 +1,8 @@ +import { describe, it } from "@effect/vitest" import * as P from "effect/ParseResult" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" import { assertFalse, assertTrue } from "effect/test/util" -import { describe, it } from "vitest" describe("greaterThan", () => { const schema = S.greaterThan(0)(S.Number) diff --git a/packages/effect/test/Schema/Schema/Number/greaterThanOrEqualTo.test.ts b/packages/effect/test/Schema/Schema/Number/greaterThanOrEqualTo.test.ts index 3740c3af311..93e46cc8607 100644 --- a/packages/effect/test/Schema/Schema/Number/greaterThanOrEqualTo.test.ts +++ b/packages/effect/test/Schema/Schema/Number/greaterThanOrEqualTo.test.ts @@ -1,8 +1,8 @@ +import { describe, it } from "@effect/vitest" import * as P from "effect/ParseResult" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" import { assertFalse, assertTrue } from "effect/test/util" -import { describe, it } from "vitest" describe("greaterThanOrEqualTo", () => { const schema = S.greaterThanOrEqualTo(0)(S.Number) diff --git a/packages/effect/test/Schema/Schema/Number/int.test.ts b/packages/effect/test/Schema/Schema/Number/int.test.ts index e1890a7f2ac..49a538d6204 100644 --- a/packages/effect/test/Schema/Schema/Number/int.test.ts +++ b/packages/effect/test/Schema/Schema/Number/int.test.ts @@ -1,8 +1,8 @@ +import { describe, it } from "@effect/vitest" import * as P from "effect/ParseResult" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" import { assertFalse, assertTrue } from "effect/test/util" -import { describe, it } from "vitest" describe("Int", () => { const schema = S.Int diff --git a/packages/effect/test/Schema/Schema/Number/lessThan.test.ts b/packages/effect/test/Schema/Schema/Number/lessThan.test.ts index c165d0f5aa7..9cbcc0483d5 100644 --- a/packages/effect/test/Schema/Schema/Number/lessThan.test.ts +++ b/packages/effect/test/Schema/Schema/Number/lessThan.test.ts @@ -1,8 +1,8 @@ +import { describe, it } from "@effect/vitest" import * as P from "effect/ParseResult" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" import { assertFalse, assertTrue } from "effect/test/util" -import { describe, it } from "vitest" describe("lessThan", () => { it("test roundtrip consistency", () => { diff --git a/packages/effect/test/Schema/Schema/Number/lessThanOrEqualTo.test.ts b/packages/effect/test/Schema/Schema/Number/lessThanOrEqualTo.test.ts index a1c94f582f8..37c375e3ae7 100644 --- a/packages/effect/test/Schema/Schema/Number/lessThanOrEqualTo.test.ts +++ b/packages/effect/test/Schema/Schema/Number/lessThanOrEqualTo.test.ts @@ -1,8 +1,8 @@ +import { describe, it } from "@effect/vitest" import * as P from "effect/ParseResult" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" import { assertFalse, assertTrue } from "effect/test/util" -import { describe, it } from "vitest" describe("lessThanOrEqualTo", () => { it("test roundtrip consistency", () => { diff --git a/packages/effect/test/Schema/Schema/Number/multipleOf.test.ts b/packages/effect/test/Schema/Schema/Number/multipleOf.test.ts index 678e8a917e3..49cc27f9b09 100644 --- a/packages/effect/test/Schema/Schema/Number/multipleOf.test.ts +++ b/packages/effect/test/Schema/Schema/Number/multipleOf.test.ts @@ -1,8 +1,8 @@ +import { describe, it } from "@effect/vitest" import * as P from "effect/ParseResult" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" import { assertFalse, assertTrue } from "effect/test/util" -import { describe, it } from "vitest" describe("multipleOf", () => { it("test roundtrip consistency", () => { diff --git a/packages/effect/test/Schema/Schema/Number/negative.test.ts b/packages/effect/test/Schema/Schema/Number/negative.test.ts index c01d315e7eb..4e4bece4053 100644 --- a/packages/effect/test/Schema/Schema/Number/negative.test.ts +++ b/packages/effect/test/Schema/Schema/Number/negative.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("Negative", () => { const schema = S.Negative diff --git a/packages/effect/test/Schema/Schema/Number/nonNaN.test.ts b/packages/effect/test/Schema/Schema/Number/nonNaN.test.ts index be6df05b2cc..f977a9bb16b 100644 --- a/packages/effect/test/Schema/Schema/Number/nonNaN.test.ts +++ b/packages/effect/test/Schema/Schema/Number/nonNaN.test.ts @@ -1,8 +1,8 @@ +import { describe, it } from "@effect/vitest" import * as P from "effect/ParseResult" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" import { assertFalse, assertTrue } from "effect/test/util" -import { describe, it } from "vitest" describe("NonNaN", () => { const schema = S.NonNaN diff --git a/packages/effect/test/Schema/Schema/Number/nonNegative.test.ts b/packages/effect/test/Schema/Schema/Number/nonNegative.test.ts index 12e90cfe36a..6b26ae1cd55 100644 --- a/packages/effect/test/Schema/Schema/Number/nonNegative.test.ts +++ b/packages/effect/test/Schema/Schema/Number/nonNegative.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("NonNegative", () => { const schema = S.NonNegative diff --git a/packages/effect/test/Schema/Schema/Number/nonPositive.test.ts b/packages/effect/test/Schema/Schema/Number/nonPositive.test.ts index 0ea3b041491..a85562e41dd 100644 --- a/packages/effect/test/Schema/Schema/Number/nonPositive.test.ts +++ b/packages/effect/test/Schema/Schema/Number/nonPositive.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("NonPositive", () => { const schema = S.NonPositive diff --git a/packages/effect/test/Schema/Schema/Number/numberFromString.test.ts b/packages/effect/test/Schema/Schema/Number/numberFromString.test.ts index 8233a06f9e0..f8760650470 100644 --- a/packages/effect/test/Schema/Schema/Number/numberFromString.test.ts +++ b/packages/effect/test/Schema/Schema/Number/numberFromString.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("NumberFromString", () => { const schema = S.NumberFromString diff --git a/packages/effect/test/Schema/Schema/Number/positive.test.ts b/packages/effect/test/Schema/Schema/Number/positive.test.ts index 547df8b638d..974c9bae5c4 100644 --- a/packages/effect/test/Schema/Schema/Number/positive.test.ts +++ b/packages/effect/test/Schema/Schema/Number/positive.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("Positive", () => { const schema = S.Positive diff --git a/packages/effect/test/Schema/Schema/Object/Object.test.ts b/packages/effect/test/Schema/Schema/Object/Object.test.ts index 797b2a50c80..1bcbaaf31ed 100644 --- a/packages/effect/test/Schema/Schema/Object/Object.test.ts +++ b/packages/effect/test/Schema/Schema/Object/Object.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("object", () => { const schema = S.Object diff --git a/packages/effect/test/Schema/Schema/Option/Option.test.ts b/packages/effect/test/Schema/Schema/Option/Option.test.ts index 201357f19c8..7156940acf1 100644 --- a/packages/effect/test/Schema/Schema/Option/Option.test.ts +++ b/packages/effect/test/Schema/Schema/Option/Option.test.ts @@ -1,7 +1,7 @@ +import { describe, it } from "@effect/vitest" import * as O from "effect/Option" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("Option", () => { it("test roundtrip consistency", () => { diff --git a/packages/effect/test/Schema/Schema/Option/OptionFromNonEmptyTrimmedString.test.ts b/packages/effect/test/Schema/Schema/Option/OptionFromNonEmptyTrimmedString.test.ts index 97869ab4afc..95f109aa244 100644 --- a/packages/effect/test/Schema/Schema/Option/OptionFromNonEmptyTrimmedString.test.ts +++ b/packages/effect/test/Schema/Schema/Option/OptionFromNonEmptyTrimmedString.test.ts @@ -1,7 +1,7 @@ +import { describe, it } from "@effect/vitest" import * as O from "effect/Option" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("OptionFromNonEmptyTrimmedString", () => { it("test roundtrip consistency", () => { diff --git a/packages/effect/test/Schema/Schema/Option/OptionFromNullOr.test.ts b/packages/effect/test/Schema/Schema/Option/OptionFromNullOr.test.ts index 9f2b62d333f..853e3b9c23c 100644 --- a/packages/effect/test/Schema/Schema/Option/OptionFromNullOr.test.ts +++ b/packages/effect/test/Schema/Schema/Option/OptionFromNullOr.test.ts @@ -1,8 +1,8 @@ +import { describe, it } from "@effect/vitest" import * as O from "effect/Option" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" import { assertTrue } from "effect/test/util" -import { describe, it } from "vitest" describe("OptionFromNullOr", () => { it("test roundtrip consistency", () => { diff --git a/packages/effect/test/Schema/Schema/Option/OptionFromNullishOr.test.ts b/packages/effect/test/Schema/Schema/Option/OptionFromNullishOr.test.ts index 5bef78f0862..6843263a729 100644 --- a/packages/effect/test/Schema/Schema/Option/OptionFromNullishOr.test.ts +++ b/packages/effect/test/Schema/Schema/Option/OptionFromNullishOr.test.ts @@ -1,8 +1,8 @@ +import { describe, it } from "@effect/vitest" import * as O from "effect/Option" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" import { assertTrue } from "effect/test/util" -import { describe, it } from "vitest" describe("OptionFromNullishOr", () => { it("test roundtrip consistency", () => { diff --git a/packages/effect/test/Schema/Schema/Option/OptionFromSelf.test.ts b/packages/effect/test/Schema/Schema/Option/OptionFromSelf.test.ts index 96613fc7988..19993f8cd9b 100644 --- a/packages/effect/test/Schema/Schema/Option/OptionFromSelf.test.ts +++ b/packages/effect/test/Schema/Schema/Option/OptionFromSelf.test.ts @@ -1,9 +1,9 @@ +import { describe, it } from "@effect/vitest" import * as O from "effect/Option" import * as P from "effect/ParseResult" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" import { assertFalse, assertTrue } from "effect/test/util" -import { describe, it } from "vitest" describe("OptionFromSelf", () => { it("arbitrary", () => { diff --git a/packages/effect/test/Schema/Schema/Option/OptionFromUndefinedOr.test.ts b/packages/effect/test/Schema/Schema/Option/OptionFromUndefinedOr.test.ts index 380df264fc3..9f56b33dd67 100644 --- a/packages/effect/test/Schema/Schema/Option/OptionFromUndefinedOr.test.ts +++ b/packages/effect/test/Schema/Schema/Option/OptionFromUndefinedOr.test.ts @@ -1,8 +1,8 @@ +import { describe, it } from "@effect/vitest" import * as O from "effect/Option" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" import { assertTrue } from "effect/test/util" -import { describe, it } from "vitest" describe("OptionFromUndefinedOr", () => { it("test roundtrip consistency", () => { diff --git a/packages/effect/test/Schema/Schema/ParseOptions-errors.test.ts b/packages/effect/test/Schema/Schema/ParseOptions-errors.test.ts index ace3b99df17..bbc8e699a40 100644 --- a/packages/effect/test/Schema/Schema/ParseOptions-errors.test.ts +++ b/packages/effect/test/Schema/Schema/ParseOptions-errors.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("`errors` option", () => { describe("decoding", () => { diff --git a/packages/effect/test/Schema/Schema/ParseOptions-exact.test.ts b/packages/effect/test/Schema/Schema/ParseOptions-exact.test.ts index 0775969d75a..e606a435e45 100644 --- a/packages/effect/test/Schema/Schema/ParseOptions-exact.test.ts +++ b/packages/effect/test/Schema/Schema/ParseOptions-exact.test.ts @@ -1,7 +1,7 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" import { assertFalse, assertTrue } from "effect/test/util" -import { describe, it } from "vitest" describe("`exact` option", () => { describe("decoding", () => { diff --git a/packages/effect/test/Schema/Schema/ParseOptions-onExcessProperty.test.ts b/packages/effect/test/Schema/Schema/ParseOptions-onExcessProperty.test.ts index 99ab6e03c05..fcc2cc3d800 100644 --- a/packages/effect/test/Schema/Schema/ParseOptions-onExcessProperty.test.ts +++ b/packages/effect/test/Schema/Schema/ParseOptions-onExcessProperty.test.ts @@ -1,8 +1,8 @@ +import { describe, it } from "@effect/vitest" import * as ParseResult from "effect/ParseResult" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" import { assertLeft } from "effect/test/util" -import { describe, it } from "vitest" describe("`onExcessProperty` option", () => { describe("`ignore` option", () => { diff --git a/packages/effect/test/Schema/Schema/ParseOptions-preserveKeyOrder.test.ts b/packages/effect/test/Schema/Schema/ParseOptions-preserveKeyOrder.test.ts index fc79bc2fa64..46dc8f39965 100644 --- a/packages/effect/test/Schema/Schema/ParseOptions-preserveKeyOrder.test.ts +++ b/packages/effect/test/Schema/Schema/ParseOptions-preserveKeyOrder.test.ts @@ -1,9 +1,9 @@ +import { describe, it } from "@effect/vitest" import type { Duration } from "effect" import * as Effect from "effect/Effect" import * as ParseResult from "effect/ParseResult" import * as S from "effect/Schema" import { deepStrictEqual } from "effect/test/util" -import { describe, it } from "vitest" describe("`preserveKeyOrder` option", () => { const b = Symbol.for("effect/Schema/test/b") diff --git a/packages/effect/test/Schema/Schema/ParseOptionsAnnotation.test.ts b/packages/effect/test/Schema/Schema/ParseOptionsAnnotation.test.ts index 904919f7a61..a050597df61 100644 --- a/packages/effect/test/Schema/Schema/ParseOptionsAnnotation.test.ts +++ b/packages/effect/test/Schema/Schema/ParseOptionsAnnotation.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" const String = S.transform(S.NonEmptyString, S.String, { strict: true, decode: (s) => s, encode: (s) => s }) .annotations({ diff --git a/packages/effect/test/Schema/Schema/PropertyKey/PropertyKey.test.ts b/packages/effect/test/Schema/Schema/PropertyKey/PropertyKey.test.ts index 0caf5de10e8..2c802bfba81 100644 --- a/packages/effect/test/Schema/Schema/PropertyKey/PropertyKey.test.ts +++ b/packages/effect/test/Schema/Schema/PropertyKey/PropertyKey.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import * as Schema from "effect/Schema" import { strictEqual } from "effect/test/util" -import { describe, it } from "vitest" describe("PropertyKey", () => { it("should handle symbol, string, and number", () => { diff --git a/packages/effect/test/Schema/Schema/PropertySignature.test.ts b/packages/effect/test/Schema/Schema/PropertySignature.test.ts index 33491b0235c..75ae1cb2064 100644 --- a/packages/effect/test/Schema/Schema/PropertySignature.test.ts +++ b/packages/effect/test/Schema/Schema/PropertySignature.test.ts @@ -1,10 +1,10 @@ +import { describe, it } from "@effect/vitest" import { identity } from "effect/Function" import * as Option from "effect/Option" import * as S from "effect/Schema" import * as AST from "effect/SchemaAST" import * as Util from "effect/test/Schema/TestUtils" import { deepStrictEqual, strictEqual } from "effect/test/util" -import { describe, it } from "vitest" describe("PropertySignature", () => { it("should expose a from property", () => { diff --git a/packages/effect/test/Schema/Schema/ReadonlyMap/ReadonlyMap.test.ts b/packages/effect/test/Schema/Schema/ReadonlyMap/ReadonlyMap.test.ts index 89e2940ea99..c3c23cdf8b9 100644 --- a/packages/effect/test/Schema/Schema/ReadonlyMap/ReadonlyMap.test.ts +++ b/packages/effect/test/Schema/Schema/ReadonlyMap/ReadonlyMap.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("ReadonlyMap", () => { it("test roundtrip consistency", () => { diff --git a/packages/effect/test/Schema/Schema/ReadonlyMap/ReadonlyMapFromRecord.test.ts b/packages/effect/test/Schema/Schema/ReadonlyMap/ReadonlyMapFromRecord.test.ts index a1f17c9a436..87fca7651ab 100644 --- a/packages/effect/test/Schema/Schema/ReadonlyMap/ReadonlyMapFromRecord.test.ts +++ b/packages/effect/test/Schema/Schema/ReadonlyMap/ReadonlyMapFromRecord.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("ReadonlyMapFromRecord", () => { it("decoding", async () => { diff --git a/packages/effect/test/Schema/Schema/ReadonlyMap/ReadonlyMapFromSelf.test.ts b/packages/effect/test/Schema/Schema/ReadonlyMap/ReadonlyMapFromSelf.test.ts index c9a9d6086dd..57574a85684 100644 --- a/packages/effect/test/Schema/Schema/ReadonlyMap/ReadonlyMapFromSelf.test.ts +++ b/packages/effect/test/Schema/Schema/ReadonlyMap/ReadonlyMapFromSelf.test.ts @@ -1,8 +1,8 @@ +import { describe, it } from "@effect/vitest" import * as P from "effect/ParseResult" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" import { assertFalse, assertTrue } from "effect/test/util" -import { describe, it } from "vitest" describe("ReadonlyMapFromSelf", () => { it("test roundtrip consistency", () => { diff --git a/packages/effect/test/Schema/Schema/ReadonlySet/ReadonlySet.test.ts b/packages/effect/test/Schema/Schema/ReadonlySet/ReadonlySet.test.ts index 36b84e426e2..f70df4dbe45 100644 --- a/packages/effect/test/Schema/Schema/ReadonlySet/ReadonlySet.test.ts +++ b/packages/effect/test/Schema/Schema/ReadonlySet/ReadonlySet.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("ReadonlySet", () => { it("test roundtrip consistency", () => { diff --git a/packages/effect/test/Schema/Schema/ReadonlySet/ReadonlySetFromSelf.test.ts b/packages/effect/test/Schema/Schema/ReadonlySet/ReadonlySetFromSelf.test.ts index 46065ed6f9d..b1508a3bd1a 100644 --- a/packages/effect/test/Schema/Schema/ReadonlySet/ReadonlySetFromSelf.test.ts +++ b/packages/effect/test/Schema/Schema/ReadonlySet/ReadonlySetFromSelf.test.ts @@ -1,8 +1,8 @@ +import { describe, it } from "@effect/vitest" import * as P from "effect/ParseResult" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" import { assertFalse, assertTrue } from "effect/test/util" -import { describe, it } from "vitest" describe("ReadonlySetFromSelf", () => { it("test roundtrip consistency", () => { diff --git a/packages/effect/test/Schema/Schema/Record/Record.test.ts b/packages/effect/test/Schema/Schema/Record/Record.test.ts index 6987e6a5dea..121171b92da 100644 --- a/packages/effect/test/Schema/Schema/Record/Record.test.ts +++ b/packages/effect/test/Schema/Schema/Record/Record.test.ts @@ -1,10 +1,10 @@ +import { describe, it } from "@effect/vitest" import * as Either from "effect/Either" import * as ParseResult from "effect/ParseResult" import * as S from "effect/Schema" import * as AST from "effect/SchemaAST" import * as Util from "effect/test/Schema/TestUtils" import { deepStrictEqual, strictEqual } from "effect/test/util" -import { describe, it } from "vitest" describe("record", () => { it("annotations()", () => { diff --git a/packages/effect/test/Schema/Schema/Redacted/Redacted.test.ts b/packages/effect/test/Schema/Schema/Redacted/Redacted.test.ts index 68667900c58..cc72704aeb9 100644 --- a/packages/effect/test/Schema/Schema/Redacted/Redacted.test.ts +++ b/packages/effect/test/Schema/Schema/Redacted/Redacted.test.ts @@ -1,7 +1,7 @@ +import { describe, it } from "@effect/vitest" import { Redacted } from "effect" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("Redacted", () => { const schema = S.Redacted(S.String) diff --git a/packages/effect/test/Schema/Schema/Redacted/RedactedFromSelf.test.ts b/packages/effect/test/Schema/Schema/Redacted/RedactedFromSelf.test.ts index f7236c4bc00..9b495475b2b 100644 --- a/packages/effect/test/Schema/Schema/Redacted/RedactedFromSelf.test.ts +++ b/packages/effect/test/Schema/Schema/Redacted/RedactedFromSelf.test.ts @@ -1,7 +1,7 @@ +import { describe, it } from "@effect/vitest" import { Redacted } from "effect" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("RedactedFromSelf", () => { const schema = S.RedactedFromSelf(S.String) diff --git a/packages/effect/test/Schema/Schema/Set/Set.test.ts b/packages/effect/test/Schema/Schema/Set/Set.test.ts index 91e79230d70..a4a84148f89 100644 --- a/packages/effect/test/Schema/Schema/Set/Set.test.ts +++ b/packages/effect/test/Schema/Schema/Set/Set.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import { strictEqual } from "effect/test/util" -import { describe, it } from "vitest" describe("Set", () => { it("description", () => { diff --git a/packages/effect/test/Schema/Schema/Set/SetFromSelf.test.ts b/packages/effect/test/Schema/Schema/Set/SetFromSelf.test.ts index f5b0ca50715..af162b2d102 100644 --- a/packages/effect/test/Schema/Schema/Set/SetFromSelf.test.ts +++ b/packages/effect/test/Schema/Schema/Set/SetFromSelf.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import { strictEqual } from "effect/test/util" -import { describe, it } from "vitest" describe("SetFromSelf", () => { it("description", () => { diff --git a/packages/effect/test/Schema/Schema/SortedSet/SortedSet.test.ts b/packages/effect/test/Schema/Schema/SortedSet/SortedSet.test.ts index 8889dd51e32..1df90abbed2 100644 --- a/packages/effect/test/Schema/Schema/SortedSet/SortedSet.test.ts +++ b/packages/effect/test/Schema/Schema/SortedSet/SortedSet.test.ts @@ -1,8 +1,8 @@ +import { describe, it } from "@effect/vitest" import * as N from "effect/Number" import * as S from "effect/Schema" import * as SortedSet from "effect/SortedSet" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("SortedSet", () => { it("test roundtrip consistency", () => { diff --git a/packages/effect/test/Schema/Schema/SortedSet/SortedSetFromSelf.test.ts b/packages/effect/test/Schema/Schema/SortedSet/SortedSetFromSelf.test.ts index 93409afe54b..c259b9b7d28 100644 --- a/packages/effect/test/Schema/Schema/SortedSet/SortedSetFromSelf.test.ts +++ b/packages/effect/test/Schema/Schema/SortedSet/SortedSetFromSelf.test.ts @@ -1,3 +1,4 @@ +import { describe, it } from "@effect/vitest" import * as N from "effect/Number" import * as P from "effect/ParseResult" import * as Schema from "effect/Schema" @@ -5,7 +6,6 @@ import * as SortedSet from "effect/SortedSet" import * as S from "effect/String" import * as Util from "effect/test/Schema/TestUtils" import { assertFalse, assertTrue } from "effect/test/util" -import { describe, it } from "vitest" describe("SortedSetFromSelf", () => { it("test roundtrip consistency", () => { diff --git a/packages/effect/test/Schema/Schema/String/NonEmptyTrimmedString.test.ts b/packages/effect/test/Schema/Schema/String/NonEmptyTrimmedString.test.ts index 5ba1f30cf47..b3f690699d1 100644 --- a/packages/effect/test/Schema/Schema/String/NonEmptyTrimmedString.test.ts +++ b/packages/effect/test/Schema/Schema/String/NonEmptyTrimmedString.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("NonEmptyTrimmedString", () => { it("test roundtrip consistency", () => { diff --git a/packages/effect/test/Schema/Schema/String/String.test.ts b/packages/effect/test/Schema/Schema/String/String.test.ts index a009a4a5ba1..cb27bcbfa66 100644 --- a/packages/effect/test/Schema/Schema/String/String.test.ts +++ b/packages/effect/test/Schema/Schema/String/String.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("String", () => { const schema = S.String diff --git a/packages/effect/test/Schema/Schema/String/StringFromBase64.test.ts b/packages/effect/test/Schema/Schema/String/StringFromBase64.test.ts index bf01d4f5f24..fafe2a68bef 100644 --- a/packages/effect/test/Schema/Schema/String/StringFromBase64.test.ts +++ b/packages/effect/test/Schema/Schema/String/StringFromBase64.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("StringFromBase64", () => { const schema = S.StringFromBase64 diff --git a/packages/effect/test/Schema/Schema/String/StringFromBase64Url.test.ts b/packages/effect/test/Schema/Schema/String/StringFromBase64Url.test.ts index ad0d39829c7..3071859c71b 100644 --- a/packages/effect/test/Schema/Schema/String/StringFromBase64Url.test.ts +++ b/packages/effect/test/Schema/Schema/String/StringFromBase64Url.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("StringFromBase64Url", () => { const schema = S.StringFromBase64Url diff --git a/packages/effect/test/Schema/Schema/String/StringFromHex.test.ts b/packages/effect/test/Schema/Schema/String/StringFromHex.test.ts index dee4e48cec8..b6867730e29 100644 --- a/packages/effect/test/Schema/Schema/String/StringFromHex.test.ts +++ b/packages/effect/test/Schema/Schema/String/StringFromHex.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("StringFromHex", () => { const schema = S.StringFromHex diff --git a/packages/effect/test/Schema/Schema/String/StringFromUriComponent.test.ts b/packages/effect/test/Schema/Schema/String/StringFromUriComponent.test.ts index ea356b4fab0..f34b7675cb9 100644 --- a/packages/effect/test/Schema/Schema/String/StringFromUriComponent.test.ts +++ b/packages/effect/test/Schema/Schema/String/StringFromUriComponent.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("StringFromUriComponent", () => { const schema = S.StringFromUriComponent diff --git a/packages/effect/test/Schema/Schema/String/capitalize.test.ts b/packages/effect/test/Schema/Schema/String/capitalize.test.ts index 4117ececd8b..39fef6d879e 100644 --- a/packages/effect/test/Schema/Schema/String/capitalize.test.ts +++ b/packages/effect/test/Schema/Schema/String/capitalize.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("Capitalize", () => { it("test roundtrip consistency", () => { diff --git a/packages/effect/test/Schema/Schema/String/endsWith.test.ts b/packages/effect/test/Schema/Schema/String/endsWith.test.ts index c2062d73d2f..ed2ed15794f 100644 --- a/packages/effect/test/Schema/Schema/String/endsWith.test.ts +++ b/packages/effect/test/Schema/Schema/String/endsWith.test.ts @@ -1,8 +1,8 @@ +import { describe, it } from "@effect/vitest" import * as P from "effect/ParseResult" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" import { assertFalse, assertTrue } from "effect/test/util" -import { describe, it } from "vitest" describe("endsWith", () => { it("is", () => { diff --git a/packages/effect/test/Schema/Schema/String/includes.test.ts b/packages/effect/test/Schema/Schema/String/includes.test.ts index 6d8e0b837ee..c17dc123ce3 100644 --- a/packages/effect/test/Schema/Schema/String/includes.test.ts +++ b/packages/effect/test/Schema/Schema/String/includes.test.ts @@ -1,8 +1,8 @@ +import { describe, it } from "@effect/vitest" import * as P from "effect/ParseResult" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" import { assertFalse, assertTrue } from "effect/test/util" -import { describe, it } from "vitest" describe("includes", () => { const schema = S.includes("a")(S.String) diff --git a/packages/effect/test/Schema/Schema/String/length.test.ts b/packages/effect/test/Schema/Schema/String/length.test.ts index 3e364689c76..783a1d88820 100644 --- a/packages/effect/test/Schema/Schema/String/length.test.ts +++ b/packages/effect/test/Schema/Schema/String/length.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("length", () => { describe("decoding", () => { diff --git a/packages/effect/test/Schema/Schema/String/lowercase.test.ts b/packages/effect/test/Schema/Schema/String/lowercase.test.ts index 02d42e52c83..1ac0772ab6c 100644 --- a/packages/effect/test/Schema/Schema/String/lowercase.test.ts +++ b/packages/effect/test/Schema/Schema/String/lowercase.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("Lowercase", () => { it("test roundtrip consistency", () => { diff --git a/packages/effect/test/Schema/Schema/String/maxLength.test.ts b/packages/effect/test/Schema/Schema/String/maxLength.test.ts index fc833204294..678a740a192 100644 --- a/packages/effect/test/Schema/Schema/String/maxLength.test.ts +++ b/packages/effect/test/Schema/Schema/String/maxLength.test.ts @@ -1,8 +1,8 @@ +import { describe, it } from "@effect/vitest" import * as P from "effect/ParseResult" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" import { assertFalse, assertTrue } from "effect/test/util" -import { describe, it } from "vitest" describe("maxLength", () => { it("test roundtrip consistency", () => { diff --git a/packages/effect/test/Schema/Schema/String/minLength.test.ts b/packages/effect/test/Schema/Schema/String/minLength.test.ts index cf6e410531d..bf440b354aa 100644 --- a/packages/effect/test/Schema/Schema/String/minLength.test.ts +++ b/packages/effect/test/Schema/Schema/String/minLength.test.ts @@ -1,8 +1,8 @@ +import { describe, it } from "@effect/vitest" import * as P from "effect/ParseResult" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" import { assertFalse, assertTrue } from "effect/test/util" -import { describe, it } from "vitest" describe("minLength", () => { it("test roundtrip consistency", () => { diff --git a/packages/effect/test/Schema/Schema/String/nonEmptyString.test.ts b/packages/effect/test/Schema/Schema/String/nonEmptyString.test.ts index 53b19912829..c6674051f07 100644 --- a/packages/effect/test/Schema/Schema/String/nonEmptyString.test.ts +++ b/packages/effect/test/Schema/Schema/String/nonEmptyString.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("nonEmptyString", () => { const schema = S.NonEmptyString diff --git a/packages/effect/test/Schema/Schema/String/pattern.test.ts b/packages/effect/test/Schema/Schema/String/pattern.test.ts index 586fd59a0ef..ffd0f1890bf 100644 --- a/packages/effect/test/Schema/Schema/String/pattern.test.ts +++ b/packages/effect/test/Schema/Schema/String/pattern.test.ts @@ -1,7 +1,7 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" import { assertFalse, assertTrue, strictEqual } from "effect/test/util" -import { describe, it } from "vitest" describe("pattern", () => { it("is", () => { diff --git a/packages/effect/test/Schema/Schema/String/split.test.ts b/packages/effect/test/Schema/Schema/String/split.test.ts index 7f76c15e8e2..d369fb0fb3e 100644 --- a/packages/effect/test/Schema/Schema/String/split.test.ts +++ b/packages/effect/test/Schema/Schema/String/split.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("string/split", () => { it("split (data-last)", async () => { diff --git a/packages/effect/test/Schema/Schema/String/startsWith.test.ts b/packages/effect/test/Schema/Schema/String/startsWith.test.ts index dd50658332e..1578366ebcc 100644 --- a/packages/effect/test/Schema/Schema/String/startsWith.test.ts +++ b/packages/effect/test/Schema/Schema/String/startsWith.test.ts @@ -1,8 +1,8 @@ +import { describe, it } from "@effect/vitest" import * as P from "effect/ParseResult" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" import { assertFalse, assertTrue } from "effect/test/util" -import { describe, it } from "vitest" describe("startsWith", () => { it("is", () => { diff --git a/packages/effect/test/Schema/Schema/String/trim.test.ts b/packages/effect/test/Schema/Schema/String/trim.test.ts index 9087c728f83..edff32969dc 100644 --- a/packages/effect/test/Schema/Schema/String/trim.test.ts +++ b/packages/effect/test/Schema/Schema/String/trim.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("trim", () => { it("test roundtrip consistency", () => { diff --git a/packages/effect/test/Schema/Schema/String/uncapitalize.test.ts b/packages/effect/test/Schema/Schema/String/uncapitalize.test.ts index bb5671c2196..7c76df585dc 100644 --- a/packages/effect/test/Schema/Schema/String/uncapitalize.test.ts +++ b/packages/effect/test/Schema/Schema/String/uncapitalize.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("Uncapitalize", () => { it("test roundtrip consistency", () => { diff --git a/packages/effect/test/Schema/Schema/String/uppercase.test.ts b/packages/effect/test/Schema/Schema/String/uppercase.test.ts index 9a1c466ab7d..4a69f496777 100644 --- a/packages/effect/test/Schema/Schema/String/uppercase.test.ts +++ b/packages/effect/test/Schema/Schema/String/uppercase.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("Uppercase", () => { it("test roundtrip consistency", () => { diff --git a/packages/effect/test/Schema/Schema/Struct/Struct.test.ts b/packages/effect/test/Schema/Schema/Struct/Struct.test.ts index 94b0d29b0c1..04de3e775db 100644 --- a/packages/effect/test/Schema/Schema/Struct/Struct.test.ts +++ b/packages/effect/test/Schema/Schema/Struct/Struct.test.ts @@ -1,8 +1,8 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as AST from "effect/SchemaAST" import * as Util from "effect/test/Schema/TestUtils" import { deepStrictEqual, strictEqual } from "effect/test/util" -import { describe, it } from "vitest" describe("Struct", () => { it("annotations()", () => { diff --git a/packages/effect/test/Schema/Schema/Struct/make.test.ts b/packages/effect/test/Schema/Schema/Struct/make.test.ts index ac9287a838f..fd93d3a5faf 100644 --- a/packages/effect/test/Schema/Schema/Struct/make.test.ts +++ b/packages/effect/test/Schema/Schema/Struct/make.test.ts @@ -1,7 +1,7 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" import { deepStrictEqual } from "effect/test/util" -import { describe, it } from "vitest" describe("make", () => { it("required fields", () => { diff --git a/packages/effect/test/Schema/Schema/Struct/omit.test.ts b/packages/effect/test/Schema/Schema/Struct/omit.test.ts index 7b317d39f2c..52af8cff766 100644 --- a/packages/effect/test/Schema/Schema/Struct/omit.test.ts +++ b/packages/effect/test/Schema/Schema/Struct/omit.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import { deepStrictEqual } from "effect/test/util" -import { describe, it } from "vitest" describe("omit", () => { it("should work", () => { diff --git a/packages/effect/test/Schema/Schema/Struct/pick.test.ts b/packages/effect/test/Schema/Schema/Struct/pick.test.ts index 74355316e8a..63834aebcac 100644 --- a/packages/effect/test/Schema/Schema/Struct/pick.test.ts +++ b/packages/effect/test/Schema/Schema/Struct/pick.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import { deepStrictEqual } from "effect/test/util" -import { describe, it } from "vitest" describe("pick", () => { it("should work", () => { diff --git a/packages/effect/test/Schema/Schema/Symbol/Symbol.test.ts b/packages/effect/test/Schema/Schema/Symbol/Symbol.test.ts index 811de0c57ed..de75a38730d 100644 --- a/packages/effect/test/Schema/Schema/Symbol/Symbol.test.ts +++ b/packages/effect/test/Schema/Schema/Symbol/Symbol.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("Symbol", () => { const schema = S.Symbol diff --git a/packages/effect/test/Schema/Schema/Symbol/SymbolFromSelf.test.ts b/packages/effect/test/Schema/Schema/Symbol/SymbolFromSelf.test.ts index 5798e331495..0bec0c1b72c 100644 --- a/packages/effect/test/Schema/Schema/Symbol/SymbolFromSelf.test.ts +++ b/packages/effect/test/Schema/Schema/Symbol/SymbolFromSelf.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("SymbolFromSelf", () => { const schema = S.SymbolFromSelf diff --git a/packages/effect/test/Schema/Schema/TaggedStruct/make.test.ts b/packages/effect/test/Schema/Schema/TaggedStruct/make.test.ts index 9a7e0b11c62..4a285882a91 100644 --- a/packages/effect/test/Schema/Schema/TaggedStruct/make.test.ts +++ b/packages/effect/test/Schema/Schema/TaggedStruct/make.test.ts @@ -1,7 +1,7 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" import { deepStrictEqual } from "effect/test/util" -import { describe, it } from "vitest" describe("make", () => { it("tag should be optional", () => { diff --git a/packages/effect/test/Schema/Schema/TemplateLiteral/TemplateLiteral.test.ts b/packages/effect/test/Schema/Schema/TemplateLiteral/TemplateLiteral.test.ts index 0e47d3634ad..15df1b28310 100644 --- a/packages/effect/test/Schema/Schema/TemplateLiteral/TemplateLiteral.test.ts +++ b/packages/effect/test/Schema/Schema/TemplateLiteral/TemplateLiteral.test.ts @@ -1,3 +1,4 @@ +import { describe, it } from "@effect/vitest" import * as A from "effect/Arbitrary" import type * as array_ from "effect/Array" import * as S from "effect/Schema" @@ -5,7 +6,6 @@ import * as AST from "effect/SchemaAST" import * as Util from "effect/test/Schema/TestUtils" import { deepStrictEqual, strictEqual, throws } from "effect/test/util" import * as fc from "fast-check" -import { describe, it } from "vitest" type TemplateLiteralParameter = S.Schema.AnyNoContext | AST.LiteralValue diff --git a/packages/effect/test/Schema/Schema/TemplateLiteralParser.test.ts b/packages/effect/test/Schema/Schema/TemplateLiteralParser.test.ts index 078694ecaca..820c18af8a2 100644 --- a/packages/effect/test/Schema/Schema/TemplateLiteralParser.test.ts +++ b/packages/effect/test/Schema/Schema/TemplateLiteralParser.test.ts @@ -1,9 +1,9 @@ +import { describe, it } from "@effect/vitest" import type * as array_ from "effect/Array" import * as S from "effect/Schema" import * as AST from "effect/SchemaAST" import * as Util from "effect/test/Schema/TestUtils" import { deepStrictEqual, strictEqual, throws } from "effect/test/util" -import { describe, it } from "vitest" type TemplateLiteralParameter = S.Schema.AnyNoContext | AST.LiteralValue diff --git a/packages/effect/test/Schema/Schema/Trimmed/Trimmed.test.ts b/packages/effect/test/Schema/Schema/Trimmed/Trimmed.test.ts index edacb8da484..66fd56e7157 100644 --- a/packages/effect/test/Schema/Schema/Trimmed/Trimmed.test.ts +++ b/packages/effect/test/Schema/Schema/Trimmed/Trimmed.test.ts @@ -1,10 +1,10 @@ +import { describe, it } from "@effect/vitest" import { Option, Predicate } from "effect" import * as P from "effect/ParseResult" import * as S from "effect/Schema" import * as AST from "effect/SchemaAST" import * as Util from "effect/test/Schema/TestUtils" import { assertFalse, assertTrue } from "effect/test/util" -import { describe, it } from "vitest" describe("Trimmed", () => { const schema = S.Trimmed diff --git a/packages/effect/test/Schema/Schema/Tuple/Tuple.test.ts b/packages/effect/test/Schema/Schema/Tuple/Tuple.test.ts index 9093bff8981..021278e4f3b 100644 --- a/packages/effect/test/Schema/Schema/Tuple/Tuple.test.ts +++ b/packages/effect/test/Schema/Schema/Tuple/Tuple.test.ts @@ -1,8 +1,8 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as AST from "effect/SchemaAST" import * as Util from "effect/test/Schema/TestUtils" import { deepStrictEqual } from "effect/test/util" -import { describe, it } from "vitest" describe("Tuple", () => { it("annotations()", () => { diff --git a/packages/effect/test/Schema/Schema/ULID.test.ts b/packages/effect/test/Schema/Schema/ULID.test.ts index aec5e3c8483..530edb6006d 100644 --- a/packages/effect/test/Schema/Schema/ULID.test.ts +++ b/packages/effect/test/Schema/Schema/ULID.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("ULID", () => { it("test roundtrip consistency", () => { diff --git a/packages/effect/test/Schema/Schema/URL/URL.test.ts b/packages/effect/test/Schema/Schema/URL/URL.test.ts index 2b06458f80e..d5243e96fd0 100644 --- a/packages/effect/test/Schema/Schema/URL/URL.test.ts +++ b/packages/effect/test/Schema/Schema/URL/URL.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("URL", () => { const schema = S.URL diff --git a/packages/effect/test/Schema/Schema/URL/URLFromSelf.test.ts b/packages/effect/test/Schema/Schema/URL/URLFromSelf.test.ts index 2e6fcaff47d..4843ceccd71 100644 --- a/packages/effect/test/Schema/Schema/URL/URLFromSelf.test.ts +++ b/packages/effect/test/Schema/Schema/URL/URLFromSelf.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("URLFromSelf", () => { const schema = S.URLFromSelf diff --git a/packages/effect/test/Schema/Schema/UUID.test.ts b/packages/effect/test/Schema/Schema/UUID.test.ts index fc1cdca4d1f..e485943d0b1 100644 --- a/packages/effect/test/Schema/Schema/UUID.test.ts +++ b/packages/effect/test/Schema/Schema/UUID.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("string/UUID", () => { it("test roundtrip consistency", () => { diff --git a/packages/effect/test/Schema/Schema/Uint8Array/Uint8Array.test.ts b/packages/effect/test/Schema/Schema/Uint8Array/Uint8Array.test.ts index 6ef95ee8984..b8a8dd18f9a 100644 --- a/packages/effect/test/Schema/Schema/Uint8Array/Uint8Array.test.ts +++ b/packages/effect/test/Schema/Schema/Uint8Array/Uint8Array.test.ts @@ -1,7 +1,7 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" import { assertTrue } from "effect/test/util" -import { describe, it } from "vitest" describe("Uint8Array > Uint8Array", () => { const schema = S.Uint8Array diff --git a/packages/effect/test/Schema/Schema/Uint8Array/Uint8ArrayFromBase64.test.ts b/packages/effect/test/Schema/Schema/Uint8Array/Uint8ArrayFromBase64.test.ts index f2581af5f4c..bd3c6de5e67 100644 --- a/packages/effect/test/Schema/Schema/Uint8Array/Uint8ArrayFromBase64.test.ts +++ b/packages/effect/test/Schema/Schema/Uint8Array/Uint8ArrayFromBase64.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("Uint8ArrayFromBase64", () => { const schema = S.Uint8ArrayFromBase64 diff --git a/packages/effect/test/Schema/Schema/Uint8Array/Uint8ArrayFromBase64Url.test.ts b/packages/effect/test/Schema/Schema/Uint8Array/Uint8ArrayFromBase64Url.test.ts index cec2342ec6a..6f065db16e3 100644 --- a/packages/effect/test/Schema/Schema/Uint8Array/Uint8ArrayFromBase64Url.test.ts +++ b/packages/effect/test/Schema/Schema/Uint8Array/Uint8ArrayFromBase64Url.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("Uint8ArrayFromBase64Url", () => { const schema = S.Uint8ArrayFromBase64Url diff --git a/packages/effect/test/Schema/Schema/Uint8Array/Uint8ArrayFromHex.test.ts b/packages/effect/test/Schema/Schema/Uint8Array/Uint8ArrayFromHex.test.ts index 1ce524f304d..5cb64fef252 100644 --- a/packages/effect/test/Schema/Schema/Uint8Array/Uint8ArrayFromHex.test.ts +++ b/packages/effect/test/Schema/Schema/Uint8Array/Uint8ArrayFromHex.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("Uint8ArrayFromHex", () => { const schema = S.Uint8ArrayFromHex diff --git a/packages/effect/test/Schema/Schema/Uint8Array/Uint8ArrayFromSelf.test.ts b/packages/effect/test/Schema/Schema/Uint8Array/Uint8ArrayFromSelf.test.ts index 38cae98eee3..49b3324c5c0 100644 --- a/packages/effect/test/Schema/Schema/Uint8Array/Uint8ArrayFromSelf.test.ts +++ b/packages/effect/test/Schema/Schema/Uint8Array/Uint8ArrayFromSelf.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("Uint8Array > Uint8ArrayFromSelf", () => { it("test roundtrip consistency", () => { diff --git a/packages/effect/test/Schema/Schema/Union/Union.test.ts b/packages/effect/test/Schema/Schema/Union/Union.test.ts index 0e56544419e..469686b8f25 100644 --- a/packages/effect/test/Schema/Schema/Union/Union.test.ts +++ b/packages/effect/test/Schema/Schema/Union/Union.test.ts @@ -1,8 +1,8 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as AST from "effect/SchemaAST" import * as Util from "effect/test/Schema/TestUtils" import { deepStrictEqual } from "effect/test/util" -import { describe, it } from "vitest" describe("Union", () => { it("should allow annotations to be applied", () => { diff --git a/packages/effect/test/Schema/Schema/UniqueSymbol/UniqueSymbolFromSelf.test.ts b/packages/effect/test/Schema/Schema/UniqueSymbol/UniqueSymbolFromSelf.test.ts index e992bbba4c1..4bbc7caa5e9 100644 --- a/packages/effect/test/Schema/Schema/UniqueSymbol/UniqueSymbolFromSelf.test.ts +++ b/packages/effect/test/Schema/Schema/UniqueSymbol/UniqueSymbolFromSelf.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("UniqueSymbolFromSelf", () => { const a = Symbol.for("effect/Schema/test/a") diff --git a/packages/effect/test/Schema/Schema/Unknown/Unknown.test.ts b/packages/effect/test/Schema/Schema/Unknown/Unknown.test.ts index 372e1d363f1..92ecc5ca64b 100644 --- a/packages/effect/test/Schema/Schema/Unknown/Unknown.test.ts +++ b/packages/effect/test/Schema/Schema/Unknown/Unknown.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("Unknown", () => { const schema = S.Unknown diff --git a/packages/effect/test/Schema/Schema/Void/Void.test.ts b/packages/effect/test/Schema/Schema/Void/Void.test.ts index a660beba914..cd5add09a65 100644 --- a/packages/effect/test/Schema/Schema/Void/Void.test.ts +++ b/packages/effect/test/Schema/Schema/Void/Void.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("Void", () => { const schema = S.Void diff --git a/packages/effect/test/Schema/Schema/annotations.test.ts b/packages/effect/test/Schema/Schema/annotations.test.ts index 82d8d884234..c26f03eb208 100644 --- a/packages/effect/test/Schema/Schema/annotations.test.ts +++ b/packages/effect/test/Schema/Schema/annotations.test.ts @@ -1,10 +1,10 @@ +import { describe, it } from "@effect/vitest" import type * as ParseResult from "effect/ParseResult" import type * as Pretty from "effect/Pretty" import * as S from "effect/Schema" import * as AST from "effect/SchemaAST" import * as Util from "effect/test/Schema/TestUtils" import { assertTrue, deepStrictEqual, strictEqual } from "effect/test/util" -import { describe, it } from "vitest" describe(".annotations()", () => { it("should return a Schema", () => { diff --git a/packages/effect/test/Schema/Schema/asserts.test.ts b/packages/effect/test/Schema/Schema/asserts.test.ts index c814393b2ef..390d55504f4 100644 --- a/packages/effect/test/Schema/Schema/asserts.test.ts +++ b/packages/effect/test/Schema/Schema/asserts.test.ts @@ -1,8 +1,8 @@ +import { describe, it } from "@effect/vitest" import * as ParseResult from "effect/ParseResult" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" import { assertTrue, strictEqual } from "effect/test/util" -import { describe, it } from "vitest" describe("asserts", () => { it("the returned error should be a ParseError", () => { diff --git a/packages/effect/test/Schema/Schema/attachPropertySignature.test.ts b/packages/effect/test/Schema/Schema/attachPropertySignature.test.ts index ad20873d955..1225a0a9251 100644 --- a/packages/effect/test/Schema/Schema/attachPropertySignature.test.ts +++ b/packages/effect/test/Schema/Schema/attachPropertySignature.test.ts @@ -1,7 +1,7 @@ +import { describe, it } from "@effect/vitest" import * as ParseResult from "effect/ParseResult" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("attachPropertySignature", () => { it("string keys literal values", async () => { diff --git a/packages/effect/test/Schema/Schema/brand.test.ts b/packages/effect/test/Schema/Schema/brand.test.ts index 73766b4d087..cf9e4b508fb 100644 --- a/packages/effect/test/Schema/Schema/brand.test.ts +++ b/packages/effect/test/Schema/Schema/brand.test.ts @@ -1,8 +1,8 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as AST from "effect/SchemaAST" import * as Util from "effect/test/Schema/TestUtils" import { assertFalse, assertTrue, deepStrictEqual, strictEqual } from "effect/test/util" -import { describe, it } from "vitest" describe("brand", () => { it("toString", () => { diff --git a/packages/effect/test/Schema/Schema/compose.test.ts b/packages/effect/test/Schema/Schema/compose.test.ts index 31df37e5d3c..e1bb9566bc5 100644 --- a/packages/effect/test/Schema/Schema/compose.test.ts +++ b/packages/effect/test/Schema/Schema/compose.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("compose", async () => { it("B = C", async () => { diff --git a/packages/effect/test/Schema/Schema/decode.test.ts b/packages/effect/test/Schema/Schema/decode.test.ts index 5ed18ec9102..69a55b2dc60 100644 --- a/packages/effect/test/Schema/Schema/decode.test.ts +++ b/packages/effect/test/Schema/Schema/decode.test.ts @@ -1,7 +1,7 @@ +import { describe, it } from "@effect/vitest" import * as Effect from "effect/Effect" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("decode", () => { const schema = S.Struct({ a: Util.NumberFromChar }) diff --git a/packages/effect/test/Schema/Schema/decodeEither.test.ts b/packages/effect/test/Schema/Schema/decodeEither.test.ts index 763881993e5..7076a8c58b6 100644 --- a/packages/effect/test/Schema/Schema/decodeEither.test.ts +++ b/packages/effect/test/Schema/Schema/decodeEither.test.ts @@ -1,7 +1,7 @@ +import { describe, it } from "@effect/vitest" import * as Either from "effect/Either" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("decodeEither", () => { const schema = S.Struct({ a: Util.NumberFromChar }) diff --git a/packages/effect/test/Schema/Schema/decodeOption.test.ts b/packages/effect/test/Schema/Schema/decodeOption.test.ts index 8d143b0ef2d..f15fc808798 100644 --- a/packages/effect/test/Schema/Schema/decodeOption.test.ts +++ b/packages/effect/test/Schema/Schema/decodeOption.test.ts @@ -1,7 +1,7 @@ +import { describe, it } from "@effect/vitest" import { Schema as S } from "effect" import * as Util from "effect/test/Schema/TestUtils" import { assertNone, assertSome } from "effect/test/util" -import { describe, it } from "vitest" describe("decodeOption", () => { it("should return none on async", () => { diff --git a/packages/effect/test/Schema/Schema/decodePromise.test.ts b/packages/effect/test/Schema/Schema/decodePromise.test.ts index f0f02dda2b6..72d07ffd802 100644 --- a/packages/effect/test/Schema/Schema/decodePromise.test.ts +++ b/packages/effect/test/Schema/Schema/decodePromise.test.ts @@ -1,7 +1,7 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" import { deepStrictEqual } from "effect/test/util" -import { describe, it } from "vitest" describe("decodePromise", () => { const schema = S.Struct({ a: Util.NumberFromChar }) diff --git a/packages/effect/test/Schema/Schema/decodeSync.test.ts b/packages/effect/test/Schema/Schema/decodeSync.test.ts index 96151b91e76..2a8e8bc799b 100644 --- a/packages/effect/test/Schema/Schema/decodeSync.test.ts +++ b/packages/effect/test/Schema/Schema/decodeSync.test.ts @@ -1,7 +1,7 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" import { deepStrictEqual } from "effect/test/util" -import { describe, it } from "vitest" describe("decodeSync", () => { const schema = S.Struct({ a: Util.NumberFromChar }) diff --git a/packages/effect/test/Schema/Schema/decodeUnknownEither.test.ts b/packages/effect/test/Schema/Schema/decodeUnknownEither.test.ts index 1c396013e55..f776f0f0b5a 100644 --- a/packages/effect/test/Schema/Schema/decodeUnknownEither.test.ts +++ b/packages/effect/test/Schema/Schema/decodeUnknownEither.test.ts @@ -1,7 +1,7 @@ +import { describe, it } from "@effect/vitest" import * as Either from "effect/Either" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("decodeUnknownEither", () => { it("should return Left on async", async () => { diff --git a/packages/effect/test/Schema/Schema/decodeUnknownOption.test.ts b/packages/effect/test/Schema/Schema/decodeUnknownOption.test.ts index 77837c1b00c..ec123d7bff4 100644 --- a/packages/effect/test/Schema/Schema/decodeUnknownOption.test.ts +++ b/packages/effect/test/Schema/Schema/decodeUnknownOption.test.ts @@ -1,7 +1,7 @@ +import { describe, it } from "@effect/vitest" import { Schema as S } from "effect" import * as Util from "effect/test/Schema/TestUtils" import { assertNone } from "effect/test/util" -import { describe, it } from "vitest" describe("decodeUnknownOption", () => { it("should return none on async", () => { diff --git a/packages/effect/test/Schema/Schema/decodeUnknownSync.test.ts b/packages/effect/test/Schema/Schema/decodeUnknownSync.test.ts index 53c7273f206..966231fd395 100644 --- a/packages/effect/test/Schema/Schema/decodeUnknownSync.test.ts +++ b/packages/effect/test/Schema/Schema/decodeUnknownSync.test.ts @@ -1,8 +1,8 @@ +import { describe, it } from "@effect/vitest" import * as ParseResult from "effect/ParseResult" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" import { assertTrue } from "effect/test/util" -import { describe, it } from "vitest" describe("decodeUnknownSync", () => { it("the returned error should be a ParseError", () => { diff --git a/packages/effect/test/Schema/Schema/encode.test.ts b/packages/effect/test/Schema/Schema/encode.test.ts index 02f0917b830..8a227422a74 100644 --- a/packages/effect/test/Schema/Schema/encode.test.ts +++ b/packages/effect/test/Schema/Schema/encode.test.ts @@ -1,7 +1,7 @@ +import { describe, it } from "@effect/vitest" import * as Effect from "effect/Effect" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("encode", () => { const schema = S.Struct({ a: Util.NumberFromChar }) diff --git a/packages/effect/test/Schema/Schema/encodeEither.test.ts b/packages/effect/test/Schema/Schema/encodeEither.test.ts index 58e6e8e0066..3cc937edb2f 100644 --- a/packages/effect/test/Schema/Schema/encodeEither.test.ts +++ b/packages/effect/test/Schema/Schema/encodeEither.test.ts @@ -1,7 +1,7 @@ +import { describe, it } from "@effect/vitest" import * as Either from "effect/Either" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("encodeEither", () => { const schema = S.Struct({ a: Util.NumberFromChar }) diff --git a/packages/effect/test/Schema/Schema/encodeOption.test.ts b/packages/effect/test/Schema/Schema/encodeOption.test.ts index 9d2c7f7f274..5af472e43a7 100644 --- a/packages/effect/test/Schema/Schema/encodeOption.test.ts +++ b/packages/effect/test/Schema/Schema/encodeOption.test.ts @@ -1,7 +1,7 @@ +import { describe, it } from "@effect/vitest" import { Schema as S } from "effect" import * as Util from "effect/test/Schema/TestUtils" import { assertNone, assertSome } from "effect/test/util" -import { describe, it } from "vitest" describe("encodeOption", () => { it("should return none on async", () => { diff --git a/packages/effect/test/Schema/Schema/encodePromise.test.ts b/packages/effect/test/Schema/Schema/encodePromise.test.ts index 7df84a8778f..11933b73178 100644 --- a/packages/effect/test/Schema/Schema/encodePromise.test.ts +++ b/packages/effect/test/Schema/Schema/encodePromise.test.ts @@ -1,7 +1,7 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" import { deepStrictEqual } from "effect/test/util" -import { describe, it } from "vitest" describe("encodePromise", () => { const schema = S.Struct({ a: Util.NumberFromChar }) diff --git a/packages/effect/test/Schema/Schema/encodeSync.test.ts b/packages/effect/test/Schema/Schema/encodeSync.test.ts index 6b991296161..957c6e74441 100644 --- a/packages/effect/test/Schema/Schema/encodeSync.test.ts +++ b/packages/effect/test/Schema/Schema/encodeSync.test.ts @@ -1,7 +1,7 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" import { deepStrictEqual } from "effect/test/util" -import { describe, it } from "vitest" describe("encodeSync", () => { const schema = S.Struct({ a: Util.NumberFromChar }) diff --git a/packages/effect/test/Schema/Schema/encodeUnknownEither.test.ts b/packages/effect/test/Schema/Schema/encodeUnknownEither.test.ts index 1dc122bb20a..a35a6cbc995 100644 --- a/packages/effect/test/Schema/Schema/encodeUnknownEither.test.ts +++ b/packages/effect/test/Schema/Schema/encodeUnknownEither.test.ts @@ -1,7 +1,7 @@ +import { describe, it } from "@effect/vitest" import * as Either from "effect/Either" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("encodeUnknownEither", () => { it("should return Left on async", async () => { diff --git a/packages/effect/test/Schema/Schema/encodeUnknownOption.test.ts b/packages/effect/test/Schema/Schema/encodeUnknownOption.test.ts index 03d33e87d56..8b229e7e19b 100644 --- a/packages/effect/test/Schema/Schema/encodeUnknownOption.test.ts +++ b/packages/effect/test/Schema/Schema/encodeUnknownOption.test.ts @@ -1,7 +1,7 @@ +import { describe, it } from "@effect/vitest" import { Schema as S } from "effect" import * as Util from "effect/test/Schema/TestUtils" import { assertNone } from "effect/test/util" -import { describe, it } from "vitest" describe("encodeUnknownOption", () => { it("should return none on async", () => { diff --git a/packages/effect/test/Schema/Schema/encodeUnknownSync.test.ts b/packages/effect/test/Schema/Schema/encodeUnknownSync.test.ts index 59feea47ab6..85e292c2cb8 100644 --- a/packages/effect/test/Schema/Schema/encodeUnknownSync.test.ts +++ b/packages/effect/test/Schema/Schema/encodeUnknownSync.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("encodeUnknownSync", () => { it("should throw on async", () => { diff --git a/packages/effect/test/Schema/Schema/encodedBoundSchema.test.ts b/packages/effect/test/Schema/Schema/encodedBoundSchema.test.ts index 62c58797366..c48670a3a46 100644 --- a/packages/effect/test/Schema/Schema/encodedBoundSchema.test.ts +++ b/packages/effect/test/Schema/Schema/encodedBoundSchema.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("encodedBoundSchema", () => { const StringTransformation = S.transform( diff --git a/packages/effect/test/Schema/Schema/encodedSchema.test.ts b/packages/effect/test/Schema/Schema/encodedSchema.test.ts index 1d5a2409136..b959beee43f 100644 --- a/packages/effect/test/Schema/Schema/encodedSchema.test.ts +++ b/packages/effect/test/Schema/Schema/encodedSchema.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("encodedSchema", () => { it("suspend", async () => { diff --git a/packages/effect/test/Schema/Schema/equivalence.test.ts b/packages/effect/test/Schema/Schema/equivalence.test.ts index d1bf42d42db..b7b874aa7e1 100644 --- a/packages/effect/test/Schema/Schema/equivalence.test.ts +++ b/packages/effect/test/Schema/Schema/equivalence.test.ts @@ -1,3 +1,4 @@ +import { describe, it } from "@effect/vitest" import * as A from "effect/Arbitrary" import * as Chunk from "effect/Chunk" import * as Data from "effect/Data" @@ -10,7 +11,6 @@ import { isUnknown } from "effect/Predicate" import * as S from "effect/Schema" import { assertFalse, assertTrue, strictEqual, throws } from "effect/test/util" import * as fc from "fast-check" -import { describe, it } from "vitest" /** * Tests that the generated Eq is a valid Eq diff --git a/packages/effect/test/Schema/Schema/extend.test.ts b/packages/effect/test/Schema/Schema/extend.test.ts index dcf868acb38..8cab8b6f6a0 100644 --- a/packages/effect/test/Schema/Schema/extend.test.ts +++ b/packages/effect/test/Schema/Schema/extend.test.ts @@ -1,10 +1,10 @@ +import { describe, it } from "@effect/vitest" import * as Arbitrary from "effect/Arbitrary" import * as FastCheck from "effect/FastCheck" import * as Schema from "effect/Schema" import * as AST from "effect/SchemaAST" import * as Util from "effect/test/Schema/TestUtils" import { assertTrue, deepStrictEqual, strictEqual, throws } from "effect/test/util" -import { describe, it } from "vitest" describe("extend", () => { describe("String", () => { diff --git a/packages/effect/test/Schema/Schema/filter.test.ts b/packages/effect/test/Schema/Schema/filter.test.ts index 6195a1f139b..65462e5ec49 100644 --- a/packages/effect/test/Schema/Schema/filter.test.ts +++ b/packages/effect/test/Schema/Schema/filter.test.ts @@ -1,9 +1,9 @@ +import { describe, it } from "@effect/vitest" import * as ParseResult from "effect/ParseResult" import * as S from "effect/Schema" import * as AST from "effect/SchemaAST" import * as Util from "effect/test/Schema/TestUtils" import { deepStrictEqual, strictEqual } from "effect/test/util" -import { describe, it } from "vitest" describe("filter", () => { describe("error messages", () => { diff --git a/packages/effect/test/Schema/Schema/filterEffect.test.ts b/packages/effect/test/Schema/Schema/filterEffect.test.ts index b42b31fd6dc..39768fc6fdf 100644 --- a/packages/effect/test/Schema/Schema/filterEffect.test.ts +++ b/packages/effect/test/Schema/Schema/filterEffect.test.ts @@ -1,9 +1,9 @@ +import { describe, it } from "@effect/vitest" import * as Effect from "effect/Effect" import * as ParseResult from "effect/ParseResult" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" import { strictEqual } from "effect/test/util" -import { describe, it } from "vitest" describe("filterEffect", () => { it("shoudl expose the original schema as `from`", async () => { diff --git a/packages/effect/test/Schema/Schema/fromBrand.test.ts b/packages/effect/test/Schema/Schema/fromBrand.test.ts index 4eee61b0367..24dc4846d12 100644 --- a/packages/effect/test/Schema/Schema/fromBrand.test.ts +++ b/packages/effect/test/Schema/Schema/fromBrand.test.ts @@ -1,7 +1,7 @@ +import { describe, it } from "@effect/vitest" import * as Brand from "effect/Brand" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" type Int = number & Brand.Brand<"Int"> const Int = Brand.refined( diff --git a/packages/effect/test/Schema/Schema/getNumberIndexedAccess.test.ts b/packages/effect/test/Schema/Schema/getNumberIndexedAccess.test.ts index f2cd3c83502..4f8a89af9b2 100644 --- a/packages/effect/test/Schema/Schema/getNumberIndexedAccess.test.ts +++ b/packages/effect/test/Schema/Schema/getNumberIndexedAccess.test.ts @@ -1,7 +1,7 @@ +import { describe, it } from "@effect/vitest" import * as Duration from "effect/Duration" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("getNumberIndexedAccess", () => { describe("Tuple", () => { diff --git a/packages/effect/test/Schema/Schema/instanceOf.test.ts b/packages/effect/test/Schema/Schema/instanceOf.test.ts index 8f5617d2984..d9383c5e2ab 100644 --- a/packages/effect/test/Schema/Schema/instanceOf.test.ts +++ b/packages/effect/test/Schema/Schema/instanceOf.test.ts @@ -1,9 +1,9 @@ +import { describe, it } from "@effect/vitest" import * as P from "effect/ParseResult" import * as S from "effect/Schema" import * as AST from "effect/SchemaAST" import * as Util from "effect/test/Schema/TestUtils" import { assertFalse, assertTrue, deepStrictEqual, strictEqual } from "effect/test/util" -import { describe, it } from "vitest" describe("instanceOf", () => { it("is", () => { diff --git a/packages/effect/test/Schema/Schema/is.test.ts b/packages/effect/test/Schema/Schema/is.test.ts index bd76b8f3d48..1d926788529 100644 --- a/packages/effect/test/Schema/Schema/is.test.ts +++ b/packages/effect/test/Schema/Schema/is.test.ts @@ -1,8 +1,8 @@ +import { describe, it } from "@effect/vitest" import * as P from "effect/ParseResult" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" import { assertFalse, assertTrue } from "effect/test/util" -import { describe, it } from "vitest" describe("is", () => { it("never", () => { diff --git a/packages/effect/test/Schema/Schema/isSchema.test.ts b/packages/effect/test/Schema/Schema/isSchema.test.ts index e989bcb17b3..5315788254a 100644 --- a/packages/effect/test/Schema/Schema/isSchema.test.ts +++ b/packages/effect/test/Schema/Schema/isSchema.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import { assertFalse, assertTrue } from "effect/test/util" -import { describe, it } from "vitest" describe("isSchema", () => { it("Schema", () => { diff --git a/packages/effect/test/Schema/Schema/keyof.test.ts b/packages/effect/test/Schema/Schema/keyof.test.ts index d6e1abb9a52..883aefa4133 100644 --- a/packages/effect/test/Schema/Schema/keyof.test.ts +++ b/packages/effect/test/Schema/Schema/keyof.test.ts @@ -1,8 +1,8 @@ +import { describe, it } from "@effect/vitest" import * as P from "effect/ParseResult" import * as S from "effect/Schema" import * as AST from "effect/SchemaAST" import { assertFalse, assertTrue, deepStrictEqual, throws } from "effect/test/util" -import { describe, it } from "vitest" describe("keyof", () => { it("should unify string literals with string", () => { diff --git a/packages/effect/test/Schema/Schema/mutable.test.ts b/packages/effect/test/Schema/Schema/mutable.test.ts index 63247e435e2..86510849640 100644 --- a/packages/effect/test/Schema/Schema/mutable.test.ts +++ b/packages/effect/test/Schema/Schema/mutable.test.ts @@ -1,8 +1,8 @@ +import { describe, it } from "@effect/vitest" import { identity } from "effect" import * as S from "effect/Schema" import * as AST from "effect/SchemaAST" import { deepStrictEqual } from "effect/test/util" -import { describe, it } from "vitest" describe("mutable", () => { it("string", () => { diff --git a/packages/effect/test/Schema/Schema/nonEmptyArray.test.ts b/packages/effect/test/Schema/Schema/nonEmptyArray.test.ts index b3e06af0b84..db45b6fce02 100644 --- a/packages/effect/test/Schema/Schema/nonEmptyArray.test.ts +++ b/packages/effect/test/Schema/Schema/nonEmptyArray.test.ts @@ -1,7 +1,7 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as AST from "effect/SchemaAST" import { deepStrictEqual, strictEqual } from "effect/test/util" -import { describe, it } from "vitest" describe("nonEmptyArray", () => { it("annotations()", () => { diff --git a/packages/effect/test/Schema/Schema/omit.test.ts b/packages/effect/test/Schema/Schema/omit.test.ts index ef4bab187fa..11cb0280ea2 100644 --- a/packages/effect/test/Schema/Schema/omit.test.ts +++ b/packages/effect/test/Schema/Schema/omit.test.ts @@ -1,7 +1,7 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" import { deepStrictEqual } from "effect/test/util" -import { describe, it } from "vitest" describe("omit", () => { it("Struct", async () => { diff --git a/packages/effect/test/Schema/Schema/optional.test.ts b/packages/effect/test/Schema/Schema/optional.test.ts index c5340bb797f..0446cb085b3 100644 --- a/packages/effect/test/Schema/Schema/optional.test.ts +++ b/packages/effect/test/Schema/Schema/optional.test.ts @@ -1,7 +1,7 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" import { strictEqual } from "effect/test/util" -import { describe, it } from "vitest" describe("optional", () => { it("should expose a from property", () => { diff --git a/packages/effect/test/Schema/Schema/optionalElement.test.ts b/packages/effect/test/Schema/Schema/optionalElement.test.ts index adcf8c4ddb9..1cbe8931c41 100644 --- a/packages/effect/test/Schema/Schema/optionalElement.test.ts +++ b/packages/effect/test/Schema/Schema/optionalElement.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import { strictEqual } from "effect/test/util" -import { describe, it } from "vitest" describe("optionalElement", () => { it("toString", () => { diff --git a/packages/effect/test/Schema/Schema/optionalToRequired.test.ts b/packages/effect/test/Schema/Schema/optionalToRequired.test.ts index 7f251ff9a87..b121f44ab50 100644 --- a/packages/effect/test/Schema/Schema/optionalToRequired.test.ts +++ b/packages/effect/test/Schema/Schema/optionalToRequired.test.ts @@ -1,7 +1,7 @@ +import { describe, it } from "@effect/vitest" import * as Option from "effect/Option" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("optionalToRequired", () => { it("two transformation schemas", async () => { diff --git a/packages/effect/test/Schema/Schema/optionalWith.test.ts b/packages/effect/test/Schema/Schema/optionalWith.test.ts index f489b476b38..bece0a689f8 100644 --- a/packages/effect/test/Schema/Schema/optionalWith.test.ts +++ b/packages/effect/test/Schema/Schema/optionalWith.test.ts @@ -1,9 +1,9 @@ +import { describe, it } from "@effect/vitest" import * as O from "effect/Option" import * as S from "effect/Schema" import * as AST from "effect/SchemaAST" import * as Util from "effect/test/Schema/TestUtils" import { deepStrictEqual, strictEqual } from "effect/test/util" -import { describe, it } from "vitest" describe("optionalWith", () => { it("annotations", async () => { diff --git a/packages/effect/test/Schema/Schema/parseJson.test.ts b/packages/effect/test/Schema/Schema/parseJson.test.ts index ac1f8f085da..c23d8383775 100644 --- a/packages/effect/test/Schema/Schema/parseJson.test.ts +++ b/packages/effect/test/Schema/Schema/parseJson.test.ts @@ -1,7 +1,7 @@ +import { describe, it } from "@effect/vitest" import * as Exit from "effect/Exit" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" const isBun = "Bun" in globalThis diff --git a/packages/effect/test/Schema/Schema/partial.test.ts b/packages/effect/test/Schema/Schema/partial.test.ts index b847a3a706a..965a39054bc 100644 --- a/packages/effect/test/Schema/Schema/partial.test.ts +++ b/packages/effect/test/Schema/Schema/partial.test.ts @@ -1,7 +1,7 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" import { strictEqual, throws } from "effect/test/util" -import { describe, it } from "vitest" describe("partial", () => { it("Struct", async () => { diff --git a/packages/effect/test/Schema/Schema/partialWith.test.ts b/packages/effect/test/Schema/Schema/partialWith.test.ts index c9e1870769e..b0e88f8592e 100644 --- a/packages/effect/test/Schema/Schema/partialWith.test.ts +++ b/packages/effect/test/Schema/Schema/partialWith.test.ts @@ -1,8 +1,8 @@ +import { describe, it } from "@effect/vitest" import { identity } from "effect/Function" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" import { strictEqual, throws } from "effect/test/util" -import { describe, it } from "vitest" describe("partialWith", () => { describe("{ exact: true }", () => { diff --git a/packages/effect/test/Schema/Schema/pick.test.ts b/packages/effect/test/Schema/Schema/pick.test.ts index c940d5a5bff..5575c955d1d 100644 --- a/packages/effect/test/Schema/Schema/pick.test.ts +++ b/packages/effect/test/Schema/Schema/pick.test.ts @@ -1,7 +1,7 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" import { deepStrictEqual } from "effect/test/util" -import { describe, it } from "vitest" describe("pick", () => { it("Struct", async () => { diff --git a/packages/effect/test/Schema/Schema/pickLiteral.test.ts b/packages/effect/test/Schema/Schema/pickLiteral.test.ts index 5c785a1c244..79c0bed25ea 100644 --- a/packages/effect/test/Schema/Schema/pickLiteral.test.ts +++ b/packages/effect/test/Schema/Schema/pickLiteral.test.ts @@ -1,8 +1,8 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as AST from "effect/SchemaAST" import * as Util from "effect/test/Schema/TestUtils" import { deepStrictEqual } from "effect/test/util" -import { describe, it } from "vitest" describe("pickLiteral", () => { it("should return an unwrapped AST with exactly one literal", () => { diff --git a/packages/effect/test/Schema/Schema/pipe.test.ts b/packages/effect/test/Schema/Schema/pipe.test.ts index c0aaac4fc4f..437406a7c60 100644 --- a/packages/effect/test/Schema/Schema/pipe.test.ts +++ b/packages/effect/test/Schema/Schema/pipe.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import { assertFalse, assertTrue } from "effect/test/util" -import { describe, it } from "vitest" describe("pipe", () => { it("schemas should be pipeable", () => { diff --git a/packages/effect/test/Schema/Schema/pluck.test.ts b/packages/effect/test/Schema/Schema/pluck.test.ts index bbca109edf2..81bfddc363e 100644 --- a/packages/effect/test/Schema/Schema/pluck.test.ts +++ b/packages/effect/test/Schema/Schema/pluck.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("pluck", () => { describe("decoding", () => { diff --git a/packages/effect/test/Schema/Schema/rename.test.ts b/packages/effect/test/Schema/Schema/rename.test.ts index 8a197a9ca26..f4f702db179 100644 --- a/packages/effect/test/Schema/Schema/rename.test.ts +++ b/packages/effect/test/Schema/Schema/rename.test.ts @@ -1,7 +1,7 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" import { strictEqual } from "effect/test/util" -import { describe, it } from "vitest" describe("rename", () => { describe("Struct", () => { diff --git a/packages/effect/test/Schema/Schema/required.test.ts b/packages/effect/test/Schema/Schema/required.test.ts index 0cd379171f0..fd7f52e0cfd 100644 --- a/packages/effect/test/Schema/Schema/required.test.ts +++ b/packages/effect/test/Schema/Schema/required.test.ts @@ -1,8 +1,8 @@ +import { describe, it } from "@effect/vitest" import { identity } from "effect/Function" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" import { strictEqual, throws } from "effect/test/util" -import { describe, it } from "vitest" describe("required", () => { it("string", () => { diff --git a/packages/effect/test/Schema/Schema/requiredToOptional.test.ts b/packages/effect/test/Schema/Schema/requiredToOptional.test.ts index 1fe967132dc..8c34f00bf20 100644 --- a/packages/effect/test/Schema/Schema/requiredToOptional.test.ts +++ b/packages/effect/test/Schema/Schema/requiredToOptional.test.ts @@ -1,7 +1,7 @@ +import { describe, it } from "@effect/vitest" import * as Option from "effect/Option" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("requiredToOptional", () => { it("two transformation schemas", async () => { diff --git a/packages/effect/test/Schema/Schema/suspend.test.ts b/packages/effect/test/Schema/Schema/suspend.test.ts index e521255b2cb..d38486d16e4 100644 --- a/packages/effect/test/Schema/Schema/suspend.test.ts +++ b/packages/effect/test/Schema/Schema/suspend.test.ts @@ -1,7 +1,7 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" import { strictEqual } from "effect/test/util" -import { describe, it } from "vitest" describe("suspend", () => { describe("toString", () => { diff --git a/packages/effect/test/Schema/Schema/transform.test.ts b/packages/effect/test/Schema/Schema/transform.test.ts index a2b0db96c76..62b1bb8ea21 100644 --- a/packages/effect/test/Schema/Schema/transform.test.ts +++ b/packages/effect/test/Schema/Schema/transform.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import * as Schema from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("transform", () => { it("should receive the fromI value other than the fromA value", async () => { diff --git a/packages/effect/test/Schema/Schema/transformLiterals.test.ts b/packages/effect/test/Schema/Schema/transformLiterals.test.ts index 0e9b78cc044..bda0c1701fa 100644 --- a/packages/effect/test/Schema/Schema/transformLiterals.test.ts +++ b/packages/effect/test/Schema/Schema/transformLiterals.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("transformLiteral", () => { describe("Struct", () => { diff --git a/packages/effect/test/Schema/Schema/transformOrFail.test.ts b/packages/effect/test/Schema/Schema/transformOrFail.test.ts index 021efa05555..bf005866dde 100644 --- a/packages/effect/test/Schema/Schema/transformOrFail.test.ts +++ b/packages/effect/test/Schema/Schema/transformOrFail.test.ts @@ -1,7 +1,7 @@ +import { describe, it } from "@effect/vitest" import * as ParseResult from "effect/ParseResult" import * as Schema from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("transformOrFail", () => { it("should receive the fromI value other than the fromA value", async () => { diff --git a/packages/effect/test/Schema/Schema/typeSchema.test.ts b/packages/effect/test/Schema/Schema/typeSchema.test.ts index aaa24903442..2ff6cb98e84 100644 --- a/packages/effect/test/Schema/Schema/typeSchema.test.ts +++ b/packages/effect/test/Schema/Schema/typeSchema.test.ts @@ -1,7 +1,7 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" import { assertFalse, assertTrue, deepStrictEqual } from "effect/test/util" -import { describe, it } from "vitest" describe("typeSchema", () => { it("transformation", () => { diff --git a/packages/effect/test/Schema/Schema/validate.test.ts b/packages/effect/test/Schema/Schema/validate.test.ts index 79b3fa4f820..e36ba1498bc 100644 --- a/packages/effect/test/Schema/Schema/validate.test.ts +++ b/packages/effect/test/Schema/Schema/validate.test.ts @@ -1,7 +1,7 @@ +import { describe, it } from "@effect/vitest" import * as Effect from "effect/Effect" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("validate", () => { const schema = S.Struct({ a: Util.NumberFromChar }) diff --git a/packages/effect/test/Schema/Schema/validateEither.test.ts b/packages/effect/test/Schema/Schema/validateEither.test.ts index e5cf0a25890..277baaaf5de 100644 --- a/packages/effect/test/Schema/Schema/validateEither.test.ts +++ b/packages/effect/test/Schema/Schema/validateEither.test.ts @@ -1,7 +1,7 @@ +import { describe, it } from "@effect/vitest" import * as Either from "effect/Either" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" -import { describe, it } from "vitest" describe("validateEither", () => { const schema = S.Struct({ a: Util.NumberFromChar }) diff --git a/packages/effect/test/Schema/Schema/validateOption.test.ts b/packages/effect/test/Schema/Schema/validateOption.test.ts index 59c6532d2c5..75c27b454b8 100644 --- a/packages/effect/test/Schema/Schema/validateOption.test.ts +++ b/packages/effect/test/Schema/Schema/validateOption.test.ts @@ -1,7 +1,7 @@ +import { describe, it } from "@effect/vitest" import { Schema as S } from "effect" import * as Util from "effect/test/Schema/TestUtils" import { assertNone, assertSome } from "effect/test/util" -import { describe, it } from "vitest" describe("validateOption", () => { it("should return none on async", () => { diff --git a/packages/effect/test/Schema/Schema/validatePromise.test.ts b/packages/effect/test/Schema/Schema/validatePromise.test.ts index 494e869bc94..d8bd2083e1a 100644 --- a/packages/effect/test/Schema/Schema/validatePromise.test.ts +++ b/packages/effect/test/Schema/Schema/validatePromise.test.ts @@ -1,7 +1,7 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" import { deepStrictEqual } from "effect/test/util" -import { describe, it } from "vitest" describe("validatePromise", () => { const schema = S.Struct({ a: Util.NumberFromChar }) diff --git a/packages/effect/test/Schema/Schema/validateSync.test.ts b/packages/effect/test/Schema/Schema/validateSync.test.ts index 8d8a2f7f97d..f39a97932c5 100644 --- a/packages/effect/test/Schema/Schema/validateSync.test.ts +++ b/packages/effect/test/Schema/Schema/validateSync.test.ts @@ -1,7 +1,7 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" import { deepStrictEqual } from "effect/test/util" -import { describe, it } from "vitest" describe("validateSync", () => { const schema = S.Struct({ a: Util.NumberFromChar }) diff --git a/packages/effect/test/Schema/Schema/withConstructorDefault.test.ts b/packages/effect/test/Schema/Schema/withConstructorDefault.test.ts index d86c3250639..e7dc71df367 100644 --- a/packages/effect/test/Schema/Schema/withConstructorDefault.test.ts +++ b/packages/effect/test/Schema/Schema/withConstructorDefault.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import { strictEqual } from "effect/test/util" -import { describe, it } from "vitest" describe("withConstructorDefault", () => { it("annotating a PropertySignatureDeclaration should repect existing defaultValues", () => { diff --git a/packages/effect/test/Schema/Schema/withDecodingDefault.test.ts b/packages/effect/test/Schema/Schema/withDecodingDefault.test.ts index 39f31c3baa3..b13bc753008 100644 --- a/packages/effect/test/Schema/Schema/withDecodingDefault.test.ts +++ b/packages/effect/test/Schema/Schema/withDecodingDefault.test.ts @@ -1,7 +1,7 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as Util from "effect/test/Schema/TestUtils" import { strictEqual } from "effect/test/util" -import { describe, it } from "vitest" describe("withDecodingDefault", () => { describe("PropertySignatureDeclaration", () => { diff --git a/packages/effect/test/Schema/SchemaAST/IndexSignature.test.ts b/packages/effect/test/Schema/SchemaAST/IndexSignature.test.ts index 8968649f783..67c30fa342a 100644 --- a/packages/effect/test/Schema/SchemaAST/IndexSignature.test.ts +++ b/packages/effect/test/Schema/SchemaAST/IndexSignature.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import * as AST from "effect/SchemaAST" import { throws } from "effect/test/util" -import { describe, it } from "vitest" describe("AST.IndexSignature", () => { it("new IndexSignature should throw on unsupported ASTs", () => { diff --git a/packages/effect/test/Schema/SchemaAST/Refinement.test.ts b/packages/effect/test/Schema/SchemaAST/Refinement.test.ts index b12ca78d03f..69f9e5255aa 100644 --- a/packages/effect/test/Schema/SchemaAST/Refinement.test.ts +++ b/packages/effect/test/Schema/SchemaAST/Refinement.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import { strictEqual } from "effect/test/util" -import { describe, it } from "vitest" describe("AST.Refinement", () => { it("toString", () => { diff --git a/packages/effect/test/Schema/SchemaAST/Tuple.test.ts b/packages/effect/test/Schema/SchemaAST/Tuple.test.ts index 8f4c7da8c09..8d138010404 100644 --- a/packages/effect/test/Schema/SchemaAST/Tuple.test.ts +++ b/packages/effect/test/Schema/SchemaAST/Tuple.test.ts @@ -1,7 +1,7 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as AST from "effect/SchemaAST" import { strictEqual, throws } from "effect/test/util" -import { describe, it } from "vitest" describe("AST.Tuple", () => { it("toString", () => { diff --git a/packages/effect/test/Schema/SchemaAST/TypeLiteral.test.ts b/packages/effect/test/Schema/SchemaAST/TypeLiteral.test.ts index 8e82048f17a..f6ac7920f75 100644 --- a/packages/effect/test/Schema/SchemaAST/TypeLiteral.test.ts +++ b/packages/effect/test/Schema/SchemaAST/TypeLiteral.test.ts @@ -1,7 +1,7 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as AST from "effect/SchemaAST" import { strictEqual, throws } from "effect/test/util" -import { describe, it } from "vitest" describe("AST.TypeLiteral", () => { it("should throw on onvalid index signature parameters", () => { diff --git a/packages/effect/test/Schema/SchemaAST/TypeLiteralTransformation.test.ts b/packages/effect/test/Schema/SchemaAST/TypeLiteralTransformation.test.ts index 12aa56981af..e3b175d39bc 100644 --- a/packages/effect/test/Schema/SchemaAST/TypeLiteralTransformation.test.ts +++ b/packages/effect/test/Schema/SchemaAST/TypeLiteralTransformation.test.ts @@ -1,7 +1,7 @@ +import { describe, it } from "@effect/vitest" import { identity } from "effect/Function" import * as AST from "effect/SchemaAST" import { throws } from "effect/test/util" -import { describe, it } from "vitest" describe("AST.TypeLiteralTransformation", () => { it("Duplicate property signature transformation", () => { diff --git a/packages/effect/test/Schema/SchemaAST/Union.test.ts b/packages/effect/test/Schema/SchemaAST/Union.test.ts index c284770ed5a..81b36db0e40 100644 --- a/packages/effect/test/Schema/SchemaAST/Union.test.ts +++ b/packages/effect/test/Schema/SchemaAST/Union.test.ts @@ -1,7 +1,7 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as AST from "effect/SchemaAST" import { deepStrictEqual, strictEqual } from "effect/test/util" -import { describe, it } from "vitest" describe("AST.Union", () => { it("flatten should un-nest union members", () => { diff --git a/packages/effect/test/Schema/SchemaAST/annotations.test.ts b/packages/effect/test/Schema/SchemaAST/annotations.test.ts index 6ede2cfdaf0..1d10094cb15 100644 --- a/packages/effect/test/Schema/SchemaAST/annotations.test.ts +++ b/packages/effect/test/Schema/SchemaAST/annotations.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import * as AST from "effect/SchemaAST" import { assertTrue, deepStrictEqual } from "effect/test/util" -import { describe, it } from "vitest" describe("annotations", () => { it("should add annotations", () => { diff --git a/packages/effect/test/Schema/SchemaAST/encodedAST.test.ts b/packages/effect/test/Schema/SchemaAST/encodedAST.test.ts index f79930746b5..20d5f9695ab 100644 --- a/packages/effect/test/Schema/SchemaAST/encodedAST.test.ts +++ b/packages/effect/test/Schema/SchemaAST/encodedAST.test.ts @@ -1,7 +1,7 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as AST from "effect/SchemaAST" import { assertFalse, assertTrue, strictEqual } from "effect/test/util" -import { describe, it } from "vitest" describe("encodedAST", () => { it("refinements", () => { diff --git a/packages/effect/test/Schema/SchemaAST/encodedBoundAST.test.ts b/packages/effect/test/Schema/SchemaAST/encodedBoundAST.test.ts index a440babf9a4..bdda05b6b02 100644 --- a/packages/effect/test/Schema/SchemaAST/encodedBoundAST.test.ts +++ b/packages/effect/test/Schema/SchemaAST/encodedBoundAST.test.ts @@ -1,7 +1,7 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as AST from "effect/SchemaAST" import { assertFalse, assertTrue } from "effect/test/util" -import { describe, it } from "vitest" describe("encodedBoundAST", () => { it("refinements", () => { diff --git a/packages/effect/test/Schema/SchemaAST/equals.test.ts b/packages/effect/test/Schema/SchemaAST/equals.test.ts index c4be28781b0..08a56eb0f83 100644 --- a/packages/effect/test/Schema/SchemaAST/equals.test.ts +++ b/packages/effect/test/Schema/SchemaAST/equals.test.ts @@ -1,7 +1,7 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as AST from "effect/SchemaAST" import { assertFalse, assertTrue } from "effect/test/util" -import { describe, it } from "vitest" describe("equals", () => { describe("TemplateLiteral", () => { diff --git a/packages/effect/test/Schema/SchemaAST/getPropertySignatures.test.ts b/packages/effect/test/Schema/SchemaAST/getPropertySignatures.test.ts index af8bfb3af25..5f90390eea5 100644 --- a/packages/effect/test/Schema/SchemaAST/getPropertySignatures.test.ts +++ b/packages/effect/test/Schema/SchemaAST/getPropertySignatures.test.ts @@ -1,7 +1,7 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as AST from "effect/SchemaAST" import { deepStrictEqual } from "effect/test/util" -import { describe, it } from "vitest" describe("getPropertySignatures", () => { it("struct", () => { diff --git a/packages/effect/test/Schema/SchemaAST/guards.test.ts b/packages/effect/test/Schema/SchemaAST/guards.test.ts index c4b7c87fe86..38c67bfad9c 100644 --- a/packages/effect/test/Schema/SchemaAST/guards.test.ts +++ b/packages/effect/test/Schema/SchemaAST/guards.test.ts @@ -1,7 +1,7 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as AST from "effect/SchemaAST" import { assertFalse, assertTrue } from "effect/test/util" -import { describe, it } from "vitest" describe("guards", () => { it("isDeclaration", () => { diff --git a/packages/effect/test/Schema/SchemaAST/mutable.test.ts b/packages/effect/test/Schema/SchemaAST/mutable.test.ts index 8ee5bf0a789..0220776ead5 100644 --- a/packages/effect/test/Schema/SchemaAST/mutable.test.ts +++ b/packages/effect/test/Schema/SchemaAST/mutable.test.ts @@ -1,8 +1,8 @@ +import { describe, it } from "@effect/vitest" import { identity } from "effect" import * as S from "effect/Schema" import * as AST from "effect/SchemaAST" import { strictEqual } from "effect/test/util" -import { describe, it } from "vitest" const expectSameReference = (schema: S.Schema.Any) => { const mutable = AST.mutable(AST.isSuspend(schema.ast) ? schema.ast.f() : schema.ast) diff --git a/packages/effect/test/Schema/SchemaAST/partial.test.ts b/packages/effect/test/Schema/SchemaAST/partial.test.ts index 61c6a23e889..45c57e7611a 100644 --- a/packages/effect/test/Schema/SchemaAST/partial.test.ts +++ b/packages/effect/test/Schema/SchemaAST/partial.test.ts @@ -1,7 +1,7 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as AST from "effect/SchemaAST" import { deepStrictEqual } from "effect/test/util" -import { describe, it } from "vitest" describe("partial", () => { describe("{ exact: false }", () => { diff --git a/packages/effect/test/Schema/SchemaAST/pick.test.ts b/packages/effect/test/Schema/SchemaAST/pick.test.ts index 7c764e3e628..0b48a87d2bd 100644 --- a/packages/effect/test/Schema/SchemaAST/pick.test.ts +++ b/packages/effect/test/Schema/SchemaAST/pick.test.ts @@ -1,7 +1,7 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as AST from "effect/SchemaAST" import { deepStrictEqual, doesNotThrow } from "effect/test/util" -import { describe, it } from "vitest" describe("pick", () => { it("refinement", async () => { diff --git a/packages/effect/test/Schema/SchemaAST/record.test.ts b/packages/effect/test/Schema/SchemaAST/record.test.ts index f4693fb8f9f..ec481e2ea57 100644 --- a/packages/effect/test/Schema/SchemaAST/record.test.ts +++ b/packages/effect/test/Schema/SchemaAST/record.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import * as AST from "effect/SchemaAST" import { deepStrictEqual, throws } from "effect/test/util" -import { describe, it } from "vitest" describe("record", () => { it("should throw on unsupported keys", () => { diff --git a/packages/effect/test/Schema/SchemaAST/suspend.test.ts b/packages/effect/test/Schema/SchemaAST/suspend.test.ts index f3804084d5c..248675ecc9b 100644 --- a/packages/effect/test/Schema/SchemaAST/suspend.test.ts +++ b/packages/effect/test/Schema/SchemaAST/suspend.test.ts @@ -1,8 +1,8 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import type * as AST from "effect/SchemaAST" import * as Util from "effect/test/Schema/TestUtils" import { assertTrue, strictEqual } from "effect/test/util" -import { describe, it } from "vitest" describe("AST.Suspend", () => { it("should memoize the thunk", async () => { diff --git a/packages/effect/test/Schema/SchemaAST/typeAST.test.ts b/packages/effect/test/Schema/SchemaAST/typeAST.test.ts index e924be79b88..7b6c2ba2f30 100644 --- a/packages/effect/test/Schema/SchemaAST/typeAST.test.ts +++ b/packages/effect/test/Schema/SchemaAST/typeAST.test.ts @@ -1,7 +1,7 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as AST from "effect/SchemaAST" import { assertFalse, assertTrue } from "effect/test/util" -import { describe, it } from "vitest" describe("typeAST", () => { describe(`should return the same reference if the AST doesn't represent a transformation`, () => { diff --git a/packages/effect/test/Schema/SchemaAST/unify.test.ts b/packages/effect/test/Schema/SchemaAST/unify.test.ts index 4afadc11f3c..f9d9a6b0f2b 100644 --- a/packages/effect/test/Schema/SchemaAST/unify.test.ts +++ b/packages/effect/test/Schema/SchemaAST/unify.test.ts @@ -1,7 +1,7 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Schema" import * as AST from "effect/SchemaAST" import { deepStrictEqual } from "effect/test/util" -import { describe, it } from "vitest" const expectUnify = (input: Array, expected: Array) => { const actual = AST.unify(input.map((schema) => schema.ast)) diff --git a/packages/effect/test/Schema/SchemaInternal.test.ts b/packages/effect/test/Schema/SchemaInternal.test.ts index 6d44ba35325..40cdf7e0327 100644 --- a/packages/effect/test/Schema/SchemaInternal.test.ts +++ b/packages/effect/test/Schema/SchemaInternal.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import * as util from "effect/internal/schema/util" import { deepStrictEqual, strictEqual } from "effect/test/util" -import { describe, it } from "vitest" describe("effect/internal/schema/util", () => { it("ownKeys", () => { diff --git a/packages/effect/test/Schema/SchemaUserland.test.ts b/packages/effect/test/Schema/SchemaUserland.test.ts index ae5827b72f8..6a651d756c5 100644 --- a/packages/effect/test/Schema/SchemaUserland.test.ts +++ b/packages/effect/test/Schema/SchemaUserland.test.ts @@ -1,10 +1,10 @@ /** * It contains a collection of user-defined APIs to keep track of what might break in the event of breaking changes. */ +import { describe, it } from "@effect/vitest" import { Record, Schema, SchemaAST as AST } from "effect" import * as Util from "effect/test/Schema/TestUtils" import { deepStrictEqual, strictEqual } from "effect/test/util" -import { describe, it } from "vitest" const structTypeSchema = ( schema: Schema.Struct diff --git a/packages/effect/test/Schema/Serializable.test.ts b/packages/effect/test/Schema/Serializable.test.ts index 31e869d2367..38fe79183e9 100644 --- a/packages/effect/test/Schema/Serializable.test.ts +++ b/packages/effect/test/Schema/Serializable.test.ts @@ -1,7 +1,7 @@ +import { describe, test } from "@effect/vitest" import { Effect, Exit } from "effect" import * as S from "effect/Schema" import { deepStrictEqual } from "effect/test/util" -import { describe, test } from "vitest" class Person extends S.Class("Person")({ id: S.Number, diff --git a/packages/effect/test/Scope.test.ts b/packages/effect/test/Scope.test.ts index 7cefff68821..693ff1558be 100644 --- a/packages/effect/test/Scope.test.ts +++ b/packages/effect/test/Scope.test.ts @@ -1,7 +1,6 @@ +import { describe, it } from "@effect/vitest" import { Deferred, Effect, identity, pipe, Ref, Scope } from "effect" import { assertTrue, deepStrictEqual, strictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" -import { describe } from "vitest" type Action = Acquire | Use | Release diff --git a/packages/effect/test/ScopedCache.test.ts b/packages/effect/test/ScopedCache.test.ts index 7f3a771e371..8a916139483 100644 --- a/packages/effect/test/ScopedCache.test.ts +++ b/packages/effect/test/ScopedCache.test.ts @@ -1,3 +1,4 @@ +import { describe, it } from "@effect/vitest" import { Array, Cause, @@ -32,8 +33,6 @@ import { } from "effect/test/util" import * as ObservableResource from "effect/test/utils/cache/ObservableResource" import * as WatchableLookup from "effect/test/utils/cache/WatchableLookup" -import * as it from "effect/test/utils/extend" -import { describe } from "vitest" const hash = dual< (y: number) => (x: number) => number, @@ -46,7 +45,7 @@ const hashEffect = dual< >(2, (x, y) => Effect.sync(() => hash(x, y))) describe("ScopedCache", () => { - it.it("cacheStats - should correctly keep track of cache size, hits and misses", () => + it("cacheStats - should correctly keep track of cache size, hits and misses", () => fc.assert( fc.asyncProperty(fc.integer(), async (salt) => { const program = Effect.gen(function*() { @@ -200,7 +199,7 @@ describe("ScopedCache", () => { }))) })) - it.it("get - when used sequentially, should properly call correct lookup", () => + it("get - when used sequentially, should properly call correct lookup", () => fc.assert(fc.asyncProperty(fc.integer(), (salt) => { const program = Effect.gen(function*() { const scopedCache = ScopedCache.make({ @@ -223,7 +222,7 @@ describe("ScopedCache", () => { return Effect.runPromise(program) }))) - it.it("get - when used concurrently, should properly call correct lookup", () => + it("get - when used concurrently, should properly call correct lookup", () => fc.assert(fc.asyncProperty(fc.integer(), (salt) => { const program = Effect.gen(function*() { const scopedCache = ScopedCache.make({ @@ -247,7 +246,7 @@ describe("ScopedCache", () => { return Effect.runPromise(program) }))) - it.it("get - should clean and remove old resource to respect cache capacity", () => + it("get - should clean and remove old resource to respect cache capacity", () => fc.assert(fc.asyncProperty(fc.integer(), (salt) => { const program = Effect.gen(function*() { const scopedCache = ScopedCache.make({ @@ -449,7 +448,7 @@ describe("ScopedCache", () => { yield* (subResource.assertAcquiredOnceAndCleaned()) })) - it.it("get - should clean old resources if the cache size is exceeded", () => { + it("get - should clean old resources if the cache size is exceeded", () => { const arb = fc.integer({ min: 1, max: 5 }).chain((cacheSize) => fc.integer({ min: cacheSize, max: cacheSize + 3 }) .map((numCreatedKey) => [cacheSize, numCreatedKey] as const) @@ -721,7 +720,7 @@ describe("ScopedCache", () => { }))) })) - it.it("refresh - should clean old resource if cache size is exceeded", () => { + it("refresh - should clean old resource if cache size is exceeded", () => { const arb = fc.integer({ min: 1, max: 5 }).chain((cacheSize) => fc.integer({ min: cacheSize, max: cacheSize + 3 }) .map((numCreatedKey) => [cacheSize, numCreatedKey] as const) diff --git a/packages/effect/test/ScopedRef.test.ts b/packages/effect/test/ScopedRef.test.ts index c40b84c170a..cec11cb0057 100644 --- a/packages/effect/test/ScopedRef.test.ts +++ b/packages/effect/test/ScopedRef.test.ts @@ -1,8 +1,7 @@ +import { describe, it } from "@effect/vitest" import { Effect, identity, pipe, ScopedRef } from "effect" import { strictEqual } from "effect/test/util" import * as Counter from "effect/test/utils/counter" -import * as it from "effect/test/utils/extend" -import { describe } from "vitest" describe("ScopedRef", () => { it.scoped("single set", () => diff --git a/packages/effect/test/Sink/collecting.test.ts b/packages/effect/test/Sink/collecting.test.ts index 25fad7b7be5..b3015104cba 100644 --- a/packages/effect/test/Sink/collecting.test.ts +++ b/packages/effect/test/Sink/collecting.test.ts @@ -1,3 +1,4 @@ +import { describe, it } from "@effect/vitest" import * as Chunk from "effect/Chunk" import * as Effect from "effect/Effect" import { constTrue, pipe } from "effect/Function" @@ -5,8 +6,6 @@ import * as Option from "effect/Option" import * as Sink from "effect/Sink" import * as Stream from "effect/Stream" import { deepStrictEqual, strictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" -import { describe } from "vitest" describe("Sink", () => { it.effect("collectAllN - respects the given limit", () => diff --git a/packages/effect/test/Sink/constructors.test.ts b/packages/effect/test/Sink/constructors.test.ts index 83ccae191e2..2c68f22a267 100644 --- a/packages/effect/test/Sink/constructors.test.ts +++ b/packages/effect/test/Sink/constructors.test.ts @@ -1,3 +1,4 @@ +import { describe, it } from "@effect/vitest" import type * as Chunk from "effect/Chunk" import * as Deferred from "effect/Deferred" import * as Effect from "effect/Effect" @@ -15,8 +16,6 @@ import * as Queue from "effect/Queue" import * as Sink from "effect/Sink" import * as Stream from "effect/Stream" import { assertTrue, deepStrictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" -import { describe } from "vitest" describe("Sink", () => { it.effect("drain - fails if upstream fails", () => diff --git a/packages/effect/test/Sink/dropping.test.ts b/packages/effect/test/Sink/dropping.test.ts index 7735fd8e205..f278f167d4f 100644 --- a/packages/effect/test/Sink/dropping.test.ts +++ b/packages/effect/test/Sink/dropping.test.ts @@ -1,11 +1,10 @@ +import { describe, it } from "@effect/vitest" import * as Effect from "effect/Effect" import * as Either from "effect/Either" import { pipe } from "effect/Function" import * as Sink from "effect/Sink" import * as Stream from "effect/Stream" import { deepStrictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" -import { describe } from "vitest" describe("Sink", () => { it.effect("dropUntil", () => diff --git a/packages/effect/test/Sink/elements.test.ts b/packages/effect/test/Sink/elements.test.ts index d78c4683491..23f09bedc5a 100644 --- a/packages/effect/test/Sink/elements.test.ts +++ b/packages/effect/test/Sink/elements.test.ts @@ -1,11 +1,10 @@ +import { describe, it } from "@effect/vitest" import * as Chunk from "effect/Chunk" import * as Effect from "effect/Effect" import { pipe } from "effect/Function" import * as Sink from "effect/Sink" import * as Stream from "effect/Stream" import { assertSome, assertTrue, deepStrictEqual, strictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" -import { describe } from "vitest" describe("Sink", () => { it.effect("every", () => diff --git a/packages/effect/test/Sink/environment.test.ts b/packages/effect/test/Sink/environment.test.ts index c46111f9d6d..545ab05bdd6 100644 --- a/packages/effect/test/Sink/environment.test.ts +++ b/packages/effect/test/Sink/environment.test.ts @@ -1,11 +1,10 @@ +import { describe, it } from "@effect/vitest" import * as Context from "effect/Context" import * as Effect from "effect/Effect" import { pipe } from "effect/Function" import * as Sink from "effect/Sink" import * as Stream from "effect/Stream" import { strictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" -import { describe } from "vitest" describe("Sink", () => { it.effect("contextWithSink", () => diff --git a/packages/effect/test/Sink/error-handling.test.ts b/packages/effect/test/Sink/error-handling.test.ts index 86319234326..5f4b9541af4 100644 --- a/packages/effect/test/Sink/error-handling.test.ts +++ b/packages/effect/test/Sink/error-handling.test.ts @@ -1,11 +1,10 @@ +import { describe, it } from "@effect/vitest" import * as Effect from "effect/Effect" import * as Exit from "effect/Exit" import { pipe } from "effect/Function" import * as Sink from "effect/Sink" import * as Stream from "effect/Stream" import { deepStrictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" -import { describe } from "vitest" describe("Sink", () => { it.effect("propagates errors", () => diff --git a/packages/effect/test/Sink/filtering.test.ts b/packages/effect/test/Sink/filtering.test.ts index 1fbe2361d94..c79d82e519f 100644 --- a/packages/effect/test/Sink/filtering.test.ts +++ b/packages/effect/test/Sink/filtering.test.ts @@ -1,10 +1,9 @@ +import { describe, it } from "@effect/vitest" import * as Effect from "effect/Effect" import { pipe } from "effect/Function" import * as Sink from "effect/Sink" import * as Stream from "effect/Stream" import { deepStrictEqual, strictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" -import { describe } from "vitest" describe("Sink", () => { it.effect("filterInput", () => diff --git a/packages/effect/test/Sink/finalization.test.ts b/packages/effect/test/Sink/finalization.test.ts index b563160b125..58cc64b03ec 100644 --- a/packages/effect/test/Sink/finalization.test.ts +++ b/packages/effect/test/Sink/finalization.test.ts @@ -1,11 +1,10 @@ +import { describe, it } from "@effect/vitest" import * as Effect from "effect/Effect" import { pipe } from "effect/Function" import * as Ref from "effect/Ref" import * as Sink from "effect/Sink" import * as Stream from "effect/Stream" import { assertTrue } from "effect/test/util" -import * as it from "effect/test/utils/extend" -import { describe } from "vitest" describe("Sink", () => { it.effect("ensuring - happy path", () => diff --git a/packages/effect/test/Sink/folding.test.ts b/packages/effect/test/Sink/folding.test.ts index da1303aafab..32cd65150aa 100644 --- a/packages/effect/test/Sink/folding.test.ts +++ b/packages/effect/test/Sink/folding.test.ts @@ -1,3 +1,4 @@ +import { describe, it } from "@effect/vitest" import * as Chunk from "effect/Chunk" import * as Effect from "effect/Effect" import * as Exit from "effect/Exit" @@ -6,8 +7,6 @@ import * as Ref from "effect/Ref" import * as Sink from "effect/Sink" import * as Stream from "effect/Stream" import { deepStrictEqual, strictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" -import { describe } from "vitest" describe("Sink", () => { it.effect("fold - empty", () => diff --git a/packages/effect/test/Sink/foreign.test.ts b/packages/effect/test/Sink/foreign.test.ts index 2c4e7b11ab1..5c6f08ece32 100644 --- a/packages/effect/test/Sink/foreign.test.ts +++ b/packages/effect/test/Sink/foreign.test.ts @@ -1,3 +1,4 @@ +import { describe, it } from "@effect/vitest" import * as Context from "effect/Context" import * as Effect from "effect/Effect" import * as Either from "effect/Either" @@ -8,9 +9,7 @@ import * as Random from "effect/Random" import type * as Sink from "effect/Sink" import * as Stream from "effect/Stream" import { deepStrictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" import { unify } from "effect/Unify" -import { describe } from "vitest" const runSink = (sink: Sink.Sink) => Stream.run(Effect.void, sink) diff --git a/packages/effect/test/Sink/mapping.test.ts b/packages/effect/test/Sink/mapping.test.ts index 623a35d08aa..15e76583915 100644 --- a/packages/effect/test/Sink/mapping.test.ts +++ b/packages/effect/test/Sink/mapping.test.ts @@ -1,3 +1,4 @@ +import { describe, it } from "@effect/vitest" import * as Cause from "effect/Cause" import * as Chunk from "effect/Chunk" import * as Effect from "effect/Effect" @@ -5,8 +6,6 @@ import { pipe } from "effect/Function" import * as Sink from "effect/Sink" import * as Stream from "effect/Stream" import { assertLeft, deepStrictEqual, strictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" -import { describe } from "vitest" describe("Sink", () => { it.effect("as", () => diff --git a/packages/effect/test/Sink/racing.test.ts b/packages/effect/test/Sink/racing.test.ts index 3b659cfee8d..fa841a1f643 100644 --- a/packages/effect/test/Sink/racing.test.ts +++ b/packages/effect/test/Sink/racing.test.ts @@ -1,3 +1,4 @@ +import { describe, it } from "@effect/vitest" import * as Chunk from "effect/Chunk" import * as Effect from "effect/Effect" import * as Either from "effect/Either" @@ -7,9 +8,7 @@ import * as Random from "effect/Random" import * as Sink from "effect/Sink" import * as Stream from "effect/Stream" import { assertTrue } from "effect/test/util" -import * as it from "effect/test/utils/extend" import { unfoldEffect } from "effect/test/utils/unfoldEffect" -import { describe } from "vitest" const findSink = (a: A): Sink.Sink => pipe( diff --git a/packages/effect/test/Sink/refining.test.ts b/packages/effect/test/Sink/refining.test.ts index 0af3de4a917..58d94860098 100644 --- a/packages/effect/test/Sink/refining.test.ts +++ b/packages/effect/test/Sink/refining.test.ts @@ -1,3 +1,4 @@ +import { describe, it } from "@effect/vitest" import * as Cause from "effect/Cause" import * as Effect from "effect/Effect" import * as Exit from "effect/Exit" @@ -6,8 +7,6 @@ import * as Option from "effect/Option" import * as Sink from "effect/Sink" import * as Stream from "effect/Stream" import { deepStrictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" -import { describe } from "vitest" describe("Sink", () => { it.effect("refineOrDie", () => diff --git a/packages/effect/test/Sink/scoping.test.ts b/packages/effect/test/Sink/scoping.test.ts index d740dc9666e..2e5d56ca0e0 100644 --- a/packages/effect/test/Sink/scoping.test.ts +++ b/packages/effect/test/Sink/scoping.test.ts @@ -1,11 +1,10 @@ +import { describe, it } from "@effect/vitest" import * as Effect from "effect/Effect" import { pipe } from "effect/Function" import * as Ref from "effect/Ref" import * as Sink from "effect/Sink" import * as Stream from "effect/Stream" import { assertFalse, assertTrue, strictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" -import { describe } from "vitest" describe("Sink", () => { it.effect("unwrapScoped - happy path", () => diff --git a/packages/effect/test/Sink/sequencing.test.ts b/packages/effect/test/Sink/sequencing.test.ts index 5f1d991f11d..073ae413241 100644 --- a/packages/effect/test/Sink/sequencing.test.ts +++ b/packages/effect/test/Sink/sequencing.test.ts @@ -1,3 +1,4 @@ +import { describe, it } from "@effect/vitest" import * as Chunk from "effect/Chunk" import * as Effect from "effect/Effect" import { pipe } from "effect/Function" @@ -5,8 +6,6 @@ import * as Option from "effect/Option" import * as Sink from "effect/Sink" import * as Stream from "effect/Stream" import { assertNone, assertSome, deepStrictEqual, strictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" -import { describe } from "vitest" describe("Sink", () => { it.effect("flatMap - empty input", () => diff --git a/packages/effect/test/Sink/traversing.test.ts b/packages/effect/test/Sink/traversing.test.ts index 7d6aab6c020..f9e6ab7cf23 100644 --- a/packages/effect/test/Sink/traversing.test.ts +++ b/packages/effect/test/Sink/traversing.test.ts @@ -1,3 +1,4 @@ +import { describe, it } from "@effect/vitest" import * as Chunk from "effect/Chunk" import * as Effect from "effect/Effect" import * as Equal from "effect/Equal" @@ -6,8 +7,6 @@ import * as Option from "effect/Option" import * as Sink from "effect/Sink" import * as Stream from "effect/Stream" import { assertNone, assertTrue, deepStrictEqual, strictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" -import { describe } from "vitest" describe("Sink", () => { it.effect("findEffect - with head sink", () => diff --git a/packages/effect/test/Sink/zipping.test.ts b/packages/effect/test/Sink/zipping.test.ts index 6e262b84eb4..18cd8ffac80 100644 --- a/packages/effect/test/Sink/zipping.test.ts +++ b/packages/effect/test/Sink/zipping.test.ts @@ -1,3 +1,4 @@ +import { describe, it } from "@effect/vitest" import * as Chunk from "effect/Chunk" import * as Effect from "effect/Effect" import * as Either from "effect/Either" @@ -7,9 +8,7 @@ import * as Random from "effect/Random" import * as Sink from "effect/Sink" import * as Stream from "effect/Stream" import { assertSome, assertTrue, strictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" import { unfoldEffect } from "effect/test/utils/unfoldEffect" -import { describe } from "vitest" const findSink = (a: A): Sink.Sink => pipe( diff --git a/packages/effect/test/SortedMap.test.ts b/packages/effect/test/SortedMap.test.ts index b26254af1ed..9d827cfecaa 100644 --- a/packages/effect/test/SortedMap.test.ts +++ b/packages/effect/test/SortedMap.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import { Equal, Hash, Number as N, pipe, SortedMap as SM } from "effect" import { assertFalse, assertNone, assertSome, assertTrue, deepStrictEqual, strictEqual } from "effect/test/util" -import { describe, it } from "vitest" class Key implements Equal.Equal { constructor(readonly id: number) {} diff --git a/packages/effect/test/SortedSet.test.ts b/packages/effect/test/SortedSet.test.ts index 9ee2f912384..f5afa96b246 100644 --- a/packages/effect/test/SortedSet.test.ts +++ b/packages/effect/test/SortedSet.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import { Equal, Hash, Order, pipe, SortedSet, String as Str } from "effect" import { assertFalse, assertTrue, deepStrictEqual, strictEqual } from "effect/test/util" -import { describe, it } from "vitest" class Member implements Equal.Equal { constructor(readonly id: string) {} diff --git a/packages/effect/test/Stream/aggregation.test.ts b/packages/effect/test/Stream/aggregation.test.ts index a461fe4d28b..68647f6b64f 100644 --- a/packages/effect/test/Stream/aggregation.test.ts +++ b/packages/effect/test/Stream/aggregation.test.ts @@ -1,3 +1,4 @@ +import { describe, it } from "@effect/vitest" import * as Cause from "effect/Cause" import * as Chunk from "effect/Chunk" import * as Deferred from "effect/Deferred" @@ -16,10 +17,8 @@ import * as Stream from "effect/Stream" import * as Take from "effect/Take" import { assertTrue, deepStrictEqual } from "effect/test/util" import { chunkCoordination } from "effect/test/utils/coordination" -import * as it from "effect/test/utils/extend" import * as TestClock from "effect/TestClock" import * as TestServices from "effect/TestServices" -import { describe } from "vitest" describe("Stream", () => { it.effect("aggregate - simple example", () => diff --git a/packages/effect/test/Stream/async.test.ts b/packages/effect/test/Stream/async.test.ts index 4a729a68f00..11b57f59c66 100644 --- a/packages/effect/test/Stream/async.test.ts +++ b/packages/effect/test/Stream/async.test.ts @@ -1,3 +1,4 @@ +import { describe, it } from "@effect/vitest" import * as Cause from "effect/Cause" import * as Chunk from "effect/Chunk" import * as Deferred from "effect/Deferred" @@ -10,8 +11,6 @@ import * as Ref from "effect/Ref" import * as Sink from "effect/Sink" import * as Stream from "effect/Stream" import { assertFalse, assertTrue, deepStrictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" -import { describe } from "vitest" describe("Stream", () => { it.effect("async", () => diff --git a/packages/effect/test/Stream/broadcasting.test.ts b/packages/effect/test/Stream/broadcasting.test.ts index cf3b0df09f5..99d55656714 100644 --- a/packages/effect/test/Stream/broadcasting.test.ts +++ b/packages/effect/test/Stream/broadcasting.test.ts @@ -1,3 +1,4 @@ +import { describe, it } from "@effect/vitest" import * as Chunk from "effect/Chunk" import * as Deferred from "effect/Deferred" import * as Effect from "effect/Effect" @@ -8,9 +9,7 @@ import * as Schedule from "effect/Schedule" import * as Sink from "effect/Sink" import * as Stream from "effect/Stream" import { assertLeft, deepStrictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" import * as TestClock from "effect/TestClock" -import { describe } from "vitest" describe("Stream", () => { it.effect("broadcast - values", () => diff --git a/packages/effect/test/Stream/buffering.test.ts b/packages/effect/test/Stream/buffering.test.ts index 0524c8a8725..e78e385dd40 100644 --- a/packages/effect/test/Stream/buffering.test.ts +++ b/packages/effect/test/Stream/buffering.test.ts @@ -1,3 +1,4 @@ +import { describe, it } from "@effect/vitest" import * as Cause from "effect/Cause" import * as Chunk from "effect/Chunk" import * as Deferred from "effect/Deferred" @@ -7,8 +8,6 @@ import { pipe } from "effect/Function" import * as Ref from "effect/Ref" import * as Stream from "effect/Stream" import { deepStrictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" -import { describe } from "vitest" describe("Stream", () => { it.effect("buffer - maintains elements and ordering", () => diff --git a/packages/effect/test/Stream/changing.test.ts b/packages/effect/test/Stream/changing.test.ts index b6585a7b0e0..769393c150d 100644 --- a/packages/effect/test/Stream/changing.test.ts +++ b/packages/effect/test/Stream/changing.test.ts @@ -1,10 +1,9 @@ +import { describe, it } from "@effect/vitest" import * as Chunk from "effect/Chunk" import * as Effect from "effect/Effect" import { pipe } from "effect/Function" import * as Stream from "effect/Stream" import { deepStrictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" -import { describe } from "vitest" describe("Stream", () => { it.effect("changes", () => diff --git a/packages/effect/test/Stream/collecting.test.ts b/packages/effect/test/Stream/collecting.test.ts index d68af9b8082..08a74fd98fd 100644 --- a/packages/effect/test/Stream/collecting.test.ts +++ b/packages/effect/test/Stream/collecting.test.ts @@ -1,3 +1,4 @@ +import { describe, it } from "@effect/vitest" import * as Chunk from "effect/Chunk" import * as Effect from "effect/Effect" import * as Either from "effect/Either" @@ -5,8 +6,6 @@ import { identity, pipe } from "effect/Function" import * as Option from "effect/Option" import * as Stream from "effect/Stream" import { assertLeft, assertRight, deepStrictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" -import { describe } from "vitest" describe("Stream", () => { it.effect("collect", () => diff --git a/packages/effect/test/Stream/concatenation.test.ts b/packages/effect/test/Stream/concatenation.test.ts index 3160b0fad92..eac6bfdcc11 100644 --- a/packages/effect/test/Stream/concatenation.test.ts +++ b/packages/effect/test/Stream/concatenation.test.ts @@ -1,11 +1,10 @@ +import { describe, it } from "@effect/vitest" import * as Chunk from "effect/Chunk" import * as Effect from "effect/Effect" import { pipe } from "effect/Function" import * as Ref from "effect/Ref" import * as Stream from "effect/Stream" import { deepStrictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" -import { describe } from "vitest" describe("Stream", () => { it.effect("concat - simple example", () => diff --git a/packages/effect/test/Stream/conditionals.test.ts b/packages/effect/test/Stream/conditionals.test.ts index d76d91c256e..d1542bb8ec6 100644 --- a/packages/effect/test/Stream/conditionals.test.ts +++ b/packages/effect/test/Stream/conditionals.test.ts @@ -1,3 +1,4 @@ +import { describe, it } from "@effect/vitest" import * as Cause from "effect/Cause" import * as Effect from "effect/Effect" import * as Exit from "effect/Exit" @@ -5,8 +6,6 @@ import { constFalse, constTrue, constVoid, pipe } from "effect/Function" import * as Option from "effect/Option" import * as Stream from "effect/Stream" import { deepStrictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" -import { describe } from "vitest" describe("Stream", () => { it.effect("when - returns the stream if the condition is satisfied", () => diff --git a/packages/effect/test/Stream/constructors.test.ts b/packages/effect/test/Stream/constructors.test.ts index 7753d2822dc..2e1bb76069f 100644 --- a/packages/effect/test/Stream/constructors.test.ts +++ b/packages/effect/test/Stream/constructors.test.ts @@ -1,3 +1,4 @@ +import { describe, it } from "@effect/vitest" import * as Chunk from "effect/Chunk" import * as Duration from "effect/Duration" import * as Effect from "effect/Effect" @@ -12,10 +13,8 @@ import * as Schedule from "effect/Schedule" import * as Stream from "effect/Stream" import { assertFalse, assertLeft, assertTrue, deepStrictEqual } from "effect/test/util" import { chunkCoordination } from "effect/test/utils/coordination" -import * as it from "effect/test/utils/extend" import * as TestClock from "effect/TestClock" import * as fc from "fast-check" -import { describe } from "vitest" const chunkArb = ( arb: fc.Arbitrary, @@ -31,7 +30,7 @@ const grouped = (arr: Array, size: number): Array> => { } describe("Stream", () => { - it.it("concatAll", () => + it("concatAll", () => fc.assert(fc.asyncProperty(fc.array(chunkArb(fc.integer())), async (chunks) => { const stream = pipe( Chunk.fromIterable(chunks), @@ -71,14 +70,14 @@ describe("Stream", () => { assertFalse(result) })) - it.it("fromChunk", () => + it("fromChunk", () => fc.assert(fc.asyncProperty(chunkArb(fc.integer()), async (chunk) => { const stream = Stream.fromChunk(chunk) const result = await Effect.runPromise(Stream.runCollect(stream)) deepStrictEqual(Array.from(result), Array.from(chunk)) }))) - it.it("fromChunks", () => + it("fromChunks", () => fc.assert(fc.asyncProperty(fc.array(chunkArb(fc.integer())), async (chunks) => { const stream = Stream.fromChunks(...chunks) const result = await Effect.runPromise(Stream.runCollect(stream)) @@ -308,7 +307,7 @@ describe("Stream", () => { ) })) - it.it("rechunk", () => + it("rechunk", () => fc.assert( fc.asyncProperty(fc.array(chunkArb(fc.integer())), fc.integer({ min: 1, max: 100 }), async (chunks, n) => { const stream = pipe( diff --git a/packages/effect/test/Stream/conversions.test.ts b/packages/effect/test/Stream/conversions.test.ts index 09783f044f5..2e4eb621586 100644 --- a/packages/effect/test/Stream/conversions.test.ts +++ b/packages/effect/test/Stream/conversions.test.ts @@ -1,3 +1,4 @@ +import { describe, it } from "@effect/vitest" import * as Cause from "effect/Cause" import * as Chunk from "effect/Chunk" import * as Effect from "effect/Effect" @@ -7,8 +8,6 @@ import * as Queue from "effect/Queue" import * as Stream from "effect/Stream" import * as Take from "effect/Take" import { deepStrictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" -import { describe } from "vitest" describe("Stream", () => { it.effect("toQueue", () => diff --git a/packages/effect/test/Stream/distributing.test.ts b/packages/effect/test/Stream/distributing.test.ts index 7eea4d115b8..b927cdc5d77 100644 --- a/packages/effect/test/Stream/distributing.test.ts +++ b/packages/effect/test/Stream/distributing.test.ts @@ -1,3 +1,4 @@ +import { describe, it } from "@effect/vitest" import * as Deferred from "effect/Deferred" import * as Effect from "effect/Effect" import * as Exit from "effect/Exit" @@ -5,8 +6,6 @@ import { constTrue, pipe } from "effect/Function" import * as Option from "effect/Option" import * as Stream from "effect/Stream" import { strictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" -import { describe } from "vitest" describe("Stream", () => { it.effect("distributedWithDynamic - ensures no race between subscription and stream end", () => diff --git a/packages/effect/test/Stream/do-notation.test.ts b/packages/effect/test/Stream/do-notation.test.ts index 43cca35dd39..576e9474bcc 100644 --- a/packages/effect/test/Stream/do-notation.test.ts +++ b/packages/effect/test/Stream/do-notation.test.ts @@ -1,10 +1,10 @@ +import { describe, it } from "@effect/vitest" import * as Chunk from "effect/Chunk" import * as Effect from "effect/Effect" import * as Either from "effect/Either" import { pipe } from "effect/Function" import * as Stream from "effect/Stream" import * as Util from "effect/test/util" -import { describe, it } from "vitest" const expectRight = (s: Stream.Stream, expected: R) => { Util.deepStrictEqual(Chunk.toArray(Effect.runSync(Stream.runCollect(Stream.either(s)))), [Either.right(expected)]) diff --git a/packages/effect/test/Stream/draining.test.ts b/packages/effect/test/Stream/draining.test.ts index b71c94557e4..f112665356d 100644 --- a/packages/effect/test/Stream/draining.test.ts +++ b/packages/effect/test/Stream/draining.test.ts @@ -1,3 +1,4 @@ +import { describe, it } from "@effect/vitest" import * as Cause from "effect/Cause" import * as Chunk from "effect/Chunk" import * as Deferred from "effect/Deferred" @@ -7,8 +8,6 @@ import { pipe } from "effect/Function" import * as Ref from "effect/Ref" import * as Stream from "effect/Stream" import { assertLeft, assertTrue, deepStrictEqual, strictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" -import { describe } from "vitest" describe("Stream", () => { it.effect("drain - simple example", () => diff --git a/packages/effect/test/Stream/dropping.test.ts b/packages/effect/test/Stream/dropping.test.ts index b14c10fd53f..90f59a6a137 100644 --- a/packages/effect/test/Stream/dropping.test.ts +++ b/packages/effect/test/Stream/dropping.test.ts @@ -1,10 +1,9 @@ +import { describe, it } from "@effect/vitest" import * as Chunk from "effect/Chunk" import * as Effect from "effect/Effect" import { constTrue, pipe } from "effect/Function" import * as Stream from "effect/Stream" import { assertLeft, assertRight, deepStrictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" -import { describe } from "vitest" describe("Stream", () => { it.effect("drop - simple example", () => diff --git a/packages/effect/test/Stream/encoding.test.ts b/packages/effect/test/Stream/encoding.test.ts index c91cc4da727..1b2fa139020 100644 --- a/packages/effect/test/Stream/encoding.test.ts +++ b/packages/effect/test/Stream/encoding.test.ts @@ -1,10 +1,9 @@ +import { describe, it } from "@effect/vitest" import * as Chunk from "effect/Chunk" import * as Effect from "effect/Effect" import { pipe } from "effect/Function" import * as Stream from "effect/Stream" import { deepStrictEqual, strictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" -import { describe } from "vitest" describe("Stream", () => { it.effect("decodeText/encodeText round trip", () => diff --git a/packages/effect/test/Stream/environment.test.ts b/packages/effect/test/Stream/environment.test.ts index c1734a812e0..04287c42392 100644 --- a/packages/effect/test/Stream/environment.test.ts +++ b/packages/effect/test/Stream/environment.test.ts @@ -1,3 +1,4 @@ +import { describe, it } from "@effect/vitest" import * as Array from "effect/Array" import * as Chunk from "effect/Chunk" import * as Context from "effect/Context" @@ -7,9 +8,7 @@ import { pipe } from "effect/Function" import * as Layer from "effect/Layer" import * as Stream from "effect/Stream" import { deepStrictEqual, strictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" import type * as Tracer from "effect/Tracer" -import { describe } from "vitest" interface StringService { readonly string: string diff --git a/packages/effect/test/Stream/error-handling.test.ts b/packages/effect/test/Stream/error-handling.test.ts index b86c1cc1237..03cda8b7653 100644 --- a/packages/effect/test/Stream/error-handling.test.ts +++ b/packages/effect/test/Stream/error-handling.test.ts @@ -1,3 +1,4 @@ +import { describe, it } from "@effect/vitest" import * as Cause from "effect/Cause" import * as Chunk from "effect/Chunk" import * as Effect from "effect/Effect" @@ -8,8 +9,6 @@ import * as Option from "effect/Option" import * as Ref from "effect/Ref" import * as Stream from "effect/Stream" import { assertLeft, assertTrue, deepStrictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" -import { describe } from "vitest" describe("Stream", () => { it.effect("absolve - happy path", () => diff --git a/packages/effect/test/Stream/filtering.test.ts b/packages/effect/test/Stream/filtering.test.ts index f516610e3d2..5f83e35d150 100644 --- a/packages/effect/test/Stream/filtering.test.ts +++ b/packages/effect/test/Stream/filtering.test.ts @@ -1,11 +1,10 @@ +import { describe, it } from "@effect/vitest" import * as Chunk from "effect/Chunk" import * as Effect from "effect/Effect" import * as Either from "effect/Either" import { pipe } from "effect/Function" import * as Stream from "effect/Stream" import { deepStrictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" -import { describe } from "vitest" describe("Stream", () => { it.effect("filter", () => diff --git a/packages/effect/test/Stream/finding.test.ts b/packages/effect/test/Stream/finding.test.ts index 82ec3a280ae..56345d31b8a 100644 --- a/packages/effect/test/Stream/finding.test.ts +++ b/packages/effect/test/Stream/finding.test.ts @@ -1,3 +1,4 @@ +import { describe, it } from "@effect/vitest" import * as Chunk from "effect/Chunk" import * as Effect from "effect/Effect" import * as Either from "effect/Either" @@ -5,8 +6,6 @@ import { pipe } from "effect/Function" import * as Option from "effect/Option" import * as Stream from "effect/Stream" import { deepStrictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" -import { describe } from "vitest" describe("Stream", () => { it.effect("find", () => diff --git a/packages/effect/test/Stream/foreign.test.ts b/packages/effect/test/Stream/foreign.test.ts index 2fc9cebb8cc..fb4315e6b6b 100644 --- a/packages/effect/test/Stream/foreign.test.ts +++ b/packages/effect/test/Stream/foreign.test.ts @@ -1,3 +1,4 @@ +import { describe, it } from "@effect/vitest" import * as Cause from "effect/Cause" import * as Chunk from "effect/Chunk" import * as Context from "effect/Context" @@ -9,9 +10,7 @@ import * as Option from "effect/Option" import * as Random from "effect/Random" import * as Stream from "effect/Stream" import { assertLeft, assertRight, deepStrictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" import { unify } from "effect/Unify" -import { describe } from "vitest" describe("Stream.Foreign", () => { it.effect("Tag", () => diff --git a/packages/effect/test/Stream/fromEventListener.test.ts b/packages/effect/test/Stream/fromEventListener.test.ts index 9e9299e9f82..a283073d91f 100644 --- a/packages/effect/test/Stream/fromEventListener.test.ts +++ b/packages/effect/test/Stream/fromEventListener.test.ts @@ -1,6 +1,5 @@ +import { describe, it } from "@effect/vitest" import { Effect, pipe, Stream } from "effect" -import * as it from "effect/test/utils/extend" -import { describe } from "vitest" class TestTarget extends EventTarget { emit() { diff --git a/packages/effect/test/Stream/getters.test.ts b/packages/effect/test/Stream/getters.test.ts index c9d31877601..11f711a25ad 100644 --- a/packages/effect/test/Stream/getters.test.ts +++ b/packages/effect/test/Stream/getters.test.ts @@ -1,10 +1,9 @@ +import { describe, it } from "@effect/vitest" import * as Effect from "effect/Effect" import { pipe } from "effect/Function" import * as Option from "effect/Option" import * as Stream from "effect/Stream" import { assertLeft, deepStrictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" -import { describe } from "vitest" describe("Stream", () => { it.effect("some", () => diff --git a/packages/effect/test/Stream/grouping.test.ts b/packages/effect/test/Stream/grouping.test.ts index 24c67cda182..ed37fcd8cf0 100644 --- a/packages/effect/test/Stream/grouping.test.ts +++ b/packages/effect/test/Stream/grouping.test.ts @@ -1,3 +1,4 @@ +import { describe, it } from "@effect/vitest" import * as Chunk from "effect/Chunk" import * as Duration from "effect/Duration" import * as Effect from "effect/Effect" @@ -12,9 +13,7 @@ import * as Sink from "effect/Sink" import * as Stream from "effect/Stream" import { assertLeft, deepStrictEqual, strictEqual } from "effect/test/util" import { chunkCoordination } from "effect/test/utils/coordination" -import * as it from "effect/test/utils/extend" import * as TestClock from "effect/TestClock" -import { describe } from "vitest" describe("Stream", () => { it.effect("groupBy - values", () => diff --git a/packages/effect/test/Stream/halting.test.ts b/packages/effect/test/Stream/halting.test.ts index 3ab8a4bc858..3d5375b14a0 100644 --- a/packages/effect/test/Stream/halting.test.ts +++ b/packages/effect/test/Stream/halting.test.ts @@ -1,3 +1,4 @@ +import { describe, it } from "@effect/vitest" import * as Chunk from "effect/Chunk" import * as Deferred from "effect/Deferred" import * as Duration from "effect/Duration" @@ -11,9 +12,7 @@ import * as Ref from "effect/Ref" import * as Stream from "effect/Stream" import { assertFalse, assertLeft, deepStrictEqual } from "effect/test/util" import { chunkCoordination } from "effect/test/utils/coordination" -import * as it from "effect/test/utils/extend" import * as TestClock from "effect/TestClock" -import { describe } from "vitest" describe("Stream", () => { it.effect("haltWhen - halts after the current element", () => diff --git a/packages/effect/test/Stream/interleaving.test.ts b/packages/effect/test/Stream/interleaving.test.ts index b299b0e1fe5..de205ba37aa 100644 --- a/packages/effect/test/Stream/interleaving.test.ts +++ b/packages/effect/test/Stream/interleaving.test.ts @@ -1,11 +1,10 @@ +import { describe, it } from "@effect/vitest" import * as Chunk from "effect/Chunk" import * as Effect from "effect/Effect" import { pipe } from "effect/Function" import * as Option from "effect/Option" import * as Stream from "effect/Stream" import { deepStrictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" -import { describe } from "vitest" describe("Stream", () => { it.effect("interleave", () => diff --git a/packages/effect/test/Stream/interrupting.test.ts b/packages/effect/test/Stream/interrupting.test.ts index bffbad6a79f..a47ac504da1 100644 --- a/packages/effect/test/Stream/interrupting.test.ts +++ b/packages/effect/test/Stream/interrupting.test.ts @@ -1,3 +1,4 @@ +import { describe, it } from "@effect/vitest" import { Schedule } from "effect" import * as Chunk from "effect/Chunk" import * as Deferred from "effect/Deferred" @@ -12,9 +13,7 @@ import * as Ref from "effect/Ref" import * as Stream from "effect/Stream" import { assertLeft, assertTrue, deepStrictEqual, strictEqual } from "effect/test/util" import { chunkCoordination } from "effect/test/utils/coordination" -import * as it from "effect/test/utils/extend" import * as TestClock from "effect/TestClock" -import { describe } from "vitest" describe("Stream", () => { it.effect("interruptWhen - preserves the scope of inner fibers", () => diff --git a/packages/effect/test/Stream/interspersing.test.ts b/packages/effect/test/Stream/interspersing.test.ts index 83247580095..5fad7e5b11c 100644 --- a/packages/effect/test/Stream/interspersing.test.ts +++ b/packages/effect/test/Stream/interspersing.test.ts @@ -1,10 +1,9 @@ +import { describe, it } from "@effect/vitest" import * as Chunk from "effect/Chunk" import * as Effect from "effect/Effect" import { pipe } from "effect/Function" import * as Stream from "effect/Stream" import { deepStrictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" -import { describe } from "vitest" describe("Stream", () => { it.effect("intersperse - several values", () => diff --git a/packages/effect/test/Stream/lifecycle.test.ts b/packages/effect/test/Stream/lifecycle.test.ts index ad588544938..25cd47f7eec 100644 --- a/packages/effect/test/Stream/lifecycle.test.ts +++ b/packages/effect/test/Stream/lifecycle.test.ts @@ -1,9 +1,8 @@ +import { describe, it } from "@effect/vitest" import * as Effect from "effect/Effect" import { pipe } from "effect/Function" import * as Stream from "effect/Stream" import { deepStrictEqual, strictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" -import { describe } from "vitest" describe("Stream", () => { it.effect("onStart", () => diff --git a/packages/effect/test/Stream/mapping.test.ts b/packages/effect/test/Stream/mapping.test.ts index 87103ba8e52..fe648e94242 100644 --- a/packages/effect/test/Stream/mapping.test.ts +++ b/packages/effect/test/Stream/mapping.test.ts @@ -1,3 +1,4 @@ +import { describe, it } from "@effect/vitest" import * as Cause from "effect/Cause" import * as Chunk from "effect/Chunk" import * as Deferred from "effect/Deferred" @@ -11,9 +12,7 @@ import * as Queue from "effect/Queue" import * as Ref from "effect/Ref" import * as Stream from "effect/Stream" import { assertFalse, assertLeft, assertTrue, deepStrictEqual, strictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" import * as TestClock from "effect/TestClock" -import { describe } from "vitest" describe("Stream", () => { it.effect("map", () => diff --git a/packages/effect/test/Stream/merging.test.ts b/packages/effect/test/Stream/merging.test.ts index 9e4384716c4..f90c1669d0c 100644 --- a/packages/effect/test/Stream/merging.test.ts +++ b/packages/effect/test/Stream/merging.test.ts @@ -1,3 +1,4 @@ +import { describe, it } from "@effect/vitest" import * as Chunk from "effect/Chunk" import * as Duration from "effect/Duration" import * as Effect from "effect/Effect" @@ -8,10 +9,8 @@ import * as HashSet from "effect/HashSet" import * as Queue from "effect/Queue" import * as Stream from "effect/Stream" import { assertLeft, assertTrue, deepStrictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" import * as TestClock from "effect/TestClock" import * as TestServices from "effect/TestServices" -import { describe } from "vitest" describe("Stream", () => { it.effect("merge - slower stream", () => diff --git a/packages/effect/test/Stream/pagination.test.ts b/packages/effect/test/Stream/pagination.test.ts index 874b84e71ab..212c223e906 100644 --- a/packages/effect/test/Stream/pagination.test.ts +++ b/packages/effect/test/Stream/pagination.test.ts @@ -1,11 +1,10 @@ +import { describe, it } from "@effect/vitest" import * as Chunk from "effect/Chunk" import * as Effect from "effect/Effect" import { pipe } from "effect/Function" import * as Option from "effect/Option" import * as Stream from "effect/Stream" import { deepStrictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" -import { describe } from "vitest" describe("Stream", () => { it.effect("paginate", () => diff --git a/packages/effect/test/Stream/partitioning.test.ts b/packages/effect/test/Stream/partitioning.test.ts index 0cc2722d9dd..599f51a0f46 100644 --- a/packages/effect/test/Stream/partitioning.test.ts +++ b/packages/effect/test/Stream/partitioning.test.ts @@ -1,3 +1,4 @@ +import { describe, it } from "@effect/vitest" import * as Chunk from "effect/Chunk" import * as Deferred from "effect/Deferred" import * as Effect from "effect/Effect" @@ -7,8 +8,6 @@ import { pipe } from "effect/Function" import * as Ref from "effect/Ref" import * as Stream from "effect/Stream" import { assertLeft, deepStrictEqual, strictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" -import { describe } from "vitest" describe("Stream", () => { it.effect("partitionEither - allows repeated runs without hanging", () => diff --git a/packages/effect/test/Stream/peeling.test.ts b/packages/effect/test/Stream/peeling.test.ts index 8c67e558540..7f2a12c76fe 100644 --- a/packages/effect/test/Stream/peeling.test.ts +++ b/packages/effect/test/Stream/peeling.test.ts @@ -1,3 +1,4 @@ +import { describe, it } from "@effect/vitest" import * as Chunk from "effect/Chunk" import * as Effect from "effect/Effect" import * as Exit from "effect/Exit" @@ -5,8 +6,6 @@ import { constTrue, pipe } from "effect/Function" import * as Sink from "effect/Sink" import * as Stream from "effect/Stream" import { deepStrictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" -import { describe } from "vitest" describe("Stream", () => { it.effect("peel", () => diff --git a/packages/effect/test/Stream/racing.test.ts b/packages/effect/test/Stream/racing.test.ts index 3ec9b6b8375..424b613e0f7 100644 --- a/packages/effect/test/Stream/racing.test.ts +++ b/packages/effect/test/Stream/racing.test.ts @@ -1,3 +1,4 @@ +import { describe, it } from "@effect/vitest" import * as Chunk from "effect/Chunk" import * as Effect from "effect/Effect" import * as Fiber from "effect/Fiber" @@ -5,9 +6,7 @@ import { pipe } from "effect/Function" import * as Schedule from "effect/Schedule" import * as Stream from "effect/Stream" import { deepStrictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" import * as TestClock from "effect/TestClock" -import { describe } from "vitest" describe("Stream", () => { it.effect("raceAll sync", () => diff --git a/packages/effect/test/Stream/repeating.test.ts b/packages/effect/test/Stream/repeating.test.ts index 30804eee357..35312b3802c 100644 --- a/packages/effect/test/Stream/repeating.test.ts +++ b/packages/effect/test/Stream/repeating.test.ts @@ -1,3 +1,4 @@ +import { describe, it } from "@effect/vitest" import * as Chunk from "effect/Chunk" import * as Duration from "effect/Duration" import * as Effect from "effect/Effect" @@ -11,10 +12,8 @@ import * as Ref from "effect/Ref" import * as Schedule from "effect/Schedule" import * as Stream from "effect/Stream" import { deepStrictEqual, strictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" import * as TestClock from "effect/TestClock" import * as TestEnvironment from "effect/TestContext" -import { describe } from "vitest" describe("Stream", () => { it.effect("forever", () => @@ -172,7 +171,7 @@ describe("Stream", () => { deepStrictEqual(Array.from(result), [1, 1]) }), 10000) - it.it("repeatEffectWithSchedule - allow schedule to rely on effect value", () => + it("repeatEffectWithSchedule - allow schedule to rely on effect value", () => fc.assert(fc.asyncProperty(fc.integer({ min: 1, max: 100 }), async (length) => { const effect = Effect.gen(function*() { const ref = yield* (Ref.make(0)) diff --git a/packages/effect/test/Stream/retrying.test.ts b/packages/effect/test/Stream/retrying.test.ts index fd1c306587d..f4eed833954 100644 --- a/packages/effect/test/Stream/retrying.test.ts +++ b/packages/effect/test/Stream/retrying.test.ts @@ -1,3 +1,4 @@ +import { describe, it } from "@effect/vitest" import * as Chunk from "effect/Chunk" import * as Clock from "effect/Clock" import * as Duration from "effect/Duration" @@ -9,9 +10,7 @@ import * as Ref from "effect/Ref" import * as Schedule from "effect/Schedule" import * as Stream from "effect/Stream" import { deepStrictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" import * as TestClock from "effect/TestClock" -import { describe } from "vitest" describe("Stream", () => { it.effect("retry - retries a failing stream", () => diff --git a/packages/effect/test/Stream/running.test.ts b/packages/effect/test/Stream/running.test.ts index aca297581e1..71015c826f1 100644 --- a/packages/effect/test/Stream/running.test.ts +++ b/packages/effect/test/Stream/running.test.ts @@ -1,3 +1,4 @@ +import { describe, it } from "@effect/vitest" import * as Chunk from "effect/Chunk" import * as Effect from "effect/Effect" import { pipe } from "effect/Function" @@ -5,8 +6,6 @@ import * as Ref from "effect/Ref" import * as Sink from "effect/Sink" import * as Stream from "effect/Stream" import { assertFalse, assertNone, assertSome, assertTrue, deepStrictEqual, strictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" -import { describe } from "vitest" describe("Stream", () => { it.effect("runFoldWhile", () => diff --git a/packages/effect/test/Stream/scanning.test.ts b/packages/effect/test/Stream/scanning.test.ts index 467fa1c0e3c..b86b8d3d9db 100644 --- a/packages/effect/test/Stream/scanning.test.ts +++ b/packages/effect/test/Stream/scanning.test.ts @@ -1,11 +1,10 @@ +import { describe, it } from "@effect/vitest" import * as Array from "effect/Array" import * as Chunk from "effect/Chunk" import * as Effect from "effect/Effect" import { pipe } from "effect/Function" import * as Stream from "effect/Stream" import { deepStrictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" -import { describe } from "vitest" describe("Stream", () => { it.effect("scan", () => diff --git a/packages/effect/test/Stream/scheduling.test.ts b/packages/effect/test/Stream/scheduling.test.ts index d3f41531242..e1a8c2bde98 100644 --- a/packages/effect/test/Stream/scheduling.test.ts +++ b/packages/effect/test/Stream/scheduling.test.ts @@ -1,3 +1,4 @@ +import { describe, it } from "@effect/vitest" import * as Clock from "effect/Clock" import * as Duration from "effect/Duration" import * as Effect from "effect/Effect" @@ -6,9 +7,7 @@ import { identity, pipe } from "effect/Function" import * as Schedule from "effect/Schedule" import * as Stream from "effect/Stream" import { deepStrictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" import * as TestClock from "effect/TestClock" -import { describe } from "vitest" describe("Stream", () => { it.effect("schedule", () => diff --git a/packages/effect/test/Stream/scoping.test.ts b/packages/effect/test/Stream/scoping.test.ts index 1863908dc6d..898043cb30e 100644 --- a/packages/effect/test/Stream/scoping.test.ts +++ b/packages/effect/test/Stream/scoping.test.ts @@ -1,3 +1,4 @@ +import { describe, it } from "@effect/vitest" import * as Array from "effect/Array" import * as Cause from "effect/Cause" import * as Chunk from "effect/Chunk" @@ -10,8 +11,6 @@ import * as Ref from "effect/Ref" import * as Scope from "effect/Scope" import * as Stream from "effect/Stream" import { assertFalse, assertLeft, assertSome, assertTrue, deepStrictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" -import { describe } from "vitest" describe("Stream", () => { it.effect("acquireRelease - simple example", () => @@ -151,7 +150,7 @@ describe("Stream", () => { assertSome(isInterruptible2, false) })) - it.it("unwrapScoped", async () => { + it("unwrapScoped", async () => { const awaiter = Deferred.unsafeMake(FiberId.none) const program = Effect.gen(function*() { const stream = (deferred: Deferred.Deferred, ref: Ref.Ref>) => diff --git a/packages/effect/test/Stream/sequencing.test.ts b/packages/effect/test/Stream/sequencing.test.ts index 95913d78bc6..9cfefb31d96 100644 --- a/packages/effect/test/Stream/sequencing.test.ts +++ b/packages/effect/test/Stream/sequencing.test.ts @@ -1,3 +1,4 @@ +import { describe, it } from "@effect/vitest" import * as Cause from "effect/Cause" import * as Chunk from "effect/Chunk" import * as Deferred from "effect/Deferred" @@ -11,8 +12,6 @@ import * as Scope from "effect/Scope" import * as Stream from "effect/Stream" import * as Take from "effect/Take" import { assertLeft, assertTrue, deepStrictEqual, strictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" -import { describe } from "vitest" const withPermitsScoped = (permits: number) => (semaphore: Effect.Semaphore) => Effect.acquireRelease( diff --git a/packages/effect/test/Stream/sliding.test.ts b/packages/effect/test/Stream/sliding.test.ts index 947f1cd749d..39e6c1d69a6 100644 --- a/packages/effect/test/Stream/sliding.test.ts +++ b/packages/effect/test/Stream/sliding.test.ts @@ -1,11 +1,10 @@ +import { describe, it } from "@effect/vitest" import * as Chunk from "effect/Chunk" import * as Effect from "effect/Effect" import { pipe } from "effect/Function" import * as Ref from "effect/Ref" import * as Stream from "effect/Stream" import { assertLeft, deepStrictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" -import { describe } from "vitest" describe("Stream", () => { it.effect("sliding - returns a sliding window", () => diff --git a/packages/effect/test/Stream/splitting.test.ts b/packages/effect/test/Stream/splitting.test.ts index a953a6abf48..72f8f018a5e 100644 --- a/packages/effect/test/Stream/splitting.test.ts +++ b/packages/effect/test/Stream/splitting.test.ts @@ -1,11 +1,10 @@ +import { describe, it } from "@effect/vitest" import * as Chunk from "effect/Chunk" import * as Effect from "effect/Effect" import { pipe } from "effect/Function" import * as Stream from "effect/Stream" import { deepStrictEqual, strictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" import * as fc from "fast-check" -import { describe } from "vitest" const weirdStringForSplitLines: fc.Arbitrary> = fc.array( fc.string().filter((s) => s !== "\n" && s !== "\r") @@ -210,7 +209,7 @@ describe("Stream", () => { ) })) - it.it("splitLines - preserves data", () => + it("splitLines - preserves data", () => fc.assert(fc.asyncProperty(weirdStringForSplitLines, async (lines) => { const data = lines.join("\n") const program = pipe( diff --git a/packages/effect/test/Stream/streamable.test.ts b/packages/effect/test/Stream/streamable.test.ts index 23d295f32a2..bffbd693858 100644 --- a/packages/effect/test/Stream/streamable.test.ts +++ b/packages/effect/test/Stream/streamable.test.ts @@ -1,9 +1,8 @@ +import { describe, it } from "@effect/vitest" import * as Effect from "effect/Effect" import * as Stream from "effect/Stream" import * as Streamable from "effect/Streamable" import { deepStrictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" -import { describe } from "vitest" describe("Streamable", () => { it.effect( diff --git a/packages/effect/test/Stream/taking.test.ts b/packages/effect/test/Stream/taking.test.ts index eb40e413bb1..6bcb8f5d32b 100644 --- a/packages/effect/test/Stream/taking.test.ts +++ b/packages/effect/test/Stream/taking.test.ts @@ -1,3 +1,4 @@ +import { describe, it } from "@effect/vitest" import * as Chunk from "effect/Chunk" import * as Effect from "effect/Effect" import * as Either from "effect/Either" @@ -5,8 +6,6 @@ import { constFalse, pipe } from "effect/Function" import * as Ref from "effect/Ref" import * as Stream from "effect/Stream" import { assertFalse, deepStrictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" -import { describe } from "vitest" describe("Stream", () => { it.effect("take", () => diff --git a/packages/effect/test/Stream/tapping.test.ts b/packages/effect/test/Stream/tapping.test.ts index 8ca2d20a375..ceb7345a27b 100644 --- a/packages/effect/test/Stream/tapping.test.ts +++ b/packages/effect/test/Stream/tapping.test.ts @@ -1,3 +1,4 @@ +import { describe, it } from "@effect/vitest" import * as Chunk from "effect/Chunk" import * as Effect from "effect/Effect" import * as Either from "effect/Either" @@ -6,8 +7,6 @@ import * as Ref from "effect/Ref" import * as Sink from "effect/Sink" import * as Stream from "effect/Stream" import { assertLeft, deepStrictEqual, strictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" -import { describe } from "vitest" describe("Stream", () => { it.effect("tap", () => diff --git a/packages/effect/test/Stream/throttling.test.ts b/packages/effect/test/Stream/throttling.test.ts index 77f236df4da..386fcdb4262 100644 --- a/packages/effect/test/Stream/throttling.test.ts +++ b/packages/effect/test/Stream/throttling.test.ts @@ -1,3 +1,4 @@ +import { describe, it } from "@effect/vitest" import * as Cause from "effect/Cause" import * as Chunk from "effect/Chunk" import * as Clock from "effect/Clock" @@ -13,9 +14,7 @@ import * as Schedule from "effect/Schedule" import * as Stream from "effect/Stream" import { assertFailure, assertTrue, deepStrictEqual } from "effect/test/util" import { chunkCoordination } from "effect/test/utils/coordination" -import * as it from "effect/test/utils/extend" import * as TestClock from "effect/TestClock" -import { describe } from "vitest" describe("Stream", () => { it.effect("throttleEnforce - free elements", () => diff --git a/packages/effect/test/Stream/timeouts.test.ts b/packages/effect/test/Stream/timeouts.test.ts index c7f4d8992b7..fd8587a1601 100644 --- a/packages/effect/test/Stream/timeouts.test.ts +++ b/packages/effect/test/Stream/timeouts.test.ts @@ -1,3 +1,4 @@ +import { describe, it } from "@effect/vitest" import * as Cause from "effect/Cause" import * as Chunk from "effect/Chunk" import * as Duration from "effect/Duration" @@ -10,9 +11,7 @@ import * as Queue from "effect/Queue" import * as Stream from "effect/Stream" import { assertLeft, deepStrictEqual } from "effect/test/util" import { chunkCoordination } from "effect/test/utils/coordination" -import * as it from "effect/test/utils/extend" import * as TestClock from "effect/TestClock" -import { describe } from "vitest" describe("Stream", () => { it.effect("timeout - succeed", () => diff --git a/packages/effect/test/Stream/transducing.test.ts b/packages/effect/test/Stream/transducing.test.ts index 99d447aa269..ea1b515aa6a 100644 --- a/packages/effect/test/Stream/transducing.test.ts +++ b/packages/effect/test/Stream/transducing.test.ts @@ -1,11 +1,10 @@ +import { describe, it } from "@effect/vitest" import * as Chunk from "effect/Chunk" import * as Effect from "effect/Effect" import { constTrue, pipe } from "effect/Function" import * as Sink from "effect/Sink" import * as Stream from "effect/Stream" import { assertLeft, deepStrictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" -import { describe } from "vitest" describe("Stream", () => { it.effect("transduce - simple example", () => diff --git a/packages/effect/test/Stream/zipping.test.ts b/packages/effect/test/Stream/zipping.test.ts index 01a5e68e51a..9db01a977d8 100644 --- a/packages/effect/test/Stream/zipping.test.ts +++ b/packages/effect/test/Stream/zipping.test.ts @@ -1,3 +1,4 @@ +import { describe, it } from "@effect/vitest" import * as Cause from "effect/Cause" import * as Chunk from "effect/Chunk" import * as Deferred from "effect/Deferred" @@ -12,9 +13,7 @@ import * as Queue from "effect/Queue" import * as Stream from "effect/Stream" import * as Take from "effect/Take" import { assertLeft, assertTrue, deepStrictEqual, strictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" import * as fc from "fast-check" -import { describe } from "vitest" const chunkArb = ( arb: fc.Arbitrary, @@ -45,7 +44,7 @@ export const splitChunks = (chunks: Chunk.Chunk>): fc.Arbitrar } describe("Stream", () => { - it.it("zipAllSortedByKeyWith", () => { + it("zipAllSortedByKeyWith", () => { const intArb = fc.integer({ min: 1, max: 100 }) const chunkArb = fc.array(fc.tuple(intArb, intArb)).map((entries) => pipe(Chunk.fromIterable(new Map(entries)), Chunk.sort(OrderByKey)) @@ -90,7 +89,7 @@ describe("Stream", () => { deepStrictEqual(Array.from(result), [[1, "a"], [2, "b"], [3, "c"]]) })) - it.it("zip - equivalence with Chunk.zip", () => + it("zip - equivalence with Chunk.zip", () => fc.assert( fc.asyncProperty(fc.array(chunkArb(fc.integer())), fc.array(chunkArb(fc.integer())), async (left, right) => { const stream = pipe( @@ -148,7 +147,7 @@ describe("Stream", () => { })) // TODO: handle Chunk.zipAllWith - // it.it("zipAllWith", () => + // it("zipAllWith", () => // fc.assert(fc.asyncProperty( // fc.array(chunkArb(fc.integer()).filter((chunk) => chunk.length > 0)), // fc.array(chunkArb(fc.integer()).filter((chunk) => chunk.length > 0)), @@ -284,7 +283,7 @@ describe("Stream", () => { deepStrictEqual(Array.from(result), [1, 1, 1]) })) - it.it("zipLatestWith - preserves partial ordering of stream elements", () => { + it("zipLatestWith - preserves partial ordering of stream elements", () => { const sortedChunkArb = chunkArb(fc.integer({ min: 1, max: 100 })) .map(Chunk.sort(Number.Order)) const sortedChunksArb = sortedChunkArb.chain((chunk) => splitChunks(Chunk.of(chunk))) @@ -344,7 +343,7 @@ describe("Stream", () => { deepStrictEqual(Array.from(result), []) })) - it.it("zipWithNext - should output the same values as zipping with the tail plus the last element", () => + it("zipWithNext - should output the same values as zipping with the tail plus the last element", () => fc.assert(fc.asyncProperty(fc.array(chunkArb(fc.integer())), async (chunks) => { const stream = Stream.fromChunks(...chunks) const { result1, result2 } = await Effect.runPromise(Effect.all({ @@ -402,7 +401,7 @@ describe("Stream", () => { deepStrictEqual(Array.from(result), []) })) - it.it("zipWithPrevious - should output same values as first element plus zipping with init", () => + it("zipWithPrevious - should output same values as first element plus zipping with init", () => fc.assert(fc.asyncProperty(fc.array(chunkArb(fc.integer())), async (chunks) => { const stream = Stream.fromChunks(...chunks) const { result1, result2 } = await Effect.runPromise(Effect.all({ @@ -435,7 +434,7 @@ describe("Stream", () => { ]) })) - it.it("zipWithPreviousAndNext - should output same values as zipping with both previous and next element", () => + it("zipWithPreviousAndNext - should output same values as zipping with both previous and next element", () => fc.assert(fc.asyncProperty(fc.array(chunkArb(fc.integer()), { minLength: 0, maxLength: 5 }), async (chunks) => { const stream = Stream.fromChunks(...chunks) const previous = pipe( diff --git a/packages/effect/test/String.test.ts b/packages/effect/test/String.test.ts index be34ff0cb39..66a578f4219 100644 --- a/packages/effect/test/String.test.ts +++ b/packages/effect/test/String.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import { Order, pipe, String as S } from "effect" import { assertFalse, assertNone, assertSome, assertTrue, deepStrictEqual, strictEqual } from "effect/test/util" -import { describe, it } from "vitest" describe("String", () => { it("isString", () => { diff --git a/packages/effect/test/Struct.test.ts b/packages/effect/test/Struct.test.ts index a606d450381..3eb7b776f1d 100644 --- a/packages/effect/test/Struct.test.ts +++ b/packages/effect/test/Struct.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import { Number, pipe, String, Struct } from "effect" import { deepStrictEqual, strictEqual } from "effect/test/util" -import { describe, it } from "vitest" describe("Struct", () => { it("pick", () => { diff --git a/packages/effect/test/SubscriptionRef.test.ts b/packages/effect/test/SubscriptionRef.test.ts index aee446d6699..2c4d5d5cd7a 100644 --- a/packages/effect/test/SubscriptionRef.test.ts +++ b/packages/effect/test/SubscriptionRef.test.ts @@ -1,7 +1,6 @@ +import { describe, it } from "@effect/vitest" import { Chunk, Deferred, Effect, Equal, Exit, Fiber, Number, pipe, Random, Stream, SubscriptionRef } from "effect" import { assertTrue, deepStrictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" -import { describe } from "vitest" describe("SubscriptionRef", () => { it.effect("multiple subscribers can receive changes", () => diff --git a/packages/effect/test/Symbol.test.ts b/packages/effect/test/Symbol.test.ts index 5f6306888fe..066757a20d7 100644 --- a/packages/effect/test/Symbol.test.ts +++ b/packages/effect/test/Symbol.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import * as S from "effect/Symbol" import { assertFalse, assertTrue } from "effect/test/util" -import { describe, it } from "vitest" describe("Symbol", () => { it("isSymbol", () => { diff --git a/packages/effect/test/SynchronizedRef.test.ts b/packages/effect/test/SynchronizedRef.test.ts index fd5d78d3e89..aa82d54c83a 100644 --- a/packages/effect/test/SynchronizedRef.test.ts +++ b/packages/effect/test/SynchronizedRef.test.ts @@ -1,7 +1,6 @@ +import { describe, it } from "@effect/vitest" import { Deferred, Effect, Exit, Fiber, Option, pipe, SynchronizedRef } from "effect" import { deepStrictEqual, strictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" -import { describe } from "vitest" const current = "value" const update = "new value" diff --git a/packages/effect/test/TArray.test.ts b/packages/effect/test/TArray.test.ts index 2ee318f011b..c5658eb2dab 100644 --- a/packages/effect/test/TArray.test.ts +++ b/packages/effect/test/TArray.test.ts @@ -1,3 +1,4 @@ +import { describe, it } from "@effect/vitest" import { Cause, Chunk, Effect, Exit, Fiber, identity, Number, Option, pipe, STM, TArray, TRef } from "effect" import { constFalse, constTrue } from "effect/Function" import { @@ -9,8 +10,6 @@ import { deepStrictEqual, strictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" -import { describe } from "vitest" const largePrime = 223 diff --git a/packages/effect/test/TMap.test.ts b/packages/effect/test/TMap.test.ts index b2603315a1f..9c8506d2ee6 100644 --- a/packages/effect/test/TMap.test.ts +++ b/packages/effect/test/TMap.test.ts @@ -1,8 +1,7 @@ +import { describe, it } from "@effect/vitest" import { Array, Chunk, Effect, Equal, Exit, FastCheck as fc, Hash, Option, pipe, STM, TMap } from "effect" import { assertFalse, assertNone, assertSome, assertTrue, deepStrictEqual, strictEqual } from "effect/test/util" import { equivalentElements } from "effect/test/utils/equals" -import * as it from "effect/test/utils/extend" -import { describe } from "vitest" class HashContainer implements Equal.Equal { constructor(readonly i: number) {} @@ -101,7 +100,7 @@ describe("TMap", () => { assertFalse(result) })) - it.it("keys - collect all keys", () => + it("keys - collect all keys", () => fc.assert(fc.asyncProperty(mapEntriesArb, async (entries) => { const transaction = pipe( TMap.fromIterable(entries), @@ -307,7 +306,7 @@ describe("TMap", () => { strictEqual(result, 2) })) - it.it("toChunk - collect all elements", () => + it("toChunk - collect all elements", () => fc.assert(fc.asyncProperty(mapEntriesArb, async (entries) => { const transaction = pipe( TMap.fromIterable(entries), @@ -319,7 +318,7 @@ describe("TMap", () => { strictEqual(pipe(entries, Array.differenceWith(equivalentElements())(Chunk.toReadonlyArray(result))).length, 0) }))) - it.it("toReadonlyArray - collect all elements", () => + it("toReadonlyArray - collect all elements", () => fc.assert(fc.asyncProperty(mapEntriesArb, async (entries) => { const transaction = pipe( TMap.fromIterable(entries), @@ -330,7 +329,7 @@ describe("TMap", () => { strictEqual(pipe(entries, Array.differenceWith(equivalentElements())(result)).length, 0) }))) - it.it("toMap - collect all elements", () => + it("toMap - collect all elements", () => fc.assert(fc.asyncProperty(mapEntriesArb, async (entries) => { const transaction = pipe( TMap.fromIterable(entries), @@ -456,7 +455,7 @@ describe("TMap", () => { deepStrictEqual(result, [["a", 2], ["c", 3]]) })) - it.it("values - collect all values", () => + it("values - collect all values", () => fc.assert(fc.asyncProperty(mapEntriesArb, async (entries) => { const transaction = pipe( TMap.fromIterable(entries), diff --git a/packages/effect/test/TPriorityQueue.test.ts b/packages/effect/test/TPriorityQueue.test.ts index d68f9759aeb..8fb2f81c085 100644 --- a/packages/effect/test/TPriorityQueue.test.ts +++ b/packages/effect/test/TPriorityQueue.test.ts @@ -1,3 +1,4 @@ +import { describe, it } from "@effect/vitest" import { Array as Arr, Effect, @@ -11,8 +12,6 @@ import { } from "effect" import { assertTrue, deepStrictEqual, strictEqual } from "effect/test/util" import { equivalentElements } from "effect/test/utils/equals" -import * as it from "effect/test/utils/extend" -import { describe } from "vitest" interface Event { readonly time: number @@ -34,7 +33,7 @@ const eventsArb: fc.Arbitrary> = fc.array(eventArb) const predicateArb: fc.Arbitrary<(event: Event) => boolean> = fc.func(fc.boolean()).map((f) => (e: Event) => f(e)) describe("TPriorityQueue", () => { - it.it("isEmpty", () => + it("isEmpty", () => fc.assert(fc.asyncProperty(eventsArb, async (events) => { const transaction = pipe( TPriorityQueue.empty(orderByTime), @@ -45,7 +44,7 @@ describe("TPriorityQueue", () => { strictEqual(result, events.length === 0) }))) - it.it("isNonEmpty", () => + it("isNonEmpty", () => fc.assert(fc.asyncProperty(eventsArb, async (events) => { const transaction = pipe( TPriorityQueue.empty(orderByTime), @@ -56,7 +55,7 @@ describe("TPriorityQueue", () => { strictEqual(result, events.length > 0) }))) - it.it("offerAll and takeAll", () => + it("offerAll and takeAll", () => fc.assert(fc.asyncProperty(eventsArb, async (events) => { const transaction = pipe( TPriorityQueue.empty(orderByTime), @@ -70,7 +69,7 @@ describe("TPriorityQueue", () => { deepStrictEqual(result, pipe(result, Arr.sort(orderByTime))) }))) - it.it("removeIf", () => + it("removeIf", () => fc.assert(fc.asyncProperty(eventsArb, predicateArb, async (events, f) => { const transaction = pipe( TPriorityQueue.fromIterable(orderByTime)(events), @@ -84,7 +83,7 @@ describe("TPriorityQueue", () => { deepStrictEqual(result, Arr.sort(orderByTime)(result)) }))) - it.it("retainIf", () => + it("retainIf", () => fc.assert(fc.asyncProperty(eventsArb, predicateArb, async (events, f) => { const transaction = pipe( TPriorityQueue.fromIterable(orderByTime)(events), @@ -98,7 +97,7 @@ describe("TPriorityQueue", () => { deepStrictEqual(result, Arr.sort(orderByTime)(result)) }))) - it.it("take", () => + it("take", () => fc.assert(fc.asyncProperty(eventsArb, async (events) => { const transaction = pipe( TPriorityQueue.fromIterable(orderByTime)(events), @@ -116,7 +115,7 @@ describe("TPriorityQueue", () => { deepStrictEqual(result, pipe(result, Arr.sort(orderByTime))) }))) - it.it("takeOption", () => + it("takeOption", () => fc.assert( fc.asyncProperty(eventsArb.filter((events) => events.length > 0), async (events) => { const transaction = pipe( @@ -140,7 +139,7 @@ describe("TPriorityQueue", () => { }) )) - it.it("takeUpTo", () => + it("takeUpTo", () => fc.assert( fc.asyncProperty( eventsArb.chain((events) => fc.tuple(fc.constant(events), fc.integer({ min: 0, max: events.length }))), @@ -168,7 +167,7 @@ describe("TPriorityQueue", () => { ) )) - it.it("toChunk", () => + it("toChunk", () => fc.assert(fc.asyncProperty(eventsArb, async (events) => { const transaction = pipe( TPriorityQueue.fromIterable(orderByTime)(events), @@ -181,7 +180,7 @@ describe("TPriorityQueue", () => { deepStrictEqual(result, pipe(result, Arr.sort(orderByTime))) }))) - it.it("toReadonlyArray", () => + it("toReadonlyArray", () => fc.assert(fc.asyncProperty(eventsArb, async (events) => { const transaction = pipe( TPriorityQueue.fromIterable(orderByTime)(events), diff --git a/packages/effect/test/TPubSub.test.ts b/packages/effect/test/TPubSub.test.ts index 30606074384..b256d7c3ca6 100644 --- a/packages/effect/test/TPubSub.test.ts +++ b/packages/effect/test/TPubSub.test.ts @@ -1,3 +1,4 @@ +import { describe, it } from "@effect/vitest" import { Array as Arr, Deferred, @@ -11,13 +12,11 @@ import { TQueue } from "effect" import { deepStrictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" -import { describe } from "vitest" const sort: (array: ReadonlyArray) => ReadonlyArray = Arr.sort(number.Order) describe("TPubSub", () => { - it.it("sequential publishers and subscribers - with one publisher and one subscriber", () => + it("sequential publishers and subscribers - with one publisher and one subscriber", () => fc.assert(fc.asyncProperty(fc.integer({ min: 1 }), fc.array(fc.integer()), async (n, as) => { const program = Effect.gen(function*() { const deferred1 = yield* (Deferred.make()) @@ -51,7 +50,7 @@ describe("TPubSub", () => { deepStrictEqual(Array.from(result), as.slice(0, n)) }))) - it.it("sequential publishers and subscribers - with one publisher and two subscribers", () => + it("sequential publishers and subscribers - with one publisher and two subscribers", () => fc.assert(fc.asyncProperty(fc.integer({ min: 1 }), fc.array(fc.integer()), async (n, as) => { const program = Effect.gen(function*() { const deferred1 = yield* (Deferred.make()) @@ -106,7 +105,7 @@ describe("TPubSub", () => { deepStrictEqual(Array.from(result2), as.slice(0, n)) }))) - it.it("concurrent publishers and subscribers - one to one", () => + it("concurrent publishers and subscribers - one to one", () => fc.assert(fc.asyncProperty(fc.integer({ min: 1 }), fc.array(fc.integer()), async (n, as) => { const program = Effect.gen(function*() { const deferred = yield* (Deferred.make()) @@ -134,7 +133,7 @@ describe("TPubSub", () => { deepStrictEqual(Array.from(result), as.slice(0, n)) }))) - it.it("concurrent publishers and subscribers - one to many", () => + it("concurrent publishers and subscribers - one to many", () => fc.assert(fc.asyncProperty(fc.integer({ min: 1 }), fc.array(fc.integer()), async (n, as) => { const program = Effect.gen(function*() { const deferred1 = yield* (Deferred.make()) @@ -178,7 +177,7 @@ describe("TPubSub", () => { deepStrictEqual(Array.from(result2), as.slice(0, n)) }))) - it.it("concurrent publishers and subscribers - many to many", () => + it("concurrent publishers and subscribers - many to many", () => fc.assert(fc.asyncProperty(fc.integer({ min: 1 }), fc.array(fc.integer({ min: 1 })), async (n, as) => { const program = Effect.gen(function*() { const deferred1 = yield* (Deferred.make()) @@ -249,7 +248,7 @@ describe("TPubSub", () => { ) }))) - it.it("back pressure - one to one", () => + it("back pressure - one to one", () => fc.assert(fc.asyncProperty(fc.integer({ min: 1 }), fc.array(fc.integer({ min: 1 })), async (n, as) => { const program = Effect.gen(function*() { const deferred = yield* (Deferred.make()) @@ -274,7 +273,7 @@ describe("TPubSub", () => { deepStrictEqual(Array.from(result), as) }))) - it.it("back pressure - one to many", () => + it("back pressure - one to many", () => fc.assert(fc.asyncProperty(fc.integer({ min: 1 }), fc.array(fc.integer({ min: 1 })), async (n, as) => { const program = Effect.gen(function*() { const deferred1 = yield* (Deferred.make()) @@ -316,7 +315,7 @@ describe("TPubSub", () => { deepStrictEqual(Array.from(result2), as) }))) - it.it("back pressure - many to many", () => + it("back pressure - many to many", () => fc.assert(fc.asyncProperty(fc.integer({ min: 1 }), fc.array(fc.integer({ min: 1 })), async (n, as) => { const program = Effect.gen(function*() { const deferred1 = yield* (Deferred.make()) @@ -375,7 +374,7 @@ describe("TPubSub", () => { deepStrictEqual(Array.from(result2).filter((n) => n < 0), as.map((n) => -n)) }))) - it.it("dropping - one to one", () => + it("dropping - one to one", () => fc.assert(fc.asyncProperty(fc.integer({ min: 1 }), fc.array(fc.integer({ min: 1 })), async (n, as) => { const program = Effect.gen(function*() { const deferred = yield* (Deferred.make()) @@ -403,7 +402,7 @@ describe("TPubSub", () => { deepStrictEqual(Array.from(result), as.slice(0, n)) }))) - it.it("dropping - one to many", () => + it("dropping - one to many", () => fc.assert(fc.asyncProperty(fc.integer({ min: 1 }), fc.array(fc.integer({ min: 1 })), async (n, as) => { const program = Effect.gen(function*() { const deferred1 = yield* (Deferred.make()) @@ -451,7 +450,7 @@ describe("TPubSub", () => { deepStrictEqual(Array.from(result2), as.slice(0, n)) }))) - it.it("dropping - many to many", () => + it("dropping - many to many", () => fc.assert(fc.asyncProperty(fc.integer({ min: 1 }), fc.array(fc.integer({ min: 1 })), async (n, as) => { const program = Effect.gen(function*() { const deferred1 = yield* (Deferred.make()) @@ -522,7 +521,7 @@ describe("TPubSub", () => { ) }))) - it.it("sliding - one to one", () => + it("sliding - one to one", () => fc.assert(fc.asyncProperty(fc.integer({ min: 1 }), fc.array(fc.integer({ min: 1 })), async (n, as) => { const program = Effect.gen(function*() { const deferred = yield* (Deferred.make()) @@ -551,7 +550,7 @@ describe("TPubSub", () => { deepStrictEqual(Array.from(result), sort(Array.from(result))) }))) - it.it("sliding - one to many", () => + it("sliding - one to many", () => fc.assert(fc.asyncProperty(fc.integer({ min: 1 }), fc.array(fc.integer({ min: 1 })), async (n, as) => { const program = Effect.gen(function*() { const deferred1 = yield* (Deferred.make()) @@ -599,7 +598,7 @@ describe("TPubSub", () => { deepStrictEqual(Array.from(result2), sort(Array.from(result2))) }))) - it.it("sliding - many to many", () => + it("sliding - many to many", () => fc.assert(fc.asyncProperty(fc.integer({ min: 1 }), fc.array(fc.integer({ min: 1 })), async (n, as) => { const program = Effect.gen(function*() { const deferred1 = yield* (Deferred.make()) @@ -670,7 +669,7 @@ describe("TPubSub", () => { ) }))) - it.it("unbounded - one to one", () => + it("unbounded - one to one", () => fc.assert(fc.asyncProperty(fc.array(fc.integer({ min: 1 })), async (as) => { const program = Effect.gen(function*() { const deferred = yield* (Deferred.make()) @@ -695,7 +694,7 @@ describe("TPubSub", () => { deepStrictEqual(Array.from(result), as) }))) - it.it("unbounded - one to many", () => + it("unbounded - one to many", () => fc.assert(fc.asyncProperty(fc.array(fc.integer({ min: 1 })), async (as) => { const program = Effect.gen(function*() { const deferred1 = yield* (Deferred.make()) @@ -737,7 +736,7 @@ describe("TPubSub", () => { deepStrictEqual(Array.from(result2), as) }))) - it.it("unbounded - many to many", () => + it("unbounded - many to many", () => fc.assert(fc.asyncProperty(fc.array(fc.integer({ min: 1 })), async (as) => { const program = Effect.gen(function*() { const deferred1 = yield* (Deferred.make()) diff --git a/packages/effect/test/TQueue.test.ts b/packages/effect/test/TQueue.test.ts index 10c1d9c55cb..8179a5ca03f 100644 --- a/packages/effect/test/TQueue.test.ts +++ b/packages/effect/test/TQueue.test.ts @@ -1,7 +1,6 @@ +import { describe, it } from "@effect/vitest" import { Effect, pipe, STM, TQueue } from "effect" import { assertFalse, assertNone, assertSome, assertTrue, deepStrictEqual, strictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" -import { describe } from "vitest" describe("TQueue", () => { it.effect("bounded", () => diff --git a/packages/effect/test/TRandom.test.ts b/packages/effect/test/TRandom.test.ts index 117c147270f..20beba9b99d 100644 --- a/packages/effect/test/TRandom.test.ts +++ b/packages/effect/test/TRandom.test.ts @@ -1,11 +1,10 @@ +import { describe, it } from "@effect/vitest" import * as Effect from "effect/Effect" import { pipe } from "effect/Function" import * as STM from "effect/STM" import { assertTrue } from "effect/test/util" -import * as it from "effect/test/utils/extend" import * as TRandom from "effect/TRandom" import * as fc from "fast-check" -import { describe } from "vitest" const floatsArb: fc.Arbitrary = fc.tuple( fc.float({ noDefaultInfinity: true, noNaN: true }), @@ -19,7 +18,7 @@ const intsArb: fc.Arbitrary = fc.tuple(fc.integer(), .map(([a, b]) => b > a ? [a, b] : [b, a]) describe("TRandom", () => { - it.it("nextIntBetween - generates integers in the specified range", () => + it("nextIntBetween - generates integers in the specified range", () => fc.assert(fc.asyncProperty(intsArb, async ([min, max]) => { const result = await pipe( STM.commit(TRandom.nextRange(min, max)), @@ -30,7 +29,7 @@ describe("TRandom", () => { assertTrue(result < max) }))) - it.it("nextRange - generates numbers in the specified range", () => + it("nextRange - generates numbers in the specified range", () => fc.assert(fc.asyncProperty(floatsArb, async ([min, max]) => { const result = await pipe( STM.commit(TRandom.nextRange(min, max)), diff --git a/packages/effect/test/TReentrantLock.test.ts b/packages/effect/test/TReentrantLock.test.ts index 1eb7529c7ec..1376f62130e 100644 --- a/packages/effect/test/TReentrantLock.test.ts +++ b/packages/effect/test/TReentrantLock.test.ts @@ -1,3 +1,4 @@ +import { describe, it } from "@effect/vitest" import * as Deferred from "effect/Deferred" import * as Effect from "effect/Effect" import type * as Exit from "effect/Exit" @@ -8,9 +9,7 @@ import * as Ref from "effect/Ref" import * as Schedule from "effect/Schedule" import * as STM from "effect/STM" import { assertNone, strictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" import * as TReentrantLock from "effect/TReentrantLock" -import { describe } from "vitest" const pollSchedule = (): Schedule.Schedule>, Option.Option>> => pipe( diff --git a/packages/effect/test/TSet.test.ts b/packages/effect/test/TSet.test.ts index f34b38dd37e..72d8231dd24 100644 --- a/packages/effect/test/TSet.test.ts +++ b/packages/effect/test/TSet.test.ts @@ -1,11 +1,10 @@ +import { describe, it } from "@effect/vitest" import * as Chunk from "effect/Chunk" import * as Effect from "effect/Effect" import { pipe } from "effect/Function" import * as STM from "effect/STM" import { assertFalse, assertTrue, deepStrictEqual, strictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" import * as TSet from "effect/TSet" -import { describe } from "vitest" describe("TSet", () => { it.effect("add - new element", () => diff --git a/packages/effect/test/TSubscriptionRef.test.ts b/packages/effect/test/TSubscriptionRef.test.ts index a85605f97a1..66168e47339 100644 --- a/packages/effect/test/TSubscriptionRef.test.ts +++ b/packages/effect/test/TSubscriptionRef.test.ts @@ -1,9 +1,19 @@ -import { Chunk, Deferred, Effect, Equal, Exit, Fiber, pipe, Random, STM, Stream } from "effect" -import * as Number from "effect/Number" +import { describe, it } from "@effect/vitest" +import { + Chunk, + Deferred, + Effect, + Equal, + Exit, + Fiber, + Number, + pipe, + Random, + STM, + Stream, + TSubscriptionRef +} from "effect" import { assertTrue, deepStrictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" -import * as TSubscriptionRef from "effect/TSubscriptionRef" -import { describe } from "vitest" describe.concurrent("TSubscriptionRef", () => { it.effect("only emits comitted values", () => diff --git a/packages/effect/test/Tracer.test.ts b/packages/effect/test/Tracer.test.ts index afa754278e3..f3d8faf4264 100644 --- a/packages/effect/test/Tracer.test.ts +++ b/packages/effect/test/Tracer.test.ts @@ -1,9 +1,8 @@ +import { describe, it } from "@effect/vitest" import { Cause, Context, Duration, Effect, Fiber, FiberId, Layer, Option, pipe, TestClock, Tracer } from "effect" import type { NativeSpan } from "effect/internal/tracer" -import { assertNone, assertTrue, deepStrictEqual, strictEqual } from "effect/test/util" -import * as it from "effect/test/utils/extend" +import { assertIncludes, assertNone, assertTrue, deepStrictEqual, strictEqual } from "effect/test/util" import type { Span } from "effect/Tracer" -import { describe } from "vitest" describe("Tracer", () => { it.effect("includes trace when errored", () => @@ -22,7 +21,7 @@ describe("Tracer", () => { }) yield* Effect.flip(getSpan("fail")) assertTrue(maybeSpan !== undefined) - assertTrue((maybeSpan!.attributes.get("code.stacktrace") as string).includes("Tracer.test.ts:23:26")) + assertIncludes(maybeSpan!.attributes.get("code.stacktrace") as string, "Tracer.test.ts:22:26") })) it.effect("captures stack", () => @@ -32,7 +31,7 @@ describe("Tracer", () => { Effect.sandbox, Effect.flip ) - assertTrue(Cause.pretty(cause).includes("Tracer.test.ts:30:39")) + assertIncludes(Cause.pretty(cause), "Tracer.test.ts:29:39") })) describe("withSpan", () => { diff --git a/packages/effect/test/Trie.test.ts b/packages/effect/test/Trie.test.ts index b1a23c59158..7841034fa60 100644 --- a/packages/effect/test/Trie.test.ts +++ b/packages/effect/test/Trie.test.ts @@ -1,9 +1,9 @@ +import { describe, it } from "@effect/vitest" import * as Equal from "effect/Equal" import { pipe } from "effect/Function" import * as Option from "effect/Option" import { assertNone, assertSome, deepStrictEqual, strictEqual, throws } from "effect/test/util" import * as Trie from "effect/Trie" -import { describe, it } from "vitest" describe("Trie", () => { it("toString", () => { diff --git a/packages/effect/test/Tuple.test.ts b/packages/effect/test/Tuple.test.ts index 427f1da3e75..edbed912a25 100644 --- a/packages/effect/test/Tuple.test.ts +++ b/packages/effect/test/Tuple.test.ts @@ -1,6 +1,6 @@ +import { describe, it } from "@effect/vitest" import { pipe, Tuple } from "effect" import { deepStrictEqual, strictEqual } from "effect/test/util" -import { describe, it } from "vitest" describe("Tuple", () => { it("make", () => { diff --git a/packages/effect/test/util.ts b/packages/effect/test/util.ts index aa12863a3c6..f596e71a3a2 100644 --- a/packages/effect/test/util.ts +++ b/packages/effect/test/util.ts @@ -50,6 +50,12 @@ export const throws = (thunk: () => void, error?: object | ((e: unknown) => bool } } +export const assertIncludes = (actual: string | undefined, expected: string, ..._: Array) => { + if (!actual?.includes(expected)) { + assert.fail(`Expected\n\n${actual}\n\nto include\n\n${expected}`) + } +} + // ---------------------------- // Option // ---------------------------- diff --git a/packages/effect/test/utils/effect-vitest-link b/packages/effect/test/utils/effect-vitest-link deleted file mode 120000 index 2f0780cc8d7..00000000000 --- a/packages/effect/test/utils/effect-vitest-link +++ /dev/null @@ -1 +0,0 @@ -../../../../packages/vitest/src/ \ No newline at end of file diff --git a/packages/effect/test/utils/extend.ts b/packages/effect/test/utils/extend.ts deleted file mode 100644 index e0a3a3a0fd4..00000000000 --- a/packages/effect/test/utils/extend.ts +++ /dev/null @@ -1 +0,0 @@ -export * from "./effect-vitest-link/index.js" diff --git a/packages/effect/tsconfig.test.json b/packages/effect/tsconfig.test.json index 333b9e9b3be..854c19a7976 100644 --- a/packages/effect/tsconfig.test.json +++ b/packages/effect/tsconfig.test.json @@ -1,11 +1,14 @@ { "extends": "../../tsconfig.base.json", "include": ["test"], - "references": [{ "path": "tsconfig.src.json" }], + "references": [ + { "path": "tsconfig.src.json" }, + { "path": "../vitest/tsconfig.src.json" } + ], "compilerOptions": { "types": ["node"], "tsBuildInfoFile": ".tsbuildinfo/test.tsbuildinfo", "rootDir": "test", - "noEmit": true + "outDir": "build/test" // Some packages import test files from `effect`, hence we need to emit `d.ts` files here. } } diff --git a/packages/effect/vitest.config.ts b/packages/effect/vitest.config.ts index df4cfb5a4b3..ce22cd9ab39 100644 --- a/packages/effect/vitest.config.ts +++ b/packages/effect/vitest.config.ts @@ -1,11 +1,12 @@ -import { mergeConfig, type UserConfigExport } from "vitest/config" +import { mergeConfig, type ViteUserConfig } from "vitest/config" import shared from "../../vitest.shared.js" -const config: UserConfigExport = { +const config: ViteUserConfig = { test: { coverage: { reporter: ["html"], - include: ["src/**/*ts"] + include: ["src/**/*.ts"], + provider: "v8" } } } diff --git a/packages/experimental/test/Machine.test.ts b/packages/experimental/test/Machine.test.ts index d4379b6c946..91e1b6241c2 100644 --- a/packages/experimental/test/Machine.test.ts +++ b/packages/experimental/test/Machine.test.ts @@ -1,7 +1,7 @@ import * as DevTools from "@effect/experimental/DevTools" import * as Machine from "@effect/experimental/Machine" +import { assert, describe, test } from "@effect/vitest" import { Cause, Chunk, Context, Deferred, Effect, Exit, Layer, Schema, Stream } from "effect" -import { assert, describe, test } from "vitest" class Increment extends Schema.TaggedRequest()("Increment", { failure: Schema.Never, success: Schema.Number, payload: {} }) diff --git a/packages/experimental/test/MsgPack.test.ts b/packages/experimental/test/MsgPack.test.ts index db11e314f48..25caa02b2fc 100644 --- a/packages/experimental/test/MsgPack.test.ts +++ b/packages/experimental/test/MsgPack.test.ts @@ -1,8 +1,8 @@ import * as MsgPack from "@effect/experimental/MsgPack" import * as Socket from "@effect/platform-node/NodeSocket" +import { assert, describe, test } from "@effect/vitest" import { Chunk, Effect, Stream } from "effect" import * as Net from "node:net" -import { assert, describe, test } from "vitest" const server = Net.createServer((socket) => { socket.on("data", (data) => { diff --git a/packages/experimental/test/Ndjson.test.ts b/packages/experimental/test/Ndjson.test.ts index 33bfd8ce662..9aab0942d01 100644 --- a/packages/experimental/test/Ndjson.test.ts +++ b/packages/experimental/test/Ndjson.test.ts @@ -1,8 +1,8 @@ import * as Ndjson from "@effect/experimental/Ndjson" import * as Socket from "@effect/platform-node/NodeSocket" +import { assert, describe, test } from "@effect/vitest" import { Chunk, Effect, Stream } from "effect" import * as Net from "node:net" -import { assert, describe, test } from "vitest" const server = Net.createServer((socket) => { socket.on("data", (data) => { diff --git a/packages/experimental/test/PersistedCache.test.ts b/packages/experimental/test/PersistedCache.test.ts index 7835031fd5f..70228cba101 100644 --- a/packages/experimental/test/PersistedCache.test.ts +++ b/packages/experimental/test/PersistedCache.test.ts @@ -1,9 +1,8 @@ import * as PersistedCache from "@effect/experimental/PersistedCache" import * as Persistence from "@effect/experimental/Persistence" import { KeyValueStore } from "@effect/platform" -import * as it from "@effect/vitest" +import { assert, describe, it } from "@effect/vitest" import { Effect, Exit, Layer, Option, PrimaryKey, Schema } from "effect" -import { assert, describe } from "vitest" class User extends Schema.Class("User")({ id: Schema.Number, diff --git a/packages/experimental/test/RequestResolver.test.ts b/packages/experimental/test/RequestResolver.test.ts index 4919e661d9b..491f7e6519f 100644 --- a/packages/experimental/test/RequestResolver.test.ts +++ b/packages/experimental/test/RequestResolver.test.ts @@ -1,10 +1,9 @@ import * as Persistence from "@effect/experimental/Persistence" import * as RequestResolverX from "@effect/experimental/RequestResolver" import { KeyValueStore } from "@effect/platform" -import * as it from "@effect/vitest" +import { assert, describe, it } from "@effect/vitest" import { Array, Effect, Exit, Layer, PrimaryKey, Request, RequestResolver, Schema, TestClock } from "effect" import type { NonEmptyArray } from "effect/Array" -import { assert, describe } from "vitest" class User extends Schema.Class("User")({ id: Schema.Number, diff --git a/packages/experimental/test/utils/extend.ts b/packages/experimental/test/utils/extend.ts index 2d70a455c05..84c76bc4a95 100644 --- a/packages/experimental/test/utils/extend.ts +++ b/packages/experimental/test/utils/extend.ts @@ -1,6 +1,6 @@ +import * as V from "@effect/vitest" import * as Effect from "effect/Effect" import { pipe } from "effect/Function" -import * as V from "vitest" export type API = V.TestAPI<{}> diff --git a/packages/experimental/tsconfig.examples.json b/packages/experimental/tsconfig.examples.json index b05e47a79af..9bc823ef609 100644 --- a/packages/experimental/tsconfig.examples.json +++ b/packages/experimental/tsconfig.examples.json @@ -2,9 +2,7 @@ "extends": "../../tsconfig.base.json", "include": ["examples"], "references": [ - { "path": "tsconfig.src.json" }, - { "path": "../effect" }, - { "path": "../platform-node" } + { "path": "tsconfig.src.json" } ], "compilerOptions": { "tsBuildInfoFile": ".tsbuildinfo/examples.tsbuildinfo", diff --git a/packages/experimental/tsconfig.src.json b/packages/experimental/tsconfig.src.json index b9a4b19b342..e9bac761e95 100644 --- a/packages/experimental/tsconfig.src.json +++ b/packages/experimental/tsconfig.src.json @@ -2,9 +2,9 @@ "extends": "../../tsconfig.base.json", "include": ["src"], "references": [ - { "path": "../effect" }, - { "path": "../platform" }, - { "path": "../platform-node" } + { "path": "../effect/tsconfig.src.json" }, + { "path": "../platform/tsconfig.src.json" }, + { "path": "../platform-node/tsconfig.src.json" } ], "compilerOptions": { "tsBuildInfoFile": ".tsbuildinfo/src.tsbuildinfo", diff --git a/packages/experimental/tsconfig.test.json b/packages/experimental/tsconfig.test.json index fc764a2b8b0..185e7065e44 100644 --- a/packages/experimental/tsconfig.test.json +++ b/packages/experimental/tsconfig.test.json @@ -3,9 +3,7 @@ "include": ["test"], "references": [ { "path": "tsconfig.src.json" }, - { "path": "../effect" }, - { "path": "../platform-node" }, - { "path": "../vitest" } + { "path": "../vitest/tsconfig.src.json" } ], "compilerOptions": { "tsBuildInfoFile": ".tsbuildinfo/test.tsbuildinfo", diff --git a/packages/experimental/vitest.config.ts b/packages/experimental/vitest.config.ts index 0411095f257..578d0667249 100644 --- a/packages/experimental/vitest.config.ts +++ b/packages/experimental/vitest.config.ts @@ -1,6 +1,6 @@ -import { mergeConfig, type UserConfigExport } from "vitest/config" +import { mergeConfig, type ViteUserConfig } from "vitest/config" import shared from "../../vitest.shared.js" -const config: UserConfigExport = {} +const config: ViteUserConfig = {} export default mergeConfig(shared, config) diff --git a/packages/opentelemetry/test/Metrics.test.ts b/packages/opentelemetry/test/Metrics.test.ts index ce04de4c153..3afe77b0ad2 100644 --- a/packages/opentelemetry/test/Metrics.test.ts +++ b/packages/opentelemetry/test/Metrics.test.ts @@ -1,10 +1,9 @@ import * as internal from "@effect/opentelemetry/internal/metrics" -import * as it from "@effect/vitest" +import { assert, describe, it } from "@effect/vitest" import { ValueType } from "@opentelemetry/api" import { Resource } from "@opentelemetry/resources" import * as Effect from "effect/Effect" import * as Metric from "effect/Metric" -import { assert, describe } from "vitest" const findMetric = (metrics: any, name: string) => metrics.resourceMetrics.scopeMetrics[0].metrics.find((_: any) => _.descriptor.name === name) diff --git a/packages/opentelemetry/test/Tracer.test.ts b/packages/opentelemetry/test/Tracer.test.ts index 26bf134caf4..b535a75950c 100644 --- a/packages/opentelemetry/test/Tracer.test.ts +++ b/packages/opentelemetry/test/Tracer.test.ts @@ -1,13 +1,12 @@ import { OtelSpan } from "@effect/opentelemetry/internal/tracer" import * as NodeSdk from "@effect/opentelemetry/NodeSdk" import * as Tracer from "@effect/opentelemetry/Tracer" -import * as it from "@effect/vitest" +import { assert, describe, expect, it } from "@effect/vitest" import * as OtelApi from "@opentelemetry/api" import { AsyncHooksContextManager } from "@opentelemetry/context-async-hooks" import { InMemorySpanExporter, SimpleSpanProcessor } from "@opentelemetry/sdk-trace-base" import * as Effect from "effect/Effect" import * as Runtime from "effect/Runtime" -import { assert, describe, expect } from "vitest" const TracingLive = NodeSdk.layer(Effect.sync(() => ({ resource: { diff --git a/packages/opentelemetry/tsconfig.src.json b/packages/opentelemetry/tsconfig.src.json index 265aaa8ced6..edbb16309ad 100644 --- a/packages/opentelemetry/tsconfig.src.json +++ b/packages/opentelemetry/tsconfig.src.json @@ -2,7 +2,7 @@ "extends": "../../tsconfig.base.json", "include": ["src"], "references": [ - { "path": "../effect" } + { "path": "../effect/tsconfig.src.json" } ], "compilerOptions": { "tsBuildInfoFile": ".tsbuildinfo/src.tsbuildinfo", diff --git a/packages/opentelemetry/tsconfig.test.json b/packages/opentelemetry/tsconfig.test.json index d18d744cb97..185e7065e44 100644 --- a/packages/opentelemetry/tsconfig.test.json +++ b/packages/opentelemetry/tsconfig.test.json @@ -3,8 +3,7 @@ "include": ["test"], "references": [ { "path": "tsconfig.src.json" }, - { "path": "../effect" }, - { "path": "../vitest" } + { "path": "../vitest/tsconfig.src.json" } ], "compilerOptions": { "tsBuildInfoFile": ".tsbuildinfo/test.tsbuildinfo", diff --git a/packages/opentelemetry/vitest.config.ts b/packages/opentelemetry/vitest.config.ts index 0411095f257..578d0667249 100644 --- a/packages/opentelemetry/vitest.config.ts +++ b/packages/opentelemetry/vitest.config.ts @@ -1,6 +1,6 @@ -import { mergeConfig, type UserConfigExport } from "vitest/config" +import { mergeConfig, type ViteUserConfig } from "vitest/config" import shared from "../../vitest.shared.js" -const config: UserConfigExport = {} +const config: ViteUserConfig = {} export default mergeConfig(shared, config) diff --git a/packages/platform-browser/test/KeyValueStore.test.ts b/packages/platform-browser/test/KeyValueStore.test.ts index 0411e5466b8..5bb81944ebd 100644 --- a/packages/platform-browser/test/KeyValueStore.test.ts +++ b/packages/platform-browser/test/KeyValueStore.test.ts @@ -1,7 +1,7 @@ import * as Kv from "@effect/platform-browser/BrowserKeyValueStore" // @ts-ignore import { testLayer } from "@effect/platform/test/KeyValueStore.test" -import { describe } from "vitest" +import { describe } from "@effect/vitest" describe("KeyValueStore / layerLocalStorage", () => testLayer(Kv.layerLocalStorage)) describe("KeyValueStore / layerSessionStorage", () => testLayer(Kv.layerSessionStorage)) diff --git a/packages/platform-browser/tsconfig.build.json b/packages/platform-browser/tsconfig.build.json index 29b272747c1..472aa658e6c 100644 --- a/packages/platform-browser/tsconfig.build.json +++ b/packages/platform-browser/tsconfig.build.json @@ -1,8 +1,8 @@ { "extends": "./tsconfig.src.json", "references": [ - { "path": "../platform/tsconfig.build.json" }, - { "path": "../effect/tsconfig.build.json" } + { "path": "../effect/tsconfig.build.json" }, + { "path": "../platform/tsconfig.build.json" } ], "compilerOptions": { "tsBuildInfoFile": ".tsbuildinfo/build.tsbuildinfo", diff --git a/packages/platform-browser/tsconfig.examples.json b/packages/platform-browser/tsconfig.examples.json index 5bfd6071476..9bc823ef609 100644 --- a/packages/platform-browser/tsconfig.examples.json +++ b/packages/platform-browser/tsconfig.examples.json @@ -1,7 +1,9 @@ { "extends": "../../tsconfig.base.json", "include": ["examples"], - "references": [{ "path": "tsconfig.src.json" }, { "path": "../effect" }], + "references": [ + { "path": "tsconfig.src.json" } + ], "compilerOptions": { "tsBuildInfoFile": ".tsbuildinfo/examples.tsbuildinfo", "rootDir": "examples", diff --git a/packages/platform-browser/tsconfig.src.json b/packages/platform-browser/tsconfig.src.json index 3ee0560b5ba..9c2b4663426 100644 --- a/packages/platform-browser/tsconfig.src.json +++ b/packages/platform-browser/tsconfig.src.json @@ -1,7 +1,10 @@ { "extends": "../../tsconfig.base.json", "include": ["src"], - "references": [{ "path": "../platform" }, { "path": "../effect" }], + "references": [ + { "path": "../effect/tsconfig.src.json" }, + { "path": "../platform/tsconfig.src.json" } + ], "compilerOptions": { "tsBuildInfoFile": ".tsbuildinfo/src.tsbuildinfo", "rootDir": "src", diff --git a/packages/platform-browser/tsconfig.test.json b/packages/platform-browser/tsconfig.test.json index d18d744cb97..1bd020f2072 100644 --- a/packages/platform-browser/tsconfig.test.json +++ b/packages/platform-browser/tsconfig.test.json @@ -3,8 +3,8 @@ "include": ["test"], "references": [ { "path": "tsconfig.src.json" }, - { "path": "../effect" }, - { "path": "../vitest" } + { "path": "../effect/tsconfig.test.json" }, // We import test files from `effect`. + { "path": "../vitest/tsconfig.src.json" } ], "compilerOptions": { "tsBuildInfoFile": ".tsbuildinfo/test.tsbuildinfo", diff --git a/packages/platform-browser/vitest.config.ts b/packages/platform-browser/vitest.config.ts index f3a59565b00..3a190f9324d 100644 --- a/packages/platform-browser/vitest.config.ts +++ b/packages/platform-browser/vitest.config.ts @@ -1,7 +1,7 @@ -import { mergeConfig, type UserConfigExport } from "vitest/config" +import { mergeConfig, type ViteUserConfig } from "vitest/config" import shared from "../../vitest.shared.js" -const config: UserConfigExport = { +const config: ViteUserConfig = { test: { environment: "happy-dom" } diff --git a/packages/platform-bun/tsconfig.build.json b/packages/platform-bun/tsconfig.build.json index 9831d2e7342..31b4275a36e 100644 --- a/packages/platform-bun/tsconfig.build.json +++ b/packages/platform-bun/tsconfig.build.json @@ -1,8 +1,9 @@ { "extends": "./tsconfig.src.json", "references": [ + { "path": "../effect/tsconfig.build.json" }, { "path": "../platform/tsconfig.build.json" }, - { "path": "../platform-node/tsconfig.build.json" } + { "path": "../platform-node-shared/tsconfig.build.json" } ], "compilerOptions": { "tsBuildInfoFile": ".tsbuildinfo/build.tsbuildinfo", diff --git a/packages/platform-bun/tsconfig.examples.json b/packages/platform-bun/tsconfig.examples.json index 1d073aa6bcf..2d097f085f5 100644 --- a/packages/platform-bun/tsconfig.examples.json +++ b/packages/platform-bun/tsconfig.examples.json @@ -1,7 +1,9 @@ { "extends": "../../tsconfig.base.json", "include": ["examples"], - "references": [{ "path": "tsconfig.src.json" }], + "references": [ + { "path": "tsconfig.src.json" } + ], "compilerOptions": { "tsBuildInfoFile": ".tsbuildinfo/examples.tsbuildinfo", "rootDir": "examples", diff --git a/packages/platform-bun/tsconfig.src.json b/packages/platform-bun/tsconfig.src.json index 8f66350e9c8..f92c3a5fa94 100644 --- a/packages/platform-bun/tsconfig.src.json +++ b/packages/platform-bun/tsconfig.src.json @@ -1,7 +1,11 @@ { "extends": "../../tsconfig.base.json", "include": ["src"], - "references": [{ "path": "../platform" }, { "path": "../platform-node" }], + "references": [ + { "path": "../effect/tsconfig.src.json" }, + { "path": "../platform/tsconfig.src.json" }, + { "path": "../platform-node-shared/tsconfig.src.json" } + ], "compilerOptions": { "tsBuildInfoFile": ".tsbuildinfo/src.tsbuildinfo", "rootDir": "src", diff --git a/packages/platform-bun/tsconfig.test.json b/packages/platform-bun/tsconfig.test.json index ec34ab61107..91a7b20e718 100644 --- a/packages/platform-bun/tsconfig.test.json +++ b/packages/platform-bun/tsconfig.test.json @@ -2,7 +2,8 @@ "extends": "../../tsconfig.base.json", "include": ["test"], "references": [ - { "path": "tsconfig.src.json" } + { "path": "tsconfig.src.json" }, + { "path": "../vitest/tsconfig.src.json" } ], "compilerOptions": { "tsBuildInfoFile": ".tsbuildinfo/test.tsbuildinfo", diff --git a/packages/platform-bun/vitest.config.ts b/packages/platform-bun/vitest.config.ts index 0411095f257..578d0667249 100644 --- a/packages/platform-bun/vitest.config.ts +++ b/packages/platform-bun/vitest.config.ts @@ -1,6 +1,6 @@ -import { mergeConfig, type UserConfigExport } from "vitest/config" +import { mergeConfig, type ViteUserConfig } from "vitest/config" import shared from "../../vitest.shared.js" -const config: UserConfigExport = {} +const config: ViteUserConfig = {} export default mergeConfig(shared, config) diff --git a/packages/platform-node-shared/test/CommandExecutor.test.ts b/packages/platform-node-shared/test/CommandExecutor.test.ts index 31c24459dbd..a88e60b83ad 100644 --- a/packages/platform-node-shared/test/CommandExecutor.test.ts +++ b/packages/platform-node-shared/test/CommandExecutor.test.ts @@ -6,6 +6,7 @@ import type * as CommandExecutor from "@effect/platform/CommandExecutor" import { SystemError } from "@effect/platform/Error" import * as FileSystem from "@effect/platform/FileSystem" import * as Path from "@effect/platform/Path" +import { describe, expect, it } from "@effect/vitest" import * as Array from "effect/Array" import * as Chunk from "effect/Chunk" import * as Effect from "effect/Effect" @@ -16,7 +17,6 @@ import * as Layer from "effect/Layer" import * as Option from "effect/Option" import * as Order from "effect/Order" import * as Stream from "effect/Stream" -import { describe, expect, it } from "vitest" const TEST_BASH_SCRIPTS_PATH = [__dirname, "fixtures", "bash"] diff --git a/packages/platform-node-shared/test/FileSystem.test.ts b/packages/platform-node-shared/test/FileSystem.test.ts index 747a3297197..c68830794ca 100644 --- a/packages/platform-node-shared/test/FileSystem.test.ts +++ b/packages/platform-node-shared/test/FileSystem.test.ts @@ -1,9 +1,9 @@ import * as NodeFileSystem from "@effect/platform-node-shared/NodeFileSystem" import * as Fs from "@effect/platform/FileSystem" +import { assert, describe, expect, it } from "@effect/vitest" import * as Chunk from "effect/Chunk" import * as Effect from "effect/Effect" import * as Stream from "effect/Stream" -import { assert, describe, expect, it } from "vitest" const runPromise = (self: Effect.Effect) => Effect.runPromise( diff --git a/packages/platform-node-shared/test/KeyValueStore.test.ts b/packages/platform-node-shared/test/KeyValueStore.test.ts index 55ff2b66b0c..682c525e3a4 100644 --- a/packages/platform-node-shared/test/KeyValueStore.test.ts +++ b/packages/platform-node-shared/test/KeyValueStore.test.ts @@ -1,7 +1,7 @@ import * as KvN from "@effect/platform-node-shared/NodeKeyValueStore" // @ts-ignore import { testLayer } from "@effect/platform/test/KeyValueStore.test" -import { describe } from "vitest" +import { describe } from "@effect/vitest" const KeyValueLive = KvN.layerFileSystem(`${__dirname}/fixtures/kv`) diff --git a/packages/platform-node-shared/test/Sink.test.ts b/packages/platform-node-shared/test/Sink.test.ts index 8b6266baa2d..604c6086a2b 100644 --- a/packages/platform-node-shared/test/Sink.test.ts +++ b/packages/platform-node-shared/test/Sink.test.ts @@ -1,5 +1,6 @@ import * as NodeSink from "@effect/platform-node-shared/NodeSink" import * as NodeStream from "@effect/platform-node-shared/NodeStream" +import { assert, describe, it } from "@effect/vitest" import * as Chunk from "effect/Chunk" import * as Data from "effect/Data" import * as Effect from "effect/Effect" @@ -8,7 +9,6 @@ import { createReadStream } from "fs" import { join } from "path" import { Writable } from "stream" import Tar from "tar" -import { assert, describe, it } from "vitest" const TEST_TARBALL = join(__dirname, "fixtures", "helloworld.tar.gz") diff --git a/packages/platform-node-shared/test/Stream.test.ts b/packages/platform-node-shared/test/Stream.test.ts index e334f8441fa..1041ec4f756 100644 --- a/packages/platform-node-shared/test/Stream.test.ts +++ b/packages/platform-node-shared/test/Stream.test.ts @@ -1,8 +1,8 @@ import * as NodeStream from "@effect/platform-node-shared/NodeStream" +import { assert, describe, it } from "@effect/vitest" import { Array, Channel, Chunk, Stream } from "effect" import * as Effect from "effect/Effect" import { Duplex, Readable, Transform } from "stream" -import { assert, describe, it } from "vitest" import { createGzip, createUnzip } from "zlib" describe("Stream", () => { diff --git a/packages/platform-node-shared/tsconfig.build.json b/packages/platform-node-shared/tsconfig.build.json index 8326d06ca2f..c61dae448bf 100644 --- a/packages/platform-node-shared/tsconfig.build.json +++ b/packages/platform-node-shared/tsconfig.build.json @@ -1,8 +1,8 @@ { "extends": "./tsconfig.src.json", "references": [ - { "path": "../platform/tsconfig.build.json" }, - { "path": "../effect/tsconfig.build.json" } + { "path": "../effect/tsconfig.build.json" }, + { "path": "../platform/tsconfig.build.json" } ], "compilerOptions": { "tsBuildInfoFile": ".tsbuildinfo/build.tsbuildinfo", diff --git a/packages/platform-node-shared/tsconfig.src.json b/packages/platform-node-shared/tsconfig.src.json index 3ee0560b5ba..9c2b4663426 100644 --- a/packages/platform-node-shared/tsconfig.src.json +++ b/packages/platform-node-shared/tsconfig.src.json @@ -1,7 +1,10 @@ { "extends": "../../tsconfig.base.json", "include": ["src"], - "references": [{ "path": "../platform" }, { "path": "../effect" }], + "references": [ + { "path": "../effect/tsconfig.src.json" }, + { "path": "../platform/tsconfig.src.json" } + ], "compilerOptions": { "tsBuildInfoFile": ".tsbuildinfo/src.tsbuildinfo", "rootDir": "src", diff --git a/packages/platform-node-shared/tsconfig.test.json b/packages/platform-node-shared/tsconfig.test.json index 5a2ff4b7941..c8636b1b141 100644 --- a/packages/platform-node-shared/tsconfig.test.json +++ b/packages/platform-node-shared/tsconfig.test.json @@ -3,8 +3,8 @@ "include": ["test"], "references": [ { "path": "tsconfig.src.json" }, - { "path": "../platform" }, - { "path": "../effect" } + { "path": "../vitest/tsconfig.src.json" }, + { "path": "../effect/tsconfig.test.json" } // We import test files from `effect`. ], "compilerOptions": { "tsBuildInfoFile": ".tsbuildinfo/test.tsbuildinfo", diff --git a/packages/platform-node-shared/vitest.config.ts b/packages/platform-node-shared/vitest.config.ts index 0411095f257..578d0667249 100644 --- a/packages/platform-node-shared/vitest.config.ts +++ b/packages/platform-node-shared/vitest.config.ts @@ -1,6 +1,6 @@ -import { mergeConfig, type UserConfigExport } from "vitest/config" +import { mergeConfig, type ViteUserConfig } from "vitest/config" import shared from "../../vitest.shared.js" -const config: UserConfigExport = {} +const config: ViteUserConfig = {} export default mergeConfig(shared, config) diff --git a/packages/platform-node/tsconfig.build.json b/packages/platform-node/tsconfig.build.json index 8c484b04df1..215e5cdce89 100644 --- a/packages/platform-node/tsconfig.build.json +++ b/packages/platform-node/tsconfig.build.json @@ -1,9 +1,9 @@ { "extends": "./tsconfig.src.json", "references": [ - { "path": "../platform/tsconfig.build.json" }, - { "path": "../platform-node-shared/tsconfig.build.json" }, - { "path": "../effect/tsconfig.build.json" } + { "path": "../effect/tsconfig.src.json" }, + { "path": "../platform/tsconfig.src.json" }, + { "path": "../platform-node-shared/tsconfig.src.json" } ], "compilerOptions": { "tsBuildInfoFile": ".tsbuildinfo/build.tsbuildinfo", diff --git a/packages/platform-node/tsconfig.src.json b/packages/platform-node/tsconfig.src.json index cf9e9e7e52a..4ee36a27c69 100644 --- a/packages/platform-node/tsconfig.src.json +++ b/packages/platform-node/tsconfig.src.json @@ -2,9 +2,9 @@ "extends": "../../tsconfig.base.json", "include": ["src"], "references": [ - { "path": "../platform" }, - { "path": "../platform-node-shared" }, - { "path": "../effect" } + { "path": "../effect/tsconfig.src.json" }, + { "path": "../platform/tsconfig.src.json" }, + { "path": "../platform-node-shared/tsconfig.src.json" } ], "compilerOptions": { "tsBuildInfoFile": ".tsbuildinfo/src.tsbuildinfo", diff --git a/packages/platform-node/tsconfig.test.json b/packages/platform-node/tsconfig.test.json index 40f0a8ec7db..185e7065e44 100644 --- a/packages/platform-node/tsconfig.test.json +++ b/packages/platform-node/tsconfig.test.json @@ -3,10 +3,7 @@ "include": ["test"], "references": [ { "path": "tsconfig.src.json" }, - { "path": "../platform" }, - { "path": "../platform-node-shared" }, - { "path": "../effect" }, - { "path": "../vitest" } + { "path": "../vitest/tsconfig.src.json" } ], "compilerOptions": { "tsBuildInfoFile": ".tsbuildinfo/test.tsbuildinfo", diff --git a/packages/platform-node/vitest.config.ts b/packages/platform-node/vitest.config.ts index 0411095f257..578d0667249 100644 --- a/packages/platform-node/vitest.config.ts +++ b/packages/platform-node/vitest.config.ts @@ -1,6 +1,6 @@ -import { mergeConfig, type UserConfigExport } from "vitest/config" +import { mergeConfig, type ViteUserConfig } from "vitest/config" import shared from "../../vitest.shared.js" -const config: UserConfigExport = {} +const config: ViteUserConfig = {} export default mergeConfig(shared, config) diff --git a/packages/platform/test/ConfigProvider.test.ts b/packages/platform/test/ConfigProvider.test.ts index 8a8a7d184b3..ab3ca34fc51 100644 --- a/packages/platform/test/ConfigProvider.test.ts +++ b/packages/platform/test/ConfigProvider.test.ts @@ -1,9 +1,10 @@ import * as FileSystem from "@effect/platform/FileSystem" import * as PlatformConfigProvider from "@effect/platform/PlatformConfigProvider" -import { assert, describe, it } from "@effect/vitest" +import { describe, it } from "@effect/vitest" import * as Config from "effect/Config" import * as Effect from "effect/Effect" import * as Layer from "effect/Layer" +import { strictEqual } from "effect/test/util" const ConfigProviderLive = Layer.unwrapEffect( PlatformConfigProvider.fromDotEnv(".env").pipe( @@ -23,6 +24,6 @@ describe("PlatformConfigProvider", () => { Effect.provide(Layer.provide(ConfigProviderLive, fileSystem)) ) - assert.strictEqual(result, "nested_config") + strictEqual(result, "nested_config") })) }) diff --git a/packages/platform/test/Cookies.test.ts b/packages/platform/test/Cookies.test.ts index 1ea9ad74d4b..1ba52971085 100644 --- a/packages/platform/test/Cookies.test.ts +++ b/packages/platform/test/Cookies.test.ts @@ -1,24 +1,26 @@ import * as Cookies from "@effect/platform/Cookies" -import { describe, expect, it } from "vitest" +import { describe, it } from "@effect/vitest" +import { throws } from "effect/test/util" + +const assertCookieError = (f: () => void, message: Cookies.CookiesError["reason"]) => { + throws(f, new Cookies.CookiesError({ reason: message })) +} describe("Cookies", () => { it("unsafeMakeCookie", () => { - expect(() => Cookies.unsafeMakeCookie("", "value")).toThrow(new Error("InvalidName")) - expect(() => Cookies.unsafeMakeCookie("name", "value", { domain: "" })).toThrow(new Error("InvalidDomain")) - expect(() => Cookies.unsafeMakeCookie("name", "value", { path: "" })).toThrow(new Error("InvalidPath")) - expect(() => Cookies.unsafeMakeCookie("name", "value", { maxAge: Infinity })).toThrow(new Error("InfinityMaxAge")) + assertCookieError(() => Cookies.unsafeMakeCookie("", "value"), "InvalidName") + assertCookieError(() => Cookies.unsafeMakeCookie("name", "value", { domain: "" }), "InvalidDomain") + assertCookieError(() => Cookies.unsafeMakeCookie("name", "value", { path: "" }), "InvalidPath") + assertCookieError(() => Cookies.unsafeMakeCookie("name", "value", { maxAge: Infinity }), "InfinityMaxAge") }) it("unsafeSetAll", () => { - expect(() => Cookies.unsafeSetAll(Cookies.empty, [["", "value"]])).toThrow(new Error("InvalidName")) - expect(() => Cookies.unsafeSetAll(Cookies.empty, [["name", "value", { domain: "" }]])).toThrow( - new Error("InvalidDomain") - ) - expect(() => Cookies.unsafeSetAll(Cookies.empty, [["name", "value", { path: "" }]])).toThrow( - new Error("InvalidPath") - ) - expect(() => Cookies.unsafeSetAll(Cookies.empty, [["name", "value", { maxAge: Infinity }]])).toThrow( - new Error("InfinityMaxAge") + assertCookieError(() => Cookies.unsafeSetAll(Cookies.empty, [["", "value"]]), "InvalidName") + assertCookieError(() => Cookies.unsafeSetAll(Cookies.empty, [["name", "value", { domain: "" }]]), "InvalidDomain") + assertCookieError(() => Cookies.unsafeSetAll(Cookies.empty, [["name", "value", { path: "" }]]), "InvalidPath") + assertCookieError( + () => Cookies.unsafeSetAll(Cookies.empty, [["name", "value", { maxAge: Infinity }]]), + "InfinityMaxAge" ) }) }) diff --git a/packages/platform/test/FileSystem.test.ts b/packages/platform/test/FileSystem.test.ts index f6cab2aff7c..2cac1f3bc0a 100644 --- a/packages/platform/test/FileSystem.test.ts +++ b/packages/platform/test/FileSystem.test.ts @@ -1,7 +1,8 @@ -import { describe, expect, it } from "vitest" +import { describe, it } from "@effect/vitest" +import { assertTrue } from "effect/test/util" describe("FileSystem", () => { it(".", () => { - expect(true).toBe(true) + assertTrue(true) }) }) diff --git a/packages/platform/test/Headers.test.ts b/packages/platform/test/Headers.test.ts index 95abe753c67..00f0286c7a8 100644 --- a/packages/platform/test/Headers.test.ts +++ b/packages/platform/test/Headers.test.ts @@ -1,7 +1,7 @@ import * as Headers from "@effect/platform/Headers" -import { assert, describe, it } from "@effect/vitest" -import { Effect, FiberId, FiberRef, FiberRefs, HashSet, Inspectable, Logger } from "effect" -import * as Redacted from "effect/Redacted" +import { describe, it } from "@effect/vitest" +import { Effect, FiberId, FiberRef, FiberRefs, HashSet, Inspectable, Logger, Redacted } from "effect" +import { assertFalse, assertTrue, deepStrictEqual, strictEqual } from "effect/test/util" describe("Headers", () => { describe("Redactable", () => { @@ -23,7 +23,7 @@ describe("Headers", () => { const r = Inspectable.withRedactableContext(fiberRefs, () => Inspectable.toStringUnknown(headers)) const redacted = JSON.parse(r) - assert.deepEqual(redacted, { + deepStrictEqual(redacted, { "content-type": "application/json", "authorization": "", "x-api-key": "some-key" @@ -48,7 +48,7 @@ describe("Headers", () => { const r = Inspectable.withRedactableContext(fiberRefs, () => Inspectable.toStringUnknown({ headers })) const redacted = JSON.parse(r) as { headers: unknown } - assert.deepEqual(redacted.headers, { + deepStrictEqual(redacted.headers, { "content-type": "application/json", "authorization": "", "x-api-key": "some-key" @@ -72,9 +72,9 @@ describe("Headers", () => { yield* Effect.log(headers).pipe( Effect.annotateLogs({ headers }) ) - assert.include(messages[0], "application/json") - assert.notInclude(messages[0], "some-token") - assert.notInclude(messages[0], "some-key") + assertTrue(messages[0].includes("application/json")) + assertFalse(messages[0].includes("some-token")) + assertFalse(messages[0].includes("some-key")) })) it.effect("logs redacted structured", () => @@ -94,8 +94,8 @@ describe("Headers", () => { yield* Effect.log(headers).pipe( Effect.annotateLogs({ headers }) ) - assert.strictEqual(Redacted.isRedacted(messages[0].message.authorization), true) - assert.strictEqual(Redacted.isRedacted(messages[0].annotations.headers.authorization), true) + strictEqual(Redacted.isRedacted(messages[0].message.authorization), true) + strictEqual(Redacted.isRedacted(messages[0].annotations.headers.authorization), true) })) }) @@ -109,12 +109,12 @@ describe("Headers", () => { const redacted = Headers.redact(headers, "Authorization") - assert.deepEqual(redacted, { + deepStrictEqual(redacted, { "content-type": "application/json", "authorization": Redacted.make("some secret"), "x-api-key": "some-key" }) - assert.strictEqual(Redacted.value(redacted.authorization as Redacted.Redacted), "Bearer some-token") + strictEqual(Redacted.value(redacted.authorization as Redacted.Redacted), "Bearer some-token") }) it("multiple keys", () => { @@ -126,13 +126,13 @@ describe("Headers", () => { const redacted = Headers.redact(headers, ["Authorization", "authorization", "X-Api-Token", "x-api-key"]) - assert.deepEqual(redacted, { + deepStrictEqual(redacted, { "content-type": "application/json", "authorization": Redacted.make("some secret"), "x-api-key": Redacted.make("some secret") }) - assert.strictEqual(Redacted.value(redacted.authorization as Redacted.Redacted), "Bearer some-token") - assert.strictEqual(Redacted.value(redacted["x-api-key"] as Redacted.Redacted), "some-key") + strictEqual(Redacted.value(redacted.authorization as Redacted.Redacted), "Bearer some-token") + strictEqual(Redacted.value(redacted["x-api-key"] as Redacted.Redacted), "some-key") }) it("RegExp", () => { @@ -144,7 +144,7 @@ describe("Headers", () => { const redacted = Headers.redact(headers, [/^sec-/]) - assert.deepEqual(redacted, { + deepStrictEqual(redacted, { "authorization": "Bearer some-token", "sec-ret": Redacted.make("some"), "sec-ret-2": Redacted.make("some") diff --git a/packages/platform/test/HttpApiError.test.ts b/packages/platform/test/HttpApiError.test.ts index 31cb48fd06a..7b2c29080cf 100644 --- a/packages/platform/test/HttpApiError.test.ts +++ b/packages/platform/test/HttpApiError.test.ts @@ -1,6 +1,7 @@ import * as HttpApiError from "@effect/platform/HttpApiError" +import { describe, it } from "@effect/vitest" import * as Schema from "effect/Schema" -import { describe, expect, it } from "vitest" +import { deepStrictEqual } from "effect/test/util" describe("HttpApiError", () => { describe("Issue schema", () => { @@ -8,7 +9,7 @@ describe("HttpApiError", () => { const encodeSync = Schema.encodeSync(HttpApiError.Issue) const decodeSync = Schema.decodeSync(HttpApiError.Issue) const expectRoundtrip = (issue: typeof HttpApiError.Issue.Type) => { - expect(decodeSync(encodeSync(issue))).toStrictEqual(issue) + deepStrictEqual(decodeSync(encodeSync(issue)), issue) } expectRoundtrip({ diff --git a/packages/platform/test/HttpApp.test.ts b/packages/platform/test/HttpApp.test.ts index 5bc4bb09e83..acecd2dd1c3 100644 --- a/packages/platform/test/HttpApp.test.ts +++ b/packages/platform/test/HttpApp.test.ts @@ -1,13 +1,14 @@ import { HttpApp, HttpServerResponse } from "@effect/platform" +import { describe, test } from "@effect/vitest" import { Context, Effect, FiberRef, Runtime, Stream } from "effect" -import { assert, describe, test } from "vitest" +import { deepStrictEqual, strictEqual } from "effect/test/util" describe("Http/App", () => { describe("toWebHandler", () => { test("json", async () => { const handler = HttpApp.toWebHandler(HttpServerResponse.json({ foo: "bar" })) const response = await handler(new Request("http://localhost:3000/")) - assert.deepStrictEqual(await response.json(), { + deepStrictEqual(await response.json(), { foo: "bar" }) }) @@ -20,11 +21,11 @@ describe("Http/App", () => { ) ) const response = await handler(new Request("http://localhost:3000/")) - assert.deepStrictEqual(response.headers.getSetCookie(), [ + deepStrictEqual(response.headers.getSetCookie(), [ "foo=bar", "test=123; HttpOnly; Secure; SameSite=Strict" ]) - assert.deepStrictEqual(await response.json(), { + deepStrictEqual(await response.json(), { foo: "bar" }) }) @@ -32,7 +33,7 @@ describe("Http/App", () => { test("stream", async () => { const handler = HttpApp.toWebHandler(HttpServerResponse.stream(Stream.make("foo", "bar").pipe(Stream.encodeText))) const response = await handler(new Request("http://localhost:3000/")) - assert.strictEqual(await response.text(), "foobar") + strictEqual(await response.text(), "foobar") }) test("stream runtime", async () => { @@ -44,7 +45,7 @@ describe("Http/App", () => { FiberRef.get(FiberRef.currentConcurrency).pipe(Stream.map(String), Stream.encodeText) )) const response = await handler(new Request("http://localhost:3000/")) - assert.strictEqual(await response.text(), "420") + strictEqual(await response.text(), "420") }) }) @@ -57,7 +58,7 @@ describe("Http/App", () => { return yield* HttpServerResponse.json(env) })) const response = await handler(new Request("http://localhost:3000/"), Env.context({ foo: "baz" })) - assert.deepStrictEqual(await response.json(), { + deepStrictEqual(await response.json(), { foo: "baz" }) }) diff --git a/packages/platform/test/HttpClient.test.ts b/packages/platform/test/HttpClient.test.ts index 2716241b5ef..4dc64036626 100644 --- a/packages/platform/test/HttpClient.test.ts +++ b/packages/platform/test/HttpClient.test.ts @@ -7,14 +7,23 @@ import { HttpClientResponse, UrlParams } from "@effect/platform" -import { assert, describe, expect, it } from "@effect/vitest" -import { Either, FiberId, FiberRefs, Inspectable, Ref, Struct } from "effect" -import * as Context from "effect/Context" -import * as Effect from "effect/Effect" -import * as Layer from "effect/Layer" -import * as Logger from "effect/Logger" -import * as Schema from "effect/Schema" -import * as Stream from "effect/Stream" +import { describe, it } from "@effect/vitest" +import { + Context, + Effect, + Either, + FiberId, + FiberRefs, + Inspectable, + Layer, + Logger, + pipe, + Ref, + Schema, + Stream, + Struct +} from "effect" +import { assertTrue, deepStrictEqual, strictEqual } from "effect/test/util" const Todo = Schema.Struct({ userId: Schema.Number, @@ -30,8 +39,8 @@ const OkTodo = Schema.Struct({ body: Todo }) -const makeJsonPlaceholder = Effect.gen(function*(_) { - const defaultClient = yield* _(HttpClient.HttpClient) +const makeJsonPlaceholder = Effect.gen(function*() { + const defaultClient = yield* (HttpClient.HttpClient) const client = defaultClient.pipe( HttpClient.mapRequest(HttpClientRequest.prependUrl("https://jsonplaceholder.typicode.com")) ) @@ -54,33 +63,33 @@ const JsonPlaceholderLive = Layer.effect(JsonPlaceholder, makeJsonPlaceholder) describe("HttpClient", () => { it("google", () => - Effect.gen(function*(_) { - const response = yield* _( + Effect.gen(function*() { + const response = yield* pipe( HttpClient.get("https://www.google.com/"), Effect.flatMap((_) => _.text), Effect.scoped ) - expect(response).toContain("Google") + assertTrue(response.includes("Google")) }).pipe(Effect.provide(FetchHttpClient.layer), Effect.runPromise)) it("google withCookiesRef", () => - Effect.gen(function*(_) { - const ref = yield* _(Ref.make(Cookies.empty)) + Effect.gen(function*() { + const ref = yield* (Ref.make(Cookies.empty)) const client = (yield* HttpClient.HttpClient).pipe( HttpClient.withCookiesRef(ref) ) - yield* _( + yield* pipe( HttpClientRequest.get("https://www.google.com/"), client.execute, Effect.scoped ) - const cookieHeader = yield* _(Ref.get(ref), Effect.map(Cookies.toCookieHeader)) - yield* _( + const cookieHeader = yield* pipe(Ref.get(ref), Effect.map(Cookies.toCookieHeader)) + yield* pipe( HttpClientRequest.get("https://www.google.com/"), client.pipe( HttpClient.tapRequest((req) => Effect.sync(() => { - assert.strictEqual(req.headers.cookie, cookieHeader) + strictEqual(req.headers.cookie, cookieHeader) }) ) ).execute, @@ -89,14 +98,14 @@ describe("HttpClient", () => { }).pipe(Effect.provide(FetchHttpClient.layer), Effect.runPromise)) it("google stream", () => - Effect.gen(function*(_) { - const response = yield* _( + Effect.gen(function*() { + const response = yield* pipe( HttpClient.get(new URL("https://www.google.com/")), Effect.map((_) => _.stream), Stream.unwrapScoped, Stream.runFold("", (a, b) => a + new TextDecoder().decode(b)) ) - expect(response).toContain("Google") + assertTrue(response.includes("Google")) }).pipe(Effect.provide(FetchHttpClient.layer), Effect.runPromise)) it("jsonplaceholder", () => @@ -106,18 +115,18 @@ describe("HttpClient", () => { Effect.flatMap(HttpClientResponse.schemaBodyJson(Todo)), Effect.scoped ) - expect(response.id).toBe(1) + strictEqual(response.id, 1) }).pipe(Effect.provide(JsonPlaceholderLive), Effect.runPromise)) it("jsonplaceholder schemaFunction", () => - Effect.gen(function*(_) { - const jp = yield* _(JsonPlaceholder) - const response = yield* _(jp.createTodo({ + Effect.gen(function*() { + const jp = yield* JsonPlaceholder + const response = yield* (jp.createTodo({ userId: 1, title: "test", completed: false })) - expect(response.title).toBe("test") + strictEqual(response.title, "test") }).pipe(Effect.provide(JsonPlaceholderLive), Effect.runPromise)) it("jsonplaceholder schemaJson", () => @@ -127,7 +136,7 @@ describe("HttpClient", () => { Effect.flatMap(HttpClientResponse.schemaJson(OkTodo)), Effect.scoped ) - expect(response.body.id).toBe(1) + strictEqual(response.body.id, 1) }).pipe(Effect.provide(JsonPlaceholderLive), Effect.runPromise)) it("request processing order", () => @@ -141,7 +150,7 @@ describe("HttpClient", () => { Effect.flatMap(HttpClientResponse.schemaBodyJson(Todo)), Effect.scoped ) - expect(response.id).toBe(1) + strictEqual(response.id, 1) }).pipe(Effect.provide(FetchHttpClient.layer), Effect.runPromise)) it("streamBody accesses the current runtime", () => @@ -163,7 +172,7 @@ describe("HttpClient", () => { Effect.scoped ) - expect(logs).toEqual([["hello"], ["world"]]) + deepStrictEqual(logs, [["hello"], ["world"]]) }).pipe(Effect.provide(FetchHttpClient.layer), Effect.runPromise)) it("ClientRequest parses URL instances", () => { @@ -171,7 +180,7 @@ describe("HttpClient", () => { HttpClientRequest.appendUrl("/foo"), HttpClientRequest.setUrlParam("baz", "qux") ) - assert.deepStrictEqual( + deepStrictEqual( UrlParams.makeUrl(request.url, request.urlParams, request.hash), Either.right(new URL("https://example.com/foo?foo=bar&baz=qux#hash")) ) @@ -190,7 +199,7 @@ describe("HttpClient", () => { ), Effect.scoped ) - assert.deepStrictEqual(response, { id: 1, userId: 1, title: "delectus aut autem", completed: false }) + deepStrictEqual(response, { id: 1, userId: 1, title: "delectus aut autem", completed: false }) }).pipe(Effect.provide(JsonPlaceholderLive))) it("ClientRequest redacts headers", () => { @@ -211,7 +220,7 @@ describe("HttpClient", () => { const r = Inspectable.withRedactableContext(fiberRefs, () => Inspectable.toStringUnknown(request)) const redacted = JSON.parse(r) - assert.deepStrictEqual(redacted, { + deepStrictEqual(redacted, { _id: "@effect/platform/HttpClientRequest", method: "GET", url: "https://example.com/", @@ -223,15 +232,15 @@ describe("HttpClient", () => { }) it("followRedirects", () => - Effect.gen(function*(_) { + Effect.gen(function*() { const defaultClient = yield* HttpClient.HttpClient const client = defaultClient.pipe(HttpClient.followRedirects()) - const response = yield* _( + const response = yield* pipe( client.get("https://google.com/"), Effect.scoped ) - expect(response.request.url).toBe("https://www.google.com/") + strictEqual(response.request.url, "https://www.google.com/") }).pipe( Effect.provide(FetchHttpClient.layer), Effect.provideService(FetchHttpClient.RequestInit, { redirect: "manual" }), diff --git a/packages/platform/test/KeyValueStore.test.ts b/packages/platform/test/KeyValueStore.test.ts index 9ba1f9fd15c..a3a6a44383f 100644 --- a/packages/platform/test/KeyValueStore.test.ts +++ b/packages/platform/test/KeyValueStore.test.ts @@ -1,90 +1,87 @@ import * as KeyValueStore from "@effect/platform/KeyValueStore" -import * as Effect from "effect/Effect" -import { identity } from "effect/Function" -import * as Layer from "effect/Layer" -import * as Option from "effect/Option" -import * as Schema from "effect/Schema" -import { afterEach, describe, expect, it } from "vitest" +import { afterEach, describe, it } from "@effect/vitest" +import { Effect, identity, Layer, pipe, Schema } from "effect" +import { assertNone, assertSome, assertTrue, strictEqual } from "effect/test/util" export const testLayer = (layer: Layer.Layer) => { const run = (effect: Effect.Effect) => Effect.runPromise(Effect.provide(effect, layer)) afterEach(() => - run(Effect.gen(function*(_) { - const kv = yield* _(KeyValueStore.KeyValueStore) - yield* _(kv.clear) + run(Effect.gen(function*() { + const kv = yield* (KeyValueStore.KeyValueStore) + yield* (kv.clear) })) ) it("set", () => - run(Effect.gen(function*(_) { - const kv = yield* _(KeyValueStore.KeyValueStore) - yield* _(kv.set("/foo/bar", "bar")) + run(Effect.gen(function*() { + const kv = yield* (KeyValueStore.KeyValueStore) + yield* (kv.set("/foo/bar", "bar")) - const value = yield* _(kv.get("/foo/bar")) - const length = yield* _(kv.size) + const value = yield* (kv.get("/foo/bar")) + const length = yield* (kv.size) - expect(value).toEqual(Option.some("bar")) - expect(length).toEqual(1) + assertSome(value, "bar") + strictEqual(length, 1) }))) it("get/ missing", () => - run(Effect.gen(function*(_) { - const kv = yield* _(KeyValueStore.KeyValueStore) - yield* _(kv.clear) - const value = yield* _(kv.get("foo")) + run(Effect.gen(function*() { + const kv = yield* (KeyValueStore.KeyValueStore) + yield* (kv.clear) + const value = yield* (kv.get("foo")) - expect(value).toEqual(Option.none()) + assertNone(value) }))) it("remove", () => - run(Effect.gen(function*(_) { - const kv = yield* _(KeyValueStore.KeyValueStore) - yield* _(kv.set("foo", "bar")) - yield* _(kv.remove("foo")) + run(Effect.gen(function*() { + const kv = yield* (KeyValueStore.KeyValueStore) + yield* (kv.set("foo", "bar")) + yield* (kv.remove("foo")) - const value = yield* _(kv.get("foo")) - const length = yield* _(kv.size) + const value = yield* (kv.get("foo")) + const length = yield* (kv.size) - expect(value).toEqual(Option.none()) - expect(length).toEqual(0) + assertNone(value) + strictEqual(length, 0) }))) it("clear", () => - run(Effect.gen(function*(_) { - const kv = yield* _(KeyValueStore.KeyValueStore) - yield* _(kv.set("foo", "bar")) - yield* _(kv.clear) + run(Effect.gen(function*() { + const kv = yield* (KeyValueStore.KeyValueStore) + yield* (kv.set("foo", "bar")) + yield* (kv.clear) - const value = yield* _(kv.get("foo")) - const length = yield* _(kv.size) + const value = yield* (kv.get("foo")) + const length = yield* (kv.size) - expect(value).toEqual(Option.none()) - expect(length).toEqual(0) + assertNone(value) + strictEqual(length, 0) }))) it("modify", () => - run(Effect.gen(function*(_) { - const kv = yield* _(KeyValueStore.KeyValueStore) - yield* _(kv.set("foo", "bar")) + run(Effect.gen(function*() { + const kv = yield* (KeyValueStore.KeyValueStore) + yield* (kv.set("foo", "bar")) - const value = yield* _(kv.modify("foo", (v) => v + "bar")) - const length = yield* _(kv.size) + const value = yield* (kv.modify("foo", (v) => v + "bar")) + const length = yield* (kv.size) - expect(value).toEqual(Option.some("barbar")) - expect(length).toEqual(1) + assertSome(value, "barbar") + strictEqual(length, 1) }))) it("modify - none", () => - run(Effect.gen(function*(_) { - const kv = yield* _(KeyValueStore.KeyValueStore) + run(Effect.gen(function*() { + const kv = yield* (KeyValueStore.KeyValueStore) - const value = yield* _(kv.modify("foo", (v) => v + "bar")) - const length = yield* _(kv.size) + const value = yield* (kv.modify("foo", (v) => v + "bar")) + const length = yield* (kv.size) - expect(value).toEqual(Option.none()) - expect(length).toEqual(0) + assertNone(value) + strictEqual(length, 0) }))) } @@ -92,18 +89,18 @@ describe("KeyValueStore / layerMemory", () => testLayer(KeyValueStore.layerMemor describe("KeyValueStore / prefix", () => { it("prefixes the keys", () => - Effect.gen(function*(_) { - const store = yield* _(KeyValueStore.KeyValueStore) + Effect.gen(function*() { + const store = yield* (KeyValueStore.KeyValueStore) const prefixed = KeyValueStore.prefix(store, "prefix/") - yield* _(prefixed.set("foo", "bar")) - yield* _(prefixed.modify("foo", (v) => v + "bar")) + yield* (prefixed.set("foo", "bar")) + yield* (prefixed.modify("foo", (v) => v + "bar")) - expect(yield* _(prefixed.get("foo"))).toEqual(Option.some("barbar")) - expect(yield* _(prefixed.has("foo"))).toEqual(true) + assertSome(yield* (prefixed.get("foo")), "barbar") + assertTrue(yield* (prefixed.has("foo"))) - expect(yield* _(store.get("prefix/foo"))).toEqual(Option.some("barbar")) - expect(yield* _(store.has("prefix/foo"))).toEqual(true) + assertSome(yield* (store.get("prefix/foo")), "barbar") + assertTrue(yield* (store.has("prefix/foo"))) }).pipe( Effect.provide(KeyValueStore.layerMemory), Effect.runPromise @@ -120,24 +117,24 @@ const runUserStore = (effect: Effect.Effect { it("encodes & decodes", () => - runUserStore(Effect.gen(function*(_) { - const store = yield* _(UserStore.tag) - yield* _(store.set("foo", new User({ name: "foo", age: 42 }))) - yield* _(store.modify("foo", (user) => new User({ ...user, age: 43 }))) - const value = yield* _(store.get("foo"), Effect.flatMap(identity)) - - expect(value.name).toEqual("foo") - expect(value.age).toEqual(43) + runUserStore(Effect.gen(function*() { + const store = yield* (UserStore.tag) + yield* (store.set("foo", new User({ name: "foo", age: 42 }))) + yield* (store.modify("foo", (user) => new User({ ...user, age: 43 }))) + const value = yield* pipe(store.get("foo"), Effect.flatMap(identity)) + + strictEqual(value.name, "foo") + strictEqual(value.age, 43) }))) it("prefix", () => - runUserStore(Effect.gen(function*(_) { - const store = yield* _(UserStore.tag) + runUserStore(Effect.gen(function*() { + const store = yield* (UserStore.tag) const prefixed = KeyValueStore.prefix(store, "prefix/") - yield* _(prefixed.set("foo", new User({ name: "foo", age: 42 }))) - const value = yield* _(store.get("prefix/foo"), Effect.flatMap(identity)) + yield* (prefixed.set("foo", new User({ name: "foo", age: 42 }))) + const value = yield* pipe(store.get("prefix/foo"), Effect.flatMap(identity)) - expect(value.name).toEqual("foo") - expect(value.age).toEqual(42) + strictEqual(value.name, "foo") + strictEqual(value.age, 42) }))) }) diff --git a/packages/platform/test/Multipart.test.ts b/packages/platform/test/Multipart.test.ts index 136c0db974c..58774f134a3 100644 --- a/packages/platform/test/Multipart.test.ts +++ b/packages/platform/test/Multipart.test.ts @@ -1,17 +1,18 @@ import * as Multipart from "@effect/platform/Multipart" -import { Chunk, Effect, identity, Stream, Unify } from "effect" -import { assert, describe, test } from "vitest" +import { describe, test } from "@effect/vitest" +import { Chunk, Effect, identity, pipe, Stream, Unify } from "effect" +import { deepStrictEqual } from "effect/test/util" describe("Multipart", () => { test("it parses", () => - Effect.gen(function*(_) { + Effect.gen(function*() { const data = new globalThis.FormData() data.append("foo", "bar") data.append("test", "ing") data.append("file", new globalThis.File(["A".repeat(1024 * 1024)], "foo.txt", { type: "text/plain" })) const response = new Response(data) - const parts = yield* _( + const parts = yield* pipe( Stream.fromReadableStream(() => response.body!, identity), Stream.pipeThroughChannel(Multipart.makeChannel(Object.fromEntries(response.headers))), Stream.mapEffect((part) => { @@ -27,7 +28,7 @@ describe("Multipart", () => { Stream.runCollect ) - assert.deepStrictEqual(Chunk.toReadonlyArray(parts), [ + deepStrictEqual(Chunk.toReadonlyArray(parts), [ ["foo", "bar"], ["test", "ing"], ["foo.txt", "A".repeat(1024 * 1024)] diff --git a/packages/platform/test/OpenApi.test.ts b/packages/platform/test/OpenApi.test.ts index 58213e63450..a22a6972671 100644 --- a/packages/platform/test/OpenApi.test.ts +++ b/packages/platform/test/OpenApi.test.ts @@ -9,8 +9,9 @@ import { Multipart, OpenApi } from "@effect/platform" +import { describe, it } from "@effect/vitest" import { Context, Schema } from "effect" -import { describe, expect, it } from "vitest" +import { deepStrictEqual } from "effect/test/util" const HttpApiDecodeError = { "description": "The request did not match the expected schema", @@ -143,7 +144,7 @@ const expectSpec = ( @@ -151,7 +152,7 @@ const expectPaths = ) => { const spec = OpenApi.fromApi(api) - expect(Object.keys(spec.paths)).toStrictEqual(paths) + deepStrictEqual(Object.keys(spec.paths), paths) } describe("OpenApi", () => { diff --git a/packages/platform/test/OpenApiJsonSchema.test.ts b/packages/platform/test/OpenApiJsonSchema.test.ts index d9cfe09a9cb..b67fd3bcb9e 100644 --- a/packages/platform/test/OpenApiJsonSchema.test.ts +++ b/packages/platform/test/OpenApiJsonSchema.test.ts @@ -1,6 +1,7 @@ import * as OpenApiJsonSchema from "@effect/platform/OpenApiJsonSchema" +import { describe, it } from "@effect/vitest" import * as Schema from "effect/Schema" -import { describe, expect, it } from "vitest" +import { deepStrictEqual } from "effect/test/util" describe("OpenApiJsonSchema", () => { it("default options", () => { @@ -12,7 +13,7 @@ describe("OpenApiJsonSchema", () => { }) const defs: Record = {} const jsonSchema = OpenApiJsonSchema.makeWithDefs(schema, { defs }) - expect(jsonSchema).toStrictEqual({ + deepStrictEqual(jsonSchema, { "additionalProperties": false, "properties": { "a": { @@ -40,7 +41,7 @@ describe("OpenApiJsonSchema", () => { "required": ["a", "b"], "type": "object" }) - expect(defs).toStrictEqual({ + deepStrictEqual(defs, { "Int": { "description": "an integer", "title": "int", diff --git a/packages/platform/test/Path.test.ts b/packages/platform/test/Path.test.ts index 04a2410e8aa..d1edd18d63c 100644 --- a/packages/platform/test/Path.test.ts +++ b/packages/platform/test/Path.test.ts @@ -1,31 +1,35 @@ import { BadArgument } from "@effect/platform/Error" import * as Path from "@effect/platform/Path" +import { describe, it } from "@effect/vitest" import * as Effect from "effect/Effect" -import { describe, expect, it } from "vitest" +import { deepStrictEqual, strictEqual } from "effect/test/util" const runPromise = (effect: Effect.Effect) => Effect.runPromise(Effect.provide(effect, Path.layer)) describe("Path", () => { it("fromFileUrl", () => - runPromise(Effect.gen(function*(_) { - const path = yield* _(Path.Path) - expect(yield* _(path.fromFileUrl(new URL("file:///foo/bar")))).toBe("/foo/bar") + runPromise(Effect.gen(function*() { + const path = yield* (Path.Path) + strictEqual(yield* (path.fromFileUrl(new URL("file:///foo/bar"))), "/foo/bar") }))) it("fromFileUrl - http", () => - runPromise(Effect.gen(function*(_) { - const path = yield* _(Path.Path) - expect(yield* _(Effect.flip(path.fromFileUrl(new URL("http://foo/bar"))))).toEqual(BadArgument({ - module: "Path", - method: "fromFileUrl", - message: "URL must be of scheme file" - })) + runPromise(Effect.gen(function*() { + const path = yield* (Path.Path) + deepStrictEqual( + yield* (Effect.flip(path.fromFileUrl(new URL("http://foo/bar")))), + BadArgument({ + module: "Path", + method: "fromFileUrl", + message: "URL must be of scheme file" + }) + ) }))) it("toFileUrl", () => - runPromise(Effect.gen(function*(_) { - const path = yield* _(Path.Path) - expect(yield* _(path.toFileUrl("/foo/bar"))).toEqual(new URL("file:///foo/bar")) + runPromise(Effect.gen(function*() { + const path = yield* (Path.Path) + deepStrictEqual(yield* (path.toFileUrl("/foo/bar")), new URL("file:///foo/bar")) }))) }) diff --git a/packages/platform/test/PlatformLogger.test.ts b/packages/platform/test/PlatformLogger.test.ts index c4babf03f62..0e92408d41b 100644 --- a/packages/platform/test/PlatformLogger.test.ts +++ b/packages/platform/test/PlatformLogger.test.ts @@ -1,6 +1,7 @@ import { FileSystem, PlatformLogger } from "@effect/platform" -import { Effect, Logger } from "effect" -import { assert, describe, test } from "vitest" +import { describe, test } from "@effect/vitest" +import { Effect, Logger, pipe } from "effect" +import { deepStrictEqual, strictEqual } from "effect/test/util" const fileLogger = Logger.simple((_: unknown) => String(_)).pipe( PlatformLogger.toFile("./tmp.txt", { flag: "a+" }) @@ -9,23 +10,23 @@ const LoggerLive = Logger.replaceScoped(Logger.defaultLogger, fileLogger) describe("PlatformLogger", () => { test("toFile", () => - Effect.gen(function*(_) { + Effect.gen(function*() { const chunks: Array = [] - yield* _( - Effect.gen(function*(_) { - yield* _(Effect.log("a")) - yield* _(Effect.log("b")) - yield* _(Effect.log("c")) - yield* _(Effect.sleep(0)) - yield* _(Effect.log("d")) - yield* _(Effect.log("e")) + yield* pipe( + Effect.gen(function*() { + yield* (Effect.log("a")) + yield* (Effect.log("b")) + yield* (Effect.log("c")) + yield* (Effect.sleep(0)) + yield* (Effect.log("d")) + yield* (Effect.log("e")) }), Effect.scoped, Effect.provide(LoggerLive), Effect.provideService(FileSystem.FileSystem, { open: (path: string, options?: FileSystem.OpenFileOptions) => { - assert.strictEqual(path, "./tmp.txt") - assert.deepStrictEqual(options, { flag: "a+" }) + strictEqual(path, "./tmp.txt") + deepStrictEqual(options, { flag: "a+" }) return Effect.succeed({ write: (chunk: Uint8Array) => Effect.tap(Effect.sleep(10), () => { @@ -36,6 +37,6 @@ describe("PlatformLogger", () => { } as any) ) - assert.deepStrictEqual(chunks, ["a\nb\nc\nd\ne\n"]) + deepStrictEqual(chunks, ["a\nb\nc\nd\ne\n"]) }).pipe(Effect.runPromise)) }) diff --git a/packages/platform/test/Template.test.ts b/packages/platform/test/Template.test.ts index a80ef011e3b..49d13c1de3c 100644 --- a/packages/platform/test/Template.test.ts +++ b/packages/platform/test/Template.test.ts @@ -1,23 +1,24 @@ import { Template } from "@effect/platform" +import { describe, test } from "@effect/vitest" import { Effect, Option, Stream } from "effect" -import { assert, describe, test } from "vitest" +import { strictEqual } from "effect/test/util" describe("Template", () => { test("it consolidates Effects", () => - Effect.gen(function*(_) { + Effect.gen(function*() { const t = Template.make`${ Effect.succeed("").pipe( Effect.delay(10) ) }${Option.some(123)}${Option.none()}` - const result = yield* _(t) - assert.strictEqual(result, `123`) + const result = yield* t + strictEqual(result, `123`) }).pipe(Effect.runPromise)) test("streaming", () => - Effect.gen(function*(_) { + Effect.gen(function*() { const t = Template.stream`${Effect.succeed("")}${Stream.make("one", " ", "two")}` - const result = yield* _(Stream.mkString(t)) - assert.strictEqual(result, `one two`) + const result = yield* Stream.mkString(t) + strictEqual(result, `one two`) }).pipe(Effect.runPromise)) }) diff --git a/packages/platform/test/Transferable.test.ts b/packages/platform/test/Transferable.test.ts index f0bd5317366..57a7519c99e 100644 --- a/packages/platform/test/Transferable.test.ts +++ b/packages/platform/test/Transferable.test.ts @@ -1,16 +1,17 @@ import * as Transferable from "@effect/platform/Transferable" -import { Effect, Schema } from "effect" -import { assert, describe, test } from "vitest" +import { describe, test } from "@effect/vitest" +import { Effect, pipe, Schema } from "effect" +import { deepStrictEqual } from "effect/test/util" describe("Transferable", () => { test("collects transferables", () => - Effect.gen(function*(_) { - const collector = yield* _(Transferable.makeCollector) + Effect.gen(function*() { + const collector = yield* Transferable.makeCollector const data = new Uint8Array([1, 2, 3]) - yield* _( + yield* pipe( Schema.encode(Transferable.Uint8Array)(data), Effect.provideService(Transferable.Collector, collector) ) - assert.deepEqual(collector.unsafeRead(), [data.buffer]) + deepStrictEqual(collector.unsafeRead(), [data.buffer]) }).pipe(Effect.runPromise)) }) diff --git a/packages/platform/test/Url.test.ts b/packages/platform/test/Url.test.ts index 005a446bbbe..b99c6b99726 100644 --- a/packages/platform/test/Url.test.ts +++ b/packages/platform/test/Url.test.ts @@ -1,26 +1,27 @@ import * as Url from "@effect/platform/Url" import * as UrlParams from "@effect/platform/UrlParams" +import { describe, it } from "@effect/vitest" import { Cause, Either } from "effect" -import { assert, describe, it } from "vitest" +import { assertTrue, deepStrictEqual } from "effect/test/util" describe("Url", () => { const testURL = new URL("https://example.com/test") const expectUrl = (updatedUrl: URL, expected: string) => { - assert.ok(updatedUrl !== testURL) - assert.notStrictEqual(updatedUrl.toString(), testURL.toString()) - assert.deepStrictEqual(updatedUrl.toString(), expected) + assertTrue(updatedUrl !== testURL) + assertTrue(updatedUrl.toString() !== testURL.toString()) + deepStrictEqual(updatedUrl.toString(), expected) } describe("fromString", () => { it("success", () => { const url = Url.fromString(testURL.toString()) - assert.deepStrictEqual(url, Either.right(testURL)) + deepStrictEqual(url, Either.right(testURL)) }) it("failure", () => { const error = Url.fromString("??") - assert.deepStrictEqual(error, Either.left(new Cause.IllegalArgumentException("Invalid URL"))) + deepStrictEqual(error, Either.left(new Cause.IllegalArgumentException("Invalid URL"))) }) }) @@ -80,7 +81,7 @@ describe("Url", () => { it("urlParams", () => { const params = Url.urlParams(new URL("https://example.com?foo=bar&baz=qux")) - assert.deepStrictEqual(params, UrlParams.fromInput([["foo", "bar"], ["baz", "qux"]])) + deepStrictEqual(params, UrlParams.fromInput([["foo", "bar"], ["baz", "qux"]])) }) it("setUrlParams", () => { diff --git a/packages/platform/test/UrlParams.test.ts b/packages/platform/test/UrlParams.test.ts index 30b7e103f09..4e233444bbe 100644 --- a/packages/platform/test/UrlParams.test.ts +++ b/packages/platform/test/UrlParams.test.ts @@ -1,69 +1,70 @@ import * as UrlParams from "@effect/platform/UrlParams" -import { assert, describe, it } from "@effect/vitest" +import { describe, it } from "@effect/vitest" import { Effect, Option, Schema } from "effect" +import { deepStrictEqual, strictEqual } from "effect/test/util" describe("UrlParams", () => { describe("makeUrl", () => { it.effect("makes a URL", () => - Effect.gen(function*(_) { - const url = yield* _(UrlParams.makeUrl("https://example.com/test", [], Option.none())) - assert.strictEqual(url.toString(), "https://example.com/test") + Effect.gen(function*() { + const url = yield* (UrlParams.makeUrl("https://example.com/test", [], Option.none())) + strictEqual(url.toString(), "https://example.com/test") })) it.effect("supports relative URLs", () => - Effect.gen(function*(_) { + Effect.gen(function*() { const originalLocation = globalThis.location globalThis.location = { origin: "https://example.com", pathname: "/path/" } as Location - const url = yield* _(UrlParams.makeUrl("test", [], Option.none())) - assert.strictEqual(url.toString(), "https://example.com/path/test") + const url = yield* (UrlParams.makeUrl("test", [], Option.none())) + strictEqual(url.toString(), "https://example.com/path/test") globalThis.location = originalLocation })) it.effect("does not throw if `location` is set to `undefined`", () => - Effect.gen(function*(_) { + Effect.gen(function*() { const originalLocation = globalThis.location // `globalThis.location` is undefined // @ts-expect-error globalThis.location = undefined - let url = yield* _(UrlParams.makeUrl("https://example.com", [], Option.none())) - assert.strictEqual(url.toString(), "https://example.com/") + let url = yield* (UrlParams.makeUrl("https://example.com", [], Option.none())) + strictEqual(url.toString(), "https://example.com/") // `location` is not in globalThis // @ts-expect-error delete globalThis.location - url = yield* _(UrlParams.makeUrl("http://example.com", [], Option.none())) - assert.strictEqual(url.toString(), "http://example.com/") + url = yield* (UrlParams.makeUrl("http://example.com", [], Option.none())) + strictEqual(url.toString(), "http://example.com/") globalThis.location = originalLocation })) it.effect("does not fail if `location` is partially defined", () => - Effect.gen(function*(_) { + Effect.gen(function*() { const originalLocation = globalThis.location globalThis.location = { href: "" } as Location - const url1 = yield* _(UrlParams.makeUrl("https://example.com", [], Option.none())) - assert.strictEqual(url1.toString(), "https://example.com/") + const url1 = yield* (UrlParams.makeUrl("https://example.com", [], Option.none())) + strictEqual(url1.toString(), "https://example.com/") globalThis.location = { href: "", origin: "https://example.com" } as unknown as Location - const url2 = yield* _(UrlParams.makeUrl("https://example.com", [], Option.none())) - assert.strictEqual(url2.toString(), "https://example.com/") + const url2 = yield* (UrlParams.makeUrl("https://example.com", [], Option.none())) + strictEqual(url2.toString(), "https://example.com/") globalThis.location = { href: "", pathname: "example_path" } as unknown as Location - const url3 = yield* _(UrlParams.makeUrl("https://example.com", [], Option.none())) - assert.strictEqual(url3.toString(), "https://example.com/") + const url3 = yield* (UrlParams.makeUrl("https://example.com", [], Option.none())) + strictEqual(url3.toString(), "https://example.com/") globalThis.location = originalLocation })) @@ -71,7 +72,7 @@ describe("UrlParams", () => { describe("fromInput", () => { it("works with non-strings", () => { - assert.deepStrictEqual( + deepStrictEqual( UrlParams.fromInput({ a: 1, b: true, c: "string", e: [1, 2, 3] }), [ ["a", "1"], @@ -87,14 +88,14 @@ describe("UrlParams", () => { describe("toRecord", () => { it("works when empty", () => { - assert.deepStrictEqual( + deepStrictEqual( UrlParams.toRecord(UrlParams.empty), {} ) }) it("builds non empty array from same keys", () => { - assert.deepStrictEqual( + deepStrictEqual( UrlParams.toRecord(UrlParams.fromInput({ "a": [10, "string", false] })), { a: ["10", "string", "false"] } ) @@ -103,7 +104,7 @@ describe("UrlParams", () => { it("works with non-strings", () => { const urlParams = UrlParams.fromInput({ a: 1, b: true, c: "string", e: [1, 2, 3] }) const result = UrlParams.toRecord(urlParams) - assert.deepStrictEqual( + deepStrictEqual( result, { "a": "1", "b": "true", "c": "string", "e": ["1", "2", "3"] } ) @@ -114,7 +115,7 @@ describe("UrlParams", () => { it.effect("works when empty", () => Effect.gen(function*() { const result = yield* UrlParams.schemaStruct(Schema.Struct({}))(UrlParams.empty) - assert.deepStrictEqual(result, {}) + deepStrictEqual(result, {}) })) it.effect("parse original values", () => @@ -123,7 +124,7 @@ describe("UrlParams", () => { const result = yield* UrlParams.schemaStruct(Schema.Struct({ a: Schema.Tuple(Schema.NumberFromString, Schema.String, Schema.BooleanFromString) }))(urlParams) - assert.deepStrictEqual(result, { + deepStrictEqual(result, { a: [10, "string", false] }) })) @@ -135,7 +136,7 @@ describe("UrlParams", () => { a: Schema.Tuple(Schema.NumberFromString, Schema.String), b: Schema.BooleanFromString }))(urlParams) - assert.deepStrictEqual(result, { + deepStrictEqual(result, { a: [10, "string"], b: false }) diff --git a/packages/platform/tsconfig.build.json b/packages/platform/tsconfig.build.json index 058393b8545..ec564b8c193 100644 --- a/packages/platform/tsconfig.build.json +++ b/packages/platform/tsconfig.build.json @@ -1,6 +1,8 @@ { "extends": "./tsconfig.src.json", - "references": [{ "path": "../effect/tsconfig.build.json" }], + "references": [ + { "path": "../effect/tsconfig.build.json" } + ], "compilerOptions": { "tsBuildInfoFile": ".tsbuildinfo/build.tsbuildinfo", "outDir": "build/esm", diff --git a/packages/platform/tsconfig.src.json b/packages/platform/tsconfig.src.json index 34700059ad6..1a7c66b033f 100644 --- a/packages/platform/tsconfig.src.json +++ b/packages/platform/tsconfig.src.json @@ -1,7 +1,9 @@ { "extends": "../../tsconfig.base.json", "include": ["src"], - "references": [{ "path": "../effect" }], + "references": [ + { "path": "../effect/tsconfig.src.json" } + ], "compilerOptions": { "tsBuildInfoFile": ".tsbuildinfo/src.tsbuildinfo", "rootDir": "src", diff --git a/packages/platform/tsconfig.test.json b/packages/platform/tsconfig.test.json index 3724ddc14cb..45c271e572c 100644 --- a/packages/platform/tsconfig.test.json +++ b/packages/platform/tsconfig.test.json @@ -3,8 +3,8 @@ "include": ["test"], "references": [ { "path": "tsconfig.src.json" }, - { "path": "../effect" }, - { "path": "../vitest" } + { "path": "../effect/tsconfig.test.json" }, // We import test files from `effect`. + { "path": "../vitest/tsconfig.src.json" } ], "compilerOptions": { "tsBuildInfoFile": ".tsbuildinfo/test.tsbuildinfo", diff --git a/packages/platform/vitest.config.ts b/packages/platform/vitest.config.ts index 929ee868eac..511b3dc00c5 100644 --- a/packages/platform/vitest.config.ts +++ b/packages/platform/vitest.config.ts @@ -1,7 +1,7 @@ -import { mergeConfig, type UserConfigExport } from "vitest/config" +import { mergeConfig, type ViteUserConfig } from "vitest/config" import shared from "../../vitest.shared.js" -const config: UserConfigExport = { +const config: ViteUserConfig = { // test: { // coverage: { // reporter: ["html"], diff --git a/packages/printer-ansi/test/terminal.test.ts b/packages/printer-ansi/test/terminal.test.ts index 06a2f3d126f..0b7d2b9a773 100644 --- a/packages/printer-ansi/test/terminal.test.ts +++ b/packages/printer-ansi/test/terminal.test.ts @@ -1,8 +1,8 @@ import * as Ansi from "@effect/printer-ansi/Ansi" import * as Doc from "@effect/printer-ansi/AnsiDoc" import * as Color from "@effect/printer-ansi/Color" +import { describe, expect, it } from "@effect/vitest" import * as String from "effect/String" -import { describe, expect, it } from "vitest" const simple = Doc.text("foo") diff --git a/packages/printer-ansi/tsconfig.src.json b/packages/printer-ansi/tsconfig.src.json index c4d58419b01..1fc66e9009e 100644 --- a/packages/printer-ansi/tsconfig.src.json +++ b/packages/printer-ansi/tsconfig.src.json @@ -2,9 +2,9 @@ "extends": "../../tsconfig.base.json", "include": ["src"], "references": [ - { "path": "../printer" }, - { "path": "../effect" }, - { "path": "../typeclass" } + { "path": "../printer/tsconfig.src.json" }, + { "path": "../effect/tsconfig.src.json" }, + { "path": "../typeclass/tsconfig.src.json" } ], "compilerOptions": { "tsBuildInfoFile": ".tsbuildinfo/src.tsbuildinfo", diff --git a/packages/printer-ansi/tsconfig.test.json b/packages/printer-ansi/tsconfig.test.json index 3fb32546afc..185e7065e44 100644 --- a/packages/printer-ansi/tsconfig.test.json +++ b/packages/printer-ansi/tsconfig.test.json @@ -3,9 +3,7 @@ "include": ["test"], "references": [ { "path": "tsconfig.src.json" }, - { "path": "../printer" }, - { "path": "../effect" }, - { "path": "../typeclass" } + { "path": "../vitest/tsconfig.src.json" } ], "compilerOptions": { "tsBuildInfoFile": ".tsbuildinfo/test.tsbuildinfo", diff --git a/packages/printer-ansi/vitest.config.ts b/packages/printer-ansi/vitest.config.ts index 0411095f257..578d0667249 100644 --- a/packages/printer-ansi/vitest.config.ts +++ b/packages/printer-ansi/vitest.config.ts @@ -1,6 +1,6 @@ -import { mergeConfig, type UserConfigExport } from "vitest/config" +import { mergeConfig, type ViteUserConfig } from "vitest/config" import shared from "../../vitest.shared.js" -const config: UserConfigExport = {} +const config: ViteUserConfig = {} export default mergeConfig(shared, config) diff --git a/packages/printer/test/doc.test.ts b/packages/printer/test/doc.test.ts index 602bfa885de..5e5d7d8c3c9 100644 --- a/packages/printer/test/doc.test.ts +++ b/packages/printer/test/doc.test.ts @@ -1,6 +1,6 @@ import * as Doc from "@effect/printer/Doc" +import { assert, describe, expect, it } from "@effect/vitest" import * as String from "effect/String" -import { assert, describe, expect, it } from "vitest" describe.concurrent("Doc", () => { describe.concurrent("constructors", () => { diff --git a/packages/printer/test/docStream.test.ts b/packages/printer/test/docStream.test.ts index d9c7ccb38af..5420a28b7cf 100644 --- a/packages/printer/test/docStream.test.ts +++ b/packages/printer/test/docStream.test.ts @@ -1,5 +1,5 @@ import * as DocStream from "@effect/printer/DocStream" -import { describe, expect, it } from "vitest" +import { describe, expect, it } from "@effect/vitest" describe.concurrent("DocStream", () => { it("isFailedStream", () => { diff --git a/packages/printer/test/docTree.test.ts b/packages/printer/test/docTree.test.ts index 5cfcb35c142..4e4923fe585 100644 --- a/packages/printer/test/docTree.test.ts +++ b/packages/printer/test/docTree.test.ts @@ -2,11 +2,11 @@ import * as Doc from "@effect/printer/Doc" import * as DocStream from "@effect/printer/DocStream" import * as DocTree from "@effect/printer/DocTree" import * as Layout from "@effect/printer/Layout" +import { describe, expect, it } from "@effect/vitest" import * as Array from "effect/Array" import * as Effect from "effect/Effect" import { pipe } from "effect/Function" import * as String from "effect/String" -import { describe, expect, it } from "vitest" describe.concurrent("DocTree", () => { describe.concurrent("constructors", () => { diff --git a/packages/printer/test/flatten.test.ts b/packages/printer/test/flatten.test.ts index 2d0a8a20c74..adb4f838c9c 100644 --- a/packages/printer/test/flatten.test.ts +++ b/packages/printer/test/flatten.test.ts @@ -1,6 +1,6 @@ import * as Flatten from "@effect/printer/Flatten" +import { describe, expect, it } from "@effect/vitest" import { identity } from "effect/Function" -import { describe, expect, it } from "vitest" describe.concurrent("Flatten", () => { it("isFlattened", () => { diff --git a/packages/printer/test/layout.test.ts b/packages/printer/test/layout.test.ts index 9e3502e01ec..de95a2ab701 100644 --- a/packages/printer/test/layout.test.ts +++ b/packages/printer/test/layout.test.ts @@ -1,8 +1,8 @@ import * as Doc from "@effect/printer/Doc" import * as Layout from "@effect/printer/Layout" import * as PageWidth from "@effect/printer/PageWidth" +import { describe, expect, it } from "@effect/vitest" import * as String from "effect/String" -import { describe, expect, it } from "vitest" const fun = (doc: Doc.Doc): Doc.Doc => Doc.cat( diff --git a/packages/printer/test/optimize.test.ts b/packages/printer/test/optimize.test.ts index 6f56099c68c..7454573f660 100644 --- a/packages/printer/test/optimize.test.ts +++ b/packages/printer/test/optimize.test.ts @@ -1,8 +1,8 @@ import * as Doc from "@effect/printer/Doc" import * as Optimize from "@effect/printer/Optimize" import { arbDoc } from "@effect/printer/test/utils/DocArbitrary" +import { describe, expect, it } from "@effect/vitest" import * as fc from "fast-check" -import { describe, expect, it } from "vitest" const arbFusionDepth: fc.Arbitrary = fc.oneof( fc.constant(Optimize.Shallow), diff --git a/packages/printer/test/pageWidth.test.ts b/packages/printer/test/pageWidth.test.ts index 3f6e9e671be..3999f24f0e6 100644 --- a/packages/printer/test/pageWidth.test.ts +++ b/packages/printer/test/pageWidth.test.ts @@ -1,5 +1,5 @@ import * as PageWidth from "@effect/printer/PageWidth" -import { describe, expect, it } from "vitest" +import { describe, expect, it } from "@effect/vitest" describe.concurrent("PageWidth", () => { it("remainingWidth", () => { diff --git a/packages/printer/test/render.test.ts b/packages/printer/test/render.test.ts index a13c1abb990..54168439fb1 100644 --- a/packages/printer/test/render.test.ts +++ b/packages/printer/test/render.test.ts @@ -1,7 +1,7 @@ import * as Doc from "@effect/printer/Doc" import * as PageWidth from "@effect/printer/PageWidth" +import { describe, expect, it } from "@effect/vitest" import * as String from "effect/String" -import { describe, expect, it } from "vitest" const fun = (doc: Doc.Doc): Doc.Doc => Doc.cat( diff --git a/packages/printer/tsconfig.src.json b/packages/printer/tsconfig.src.json index ddcd64c30f7..677c51a3e5a 100644 --- a/packages/printer/tsconfig.src.json +++ b/packages/printer/tsconfig.src.json @@ -2,8 +2,8 @@ "extends": "../../tsconfig.base.json", "include": ["src"], "references": [ - { "path": "../effect" }, - { "path": "../typeclass" } + { "path": "../effect/tsconfig.src.json" }, + { "path": "../typeclass/tsconfig.src.json" } ], "compilerOptions": { "tsBuildInfoFile": ".tsbuildinfo/src.tsbuildinfo", diff --git a/packages/printer/tsconfig.test.json b/packages/printer/tsconfig.test.json index d0cc0024621..185e7065e44 100644 --- a/packages/printer/tsconfig.test.json +++ b/packages/printer/tsconfig.test.json @@ -3,8 +3,7 @@ "include": ["test"], "references": [ { "path": "tsconfig.src.json" }, - { "path": "../effect" }, - { "path": "../typeclass" } + { "path": "../vitest/tsconfig.src.json" } ], "compilerOptions": { "tsBuildInfoFile": ".tsbuildinfo/test.tsbuildinfo", diff --git a/packages/printer/vitest.config.ts b/packages/printer/vitest.config.ts index 0411095f257..578d0667249 100644 --- a/packages/printer/vitest.config.ts +++ b/packages/printer/vitest.config.ts @@ -1,6 +1,6 @@ -import { mergeConfig, type UserConfigExport } from "vitest/config" +import { mergeConfig, type ViteUserConfig } from "vitest/config" import shared from "../../vitest.shared.js" -const config: UserConfigExport = {} +const config: ViteUserConfig = {} export default mergeConfig(shared, config) diff --git a/packages/rpc-http/test/Router.test.ts b/packages/rpc-http/test/Router.test.ts index 9e1d27efa08..27150538172 100644 --- a/packages/rpc-http/test/Router.test.ts +++ b/packages/rpc-http/test/Router.test.ts @@ -1,4 +1,4 @@ -import { describe, test } from "vitest" +import { describe, test } from "@effect/vitest" describe("Router", () => { test("should work", () => {}) diff --git a/packages/rpc-http/tsconfig.src.json b/packages/rpc-http/tsconfig.src.json index bfec71fa85e..22e4045b579 100644 --- a/packages/rpc-http/tsconfig.src.json +++ b/packages/rpc-http/tsconfig.src.json @@ -2,9 +2,9 @@ "extends": "../../tsconfig.base.json", "include": ["src"], "references": [ - { "path": "../effect" }, - { "path": "../rpc" }, - { "path": "../platform" } + { "path": "../effect/tsconfig.src.json" }, + { "path": "../rpc/tsconfig.src.json" }, + { "path": "../platform/tsconfig.src.json" } ], "compilerOptions": { "tsBuildInfoFile": ".tsbuildinfo/src.tsbuildinfo", diff --git a/packages/rpc-http/tsconfig.test.json b/packages/rpc-http/tsconfig.test.json index 8ad3bae32dc..185e7065e44 100644 --- a/packages/rpc-http/tsconfig.test.json +++ b/packages/rpc-http/tsconfig.test.json @@ -3,10 +3,7 @@ "include": ["test"], "references": [ { "path": "tsconfig.src.json" }, - { "path": "../effect" }, - { "path": "../rpc" }, - { "path": "../platform" }, - { "path": "../platform-node" } + { "path": "../vitest/tsconfig.src.json" } ], "compilerOptions": { "tsBuildInfoFile": ".tsbuildinfo/test.tsbuildinfo", diff --git a/packages/rpc-http/vitest.config.ts b/packages/rpc-http/vitest.config.ts index 0411095f257..578d0667249 100644 --- a/packages/rpc-http/vitest.config.ts +++ b/packages/rpc-http/vitest.config.ts @@ -1,6 +1,6 @@ -import { mergeConfig, type UserConfigExport } from "vitest/config" +import { mergeConfig, type ViteUserConfig } from "vitest/config" import shared from "../../vitest.shared.js" -const config: UserConfigExport = {} +const config: ViteUserConfig = {} export default mergeConfig(shared, config) diff --git a/packages/rpc/test/Router.test.ts b/packages/rpc/test/Router.test.ts index efd3dde82f1..9745c7023ff 100644 --- a/packages/rpc/test/Router.test.ts +++ b/packages/rpc/test/Router.test.ts @@ -1,5 +1,6 @@ import { RpcResolver, RpcResolverNoStream, RpcRouter } from "@effect/rpc" import * as Rpc from "@effect/rpc/Rpc" +import { assert, describe, expect, it, test } from "@effect/vitest" import * as Array from "effect/Array" import * as Chunk from "effect/Chunk" import * as Context from "effect/Context" @@ -7,7 +8,6 @@ import * as Effect from "effect/Effect" import { flow, pipe } from "effect/Function" import * as Schema from "effect/Schema" import * as Stream from "effect/Stream" -import { assert, describe, expect, it, test } from "vitest" interface Name { readonly _: unique symbol diff --git a/packages/rpc/tsconfig.src.json b/packages/rpc/tsconfig.src.json index a1ad8921290..9c2b4663426 100644 --- a/packages/rpc/tsconfig.src.json +++ b/packages/rpc/tsconfig.src.json @@ -1,7 +1,10 @@ { "extends": "../../tsconfig.base.json", "include": ["src"], - "references": [{ "path": "../effect" }, { "path": "../platform" }], + "references": [ + { "path": "../effect/tsconfig.src.json" }, + { "path": "../platform/tsconfig.src.json" } + ], "compilerOptions": { "tsBuildInfoFile": ".tsbuildinfo/src.tsbuildinfo", "rootDir": "src", diff --git a/packages/rpc/tsconfig.test.json b/packages/rpc/tsconfig.test.json index 8939416ac7e..185e7065e44 100644 --- a/packages/rpc/tsconfig.test.json +++ b/packages/rpc/tsconfig.test.json @@ -3,8 +3,7 @@ "include": ["test"], "references": [ { "path": "tsconfig.src.json" }, - { "path": "../effect" }, - { "path": "../platform" } + { "path": "../vitest/tsconfig.src.json" } ], "compilerOptions": { "tsBuildInfoFile": ".tsbuildinfo/test.tsbuildinfo", diff --git a/packages/rpc/vitest.config.ts b/packages/rpc/vitest.config.ts index 0411095f257..578d0667249 100644 --- a/packages/rpc/vitest.config.ts +++ b/packages/rpc/vitest.config.ts @@ -1,6 +1,6 @@ -import { mergeConfig, type UserConfigExport } from "vitest/config" +import { mergeConfig, type ViteUserConfig } from "vitest/config" import shared from "../../vitest.shared.js" -const config: UserConfigExport = {} +const config: ViteUserConfig = {} export default mergeConfig(shared, config) diff --git a/packages/sql-clickhouse/tsconfig.src.json b/packages/sql-clickhouse/tsconfig.src.json index be4e820022a..64ac6ef51b5 100644 --- a/packages/sql-clickhouse/tsconfig.src.json +++ b/packages/sql-clickhouse/tsconfig.src.json @@ -2,9 +2,9 @@ "extends": "../../tsconfig.base.json", "include": ["src"], "references": [ - { "path": "../effect" }, - { "path": "../sql" }, - { "path": "../platform-node" } + { "path": "../effect/tsconfig.src.json" }, + { "path": "../sql/tsconfig.src.json" }, + { "path": "../platform-node/tsconfig.src.json" } ], "compilerOptions": { "tsBuildInfoFile": ".tsbuildinfo/src.tsbuildinfo", diff --git a/packages/sql-clickhouse/tsconfig.test.json b/packages/sql-clickhouse/tsconfig.test.json index 497f697f10a..185e7065e44 100644 --- a/packages/sql-clickhouse/tsconfig.test.json +++ b/packages/sql-clickhouse/tsconfig.test.json @@ -3,8 +3,7 @@ "include": ["test"], "references": [ { "path": "tsconfig.src.json" }, - { "path": "../effect" }, - { "path": "../sql" } + { "path": "../vitest/tsconfig.src.json" } ], "compilerOptions": { "tsBuildInfoFile": ".tsbuildinfo/test.tsbuildinfo", diff --git a/packages/sql-clickhouse/vitest.config.ts b/packages/sql-clickhouse/vitest.config.ts index 0411095f257..578d0667249 100644 --- a/packages/sql-clickhouse/vitest.config.ts +++ b/packages/sql-clickhouse/vitest.config.ts @@ -1,6 +1,6 @@ -import { mergeConfig, type UserConfigExport } from "vitest/config" +import { mergeConfig, type ViteUserConfig } from "vitest/config" import shared from "../../vitest.shared.js" -const config: UserConfigExport = {} +const config: ViteUserConfig = {} export default mergeConfig(shared, config) diff --git a/packages/sql-d1/tsconfig.src.json b/packages/sql-d1/tsconfig.src.json index 424a843861e..dafd3159155 100644 --- a/packages/sql-d1/tsconfig.src.json +++ b/packages/sql-d1/tsconfig.src.json @@ -1,7 +1,10 @@ { "extends": "../../tsconfig.base.json", "include": ["src"], - "references": [{ "path": "../effect" }, { "path": "../sql" }], + "references": [ + { "path": "../effect/tsconfig.src.json" }, + { "path": "../sql/tsconfig.src.json" } + ], "compilerOptions": { "tsBuildInfoFile": ".tsbuildinfo/src.tsbuildinfo", "rootDir": "src", diff --git a/packages/sql-d1/tsconfig.test.json b/packages/sql-d1/tsconfig.test.json index 9d0a40abeda..185e7065e44 100644 --- a/packages/sql-d1/tsconfig.test.json +++ b/packages/sql-d1/tsconfig.test.json @@ -3,9 +3,7 @@ "include": ["test"], "references": [ { "path": "tsconfig.src.json" }, - { "path": "../effect" }, - { "path": "../sql" }, - { "path": "../vitest" } + { "path": "../vitest/tsconfig.src.json" } ], "compilerOptions": { "tsBuildInfoFile": ".tsbuildinfo/test.tsbuildinfo", diff --git a/packages/sql-d1/vitest.config.ts b/packages/sql-d1/vitest.config.ts index 0411095f257..578d0667249 100644 --- a/packages/sql-d1/vitest.config.ts +++ b/packages/sql-d1/vitest.config.ts @@ -1,6 +1,6 @@ -import { mergeConfig, type UserConfigExport } from "vitest/config" +import { mergeConfig, type ViteUserConfig } from "vitest/config" import shared from "../../vitest.shared.js" -const config: UserConfigExport = {} +const config: ViteUserConfig = {} export default mergeConfig(shared, config) diff --git a/packages/sql-drizzle/tsconfig.src.json b/packages/sql-drizzle/tsconfig.src.json index 424a843861e..dafd3159155 100644 --- a/packages/sql-drizzle/tsconfig.src.json +++ b/packages/sql-drizzle/tsconfig.src.json @@ -1,7 +1,10 @@ { "extends": "../../tsconfig.base.json", "include": ["src"], - "references": [{ "path": "../effect" }, { "path": "../sql" }], + "references": [ + { "path": "../effect/tsconfig.src.json" }, + { "path": "../sql/tsconfig.src.json" } + ], "compilerOptions": { "tsBuildInfoFile": ".tsbuildinfo/src.tsbuildinfo", "rootDir": "src", diff --git a/packages/sql-drizzle/tsconfig.test.json b/packages/sql-drizzle/tsconfig.test.json index f303ae1e5c8..d4ead685d9c 100644 --- a/packages/sql-drizzle/tsconfig.test.json +++ b/packages/sql-drizzle/tsconfig.test.json @@ -3,13 +3,10 @@ "include": ["test"], "references": [ { "path": "tsconfig.src.json" }, - { "path": "../effect" }, - { "path": "../platform-node" }, - { "path": "../sql" }, - { "path": "../sql-mysql2" }, - { "path": "../sql-pg" }, - { "path": "../sql-sqlite-node" }, - { "path": "../vitest" } + { "path": "../vitest/tsconfig.src.json" }, + { "path": "../sql-pg/tsconfig.src.json" }, + { "path": "../sql-mysql2/tsconfig.src.json" }, + { "path": "../sql-sqlite-node/tsconfig.src.json" } ], "compilerOptions": { "tsBuildInfoFile": ".tsbuildinfo/test.tsbuildinfo", diff --git a/packages/sql-drizzle/vitest.config.ts b/packages/sql-drizzle/vitest.config.ts index 0411095f257..578d0667249 100644 --- a/packages/sql-drizzle/vitest.config.ts +++ b/packages/sql-drizzle/vitest.config.ts @@ -1,6 +1,6 @@ -import { mergeConfig, type UserConfigExport } from "vitest/config" +import { mergeConfig, type ViteUserConfig } from "vitest/config" import shared from "../../vitest.shared.js" -const config: UserConfigExport = {} +const config: ViteUserConfig = {} export default mergeConfig(shared, config) diff --git a/packages/sql-kysely/tsconfig.src.json b/packages/sql-kysely/tsconfig.src.json index 424a843861e..dafd3159155 100644 --- a/packages/sql-kysely/tsconfig.src.json +++ b/packages/sql-kysely/tsconfig.src.json @@ -1,7 +1,10 @@ { "extends": "../../tsconfig.base.json", "include": ["src"], - "references": [{ "path": "../effect" }, { "path": "../sql" }], + "references": [ + { "path": "../effect/tsconfig.src.json" }, + { "path": "../sql/tsconfig.src.json" } + ], "compilerOptions": { "tsBuildInfoFile": ".tsbuildinfo/src.tsbuildinfo", "rootDir": "src", diff --git a/packages/sql-kysely/tsconfig.test.json b/packages/sql-kysely/tsconfig.test.json index b0736b70722..70c4e8271c5 100644 --- a/packages/sql-kysely/tsconfig.test.json +++ b/packages/sql-kysely/tsconfig.test.json @@ -3,14 +3,11 @@ "include": ["test"], "references": [ { "path": "tsconfig.src.json" }, - { "path": "../effect" }, - { "path": "../platform-node" }, - { "path": "../sql" }, - { "path": "../sql-mssql" }, - { "path": "../sql-mysql2" }, - { "path": "../sql-pg" }, - { "path": "../sql-sqlite-node" }, - { "path": "../vitest" } + { "path": "../vitest/tsconfig.src.json" }, + { "path": "../sql-pg/tsconfig.src.json" }, + { "path": "../sql-mysql2/tsconfig.src.json" }, + { "path": "../sql-mssql/tsconfig.src.json" }, + { "path": "../sql-sqlite-node/tsconfig.src.json" } ], "compilerOptions": { "tsBuildInfoFile": ".tsbuildinfo/test.tsbuildinfo", diff --git a/packages/sql-kysely/vitest.config.ts b/packages/sql-kysely/vitest.config.ts index 0411095f257..578d0667249 100644 --- a/packages/sql-kysely/vitest.config.ts +++ b/packages/sql-kysely/vitest.config.ts @@ -1,6 +1,6 @@ -import { mergeConfig, type UserConfigExport } from "vitest/config" +import { mergeConfig, type ViteUserConfig } from "vitest/config" import shared from "../../vitest.shared.js" -const config: UserConfigExport = {} +const config: ViteUserConfig = {} export default mergeConfig(shared, config) diff --git a/packages/sql-libsql/tsconfig.src.json b/packages/sql-libsql/tsconfig.src.json index 424a843861e..dafd3159155 100644 --- a/packages/sql-libsql/tsconfig.src.json +++ b/packages/sql-libsql/tsconfig.src.json @@ -1,7 +1,10 @@ { "extends": "../../tsconfig.base.json", "include": ["src"], - "references": [{ "path": "../effect" }, { "path": "../sql" }], + "references": [ + { "path": "../effect/tsconfig.src.json" }, + { "path": "../sql/tsconfig.src.json" } + ], "compilerOptions": { "tsBuildInfoFile": ".tsbuildinfo/src.tsbuildinfo", "rootDir": "src", diff --git a/packages/sql-libsql/tsconfig.test.json b/packages/sql-libsql/tsconfig.test.json index 70103fe42ab..40c1407c0d6 100644 --- a/packages/sql-libsql/tsconfig.test.json +++ b/packages/sql-libsql/tsconfig.test.json @@ -3,10 +3,7 @@ "include": ["test"], "references": [ { "path": "tsconfig.src.json" }, - { "path": "../effect" }, - { "path": "../platform-node" }, - { "path": "../sql" }, - { "path": "../vitest" } + { "path": "../vitest/tsconfig.src.json" }, ], "compilerOptions": { "tsBuildInfoFile": ".tsbuildinfo/test.tsbuildinfo", diff --git a/packages/sql-libsql/vitest.config.ts b/packages/sql-libsql/vitest.config.ts index 915fb0c7b3f..a31895bfe13 100644 --- a/packages/sql-libsql/vitest.config.ts +++ b/packages/sql-libsql/vitest.config.ts @@ -1,6 +1,6 @@ -import { mergeConfig, type UserConfigExport } from "vitest/config" +import { mergeConfig, type ViteUserConfig } from "vitest/config" import shared from "../../vitest.shared.js" -const config: UserConfigExport = { test: { sequence: { concurrent: false } } } +const config: ViteUserConfig = { test: { sequence: { concurrent: false } } } export default mergeConfig(shared, config) diff --git a/packages/sql-mssql/test/Client.test.ts b/packages/sql-mssql/test/Client.test.ts index 53d140b561a..0fb0c2f08de 100644 --- a/packages/sql-mssql/test/Client.test.ts +++ b/packages/sql-mssql/test/Client.test.ts @@ -1,7 +1,7 @@ import { MssqlClient } from "@effect/sql-mssql" import * as Statement from "@effect/sql/Statement" +import { describe, expect, it } from "@effect/vitest" import { Effect } from "effect" -import { describe, expect, it } from "vitest" const sql = Statement.make(Effect.void as any, MssqlClient.makeCompiler(), [], undefined) diff --git a/packages/sql-mssql/tsconfig.src.json b/packages/sql-mssql/tsconfig.src.json index 424a843861e..dafd3159155 100644 --- a/packages/sql-mssql/tsconfig.src.json +++ b/packages/sql-mssql/tsconfig.src.json @@ -1,7 +1,10 @@ { "extends": "../../tsconfig.base.json", "include": ["src"], - "references": [{ "path": "../effect" }, { "path": "../sql" }], + "references": [ + { "path": "../effect/tsconfig.src.json" }, + { "path": "../sql/tsconfig.src.json" } + ], "compilerOptions": { "tsBuildInfoFile": ".tsbuildinfo/src.tsbuildinfo", "rootDir": "src", diff --git a/packages/sql-mssql/tsconfig.test.json b/packages/sql-mssql/tsconfig.test.json index 497f697f10a..40c1407c0d6 100644 --- a/packages/sql-mssql/tsconfig.test.json +++ b/packages/sql-mssql/tsconfig.test.json @@ -3,8 +3,7 @@ "include": ["test"], "references": [ { "path": "tsconfig.src.json" }, - { "path": "../effect" }, - { "path": "../sql" } + { "path": "../vitest/tsconfig.src.json" }, ], "compilerOptions": { "tsBuildInfoFile": ".tsbuildinfo/test.tsbuildinfo", diff --git a/packages/sql-mssql/vitest.config.ts b/packages/sql-mssql/vitest.config.ts index 0411095f257..578d0667249 100644 --- a/packages/sql-mssql/vitest.config.ts +++ b/packages/sql-mssql/vitest.config.ts @@ -1,6 +1,6 @@ -import { mergeConfig, type UserConfigExport } from "vitest/config" +import { mergeConfig, type ViteUserConfig } from "vitest/config" import shared from "../../vitest.shared.js" -const config: UserConfigExport = {} +const config: ViteUserConfig = {} export default mergeConfig(shared, config) diff --git a/packages/sql-mysql2/tsconfig.src.json b/packages/sql-mysql2/tsconfig.src.json index 424a843861e..dafd3159155 100644 --- a/packages/sql-mysql2/tsconfig.src.json +++ b/packages/sql-mysql2/tsconfig.src.json @@ -1,7 +1,10 @@ { "extends": "../../tsconfig.base.json", "include": ["src"], - "references": [{ "path": "../effect" }, { "path": "../sql" }], + "references": [ + { "path": "../effect/tsconfig.src.json" }, + { "path": "../sql/tsconfig.src.json" } + ], "compilerOptions": { "tsBuildInfoFile": ".tsbuildinfo/src.tsbuildinfo", "rootDir": "src", diff --git a/packages/sql-mysql2/tsconfig.test.json b/packages/sql-mysql2/tsconfig.test.json index 497f697f10a..40c1407c0d6 100644 --- a/packages/sql-mysql2/tsconfig.test.json +++ b/packages/sql-mysql2/tsconfig.test.json @@ -3,8 +3,7 @@ "include": ["test"], "references": [ { "path": "tsconfig.src.json" }, - { "path": "../effect" }, - { "path": "../sql" } + { "path": "../vitest/tsconfig.src.json" }, ], "compilerOptions": { "tsBuildInfoFile": ".tsbuildinfo/test.tsbuildinfo", diff --git a/packages/sql-mysql2/vitest.config.ts b/packages/sql-mysql2/vitest.config.ts index 0411095f257..578d0667249 100644 --- a/packages/sql-mysql2/vitest.config.ts +++ b/packages/sql-mysql2/vitest.config.ts @@ -1,6 +1,6 @@ -import { mergeConfig, type UserConfigExport } from "vitest/config" +import { mergeConfig, type ViteUserConfig } from "vitest/config" import shared from "../../vitest.shared.js" -const config: UserConfigExport = {} +const config: ViteUserConfig = {} export default mergeConfig(shared, config) diff --git a/packages/sql-pg/tsconfig.src.json b/packages/sql-pg/tsconfig.src.json index ee66b4ebde5..13590c3e70a 100644 --- a/packages/sql-pg/tsconfig.src.json +++ b/packages/sql-pg/tsconfig.src.json @@ -1,7 +1,10 @@ { "extends": "../../tsconfig.base.json", "include": ["src"], - "references": [{ "path": "../effect" }, { "path": "../sql" }], + "references": [ + { "path": "../effect/tsconfig.src.json" }, + { "path": "../sql/tsconfig.src.json" } + ], "compilerOptions": { "tsBuildInfoFile": ".tsbuildinfo/src.tsbuildinfo", "rootDir": "src", diff --git a/packages/sql-pg/tsconfig.test.json b/packages/sql-pg/tsconfig.test.json index 497f697f10a..40c1407c0d6 100644 --- a/packages/sql-pg/tsconfig.test.json +++ b/packages/sql-pg/tsconfig.test.json @@ -3,8 +3,7 @@ "include": ["test"], "references": [ { "path": "tsconfig.src.json" }, - { "path": "../effect" }, - { "path": "../sql" } + { "path": "../vitest/tsconfig.src.json" }, ], "compilerOptions": { "tsBuildInfoFile": ".tsbuildinfo/test.tsbuildinfo", diff --git a/packages/sql-pg/vitest.config.ts b/packages/sql-pg/vitest.config.ts index 0411095f257..578d0667249 100644 --- a/packages/sql-pg/vitest.config.ts +++ b/packages/sql-pg/vitest.config.ts @@ -1,6 +1,6 @@ -import { mergeConfig, type UserConfigExport } from "vitest/config" +import { mergeConfig, type ViteUserConfig } from "vitest/config" import shared from "../../vitest.shared.js" -const config: UserConfigExport = {} +const config: ViteUserConfig = {} export default mergeConfig(shared, config) diff --git a/packages/sql-sqlite-bun/tsconfig.src.json b/packages/sql-sqlite-bun/tsconfig.src.json index 1c2f3f6e2a7..b753a02d3e0 100644 --- a/packages/sql-sqlite-bun/tsconfig.src.json +++ b/packages/sql-sqlite-bun/tsconfig.src.json @@ -1,7 +1,10 @@ { "extends": "../../tsconfig.base.json", - "include": ["src", "../sql-sqlite-wasm/src/sqlite-wasm.d.ts"], - "references": [{ "path": "../effect" }, { "path": "../sql" }], + "include": ["src"], + "references": [ + { "path": "../effect/tsconfig.src.json" }, + { "path": "../sql/tsconfig.src.json" } + ], "compilerOptions": { "tsBuildInfoFile": ".tsbuildinfo/src.tsbuildinfo", "rootDir": "src", diff --git a/packages/sql-sqlite-bun/tsconfig.test.json b/packages/sql-sqlite-bun/tsconfig.test.json index 0fc93036045..a148bf6e2e1 100644 --- a/packages/sql-sqlite-bun/tsconfig.test.json +++ b/packages/sql-sqlite-bun/tsconfig.test.json @@ -3,10 +3,7 @@ "include": ["test"], "references": [ { "path": "tsconfig.src.json" }, - { "path": "../effect" }, - { "path": "../platform-bun" }, - { "path": "../sql" }, - { "path": "../vitest" } + { "path": "../vitest/tsconfig.src.json" }, ], "compilerOptions": { "tsBuildInfoFile": ".tsbuildinfo/test.tsbuildinfo", diff --git a/packages/sql-sqlite-bun/vitest.config.ts b/packages/sql-sqlite-bun/vitest.config.ts index 0411095f257..578d0667249 100644 --- a/packages/sql-sqlite-bun/vitest.config.ts +++ b/packages/sql-sqlite-bun/vitest.config.ts @@ -1,6 +1,6 @@ -import { mergeConfig, type UserConfigExport } from "vitest/config" +import { mergeConfig, type ViteUserConfig } from "vitest/config" import shared from "../../vitest.shared.js" -const config: UserConfigExport = {} +const config: ViteUserConfig = {} export default mergeConfig(shared, config) diff --git a/packages/sql-sqlite-do/tsconfig.src.json b/packages/sql-sqlite-do/tsconfig.src.json index 424a843861e..dafd3159155 100644 --- a/packages/sql-sqlite-do/tsconfig.src.json +++ b/packages/sql-sqlite-do/tsconfig.src.json @@ -1,7 +1,10 @@ { "extends": "../../tsconfig.base.json", "include": ["src"], - "references": [{ "path": "../effect" }, { "path": "../sql" }], + "references": [ + { "path": "../effect/tsconfig.src.json" }, + { "path": "../sql/tsconfig.src.json" } + ], "compilerOptions": { "tsBuildInfoFile": ".tsbuildinfo/src.tsbuildinfo", "rootDir": "src", diff --git a/packages/sql-sqlite-do/tsconfig.test.json b/packages/sql-sqlite-do/tsconfig.test.json index 9d0a40abeda..40c1407c0d6 100644 --- a/packages/sql-sqlite-do/tsconfig.test.json +++ b/packages/sql-sqlite-do/tsconfig.test.json @@ -3,9 +3,7 @@ "include": ["test"], "references": [ { "path": "tsconfig.src.json" }, - { "path": "../effect" }, - { "path": "../sql" }, - { "path": "../vitest" } + { "path": "../vitest/tsconfig.src.json" }, ], "compilerOptions": { "tsBuildInfoFile": ".tsbuildinfo/test.tsbuildinfo", diff --git a/packages/sql-sqlite-do/vitest.config.ts b/packages/sql-sqlite-do/vitest.config.ts index 0411095f257..578d0667249 100644 --- a/packages/sql-sqlite-do/vitest.config.ts +++ b/packages/sql-sqlite-do/vitest.config.ts @@ -1,6 +1,6 @@ -import { mergeConfig, type UserConfigExport } from "vitest/config" +import { mergeConfig, type ViteUserConfig } from "vitest/config" import shared from "../../vitest.shared.js" -const config: UserConfigExport = {} +const config: ViteUserConfig = {} export default mergeConfig(shared, config) diff --git a/packages/sql-sqlite-node/tsconfig.examples.json b/packages/sql-sqlite-node/tsconfig.examples.json deleted file mode 100644 index 119ff192eb9..00000000000 --- a/packages/sql-sqlite-node/tsconfig.examples.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "extends": "../../tsconfig.base.json", - "include": ["examples"], - "references": [ - { "path": "tsconfig.src.json" }, - { "path": "../effect" }, - { "path": "../experimental" }, - { "path": "../sql" } - ], - "compilerOptions": { - "tsBuildInfoFile": ".tsbuildinfo/examples.tsbuildinfo", - "rootDir": "examples", - "noEmit": true - } -} diff --git a/packages/sql-sqlite-node/tsconfig.json b/packages/sql-sqlite-node/tsconfig.json index 3edbf6b8a56..2c291d2192d 100644 --- a/packages/sql-sqlite-node/tsconfig.json +++ b/packages/sql-sqlite-node/tsconfig.json @@ -3,7 +3,6 @@ "include": [], "references": [ { "path": "tsconfig.src.json" }, - { "path": "tsconfig.test.json" }, - { "path": "tsconfig.examples.json" } + { "path": "tsconfig.test.json" } ] } diff --git a/packages/sql-sqlite-node/tsconfig.src.json b/packages/sql-sqlite-node/tsconfig.src.json index 7f6843ca242..dafd3159155 100644 --- a/packages/sql-sqlite-node/tsconfig.src.json +++ b/packages/sql-sqlite-node/tsconfig.src.json @@ -1,7 +1,10 @@ { "extends": "../../tsconfig.base.json", - "include": ["src", "../sql-sqlite-wasm/src/sqlite-wasm.d.ts"], - "references": [{ "path": "../effect" }, { "path": "../sql" }], + "include": ["src"], + "references": [ + { "path": "../effect/tsconfig.src.json" }, + { "path": "../sql/tsconfig.src.json" } + ], "compilerOptions": { "tsBuildInfoFile": ".tsbuildinfo/src.tsbuildinfo", "rootDir": "src", diff --git a/packages/sql-sqlite-node/tsconfig.test.json b/packages/sql-sqlite-node/tsconfig.test.json index 70103fe42ab..40c1407c0d6 100644 --- a/packages/sql-sqlite-node/tsconfig.test.json +++ b/packages/sql-sqlite-node/tsconfig.test.json @@ -3,10 +3,7 @@ "include": ["test"], "references": [ { "path": "tsconfig.src.json" }, - { "path": "../effect" }, - { "path": "../platform-node" }, - { "path": "../sql" }, - { "path": "../vitest" } + { "path": "../vitest/tsconfig.src.json" }, ], "compilerOptions": { "tsBuildInfoFile": ".tsbuildinfo/test.tsbuildinfo", diff --git a/packages/sql-sqlite-node/vitest.config.ts b/packages/sql-sqlite-node/vitest.config.ts index 0411095f257..578d0667249 100644 --- a/packages/sql-sqlite-node/vitest.config.ts +++ b/packages/sql-sqlite-node/vitest.config.ts @@ -1,6 +1,6 @@ -import { mergeConfig, type UserConfigExport } from "vitest/config" +import { mergeConfig, type ViteUserConfig } from "vitest/config" import shared from "../../vitest.shared.js" -const config: UserConfigExport = {} +const config: ViteUserConfig = {} export default mergeConfig(shared, config) diff --git a/packages/sql-sqlite-react-native/tsconfig.examples.json b/packages/sql-sqlite-react-native/tsconfig.examples.json deleted file mode 100644 index 119ff192eb9..00000000000 --- a/packages/sql-sqlite-react-native/tsconfig.examples.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "extends": "../../tsconfig.base.json", - "include": ["examples"], - "references": [ - { "path": "tsconfig.src.json" }, - { "path": "../effect" }, - { "path": "../experimental" }, - { "path": "../sql" } - ], - "compilerOptions": { - "tsBuildInfoFile": ".tsbuildinfo/examples.tsbuildinfo", - "rootDir": "examples", - "noEmit": true - } -} diff --git a/packages/sql-sqlite-react-native/tsconfig.json b/packages/sql-sqlite-react-native/tsconfig.json index 3edbf6b8a56..2c291d2192d 100644 --- a/packages/sql-sqlite-react-native/tsconfig.json +++ b/packages/sql-sqlite-react-native/tsconfig.json @@ -3,7 +3,6 @@ "include": [], "references": [ { "path": "tsconfig.src.json" }, - { "path": "tsconfig.test.json" }, - { "path": "tsconfig.examples.json" } + { "path": "tsconfig.test.json" } ] } diff --git a/packages/sql-sqlite-react-native/tsconfig.src.json b/packages/sql-sqlite-react-native/tsconfig.src.json index 424a843861e..dafd3159155 100644 --- a/packages/sql-sqlite-react-native/tsconfig.src.json +++ b/packages/sql-sqlite-react-native/tsconfig.src.json @@ -1,7 +1,10 @@ { "extends": "../../tsconfig.base.json", "include": ["src"], - "references": [{ "path": "../effect" }, { "path": "../sql" }], + "references": [ + { "path": "../effect/tsconfig.src.json" }, + { "path": "../sql/tsconfig.src.json" } + ], "compilerOptions": { "tsBuildInfoFile": ".tsbuildinfo/src.tsbuildinfo", "rootDir": "src", diff --git a/packages/sql-sqlite-react-native/tsconfig.test.json b/packages/sql-sqlite-react-native/tsconfig.test.json index 9d0a40abeda..40c1407c0d6 100644 --- a/packages/sql-sqlite-react-native/tsconfig.test.json +++ b/packages/sql-sqlite-react-native/tsconfig.test.json @@ -3,9 +3,7 @@ "include": ["test"], "references": [ { "path": "tsconfig.src.json" }, - { "path": "../effect" }, - { "path": "../sql" }, - { "path": "../vitest" } + { "path": "../vitest/tsconfig.src.json" }, ], "compilerOptions": { "tsBuildInfoFile": ".tsbuildinfo/test.tsbuildinfo", diff --git a/packages/sql-sqlite-react-native/vitest.config.ts b/packages/sql-sqlite-react-native/vitest.config.ts index 0411095f257..578d0667249 100644 --- a/packages/sql-sqlite-react-native/vitest.config.ts +++ b/packages/sql-sqlite-react-native/vitest.config.ts @@ -1,6 +1,6 @@ -import { mergeConfig, type UserConfigExport } from "vitest/config" +import { mergeConfig, type ViteUserConfig } from "vitest/config" import shared from "../../vitest.shared.js" -const config: UserConfigExport = {} +const config: ViteUserConfig = {} export default mergeConfig(shared, config) diff --git a/packages/sql-sqlite-wasm/tsconfig.examples.json b/packages/sql-sqlite-wasm/tsconfig.examples.json deleted file mode 100644 index 119ff192eb9..00000000000 --- a/packages/sql-sqlite-wasm/tsconfig.examples.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "extends": "../../tsconfig.base.json", - "include": ["examples"], - "references": [ - { "path": "tsconfig.src.json" }, - { "path": "../effect" }, - { "path": "../experimental" }, - { "path": "../sql" } - ], - "compilerOptions": { - "tsBuildInfoFile": ".tsbuildinfo/examples.tsbuildinfo", - "rootDir": "examples", - "noEmit": true - } -} diff --git a/packages/sql-sqlite-wasm/tsconfig.json b/packages/sql-sqlite-wasm/tsconfig.json index 3edbf6b8a56..2c291d2192d 100644 --- a/packages/sql-sqlite-wasm/tsconfig.json +++ b/packages/sql-sqlite-wasm/tsconfig.json @@ -3,7 +3,6 @@ "include": [], "references": [ { "path": "tsconfig.src.json" }, - { "path": "tsconfig.test.json" }, - { "path": "tsconfig.examples.json" } + { "path": "tsconfig.test.json" } ] } diff --git a/packages/sql-sqlite-wasm/tsconfig.src.json b/packages/sql-sqlite-wasm/tsconfig.src.json index c353999593b..6bc5ff552ce 100644 --- a/packages/sql-sqlite-wasm/tsconfig.src.json +++ b/packages/sql-sqlite-wasm/tsconfig.src.json @@ -1,7 +1,10 @@ { "extends": "../../tsconfig.base.json", "include": ["src"], - "references": [{ "path": "../effect" }, { "path": "../sql" }], + "references": [ + { "path": "../effect/tsconfig.src.json" }, + { "path": "../sql/tsconfig.src.json" } + ], "compilerOptions": { "tsBuildInfoFile": ".tsbuildinfo/src.tsbuildinfo", "rootDir": "src", diff --git a/packages/sql-sqlite-wasm/tsconfig.test.json b/packages/sql-sqlite-wasm/tsconfig.test.json index 70103fe42ab..40c1407c0d6 100644 --- a/packages/sql-sqlite-wasm/tsconfig.test.json +++ b/packages/sql-sqlite-wasm/tsconfig.test.json @@ -3,10 +3,7 @@ "include": ["test"], "references": [ { "path": "tsconfig.src.json" }, - { "path": "../effect" }, - { "path": "../platform-node" }, - { "path": "../sql" }, - { "path": "../vitest" } + { "path": "../vitest/tsconfig.src.json" }, ], "compilerOptions": { "tsBuildInfoFile": ".tsbuildinfo/test.tsbuildinfo", diff --git a/packages/sql-sqlite-wasm/vitest.config.ts b/packages/sql-sqlite-wasm/vitest.config.ts index 0411095f257..578d0667249 100644 --- a/packages/sql-sqlite-wasm/vitest.config.ts +++ b/packages/sql-sqlite-wasm/vitest.config.ts @@ -1,6 +1,6 @@ -import { mergeConfig, type UserConfigExport } from "vitest/config" +import { mergeConfig, type ViteUserConfig } from "vitest/config" import shared from "../../vitest.shared.js" -const config: UserConfigExport = {} +const config: ViteUserConfig = {} export default mergeConfig(shared, config) diff --git a/packages/sql/test/index.test.ts b/packages/sql/test/index.test.ts index 7c743e05289..e3e3ebb50b4 100644 --- a/packages/sql/test/index.test.ts +++ b/packages/sql/test/index.test.ts @@ -1,4 +1,4 @@ -import { assert, describe, it } from "vitest" +import { assert, describe, it } from "@effect/vitest" // TODO: implement a test suite describe("sql", () => { diff --git a/packages/sql/tsconfig.src.json b/packages/sql/tsconfig.src.json index 098b4d92f30..9526a582a14 100644 --- a/packages/sql/tsconfig.src.json +++ b/packages/sql/tsconfig.src.json @@ -2,9 +2,9 @@ "extends": "../../tsconfig.base.json", "include": ["src"], "references": [ - { "path": "../effect" }, - { "path": "../experimental" }, - { "path": "../platform" } + { "path": "../effect/tsconfig.src.json" }, + { "path": "../experimental/tsconfig.src.json" }, + { "path": "../platform/tsconfig.src.json" } ], "compilerOptions": { "tsBuildInfoFile": ".tsbuildinfo/src.tsbuildinfo", diff --git a/packages/sql/tsconfig.test.json b/packages/sql/tsconfig.test.json index 8939416ac7e..185e7065e44 100644 --- a/packages/sql/tsconfig.test.json +++ b/packages/sql/tsconfig.test.json @@ -3,8 +3,7 @@ "include": ["test"], "references": [ { "path": "tsconfig.src.json" }, - { "path": "../effect" }, - { "path": "../platform" } + { "path": "../vitest/tsconfig.src.json" } ], "compilerOptions": { "tsBuildInfoFile": ".tsbuildinfo/test.tsbuildinfo", diff --git a/packages/sql/vitest.config.ts b/packages/sql/vitest.config.ts index 0411095f257..578d0667249 100644 --- a/packages/sql/vitest.config.ts +++ b/packages/sql/vitest.config.ts @@ -1,6 +1,6 @@ -import { mergeConfig, type UserConfigExport } from "vitest/config" +import { mergeConfig, type ViteUserConfig } from "vitest/config" import shared from "../../vitest.shared.js" -const config: UserConfigExport = {} +const config: ViteUserConfig = {} export default mergeConfig(shared, config) diff --git a/packages/typeclass/test/Applicative.test.ts b/packages/typeclass/test/Applicative.test.ts index 69291f95dad..bed7008fddd 100644 --- a/packages/typeclass/test/Applicative.test.ts +++ b/packages/typeclass/test/Applicative.test.ts @@ -1,8 +1,8 @@ import * as applicative from "@effect/typeclass/Applicative" import * as NumberInstances from "@effect/typeclass/data/Number" import * as OptionInstances from "@effect/typeclass/data/Option" +import { describe, it } from "@effect/vitest" import * as Option from "effect/Option" -import { describe, it } from "vitest" import * as Util from "./util.js" describe.concurrent("Applicative", () => { diff --git a/packages/typeclass/test/Bicovariant.test.ts b/packages/typeclass/test/Bicovariant.test.ts index d65b421c0fb..d0fe6ac3983 100644 --- a/packages/typeclass/test/Bicovariant.test.ts +++ b/packages/typeclass/test/Bicovariant.test.ts @@ -1,9 +1,9 @@ import * as _ from "@effect/typeclass/Bicovariant" import * as ArrayInstances from "@effect/typeclass/data/Array" import * as EitherInstances from "@effect/typeclass/data/Either" +import { describe, it } from "@effect/vitest" import * as E from "effect/Either" import { pipe } from "effect/Function" -import { describe, it } from "vitest" import * as U from "./util.js" describe.concurrent("Bicovariant", () => { diff --git a/packages/typeclass/test/Bounded.test.ts b/packages/typeclass/test/Bounded.test.ts index 589ef32a807..415284d0abf 100644 --- a/packages/typeclass/test/Bounded.test.ts +++ b/packages/typeclass/test/Bounded.test.ts @@ -1,6 +1,6 @@ import * as _ from "@effect/typeclass/Bounded" +import { describe, it } from "@effect/vitest" import * as Number from "effect/Number" -import { describe, it } from "vitest" import * as U from "./util.js" describe.concurrent("Bounded", () => { diff --git a/packages/typeclass/test/Chainable.test.ts b/packages/typeclass/test/Chainable.test.ts index 5508d94bfa5..15c387b0f39 100644 --- a/packages/typeclass/test/Chainable.test.ts +++ b/packages/typeclass/test/Chainable.test.ts @@ -1,8 +1,8 @@ import * as _ from "@effect/typeclass/Chainable" import * as OptionInstances from "@effect/typeclass/data/Option" +import { describe, it } from "@effect/vitest" import { pipe } from "effect/Function" import * as O from "effect/Option" -import { describe, it } from "vitest" import * as U from "./util.js" describe.concurrent("Chainable", () => { diff --git a/packages/typeclass/test/Contravariant.test.ts b/packages/typeclass/test/Contravariant.test.ts index d7d6094dfb5..1a3578595a2 100644 --- a/packages/typeclass/test/Contravariant.test.ts +++ b/packages/typeclass/test/Contravariant.test.ts @@ -1,9 +1,9 @@ import * as _ from "@effect/typeclass/Contravariant" import * as PredicateInstances from "@effect/typeclass/data/Predicate" +import { describe, it } from "@effect/vitest" import * as order from "effect/Order" import type * as P from "effect/Predicate" import * as S from "effect/String" -import { describe, it } from "vitest" import * as U from "./util.js" describe.concurrent("Contravariant", () => { diff --git a/packages/typeclass/test/Coproduct.test.ts b/packages/typeclass/test/Coproduct.test.ts index 030630c182a..b4fc7450b7b 100644 --- a/packages/typeclass/test/Coproduct.test.ts +++ b/packages/typeclass/test/Coproduct.test.ts @@ -1,7 +1,7 @@ import * as _ from "@effect/typeclass/Coproduct" import * as OptionInstances from "@effect/typeclass/data/Option" +import { describe, it } from "@effect/vitest" import * as O from "effect/Option" -import { describe, it } from "vitest" import * as U from "./util.js" describe.concurrent("Coproduct", () => { diff --git a/packages/typeclass/test/Covariant.test.ts b/packages/typeclass/test/Covariant.test.ts index 9fa8a941b28..27e3c3790fc 100644 --- a/packages/typeclass/test/Covariant.test.ts +++ b/packages/typeclass/test/Covariant.test.ts @@ -1,9 +1,9 @@ import * as _ from "@effect/typeclass/Covariant" import * as ArrayInstances from "@effect/typeclass/data/Array" import * as OptionInstances from "@effect/typeclass/data/Option" +import { describe, it } from "@effect/vitest" import { pipe } from "effect/Function" import * as O from "effect/Option" -import { describe, it } from "vitest" import * as U from "./util.js" diff --git a/packages/typeclass/test/Filterable.test.ts b/packages/typeclass/test/Filterable.test.ts index 178969a0d6c..73934481c1d 100644 --- a/packages/typeclass/test/Filterable.test.ts +++ b/packages/typeclass/test/Filterable.test.ts @@ -1,10 +1,10 @@ import * as ArrayInstances from "@effect/typeclass/data/Array" import * as OptionInstances from "@effect/typeclass/data/Option" import * as _ from "@effect/typeclass/Filterable" +import { assert, describe, it } from "@effect/vitest" import * as E from "effect/Either" import { pipe } from "effect/Function" import * as O from "effect/Option" -import { assert, describe, it } from "vitest" import * as U from "./util.js" describe.concurrent("Filterable", () => { diff --git a/packages/typeclass/test/FlatMap.test.ts b/packages/typeclass/test/FlatMap.test.ts index f1496b99d0f..49dd5a5d719 100644 --- a/packages/typeclass/test/FlatMap.test.ts +++ b/packages/typeclass/test/FlatMap.test.ts @@ -1,8 +1,8 @@ import * as OptionInstances from "@effect/typeclass/data/Option" import * as _ from "@effect/typeclass/FlatMap" +import { describe, it } from "@effect/vitest" import { pipe } from "effect/Function" import * as O from "effect/Option" -import { describe, it } from "vitest" import * as U from "./util.js" describe.concurrent("FlatMap", () => { diff --git a/packages/typeclass/test/Foldable.test.ts b/packages/typeclass/test/Foldable.test.ts index 14456de5234..2293b75ef50 100644 --- a/packages/typeclass/test/Foldable.test.ts +++ b/packages/typeclass/test/Foldable.test.ts @@ -2,9 +2,9 @@ import * as ArrayInstances from "@effect/typeclass/data/Array" import * as NumberInstances from "@effect/typeclass/data/Number" import * as OptionInstances from "@effect/typeclass/data/Option" import * as Foldable from "@effect/typeclass/Foldable" +import { describe, it } from "@effect/vitest" import { pipe } from "effect/Function" import * as O from "effect/Option" -import { describe, it } from "vitest" import * as U from "./util.js" describe.concurrent("Foldable", () => { diff --git a/packages/typeclass/test/Invariant.test.ts b/packages/typeclass/test/Invariant.test.ts index 4c6261f13f5..575140bf6af 100644 --- a/packages/typeclass/test/Invariant.test.ts +++ b/packages/typeclass/test/Invariant.test.ts @@ -3,10 +3,10 @@ import * as PredicateInstances from "@effect/typeclass/data/Predicate" import * as StringInstances from "@effect/typeclass/data/String" import * as _ from "@effect/typeclass/Invariant" import * as Semigroup from "@effect/typeclass/Semigroup" +import { describe, it } from "@effect/vitest" import { pipe } from "effect/Function" import * as O from "effect/Option" import * as String from "effect/String" -import { describe, it } from "vitest" import * as U from "./util.js" describe.concurrent("Invariant", () => { diff --git a/packages/typeclass/test/Monoid.test.ts b/packages/typeclass/test/Monoid.test.ts index ad7ac38f29a..6ba592aa81c 100644 --- a/packages/typeclass/test/Monoid.test.ts +++ b/packages/typeclass/test/Monoid.test.ts @@ -1,7 +1,7 @@ import * as NumberInstances from "@effect/typeclass/data/Number" import * as StringInstances from "@effect/typeclass/data/String" import * as Monoid from "@effect/typeclass/Monoid" -import { describe, it } from "vitest" +import { describe, it } from "@effect/vitest" import * as U from "./util.js" describe.concurrent("Monoid", () => { diff --git a/packages/typeclass/test/Of.test.ts b/packages/typeclass/test/Of.test.ts index 6822faea050..519e645b0d9 100644 --- a/packages/typeclass/test/Of.test.ts +++ b/packages/typeclass/test/Of.test.ts @@ -1,8 +1,8 @@ import * as OptionInstances from "@effect/typeclass/data/Option" import * as _ from "@effect/typeclass/Of" +import { describe, it } from "@effect/vitest" import * as RA from "effect/Array" import * as O from "effect/Option" -import { describe, it } from "vitest" import * as U from "./util.js" describe.concurrent("Of", () => { diff --git a/packages/typeclass/test/Product.test.ts b/packages/typeclass/test/Product.test.ts index 9741ad2ded0..e45c90b0838 100644 --- a/packages/typeclass/test/Product.test.ts +++ b/packages/typeclass/test/Product.test.ts @@ -4,11 +4,11 @@ import * as PredicateInstances from "@effect/typeclass/data/Predicate" import * as StringInstances from "@effect/typeclass/data/String" import * as _ from "@effect/typeclass/Product" import * as Semigroup from "@effect/typeclass/Semigroup" +import { describe, it } from "@effect/vitest" import * as Boolean from "effect/Boolean" import * as Number from "effect/Number" import * as O from "effect/Option" import * as String from "effect/String" -import { describe, it } from "vitest" import * as U from "./util.js" describe.concurrent("Product", () => { diff --git a/packages/typeclass/test/SemiApplicative.test.ts b/packages/typeclass/test/SemiApplicative.test.ts index 3fb427c2106..82168f3207d 100644 --- a/packages/typeclass/test/SemiApplicative.test.ts +++ b/packages/typeclass/test/SemiApplicative.test.ts @@ -1,9 +1,9 @@ import * as OptionInstances from "@effect/typeclass/data/Option" import * as StringInstances from "@effect/typeclass/data/String" import * as _ from "@effect/typeclass/SemiApplicative" +import { describe, it } from "@effect/vitest" import { pipe } from "effect/Function" import * as O from "effect/Option" -import { describe, it } from "vitest" import * as U from "./util.js" describe.concurrent("SemiApplicative", () => { diff --git a/packages/typeclass/test/SemiProduct.test.ts b/packages/typeclass/test/SemiProduct.test.ts index 5a51a380f39..a9733cbd810 100644 --- a/packages/typeclass/test/SemiProduct.test.ts +++ b/packages/typeclass/test/SemiProduct.test.ts @@ -7,6 +7,7 @@ import * as of_ from "@effect/typeclass/Of" import * as semiApplicative from "@effect/typeclass/SemiApplicative" import * as Semigroup from "@effect/typeclass/Semigroup" import * as _ from "@effect/typeclass/SemiProduct" +import { describe, expect, it } from "@effect/vitest" import * as Boolean from "effect/Boolean" import { pipe } from "effect/Function" import type { Kind, TypeLambda } from "effect/HKT" @@ -15,7 +16,6 @@ import * as O from "effect/Option" import * as P from "effect/Predicate" import type * as Predicate from "effect/Predicate" import * as String from "effect/String" -import { describe, expect, it } from "vitest" import * as U from "./util.js" /** diff --git a/packages/typeclass/test/Semigroup.test.ts b/packages/typeclass/test/Semigroup.test.ts index dbffefb5d4b..c5951684c5d 100644 --- a/packages/typeclass/test/Semigroup.test.ts +++ b/packages/typeclass/test/Semigroup.test.ts @@ -1,10 +1,10 @@ import * as NumberInstances from "@effect/typeclass/data/Number" import * as StringInstances from "@effect/typeclass/data/String" import * as Semigroup from "@effect/typeclass/Semigroup" +import { describe, expect, it } from "@effect/vitest" import { pipe } from "effect/Function" import * as Number from "effect/Number" import * as order from "effect/Order" -import { describe, expect, it } from "vitest" import * as U from "./util.js" describe.concurrent("Semigroup", () => { diff --git a/packages/typeclass/test/Traversable.test.ts b/packages/typeclass/test/Traversable.test.ts index 6d3372fc7aa..6a1b0baee5b 100644 --- a/packages/typeclass/test/Traversable.test.ts +++ b/packages/typeclass/test/Traversable.test.ts @@ -1,9 +1,9 @@ import * as ArrayInstances from "@effect/typeclass/data/Array" import * as OptionInstances from "@effect/typeclass/data/Option" import * as Traversable from "@effect/typeclass/Traversable" +import { describe, it } from "@effect/vitest" import { pipe } from "effect/Function" import * as O from "effect/Option" -import { describe, it } from "vitest" import * as U from "./util.js" describe.concurrent("Traversable", () => { diff --git a/packages/typeclass/test/TraversableFilterable.test.ts b/packages/typeclass/test/TraversableFilterable.test.ts index 3508311f178..8a62d1651d2 100644 --- a/packages/typeclass/test/TraversableFilterable.test.ts +++ b/packages/typeclass/test/TraversableFilterable.test.ts @@ -1,9 +1,9 @@ import * as ArrayInstances from "@effect/typeclass/data/Array" import * as OptionInstances from "@effect/typeclass/data/Option" import * as _ from "@effect/typeclass/TraversableFilterable" +import { assert, describe, expect, it } from "@effect/vitest" import * as E from "effect/Either" import * as O from "effect/Option" -import { assert, describe, expect, it } from "vitest" import * as U from "./util.js" describe.concurrent("TraversableFilterable", () => { diff --git a/packages/typeclass/test/data/Array.test.ts b/packages/typeclass/test/data/Array.test.ts index dc5dc402aa6..58673c2fc46 100644 --- a/packages/typeclass/test/data/Array.test.ts +++ b/packages/typeclass/test/data/Array.test.ts @@ -1,5 +1,5 @@ import * as ArrayInstances from "@effect/typeclass/data/Array" -import { describe, expect, it } from "vitest" +import { describe, expect, it } from "@effect/vitest" describe.concurrent("Array", () => { it("Product.productAll", () => { diff --git a/packages/typeclass/test/data/BigInt.test.ts b/packages/typeclass/test/data/BigInt.test.ts index 63916c1b8cd..25463024ac3 100644 --- a/packages/typeclass/test/data/BigInt.test.ts +++ b/packages/typeclass/test/data/BigInt.test.ts @@ -1,5 +1,5 @@ import * as BigintInstances from "@effect/typeclass/data/BigInt" -import { describe, it } from "vitest" +import { describe, it } from "@effect/vitest" import * as U from "../util.js" describe.concurrent("Bigint", () => { diff --git a/packages/typeclass/test/data/Boolean.test.ts b/packages/typeclass/test/data/Boolean.test.ts index 7cafc9c5e80..f6c4b2c166c 100644 --- a/packages/typeclass/test/data/Boolean.test.ts +++ b/packages/typeclass/test/data/Boolean.test.ts @@ -1,5 +1,5 @@ import * as BooleanInstances from "@effect/typeclass/data/Boolean" -import { describe, it } from "vitest" +import { describe, it } from "@effect/vitest" import * as U from "../util.js" describe.concurrent("Boolean", () => { diff --git a/packages/typeclass/test/data/Effect.test.ts b/packages/typeclass/test/data/Effect.test.ts index c4061618aad..d1598a828d6 100644 --- a/packages/typeclass/test/data/Effect.test.ts +++ b/packages/typeclass/test/data/Effect.test.ts @@ -1,7 +1,7 @@ import * as EffectInstances from "@effect/typeclass/data/Effect" import * as RecordInstances from "@effect/typeclass/data/Record" +import { describe, expect, it } from "@effect/vitest" import * as Effect from "effect/Effect" -import { describe, expect, it } from "vitest" describe.concurrent("Effect", () => { describe("Applicative", () => { diff --git a/packages/typeclass/test/data/Either.test.ts b/packages/typeclass/test/data/Either.test.ts index c345f6525c3..3a43a9b781d 100644 --- a/packages/typeclass/test/data/Either.test.ts +++ b/packages/typeclass/test/data/Either.test.ts @@ -1,9 +1,9 @@ import * as EitherInstances from "@effect/typeclass/data/Either" import * as OptionInstances from "@effect/typeclass/data/Option" +import { describe, expect, it } from "@effect/vitest" import * as Either from "effect/Either" import { pipe } from "effect/Function" import * as Option from "effect/Option" -import { describe, expect, it } from "vitest" import * as Util from "../util.js" describe.concurrent("Either", () => { diff --git a/packages/typeclass/test/data/Micro.test.ts b/packages/typeclass/test/data/Micro.test.ts index 80be96edfd7..45bbf8040f2 100644 --- a/packages/typeclass/test/data/Micro.test.ts +++ b/packages/typeclass/test/data/Micro.test.ts @@ -1,7 +1,7 @@ import * as MicroInstances from "@effect/typeclass/data/Micro" import * as RecordInstances from "@effect/typeclass/data/Record" +import { describe, expect, it } from "@effect/vitest" import * as Micro from "effect/Micro" -import { describe, expect, it } from "vitest" describe.concurrent("Micro", () => { describe("Applicative", () => { diff --git a/packages/typeclass/test/data/Number.test.ts b/packages/typeclass/test/data/Number.test.ts index c17c546dfd9..4788eb5010c 100644 --- a/packages/typeclass/test/data/Number.test.ts +++ b/packages/typeclass/test/data/Number.test.ts @@ -1,5 +1,5 @@ import * as NumberInstances from "@effect/typeclass/data/Number" -import { describe, it } from "vitest" +import { describe, it } from "@effect/vitest" import * as U from "../util.js" describe.concurrent("Number", () => { diff --git a/packages/typeclass/test/data/Option.test.ts b/packages/typeclass/test/data/Option.test.ts index a727c1d3131..1750bcda26d 100644 --- a/packages/typeclass/test/data/Option.test.ts +++ b/packages/typeclass/test/data/Option.test.ts @@ -1,8 +1,8 @@ import * as ReadonlyArrayInstances from "@effect/typeclass/data/Array" import * as OptionInstances from "@effect/typeclass/data/Option" +import { describe, it } from "@effect/vitest" import { pipe } from "effect/Function" import * as Option from "effect/Option" -import { describe, it } from "vitest" import * as Util from "../util.js" describe.concurrent("Option", () => { diff --git a/packages/typeclass/test/data/Predicate.test.ts b/packages/typeclass/test/data/Predicate.test.ts index 1e21a4c694f..fc0dc363024 100644 --- a/packages/typeclass/test/data/Predicate.test.ts +++ b/packages/typeclass/test/data/Predicate.test.ts @@ -1,7 +1,7 @@ import * as PredicatenIstances from "@effect/typeclass/data/Predicate" +import { describe, expect, it } from "@effect/vitest" import { constFalse, constTrue } from "effect/Function" import type * as Predicate from "effect/Predicate" -import { describe, expect, it } from "vitest" import * as Util from "../util.js" describe.concurrent("Option", () => { diff --git a/packages/typeclass/test/data/Record.test.ts b/packages/typeclass/test/data/Record.test.ts index 448bc008cae..01a065efadc 100644 --- a/packages/typeclass/test/data/Record.test.ts +++ b/packages/typeclass/test/data/Record.test.ts @@ -3,8 +3,8 @@ import * as OptionInstances from "@effect/typeclass/data/Option" import * as RecordInstances from "@effect/typeclass/data/Record" import * as monoid from "@effect/typeclass/Monoid" import * as semigroup from "@effect/typeclass/Semigroup" +import { describe, expect, it } from "@effect/vitest" import * as Option from "effect/Option" -import { describe, expect, it } from "vitest" describe.concurrent("Record", () => { it("traverse (string)", () => { diff --git a/packages/typeclass/tsconfig.src.json b/packages/typeclass/tsconfig.src.json index 272866fcc37..79d2b34eb4c 100644 --- a/packages/typeclass/tsconfig.src.json +++ b/packages/typeclass/tsconfig.src.json @@ -2,7 +2,7 @@ "extends": "../../tsconfig.base.json", "include": ["src"], "references": [ - { "path": "../effect" } + { "path": "../effect/tsconfig.src.json" } ], "compilerOptions": { "outDir": "build/src", diff --git a/packages/typeclass/tsconfig.test.json b/packages/typeclass/tsconfig.test.json index d1c3c57a18d..40c1407c0d6 100644 --- a/packages/typeclass/tsconfig.test.json +++ b/packages/typeclass/tsconfig.test.json @@ -3,7 +3,7 @@ "include": ["test"], "references": [ { "path": "tsconfig.src.json" }, - { "path": "../effect" } + { "path": "../vitest/tsconfig.src.json" }, ], "compilerOptions": { "tsBuildInfoFile": ".tsbuildinfo/test.tsbuildinfo", diff --git a/packages/typeclass/vitest.config.ts b/packages/typeclass/vitest.config.ts index 0411095f257..578d0667249 100644 --- a/packages/typeclass/vitest.config.ts +++ b/packages/typeclass/vitest.config.ts @@ -1,6 +1,6 @@ -import { mergeConfig, type UserConfigExport } from "vitest/config" +import { mergeConfig, type ViteUserConfig } from "vitest/config" import shared from "../../vitest.shared.js" -const config: UserConfigExport = {} +const config: ViteUserConfig = {} export default mergeConfig(shared, config) diff --git a/packages/vitest/README.md b/packages/vitest/README.md index cb875cc20bb..9e7f06b38fc 100644 --- a/packages/vitest/README.md +++ b/packages/vitest/README.md @@ -59,9 +59,8 @@ To write a test, place your assertions directly within the main effect. This ens In the following example, we test a function that divides two numbers, but fails if the divisor is zero. The goal is to check that the function returns the correct result when given valid input. ```ts -import { it } from "@effect/vitest" +import { it, expect } from "@effect/vitest" import { Effect } from "effect" -import { expect } from "vitest" // A simple divide function that returns an Effect, failing when dividing by zero function divide(a: number, b: number) { @@ -85,9 +84,8 @@ When you need to handle both success and failure cases in a test, you can use `E **Example** (Testing Success and Failure with `Exit`) ```ts -import { it } from "@effect/vitest" +import { it, expect } from "@effect/vitest" import { Effect, Exit } from "effect" -import { expect } from "vitest" // A function that divides two numbers and returns an Effect. // It fails if the divisor is zero. @@ -171,7 +169,7 @@ If you need to temporarily disable a test but don't want to delete or comment ou ```ts import { it } from "@effect/vitest" import { Effect, Exit } from "effect" -import { expect } from "vitest" +import { expect } from "@effect/vitest" function divide(a: number, b: number) { if (b === 0) return Effect.fail("Cannot divide by zero") @@ -196,7 +194,7 @@ When you're developing or debugging, it's often useful to run a specific test wi ```ts import { it } from "@effect/vitest" import { Effect, Exit } from "effect" -import { expect } from "vitest" +import { expect } from "@effect/vitest" function divide(a: number, b: number) { if (b === 0) return Effect.fail("Cannot divide by zero") diff --git a/packages/vitest/src/index.ts b/packages/vitest/src/index.ts index f8af07faec9..57b7daefcbf 100644 --- a/packages/vitest/src/index.ts +++ b/packages/vitest/src/index.ts @@ -11,6 +11,11 @@ import type * as TestServices from "effect/TestServices" import * as V from "vitest" import * as internal from "./internal.js" +/** + * @since 1.0.0 + */ +export * from "vitest" + /** * @since 1.0.0 */ @@ -239,8 +244,3 @@ export const makeMethods: (it: V.TestAPI) => Vitest.Methods = internal.makeMetho */ export const describeWrapped: (name: string, f: (it: Vitest.Methods) => void) => V.SuiteCollector = internal.describeWrapped - -/** - * @since 1.0.0 - */ -export * from "vitest" diff --git a/packages/vitest/test/equality-tester.test.ts b/packages/vitest/test/equality-tester.test.ts index 819e04d449b..df385fe4cae 100644 --- a/packages/vitest/test/equality-tester.test.ts +++ b/packages/vitest/test/equality-tester.test.ts @@ -1,9 +1,9 @@ +import { describe, expect, it } from "@effect/vitest" import * as Cause from "effect/Cause" import * as Data from "effect/Data" import * as Either from "effect/Either" import * as Exit from "effect/Exit" import * as Option from "effect/Option" -import { describe, expect, it } from "vitest" describe("toMatchObject", () => { it("plain objects", () => { diff --git a/packages/vitest/tsconfig.src.json b/packages/vitest/tsconfig.src.json index 8b0357d42df..79d2b34eb4c 100644 --- a/packages/vitest/tsconfig.src.json +++ b/packages/vitest/tsconfig.src.json @@ -1,7 +1,9 @@ { "extends": "../../tsconfig.base.json", "include": ["src"], - "references": [{ "path": "../effect" }], + "references": [ + { "path": "../effect/tsconfig.src.json" } + ], "compilerOptions": { "outDir": "build/src", "tsBuildInfoFile": ".tsbuildinfo/src.tsbuildinfo", diff --git a/packages/vitest/tsconfig.test.json b/packages/vitest/tsconfig.test.json index 24d66247527..f2d078bbe35 100644 --- a/packages/vitest/tsconfig.test.json +++ b/packages/vitest/tsconfig.test.json @@ -1,7 +1,9 @@ { "extends": "../../tsconfig.base.json", "include": ["test"], - "references": [{ "path": "tsconfig.src.json" }], + "references": [ + { "path": "tsconfig.src.json" } + ], "compilerOptions": { "tsBuildInfoFile": ".tsbuildinfo/test.tsbuildinfo", "rootDir": "test", diff --git a/packages/vitest/vitest.config.ts b/packages/vitest/vitest.config.ts index 0411095f257..578d0667249 100644 --- a/packages/vitest/vitest.config.ts +++ b/packages/vitest/vitest.config.ts @@ -1,6 +1,6 @@ -import { mergeConfig, type UserConfigExport } from "vitest/config" +import { mergeConfig, type ViteUserConfig } from "vitest/config" import shared from "../../vitest.shared.js" -const config: UserConfigExport = {} +const config: ViteUserConfig = {} export default mergeConfig(shared, config) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 68aab30d2ac..481933071c0 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -64,6 +64,9 @@ importers: '@effect/language-service': specifier: ^0.1.0 version: 0.1.0 + '@effect/vitest': + specifier: workspace:^ + version: link:packages/vitest/dist '@eslint/compat': specifier: 1.1.1 version: 1.1.1 diff --git a/setupTests.ts b/setupTests.ts index 62c5d033f98..fd3c87ec10f 100644 --- a/setupTests.ts +++ b/setupTests.ts @@ -1,3 +1,3 @@ -import * as it from "@effect/vitest" +import { addEqualityTesters } from "@effect/vitest" -it.addEqualityTesters() +addEqualityTesters() diff --git a/vitest.shared.ts b/vitest.shared.ts index 8503465f9fa..6e6d2b92697 100644 --- a/vitest.shared.ts +++ b/vitest.shared.ts @@ -1,17 +1,16 @@ import * as path from "node:path" -import type { UserConfig } from "vitest/config" +import type { ViteUserConfig } from "vitest/config" const alias = (pkg: string, dir = pkg) => { const name = pkg === "effect" ? "effect" : `@effect/${pkg}` - const target = process.env.TEST_DIST !== undefined ? "dist/dist/esm" : "src" + const target = process.env.TEST_DIST !== undefined ? path.join("dist", "dist", "esm") : "src" return ({ [`${name}/test`]: path.join(__dirname, "packages", dir, "test"), [`${name}`]: path.join(__dirname, "packages", dir, target) }) } -// This is a workaround, see https://github.com/vitest-dev/vitest/issues/4744 -const config: UserConfig = { +const config: ViteUserConfig = { esbuild: { target: "es2020" }, diff --git a/vitest.workspace.ts b/vitest.workspace.ts index 668e6aea516..53379c46b4c 100644 --- a/vitest.workspace.ts +++ b/vitest.workspace.ts @@ -1,29 +1,6 @@ -import * as path from "node:path" -import { defineWorkspace, type UserWorkspaceConfig } from "vitest/config" - -// Remaining issues: -// - Random failures (browser): https://github.com/vitest-dev/vitest/issues/4497 -// - Alias resolution (browser, has workaround): https://github.com/vitest-dev/vitest/issues/4744 -// - Workspace optimization: https://github.com/vitest-dev/vitest/issues/4746 - -// TODO: Once https://github.com/vitest-dev/vitest/issues/4497 and https://github.com/vitest-dev/vitest/issues/4746 -// are resolved, we can create specialized workspace groups in separate workspace files to better control test groups -// with different dependencies (e.g. playwright browser) in CI. - -// eslint-disable-next-line @typescript-eslint/no-unused-vars -const project = ( - config: UserWorkspaceConfig["test"] & { name: `${string}|${string}` }, - root = config.root ?? path.join(__dirname, `packages/${config.name.split("|").at(0)}`) -) => ({ - extends: "vitest.shared.ts", - test: { root, ...config } -}) +import { defineWorkspace } from "vitest/config" export default defineWorkspace([ - // Add specialized configuration for some packages. - // project({ name: "effect|browser", environment: "happy-dom" }), - // project({ name: "schema|browser", environment: "happy-dom" }), - // Add the default configuration for all packages. "packages/*", "packages/ai/*" ])