Skip to content

Commit 51bec2f

Browse files
author
Serhii Khoma
committed
feat: update halogen to v6, update ps-cst to dodo version
1 parent 8a8a689 commit 51bec2f

File tree

10 files changed

+277
-356
lines changed

10 files changed

+277
-356
lines changed

‎docs/entry.4aabd04e.js.map‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

docs/entry.4aabd04e.js renamed to docs/entry.51164d29.js

Lines changed: 234 additions & 171 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/entry.51164d29.js.map‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<!doctype html><html xmlns="http://www.w3.org/1999/xhtml" xmlns:foo="http://www.w3.org/2000/svg"><head><meta charset="utf-8"><title>html2purescript</title><style>body{font-family:sans-serif;text-align:center;margin:10px}textarea{width:100%;height:220px}.container{max-width:900px;margin:auto;text-align:left}.title{vertical-align:middle}.title .picker,h1{font-size:20px}label{display:block;color:#ac450a;border-bottom:1px solid #ac450a;margin-bottom:5px}section{margin:20px auto}</style></head><body> <script src="entry.4aabd04e.js"></script> </body></html>
1+
<!doctype html><html xmlns="http://www.w3.org/1999/xhtml" xmlns:foo="http://www.w3.org/2000/svg"><head><meta charset="utf-8"><title>html2purescript</title><style>body{font-family:sans-serif;text-align:center;margin:10px}textarea{width:100%;height:220px}.container{max-width:900px;margin:auto;text-align:left}.title{vertical-align:middle}.title .picker,h1{font-size:20px}label{display:block;color:#ac450a;border-bottom:1px solid #ac450a;margin-bottom:5px}section{margin:20px auto}</style></head><body> <script src="entry.51164d29.js"></script> </body></html>

‎packages.dhall‎

Lines changed: 6 additions & 161 deletions
Original file line numberDiff line numberDiff line change
@@ -1,167 +1,12 @@
1-
{-
2-
Welcome to your new Dhall package-set!
3-
4-
Below are instructions for how to edit this file for most use
5-
cases, so that you don't need to know Dhall to use it.
6-
7-
## Warning: Don't Move This Top-Level Comment!
8-
9-
Due to how `dhall format` currently works, this comment's
10-
instructions cannot appear near corresponding sections below
11-
because `dhall format` will delete the comment. However,
12-
it will not delete a top-level comment like this one.
13-
14-
## Use Cases
15-
16-
Most will want to do one or both of these options:
17-
1. Override/Patch a package's dependency
18-
2. Add a package not already in the default package set
19-
20-
This file will continue to work whether you use one or both options.
21-
Instructions for each option are explained below.
22-
23-
### Overriding/Patching a package
24-
25-
Purpose:
26-
- Change a package's dependency to a newer/older release than the
27-
default package set's release
28-
- Use your own modified version of some dependency that may
29-
include new API, changed API, removed API by
30-
using your custom git repo of the library rather than
31-
the package set's repo
32-
33-
Syntax:
34-
Replace the overrides' "{=}" (an empty record) with the following idea
35-
The "//" or "⫽" means "merge these two records and
36-
when they have the same value, use the one on the right:"
37-
-------------------------------
38-
let overrides =
39-
{ packageName =
40-
upstream.packageName // { updateEntity1 = "new value", updateEntity2 = "new value" }
41-
, packageName =
42-
upstream.packageName // { version = "v4.0.0" }
43-
, packageName =
44-
upstream.packageName // { repo = "https://www.example.com/path/to/new/repo.git" }
45-
}
46-
-------------------------------
47-
48-
Example:
49-
-------------------------------
50-
let overrides =
51-
{ halogen =
52-
upstream.halogen // { version = "master" }
53-
, halogen-vdom =
54-
upstream.halogen-vdom // { version = "v4.0.0" }
55-
}
56-
-------------------------------
57-
58-
### Additions
59-
60-
Purpose:
61-
- Add packages that aren't already included in the default package set
62-
63-
Syntax:
64-
Replace the additions' "{=}" (an empty record) with the following idea:
65-
-------------------------------
66-
let additions =
67-
{ package-name =
68-
{ dependencies =
69-
[ "dependency1"
70-
, "dependency2"
71-
]
72-
, repo =
73-
"https://example.com/path/to/git/repo.git"
74-
, version =
75-
"tag ('v4.0.0') or branch ('master')"
76-
}
77-
, package-name =
78-
{ dependencies =
79-
[ "dependency1"
80-
, "dependency2"
81-
]
82-
, repo =
83-
"https://example.com/path/to/git/repo.git"
84-
, version =
85-
"tag ('v4.0.0') or branch ('master')"
86-
}
87-
, etc.
88-
}
89-
-------------------------------
90-
91-
Example:
92-
-------------------------------
93-
let additions =
94-
{ benchotron =
95-
{ dependencies =
96-
[ "arrays"
97-
, "exists"
98-
, "profunctor"
99-
, "strings"
100-
, "quickcheck"
101-
, "lcg"
102-
, "transformers"
103-
, "foldable-traversable"
104-
, "exceptions"
105-
, "node-fs"
106-
, "node-buffer"
107-
, "node-readline"
108-
, "datetime"
109-
, "now"
110-
]
111-
, repo =
112-
"https://github.com/hdgarrood/purescript-benchotron.git"
113-
, version =
114-
"v7.0.0"
115-
}
116-
}
117-
-------------------------------
118-
-}
119-
120-
1211
let upstream =
1222
https://github.com/purescript/package-sets/releases/download/psc-0.13.8-20200724/packages.dhall sha256:bb941d30820a49345a0e88937094d2b9983d939c9fd3a46969b85ce44953d7d9
1233

1244
let overrides = {=}
1255

126-
let additions =
127-
{ html-parser =
128-
{ dependencies =
129-
[ "console"
130-
, "quickcheck"
131-
, "string-parsers"
132-
]
133-
, repo =
134-
"https://github.com/srghma/purescript-html-parser.git"
135-
, version =
136-
"master"
137-
}
138-
, prettyprinter =
139-
{ dependencies =
140-
[ "prelude"
141-
, "unfoldable"
142-
, "console"
143-
, "stringutils"
144-
]
145-
, repo = "https://github.com/srghma/purescript-prettyprinter.git"
146-
, version = "master"
147-
}
148-
, ps-cst =
149-
{ dependencies =
150-
[ "console"
151-
, "effect"
152-
, "generics-rep"
153-
, "psci-support"
154-
, "record"
155-
, "strings"
156-
, "spec"
157-
, "node-path"
158-
, "node-fs-aff"
159-
, "ansi"
160-
, "prettyprinter"
161-
]
162-
, repo = "https://github.com/srghma/purescript-ps-cst.git"
163-
, version = "master"
164-
}
165-
}
6+
let additions = {=}
1667

167-
in upstream // overrides // additions
8+
in upstream
9+
// https://raw.githubusercontent.com/srghma/my-purescript-package-sets/f81370b/packages.dhall sha256:4060d30d829e5c6aa942c0f986f0bc86ad30c274efdb3cad5dce65eb64172170
10+
upstream.(https://raw.githubusercontent.com/srghma/my-purescript-package-sets/f81370b/upstreamTypeChunk.dhall sha256:1f07f2737ec9a052fa448d4f2c3058ed5bb68ea66622ac3d1f74bd78eeeac09b)
11+
// overrides
12+
// additions

‎spago.dhall‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ You can edit this file as you like.
1212
, "html-parser"
1313
, "ps-cst"
1414
, "debug"
15+
, "stringutils"
16+
, "strings-extra"
1517
]
1618
, packages = ./packages.dhall
1719
, sources = [ "src/**/*.purs", "test/**/*.purs" ]

‎src/Component.purs‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import Prelude
55
import Data.Array (singleton)
66
import Data.Const (Const)
77
import Data.Either (either)
8-
import Data.Maybe (Maybe(..))
98
import Halogen (ClassName(..))
109
import Halogen as H
1110
import Halogen.HTML as HH
@@ -41,7 +40,7 @@ testHtml = """<div class="main" id="zero">
4140
</div>
4241
"""
4342

44-
component :: forall m. H.Component HH.HTML (Const Void) Unit Void m
43+
component :: forall m. H.Component (Const Void) Unit Void m
4544
component =
4645
H.mkComponent
4746
{ initialState: const initialState
@@ -65,7 +64,7 @@ component =
6564
]
6665
, HH.section []
6766
[ HH.label_ [ HH.text "HTML input:"]
68-
, HH.textarea [ HP.value state.raw, HE.onValueChange (Just <<< ParseInput) ]
67+
, HH.textarea [ HP.value state.raw, HE.onValueChange ParseInput ]
6968
]
7069
, HH.section []
7170
[ HH.label_ [ HH.text "Halogen output:"]

‎src/Main.purs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module Main where
22

3-
import Prelude (Unit, bind, discard, unit, void, ($))
3+
import Prelude
44
import Web.HTML (HTMLElement)
55

66
import Component (component)

‎src/Parser/Halogen.purs‎

Lines changed: 22 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,26 @@
11
module Parser.Halogen where
22

3-
import Language.PS.SmartCST
43
import Prelude
54

6-
import Parser.Halogen.Utils
75
import Data.Array as Array
86
import Data.Array.NonEmpty as NonEmptyArray
97
import Data.Either (Either)
108
import Data.Foldable (fold)
119
import Data.List (List)
1210
import Data.Maybe (Maybe(..))
1311
import Data.String as String
14-
import Debug.Trace (spy, trace)
12+
import Data.String.CodeUnits (stripPrefix)
13+
import Data.String.Pattern (Pattern(..))
14+
import Dodo as Dodo
15+
import Language.PS.SmartCST (Declaration(..), Expr(..), Guarded(..), Ident(..), Module(..), ProperName(..), SmartQualifiedName(..), Type(..), TypeVarBinding(..), mkModuleName, printModule)
16+
import Parser.Halogen.Utils (classNameToFunctionName, collectClassNames, exprClassNameConstructor, fromHalogenHH, fromHalogenHP, fromHalogenHPAria, stringToClasses)
1517
import Text.HTML.Parser (Attribute(..), HTML(..), parseHTML)
1618
import Text.Parsing.StringParser (ParseError)
17-
import Unsafe.Coerce (unsafeCoerce)
19+
import Data.String.Extra as Data.String.Extra
1820

1921
toHalogen :: String -> Either ParseError String
2022
toHalogen content = parseHTML content <#> \htmls ->
21-
printModuleToString 80 (outputModule htmls)
23+
Dodo.print Dodo.plainText Dodo.twoSpaces $ printModule $ outputModule htmls
2224

2325
outputModule :: List HTML -> Module
2426
outputModule htmls =
@@ -101,10 +103,21 @@ renderTree =
101103
(ExprIdent (fromHalogenHP (Ident "classes")))
102104
`ExprApp`
103105
(ExprArray $ names' <#> (\name -> ExprVar (Ident (classNameToFunctionName name))))
104-
Attribute key val -> Array.singleton $
105-
(ExprIdent (fromHalogenHP (Ident key)))
106-
`ExprApp`
107-
(ExprString val)
106+
Attribute key val ->
107+
let
108+
name =
109+
case stripPrefix (Pattern "aria-") key of
110+
Nothing ->
111+
let
112+
appendUnderscore = Array.elem key ["id"]
113+
key' = if appendUnderscore then key <> "_" else key
114+
in fromHalogenHP (Ident key')
115+
Just key' -> fromHalogenHPAria $ Ident $ Data.String.Extra.camelCase key'
116+
in
117+
Array.singleton $
118+
(ExprIdent name)
119+
`ExprApp`
120+
(ExprString val)
108121

109122
renderHtml :: HTML -> Array Expr
110123
renderHtml =

‎src/Parser/Halogen/Utils.purs‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,26 @@
11
module Parser.Halogen.Utils where
22

3-
import Language.PS.SmartCST
3+
import Language.PS.SmartCST (Expr(..), ProperName(..), SmartQualifiedName(..), SmartQualifiedNameConstructor(..), mkModuleName)
44
import Prelude
55

66
import Data.Array as Array
77
import Data.Array.NonEmpty as NonEmptyArray
8-
import Data.Either (Either)
98
import Data.Foldable (fold)
109
import Data.List (List)
11-
import Data.Maybe (Maybe(..))
12-
import Data.String as String
13-
import Debug.Trace (spy, trace)
14-
import Text.HTML.Parser (Attribute(..), HTML(..), parseHTML)
15-
import Text.Parsing.StringParser (ParseError)
16-
import Unsafe.Coerce (unsafeCoerce)
17-
import Data.String.Common as String
10+
import Data.String (Pattern(..), Replacement(..)) as String
11+
import Text.HTML.Parser (Attribute(..), HTML(..))
12+
import Data.String.Common (null, replaceAll, split) as String
1813

1914
fromHalogenHH :: forall a. a -> SmartQualifiedName a
2015
fromHalogenHH = SmartQualifiedName__Custom (mkModuleName $ NonEmptyArray.cons' "Halogen" ["HTML"]) (mkModuleName $ NonEmptyArray.cons' "HH" [])
2116

2217
fromHalogenHP :: forall a. a -> SmartQualifiedName a
2318
fromHalogenHP = SmartQualifiedName__Custom (mkModuleName $ NonEmptyArray.cons' "Halogen" ["HTML", "Properties"]) (mkModuleName $ NonEmptyArray.cons' "HP" [])
2419

20+
fromHalogenHPAria :: forall a. a -> SmartQualifiedName a
21+
fromHalogenHPAria = SmartQualifiedName__Custom (mkModuleName $ NonEmptyArray.cons' "Halogen" ["HTML", "Properties", "ARIA"]) (mkModuleName $ NonEmptyArray.cons' "HP" ["ARIA"])
22+
23+
exprClassNameConstructor :: Expr
2524
exprClassNameConstructor = ExprConstructor $
2625
SmartQualifiedNameConstructor__Simple
2726
(mkModuleName $ NonEmptyArray.cons' "Halogen" ["HTML"])

0 commit comments

Comments
 (0)