Merge Schema into Effect (#3772)

Effect-TS · Oct 20, 2024 · bff0e80 · bff0e80
1 parent 5388832
commit bff0e80
Show file tree

Hide file tree

Showing 540 changed files with 4,057 additions and 5,229 deletions.
diff --git a/.changeset/six-crabs-itch.md b/.changeset/six-crabs-itch.md
@@ -0,0 +1,75 @@
+---
+"effect": minor
+---
+
+Merge Schema into Effect.
+
+### Modules
+
+Before
+
+```ts
+import {
+  Arbitrary,
+  AST,
+  FastCheck,
+  JSONSchema,
+  ParseResult,
+  Pretty,
+  Schema
+} from "@effect/schema"
+```
+
+After
+
+```ts
+import {
+  Arbitrary,
+  SchemaAST, // changed
+  FastCheck,
+  JSONSchema,
+  ParseResult,
+  Pretty,
+  Schema
+} from "effect"
+```
+
+### Formatters
+
+`ArrayFormatter` / `TreeFormatter` merged into `ParseResult` module.
+
+Before
+
+```ts
+import { ArrayFormatter, TreeFormatter } from "@effect/schema"
+```
+
+After
+
+```ts
+import { ArrayFormatter, TreeFormatter } from "effect/ParseResult"
+```
+
+### Serializable
+
+Merged into `Schema` module.
+
+### Equivalence
+
+Merged into `Schema` module.
+
+Before
+
+```ts
+import { Equivalence } from "@effect/schema"
+
+Equivalence.make(myschema)
+```
+
+After
+
+```ts
+import { Schema } from "@effect/schema"
+
+Schema.equivalence(myschema)
+```
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -15,7 +15,6 @@
 /packages/printer-ansi/            @IMax153
 /packages/rpc/                     @tim-smart
 /packages/rpc-http/                @tim-smart
-/packages/schema/                  @gcanti
 /packages/sql/                     @tim-smart
 /packages/sql-mssql/               @tim-smart
 /packages/sql-mysql2/              @tim-smart

diff --git a/packages/ai/ai/docgen.json b/packages/ai/ai/docgen.json
@@ -1,51 +1,23 @@
 {
   "$schema": "../../../node_modules/@effect/docgen/schema.json",
-  "exclude": [
-    "src/internal/**/*.ts"
-  ],
+  "exclude": ["src/internal/**/*.ts"],
   "examplesCompilerOptions": {
     "noEmit": true,
     "strict": true,
     "skipLibCheck": true,
     "moduleResolution": "Bundler",
     "module": "ES2022",
     "target": "ES2022",
-    "lib": [
-      "ES2022",
-      "DOM",
-      "DOM.Iterable"
-    ],
+    "lib": ["ES2022", "DOM", "DOM.Iterable"],
     "paths": {
-      "effect": [
-        "../../../../effect/src/index.js"
-      ],
-      "effect/*": [
-        "../../../../effect/src/*.js"
-      ],
-      "@effect/platform": [
-        "../../../../platform/src/index.js"
-      ],
-      "@effect/platform/*": [
-        "../../../../platform/src/*.js"
-      ],
-      "@effect/schema": [
-        "../../../../schema/src/index.js"
-      ],
-      "@effect/schema/*": [
-        "../../../../schema/src/*.js"
-      ],
-      "@effect/ai": [
-        "../../../ai/src/index.js"
-      ],
-      "@effect/ai/*": [
-        "../../../ai/src/*.js"
-      ],
-      "@effect/ai-openai": [
-        "../../../ai-openai/src/index.js"
-      ],
-      "@effect/ai-openai/*": [
-        "../../../ai-openai/src/*.js"
-      ]
+      "effect": ["../../../../effect/src/index.js"],
+      "effect/*": ["../../../../effect/src/*.js"],
+      "@effect/platform": ["../../../../platform/src/index.js"],
+      "@effect/platform/*": ["../../../../platform/src/*.js"],
+      "@effect/ai": ["../../../ai/src/index.js"],
+      "@effect/ai/*": ["../../../ai/src/*.js"],
+      "@effect/ai-openai": ["../../../ai-openai/src/index.js"],
+      "@effect/ai-openai/*": ["../../../ai-openai/src/*.js"]
     }
   }
 }
diff --git a/packages/ai/ai/package.json b/packages/ai/ai/package.json
@@ -41,12 +41,10 @@
   "dependencies": {},
   "peerDependencies": {
     "@effect/platform": "workspace:^",
-    "@effect/schema": "workspace:^",
     "effect": "workspace:^"
   },
   "devDependencies": {
     "@effect/platform": "workspace:^",
-    "@effect/schema": "workspace:^",
     "effect": "workspace:^"
   }
 }
diff --git a/packages/ai/ai/src/AiChat.ts b/packages/ai/ai/src/AiChat.ts
@@ -1,12 +1,12 @@
 /**
  * @since 1.0.0
  */
-import type { ParseError } from "@effect/schema/ParseResult"
-import * as Schema from "@effect/schema/Schema"
 import * as Channel from "effect/Channel"
 import * as Chunk from "effect/Chunk"
 import * as Effect from "effect/Effect"
+import type { ParseError } from "effect/ParseResult"
 import * as Ref from "effect/Ref"
+import * as Schema from "effect/Schema"
 import * as Stream from "effect/Stream"
 import type { Concurrency } from "effect/Types"
 import type { AiError } from "./AiError.js"

diff --git a/packages/ai/ai/src/AiError.ts b/packages/ai/ai/src/AiError.ts
@@ -1,7 +1,7 @@
 /**
  * @since 1.0.0
  */
-import * as Schema from "@effect/schema/Schema"
+import * as Schema from "effect/Schema"
 
 /**
  * @since 1.0.0

diff --git a/packages/ai/ai/src/AiInput.ts b/packages/ai/ai/src/AiInput.ts
@@ -4,15 +4,15 @@
 import type { PlatformError } from "@effect/platform/Error"
 import * as FileSystem from "@effect/platform/FileSystem"
 import * as Path from "@effect/platform/Path"
-import * as ParseResult from "@effect/schema/ParseResult"
-import * as Schema_ from "@effect/schema/Schema"
 import * as Chunk from "effect/Chunk"
 import * as Context from "effect/Context"
 import * as Effect from "effect/Effect"
 import * as Encoding from "effect/Encoding"
 import { dual } from "effect/Function"
 import * as Option from "effect/Option"
+import * as ParseResult from "effect/ParseResult"
 import * as Predicate from "effect/Predicate"
+import * as Schema_ from "effect/Schema"
 import { AiResponse, ToolCallId, WithResolved } from "./AiResponse.js"
 import * as AiRole from "./AiRole.js"
 

diff --git a/packages/ai/ai/src/AiResponse.ts b/packages/ai/ai/src/AiResponse.ts
@@ -1,13 +1,13 @@
 /**
  * @since 1.0.0
  */
-import * as Schema from "@effect/schema/Schema"
 import * as Chunk from "effect/Chunk"
 import * as Data from "effect/Data"
 import * as Effect from "effect/Effect"
 import * as Iterable from "effect/Iterable"
 import * as Option from "effect/Option"
 import * as Predicate from "effect/Predicate"
+import * as Schema from "effect/Schema"
 import { AiError } from "./AiError.js"
 import * as AiRole from "./AiRole.js"
 

diff --git a/packages/ai/ai/src/AiRole.ts b/packages/ai/ai/src/AiRole.ts
@@ -1,8 +1,8 @@
 /**
  * @since 1.0.0
  */
-import * as Schema from "@effect/schema/Schema"
 import * as Option from "effect/Option"
+import * as Schema from "effect/Schema"
 
 /**
  * @since 1.0.0

diff --git a/packages/ai/ai/src/AiToolkit.ts b/packages/ai/ai/src/AiToolkit.ts
@@ -1,8 +1,6 @@
 /**
  * @since 1.0.0
  */
-import type * as Schema from "@effect/schema/Schema"
-import type * as Serializable from "@effect/schema/Serializable"
 import * as Context from "effect/Context"
 import * as Effect from "effect/Effect"
 import * as Effectable from "effect/Effectable"
@@ -11,6 +9,7 @@ import * as HashMap from "effect/HashMap"
 import * as Inspectable from "effect/Inspectable"
 import * as Layer from "effect/Layer"
 import { pipeArguments } from "effect/Pipeable"
+import type * as Schema from "effect/Schema"
 import type { Scope } from "effect/Scope"
 import type * as Types from "effect/Types"
 
@@ -82,27 +81,27 @@ export declare namespace Tool {
   export interface AnySchema {
     readonly [Schema.TypeId]: any
     readonly _tag: string
-    readonly Type: Serializable.SerializableWithResult.All
+    readonly Type: Schema.SerializableWithResult.All
     readonly success: Schema.Schema.Any
   }
 
   /**
    * @since 1.0.0
    * @category tool
    */
-  export type Success<Tool extends AnySchema> = Serializable.WithResult.Success<Tool["Type"]>
+  export type Success<Tool extends AnySchema> = Schema.WithResult.Success<Tool["Type"]>
 
   /**
    * @since 1.0.0
    * @category tool
    */
-  export type Failure<Tool extends AnySchema> = Serializable.WithResult.Failure<Tool["Type"]>
+  export type Failure<Tool extends AnySchema> = Schema.WithResult.Failure<Tool["Type"]>
 
   /**
    * @since 1.0.0
    * @category tool
    */
-  export type Context<Tool extends AnySchema> = Serializable.WithResult.Context<Tool["Type"]>
+  export type Context<Tool extends AnySchema> = Schema.WithResult.Context<Tool["Type"]>
 
   /**
    * @since 1.0.0

diff --git a/packages/ai/ai/src/Completions.ts b/packages/ai/ai/src/Completions.ts
@@ -2,13 +2,13 @@
  * @since 1.0.0
  */
 import * as JsonSchema from "@effect/platform/OpenApiJsonSchema"
-import * as AST from "@effect/schema/AST"
-import * as Schema from "@effect/schema/Schema"
 import * as Chunk from "effect/Chunk"
 import * as Context from "effect/Context"
 import * as Effect from "effect/Effect"
 import * as HashMap from "effect/HashMap"
 import * as Option from "effect/Option"
+import * as Schema from "effect/Schema"
+import * as AST from "effect/SchemaAST"
 import * as Stream from "effect/Stream"
 import type { Concurrency } from "effect/Types"
 import { AiError } from "./AiError.js"

diff --git a/packages/ai/ai/tsconfig.build.json b/packages/ai/ai/tsconfig.build.json
@@ -2,8 +2,7 @@
   "extends": "./tsconfig.src.json",
   "references": [
     { "path": "../../effect/tsconfig.build.json" },
-    { "path": "../../platform/tsconfig.build.json" },
-    { "path": "../../schema/tsconfig.build.json" }
+    { "path": "../../platform/tsconfig.build.json" }
   ],
   "compilerOptions": {
     "tsBuildInfoFile": ".tsbuildinfo/build.tsbuildinfo",

diff --git a/packages/ai/ai/tsconfig.src.json b/packages/ai/ai/tsconfig.src.json
@@ -1,11 +1,7 @@
 {
   "extends": "../../../tsconfig.base.json",
   "include": ["src"],
-  "references": [
-    { "path": "../../effect" },
-    { "path": "../../platform" },
-    { "path": "../../schema" }
-  ],
+  "references": [{ "path": "../../effect" }, { "path": "../../platform" }],
   "compilerOptions": {
     "tsBuildInfoFile": ".tsbuildinfo/src.tsbuildinfo",
     "rootDir": "src",

diff --git a/packages/ai/ai/tsconfig.test.json b/packages/ai/ai/tsconfig.test.json
@@ -5,7 +5,6 @@
     { "path": "tsconfig.src.json" },
     { "path": "../../effect" },
     { "path": "../../platform" },
-    { "path": "../../schema" },
     { "path": "../../vitest" }
   ],
   "compilerOptions": {

diff --git a/packages/ai/openai/docgen.json b/packages/ai/openai/docgen.json
@@ -1,58 +1,25 @@
 {
   "$schema": "../../../node_modules/@effect/docgen/schema.json",
-  "exclude": [
-    "src/Generated.ts",
-    "src/internal/**/*.ts"
-  ],
+  "exclude": ["src/Generated.ts", "src/internal/**/*.ts"],
   "examplesCompilerOptions": {
     "noEmit": true,
     "strict": true,
     "skipLibCheck": true,
     "moduleResolution": "Bundler",
     "module": "ES2022",
     "target": "ES2022",
-    "lib": [
-      "ES2022",
-      "DOM",
-      "DOM.Iterable"
-    ],
+    "lib": ["ES2022", "DOM", "DOM.Iterable"],
     "paths": {
-      "effect": [
-        "../../../../effect/src/index.js"
-      ],
-      "effect/*": [
-        "../../../../effect/src/*.js"
-      ],
-      "@effect/experimental": [
-        "../../../../experimental/src/index.js"
-      ],
-      "@effect/experimental/*": [
-        "../../../../experimental/src/*.js"
-      ],
-      "@effect/platform": [
-        "../../../../platform/src/index.js"
-      ],
-      "@effect/platform/*": [
-        "../../../../platform/src/*.js"
-      ],
-      "@effect/schema": [
-        "../../../../schema/src/index.js"
-      ],
-      "@effect/schema/*": [
-        "../../../../schema/src/*.js"
-      ],
-      "@effect/ai": [
-        "../../../ai/src/index.js"
-      ],
-      "@effect/ai/*": [
-        "../../../ai/src/*.js"
-      ],
-      "@effect/ai-openai": [
-        "../../../ai-openai/src/index.js"
-      ],
-      "@effect/ai-openai/*": [
-        "../../../ai-openai/src/*.js"
-      ]
+      "effect": ["../../../../effect/src/index.js"],
+      "effect/*": ["../../../../effect/src/*.js"],
+      "@effect/experimental": ["../../../../experimental/src/index.js"],
+      "@effect/experimental/*": ["../../../../experimental/src/*.js"],
+      "@effect/platform": ["../../../../platform/src/index.js"],
+      "@effect/platform/*": ["../../../../platform/src/*.js"],
+      "@effect/ai": ["../../../ai/src/index.js"],
+      "@effect/ai/*": ["../../../ai/src/*.js"],
+      "@effect/ai-openai": ["../../../ai-openai/src/index.js"],
+      "@effect/ai-openai/*": ["../../../ai-openai/src/*.js"]
     }
   }
 }