Update Pathy and URI

bower.json

@@ -25,10 +25,13 @@
     "purescript-nonempty": "^4.1.1",
     "purescript-numbers": "^5.0.0",
     "purescript-oidc-crypt-utils": "^7.0.1",
-    "purescript-pathy": "^4.1.0",
-    "purescript-uri": "^4.2.3",
-    "purescript-sql-squared": "^0.10.0",
-    "purescript-const": "^3.2.0"
+    "purescript-pathy": "safareli/purescript-pathy#refactor",
+    "purescript-string-parsers": "^3.0.0",
+    "purescript-strings": "^3.5.0",
+    "purescript-uri": "garyb/purescript-uri#next",
+    "purescript-sql-squared": "safareli/purescript-sql-squared#pathy",
+    "purescript-const": "^3.2.0",
+    "purescript-codec": "^2.1.0"
   },
   "devDependencies": {
     "purescript-assert": "^3.0.0",
@@ -39,5 +42,8 @@
     "purescript-quickcheck": "^4.6.1",
     "purescript-quasar-test-starter": "slamdata/quasar-test-starter#^1.0.0",
     "purescript-quickcheck-laws": "^3.0.1"
+  },
+  "resolutions": {
+    "purescript-pathy": "refactor"
   }
 }

src/Quasar/Advanced/Paths.purs

@@ -16,31 +16,37 @@ limitations under the License.
 
 module Quasar.Advanced.Paths where
 
-import Data.Path.Pathy (RelDir, RelFile, Sandboxed, file, dir, (</>))
+import Pathy (RelDir, RelFile, dir, file, (</>))
+import Data.Symbol (SProxy(..))
 
-oidcProviders ∷ RelFile Sandboxed
-oidcProviders = dir "security" </> dir "oidc" </> file "providers"
+oidcProviders ∷ RelFile
+oidcProviders = dir (SProxy :: SProxy "security") </> dir (SProxy :: SProxy "oidc") </> file (SProxy :: SProxy "providers")
 
-token ∷ RelDir Sandboxed
-token = dir "security" </> dir "token"
+token ∷ RelDir
+token = dir (SProxy :: SProxy "security") </> dir (SProxy :: SProxy "token")
 
-group ∷ RelDir Sandboxed
-group = dir "security" </> dir "group"
+group ∷ RelDir
+group = dir (SProxy :: SProxy "security") </> dir (SProxy :: SProxy "group")
 
-permission ∷ RelDir Sandboxed
-permission = dir "security" </> dir "permission"
+permission ∷ RelDir
+permission = dir (SProxy :: SProxy "security") </> dir (SProxy :: SProxy "permission")
 
-authority ∷ RelDir Sandboxed
-authority = dir "security" </> dir "authority"
+children ∷ RelFile
+children = file (SProxy :: SProxy "children")
 
-licenseInfo ∷ RelFile Sandboxed
-licenseInfo = dir "server" </> file "licenseInfo"
+authority ∷ RelDir
+authority = dir (SProxy :: SProxy "security") </> dir (SProxy :: SProxy "authority")
 
-licensee ∷ RelFile Sandboxed
-licensee = dir "server" </> file "licensee"
+licenseInfo ∷ RelFile
+licenseInfo = dir (SProxy :: SProxy "server") </> file (SProxy :: SProxy "licenseInfo")
+
+licensee ∷ RelFile
+licensee = dir (SProxy :: SProxy "server") </> file (SProxy :: SProxy "licensee")
+
+pdfInfo ∷ RelFile
+pdfInfo = dir (SProxy :: SProxy "service") </> dir (SProxy :: SProxy "pdf") </> file (SProxy :: SProxy "info")
+
+generatePdf ∷ RelFile
+generatePdf = dir (SProxy :: SProxy "service") </> dir (SProxy :: SProxy "pdf") </> file (SProxy :: SProxy "generate")
 
-pdfInfo ∷ RelFile Sandboxed
-pdfInfo = dir "service" </> dir "pdf" </> file "info"
 
-generatePdf ∷ RelFile Sandboxed
-generatePdf = dir "service" </> dir "pdf" </> file "generate"

src/Quasar/Advanced/QuasarAF.purs

@@ -30,6 +30,7 @@ import Data.Foldable (class Foldable, foldMap)
 import Data.Functor.Coproduct (Coproduct, left, right)
 import Data.Maybe (Maybe(..))
 import Data.Time.Duration (Seconds)
+import Pathy (AbsDir, AbsFile, AbsPath)
 import Quasar.Advanced.Types as QA
 import Quasar.Data (QData)
 import Quasar.Data.Json (PrecisionMode(..))
@@ -42,7 +43,7 @@ import Quasar.Mount.View as View
 import Quasar.QuasarF (QuasarF(..))
 import Quasar.Query.OutputMeta (OutputMeta)
 import Quasar.ServerInfo (ServerInfo)
-import Quasar.Types (AnyPath, FilePath, DirPath, Pagination, Vars, CompileResultR)
+import Quasar.Types (Pagination, Vars, CompileResultR)
 import SqlSquared (SqlQuery)
 
 data QuasarAF a
@@ -81,7 +82,7 @@ serverInfo =
 
 readQuery
   ∷ PrecisionMode
-  → DirPath
+  → AbsDir
   → SqlQuery
   → Vars
   → Maybe Pagination
@@ -90,7 +91,7 @@ readQuery mode path sql vars pagination =
   left $ ReadQuery mode path sql vars pagination id
 
 readQueryEJson
-  ∷ DirPath
+  ∷ AbsDir
   → SqlQuery
   → Vars
   → Maybe Pagination
@@ -99,114 +100,114 @@ readQueryEJson path sql vars pagination =
   readQuery Precise path sql vars pagination <#> resultsAsEJson
 
 writeQuery
-  ∷ DirPath
-  → FilePath
+  ∷ AbsDir
+  → AbsFile
   → SqlQuery
   → Vars
   → QuasarAFCE OutputMeta
 writeQuery path file sql vars =
   left $ WriteQuery path file sql vars id
 
 compileQuery
-  ∷ DirPath
+  ∷ AbsDir
   → SqlQuery
   → Vars
   → QuasarAFCE CompileResultR
 compileQuery path sql vars =
   left $ CompileQuery path sql vars id
 
 fileMetadata
-  ∷ FilePath
+  ∷ AbsFile
   → QuasarAFCE Unit
 fileMetadata path =
   left $ FileMetadata path id
 
 dirMetadata
-  ∷ DirPath
+  ∷ AbsDir
   → Maybe Pagination
   → QuasarAFCE (Array QResource)
 dirMetadata path pagination =
   left $ DirMetadata path pagination id
 
 readFile
   ∷ PrecisionMode
-  → FilePath
+  → AbsFile
   → Maybe Pagination
   → QuasarAFCE JArray
 readFile mode path pagination =
   left $ ReadFile mode path pagination id
 
 readFileEJson
-  ∷ FilePath
+  ∷ AbsFile
   → Maybe Pagination
   → QuasarAFCE (Array EJson)
 readFileEJson path pagination =
   readFile Precise path pagination <#> resultsAsEJson
 
 writeFile
-  ∷ FilePath
+  ∷ AbsFile
   → QData
   → QuasarAFCE Unit
 writeFile path content =
   left $ WriteFile path content id
 
 writeDir
-  ∷ DirPath
+  ∷ AbsDir
   → Blob
   → QuasarAFCE Unit
 writeDir path content =
   left $ WriteDir path content id
 
 appendFile
-  ∷ FilePath
+  ∷ AbsFile
   → QData
   → QuasarAFCE Unit
 appendFile path content =
   left $ AppendFile path content id
 
 deleteData
-  ∷ AnyPath
+  ∷ AbsPath
   → QuasarAFCE Unit
 deleteData path =
   left $ DeleteData path id
 
 moveData
-  ∷ AnyPath
-  → AnyPath
+  ∷ AbsPath
+  → AbsPath
   → QuasarAFCE Unit
 moveData from to =
   left $ MoveData from to id
 
 getMount
-  ∷ AnyPath
+  ∷ AbsPath
   → QuasarAFCE MountConfig
 getMount path =
   left $ GetMount path id
 
 createMount
-  ∷ AnyPath
+  ∷ AbsPath
   → MountConfig
   → QuasarAFCE Unit
 createMount path config =
   left $ CreateMount path config Nothing id
 
 updateMount
-  ∷ AnyPath
+  ∷ AbsPath
   → MountConfig
   → QuasarAFCE Unit
 updateMount path config =
   left $ UpdateMount path config Nothing id
 
 createCachedView
-  ∷ AnyPath
+  ∷ AbsPath
   → View.Config
   → Seconds
   → QuasarAFCE Unit
 createCachedView path config maxAge =
   left $ CreateMount path (ViewConfig config) (Just maxAge) id
 
 updateCachedView
-  ∷ AnyPath
+  ∷ AbsPath
   → View.Config
   → Seconds
   → QuasarAFCE Unit

src/Quasar/Advanced/QuasarAF/Interpreter/Affjax.purs

@@ -32,25 +32,24 @@ import Data.Either (Either(..))
 import Data.Foldable (foldMap)
 import Data.Functor.Coproduct (Coproduct, left, right, coproduct)
 import Data.HTTP.Method (Method(..))
-import Data.List as List
 import Data.Maybe (Maybe(..), maybe)
 import Data.Monoid (mempty)
-import Data.Path.Pathy ((</>))
-import Data.Path.Pathy as Pt
 import Data.String as Str
 import Data.Tuple (Tuple(..), snd)
-import Data.URI as URI
 import Network.HTTP.Affjax as AX
 import Network.HTTP.Affjax.Request (RequestContent, toRequest)
 import Network.HTTP.AffjaxF as AXF
 import Network.HTTP.RequestHeader as Req
 import OIDC.Crypt.Types as OIDC
+import Pathy (Name(..), (</>))
+import Pathy as Pt
 import Quasar.Advanced.Paths as Paths
 import Quasar.Advanced.QuasarAF (QuasarAFC, QuasarAF(..))
 import Quasar.Advanced.QuasarAF.Interpreter.Config (Config)
 import Quasar.Advanced.QuasarAF.Interpreter.Internal (mkGroupUrl)
 import Quasar.Advanced.Types as Qa
 import Quasar.ConfigF as CF
+import Quasar.Data.URI as URI
 import Quasar.Error (QResponse)
 import Quasar.QuasarF.Interpreter.Affjax as QCI
 import Quasar.QuasarF.Interpreter.Internal (ask, defaultRequest, jsonResult, mkRequest, mkUrl, unitResult)
@@ -120,15 +119,15 @@ evalQuasarAdvanced (AuthorityList k) = do
 evalQuasarAdvanced (PermissionInfo pid k) = do
   config ← ask
   url ← mkUrl
-    (Right (Paths.permission </> Pt.file (Qa.runPermissionId pid)))
-    (URI.Query (List.singleton (Tuple "transitive" Nothing)))
+    (Right (Paths.permission </> Pt.file' (Name $ Qa.runPermissionId pid)))
+    (URI.QueryPairs [Tuple "transitive" Nothing])
   map k
     $ mkAuthedRequest (jsonResult >>> map Qa.runPermission)
     $ _{ url = url }
 evalQuasarAdvanced (PermissionChildren pid isTransitive k) = do
   config ← ask
   url ← mkUrl
-    (Right (Paths.permission </> Pt.dir (Qa.runPermissionId pid) </> Pt.file "children"))
+    (Right (Paths.permission </> Pt.dir' (Name $ Qa.runPermissionId pid) </> Paths.children ))
     (transitiveQuery isTransitive)
   map k
     $ mkAuthedRequest (jsonResult >>> map (map Qa.runPermission))
@@ -145,7 +144,7 @@ evalQuasarAdvanced (SharePermission req k) = do
 evalQuasarAdvanced (DeletePermission pid k) = do
   config ← ask
   url ← mkUrl
-    (Right (Paths.permission </> Pt.file (Qa.runPermissionId pid)))
+    (Right (Paths.permission </> Pt.file' (Name $ Qa.runPermissionId pid)))
     mempty
   map k
     $ mkAuthedRequest unitResult
@@ -161,7 +160,7 @@ evalQuasarAdvanced (TokenList k) = do
 evalQuasarAdvanced (TokenInfo tid k) = do
   config ← ask
   url ← mkUrl
-    (Right (Paths.token </> Pt.file (Qa.runTokenId tid)))
+    (Right (Paths.token </> Pt.file' (Name $ Qa.runTokenId tid)))
     mempty
   map k
     $ mkAuthedRequest (jsonResult >>> map Qa.runToken)
@@ -181,7 +180,7 @@ evalQuasarAdvanced (CreateToken mbName actions k) = do
        }
 evalQuasarAdvanced (UpdateToken tid actions k) = do
   config ← ask
-  url ← mkUrl (Right (Paths.token </> Pt.file (Qa.runTokenId tid))) mempty
+  url ← mkUrl (Right (Paths.token </> Pt.file' (Name $ Qa.runTokenId tid))) mempty
   map k
     $ mkAuthedRequest (jsonResult >>> map Qa.runToken)
     $ _{ url = url
@@ -194,7 +193,7 @@ evalQuasarAdvanced (UpdateToken tid actions k) = do
 evalQuasarAdvanced (DeleteToken tid k) = do
   config ← ask
   url ← mkUrl
-    (Right (Paths.token </> Pt.file (Qa.runTokenId tid)))
+    (Right (Paths.token </> Pt.file' (Name $ Qa.runTokenId tid)))
     mempty
   map k
     $ mkAuthedRequest unitResult
@@ -226,9 +225,9 @@ evalQuasarAdvanced (PDFInfo k) = do
     $ mkAuthedRequest (const (Right unit))
     $ _{ url = url  }
 
-transitiveQuery ∷ Boolean → URI.Query
+transitiveQuery ∷ Boolean → URI.QQuery
 transitiveQuery b =
-  if b then URI.Query (List.singleton (Tuple "transitive" Nothing)) else mempty
+  if b then URI.QueryPairs [Tuple "transitive" Nothing] else mempty
 
 mkAuthedRequest
   ∷ ∀ a r

src/Quasar/Advanced/QuasarAF/Interpreter/Internal.purs

@@ -22,9 +22,9 @@ import Control.Monad.Free (Free)
 import Data.Either (Either(..))
 import Data.Functor.Coproduct (Coproduct)
 import Data.Maybe (Maybe(..))
-import Data.Path.Pathy (rootDir)
+import Pathy (rootDir)
 import Data.String as String
-import Data.URI as URI
+import Quasar.Data.URI as URI
 import Network.HTTP.Affjax.Request (RequestContent)
 import Network.HTTP.AffjaxF as AXF
 import Quasar.Advanced.Paths as Paths
@@ -38,7 +38,7 @@ type AXFP = AXF.AffjaxFP RequestContent String
 mkGroupUrl
   ∷ ∀ r
   . GroupPath
-  → URI.Query
+  → URI.QQuery
   → Free (Coproduct (CF.ConfigF (Config r)) AXFP) String
 mkGroupUrl (GroupPath gp) q = do
   url ← mkFSUrl Paths.group (Left gp) q