Add npm workspaces

.gitignore

@@ -1,4 +1,5 @@
 .DS_Store
 .rsynced
 .idea/
-executables
+executables
+node_modules

.npmrc

@@ -0,0 +1 @@
+legacy-peer-deps=true

compatibility-kit/javascript/package.json

@@ -1,22 +1,22 @@
 {
   "name": "@cucumber/compatibility-kit",
   "version": "3.0.0",
-  "description": "Cucumber Compatibility Kit validates a Cucumber implementation",
+  "private": true,
+  "description": "Test data used to validate a Cucumber implementation",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/cucumber/cucumber.git"
   },
   "author": "Aslak Hellesøy",
   "license": "MIT",
   "scripts": {
-    "nyc": "nyc --reporter=html --reporter=text mocha",
     "test": "echo 'no tests'",
     "lint": "eslint --ext --max-warnings 0 ts features",
     "lint-fix": "eslint --ext ts --max-warnings 0 --fix features",
     "build": "tsc"
   },
   "devDependencies": {
-    "@cucumber/fake-cucumber": "file:../../fake-cucumber/javascript",
+    "@cucumber/fake-cucumber": "^10.0.0",
     "@types/stream-buffers": "^3.0.3",
     "@typescript-eslint/eslint-plugin": "^4.14.2",
     "@typescript-eslint/parser": "^4.14.2",
@@ -31,11 +31,5 @@
     "stream-buffers": "^3.0.2",
     "typescript": "^4.1.3"
   },
-  "dependencies": {},
-  "bugs": {
-    "url": "https://github.com/cucumber/cucumber/issues"
-  },
-  "homepage": "https://github.com/cucumber/cucumber#readme",
-  "main": "index.js",
-  "keywords": []
+  "dependencies": {}
 }

compatibility-kit/javascript/tsconfig.build.json

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

create-meta/javascript/.mocharc.json

@@ -1,6 +1,6 @@
 {
-  "require": ["ts-node/register", "source-map-support/register"],
+  "require": ["tsconfig-paths/register", "ts-node/register", "source-map-support/register"],
   "extension": ["ts", "tsx"],
   "recursive": true,
-  "timeout": 10000  
+  "timeout": 10000
 }

create-meta/javascript/tsconfig.build.json

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

create-meta/javascript/tsconfig.json

@@ -1,26 +1,3 @@
 {
-  "compilerOptions": {
-    "declaration": true,
-    "target": "es5",
-    "lib": [
-      "es2019",
-      "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/**/*",
-    "features/**/*"
-  ]
+  "extends": "../../tsconfig.json"
 }

cucumber-expressions/javascript/tsconfig.build.json

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

fake-cucumber/javascript/.mocharc.json

@@ -1,6 +1,6 @@
 {
-  "require": ["ts-node/register", "source-map-support/register"],
+  "require": ["tsconfig-paths/register", "ts-node/register", "source-map-support/register"],
   "extension": ["ts", "tsx"],
   "recursive": true,
-  "timeout": 10000  
+  "timeout": 10000
 }

fake-cucumber/javascript/package.json

@@ -48,12 +48,13 @@
     "stream-buffers": "^3.0.2"
   },
   "dependencies": {
-    "@cucumber/cucumber-expressions": "file:../../cucumber-expressions/javascript",
-    "@cucumber/create-meta": "file:../../create-meta/javascript",
-    "@cucumber/gherkin": "file:../../gherkin/javascript",
-    "@cucumber/gherkin-utils": "file:../../gherkin-utils/javascript",
-    "@cucumber/messages": "file:../../messages/javascript",
-    "@cucumber/tag-expressions": "file:../../tag-expressions/javascript",
+    "@cucumber/cucumber-expressions": "^12.0.0",
+    "@cucumber/create-meta": "^3.0.0",
+    "@cucumber/gherkin": "^17.0.2",
+    "@cucumber/gherkin-streams": "^1.0.0",
+    "@cucumber/gherkin-utils": "^3.0.0",
+    "@cucumber/messages": "^14.0.1",
+    "@cucumber/tag-expressions": "^3.0.0",
     "commander": "^7.0.0",
     "glob": "^7.1.6",
     "source-map-support": "^0.5.19",

fake-cucumber/javascript/test/TestHelpers.ts

@@ -1,6 +1,6 @@
 import { Readable } from 'stream'
 import { IdGenerator, messages } from '@cucumber/messages'
-import GherkinStreams from '@cucumber/gherkin/dist/src/stream/GherkinStreams'
+import { GherkinStreams } from '@cucumber/gherkin-streams'
 
 export function gherkinMessages(gherkinSource: string, uri: string): Readable {
   const source = messages.Envelope.fromObject({

fake-cucumber/javascript/tsconfig.build.json

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

fake-cucumber/javascript/tsconfig.json

@@ -1,26 +1,3 @@
 {
-  "compilerOptions": {
-    "declaration": true,
-    "target": "es5",
-    "lib": [
-      "es2019",
-      "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/**/*",
-    "features/**/*"
-  ]
+  "extends": "../../tsconfig.json"
 }

gherkin-streams/README.md

@@ -0,0 +1,3 @@
+# Gherkin Streams
+
+This module contains utilities to use the Gherkin library with streams.

gherkin-streams/javascript/package.json

@@ -0,0 +1,35 @@
+{
+  "name": "@cucumber/gherkin-streams",
+  "version": "1.0.0",
+  "description": "Streams for reading Gherkin parser output",
+  "main": "dist/src/index.js",
+  "types": "dist/src/index.d.ts",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/cucumber/cucumber.git"
+  },
+  "author": "Cucumber Limited <[email protected]>",
+  "license": "MIT",
+  "scripts": {
+    "test": "echo 'no tests'"
+  },
+  "dependencies": {
+    "@cucumber/messages": "^14.0.1",
+    "protobufjs": "^6.10.2"
+  },
+  "devDependencies": {
+    "@types/mocha": "^8.2.0",
+    "@types/node": "^14.14.25",
+    "mocha": "^8.2.1",
+    "nyc": "^15.1.0",
+    "typescript": "^4.1.3"
+  },
+  "bugs": {
+    "url": "https://github.com/cucumber/cucumber/issues"
+  },
+  "homepage": "https://github.com/cucumber/cucumber#readme",
+  "directories": {
+    "test": "test"
+  },
+  "keywords": []
+}

gherkin/javascript/src/stream/GherkinStreams.ts → gherkin-streams/javascript/src/GherkinStreams.ts

@@ -1,11 +1,11 @@
 import { PassThrough, pipeline, Readable } from 'stream'
 import { messages } from '@cucumber/messages'
-import { BinaryToMessageStream } from '@cucumber/messages/dist/src/stream'
+import { BinaryToMessageStream } from '@cucumber/message-streams'
 import ParserMessageStream from './ParserMessageStream'
 import SourceMessageStream from './SourceMessageStream'
-import IGherkinOptions from '../IGherkinOptions'
-import makeGherkinOptions from '../makeGherkinOptions'
 import fs from 'fs'
+import { IGherkinOptions } from '@cucumber/gherkin'
+import makeGherkinOptions from './makeGherkinOptions'
 
 function fromStream(stream: Readable, options: IGherkinOptions) {
   return pipeline(

gherkin/javascript/src/stream/ParserMessageStream.ts → gherkin-streams/javascript/src/ParserMessageStream.ts

@@ -1,7 +1,6 @@
-import generateMessages from '../generateMessages'
 import { Transform, TransformCallback } from 'stream'
 import { messages } from '@cucumber/messages'
-import IGherkinOptions from '../IGherkinOptions'
+import {generateMessages, IGherkinOptions } from '@cucumber/gherkin'
 
 /**
  * Stream that reads Source messages and writes GherkinDocument and Pickle messages.

gherkin/javascript/src/stream/SourceMessageStream.ts → gherkin-streams/javascript/src/SourceMessageStream.ts

@@ -1,5 +1,5 @@
+import { makeSourceEnvelope } from '@cucumber/gherkin'
 import { Transform, TransformCallback } from 'stream'
-import makeSourceEnvelope from '../makeSourceEnvelope'
 
 /**
  * Stream that reads a string and writes a single Source message.

gherkin/javascript/src/cli/main.ts → gherkin-streams/javascript/src/cli/main.ts

@@ -1,13 +1,13 @@
 import { Command } from 'commander'
 import packageJson from '../../package.json'
-import Gherkin from '../stream/GherkinStreams'
+import GherkinStreams from '../GherkinStreams'
 import { IdGenerator } from '@cucumber/messages'
 import {
   MessageToBinaryStream,
   MessageToNdjsonStream,
-} from '@cucumber/messages/dist/src/stream'
+} from '@cucumber/message-streams'
 import { Readable, Transform } from 'stream'
-import IGherkinOptions from '../IGherkinOptions'
+import { IGherkinOptions } from '@cucumber/gherkin'
 
 const program = new Command()
 program.version(packageJson.version)
@@ -35,8 +35,8 @@ const options: IGherkinOptions = {
 
 const messageStream =
   paths.length === 0
-    ? Gherkin.fromStream((process.stdin as unknown) as Readable, options)
-    : Gherkin.fromPaths(paths, options)
+    ? GherkinStreams.fromStream((process.stdin as unknown) as Readable, options)
+    : GherkinStreams.fromPaths(paths, options)
 
 let encodedStream: Transform
 switch (program.opts().format) {

gherkin-streams/javascript/src/index.ts

@@ -0,0 +1,5 @@
+import GherkinStreams from './GherkinStreams'
+
+export {
+  GherkinStreams,
+}

gherkin/javascript/src/makeGherkinOptions.ts → gherkin-streams/javascript/src/makeGherkinOptions.ts

@@ -1,5 +1,5 @@
+import { IGherkinOptions } from '@cucumber/gherkin'
 import { IdGenerator } from '@cucumber/messages'
-import IGherkinOptions from './IGherkinOptions'
 
 const defaultOptions: IGherkinOptions = {
   defaultDialect: 'en',

gherkin/javascript/test/StreamTest.ts → gherkin-streams/javascript/test/StreamTest.ts

@@ -1,23 +1,22 @@
 import assert from 'assert'
 import { Readable } from 'stream'
 import { messages } from '@cucumber/messages'
-import Gherkin from '../src/stream/GherkinStreams'
-import makeSourceEnvelope from '../src/makeSourceEnvelope'
-import { IGherkinOptions, dialects } from '../src'
+import {dialects, IGherkinOptions, makeSourceEnvelope } from '@cucumber/gherkin'
+import {GherkinStreams} from "../src";
 
 const defaultOptions: IGherkinOptions = {}
 
 describe('gherkin', () => {
   it('parses gherkin from the file system', async () => {
     const envelopes = await streamToArray(
-      Gherkin.fromPaths(['testdata/good/minimal.feature'], defaultOptions)
+      GherkinStreams.fromPaths(['testdata/good/minimal.feature'], defaultOptions)
     )
     assert.strictEqual(envelopes.length, 3)
   })
 
   it('throws an error when the path is a directory', async () => {
     assert.rejects(async () =>
-      streamToArray(Gherkin.fromPaths(['testdata/good'], defaultOptions))
+      streamToArray(GherkinStreams.fromPaths(['testdata/good'], defaultOptions))
     )
   })
 
@@ -32,7 +31,7 @@ describe('gherkin', () => {
     )
 
     const envelopes = await streamToArray(
-      Gherkin.fromSources([source], defaultOptions)
+      GherkinStreams.fromSources([source], defaultOptions)
     )
     assert.strictEqual(envelopes.length, 3)
   })
@@ -46,7 +45,7 @@ describe('gherkin', () => {
       'test.feature'
     )
     const envelopes = await streamToArray(
-      Gherkin.fromSources([source], { defaultDialect: 'fr' })
+      GherkinStreams.fromSources([source], { defaultDialect: 'fr' })
     )
     assert.strictEqual(envelopes.length, 3)
   })

gherkin-utils/javascript/.mocharc.json

@@ -1,5 +1,5 @@
 {
-  "require": ["ts-node/register", "source-map-support/register"],
+  "require": ["tsconfig-paths/register", "ts-node/register", "source-map-support/register"],
   "extension": ["ts", "tsx"],
   "recursive": true,
   "timeout": 10000  

gherkin-utils/javascript/default.mk

@@ -6,19 +6,10 @@ PRIVATE = $(shell node -e "console.log(require('./package.json').private)")
 NPM ?= npm
 IS_TESTDATA = $(findstring -testdata,${CURDIR})
 
-ifeq (yarn,$(NPM))
-LOCKFILE = yarn.lock
-else
-LOCKFILE = package-lock.json
-endif
-
 default: .tested .built .linted
 .PHONY: default
 
-.deps: $(LOCKFILE)
-	touch $@
-
-.codegen: .deps
+.codegen:
 	touch $@
 
 .built: .codegen $(TYPESCRIPT_SOURCE_FILES)
@@ -35,10 +26,6 @@ default: .tested .built .linted
 	$(NPM) run lint-fix
 	touch $@
 
-$(LOCKFILE): package.json
-	$(NPM) install
-	touch $@
-
 update-dependencies:
 	npx npm-check-updates --upgrade
 .PHONY: update-dependencies