ogma-language-jsonspec 1.15.0 → 1.16.0

raw patch · 3 files changed

+18/−17 lines, 3 filesdep ~megaparsecdep ~ogma-specPVP ok

version bump matches the API change (PVP)

Dependency ranges changed: megaparsec, ogma-spec

API changes (from Hackage documentation)

Files

• CHANGELOG.md +7/−0
• ogma-language-jsonspec.cabal +3/−3
• src/Language/JSONSpec/Parser.hs +8/−14

@@ -1,5 +1,12 @@ # Revision history for ogma-language-jsonspec +## [1.16.0] - 2026-09-21++* Version bump (1.16.0) (#606).+* Bump upper version constraint on `megaparsec` (#545).+* Use infix variant of `fmap` (#583).+* Remove unused imports from `Language.JSONSpec.Parser` (#598).+ ## [1.15.0] - 2026-07-21  * Version bump (1.15.0) (#508).

@@ -19,7 +19,7 @@ build-type:          Simple  name:                ogma-language-jsonspec-version:             1.15.0+version:             1.16.0 homepage:            https://github.com/nasa/ogma bug-reports:         https://github.com/nasa/ogma/issues license:             Apache-2.0@@ -61,11 +61,11 @@     , filepath               >= 1.4.2    && < 1.6     , jsonpath               >= 0.3      && < 0.4     , text                   >= 1.2.3.1  && < 2.2-    , megaparsec             >= 8.0.0    && < 9.8+    , megaparsec             >= 8.0.0    && < 9.9     , mtl                    >= 2.2.2    && < 2.4     , bytestring             >= 0.10.8.2 && < 0.13 -    , ogma-spec              >= 1.15.0 && < 1.16+    , ogma-spec              >= 1.16.0 && < 1.17    hs-source-dirs:     src

@@ -21,19 +21,13 @@  -- External imports import           Control.Monad.Except  (ExceptT (..), runExceptT)-import           Data.Aeson            (FromJSON (..), Value (..), decode, (.:))-import           Data.Aeson.Key        (toString)-import qualified Data.Aeson.KeyMap     as M-import           Data.Aeson.Types      (prependFailure, typeMismatch)+import           Data.Aeson            (Value (..)) import           Data.Bifunctor        (first)-import           Data.ByteString.Lazy  (fromStrict) import           Data.JSONPath.Execute (executeJSONPath) import           Data.JSONPath.Parser  (jsonPath) import           Data.JSONPath.Types   (JSONPathElement(..)) import           Data.Text             (pack, unpack) import qualified Data.Text             as T-import qualified Data.Text.Encoding    as T-import qualified Data.Text.IO          as T import           System.FilePath       (takeBaseName, takeFileName) import           Text.Megaparsec       (eof, errorBundlePretty, parse) @@ -104,19 +98,19 @@ parseJSONFormat :: JSONFormat -> Either String JSONFormatInternal parseJSONFormat jsonFormat = do   jfi2 <- showErrorsM $-            fmap (parseJSONPath . pack) $ specInternalVars jsonFormat+            parseJSONPath . pack <$> specInternalVars jsonFormat   jfi3 <- showErrors $             parseJSONPath $ pack $ specInternalVarId jsonFormat   jfi4 <- showErrors $             parseJSONPath $ pack $ specInternalVarExpr jsonFormat   jfi5 <- showErrorsM $-            fmap (parseJSONPath . pack) $ specInternalVarType jsonFormat+            parseJSONPath . pack <$> specInternalVarType jsonFormat   jfi6 <- showErrorsM $-            fmap (parseJSONPath . pack) $ specExternalVars jsonFormat+            parseJSONPath . pack <$> specExternalVars jsonFormat   jfi7 <- showErrors $             parseJSONPath $ pack $ specExternalVarId jsonFormat   jfi8 <- showErrorsM $-            fmap (parseJSONPath . pack) $ specExternalVarType jsonFormat+            parseJSONPath . pack <$> specExternalVarType jsonFormat   jfi9 <- showErrors $             parseJSONPath $ pack $ specRequirements jsonFormat @@ -128,13 +122,13 @@     JSONPath p -> showErrors $ fmap FSIJSONPath $ parseJSONPath $ pack p    jfi11 <- showErrorsM $-             fmap (parseJSONPath . pack) $ specRequirementDesc jsonFormat+             parseJSONPath . pack <$> specRequirementDesc jsonFormat   jfi12 <- showErrors $              parseJSONPath $ pack $ specRequirementExpr jsonFormat   jfi13 <- showErrorsM $-             fmap (parseJSONPath . pack) $ specRequirementResultType jsonFormat+             parseJSONPath . pack <$> specRequirementResultType jsonFormat   jfi14 <- showErrorsM $-             fmap (parseJSONPath . pack) $ specRequirementResultExpr jsonFormat+             parseJSONPath . pack <$> specRequirementResultExpr jsonFormat   return $ JSONFormatInternal              { jfiInternalVars          = jfi2              , jfiInternalVarId         = jfi3