@effect/platform 0.71.1 → 0.71.3
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/cjs/HttpApi.js +6 -8
- package/dist/cjs/HttpApi.js.map +1 -1
- package/dist/cjs/HttpApiEndpoint.js +7 -9
- package/dist/cjs/HttpApiEndpoint.js.map +1 -1
- package/dist/cjs/HttpApiGroup.js +4 -6
- package/dist/cjs/HttpApiGroup.js.map +1 -1
- package/dist/cjs/HttpApiSchema.js +25 -1
- package/dist/cjs/HttpApiSchema.js.map +1 -1
- package/dist/cjs/OpenApiJsonSchema.js +2 -1
- package/dist/cjs/OpenApiJsonSchema.js.map +1 -1
- package/dist/dts/HttpApi.d.ts.map +1 -1
- package/dist/dts/HttpApiEndpoint.d.ts.map +1 -1
- package/dist/dts/HttpApiGroup.d.ts.map +1 -1
- package/dist/dts/HttpApiSchema.d.ts +5 -0
- package/dist/dts/HttpApiSchema.d.ts.map +1 -1
- package/dist/dts/OpenApiJsonSchema.d.ts +16 -3
- package/dist/dts/OpenApiJsonSchema.d.ts.map +1 -1
- package/dist/esm/HttpApi.js +6 -8
- package/dist/esm/HttpApi.js.map +1 -1
- package/dist/esm/HttpApiEndpoint.js +7 -9
- package/dist/esm/HttpApiEndpoint.js.map +1 -1
- package/dist/esm/HttpApiGroup.js +4 -6
- package/dist/esm/HttpApiGroup.js.map +1 -1
- package/dist/esm/HttpApiSchema.js +23 -0
- package/dist/esm/HttpApiSchema.js.map +1 -1
- package/dist/esm/OpenApiJsonSchema.js +2 -1
- package/dist/esm/OpenApiJsonSchema.js.map +1 -1
- package/package.json +2 -2
- package/src/HttpApi.ts +6 -11
- package/src/HttpApiEndpoint.ts +5 -18
- package/src/HttpApiGroup.ts +2 -9
- package/src/HttpApiSchema.ts +24 -0
- package/src/OpenApiJsonSchema.ts +18 -4
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import type * as Schema from "effect/Schema";
|
|
2
|
-
import type * as AST from "effect/SchemaAST";
|
|
3
2
|
/**
|
|
4
3
|
* @category model
|
|
5
4
|
* @since 1.0.0
|
|
@@ -17,6 +16,7 @@ export interface Annotations {
|
|
|
17
16
|
export interface Never extends Annotations {
|
|
18
17
|
$id: "/schemas/never";
|
|
19
18
|
not: {};
|
|
19
|
+
nullable?: boolean;
|
|
20
20
|
}
|
|
21
21
|
/**
|
|
22
22
|
* @category model
|
|
@@ -53,6 +53,7 @@ export interface AnyObject extends Annotations {
|
|
|
53
53
|
type: "array";
|
|
54
54
|
}
|
|
55
55
|
];
|
|
56
|
+
nullable?: boolean;
|
|
56
57
|
}
|
|
57
58
|
/**
|
|
58
59
|
* @category model
|
|
@@ -68,6 +69,7 @@ export interface Empty extends Annotations {
|
|
|
68
69
|
type: "array";
|
|
69
70
|
}
|
|
70
71
|
];
|
|
72
|
+
nullable?: boolean;
|
|
71
73
|
}
|
|
72
74
|
/**
|
|
73
75
|
* @category model
|
|
@@ -75,6 +77,7 @@ export interface Empty extends Annotations {
|
|
|
75
77
|
*/
|
|
76
78
|
export interface Ref extends Annotations {
|
|
77
79
|
$ref: string;
|
|
80
|
+
nullable?: boolean;
|
|
78
81
|
}
|
|
79
82
|
/**
|
|
80
83
|
* @category model
|
|
@@ -93,6 +96,7 @@ export interface String extends Annotations {
|
|
|
93
96
|
maxLength?: number;
|
|
94
97
|
pattern?: string;
|
|
95
98
|
}>;
|
|
99
|
+
nullable?: boolean;
|
|
96
100
|
}
|
|
97
101
|
/**
|
|
98
102
|
* @category model
|
|
@@ -112,6 +116,7 @@ export interface Numeric extends Annotations {
|
|
|
112
116
|
exclusiveMaximum?: number;
|
|
113
117
|
multipleOf?: number;
|
|
114
118
|
}>;
|
|
119
|
+
nullable?: boolean;
|
|
115
120
|
}
|
|
116
121
|
/**
|
|
117
122
|
* @category model
|
|
@@ -133,6 +138,7 @@ export interface Integer extends Numeric {
|
|
|
133
138
|
*/
|
|
134
139
|
export interface Boolean extends Annotations {
|
|
135
140
|
type: "boolean";
|
|
141
|
+
nullable?: boolean;
|
|
136
142
|
}
|
|
137
143
|
/**
|
|
138
144
|
* @category model
|
|
@@ -144,13 +150,16 @@ export interface Array extends Annotations {
|
|
|
144
150
|
minItems?: number;
|
|
145
151
|
maxItems?: number;
|
|
146
152
|
additionalItems?: JsonSchema | boolean;
|
|
153
|
+
nullable?: boolean;
|
|
147
154
|
}
|
|
148
155
|
/**
|
|
149
156
|
* @category model
|
|
150
157
|
* @since 1.0.0
|
|
151
158
|
*/
|
|
152
159
|
export interface Enum extends Annotations {
|
|
153
|
-
|
|
160
|
+
type?: "string" | "number" | "boolean";
|
|
161
|
+
enum: globalThis.Array<string | number | boolean | null>;
|
|
162
|
+
nullable?: boolean;
|
|
154
163
|
}
|
|
155
164
|
/**
|
|
156
165
|
* @category model
|
|
@@ -159,9 +168,11 @@ export interface Enum extends Annotations {
|
|
|
159
168
|
export interface Enums extends Annotations {
|
|
160
169
|
$comment: "/schemas/enums";
|
|
161
170
|
anyOf: globalThis.Array<{
|
|
171
|
+
type: "string" | "number";
|
|
162
172
|
title: string;
|
|
163
173
|
enum: [string | number];
|
|
164
174
|
}>;
|
|
175
|
+
nullable?: boolean;
|
|
165
176
|
}
|
|
166
177
|
/**
|
|
167
178
|
* @category model
|
|
@@ -169,6 +180,7 @@ export interface Enums extends Annotations {
|
|
|
169
180
|
*/
|
|
170
181
|
export interface AnyOf extends Annotations {
|
|
171
182
|
anyOf: globalThis.Array<JsonSchema>;
|
|
183
|
+
nullable?: boolean;
|
|
172
184
|
}
|
|
173
185
|
/**
|
|
174
186
|
* @category model
|
|
@@ -181,6 +193,7 @@ export interface Object extends Annotations {
|
|
|
181
193
|
additionalProperties?: boolean | JsonSchema;
|
|
182
194
|
patternProperties?: Record<string, JsonSchema>;
|
|
183
195
|
propertyNames?: JsonSchema;
|
|
196
|
+
nullable?: boolean;
|
|
184
197
|
}
|
|
185
198
|
/**
|
|
186
199
|
* @category model
|
|
@@ -212,7 +225,7 @@ export declare const make: <A, I, R>(schema: Schema.Schema<A, I, R>) => Root;
|
|
|
212
225
|
* @since 1.0.0
|
|
213
226
|
*/
|
|
214
227
|
export declare const makeWithDefs: <A, I, R>(schema: Schema.Schema<A, I, R>, options: {
|
|
215
|
-
readonly defs: Record<string,
|
|
228
|
+
readonly defs: Record<string, any>;
|
|
216
229
|
readonly defsPath?: string;
|
|
217
230
|
readonly topLevelReferenceStrategy?: "skip" | "keep";
|
|
218
231
|
}) => JsonSchema;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OpenApiJsonSchema.d.ts","sourceRoot":"","sources":["../../src/OpenApiJsonSchema.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,KAAK,MAAM,MAAM,eAAe,CAAA;
|
|
1
|
+
{"version":3,"file":"OpenApiJsonSchema.d.ts","sourceRoot":"","sources":["../../src/OpenApiJsonSchema.ts"],"names":[],"mappings":"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"}
|
package/dist/esm/HttpApi.js
CHANGED
|
@@ -60,9 +60,9 @@ const Proto = {
|
|
|
60
60
|
return makeProto({
|
|
61
61
|
identifier: this.identifier,
|
|
62
62
|
groups: this.groups,
|
|
63
|
-
errorSchema: HttpApiSchema.UnionUnify(this.errorSchema, schema.annotations(HttpApiSchema.annotations({
|
|
64
|
-
status: annotations
|
|
65
|
-
}))),
|
|
63
|
+
errorSchema: HttpApiSchema.UnionUnify(this.errorSchema, annotations?.status ? schema.annotations(HttpApiSchema.annotations({
|
|
64
|
+
status: annotations.status
|
|
65
|
+
})) : schema),
|
|
66
66
|
annotations: this.annotations,
|
|
67
67
|
middlewares: this.middlewares
|
|
68
68
|
});
|
|
@@ -80,9 +80,7 @@ const Proto = {
|
|
|
80
80
|
return makeProto({
|
|
81
81
|
identifier: this.identifier,
|
|
82
82
|
groups: this.groups,
|
|
83
|
-
errorSchema: HttpApiSchema.UnionUnify(this.errorSchema, tag.failure
|
|
84
|
-
status: HttpApiSchema.getStatusError(tag.failure)
|
|
85
|
-
}))),
|
|
83
|
+
errorSchema: HttpApiSchema.UnionUnify(this.errorSchema, tag.failure),
|
|
86
84
|
annotations: this.annotations,
|
|
87
85
|
middlewares: new Set([...this.middlewares, tag])
|
|
88
86
|
});
|
|
@@ -178,7 +176,7 @@ const extractMembers = (topAst, inherited, getStatus) => {
|
|
|
178
176
|
return;
|
|
179
177
|
}
|
|
180
178
|
ast = AST.annotations(ast, {
|
|
181
|
-
...topAst.annotations,
|
|
179
|
+
...HttpApiSchema.extractAnnotations(topAst.annotations),
|
|
182
180
|
...ast.annotations
|
|
183
181
|
});
|
|
184
182
|
const status = getStatus(ast);
|
|
@@ -205,7 +203,7 @@ const extractPayloads = topAst => {
|
|
|
205
203
|
return;
|
|
206
204
|
}
|
|
207
205
|
ast = AST.annotations(ast, {
|
|
208
|
-
...topAst.annotations,
|
|
206
|
+
...HttpApiSchema.extractAnnotations(topAst.annotations),
|
|
209
207
|
...ast.annotations
|
|
210
208
|
});
|
|
211
209
|
const encoding = HttpApiSchema.getEncoding(ast);
|
package/dist/esm/HttpApi.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HttpApi.js","names":["Context","Option","pipeArguments","Predicate","Record","AST","HttpApiDecodeError","HttpApiSchema","TypeId","Symbol","for","isHttpApi","u","hasProperty","Api","Tag","Proto","pipe","arguments","add","group","makeProto","identifier","groups","set","errorSchema","annotations","middlewares","addHttpApi","api","newGroups","key","newGroup","annotateContext","empty","merge","Set","UnionUnify","addError","schema","status","
|
|
1
|
+
{"version":3,"file":"HttpApi.js","names":["Context","Option","pipeArguments","Predicate","Record","AST","HttpApiDecodeError","HttpApiSchema","TypeId","Symbol","for","isHttpApi","u","hasProperty","Api","Tag","Proto","pipe","arguments","add","group","makeProto","identifier","groups","set","errorSchema","annotations","middlewares","addHttpApi","api","newGroups","key","newGroup","annotateContext","empty","merge","Set","UnionUnify","addError","schema","status","prefix","map","middleware","tag","failure","annotate","value","context","options","HttpApi","Object","setPrototypeOf","make","Map","reflect","self","apiErrors","extractMembers","ast","getStatusErrorAST","values","groupErrors","groupAnnotations","onGroup","mergedAnnotations","endpoints","endpoint","predicate","errors","onEndpoint","payloads","payloadSchema","_tag","extractPayloads","emptyMap","successes","successSchema","getStatusSuccessAST","topAst","inherited","getStatus","members","process","extractAnnotations","emptyDecodeable","getEmptyDecodeable","current","get","description","none","orElse","getDescriptionOrIdentifier","Union","types","encodedAST","some","type","encoding","getEncoding","contentType","getMultipart","undefined","to","fromNullable","DescriptionAnnotationId","IdentifierAnnotationId","AdditionalSchemas"],"sources":["../../src/HttpApi.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
|
@@ -21,9 +21,9 @@ const Proto = {
|
|
|
21
21
|
return pipeArguments(this, arguments);
|
|
22
22
|
},
|
|
23
23
|
addSuccess(schema, annotations) {
|
|
24
|
-
schema = schema.
|
|
25
|
-
status: annotations
|
|
26
|
-
}))
|
|
24
|
+
schema = annotations?.status ? schema.annotations(HttpApiSchema.annotations({
|
|
25
|
+
status: annotations.status
|
|
26
|
+
})) : schema;
|
|
27
27
|
return makeProto({
|
|
28
28
|
...this,
|
|
29
29
|
successSchema: this.successSchema === HttpApiSchema.NoContent ? schema : HttpApiSchema.UnionUnify(this.successSchema, schema)
|
|
@@ -32,9 +32,9 @@ const Proto = {
|
|
|
32
32
|
addError(schema, annotations) {
|
|
33
33
|
return makeProto({
|
|
34
34
|
...this,
|
|
35
|
-
errorSchema: HttpApiSchema.UnionUnify(this.errorSchema, schema.
|
|
36
|
-
status: annotations
|
|
37
|
-
})))
|
|
35
|
+
errorSchema: HttpApiSchema.UnionUnify(this.errorSchema, annotations?.status ? schema.annotations(HttpApiSchema.annotations({
|
|
36
|
+
status: annotations.status
|
|
37
|
+
})) : schema)
|
|
38
38
|
});
|
|
39
39
|
},
|
|
40
40
|
setPayload(schema) {
|
|
@@ -70,9 +70,7 @@ const Proto = {
|
|
|
70
70
|
middleware(middleware) {
|
|
71
71
|
return makeProto({
|
|
72
72
|
...this,
|
|
73
|
-
errorSchema: HttpApiSchema.UnionUnify(this.errorSchema, middleware.failure
|
|
74
|
-
status: HttpApiSchema.getStatusError(middleware.failure)
|
|
75
|
-
})))),
|
|
73
|
+
errorSchema: HttpApiSchema.UnionUnify(this.errorSchema, middleware.failure),
|
|
76
74
|
middlewares: new Set([...this.middlewares, middleware])
|
|
77
75
|
});
|
|
78
76
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HttpApiEndpoint.js","names":["Context","Option","pipeArguments","Predicate","Schema","HttpApiSchema","HttpRouter","TypeId","Symbol","for","isHttpApiEndpoint","u","hasProperty","Proto","pipe","arguments","addSuccess","schema","annotations","status","
|
|
1
|
+
{"version":3,"file":"HttpApiEndpoint.js","names":["Context","Option","pipeArguments","Predicate","Schema","HttpApiSchema","HttpRouter","TypeId","Symbol","for","isHttpApiEndpoint","u","hasProperty","Proto","pipe","arguments","addSuccess","schema","annotations","status","makeProto","successSchema","NoContent","UnionUnify","addError","errorSchema","setPayload","payloadSchema","some","setPath","pathSchema","setUrlParams","urlParamsSchema","setHeaders","headersSchema","prefix","path","prefixPath","middleware","failure","middlewares","Set","annotate","tag","value","add","annotateContext","context","merge","options","Object","assign","create","make","method","name","args","length","none","Never","empty","segments","schemas","obj","i","key","getParam","ast","String","Struct","get","post","put","patch","del"],"sources":["../../src/HttpApiEndpoint.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
package/dist/esm/HttpApiGroup.js
CHANGED
|
@@ -37,9 +37,9 @@ const Proto = {
|
|
|
37
37
|
identifier: this.identifier,
|
|
38
38
|
topLevel: this.topLevel,
|
|
39
39
|
endpoints: this.endpoints,
|
|
40
|
-
errorSchema: HttpApiSchema.UnionUnify(this.errorSchema, schema.annotations(HttpApiSchema.annotations({
|
|
41
|
-
status: annotations
|
|
42
|
-
}))),
|
|
40
|
+
errorSchema: HttpApiSchema.UnionUnify(this.errorSchema, annotations?.status ? schema.annotations(HttpApiSchema.annotations({
|
|
41
|
+
status: annotations.status
|
|
42
|
+
})) : schema),
|
|
43
43
|
annotations: this.annotations,
|
|
44
44
|
middlewares: this.middlewares
|
|
45
45
|
});
|
|
@@ -59,9 +59,7 @@ const Proto = {
|
|
|
59
59
|
identifier: this.identifier,
|
|
60
60
|
topLevel: this.topLevel,
|
|
61
61
|
endpoints: this.endpoints,
|
|
62
|
-
errorSchema: HttpApiSchema.UnionUnify(this.errorSchema, middleware.failure
|
|
63
|
-
status: HttpApiSchema.getStatusError(middleware.failure)
|
|
64
|
-
}))),
|
|
62
|
+
errorSchema: HttpApiSchema.UnionUnify(this.errorSchema, middleware.failure),
|
|
65
63
|
annotations: this.annotations,
|
|
66
64
|
middlewares: new Set([...this.middlewares, middleware])
|
|
67
65
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HttpApiGroup.js","names":["Context","pipeArguments","Predicate","Record","Schema","HttpApiSchema","TypeId","Symbol","for","isHttpApiGroup","u","hasProperty","Proto","add","endpoint","makeProto","identifier","topLevel","endpoints","name","errorSchema","annotations","middlewares","addError","schema","UnionUnify","status","
|
|
1
|
+
{"version":3,"file":"HttpApiGroup.js","names":["Context","pipeArguments","Predicate","Record","Schema","HttpApiSchema","TypeId","Symbol","for","isHttpApiGroup","u","hasProperty","Proto","add","endpoint","makeProto","identifier","topLevel","endpoints","name","errorSchema","annotations","middlewares","addError","schema","UnionUnify","status","prefix","map","middleware","failure","Set","middlewareEndpoints","annotateContext","context","merge","annotate","tag","value","annotateEndpointsContext","annotateEndpoints","pipe","arguments","options","HttpApiGroup","Object","setPrototypeOf","assign","make","empty","Never"],"sources":["../../src/HttpApiGroup.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
|
@@ -31,6 +31,29 @@ export const AnnotationEncoding = /*#__PURE__*/Symbol.for("@effect/platform/Http
|
|
|
31
31
|
* @category annotations
|
|
32
32
|
*/
|
|
33
33
|
export const AnnotationParam = /*#__PURE__*/Symbol.for("@effect/platform/HttpApiSchema/AnnotationParam");
|
|
34
|
+
/**
|
|
35
|
+
* @since 1.0.0
|
|
36
|
+
* @category annotations
|
|
37
|
+
*/
|
|
38
|
+
export const extractAnnotations = ast => {
|
|
39
|
+
const result = {};
|
|
40
|
+
if (AnnotationStatus in ast) {
|
|
41
|
+
result[AnnotationStatus] = ast[AnnotationStatus];
|
|
42
|
+
}
|
|
43
|
+
if (AnnotationEmptyDecodeable in ast) {
|
|
44
|
+
result[AnnotationEmptyDecodeable] = ast[AnnotationEmptyDecodeable];
|
|
45
|
+
}
|
|
46
|
+
if (AnnotationEncoding in ast) {
|
|
47
|
+
result[AnnotationEncoding] = ast[AnnotationEncoding];
|
|
48
|
+
}
|
|
49
|
+
if (AnnotationParam in ast) {
|
|
50
|
+
result[AnnotationParam] = ast[AnnotationParam];
|
|
51
|
+
}
|
|
52
|
+
if (AnnotationMultipart in ast) {
|
|
53
|
+
result[AnnotationMultipart] = ast[AnnotationMultipart];
|
|
54
|
+
}
|
|
55
|
+
return result;
|
|
56
|
+
};
|
|
34
57
|
const mergedAnnotations = ast => ast._tag === "Transformation" ? {
|
|
35
58
|
...ast.to.annotations,
|
|
36
59
|
...ast.annotations
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HttpApiSchema.js","names":["Effect","Effectable","constant","constVoid","dual","globalValue","hasProperty","Schema","AST","Struct","AnnotationMultipart","Symbol","for","AnnotationStatus","AnnotationEmptyDecodeable","AnnotationEncoding","AnnotationParam","
|
|
1
|
+
{"version":3,"file":"HttpApiSchema.js","names":["Effect","Effectable","constant","constVoid","dual","globalValue","hasProperty","Schema","AST","Struct","AnnotationMultipart","Symbol","for","AnnotationStatus","AnnotationEmptyDecodeable","AnnotationEncoding","AnnotationParam","extractAnnotations","ast","result","mergedAnnotations","_tag","to","annotations","getAnnotation","key","getStatus","defaultStatus","getEmptyDecodeable","getMultipart","encodingJson","kind","contentType","getEncoding","getParam","omit","status","undefined","isVoid","from","f","getStatusSuccessAST","getStatusSuccess","self","getStatusErrorAST","getStatusError","UnionUnify","that","make","Union","Array","Set","types","param","name","schema","Empty","Void","asEmpty","options","transform","typeSchema","decode","encode","Created","Accepted","NoContent","MultipartTypeId","Multipart","defaultContentType","encoding","withEncoding","jsonSchema","type","format","Text","String","Uint8Array","Uint8ArrayFromSelf","astCache","WeakMap","deunionize","schemas","has","add","get","astType","memberSchema","set","EmptyError","symbol","tag","StructuralClass","commit","fail","prototype","Object","assign","TypeId","pipe","defineProperty","declare","u","identifier","title"],"sources":["../../src/HttpApiSchema.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
|
@@ -30,11 +30,12 @@ export const make = schema => {
|
|
|
30
30
|
* @since 1.0.0
|
|
31
31
|
*/
|
|
32
32
|
export const makeWithDefs = (schema, options) => {
|
|
33
|
-
|
|
33
|
+
const jsonSchema = JSONSchema.fromAST(schema.ast, {
|
|
34
34
|
definitions: options.defs,
|
|
35
35
|
definitionPath: options.defsPath ?? "#/components/schemas/",
|
|
36
36
|
target: "openApi3.1",
|
|
37
37
|
topLevelReferenceStrategy: options.topLevelReferenceStrategy ?? "keep"
|
|
38
38
|
});
|
|
39
|
+
return jsonSchema;
|
|
39
40
|
};
|
|
40
41
|
//# sourceMappingURL=OpenApiJsonSchema.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OpenApiJsonSchema.js","names":["JSONSchema","Record","make","schema","defs","out","makeWithDefs","isEmptyRecord","$defs","options","fromAST","ast","definitions","definitionPath","defsPath","target","topLevelReferenceStrategy"],"sources":["../../src/OpenApiJsonSchema.ts"],"sourcesContent":[null],"mappings":"AAAA;;;AAGA,OAAO,KAAKA,UAAU,MAAM,mBAAmB;AAC/C,OAAO,KAAKC,MAAM,MAAM,eAAe;
|
|
1
|
+
{"version":3,"file":"OpenApiJsonSchema.js","names":["JSONSchema","Record","make","schema","defs","out","makeWithDefs","isEmptyRecord","$defs","options","jsonSchema","fromAST","ast","definitions","definitionPath","defsPath","target","topLevelReferenceStrategy"],"sources":["../../src/OpenApiJsonSchema.ts"],"sourcesContent":[null],"mappings":"AAAA;;;AAGA,OAAO,KAAKA,UAAU,MAAM,mBAAmB;AAC/C,OAAO,KAAKC,MAAM,MAAM,eAAe;AA+OvC;;;;AAIA,OAAO,MAAMC,IAAI,GAAaC,MAA8B,IAAU;EACpE,MAAMC,IAAI,GAA+B,EAAE;EAC3C,MAAMC,GAAG,GAASC,YAAY,CAACH,MAAM,EAAE;IAAEC;EAAI,CAAE,CAAC;EAChD,IAAI,CAACH,MAAM,CAACM,aAAa,CAACH,IAAI,CAAC,EAAE;IAC/BC,GAAG,CAACG,KAAK,GAAGJ,IAAI;EAClB;EACA,OAAOC,GAAG;AACZ,CAAC;AAED;;;;;;;;;;;;AAYA,OAAO,MAAMC,YAAY,GAAGA,CAAUH,MAA8B,EAAEM,OAIrE,KAAgB;EACf,MAAMC,UAAU,GAAGV,UAAU,CAACW,OAAO,CAACR,MAAM,CAACS,GAAG,EAAE;IAChDC,WAAW,EAAEJ,OAAO,CAACL,IAAI;IACzBU,cAAc,EAAEL,OAAO,CAACM,QAAQ,IAAI,uBAAuB;IAC3DC,MAAM,EAAE,YAAY;IACpBC,yBAAyB,EAAER,OAAO,CAACQ,yBAAyB,IAAI;GACjE,CAAC;EACF,OAAOP,UAAwB;AACjC,CAAC","ignoreList":[]}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@effect/platform",
|
|
3
|
-
"version": "0.71.
|
|
3
|
+
"version": "0.71.3",
|
|
4
4
|
"description": "Unified interfaces for common platform-specific services",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"repository": {
|
|
@@ -14,7 +14,7 @@
|
|
|
14
14
|
"multipasta": "^0.2.5"
|
|
15
15
|
},
|
|
16
16
|
"peerDependencies": {
|
|
17
|
-
"effect": "^3.11.
|
|
17
|
+
"effect": "^3.11.7"
|
|
18
18
|
},
|
|
19
19
|
"publishConfig": {
|
|
20
20
|
"provenance": true
|
package/src/HttpApi.ts
CHANGED
|
@@ -186,9 +186,9 @@ const Proto = {
|
|
|
186
186
|
groups: this.groups,
|
|
187
187
|
errorSchema: HttpApiSchema.UnionUnify(
|
|
188
188
|
this.errorSchema,
|
|
189
|
-
|
|
190
|
-
status: annotations
|
|
191
|
-
|
|
189
|
+
annotations?.status
|
|
190
|
+
? schema.annotations(HttpApiSchema.annotations({ status: annotations.status }))
|
|
191
|
+
: schema
|
|
192
192
|
),
|
|
193
193
|
annotations: this.annotations,
|
|
194
194
|
middlewares: this.middlewares
|
|
@@ -207,12 +207,7 @@ const Proto = {
|
|
|
207
207
|
return makeProto({
|
|
208
208
|
identifier: this.identifier,
|
|
209
209
|
groups: this.groups,
|
|
210
|
-
errorSchema: HttpApiSchema.UnionUnify(
|
|
211
|
-
this.errorSchema,
|
|
212
|
-
tag.failure.annotations(HttpApiSchema.annotations({
|
|
213
|
-
status: HttpApiSchema.getStatusError(tag.failure)
|
|
214
|
-
}) as any)
|
|
215
|
-
),
|
|
210
|
+
errorSchema: HttpApiSchema.UnionUnify(this.errorSchema, tag.failure),
|
|
216
211
|
annotations: this.annotations,
|
|
217
212
|
middlewares: new Set([...this.middlewares, tag])
|
|
218
213
|
})
|
|
@@ -366,7 +361,7 @@ const extractMembers = (
|
|
|
366
361
|
return
|
|
367
362
|
}
|
|
368
363
|
ast = AST.annotations(ast, {
|
|
369
|
-
...topAst.annotations,
|
|
364
|
+
...HttpApiSchema.extractAnnotations(topAst.annotations),
|
|
370
365
|
...ast.annotations
|
|
371
366
|
})
|
|
372
367
|
const status = getStatus(ast)
|
|
@@ -414,7 +409,7 @@ const extractPayloads = (topAst: AST.AST): ReadonlyMap<string, {
|
|
|
414
409
|
return
|
|
415
410
|
}
|
|
416
411
|
ast = AST.annotations(ast, {
|
|
417
|
-
...topAst.annotations,
|
|
412
|
+
...HttpApiSchema.extractAnnotations(topAst.annotations),
|
|
418
413
|
...ast.annotations
|
|
419
414
|
})
|
|
420
415
|
const encoding = HttpApiSchema.getEncoding(ast)
|
package/src/HttpApiEndpoint.ts
CHANGED
|
@@ -700,11 +700,9 @@ const Proto = {
|
|
|
700
700
|
schema: Schema.Schema.Any,
|
|
701
701
|
annotations?: { readonly status?: number }
|
|
702
702
|
) {
|
|
703
|
-
schema =
|
|
704
|
-
|
|
705
|
-
|
|
706
|
-
}))
|
|
707
|
-
)
|
|
703
|
+
schema = annotations?.status ?
|
|
704
|
+
schema.annotations(HttpApiSchema.annotations({ status: annotations.status })) :
|
|
705
|
+
schema
|
|
708
706
|
return makeProto({
|
|
709
707
|
...this,
|
|
710
708
|
successSchema: this.successSchema === HttpApiSchema.NoContent ?
|
|
@@ -717,11 +715,7 @@ const Proto = {
|
|
|
717
715
|
...this,
|
|
718
716
|
errorSchema: HttpApiSchema.UnionUnify(
|
|
719
717
|
this.errorSchema,
|
|
720
|
-
schema.
|
|
721
|
-
Schema.annotations(HttpApiSchema.annotations({
|
|
722
|
-
status: annotations?.status ?? HttpApiSchema.getStatusError(schema)
|
|
723
|
-
}))
|
|
724
|
-
)
|
|
718
|
+
annotations?.status ? schema.annotations(HttpApiSchema.annotations({ status: annotations.status })) : schema
|
|
725
719
|
)
|
|
726
720
|
})
|
|
727
721
|
},
|
|
@@ -758,14 +752,7 @@ const Proto = {
|
|
|
758
752
|
middleware(this: HttpApiEndpoint.AnyWithProps, middleware: HttpApiMiddleware.TagClassAny) {
|
|
759
753
|
return makeProto({
|
|
760
754
|
...this,
|
|
761
|
-
errorSchema: HttpApiSchema.UnionUnify(
|
|
762
|
-
this.errorSchema,
|
|
763
|
-
middleware.failure.pipe(
|
|
764
|
-
Schema.annotations(HttpApiSchema.annotations({
|
|
765
|
-
status: HttpApiSchema.getStatusError(middleware.failure)
|
|
766
|
-
}))
|
|
767
|
-
)
|
|
768
|
-
),
|
|
755
|
+
errorSchema: HttpApiSchema.UnionUnify(this.errorSchema, middleware.failure),
|
|
769
756
|
middlewares: new Set([...this.middlewares, middleware])
|
|
770
757
|
})
|
|
771
758
|
},
|
package/src/HttpApiGroup.ts
CHANGED
|
@@ -309,9 +309,7 @@ const Proto = {
|
|
|
309
309
|
endpoints: this.endpoints,
|
|
310
310
|
errorSchema: HttpApiSchema.UnionUnify(
|
|
311
311
|
this.errorSchema,
|
|
312
|
-
schema.annotations(HttpApiSchema.annotations({
|
|
313
|
-
status: annotations?.status ?? HttpApiSchema.getStatusError(schema)
|
|
314
|
-
}))
|
|
312
|
+
annotations?.status ? schema.annotations(HttpApiSchema.annotations({ status: annotations.status })) : schema
|
|
315
313
|
),
|
|
316
314
|
annotations: this.annotations,
|
|
317
315
|
middlewares: this.middlewares
|
|
@@ -332,12 +330,7 @@ const Proto = {
|
|
|
332
330
|
identifier: this.identifier,
|
|
333
331
|
topLevel: this.topLevel,
|
|
334
332
|
endpoints: this.endpoints,
|
|
335
|
-
errorSchema: HttpApiSchema.UnionUnify(
|
|
336
|
-
this.errorSchema,
|
|
337
|
-
middleware.failure.annotations(HttpApiSchema.annotations({
|
|
338
|
-
status: HttpApiSchema.getStatusError(middleware.failure)
|
|
339
|
-
}) as any)
|
|
340
|
-
),
|
|
333
|
+
errorSchema: HttpApiSchema.UnionUnify(this.errorSchema, middleware.failure),
|
|
341
334
|
annotations: this.annotations,
|
|
342
335
|
middlewares: new Set([...this.middlewares, middleware])
|
|
343
336
|
})
|