Fix up common module imports

Signed-off-by: Connor Avery <[email protected]>

Author: connoravo-nhs

Makefile

@@ -125,7 +125,8 @@ lint-node: compile-node
 	npm run lint --workspace packages/nhsd-pfp-sandbox
 	npm run lint --workspace packages/statusLambda
 	npm run lint --workspace packages/serviceSearchClient
-	npm run lint --workspace packages/common
+	npm run lint --workspace packages/common/utilities
+	npm run lint --workspace packages/common/tests
 	npm run lint --workspace packages/distanceSelling
 
 lint-samtemplates:
@@ -147,7 +148,8 @@ test: compile
 	npm run test --workspace packages/statusLambda
 	npm run test --workspace packages/serviceSearchClient
 	npm run test --workspace packages/distanceSelling
-	npm run test --workspace packages/common
+	npm run test --workspace packages/common/utilities
+	npm run test --workspace packages/common/tests
 
 clean:
 	rm -rf packages/capabilityStatement/coverage

jest.default.config.ts

@@ -13,8 +13,8 @@ const jestConfig: JestConfigWithTsJest = {
     "^(\\.{1,2}/.*)\\.js$": "$1",
     "^@common/tests$": "<rootDir>/../../packages/common/tests/lib/index.js",
     "^@common/tests/(.*)$": "<rootDir>/../../packages/common/tests/lib/$1.js",
-    "^@common/utilities$": "<rootDir>/../../packages/common/lib/index.js",
-    "^@common/utilities(.*)$": "<rootDir>/../../packages/common/lib/$1.js"
+    "^@common/utilities$": "<rootDir>/../../packages/common/utilities/lib/index.js",
+    "^@common/utilities/(.*)$": "<rootDir>/../../packages/common/utilities/lib/$1.js"
   },
   transform: {
     "^.+\\.ts?$": [

package.json

@@ -20,7 +20,8 @@
     "packages/nhsd-pfp-sandbox",
     "packages/statusLambda",
     "packages/serviceSearchClient",
-    "packages/common",
+    "packages/common/utilities",
+    "packages/common/tests",
     "packages/distanceSelling"
   ],
   "devDependencies": {

packages/capabilityStatement/tests/test-handler.test.ts

@@ -9,7 +9,7 @@ import {
   helloworldContext,
   test_append_trace_ids,
   test_mime_type
-} from "@common/utilities"
+} from "@common/tests"
 
 const dummyContext = helloworldContext
 const mockEvent: APIGatewayProxyEvent = mockAPIGatewayProxyEvent

packages/capabilityStatement/tsconfig.json

@@ -4,6 +4,10 @@
     "rootDir": ".",
     "outDir": "lib"
   },
+  "references": [
+    { "path": "../common/utilities" },
+    { "path": "../common/tests" }
+  ],
   "include": ["src/**/*", "tests/**/*", "examples/CapabilityStatement/apim-medicines-prescriptionsforpatients.json"],
   "exclude": ["node_modules"]
 }