From d45f3ec46b4b791705de0352f7ce382260845171 Mon Sep 17 00:00:00 2001 From: Gabriel Gonzalez Date: Sun, 28 Jul 2019 21:46:32 -0700 Subject: [PATCH] =?UTF-8?q?Version=201.24.0=20=E2=86=92=201.25.0=20(#1156)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dhall-bash/dhall-bash.cabal | 4 +- dhall-json/CHANGELOG.md | 27 +++++- dhall-json/dhall-json.cabal | 4 +- dhall-lsp-server/dhall-lsp-server.cabal | 66 +++++++------- dhall-nix/dhall-nix.cabal | 2 +- dhall-try/dhall-try.cabal | 4 +- dhall/CHANGELOG.md | 115 ++++++++++++++++++++++++ dhall/dhall-lang | 2 +- dhall/dhall.cabal | 2 +- 9 files changed, 183 insertions(+), 43 deletions(-) diff --git a/dhall-bash/dhall-bash.cabal b/dhall-bash/dhall-bash.cabal index d32c125..1c64f76 100644 --- a/dhall-bash/dhall-bash.cabal +++ b/dhall-bash/dhall-bash.cabal @@ -1,5 +1,5 @@ Name: dhall-bash -Version: 1.0.21 +Version: 1.0.22 Cabal-Version: >=1.8.0.2 Build-Type: Simple Tested-With: GHC == 7.10.3, GHC == 8.4.3, GHC == 8.6.1 @@ -31,7 +31,7 @@ Library base >= 4.8.0.0 && < 5 , bytestring < 0.11, containers < 0.7 , - dhall >= 1.22.0 && < 1.25, + dhall >= 1.25.0 && < 1.26, neat-interpolation < 0.4 , shell-escape < 0.3 , text >= 0.2 && < 1.3 diff --git a/dhall-json/CHANGELOG.md b/dhall-json/CHANGELOG.md index 12ea064..4485e7c 100644 --- a/dhall-json/CHANGELOG.md +++ b/dhall-json/CHANGELOG.md @@ -1,3 +1,28 @@ +1.4.0 + +* BREAKING CHANGE: Split `Dhall.YAML` into `Dhall.YAML` + `Dhall.YAMLToDhall` + * See: https://github.com/dhall-lang/dhall-haskell/pull/993 +* BUG FIX: Fix `dhall-to-{json,yaml}`'s support for preserving alternative + names + * The `Nested`/`Inline` unions are now correctly given special treatment + again + * See: https://github.com/dhall-lang/dhall-haskell/pull/1080 +* Feature: Support weakly-typed JSON value added to Prelude + * You can now encode/decode values of type `./Prelude/JSON/Type` which + can store arbitrary JSON + * This is useful when dealing with "pass-through" or schema-free JSON + values + * See: https://github.com/dhall-lang/dhall-haskell/pull/1007 +* Feature: Eta support for `dhall-json` + * See: https://github.com/dhall-lang/dhall-haskell/pull/1013 +* Feature: Add `--file` option to `dhall-json` executables +* Feature: Support unions for keys + * You can now decode record fields as enums instead of `Text` so that you + can pattern match on them + * See: https://github.com/dhall-lang/dhall-haskell/pull/1094 +* Pretty-print output of `{json,yaml}-to-dhall` + * See: https://github.com/dhall-lang/dhall-haskell/pull/1150 + 1.3.0 * BREAKING CHANGE: Change YAML/JSON encoding for `NaN`/`Infinity`/`-Infinity` @@ -7,7 +32,7 @@ * BREAKING CHANGE: Isolate YAML code to one modulee * This is a breaking change because it moves `Dhall.JSON.jsonToYaml` to `Dhall.YAML.jsonToYaml` - * See: https://github.com/dhall-lang/dhall-haskell/pull/989/files + * See: https://github.com/dhall-lang/dhall-haskell/pull/989 * New `yaml-to-dhall` command-line utility * See: https://github.com/dhall-lang/dhall-haskell/pull/977 * Add `--quoted` flag to force quoting of YAML string literals diff --git a/dhall-json/dhall-json.cabal b/dhall-json/dhall-json.cabal index b150b17..b2a33fc 100644 --- a/dhall-json/dhall-json.cabal +++ b/dhall-json/dhall-json.cabal @@ -1,5 +1,5 @@ Name: dhall-json -Version: 1.3.0 +Version: 1.4.0 Cabal-Version: >=1.8.0.2 Build-Type: Simple Tested-With: GHC == 7.10.3, GHC == 8.4.3, GHC == 8.6.1 @@ -47,7 +47,7 @@ Library aeson-pretty < 0.9 , bytestring < 0.11, containers , - dhall >= 1.24.0 && < 1.25, + dhall >= 1.25.0 && < 1.26, exceptions >= 0.8.3 && < 0.11, optparse-applicative >= 0.14.0.0 && < 0.16, scientific >= 0.3.0.0 && < 0.4 , diff --git a/dhall-lsp-server/dhall-lsp-server.cabal b/dhall-lsp-server/dhall-lsp-server.cabal index 8d6f012..ba5f778 100644 --- a/dhall-lsp-server/dhall-lsp-server.cabal +++ b/dhall-lsp-server/dhall-lsp-server.cabal @@ -1,11 +1,11 @@ cabal-version: 1.12 name: dhall-lsp-server -version: 0.1.0.1 +version: 1.0.0 description: Please see the README on GitHub at homepage: https://github.com/dhall-lang/dhall-haskell/dhall-lsp-server#readme bug-reports: https://github.com/dhall-lang/dhall-haskell/issues author: panaeon -maintainer: panaeon +maintainer: Gabriel Gonzalez copyright: 2019 panaeon license: MIT license-file: LICENSE @@ -38,33 +38,33 @@ library src default-extensions: LambdaCase OverloadedStrings FlexibleInstances TypeApplications RecordWildCards ScopedTypeVariables build-depends: - aeson - , aeson-pretty - , base >=4.7 && <5 - , bytestring - , containers - , cryptonite - , data-default - , dhall - , dhall-json - , dotgen - , filepath - , haskell-lsp < 0.9 - , hslogger - , lens - , lens-family-core - , megaparsec - , mtl - , network-uri - , optparse-applicative - , prettyprinter - , sorted-list - , stm - , text - , transformers - , unordered-containers - , uri-encode - , yi-rope + aeson >= 1.3.1.1 && < 1.5 + , aeson-pretty >= 0.8.7 && < 0.9 + , base >= 4.7 && < 5 + , bytestring >= 0.10.8.2 && < 0.11 + , containers >= 0.5.11.0 && < 0.7 + , cryptonite >= 0.25 && < 0.27 + , data-default >= 0.7.1.1 && < 0.8 + , dhall >= 1.25.0 && < 1.26 + , dhall-json >= 1.4 && < 1.5 + , dotgen >= 0.4.2 && < 0.5 + , filepath >= 1.4.2 && < 1.5 + , haskell-lsp >= 0.8.1.0 && < 0.9 + , hslogger >= 1.2.10 && < 1.4 + , lens >= 4.16.1 && < 4.18 + , lens-family-core >= 1.2.3 && < 2.1 + , megaparsec >= 7.0.2 && < 7.1 + , mtl >= 2.2.2 && < 2.3 + , network-uri >= 2.6.1.0 && < 2.7 + , optparse-applicative >= 0.14.3.0 && < 0.16 + , prettyprinter >= 1.2.1 && < 1.4 + , sorted-list >= 0.2.1.0 && < 0.3 + , stm >= 2.4.5.0 && < 2.6 + , text >= 1.2.3.0 && < 1.3 + , transformers >= 0.5.5.0 && < 0.6 + , unordered-containers >= 0.2.9.0 && < 0.3 + , uri-encode >= 1.5.0.5 && < 1.6 + , yi-rope >= 0.11 && < 0.12 default-language: Haskell2010 GHC-Options: -Wall -fwarn-incomplete-uni-patterns if impl(eta) @@ -112,10 +112,10 @@ Test-Suite doctest Main-Is: Main.hs GHC-Options: -Wall Build-Depends: - base , - directory , - filepath < 1.5 , - doctest >= 0.7.0 && < 0.17 + base , + directory >= 1.3.1.5 && < 1.4 , + filepath < 1.5 , + doctest >= 0.7.0 && < 0.17 Other-Extensions: OverloadedStrings RecordWildCards Default-Language: Haskell2010 -- `doctest` doesn't work with `MIN_VERSION` macros before GHC 8 diff --git a/dhall-nix/dhall-nix.cabal b/dhall-nix/dhall-nix.cabal index 6b720d3..9f6fc56 100644 --- a/dhall-nix/dhall-nix.cabal +++ b/dhall-nix/dhall-nix.cabal @@ -30,7 +30,7 @@ Library base >= 4.8.0.0 && < 5 , containers < 0.7 , data-fix < 0.3 , - dhall >= 1.22 && < 1.25, + dhall >= 1.25 && < 1.26, hnix >= 0.6.1 && < 0.7 , neat-interpolation < 0.4 , text >= 0.8.0.0 && < 1.3 diff --git a/dhall-try/dhall-try.cabal b/dhall-try/dhall-try.cabal index 28e03f7..3edf05e 100644 --- a/dhall-try/dhall-try.cabal +++ b/dhall-try/dhall-try.cabal @@ -16,8 +16,8 @@ executable dhall-try main-is: Main.hs build-depends: base >= 4.11.0.0 && < 5 , aeson-pretty >= 0.8.7 && < 0.9 - , dhall >= 1.19.0 && < 1.25 - , dhall-json >= 1.2.5 && < 1.4 + , dhall >= 1.19.0 && < 1.26 + , dhall-json >= 1.2.5 && < 1.5 , prettyprinter >= 1.2.1 && < 1.3 , text >= 1.2.3.0 && < 1.3 , ghcjs-base >= 0.2.0.0 && < 0.3 diff --git a/dhall/CHANGELOG.md b/dhall/CHANGELOG.md index dd78d9d..e037d28 100644 --- a/dhall/CHANGELOG.md +++ b/dhall/CHANGELOG.md @@ -1,3 +1,118 @@ +1.25.0 + +* Supports version 8.0.0 of the standard + * See: https://github.com/dhall-lang/dhall-lang/releases/tag/v8.0.0 +* BREAKING CHANGE: Remove support for old-style `List`-like `Optional` literals + * List-like `Optional` Literals (i.e. `[ 1 ] : Optional Natural`) are no + longer valid + * See: https://github.com/dhall-lang/dhall-haskell/pull/1002 +* BREAKING CHANGE: Add support for semi-semantic caching + * This change significantly improves the performance of imports + * This change also automatically caches imports without an integrity check + * This changes several types in `Dhall.Import` to support this new + feature + * See: https://github.com/dhall-lang/dhall-haskell/pull/1113 +* BREAKING CHANGE: Implement new Unicode braced escape sequence + * Escape sequences encoding surrogate pairs are no longer valid + * Instead, characters previously encoded as surrogate pairs can instead be + encoded as a braced sequence + * For example: "\uD834\uDD1E" must now be written as "\u{1D11E}" + * See: https://github.com/dhall-lang/dhall-haskell/pull/987 + * See: https://github.com/dhall-lang/dhall-haskell/pull/1104 +* BREAKING CHANGE: Make the type of extract richer: + * `Dhall.extract` can now return a detailed error instead of just a `Maybe` + * This is a breaking chnage because the type of `extract` changed + * See: https://github.com/dhall-lang/dhall-haskell/pull/1011 +* BREAKING CHANGE: Add support for importing expressions `as Location` + * This is a breaking change because a new `Location` constructor was added + to `ImportMode` + * See: https://github.com/dhall-lang/dhall-haskell/pull/1019 +* BREAKING CHANGE: Switch `Var` to use an `Int` + * This is a performance improvement, but also a breaking change since the + `Integer` in the `Var` constructor was changed to an `Int` + * See: https://github.com/dhall-lang/dhall-haskell/pull/1044 +* BREAKING CHANGE: Add new `toMap` keyword + * This is a breaking change to the API because a new `ToMap` constructor + was added to the `Expr` type + * This is also a technically breaking change to the language because `toMap` + is now a reserved keyword, although most code should be unaffected in + practice + * See: https://github.com/dhall-lang/dhall-haskell/pull/1041 +* BREAKING CHANGE: Sort the fields of a record projection during normalization + * This is a technically breaking change to the language because any + expressions with an uninterpreted record projection will have a different + semantic integrity check. However, most could should be unaffected in + practice + * See: https://github.com/dhall-lang/dhall-haskell/pull/1111 +* BUG FIX: Fix substitution into record projection by type + * An expression like this one was being incorrectly rejected: + `let e = { a = 10, b = "Text" } let s = { a : Natural } in e.(s)`, which + this change fixes + * See: https://github.com/dhall-lang/dhall-haskell/pull/1012 +* BUG FIX: Reject record projection when there is a field type mismatch + * Record projection by type was previously not checking the expected + field types, which this change fixes + * See: https://github.com/dhall-lang/dhall-haskell/pull/1027 +* BUG FIX: Fix linting of unused let bindings + * Certain let bindings were not correctly detected as unused, which this + change fixes + * See: https://github.com/dhall-lang/dhall-haskell/pull/1001 +* BUG FIX: Fix `--file` option + * The `--file` option from the previous release did not work, due to not + computing relative paths correctly, which this change fixes + * See: https://github.com/dhall-lang/dhall-haskell/pull/1004 +* BUG FIX: Minor fix to `dhall diff` + * `dhall diff` was incorrectly displaying spurious differences for + identical lists that were function arguments, which this change fixes + * See: https://github.com/dhall-lang/dhall-haskell/pull/1006 +* BUG FIX: Allow `Sort` as type annotation + * This should have been implemented in the previous release as part of + supporting version 8.0.0 of the standard, but was missed + * See: https://github.com/dhall-lang/dhall-haskell/pull/1024 +* BUG FIX: `Dhall.Map`: Reflect original key ordering in `Ord` instance + * `Dhall.Map` now considers key order when comparing `Map`s, which it should + have done before, but didn't + * See: https://github.com/dhall-lang/dhall-haskell/pull/1050 +* BUG FIX: Consistently format multi-line strings + * The formatter now formats naked multi-line strings the same as nested + multi-line strings + * Specifically, naked multi-line strings can now be formatted on a single + (just like nested multi-line strings) + * See: https://github.com/dhall-lang/dhall-haskell/pull/1056 +* BUG FIX: Make `isNormalized` consistent with `normalize` + * See: https://github.com/dhall-lang/dhall-haskell/pull/1115 +* BUG FIX: Make `normalizeWithM` consistent with `normalize` + * See: https://github.com/dhall-lang/dhall-haskell/pull/1126 +* BUG FIX: Fix import alternatives to recover from type errors + * See: https://github.com/dhall-lang/dhall-haskell/pull/1152 +* Feature: Semi-semantic caching + * The Haskell implementation now implicitly caches *all* local imports, not + just imports frozen by integrity checks, so that you don't have to freeze + them when doing local development + * These cached imports are still correctly invalidated if they or any of + their dependencies change + * This new implicit cache is stored underneath `~/.cache/dhall-haskell` by + default + * See: https://github.com/dhall-lang/dhall-haskell/pull/1154 +* Feature: New `dhall text` subcommand + * This new subcommand supersedes the old `dhall-to-text` executable +* Feature: Add `instance Lift (Expr s a)` + * See: https://github.com/dhall-lang/dhall-haskell/pull/1119 +* Fixes and improvements to error messages: + * See: https://github.com/dhall-lang/dhall-haskell/pull/1030 + * See: https://github.com/dhall-lang/dhall-haskell/pull/1137 +* Fixes and improvements to tests: + * See: https://github.com/dhall-lang/dhall-haskell/pull/1155 + * See: https://github.com/dhall-lang/dhall-haskell/pull/1159 +* Performance improvements + * See: https://github.com/dhall-lang/dhall-haskell/pull/1036 + * See: https://github.com/dhall-lang/dhall-haskell/pull/1051 + * See: https://github.com/dhall-lang/dhall-haskell/pull/1048 + * See: https://github.com/dhall-lang/dhall-haskell/pull/1057 + * See: https://github.com/dhall-lang/dhall-haskell/pull/1065 + * See: https://github.com/dhall-lang/dhall-haskell/pull/1066 + * See: https://github.com/dhall-lang/dhall-haskell/pull/1085 + 1.24.0 * Supports version 8.0.0 of the standard diff --git a/dhall/dhall-lang b/dhall/dhall-lang index f4ee1fb..6cbf57c 160000 --- a/dhall/dhall-lang +++ b/dhall/dhall-lang @@ -1 +1 @@ -Subproject commit f4ee1fb8f8165c6d68d5f7f4da609483839271db +Subproject commit 6cbf57c946e7e6576babc23a38320e53ecfa6bee diff --git a/dhall/dhall.cabal b/dhall/dhall.cabal index 2864ca4..8bc40cd 100644 --- a/dhall/dhall.cabal +++ b/dhall/dhall.cabal @@ -1,5 +1,5 @@ Name: dhall -Version: 1.24.0 +Version: 1.25.0 Cabal-Version: >=1.10 Build-Type: Simple Tested-With: GHC == 7.10.3, GHC == 8.4.3, GHC == 8.6.1