add extract and ui-url commands to CLI

Author: zth

CHANGELOG.md

@@ -1,5 +1,6 @@
 # master
 
+- Add `extract` and `ui-url` commands to CLI.
 - Emit `@live` annotations for relevant things in generated files.
 - Latest `rescript-embed-lang`.
 - Depend on ReScript v11.

cli/Cli.res

@@ -20,7 +20,11 @@ let usage = `Usage:
     [--watch]                                             | Runs this command in watch mode.
     
   unused-selections                                       | Check if we there are unused selections in your EdgeQL queries.
-    [--ci]                                                | Run in CI mode.`
+    [--ci]                                                | Run in CI mode.
+  
+  ui-url                                                  | Get the URL for opening the local EdgeDB UI.
+  
+  extract <filePath>                                      | Extract all %edgeql tags in file at <filePath>.`
 
 type config = {client: EdgeDB.Client.t}
 
@@ -72,7 +76,7 @@ let main = async () => {
           dict
         })
         ->JSON.stringifyAny
-        ->Option.getWithDefault("")
+        ->Option.getOr("")
         ->NodeJs.Buffer.fromString,
       )
     }
@@ -169,8 +173,21 @@ let main = async () => {
 
       {client: client}
     },
-    ~handleOtherCommand=async ({args, command}) => {
+    ~handleOtherCommand=async ({args, command, config}) => {
       switch command {
+      | "ui-url" =>
+        let getNormalizedConfig: EdgeDB.Client.t => promise<
+          'a,
+        > = %raw(`async function getNormalizedConfig(client) {
+          return (await client.pool._getNormalizedConnectConfig()).connectionParams
+        }`)
+
+        let connectionConfig = await getNormalizedConfig(config.client)
+
+        let url = `http://${connectionConfig["address"]->Array.joinWith(
+            ":",
+          )}/ui/${connectionConfig["database"]}`
+        Console.log(url)
       | "unused-selections" =>
         let ci = args->RescriptEmbedLang.CliArgs.hasArg("--ci")
 
@@ -198,7 +215,7 @@ let main = async () => {
         content
         ->String.split("# @name ")
         ->Array.get(1)
-        ->Option.getWithDefault("")
+        ->Option.getOr("")
         ->String.split(" ")
         ->Array.get(0)
         ->Option.map(EdgeDbGenerator__Utils.capitalizeString)
@@ -224,7 +241,7 @@ let main = async () => {
           while !break.contents {
             let currentLineCount = lineCount.contents
             lineCount := currentLineCount + 1
-            let line = lines->Array.get(currentLineCount)->Option.getWithDefault("")
+            let line = lines->Array.get(currentLineCount)->Option.getOr("")
             if line->String.includes("@name") {
               switch line->String.split("# @name ") {
               | [before, _after] =>
@@ -350,7 +367,7 @@ let transaction = (transaction: EdgeDB.Transaction.t${hasArgs
           let migrations =
             (await config.client
             ->EdgeDB.QueryHelpers.single("select count(schema::Migration)"))
-            ->Option.getWithDefault(-1)
+            ->Option.getOr(-1)
 
           debug(`[schema change detection] Found ${migrations->Int.toString} migrations`)
           let currentMigrationsCount = migrationsCount.contents

cli/EdgeDbGenerator.res

@@ -314,9 +314,9 @@ module AnalyzeQuery = {
     | Exn.Error(err) =>
       errorMessage := err->Exn.message
       Console.error(
-        `${CliUtils.colorRed(
-            "ERROR in file",
-          )}: ${path}:\n${errorMessage.contents->Option.getWithDefault("-")}`,
+        `${CliUtils.colorRed("ERROR in file")}: ${path}:\n${errorMessage.contents->Option.getOr(
+            "-",
+          )}`,
       )
       await holder->BaseClientPool.Holder.release
       None
@@ -350,7 +350,7 @@ module AnalyzeQuery = {
       })
     | _ =>
       Error(
-        errorMessage.contents->Option.getWithDefault(
+        errorMessage.contents->Option.getOr(
           "This query has an unknown EdgeDB error. Please check the query and recompile.",
         ),
       )

dbTestProject/test/TestProject.test.res

@@ -18,15 +18,13 @@ let removeIds = (key, value) => {
 describe("fetching data", () => {
   testAsync("fetching movies", async () => {
     let movies = await client->Movies.allMovies
-    let movies =
-      movies->JSON.stringifyAnyWithReplacerAndIndent(removeIds, 2)->Option.getWithDefault("")
+    let movies = movies->JSON.stringifyAnyWithReplacerAndIndent(removeIds, 2)->Option.getOr("")
     expect(movies)->Expect.toMatchSnapshot
   })
 
   testAsync("fetching single movie", async () => {
     let movie = await client->Movies.movieByTitle(~title="The Great Adventure")
-    let movie =
-      movie->JSON.stringifyAnyWithReplacerAndIndent(removeIds, 2)->Option.getWithDefault("")
+    let movie = movie->JSON.stringifyAnyWithReplacerAndIndent(removeIds, 2)->Option.getOr("")
     expect(movie)->Expect.toMatchSnapshot
   })