wip

Author: functora

pub/xlsx/src/Codec/Xlsx/Formatted.hs

@@ -244,16 +244,16 @@ formatWorkbook nfcss initStyle = extract go
         return
           ( name,
             def
-              & wsCells
+              & #wsCells
               .~ M.fromList (concat cs')
-              & wsMerges
+              & #wsMerges
               .~ merges
           )
     extract (sheets, st) =
       def
-        & xlSheets
+        & #xlSheets
         .~ sheets
-        & xlStyles
+        & #xlStyles
         .~ renderStyleSheet (updateStyleSheetFromState initStyle st)
 
 -- | reverse to 'formatted' which allows to get a map of formatted cells

pub/xlsx/src/Codec/Xlsx/Lens.hs

@@ -65,14 +65,14 @@ upsert k v ((k1, v1) : r) =
 -- | lens giving access to a worksheet from 'Xlsx' object
 -- by its name
 ixSheet :: Text -> Traversal' Xlsx Worksheet
-ixSheet s = xlSheets . \f -> fmap unSheetList . ix s f . SheetList
+ixSheet s = #xlSheets . \f -> fmap unSheetList . ix s f . SheetList
 
 -- | 'Control.Lens.At' variant of 'ixSheet' lens
 --
 -- /Note:/ if there is no such sheet in this workbook then new sheet will be
 -- added as the last one to the sheet list
 atSheet :: Text -> Lens' Xlsx (Maybe Worksheet)
-atSheet s = xlSheets . \f -> fmap unSheetList . at s f . SheetList
+atSheet s = #xlSheets . \f -> fmap unSheetList . at s f . SheetList
 
 -- | lens giving access to a cell in some worksheet
 -- by its position, by default row+column index is used
@@ -82,7 +82,7 @@ ixCell = ixCellRC
 
 -- | lens to access cell in a worksheet
 ixCellRC :: (RowIndex, ColumnIndex) -> Traversal' Worksheet Cell
-ixCellRC i = wsCells . ix i
+ixCellRC i = #wsCells . ix i
 
 -- | lens to access cell in a worksheet using more traditional
 -- x+y coordinates
@@ -96,7 +96,7 @@ atCell = atCellRC
 
 -- | lens to read, write or delete cell in a worksheet
 atCellRC :: (RowIndex, ColumnIndex) -> Lens' Worksheet (Maybe Cell)
-atCellRC i = wsCells . at i
+atCellRC i = #wsCells . at i
 
 -- | lens to read, write or delete cell in a worksheet
 -- using more traditional x+y or row+column index

pub/xlsx/src/Codec/Xlsx/Parser.hs

@@ -118,7 +118,7 @@ toXlsxEitherBase parseSheet bs = do
   (wfs, names, cacheSources, dateBase) <- readWorkbook ar
   sheets <- forM wfs $ \wf -> do
     sheet <- parseSheet ar sst contentTypes cacheSources wf
-    return . (wfName wf,) . (wsState .~ wfState wf) $ sheet
+    return . (wfName wf,) . (#wsState .~ wfState wf) $ sheet
   CustomProperties customPropMap <- getCustomProperties ar
   return $ Xlsx sheets (getStyles ar) names customPropMap dateBase
 
@@ -160,37 +160,37 @@ extractSheetFast ar sst contentTypes caches wf = do
         liftEither . collectChildren root $ do
           skip "sheetPr"
           skip "dimension"
-          _wsSheetViews <- fmap justNonEmpty . maybeParse "sheetViews" $ \n ->
+          wsSheetViews <- fmap justNonEmpty . maybeParse "sheetViews" $ \n ->
             collectChildren n $ fromChildList "sheetView"
           skip "sheetFormatPr"
-          _wsColumnsProperties <-
+          wsColumnsProperties <-
             fmap (fromMaybe []) . maybeParse "cols" $ \n ->
               collectChildren n (fromChildList "col")
-          (_wsRowPropertiesMap, _wsCells, _wsSharedFormulas) <-
+          (wsRowPropertiesMap, wsCells, wsSharedFormulas) <-
             requireAndParse "sheetData" $ \n -> do
               rows <- collectChildren n $ childList "row"
               collectRows <$> forM rows parseRow
           skip "sheetCalcPr"
-          _wsProtection <- maybeFromChild "sheetProtection"
+          wsProtection <- maybeFromChild "sheetProtection"
           skip "protectedRanges"
           skip "scenarios"
-          _wsAutoFilter <- maybeFromChild "autoFilter"
+          wsAutoFilter <- maybeFromChild "autoFilter"
           skip "sortState"
           skip "dataConsolidate"
           skip "customSheetViews"
-          _wsMerges <- fmap (fromMaybe []) . maybeParse "mergeCells" $ \n -> do
+          wsMerges <- fmap (fromMaybe []) . maybeParse "mergeCells" $ \n -> do
             mCells <- collectChildren n $ childList "mergeCell"
             forM mCells $ \mCell -> parseAttributes mCell $ fromAttr "ref"
-          _wsConditionalFormattings <-
+          wsConditionalFormattings <-
             M.fromList . map unCfPair <$> fromChildList "conditionalFormatting"
-          _wsDataValidations <-
+          wsDataValidations <-
             fmap (fromMaybe mempty) . maybeParse "dataValidations" $ \n -> do
               M.fromList . map unDvPair
                 <$> collectChildren n (fromChildList "dataValidation")
           skip "hyperlinks"
           skip "printOptions"
           skip "pageMargins"
-          _wsPageSetup <- maybeFromChild "pageSetup"
+          wsPageSetup <- maybeFromChild "pageSetup"
           skip "headerFooter"
           skip "rowBreaks"
           skip "colBreaks"
@@ -210,10 +210,10 @@ extractSheetFast ar sst contentTypes caches wf = do
           -- all explicitly assigned fields filled below
           return
             ( Worksheet
-                { _wsDrawing = Nothing,
-                  _wsPivotTables = [],
-                  _wsTables = [],
-                  _wsState = wfState wf,
+                { wsDrawing = Nothing,
+                  wsPivotTables = [],
+                  wsTables = [],
+                  wsState = wfState wf,
                   ..
                 },
               tableIds,
@@ -253,13 +253,13 @@ extractSheetFast ar sst contentTypes caches wf = do
 
       return $
         ws
-          & wsTables
+          & #wsTables
           .~ tables
-          & wsCells
+          & #wsCells
           %~ mergeComments
-          & wsDrawing
+          & #wsDrawing
           .~ drawing
-          & wsPivotTables
+          & #wsPivotTables
           .~ pivotTables
     liftEither :: Either Text a -> Parser a
     liftEither = left (\t -> InvalidFile filePath t)

pub/xlsx/src/Codec/Xlsx/Types.hs

@@ -27,36 +27,6 @@ module Codec.Xlsx.Types
 
     -- * Lenses
 
-    -- ** Workbook
-    xlSheets,
-    xlStyles,
-    xlDefinedNames,
-    xlCustomProperties,
-    xlDateBase,
-
-    -- ** Worksheet
-    wsColumnsProperties,
-    wsRowPropertiesMap,
-    wsCells,
-    wsDrawing,
-    wsMerges,
-    wsSheetViews,
-    wsPageSetup,
-    wsConditionalFormattings,
-    wsDataValidations,
-    wsPivotTables,
-    wsAutoFilter,
-    wsTables,
-    wsProtection,
-    wsSharedFormulas,
-    wsState,
-
-    -- ** Cells
-    Cell.cellValue,
-    Cell.cellStyle,
-    Cell.cellComment,
-    Cell.cellFormula,
-
     -- ** Row properties
     rowHeightLens,
     _CustomHeight,
@@ -285,50 +255,48 @@ instance ToAttrVal SheetState where
 -- | Xlsx worksheet
 data Worksheet = Worksheet
   { -- | column widths
-    _wsColumnsProperties :: [ColumnsProperties],
+    wsColumnsProperties :: [ColumnsProperties],
     -- | custom row properties (height, style) map
-    _wsRowPropertiesMap :: Map RowIndex RowProperties,
+    wsRowPropertiesMap :: Map RowIndex RowProperties,
     -- | data mapped by (row, column) pairs
-    _wsCells :: CellMap,
+    wsCells :: CellMap,
     -- | SpreadsheetML Drawing
-    _wsDrawing :: Maybe Drawing,
+    wsDrawing :: Maybe Drawing,
     -- | list of cell merges
-    _wsMerges :: [Range],
-    _wsSheetViews :: Maybe [SheetView],
-    _wsPageSetup :: Maybe PageSetup,
-    _wsConditionalFormattings :: Map SqRef ConditionalFormatting,
-    _wsDataValidations :: Map SqRef DataValidation,
-    _wsPivotTables :: [PivotTable],
-    _wsAutoFilter :: Maybe AutoFilter,
-    _wsTables :: [Table],
-    _wsProtection :: Maybe SheetProtection,
-    _wsSharedFormulas :: Map SharedFormulaIndex SharedFormulaOptions,
-    _wsState :: SheetState
+    wsMerges :: [Range],
+    wsSheetViews :: Maybe [SheetView],
+    wsPageSetup :: Maybe PageSetup,
+    wsConditionalFormattings :: Map SqRef ConditionalFormatting,
+    wsDataValidations :: Map SqRef DataValidation,
+    wsPivotTables :: [PivotTable],
+    wsAutoFilter :: Maybe AutoFilter,
+    wsTables :: [Table],
+    wsProtection :: Maybe SheetProtection,
+    wsSharedFormulas :: Map SharedFormulaIndex SharedFormulaOptions,
+    wsState :: SheetState
   }
   deriving (Eq, Show, Generic)
 
 instance NFData Worksheet
 
-makeLenses ''Worksheet
-
 instance Default Worksheet where
   def =
     Worksheet
-      { _wsColumnsProperties = [],
-        _wsRowPropertiesMap = M.empty,
-        _wsCells = M.empty,
-        _wsDrawing = Nothing,
-        _wsMerges = [],
-        _wsSheetViews = Nothing,
-        _wsPageSetup = Nothing,
-        _wsConditionalFormattings = M.empty,
-        _wsDataValidations = M.empty,
-        _wsPivotTables = [],
-        _wsAutoFilter = Nothing,
-        _wsTables = [],
-        _wsProtection = Nothing,
-        _wsSharedFormulas = M.empty,
-        _wsState = def
+      { wsColumnsProperties = [],
+        wsRowPropertiesMap = M.empty,
+        wsCells = M.empty,
+        wsDrawing = Nothing,
+        wsMerges = [],
+        wsSheetViews = Nothing,
+        wsPageSetup = Nothing,
+        wsConditionalFormattings = M.empty,
+        wsDataValidations = M.empty,
+        wsPivotTables = [],
+        wsAutoFilter = Nothing,
+        wsTables = [],
+        wsProtection = Nothing,
+        wsSharedFormulas = M.empty,
+        wsState = def
       }
 
 -- | Raw worksheet styles, for structured implementation see 'StyleSheet'
@@ -340,15 +308,15 @@ instance NFData Styles
 
 -- | Structured representation of Xlsx file (currently a subset of its contents)
 data Xlsx = Xlsx
-  { _xlSheets :: [(Text, Worksheet)],
-    _xlStyles :: Styles,
-    _xlDefinedNames :: DefinedNames,
-    _xlCustomProperties :: Map Text Variant,
+  { xlSheets :: [(Text, Worksheet)],
+    xlStyles :: Styles,
+    xlDefinedNames :: DefinedNames,
+    xlCustomProperties :: Map Text Variant,
     -- | date base to use when converting serial value (i.e. 'CellDouble d')
     -- into date-time. Default value is 'DateBase1900'
     --
     -- See also 18.17.4.1 "Date Conversion for Serial Date-Times" (p. 2067)
-    _xlDateBase :: DateBase
+    xlDateBase :: DateBase
   }
   deriving (Eq, Show, Generic)
 
@@ -380,8 +348,6 @@ newtype DefinedNames = DefinedNames [(Text, Maybe Text, Text)]
 
 instance NFData DefinedNames
 
-makeLenses ''Xlsx
-
 instance Default Xlsx where
   def = Xlsx [] emptyStyles def M.empty DateBase1900
 

pub/xlsx/src/Codec/Xlsx/Types/Internal/SharedStringTable.hs

@@ -98,7 +98,7 @@ sstConstruct =
   SharedStringTable . V.fromList . uniq . concatMap goSheet
   where
     goSheet :: Worksheet -> [XlsxText]
-    goSheet = mapMaybe (cellValue >=> sstEntry) . Map.elems . _wsCells
+    goSheet = mapMaybe (cellValue >=> sstEntry) . Map.elems . wsCells
 
     sstEntry :: CellValue -> Maybe XlsxText
     sstEntry (CellText text) = Just $ XlsxText text