Skip to content

Commit a5b066d

Browse files
zthzth
committed
format + fix
1 parent 76716dd commit a5b066d

4 files changed

Lines changed: 75 additions & 65 deletions

File tree

‎.github/workflows/main.yml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,11 @@ jobs:
4242
id: git_status
4343
shell: bash
4444
run: |
45-
echo "status=$( git status --porcelain )" >> "$GITHUB_OUTPUT"
45+
{
46+
echo 'status<<__GIT_STATUS__'
47+
git status --porcelain
48+
echo '__GIT_STATUS__'
49+
} >> "$GITHUB_OUTPUT"
4650
- name: Exit if routes have not been properly regenerated and committed, or if formatting is incorrect
4751
shell: bash
4852
run: |

‎packages/rescript-relay-router/cli/RescriptRelayRouterCli__Commands.res‎

Lines changed: 22 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -243,9 +243,11 @@ let printRouteInfo = (~url, ~config) => {
243243
let rec dumpRoutesSortOrder = options => {
244244
switch options {
245245
| list{"--sort", "alphabetic", ..._}
246-
| list{"--sort=alphabetic", ..._} => Types.Alphabetic
246+
| list{"--sort=alphabetic", ..._} =>
247+
Types.Alphabetic
247248
| list{"--sort", "definition", ..._}
248-
| list{"--sort=definition", ..._} => Types.DefinitionOrder
249+
| list{"--sort=definition", ..._} =>
250+
Types.DefinitionOrder
249251
| list{_, ...rest} => dumpRoutesSortOrder(rest)
250252
| list{} => Types.DefinitionOrder
251253
}
@@ -258,9 +260,11 @@ let init = () => {
258260

259261
Fs.writeFileSync(
260262
path,
261-
`module.exports = ${JSON.Object(dict{
262-
"routesFolderPath": JSON.String("./src/routes"),
263-
})->JSON.stringify(~space=2)}`,
263+
`module.exports = ${JSON.Object(
264+
dict{
265+
"routesFolderPath": JSON.String("./src/routes"),
266+
},
267+
)->JSON.stringify(~space=2)}`,
264268
)
265269

266270
Console.log("[init] Config created at: " ++ path)
@@ -277,15 +281,19 @@ let init = () => {
277281
Fs.writeFileSync(
278282
routesJsonPath,
279283
JSON.Array([
280-
JSON.Object(dict{
281-
"path": JSON.String("/"),
282-
"name": JSON.String("Root"),
283-
"children": JSON.Array([]),
284-
}),
285-
JSON.Object(dict{
286-
"path": JSON.String("*"),
287-
"name": JSON.String("FourOhFour"),
288-
}),
284+
JSON.Object(
285+
dict{
286+
"path": JSON.String("/"),
287+
"name": JSON.String("Root"),
288+
"children": JSON.Array([]),
289+
},
290+
),
291+
JSON.Object(
292+
dict{
293+
"path": JSON.String("*"),
294+
"name": JSON.String("FourOhFour"),
295+
},
296+
),
289297
])->JSON.stringify(~space=2),
290298
)
291299

‎packages/rescript-relay-router/cli/RescriptRelayRouterCli__DumpRoutes.res‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,10 @@ let queryParamsObject = (route: printableRoute) => {
2323
}
2424

2525
let routeRendererPath = (~config, route: printableRoute) =>
26-
Utils.pathInRoutesFolder(~config, ~fileName=route.name->RouteName.getRouteRendererFileName)
27-
->pathRelativeToCwd
26+
Utils.pathInRoutesFolder(
27+
~config,
28+
~fileName=route.name->RouteName.getRouteRendererFileName,
29+
)->pathRelativeToCwd
2830

2931
let routeFilePath = (~config, route: printableRoute) =>
3032
Utils.pathInRoutesFolder(~config, ~fileName=route.sourceFile)->pathRelativeToCwd
@@ -51,9 +53,7 @@ let sortRoutes = (routes, ~sortOrder) => {
5153
switch sortOrder {
5254
| DefinitionOrder => ()
5355
| Alphabetic =>
54-
routes->Array.sort((a, b) =>
55-
String.localeCompare(a->urlFromDumpedRoute, b->urlFromDumpedRoute)
56-
)
56+
routes->Array.sort((a, b) => String.localeCompare(a->urlFromDumpedRoute, b->urlFromDumpedRoute))
5757
}
5858
}
5959

‎packages/rescript-relay-router/test/RescriptRelayRouterCli.test.res‎

Lines changed: 43 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ open RescriptRelayRouterCli__Types
44
module U = RescriptRelayRouterCli__Utils
55
module DumpRoutes = RescriptRelayRouterCli__DumpRoutes
66

7-
let stringifyDump = dumped => dumped->Array.map(route => JSON.Object(route))->JSON.Array->JSON.stringify
7+
let stringifyDump = dumped =>
8+
dumped->Array.map(route => JSON.Object(route))->JSON.Array->JSON.stringify
89

910
let testConfig = {
1011
generatedPath: "src/routes/__generated__",
@@ -129,22 +130,21 @@ describe("Dump routes", () => {
129130
}
130131
]`)
131132

132-
let dumped =
133-
DumpRoutes.dump(
134-
~routes=result->U.routeChildrenToPrintable,
135-
~config=testConfig,
136-
~options={
137-
includeQueryParams: false,
138-
includeName: false,
139-
includeRouteRendererPath: false,
140-
includeRouteFilePath: false,
141-
sortOrder: DefinitionOrder,
142-
},
143-
)
144-
145-
expect(dumped->stringifyDump)->Expect.toBe(
146-
`[{"url":"/organization/:slug"},{"url":"/organization/:slug/members"},{"url":"/"},{"url":"/admin"}]`,
133+
let dumped = DumpRoutes.dump(
134+
~routes=result->U.routeChildrenToPrintable,
135+
~config=testConfig,
136+
~options={
137+
includeQueryParams: false,
138+
includeName: false,
139+
includeRouteRendererPath: false,
140+
includeRouteFilePath: false,
141+
sortOrder: DefinitionOrder,
142+
},
147143
)
144+
145+
expect(
146+
dumped->stringifyDump,
147+
)->Expect.toBe(`[{"url":"/organization/:slug"},{"url":"/organization/:slug/members"},{"url":"/"},{"url":"/admin"}]`)
148148
})
149149

150150
test("can sort routes alphabetically by URL", _t => {
@@ -169,22 +169,21 @@ describe("Dump routes", () => {
169169
}
170170
]`)
171171

172-
let dumped =
173-
DumpRoutes.dump(
174-
~routes=result->U.routeChildrenToPrintable,
175-
~config=testConfig,
176-
~options={
177-
includeQueryParams: false,
178-
includeName: false,
179-
includeRouteRendererPath: false,
180-
includeRouteFilePath: false,
181-
sortOrder: Alphabetic,
182-
},
183-
)
184-
185-
expect(dumped->stringifyDump)->Expect.toBe(
186-
`[{"url":"/"},{"url":"/admin"},{"url":"/organization/:slug"},{"url":"/organization/:slug/members"}]`,
172+
let dumped = DumpRoutes.dump(
173+
~routes=result->U.routeChildrenToPrintable,
174+
~config=testConfig,
175+
~options={
176+
includeQueryParams: false,
177+
includeName: false,
178+
includeRouteRendererPath: false,
179+
includeRouteFilePath: false,
180+
sortOrder: Alphabetic,
181+
},
187182
)
183+
184+
expect(
185+
dumped->stringifyDump,
186+
)->Expect.toBe(`[{"url":"/"},{"url":"/admin"},{"url":"/organization/:slug"},{"url":"/organization/:slug/members"}]`)
188187
})
189188

190189
test("includes query params and requested metadata", _t => {
@@ -201,21 +200,20 @@ describe("Dump routes", () => {
201200
}
202201
]`)
203202

204-
let dumped =
205-
DumpRoutes.dump(
206-
~routes=result->U.routeChildrenToPrintable,
207-
~config=testConfig,
208-
~options={
209-
includeQueryParams: true,
210-
includeName: true,
211-
includeRouteRendererPath: true,
212-
includeRouteFilePath: true,
213-
sortOrder: Alphabetic,
214-
},
203+
let dumped = DumpRoutes.dump(
204+
~routes=result->U.routeChildrenToPrintable,
205+
~config=testConfig,
206+
~options={
207+
includeQueryParams: true,
208+
includeName: true,
209+
includeRouteRendererPath: true,
210+
includeRouteFilePath: true,
211+
sortOrder: Alphabetic,
212+
},
215213
)
216214

217-
expect(dumped->stringifyDump)->Expect.toBe(
218-
`[{"url":"/organization/:slug","queryParams":{"displayMode":":displayMode","expandDetails":":expandDetails"},"name":"Organization","routeRendererPath":"src/routes/Organization_route_renderer.res","routeFilePath":"src/routes/routes.json"},{"url":"/organization/:slug/members","queryParams":{"after":":after","displayMode":":displayMode","expandDetails":":expandDetails","first":":first"},"name":"Organization__Members","routeRendererPath":"src/routes/Organization__Members_route_renderer.res","routeFilePath":"src/routes/routes.json"}]`,
219-
)
215+
expect(
216+
dumped->stringifyDump,
217+
)->Expect.toBe(`[{"url":"/organization/:slug","queryParams":{"displayMode":":displayMode","expandDetails":":expandDetails"},"name":"Organization","routeRendererPath":"src/routes/Organization_route_renderer.res","routeFilePath":"src/routes/routes.json"},{"url":"/organization/:slug/members","queryParams":{"after":":after","displayMode":":displayMode","expandDetails":":expandDetails","first":":first"},"name":"Organization__Members","routeRendererPath":"src/routes/Organization__Members_route_renderer.res","routeFilePath":"src/routes/routes.json"}]`)
220218
})
221219
})

0 commit comments

Comments
 (0)