upgrade effect

BBB · Sep 20, 2023 · 3ed260b · 3ed260b
1 parent 977704f
commit 3ed260b
Show file tree

Hide file tree

Showing 26 changed files with 68 additions and 67 deletions.
diff --git a/packages/builder/package.json b/packages/builder/package.json
@@ -18,13 +18,13 @@
     "@ollierelph/openapi-visitor": "workspace:*"
   },
   "devDependencies": {
-    "@effect/data": "^0.14.0",
-    "@effect/schema": "^0.19.3",
+    "@effect/data": "^0.18.5",
+    "@effect/schema": "^0.36.3",
     "@types/node": "^18.16.1",
     "ts-pattern": "^5.0.1"
   },
   "peerDependencies": {
-    "@effect/data": "^0.14.0",
-    "@effect/schema": "^0.19.3"
+    "@effect/data": "^0.18.5",
+    "@effect/schema": "^0.36.3"
   }
 }
diff --git a/packages/parser/package.json b/packages/parser/package.json
@@ -16,12 +16,12 @@
   "dependencies": {
   },
   "devDependencies": {
-    "@effect/data": "^0.14.0",
-    "@effect/schema": "^0.19.3",
+    "@effect/data": "^0.18.5",
+    "@effect/schema": "^0.36.3",
     "@types/node": "^18.16.1"
   },
   "peerDependencies": {
-    "@effect/data": "^0.14.0",
-    "@effect/schema": "^0.19.3"
+    "@effect/data": "^0.18.5",
+    "@effect/schema": "^0.36.3"
   }
 }
diff --git a/packages/parser/src/parsers/effect-schema/schemas/CallbackObject.ts b/packages/parser/src/parsers/effect-schema/schemas/CallbackObject.ts
@@ -6,4 +6,4 @@ import { PathItemObjectCodec } from "./PathItemObject";
 export const CallbackObjectCodec = S.lazy(() =>
   S.record(S.string, referenceOr(PathItemObjectCodec)),
 );
-export type CallbackObject = S.To<typeof CallbackObjectCodec>;
+export type CallbackObject = S.Schema.To<typeof CallbackObjectCodec>;
diff --git a/packages/parser/src/parsers/effect-schema/schemas/ComponentsObject.ts b/packages/parser/src/parsers/effect-schema/schemas/ComponentsObject.ts
@@ -36,4 +36,4 @@ export const ComponentsObjectCodec = S.struct({
   pathItems: S.optional(S.record(restrictedStringKey, S.any)),
 });
 
-export type ComponentsObject = S.To<typeof ComponentsObjectCodec>;
+export type ComponentsObject = S.Schema.To<typeof ComponentsObjectCodec>;
diff --git a/packages/parser/src/parsers/effect-schema/schemas/ContactObject.ts b/packages/parser/src/parsers/effect-schema/schemas/ContactObject.ts
@@ -9,4 +9,4 @@ export const ContactObjectCodec = S.optional(
     email: S.optional(email),
   }),
 );
-export type ContactObject = S.To<typeof ContactObjectCodec>;
+export type ContactObject = S.Schema.To<typeof ContactObjectCodec>;
diff --git a/packages/parser/src/parsers/effect-schema/schemas/ContentObject.ts b/packages/parser/src/parsers/effect-schema/schemas/ContentObject.ts
@@ -2,4 +2,4 @@ import * as S from "@effect/schema/Schema";
 import { MediaTypeObjectCodec } from "./MediaTypeObject";
 
 export const ContentObjectCodec = S.record(S.string, MediaTypeObjectCodec);
-export type ContentObject = S.To<typeof ContentObjectCodec>;
+export type ContentObject = S.Schema.To<typeof ContentObjectCodec>;
diff --git a/packages/parser/src/parsers/effect-schema/schemas/EncodingObject.ts b/packages/parser/src/parsers/effect-schema/schemas/EncodingObject.ts
@@ -8,4 +8,4 @@ export const EncodingObjectCodec = S.struct({
   explode: S.optional(S.boolean),
   allowReserved: S.optional(S.boolean),
 });
-export type EncodingObject = S.To<typeof EncodingObjectCodec>;
+export type EncodingObject = S.Schema.To<typeof EncodingObjectCodec>;
diff --git a/packages/parser/src/parsers/effect-schema/schemas/ExampleObject.ts b/packages/parser/src/parsers/effect-schema/schemas/ExampleObject.ts
@@ -6,4 +6,4 @@ export const ExampleObjectCodec = S.struct({
   value: S.any,
   externalValue: S.string,
 });
-export type ExampleObject = S.To<typeof ExampleObjectCodec>;
+export type ExampleObject = S.Schema.To<typeof ExampleObjectCodec>;
diff --git a/packages/parser/src/parsers/effect-schema/schemas/ExternalDocumentationObject.ts b/packages/parser/src/parsers/effect-schema/schemas/ExternalDocumentationObject.ts
@@ -5,6 +5,6 @@ export const ExternalDocumentationObjectCodec = S.struct({
   description: S.optional(S.string),
   url: url,
 });
-export type ExternalDocumentationObject = S.To<
+export type ExternalDocumentationObject = S.Schema.To<
   typeof ExternalDocumentationObjectCodec
 >;
diff --git a/packages/parser/src/parsers/effect-schema/schemas/HeaderObject.ts b/packages/parser/src/parsers/effect-schema/schemas/HeaderObject.ts
@@ -5,4 +5,4 @@ export const HeaderObjectCodec = S.struct({
   deprecated: S.optional(S.boolean),
   allowEmptyValue: S.optional(S.boolean),
 });
-export type HeaderObject = S.To<typeof HeaderObjectCodec>;
+export type HeaderObject = S.Schema.To<typeof HeaderObjectCodec>;
diff --git a/packages/parser/src/parsers/effect-schema/schemas/InfoObject.ts b/packages/parser/src/parsers/effect-schema/schemas/InfoObject.ts
@@ -14,4 +14,4 @@ export const InfoObjectCodec = S.struct({
   license: LicenseObjectCodec,
   version: S.optional(S.string),
 });
-export type InfoObject = S.To<typeof InfoObjectCodec>;
+export type InfoObject = S.Schema.To<typeof InfoObjectCodec>;
diff --git a/packages/parser/src/parsers/effect-schema/schemas/LicenseObject.ts b/packages/parser/src/parsers/effect-schema/schemas/LicenseObject.ts
@@ -7,4 +7,4 @@ export const LicenseObjectCodec = S.optional(
     url: S.optional(url),
   }),
 );
-export type LicenseObject = S.To<typeof LicenseObjectCodec>;
+export type LicenseObject = S.Schema.To<typeof LicenseObjectCodec>;
diff --git a/packages/parser/src/parsers/effect-schema/schemas/LinkObject.ts b/packages/parser/src/parsers/effect-schema/schemas/LinkObject.ts
@@ -9,4 +9,4 @@ export const LinkObjectCodec = S.struct({
   description: S.optional(S.string),
   server: S.optional(ServerObject),
 });
-export type LinkObject = S.To<typeof LinkObjectCodec>;
+export type LinkObject = S.Schema.To<typeof LinkObjectCodec>;
diff --git a/packages/parser/src/parsers/effect-schema/schemas/MediaTypeObject.ts b/packages/parser/src/parsers/effect-schema/schemas/MediaTypeObject.ts
@@ -8,7 +8,7 @@ const MediaTypeCommon = S.struct({
   schema: S.optional(referenceOr(SchemaObjectCodec)),
   encoding: S.optional(S.record(S.string, referenceOr(EncodingObjectCodec))),
 });
-type MediaTypeCommon = S.To<typeof MediaTypeCommon>;
+type MediaTypeCommon = S.Schema.To<typeof MediaTypeCommon>;
 export const MediaTypeObjectCodec = S.union(
   S.extend(MediaTypeCommon)(
     S.struct({
@@ -21,4 +21,4 @@ export const MediaTypeObjectCodec = S.union(
     }),
   ),
 );
-export type MediaTypeObject = S.To<typeof MediaTypeObjectCodec>;
+export type MediaTypeObject = S.Schema.To<typeof MediaTypeObjectCodec>;
diff --git a/packages/parser/src/parsers/effect-schema/schemas/OpenApiObject.ts b/packages/parser/src/parsers/effect-schema/schemas/OpenApiObject.ts
@@ -12,7 +12,7 @@ export const OpenApiObjectCodec = S.struct({
   components: S.optional(ComponentsObjectCodec),
   paths: S.optional(PathsObjectCodec),
 });
-export type OpenApiObject = S.To<typeof OpenApiObjectCodec>;
+export type OpenApiObject = S.Schema.To<typeof OpenApiObjectCodec>;
 
 export function buildOpenApi(): OpenApiObject {
   return {
@@ -81,13 +81,13 @@ export function buildOpenApi(): OpenApiObject {
           type: "object",
           properties: {
             foo: {
-              "type": "string"
+              type: "string",
             },
             bingo: {
-              "type": "number"
-            }
+              type: "number",
+            },
           },
-          required: ["foo"]
+          required: ["foo"],
         },
       },
     },

diff --git a/packages/parser/src/parsers/effect-schema/schemas/ParameterObject.ts b/packages/parser/src/parsers/effect-schema/schemas/ParameterObject.ts
@@ -13,4 +13,4 @@ export const ParameterObjectCodec = S.struct({
   deprecated: S.optional(S.boolean),
   allowEmptyValue: S.optional(S.boolean),
 });
-export type ParameterObject = S.To<typeof ParameterObjectCodec>;
+export type ParameterObject = S.Schema.To<typeof ParameterObjectCodec>;
diff --git a/packages/parser/src/parsers/effect-schema/schemas/PathsObject.ts b/packages/parser/src/parsers/effect-schema/schemas/PathsObject.ts
@@ -6,4 +6,4 @@ export const PathsObjectCodec = S.record(
   S.string,
   referenceOr(PathItemObjectCodec),
 );
-export type PathsObject = S.To<typeof PathsObjectCodec>;
+export type PathsObject = S.Schema.To<typeof PathsObjectCodec>;
diff --git a/packages/parser/src/parsers/effect-schema/schemas/ReferenceObject.ts b/packages/parser/src/parsers/effect-schema/schemas/ReferenceObject.ts
@@ -25,7 +25,7 @@ export const localRef = S.templateLiteral(
  * https://spec.openapis.org/oas/latest.html#reference-object
  */
 export const ReferenceObjectCodec = S.struct({ $ref: localRef });
-export type ReferenceObject = S.To<typeof ReferenceObjectCodec>;
+export type ReferenceObject = S.Schema.To<typeof ReferenceObjectCodec>;
 export const isReferenceObject = S.is(ReferenceObjectCodec);
 export const referenceOr = <Members extends readonly S.Schema<any, any>[]>(
   ...members: Members

diff --git a/packages/parser/src/parsers/effect-schema/schemas/RequestBodyObject.ts b/packages/parser/src/parsers/effect-schema/schemas/RequestBodyObject.ts
@@ -6,4 +6,4 @@ export const RequestBodyObjectCodec = S.struct({
   content: S.record(S.string, MediaTypeObjectCodec),
   required: S.optional(S.boolean),
 });
-export type RequestBodyObject = S.To<typeof RequestBodyObjectCodec>;
+export type RequestBodyObject = S.Schema.To<typeof RequestBodyObjectCodec>;
diff --git a/packages/parser/src/parsers/effect-schema/schemas/ResponseObject.ts b/packages/parser/src/parsers/effect-schema/schemas/ResponseObject.ts
@@ -12,4 +12,4 @@ export const ResponseObjectCodec = S.struct({
   content: S.optional(ContentObjectCodec),
   links: S.optional(S.record(S.string, LinkObjectCodec)),
 });
-export type ResponseObject = S.To<typeof ResponseObjectCodec>;
+export type ResponseObject = S.Schema.To<typeof ResponseObjectCodec>;
diff --git a/packages/parser/src/parsers/effect-schema/schemas/ResponsesObject.ts b/packages/parser/src/parsers/effect-schema/schemas/ResponsesObject.ts
@@ -7,4 +7,4 @@ export const ResponsesObjectCodec = S.record(
   restrictedStringKey,
   referenceOr(ResponseObjectCodec),
 );
-export type ResponsesObject = S.To<typeof ResponsesObjectCodec>;
+export type ResponsesObject = S.Schema.To<typeof ResponsesObjectCodec>;
diff --git a/packages/parser/src/parsers/effect-schema/schemas/SchemaObject.ts b/packages/parser/src/parsers/effect-schema/schemas/SchemaObject.ts
@@ -7,7 +7,7 @@ type SchemaCommon = {
   readonly description?: string;
   readonly default?: any;
   readonly nullable?: boolean;
-  readonly format?: S.To<typeof format>;
+  readonly format?: S.Schema.To<typeof format>;
 };
 export type SchemaObject =
   | (SchemaCommon &

diff --git a/packages/parser/src/parsers/effect-schema/schemas/SecurityRequirementObject.ts b/packages/parser/src/parsers/effect-schema/schemas/SecurityRequirementObject.ts
@@ -4,6 +4,6 @@ export const SecurityRequirementObjectCodec = S.record(
   S.string,
   S.array(S.string),
 );
-export type SecurityRequirementObject = S.To<
+export type SecurityRequirementObject = S.Schema.To<
   typeof SecurityRequirementObjectCodec
 >;
diff --git a/packages/parser/src/parsers/effect-schema/schemas/ServerObject.ts b/packages/parser/src/parsers/effect-schema/schemas/ServerObject.ts
@@ -16,4 +16,4 @@ export const ServerObject = S.struct({
   description: S.optional(S.string),
   variables: ServerVariablesObjectCodec,
 });
-export type ServerObject = S.To<typeof ServerObject>;
+export type ServerObject = S.Schema.To<typeof ServerObject>;
diff --git a/packages/visitor/package.json b/packages/visitor/package.json
@@ -17,12 +17,12 @@
     "@ollierelph/openapi-parser": "workspace:*"
   },
   "devDependencies": {
-    "@effect/data": "^0.14.0",
-    "@effect/schema": "^0.19.3",
+    "@effect/data": "^0.18.5",
+    "@effect/schema": "^0.36.3",
     "@types/node": "^18.16.1"
   },
   "peerDependencies": {
-    "@effect/data": "^0.14.0",
-    "@effect/schema": "^0.19.3"
+    "@effect/data": "^0.18.5",
+    "@effect/schema": "^0.36.3"
   }
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml