gherkin - npm Package Compare versions

Comparing version 3.1.2 to 3.2.0

bower.json

@@ -5,3 +5,3 @@ {
   "version": "3.0.0",
-  "homepage": "https://github.com/cucumber/gherkin3",
+  "homepage": "https://github.com/cucumber/gherkin-javascript",
   "authors": [
@@ -8,0 +8,0 @@ "Aslak Hellesøy <[e-mail]>"

CONTRIBUTING.md

@@ -1,3 +0,3 @@
-Please read [CONTRIBUTING](https://github.com/cucumber/gherkin3/blob/master/CONTRIBUTING.md) first.
-You should clone the [cucumber/gherkin3](https://github.com/cucumber/gherkin3) repo if you want
+Please read [CONTRIBUTING](https://github.com/cucumber/gherkin/blob/master/CONTRIBUTING.md) first.
+You should clone the [cucumber/gherkin](https://github.com/cucumber/gherkin) repo if you want
 to contribute.
@@ -4,0 +4,0 @@

index.js

@@ -17,4 +17,5 @@ (function (root, factory) {
     TokenMatcher: require('./lib/gherkin/token_matcher'),
-    AstBuilder: require('./lib/gherkin/ast_builder')
+    AstBuilder: require('./lib/gherkin/ast_builder'),
+    Compiler: require('./lib/gherkin/pickles/compiler')
   };
 }));

lib/gherkin/ast_builder.js

@@ -121,12 +121,16 @@ var AstNode = require('./ast_node');
         var separatorToken = node.getTokens('DocStringSeparator')[0];
-        var contentType = separatorToken.matchedText;
+        var contentType = separatorToken.matchedText.length > 0 ? separatorToken.matchedText : undefined;
         var lineTokens = node.getTokens('Other');
         var content = lineTokens.map(function (t) {return t.matchedText}).join("\n");
 
-        return {
+        var result = {
           type: node.ruleType,
           location: getLocation(separatorToken),
-          contentType: contentType,
           content: content
         };
+        // conditionally add this like this (needed to make tests pass on node 0.10 as well as 4.0)
+        if(contentType) {
+          result.contentType = contentType;
+        }
+        return result;
       case 'DataTable':
@@ -133,0 +137,0 @@ var rows = getTableRows(node);

lib/gherkin/gherkin_line.js

@@ -0,1 +1,3 @@
+var countSymbols = require('./count_symbols')
+
 function GherkinLine(lineText, lineNumber) {
@@ -6,3 +8,3 @@ this.lineText = lineText;
   this.isEmpty = this.trimmedLineText.length == 0;
-  this.indent = lineText.length - this.trimmedLineText.length;
+  this.indent = countSymbols(lineText) - countSymbols(this.trimmedLineText);
 };
@@ -57,2 +59,5 @@
       } else {
+        if (chr != '|' && chr != '\\') {
+          cell += '\\';
+        }
         cell += chr;
@@ -59,0 +64,0 @@ }

lib/gherkin/gherkin-languages.json

@@ -192,10 +192,10 @@ {
       "Senario",
-      "Situai",
+      "Situasi",
       "Keadaan"
     ],
     "scenarioOutline": [
-      "Template Senario",
-      "Template Situai",
-      "Template Keadaan",
-      "Menggariskan Senario"
+      "Kerangka Senario",
+      "Kerangka Situasi",
+      "Kerangka Keadaan",
+      "Garis Panduan Senario"
     ],
@@ -232,4 +232,4 @@ "then": [
     "given": [
-       "* ",
-       "Dato "
+      "* ",
+      "Dato "
     ],
@@ -239,9 +239,9 @@ "name": "Bosnian",
     "scenario": [
-       "Scenariju",
-       "Scenario"
+      "Scenariju",
+      "Scenario"
     ],
     "scenarioOutline": [
-       "Scenariju-obris",
-       "Scenario-outline"
-    ], 
+      "Scenariju-obris",
+      "Scenario-outline"
+    ],
     "then": [
@@ -504,2 +504,41 @@ "* ",
   },
+  "em": {
+    "and": [
+      "* ",
+      "😂"
+    ],
+    "background": [
+      "💤"
+    ],
+    "but": [
+      "* ",
+      "😔"
+    ],
+    "examples": [
+      "📓"
+    ],
+    "feature": [
+      "📚"
+    ],
+    "given": [
+      "* ",
+      "😐"
+    ],
+    "name": "Emoji",
+    "native": "😀",
+    "scenario": [
+      "📕"
+    ],
+    "scenarioOutline": [
+      "📖"
+    ],
+    "then": [
+      "* ",
+      "🙏"
+    ],
+    "when": [
+      "* ",
+      "🎬"
+    ]
+  },
   "en": {
@@ -967,2 +1006,4 @@ "and": [
       "* ",
+      "Et que ",
+      "Et qu'",
       "Et "
@@ -975,2 +1016,4 @@ ],
       "* ",
+      "Mais que ",
+      "Mais qu'",
       "Mais "
@@ -987,2 +1030,4 @@ ],
       "Soit ",
+      "Etant donné que ",
+      "Etant donné qu'",
       "Etant donné ",
@@ -992,2 +1037,4 @@ "Etant donnée ",
       "Etant données ",
+      "Étant donné que ",
+      "Étant donné qu'",
       "Étant donné ",
@@ -1794,2 +1841,46 @@ "Étant donnée ",
   },
+  "mn": {
+    "and": [
+      "* ",
+      "Мөн ",
+      "Тэгээд "
+    ],
+    "background": [
+      "Агуулга"
+    ],
+    "but": [
+      "* ",
+      "Гэхдээ ",
+      "Харин "
+    ],
+    "examples": [
+      "Тухайлбал"
+    ],
+    "feature": [
+      "Функц",
+      "Функционал"
+    ],
+    "given": [
+      "* ",
+      "Өгөгдсөн нь ",
+      "Анх "
+    ],
+    "name": "Mongolian",
+    "native": "монгол",
+    "scenario": [
+      "Сценар"
+    ],
+    "scenarioOutline": [
+      "Сценарын төлөвлөгөө"
+    ],
+    "then": [
+      "* ",
+      "Тэгэхэд ",
+      "Үүний дараа "
+    ],
+    "when": [
+      "* ",
+      "Хэрэв "
+    ]
+  },
   "nl": {
@@ -1796,0 +1887,0 @@ "and": [

lib/gherkin/token_matcher.js

@@ -187,4 +187,4 @@ var dialects = require('./gherkin-languages.json');
   function unescapeDocString(text) {
-    return text.replace("\\\"\\\"\\\"", "\"\"\"");
+    return activeDocStringSeparator != null ? text.replace("\\\"\\\"\\\"", "\"\"\"") : text;
   }
 };

package.json

 {
   "name": "gherkin",
-  "version": "3.1.2",
+  "version": "3.2.0",
   "description": "Gherkin parser",
@@ -20,12 +20,12 @@ "main": "index.js",
   "bugs": {
-    "url": "https://github.com/cucumber/gherkin3/issues"
+    "url": "https://github.com/cucumber/gherkin/issues"
   },
-  "homepage": "https://github.com/cucumber/gherkin3",
+  "homepage": "https://github.com/cucumber/gherkin",
   "devDependencies": {
-    "bower": "^1.5.3",
-    "browserify": "^11.2.0",
-    "mocha": "^2.3.3",
+    "bower": "^1.7.2",
+    "browserify": "^12.0.2",
+    "mocha": "^2.3.4",
     "mversion": "^1.10.1",
-    "uglify-js": "^2.4.24"
+    "uglify-js": "^2.6.1"
   }
 }

README.md

@@ -1,3 +0,3 @@
-[![Build Status](https://secure.travis-ci.org/cucumber/gherkin-javascript.png)](http://travis-ci.org/cucumber/gherkin-javascript)
+[![Build Status](https://secure.travis-ci.org/cucumber/gherkin-javascript.svg)](http://travis-ci.org/cucumber/gherkin-javascript)
 
-Gherkin parser/compiler for JavaScript. Please see [Gherkin3](https://github.com/cucumber/gherkin3) for details.
+Gherkin parser/compiler for JavaScript. Please see [Gherkin](https://github.com/cucumber/gherkin) for details.

test/parser_test.js

@@ -64,3 +64,3 @@ var assert = require('assert');
 								     "      ```\n" +
-								     "      unclosed docstring\n"), 
+								     "      unclosed docstring\n"),
 					    matcher) },
@@ -73,3 +73,3 @@ Gherkin.ParserException);
 						    "      closed docstring\n" +
-						    "      \"\"\""), 
+						    "      \"\"\""),
 			   matcher);
@@ -94,3 +94,2 @@
             content: 'closed docstring',
-            contentType: '',
             location: { line: 4, column: 7 },
@@ -97,0 +96,0 @@ type: 'DocString',

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

392636

increased by5.16%

Number of package files

31

increased by6.9%

Lines of code

11735

increased by4.23%

No dependency changes