Merge pull request #19 from purescript-contrib/updates

Updates for PureScript 0.11

Author: garyb

.eslintrc.json

@@ -0,0 +1,28 @@
+{
+  "parserOptions": {
+    "ecmaVersion": 5
+  },
+  "extends": "eslint:recommended",
+  "env": {
+    "commonjs": true
+  },
+  "rules": {
+    "strict": [2, "global"],
+    "block-scoped-var": 2,
+    "consistent-return": 2,
+    "eqeqeq": [2, "smart"],
+    "guard-for-in": 2,
+    "no-caller": 2,
+    "no-extend-native": 2,
+    "no-loop-func": 2,
+    "no-new": 2,
+    "no-param-reassign": 2,
+    "no-return-assign": 2,
+    "no-unused-expressions": 2,
+    "no-use-before-define": 2,
+    "radix": [2, "always"],
+    "indent": [2, 2],
+    "quotes": [2, "double"],
+    "semi": [2, "always"]
+  }
+}

.gitignore

@@ -1,7 +1,6 @@
 /.*
 !/.gitignore
-!/.jscsrc
-!/.jshintrc
+!/.eslintrc.json
 !/.travis.yml
 /bower_components/
 /node_modules/

.jscsrc

@@ -1,7 +1,7 @@
 language: node_js
 dist: trusty
 sudo: required
-node_js: 6
+node_js: stable
 install:
   - npm install -g bower
   - npm install

.jshintrc

@@ -1,12 +1,13 @@
 {
   "name": "purescript-argonaut-core",
   "homepage": "https://github.com/purescript-contrib/purescript-argonaut-core",
+  "description": "Core of the purescript-argonaut library, providing basic types, folds, and combinators for `Json`",
+  "license": "MIT",
   "authors": [
     "Maxim Zimaliev <[email protected]>",
     "Hardy Jones <>",
     "John A. De Goes <[email protected]>"
   ],
-  "description": "Core of the purescript-argonaut library, providing basic types, folds, and combinators for `Json`",
   "keywords": [
     "purescript",
     "argonaut",
@@ -16,13 +17,22 @@
     "type": "git",
     "url": "git://github.com/purescript-contrib/purescript-argonaut-core.git"
   },
-  "license": "MIT",
+  "ignore": [
+    "**/.*",
+    "bower_components",
+    "node_modules",
+    "output",
+    "test",
+    "bower.json",
+    "package.json"
+  ],
   "dependencies": {
-    "purescript-enums": "^2.0.0",
-    "purescript-functions": "^2.0.0",
-    "purescript-maps": "^2.0.0"
+    "purescript-enums": "^3.0.0",
+    "purescript-functions": "^3.0.0",
+    "purescript-gen": "^1.0.0",
+    "purescript-maps": "^3.0.0"
   },
   "devDependencies": {
-    "purescript-strongcheck": "^2.0.0"
+    "purescript-strongcheck": "^3.1.0"
   }
 }

.travis.yml

@@ -2,15 +2,14 @@
   "private": true,
   "scripts": {
     "clean": "rimraf output && rimraf .pulp-cache",
-    "build": "jshint src && jscs src && pulp build --censor-lib --strict",
+    "build": "eslint src && pulp build -- --censor-lib --strict",
     "test": "pulp test"
   },
   "devDependencies": {
-    "jscs": "^3.0.7",
-    "jshint": "^2.9.3",
-    "pulp": "^9.0.1",
-    "purescript-psa": "^0.3.9",
-    "purescript": "^0.10.1",
-    "rimraf": "^2.5.4"
+    "eslint": "^3.19.0",
+    "pulp": "^11.0.0",
+    "purescript-psa": "^0.5.0",
+    "purescript": "^0.11.1",
+    "rimraf": "^2.6.1"
   }
 }

bower.json

@@ -2,14 +2,14 @@
 -- | manipulating JSON values. The README contains additional documentation
 -- | for this module.
 module Data.Argonaut.Core
-  ( Json(..)
-  , JNull(..)
-  , JBoolean(..)
-  , JNumber(..)
-  , JString(..)
-  , JAssoc(..)
-  , JArray(..)
-  , JObject(..)
+  ( Json
+  , JNull
+  , JBoolean
+  , JNumber
+  , JString
+  , JAssoc
+  , JArray
+  , JObject
   , foldJson
   , foldJsonNull
   , foldJsonBoolean
@@ -36,9 +36,10 @@ module Data.Argonaut.Core
   , toArray
   , toObject
   , jsonNull
-  , jsonFalse
   , jsonTrue
+  , jsonFalse
   , jsonZero
+  , jsonEmptyString
   , jsonEmptyArray
   , jsonSingletonArray
   , jsonEmptyObject
@@ -80,12 +81,12 @@ type JAssoc = Tuple String Json
 -- | The type of null values inside JSON data. There is exactly one value of
 -- | this type: in JavaScript, it is written `null`. This module exports this
 -- | value as `jsonNull`.
-foreign import data JNull :: *
+foreign import data JNull :: Type
 
 -- | The type of JSON data. The underlying representation is the same as what
 -- | would be returned from JavaScript's `JSON.parse` function; that is,
 -- | ordinary JavaScript booleans, strings, arrays, objects, etc.
-foreign import data Json :: *
+foreign import data Json :: Type
 
 -- | Case analysis for `Json` values. See the README for more information.
 foldJson

package.json

@@ -0,0 +1,56 @@
+module Data.Argonaut.Gen where
+
+import Prelude
+
+import Control.Lazy (class Lazy, defer)
+import Control.Monad.Gen (class MonadGen)
+import Control.Monad.Gen as Gen
+import Control.Monad.Rec.Class (class MonadRec)
+
+import Data.Argonaut.Core as J
+import Data.Array as A
+import Data.Char as C
+import Data.NonEmpty ((:|))
+import Data.String as S
+import Data.StrMap as SM
+
+genJson :: forall m. MonadGen m => MonadRec m => Lazy (m J.Json) => m J.Json
+genJson = Gen.resize (min 10) $ Gen.sized genJson'
+  where
+  genJson' :: Int -> m J.Json
+  genJson' size
+    | size > 1 = Gen.resize (_ - 1) (Gen.choose genJArray genJObject)
+    | otherwise = genLeaf
+
+  genLeaf :: m J.Json
+  genLeaf = Gen.oneOf $ pure J.jsonNull :| [ genJBoolean, genJNumber, genJString]
+
+  genJArray :: m J.Json
+  genJArray = J.fromArray <$> Gen.unfoldable (defer \_ -> genJson)
+
+  genJObject :: m J.Json
+  genJObject = A.foldM extendJObj J.jsonEmptyObject =<< Gen.unfoldable genString
+
+  extendJObj :: J.Json -> String -> m J.Json
+  extendJObj obj k = do
+    v <- genJson
+    pure $
+      J.foldJsonObject
+        (J.jsonSingletonObject k v)
+        (J.fromObject <<< SM.insert k v)
+        obj
+
+  genJBoolean :: m J.Json
+  genJBoolean = J.fromBoolean <$> Gen.chooseBool
+
+  genJNumber :: m J.Json
+  genJNumber = J.fromNumber <$> Gen.chooseFloat (-1000000.0) 1000000.0
+
+  genJString :: m J.Json
+  genJString = J.fromString <$> genString
+
+  genString :: m String
+  genString = S.fromCharArray <$> Gen.unfoldable genChar
+
+  genChar :: m Char
+  genChar = C.fromCharCode <$> Gen.chooseInt 0 65535