@effect/platform 0.93.2 → 0.93.4
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/HttpApiScalar.js +3 -3
- package/dist/cjs/HttpApiScalar.js.map +1 -1
- package/dist/cjs/internal/httpServerError.js +12 -7
- package/dist/cjs/internal/httpServerError.js.map +1 -1
- package/dist/dts/HttpApiScalar.d.ts +2 -10
- package/dist/dts/HttpApiScalar.d.ts.map +1 -1
- package/dist/esm/HttpApiScalar.js +3 -3
- package/dist/esm/HttpApiScalar.js.map +1 -1
- package/dist/esm/internal/httpServerError.js +11 -6
- package/dist/esm/internal/httpServerError.js.map +1 -1
- package/package.json +2 -2
- package/src/HttpApiScalar.ts +26 -37
- package/src/internal/httpServerError.ts +19 -5
|
@@ -22,7 +22,7 @@ const makeHandler = options => {
|
|
|
22
22
|
const spec = OpenApi.fromApi(options.api);
|
|
23
23
|
const source = options?.source;
|
|
24
24
|
const scalarConfig = {
|
|
25
|
-
_integration: "
|
|
25
|
+
_integration: "html",
|
|
26
26
|
...options?.scalar
|
|
27
27
|
};
|
|
28
28
|
const response = HttpServerResponse.html(`<!doctype html>
|
|
@@ -52,7 +52,7 @@ const makeHandler = options => {
|
|
|
52
52
|
* @since 1.0.0
|
|
53
53
|
* @category layers
|
|
54
54
|
*/
|
|
55
|
-
const layer = options => _HttpApiBuilder.Router.use(
|
|
55
|
+
const layer = options => _HttpApiBuilder.Router.use(Effect.fnUntraced(function* (router) {
|
|
56
56
|
const {
|
|
57
57
|
api
|
|
58
58
|
} = yield* _HttpApi.Api;
|
|
@@ -71,7 +71,7 @@ const layer = options => _HttpApiBuilder.Router.use(router => Effect.gen(functio
|
|
|
71
71
|
* @category layers
|
|
72
72
|
*/
|
|
73
73
|
exports.layer = layer;
|
|
74
|
-
const layerCdn = options => _HttpApiBuilder.Router.use(
|
|
74
|
+
const layerCdn = options => _HttpApiBuilder.Router.use(Effect.fnUntraced(function* (router) {
|
|
75
75
|
const {
|
|
76
76
|
api
|
|
77
77
|
} = yield* _HttpApi.Api;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HttpApiScalar.js","names":["Effect","_interopRequireWildcard","require","Layer","_HttpApi","_HttpApiBuilder","HttpLayerRouter","HttpServerResponse","Html","internal","OpenApi","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","makeHandler","options","spec","fromApi","api","source","scalarConfig","_integration","scalar","response","html","escape","info","title","description","escapeJson","_tag","version","succeed","layer","Router","use","
|
|
1
|
+
{"version":3,"file":"HttpApiScalar.js","names":["Effect","_interopRequireWildcard","require","Layer","_HttpApi","_HttpApiBuilder","HttpLayerRouter","HttpServerResponse","Html","internal","OpenApi","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","makeHandler","options","spec","fromApi","api","source","scalarConfig","_integration","scalar","response","html","escape","info","title","description","escapeJson","_tag","version","succeed","layer","Router","use","fnUntraced","router","Api","handler","javascript","path","exports","layerCdn","layerHttpLayerRouter","HttpRouter","add","effectDiscard","layerHttpLayerRouterCdn"],"sources":["../../src/HttpApiScalar.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
|
@@ -24,17 +24,14 @@ const clientAbortFiberId = exports.clientAbortFiberId = /*#__PURE__*/(0, _Global
|
|
|
24
24
|
const causeResponse = cause => {
|
|
25
25
|
const [effect, stripped] = Cause.reduce(cause, [Effect.succeed(internalServerError), Cause.empty], (acc, cause) => {
|
|
26
26
|
switch (cause._tag) {
|
|
27
|
-
case "Empty":
|
|
28
|
-
{
|
|
29
|
-
return Option.some(acc);
|
|
30
|
-
}
|
|
31
27
|
case "Fail":
|
|
32
28
|
{
|
|
33
|
-
return Option.some([Respondable.toResponseOrElse(cause.error, internalServerError), cause]);
|
|
29
|
+
return Option.some([Respondable.toResponseOrElse(cause.error, internalServerError), combineCauses(acc[1], cause)]);
|
|
34
30
|
}
|
|
35
31
|
case "Die":
|
|
36
32
|
{
|
|
37
|
-
|
|
33
|
+
const isResponse = internalServerResponse.isServerResponse(cause.defect);
|
|
34
|
+
return Option.some([Respondable.toResponseOrElseDefect(cause.defect, internalServerError), isResponse ? acc[1] : combineCauses(acc[1], cause)]);
|
|
38
35
|
}
|
|
39
36
|
case "Interrupt":
|
|
40
37
|
{
|
|
@@ -57,8 +54,16 @@ const causeResponse = cause => {
|
|
|
57
54
|
return [response, Cause.sequential(stripped, Cause.die(response))];
|
|
58
55
|
});
|
|
59
56
|
};
|
|
60
|
-
/** @internal */
|
|
61
57
|
exports.causeResponse = causeResponse;
|
|
58
|
+
const combineCauses = (left, right) => {
|
|
59
|
+
if (Cause.isEmptyType(left)) {
|
|
60
|
+
return right;
|
|
61
|
+
} else if (Cause.isEmptyType(right)) {
|
|
62
|
+
return left;
|
|
63
|
+
}
|
|
64
|
+
return Cause.sequential(left, right);
|
|
65
|
+
};
|
|
66
|
+
/** @internal */
|
|
62
67
|
const causeResponseStripped = cause => {
|
|
63
68
|
let response;
|
|
64
69
|
const stripped = Cause.stripSomeDefects(cause, defect => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"httpServerError.js","names":["Cause","_interopRequireWildcard","require","Effect","FiberId","_GlobalValue","Option","Predicate","Respondable","internalServerResponse","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","TypeId","exports","Symbol","for","isServerError","u","hasProperty","clientAbortFiberId","globalValue","runtime","causeResponse","cause","effect","stripped","reduce","succeed","internalServerError","empty","acc","_tag","some","toResponseOrElse","error","
|
|
1
|
+
{"version":3,"file":"httpServerError.js","names":["Cause","_interopRequireWildcard","require","Effect","FiberId","_GlobalValue","Option","Predicate","Respondable","internalServerResponse","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","TypeId","exports","Symbol","for","isServerError","u","hasProperty","clientAbortFiberId","globalValue","runtime","causeResponse","cause","effect","stripped","reduce","succeed","internalServerError","empty","acc","_tag","some","toResponseOrElse","error","combineCauses","isResponse","isServerResponse","defect","toResponseOrElseDefect","none","response","fiberId","clientAbortError","serverAbortError","map","isEmptyType","die","sequential","left","right","causeResponseStripped","stripSomeDefects","status","exitResponse","exit","value"],"sources":["../../../src/internal/httpServerError.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
|
@@ -6,7 +6,7 @@ import * as HttpLayerRouter from "./HttpLayerRouter.js";
|
|
|
6
6
|
* @since 1.0.0
|
|
7
7
|
* @category model
|
|
8
8
|
*/
|
|
9
|
-
export type ScalarThemeId = "alternate" | "default" | "moon" | "purple" | "solarized" | "bluePlanet" | "
|
|
9
|
+
export type ScalarThemeId = "alternate" | "default" | "moon" | "purple" | "solarized" | "bluePlanet" | "saturn" | "kepler" | "mars" | "deepSpace" | "laserwave" | "none";
|
|
10
10
|
/**
|
|
11
11
|
* @see https://github.com/scalar/scalar/blob/main/documentation/configuration.md
|
|
12
12
|
*
|
|
@@ -19,9 +19,7 @@ export type ScalarConfig = {
|
|
|
19
19
|
/** The layout to use for the references */
|
|
20
20
|
layout?: "modern" | "classic";
|
|
21
21
|
/** URL to a request proxy for the API client */
|
|
22
|
-
|
|
23
|
-
/** Whether the spec input should show */
|
|
24
|
-
isEditable?: boolean;
|
|
22
|
+
proxyUrl?: string;
|
|
25
23
|
/** Whether to show the sidebar */
|
|
26
24
|
showSidebar?: boolean;
|
|
27
25
|
/**
|
|
@@ -30,12 +28,6 @@ export type ScalarConfig = {
|
|
|
30
28
|
* Default: `false`
|
|
31
29
|
*/
|
|
32
30
|
hideModels?: boolean;
|
|
33
|
-
/**
|
|
34
|
-
* Whether to show the “Download OpenAPI Document” button
|
|
35
|
-
*
|
|
36
|
-
* Default: `false`
|
|
37
|
-
*/
|
|
38
|
-
hideDownloadButton?: boolean;
|
|
39
31
|
/**
|
|
40
32
|
* Whether to show the “Test Request” button
|
|
41
33
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HttpApiScalar.d.ts","sourceRoot":"","sources":["../../src/HttpApiScalar.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AACrC,OAAO,EAAE,GAAG,EAAE,MAAM,cAAc,CAAA;AAClC,OAAO,KAAK,KAAK,OAAO,MAAM,cAAc,CAAA;AAE5C,OAAO,KAAK,eAAe,MAAM,sBAAsB,CAAA;AAMvD;;;GAGG;AACH,MAAM,MAAM,aAAa,GACrB,WAAW,GACX,SAAS,GACT,MAAM,GACN,QAAQ,GACR,WAAW,GACX,YAAY,GACZ,
|
|
1
|
+
{"version":3,"file":"HttpApiScalar.d.ts","sourceRoot":"","sources":["../../src/HttpApiScalar.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,7 +14,7 @@ const makeHandler = options => {
|
|
|
14
14
|
const spec = OpenApi.fromApi(options.api);
|
|
15
15
|
const source = options?.source;
|
|
16
16
|
const scalarConfig = {
|
|
17
|
-
_integration: "
|
|
17
|
+
_integration: "html",
|
|
18
18
|
...options?.scalar
|
|
19
19
|
};
|
|
20
20
|
const response = HttpServerResponse.html(`<!doctype html>
|
|
@@ -44,7 +44,7 @@ const makeHandler = options => {
|
|
|
44
44
|
* @since 1.0.0
|
|
45
45
|
* @category layers
|
|
46
46
|
*/
|
|
47
|
-
export const layer = options => Router.use(
|
|
47
|
+
export const layer = options => Router.use(Effect.fnUntraced(function* (router) {
|
|
48
48
|
const {
|
|
49
49
|
api
|
|
50
50
|
} = yield* Api;
|
|
@@ -62,7 +62,7 @@ export const layer = options => Router.use(router => Effect.gen(function* () {
|
|
|
62
62
|
* @since 1.0.0
|
|
63
63
|
* @category layers
|
|
64
64
|
*/
|
|
65
|
-
export const layerCdn = options => Router.use(
|
|
65
|
+
export const layerCdn = options => Router.use(Effect.fnUntraced(function* (router) {
|
|
66
66
|
const {
|
|
67
67
|
api
|
|
68
68
|
} = yield* Api;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HttpApiScalar.js","names":["Effect","Layer","Api","Router","HttpLayerRouter","HttpServerResponse","Html","internal","OpenApi","makeHandler","options","spec","fromApi","api","source","scalarConfig","_integration","scalar","response","html","escape","info","title","description","escapeJson","_tag","version","succeed","layer","use","
|
|
1
|
+
{"version":3,"file":"HttpApiScalar.js","names":["Effect","Layer","Api","Router","HttpLayerRouter","HttpServerResponse","Html","internal","OpenApi","makeHandler","options","spec","fromApi","api","source","scalarConfig","_integration","scalar","response","html","escape","info","title","description","escapeJson","_tag","version","succeed","layer","use","fnUntraced","router","handler","javascript","get","path","layerCdn","layerHttpLayerRouter","HttpRouter","add","effectDiscard","layerHttpLayerRouterCdn"],"sources":["../../src/HttpApiScalar.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
|
@@ -16,17 +16,14 @@ export const clientAbortFiberId = /*#__PURE__*/globalValue("@effect/platform/Htt
|
|
|
16
16
|
export const causeResponse = cause => {
|
|
17
17
|
const [effect, stripped] = Cause.reduce(cause, [Effect.succeed(internalServerError), Cause.empty], (acc, cause) => {
|
|
18
18
|
switch (cause._tag) {
|
|
19
|
-
case "Empty":
|
|
20
|
-
{
|
|
21
|
-
return Option.some(acc);
|
|
22
|
-
}
|
|
23
19
|
case "Fail":
|
|
24
20
|
{
|
|
25
|
-
return Option.some([Respondable.toResponseOrElse(cause.error, internalServerError), cause]);
|
|
21
|
+
return Option.some([Respondable.toResponseOrElse(cause.error, internalServerError), combineCauses(acc[1], cause)]);
|
|
26
22
|
}
|
|
27
23
|
case "Die":
|
|
28
24
|
{
|
|
29
|
-
|
|
25
|
+
const isResponse = internalServerResponse.isServerResponse(cause.defect);
|
|
26
|
+
return Option.some([Respondable.toResponseOrElseDefect(cause.defect, internalServerError), isResponse ? acc[1] : combineCauses(acc[1], cause)]);
|
|
30
27
|
}
|
|
31
28
|
case "Interrupt":
|
|
32
29
|
{
|
|
@@ -49,6 +46,14 @@ export const causeResponse = cause => {
|
|
|
49
46
|
return [response, Cause.sequential(stripped, Cause.die(response))];
|
|
50
47
|
});
|
|
51
48
|
};
|
|
49
|
+
const combineCauses = (left, right) => {
|
|
50
|
+
if (Cause.isEmptyType(left)) {
|
|
51
|
+
return right;
|
|
52
|
+
} else if (Cause.isEmptyType(right)) {
|
|
53
|
+
return left;
|
|
54
|
+
}
|
|
55
|
+
return Cause.sequential(left, right);
|
|
56
|
+
};
|
|
52
57
|
/** @internal */
|
|
53
58
|
export const causeResponseStripped = cause => {
|
|
54
59
|
let response;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"httpServerError.js","names":["Cause","Effect","FiberId","globalValue","Option","Predicate","Respondable","internalServerResponse","TypeId","Symbol","for","isServerError","u","hasProperty","clientAbortFiberId","runtime","causeResponse","cause","effect","stripped","reduce","succeed","internalServerError","empty","acc","_tag","some","toResponseOrElse","error","
|
|
1
|
+
{"version":3,"file":"httpServerError.js","names":["Cause","Effect","FiberId","globalValue","Option","Predicate","Respondable","internalServerResponse","TypeId","Symbol","for","isServerError","u","hasProperty","clientAbortFiberId","runtime","causeResponse","cause","effect","stripped","reduce","succeed","internalServerError","empty","acc","_tag","some","toResponseOrElse","error","combineCauses","isResponse","isServerResponse","defect","toResponseOrElseDefect","none","response","fiberId","clientAbortError","serverAbortError","map","isEmptyType","die","sequential","left","right","causeResponseStripped","stripSomeDefects","status","exitResponse","exit","value"],"sources":["../../../src/internal/httpServerError.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@effect/platform",
|
|
3
|
-
"version": "0.93.
|
|
3
|
+
"version": "0.93.4",
|
|
4
4
|
"description": "Unified interfaces for common platform-specific services",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"repository": {
|
|
@@ -16,7 +16,7 @@
|
|
|
16
16
|
"multipasta": "^0.2.7"
|
|
17
17
|
},
|
|
18
18
|
"peerDependencies": {
|
|
19
|
-
"effect": "^3.19.
|
|
19
|
+
"effect": "^3.19.6"
|
|
20
20
|
},
|
|
21
21
|
"publishConfig": {
|
|
22
22
|
"provenance": true
|
package/src/HttpApiScalar.ts
CHANGED
|
@@ -23,10 +23,11 @@ export type ScalarThemeId =
|
|
|
23
23
|
| "purple"
|
|
24
24
|
| "solarized"
|
|
25
25
|
| "bluePlanet"
|
|
26
|
-
| "deepSpace"
|
|
27
26
|
| "saturn"
|
|
28
27
|
| "kepler"
|
|
29
28
|
| "mars"
|
|
29
|
+
| "deepSpace"
|
|
30
|
+
| "laserwave"
|
|
30
31
|
| "none"
|
|
31
32
|
|
|
32
33
|
/**
|
|
@@ -41,9 +42,7 @@ export type ScalarConfig = {
|
|
|
41
42
|
/** The layout to use for the references */
|
|
42
43
|
layout?: "modern" | "classic"
|
|
43
44
|
/** URL to a request proxy for the API client */
|
|
44
|
-
|
|
45
|
-
/** Whether the spec input should show */
|
|
46
|
-
isEditable?: boolean
|
|
45
|
+
proxyUrl?: string
|
|
47
46
|
/** Whether to show the sidebar */
|
|
48
47
|
showSidebar?: boolean
|
|
49
48
|
/**
|
|
@@ -52,12 +51,6 @@ export type ScalarConfig = {
|
|
|
52
51
|
* Default: `false`
|
|
53
52
|
*/
|
|
54
53
|
hideModels?: boolean
|
|
55
|
-
/**
|
|
56
|
-
* Whether to show the “Download OpenAPI Document” button
|
|
57
|
-
*
|
|
58
|
-
* Default: `false`
|
|
59
|
-
*/
|
|
60
|
-
hideDownloadButton?: boolean
|
|
61
54
|
/**
|
|
62
55
|
* Whether to show the “Test Request” button
|
|
63
56
|
*
|
|
@@ -124,7 +117,7 @@ const makeHandler = (options: {
|
|
|
124
117
|
const source = options?.source
|
|
125
118
|
|
|
126
119
|
const scalarConfig = {
|
|
127
|
-
_integration: "
|
|
120
|
+
_integration: "html",
|
|
128
121
|
...options?.scalar
|
|
129
122
|
}
|
|
130
123
|
|
|
@@ -175,20 +168,18 @@ export const layer = (options?: {
|
|
|
175
168
|
readonly path?: `/${string}` | undefined
|
|
176
169
|
readonly scalar?: ScalarConfig
|
|
177
170
|
}): Layer.Layer<never, never, Api> =>
|
|
178
|
-
Router.use((router)
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
}
|
|
188
|
-
})
|
|
189
|
-
yield* router.get(options?.path ?? "/docs", handler)
|
|
171
|
+
Router.use(Effect.fnUntraced(function*(router) {
|
|
172
|
+
const { api } = yield* Api
|
|
173
|
+
const handler = makeHandler({
|
|
174
|
+
...options,
|
|
175
|
+
api,
|
|
176
|
+
source: {
|
|
177
|
+
_tag: "Inline",
|
|
178
|
+
source: internal.javascript
|
|
179
|
+
}
|
|
190
180
|
})
|
|
191
|
-
|
|
181
|
+
yield* router.get(options?.path ?? "/docs", handler)
|
|
182
|
+
}))
|
|
192
183
|
|
|
193
184
|
/**
|
|
194
185
|
* @since 1.0.0
|
|
@@ -199,20 +190,18 @@ export const layerCdn = (options?: {
|
|
|
199
190
|
readonly scalar?: ScalarConfig
|
|
200
191
|
readonly version?: string | undefined
|
|
201
192
|
}): Layer.Layer<never, never, Api> =>
|
|
202
|
-
Router.use((router)
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
}
|
|
212
|
-
})
|
|
213
|
-
yield* router.get(options?.path ?? "/docs", handler)
|
|
193
|
+
Router.use(Effect.fnUntraced(function*(router) {
|
|
194
|
+
const { api } = yield* Api
|
|
195
|
+
const handler = makeHandler({
|
|
196
|
+
...options,
|
|
197
|
+
api,
|
|
198
|
+
source: {
|
|
199
|
+
_tag: "Cdn",
|
|
200
|
+
version: options?.version
|
|
201
|
+
}
|
|
214
202
|
})
|
|
215
|
-
|
|
203
|
+
yield* router.get(options?.path ?? "/docs", handler)
|
|
204
|
+
}))
|
|
216
205
|
|
|
217
206
|
/**
|
|
218
207
|
* @since 1.0.0
|
|
@@ -33,14 +33,19 @@ export const causeResponse = <E>(
|
|
|
33
33
|
[Effect.succeed(internalServerError), Cause.empty as Cause.Cause<E>] as const,
|
|
34
34
|
(acc, cause) => {
|
|
35
35
|
switch (cause._tag) {
|
|
36
|
-
case "Empty": {
|
|
37
|
-
return Option.some(acc)
|
|
38
|
-
}
|
|
39
36
|
case "Fail": {
|
|
40
|
-
return Option.some(
|
|
37
|
+
return Option.some(
|
|
38
|
+
[Respondable.toResponseOrElse(cause.error, internalServerError), combineCauses(acc[1], cause)] as const
|
|
39
|
+
)
|
|
41
40
|
}
|
|
42
41
|
case "Die": {
|
|
43
|
-
|
|
42
|
+
const isResponse = internalServerResponse.isServerResponse(cause.defect)
|
|
43
|
+
return Option.some(
|
|
44
|
+
[
|
|
45
|
+
Respondable.toResponseOrElseDefect(cause.defect, internalServerError),
|
|
46
|
+
isResponse ? acc[1] : combineCauses(acc[1], cause)
|
|
47
|
+
] as const
|
|
48
|
+
)
|
|
44
49
|
}
|
|
45
50
|
case "Interrupt": {
|
|
46
51
|
if (acc[1]._tag !== "Empty") {
|
|
@@ -63,6 +68,15 @@ export const causeResponse = <E>(
|
|
|
63
68
|
})
|
|
64
69
|
}
|
|
65
70
|
|
|
71
|
+
const combineCauses = <A = never, B = never>(left: Cause.Cause<A>, right: Cause.Cause<B>): Cause.Cause<A | B> => {
|
|
72
|
+
if (Cause.isEmptyType(left)) {
|
|
73
|
+
return right
|
|
74
|
+
} else if (Cause.isEmptyType(right)) {
|
|
75
|
+
return left
|
|
76
|
+
}
|
|
77
|
+
return Cause.sequential(left, right)
|
|
78
|
+
}
|
|
79
|
+
|
|
66
80
|
/** @internal */
|
|
67
81
|
export const causeResponseStripped = <E>(
|
|
68
82
|
cause: Cause.Cause<E>
|