windows support, linting

rodrigopivi · Mar 23, 2018 · 8d1e224 · 8d1e224
1 parent 39037c1
commit 8d1e224
Show file tree

Hide file tree

Showing 9 changed files with 751 additions and 65 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -0,0 +1,31 @@
+{
+    "env": {
+        "browser": true,
+        "commonjs": true,
+        "es6": true,
+        "node": true,
+        "jest": true
+    },
+    "extends": "eslint:recommended",
+    "parserOptions": {
+        "sourceType": "module"
+    },
+    "rules": {
+        "indent": [
+            "error",
+            4
+        ],
+        "linebreak-style": [
+            "error",
+            "unix"
+        ],
+        "quotes": [
+            "error",
+            "double"
+        ],
+        "semi": [
+            "error",
+            "always"
+        ]
+    }
+}
diff --git a/core/__snapshots__/core.test.js.snap b/core/__snapshots__/core.test.js.snap
@@ -103,13 +103,18 @@ Array [
 
 exports[`test action without correct identation error 1`] = `
 "{
-  \\"message\\": \\"Expected \\\\\\"%\\\\\\", \\\\\\"@\\\\\\", \\\\\\"\\\\\\\\n\\\\\\", \\\\\\"~\\\\\\", correct indentation, or end of input but \\\\\\" \\\\\\" found.\\",
+  \\"message\\": \\"Expected \\\\\\"%\\\\\\", \\\\\\"@\\\\\\", \\\\\\"\\\\\\\\n\\\\\\", \\\\\\"\\\\\\\\r\\\\\\\\n\\\\\\", \\\\\\"~\\\\\\", correct indentation, or end of input but \\\\\\" \\\\\\" found.\\",
   \\"expected\\": [
     {
       \\"type\\": \\"literal\\",
       \\"text\\": \\"\\\\n\\",
       \\"ignoreCase\\": false
     },
+    {
+      \\"type\\": \\"literal\\",
+      \\"text\\": \\"\\\\r\\\\n\\",
+      \\"ignoreCase\\": false
+    },
     {
       \\"type\\": \\"other\\",
       \\"description\\": \\"correct indentation\\"
@@ -119,6 +124,11 @@ exports[`test action without correct identation error 1`] = `
       \\"text\\": \\"\\\\n\\",
       \\"ignoreCase\\": false
     },
+    {
+      \\"type\\": \\"literal\\",
+      \\"text\\": \\"\\\\r\\\\n\\",
+      \\"ignoreCase\\": false
+    },
     {
       \\"type\\": \\"literal\\",
       \\"text\\": \\"%\\",
@@ -129,6 +139,11 @@ exports[`test action without correct identation error 1`] = `
       \\"text\\": \\"\\\\n\\",
       \\"ignoreCase\\": false
     },
+    {
+      \\"type\\": \\"literal\\",
+      \\"text\\": \\"\\\\r\\\\n\\",
+      \\"ignoreCase\\": false
+    },
     {
       \\"type\\": \\"literal\\",
       \\"text\\": \\"@\\",
@@ -139,6 +154,11 @@ exports[`test action without correct identation error 1`] = `
       \\"text\\": \\"\\\\n\\",
       \\"ignoreCase\\": false
     },
+    {
+      \\"type\\": \\"literal\\",
+      \\"text\\": \\"\\\\r\\\\n\\",
+      \\"ignoreCase\\": false
+    },
     {
       \\"type\\": \\"literal\\",
       \\"text\\": \\"~\\",
@@ -167,13 +187,18 @@ exports[`test action without correct identation error 1`] = `
 
 exports[`test action without sentences error 1`] = `
 "{
-  \\"message\\": \\"Expected \\\\\\"\\\\\\\\n\\\\\\" or correct indentation but end of input found.\\",
+  \\"message\\": \\"Expected \\\\\\"\\\\\\\\n\\\\\\", \\\\\\"\\\\\\\\r\\\\\\\\n\\\\\\", or correct indentation but end of input found.\\",
   \\"expected\\": [
     {
       \\"type\\": \\"literal\\",
       \\"text\\": \\"\\\\n\\",
       \\"ignoreCase\\": false
     },
+    {
+      \\"type\\": \\"literal\\",
+      \\"text\\": \\"\\\\r\\\\n\\",
+      \\"ignoreCase\\": false
+    },
     {
       \\"type\\": \\"other\\",
       \\"description\\": \\"correct indentation\\"
@@ -251,13 +276,18 @@ exports[`test argument that defines only one alias inside each line 1`] = `
 
 exports[`test empty parser error 1`] = `
 "{
-  \\"message\\": \\"Expected \\\\\\"%\\\\\\", \\\\\\"@\\\\\\", \\\\\\"\\\\\\\\n\\\\\\", or \\\\\\"~\\\\\\" but end of input found.\\",
+  \\"message\\": \\"Expected \\\\\\"%\\\\\\", \\\\\\"@\\\\\\", \\\\\\"\\\\\\\\n\\\\\\", \\\\\\"\\\\\\\\r\\\\\\\\n\\\\\\", or \\\\\\"~\\\\\\" but end of input found.\\",
   \\"expected\\": [
     {
       \\"type\\": \\"literal\\",
       \\"text\\": \\"\\\\n\\",
       \\"ignoreCase\\": false
     },
+    {
+      \\"type\\": \\"literal\\",
+      \\"text\\": \\"\\\\r\\\\n\\",
+      \\"ignoreCase\\": false
+    },
     {
       \\"type\\": \\"literal\\",
       \\"text\\": \\"%\\",
@@ -268,6 +298,11 @@ exports[`test empty parser error 1`] = `
       \\"text\\": \\"\\\\n\\",
       \\"ignoreCase\\": false
     },
+    {
+      \\"type\\": \\"literal\\",
+      \\"text\\": \\"\\\\r\\\\n\\",
+      \\"ignoreCase\\": false
+    },
     {
       \\"type\\": \\"literal\\",
       \\"text\\": \\"@\\",
@@ -278,6 +313,11 @@ exports[`test empty parser error 1`] = `
       \\"text\\": \\"\\\\n\\",
       \\"ignoreCase\\": false
     },
+    {
+      \\"type\\": \\"literal\\",
+      \\"text\\": \\"\\\\r\\\\n\\",
+      \\"ignoreCase\\": false
+    },
     {
       \\"type\\": \\"literal\\",
       \\"text\\": \\"~\\",

diff --git a/core/chatito.js b/core/chatito.js
diff --git a/core/chatito.pegjs b/core/chatito.pegjs
@@ -56,6 +56,8 @@ AnyText = v:([^ \n]+) { return v.join("") }
 OptionalKeywordLiteral = id:AnyText SPACE?
     { return { id: id, type: "Text" }}
 EOS = EOL / EOF
-EOL = "\n"+
+EOL = (EOLNonWindows/EOLWindows)+
+EOLNonWindows = "\n"
+EOLWindows = "\r\n"
 SPACE = " "+
 EOF = !.