Convert messages into a hybrid cjs/esm package

message-streams/CHANGELOG.md

@@ -9,6 +9,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Added
 
+* Support for EcmaScript modules (aka ESM)
+  ([#1756](https://github.com/cucumber/common/pull/1756))
+
 ### Changed
 
 ### Deprecated

message-streams/javascript/.gitignore

@@ -1,4 +1,7 @@
-dist/
+dist/*
+!dist/cjs
+dist/cjs/*
+!dist/cjs/package.json
 .idea/
 .nyc_output/
 coverage/

message-streams/javascript/.mocharc.json

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

message-streams/javascript/.rsync

@@ -1 +1 @@
-../../.templates/javascript/ .
+../../.templates/javascript-esm/ .

message-streams/javascript/default.mk

@@ -70,6 +70,7 @@ clean: clean-javascript
 
 clean-javascript:
 	rm -rf .deps .codegen .tested* coverage dist acceptance
+	git checkout dist
 .PHONY: clean-javascript
 
 clobber: clean

message-streams/javascript/dist/cjs/package.json

@@ -0,0 +1,3 @@
+{
+    "type": "commonjs"
+}

message-streams/javascript/package.json

@@ -2,17 +2,34 @@
   "name": "@cucumber/message-streams",
   "version": "3.0.0",
   "description": "Streams for reading/writing messages",
-  "main": "dist/src/index.js",
-  "types": "dist/src/index.d.ts",
+  "type": "module",
+  "main": "dist/cjs/src/index.js",
+  "types": "dist/cjs/src/index.d.ts",
+  "files": [
+    "dist/cjs",
+    "dist/esm"
+  ],
+  "module": "dist/esm/src/index.js",
+  "jsnext:main": "dist/esm/src/index.js",
+  "exports": {
+    ".": {
+      "import": "./dist/esm/src/index.js",
+      "require": "./dist/cjs/src/index.js"
+    }
+  },
   "repository": {
     "type": "git",
     "url": "git://github.com/cucumber/cucumber.git"
   },
   "author": "Cucumber Limited <[email protected]>",
   "license": "MIT",
   "scripts": {
-    "test": "mocha",
-    "prepublishOnly": "tsc --build tsconfig.build.json"
+    "build:cjs": "tsc --build tsconfig.build-cjs.json",
+    "build:esm": "tsc --build tsconfig.build-esm.json",
+    "build": "npm run build:cjs && npm run build:esm",
+    "test": "mocha && npm run test:cjs",
+    "test:cjs": "npm run build:cjs && mocha --no-config dist/cjs/test",
+    "prepublishOnly": "npm run build"
   },
   "dependencies": {
     "@cucumber/messages": "^17.1.1"

message-streams/javascript/src/index.ts

@@ -1,4 +1,4 @@
-import MessageToNdjsonStream from './MessageToNdjsonStream'
-import NdjsonToMessageStream from './NdjsonToMessageStream'
+import MessageToNdjsonStream from './MessageToNdjsonStream.js'
+import NdjsonToMessageStream from './NdjsonToMessageStream.js'
 
 export { MessageToNdjsonStream, NdjsonToMessageStream }

message-streams/javascript/test/NdjsonStreamTest.ts

@@ -1,9 +1,9 @@
 import * as messages from '@cucumber/messages'
-import { MessageToNdjsonStream } from '../src'
+import { MessageToNdjsonStream } from '../src/index.js'
 import assert from 'assert'
-import NdjsonToMessageStream from '../src/NdjsonToMessageStream'
-import verifyStreamContract from './verifyStreamContract'
-import toArray from './toArray'
+import NdjsonToMessageStream from '../src/NdjsonToMessageStream.js'
+import verifyStreamContract from './verifyStreamContract.js'
+import toArray from './toArray.js'
 import { Envelope } from '@cucumber/messages'
 
 describe('NdjsonStream', () => {

message-streams/javascript/test/verifyStreamContract.ts

@@ -1,7 +1,7 @@
 import * as messages from '@cucumber/messages'
 import { Transform } from 'stream'
-import toArray from './toArray'
-import assert = require('assert')
+import toArray from './toArray.js'
+import assert from 'assert'
 
 export default function verifyStreamContract(
   makeFromMessageStream: () => Transform,

message-streams/javascript/tsconfig.build.json → message-streams/javascript/tsconfig.build-cjs.json

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

messages/javascript/tsconfig.build.json → message-streams/javascript/tsconfig.build-esm.json

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

message-streams/javascript/tsconfig.json

@@ -1,3 +1,3 @@
 {
-  "extends": "../../tsconfig.json"
+  "extends": "../../tsconfig.esm.json"
 }

messages/CHANGELOG.md

@@ -9,6 +9,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Added
 
+* Support for EcmaScript modules (aka ESM)
+  ([#1756](https://github.com/cucumber/common/pull/1756))
+
 ### Changed
 
 ### Deprecated

messages/javascript/.gitignore

@@ -1,4 +1,7 @@
-dist/
+dist/*
+!dist/cjs
+dist/cjs/*
+!dist/cjs/package.json
 .idea/
 .nyc_output/
 coverage/

messages/javascript/.mocharc.json

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

messages/javascript/.rsync

@@ -1,3 +1,3 @@
 ../../LICENSE LICENSE
 ../../.templates/github/ .github/
-../../.templates/javascript/ .
+../../.templates/javascript-esm/ .

messages/javascript/Makefile

@@ -2,10 +2,13 @@ include default.mk
 
 JSONSCHEMAS = $(shell find ../jsonschema -name "*.json")
 
-.codegen: src/messages.ts
+.codegen: src/messages.ts src/version.ts
 
 src/messages.ts: $(JSONSCHEMAS) ../jsonschema/scripts/codegen.rb
 	ruby ../jsonschema/scripts/codegen.rb TypeScript ../jsonschema > $@
 
+src/version.ts: package.json
+	npm version --json | jq $$'"// This file is generated using `make src/version.ts` or `make .codegen`\nexport const version = \'" + (."@cucumber/messages") + "\'"' --raw-output > $@
+
 clean:
-	rm -rf dist src/types/*.ts
+	rm -rf src/types/*.ts

messages/javascript/default.mk

@@ -70,6 +70,7 @@ clean: clean-javascript
 
 clean-javascript:
 	rm -rf .deps .codegen .tested* coverage dist acceptance
+	git checkout dist
 .PHONY: clean-javascript
 
 clobber: clean

messages/javascript/dist/cjs/package.json

@@ -0,0 +1,3 @@
+{
+    "type": "commonjs"
+}

messages/javascript/package.json

@@ -2,24 +2,41 @@
   "name": "@cucumber/messages",
   "version": "17.1.1",
   "description": "JSON schema-based messages for Cucumber's inter-process communication",
-  "main": "dist/src/index.js",
-  "types": "dist/src/index.d.ts",
+  "type": "module",
+  "main": "dist/cjs/src/index.js",
+  "types": "dist/cjs/src/index.d.ts",
+  "files": [
+    "dist/cjs",
+    "dist/esm"
+  ],
+  "module": "dist/esm/src/index.js",
+  "jsnext:main": "dist/esm/src/index.js",
+  "exports": {
+    ".": {
+      "import": "./dist/esm/src/index.js",
+      "require": "./dist/cjs/src/index.js"
+    }
+  },
   "repository": {
     "type": "git",
     "url": "git://github.com/cucumber/messages-javascript.git"
   },
   "author": "Cucumber Limited <[email protected]>",
   "license": "MIT",
   "scripts": {
+    "build:cjs": "tsc --build tsconfig.build-cjs.json",
+    "build:esm": "tsc --build tsconfig.build-esm.json",
+    "build": "npm run build:cjs && npm run build:esm",
     "prepare": "make src/messages.ts",
-    "test": "mocha",
-    "prepublishOnly": "tsc --build tsconfig.build.json"
+    "test": "mocha && npm run test:cjs",
+    "test:cjs": "npm run build:cjs && mocha --no-config dist/cjs/test",
+    "prepublishOnly": "npm run build"
   },
   "dependencies": {
     "@types/uuid": "8.3.1",
-    "uuid": "8.3.2",
     "class-transformer": "0.4.0",
-    "reflect-metadata": "0.1.13"
+    "reflect-metadata": "0.1.13",
+    "uuid": "8.3.2"
   },
   "devDependencies": {
     "@types/mocha": "9.0.0",

messages/javascript/src/TimeConversion.ts

@@ -1,4 +1,4 @@
-import * as messages from './messages'
+import * as messages from './messages.js'
 
 const MILLISECONDS_PER_SECOND = 1e3
 const NANOSECONDS_PER_MILLISECOND = 1e6

messages/javascript/src/getWorstTestStepResult.ts

@@ -1,5 +1,5 @@
-import { TestStepResult, TestStepResultStatus } from './messages'
-import { millisecondsToDuration } from './TimeConversion'
+import { TestStepResult, TestStepResultStatus } from './messages.js'
+import { millisecondsToDuration } from './TimeConversion.js'
 
 /**
  * Gets the worst result

messages/javascript/src/index.ts

@@ -1,9 +1,9 @@
-import * as TimeConversion from './TimeConversion'
-import * as IdGenerator from './IdGenerator'
-import { version } from '../package.json'
-import { parseEnvelope } from './parseEnvelope'
-import { getWorstTestStepResult } from './getWorstTestStepResult'
+import * as TimeConversion from './TimeConversion.js'
+import * as IdGenerator from './IdGenerator.js'
+import { parseEnvelope } from './parseEnvelope.js'
+import { getWorstTestStepResult } from './getWorstTestStepResult.js'
+import { version } from './version.js'
 
-export * from './messages'
+export * from './messages.js'
 
 export { TimeConversion, IdGenerator, version, parseEnvelope, getWorstTestStepResult }

messages/javascript/src/parseEnvelope.ts

@@ -1,4 +1,4 @@
-import { Envelope } from './messages'
+import { Envelope } from './messages.js'
 import { plainToClass } from 'class-transformer'
 
 /**

messages/javascript/src/version.ts

@@ -0,0 +1,2 @@
+// This file is generated using `make src/version.ts` or `make .codegen`
+export const version = '17.1.0'

messages/javascript/test/TimeConversionTest.ts

@@ -1,6 +1,6 @@
 import assert from 'assert'
-import { Duration, TimeConversion } from '../src'
-import { addDurations } from '../src/TimeConversion'
+import { Duration, TimeConversion } from '../src/index.js'
+import { addDurations } from '../src/TimeConversion.js'
 
 const {
   durationToMilliseconds,

messages/javascript/test/getWorstTestStepResultsTest.ts

@@ -1,5 +1,5 @@
-import { getWorstTestStepResult } from '../src/getWorstTestStepResult'
-import { TestStepResultStatus } from '../src/messages'
+import { getWorstTestStepResult } from '../src/getWorstTestStepResult.js'
+import { TestStepResultStatus } from '../src/messages.js'
 import assert from 'assert'
 
 describe('getWorstTestStepResult', () => {

messages/javascript/test/messagesTest.ts

@@ -1,5 +1,5 @@
 import assert from 'assert'
-import { Envelope, parseEnvelope } from '../src/index'
+import { Envelope, parseEnvelope } from '../src/index.js'
 
 describe('messages', () => {
   it('defaults missing fields when deserialising from JSON', () => {

messages/javascript/tsconfig.build-cjs.json

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

messages/javascript/tsconfig.build-esm.json

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

messages/javascript/tsconfig.json

@@ -1,3 +1,3 @@
 {
-  "extends": "../../tsconfig.json"
+  "extends": "../../tsconfig.esm.json"
 }