TS: Resolve all circular dependencies and run madge as part of CI checks

js/pond/package.json

@@ -70,7 +70,7 @@
     "clean": "rimraf ./lib ./coverage",
     "build": "tsc -p ./tsconfig.prod.json",
     "build:watch": "npm run build -- --watch --pretty",
-    "build:prod": "npm run clean && npm run lint && npm run test:ci && npm run build && npm run api:accept",
+    "build:prod": "npm run clean && npm run lint && npm run test:ci && npm run build && npm run api:accept && npm run madge",
     "lint": "eslint ./src --ext .js,.jsx,.ts,.tsx",
     "lint:fix": "npm run lint -- --fix",
     "format:configs": "prettier --write .prettierrc.json jest.config.js .vscode/settings.json tsconfig.prod.json tsconfig.json .eslintrc.json",

js/sdk/package.json

@@ -81,7 +81,7 @@
     "clean": "rimraf ./lib ./coverage",
     "build": "tsc -p ./tsconfig.prod.json",
     "build:watch": "npm run build -- --watch --pretty",
-    "build:prod": "npm run clean && npm run lint && npm run test:ci && npm run build && npm run api:accept",
+    "build:prod": "npm run clean && npm run lint && npm run test:ci && npm run build && npm run api:accept && npm run madge",
     "lint": "eslint ./src --ext .js,.jsx,.ts,.tsx",
     "lint:fix": "npm run lint -- --fix",
     "format:configs": "prettier --write .prettierrc.json jest.config.js .vscode/settings.json tsconfig.prod.json tsconfig.json .eslintrc.json",

js/sdk/src/actyx.ts

@@ -5,7 +5,7 @@
  * Copyright (C) 2021 Actyx AG
  */
 import { EventFns, TestEventFns } from './event-fns'
-import { EventFnsFromEventStoreV2, EventStoreV2 } from './internal_common'
+import { EventFnsFromEventStoreV2, EventStores } from './internal_common'
 import { log } from './internal_common/log'
 import { SnapshotStore } from './snapshotStore'
 import { ActyxOpts, ActyxTestOpts, AppId, AppManifest, NodeId } from './types'
@@ -102,7 +102,7 @@ export const Actyx = {
    * @public
    */
   test: (opts: ActyxTestOpts = {}): TestActyx => {
-    const store = EventStoreV2.test(opts.nodeId)
+    const store = EventStores.test(opts.nodeId)
     const snaps = SnapshotStore.inMem()
     const nodeId = opts.nodeId || NodeId.of('TESTNODEID')
 

js/sdk/src/internal_common/event-fns-impl.spec.ts

@@ -5,7 +5,6 @@
  * Copyright (C) 2021 Actyx AG
  */
 import { chunksOf } from 'fp-ts/lib/Array'
-import { Subject } from '../../node_modules/rxjs'
 import {
   ActyxEvent,
   allEvents,
@@ -16,9 +15,10 @@ import {
   NodeId,
   Where,
 } from '..'
+import { Subject } from '../../node_modules/rxjs'
 import { SnapshotStore } from '../snapshotStore'
 import { EventFnsFromEventStoreV2 } from './event-fns-impl'
-import { EventStore } from './eventStore'
+import { testEventStore } from './testEventStore'
 import { emitter, mkTimeline } from './testHelper'
 import { Event, Events } from './types'
 
@@ -141,7 +141,7 @@ const setup = () => {
   const srcC = emitter('C')
   const tl = mkTimeline(srcC(5), srcB(6), srcA(7), srcA(8), srcB(9), srcC(10))
 
-  const store = EventStore.test()
+  const store = testEventStore()
   const fns = EventFnsFromEventStoreV2(NodeId.of('noop'), store, SnapshotStore.noop)
 
   return { store, fns, tl }

js/sdk/src/internal_common/eventStore.ts

@@ -6,8 +6,6 @@
  */
 import { Observable } from '../../node_modules/rxjs'
 import { EventsSortOrder, NodeId, OffsetMap, Where } from '../types'
-import { mockEventStore } from './mockEventStore'
-import { testEventStore, TestEventStore } from './testEventStore'
 import { Event, Events, OffsetsResponse, UnstoredEvents } from './types'
 
 /**
@@ -76,21 +74,3 @@ export type EventStore = {
   readonly subscribe: DoSubscribe
   readonly persistEvents: DoPersistEvents
 }
-
-const noopEventStore: EventStore = {
-  subscribe: () => Observable.empty(),
-  query: () => Observable.empty(),
-  queryUnchecked: () => Observable.empty(),
-  offsets: () => Promise.resolve({ present: {}, toReplicate: {} }),
-  persistEvents: () => Observable.empty(),
-}
-
-export const EventStore: {
-  noop: EventStore
-  mock: () => EventStore
-  test: (nodeId?: NodeId, eventChunkSize?: number) => TestEventStore
-} = {
-  noop: noopEventStore,
-  mock: mockEventStore,
-  test: testEventStore,
-}

js/sdk/src/internal_common/index.ts

@@ -7,3 +7,22 @@
 export { EventFnsFromEventStoreV2 } from './event-fns-impl'
 export { EventStore as EventStoreV2 } from './eventStore'
 export * from './types'
+
+import { Observable } from '../../node_modules/rxjs'
+import { EventStore } from './eventStore'
+import { mockEventStore } from './mockEventStore'
+import { testEventStore } from './testEventStore'
+
+const noopEventStore: EventStore = {
+  subscribe: () => Observable.empty(),
+  query: () => Observable.empty(),
+  queryUnchecked: () => Observable.empty(),
+  offsets: () => Promise.resolve({ present: {}, toReplicate: {} }),
+  persistEvents: () => Observable.empty(),
+}
+
+export const EventStores = {
+  noop: noopEventStore,
+  mock: mockEventStore,
+  test: testEventStore,
+}