Merge pull request #685 from gethinode/validation

Fix args validation

data/structures/card-group.yml

@@ -39,13 +39,18 @@ arguments:
     optional: true
     comment: Maximum number of cards to display.
   cols:
-    type: int
+    type: select
     optional: true
-    default: 3
+    default: "3"
     comment: Number of grid columns.
     options:
-      min: 1
-      max: 5
+      values:
+        - "1"
+        - "2"
+        - "3"
+        - "4"
+        - "5"
+        - "auto"
   paginate:
     type: bool
     optional: true

data/structures/nav.yml

@@ -58,12 +58,12 @@ arguments:
   width:
     type: select
     optional: true
-    default: 100
+    default: "100"
     comment: Responsive width of the tab group.
     options:
       values:
-        - 50
-        - 100
+        - "50"
+        - "100"
     group: partial
   loading:
     type: select

layouts/partials/assets/section-list.html

@@ -151,20 +151,20 @@
             {{- $params := (dict 
                 "page" $page
                 "list" $list
-                "title" $title
-                "icon" $icon
-                "thumbnail" $thumbnail
-                "ratio" $ratio
-                "description" $description
                 "class" $style
-                "color" $color
-                "loading" $loading
                 )
             -}}
         
             {{ if eq $layout "card" }}
                 {{- $partial = "assets/card-group.html" -}}
                 {{- $params = merge $params (dict 
+                    "title" $title
+                    "icon" $icon
+                    "thumbnail" $thumbnail
+                    "ratio" $ratio
+                    "description" $description
+                    "color" $color
+                    "loading" $loading
                     "max" $max
                     "cols" $cols
                     "href" $sectionURL
@@ -180,7 +180,6 @@
             {{ else if eq $layout "nav" }}
                 {{- $partial = "assets/nav.html" -}}
                 {{- $params = merge $params (dict 
-                    "layout" $layout
                     "id" $section
                     "pane" $pane
                     "type" $type
@@ -192,6 +191,13 @@
             {{- else -}}
                 {{- $partial = "assets/list.html" -}}
                 {{- $params = merge $params (dict 
+                    "title" $title
+                    "icon" $icon
+                    "thumbnail" $thumbnail
+                    "ratio" $ratio
+                    "description" $description
+                    "color" $color
+                    "loading" $loading
                     "layout" $layout
                     ) 
                 -}}

layouts/partials/utilities/IsInvalidArgs.html

@@ -86,8 +86,9 @@
                 {{ $actual = "int" }}
             {{ else if and (in $expected "float") (findRE `^(?:[1-9]\d*|0)?(?:\.\d+)?$` $val) }}
                 {{ $actual = "float" }}
-            {{ else if and (in $expected "string") (in (slice "bool" "int" "float" "float64") $actual) }}
+            {{ else if and (in $expected "string") (in (slice "bool" "int" "int64" "float" "float64") $actual) }}
                 {{ $actual = "string" }}
+                {{ $val = string $val }}
             {{ end }}
 
             {{ if and $val (not (in $expected $actual)) }}

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@gethinode/hinode",
-  "version": "0.22.0-beta2",
+  "version": "0.22.0-beta3",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@gethinode/hinode",
-      "version": "0.22.0-beta2",
+      "version": "0.22.0-beta3",
       "license": "MIT",
       "devDependencies": {
         "@fullhuman/postcss-purgecss": "^5.0.0",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gethinode/hinode",
-  "version": "0.22.0-beta2",
+  "version": "0.22.0-beta3",
   "description": "Hinode is a clean documentation and blog theme for Hugo, an open-source static site generator",
   "keywords": [
     "hugo",