@unchainedshop/core-events 2.0.0-beta8 → 2.0.0-beta9

package/jest.config.js

@@ -2,4 +2,13 @@
 export default {
   preset: 'ts-jest',
   testEnvironment: 'node',
+  extensionsToTreatAsEsm: ['.ts'],
+  transform: {
+    '^.+\\.tsx?$': [
+      'ts-jest',
+      {
+        useESM: true,
+      },
+    ],
+  },
 };

package/lib/module/configureEventsModule.d.ts

@@ -1,3 +1,8 @@
-import { EventsModule } from '@unchainedshop/types/events';
+import { EventQuery, EventsModule } from '@unchainedshop/types/events';
 import { ModuleInput } from '@unchainedshop/types/core';
+export declare const buildFindSelector: ({ types, queryString, created }: EventQuery) => {
+    type?: any;
+    $text?: any;
+    created?: any;
+};
 export declare const configureEventsModule: ({ db, }: ModuleInput<Record<string, never>>) => Promise<EventsModule>;

package/lib/module/configureEventsModule.js

@@ -4,7 +4,7 @@ import { SortDirection } from '@unchainedshop/types/api';
 import { EventsCollection } from '../db/EventsCollection';
 import { EventsSchema } from '../db/EventsSchema';
 import { configureEventHistoryAdapter } from './configureEventHistoryAdapter';
-const buildFindSelector = ({ types, queryString, created }) => {
+export const buildFindSelector = ({ types, queryString, created }) => {
     const selector = {};
     if (types && Array.isArray(types))
         selector.type = { $in: types };
@@ -27,10 +27,11 @@ export const configureEventsModule = async ({ db, }) => {
             return Events.findOne(selector, options);
         },
         findEvents: async ({ limit, offset, sort, ...query }) => {
+            const defaultSort = [{ key: 'created', value: SortDirection.DESC }];
             return Events.find(buildFindSelector(query), {
                 skip: offset,
                 limit,
-                sort: buildSortOptions(sort || [{ key: 'created', value: SortDirection.DESC }]),
+                sort: buildSortOptions(sort || defaultSort),
             }).toArray();
         },
         type: (event) => {

package/lib/module/configureEventsModule.js.map

@@ -1 +1 @@
-{"version":3,"file":"configureEventsModule.js","sourceRoot":"","sources":["../../src/module/configureEventsModule.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,mBAAmB,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAGnG,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EAAE,aAAa,EAAc,MAAM,0BAA0B,CAAC;AAErE,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,4BAA4B,EAAE,MAAM,gCAAgC,CAAC;AAE9E,MAAM,iBAAiB,GAAG,CAAC,EAAE,KAAK,EAAE,WAAW,EAAE,OAAO,EAAc,EAAE,EAAE;IACxE,MAAM,QAAQ,GAA+C,EAAE,CAAC;IAEhE,IAAI,KAAK,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;QAAE,QAAQ,CAAC,IAAI,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC;IAClE,IAAI,WAAW;QAAE,QAAQ,CAAC,KAAK,GAAG,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC;IAC3D,IAAI,OAAO;QAAE,QAAQ,CAAC,OAAO,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;IAClD,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,qBAAqB,GAAG,KAAK,EAAE,EAC1C,EAAE,GACiC,EAAyB,EAAE;IAC9D,MAAM,MAAM,GAAG,MAAM,gBAAgB,CAAC,EAAE,CAAC,CAAC;IAE1C,MAAM,SAAS,GAAG,mBAAmB,CAAQ,MAAM,EAAE,YAAY,EAAE;QACjE,aAAa,EAAE,IAAI;KACpB,CAA2B,CAAC;IAE7B,4BAA4B,CAAC,SAAS,CAAC,CAAC;IAExC,OAAO;QACL,GAAG,SAAS;QACZ,SAAS,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,GAAG,IAAI,EAAE,EAAE,OAAO,EAAE,EAAE;YACjD,MAAM,QAAQ,GAAG,OAAO,CAAC,CAAC,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;YAChE,OAAO,MAAM,CAAC,OAAO,CAAC,QAAoC,EAAE,OAAO,CAAC,CAAC;QACvE,CAAC;QAED,UAAU,EAAE,KAAK,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,KAAK,EAAE,EAAE,EAAE;YACtD,OAAO,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,EAAE;gBAC3C,IAAI,EAAE,MAAM;gBACZ,KAAK;gBACL,IAAI,EAAE,gBAAgB,CAAC,IAAI,IAAI,CAAC,EAAE,GAAG,EAAE,SAAS,EAAE,KAAK,EAAE,aAAa,CAAC,IAAI,EAAgB,CAAC,CAAC;aAC9F,CAAC,CAAC,OAAO,EAAE,CAAC;QACf,CAAC;QAED,IAAI,EAAE,CAAC,KAAK,EAAE,EAAE;YACd,IAAI,mBAAmB,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE;gBAC9C,OAAO,KAAK,CAAC,IAAI,CAAC;aACnB;YACD,OAAO,SAAS,CAAC;QACnB,CAAC;QAED,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE;YACrB,MAAM,KAAK,GAAG,MAAM,MAAM,CAAC,cAAc,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC,CAAC;YACpE,OAAO,KAAK,CAAC;QACf,CAAC;KACF,CAAC;AACJ,CAAC,CAAC"}
+{"version":3,"file":"configureEventsModule.js","sourceRoot":"","sources":["../../src/module/configureEventsModule.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,mBAAmB,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAGnG,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EAAE,aAAa,EAAc,MAAM,0BAA0B,CAAC;AAErE,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,4BAA4B,EAAE,MAAM,gCAAgC,CAAC;AAE9E,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,EAAE,KAAK,EAAE,WAAW,EAAE,OAAO,EAAc,EAAE,EAAE;IAC/E,MAAM,QAAQ,GAA+C,EAAE,CAAC;IAEhE,IAAI,KAAK,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;QAAE,QAAQ,CAAC,IAAI,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC;IAClE,IAAI,WAAW;QAAE,QAAQ,CAAC,KAAK,GAAG,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC;IAC3D,IAAI,OAAO;QAAE,QAAQ,CAAC,OAAO,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;IAClD,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,qBAAqB,GAAG,KAAK,EAAE,EAC1C,EAAE,GACiC,EAAyB,EAAE;IAC9D,MAAM,MAAM,GAAG,MAAM,gBAAgB,CAAC,EAAE,CAAC,CAAC;IAE1C,MAAM,SAAS,GAAG,mBAAmB,CAAQ,MAAM,EAAE,YAAY,EAAE;QACjE,aAAa,EAAE,IAAI;KACpB,CAA2B,CAAC;IAE7B,4BAA4B,CAAC,SAAS,CAAC,CAAC;IAExC,OAAO;QACL,GAAG,SAAS;QACZ,SAAS,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,GAAG,IAAI,EAAE,EAAE,OAAO,EAAE,EAAE;YACjD,MAAM,QAAQ,GAAG,OAAO,CAAC,CAAC,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;YAChE,OAAO,MAAM,CAAC,OAAO,CAAC,QAAoC,EAAE,OAAO,CAAC,CAAC;QACvE,CAAC;QAED,UAAU,EAAE,KAAK,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,KAAK,EAAE,EAAE,EAAE;YACtD,MAAM,WAAW,GAAG,CAAC,EAAE,GAAG,EAAE,SAAS,EAAE,KAAK,EAAE,aAAa,CAAC,IAAI,EAAE,CAAsB,CAAC;YACzF,OAAO,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,EAAE;gBAC3C,IAAI,EAAE,MAAM;gBACZ,KAAK;gBACL,IAAI,EAAE,gBAAgB,CAAC,IAAI,IAAI,WAAW,CAAC;aAC5C,CAAC,CAAC,OAAO,EAAE,CAAC;QACf,CAAC;QAED,IAAI,EAAE,CAAC,KAAK,EAAE,EAAE;YACd,IAAI,mBAAmB,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE;gBAC9C,OAAO,KAAK,CAAC,IAAI,CAAC;aACnB;YACD,OAAO,SAAS,CAAC;QACnB,CAAC;QAED,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE;YACrB,MAAM,KAAK,GAAG,MAAM,MAAM,CAAC,cAAc,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC,CAAC;YACpE,OAAO,KAAK,CAAC;QACf,CAAC;KACF,CAAC;AACJ,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unchainedshop/core-events",
-  "version": "2.0.0-beta8",
+  "version": "2.0.0-beta9",
   "main": "lib/events-index.js",
   "exports": {
     ".": "./lib/events-index.js",
@@ -12,7 +12,8 @@
     "clean": "rm -rf lib",
     "build": "npm run clean && tsc",
     "watch": "tsc -w",
-    "test": "jest --watch"
+    "test": "NODE_OPTIONS=--experimental-vm-modules jest --detectOpenHandles --forceExit",
+    "test:watch": "NODE_OPTIONS=--experimental-vm-modules jest --watch --detectOpenHandles --forceExit"
   },
   "repository": {
     "type": "git",
@@ -30,16 +31,16 @@
   },
   "homepage": "https://github.com/unchainedshop/unchained#readme",
   "dependencies": {
-    "@unchainedshop/events": "^2.0.0-beta8",
-    "@unchainedshop/utils": "^2.0.0-beta8",
-    "simpl-schema": "^3.0.1"
+    "@unchainedshop/events": "^2.0.0-beta9",
+    "@unchainedshop/utils": "^2.0.0-beta9",
+    "simpl-schema": "^3.2.0"
   },
   "devDependencies": {
-    "@types/node": "^18.11.9",
-    "@unchainedshop/types": "^2.0.0-beta8",
+    "@types/node": "^18.11.12",
+    "@unchainedshop/types": "^2.0.0-beta9",
     "jest": "^29.3.1",
     "mongodb": "^4.12.1",
     "ts-jest": "^29.0.3",
-    "typescript": "^4.9.3"
+    "typescript": "^4.9.4"
   }
 }

package/src/module/configureEventsModule.ts

@@ -8,7 +8,7 @@ import { EventsCollection } from '../db/EventsCollection';
 import { EventsSchema } from '../db/EventsSchema';
 import { configureEventHistoryAdapter } from './configureEventHistoryAdapter';
 
-const buildFindSelector = ({ types, queryString, created }: EventQuery) => {
+export const buildFindSelector = ({ types, queryString, created }: EventQuery) => {
   const selector: { type?: any; $text?: any; created?: any } = {};
 
   if (types && Array.isArray(types)) selector.type = { $in: types };
@@ -36,10 +36,11 @@ export const configureEventsModule = async ({
     },
 
     findEvents: async ({ limit, offset, sort, ...query }) => {
+      const defaultSort = [{ key: 'created', value: SortDirection.DESC }] as Array<SortOption>;
       return Events.find(buildFindSelector(query), {
         skip: offset,
         limit,
-        sort: buildSortOptions(sort || [{ key: 'created', value: SortDirection.DESC } as SortOption]),
+        sort: buildSortOptions(sort || defaultSort),
       }).toArray();
     },
 

package/tests/events-index.test.ts

@@ -1,33 +1,30 @@
-import { assert } from 'chai';
-import { initDb } from '@unchainedshop/mongodb';
-import { configureEventsModule } from '@unchainedshop/events';
-import { emit, registerEvents, getEmitHistoryAdapter } from '@unchainedshop/events';
+import { buildFindSelector } from "../src/module/configureEventsModule";
 
-describe('Test exports', () => {
-  let module;
-  before(async () => {
-    const db = await initDb();
-    module = await configureEventsModule({ db });
-
-    registerEvents(['TEST EVENT']);
-  });
-  it('Configure Events', () => {
-    assert.isDefined(configureEventsModule);
-    assert.ok(module);
-    assert.isFunction(module.findEvent);
+describe('Event', () => {
+  describe('buildFindSelector', () => {
+  it('Return correct filter object when passed create, queryString, types', async () => {
+   expect(buildFindSelector({created: new Date("2022-12-03T18:23:38.278Z"), queryString: "Hello world", types: ['PRODUCT_CREATED']})).toEqual({
+      type: { '$in': [ 'PRODUCT_CREATED' ] },
+      '$text': { '$search': 'Hello world' },
+      created: { '$gte': new Date( "2022-12-03T18:23:38.278Z" )}
+    })
   });
 
-  it('Test event history adapter', async () => {
-    assert.ok(getEmitHistoryAdapter());
+  it('Return correct filter object when passed create, queryString', async () => {
+    expect(buildFindSelector({created: new Date("2022-12-03T18:23:38.278Z"), queryString: "Hello world"})).toEqual({       
+       '$text': { '$search': 'Hello world' },
+       created: { '$gte': new Date( "2022-12-03T18:23:38.278Z" )}
+     })
+   });
 
-    await emit('TEST EVENT', { orderId: 'Order1234' });
+   it('Return correct filter object when passed create', async () => {
+    expect(buildFindSelector({created: new Date("2022-12-03T18:23:38.278Z")})).toEqual({              
+       created: { '$gte': new Date( "2022-12-03T18:23:38.278Z" )}
+     })
+   });
 
-    const events = await module.findEvents({
-      limit: 10,
-      offset: 0,
-      type: 'TEST EVENT',
-    });
-
-    assert.isAtLeast(events.length, 1)
-  });
+   it('Return correct filter object when passed no argument', async () => {
+    expect(buildFindSelector({})).toEqual({})
+   });
+})
 });