chore: move all util functions into Cli namespace to resolve name cla…

…shes & bump toolchain

Cli/Basic.lean

@@ -1,5 +1,7 @@
 import Lean.Data.RBTree
 
+namespace Cli
+
 section Utils
   /--
   Matches the lengths of lists `a` and `b` by filling the shorter one with
@@ -20,7 +22,7 @@ section Utils
       return r
 
     def flatMap (f : α → Array β) (xs : Array α) : Array β :=
-      xs.map f |>.join
+      join (xs.map f)
   end Array
 
   namespace String
@@ -52,7 +54,7 @@ section Utils
     Panics if `maxWidth = 0`.
     -/
     def wrapAt! (s : String) (maxWidth : Nat) : String :=
-      s.wrapAt? maxWidth |>.get!
+      wrapAt? s maxWidth |>.get!
 
     /--
     Deletes all trailing spaces at the end of every line, as seperated by `\n`.
@@ -88,7 +90,7 @@ section Utils
             continue
           -- if `w` is the first proper word, this will insert a `\n` before the text, which we remove later.
           -- `w.wrapAt! maxWidth` ensures that our new line is not already too large.
-          let wordOnNewLine := "\n" ++ w.wrapAt! maxWidth
+          let wordOnNewLine := "\n" ++ wrapAt! w maxWidth
           result := result.push wordOnNewLine
           let wrappedLines : Array String := wordOnNewLine.splitOn "\n" |>.toArray
           currentLineWidth := wrappedLines[wrappedLines.size - 1]!.length + 1
@@ -111,7 +113,7 @@ section Utils
     Panics if `maxWidth = 0`.
     -/
     def wrapWordsAt! (s : String) (maxWidth : Nat) : String :=
-      s.wrapWordsAt? maxWidth |>.get!
+      wrapWordsAt? s maxWidth |>.get!
 
     /--
     Inserts `n` spaces before each line as seperated by `\n` in `s`.
@@ -146,16 +148,16 @@ section Utils
       if maxWidth - margin - minRightColumnWidth < 1 then
         return none
       let rows : Array (List String × String) := rows.map fun (left, right) =>
-        (maxWidth - margin - minRightColumnWidth |> left.wrapWordsAt! |>.splitOn "\n", right)
+        (maxWidth - margin - minRightColumnWidth |> String.wrapWordsAt! left |>.splitOn "\n", right)
       let leftColumnWidth :=
-        rows.flatMap (·.1.map (·.length) |>.toArray)
+        flatMap (·.1.map (·.length) |>.toArray) rows
           |>.getMax? (· < ·)
           |>.get!
       let leftColumnWidth := leftColumnWidth + margin
       let rows : Array (List String × List String) := rows.map fun (left, right) =>
-        (left, maxWidth - leftColumnWidth |> right.wrapWordsAt! |>.splitOn "\n")
-      let rows : Array (String × String) := rows.flatMap fun (left, right) =>
-        let (left, right) : List String × List String := left.matchLength right ""
+        (left, maxWidth - leftColumnWidth |> String.wrapWordsAt! right |>.splitOn "\n")
+      let rows : Array (String × String) := flatMap (xs := rows) fun (left, right) =>
+        let (left, right) : List String × List String := List.matchLength left right ""
         left.zip right |>.toArray
       let rows : Array String := rows.map fun (left, right) =>
         if right = "" then
@@ -174,7 +176,7 @@ section Utils
     -/
     def renderTable! (rows : Array (String × String)) (maxWidth : Nat) (margin : Nat := 2)
       : String :=
-      rows.renderTable? maxWidth margin |>.get!
+      renderTable? rows maxWidth margin |>.get!
   end Array
 
   namespace Option
@@ -190,8 +192,6 @@ section Utils
   end Option
 end Utils
 
-namespace Cli
-
 section Configuration
   /--
   Represents a type that can be parsed to a string and the corresponding name of the type.
@@ -457,9 +457,9 @@ section Configuration
     /-- Checks whether `m` has a flag with the corresponding `shortName`. -/
     def hasFlagByShortName (m : Meta) (name : String) : Bool := m.flagByShortName? name |>.isSome
 
-    /-- 
+    /--
     Adds help (`-h, --help`) and version (`--version`) flags to `m`. Does not add
-    a version flag if `m` does not designate a version. 
+    a version flag if `m` does not designate a version.
     -/
     def addHelpAndVersionFlags (m : Meta) : Meta := Id.run do
       let helpFlag := .paramless
@@ -475,7 +475,7 @@ section Configuration
       { m with flags := fixedFlags ++ m.flags }
   end Cmd.Meta
 
-  /-- 
+  /--
   Represents a recursive variant of `Cmd.Meta` that is used in `Parsed`
   to replicate the recursive subcommand structure of a command
   without referring to the command itself.
@@ -679,7 +679,7 @@ section Configuration
       (subCmds             : Array ExtendableCmd := #[])
       : ExtendableCmd :=
         .mk'
-          ⟨name, parent.meta.parentNames.push parent.meta.name, version?, description, furtherInformation?, 
+          ⟨name, parent.meta.parentNames.push parent.meta.name, version?, description, furtherInformation?,
             flags, positionalArgs, variableArg?⟩
           run subCmds
 
@@ -710,7 +710,7 @@ section Configuration
       (subCmds             : Array ExtendableCmd := #[])
       : ExtendableCmd :=
         .mkWithHelpAndVersionFlags'
-          ⟨name, parent.meta.parentNames.push parent.meta.name, version?, description, furtherInformation?, 
+          ⟨name, parent.meta.parentNames.push parent.meta.name, version?, description, furtherInformation?,
             flags, positionalArgs, variableArg?⟩
           run subCmds
 
@@ -783,18 +783,18 @@ section Configuration
   - The output of the parser can be postprocessed and validated.
   -/
   structure Extension where
-    /-- 
+    /--
     Priority that dictates how early an extension is applied.
     The lower the priority, the later it is applied.
     -/
     priority : Nat := 1024
-    /-- 
+    /--
     Extends a command to adjust the displayed help.
     The recursive subcommand structure may be mutated.
     -/
     extend : ExtendableCmd → ExtendableCmd := id
-    /-- 
-    Processes and validates the output of the parser for the given `ExtendableCmd`. 
+    /--
+    Processes and validates the output of the parser for the given `ExtendableCmd`.
     Takes the `ExtendableCmd` that results from all extensions being applied.
     If postprocessing mutates the subcommand structure in `Parsed.cmd`, care must be taken to update
     `Parsed.parent?` accordingly as well.
@@ -852,7 +852,7 @@ section Configuration
         let subCmdParentNames := parentNames.push c.meta.name
         let subCmds := c.subCmds.map (loop · subCmdParentNames)
         .init { c.meta with parentNames := parentNames } c.run subCmds c.extension?
-    
+
     /--
     Creates a new command. Adds a `-h, --help` and a `--version` flag if `meta` designates a version.
     Updates the `parentNames` of all subcommands.
@@ -947,7 +947,7 @@ section Configuration
       for ⟨fullName, extension?⟩ in extensions do
         extensionIndex := extensionIndex.insert fullName extension?
       let rec loop (c : ExtendableCmd) : Cli.Cmd :=
-        let extension? := do extensionIndex.find? (← c.originalFullName?) |>.join
+        let extension? := do extensionIndex.find? (← c.originalFullName?) |> Option.join
         let subCmds := c.subCmds.map loop
         .init c.meta c.run subCmds extension?
       loop c |>.updateParentNames |> prependOriginalParentNames
@@ -1052,24 +1052,27 @@ section Macro
           (description    := $description)
           (flags          := $(quote (← flags.getD #[] |>.mapM expandFlag)))
           (positionalArgs := $(quote (← positionalArgs.getD #[] |>.mapM expandPositionalArg)))
-          (variableArg?   := $(quote (← variableArg.join.mapM expandVariableArg)))
+          (variableArg?   := $(quote (← (Option.join variableArg).mapM expandVariableArg)))
           (run            := $(← expandRunFun run))
           (subCmds        := $(quote (subCommands.getD ⟨#[]⟩).getElems))
           (extension?     := some <| Array.foldl Extension.then { : Extension } <| Array.qsort
             $(quote (extensions.getD ⟨#[]⟩).getElems) (·.priority > ·.priority)))
 end Macro
 
 section Info
+  open Cli.String
+  open Cli.Option
+
   /-- Maximum width within which all formatted text should fit. -/
   def maxWidth                  : Nat := 80
   /-- Amount of spaces with which section content is indented. -/
   def indentation               : Nat := 4
   /-- Maximum width within which all formatted text should fit, after indentation. -/
   def maxIndentedWidth          : Nat := maxWidth - indentation
   /-- Formats `xs` by `String.optJoin`ing the components with a single space. -/
-  def line  (xs : Array String) : String := " ".optJoin xs
+  def line  (xs : Array String) : String := optJoin xs " "
   /-- Formats `xs` by `String.optJoin`ing the components with a newline `\n`. -/
-  def lines (xs : Array String) : String := "\n".optJoin xs
+  def lines (xs : Array String) : String := optJoin xs "\n"
 
   /--
   Renders a help section with the designated `title` and `content`.
@@ -1088,43 +1091,43 @@ section Info
       else
         return s!"{title}:"
     lines #[
-      titleLine?.optStr,
-      content |>.wrapWordsAt! maxIndentedWidth |>.indent indentation
+      optStr titleLine?,
+      wrapWordsAt! content maxIndentedWidth |> indent (n := indentation)
     ]
 
   /--
-  Renders a table using `Array.renderTable!` and then renders a section with
+  Renders a table using `Cli.Array.renderTable!` and then renders a section with
   the designated `title` and the rendered table as content.
   -/
   def renderTable
     (title                  : String)
     (columns                : Array (String × String))
     (emptyTablePlaceholder? : Option String := none)
     : String :=
-    let table := columns.renderTable! (maxWidth := maxIndentedWidth)
+    let table := Array.renderTable! columns (maxWidth := maxIndentedWidth)
     renderSection title table emptyTablePlaceholder?
 
   namespace Cmd
     private def metaDataInfo (c : Cmd) : String :=
       let version? : Option String := do return s!"[{← c.meta.version?}]"
       lines #[
-        line #[c.meta.fullName, version?.optStr] |>.wrapWordsAt! maxWidth,
-        c.meta.description.wrapWordsAt! maxWidth
+        line #[c.meta.fullName, optStr version?] |> wrapWordsAt! (maxWidth := maxWidth),
+        wrapWordsAt! c.meta.description maxWidth
       ]
 
     private def usageInfo (c : Cmd) : String :=
       let subCmdTitle? : Option String := if ¬c.subCmds.isEmpty then "[SUBCOMMAND]" else none
       let posArgNames  : String        := line <| c.meta.positionalArgs.map (s!"<{·.name}>")
       let varArgName?  : Option String := do return s!"<{(← c.meta.variableArg?).name}>..."
-      let info := line #[c.meta.fullName, subCmdTitle?.optStr, "[FLAGS]", posArgNames, varArgName?.optStr]
+      let info := line #[c.meta.fullName, optStr subCmdTitle?, "[FLAGS]", posArgNames, optStr varArgName?]
       renderSection "USAGE" info
 
     private def flagInfo (c : Cmd) : String :=
       let columns : Array (String × String) := c.meta.flags.map fun flag =>
         let shortName?    : Option String := do return s!"-{← flag.shortName?}"
-        let names         : String        := ", ".optJoin #[shortName?.optStr, s!"--{flag.longName}"]
+        let names         : String        := optJoin #[optStr shortName?, s!"--{flag.longName}"] ", "
         let type?         : Option String := if ¬ flag.isParamless then s!": {flag.type.name}" else none
-        (line #[names, type?.optStr], flag.description)
+        (line #[names, optStr type?], flag.description)
       renderTable "FLAGS" columns (emptyTablePlaceholder? := "None")
 
     private def positionalArgInfo (c : Cmd) : String :=
@@ -1148,14 +1151,14 @@ section Info
         "\n" ++ c.flagInfo,
         (if ¬c.meta.positionalArgs.isEmpty ∨ c.meta.hasVariableArg then "\n" else "") ++ c.positionalArgInfo,
         (if ¬c.subCmds.isEmpty then "\n" else "") ++ c.subCommandInfo,
-        (if c.meta.hasFurtherInformation then "\n" else "") ++ c.meta.furtherInformation?.optStr
+        (if c.meta.hasFurtherInformation then "\n" else "") ++ optStr c.meta.furtherInformation?
       ]
 
     /-- Renders an error for `c` with the designated message `msg`. -/
     def error (c : Cmd) (msg : String) : String :=
       lines #[
-        msg.wrapWordsAt! maxWidth,
-        s!"Run `{c.meta.fullName} -h` for further information.".wrapWordsAt! maxWidth
+        wrapWordsAt! msg maxWidth,
+        wrapWordsAt! s!"Run `{c.meta.fullName} -h` for further information." maxWidth
       ]
 
     /-- Prints the help for `c`. -/
@@ -1216,7 +1219,7 @@ section Parsing
             return s!" (`--{flag.longName}`)"
           else
             return s!" (`-{← flag.shortName?}`)"
-        s!"Duplicate flag `{inputFlag}`{complementaryName?.optStr}.")
+        s!"Duplicate flag `{inputFlag}`{Option.optStr complementaryName?}.")
     | redundantFlagArg
       (flag       : Flag)
       (inputFlag  : InputFlag)
@@ -1538,12 +1541,12 @@ section Parsing
     partial def applyExtensions (c : Cmd) : Cmd := Id.run do
       let subCmds := c.subCmds.map applyExtensions
       let c := c.update (subCmds := subCmds)
-      let some extension := c.extension? 
+      let some extension := c.extension?
         | return c
       extension.extend (.ofFullCmd c) |>.toFullCmd c
 
     /--
-    Processes `args` by applying all extensions in `c`, `Cmd.parse?`ing the input according to `c` 
+    Processes `args` by applying all extensions in `c`, `Cmd.parse?`ing the input according to `c`
     and then applying the postprocessing extension of the respective (sub)command that was called.
     Note that `args` designates the list `<foo>` in `somebinary <foo>`.
     Returns either the (sub)command that an error occured in and the corresponding error message or

Cli/Extensions.lean

@@ -1,5 +1,7 @@
 import Cli.Basic
 
+namespace Cli
+
 section Utils
   namespace Array
     /--
@@ -36,8 +38,6 @@ section Utils
   end Array
 end Utils
 
-namespace Cli
-
 section Extensions
   /-- Prepends an author name to the description of the command. -/
   def author (author : String) : Extension := {
@@ -47,8 +47,8 @@ section Extensions
   /-- Appends a longer description to the end of the help. -/
   def longDescription (description : String) : Extension := {
       extend := fun cmd => cmd.update (furtherInformation? :=
-        some <| cmd.furtherInformation?.optStr ++ lines #[
-          cmd.furtherInformation?.optStr,
+        some <| Option.optStr cmd.furtherInformation? ++ lines #[
+          Option.optStr cmd.furtherInformation?,
           (if cmd.hasFurtherInformation then "\n" else "") ++ renderSection "DESCRIPTION" description
         ]
       )
@@ -58,7 +58,7 @@ section Extensions
   def helpSubCommand : Extension := {
       priority := 0
       extend   := fun cmd =>
-        let helpCmd := .mk 
+        let helpCmd := .mk
           (parent      := cmd)
           (name        := "help")
           (version?    := none)
@@ -67,7 +67,7 @@ section Extensions
         -- adding it once without a command handler ensures that the help will include
         -- the help subcommand itself
         let cmd := cmd.update (subCmds := cmd.subCmds.push helpCmd)
-        let helpCmd := helpCmd.update (run := fun _ => do 
+        let helpCmd := helpCmd.update (run := fun _ => do
           cmd.toFullCmdWithoutExtensions.printHelp
           return 0)
         let subCmds := cmd.subCmds.set! (cmd.subCmds.size - 1) helpCmd
@@ -80,12 +80,12 @@ section Extensions
       if cmd.version?.isNone then
         panic! "Cli.versionSubCommand!: Cannot add `version` subcommand to command without a version."
       else
-        let helpCmd := .mk 
+        let helpCmd := .mk
           (parent      := cmd)
           (name        := "version")
           (version?    := none)
           (description := "Prints the version.")
-          (run         := fun _ => do 
+          (run         := fun _ => do
             cmd.toFullCmdWithoutExtensions.printVersion!
             return 0)
         cmd.update (subCmds := cmd.subCmds.push helpCmd)
@@ -111,7 +111,7 @@ section Extensions
         cmd.update (flags := newMetaFlags)
       postprocess := fun cmd parsed =>
         let defaultFlags := findDefaultFlags cmd
-        return { parsed with flags := parsed.flags.leftUnionBy (·.flag.longName) defaultFlags }
+        return { parsed with flags := Array.leftUnionBy (·.flag.longName) parsed.flags defaultFlags }
     }
 
   /--
@@ -134,7 +134,7 @@ section Extensions
         if parsed.hasFlag "help" ∨ parsed.hasFlag "version" then
           return parsed
         let requiredFlags := findRequiredFlags cmd
-        let missingFlags := requiredFlags.diffBy (·.longName) <| parsed.flags.map (·.flag.longName)
+        let missingFlags := Array.diffBy (·.longName) requiredFlags <| parsed.flags.map (·.flag.longName)
         if let some missingFlag ← pure <| missingFlags.get? 0 then
           throw s!"Missing required flag `--{missingFlag.longName}`."
         return parsed

lean-toolchain

@@ -1 +1 @@
-leanprover/lean4:nightly-2022-10-20
+leanprover/lean4:nightly-2022-10-31