@emoyly/problem 6.0.0 → 7.0.0

package/src/middleware/base.ts

@@ -1,7 +1,7 @@
 import { otherErrors } from '../defaults/index.js'
 import { Problem } from '../problem.js'
 import type { ProblemOpts } from '../typings/index.js'
-import type { MiddlewareOptions, PartialMiddlewareOptions } from '../typings/middleware.js'
+import type { MiddlewareOptions, PartialMiddlewareOptions, ProblemListener } from '../typings/middleware.js'
 import { getProblems } from '../util/getProblems.js'
 
 /**
@@ -61,4 +61,30 @@ export abstract class MiddlewareBase {
     }
 
     fallback: ProblemOpts = otherErrors.unknown
+
+    problemListeners: ProblemListener[] = []
+
+    protected emit = (list: Problem[]) => {
+        for (const listener of this.problemListeners) {
+            listener(list)
+        }
+    }
+
+    /**
+     * Listen to problems
+     */
+    onProblem = (listener: ProblemListener) => {
+        this.problemListeners.push(listener)
+    }
+
+    /**
+     * Un-listen to problems
+     */
+    offProblem = (listener: ProblemListener) => {
+        const idx = this.problemListeners.findIndex(val => val === listener)
+
+        if (idx < 0 || isNaN(idx)) return
+
+        this.problemListeners.splice(idx, 1)
+    }
 }

package/src/middleware/express.ts

@@ -3,7 +3,6 @@ import type { PartialMiddlewareOptions } from '../typings/middleware.js'
 import { MiddlewareBase } from './base.js'
 import { Problem } from '../problem.js'
 import { codes4xx, otherErrors } from '../defaults/index.js'
-import events from '../util/events.js'
 import { defaultInstance } from '../util/defaults.js'
 
 export class ExpressMiddleware extends MiddlewareBase {
@@ -18,7 +17,7 @@ export class ExpressMiddleware extends MiddlewareBase {
                     }
                 }
 
-                events.emit(problems)
+                this.emit(problems)
 
                 res
                     .contentType('application/problem+json')

package/src/typings/index.ts

@@ -1,5 +1,4 @@
 export * from './middleware.js'
 export * from './parser.js'
 export * from './problem.js'
-export * from './events.js'
 export * from './codes.js'

package/src/typings/middleware.ts

@@ -1,3 +1,4 @@
+import type { Problem } from '../problem.js'
 import type { Parser } from './parser.js'
 
 export interface MiddlewareOptions {
@@ -9,3 +10,5 @@ export interface MiddlewareOptions {
 }
 
 export type PartialMiddlewareOptions = Partial<MiddlewareOptions>
+
+export type ProblemListener = (problems: Problem[]) => void

package/src/util/version.ts

@@ -1,4 +1,4 @@
-export const version = '6.0.0'
+export const version = '7.0.0'
 export const major = Number(version.split('.')[0])
 
 export function isCompatibleVersion(inputVersion: string) {

package/cjs/typings/events.d.ts

@@ -1,2 +0,0 @@
-import type { Problem } from '../problem.js';
-export type ProblemListener = (problems: Problem[]) => void;

package/cjs/typings/events.js

@@ -1,2 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });

package/cjs/util/events.d.ts

@@ -1,16 +0,0 @@
-import type { ProblemListener } from '../typings/events.js';
-import { Problem } from '../problem.js';
-declare class ProblemEvents {
-    listeners: ProblemListener[];
-    emit: (list: Problem[]) => void;
-    /**
-     * Listen to problems
-     */
-    onProblem: (listener: ProblemListener) => void;
-    /**
-     * Un-listen to problems
-     */
-    offProblem: (listener: ProblemListener) => void;
-}
-declare const instance: ProblemEvents;
-export default instance;

package/cjs/util/events.js

@@ -1,27 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-class ProblemEvents {
-    listeners = [];
-    emit = (list) => {
-        for (const listener of this.listeners) {
-            listener(list);
-        }
-    };
-    /**
-     * Listen to problems
-     */
-    onProblem = (listener) => {
-        this.listeners.push(listener);
-    };
-    /**
-     * Un-listen to problems
-     */
-    offProblem = (listener) => {
-        const idx = this.listeners.findIndex(val => val === listener);
-        if (idx < 0 || isNaN(idx))
-            return;
-        this.listeners.splice(idx, 1);
-    };
-}
-const instance = new ProblemEvents();
-exports.default = instance;

package/esm/typings/events.d.ts

@@ -1,2 +0,0 @@
-import type { Problem } from '../problem.js';
-export type ProblemListener = (problems: Problem[]) => void;

package/esm/typings/events.js

@@ -1 +0,0 @@
-export {};

package/esm/util/events.d.ts

@@ -1,16 +0,0 @@
-import type { ProblemListener } from '../typings/events.js';
-import { Problem } from '../problem.js';
-declare class ProblemEvents {
-    listeners: ProblemListener[];
-    emit: (list: Problem[]) => void;
-    /**
-     * Listen to problems
-     */
-    onProblem: (listener: ProblemListener) => void;
-    /**
-     * Un-listen to problems
-     */
-    offProblem: (listener: ProblemListener) => void;
-}
-declare const instance: ProblemEvents;
-export default instance;

package/esm/util/events.js

@@ -1,25 +0,0 @@
-class ProblemEvents {
-    listeners = [];
-    emit = (list) => {
-        for (const listener of this.listeners) {
-            listener(list);
-        }
-    };
-    /**
-     * Listen to problems
-     */
-    onProblem = (listener) => {
-        this.listeners.push(listener);
-    };
-    /**
-     * Un-listen to problems
-     */
-    offProblem = (listener) => {
-        const idx = this.listeners.findIndex(val => val === listener);
-        if (idx < 0 || isNaN(idx))
-            return;
-        this.listeners.splice(idx, 1);
-    };
-}
-const instance = new ProblemEvents();
-export default instance;

package/src/typings/events.ts

@@ -1,3 +0,0 @@
-import type { Problem } from '../problem.js'
-
-export type ProblemListener = (problems: Problem[]) => void

package/src/util/events.ts

@@ -1,34 +0,0 @@
-import type { ProblemListener } from '../typings/events.js'
-import { Problem } from '../problem.js'
-
-class ProblemEvents {
-    listeners: ProblemListener[] = []
-
-    emit = (list: Problem[]) => {
-        for (const listener of this.listeners) {
-            listener(list)
-        }
-    }
-
-    /**
-     * Listen to problems
-     */
-    onProblem = (listener: ProblemListener) => {
-        this.listeners.push(listener)
-    }
-
-    /**
-     * Un-listen to problems
-     */
-    offProblem = (listener: ProblemListener) => {
-        const idx = this.listeners.findIndex(val => val === listener)
-
-        if (idx < 0 || isNaN(idx)) return
-
-        this.listeners.splice(idx, 1)
-    }
-}
-
-const instance = new ProblemEvents()
-
-export default instance