@secretlint/core - npm Package Compare versions

Comparing version 6.2.2 to 6.2.3

lib/helper/promise-event-emitter.d.ts

@@ -1,9 +0,17 @@
-/// <reference types="node" />
-import { EventEmitter } from "events";
+export type Listener = (...args: any[]) => void;
+export declare class EventEmitter<T extends Listener = Listener> {
+    #private;
+    on(type: string | Symbol, listener: T): void;
+    emit(type: string | Symbol, ...args: any[]): void;
+    off(type: string | Symbol, listener: T): void;
+    removeAllListeners(): void;
+    listenerCount(type: string | Symbol): number;
+    listeners(type: string | Symbol): T[];
+}
 export declare class PromiseEventEmitter {
     private events;
     constructor();
-    listenerCount(type: string | symbol): number;
-    on(event: string | symbol, listener: (...args: any[]) => void | Promise<void>): EventEmitter;
-    emit(event: string | symbol, ...args: Array<any>): Promise<Array<void>>;
+    listenerCount(type: string | Symbol): number;
+    on(event: string | Symbol, listener: (...args: any[]) => Promise<void> | void): void;
+    emit(event: string | Symbol, ...args: any[]): Promise<void[]>;
 }

lib/helper/promise-event-emitter.js

@@ -0,12 +1,60 @@
+"use strict";
 // MIT © 2017 azu
 // MIT © 2017 59naga
 // https://github.com/59naga/carrack
-"use strict";
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _EventEmitter_listeners;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PromiseEventEmitter = void 0;
-const events_1 = require("events");
+exports.PromiseEventEmitter = exports.EventEmitter = void 0;
+class EventEmitter {
+    constructor() {
+        _EventEmitter_listeners.set(this, new Map());
+    }
+    on(type, listener) {
+        const prevSet = __classPrivateFieldGet(this, _EventEmitter_listeners, "f").get(type);
+        const listenerSet = prevSet !== null && prevSet !== void 0 ? prevSet : new Set();
+        listenerSet === null || listenerSet === void 0 ? void 0 : listenerSet.add(listener);
+        __classPrivateFieldGet(this, _EventEmitter_listeners, "f").set(type, listenerSet);
+    }
+    emit(type, ...args) {
+        const listenerSet = __classPrivateFieldGet(this, _EventEmitter_listeners, "f").get(type);
+        if (!listenerSet) {
+            return;
+        }
+        for (const listenerSetElement of listenerSet) {
+            listenerSetElement(...args);
+        }
+    }
+    off(type, listener) {
+        const listenerSet = __classPrivateFieldGet(this, _EventEmitter_listeners, "f").get(type);
+        if (!listenerSet) {
+            return;
+        }
+        for (const listenerSetElement of listenerSet) {
+            if (listenerSetElement === listener) {
+                listenerSet.delete(listener);
+            }
+        }
+    }
+    removeAllListeners() {
+        __classPrivateFieldGet(this, _EventEmitter_listeners, "f").clear();
+    }
+    listenerCount(type) {
+        var _a, _b;
+        return (_b = (_a = __classPrivateFieldGet(this, _EventEmitter_listeners, "f").get(type)) === null || _a === void 0 ? void 0 : _a.size) !== null && _b !== void 0 ? _b : 0;
+    }
+    listeners(type) {
+        var _a;
+        return Array.from((_a = __classPrivateFieldGet(this, _EventEmitter_listeners, "f").get(type)) !== null && _a !== void 0 ? _a : []);
+    }
+}
+exports.EventEmitter = EventEmitter;
+_EventEmitter_listeners = new WeakMap();
 class PromiseEventEmitter {
     constructor() {
-        this.events = new events_1.EventEmitter();
-        this.events.setMaxListeners(0);
+        this.events = new EventEmitter();
     }
@@ -13,0 +61,0 @@ listenerCount(type) {

lib/index.js

 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
@@ -10,3 +13,4 @@ exports.lintSource = void 0;
 const messages_1 = require("./messages");
-const debug = require("debug")("@secretlint/core");
+const debug_1 = __importDefault(require("debug"));
+const debug = (0, debug_1.default)("@secretlint/core");
 const lintSource = ({ source, options }) => {
@@ -13,0 +17,0 @@ var _a, _b;

lib/RuleContext.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createRuleContext = exports.createContextEvents = void 0;
-const events_1 = require("events");
+const promise_event_emitter_1 = require("./helper/promise-event-emitter");
 const SecretLintRuleMessageTranslator_1 = require("./helper/SecretLintRuleMessageTranslator");
 const createContextEvents = () => {
-    const contextEvents = new events_1.EventEmitter();
+    const contextEvents = new promise_event_emitter_1.EventEmitter();
     const REPORT_SYMBOL = Symbol("report");
@@ -9,0 +9,0 @@ const IGNORE_SYMBOL = Symbol("ignore");

lib/SecretLintSourceCodeImpl.js

 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
@@ -30,4 +7,4 @@ return (mod && mod.__esModule) ? mod : { "default": mod };
 exports.SecretLintSourceCodeImpl = void 0;
-const assert = __importStar(require("assert"));
 const structured_source_1 = __importDefault(require("structured-source"));
+const invariant_1 = require("./helper/invariant");
 /**
@@ -38,3 +15,3 @@ * This class represent of source code.
     constructor({ content = "", ext, filePath, contentType, }) {
-        assert.ok(ext || filePath, "should be set either of fileExt or filePath.");
+        (0, invariant_1.invariant)(ext || filePath, "should be set either of fileExt or filePath.");
         this.hasBOM = content.charCodeAt(0) === 0xfeff;
@@ -41,0 +18,0 @@ this.content = this.hasBOM ? content.slice(1) : content;

package.json

 {
     "name": "@secretlint/core",
-    "version": "6.2.2",
+    "version": "6.2.3",
     "description": "Core library for @secretlint.",
@@ -43,4 +43,4 @@ "keywords": [
     "dependencies": {
-        "@secretlint/profiler": "^6.2.2",
-        "@secretlint/types": "^6.2.2",
+        "@secretlint/profiler": "^6.2.3",
+        "@secretlint/types": "^6.2.3",
         "debug": "^4.3.4",
@@ -50,2 +50,3 @@ "structured-source": "^3.0.2"
     "devDependencies": {
+        "@types/debug": "^4.1.7",
         "@types/mocha": "^10.0.1",
@@ -68,3 +69,3 @@ "@types/node": "^18.11.18",
     },
-    "gitHead": "7b87a6116a9c004ef687516bb7b11fed8d0b5d50"
+    "gitHead": "33526d2cc14778bd0e3df752c0ea91214daec5e5"
 }

src/helper/promise-event-emitter.ts

 // MIT © 2017 azu
 // MIT © 2017 59naga
 // https://github.com/59naga/carrack
-"use strict";
-import { EventEmitter } from "events";
 
+export type Listener = (...args: any[]) => void;
+
+export class EventEmitter<T extends Listener = Listener> {
+    #listeners = new Map<string | Symbol, Set<T>>();
+
+    on(type: string | Symbol, listener: T): void {
+        const prevSet = this.#listeners.get(type);
+        const listenerSet = prevSet ?? new Set<T>();
+        listenerSet?.add(listener);
+        this.#listeners.set(type, listenerSet);
+    }
+
+    emit(type: string | Symbol, ...args: any[]): void {
+        const listenerSet = this.#listeners.get(type);
+        if (!listenerSet) {
+            return;
+        }
+        for (const listenerSetElement of listenerSet) {
+            listenerSetElement(...args);
+        }
+    }
+
+    off(type: string | Symbol, listener: T): void {
+        const listenerSet = this.#listeners.get(type);
+        if (!listenerSet) {
+            return;
+        }
+        for (const listenerSetElement of listenerSet) {
+            if (listenerSetElement === listener) {
+                listenerSet.delete(listener);
+            }
+        }
+    }
+
+    removeAllListeners(): void {
+        this.#listeners.clear();
+    }
+
+    listenerCount(type: string | Symbol): number {
+        return this.#listeners.get(type)?.size ?? 0;
+    }
+
+    listeners(type: string | Symbol): T[] {
+        return Array.from(this.#listeners.get(type) ?? []);
+    }
+}
+
 export class PromiseEventEmitter {
-    private events: EventEmitter;
+    private events: EventEmitter<(...args: any[]) => Promise<void> | void>;
 
     constructor() {
         this.events = new EventEmitter();
-        this.events.setMaxListeners(0);
     }
 
-    listenerCount(type: string | symbol): number {
+    listenerCount(type: string | Symbol): number {
         return this.events.listenerCount(type);
     }
 
-    on(event: string | symbol, listener: (...args: any[]) => void | Promise<void>) {
+    on(event: string | Symbol, listener: (...args: any[]) => Promise<void> | void) {
         return this.events.on(event, listener);
     }
 
-    emit(event: string | symbol, ...args: Array<any>): Promise<Array<void>> {
-        const promises: Array<Promise<void>> = [];
+    emit(event: string | Symbol, ...args: any[]): Promise<void[]> {
+        const promises: (Promise<void> | void)[] = [];
 
@@ -26,0 +70,0 @@ this.events.listeners(event).forEach((listener) => {

src/index.ts

@@ -19,4 +19,4 @@ import {
 import { cleanupMessages } from "./messages";
-
-const debug = require("debug")("@secretlint/core");
+import debug0 from "debug";
+const debug = debug0("@secretlint/core");
 export type SecretLintSourceOptions = {
@@ -23,0 +23,0 @@ /**

src/RuleContext.ts

@@ -1,2 +0,2 @@
-import { EventEmitter } from "events";
+import { EventEmitter } from "./helper/promise-event-emitter";
 import {
@@ -3,0 +3,0 @@ SecretLintCoreIgnoreDescriptor,

src/SecretLintSourceCodeImpl.ts

@@ -1,2 +0,1 @@
-import * as assert from "assert";
 import StructuredSource from "structured-source";
@@ -9,2 +8,3 @@ import {
 } from "@secretlint/types";
+import { invariant } from "./helper/invariant";
 
@@ -33,3 +33,3 @@ /**
     }) {
-        assert.ok(ext || filePath, "should be set either of fileExt or filePath.");
+        invariant(ext || filePath, "should be set either of fileExt or filePath.");
         this.hasBOM = content.charCodeAt(0) === 0xfeff;
@@ -36,0 +36,0 @@ this.content = this.hasBOM ? content.slice(1) : content;

No alert changes

Improved metrics

Total package byte prevSize

107639

increased by5.39%

Number of package files

67

increased by6.35%

Lines of code

2145

increased by5.25%

Worsened metrics

Dev dependency count

11

increased by10%

Dependency changes

• Updated@secretlint/profiler@^6.2.3

• Updated@secretlint/types@^6.2.3