godot-megaparsec 0.2.1.0 → 0.2.2.0

raw patch · 3 files changed

+97/−62 lines, 3 filesPVP: major bump suggested

API removals or changes: PVP suggests a major version bump

API changes (from Hackage documentation)

Files

• godot-megaparsec.cabal +1/−1
• src/Godot/Parser/Resource.hs +86/−61
• src/Godot/Parser/Resource/Lens.hs +10/−0

@@ -1,6 +1,6 @@ cabal-version:      2.4 name:               godot-megaparsec-version:            0.2.1.0+version:            0.2.2.0  -- A short (one-line) description of the package. synopsis:           Megaparsec parser for Godot `tscn` and `gdns` files.

@@ -24,6 +24,11 @@   ,GdnsDescriptor(..)   ,GdnsParsed(..)   ,GodotParsed(..)+  ,ExtResource(..)+  ,SubResource(..)+  ,Node(..)+  ,Connection(..)+  ,Resource(..)   ,tscnParser   ,gdnsParser   ,otherParser@@ -170,62 +175,82 @@  collectRest its = M.filterWithKey (\k _ -> k `S.member` S.fromList its) --- | Godot resource section prefixed with a bracket-enclosed header, optionally--- with body entries.------ Header entries not specified in a record are accessed with the relevant `headers` field.--- Likewise, body entries not specified are accessed with the `entries` field.--- Note that explicitly specified section fields are not duplicated in `headers` and--- `entries` fields.-data GodotSection-  = ExtResourceSection-    { _extResourceSectionPath    :: T.Text-    , _extResourceSectionTy      :: T.Text-    , _extResourceSectionId      :: Int-      -- | Other header information.-    , _extResourceSectionHeaders :: M.HashMap T.Text GodotValue-      -- | Body of the configuration entry.-    , _extResourceSectionEntries :: M.HashMap T.Text GodotValue-    }-  | SubResourceSection-    { _subResourceSectionTy      :: T.Text-    , _subResourceSectionId      :: Int-      -- | Other header information.-    , _subResourceSectionHeaders :: M.HashMap T.Text GodotValue-      -- | Body of the configuration entry.-    , _subResourceSectionEntries :: M.HashMap T.Text GodotValue-    }-  | NodeSection-    { _nodeSectionTy :: Maybe T.Text-    , _nodeSectionName :: T.Text+data ExtResource =+  ExtResource+  { _extResourcePath    :: T.Text+  , _extResourceTy      :: T.Text+  , _extResourceId      :: Int+    -- | Other header information.+  , _extResourceHeaders :: M.HashMap T.Text GodotValue+    -- | Body of the configuration entry.+  , _extResourceEntries :: M.HashMap T.Text GodotValue+  }+  deriving (Show, Generic)++data SubResource =+  SubResource+  { _subResourceTy      :: T.Text+  , _subResourceId      :: Int+    -- | Other header information.+  , _subResourceHeaders :: M.HashMap T.Text GodotValue+    -- | Body of the configuration entry.+  , _subResourceEntries :: M.HashMap T.Text GodotValue+  }+  deriving (Show, Generic)++data Node =+  Node+    { _nodeTy :: Maybe T.Text+    , _nodeName :: T.Text       -- | If `Nothing`, then this node is the root.-    , _nodeSectionParent :: Maybe T.Text+    , _nodeParent :: Maybe T.Text       -- | Instance refers to an `ExtResource` ID, usually listed at the top of a file.-    , _nodeSectionInst :: Maybe Int-    , _nodeSectionInstPlaceholder :: Maybe T.Text-    , _nodeSectionOwner :: Maybe T.Text-    , _nodeSectionIndex :: Maybe Int-    , _nodeSectionGroups :: Maybe [T.Text]+    , _nodeInst :: Maybe Int+    , _nodeInstPlaceholder :: Maybe T.Text+    , _nodeOwner :: Maybe T.Text+    , _nodeIndex :: Maybe Int+    , _nodeGroups :: Maybe [T.Text]       -- | Other header information.-    , _nodeSectionHeaders :: M.HashMap T.Text GodotValue+    , _nodeHeaders :: M.HashMap T.Text GodotValue       -- | Body of the configuration entry.-    , _nodeSectionEntries :: M.HashMap T.Text GodotValue+    , _nodeEntries :: M.HashMap T.Text GodotValue     }-  | ConnectionSection-    { _connectionSectionSignal  :: T.Text-    , _connectionSectionFrom    :: T.Text-    , _connectionSectionTo      :: T.Text-    , _connectionSectionMethod  :: T.Text+    deriving (Show, Generic)++data Connection =+  Connection+    { _connectionSignal  :: T.Text+    , _connectionFrom    :: T.Text+    , _connectionTo      :: T.Text+    , _connectionMethod  :: T.Text       -- | Other header information.-    , _connectionSectionHeaders :: M.HashMap T.Text GodotValue+    , _connectionHeaders :: M.HashMap T.Text GodotValue       -- | Body of the configuration entry.-    , _connectionSectionEntries :: M.HashMap T.Text GodotValue+    , _connectionEntries :: M.HashMap T.Text GodotValue     }-  | ResourceSection-    { _resourceSectionResourceName :: Maybe T.Text-    , _resourceSectionClassName    :: Maybe T.Text-    , _resourceSectionLibrary      :: Maybe (T.Text, [GodotValue])+    deriving (Show, Generic)++data Resource =+  Resource+    { _resourceResourceName :: Maybe T.Text+    , _resourceClassName    :: Maybe T.Text+    , _resourceLibrary      :: Maybe (T.Text, [GodotValue])     }+    deriving (Show, Generic)++-- | Godot resource section prefixed with a bracket-enclosed header, optionally+-- with body entries.+--+-- Header entries not specified in a record are accessed with the relevant `headers` field.+-- Likewise, body entries not specified are accessed with the `entries` field.+-- Note that explicitly specified section fields are not duplicated in `headers` and+-- `entries` fields.+data GodotSection+  = ExtResourceSection ExtResource+  | SubResourceSection SubResource+  | NodeSection Node+  | ConnectionSection Connection+  | ResourceSection Resource   | OtherSection     { _otherSectionHeader  :: T.Text     , _otherSectionHeaders :: M.HashMap T.Text GodotValue@@ -314,33 +339,33 @@ -- conversion function. headerWrapper   :: T.Text-  -> (M.HashMap T.Text GodotValue -> M.HashMap T.Text GodotValue -> GodotSection)-  -> Parser GodotSection+  -> (M.HashMap T.Text GodotValue -> M.HashMap T.Text GodotValue -> a)+  -> Parser a headerWrapper targetSect p = do   (headerName, headerKvs', bodyKvs) <- bodyAndKvs   unless (headerName == targetSect) (fail "mismatched expected header")   pure $ p headerKvs' bodyKvs  -- | Parse a `[sub_resource]` section.-tscnSubResourceP :: Parser GodotSection+tscnSubResourceP :: Parser SubResource tscnSubResourceP =   headerWrapper "sub_resource"-  (\kvs bodyKvs -> SubResourceSection (unGodotString' "type" kvs) (unGodotInt' "id" kvs)+  (\kvs bodyKvs -> SubResource (unGodotString' "type" kvs) (unGodotInt' "id" kvs)    (collectRest ["type", "id"] kvs) bodyKvs)  -- | Parse an `[ext_resource]` section.-tscnExtResourceP :: Parser GodotSection+tscnExtResourceP :: Parser ExtResource tscnExtResourceP =   headerWrapper "ext_resource"-  (\kvs bodyKvs -> ExtResourceSection (unGodotString' "path" kvs)+  (\kvs bodyKvs -> ExtResource (unGodotString' "path" kvs)    (unGodotString' "type" kvs) (unGodotInt' "id" kvs)    (collectRest ["path", "type", "id"] kvs) bodyKvs)  -- | Parse a `[node]` section.-tscnNodeP :: Parser GodotSection+tscnNodeP :: Parser Node tscnNodeP =   headerWrapper "node"-  (\kvs bodyKvs -> NodeSection (unGodotString "type" kvs) (unGodotString' "name" kvs)+  (\kvs bodyKvs -> Node (unGodotString "type" kvs) (unGodotString' "name" kvs)    (unGodotString "parent" kvs)    ((\(GodotInt i) -> i) . head . snd <$> unGodotConstructor "instance" kvs)    (unGodotString "instance_placeholder" kvs) (unGodotString "owner" kvs)@@ -357,10 +382,10 @@     , "groups"] kvs) bodyKvs)  -- | Parse a `[connection]` section.-tscnConnectionP :: Parser GodotSection+tscnConnectionP :: Parser Connection tscnConnectionP =   headerWrapper "connection"-  (\kvs bodyKvs -> ConnectionSection (unGodotString' "signal" kvs)+  (\kvs bodyKvs -> Connection (unGodotString' "signal" kvs)    (unGodotString' "from" kvs) (unGodotString' "to" kvs) (unGodotString' "method" kvs)    (collectRest ["signal", "from", "to", "method"] kvs) bodyKvs) @@ -379,15 +404,15 @@       sectionP  =         P.choice         (map P.try-         [tscnConnectionP, tscnExtResourceP, tscnSubResourceP, tscnNodeP, otherP])+         [ConnectionSection <$> tscnConnectionP, ExtResourceSection <$> tscnExtResourceP, SubResourceSection <$> tscnSubResourceP, NodeSection <$> tscnNodeP, otherP])   sections <- P.manyTill sectionP P.eof   pure $ TscnParsed (TscnDescriptor loadSteps format) sections  -- | Parse a `[resource]` section.-resourceP :: Parser GodotSection+resourceP :: Parser Resource resourceP =   headerWrapper "resource"-  (\_ bodyKvs -> ResourceSection (unGodotString "resource_name" bodyKvs)+  (\_ bodyKvs -> Resource (unGodotString "resource_name" bodyKvs)    (unGodotString "class_name" bodyKvs) (unGodotConstructor "library" bodyKvs))  -- | Parse a `gdns` file.@@ -397,7 +422,7 @@   let ty        = unGodotString' "type" kvs       loadSteps = unGodotInt' "load_steps" kvs       format    = unGodotInt' "format" kvs-      sectionP  = P.choice (map P.try [tscnExtResourceP, resourceP, otherP])+      sectionP  = P.choice (map P.try [ExtResourceSection <$> tscnExtResourceP, ResourceSection <$> resourceP, otherP])   sections <- P.manyTill sectionP P.eof   pure $ GdnsParsed (GdnsDescriptor ty loadSteps format) sections 

@@ -26,3 +26,13 @@ makeLenses ''OtherParsed  makeLenses ''GodotParsed++makeLenses ''ExtResource++makeLenses ''SubResource++makeLenses ''Node++makeLenses ''Connection++makeLenses ''Resource