@cucumber/tag-expressions 2.0.4 → 3.0.1

package/package.json

@@ -1,16 +1,12 @@
 {
   "name": "@cucumber/tag-expressions",
-  "version": "2.0.4",
+  "version": "3.0.1",
   "description": "Cucumber Tag Expression parser",
-  "main": "dist/src/tag_expression_parser.js",
-  "types": "dist/src/tag_expression_parser.d.ts",
+  "main": "dist/src/index.js",
+  "types": "dist/src/index.d.ts",
   "scripts": {
     "test": "mocha",
-    "lint": "tslint src/**/*.ts test/**/*.ts",
-    "lint-fix": "tslint --fix src/**/*.ts test/**/*.ts",
-    "coverage": "nyc --reporter=html --reporter=text mocha",
-    "build": "tsc",
-    "prepublishOnly": "npm run build"
+    "prepublishOnly": "tsc --build tsconfig.build.json"
   },
   "repository": {
     "type": "git",
@@ -26,19 +22,13 @@
   },
   "homepage": "https://github.com/cucumber/tag-expressions-javascript",
   "devDependencies": {
-    "@types/mocha": "^5.2.7",
-    "@types/node": "^13.1.6",
-    "mocha": "^7.0.0",
-    "nyc": "^15.0.0",
-    "prettier": "^1.19.1",
-    "ts-node": "^8.6.0",
-    "tslint": "^5.20.1",
-    "tslint-config-prettier": "^1.18.0",
-    "tslint-plugin-prettier": "^2.1.0",
-    "typescript": "^3.7.4"
+    "@types/mocha": "^8.2.2",
+    "@types/node": "^14.14.37",
+    "mocha": "^8.3.2",
+    "ts-node": "^9.1.1",
+    "typescript": "^4.2.3"
   },
   "directories": {
     "test": "test"
-  },
-  "dependencies": {}
+  }
 }

package/src/{tag_expression_parser.ts → index.ts}

@@ -28,7 +28,7 @@ export default function parse(infix: string): Node {
   const operators: string[] = []
   let expectedTokenType = OPERAND
 
-  tokens.forEach(function(token) {
+  tokens.forEach(function (token) {
     if (isUnary(token)) {
       check(expectedTokenType, OPERAND)
       operators.push(token)
@@ -176,48 +176,26 @@ class Literal implements Node {
 }
 
 class Or implements Node {
-  constructor(
-    private readonly leftExpr: Node,
-    private readonly rightExpr: Node
-  ) {}
+  constructor(private readonly leftExpr: Node, private readonly rightExpr: Node) {}
 
   public evaluate(variables: string[]) {
-    return (
-      this.leftExpr.evaluate(variables) || this.rightExpr.evaluate(variables)
-    )
+    return this.leftExpr.evaluate(variables) || this.rightExpr.evaluate(variables)
   }
 
   public toString() {
-    return (
-      '( ' +
-      this.leftExpr.toString() +
-      ' or ' +
-      this.rightExpr.toString() +
-      ' )'
-    )
+    return '( ' + this.leftExpr.toString() + ' or ' + this.rightExpr.toString() + ' )'
   }
 }
 
 class And implements Node {
-  constructor(
-    private readonly leftExpr: Node,
-    private readonly rightExpr: Node
-  ) {}
+  constructor(private readonly leftExpr: Node, private readonly rightExpr: Node) {}
 
   public evaluate(variables: string[]) {
-    return (
-      this.leftExpr.evaluate(variables) && this.rightExpr.evaluate(variables)
-    )
+    return this.leftExpr.evaluate(variables) && this.rightExpr.evaluate(variables)
   }
 
   public toString() {
-    return (
-      '( ' +
-      this.leftExpr.toString() +
-      ' and ' +
-      this.rightExpr.toString() +
-      ' )'
-    )
+    return '( ' + this.leftExpr.toString() + ' and ' + this.rightExpr.toString() + ' )'
   }
 }
 
@@ -234,6 +212,7 @@ class Not implements Node {
 }
 
 class True implements Node {
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
   public evaluate(variables: string[]) {
     return true
   }

package/test/tag_expression_parser_test.ts

@@ -1,9 +1,9 @@
 import assert from 'assert'
-import parse from '../src/tag_expression_parser'
+import parse from '../src'
 
 describe('TagExpressionParser', () => {
   describe('#parse', () => {
-    ;[
+    const tests = [
       ['', 'true'],
       ['a and b', '( a and b )'],
       ['a or b', '( a or b )'],
@@ -18,8 +18,9 @@ describe('TagExpressionParser', () => {
         '( ( ( not ( a\\(\\) ) or ( b and not ( c ) ) ) or not ( d ) ) or ( e and f ) )',
       ],
       // a or not b
-    ].forEach(function(inOut) {
-      it(inOut[0], function() {
+    ]
+    tests.forEach(function (inOut) {
+      it(inOut[0], function () {
         const infix = inOut[0]
         const expr = parse(infix)
         assert.strictEqual(expr.toString(), inOut[1])
@@ -39,8 +40,8 @@ describe('TagExpressionParser', () => {
       ['( a and b ) )', 'Syntax error. Unmatched )'],
       ['( ( a and b )', 'Syntax error. Unmatched ('],
       // a or not b
-    ].forEach(function(inOut) {
-      it(inOut[0] + ' fails', function() {
+    ].forEach(function (inOut) {
+      it(inOut[0] + ' fails', function () {
         const infix = inOut[0]
         try {
           parse(infix)
@@ -53,27 +54,27 @@ describe('TagExpressionParser', () => {
 
     // evaluation
 
-    it('evaluates not', function() {
+    it('evaluates not', function () {
       const expr = parse('not   x')
       assert.strictEqual(expr.evaluate(['x']), false)
       assert.strictEqual(expr.evaluate(['y']), true)
     })
 
-    it('evaluates and', function() {
+    it('evaluates and', function () {
       const expr = parse('x and y')
       assert.strictEqual(expr.evaluate(['x', 'y']), true)
       assert.strictEqual(expr.evaluate(['y']), false)
       assert.strictEqual(expr.evaluate(['x']), false)
     })
 
-    it('evaluates or', function() {
+    it('evaluates or', function () {
       const expr = parse('  x or(y) ')
       assert.strictEqual(expr.evaluate([]), false)
       assert.strictEqual(expr.evaluate(['y']), true)
       assert.strictEqual(expr.evaluate(['x']), true)
     })
 
-    it('evaluates expressions with escaped chars', function() {
+    it('evaluates expressions with escaped chars', function () {
       const expr = parse('  x\\(1\\) or(y\\(2\\)) ')
       assert.strictEqual(expr.evaluate([]), false)
       assert.strictEqual(expr.evaluate(['y(2)']), true)
@@ -82,7 +83,7 @@ describe('TagExpressionParser', () => {
       assert.strictEqual(expr.evaluate(['x']), false)
     })
 
-    it('evaluates empty expressions to true', function() {
+    it('evaluates empty expressions to true', function () {
       const expr = parse('')
       assert.strictEqual(expr.evaluate([]), true)
       assert.strictEqual(expr.evaluate(['y']), true)

package/tsconfig.build.json

@@ -0,0 +1,11 @@
+{
+  "extends": "../../tsconfig.build.json",
+  "compilerOptions": {
+    "rootDir": ".",
+    "outDir": "dist"
+  },
+  "include": [
+    "src",
+    "test"
+  ]
+}

package/tsconfig.json

@@ -1,29 +1,3 @@
 {
-  "compilerOptions": {
-    "declaration": true,
-    "target": "es5",
-    "lib": [
-      "es5",
-      "es6",
-      "es7",
-      "es2015",
-      "es2017",
-      "dom"
-    ],
-    "sourceMap": true,
-    "allowJs": false,
-    "jsx": "react",
-    "resolveJsonModule": true,
-    "module": "commonjs",
-    "esModuleInterop": true,
-    "noImplicitAny": true,
-    "moduleResolution": "node",
-    "outDir": "dist",
-    "downlevelIteration": true,
-    "skipLibCheck": true
-  },
-  "include": [
-    "src/**/*",
-    "test/**/*"
-  ]
+  "extends": "../../tsconfig.json"
 }

package/.nycrc.json

@@ -1,16 +0,0 @@
-{
-  "extension": [
-    ".ts",
-    ".tsx"
-  ],
-  "exclude": [
-    "coverage",
-    "dist",
-    "src/**/*.d.ts"
-  ],
-  "reporter": [
-    "html",
-    "text"
-  ],
-  "all": true  
-}

package/.prettierrc

@@ -1,5 +0,0 @@
-{
-  "trailingComma": "es5",
-  "semi": false,
-  "singleQuote": true
-}

package/dist/src/tag_expression_parser.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"tag_expression_parser.js","sourceRoot":"","sources":["../../src/tag_expression_parser.ts"],"names":[],"mappings":"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"}

package/scripts/npm-link

@@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-#
-# Links an npm module
-#
-set -euf -o pipefail
-
-# `npm link` does not work on CircleCI, so we're doing manual symlinking instead
-rm -rf "node_modules/$1"
-# Some modules have no dependencies in package.json, so we'll create it just in case
-mkdir -p "node_modules"
-ln -s "$(pwd)/../../$1/javascript" node_modules/$1

package/test/mocha.opts

@@ -1,5 +0,0 @@
---require ts-node/register
---require source-map-support/register
---extension ts,tsx
---recursive
---timeout 60000

package/tslint.json

@@ -1,23 +0,0 @@
-{
-  "defaultSeverity": "error",
-  "extends": [
-    "tslint:latest",
-    "tslint-plugin-prettier",
-    "tslint-config-prettier"
-  ],
-  "jsRules": {},
-  "rules": {
-    "object-literal-sort-keys": false,
-    "ordered-imports": false,
-    "no-submodule-imports": false,
-    "member-ordering": false,
-    "max-classes-per-file": false,
-    "interface-name": false,
-    "no-empty-interface": false,
-    "no-namespace": false,
-    "no-implicit-dependencies": [true, "dev"],
-    "only-arrow-functions": false,
-    "prettier": true
-  },
-  "rulesDirectory": []
-}