[spago] spago@next

nix/easy-ps.nix

@@ -5,8 +5,8 @@ import
     pkgs.fetchFromGitHub {
       owner = "justinwoo";
       repo = "easy-purescript-nix";
-      rev = "11d3bd58ce6e32703bf69cec04dc7c38eabe14ba";
-      sha256 = "tESal32bcqqdZO+aKnBzc1GoL2mtnaDtj2y7ociCRGA=";
+      rev = "117fd96acb69d7d1727df95b6fde9d8715e031fc";
+      sha256 = "lcIRIOFCdIWEGyKyG/tB4KvxM9zoWuBRDxW+T+mvIb0=";
     }
   ) {
   inherit pkgs;

package.json

@@ -63,6 +63,7 @@
         "react-tooltip": "^4.2.8",
         "secp256k1": "^4.0.2",
         "sigma": "^2.4.0",
+        "spago": "^0.93.29",
         "twgl.js": "^5.0.4",
         "uuid": "8.3.2"
     },
@@ -75,7 +76,6 @@
         "react-testing-library": "^8.0.1",
         "sass": "^1.35.2",
         "serve": "^12.0.0",
-        "spago": "^0.20.9",
         "ssl-serve": "^6.5.8",
         "taiko": "latest",
         "vscode-languageserver": "^7.0.0",

packages.dhall

-let upstream =
-      https://github.com/garganscript/package-sets/releases/download/v0.1.7/release.dhall
-        sha256:52886309e1f0158a85427f80c1e3d47ce747c5f14fcec671a81fe5c2c711a6db
-
-let overrides =
-      { graphql-client =
-        { dependencies =
-          [ "aff"
-          , "aff-promise"
-          , "affjax"
-          , "affjax-node"
-          , "affjax-web"
-          , "argonaut-codecs"
-          , "argonaut-core"
-          , "arrays"
-          , "bifunctors"
-          , "control"
-          , "datetime"
-          , "debug"
-          , "effect"
-          , "either"
-          , "enums"
-          , "exceptions"
-          , "foldable-traversable"
-          , "foreign"
-          , "foreign-object"
-          , "functions"
-          , "halogen-subscriptions"
-          , "heterogeneous"
-          , "http-methods"
-          , "integers"
-          , "lists"
-          , "maybe"
-          , "media-types"
-          , "newtype"
-          , "node-buffer"
-          , "node-fs"
-          , "nullable"
-          , "numbers"
-          , "ordered-collections"
-          , "parsing"
-          , "prelude"
-          , "profunctor"
-          , "profunctor-lenses"
-          , "psci-support"
-          , "quickcheck"
-          , "record"
-          , "spec"
-          , "spec-discovery"
-          , "string-parsers"
-          , "strings"
-          , "strings-extra"
-          , "transformers"
-          , "tuples"
-          , "unicode"
-          , "unsafe-coerce"
-          , "variant"
-          ]
-        , repo =
-            "https://github.com/OxfordAbstracts/purescript-graphql-client.git"
-        , version = "v9.2.2"
-        }
-      , jest =
-        { dependencies =
-          [ "aff"
-          , "aff-promise"
-          , "effect"
-          , "foldable-traversable"
-          , "prelude"
-          , "psci-support"
-          ]
-        , repo = "https://github.com/nonbili/purescript-jest"
-        , version = "018543987af27db6a3842048b6b3f5ec47609087"
-        }
-      , markdown-it =
-        { dependencies =
-          [ "effect"
-          , "foldable-traversable"
-          , "foreign"
-          , "jest"
-          , "options"
-          , "prelude"
-          , "tuples"
-          ]
-        , repo = "https://github.com/nonbili/purescript-markdown-it"
-        , version = "f6e8ee91298f2fc13c4277e75a19e0538de5f7a2"
-        }
-      , record-extra =
-        { dependencies =
-          [ "arrays"
-          , "effect"
-          , "functions"
-          , "lists"
-          , "maybe"
-          , "prelude"
-          , "record"
-          , "test-unit"
-          , "tuples"
-          , "typelevel-prelude"
-          ]
-        , repo = "https://github.com/justinwoo/purescript-record-extra"
-        , version = "v5.0.1"
-        }
-      }
-
-let additions =
-      { convertable-options =
-        { dependencies = [ "console", "effect", "maybe", "record" ]
-        , repo = "https://github.com/natefaubion/purescript-convertable-options"
-        , version = "v1.0.0"
-        }
-      , data-default =
-        { dependencies =
-          [ "assert", "lists", "maybe", "record", "effect", "prelude" ]
-        , repo = "https://github.com/thought2/purescript-data-default"
-        , version = "350e600a5a022c9599865a2dd14196b442f59bcc"
-        }
-      , dom-filereader =
-        { dependencies = [ "aff", "arraybuffer-types", "web-file", "web-html" ]
-        , repo = "https://github.com/nwolverson/purescript-dom-filereader"
-        , version = "v5.0.0"
-        }
-      , sequences =
-        { dependencies =
-          [ "arrays"
-          , "assert"
-          , "console"
-          , "control"
-          , "effect"
-          , "lazy"
-          , "maybe"
-          , "newtype"
-          , "nonempty"
-          , "partial"
-          , "prelude"
-          , "profunctor"
-          , "psci-support"
-          , "tuples"
-          , "unfoldable"
-          , "unsafe-coerce"
-          ]
-        , repo = "https://github.com/garganscript/purescript-sequences.git"
-        , version = "recursion-fix"
-        }
-      , read =
-        { dependencies = [ "prelude", "maybe", "strings" ]
-        , repo = "https://github.com/truqu/purescript-read"
-        , version = "v1.0.1"
-        }
-      , simple-json-generics =
-        { dependencies =
-          [ "assert"
-          , "control"
-          , "effect"
-          , "either"
-          , "foreign"
-          , "partial"
-          , "prelude"
-          , "simple-json"
-          , "transformers"
-          , "typelevel-prelude"
-          ]
-        , repo =
-            "https://github.com/garganscript/purescript-simple-json-generics"
-        , version = "master"
-        }
-      , spec-discovery =
-        { dependencies = [ "prelude", "effect", "arrays", "spec", "node-fs" ]
-        , repo = "https://github.com/purescript-spec/purescript-spec-discovery"
-        , version = "v8.0.0"
-        }
-      , spec-quickcheck =
-        { dependencies = [ "prelude", "aff", "random", "quickcheck", "spec" ]
-        , repo = "https://github.com/purescript-spec/purescript-spec-quickcheck"
-        , version = "v3.1.0"
-        }
-      , string-search =
-        { dependencies =
-          [ "arrays"
-          , "enums"
-          , "foldable-traversable"
-          , "int64"
-          , "integers"
-          , "lists"
-          , "maybe"
-          , "ordered-collections"
-          , "partial"
-          , "prelude"
-          , "strings"
-          , "tuples"
-          , "uint"
-          ]
-        , repo =
-            "https://gitlab.iscpif.fr/gargantext/purescript-string-search.git"
-        , version = "v0.1.6"
-        }
-      , tuples-native =
-        { dependencies =
-          [ "console"
-          , "effect"
-          , "functions"
-          , "prelude"
-          , "tuples"
-          , "typelevel"
-          , "typelevel-prelude"
-          ]
-        , repo = "https://github.com/garganscript/purescript-tuples-native"
-        , version = "v2.3.0"
-        }
-      , versions =
-        { dependencies = [ "prelude" ]
-        , repo = "https://github.com/hdgarrood/purescript-versions.git"
-        , version = "v6.0.0"
-        }
-      , web-url =
-        { dependencies = [ "prelude" ]
-        , repo = "https://github.com/mjepronk/purescript-web-url"
-        , version = "v2.0.0"
-        }
-      }
-
-in  upstream // overrides // additions

shell.nix

@@ -133,21 +133,13 @@ let
 in
 pkgs.mkShell {
   buildInputs = [
-    easy-ps.purs-0_15_7
+    easy-ps.purs-0_15_15
+    easy-ps.spago
     easy-ps.psc-package
     easy-ps.dhall-json-simple
     easy-ps.zephyr
-    browserify
-    browserify-zephyr
-    build-css
-    build-purs
-    build-suggestions
-    build-watch
-    build-zephyr
-    build
     pkgs.ijq
     pkgs.jq
-    minify-bundle
     #pkgs.closurecompiler
     pkgs.esbuild
     pkgs.minify
@@ -155,11 +147,22 @@ pkgs.mkShell {
     #pkgs.nodePackages.purescript-language-server
     #pkgs.python  # needed for msgpack etc
     #nodejs_20_3_1
-    repl
-    serve
     pkgs.pulp
-    pkgs.spago
+    #pkgs.spago
     pkgs.yarn
+
+    # scripts
+    browserify
+    browserify-zephyr
+    build-css
+    build-purs
+    build-suggestions
+    build-watch
+    build-zephyr
+    build
+    minify-bundle
+    repl
+    serve
     test-ps
   ];
 

spago.dhall

-{-
-Welcome to a Spago project!
-You can edit this file as you like.
-
-Need help? See the following resources:
-- Spago documentation: https://github.com/purescript/spago
-- Dhall language tour: https://docs.dhall-lang.org/tutorials/Language-Tour.html
-
-When creating a new Spago project, you can use
-`spago init --no-comments` or `spago init -C`
-to generate this file without the comments in this block.
--}
-{ name = "gargantext"
-, dependencies =
-  [ "aff"
-  , "aff-promise"
-  , "affjax"
-  , "affjax-web"
-  , "argonaut"
-  , "argonaut-codecs"
-  , "argonaut-core"
-  , "arraybuffer-types"
-  , "arrays"
-  , "bifunctors"
-  , "colors"
-  , "console"
-  , "control"
-  , "convertable-options"
-  , "css"
-  , "d3"
-  , "data-default"
-  , "datetime"
-  , "debug"
-  , "dom-filereader"
-  , "dom-simple"
-  , "effect"
-  , "either"
-  , "enums"
-  , "exceptions"
-  , "ffi-simple"
-  , "foldable-traversable"
-  , "foreign"
-  , "foreign-object"
-  , "form-urlencoded"
-  , "formatters"
-  , "functions"
-  , "graphql-client"
-  , "heterogeneous"
-  , "http-methods"
-  , "integers"
-  , "js-timers"
-  , "lists"
-  , "markdown-it"
-  , "maybe"
-  , "media-types"
-  , "milkis"
-  , "newtype"
-  , "nonempty"
-  , "now"
-  , "nullable"
-  , "numbers"
-  , "ordered-collections"
-  , "orders"
-  , "parallel"
-  , "partial"
-  , "prelude"
-  , "profunctor-lenses"
-  , "psci-support"
-  , "random"
-  , "react"
-  , "reactix"
-  , "record"
-  , "record-extra"
-  , "routing"
-  , "sequences"
-  , "simple-json"
-  , "simple-json-generics"
-  , "string-search"
-  , "strings"
-  , "strings-extra"
-  , "stringutils"
-  , "these"
-  , "toestand"
-  , "transformers"
-  , "tuples"
-  , "tuples-native"
-  , "typelevel"
-  , "typelevel-prelude"
-  , "unfoldable"
-  , "unordered-collections"
-  , "unsafe-coerce"
-  , "uri"
-  , "uuid"
-  , "validation"
-  , "web-file"
-  , "web-html"
-  , "web-storage"
-  , "web-url"
-  , "web-xhr"
-  ]
-, packages = ./packages.dhall
-, sources = [ "src/**/*.purs" ]
-}

src/Gargantext/Components/GraphQL.purs

@@ -23,7 +23,6 @@ import Gargantext.Ends (Backend(..))
 import Gargantext.Prelude
 import Gargantext.Sessions (Session(..))
 import Gargantext.Utils.Reactix as R2
-import GraphQL.Client.Args (type (==>))
 import GraphQL.Client.BaseClients.Urql (UrqlClient, createClient)
 import GraphQL.Client.Query (decodeGqlRes) --, mutationJson)
 import GraphQL.Client.SafeQueryName (safeQueryName)
@@ -144,26 +143,26 @@ mutationGql session name q = do
 
 -- Schema
 type Schema
-  = { annuaire_contacts :: { contact_id :: Int } ==> Array AnnuaireContact
-    , context_ngrams :: { context_id :: Int, list_id :: Int } ==> Array String
-    , contexts :: { context_id :: Int, node_id :: Int } ==> Array GQLCTX.NodeContext
-    , contexts_for_ngrams :: { corpus_id :: Int, ngrams_terms :: Array String } ==> Array GQLCTX.Context
-    , imt_schools :: {} ==> Array GQLIMT.School
-    , languages :: {} ==> Array GQLNLP.Language
-    , node_parent :: { node_id :: Int, parent_type :: String } ==> Array GQLNode.Node  -- TODO: parent_type :: NodeType
-    , nodes :: { node_id :: Int } ==> Array GQLNode.Node
-    , nodes_corpus :: { corpus_id :: Int } ==> Array GQLNode.Corpus
-    , user_infos :: { user_id :: Int } ==> Array UserInfo
-    , users :: { user_id :: Int } ==> Array User
-    , team :: { team_node_id :: Int } ==> Team
-    , tree :: { root_id :: Int } ==> TreeFirstLevel
-    , tree_branch :: { node_id :: Int } ==> BreadcrumbInfo
+  = { annuaire_contacts :: { contact_id :: Int } -> Array AnnuaireContact
+    , context_ngrams :: { context_id :: Int, list_id :: Int } -> Array String
+    , contexts :: { context_id :: Int, node_id :: Int } -> Array GQLCTX.NodeContext
+    , contexts_for_ngrams :: { corpus_id :: Int, ngrams_terms :: Array String } -> Array GQLCTX.Context
+    , imt_schools :: {} -> Array GQLIMT.School
+    , languages :: {} -> Array GQLNLP.Language
+    , node_parent :: { node_id :: Int, parent_type :: String } -> Array GQLNode.Node  -- TODO: parent_type :: NodeType
+    , nodes :: { node_id :: Int } -> Array GQLNode.Node
+    , nodes_corpus :: { corpus_id :: Int } -> Array GQLNode.Corpus
+    , user_infos :: { user_id :: Int } -> Array UserInfo
+    , users :: { user_id :: Int } -> Array User
+    , team :: { team_node_id :: Int } -> Team
+    , tree :: { root_id :: Int } -> TreeFirstLevel
+    , tree_branch :: { node_id :: Int } -> BreadcrumbInfo
     }
 
 type Mutation
-  = { update_user_info :: UserInfoM ==> Int
-    , update_user_pubmed_api_key :: UserPubmedAPIKeyM ==> Int
-    , update_user_epo_api_user :: UserEPOAPIUserM ==> Int
-    , update_user_epo_api_token :: UserEPOAPITokenM ==> Int
-    , delete_team_membership :: TeamDeleteM ==> Array Int
-    , update_node_context_category :: GQLCTX.NodeContextCategoryM ==> Array Int }
+  = { update_user_info :: UserInfoM -> Int
+    , update_user_pubmed_api_key :: UserPubmedAPIKeyM -> Int
+    , update_user_epo_api_user :: UserEPOAPIUserM -> Int
+    , update_user_epo_api_token :: UserEPOAPITokenM -> Int
+    , delete_team_membership :: TeamDeleteM -> Array Int
+    , update_node_context_category :: GQLCTX.NodeContextCategoryM -> Array Int }

test.dhall

-let conf = ./spago.dhall
-
-in      conf
-    //  { sources = conf.sources # [ "test/**/*.purs" ]
-        , dependencies =
-            conf.dependencies # [ "spec", "spec-discovery", "spec-quickcheck" ]
-        }