diff --git a/.github/workflows/pr_closed.yaml b/.github/workflows/pr_closed.yaml index a30550b..a779de0 100644 --- a/.github/workflows/pr_closed.yaml +++ b/.github/workflows/pr_closed.yaml @@ -67,7 +67,7 @@ jobs: echo "version_changed=true" >> $GITHUB_OUTPUT fi - test-contract-provider: + test-contract: name: "Test contracts (provider)" needs: check-event-schemas-version-change if: needs.check-event-schemas-version-change.outputs.version_changed == 'true' @@ -85,7 +85,7 @@ jobs: - name: "Install dependencies" run: npm ci - name: "Run provider contract tests" - run: make test-contract-provider + run: make test-contract env: GITHUB_PACKAGES_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -93,7 +93,7 @@ jobs: name: Publish event schemas package to GitHub package registry needs: - check-event-schemas-version-change - - test-contract-provider + - test-contract if: needs.check-event-schemas-version-change.outputs.version_changed == 'true' runs-on: ubuntu-latest permissions: diff --git a/packages/events/package.json b/packages/events/package.json index 794c9f9..3822cc7 100644 --- a/packages/events/package.json +++ b/packages/events/package.json @@ -15,15 +15,15 @@ "ts-node": "^10.9.2", "typescript": "^5.7.3" }, - "main": "src/index.ts", + "main": "dist/index.js", "name": "@nhsdigital/nhs-notify-event-schemas-letter-rendering", "publishConfig": { "registry": "https://npm.pkg.github.com" }, - "public": false, + "private": false, "repository": "git@github.com:NHSDigital/nhs-notify-standards.git", "scripts": { - "build": "tsc -p tsconfig.build.json", + "build": "rm -f *.tsbuildinfo && tsc -p tsconfig.build.json", "dev": "ts-node src/index.ts", "gen:asyncapi": "mkdir -p ./dist/asyncapi && ts-node src/cli/bundle-asyncapi.ts", "gen:jsonschema": "ts-node src/cli/generate-json.ts", @@ -33,12 +33,12 @@ "lint:schema": "spectral lint client-config/client-config.yaml", "prebuild": "rm -rf dist && npm run gen:asyncapi", "pregen:asyncapi": "npm run gen:jsonschema", - "pregen:jsonschema": "rm -rf ./client-config/json", + "pregen:jsonschema": "rm -rf ./schemas/domain/*.json ./schemas/events/*.json", "prelint:schema": "npm run gen:jsonschema", "start": "node dist/index.js", "test": "jest", "test:unit": "jest", - "prepublishOnly": "npm run build" + "prepare": "npm run build" }, - "version": "1.0.0" + "version": "1.0.2" } diff --git a/packages/events/src/index.ts b/packages/events/src/index.ts new file mode 100644 index 0000000..b1cc6f2 --- /dev/null +++ b/packages/events/src/index.ts @@ -0,0 +1,10 @@ +// Domain exports +export * from "./domain/common"; +export * from "./domain/letter-request"; + +// Event exports +export * from "./events/event-envelope"; +export * from "./events/letter-request-prepared-event"; + +// Helper exports +export * from "./helpers/id-ref"; diff --git a/packages/events/tsconfig.build.json b/packages/events/tsconfig.build.json index 4e1e3e2..69e51c0 100644 --- a/packages/events/tsconfig.build.json +++ b/packages/events/tsconfig.build.json @@ -1,14 +1,14 @@ { "compilerOptions": { + "noEmit": false, "outDir": "dist", "rootDir": "src" }, "exclude": [ "node_modules", "dist", - "**/__tests__/*", "src/cli", - "jest.config.ts" + "src/**/__tests__" ], "extends": "./tsconfig.json", "include": [ diff --git a/scripts/tests/test.mk b/scripts/tests/test.mk index 742d123..9d99801 100644 --- a/scripts/tests/test.mk +++ b/scripts/tests/test.mk @@ -71,10 +71,10 @@ test: # Run all the test tasks @Testing _test: set -e script="./scripts/tests/${name}.sh" - if [ -e "$${script}" ]; then - exec $${script} - else - echo "make test-${name} not implemented: $${script} not found" >&2 + if [ -e "$${script}" ]; then \ + exec $${script}; \ + else \ + echo "make test-${name} not implemented: $${script} not found" >&2; \ fi ${VERBOSE}.SILENT: \