annotate vext.sml @ 1740:669bd699082d

Update vext
author Chris Cannam
date Thu, 13 Jul 2017 15:34:33 +0100
parents 76872ffc03a3
children bf4a7015033e
rev   line source
Chris@1706 1 (* This file is automatically generated from the individual
Chris@1706 2 source files in the Vext repository. *)
Chris@1706 3
Chris@1706 4 (*
Chris@1706 5 Vext
Chris@1706 6
Chris@1706 7 A simple manager for third-party source code dependencies
Chris@1706 8
Chris@1706 9 Copyright 2017 Chris Cannam.
Chris@1706 10
Chris@1706 11 Permission is hereby granted, free of charge, to any person
Chris@1706 12 obtaining a copy of this software and associated documentation
Chris@1706 13 files (the "Software"), to deal in the Software without
Chris@1706 14 restriction, including without limitation the rights to use, copy,
Chris@1706 15 modify, merge, publish, distribute, sublicense, and/or sell copies
Chris@1706 16 of the Software, and to permit persons to whom the Software is
Chris@1706 17 furnished to do so, subject to the following conditions:
Chris@1706 18
Chris@1706 19 The above copyright notice and this permission notice shall be
Chris@1706 20 included in all copies or substantial portions of the Software.
Chris@1706 21
Chris@1706 22 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
Chris@1706 23 EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
Chris@1706 24 MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
Chris@1706 25 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR
Chris@1706 26 ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
Chris@1706 27 CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
Chris@1706 28 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
Chris@1706 29
Chris@1706 30 Except as contained in this notice, the names of Chris Cannam and
Chris@1706 31 Particular Programs Ltd shall not be used in advertising or
Chris@1706 32 otherwise to promote the sale, use or other dealings in this
Chris@1706 33 Software without prior written authorization.
Chris@1706 34 *)
Chris@1706 35
Chris@1740 36 val vext_version = "0.9.6"
Chris@1706 37
Chris@1706 38
Chris@1706 39 datatype vcs =
Chris@1706 40 HG |
Chris@1706 41 GIT
Chris@1706 42
Chris@1706 43 datatype source =
Chris@1721 44 URL_SOURCE of string |
Chris@1721 45 SERVICE_SOURCE of {
Chris@1706 46 service : string,
Chris@1706 47 owner : string option,
Chris@1706 48 repo : string option
Chris@1706 49 }
Chris@1706 50
Chris@1740 51 type id_or_tag = string
Chris@1740 52
Chris@1706 53 datatype pin =
Chris@1706 54 UNPINNED |
Chris@1740 55 PINNED of id_or_tag
Chris@1706 56
Chris@1706 57 datatype libstate =
Chris@1706 58 ABSENT |
Chris@1706 59 CORRECT |
Chris@1706 60 SUPERSEDED |
Chris@1706 61 WRONG
Chris@1706 62
Chris@1706 63 datatype localstate =
Chris@1706 64 MODIFIED |
Chris@1740 65 LOCK_MISMATCHED |
Chris@1740 66 CLEAN
Chris@1706 67
Chris@1706 68 datatype branch =
Chris@1706 69 BRANCH of string |
Chris@1706 70 DEFAULT_BRANCH
Chris@1706 71
Chris@1706 72 (* If we can recover from an error, for example by reporting failure
Chris@1706 73 for this one thing and going on to the next thing, then the error
Chris@1706 74 should usually be returned through a result type rather than an
Chris@1706 75 exception. *)
Chris@1706 76
Chris@1706 77 datatype 'a result =
Chris@1706 78 OK of 'a |
Chris@1706 79 ERROR of string
Chris@1706 80
Chris@1706 81 type libname = string
Chris@1706 82
Chris@1706 83 type libspec = {
Chris@1706 84 libname : libname,
Chris@1706 85 vcs : vcs,
Chris@1706 86 source : source,
Chris@1706 87 branch : branch,
Chris@1740 88 project_pin : pin,
Chris@1740 89 lock_pin : pin
Chris@1706 90 }
Chris@1706 91
Chris@1706 92 type lock = {
Chris@1706 93 libname : libname,
Chris@1706 94 id_or_tag : id_or_tag
Chris@1706 95 }
Chris@1740 96
Chris@1706 97 type remote_spec = {
Chris@1706 98 anon : string option,
Chris@1706 99 auth : string option
Chris@1706 100 }
Chris@1706 101
Chris@1706 102 type provider = {
Chris@1706 103 service : string,
Chris@1706 104 supports : vcs list,
Chris@1706 105 remote_spec : remote_spec
Chris@1706 106 }
Chris@1706 107
Chris@1706 108 type account = {
Chris@1706 109 service : string,
Chris@1706 110 login : string
Chris@1706 111 }
Chris@1706 112
Chris@1706 113 type context = {
Chris@1706 114 rootpath : string,
Chris@1706 115 extdir : string,
Chris@1706 116 providers : provider list,
Chris@1706 117 accounts : account list
Chris@1706 118 }
Chris@1706 119
Chris@1706 120 type userconfig = {
Chris@1706 121 providers : provider list,
Chris@1706 122 accounts : account list
Chris@1706 123 }
Chris@1706 124
Chris@1706 125 type project = {
Chris@1706 126 context : context,
Chris@1706 127 libs : libspec list
Chris@1706 128 }
Chris@1706 129
Chris@1706 130 structure VextFilenames = struct
Chris@1706 131 val project_file = "vext-project.json"
Chris@1706 132 val project_lock_file = "vext-lock.json"
Chris@1706 133 val user_config_file = ".vext.json"
Chris@1706 134 end
Chris@1706 135
Chris@1706 136 signature VCS_CONTROL = sig
Chris@1706 137
Chris@1706 138 (** Test whether the library is present locally at all *)
Chris@1706 139 val exists : context -> libname -> bool result
Chris@1706 140
Chris@1706 141 (** Return the id (hash) of the current revision for the library *)
Chris@1706 142 val id_of : context -> libname -> id_or_tag result
Chris@1706 143
Chris@1706 144 (** Test whether the library is at the given id *)
Chris@1706 145 val is_at : context -> libname * id_or_tag -> bool result
Chris@1706 146
Chris@1706 147 (** Test whether the library is on the given branch, i.e. is at
Chris@1706 148 the branch tip or an ancestor of it *)
Chris@1706 149 val is_on_branch : context -> libname * branch -> bool result
Chris@1706 150
Chris@1706 151 (** Test whether the library is at the newest revision for the
Chris@1706 152 given branch. False may indicate that the branch has advanced
Chris@1706 153 or that the library is not on the branch at all. This function
Chris@1706 154 may use the network to check for new revisions *)
Chris@1706 155 val is_newest : context -> libname * branch -> bool result
Chris@1706 156
Chris@1706 157 (** Test whether the library is at the newest revision available
Chris@1706 158 locally for the given branch. False may indicate that the
Chris@1706 159 branch has advanced or that the library is not on the branch
Chris@1706 160 at all. This function must not use the network *)
Chris@1706 161 val is_newest_locally : context -> libname * branch -> bool result
Chris@1706 162
Chris@1706 163 (** Test whether the library has been modified in the local
Chris@1706 164 working copy *)
Chris@1706 165 val is_modified_locally : context -> libname -> bool result
Chris@1706 166
Chris@1706 167 (** Check out, i.e. clone a fresh copy of, the repo for the given
Chris@1706 168 library on the given branch *)
Chris@1706 169 val checkout : context -> libname * source * branch -> unit result
Chris@1706 170
Chris@1706 171 (** Update the library to the given branch tip *)
Chris@1706 172 val update : context -> libname * branch -> id_or_tag result
Chris@1706 173
Chris@1706 174 (** Update the library to the given specific id or tag *)
Chris@1706 175 val update_to : context -> libname * id_or_tag -> id_or_tag result
Chris@1706 176 end
Chris@1706 177
Chris@1706 178 signature LIB_CONTROL = sig
Chris@1706 179 val review : context -> libspec -> (libstate * localstate) result
Chris@1706 180 val status : context -> libspec -> (libstate * localstate) result
Chris@1706 181 val update : context -> libspec -> id_or_tag result
Chris@1740 182 val id_of : context -> libspec -> id_or_tag result
Chris@1706 183 end
Chris@1706 184
Chris@1706 185 structure FileBits :> sig
Chris@1706 186 val extpath : context -> string
Chris@1706 187 val libpath : context -> libname -> string
Chris@1706 188 val subpath : context -> libname -> string -> string
Chris@1706 189 val command_output : context -> libname -> string list -> string result
Chris@1706 190 val command : context -> libname -> string list -> unit result
Chris@1706 191 val file_contents : string -> string
Chris@1706 192 val mydir : unit -> string
Chris@1706 193 val homedir : unit -> string
Chris@1706 194 val mkpath : string -> unit result
Chris@1706 195 val project_spec_path : string -> string
Chris@1706 196 val project_lock_path : string -> string
Chris@1706 197 val verbose : unit -> bool
Chris@1706 198 end = struct
Chris@1706 199
Chris@1706 200 fun verbose () =
Chris@1706 201 case OS.Process.getEnv "VEXT_VERBOSE" of
Chris@1706 202 SOME "0" => false
Chris@1706 203 | SOME _ => true
Chris@1706 204 | NONE => false
Chris@1706 205
Chris@1706 206 fun extpath ({ rootpath, extdir, ... } : context) =
Chris@1706 207 let val { isAbs, vol, arcs } = OS.Path.fromString rootpath
Chris@1706 208 in OS.Path.toString {
Chris@1706 209 isAbs = isAbs,
Chris@1706 210 vol = vol,
Chris@1706 211 arcs = arcs @ [ extdir ]
Chris@1706 212 }
Chris@1706 213 end
Chris@1706 214
Chris@1706 215 fun subpath ({ rootpath, extdir, ... } : context) libname remainder =
Chris@1706 216 (* NB libname is allowed to be a path fragment, e.g. foo/bar *)
Chris@1706 217 let val { isAbs, vol, arcs } = OS.Path.fromString rootpath
Chris@1706 218 val split = String.fields (fn c => c = #"/")
Chris@1706 219 in OS.Path.toString {
Chris@1706 220 isAbs = isAbs,
Chris@1706 221 vol = vol,
Chris@1706 222 arcs = arcs @ [ extdir ] @ split libname @ split remainder
Chris@1706 223 }
Chris@1706 224 end
Chris@1706 225
Chris@1706 226 fun libpath context "" =
Chris@1706 227 extpath context
Chris@1706 228 | libpath context libname =
Chris@1706 229 subpath context libname ""
Chris@1706 230
Chris@1706 231 fun project_file_path rootpath filename =
Chris@1706 232 let val { isAbs, vol, arcs } = OS.Path.fromString rootpath
Chris@1706 233 in OS.Path.toString {
Chris@1706 234 isAbs = isAbs,
Chris@1706 235 vol = vol,
Chris@1706 236 arcs = arcs @ [ filename ]
Chris@1706 237 }
Chris@1706 238 end
Chris@1706 239
Chris@1706 240 fun project_spec_path rootpath =
Chris@1706 241 project_file_path rootpath (VextFilenames.project_file)
Chris@1706 242
Chris@1706 243 fun project_lock_path rootpath =
Chris@1706 244 project_file_path rootpath (VextFilenames.project_lock_file)
Chris@1706 245
Chris@1706 246 fun trim str =
Chris@1706 247 hd (String.fields (fn x => x = #"\n" orelse x = #"\r") str)
Chris@1706 248
Chris@1706 249 fun file_contents filename =
Chris@1706 250 let val stream = TextIO.openIn filename
Chris@1706 251 fun read_all str acc =
Chris@1706 252 case TextIO.inputLine str of
Chris@1706 253 SOME line => read_all str (trim line :: acc)
Chris@1706 254 | NONE => rev acc
Chris@1706 255 val contents = read_all stream []
Chris@1706 256 val _ = TextIO.closeIn stream
Chris@1706 257 in
Chris@1706 258 String.concatWith "\n" contents
Chris@1706 259 end
Chris@1706 260
Chris@1706 261 fun expand_commandline cmdlist =
Chris@1706 262 (* We are quite [too] strict about what we accept here, except
Chris@1706 263 for the first element in cmdlist which is assumed to be a
Chris@1706 264 known command location rather than arbitrary user input. NB
Chris@1706 265 only ASCII accepted at this point. *)
Chris@1706 266 let open Char
Chris@1706 267 fun quote arg =
Chris@1706 268 if List.all
Chris@1706 269 (fn c => isAlphaNum c orelse c = #"-" orelse c = #"_")
Chris@1706 270 (explode arg)
Chris@1706 271 then arg
Chris@1706 272 else "\"" ^ arg ^ "\""
Chris@1706 273 fun check arg =
Chris@1706 274 let val valid = explode " /#:;?,._-{}@="
Chris@1706 275 in
Chris@1706 276 app (fn c =>
Chris@1706 277 if isAlphaNum c orelse
Chris@1706 278 List.exists (fn v => v = c) valid
Chris@1706 279 then ()
Chris@1706 280 else raise Fail ("Invalid character '" ^
Chris@1706 281 (Char.toString c) ^
Chris@1706 282 "' in command list"))
Chris@1706 283 (explode arg);
Chris@1706 284 arg
Chris@1706 285 end
Chris@1706 286 in
Chris@1706 287 String.concatWith " "
Chris@1706 288 (map quote
Chris@1706 289 (hd cmdlist :: map check (tl cmdlist)))
Chris@1706 290 end
Chris@1706 291
Chris@1706 292 val tick_cycle = ref 0
Chris@1706 293 val tick_chars = Vector.fromList (map String.str (explode "|/-\\"))
Chris@1706 294
Chris@1716 295 fun tick libname cmdlist =
Chris@1706 296 let val n = Vector.length tick_chars
Chris@1706 297 fun pad_to n str =
Chris@1716 298 if n <= String.size str then str
Chris@1716 299 else pad_to n (str ^ " ")
Chris@1716 300 val name = if libname <> "" then libname
Chris@1716 301 else if cmdlist = nil then ""
Chris@1716 302 else hd (rev cmdlist)
Chris@1706 303 in
Chris@1716 304 print (" " ^
Chris@1706 305 Vector.sub(tick_chars, !tick_cycle) ^ " " ^
Chris@1716 306 pad_to 24 name ^
Chris@1716 307 "\r");
Chris@1706 308 tick_cycle := (if !tick_cycle = n - 1 then 0 else 1 + !tick_cycle)
Chris@1706 309 end
Chris@1706 310
Chris@1706 311 fun run_command context libname cmdlist redirect =
Chris@1706 312 let open OS
Chris@1706 313 val dir = libpath context libname
Chris@1706 314 val cmd = expand_commandline cmdlist
Chris@1706 315 val _ = if verbose ()
Chris@1706 316 then print ("Running: " ^ cmd ^
Chris@1706 317 " (in dir " ^ dir ^ ")...\n")
Chris@1716 318 else tick libname cmdlist
Chris@1706 319 val _ = FileSys.chDir dir
Chris@1706 320 val status = case redirect of
Chris@1706 321 NONE => Process.system cmd
Chris@1706 322 | SOME file => Process.system (cmd ^ ">" ^ file)
Chris@1706 323 in
Chris@1706 324 if Process.isSuccess status
Chris@1706 325 then OK ()
Chris@1706 326 else ERROR ("Command failed: " ^ cmd ^ " (in dir " ^ dir ^ ")")
Chris@1706 327 end
Chris@1706 328 handle ex => ERROR ("Unable to run command: " ^ exnMessage ex)
Chris@1706 329
Chris@1706 330 fun command context libname cmdlist =
Chris@1706 331 run_command context libname cmdlist NONE
Chris@1706 332
Chris@1706 333 fun command_output context libname cmdlist =
Chris@1706 334 let open OS
Chris@1706 335 val tmpFile = FileSys.tmpName ()
Chris@1706 336 val result = run_command context libname cmdlist (SOME tmpFile)
Chris@1706 337 val contents = file_contents tmpFile
Chris@1706 338 in
Chris@1706 339 FileSys.remove tmpFile handle _ => ();
Chris@1706 340 case result of
Chris@1706 341 OK () => OK contents
Chris@1706 342 | ERROR e => ERROR e
Chris@1706 343 end
Chris@1706 344
Chris@1706 345 fun mydir () =
Chris@1706 346 let open OS
Chris@1706 347 val { dir, file } = Path.splitDirFile (CommandLine.name ())
Chris@1706 348 in
Chris@1706 349 FileSys.realPath
Chris@1706 350 (if Path.isAbsolute dir
Chris@1706 351 then dir
Chris@1706 352 else Path.concat (FileSys.getDir (), dir))
Chris@1706 353 end
Chris@1706 354
Chris@1706 355 fun homedir () =
Chris@1706 356 (* Failure is not routine, so we use an exception here *)
Chris@1706 357 case (OS.Process.getEnv "HOME",
Chris@1706 358 OS.Process.getEnv "HOMEPATH") of
Chris@1706 359 (SOME home, _) => home
Chris@1706 360 | (NONE, SOME home) => home
Chris@1706 361 | (NONE, NONE) =>
Chris@1706 362 raise Fail "Failed to look up home directory from environment"
Chris@1706 363
Chris@1706 364 fun mkpath path =
Chris@1706 365 if OS.FileSys.isDir path handle _ => false
Chris@1706 366 then OK ()
Chris@1706 367 else case OS.Path.fromString path of
Chris@1706 368 { arcs = nil, ... } => OK ()
Chris@1706 369 | { isAbs = false, ... } => ERROR "mkpath requires absolute path"
Chris@1706 370 | { isAbs, vol, arcs } =>
Chris@1706 371 case mkpath (OS.Path.toString { (* parent *)
Chris@1706 372 isAbs = isAbs,
Chris@1706 373 vol = vol,
Chris@1706 374 arcs = rev (tl (rev arcs)) }) of
Chris@1706 375 ERROR e => ERROR e
Chris@1706 376 | OK () => ((OS.FileSys.mkDir path; OK ())
Chris@1706 377 handle OS.SysErr (e, _) =>
Chris@1706 378 ERROR ("Directory creation failed: " ^ e))
Chris@1706 379 end
Chris@1706 380
Chris@1706 381 functor LibControlFn (V: VCS_CONTROL) :> LIB_CONTROL = struct
Chris@1706 382
Chris@1706 383 (* Valid states for unpinned libraries:
Chris@1706 384
Chris@1706 385 - CORRECT: We are on the right branch and are up-to-date with
Chris@1706 386 it as far as we can tell. (If not using the network, this
Chris@1706 387 should be reported to user as "Present" rather than "Correct"
Chris@1706 388 as the remote repo may have advanced without us knowing.)
Chris@1706 389
Chris@1706 390 - SUPERSEDED: We are on the right branch but we can see that
Chris@1706 391 there is a newer revision either locally or on the remote (in
Chris@1706 392 Git terms, we are at an ancestor of the desired branch tip).
Chris@1706 393
Chris@1706 394 - WRONG: We are on the wrong branch (in Git terms, we are not
Chris@1706 395 at the desired branch tip or any ancestor of it).
Chris@1706 396
Chris@1706 397 - ABSENT: Repo doesn't exist here at all.
Chris@1706 398
Chris@1706 399 Valid states for pinned libraries:
Chris@1706 400
Chris@1706 401 - CORRECT: We are at the pinned revision.
Chris@1706 402
Chris@1706 403 - WRONG: We are at any revision other than the pinned one.
Chris@1706 404
Chris@1706 405 - ABSENT: Repo doesn't exist here at all.
Chris@1706 406 *)
Chris@1706 407
Chris@1740 408 fun check with_network context
Chris@1740 409 ({ libname, branch, project_pin, lock_pin, ... } : libspec) =
Chris@1706 410 let fun check_unpinned () =
Chris@1706 411 let val is_newest = if with_network
Chris@1706 412 then V.is_newest
Chris@1706 413 else V.is_newest_locally
Chris@1706 414 in
Chris@1706 415 case is_newest context (libname, branch) of
Chris@1706 416 ERROR e => ERROR e
Chris@1706 417 | OK true => OK CORRECT
Chris@1706 418 | OK false =>
Chris@1706 419 case V.is_on_branch context (libname, branch) of
Chris@1706 420 ERROR e => ERROR e
Chris@1706 421 | OK true => OK SUPERSEDED
Chris@1706 422 | OK false => OK WRONG
Chris@1706 423 end
Chris@1706 424 fun check_pinned target =
Chris@1706 425 case V.is_at context (libname, target) of
Chris@1706 426 ERROR e => ERROR e
Chris@1706 427 | OK true => OK CORRECT
Chris@1706 428 | OK false => OK WRONG
Chris@1740 429 fun check_remote () =
Chris@1740 430 case project_pin of
Chris@1706 431 UNPINNED => check_unpinned ()
Chris@1706 432 | PINNED target => check_pinned target
Chris@1740 433 fun check_local () =
Chris@1740 434 case V.is_modified_locally context libname of
Chris@1740 435 ERROR e => ERROR e
Chris@1740 436 | OK true => OK MODIFIED
Chris@1740 437 | OK false =>
Chris@1740 438 case lock_pin of
Chris@1740 439 UNPINNED => OK CLEAN
Chris@1740 440 | PINNED target =>
Chris@1740 441 case V.is_at context (libname, target) of
Chris@1740 442 ERROR e => ERROR e
Chris@1740 443 | OK true => OK CLEAN
Chris@1740 444 | OK false => OK LOCK_MISMATCHED
Chris@1706 445 in
Chris@1706 446 case V.exists context libname of
Chris@1706 447 ERROR e => ERROR e
Chris@1740 448 | OK false => OK (ABSENT, CLEAN)
Chris@1706 449 | OK true =>
Chris@1740 450 case (check_remote (), check_local ()) of
Chris@1706 451 (ERROR e, _) => ERROR e
Chris@1706 452 | (_, ERROR e) => ERROR e
Chris@1740 453 | (OK r, OK l) => OK (r, l)
Chris@1706 454 end
Chris@1706 455
Chris@1706 456 val review = check true
Chris@1706 457 val status = check false
Chris@1740 458
Chris@1740 459 fun update context
Chris@1740 460 ({ libname, source, branch,
Chris@1740 461 project_pin, lock_pin, ... } : libspec) =
Chris@1706 462 let fun update_unpinned () =
Chris@1706 463 case V.is_newest context (libname, branch) of
Chris@1706 464 ERROR e => ERROR e
Chris@1706 465 | OK true => V.id_of context libname
Chris@1706 466 | OK false => V.update context (libname, branch)
Chris@1706 467 fun update_pinned target =
Chris@1706 468 case V.is_at context (libname, target) of
Chris@1706 469 ERROR e => ERROR e
Chris@1706 470 | OK true => OK target
Chris@1706 471 | OK false => V.update_to context (libname, target)
Chris@1706 472 fun update' () =
Chris@1740 473 case lock_pin of
Chris@1740 474 PINNED target => update_pinned target
Chris@1740 475 | UNPINNED =>
Chris@1740 476 case project_pin of
Chris@1740 477 PINNED target => update_pinned target
Chris@1740 478 | UNPINNED => update_unpinned ()
Chris@1706 479 in
Chris@1706 480 case V.exists context libname of
Chris@1706 481 ERROR e => ERROR e
Chris@1706 482 | OK true => update' ()
Chris@1706 483 | OK false =>
Chris@1706 484 case V.checkout context (libname, source, branch) of
Chris@1706 485 ERROR e => ERROR e
Chris@1706 486 | OK () => update' ()
Chris@1706 487 end
Chris@1740 488
Chris@1740 489 fun id_of context ({ libname, ... } : libspec) =
Chris@1740 490 V.id_of context libname
Chris@1740 491
Chris@1706 492 end
Chris@1706 493
Chris@1706 494 (* Simple Standard ML JSON parser
Chris@1706 495 ==============================
Chris@1706 496
Chris@1706 497 https://bitbucket.org/cannam/sml-simplejson
Chris@1706 498
Chris@1706 499 An RFC-compliant JSON parser in one SML file with no dependency
Chris@1706 500 on anything outside the Basis library. Also includes a simple
Chris@1706 501 serialiser.
Chris@1706 502
Chris@1706 503 Tested with MLton, Poly/ML, and SML/NJ compilers.
Chris@1706 504
Chris@1706 505 Parser notes:
Chris@1706 506
Chris@1706 507 * Complies with RFC 7159, The JavaScript Object Notation (JSON)
Chris@1706 508 Data Interchange Format
Chris@1706 509
Chris@1706 510 * Passes all of the JSONTestSuite parser accept/reject tests that
Chris@1706 511 exist at the time of writing, as listed in "Parsing JSON is a
Chris@1706 512 Minefield" (http://seriot.ch/parsing_json.php)
Chris@1706 513
Chris@1706 514 * Two-pass parser using naive exploded strings, therefore not
Chris@1706 515 particularly fast and not suitable for large input files
Chris@1706 516
Chris@1706 517 * Only supports UTF-8 input, not UTF-16 or UTF-32. Doesn't check
Chris@1706 518 that JSON strings are valid UTF-8 -- the caller must do that --
Chris@1706 519 but does handle \u escapes
Chris@1706 520
Chris@1706 521 * Converts all numbers to type "real". If that is a 64-bit IEEE
Chris@1706 522 float type (common but not guaranteed in SML) then we're pretty
Chris@1706 523 standard for a JSON parser
Chris@1706 524
Chris@1706 525 Copyright 2017 Chris Cannam.
Chris@1706 526 Parts based on the JSON parser in the Ponyo library by Phil Eaton.
Chris@1706 527
Chris@1706 528 Permission is hereby granted, free of charge, to any person
Chris@1706 529 obtaining a copy of this software and associated documentation
Chris@1706 530 files (the "Software"), to deal in the Software without
Chris@1706 531 restriction, including without limitation the rights to use, copy,
Chris@1706 532 modify, merge, publish, distribute, sublicense, and/or sell copies
Chris@1706 533 of the Software, and to permit persons to whom the Software is
Chris@1706 534 furnished to do so, subject to the following conditions:
Chris@1706 535
Chris@1706 536 The above copyright notice and this permission notice shall be
Chris@1706 537 included in all copies or substantial portions of the Software.
Chris@1706 538
Chris@1706 539 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
Chris@1706 540 EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
Chris@1706 541 MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
Chris@1706 542 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR
Chris@1706 543 ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
Chris@1706 544 CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
Chris@1706 545 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
Chris@1706 546
Chris@1706 547 Except as contained in this notice, the names of Chris Cannam and
Chris@1706 548 Particular Programs Ltd shall not be used in advertising or
Chris@1706 549 otherwise to promote the sale, use or other dealings in this
Chris@1706 550 Software without prior written authorization.
Chris@1706 551 *)
Chris@1706 552
Chris@1706 553 signature JSON = sig
Chris@1706 554
Chris@1706 555 datatype json = OBJECT of (string * json) list
Chris@1706 556 | ARRAY of json list
Chris@1706 557 | NUMBER of real
Chris@1706 558 | STRING of string
Chris@1706 559 | BOOL of bool
Chris@1706 560 | NULL
Chris@1706 561
Chris@1706 562 datatype 'a result = OK of 'a
Chris@1706 563 | ERROR of string
Chris@1706 564
Chris@1706 565 val parse : string -> json result
Chris@1706 566 val serialise : json -> string
Chris@1706 567 val serialiseIndented : json -> string
Chris@1706 568
Chris@1706 569 end
Chris@1706 570
Chris@1706 571 structure Json :> JSON = struct
Chris@1706 572
Chris@1706 573 datatype json = OBJECT of (string * json) list
Chris@1706 574 | ARRAY of json list
Chris@1706 575 | NUMBER of real
Chris@1706 576 | STRING of string
Chris@1706 577 | BOOL of bool
Chris@1706 578 | NULL
Chris@1706 579
Chris@1706 580 datatype 'a result = OK of 'a
Chris@1706 581 | ERROR of string
Chris@1706 582
Chris@1706 583 structure T = struct
Chris@1706 584 datatype token = NUMBER of char list
Chris@1706 585 | STRING of string
Chris@1706 586 | BOOL of bool
Chris@1706 587 | NULL
Chris@1706 588 | CURLY_L
Chris@1706 589 | CURLY_R
Chris@1706 590 | SQUARE_L
Chris@1706 591 | SQUARE_R
Chris@1706 592 | COLON
Chris@1706 593 | COMMA
Chris@1706 594
Chris@1706 595 fun toString t =
Chris@1706 596 case t of NUMBER digits => implode digits
Chris@1706 597 | STRING s => s
Chris@1706 598 | BOOL b => Bool.toString b
Chris@1706 599 | NULL => "null"
Chris@1706 600 | CURLY_L => "{"
Chris@1706 601 | CURLY_R => "}"
Chris@1706 602 | SQUARE_L => "["
Chris@1706 603 | SQUARE_R => "]"
Chris@1706 604 | COLON => ":"
Chris@1706 605 | COMMA => ","
Chris@1706 606 end
Chris@1706 607
Chris@1706 608 fun bmpToUtf8 cp = (* convert a codepoint in Unicode BMP to utf8 bytes *)
Chris@1706 609 let open Word
Chris@1706 610 infix 6 orb andb >>
Chris@1706 611 in
Chris@1706 612 map (Char.chr o toInt)
Chris@1706 613 (if cp < 0wx80 then
Chris@1706 614 [cp]
Chris@1706 615 else if cp < 0wx800 then
Chris@1706 616 [0wxc0 orb (cp >> 0w6), 0wx80 orb (cp andb 0wx3f)]
Chris@1706 617 else if cp < 0wx10000 then
Chris@1706 618 [0wxe0 orb (cp >> 0w12),
Chris@1706 619 0wx80 orb ((cp >> 0w6) andb 0wx3f),
Chris@1706 620 0wx80 orb (cp andb 0wx3f)]
Chris@1706 621 else raise Fail ("Invalid BMP point " ^ (Word.toString cp)))
Chris@1706 622 end
Chris@1706 623
Chris@1706 624 fun error pos text = ERROR (text ^ " at character position " ^
Chris@1706 625 Int.toString (pos - 1))
Chris@1706 626 fun token_error pos = error pos ("Unexpected token")
Chris@1706 627
Chris@1706 628 fun lexNull pos acc (#"u" :: #"l" :: #"l" :: xs) =
Chris@1706 629 lex (pos + 3) (T.NULL :: acc) xs
Chris@1706 630 | lexNull pos acc _ = token_error pos
Chris@1706 631
Chris@1706 632 and lexTrue pos acc (#"r" :: #"u" :: #"e" :: xs) =
Chris@1706 633 lex (pos + 3) (T.BOOL true :: acc) xs
Chris@1706 634 | lexTrue pos acc _ = token_error pos
Chris@1706 635
Chris@1706 636 and lexFalse pos acc (#"a" :: #"l" :: #"s" :: #"e" :: xs) =
Chris@1706 637 lex (pos + 4) (T.BOOL false :: acc) xs
Chris@1706 638 | lexFalse pos acc _ = token_error pos
Chris@1706 639
Chris@1706 640 and lexChar tok pos acc xs =
Chris@1706 641 lex pos (tok :: acc) xs
Chris@1706 642
Chris@1706 643 and lexString pos acc cc =
Chris@1706 644 let datatype escaped = ESCAPED | NORMAL
Chris@1706 645 fun lexString' pos text ESCAPED [] =
Chris@1706 646 error pos "End of input during escape sequence"
Chris@1706 647 | lexString' pos text NORMAL [] =
Chris@1706 648 error pos "End of input during string"
Chris@1706 649 | lexString' pos text ESCAPED (x :: xs) =
Chris@1706 650 let fun esc c = lexString' (pos + 1) (c :: text) NORMAL xs
Chris@1706 651 in case x of
Chris@1706 652 #"\"" => esc x
Chris@1706 653 | #"\\" => esc x
Chris@1706 654 | #"/" => esc x
Chris@1706 655 | #"b" => esc #"\b"
Chris@1706 656 | #"f" => esc #"\f"
Chris@1706 657 | #"n" => esc #"\n"
Chris@1706 658 | #"r" => esc #"\r"
Chris@1706 659 | #"t" => esc #"\t"
Chris@1706 660 | _ => error pos ("Invalid escape \\" ^
Chris@1706 661 Char.toString x)
Chris@1706 662 end
Chris@1706 663 | lexString' pos text NORMAL (#"\\" :: #"u" ::a::b::c::d:: xs) =
Chris@1706 664 if List.all Char.isHexDigit [a,b,c,d]
Chris@1706 665 then case Word.fromString ("0wx" ^ (implode [a,b,c,d])) of
Chris@1706 666 SOME w => (let val utf = rev (bmpToUtf8 w) in
Chris@1706 667 lexString' (pos + 6) (utf @ text)
Chris@1706 668 NORMAL xs
Chris@1706 669 end
Chris@1706 670 handle Fail err => error pos err)
Chris@1706 671 | NONE => error pos "Invalid Unicode BMP escape sequence"
Chris@1706 672 else error pos "Invalid Unicode BMP escape sequence"
Chris@1706 673 | lexString' pos text NORMAL (x :: xs) =
Chris@1706 674 if Char.ord x < 0x20
Chris@1706 675 then error pos "Invalid unescaped control character"
Chris@1706 676 else
Chris@1706 677 case x of
Chris@1706 678 #"\"" => OK (rev text, xs, pos + 1)
Chris@1706 679 | #"\\" => lexString' (pos + 1) text ESCAPED xs
Chris@1706 680 | _ => lexString' (pos + 1) (x :: text) NORMAL xs
Chris@1706 681 in
Chris@1706 682 case lexString' pos [] NORMAL cc of
Chris@1706 683 OK (text, rest, newpos) =>
Chris@1706 684 lex newpos (T.STRING (implode text) :: acc) rest
Chris@1706 685 | ERROR e => ERROR e
Chris@1706 686 end
Chris@1706 687
Chris@1706 688 and lexNumber firstChar pos acc cc =
Chris@1706 689 let val valid = explode ".+-e"
Chris@1706 690 fun lexNumber' pos digits [] = (rev digits, [], pos)
Chris@1706 691 | lexNumber' pos digits (x :: xs) =
Chris@1706 692 if x = #"E" then lexNumber' (pos + 1) (#"e" :: digits) xs
Chris@1706 693 else if Char.isDigit x orelse List.exists (fn c => x = c) valid
Chris@1706 694 then lexNumber' (pos + 1) (x :: digits) xs
Chris@1706 695 else (rev digits, x :: xs, pos)
Chris@1706 696 val (digits, rest, newpos) =
Chris@1706 697 lexNumber' (pos - 1) [] (firstChar :: cc)
Chris@1706 698 in
Chris@1706 699 case digits of
Chris@1706 700 [] => token_error pos
Chris@1706 701 | _ => lex newpos (T.NUMBER digits :: acc) rest
Chris@1706 702 end
Chris@1706 703
Chris@1706 704 and lex pos acc [] = OK (rev acc)
Chris@1706 705 | lex pos acc (x::xs) =
Chris@1706 706 (case x of
Chris@1706 707 #" " => lex
Chris@1706 708 | #"\t" => lex
Chris@1706 709 | #"\n" => lex
Chris@1706 710 | #"\r" => lex
Chris@1706 711 | #"{" => lexChar T.CURLY_L
Chris@1706 712 | #"}" => lexChar T.CURLY_R
Chris@1706 713 | #"[" => lexChar T.SQUARE_L
Chris@1706 714 | #"]" => lexChar T.SQUARE_R
Chris@1706 715 | #":" => lexChar T.COLON
Chris@1706 716 | #"," => lexChar T.COMMA
Chris@1706 717 | #"\"" => lexString
Chris@1706 718 | #"t" => lexTrue
Chris@1706 719 | #"f" => lexFalse
Chris@1706 720 | #"n" => lexNull
Chris@1706 721 | x => lexNumber x) (pos + 1) acc xs
Chris@1706 722
Chris@1706 723 fun show [] = "end of input"
Chris@1706 724 | show (tok :: _) = T.toString tok
Chris@1706 725
Chris@1706 726 fun parseNumber digits =
Chris@1706 727 (* Note lexNumber already case-insensitised the E for us *)
Chris@1706 728 let open Char
Chris@1706 729
Chris@1706 730 fun okExpDigits [] = false
Chris@1706 731 | okExpDigits (c :: []) = isDigit c
Chris@1706 732 | okExpDigits (c :: cs) = isDigit c andalso okExpDigits cs
Chris@1706 733
Chris@1706 734 fun okExponent [] = false
Chris@1706 735 | okExponent (#"+" :: cs) = okExpDigits cs
Chris@1706 736 | okExponent (#"-" :: cs) = okExpDigits cs
Chris@1706 737 | okExponent cc = okExpDigits cc
Chris@1706 738
Chris@1706 739 fun okFracTrailing [] = true
Chris@1706 740 | okFracTrailing (c :: cs) =
Chris@1706 741 (isDigit c andalso okFracTrailing cs) orelse
Chris@1706 742 (c = #"e" andalso okExponent cs)
Chris@1706 743
Chris@1706 744 fun okFraction [] = false
Chris@1706 745 | okFraction (c :: cs) =
Chris@1706 746 isDigit c andalso okFracTrailing cs
Chris@1706 747
Chris@1706 748 fun okPosTrailing [] = true
Chris@1706 749 | okPosTrailing (#"." :: cs) = okFraction cs
Chris@1706 750 | okPosTrailing (#"e" :: cs) = okExponent cs
Chris@1706 751 | okPosTrailing (c :: cs) =
Chris@1706 752 isDigit c andalso okPosTrailing cs
Chris@1706 753
Chris@1706 754 fun okPositive [] = false
Chris@1706 755 | okPositive (#"0" :: []) = true
Chris@1706 756 | okPositive (#"0" :: #"." :: cs) = okFraction cs
Chris@1706 757 | okPositive (#"0" :: #"e" :: cs) = okExponent cs
Chris@1706 758 | okPositive (#"0" :: cs) = false
Chris@1706 759 | okPositive (c :: cs) = isDigit c andalso okPosTrailing cs
Chris@1706 760
Chris@1706 761 fun okNumber (#"-" :: cs) = okPositive cs
Chris@1706 762 | okNumber cc = okPositive cc
Chris@1706 763 in
Chris@1706 764 if okNumber digits
Chris@1706 765 then case Real.fromString (implode digits) of
Chris@1706 766 NONE => ERROR "Number out of range"
Chris@1706 767 | SOME r => OK r
Chris@1706 768 else ERROR ("Invalid number \"" ^ (implode digits) ^ "\"")
Chris@1706 769 end
Chris@1706 770
Chris@1706 771 fun parseObject (T.CURLY_R :: xs) = OK (OBJECT [], xs)
Chris@1706 772 | parseObject tokens =
Chris@1706 773 let fun parsePair (T.STRING key :: T.COLON :: xs) =
Chris@1706 774 (case parseTokens xs of
Chris@1706 775 ERROR e => ERROR e
Chris@1706 776 | OK (j, xs) => OK ((key, j), xs))
Chris@1706 777 | parsePair other =
Chris@1706 778 ERROR ("Object key/value pair expected around \"" ^
Chris@1706 779 show other ^ "\"")
Chris@1706 780 fun parseObject' acc [] = ERROR "End of input during object"
Chris@1706 781 | parseObject' acc tokens =
Chris@1706 782 case parsePair tokens of
Chris@1706 783 ERROR e => ERROR e
Chris@1706 784 | OK (pair, T.COMMA :: xs) =>
Chris@1706 785 parseObject' (pair :: acc) xs
Chris@1706 786 | OK (pair, T.CURLY_R :: xs) =>
Chris@1706 787 OK (OBJECT (rev (pair :: acc)), xs)
Chris@1706 788 | OK (_, _) => ERROR "Expected , or } after object element"
Chris@1706 789 in
Chris@1706 790 parseObject' [] tokens
Chris@1706 791 end
Chris@1706 792
Chris@1706 793 and parseArray (T.SQUARE_R :: xs) = OK (ARRAY [], xs)
Chris@1706 794 | parseArray tokens =
Chris@1706 795 let fun parseArray' acc [] = ERROR "End of input during array"
Chris@1706 796 | parseArray' acc tokens =
Chris@1706 797 case parseTokens tokens of
Chris@1706 798 ERROR e => ERROR e
Chris@1706 799 | OK (j, T.COMMA :: xs) => parseArray' (j :: acc) xs
Chris@1706 800 | OK (j, T.SQUARE_R :: xs) => OK (ARRAY (rev (j :: acc)), xs)
Chris@1706 801 | OK (_, _) => ERROR "Expected , or ] after array element"
Chris@1706 802 in
Chris@1706 803 parseArray' [] tokens
Chris@1706 804 end
Chris@1706 805
Chris@1706 806 and parseTokens [] = ERROR "Value expected"
Chris@1706 807 | parseTokens (tok :: xs) =
Chris@1706 808 (case tok of
Chris@1706 809 T.NUMBER d => (case parseNumber d of
Chris@1706 810 OK r => OK (NUMBER r, xs)
Chris@1706 811 | ERROR e => ERROR e)
Chris@1706 812 | T.STRING s => OK (STRING s, xs)
Chris@1706 813 | T.BOOL b => OK (BOOL b, xs)
Chris@1706 814 | T.NULL => OK (NULL, xs)
Chris@1706 815 | T.CURLY_L => parseObject xs
Chris@1706 816 | T.SQUARE_L => parseArray xs
Chris@1706 817 | _ => ERROR ("Unexpected token " ^ T.toString tok ^
Chris@1706 818 " before " ^ show xs))
Chris@1706 819
Chris@1706 820 fun parse str =
Chris@1706 821 case lex 1 [] (explode str) of
Chris@1706 822 ERROR e => ERROR e
Chris@1706 823 | OK tokens => case parseTokens tokens of
Chris@1706 824 OK (value, []) => OK value
Chris@1706 825 | OK (_, _) => ERROR "Extra data after input"
Chris@1706 826 | ERROR e => ERROR e
Chris@1706 827
Chris@1706 828 fun stringEscape s =
Chris@1706 829 let fun esc x = [x, #"\\"]
Chris@1706 830 fun escape' acc [] = rev acc
Chris@1706 831 | escape' acc (x :: xs) =
Chris@1706 832 escape' (case x of
Chris@1706 833 #"\"" => esc x @ acc
Chris@1706 834 | #"\\" => esc x @ acc
Chris@1706 835 | #"\b" => esc #"b" @ acc
Chris@1706 836 | #"\f" => esc #"f" @ acc
Chris@1706 837 | #"\n" => esc #"n" @ acc
Chris@1706 838 | #"\r" => esc #"r" @ acc
Chris@1706 839 | #"\t" => esc #"t" @ acc
Chris@1706 840 | _ =>
Chris@1706 841 let val c = Char.ord x
Chris@1706 842 in
Chris@1706 843 if c < 0x20
Chris@1706 844 then let val hex = Word.toString (Word.fromInt c)
Chris@1706 845 in (rev o explode) (if c < 0x10
Chris@1706 846 then ("\\u000" ^ hex)
Chris@1706 847 else ("\\u00" ^ hex))
Chris@1706 848 end @ acc
Chris@1706 849 else
Chris@1706 850 x :: acc
Chris@1706 851 end)
Chris@1706 852 xs
Chris@1706 853 in
Chris@1706 854 implode (escape' [] (explode s))
Chris@1706 855 end
Chris@1706 856
Chris@1706 857 fun serialise json =
Chris@1706 858 case json of
Chris@1706 859 OBJECT pp => "{" ^ String.concatWith
Chris@1706 860 "," (map (fn (key, value) =>
Chris@1706 861 serialise (STRING key) ^ ":" ^
Chris@1706 862 serialise value) pp) ^
Chris@1706 863 "}"
Chris@1706 864 | ARRAY arr => "[" ^ String.concatWith "," (map serialise arr) ^ "]"
Chris@1706 865 | NUMBER n => implode (map (fn #"~" => #"-" | c => c)
Chris@1706 866 (explode (Real.toString n)))
Chris@1706 867 | STRING s => "\"" ^ stringEscape s ^ "\""
Chris@1706 868 | BOOL b => Bool.toString b
Chris@1706 869 | NULL => "null"
Chris@1706 870
Chris@1706 871 fun serialiseIndented json =
Chris@1706 872 let fun indent 0 = ""
Chris@1706 873 | indent i = " " ^ indent (i - 1)
Chris@1706 874 fun serialiseIndented' i json =
Chris@1706 875 let val ser = serialiseIndented' (i + 1)
Chris@1706 876 in
Chris@1706 877 case json of
Chris@1706 878 OBJECT [] => "{}"
Chris@1706 879 | ARRAY [] => "[]"
Chris@1706 880 | OBJECT pp => "{\n" ^ indent (i + 1) ^
Chris@1706 881 String.concatWith
Chris@1706 882 (",\n" ^ indent (i + 1))
Chris@1706 883 (map (fn (key, value) =>
Chris@1706 884 ser (STRING key) ^ ": " ^
Chris@1706 885 ser value) pp) ^
Chris@1706 886 "\n" ^ indent i ^ "}"
Chris@1706 887 | ARRAY arr => "[\n" ^ indent (i + 1) ^
Chris@1706 888 String.concatWith
Chris@1706 889 (",\n" ^ indent (i + 1))
Chris@1706 890 (map ser arr) ^
Chris@1706 891 "\n" ^ indent i ^ "]"
Chris@1706 892 | other => serialise other
Chris@1706 893 end
Chris@1706 894 in
Chris@1706 895 serialiseIndented' 0 json ^ "\n"
Chris@1706 896 end
Chris@1706 897
Chris@1706 898 end
Chris@1706 899
Chris@1706 900
Chris@1706 901 structure JsonBits :> sig
Chris@1706 902 val load_json_from : string -> Json.json (* filename -> json *)
Chris@1706 903 val save_json_to : string -> Json.json -> unit
Chris@1706 904 val lookup_optional : Json.json -> string list -> Json.json option
Chris@1706 905 val lookup_optional_string : Json.json -> string list -> string option
Chris@1706 906 val lookup_mandatory : Json.json -> string list -> Json.json
Chris@1706 907 val lookup_mandatory_string : Json.json -> string list -> string
Chris@1706 908 end = struct
Chris@1706 909
Chris@1706 910 fun load_json_from filename =
Chris@1706 911 case Json.parse (FileBits.file_contents filename) of
Chris@1706 912 Json.OK json => json
Chris@1706 913 | Json.ERROR e => raise Fail ("Failed to parse file: " ^ e)
Chris@1706 914
Chris@1706 915 fun save_json_to filename json =
Chris@1732 916 (* using binary I/O to avoid ever writing CR/LF line endings *)
Chris@1706 917 let val jstr = Json.serialiseIndented json
Chris@1732 918 val stream = BinIO.openOut filename
Chris@1706 919 in
Chris@1732 920 BinIO.output (stream, Byte.stringToBytes jstr);
Chris@1732 921 BinIO.closeOut stream
Chris@1706 922 end
Chris@1706 923
Chris@1706 924 fun lookup_optional json kk =
Chris@1706 925 let fun lookup key =
Chris@1706 926 case json of
Chris@1706 927 Json.OBJECT kvs =>
Chris@1706 928 (case List.find (fn (k, v) => k = key) kvs of
Chris@1706 929 SOME (k, v) => SOME v
Chris@1706 930 | NONE => NONE)
Chris@1706 931 | _ => raise Fail "Object expected"
Chris@1706 932 in
Chris@1706 933 case kk of
Chris@1706 934 [] => NONE
Chris@1706 935 | key::[] => lookup key
Chris@1706 936 | key::kk => case lookup key of
Chris@1706 937 NONE => NONE
Chris@1706 938 | SOME j => lookup_optional j kk
Chris@1706 939 end
Chris@1706 940
Chris@1706 941 fun lookup_optional_string json kk =
Chris@1706 942 case lookup_optional json kk of
Chris@1706 943 SOME (Json.STRING s) => SOME s
Chris@1706 944 | SOME _ => raise Fail ("Value (if present) must be string: " ^
Chris@1706 945 (String.concatWith " -> " kk))
Chris@1706 946 | NONE => NONE
Chris@1706 947
Chris@1706 948 fun lookup_mandatory json kk =
Chris@1706 949 case lookup_optional json kk of
Chris@1706 950 SOME v => v
Chris@1706 951 | NONE => raise Fail ("Value is mandatory: " ^
Chris@1706 952 (String.concatWith " -> " kk) ^ " in json: " ^
Chris@1706 953 (Json.serialise json))
Chris@1706 954
Chris@1706 955 fun lookup_mandatory_string json kk =
Chris@1706 956 case lookup_optional json kk of
Chris@1706 957 SOME (Json.STRING s) => s
Chris@1706 958 | _ => raise Fail ("Value must be string: " ^
Chris@1706 959 (String.concatWith " -> " kk))
Chris@1706 960 end
Chris@1706 961
Chris@1706 962 structure Provider :> sig
Chris@1706 963 val load_providers : Json.json -> provider list
Chris@1706 964 val load_more_providers : provider list -> Json.json -> provider list
Chris@1706 965 val remote_url : context -> vcs -> source -> libname -> string
Chris@1706 966 end = struct
Chris@1706 967
Chris@1706 968 val known_providers : provider list =
Chris@1706 969 [ {
Chris@1706 970 service = "bitbucket",
Chris@1706 971 supports = [HG, GIT],
Chris@1706 972 remote_spec = {
Chris@1724 973 anon = SOME "https://bitbucket.org/{owner}/{repository}",
Chris@1724 974 auth = SOME "ssh://{vcs}@bitbucket.org/{owner}/{repository}"
Chris@1706 975 }
Chris@1706 976 },
Chris@1706 977 {
Chris@1706 978 service = "github",
Chris@1706 979 supports = [GIT],
Chris@1706 980 remote_spec = {
Chris@1724 981 anon = SOME "https://github.com/{owner}/{repository}",
Chris@1724 982 auth = SOME "ssh://{vcs}@github.com/{owner}/{repository}"
Chris@1706 983 }
Chris@1706 984 }
Chris@1706 985 ]
Chris@1706 986
Chris@1706 987 fun vcs_name vcs =
Chris@1706 988 case vcs of GIT => "git" |
Chris@1706 989 HG => "hg"
Chris@1706 990
Chris@1706 991 fun vcs_from_name name =
Chris@1706 992 case name of "git" => GIT
Chris@1706 993 | "hg" => HG
Chris@1706 994 | other => raise Fail ("Unknown vcs name \"" ^ name ^ "\"")
Chris@1706 995
Chris@1706 996 fun load_more_providers previously_loaded json =
Chris@1706 997 let open JsonBits
Chris@1706 998 fun load pjson pname : provider =
Chris@1706 999 {
Chris@1706 1000 service = pname,
Chris@1706 1001 supports =
Chris@1706 1002 case lookup_mandatory pjson ["vcs"] of
Chris@1706 1003 Json.ARRAY vv =>
Chris@1706 1004 map (fn (Json.STRING v) => vcs_from_name v
Chris@1706 1005 | _ => raise Fail "Strings expected in vcs array")
Chris@1706 1006 vv
Chris@1706 1007 | _ => raise Fail "Array expected for vcs",
Chris@1706 1008 remote_spec = {
Chris@1724 1009 anon = lookup_optional_string pjson ["anonymous"],
Chris@1724 1010 auth = lookup_optional_string pjson ["authenticated"]
Chris@1706 1011 }
Chris@1706 1012 }
Chris@1706 1013 val loaded =
Chris@1721 1014 case lookup_optional json ["services"] of
Chris@1706 1015 NONE => []
Chris@1706 1016 | SOME (Json.OBJECT pl) => map (fn (k, v) => load v k) pl
Chris@1721 1017 | _ => raise Fail "Object expected for services in config"
Chris@1706 1018 val newly_loaded =
Chris@1706 1019 List.filter (fn p => not (List.exists (fn pp => #service p =
Chris@1706 1020 #service pp)
Chris@1706 1021 previously_loaded))
Chris@1706 1022 loaded
Chris@1706 1023 in
Chris@1706 1024 previously_loaded @ newly_loaded
Chris@1706 1025 end
Chris@1706 1026
Chris@1706 1027 fun load_providers json =
Chris@1706 1028 load_more_providers known_providers json
Chris@1706 1029
Chris@1706 1030 fun expand_spec spec { vcs, service, owner, repo } login =
Chris@1706 1031 (* ugly *)
Chris@1706 1032 let fun replace str =
Chris@1706 1033 case str of
Chris@1706 1034 "vcs" => vcs_name vcs
Chris@1706 1035 | "service" => service
Chris@1706 1036 | "owner" =>
Chris@1706 1037 (case owner of
Chris@1706 1038 SOME ostr => ostr
Chris@1706 1039 | NONE => raise Fail ("Owner not specified for service " ^
Chris@1706 1040 service))
Chris@1724 1041 | "repository" => repo
Chris@1706 1042 | "account" =>
Chris@1706 1043 (case login of
Chris@1706 1044 SOME acc => acc
Chris@1706 1045 | NONE => raise Fail ("Account not given for service " ^
Chris@1706 1046 service))
Chris@1706 1047 | other => raise Fail ("Unknown variable \"" ^ other ^
Chris@1706 1048 "\" in spec for service " ^ service)
Chris@1706 1049 fun expand' acc sstr =
Chris@1706 1050 case Substring.splitl (fn c => c <> #"{") sstr of
Chris@1706 1051 (pfx, sfx) =>
Chris@1706 1052 if Substring.isEmpty sfx
Chris@1706 1053 then rev (pfx :: acc)
Chris@1706 1054 else
Chris@1706 1055 case Substring.splitl (fn c => c <> #"}") sfx of
Chris@1706 1056 (tok, remainder) =>
Chris@1706 1057 if Substring.isEmpty remainder
Chris@1706 1058 then rev (tok :: pfx :: acc)
Chris@1706 1059 else let val replacement =
Chris@1706 1060 replace
Chris@1706 1061 (* tok begins with "{": *)
Chris@1706 1062 (Substring.string
Chris@1706 1063 (Substring.triml 1 tok))
Chris@1706 1064 in
Chris@1706 1065 expand' (Substring.full replacement ::
Chris@1706 1066 pfx :: acc)
Chris@1706 1067 (* remainder begins with "}": *)
Chris@1706 1068 (Substring.triml 1 remainder)
Chris@1706 1069 end
Chris@1706 1070 in
Chris@1706 1071 Substring.concat (expand' [] (Substring.full spec))
Chris@1706 1072 end
Chris@1706 1073
Chris@1706 1074 fun provider_url req login providers =
Chris@1706 1075 case providers of
Chris@1706 1076 [] => raise Fail ("Unknown service \"" ^ (#service req) ^
Chris@1706 1077 "\" for vcs \"" ^ (vcs_name (#vcs req)) ^ "\"")
Chris@1706 1078 | ({ service, supports, remote_spec : remote_spec } :: rest) =>
Chris@1706 1079 if service <> (#service req) orelse
Chris@1706 1080 not (List.exists (fn v => v = (#vcs req)) supports)
Chris@1706 1081 then provider_url req login rest
Chris@1706 1082 else
Chris@1706 1083 case (login, #auth remote_spec, #anon remote_spec) of
Chris@1706 1084 (SOME _, SOME auth, _) => expand_spec auth req login
Chris@1706 1085 | (SOME _, _, SOME anon) => expand_spec anon req NONE
Chris@1706 1086 | (NONE, _, SOME anon) => expand_spec anon req NONE
Chris@1724 1087 | _ => raise Fail ("No suitable anonymous or authenticated " ^
Chris@1724 1088 "URL spec provided for service \"" ^
Chris@1724 1089 service ^ "\"")
Chris@1706 1090
Chris@1706 1091 fun login_for ({ accounts, ... } : context) service =
Chris@1706 1092 case List.find (fn a => service = #service a) accounts of
Chris@1706 1093 SOME { login, ... } => SOME login
Chris@1706 1094 | NONE => NONE
Chris@1706 1095
Chris@1706 1096 fun remote_url (context : context) vcs source libname =
Chris@1706 1097 case source of
Chris@1721 1098 URL_SOURCE u => u
Chris@1721 1099 | SERVICE_SOURCE { service, owner, repo } =>
Chris@1706 1100 provider_url { vcs = vcs,
Chris@1706 1101 service = service,
Chris@1706 1102 owner = owner,
Chris@1706 1103 repo = case repo of
Chris@1706 1104 SOME r => r
Chris@1706 1105 | NONE => libname }
Chris@1706 1106 (login_for context service)
Chris@1706 1107 (#providers context)
Chris@1706 1108 end
Chris@1706 1109
Chris@1706 1110 structure HgControl :> VCS_CONTROL = struct
Chris@1706 1111
Chris@1706 1112 type vcsstate = { id: string, modified: bool,
Chris@1706 1113 branch: string, tags: string list }
Chris@1706 1114
Chris@1706 1115 val hg_args = [ "--config", "ui.interactive=true" ]
Chris@1706 1116
Chris@1706 1117 fun hg_command context libname args =
Chris@1706 1118 FileBits.command context libname ("hg" :: hg_args @ args)
Chris@1706 1119
Chris@1706 1120 fun hg_command_output context libname args =
Chris@1706 1121 FileBits.command_output context libname ("hg" :: hg_args @ args)
Chris@1706 1122
Chris@1706 1123 fun exists context libname =
Chris@1706 1124 OK (OS.FileSys.isDir (FileBits.subpath context libname ".hg"))
Chris@1706 1125 handle _ => OK false
Chris@1706 1126
Chris@1706 1127 fun remote_for context (libname, source) =
Chris@1706 1128 Provider.remote_url context HG source libname
Chris@1706 1129
Chris@1706 1130 fun current_state context libname : vcsstate result =
Chris@1706 1131 let fun is_branch text = text <> "" andalso #"(" = hd (explode text)
Chris@1706 1132 and extract_branch b =
Chris@1706 1133 if is_branch b (* need to remove enclosing parens *)
Chris@1706 1134 then (implode o rev o tl o rev o tl o explode) b
Chris@1706 1135 else "default"
Chris@1706 1136 and is_modified id = id <> "" andalso #"+" = hd (rev (explode id))
Chris@1706 1137 and extract_id id =
Chris@1706 1138 if is_modified id (* need to remove trailing "+" *)
Chris@1706 1139 then (implode o rev o tl o rev o explode) id
Chris@1706 1140 else id
Chris@1706 1141 and split_tags tags = String.tokens (fn c => c = #"/") tags
Chris@1706 1142 and state_for (id, branch, tags) =
Chris@1706 1143 OK { id = extract_id id,
Chris@1706 1144 modified = is_modified id,
Chris@1706 1145 branch = extract_branch branch,
Chris@1706 1146 tags = split_tags tags }
Chris@1706 1147 in
Chris@1706 1148 case hg_command_output context libname ["id"] of
Chris@1706 1149 ERROR e => ERROR e
Chris@1706 1150 | OK out =>
Chris@1706 1151 case String.tokens (fn x => x = #" ") out of
Chris@1706 1152 [id, branch, tags] => state_for (id, branch, tags)
Chris@1706 1153 | [id, other] => if is_branch other
Chris@1706 1154 then state_for (id, other, "")
Chris@1706 1155 else state_for (id, "", other)
Chris@1706 1156 | [id] => state_for (id, "", "")
Chris@1706 1157 | _ => ERROR ("Unexpected output from hg id: " ^ out)
Chris@1706 1158 end
Chris@1706 1159
Chris@1706 1160 fun branch_name branch = case branch of
Chris@1706 1161 DEFAULT_BRANCH => "default"
Chris@1706 1162 | BRANCH "" => "default"
Chris@1706 1163 | BRANCH b => b
Chris@1706 1164
Chris@1706 1165 fun id_of context libname =
Chris@1706 1166 case current_state context libname of
Chris@1706 1167 ERROR e => ERROR e
Chris@1706 1168 | OK { id, ... } => OK id
Chris@1706 1169
Chris@1706 1170 fun is_at context (libname, id_or_tag) =
Chris@1706 1171 case current_state context libname of
Chris@1706 1172 ERROR e => ERROR e
Chris@1706 1173 | OK { id, tags, ... } =>
Chris@1706 1174 OK (String.isPrefix id_or_tag id orelse
Chris@1706 1175 String.isPrefix id id_or_tag orelse
Chris@1706 1176 List.exists (fn t => t = id_or_tag) tags)
Chris@1706 1177
Chris@1706 1178 fun is_on_branch context (libname, b) =
Chris@1706 1179 case current_state context libname of
Chris@1706 1180 ERROR e => ERROR e
Chris@1706 1181 | OK { branch, ... } => OK (branch = branch_name b)
Chris@1706 1182
Chris@1706 1183 fun is_newest_locally context (libname, branch) =
Chris@1706 1184 case hg_command_output context libname
Chris@1706 1185 ["log", "-l1",
Chris@1706 1186 "-b", branch_name branch,
Chris@1706 1187 "--template", "{node}"] of
Chris@1706 1188 ERROR e => ERROR e
Chris@1706 1189 | OK newest_in_repo => is_at context (libname, newest_in_repo)
Chris@1706 1190
Chris@1706 1191 fun pull context libname =
Chris@1706 1192 hg_command context libname
Chris@1706 1193 (if FileBits.verbose ()
Chris@1706 1194 then ["pull"]
Chris@1706 1195 else ["pull", "-q"])
Chris@1706 1196
Chris@1706 1197 fun is_newest context (libname, branch) =
Chris@1706 1198 case is_newest_locally context (libname, branch) of
Chris@1706 1199 ERROR e => ERROR e
Chris@1706 1200 | OK false => OK false
Chris@1706 1201 | OK true =>
Chris@1706 1202 case pull context libname of
Chris@1706 1203 ERROR e => ERROR e
Chris@1706 1204 | _ => is_newest_locally context (libname, branch)
Chris@1706 1205
Chris@1706 1206 fun is_modified_locally context libname =
Chris@1706 1207 case current_state context libname of
Chris@1706 1208 ERROR e => ERROR e
Chris@1706 1209 | OK { modified, ... } => OK modified
Chris@1706 1210
Chris@1706 1211 fun checkout context (libname, source, branch) =
Chris@1706 1212 let val url = remote_for context (libname, source)
Chris@1706 1213 in
Chris@1706 1214 case FileBits.mkpath (FileBits.extpath context) of
Chris@1706 1215 ERROR e => ERROR e
Chris@1706 1216 | _ => hg_command context ""
Chris@1706 1217 ["clone", "-u", branch_name branch,
Chris@1706 1218 url, libname]
Chris@1706 1219 end
Chris@1706 1220
Chris@1706 1221 fun update context (libname, branch) =
Chris@1706 1222 let val pull_result = pull context libname
Chris@1706 1223 in
Chris@1706 1224 case hg_command context libname ["update", branch_name branch] of
Chris@1706 1225 ERROR e => ERROR e
Chris@1706 1226 | _ =>
Chris@1706 1227 case pull_result of
Chris@1706 1228 ERROR e => ERROR e
Chris@1706 1229 | _ => id_of context libname
Chris@1706 1230 end
Chris@1706 1231
Chris@1706 1232 fun update_to context (libname, "") =
Chris@1706 1233 ERROR "Non-empty id (tag or revision id) required for update_to"
Chris@1706 1234 | update_to context (libname, id) =
Chris@1723 1235 let val pull_result = pull context libname
Chris@1723 1236 in
Chris@1723 1237 case hg_command context libname ["update", "-r", id] of
Chris@1723 1238 OK _ => id_of context libname
Chris@1723 1239 | ERROR e =>
Chris@1723 1240 case pull_result of
Chris@1723 1241 ERROR e' => ERROR e' (* this was the ur-error *)
Chris@1723 1242 | _ => ERROR e
Chris@1723 1243 end
Chris@1706 1244
Chris@1706 1245 end
Chris@1706 1246
Chris@1706 1247 structure GitControl :> VCS_CONTROL = struct
Chris@1706 1248
Chris@1706 1249 (* With Git repos we always operate in detached HEAD state. Even
Chris@1706 1250 the master branch is checked out using the remote reference,
Chris@1706 1251 origin/master. *)
Chris@1706 1252
Chris@1706 1253 fun git_command context libname args =
Chris@1706 1254 FileBits.command context libname ("git" :: args)
Chris@1706 1255
Chris@1706 1256 fun git_command_output context libname args =
Chris@1706 1257 FileBits.command_output context libname ("git" :: args)
Chris@1706 1258
Chris@1706 1259 fun exists context libname =
Chris@1706 1260 OK (OS.FileSys.isDir (FileBits.subpath context libname ".git"))
Chris@1706 1261 handle _ => OK false
Chris@1706 1262
Chris@1706 1263 fun remote_for context (libname, source) =
Chris@1706 1264 Provider.remote_url context GIT source libname
Chris@1706 1265
Chris@1706 1266 fun branch_name branch = case branch of
Chris@1706 1267 DEFAULT_BRANCH => "master"
Chris@1706 1268 | BRANCH "" => "master"
Chris@1706 1269 | BRANCH b => b
Chris@1706 1270
Chris@1706 1271 fun remote_branch_name branch = "origin/" ^ branch_name branch
Chris@1706 1272
Chris@1706 1273 fun checkout context (libname, source, branch) =
Chris@1706 1274 let val url = remote_for context (libname, source)
Chris@1706 1275 in
Chris@1706 1276 case FileBits.mkpath (FileBits.extpath context) of
Chris@1706 1277 OK () => git_command context ""
Chris@1706 1278 ["clone", "-b",
Chris@1706 1279 branch_name branch,
Chris@1706 1280 url, libname]
Chris@1706 1281 | ERROR e => ERROR e
Chris@1706 1282 end
Chris@1706 1283
Chris@1706 1284 (* NB git rev-parse HEAD shows revision id of current checkout;
Chris@1706 1285 git rev-list -1 <tag> shows revision id of revision with that tag *)
Chris@1706 1286
Chris@1706 1287 fun id_of context libname =
Chris@1706 1288 git_command_output context libname ["rev-parse", "HEAD"]
Chris@1706 1289
Chris@1706 1290 fun is_at context (libname, id_or_tag) =
Chris@1706 1291 case id_of context libname of
Chris@1706 1292 ERROR e => ERROR e
Chris@1706 1293 | OK id =>
Chris@1706 1294 if String.isPrefix id_or_tag id orelse
Chris@1706 1295 String.isPrefix id id_or_tag
Chris@1706 1296 then OK true
Chris@1706 1297 else
Chris@1706 1298 case git_command_output context libname
Chris@1723 1299 ["show-ref",
Chris@1723 1300 "refs/tags/" ^ id_or_tag] of
Chris@1723 1301 OK "" => OK false
Chris@1723 1302 | ERROR _ => OK false
Chris@1723 1303 | OK s => OK (id = hd (String.tokens (fn c => c = #" ") s))
Chris@1706 1304
Chris@1706 1305 fun branch_tip context (libname, branch) =
Chris@1706 1306 git_command_output context libname
Chris@1706 1307 ["rev-list", "-1",
Chris@1706 1308 remote_branch_name branch]
Chris@1706 1309
Chris@1706 1310 fun is_newest_locally context (libname, branch) =
Chris@1706 1311 case branch_tip context (libname, branch) of
Chris@1706 1312 ERROR e => ERROR e
Chris@1706 1313 | OK rev => is_at context (libname, rev)
Chris@1706 1314
Chris@1706 1315 fun is_on_branch context (libname, branch) =
Chris@1706 1316 case branch_tip context (libname, branch) of
Chris@1706 1317 ERROR e => ERROR e
Chris@1706 1318 | OK rev =>
Chris@1706 1319 case is_at context (libname, rev) of
Chris@1706 1320 ERROR e => ERROR e
Chris@1706 1321 | OK true => OK true
Chris@1706 1322 | OK false =>
Chris@1706 1323 case git_command context libname
Chris@1706 1324 ["merge-base", "--is-ancestor",
Chris@1706 1325 "HEAD", remote_branch_name branch] of
Chris@1706 1326 ERROR e => OK false (* cmd returns non-zero for no *)
Chris@1706 1327 | _ => OK true
Chris@1706 1328
Chris@1706 1329 fun is_newest context (libname, branch) =
Chris@1706 1330 case is_newest_locally context (libname, branch) of
Chris@1706 1331 ERROR e => ERROR e
Chris@1706 1332 | OK false => OK false
Chris@1706 1333 | OK true =>
Chris@1706 1334 case git_command context libname ["fetch"] of
Chris@1706 1335 ERROR e => ERROR e
Chris@1706 1336 | _ => is_newest_locally context (libname, branch)
Chris@1706 1337
Chris@1706 1338 fun is_modified_locally context libname =
Chris@1706 1339 case git_command_output context libname ["status", "--porcelain"] of
Chris@1706 1340 ERROR e => ERROR e
Chris@1706 1341 | OK "" => OK false
Chris@1706 1342 | OK _ => OK true
Chris@1706 1343
Chris@1706 1344 (* This function updates to the latest revision on a branch rather
Chris@1706 1345 than to a specific id or tag. We can't just checkout the given
Chris@1706 1346 branch, as that will succeed even if the branch isn't up to
Chris@1706 1347 date. We could checkout the branch and then fetch and merge,
Chris@1706 1348 but it's perhaps cleaner not to maintain a local branch at all,
Chris@1706 1349 but instead checkout the remote branch as a detached head. *)
Chris@1706 1350
Chris@1706 1351 fun update context (libname, branch) =
Chris@1706 1352 case git_command context libname ["fetch"] of
Chris@1706 1353 ERROR e => ERROR e
Chris@1706 1354 | _ =>
Chris@1706 1355 case git_command context libname ["checkout", "--detach",
Chris@1706 1356 remote_branch_name branch] of
Chris@1706 1357 ERROR e => ERROR e
Chris@1706 1358 | _ => id_of context libname
Chris@1706 1359
Chris@1706 1360 (* This function is dealing with a specific id or tag, so if we
Chris@1723 1361 can successfully check it out (detached) then that's all we
Chris@1723 1362 need to do, regardless of whether fetch succeeded or not. We do
Chris@1723 1363 attempt the fetch first, though, purely in order to avoid ugly
Chris@1723 1364 error messages in the common case where we're being asked to
Chris@1723 1365 update to a new pin (from the lock file) that hasn't been
Chris@1723 1366 fetched yet. *)
Chris@1706 1367
Chris@1706 1368 fun update_to context (libname, "") =
Chris@1706 1369 ERROR "Non-empty id (tag or revision id) required for update_to"
Chris@1706 1370 | update_to context (libname, id) =
Chris@1723 1371 let val fetch_result = git_command context libname ["fetch"]
Chris@1723 1372 in
Chris@1723 1373 case git_command context libname ["checkout", "--detach", id] of
Chris@1723 1374 OK _ => id_of context libname
Chris@1723 1375 | ERROR e =>
Chris@1723 1376 case fetch_result of
Chris@1723 1377 ERROR e' => ERROR e' (* this was the ur-error *)
Chris@1723 1378 | _ => ERROR e
Chris@1723 1379 end
Chris@1723 1380
Chris@1706 1381 end
Chris@1706 1382
Chris@1706 1383 structure AnyLibControl :> LIB_CONTROL = struct
Chris@1706 1384
Chris@1706 1385 structure H = LibControlFn(HgControl)
Chris@1706 1386 structure G = LibControlFn(GitControl)
Chris@1706 1387
Chris@1706 1388 fun review context (spec as { vcs, ... } : libspec) =
Chris@1706 1389 (fn HG => H.review | GIT => G.review) vcs context spec
Chris@1706 1390
Chris@1706 1391 fun status context (spec as { vcs, ... } : libspec) =
Chris@1706 1392 (fn HG => H.status | GIT => G.status) vcs context spec
Chris@1706 1393
Chris@1706 1394 fun update context (spec as { vcs, ... } : libspec) =
Chris@1706 1395 (fn HG => H.update | GIT => G.update) vcs context spec
Chris@1740 1396
Chris@1740 1397 fun id_of context (spec as { vcs, ... } : libspec) =
Chris@1740 1398 (fn HG => H.id_of | GIT => G.id_of) vcs context spec
Chris@1706 1399 end
Chris@1706 1400
Chris@1724 1401 val libobjname = "libraries"
Chris@1724 1402
Chris@1706 1403 fun load_libspec spec_json lock_json libname : libspec =
Chris@1706 1404 let open JsonBits
Chris@1724 1405 val libobj = lookup_mandatory spec_json [libobjname, libname]
Chris@1706 1406 val vcs = lookup_mandatory_string libobj ["vcs"]
Chris@1706 1407 val retrieve = lookup_optional_string libobj
Chris@1706 1408 val service = retrieve ["service"]
Chris@1706 1409 val owner = retrieve ["owner"]
Chris@1706 1410 val repo = retrieve ["repository"]
Chris@1706 1411 val url = retrieve ["url"]
Chris@1706 1412 val branch = retrieve ["branch"]
Chris@1740 1413 val project_pin = case retrieve ["pin"] of
Chris@1740 1414 NONE => UNPINNED
Chris@1740 1415 | SOME p => PINNED p
Chris@1724 1416 val lock_pin = case lookup_optional lock_json [libobjname, libname] of
Chris@1740 1417 NONE => UNPINNED
Chris@1740 1418 | SOME ll => case lookup_optional_string ll ["pin"] of
Chris@1740 1419 SOME p => PINNED p
Chris@1740 1420 | NONE => UNPINNED
Chris@1706 1421 in
Chris@1706 1422 {
Chris@1706 1423 libname = libname,
Chris@1706 1424 vcs = case vcs of
Chris@1706 1425 "hg" => HG
Chris@1706 1426 | "git" => GIT
Chris@1706 1427 | other => raise Fail ("Unknown version-control system \"" ^
Chris@1706 1428 other ^ "\""),
Chris@1706 1429 source = case (url, service, owner, repo) of
Chris@1721 1430 (SOME u, NONE, _, _) => URL_SOURCE u
Chris@1706 1431 | (NONE, SOME ss, owner, repo) =>
Chris@1721 1432 SERVICE_SOURCE { service = ss, owner = owner, repo = repo }
Chris@1706 1433 | _ => raise Fail ("Must have exactly one of service " ^
Chris@1706 1434 "or url string"),
Chris@1740 1435 project_pin = project_pin,
Chris@1740 1436 lock_pin = lock_pin,
Chris@1706 1437 branch = case branch of
Chris@1706 1438 SOME b => BRANCH b
Chris@1706 1439 | NONE => DEFAULT_BRANCH
Chris@1706 1440 }
Chris@1706 1441 end
Chris@1706 1442
Chris@1706 1443 fun load_userconfig () : userconfig =
Chris@1706 1444 let val home = FileBits.homedir ()
Chris@1706 1445 val conf_json =
Chris@1706 1446 JsonBits.load_json_from
Chris@1706 1447 (OS.Path.joinDirFile {
Chris@1706 1448 dir = home,
Chris@1706 1449 file = VextFilenames.user_config_file })
Chris@1706 1450 handle IO.Io _ => Json.OBJECT []
Chris@1706 1451 in
Chris@1706 1452 {
Chris@1706 1453 accounts = case JsonBits.lookup_optional conf_json ["accounts"] of
Chris@1706 1454 NONE => []
Chris@1706 1455 | SOME (Json.OBJECT aa) =>
Chris@1706 1456 map (fn (k, (Json.STRING v)) =>
Chris@1706 1457 { service = k, login = v }
Chris@1706 1458 | _ => raise Fail
Chris@1706 1459 "String expected for account name")
Chris@1706 1460 aa
Chris@1706 1461 | _ => raise Fail "Array expected for accounts",
Chris@1706 1462 providers = Provider.load_providers conf_json
Chris@1706 1463 }
Chris@1706 1464 end
Chris@1706 1465
Chris@1732 1466 datatype pintype =
Chris@1732 1467 NO_LOCKFILE |
Chris@1732 1468 USE_LOCKFILE
Chris@1732 1469
Chris@1732 1470 fun load_project (userconfig : userconfig) rootpath pintype : project =
Chris@1706 1471 let val spec_file = FileBits.project_spec_path rootpath
Chris@1706 1472 val lock_file = FileBits.project_lock_path rootpath
Chris@1706 1473 val _ = if OS.FileSys.access (spec_file, [OS.FileSys.A_READ])
Chris@1706 1474 handle OS.SysErr _ => false
Chris@1706 1475 then ()
Chris@1706 1476 else raise Fail ("Failed to open project spec file " ^
Chris@1706 1477 (VextFilenames.project_file) ^ " in " ^
Chris@1706 1478 rootpath ^
Chris@1706 1479 ".\nPlease ensure the spec file is in the " ^
Chris@1706 1480 "project root and run this from there.")
Chris@1706 1481 val spec_json = JsonBits.load_json_from spec_file
Chris@1732 1482 val lock_json = if pintype = USE_LOCKFILE
Chris@1706 1483 then JsonBits.load_json_from lock_file
Chris@1706 1484 handle IO.Io _ => Json.OBJECT []
Chris@1706 1485 else Json.OBJECT []
Chris@1706 1486 val extdir = JsonBits.lookup_mandatory_string spec_json
Chris@1706 1487 ["config", "extdir"]
Chris@1724 1488 val spec_libs = JsonBits.lookup_optional spec_json [libobjname]
Chris@1724 1489 val lock_libs = JsonBits.lookup_optional lock_json [libobjname]
Chris@1706 1490 val providers = Provider.load_more_providers
Chris@1706 1491 (#providers userconfig) spec_json
Chris@1706 1492 val libnames = case spec_libs of
Chris@1706 1493 NONE => []
Chris@1706 1494 | SOME (Json.OBJECT ll) => map (fn (k, v) => k) ll
Chris@1706 1495 | _ => raise Fail "Object expected for libs"
Chris@1706 1496 in
Chris@1706 1497 {
Chris@1706 1498 context = {
Chris@1706 1499 rootpath = rootpath,
Chris@1706 1500 extdir = extdir,
Chris@1706 1501 providers = providers,
Chris@1706 1502 accounts = #accounts userconfig
Chris@1706 1503 },
Chris@1706 1504 libs = map (load_libspec spec_json lock_json) libnames
Chris@1706 1505 }
Chris@1706 1506 end
Chris@1706 1507
Chris@1706 1508 fun save_lock_file rootpath locks =
Chris@1706 1509 let val lock_file = FileBits.project_lock_path rootpath
Chris@1706 1510 open Json
Chris@1706 1511 val lock_json =
Chris@1706 1512 OBJECT [
Chris@1724 1513 (libobjname,
Chris@1724 1514 OBJECT (map (fn { libname, id_or_tag } =>
Chris@1724 1515 (libname,
Chris@1724 1516 OBJECT [ ("pin", STRING id_or_tag) ]))
Chris@1724 1517 locks))
Chris@1706 1518 ]
Chris@1706 1519 in
Chris@1706 1520 JsonBits.save_json_to lock_file lock_json
Chris@1706 1521 end
Chris@1706 1522
Chris@1706 1523 fun pad_to n str =
Chris@1706 1524 if n <= String.size str then str
Chris@1706 1525 else pad_to n (str ^ " ")
Chris@1706 1526
Chris@1706 1527 fun hline_to 0 = ""
Chris@1706 1528 | hline_to n = "-" ^ hline_to (n-1)
Chris@1706 1529
Chris@1706 1530 val libname_width = 25
Chris@1706 1531 val libstate_width = 11
Chris@1740 1532 val localstate_width = 17
Chris@1706 1533 val notes_width = 5
Chris@1706 1534 val divider = " | "
Chris@1740 1535 val clear_line = "\r" ^ pad_to 80 "";
Chris@1706 1536
Chris@1706 1537 fun print_status_header () =
Chris@1740 1538 print (clear_line ^ "\n " ^
Chris@1706 1539 pad_to libname_width "Library" ^ divider ^
Chris@1706 1540 pad_to libstate_width "State" ^ divider ^
Chris@1706 1541 pad_to localstate_width "Local" ^ divider ^
Chris@1706 1542 "Notes" ^ "\n " ^
Chris@1706 1543 hline_to libname_width ^ "-+-" ^
Chris@1706 1544 hline_to libstate_width ^ "-+-" ^
Chris@1706 1545 hline_to localstate_width ^ "-+-" ^
Chris@1706 1546 hline_to notes_width ^ "\n")
Chris@1706 1547
Chris@1706 1548 fun print_outcome_header () =
Chris@1740 1549 print (clear_line ^ "\n " ^
Chris@1706 1550 pad_to libname_width "Library" ^ divider ^
Chris@1706 1551 pad_to libstate_width "Outcome" ^ divider ^
Chris@1706 1552 "Notes" ^ "\n " ^
Chris@1706 1553 hline_to libname_width ^ "-+-" ^
Chris@1706 1554 hline_to libstate_width ^ "-+-" ^
Chris@1706 1555 hline_to notes_width ^ "\n")
Chris@1706 1556
Chris@1706 1557 fun print_status with_network (libname, status) =
Chris@1706 1558 let val libstate_str =
Chris@1706 1559 case status of
Chris@1706 1560 OK (ABSENT, _) => "Absent"
Chris@1706 1561 | OK (CORRECT, _) => if with_network then "Correct" else "Present"
Chris@1706 1562 | OK (SUPERSEDED, _) => "Superseded"
Chris@1706 1563 | OK (WRONG, _) => "Wrong"
Chris@1706 1564 | ERROR _ => "Error"
Chris@1706 1565 val localstate_str =
Chris@1706 1566 case status of
Chris@1706 1567 OK (_, MODIFIED) => "Modified"
Chris@1740 1568 | OK (_, LOCK_MISMATCHED) => "Differs from Lock"
Chris@1740 1569 | OK (_, CLEAN) => "Clean"
Chris@1740 1570 | ERROR _ => ""
Chris@1706 1571 val error_str =
Chris@1706 1572 case status of
Chris@1706 1573 ERROR e => e
Chris@1706 1574 | _ => ""
Chris@1706 1575 in
Chris@1706 1576 print (" " ^
Chris@1706 1577 pad_to libname_width libname ^ divider ^
Chris@1706 1578 pad_to libstate_width libstate_str ^ divider ^
Chris@1706 1579 pad_to localstate_width localstate_str ^ divider ^
Chris@1706 1580 error_str ^ "\n")
Chris@1706 1581 end
Chris@1706 1582
Chris@1706 1583 fun print_update_outcome (libname, outcome) =
Chris@1706 1584 let val outcome_str =
Chris@1706 1585 case outcome of
Chris@1706 1586 OK id => "Ok"
Chris@1706 1587 | ERROR e => "Failed"
Chris@1706 1588 val error_str =
Chris@1706 1589 case outcome of
Chris@1706 1590 ERROR e => e
Chris@1706 1591 | _ => ""
Chris@1706 1592 in
Chris@1706 1593 print (" " ^
Chris@1706 1594 pad_to libname_width libname ^ divider ^
Chris@1706 1595 pad_to libstate_width outcome_str ^ divider ^
Chris@1706 1596 error_str ^ "\n")
Chris@1706 1597 end
Chris@1706 1598
Chris@1706 1599 fun act_and_print action print_header print_line (libs : libspec list) =
Chris@1706 1600 let val lines = map (fn lib => (#libname lib, action lib)) libs
Chris@1706 1601 val _ = print_header ()
Chris@1706 1602 in
Chris@1706 1603 app print_line lines;
Chris@1706 1604 lines
Chris@1706 1605 end
Chris@1708 1606
Chris@1708 1607 fun return_code_for outcomes =
Chris@1708 1608 foldl (fn ((_, result), acc) =>
Chris@1708 1609 case result of
Chris@1708 1610 ERROR _ => OS.Process.failure
Chris@1708 1611 | _ => acc)
Chris@1708 1612 OS.Process.success
Chris@1708 1613 outcomes
Chris@1706 1614
Chris@1706 1615 fun status_of_project ({ context, libs } : project) =
Chris@1708 1616 return_code_for (act_and_print (AnyLibControl.status context)
Chris@1708 1617 print_status_header (print_status false)
Chris@1708 1618 libs)
Chris@1706 1619
Chris@1706 1620 fun review_project ({ context, libs } : project) =
Chris@1708 1621 return_code_for (act_and_print (AnyLibControl.review context)
Chris@1708 1622 print_status_header (print_status true)
Chris@1708 1623 libs)
Chris@1706 1624
Chris@1706 1625 fun update_project ({ context, libs } : project) =
Chris@1706 1626 let val outcomes = act_and_print
Chris@1706 1627 (AnyLibControl.update context)
Chris@1706 1628 print_outcome_header print_update_outcome libs
Chris@1708 1629 val locks =
Chris@1708 1630 List.concat
Chris@1708 1631 (map (fn (libname, result) =>
Chris@1708 1632 case result of
Chris@1708 1633 ERROR _ => []
Chris@1708 1634 | OK id => [{ libname = libname, id_or_tag = id }])
Chris@1708 1635 outcomes)
Chris@1708 1636 val return_code = return_code_for outcomes
Chris@1706 1637 in
Chris@1708 1638 if OS.Process.isSuccess return_code
Chris@1708 1639 then save_lock_file (#rootpath context) locks
Chris@1708 1640 else ();
Chris@1708 1641 return_code
Chris@1706 1642 end
Chris@1706 1643
Chris@1740 1644 fun lock_project ({ context, libs } : project) =
Chris@1740 1645 let val outcomes = map (fn lib =>
Chris@1740 1646 (#libname lib, AnyLibControl.id_of context lib))
Chris@1740 1647 libs
Chris@1740 1648 val locks =
Chris@1740 1649 List.concat
Chris@1740 1650 (map (fn (libname, result) =>
Chris@1740 1651 case result of
Chris@1740 1652 ERROR _ => []
Chris@1740 1653 | OK id => [{ libname = libname, id_or_tag = id }])
Chris@1740 1654 outcomes)
Chris@1740 1655 val return_code = return_code_for outcomes
Chris@1740 1656 val _ = print clear_line
Chris@1740 1657 in
Chris@1740 1658 if OS.Process.isSuccess return_code
Chris@1740 1659 then save_lock_file (#rootpath context) locks
Chris@1740 1660 else ();
Chris@1740 1661 return_code
Chris@1740 1662 end
Chris@1740 1663
Chris@1732 1664 fun load_local_project pintype =
Chris@1706 1665 let val userconfig = load_userconfig ()
Chris@1706 1666 val rootpath = OS.FileSys.getDir ()
Chris@1706 1667 in
Chris@1732 1668 load_project userconfig rootpath pintype
Chris@1706 1669 end
Chris@1706 1670
Chris@1732 1671 fun with_local_project pintype f =
Chris@1732 1672 let val return_code = f (load_local_project pintype)
Chris@1708 1673 handle e =>
Chris@1708 1674 (print ("Failed with exception: " ^
Chris@1708 1675 (exnMessage e) ^ "\n");
Chris@1708 1676 OS.Process.failure)
Chris@1708 1677 val _ = print "\n";
Chris@1708 1678 in
Chris@1708 1679 return_code
Chris@1708 1680 end
Chris@1706 1681
Chris@1740 1682 fun review () = with_local_project USE_LOCKFILE review_project
Chris@1740 1683 fun status () = with_local_project USE_LOCKFILE status_of_project
Chris@1732 1684 fun update () = with_local_project NO_LOCKFILE update_project
Chris@1740 1685 fun lock () = with_local_project NO_LOCKFILE lock_project
Chris@1732 1686 fun install () = with_local_project USE_LOCKFILE update_project
Chris@1706 1687
Chris@1706 1688 fun version () =
Chris@1708 1689 (print ("v" ^ vext_version ^ "\n");
Chris@1708 1690 OS.Process.success)
Chris@1706 1691
Chris@1706 1692 fun usage () =
Chris@1706 1693 (print "\nVext ";
Chris@1706 1694 version ();
Chris@1706 1695 print ("\nA simple manager for third-party source code dependencies.\n\n"
Chris@1706 1696 ^ "Usage:\n\n"
Chris@1706 1697 ^ " vext <command>\n\n"
Chris@1706 1698 ^ "where <command> is one of:\n\n"
Chris@1716 1699 ^ " status print quick report on local status only, without using network\n"
Chris@1706 1700 ^ " review check configured libraries against their providers, and report\n"
Chris@1706 1701 ^ " install update configured libraries according to project specs and lock file\n"
Chris@1706 1702 ^ " update update configured libraries and lock file according to project specs\n"
Chris@1740 1703 ^ " lock update lock file to match local library status\n"
Chris@1708 1704 ^ " version print the Vext version number and exit\n\n");
Chris@1708 1705 OS.Process.failure)
Chris@1706 1706
Chris@1706 1707 fun vext args =
Chris@1708 1708 let val return_code =
Chris@1708 1709 case args of
Chris@1708 1710 ["review"] => review ()
Chris@1708 1711 | ["status"] => status ()
Chris@1708 1712 | ["install"] => install ()
Chris@1708 1713 | ["update"] => update ()
Chris@1740 1714 | ["lock"] => lock ()
Chris@1708 1715 | ["version"] => version ()
Chris@1708 1716 | _ => usage ()
Chris@1708 1717 in
Chris@1708 1718 OS.Process.exit return_code;
Chris@1708 1719 ()
Chris@1708 1720 end
Chris@1706 1721
Chris@1706 1722 fun main () =
Chris@1706 1723 vext (CommandLine.arguments ())