@typed/router 0.23.2 → 0.24.0

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.
Files changed (5) hide show
  1. package/dist/dts/CurrentRoute.d.ts +5 -5
  2. package/dist/dts/CurrentRoute.d.ts.map +1 -1
  3. package/dist/esm/CurrentRoute.js.map +1 -1
  4. package/package.json +8 -8
  5. package/src/CurrentRoute.ts +8 -8
package/dist/dts/CurrentRoute.d.ts CHANGED
@@ -28,7 +28,7 @@ export declare function make<const P extends string>(route: P | Route.Route<P>,
28
28
  /**
29
29
  * @since 1.0.0
30
30
  */
31
- export declare function layer<const P extends string>(route: P | Route.Route<P>, parent?: Option.Option<CurrentRoute>): Layer.Layer<never, never, CurrentRoute>;
31
+ export declare function layer<const P extends string>(route: P | Route.Route<P>, parent?: Option.Option<CurrentRoute>): Layer.Layer<CurrentRoute>;
32
32
  /**
33
33
  * @since 1.0.0
34
34
  */
@@ -37,8 +37,8 @@ export declare const CurrentParams: RefSubject.Filtered<Navigation | CurrentRout
37
37
  * @since 1.0.0
38
38
  */
39
39
  export declare const withCurrentRoute: {
40
- <P extends string>(route: Route.Route<P>): <R, E, A>(effect: Effect.Effect<R, E, A>) => Effect.Effect<Exclude<R, CurrentRoute>, E, A>;
41
- <R, E, A, P extends string>(effect: Effect.Effect<R, E, A>, route: Route.Route<P>): Effect.Effect<Exclude<R, CurrentRoute>, E, A>;
40
+ <P extends string>(route: Route.Route<P>): <R, E, A>(effect: Effect.Effect<A, E, R>) => Effect.Effect<A, E, Exclude<R, CurrentRoute>>;
41
+ <R, E, A, P extends string>(effect: Effect.Effect<A, E, R>, route: Route.Route<P>): Effect.Effect<A, E, Exclude<R, CurrentRoute>>;
42
42
  };
43
43
  /**
44
44
  * @since 1.0.0
@@ -51,11 +51,11 @@ export declare function isActive<const P extends string>(pathOrRoute: Route.Rout
51
51
  /**
52
52
  * @since 1.0.0
53
53
  */
54
- export declare const browser: Layer.Layer<Document.Document, never, CurrentRoute>;
54
+ export declare const browser: Layer.Layer<CurrentRoute, never, Document.Document>;
55
55
  /**
56
56
  * @since 1.0.0
57
57
  */
58
- export declare const server: (base?: string) => Layer.Layer<never, never, CurrentRoute>;
58
+ export declare const server: (base?: string) => Layer.Layer<CurrentRoute>;
59
59
  /**
60
60
  * @since 1.0.0
61
61
  */
package/dist/dts/CurrentRoute.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"CurrentRoute.d.ts","sourceRoot":"","sources":["../../src/CurrentRoute.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,OAAO,MAAM,gBAAgB,CAAA;AACzC,OAAO,KAAK,QAAQ,MAAM,qBAAqB,CAAA;AAC/C,OAAO,KAAK,UAAU,MAAM,sBAAsB,CAAA;AAClD,OAAO,KAAK,EAAe,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAEhE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAA;AACnC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AAEvC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AAGvC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAA;AAC3C,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AAErC;;GAEG;AACH,MAAM,WAAW,YAAY,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM;IACrD,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;IAC9B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,CAAA;CAC7C;AAED;;GAEG;AACH,eAAO,MAAM,YAAY,EAAE,OAAO,CAAC,MAAM,CAAC,YAAY,CAA8D,CAAA;AAEpH;;GAEG;AACH,wBAAgB,IAAI,CAAC,KAAK,CAAC,CAAC,SAAS,MAAM,EACzC,KAAK,EAAE,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,EACzB,MAAM,GAAE,MAAM,CAAC,MAAM,CAAC,YAAY,CAAiB,GAClD,YAAY,CAAC,CAAC,CAAC,CAKjB;AAED;;GAEG;AACH,wBAAgB,KAAK,CAAC,KAAK,CAAC,CAAC,SAAS,MAAM,EAC1C,KAAK,EAAE,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,EACzB,MAAM,GAAE,MAAM,CAAC,MAAM,CAAC,YAAY,CAAiB,GAClD,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,EAAE,YAAY,CAAC,CAEzC;AAMD;;GAEG;AACH,eAAO,MAAM,aAAa,EAAE,UAAU,CAAC,QAAQ,CAAC,UAAU,GAAG,YAAY,EAAE,KAAK,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAElB,CAAA;AAEhG;;GAEG;AACH,eAAO,MAAM,gBAAgB,EAAE;IAC7B,CAAC,CAAC,SAAS,MAAM,EACf,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,GACpB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,KAAK,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,EAAE,YAAY,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAA;IAE7F,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,SAAS,MAAM,EACxB,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAC9B,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,GACpB,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,EAAE,YAAY,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAA;CAc7C,CAAA;AAiBL;;GAEG;AACH,wBAAgB,QAAQ,CAAC,KAAK,CAAC,CAAC,SAAS,MAAM,EAC7C,WAAW,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,EAC/B,GAAG,MAAM,EAAE,CAAC,MAAM,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,GACrE,UAAU,CAAC,QAAQ,CAAC,UAAU,GAAG,YAAY,EAAE,KAAK,EAAE,MAAM,CAAC,CAQ/D;AAkBD;;GAEG;AACH,wBAAgB,QAAQ,CAAC,KAAK,CAAC,CAAC,SAAS,MAAM,EAC7C,WAAW,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,EAC/B,GAAG,MAAM,EAAE,CAAC,MAAM,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,GACrE,UAAU,CAAC,QAAQ,CAAC,UAAU,GAAG,YAAY,EAAE,KAAK,EAAE,OAAO,CAAC,CAQhE;AAED;;GAEG;AACH,eAAO,MAAM,OAAO,EAAE,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,QAAQ,EAAE,KAAK,EAAE,YAAY,CAWvE,CAAA;AAED;;GAEG;AACH,eAAO,MAAM,MAAM,UAAU,MAAM,KAAS,WAAW,CAAC,KAAK,EAAE,KAAK,EAAE,YAAY,CACN,CAAA;AAK5E;;GAEG;AACH,eAAO,MAAM,mBAAmB,EAAE,UAAU,CAAC,QAAQ,CAAC,UAAU,EAAE,KAAK,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CACpE,CAAA;AAErC;;GAEG;AACH,eAAO,MAAM,YAAY,iDAA+C,CAAA"}
1
+ {"version":3,"file":"CurrentRoute.d.ts","sourceRoot":"","sources":["../../src/CurrentRoute.ts"],"names":[],"mappings":"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"}
package/dist/esm/CurrentRoute.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"CurrentRoute.js","sourceRoot":"","sources":["../../src/CurrentRoute.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"CurrentRoute.js","sourceRoot":"","sources":["../../src/CurrentRoute.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,OAAO,MAAM,gBAAgB,CAAA;AACzC,OAAO,KAAK,QAAQ,MAAM,qBAAqB,CAAA;AAC/C,OAAO,KAAK,UAAU,MAAM,sBAAsB,CAAA;AAElD,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAE7D,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AAEvC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAA;AAG5C,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AAUrC;;GAEG;AACH,MAAM,CAAC,MAAM,YAAY,GAAiC,OAAO,CAAC,MAAM,CAAe,4BAA4B,CAAC,CAAA;AAEpH;;GAEG;AACH,MAAM,UAAU,IAAI,CAClB,KAAyB,EACzB,SAAsC,MAAM,CAAC,IAAI,EAAE;IAEnD,OAAO;QACL,KAAK,EAAE,QAAQ,CAAC,KAAK,CAAC;QACtB,MAAM;KACP,CAAA;AACH,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,KAAK,CACnB,KAAyB,EACzB,SAAsC,MAAM,CAAC,IAAI,EAAE;IAEnD,OAAO,YAAY,CAAC,KAAK,CAAC,IAAI,CAAC,KAA4B,EAAE,MAAM,CAAC,CAAC,CAAA;AACvE,CAAC;AAED,SAAS,QAAQ,CAAmB,KAAyB;IAC3D,OAAO,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAA;AAClE,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,MAAM,aAAa,GACxB,UAAU;KACP,eAAe,CAAC,WAAW,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;AAEhG;;GAEG;AACH,MAAM,CAAC,MAAM,gBAAgB,GASzB,IAAI,CAAC,CAAC,EAAE,CACV,MAA8B,EAC9B,KAAqB,EAC0B,EAAE,CACjD,MAAM,CAAC,iBAAiB,CAAC,CAAC,GAAG,EAAE,EAAE;IAC/B,MAAM,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC,GAAG,EAAE,YAAY,CAAC,CAAA;IAEnD,IAAI,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC;QAAE,OAAO,IAAI,CAAC,MAAM,EAAE,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAiB,CAAC,CAAC,CAAA;IAEjG,OAAO,IAAI,CACT,MAAM,EACN,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,MAAM,CAAiB,CAAC,CACrF,CAAA;AACH,CAAC,CAAC,CAAC,CAAA;AAEL,MAAM,SAAS,GAAG,CAChB,WAAmB,EACnB,YAA4B,EAC5B,KAAsB,EACtB,GAAG,CAAC,MAAM,CAAgE,EAC1E,EAAE;IACF,MAAM,YAAY,GAAG,YAAY,CAAC,KAAK,CAAC,WAAW,CAAC,CAAA;IACpD,IAAI,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC;QAAE,OAAO,MAAM,CAAC,IAAI,EAAE,CAAA;IAErD,MAAM,SAAS,GAAG,YAAY,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;IAC5C,MAAM,UAAU,GAAG,EAAE,GAAG,YAAY,CAAC,KAAK,EAAE,GAAG,MAAM,EAAE,CAAA;IAEvD,OAAO,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,UAAiB,CAAC,CAAC,CAAA;AACvD,CAAC,CAAA;AAED;;GAEG;AACH,MAAM,UAAU,QAAQ,CACtB,WAA+B,EAC/B,GAAG,MAAmE;IAEtE,MAAM,KAAK,GAAG,OAAO,WAAW,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,WAAW,CAAA;IAEzF,OAAO,UAAU,CAAC,eAAe,CAC/B,WAAW,EACX,CAAC,WAAW,EAAE,EAAE,CACd,MAAM,CAAC,GAAG,CAAC,YAAY,EAAE,CAAC,YAAY,EAAE,EAAE,CAAC,SAAS,CAAC,WAAW,EAAE,YAAY,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,MAAM,CAAC,CAAC,CAC3G,CAAA;AACH,CAAC;AAED,MAAM,SAAS,GAAG,CAChB,WAAmB,EACnB,YAA4B,EAC5B,KAAsB,EACtB,GAAG,MAAqE,EACxE,EAAE;IACF,MAAM,YAAY,GAAG,YAAY,CAAC,KAAK,CAAC,WAAW,CAAC,CAAA;IAEpD,IAAI,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC;QAAE,OAAO,KAAK,CAAA;IAE7C,MAAM,SAAS,GAAG,YAAY,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;IAC5C,MAAM,UAAU,GAAG,EAAE,GAAG,YAAY,CAAC,KAAK,EAAE,GAAG,MAAM,EAAE,CAAA;IACvD,MAAM,QAAQ,GAAG,SAAS,CAAC,IAAI,CAAC,UAAiB,CAAC,CAAA;IAElD,OAAO,QAAQ,KAAK,WAAW,IAAI,WAAW,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAA;AACrE,CAAC,CAAA;AACD;;GAEG;AACH,MAAM,UAAU,QAAQ,CACtB,WAA+B,EAC/B,GAAG,MAAmE;IAEtE,MAAM,KAAK,GAAG,OAAO,WAAW,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,WAAW,CAAA;IAEzF,OAAO,UAAU,CAAC,SAAS,CACzB,WAAW,EACX,CAAC,WAAW,EAAE,EAAE,CACd,MAAM,CAAC,GAAG,CAAC,YAAY,EAAE,CAAC,YAAY,EAAE,EAAE,CAAC,SAAS,CAAC,WAAW,EAAE,YAAY,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,MAAM,CAAC,CAAC,CAC3G,CAAA;AACH,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,MAAM,OAAO,GAAwD,YAAY,CAAC,KAAK,CAC5F,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAC,CAAC;IACpB,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAA;IAC5C,MAAM,IAAI,GAAG,QAAQ,CAAC,aAAa,CAAC,MAAM,CAAC,CAAA;IAC3C,MAAM,QAAQ,GAAG,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAA;IAEvC,OAAO;QACL,KAAK,EAAE,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC;QAC/B,MAAM,EAAE,MAAM,CAAC,IAAI,EAAE;KACtB,CAAA;AACH,CAAC,CAAC,CACH,CAAA;AAED;;GAEG;AACH,MAAM,CAAC,MAAM,MAAM,GAAG,CAAC,OAAe,GAAG,EAA6B,EAAE,CACtE,YAAY,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,IAAI,EAAE,EAAE,CAAC,CAAA;AAE5E,MAAM,eAAe,GAAG,CAAC,WAAwB,EAAoC,EAAE,CACrF,MAAM,CAAC,WAAW,CAAC,WAAW,CAAC,GAAG,CAAC,YAAY,CAAC,CAAA;AAElD;;GAEG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAA6E,UAAU;KACpH,GAAG,CAAC,YAAY,EAAE,eAAe,CAAC,CAAA;AAErC;;GAEG;AACH,MAAM,CAAC,MAAM,YAAY,GAAG,UAAU,CAAC,GAAG,CAAC,YAAY,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@typed/router",
3
- "version": "0.23.2",
3
+ "version": "0.24.0",
4
4
  "description": "",
5
5
  "license": "MIT",
6
6
  "repository": {
@@ -10,14 +10,14 @@
10
10
  "sideEffects": [],
11
11
  "author": "Typed contributors",
12
12
  "dependencies": {
13
- "effect": "^2.2.3",
14
- "@typed/context": "0.23.1",
15
- "@typed/dom": "11.0.1",
16
- "@typed/environment": "0.5.1",
17
- "@typed/fx": "1.22.2",
18
- "@typed/navigation": "0.10.2",
13
+ "effect": "^2.3.6",
14
+ "@typed/context": "0.24.0",
15
+ "@typed/dom": "12.0.0",
16
+ "@typed/environment": "0.6.0",
17
+ "@typed/fx": "1.23.0",
18
+ "@typed/navigation": "0.11.0",
19
19
  "@typed/path": "0.9.0",
20
- "@typed/route": "3.1.2"
20
+ "@typed/route": "3.2.0"
21
21
  },
22
22
  "main": "./dist/cjs/index.js",
23
23
  "module": "./dist/esm/index.js",
package/src/CurrentRoute.ts CHANGED
@@ -48,7 +48,7 @@ export function make<const P extends string>(
48
48
  export function layer<const P extends string>(
49
49
  route: P | Route.Route<P>,
50
50
  parent: Option.Option<CurrentRoute> = Option.none()
51
- ): Layer.Layer<never, never, CurrentRoute> {
51
+ ): Layer.Layer<CurrentRoute> {
52
52
  return CurrentRoute.layer(make(route as Route.Route<string>, parent))
53
53
  }
54
54
 
@@ -69,16 +69,16 @@ export const CurrentParams: RefSubject.Filtered<Navigation | CurrentRoute, never
69
69
  export const withCurrentRoute: {
70
70
  <P extends string>(
71
71
  route: Route.Route<P>
72
- ): <R, E, A>(effect: Effect.Effect<R, E, A>) => Effect.Effect<Exclude<R, CurrentRoute>, E, A>
72
+ ): <R, E, A>(effect: Effect.Effect<A, E, R>) => Effect.Effect<A, E, Exclude<R, CurrentRoute>>
73
73
 
74
74
  <R, E, A, P extends string>(
75
- effect: Effect.Effect<R, E, A>,
75
+ effect: Effect.Effect<A, E, R>,
76
76
  route: Route.Route<P>
77
- ): Effect.Effect<Exclude<R, CurrentRoute>, E, A>
77
+ ): Effect.Effect<A, E, Exclude<R, CurrentRoute>>
78
78
  } = dual(2, <R, E, A, P extends string>(
79
- effect: Effect.Effect<R, E, A>,
79
+ effect: Effect.Effect<A, E, R>,
80
80
  route: Route.Route<P>
81
- ): Effect.Effect<Exclude<R, CurrentRoute>, E, A> =>
81
+ ): Effect.Effect<A, E, Exclude<R, CurrentRoute>> =>
82
82
  Effect.contextWithEffect((ctx) => {
83
83
  const parent = Context.getOption(ctx, CurrentRoute)
84
84
 
@@ -156,7 +156,7 @@ export function isActive<const P extends string>(
156
156
  /**
157
157
  * @since 1.0.0
158
158
  */
159
- export const browser: Layer.Layer<Document.Document, never, CurrentRoute> = CurrentRoute.layer(
159
+ export const browser: Layer.Layer<CurrentRoute, never, Document.Document> = CurrentRoute.layer(
160
160
  Effect.gen(function*(_) {
161
161
  const document = yield* _(Document.Document)
162
162
  const base = document.querySelector("base")
@@ -172,7 +172,7 @@ export const browser: Layer.Layer<Document.Document, never, CurrentRoute> = Curr
172
172
  /**
173
173
  * @since 1.0.0
174
174
  */
175
- export const server = (base: string = "/"): Layer.Layer<never, never, CurrentRoute> =>
175
+ export const server = (base: string = "/"): Layer.Layer<CurrentRoute> =>
176
176
  CurrentRoute.layer({ route: Route.fromPath(base), parent: Option.none() })
177
177
 
178
178
  const getSearchParams = (destination: Destination): Readonly<Record<string, string>> =>