effect 4.0.0-beta.51 → 4.0.0-beta.52
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/Data.js +2 -2
- package/dist/Data.js.map +1 -1
- package/dist/Schema.d.ts +0 -1
- package/dist/Schema.d.ts.map +1 -1
- package/dist/Schema.js +82 -11
- package/dist/Schema.js.map +1 -1
- package/dist/index.d.ts +3 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +3 -0
- package/dist/index.js.map +1 -1
- package/dist/internal/schema/representation.js +1 -2
- package/dist/internal/schema/representation.js.map +1 -1
- package/dist/internal/schema/schema.d.ts.map +1 -1
- package/dist/internal/schema/schema.js +37 -0
- package/dist/internal/schema/schema.js.map +1 -1
- package/dist/unstable/ai/McpServer.d.ts.map +1 -1
- package/dist/unstable/ai/McpServer.js +7 -0
- package/dist/unstable/ai/McpServer.js.map +1 -1
- package/dist/unstable/cli/index.d.ts +2 -0
- package/dist/unstable/cli/index.d.ts.map +1 -1
- package/dist/unstable/cli/index.js +2 -0
- package/dist/unstable/cli/index.js.map +1 -1
- package/dist/unstable/httpapi/HttpApi.js.map +1 -1
- package/dist/unstable/httpapi/HttpApiBuilder.d.ts.map +1 -1
- package/dist/unstable/httpapi/HttpApiBuilder.js +11 -6
- package/dist/unstable/httpapi/HttpApiBuilder.js.map +1 -1
- package/dist/unstable/httpapi/HttpApiClient.d.ts +5 -6
- package/dist/unstable/httpapi/HttpApiClient.d.ts.map +1 -1
- package/dist/unstable/httpapi/HttpApiClient.js.map +1 -1
- package/dist/unstable/httpapi/HttpApiEndpoint.d.ts +17 -18
- package/dist/unstable/httpapi/HttpApiEndpoint.d.ts.map +1 -1
- package/dist/unstable/httpapi/HttpApiEndpoint.js +1 -2
- package/dist/unstable/httpapi/HttpApiEndpoint.js.map +1 -1
- package/dist/unstable/httpapi/HttpApiError.d.ts +28 -8
- package/dist/unstable/httpapi/HttpApiError.d.ts.map +1 -1
- package/dist/unstable/httpapi/HttpApiError.js +28 -15
- package/dist/unstable/httpapi/HttpApiError.js.map +1 -1
- package/dist/unstable/httpapi/HttpApiMiddleware.d.ts +4 -3
- package/dist/unstable/httpapi/HttpApiMiddleware.d.ts.map +1 -1
- package/dist/unstable/httpapi/HttpApiMiddleware.js +2 -2
- package/dist/unstable/httpapi/HttpApiMiddleware.js.map +1 -1
- package/dist/unstable/httpapi/OpenApi.js.map +1 -1
- package/package.json +1 -1
- package/src/Data.ts +1 -1
- package/src/Schema.ts +96 -12
- package/src/index.ts +3 -0
- package/src/internal/schema/representation.ts +1 -2
- package/src/internal/schema/schema.ts +43 -0
- package/src/unstable/ai/McpServer.ts +8 -0
- package/src/unstable/cli/index.ts +2 -0
- package/src/unstable/httpapi/HttpApi.ts +1 -1
- package/src/unstable/httpapi/HttpApiBuilder.ts +13 -6
- package/src/unstable/httpapi/HttpApiClient.ts +5 -6
- package/src/unstable/httpapi/HttpApiEndpoint.ts +6 -7
- package/src/unstable/httpapi/HttpApiError.ts +43 -22
- package/src/unstable/httpapi/HttpApiMiddleware.ts +6 -5
- package/src/unstable/httpapi/OpenApi.ts +1 -1
- package/dist/internal/schema/to-codec.d.ts +0 -2
- package/dist/internal/schema/to-codec.d.ts.map +0 -1
- package/dist/internal/schema/to-codec.js +0 -126
- package/dist/internal/schema/to-codec.js.map +0 -1
- package/src/internal/schema/to-codec.ts +0 -138
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HttpApiError.js","names":["Effect","ErrorReporter","
|
|
1
|
+
{"version":3,"file":"HttpApiError.js","names":["Data","Effect","ErrorReporter","hasProperty","Schema","HttpServerRespondable","HttpServerResponse","HttpApiSchema","badRequestResponse","empty","status","unauthorizedResponse","forbiddenResponse","notFoundResponse","methodNotAllowedResponse","notAcceptableResponse","requestTimeoutResponse","conflictResponse","goneResponse","internalServerErrorResponse","notImplementedResponse","serviceUnavailableResponse","BadRequest","ErrorClass","_tag","tag","description","httpApiStatus","ignore","symbol","succeed","singleton","BadRequestNoContent","pipe","asNoContent","decode","Unauthorized","UnauthorizedNoContent","Forbidden","ForbiddenNoContent","NotFound","NotFoundNoContent","MethodNotAllowed","MethodNotAllowedNoContent","NotAcceptable","NotAcceptableNoContent","RequestTimeout","RequestTimeoutNoContent","Conflict","ConflictNoContent","Gone","GoneNoContent","InternalServerError","InternalServerErrorNoContent","NotImplemented","NotImplementedNoContent","ServiceUnavailable","ServiceUnavailableNoContent","HttpApiSchemaErrorTypeId","HttpApiSchemaError","TaggedClass","is","u","wrap","kind","effect","mapError","error","cause","name","message"],"sources":["../../../src/unstable/httpapi/HttpApiError.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
import * as Context from "../../Context.ts";
|
|
5
5
|
import * as Effect from "../../Effect.ts";
|
|
6
6
|
import * as Layer from "../../Layer.ts";
|
|
7
|
-
import * as Schema from "../../Schema.ts";
|
|
7
|
+
import type * as Schema from "../../Schema.ts";
|
|
8
8
|
import { Scope } from "../../Scope.ts";
|
|
9
9
|
import type { unhandled } from "../../Types.ts";
|
|
10
10
|
import type * as HttpClientError from "../http/HttpClientError.ts";
|
|
@@ -13,6 +13,7 @@ import type * as HttpClientResponse from "../http/HttpClientResponse.ts";
|
|
|
13
13
|
import type * as HttpRouter from "../http/HttpRouter.ts";
|
|
14
14
|
import type { HttpServerResponse } from "../http/HttpServerResponse.ts";
|
|
15
15
|
import type * as HttpApiEndpoint from "./HttpApiEndpoint.ts";
|
|
16
|
+
import { HttpApiSchemaError } from "./HttpApiError.ts";
|
|
16
17
|
import type * as HttpApiGroup from "./HttpApiGroup.ts";
|
|
17
18
|
import type * as HttpApiSecurity from "./HttpApiSecurity.ts";
|
|
18
19
|
declare const TypeId = "~effect/httpapi/HttpApiMiddleware";
|
|
@@ -239,10 +240,10 @@ export declare const Service: <Self, Config extends {
|
|
|
239
240
|
* @since 4.0.0
|
|
240
241
|
* @category SchemaError transform
|
|
241
242
|
*/
|
|
242
|
-
export declare const layerSchemaErrorTransform: <Id, E extends ErrorConstraint, Requires>(service: Context.Service<Id, HttpApiMiddleware<never, E, Requires>>, transform: (error:
|
|
243
|
+
export declare const layerSchemaErrorTransform: <Id, E extends ErrorConstraint, Requires>(service: Context.Service<Id, HttpApiMiddleware<never, E, Requires>>, transform: (error: HttpApiSchemaError, context: {
|
|
243
244
|
readonly endpoint: HttpApiEndpoint.AnyWithProps;
|
|
244
245
|
readonly group: HttpApiGroup.AnyWithProps;
|
|
245
|
-
}) => Effect.Effect<HttpServerResponse, ErrorSchemaFromConstraint<E>["Type"] |
|
|
246
|
+
}) => Effect.Effect<HttpServerResponse, ErrorSchemaFromConstraint<E>["Type"] | HttpApiSchemaError, Requires | HttpRouter.Provided>) => Layer.Layer<Id>;
|
|
246
247
|
/**
|
|
247
248
|
* @since 4.0.0
|
|
248
249
|
* @category client
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HttpApiMiddleware.d.ts","sourceRoot":"","sources":["../../../src/unstable/httpapi/HttpApiMiddleware.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,OAAO,MAAM,kBAAkB,CAAA;AAC3C,OAAO,KAAK,MAAM,MAAM,iBAAiB,CAAA;AACzC,OAAO,KAAK,KAAK,MAAM,gBAAgB,CAAA;AAEvC,OAAO,KAAK,MAAM,MAAM,iBAAiB,CAAA;
|
|
1
|
+
{"version":3,"file":"HttpApiMiddleware.d.ts","sourceRoot":"","sources":["../../../src/unstable/httpapi/HttpApiMiddleware.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,8 +5,8 @@ import * as Context from "../../Context.js";
|
|
|
5
5
|
import * as Effect from "../../Effect.js";
|
|
6
6
|
import * as Layer from "../../Layer.js";
|
|
7
7
|
import { hasProperty } from "../../Predicate.js";
|
|
8
|
-
import * as Schema from "../../Schema.js";
|
|
9
8
|
import { Scope } from "../../Scope.js";
|
|
9
|
+
import { HttpApiSchemaError } from "./HttpApiError.js";
|
|
10
10
|
const TypeId = "~effect/httpapi/HttpApiMiddleware";
|
|
11
11
|
const SecurityTypeId = "~effect/httpapi/HttpApiMiddleware/Security";
|
|
12
12
|
/**
|
|
@@ -73,7 +73,7 @@ function getError(error) {
|
|
|
73
73
|
* @since 4.0.0
|
|
74
74
|
* @category SchemaError transform
|
|
75
75
|
*/
|
|
76
|
-
export const layerSchemaErrorTransform = (service, transform) => Layer.succeed(service, (httpEffect, options) => Effect.catch(httpEffect, e =>
|
|
76
|
+
export const layerSchemaErrorTransform = (service, transform) => Layer.succeed(service, (httpEffect, options) => Effect.catch(httpEffect, e => HttpApiSchemaError.is(e) ? transform(e, options) : Effect.fail(e)));
|
|
77
77
|
/**
|
|
78
78
|
* @since 4.0.0
|
|
79
79
|
* @category client
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HttpApiMiddleware.js","names":["Context","Effect","Layer","hasProperty","
|
|
1
|
+
{"version":3,"file":"HttpApiMiddleware.js","names":["Context","Effect","Layer","hasProperty","Scope","HttpApiSchemaError","TypeId","SecurityTypeId","isSecurity","u","Service","id","options","Err","globalThis","Error","limit","stackTraceLimit","creationError","self","Object","defineProperty","get","stack","error","getError","requiredForClient","security","undefined","keys","length","Set","Array","isArray","layerSchemaErrorTransform","service","transform","succeed","httpEffect","catch","e","is","fail","layerClient","tag","effectContext","gen","services","context","pipe","omit","middleware","isEffect","makeUnsafe","Map","key","updateContext","requestContext","merge"],"sources":["../../../src/unstable/httpapi/HttpApiMiddleware.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OpenApi.js","names":["Arr","Context","constFalse","JsonPatch","escapeToken","JsonSchema","Option","Schema","AST","SchemaRepresentation","HttpMethod","HttpApi","HttpApiEndpoint","HttpApiMiddleware","HttpApiSchema","Identifier","Service","Title","Version","Description","License","ExternalDocs","Servers","Format","Summary","Deprecated","Override","Exclude","Reference","defaultValue","Transform","servicesPartial","tags","entries","Object","options","context","empty","key","tag","undefined","add","annotations","identifier","title","version","description","license","summary","deprecated","externalDocs","servers","format","override","exclude","transform","apiCache","WeakMap","processAnnotation","ctx","annotation","f","o","getOption","isSome","value","fromApi","api","cached","get","spec","openapi","info","paths","components","schemas","securitySchemes","security","pathOps","reflect","onGroup","group","name","getOrElse","assign","transformFn","push","onEndpoint","endpoint","mergedAnnotations","middleware","op","operationId","topLevel","parameters","responses","path","replace","method","toLowerCase","processRequestBodies","payloadMap","size","c","hasContent","forEach","encoding","contentType","filtered","filter","s","isNoContent","ast","length","asts","map","getAST","Union","_tag","toEncodingAST","schema","requestBody","content","required","processResponseBodies","bodies","defaultDescription","status","descriptions","Array","from","join","String","processParameters","i","getLastEncoding","isObjects","ps","propertySignatures","in","isOptional","type","isSecurity","processHttpApiSecurity","makeSecurityScheme","hasBody","payload","params","entry","values","next","headers","query","extractResponseBodies","getSuccessSchemas","getStatusSuccess","resolveDescriptionOrIdentifier","getErrorSchemas","getStatusError","AdditionalSchemas","componentSchemas","componentSchema","resolveIdentifier","globalThis","Error","escapePath","isArrayNonEmpty","multiDocument","fromASTs","jsonSchemaMultiDocument","toMultiDocumentOpenApi3_1","toJsonSchemaMultiDocument","patchOps","oppath","definitions","definition","apply","keys","VALID_OPEN_API_COMPONENTS_SCHEMAS_KEY_REGEXP","test","set","getStatus","getDescription","Map","process","addNoContent","addContent","getResponseEncoding","statusMap","Set","contentTypeMap","resolveDescription","Uint8ArrayEncoding","annotate","persistedFileToBinaryEncoding","isDeclaration","typeConstructor","recur","meta","scheme","pipe","bearerFormat","getOrUndefined"],"sources":["../../../src/unstable/httpapi/OpenApi.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
|
1
|
+
{"version":3,"file":"OpenApi.js","names":["Arr","Context","constFalse","JsonPatch","escapeToken","JsonSchema","Option","Schema","AST","SchemaRepresentation","HttpMethod","HttpApi","HttpApiEndpoint","HttpApiMiddleware","HttpApiSchema","Identifier","Service","Title","Version","Description","License","ExternalDocs","Servers","Format","Summary","Deprecated","Override","Exclude","Reference","defaultValue","Transform","servicesPartial","tags","entries","Object","options","context","empty","key","tag","undefined","add","annotations","identifier","title","version","description","license","summary","deprecated","externalDocs","servers","format","override","exclude","transform","apiCache","WeakMap","processAnnotation","ctx","annotation","f","o","getOption","isSome","value","fromApi","api","cached","get","spec","openapi","info","paths","components","schemas","securitySchemes","security","pathOps","reflect","onGroup","group","name","getOrElse","assign","transformFn","push","onEndpoint","endpoint","mergedAnnotations","middleware","op","operationId","topLevel","parameters","responses","path","replace","method","toLowerCase","processRequestBodies","payloadMap","size","c","hasContent","forEach","encoding","contentType","filtered","filter","s","isNoContent","ast","length","asts","map","getAST","Union","_tag","toEncodingAST","schema","requestBody","content","required","processResponseBodies","bodies","defaultDescription","status","descriptions","Array","from","join","String","processParameters","i","getLastEncoding","isObjects","ps","propertySignatures","in","isOptional","type","isSecurity","processHttpApiSecurity","makeSecurityScheme","hasBody","payload","params","entry","values","next","headers","query","extractResponseBodies","getSuccessSchemas","getStatusSuccess","resolveDescriptionOrIdentifier","getErrorSchemas","getStatusError","AdditionalSchemas","componentSchemas","componentSchema","resolveIdentifier","globalThis","Error","escapePath","isArrayNonEmpty","multiDocument","fromASTs","jsonSchemaMultiDocument","toMultiDocumentOpenApi3_1","toJsonSchemaMultiDocument","patchOps","oppath","definitions","definition","apply","keys","VALID_OPEN_API_COMPONENTS_SCHEMAS_KEY_REGEXP","test","set","getStatus","getDescription","Map","process","addNoContent","addContent","getResponseEncoding","statusMap","Set","contentTypeMap","resolveDescription","Uint8ArrayEncoding","annotate","persistedFileToBinaryEncoding","isDeclaration","typeConstructor","recur","meta","scheme","pipe","bearerFormat","getOrUndefined"],"sources":["../../../src/unstable/httpapi/OpenApi.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
package/package.json
CHANGED
package/src/Data.ts
CHANGED
package/src/Schema.ts
CHANGED
|
@@ -103,7 +103,7 @@ import * as Equivalence from "./Equivalence.ts"
|
|
|
103
103
|
import * as Exit_ from "./Exit.ts"
|
|
104
104
|
import type { Formatter } from "./Formatter.ts"
|
|
105
105
|
import { format, formatPropertyKey } from "./Formatter.ts"
|
|
106
|
-
import { identity } from "./Function.ts"
|
|
106
|
+
import { identity, memoize } from "./Function.ts"
|
|
107
107
|
import * as HashMap_ from "./HashMap.ts"
|
|
108
108
|
import * as HashSet_ from "./HashSet.ts"
|
|
109
109
|
import * as core from "./internal/core.ts"
|
|
@@ -113,7 +113,6 @@ import * as InternalEquivalence from "./internal/schema/equivalence.ts"
|
|
|
113
113
|
import * as InternalStandard from "./internal/schema/representation.ts"
|
|
114
114
|
import * as InternalSchema from "./internal/schema/schema.ts"
|
|
115
115
|
import { SchemaError } from "./internal/schema/schema.ts"
|
|
116
|
-
import * as InternalToCodec from "./internal/schema/to-codec.ts"
|
|
117
116
|
import * as JsonPatch from "./JsonPatch.ts"
|
|
118
117
|
import * as JsonSchema from "./JsonSchema.ts"
|
|
119
118
|
import { remainder } from "./Number.ts"
|
|
@@ -4930,9 +4929,8 @@ export function instanceOf<C extends abstract new(...args: any) => any, Iso = In
|
|
|
4930
4929
|
* Used when building low-level AST transformations that bridge two schema types.
|
|
4931
4930
|
*
|
|
4932
4931
|
* @since 4.0.0
|
|
4933
|
-
* @experimental
|
|
4934
4932
|
*/
|
|
4935
|
-
export function link<T>() {
|
|
4933
|
+
export function link<T>() {
|
|
4936
4934
|
return <To extends Top>(
|
|
4937
4935
|
encodeTo: To,
|
|
4938
4936
|
transformation: {
|
|
@@ -11496,7 +11494,66 @@ export function toJsonSchemaDocument(schema: Top, options?: ToJsonSchemaOptions)
|
|
|
11496
11494
|
* @since 4.0.0
|
|
11497
11495
|
*/
|
|
11498
11496
|
export function toCodecJson<T, E, RD, RE>(schema: Codec<T, E, RD, RE>): Codec<T, Json, RD, RE> {
|
|
11499
|
-
return make(
|
|
11497
|
+
return make(toCodecJsonTop(schema.ast))
|
|
11498
|
+
}
|
|
11499
|
+
|
|
11500
|
+
const toCodecJsonTop = AST.toCodec((ast) => {
|
|
11501
|
+
const out = toCodecJsonBase(ast, toCodecJsonTop)
|
|
11502
|
+
return out !== ast && AST.isOptional(ast) ? AST.optionalKeyLastLink(out) : out
|
|
11503
|
+
})
|
|
11504
|
+
|
|
11505
|
+
function toCodecJsonBase(ast: AST.AST, recur: (ast: AST.AST) => AST.AST): AST.AST {
|
|
11506
|
+
switch (ast._tag) {
|
|
11507
|
+
case "Declaration": {
|
|
11508
|
+
const getLink = ast.annotations?.toCodecJson ?? ast.annotations?.toCodec
|
|
11509
|
+
if (Predicate.isFunction(getLink)) {
|
|
11510
|
+
const tps = AST.isDeclaration(ast)
|
|
11511
|
+
? ast.typeParameters.map((tp) => InternalSchema.make(AST.toEncoded(tp)))
|
|
11512
|
+
: []
|
|
11513
|
+
const link = getLink(tps)
|
|
11514
|
+
const to = recur(link.to)
|
|
11515
|
+
return AST.replaceEncoding(ast, to === link.to ? [link] : [new AST.Link(to, link.transformation)])
|
|
11516
|
+
}
|
|
11517
|
+
return AST.replaceEncoding(ast, [AST.unknownToNull])
|
|
11518
|
+
}
|
|
11519
|
+
case "Unknown":
|
|
11520
|
+
case "ObjectKeyword":
|
|
11521
|
+
return AST.replaceEncoding(ast, [AST.unknownToJson])
|
|
11522
|
+
case "Undefined":
|
|
11523
|
+
case "Void":
|
|
11524
|
+
case "Literal":
|
|
11525
|
+
case "Number":
|
|
11526
|
+
return ast.toCodecJson()
|
|
11527
|
+
case "UniqueSymbol":
|
|
11528
|
+
case "Symbol":
|
|
11529
|
+
case "BigInt":
|
|
11530
|
+
return ast.toCodecStringTree()
|
|
11531
|
+
case "Objects": {
|
|
11532
|
+
if (ast.propertySignatures.some((ps) => typeof ps.name !== "string")) {
|
|
11533
|
+
throw new globalThis.Error("Objects property names must be strings", { cause: ast })
|
|
11534
|
+
}
|
|
11535
|
+
return ast.recur(recur)
|
|
11536
|
+
}
|
|
11537
|
+
case "Union": {
|
|
11538
|
+
const sortedTypes = InternalSchema.jsonReorder(ast.types)
|
|
11539
|
+
if (sortedTypes !== ast.types) {
|
|
11540
|
+
return new AST.Union(
|
|
11541
|
+
sortedTypes,
|
|
11542
|
+
ast.mode,
|
|
11543
|
+
ast.annotations,
|
|
11544
|
+
ast.checks,
|
|
11545
|
+
ast.encoding,
|
|
11546
|
+
ast.context
|
|
11547
|
+
).recur(recur)
|
|
11548
|
+
}
|
|
11549
|
+
return ast.recur(recur)
|
|
11550
|
+
}
|
|
11551
|
+
case "Arrays":
|
|
11552
|
+
case "Suspend":
|
|
11553
|
+
return ast.recur(recur)
|
|
11554
|
+
}
|
|
11555
|
+
// `Schema.Any` is used as an escape hatch
|
|
11556
|
+
return ast
|
|
11500
11557
|
}
|
|
11501
11558
|
|
|
11502
11559
|
/**
|
|
@@ -11507,7 +11564,32 @@ export function toCodecJson<T, E, RD, RE>(schema: Codec<T, E, RD, RE>): Codec<T,
|
|
|
11507
11564
|
* @since 4.0.0
|
|
11508
11565
|
*/
|
|
11509
11566
|
export function toCodecIso<S extends Top>(schema: S): Codec<S["Type"], S["Iso"]> {
|
|
11510
|
-
return make(
|
|
11567
|
+
return make(toCodecIsoTop(AST.toType(schema.ast)))
|
|
11568
|
+
}
|
|
11569
|
+
|
|
11570
|
+
const toCodecIsoTop = memoize((ast: AST.AST): AST.AST => {
|
|
11571
|
+
const out = toCodecIsoBase(ast, toCodecIsoTop)
|
|
11572
|
+
return out !== ast && AST.isOptional(ast) ? AST.optionalKeyLastLink(out) : out
|
|
11573
|
+
})
|
|
11574
|
+
|
|
11575
|
+
function toCodecIsoBase(ast: AST.AST, recur: (ast: AST.AST) => AST.AST): AST.AST {
|
|
11576
|
+
switch (ast._tag) {
|
|
11577
|
+
case "Declaration": {
|
|
11578
|
+
const getLink = ast.annotations?.toCodecIso ?? ast.annotations?.toCodec
|
|
11579
|
+
if (Predicate.isFunction(getLink)) {
|
|
11580
|
+
const link = getLink(ast.typeParameters.map((tp) => InternalSchema.make(tp)))
|
|
11581
|
+
const to = recur(link.to)
|
|
11582
|
+
return AST.replaceEncoding(ast, to === link.to ? [link] : [new AST.Link(to, link.transformation)])
|
|
11583
|
+
}
|
|
11584
|
+
return ast
|
|
11585
|
+
}
|
|
11586
|
+
case "Arrays":
|
|
11587
|
+
case "Objects":
|
|
11588
|
+
case "Union":
|
|
11589
|
+
case "Suspend":
|
|
11590
|
+
return ast.recur(recur)
|
|
11591
|
+
}
|
|
11592
|
+
return ast
|
|
11511
11593
|
}
|
|
11512
11594
|
|
|
11513
11595
|
/**
|
|
@@ -11546,11 +11628,13 @@ export function toCodecStringTree<T, E, RD, RE>(
|
|
|
11546
11628
|
schema: Codec<T, E, RD, RE>,
|
|
11547
11629
|
options?: { readonly keepDeclarations?: boolean | undefined }
|
|
11548
11630
|
): Codec<T, unknown, RD, RE> {
|
|
11549
|
-
|
|
11550
|
-
|
|
11551
|
-
|
|
11552
|
-
|
|
11553
|
-
|
|
11631
|
+
return make(
|
|
11632
|
+
toCodecEnsureArray(
|
|
11633
|
+
options?.keepDeclarations === true
|
|
11634
|
+
? serializerStringTreeKeepDeclarations(schema.ast)
|
|
11635
|
+
: serializerStringTree(schema.ast)
|
|
11636
|
+
)
|
|
11637
|
+
)
|
|
11554
11638
|
}
|
|
11555
11639
|
|
|
11556
11640
|
type XmlEncoderOptions = {
|
|
@@ -11683,7 +11767,7 @@ function getStringTreePriority(ast: AST.AST): number {
|
|
|
11683
11767
|
}
|
|
11684
11768
|
}
|
|
11685
11769
|
|
|
11686
|
-
const treeReorder =
|
|
11770
|
+
const treeReorder = InternalSchema.makeReorder(getStringTreePriority)
|
|
11687
11771
|
|
|
11688
11772
|
function serializerTree(
|
|
11689
11773
|
ast: AST.AST,
|
package/src/index.ts
CHANGED
|
@@ -3528,6 +3528,7 @@ export * as SchemaAST from "./SchemaAST.ts"
|
|
|
3528
3528
|
* - Parse/stringify JSON → {@link parseJson}, {@link stringifyJson}
|
|
3529
3529
|
* - Encode/decode Base64 → {@link encodeBase64}, {@link decodeBase64}, {@link decodeBase64String}
|
|
3530
3530
|
* - Encode/decode Hex → {@link encodeHex}, {@link decodeHex}, {@link decodeHexString}
|
|
3531
|
+
* - Encode/decode URI components → {@link encodeUriComponent}, {@link decodeUriComponent}
|
|
3531
3532
|
* - Parse DateTime → {@link dateTimeUtcFromInput}
|
|
3532
3533
|
* - Decode/encode FormData → {@link decodeFormData}, {@link encodeFormData}
|
|
3533
3534
|
* - Decode/encode URLSearchParams → {@link decodeURLSearchParams}, {@link encodeURLSearchParams}
|
|
@@ -3795,6 +3796,8 @@ export * as SchemaRepresentation from "./SchemaRepresentation.ts"
|
|
|
3795
3796
|
* - Wrap nullable/optional as Option → {@link optionFromNullOr}, {@link optionFromOptionalKey}, {@link optionFromOptional}
|
|
3796
3797
|
* - Parse URLs → {@link urlFromString}
|
|
3797
3798
|
* - Base64 ↔ Uint8Array → {@link uint8ArrayFromBase64String}
|
|
3799
|
+
* - Base64 ↔ string → {@link stringFromBase64String}
|
|
3800
|
+
* - URI component ↔ string → {@link stringFromUriComponent}
|
|
3798
3801
|
* - JSON string ↔ unknown → {@link fromJsonString}
|
|
3799
3802
|
* - FormData/URLSearchParams ↔ unknown → {@link fromFormData}, {@link fromURLSearchParams}
|
|
3800
3803
|
* - Check if a value is a Transformation → {@link isTransformation}
|
|
@@ -11,7 +11,6 @@ import * as AST from "../../SchemaAST.ts"
|
|
|
11
11
|
import type * as SchemaRepresentation from "../../SchemaRepresentation.ts"
|
|
12
12
|
import * as InternalAnnotations from "./annotations.ts"
|
|
13
13
|
import * as InternalSchema from "./schema.ts"
|
|
14
|
-
import * as InternalToCodec from "./to-codec.ts"
|
|
15
14
|
|
|
16
15
|
/** @internal */
|
|
17
16
|
export function fromAST(ast: AST.AST): SchemaRepresentation.Document {
|
|
@@ -213,7 +212,7 @@ export function fromASTs(asts: readonly [AST.AST, ...Array<AST.AST>]): SchemaRep
|
|
|
213
212
|
...annotations
|
|
214
213
|
}
|
|
215
214
|
case "Union": {
|
|
216
|
-
const types =
|
|
215
|
+
const types = InternalSchema.jsonReorder(last.types)
|
|
217
216
|
return {
|
|
218
217
|
_tag: last._tag,
|
|
219
218
|
types: types.map((ast) => recur(ast)),
|
|
@@ -42,6 +42,7 @@ export function make<S extends Schema.Top>(ast: S["ast"], options?: object): S {
|
|
|
42
42
|
/** @internal */
|
|
43
43
|
export const SchemaErrorTypeId = "~effect/Schema/SchemaError"
|
|
44
44
|
|
|
45
|
+
// not internal
|
|
45
46
|
export class SchemaError {
|
|
46
47
|
readonly [SchemaErrorTypeId] = SchemaErrorTypeId
|
|
47
48
|
readonly _tag = "SchemaError"
|
|
@@ -57,3 +58,45 @@ export class SchemaError {
|
|
|
57
58
|
return `SchemaError(${this.message})`
|
|
58
59
|
}
|
|
59
60
|
}
|
|
61
|
+
|
|
62
|
+
/** @internal */
|
|
63
|
+
export const jsonReorder = makeReorder(getJsonPriority)
|
|
64
|
+
|
|
65
|
+
function getJsonPriority(ast: AST.AST): number {
|
|
66
|
+
switch (ast._tag) {
|
|
67
|
+
case "BigInt":
|
|
68
|
+
case "Symbol":
|
|
69
|
+
case "UniqueSymbol":
|
|
70
|
+
return 0
|
|
71
|
+
default:
|
|
72
|
+
return 1
|
|
73
|
+
}
|
|
74
|
+
}
|
|
75
|
+
|
|
76
|
+
/** @internal */
|
|
77
|
+
export function makeReorder(getPriority: (ast: AST.AST) => number) {
|
|
78
|
+
return (types: ReadonlyArray<AST.AST>): ReadonlyArray<AST.AST> => {
|
|
79
|
+
// Create a map of original indices for O(1) lookup
|
|
80
|
+
const indexMap = new Map<AST.AST, number>()
|
|
81
|
+
for (let i = 0; i < types.length; i++) {
|
|
82
|
+
indexMap.set(AST.toEncoded(types[i]), i)
|
|
83
|
+
}
|
|
84
|
+
|
|
85
|
+
// Create a sorted copy of the types array
|
|
86
|
+
const sortedTypes = [...types].sort((a, b) => {
|
|
87
|
+
a = AST.toEncoded(a)
|
|
88
|
+
b = AST.toEncoded(b)
|
|
89
|
+
const pa = getPriority(a)
|
|
90
|
+
const pb = getPriority(b)
|
|
91
|
+
if (pa !== pb) return pa - pb
|
|
92
|
+
// If priorities are equal, maintain original order (stable sort)
|
|
93
|
+
return indexMap.get(a)! - indexMap.get(b)!
|
|
94
|
+
})
|
|
95
|
+
|
|
96
|
+
// Check if order changed by comparing arrays
|
|
97
|
+
const orderChanged = sortedTypes.some((ast, index) => ast !== types[index])
|
|
98
|
+
|
|
99
|
+
if (!orderChanged) return types
|
|
100
|
+
return sortedTypes
|
|
101
|
+
}
|
|
102
|
+
}
|
|
@@ -383,6 +383,14 @@ export const run: (options: {
|
|
|
383
383
|
const initializePayload = getInitializedClient(clientSessions, client.id, headers)
|
|
384
384
|
const isInitialize = rpc._tag === "initialize"
|
|
385
385
|
if (!isInitialize && !initializePayload) {
|
|
386
|
+
const fiber = Fiber.getCurrent()!
|
|
387
|
+
const httpRequest = Context.getOrUndefined(fiber.context, HttpServerRequest.HttpServerRequest)
|
|
388
|
+
if (httpRequest) {
|
|
389
|
+
appendPreResponseHandlerUnsafe(
|
|
390
|
+
httpRequest,
|
|
391
|
+
() => Effect.succeed(HttpServerResponse.empty({ status: 404 }))
|
|
392
|
+
)
|
|
393
|
+
}
|
|
386
394
|
return Effect.die(new Error(`Mcp-Session-Id does not exist`))
|
|
387
395
|
}
|
|
388
396
|
return Effect.provideService(
|
|
@@ -255,7 +255,7 @@ export const reflect = <Id extends string, Groups extends HttpApiGroup.Any>(
|
|
|
255
255
|
// -------------------------------------------------------------------------------------
|
|
256
256
|
|
|
257
257
|
const extractResponseContent = (
|
|
258
|
-
schemas:
|
|
258
|
+
schemas: Array<Schema.Top>,
|
|
259
259
|
getStatus: (ast: AST.AST) => number
|
|
260
260
|
): ReadonlyMap<number, [Schema.Top, ...Array<Schema.Top>]> => {
|
|
261
261
|
const map = new Map<number, [Schema.Top, ...Array<Schema.Top>]>()
|
|
@@ -36,6 +36,7 @@ import * as Multipart from "../http/Multipart.ts"
|
|
|
36
36
|
import * as UrlParams from "../http/UrlParams.ts"
|
|
37
37
|
import type * as HttpApi from "./HttpApi.ts"
|
|
38
38
|
import * as HttpApiEndpoint from "./HttpApiEndpoint.ts"
|
|
39
|
+
import { HttpApiSchemaError } from "./HttpApiError.ts"
|
|
39
40
|
import type * as HttpApiGroup from "./HttpApiGroup.ts"
|
|
40
41
|
import * as HttpApiMiddleware from "./HttpApiMiddleware.ts"
|
|
41
42
|
import * as HttpApiSchema from "./HttpApiSchema.ts"
|
|
@@ -589,13 +590,13 @@ function handlerToHttpEffect(
|
|
|
589
590
|
group
|
|
590
591
|
}
|
|
591
592
|
if (decodeParams) {
|
|
592
|
-
request.params = yield* decodeParams(routeContext.params)
|
|
593
|
+
request.params = yield* HttpApiSchemaError.wrap("Params", decodeParams(routeContext.params))
|
|
593
594
|
}
|
|
594
595
|
if (decodeHeaders) {
|
|
595
|
-
request.headers = yield* decodeHeaders(httpRequest.headers)
|
|
596
|
+
request.headers = yield* HttpApiSchemaError.wrap("Headers", decodeHeaders(httpRequest.headers))
|
|
596
597
|
}
|
|
597
598
|
if (decodeQuery) {
|
|
598
|
-
request.query = yield* decodeQuery(query)
|
|
599
|
+
request.query = yield* HttpApiSchemaError.wrap("Query", decodeQuery(query))
|
|
599
600
|
}
|
|
600
601
|
if (payloadBy) {
|
|
601
602
|
const result = decodePayload(payloadBy, httpRequest, query)
|
|
@@ -603,15 +604,20 @@ function handlerToHttpEffect(
|
|
|
603
604
|
return result
|
|
604
605
|
}
|
|
605
606
|
if (result !== undefined) {
|
|
606
|
-
request.payload = yield* result
|
|
607
|
+
request.payload = yield* HttpApiSchemaError.wrap("Payload", result)
|
|
607
608
|
}
|
|
608
609
|
}
|
|
609
610
|
const response = yield* handler(request)
|
|
610
|
-
return Response.isHttpServerResponse(response)
|
|
611
|
+
return Response.isHttpServerResponse(response)
|
|
612
|
+
? response
|
|
613
|
+
: yield* HttpApiSchemaError.wrap("Body", encodeSuccess(response))
|
|
611
614
|
})
|
|
612
615
|
).pipe(
|
|
613
616
|
Effect.withErrorReporting,
|
|
614
|
-
Effect.catch((error) =>
|
|
617
|
+
Effect.catch((error) => {
|
|
618
|
+
if (HttpApiSchemaError.is(error)) return Effect.die(error)
|
|
619
|
+
return Effect.orDie(encodeError(error))
|
|
620
|
+
}),
|
|
615
621
|
Effect.provideContext(context)
|
|
616
622
|
)
|
|
617
623
|
}
|
|
@@ -719,6 +725,7 @@ function makeSuccessSchema(endpoint: HttpApiEndpoint.AnyWithProps): Schema.Encod
|
|
|
719
725
|
|
|
720
726
|
function makeErrorSchema(endpoint: HttpApiEndpoint.AnyWithProps): Schema.Encoder<HttpServerResponse, unknown> {
|
|
721
727
|
const schemas = HttpApiEndpoint.getErrorSchemas(endpoint).map(toResponseErrorSchema)
|
|
728
|
+
if (schemas.length === 0) return Schema.Never
|
|
722
729
|
return schemas.length === 1 ? schemas[0] : Schema.Union(schemas)
|
|
723
730
|
}
|
|
724
731
|
|