@wooksjs/event-core 0.4.10 → 0.4.12

package/dist/index.cjs

@@ -12,32 +12,18 @@ function attachHook(target, opts, name) {
 }
 
 let currentContext = null;
-/**
- * Create a new event context
- *
- * @param data
- * @returns set of hooks { getCtx, restoreCtx, clearCtx, hookStore, getStore, setStore }
- */
 function createEventContext(data) {
-    const newContext = Object.assign({}, data);
+    const newContext = { ...data };
     currentContext = newContext;
     return _getCtxHelpers(newContext);
 }
-/**
- * Use existing event context
- *
- * !Must be called syncronously while context is reachable
- *
- * @returns set of hooks { getCtx, restoreCtx, clearCtx, hookStore, getStore, setStore }
- */
 function useEventContext(expectedTypes) {
-    var _a;
     if (!currentContext) {
         throw new Error('Event context does not exist. Use event context synchronously within the runtime of the event.');
     }
     const cc = currentContext;
     if (expectedTypes || typeof expectedTypes === 'string') {
-        const type = (_a = cc.event) === null || _a === void 0 ? void 0 : _a.type;
+        const type = cc.event?.type;
         const types = typeof expectedTypes === 'string' ? [expectedTypes] : expectedTypes;
         if (!types.includes(type))
             new Error(`Event context type mismatch: expected ${types
@@ -47,12 +33,6 @@ function useEventContext(expectedTypes) {
     return _getCtxHelpers(cc);
 }
 function _getCtxHelpers(cc) {
-    /**
-     * Hook to an event store property
-     *
-     * @param key store property key
-     * @returns a hook { value: <prop value>, hook: (key2: keyof <prop value>) => { value: <nested prop value> }, ... }
-     */
     function store(key) {
         const obj = {
             value: null,
@@ -112,29 +92,12 @@ function _getCtxHelpers(cc) {
         }
         return obj;
     }
-    /**
-     * Get event context object
-     *
-     * @returns whole context object
-     */
     function getCtx() {
         return cc;
     }
-    /**
-     * Get value of event store property
-     *
-     * @param key property name
-     * @returns value of property by name
-     */
     function get(key) {
         return getCtx()[key];
     }
-    /**
-     * Set value of event store property
-     *
-     * @param key property name
-     * @param v property value
-     */
     function set(key, v) {
         getCtx()[key] = v;
     }
@@ -173,7 +136,10 @@ class EventLogger extends logger.ProstoLogger {
             level: 4,
         };
         if (!_opts.mapper) {
-            _opts.mapper = (msg) => (Object.assign(Object.assign({}, msg), { eventId }));
+            _opts.mapper = (msg) => ({
+                ...msg,
+                eventId,
+            });
         }
         if (!_opts.transports) {
             _opts.transports = [
@@ -182,7 +148,7 @@ class EventLogger extends logger.ProstoLogger {
                 }),
             ];
         }
-        super(_opts, (opts === null || opts === void 0 ? void 0 : opts.topic) || 'event');
+        super(_opts, opts?.topic || 'event');
     }
 }
 
@@ -191,7 +157,7 @@ function useEventLogger(topic) {
     const { store, getCtx } = useEventContext();
     const { init } = store('event');
     const ctx = getCtx();
-    const get = () => init('logger', () => { var _a; return new EventLogger(getId(), (_a = ctx.options) === null || _a === void 0 ? void 0 : _a.eventLogger); });
+    const get = () => init('logger', () => new EventLogger(getId(), ctx.options?.eventLogger));
     return topic ? get().createTopic(topic) : get();
 }
 

package/dist/index.d.ts

@@ -1,110 +1,104 @@
-import { ProstoLogger } from '@prostojs/logger';
-import { TProstoLoggerOptions } from '@prostojs/logger';
-
-export declare function attachHook<V = unknown, T extends object | Function = object, P extends PropertyKey = 'value'>(target: T, opts: {
-    get: () => V | undefined;
-    set?: (value: V) => void;
-}, name?: P): T & THook<V, P>;
-
-/**
- * Create a new event context
- *
- * @param data
- * @returns set of hooks { getCtx, restoreCtx, clearCtx, hookStore, getStore, setStore }
- */
-export declare function createEventContext<S = TEmpty, EventTypeToCreate = TEmpty>(data: S & TGenericContextStore<EventTypeToCreate>): {
-    getCtx: () => S & TGenericContextStore<EventTypeToCreate>;
-    restoreCtx: () => TGenericContextStore<TEmpty>;
-    clearCtx: () => null;
-    store: <K extends keyof S | keyof TGenericContextStore<EventTypeToCreate>>(key: K) => {
-        value: (S & TGenericContextStore<EventTypeToCreate>)[K];
-        hook: <K2 extends keyof Required<S & TGenericContextStore<EventTypeToCreate>>[K]>(key2: K2) => {
-            value: Required<S & TGenericContextStore<EventTypeToCreate>>[K][K2];
-            isDefined: boolean;
-        };
-        init: <K2_1 extends keyof Required<S & TGenericContextStore<EventTypeToCreate>>[K]>(key2: K2_1, getter: () => Required<Required<S & TGenericContextStore<EventTypeToCreate>>[K]>[K2_1]) => Required<Required<S & TGenericContextStore<EventTypeToCreate>>[K]>[K2_1];
-        set: <K2_2 extends keyof Required<S & TGenericContextStore<EventTypeToCreate>>[K]>(key2: K2_2, v: Required<(S & TGenericContextStore<EventTypeToCreate>)[K]>[K2_2]) => Required<(S & TGenericContextStore<EventTypeToCreate>)[K]>[K2_2];
-        get: <K2_3 extends keyof Required<S & TGenericContextStore<EventTypeToCreate>>[K]>(key2: K2_3) => Required<S & TGenericContextStore<EventTypeToCreate>>[K][K2_3];
-        has: <K2_4 extends keyof Required<S & TGenericContextStore<EventTypeToCreate>>[K]>(key2: K2_4) => boolean;
-        del: <K2_5 extends keyof Required<S & TGenericContextStore<EventTypeToCreate>>[K]>(key2: K2_5) => void;
-        entries: () => [string, unknown][];
-        clear: () => void;
-    };
-    getStore: <K_1 extends keyof S | keyof TGenericContextStore<EventTypeToCreate>>(key: K_1) => (S & TGenericContextStore<EventTypeToCreate>)[K_1];
-    setStore: <K_2 extends keyof S | keyof TGenericContextStore<EventTypeToCreate>>(key: K_2, v: (S & TGenericContextStore<EventTypeToCreate>)[K_2]) => void;
-};
-
-export declare class EventLogger extends ProstoLogger<TEventLoggerData> {
-    constructor(eventId: string, opts?: TEventOptions['eventLogger']);
-}
-
-export declare interface TEmpty {
-}
-
-export declare interface TEventLoggerData {
-    eventId: string;
-}
-
-export declare interface TEventOptions {
-    eventLogger?: {
-        topic?: string;
-    } & TProstoLoggerOptions<TEventLoggerData>;
-}
-
-export declare type TGenericContextStore<CustomEventType = TEmpty> = {
-    event: CustomEventType & TGenericEvent;
-    options: TEventOptions;
-    routeParams?: Record<string, string | string[]>;
-};
-
-export declare interface TGenericEvent {
-    type: string;
-    logger?: EventLogger;
-    id?: string;
-}
-
-export declare type THook<T = string, K extends PropertyKey = 'value'> = {
-    [key in K]: T;
-};
-
-/**
- * Use existing event context
- *
- * !Must be called syncronously while context is reachable
- *
- * @returns set of hooks { getCtx, restoreCtx, clearCtx, hookStore, getStore, setStore }
- */
-export declare function useEventContext<S = TEmpty, EventType = TEmpty>(expectedTypes?: string | string[]): {
-    getCtx: () => S & TGenericContextStore<EventType>;
-    restoreCtx: () => TGenericContextStore<TEmpty>;
-    clearCtx: () => null;
-    store: <K extends keyof S | keyof TGenericContextStore<EventType>>(key: K) => {
-        value: (S & TGenericContextStore<EventType>)[K];
-        hook: <K2 extends keyof Required<S & TGenericContextStore<EventType>>[K]>(key2: K2) => {
-            value: Required<S & TGenericContextStore<EventType>>[K][K2];
-            isDefined: boolean;
-        };
-        init: <K2_1 extends keyof Required<S & TGenericContextStore<EventType>>[K]>(key2: K2_1, getter: () => Required<Required<S & TGenericContextStore<EventType>>[K]>[K2_1]) => Required<Required<S & TGenericContextStore<EventType>>[K]>[K2_1];
-        set: <K2_2 extends keyof Required<S & TGenericContextStore<EventType>>[K]>(key2: K2_2, v: Required<(S & TGenericContextStore<EventType>)[K]>[K2_2]) => Required<(S & TGenericContextStore<EventType>)[K]>[K2_2];
-        get: <K2_3 extends keyof Required<S & TGenericContextStore<EventType>>[K]>(key2: K2_3) => Required<S & TGenericContextStore<EventType>>[K][K2_3];
-        has: <K2_4 extends keyof Required<S & TGenericContextStore<EventType>>[K]>(key2: K2_4) => boolean;
-        del: <K2_5 extends keyof Required<S & TGenericContextStore<EventType>>[K]>(key2: K2_5) => void;
-        entries: () => [string, unknown][];
-        clear: () => void;
-    };
-    getStore: <K_1 extends keyof S | keyof TGenericContextStore<EventType>>(key: K_1) => (S & TGenericContextStore<EventType>)[K_1];
-    setStore: <K_2 extends keyof S | keyof TGenericContextStore<EventType>>(key: K_2, v: (S & TGenericContextStore<EventType>)[K_2]) => void;
-};
-
-export declare function useEventId(): {
-    getId: () => string;
-};
-
-export declare function useEventLogger(topic?: string): ProstoLogger<TEventLoggerData>;
-
-export declare function useRouteParams<T extends object = Record<string, string | string[]>>(): {
-    params: T;
-    get: <K extends keyof T>(name: K) => T[K];
-};
-
-export { }
+import * as _prostojs_logger from '@prostojs/logger';
+import { ProstoLogger, TProstoLoggerOptions } from '@prostojs/logger';
+
+interface TEventLoggerData {
+    eventId: string;
+}
+declare class EventLogger extends ProstoLogger<TEventLoggerData> {
+    constructor(eventId: string, opts?: TEventOptions['eventLogger']);
+}
+
+interface TGenericEvent {
+    type: string;
+    logger?: EventLogger;
+    id?: string;
+}
+interface TEmpty {
+}
+
+interface TEventOptions {
+    eventLogger?: {
+        topic?: string;
+    } & TProstoLoggerOptions<TEventLoggerData>;
+}
+type TGenericContextStore<CustomEventType = TEmpty> = {
+    event: CustomEventType & TGenericEvent;
+    options: TEventOptions;
+    routeParams?: Record<string, string | string[]>;
+};
+/**
+ * Create a new event context
+ *
+ * @param data
+ * @returns set of hooks { getCtx, restoreCtx, clearCtx, hookStore, getStore, setStore }
+ */
+declare function createEventContext<S = TEmpty, EventTypeToCreate = TEmpty>(data: S & TGenericContextStore<EventTypeToCreate>): {
+    getCtx: () => S & TGenericContextStore<EventTypeToCreate>;
+    restoreCtx: () => TGenericContextStore<TEmpty>;
+    clearCtx: () => null;
+    store: <K extends keyof S | keyof TGenericContextStore<EventTypeToCreate>>(key: K) => {
+        value: (S & TGenericContextStore<EventTypeToCreate>)[K];
+        hook: <K2 extends keyof Required<S & TGenericContextStore<EventTypeToCreate>>[K]>(key2: K2) => {
+            value: Required<S & TGenericContextStore<EventTypeToCreate>>[K][K2];
+            isDefined: boolean;
+        };
+        init: <K2_1 extends keyof Required<S & TGenericContextStore<EventTypeToCreate>>[K]>(key2: K2_1, getter: () => Required<Required<S & TGenericContextStore<EventTypeToCreate>>[K]>[K2_1]) => Required<Required<S & TGenericContextStore<EventTypeToCreate>>[K]>[K2_1];
+        set: <K2_2 extends keyof Required<S & TGenericContextStore<EventTypeToCreate>>[K]>(key2: K2_2, v: Required<(S & TGenericContextStore<EventTypeToCreate>)[K]>[K2_2]) => Required<(S & TGenericContextStore<EventTypeToCreate>)[K]>[K2_2];
+        get: <K2_3 extends keyof Required<S & TGenericContextStore<EventTypeToCreate>>[K]>(key2: K2_3) => Required<S & TGenericContextStore<EventTypeToCreate>>[K][K2_3];
+        has: <K2_4 extends keyof Required<S & TGenericContextStore<EventTypeToCreate>>[K]>(key2: K2_4) => boolean;
+        del: <K2_5 extends keyof Required<S & TGenericContextStore<EventTypeToCreate>>[K]>(key2: K2_5) => void;
+        entries: () => [string, unknown][];
+        clear: () => void;
+    };
+    getStore: <K_1 extends keyof S | keyof TGenericContextStore<EventTypeToCreate>>(key: K_1) => (S & TGenericContextStore<EventTypeToCreate>)[K_1];
+    setStore: <K_2 extends keyof S | keyof TGenericContextStore<EventTypeToCreate>>(key: K_2, v: (S & TGenericContextStore<EventTypeToCreate>)[K_2]) => void;
+};
+/**
+ * Use existing event context
+ *
+ * !Must be called syncronously while context is reachable
+ *
+ * @returns set of hooks { getCtx, restoreCtx, clearCtx, hookStore, getStore, setStore }
+ */
+declare function useEventContext<S = TEmpty, EventType = TEmpty>(expectedTypes?: string | string[]): {
+    getCtx: () => S & TGenericContextStore<EventType>;
+    restoreCtx: () => TGenericContextStore<TEmpty>;
+    clearCtx: () => null;
+    store: <K extends keyof S | keyof TGenericContextStore<EventType>>(key: K) => {
+        value: (S & TGenericContextStore<EventType>)[K];
+        hook: <K2 extends keyof Required<S & TGenericContextStore<EventType>>[K]>(key2: K2) => {
+            value: Required<S & TGenericContextStore<EventType>>[K][K2];
+            isDefined: boolean;
+        };
+        init: <K2_1 extends keyof Required<S & TGenericContextStore<EventType>>[K]>(key2: K2_1, getter: () => Required<Required<S & TGenericContextStore<EventType>>[K]>[K2_1]) => Required<Required<S & TGenericContextStore<EventType>>[K]>[K2_1];
+        set: <K2_2 extends keyof Required<S & TGenericContextStore<EventType>>[K]>(key2: K2_2, v: Required<(S & TGenericContextStore<EventType>)[K]>[K2_2]) => Required<(S & TGenericContextStore<EventType>)[K]>[K2_2];
+        get: <K2_3 extends keyof Required<S & TGenericContextStore<EventType>>[K]>(key2: K2_3) => Required<S & TGenericContextStore<EventType>>[K][K2_3];
+        has: <K2_4 extends keyof Required<S & TGenericContextStore<EventType>>[K]>(key2: K2_4) => boolean;
+        del: <K2_5 extends keyof Required<S & TGenericContextStore<EventType>>[K]>(key2: K2_5) => void;
+        entries: () => [string, unknown][];
+        clear: () => void;
+    };
+    getStore: <K_1 extends keyof S | keyof TGenericContextStore<EventType>>(key: K_1) => (S & TGenericContextStore<EventType>)[K_1];
+    setStore: <K_2 extends keyof S | keyof TGenericContextStore<EventType>>(key: K_2, v: (S & TGenericContextStore<EventType>)[K_2]) => void;
+};
+
+declare function attachHook<V = unknown, T extends object | Function = object, P extends PropertyKey = 'value'>(target: T, opts: {
+    get: () => V | undefined;
+    set?: (value: V) => void;
+}, name?: P): T & THook<V, P>;
+type THook<T = string, K extends PropertyKey = 'value'> = {
+    [key in K]: T;
+};
+
+declare function useRouteParams<T extends object = Record<string, string | string[]>>(): {
+    params: T;
+    get: <K extends keyof T>(name: K) => T[K];
+};
+
+declare function useEventId(): {
+    getId: () => string;
+};
+
+declare function useEventLogger(topic?: string): _prostojs_logger.ProstoLogger<TEventLoggerData>;
+
+export { EventLogger, type TEmpty, type TEventLoggerData, type TEventOptions, type TGenericContextStore, type TGenericEvent, type THook, attachHook, createEventContext, useEventContext, useEventId, useEventLogger, useRouteParams };

package/dist/index.mjs

@@ -10,32 +10,18 @@ function attachHook(target, opts, name) {
 }
 
 let currentContext = null;
-/**
- * Create a new event context
- *
- * @param data
- * @returns set of hooks { getCtx, restoreCtx, clearCtx, hookStore, getStore, setStore }
- */
 function createEventContext(data) {
-    const newContext = Object.assign({}, data);
+    const newContext = { ...data };
     currentContext = newContext;
     return _getCtxHelpers(newContext);
 }
-/**
- * Use existing event context
- *
- * !Must be called syncronously while context is reachable
- *
- * @returns set of hooks { getCtx, restoreCtx, clearCtx, hookStore, getStore, setStore }
- */
 function useEventContext(expectedTypes) {
-    var _a;
     if (!currentContext) {
         throw new Error('Event context does not exist. Use event context synchronously within the runtime of the event.');
     }
     const cc = currentContext;
     if (expectedTypes || typeof expectedTypes === 'string') {
-        const type = (_a = cc.event) === null || _a === void 0 ? void 0 : _a.type;
+        const type = cc.event?.type;
         const types = typeof expectedTypes === 'string' ? [expectedTypes] : expectedTypes;
         if (!types.includes(type))
             new Error(`Event context type mismatch: expected ${types
@@ -45,12 +31,6 @@ function useEventContext(expectedTypes) {
     return _getCtxHelpers(cc);
 }
 function _getCtxHelpers(cc) {
-    /**
-     * Hook to an event store property
-     *
-     * @param key store property key
-     * @returns a hook { value: <prop value>, hook: (key2: keyof <prop value>) => { value: <nested prop value> }, ... }
-     */
     function store(key) {
         const obj = {
             value: null,
@@ -110,29 +90,12 @@ function _getCtxHelpers(cc) {
         }
         return obj;
     }
-    /**
-     * Get event context object
-     *
-     * @returns whole context object
-     */
     function getCtx() {
         return cc;
     }
-    /**
-     * Get value of event store property
-     *
-     * @param key property name
-     * @returns value of property by name
-     */
     function get(key) {
         return getCtx()[key];
     }
-    /**
-     * Set value of event store property
-     *
-     * @param key property name
-     * @param v property value
-     */
     function set(key, v) {
         getCtx()[key] = v;
     }
@@ -171,7 +134,10 @@ class EventLogger extends ProstoLogger {
             level: 4,
         };
         if (!_opts.mapper) {
-            _opts.mapper = (msg) => (Object.assign(Object.assign({}, msg), { eventId }));
+            _opts.mapper = (msg) => ({
+                ...msg,
+                eventId,
+            });
         }
         if (!_opts.transports) {
             _opts.transports = [
@@ -180,7 +146,7 @@ class EventLogger extends ProstoLogger {
                 }),
             ];
         }
-        super(_opts, (opts === null || opts === void 0 ? void 0 : opts.topic) || 'event');
+        super(_opts, opts?.topic || 'event');
     }
 }
 
@@ -189,7 +155,7 @@ function useEventLogger(topic) {
     const { store, getCtx } = useEventContext();
     const { init } = store('event');
     const ctx = getCtx();
-    const get = () => init('logger', () => { var _a; return new EventLogger(getId(), (_a = ctx.options) === null || _a === void 0 ? void 0 : _a.eventLogger); });
+    const get = () => init('logger', () => new EventLogger(getId(), ctx.options?.eventLogger));
     return topic ? get().createTopic(topic) : get();
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wooksjs/event-core",
-  "version": "0.4.10",
+  "version": "0.4.12",
   "description": "@wooksjs/event-core",
   "main": "dist/index.cjs",
   "module": "dist/index.mjs",
@@ -8,6 +8,14 @@
   "files": [
     "dist"
   ],
+  "exports": {
+    "./package.json": "./package.json",
+    ".": {
+      "require": "./dist/index.cjs",
+      "import": "./dist/index.mjs",
+      "types": "./dist/index.d.ts"
+    }
+  },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/wooksjs/wooksjs.git",
@@ -31,7 +39,7 @@
     "url": "https://github.com/wooksjs/wooksjs/issues"
   },
   "dependencies": {
-    "@prostojs/logger": "^0.3.7"
+    "@prostojs/logger": "^0.4.0"
   },
   "homepage": "https://github.com/wooksjs/wooksjs/tree/main/packages/event-core#readme"
 }