Removed stream events method from the API to be able to merge changes…

…, it'll be added later on Also applied other post merge fixed to wrongly resolved conflicts
event-driven-io · Oct 6, 2024 · 62081f2 · 62081f2
1 parent e172275
commit 62081f2
Show file tree

Hide file tree

Showing 21 changed files with 142 additions and 150 deletions.
diff --git a/samples/webApi/expressjs-with-esdb/tsup.config.ts b/samples/webApi/expressjs-with-esdb/tsup.config.ts
@@ -10,6 +10,8 @@ export default defineConfig({
   minify: true, //env === 'production',
   bundle: true, //env === 'production',
   skipNodeModulesBundle: true,
+  entryPoints: ['src/index.ts'],
+  watch: env === 'development',
   target: 'esnext',
   outDir: 'dist', //env === 'production' ? 'dist' : 'lib',
   entry: ['src/index.ts'],

diff --git a/samples/webApi/expressjs-with-postgresql/src/shoppingCarts/api.ts b/samples/webApi/expressjs-with-postgresql/src/shoppingCarts/api.ts
@@ -189,22 +189,6 @@ export const shoppingCartApi =
         });
       }),
     );
-
-    // Get Shopping Cart
-    router.get(
-      '/clients/:clientId/shopping-carts/summary',
-      on(async (request: GetShoppingCartRequest) => {
-        const clientId = assertNotEmptyString(request.params.clientId);
-
-        const result = await getClientShoppingSummary(readStore, clientId);
-
-        if (result === null) return NotFound();
-
-        return OK({
-          body: result,
-        });
-      }),
-    );
   };
 
 // Add Product Item

diff --git a/samples/webApi/expressjs-with-postgresql/src/shoppingCarts/getClientShoppingSummary/index.ts b/samples/webApi/expressjs-with-postgresql/src/shoppingCarts/getClientShoppingSummary/index.ts
@@ -26,12 +26,6 @@ export type CancelledSummary = ShoppingSummary & {
   cartsCount: number;
 };
 
-const initialSummary = {
-  cartsCount: 0,
-  productItemsCount: 0,
-  totalAmount: 0,
-};
-
 const evolve = (
   document: ClientShoppingSummary | null,
   { type, data: event, metadata }: ShoppingCartEvent,
@@ -99,6 +93,12 @@ const evolve = (
   }
 };
 
+const initialSummary = {
+  cartsCount: 0,
+  productItemsCount: 0,
+  totalAmount: 0,
+};
+
 const withAdjustedTotals = (options: {
   summary: ShoppingSummary | undefined;
   with: PricedProductItem | ShoppingSummary;
@@ -125,18 +125,18 @@ const withAdjustedTotals = (options: {
   };
 };
 
-const ClientShoppingSummaryCollectionName = 'ClientShoppingSummary';
+const clientShoppingSummaryCollectionName = 'ClientShoppingSummary';
 
 export const getClientShoppingSummary = (
   db: PongoDb,
   clientId: string,
 ): Promise<ClientShoppingSummary | null> =>
   db
-    .collection<ClientShoppingSummary>(ClientShoppingSummaryCollectionName)
+    .collection<ClientShoppingSummary>(clientShoppingSummaryCollectionName)
     .findOne({ _id: clientId });
 
 export const clientShoppingSummaryProjection = pongoMultiStreamProjection({
-  collectionName: ClientShoppingSummaryCollectionName,
+  collectionName: clientShoppingSummaryCollectionName,
   getDocumentId: (event) => event.metadata.clientId,
   evolve,
   canHandle: [

diff --git a/src/package-lock.json b/src/package-lock.json
diff --git a/src/package.json b/src/package.json
@@ -3,7 +3,6 @@
   "type": "module",
   "version": "0.19.1",
   "description": "Emmett - Event Sourcing development made simple",
-  "type": "module",
   "engines": {
     "node": ">=20.11.1"
   },

diff --git a/src/packages/emmett-esdb/package.json b/src/packages/emmett-esdb/package.json
@@ -3,7 +3,6 @@
   "type": "module",
   "version": "0.19.1",
   "description": "Emmett - EventStoreDB - Event Sourcing development made simple",
-  "type": "module",
   "scripts": {
     "build": "tsup",
     "build:ts": "tsc",
@@ -53,7 +52,6 @@
   },
   "peerDependencies": {
     "@event-driven-io/emmett": "0.19.1",
-    "@eventstore/db-client": "^6.2.1",
-    "web-streams-polyfill": "^4.0.0"
+    "@eventstore/db-client": "^6.2.1"
   }
 }
diff --git a/src/packages/emmett-esdb/src/eventStore/eventstoreDBEventStore.ts b/src/packages/emmett-esdb/src/eventStore/eventstoreDBEventStore.ts
@@ -4,7 +4,6 @@ import {
   STREAM_DOES_NOT_EXIST,
   STREAM_EXISTS,
   globalStreamCaughtUp,
-  restream,
   streamTransformations,
   type AggregateStreamOptions,
   type AggregateStreamResult,
@@ -15,7 +14,6 @@ import {
   type EventStore,
   type ExpectedStreamVersion,
   type GlobalStreamCaughtUp,
-  type GlobalSubscriptionEvent,
   type ReadEvent,
   type ReadEventMetadataWithGlobalPosition,
   type ReadStreamOptions,
@@ -26,10 +24,8 @@ import {
   STREAM_EXISTS as ESDB_STREAM_EXISTS,
   EventStoreDBClient,
   NO_STREAM,
-  START,
   StreamNotFoundError,
   WrongExpectedVersionError,
-  excludeSystemEvents,
   jsonEvent,
   type AllStreamResolvedEvent,
   type AllStreamSubscription,
@@ -179,7 +175,7 @@ export const getEventStoreDBEventStore = (
       }
     },
 
-    streamEvents: streamEvents(eventStore),
+    //streamEvents: streamEvents(eventStore),
   };
 };
 
@@ -251,6 +247,7 @@ const assertExpectedVersionMatchesCurrent = (
     throw new ExpectedVersionConflictError(current, expected);
 };
 
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
 const convertToWebReadableStream = (
   allStreamSubscription: AllStreamSubscription,
 ): ReadableStream<AllStreamResolvedEvent | GlobalStreamCaughtUp> => {
@@ -289,23 +286,22 @@ const convertToWebReadableStream = (
   );
 };
 
-const streamEvents = (eventStore: EventStoreDBClient) => () => {
-  return restream<
-    AllStreamResolvedEvent | GlobalSubscriptionEvent,
-    | ReadEvent<Event, ReadEventMetadataWithGlobalPosition>
-    // eslint-disable-next-line @typescript-eslint/no-redundant-type-constituents
-    | GlobalSubscriptionEvent
-  >(
-    (): ReadableStream<AllStreamResolvedEvent | GlobalSubscriptionEvent> =>
-      convertToWebReadableStream(
-        eventStore.subscribeToAll({
-          fromPosition: START,
-          filter: excludeSystemEvents(),
-        }),
-      ),
-    (
-      resolvedEvent: AllStreamResolvedEvent | GlobalSubscriptionEvent,
-    ): ReadEvent<Event, ReadEventMetadataWithGlobalPosition> =>
-      mapFromESDBEvent(resolvedEvent.event as JSONRecordedEvent<Event>),
-  );
-};
+// const streamEvents = (eventStore: EventStoreDBClient) => () => {
+//   return restream<
+//     AllStreamResolvedEvent | GlobalSubscriptionEvent,
+//     | ReadEvent<Event, ReadEventMetadataWithGlobalPosition>
+//     | GlobalSubscriptionEvent
+//   >(
+//     (): ReadableStream<AllStreamResolvedEvent | GlobalSubscriptionEvent> =>
+//       convertToWebReadableStream(
+//         eventStore.subscribeToAll({
+//           fromPosition: START,
+//           filter: excludeSystemEvents(),
+//         }),
+//       ),
+//     (
+//       resolvedEvent: AllStreamResolvedEvent | GlobalSubscriptionEvent,
+//     ): ReadEvent<Event, ReadEventMetadataWithGlobalPosition> =>
+//       mapFromESDBEvent(resolvedEvent.event as JSONRecordedEvent<Event>),
+//   );
+// };
diff --git a/src/packages/emmett-expressjs/package.json b/src/packages/emmett-expressjs/package.json
@@ -55,7 +55,6 @@
     "express": "^4.19.2",
     "express-async-errors": "^3.1.1",
     "http-problem-details": "^0.1.5",
-    "supertest": "^7.0.0",
-    "web-streams-polyfill": "^4.0.0"
+    "supertest": "^7.0.0"
   }
 }
diff --git a/src/packages/emmett-fastify/package.json b/src/packages/emmett-fastify/package.json
@@ -3,7 +3,6 @@
   "version": "0.19.1",
   "type": "module",
   "description": "Emmett - Event Sourcing development made simple",
-  "type": "module",
   "scripts": {
     "build": "tsup",
     "build:ts": "tsc",

diff --git a/src/packages/emmett-shims/package.json b/src/packages/emmett-shims/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@event-driven-io/emmett-shims",
-  "version": "0.11.2",
+  "version": "0.19.1",
   "type": "module",
   "description": "Emmett - Event Sourcing development made simple",
   "scripts": {

diff --git a/src/packages/emmett-shims/src/index.ts b/src/packages/emmett-shims/src/index.ts
@@ -1,4 +1,10 @@
-import streamsPolyfill from 'web-streams-polyfill';
+import {
+  ReadableStream,
+  TransformStream,
+  WritableStream,
+} from 'web-streams-polyfill';
+
+const streamsPolyfill = { ReadableStream, WritableStream, TransformStream };
 
 // https://github.com/jsdom/jsdom/issues/1537#issuecomment-229405327
 
@@ -40,18 +46,13 @@ let streams: typeof streamsPolyfill;
 
 if (
   globalThis &&
-  // @ts-expect-error global object check
   globalThis.WritableStream &&
-  // @ts-expect-error global object check
   globalThis.ReadableStream &&
-  // @ts-expect-error global object check
   globalThis.TransformStream
 ) {
-  // @ts-expect-error global object check
   streams = globalThis as typeof streamsPolyfill;
 } else {
   try {
-    // @ts-expect-error global object check
     streams = (await import('node:stream/web')) as typeof streamsPolyfill;
   } catch {
     // Just falling back to the default polyfill

diff --git a/src/packages/emmett-testcontainers/package.json b/src/packages/emmett-testcontainers/package.json
@@ -3,7 +3,6 @@
   "version": "0.19.1",
   "type": "module",
   "description": "Emmett - TestContainers - Event Sourcing development made simple",
-  "type": "module",
   "scripts": {
     "build": "tsup",
     "build:ts": "tsc",