Merge pull request #200 from citizennet/AS-1681/fix-warnings

AS-1681 Remove Compile Warnings

Author: boygao1992

Makefile

@@ -13,9 +13,10 @@ UI_GUIDE_DIR ?= $(ROOT_DIR)/ui-guide
 CLEAN_DEPS :=
 BUILD_DEPS := build-ui
 DEPS := $(BUILD_DIR)/.deps
-FIND_SRC_FILES_ARGS := \( -name '*.purs' -o -name '*.js' \) -type f
+FIND_SRC_FILES_ARGS := -name '*.purs' -type f
 NODE_MODULES := $(ROOT_DIR)/node_modules/.stamp
 PACKAGE_JSON := $(ROOT_DIR)/package.json
+PSA_ARGS ?= --censor-lib --stash=$(BUILD_DIR)/.psa_stash --is-lib=.spago --strict --censor-codes=UserDefinedWarning
 SRC_FILES := $(shell find $(SRC_DIR) $(FIND_SRC_FILES_ARGS))
 TEST_FILES := $(shell find $(TEST_DIR) $(FIND_SRC_FILES_ARGS))
 UI_GUIDE_FILES := $(shell find $(UI_GUIDE_DIR) $(FIND_SRC_FILES_ARGS))
@@ -25,7 +26,7 @@ YARN_LOCK := $(ROOT_DIR)/yarn.lock
 CYAN := \033[0;36m
 RESET := \033[0;0m
 
-YARN := cd $(ROOT_DIR) && yarn
+NPX := cd $(ROOT_DIR) && npx
 
 -include $(ROOT_DIR)/css/Makefile
 
@@ -45,7 +46,7 @@ $(BUILD_DIR)/help: $(BUILD_DIR)/help-unsorted | $(BUILD_DIR)
 	@sort $< > $@
 
 $(BUILD_DIR)/test.js: $(OUTPUT_DIR)/Test.Main/index.js | $(BUILD_DIR)
-	$(YARN) run purs bundle \
+	$(NPX) purs bundle \
 		$(RTS_ARGS) \
 		$(OUTPUT_DIR)/*/*.js \
 		--main Test.Main \
@@ -57,29 +58,29 @@ $(BUILD_DIR)/test.out: $(BUILD_DIR)/test.js
 	mv $@.tmp $@ # Move the output where it belongs.
 
 $(DEPS): packages.dhall spago.dhall $(NODE_MODULES) | $(BUILD_DIR)
-	$(YARN) run spago install $(RTS_ARGS)
-	touch $@
+	$(NPX) spago install $(RTS_ARGS)
+	$(NPX) spago sources | sed -e "s/\(.*\)/'\1'/" | tr '\n' ' ' > $(DEPS)
 
 $(DIST_DIR)/bundled.js: $(OUTPUT_DIR)/Main/index.js
-	$(YARN) run purs bundle \
+	$(NPX) purs bundle \
 		$(RTS_ARGS) \
 		$(OUTPUT_DIR)/*/*.js \
 		--main Main \
 		--module Main \
 		--output $@
 
 $(DIST_DIR)/index.js: $(OUTPUT_DIR)/Main/index.js
-	$(YARN) run browserify dist/main.js --outfile $@
+	$(NPX) browserify dist/main.js --outfile $@
 
 $(NODE_MODULES): $(PACKAGE_JSON) $(YARN_LOCK)
-	$(YARN) install
+	$(NPX) yarn install
 	touch $@
 
-$(OUTPUT_DIR)/Main/index.js: $(SRC_FILES) $(UI_GUIDE_FILES) $(DEPS)
-	$(YARN) run spago build -p "$(UI_GUIDE_DIR)/**/*.purs" -u "$(RTS_ARGS)"
+$(OUTPUT_DIR)/Main/index.js: $(DEPS) $(SRC_FILES) $(UI_GUIDE_FILES)
+	$(NPX) psa $(PSA_ARGS) $(RTS_ARGS) $(shell cat $(DEPS)) $(UI_GUIDE_FILES)
 
-$(OUTPUT_DIR)/Test.Main/index.js: $(SRC_FILES) $(TEST_FILES) $(DEPS)
-	$(YARN) run spago build -p "$(TEST_DIR)/Main.purs $(TEST_DIR)/Test/**/*.purs" -u "$(RTS_ARGS)"
+$(OUTPUT_DIR)/Test.Main/index.js: $(DEPS) $(SRC_FILES) $(TEST_FILES)
+	$(NPX) psa $(PSA_ARGS) $(RTS_ARGS) $(shell cat $(DEPS))
 
 .PHONY: build
 build: $(BUILD_DEPS) ## Build everything — all the CSS, and the UI Guide — installing any missing dependencies along the way

css/Makefile

@@ -13,7 +13,7 @@ DIST_CSS_DEV_SCOPED := $(DIST_DIR)/$(DIST_CSS_FILENAME).scoped.css
 DIST_CSS_PROD_GLOBAL := $(DIST_DIR)/$(DIST_CSS_FILENAME).min.css
 DIST_CSS_PROD_SCOPED := $(DIST_DIR)/$(DIST_CSS_FILENAME).scoped.min.css
 
-CSS_YARN := cd $(CSS_DIR) && yarn
+CSS_NPX := cd $(CSS_DIR) && npx
 
 .DEFAULT_GOAL := build-css
 
@@ -23,20 +23,20 @@ BUILD_DEPS += build-css
 CLEAN_DEPS += clean-css
 
 $(CSS_NODE_MODULES): $(CSS_PACKAGE_JSON) $(CSS_YARN_LOCK)
-	$(CSS_YARN) install
+	$(CSS_NPX) yarn install
 	touch $@
 
 $(DIST_CSS_DEV_GLOBAL): $(CSS_NODE_MODULES) | $(DIST_DIR)
-	$(CSS_YARN) run webpack
+	$(CSS_NPX) webpack
 
 $(DIST_CSS_DEV_SCOPED): $(CSS_NODE_MODULES) | $(DIST_DIR)
-	$(CSS_YARN) run webpack --env=scoped
+	$(CSS_NPX) webpack --env=scoped
 
 $(DIST_CSS_PROD_GLOBAL): $(CSS_NODE_MODULES) | $(DIST_DIR)
-	$(CSS_YARN) run webpack --env=prod
+	$(CSS_NPX) webpack --env=prod
 
 $(DIST_CSS_PROD_SCOPED): $(CSS_NODE_MODULES) | $(DIST_DIR)
-	$(CSS_YARN) run webpack --env=prod,scoped
+	$(CSS_NPX) webpack --env=prod,scoped
 
 $(DIST_DIR):
 	mkdir -p $@
@@ -69,4 +69,4 @@ clean-css: ## Remove all CSS dependencies and build artifacts, starting over wit
 		$(DIST_CSS_DEV_GLOBAL) \
 		$(DIST_CSS_DEV_SCOPED) \
 		$(DIST_CSS_PROD_GLOBAL) \
-		$(DIST_CSS_PROD_SCOPED)
+		$(DIST_CSS_PROD_SCOPED)

package.json

@@ -14,6 +14,7 @@
     "parcel": "1.12.4",
     "parcel-bundler": "1.12.3",
     "purescript": "0.14.3",
+    "purescript-psa": "0.8.2",
     "spago": "^0.15.2"
   },
   "dependencies": {

src/Blocks/Expandable.purs

@@ -26,7 +26,7 @@ instance read :: Read Status where
   read = case _ of
     "collapsed" -> pure Collapsed
     "expanded"  -> pure Expanded
-    otherwise   -> Nothing
+    _   -> Nothing
 
 instance isPropStatus :: IsProp Status where
   toPropValue = propFromString <<< toProp

src/Blocks/Pager.purs

@@ -5,7 +5,6 @@ import Prelude
 import DOM.HTML.Indexed (HTMLdiv)
 import Data.Array ((..))
 import Data.FoldableWithIndex (foldlWithIndex)
-import Data.Maybe (Maybe)
 import Foreign.Object as Foreign.Object
 import Halogen.HTML as HH
 import Halogen.HTML.Core (ClassName(..))
@@ -44,17 +43,17 @@ pager skip last query =
       foldlWithIndex makePagingButtons' [] makeList
 
     makePagingButtons' :: Int -> Array (HH.HTML p i) -> Int -> Array (HH.HTML p i)
-    makePagingButtons' 0 btns btn =
+    makePagingButtons' 0 _ btn =
       (if skip == 1 then [] else [backArrow]) <> [button btn]
     makePagingButtons' 1 btns btn | btn /= 2 =
       btns <> [ellipsis] <> [button btn]
-    makePagingButtons' idx btns btn | btn == last && last < 7 && skip /= last =
+    makePagingButtons' _ btns btn | btn == last && last < 7 && skip /= last =
       btns <> [button btn] <> [forwardArrow]
-    makePagingButtons' idx btns btn | btn == last && last < 7 =
+    makePagingButtons' _ btns btn | btn == last && last < 7 =
       btns <> [button btn]
-    makePagingButtons' idx btns btn | btn == last && skip < (last - 3) =
+    makePagingButtons' _ btns btn | btn == last && skip < (last - 3) =
       btns <> [ellipsis] <> [button btn] <> [forwardArrow]
-    makePagingButtons' idx btns btn | btn == last =
+    makePagingButtons' _ btns btn | btn == last =
       btns <> [button btn] <> (if skip == last then [] else [forwardArrow])
     makePagingButtons' _ btns btn =
       btns <> [button btn]
@@ -122,17 +121,17 @@ makePagingButtonsNew skip last query = foldlWithIndex makePagingButtons' [] make
   makeList = [1] <> (skip - 2) .. (skip + 2) <> [last]
 
   makePagingButtons' :: Int -> Array (HH.HTML p i) -> Int -> Array (HH.HTML p i)
-  makePagingButtons' 0 btns btn =
+  makePagingButtons' 0 _ btn =
     (if skip == 1 then [] else [backArrow]) <> [button btn]
   makePagingButtons' 1 btns btn | btn /= 2 =
     btns <> [ellipsis] <> [button btn]
-  makePagingButtons' idx btns btn | btn == last && last < 7 && skip /= last =
+  makePagingButtons' _ btns btn | btn == last && last < 7 && skip /= last =
     btns <> [button btn] <> [forwardArrow]
-  makePagingButtons' idx btns btn | btn == last && last < 7 =
+  makePagingButtons' _ btns btn | btn == last && last < 7 =
     btns <> [button btn]
-  makePagingButtons' idx btns btn | btn == last && skip < (last - 3) =
+  makePagingButtons' _ btns btn | btn == last && skip < (last - 3) =
     btns <> [ellipsis] <> [button btn] <> [forwardArrow]
-  makePagingButtons' idx btns btn | btn == last =
+  makePagingButtons' _ btns btn | btn == last =
     btns <> [button btn] <> (if skip == last then [] else [forwardArrow])
   makePagingButtons' _ btns btn =
     btns <> [button btn]

src/Components/MultiInput/Component.purs

@@ -68,7 +68,7 @@ data Action
   | Receive Input
   | RemoveOne Int
 
-data Query a
+data Query (a :: Type)
   = GetItems (Array String -> a)
   | SetItems (Array String) a
   | SelectItem String a

src/Components/MultiInput/TextWidth.purs

@@ -37,18 +37,18 @@ type State =
 data Action
   = Receive Input
 
-data Query a
+data Query (a :: Type)
   = GetWidth String (Number -> a)
 
 type Input =
   { renderText :: String -> Halogen.HTML.PlainHTML
   }
 
-type Output =
-  Void
+type Output
+  = Void
 
-type ChildSlots =
-  ()
+type ChildSlots
+  = () :: Row Type
 
 component ::
   forall m.

src/Components/SearchBar.purs

@@ -41,7 +41,7 @@ data Action
   | Open
   | Blur
 
-data Query a
+data Query (a :: Type)
   = SetText String a
 
 type Slot = H.Slot Query Message

src/Data/Currency.purs

@@ -86,7 +86,7 @@ parseCentsFromDollarStr str = Cents <$> case split (Pattern ".") str of
     =<< (+) <$> dollarsPlace dollars <*> BigInt.fromString (take 2 $ cents <> "0")
 
   -- Unable to parse
-  otherwise -> Nothing
+  _ -> Nothing
 
   where
     -- Expects only the dollars place, no cents. Cents will overstate

src/Data/DateTime.purs

@@ -112,12 +112,12 @@ adjustDaysBy n = unsafePartial fromJust <<< next n
 nextMonth :: Date -> Date
 nextMonth d = case (month d) of
   December -> canonicalDate (unsafeSucc (year d)) January (day d)
-  other    -> canonicalDate (year d) (unsafeSucc (month d)) (day d)
+  _    -> canonicalDate (year d) (unsafeSucc (month d)) (day d)
 
 prevMonth :: Date -> Date
 prevMonth d = case (month d) of
   January -> canonicalDate (unsafePred (year d)) December (day d)
-  other   -> canonicalDate (year d) (unsafePred (month d)) (day d)
+  _   -> canonicalDate (year d) (unsafePred (month d)) (day d)
 
 -- Years
 -- Note: Attempts to preserve the same day, but due to the use of