From cfd73c6a97d342d9d1a3bff0cc5a709761003cc2 Mon Sep 17 00:00:00 2001 From: Romain Lenzotti Date: Fri, 29 Nov 2024 16:40:42 +0100 Subject: [PATCH] chore: update eslint --- .eslintignore | 11 - .eslintrc | 32 - eslint.config.mjs | 72 ++ package.json | 14 +- packages/connect/package.json | 2 +- packages/connect/src/ConnectAppender.spec.ts | 3 +- packages/file/package.json | 2 +- packages/file/src/FileAppender.spec.ts | 1 + packages/file/src/FileAppender.ts | 2 +- packages/insight/package.json | 2 +- packages/insight/src/InsightAppender.ts | 2 +- packages/logentries/package.json | 2 +- packages/logentries/src/LogEntriesAppender.ts | 2 +- packages/logger/package.json | 5 +- packages/logger/src/browser/exports.ts | 2 +- .../src/browser/layouts/LayoutReplacer.ts | 5 +- .../appenders/class/BaseAppender.spec.ts | 10 +- .../components/ConsoleAppender.spec.ts | 7 +- .../appenders/components/ConsoleAppender.ts | 2 +- .../common/appenders/decorators/appender.ts | 2 +- .../logger/src/common/core/LogEvent.spec.ts | 2 +- packages/logger/src/common/core/LogEvent.ts | 2 +- .../logger/src/common/core/LogLevel.spec.ts | 4 +- .../src/common/layouts/class/Layouts.ts | 2 +- .../layouts/components/BasicLayout.spec.ts | 5 +- .../common/layouts/components/BasicLayout.ts | 4 +- .../layouts/components/ColoredLayout.spec.ts | 5 +- .../layouts/components/ColoredLayout.ts | 4 +- .../common/layouts/components/DummyLayout.ts | 2 +- .../layouts/components/JsonLayout.spec.ts | 7 +- .../common/layouts/components/JsonLayout.ts | 2 +- .../MessagePassThroughLayout.spec.ts | 5 +- .../components/MessagePassThroughLayout.ts | 2 +- .../common/layouts/components/ObjectLayout.ts | 2 +- .../layouts/components/PatternLayout.spec.ts | 9 +- .../layouts/components/PatternLayout.ts | 8 +- .../src/common/layouts/constants/logColors.ts | 2 +- .../utils/timestampLevelAndCategory.ts | 3 +- .../src/common/logger/class/Logger.spec.ts | 29 +- .../logger/src/common/logger/class/Logger.ts | 8 +- .../logger/class/LoggerAppenders.spec.ts | 13 +- .../common/logger/class/LoggerAppenders.ts | 4 +- .../src/node/appenders/StderrAppender.spec.ts | 7 +- .../src/node/appenders/StderrAppender.ts | 4 +- .../src/node/appenders/StdoutAppender.spec.ts | 11 +- .../src/node/appenders/StdoutAppender.ts | 4 +- packages/logger/src/node/exports.ts | 8 +- .../logger/src/node/layouts/LayoutReplacer.ts | 8 +- packages/loggly/package.json | 2 +- packages/logstash-http/package.json | 2 +- .../logstash-http/src/LogStashHttpAppender.ts | 2 +- packages/logstash-udp/package.json | 2 +- .../logstash-udp/src/LogStashUdpAppender.ts | 2 +- packages/rabbitmq/package.json | 2 +- packages/rabbitmq/src/RabbitMQAppender.ts | 2 +- packages/seq/package.json | 2 +- packages/slack/package.json | 2 +- packages/slack/src/SlackAppender.ts | 3 +- packages/smtp/package.json | 2 +- packages/smtp/src/SmtpAppender.ts | 2 +- tools/typescript/index.js | 185 +++-- tools/typescript/package.json | 7 +- tools/vitest/package.json | 6 +- tools/vitest/presets/alias.js | 14 +- tools/vitest/presets/index.js | 2 +- yarn.lock | 667 +++++++++++------- 66 files changed, 706 insertions(+), 546 deletions(-) delete mode 100644 .eslintignore delete mode 100644 .eslintrc create mode 100644 eslint.config.mjs diff --git a/.eslintignore b/.eslintignore deleted file mode 100644 index 40eb8662..00000000 --- a/.eslintignore +++ /dev/null @@ -1,11 +0,0 @@ -node_modules -docs -docs-references -**/lib -**/dist -**/coverage -**/.nyc_output -**/node_modules -*-lock.json -*.lock -benchmarks.* diff --git a/.eslintrc b/.eslintrc deleted file mode 100644 index 33823777..00000000 --- a/.eslintrc +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parser": "@typescript-eslint/parser", - "extends": ["prettier", "plugin:@typescript-eslint/recommended"], - "plugins": ["@typescript-eslint"], - "parserOptions": { - "ecmaVersion": 2023, - "sourceType": "module", - "project": "./tsconfig.eslint.json" - }, - "env": { - "node": true, - "es6": true - }, - "rules": { - "@typescript-eslint/no-empty-function": "off", - "@typescript-eslint/ban-ts-comment": "off", - "@typescript-eslint/ban-types": "off", - "@typescript-eslint/no-inferrable-types": "off", - "@typescript-eslint/no-empty-interface": "off", - "@typescript-eslint/no-namespace": "off", - "@typescript-eslint/no-var-requires": "off", - "@typescript-eslint/no-this-alias": "off", - "@typescript-eslint/no-explicit-any": "off", - "@typescript-eslint/explicit-module-boundary-types": "off", - "@typescript-eslint/no-unused-vars": "off", - "@typescript-eslint/no-non-null-assertion": "off", - "no-case-declarations": "off", - "no-empty": "off", - "prefer-const": "off", - "no-fallthrough": "off" - } -} diff --git a/eslint.config.mjs b/eslint.config.mjs new file mode 100644 index 00000000..f2410436 --- /dev/null +++ b/eslint.config.mjs @@ -0,0 +1,72 @@ +import typescriptEslint from "@typescript-eslint/eslint-plugin"; +import typescriptParser from "@typescript-eslint/parser"; +import pluginPrettierRecommended from "eslint-plugin-prettier/recommended"; +import pluginSimpleImportSort from "eslint-plugin-simple-import-sort"; +import vitest from "eslint-plugin-vitest"; +import pluginWorkspaces from "eslint-plugin-workspaces"; +import globals from "globals"; +import {join} from "node:path"; + +export default [ + { + ignores: ["**/coverage", "**/lib", "**/dist", "processes.config.js", "**/snapshots", "**/templates", "**/docs/**", "**/docs-references/**"] + }, + { + files: ["**/*.{js,mjs,cjs,jsx,mjsx,ts,tsx,mtsx}"], + languageOptions: { + ecmaVersion: "latest", + sourceType: "module", + parser: typescriptParser, + parserOptions: { + ecmaVersion: "latest", + sourceType: "module", + tsconfigRootDir: join(import.meta.dirname, "tsconfig.eslint.json") + }, + globals: { + ...globals.node + } + }, + plugins: { + "@typescript-eslint": typescriptEslint + }, + rules: { + "@typescript-eslint/ban-ts-comment": 0, + "@typescript-eslint/camelcase": 0, + "@typescript-eslint/no-inferrable-types": 0, + "@typescript-eslint/explicit-function-return-type": 0, + "@typescript-eslint/explicit-module-boundary-types": 0, + "@typescript-eslint/no-unused-vars": 0, + "@typescript-eslint/no-explicit-any": 0, + "@typescript-eslint/no-non-null-assertion": 0 + } + }, + { + files: ["**/*.spec.{js,mjs,cjs,jsx,mjsx,ts,tsx,mtsx}"], // or any other pattern + ignores: ["docs/**", "docs-references/**"], + plugins: { + vitest + }, + rules: { + ...vitest.configs.recommended.rules, // you can also use vitest.configs.all.rules to enable all rules + "vitest/consistent-test-it": ["error", {fn: "it", withinDescribe: "it"}], + "vitest/no-alias-methods": "error", + "vitest/expect-expect": "off" + } + }, + { + files: ["**/*.{js,mjs,cjs,jsx,mjsx,ts,tsx,mtsx}"], + languageOptions: { + parserOptions: {} + }, + plugins: { + "simple-import-sort": pluginSimpleImportSort, + workspaces: pluginWorkspaces + }, + rules: { + "simple-import-sort/imports": "error", + "simple-import-sort/exports": "error", + "workspaces/no-absolute-imports": "error" + } + }, + pluginPrettierRecommended +]; diff --git a/package.json b/package.json index cf8e622a..23eb5740 100644 --- a/package.json +++ b/package.json @@ -62,23 +62,25 @@ "@tsed/monorepo-utils": "2.3.10", "@tsed/ts-doc": "^4.1.0", "@types/node": "20.11.26", - "@typescript-eslint/eslint-plugin": "^7.2.0", - "@typescript-eslint/parser": "^7.2.0", + "@typescript-eslint/eslint-plugin": "8.16.0", + "@typescript-eslint/parser": "8.16.0", "@vitest/coverage-v8": "2.1.6", "barrelsby": "2.8.1", "concurrently": "^8.2.2", "coveralls": "^3.1.1", "cross-env": "7.0.3", "entities": "4.5.0", - "eslint": "^8.57.0", + "eslint": "9.12.0", "eslint-config-prettier": "9.1.0", - "eslint-plugin-jest": "27.9.0", - "eslint-plugin-prettier": "5.1.3", + "eslint-plugin-prettier": "5.2.1", + "eslint-plugin-simple-import-sort": "12.1.1", + "eslint-plugin-vitest": "0.5.4", + "eslint-plugin-workspaces": "0.10.1", "gflow": "^5.1.4", "husky": "^9.0.11", "is-ci": "^3.0.1", "lint-staged": "^15.2.2", - "prettier": "3.2.5", + "prettier": "3.4.1", "semantic-release": "^23.0.2", "semantic-release-slack-bot": "^4.0.2", "ts-node": "^10.9.2", diff --git a/packages/connect/package.json b/packages/connect/package.json index 094098ac..2fb1e258 100644 --- a/packages/connect/package.json +++ b/packages/connect/package.json @@ -52,4 +52,4 @@ "peerDependencies": { "@tsed/logger": "6.7.8" } -} \ No newline at end of file +} diff --git a/packages/connect/src/ConnectAppender.spec.ts b/packages/connect/src/ConnectAppender.spec.ts index a5f1030d..14c9a7b1 100644 --- a/packages/connect/src/ConnectAppender.spec.ts +++ b/packages/connect/src/ConnectAppender.spec.ts @@ -1,5 +1,6 @@ -import {vi} from "vitest"; import {Logger} from "@tsed/logger"; +import {vi} from "vitest"; + import {ConnectAppender} from "./ConnectAppender.js"; describe("ConnectAppender", () => { diff --git a/packages/file/package.json b/packages/file/package.json index a674a15e..8514f630 100644 --- a/packages/file/package.json +++ b/packages/file/package.json @@ -53,4 +53,4 @@ "peerDependencies": { "@tsed/logger": "6.7.8" } -} \ No newline at end of file +} diff --git a/packages/file/src/FileAppender.spec.ts b/packages/file/src/FileAppender.spec.ts index c6f68006..b04e6999 100644 --- a/packages/file/src/FileAppender.spec.ts +++ b/packages/file/src/FileAppender.spec.ts @@ -1,4 +1,5 @@ import {levels, LogEvent} from "@tsed/logger"; + import {FileAppender} from "./index.js"; describe("FileAppender", () => { diff --git a/packages/file/src/FileAppender.ts b/packages/file/src/FileAppender.ts index b6951a9d..1a9a4ef3 100644 --- a/packages/file/src/FileAppender.ts +++ b/packages/file/src/FileAppender.ts @@ -1,6 +1,6 @@ import {Appender, BaseAppender, LogEvent} from "@tsed/logger"; -import {normalize} from "path"; import * as Os from "os"; +import {normalize} from "path"; // @ts-ignore import streams from "streamroller"; diff --git a/packages/insight/package.json b/packages/insight/package.json index 3d3e7034..37ef3730 100644 --- a/packages/insight/package.json +++ b/packages/insight/package.json @@ -51,4 +51,4 @@ "peerDependencies": { "@tsed/logger": "6.7.8" } -} \ No newline at end of file +} diff --git a/packages/insight/src/InsightAppender.ts b/packages/insight/src/InsightAppender.ts index 837a4c82..55e5c80f 100644 --- a/packages/insight/src/InsightAppender.ts +++ b/packages/insight/src/InsightAppender.ts @@ -1,4 +1,4 @@ -import {$log, Appender, LogEvent, BaseAppender} from "@tsed/logger"; +import {$log, Appender, BaseAppender, LogEvent} from "@tsed/logger"; import Insight from "r7insight_node"; @Appender({name: "insight"}) diff --git a/packages/logentries/package.json b/packages/logentries/package.json index 06f1ff22..5c0020c7 100644 --- a/packages/logentries/package.json +++ b/packages/logentries/package.json @@ -51,4 +51,4 @@ "peerDependencies": { "@tsed/logger": "6.7.8" } -} \ No newline at end of file +} diff --git a/packages/logentries/src/LogEntriesAppender.ts b/packages/logentries/src/LogEntriesAppender.ts index 4f0aba69..e7aaa668 100644 --- a/packages/logentries/src/LogEntriesAppender.ts +++ b/packages/logentries/src/LogEntriesAppender.ts @@ -1,4 +1,4 @@ -import {$log, Appender, LogEvent, BaseAppender} from "@tsed/logger"; +import {$log, Appender, BaseAppender, LogEvent} from "@tsed/logger"; // @ts-ignore import LogEntries from "le_node"; diff --git a/packages/logger/package.json b/packages/logger/package.json index 7b23a4ef..123d8e50 100644 --- a/packages/logger/package.json +++ b/packages/logger/package.json @@ -57,6 +57,5 @@ "typescript": "5.7.2", "vite": "5.4.11", "vitest": "^2.1.6" - }, - "peerDependencies": {} -} \ No newline at end of file + } +} diff --git a/packages/logger/src/browser/exports.ts b/packages/logger/src/browser/exports.ts index 54441ba8..a91dc5e8 100644 --- a/packages/logger/src/browser/exports.ts +++ b/packages/logger/src/browser/exports.ts @@ -1,7 +1,7 @@ import {Logger, PatternLayout} from "../common/index.js"; +import {StringUtils} from "../common/layouts/utils/StringUtils.js"; import {LayoutReplacer} from "./layouts/LayoutReplacer.js"; import {format} from "./utils/format.js"; -import {StringUtils} from "../common/layouts/utils/StringUtils.js"; export * from "../common/index.js"; export const $log: Logger = new Logger("default"); diff --git a/packages/logger/src/browser/layouts/LayoutReplacer.ts b/packages/logger/src/browser/layouts/LayoutReplacer.ts index 373d4aeb..a6905a48 100644 --- a/packages/logger/src/browser/layouts/LayoutReplacer.ts +++ b/packages/logger/src/browser/layouts/LayoutReplacer.ts @@ -1,10 +1,11 @@ // @ts-ignore import * as dateFormat from "date-format"; + import {LogEvent} from "../../common/core/LogEvent.js"; import {LOG_COLORS} from "../../common/layouts/constants/logColors.js"; -import {colorizeEnd, colorizeStart} from "../../common/layouts/utils/colorizeUtils.js"; -import {IReplacers} from "../../common/layouts/interfaces/Replacers.js"; import {TokensHandlers} from "../../common/layouts/interfaces/BasicLayoutConfiguration.js"; +import {IReplacers} from "../../common/layouts/interfaces/Replacers.js"; +import {colorizeEnd, colorizeStart} from "../../common/layouts/utils/colorizeUtils.js"; import {format} from "../utils/format.js"; export class LayoutReplacer { diff --git a/packages/logger/src/common/appenders/class/BaseAppender.spec.ts b/packages/logger/src/common/appenders/class/BaseAppender.spec.ts index ee76d3a6..60b3924b 100644 --- a/packages/logger/src/common/appenders/class/BaseAppender.spec.ts +++ b/packages/logger/src/common/appenders/class/BaseAppender.spec.ts @@ -1,9 +1,11 @@ +import "../../layouts/components/ColoredLayout.js"; +import "../../layouts/components/DummyLayout.js"; + import {vi} from "vitest"; + +import {LogEvent} from "../../core/LogEvent.js"; import {levels} from "../../core/LogLevel.js"; import {BaseAppender} from "./BaseAppender.js"; -import {LogEvent} from "../../core/LogEvent.js"; -import "../../layouts/components/ColoredLayout.js"; -import "../../layouts/components/DummyLayout.js"; const buildStub = vi.fn(); @@ -25,7 +27,7 @@ describe("BaseAppender", () => { testAppender.build(); testAppender.write(logEvent); - expect(buildStub).toBeCalledTimes(1); + expect(buildStub).toHaveBeenCalledTimes(1); expect(testAppender.config).toEqual({type: "console", options: {}}); }); }); diff --git a/packages/logger/src/common/appenders/components/ConsoleAppender.spec.ts b/packages/logger/src/common/appenders/components/ConsoleAppender.spec.ts index c354a634..dbc4df7d 100644 --- a/packages/logger/src/common/appenders/components/ConsoleAppender.spec.ts +++ b/packages/logger/src/common/appenders/components/ConsoleAppender.spec.ts @@ -1,10 +1,13 @@ +import "../../layouts/components/ColoredLayout"; + import {format} from "node:util"; + import {vi} from "vitest"; -import {ConsoleAppender} from "./ConsoleAppender.js"; + import {LogEvent} from "../../core/LogEvent.js"; import {levels} from "../../core/LogLevel.js"; -import "../../layouts/components/ColoredLayout"; import {StringUtils} from "../../layouts/utils/StringUtils.js"; +import {ConsoleAppender} from "./ConsoleAppender.js"; StringUtils.format = format; diff --git a/packages/logger/src/common/appenders/components/ConsoleAppender.ts b/packages/logger/src/common/appenders/components/ConsoleAppender.ts index 7a7d8b8d..6ab43242 100644 --- a/packages/logger/src/common/appenders/components/ConsoleAppender.ts +++ b/packages/logger/src/common/appenders/components/ConsoleAppender.ts @@ -1,6 +1,6 @@ import {LogEvent} from "../../core/LogEvent.js"; -import {Appender} from "../decorators/appender.js"; import {BaseAppender} from "../class/BaseAppender.js"; +import {Appender} from "../decorators/appender.js"; /** * ## Console Appender diff --git a/packages/logger/src/common/appenders/decorators/appender.ts b/packages/logger/src/common/appenders/decorators/appender.ts index 6369e88b..a0550596 100644 --- a/packages/logger/src/common/appenders/decorators/appender.ts +++ b/packages/logger/src/common/appenders/decorators/appender.ts @@ -1,5 +1,5 @@ -import {AppendersRegistry} from "../registries/AppendersRegistry.js"; import {AppenderOptions} from "../class/BaseAppender.js"; +import {AppendersRegistry} from "../registries/AppendersRegistry.js"; export function Appender(options: AppenderOptions) { return (target: any) => { diff --git a/packages/logger/src/common/core/LogEvent.spec.ts b/packages/logger/src/common/core/LogEvent.spec.ts index 4cb38053..b6a4409c 100644 --- a/packages/logger/src/common/core/LogEvent.spec.ts +++ b/packages/logger/src/common/core/LogEvent.spec.ts @@ -1,6 +1,6 @@ +import {LogContext} from "./LogContext.js"; import {LogEvent} from "./LogEvent.js"; import {levels} from "./LogLevel.js"; -import {LogContext} from "./LogContext.js"; describe("LogEvent", () => { it("should create a new logevent (data)", () => { diff --git a/packages/logger/src/common/core/LogEvent.ts b/packages/logger/src/common/core/LogEvent.ts index 55e25347..0d446fe8 100644 --- a/packages/logger/src/common/core/LogEvent.ts +++ b/packages/logger/src/common/core/LogEvent.ts @@ -1,5 +1,5 @@ -import {LogLevel} from "./LogLevel.js"; import {LogContext} from "./LogContext.js"; +import {LogLevel} from "./LogLevel.js"; export class LogEvent { /** diff --git a/packages/logger/src/common/core/LogLevel.spec.ts b/packages/logger/src/common/core/LogLevel.spec.ts index 1f825488..791bbf9c 100644 --- a/packages/logger/src/common/core/LogLevel.spec.ts +++ b/packages/logger/src/common/core/LogLevel.spec.ts @@ -60,11 +60,11 @@ describe("LogLevel", () => { expect(LogLevel.getLevel(levels().ALL)).toEqual(levels().ALL); }); - it("should return level (1)", () => { + it("should return level (2)", () => { expect(LogLevel.getLevel("all")).toEqual(levels().ALL); }); - it("should return level (2)", () => { + it("should return level (3)", () => { expect(LogLevel.getLevel({toString: () => "all"})).toEqual(levels().ALL); }); }); diff --git a/packages/logger/src/common/layouts/class/Layouts.ts b/packages/logger/src/common/layouts/class/Layouts.ts index 6502d128..f42c8918 100644 --- a/packages/logger/src/common/layouts/class/Layouts.ts +++ b/packages/logger/src/common/layouts/class/Layouts.ts @@ -1,5 +1,5 @@ -import {LayoutsRegistry} from "../registries/LayoutsRegistry.js"; import {BasicLayoutConfiguration} from "../interfaces/BasicLayoutConfiguration.js"; +import {LayoutsRegistry} from "../registries/LayoutsRegistry.js"; import {BaseLayout} from "./BaseLayout.js"; export class Layouts { diff --git a/packages/logger/src/common/layouts/components/BasicLayout.spec.ts b/packages/logger/src/common/layouts/components/BasicLayout.spec.ts index 037a22fc..90d3c3a9 100644 --- a/packages/logger/src/common/layouts/components/BasicLayout.spec.ts +++ b/packages/logger/src/common/layouts/components/BasicLayout.spec.ts @@ -1,8 +1,9 @@ +import {format} from "node:util"; + import {LogEvent} from "../../core/LogEvent.js"; import {levels} from "../../core/LogLevel.js"; -import {BasicLayout} from "./BasicLayout.js"; import {StringUtils} from "../utils/StringUtils.js"; -import {format} from "node:util"; +import {BasicLayout} from "./BasicLayout.js"; StringUtils.format = format; diff --git a/packages/logger/src/common/layouts/components/BasicLayout.ts b/packages/logger/src/common/layouts/components/BasicLayout.ts index ea03f9f8..2eedea00 100644 --- a/packages/logger/src/common/layouts/components/BasicLayout.ts +++ b/packages/logger/src/common/layouts/components/BasicLayout.ts @@ -1,8 +1,8 @@ -import {timestampLevelAndCategory} from "../utils/timestampLevelAndCategory.js"; -import {BaseLayout} from "../class/BaseLayout.js"; import {LogEvent} from "../../core/LogEvent.js"; +import {BaseLayout} from "../class/BaseLayout.js"; import {Layout} from "../decorators/layout.js"; import {StringUtils} from "../utils/StringUtils.js"; +import {timestampLevelAndCategory} from "../utils/timestampLevelAndCategory.js"; @Layout({name: "basic"}) export class BasicLayout extends BaseLayout { diff --git a/packages/logger/src/common/layouts/components/ColoredLayout.spec.ts b/packages/logger/src/common/layouts/components/ColoredLayout.spec.ts index 89ed4f49..0a3474c5 100644 --- a/packages/logger/src/common/layouts/components/ColoredLayout.spec.ts +++ b/packages/logger/src/common/layouts/components/ColoredLayout.spec.ts @@ -1,8 +1,9 @@ +import {format} from "node:util"; + import {LogEvent} from "../../core/LogEvent.js"; import {levels} from "../../core/LogLevel.js"; -import {ColoredLayout} from "./ColoredLayout.js"; import {StringUtils} from "../utils/StringUtils.js"; -import {format} from "node:util"; +import {ColoredLayout} from "./ColoredLayout.js"; StringUtils.format = format; diff --git a/packages/logger/src/common/layouts/components/ColoredLayout.ts b/packages/logger/src/common/layouts/components/ColoredLayout.ts index ab8910c4..4e788c44 100644 --- a/packages/logger/src/common/layouts/components/ColoredLayout.ts +++ b/packages/logger/src/common/layouts/components/ColoredLayout.ts @@ -1,9 +1,9 @@ import {LogEvent} from "../../core/LogEvent.js"; -import {timestampLevelAndCategory} from "../utils/timestampLevelAndCategory.js"; +import {BaseLayout} from "../class/BaseLayout.js"; import {LOG_COLORS} from "../constants/logColors.js"; import {Layout} from "../decorators/layout.js"; -import {BaseLayout} from "../class/BaseLayout.js"; import {StringUtils} from "../utils/StringUtils.js"; +import {timestampLevelAndCategory} from "../utils/timestampLevelAndCategory.js"; @Layout({name: "colored"}) export class ColoredLayout extends BaseLayout { diff --git a/packages/logger/src/common/layouts/components/DummyLayout.ts b/packages/logger/src/common/layouts/components/DummyLayout.ts index cb2b588b..cf198149 100644 --- a/packages/logger/src/common/layouts/components/DummyLayout.ts +++ b/packages/logger/src/common/layouts/components/DummyLayout.ts @@ -1,5 +1,5 @@ -import {BaseLayout} from "../class/BaseLayout.js"; import {LogEvent} from "../../core/LogEvent.js"; +import {BaseLayout} from "../class/BaseLayout.js"; import {Layout} from "../decorators/layout.js"; @Layout({name: "dummy"}) diff --git a/packages/logger/src/common/layouts/components/JsonLayout.spec.ts b/packages/logger/src/common/layouts/components/JsonLayout.spec.ts index 5d0d581a..f708b644 100644 --- a/packages/logger/src/common/layouts/components/JsonLayout.spec.ts +++ b/packages/logger/src/common/layouts/components/JsonLayout.spec.ts @@ -1,9 +1,10 @@ +import {format} from "node:util"; + +import {LogContext} from "../../core/LogContext.js"; import {LogEvent} from "../../core/LogEvent.js"; import {levels} from "../../core/LogLevel.js"; -import {JsonLayout} from "./JsonLayout.js"; -import {LogContext} from "../../core/LogContext.js"; import {StringUtils} from "../utils/StringUtils.js"; -import {format} from "node:util"; +import {JsonLayout} from "./JsonLayout.js"; StringUtils.format = format; diff --git a/packages/logger/src/common/layouts/components/JsonLayout.ts b/packages/logger/src/common/layouts/components/JsonLayout.ts index 36f2ab01..905d187d 100644 --- a/packages/logger/src/common/layouts/components/JsonLayout.ts +++ b/packages/logger/src/common/layouts/components/JsonLayout.ts @@ -1,5 +1,5 @@ -import {BaseLayout} from "../class/BaseLayout.js"; import {LogEvent} from "../../core/LogEvent.js"; +import {BaseLayout} from "../class/BaseLayout.js"; import {Layout} from "../decorators/layout.js"; import {logEventToObject} from "../utils/logEventToObject.js"; diff --git a/packages/logger/src/common/layouts/components/MessagePassThroughLayout.spec.ts b/packages/logger/src/common/layouts/components/MessagePassThroughLayout.spec.ts index 6a60675c..73174955 100644 --- a/packages/logger/src/common/layouts/components/MessagePassThroughLayout.spec.ts +++ b/packages/logger/src/common/layouts/components/MessagePassThroughLayout.spec.ts @@ -1,8 +1,9 @@ +import {format} from "node:util"; + import {LogEvent} from "../../core/LogEvent.js"; import {levels} from "../../core/LogLevel.js"; -import {MessagePassThroughLayout} from "./MessagePassThroughLayout.js"; import {StringUtils} from "../utils/StringUtils.js"; -import {format} from "node:util"; +import {MessagePassThroughLayout} from "./MessagePassThroughLayout.js"; StringUtils.format = format; diff --git a/packages/logger/src/common/layouts/components/MessagePassThroughLayout.ts b/packages/logger/src/common/layouts/components/MessagePassThroughLayout.ts index f25bd772..3a762284 100644 --- a/packages/logger/src/common/layouts/components/MessagePassThroughLayout.ts +++ b/packages/logger/src/common/layouts/components/MessagePassThroughLayout.ts @@ -1,5 +1,5 @@ -import {BaseLayout} from "../class/BaseLayout.js"; import {LogEvent} from "../../core/LogEvent.js"; +import {BaseLayout} from "../class/BaseLayout.js"; import {Layout} from "../decorators/layout.js"; import {StringUtils} from "../utils/StringUtils.js"; diff --git a/packages/logger/src/common/layouts/components/ObjectLayout.ts b/packages/logger/src/common/layouts/components/ObjectLayout.ts index 0a4b655f..5ddc0c6b 100644 --- a/packages/logger/src/common/layouts/components/ObjectLayout.ts +++ b/packages/logger/src/common/layouts/components/ObjectLayout.ts @@ -1,5 +1,5 @@ -import {BaseLayout} from "../class/BaseLayout.js"; import {LogEvent} from "../../core/LogEvent.js"; +import {BaseLayout} from "../class/BaseLayout.js"; import {Layout} from "../decorators/layout.js"; import {logEventToObject} from "../utils/logEventToObject.js"; diff --git a/packages/logger/src/common/layouts/components/PatternLayout.spec.ts b/packages/logger/src/common/layouts/components/PatternLayout.spec.ts index eb0ed36a..2f645519 100644 --- a/packages/logger/src/common/layouts/components/PatternLayout.spec.ts +++ b/packages/logger/src/common/layouts/components/PatternLayout.spec.ts @@ -1,10 +1,11 @@ -import {LogEvent} from "../../core/LogEvent.js"; -import {levels} from "../../core/LogLevel.js"; -import * as os from "os"; // @ts-ignore import * as dateFormat from "date-format"; -import {PatternLayout} from "./PatternLayout.js"; +import * as os from "os"; + import {LayoutReplacer} from "../../../node/layouts/LayoutReplacer.js"; +import {LogEvent} from "../../core/LogEvent.js"; +import {levels} from "../../core/LogLevel.js"; +import {PatternLayout} from "./PatternLayout.js"; const EOL = os.EOL || "\n"; LayoutReplacer.HOSTNAME = "hostname"; diff --git a/packages/logger/src/common/layouts/components/PatternLayout.ts b/packages/logger/src/common/layouts/components/PatternLayout.ts index f5b4c4ef..55dcb607 100644 --- a/packages/logger/src/common/layouts/components/PatternLayout.ts +++ b/packages/logger/src/common/layouts/components/PatternLayout.ts @@ -1,9 +1,9 @@ -import {truncateAndPad} from "../utils/StringUtils.js"; -import {BaseLayout} from "../class/BaseLayout.js"; -import {IReplacers} from "../interfaces/Replacers.js"; import {LogEvent} from "../../core/LogEvent.js"; -import {BasicLayoutConfiguration, TokensHandlers} from "../interfaces/BasicLayoutConfiguration.js"; +import {BaseLayout} from "../class/BaseLayout.js"; import {Layout} from "../decorators/layout.js"; +import {BasicLayoutConfiguration, TokensHandlers} from "../interfaces/BasicLayoutConfiguration.js"; +import {IReplacers} from "../interfaces/Replacers.js"; +import {truncateAndPad} from "../utils/StringUtils.js"; const regex = /%(-?[0-9]+)?(\.?[0-9]+)?([[\]cdhmnpjrzxy%])(\{([^}]+)\})?|([^%]+)/; const TTCC_CONVERSION_PATTERN = "%r %p %c - %m%n"; diff --git a/packages/logger/src/common/layouts/constants/logColors.ts b/packages/logger/src/common/layouts/constants/logColors.ts index c89da65d..632dda6f 100644 --- a/packages/logger/src/common/layouts/constants/logColors.ts +++ b/packages/logger/src/common/layouts/constants/logColors.ts @@ -6,6 +6,6 @@ export enum LOG_COLORS { TRACE = "blue", ERROR = "red", FATAL = "magenta", - // eslint-disable-next-line @typescript-eslint/no-duplicate-enum-values + OFF = "grey" } diff --git a/packages/logger/src/common/layouts/utils/timestampLevelAndCategory.ts b/packages/logger/src/common/layouts/utils/timestampLevelAndCategory.ts index ef09ddaa..84856aa7 100644 --- a/packages/logger/src/common/layouts/utils/timestampLevelAndCategory.ts +++ b/packages/logger/src/common/layouts/utils/timestampLevelAndCategory.ts @@ -1,7 +1,8 @@ // @ts-ignore import * as dateFormat from "date-format"; -import {colorize} from "./colorizeUtils.js"; + import {LogEvent} from "../../core/LogEvent.js"; +import {colorize} from "./colorizeUtils.js"; import {StringUtils} from "./StringUtils.js"; export function timestampLevelAndCategory(loggingEvent: LogEvent, colour: any, timezoneOffset: number | undefined) { diff --git a/packages/logger/src/common/logger/class/Logger.spec.ts b/packages/logger/src/common/logger/class/Logger.spec.ts index 0d02e414..98da709c 100644 --- a/packages/logger/src/common/logger/class/Logger.spec.ts +++ b/packages/logger/src/common/logger/class/Logger.spec.ts @@ -1,11 +1,12 @@ -import {Layout} from "../../layouts/decorators/layout.js"; -import {BaseLayout} from "../../layouts/class/BaseLayout.js"; -import {LogEvent} from "../../core/LogEvent.js"; -import {Appender} from "../../appenders/decorators/appender.js"; +import "../../layouts/components/ColoredLayout"; + import {BaseAppender} from "../../appenders/class/BaseAppender.js"; -import {Logger} from "./Logger.js"; +import {Appender} from "../../appenders/decorators/appender.js"; +import {LogEvent} from "../../core/LogEvent.js"; import {LogLevel} from "../../core/LogLevel.js"; -import "../../layouts/components/ColoredLayout"; +import {BaseLayout} from "../../layouts/class/BaseLayout.js"; +import {Layout} from "../../layouts/decorators/layout.js"; +import {Logger} from "./Logger.js"; @Layout({name: "test"}) class TestLayout extends BaseLayout { @@ -50,7 +51,7 @@ describe("Logger", () => { logger.debug("test"); const arg = stub.mock.calls[0][0]; - expect(stub).toBeCalledTimes(1); + expect(stub).toHaveBeenCalledTimes(1); expect(arg.categoryName).toEqual("loggerName"); expect(arg.level).toBeInstanceOf(LogLevel); expect(arg.level.toString()).toEqual("DEBUG"); @@ -68,7 +69,7 @@ describe("Logger", () => { const arg = stub.mock.calls[0][0]; - expect(stub).toBeCalledTimes(1); + expect(stub).toHaveBeenCalledTimes(1); expect(arg.categoryName).toEqual("loggerName"); expect(arg.level).toBeInstanceOf(LogLevel); expect(arg.level.toString()).toEqual("INFO"); @@ -85,7 +86,7 @@ describe("Logger", () => { logger.warn("test"); const arg = stub.mock.calls[0][0]; - expect(stub).toBeCalledTimes(1); + expect(stub).toHaveBeenCalledTimes(1); expect(arg.categoryName).toEqual("loggerName"); expect(arg.level).toBeInstanceOf(LogLevel); expect(arg.level.toString()).toEqual("WARN"); @@ -102,7 +103,7 @@ describe("Logger", () => { logger.trace("test"); const arg = stub.mock.calls[0][0]; - expect(stub).toBeCalledTimes(1); + expect(stub).toHaveBeenCalledTimes(1); expect(arg.categoryName).toEqual("loggerName"); expect(arg.level).toBeInstanceOf(LogLevel); expect(arg.level.toString()).toEqual("TRACE"); @@ -120,7 +121,7 @@ describe("Logger", () => { const arg = stub.mock.calls[0][0]; - expect(stub).toBeCalledTimes(1); + expect(stub).toHaveBeenCalledTimes(1); expect(arg.categoryName).toEqual("loggerName"); expect(arg.level).toBeInstanceOf(LogLevel); expect(arg.level.toString()).toEqual("ERROR"); @@ -138,7 +139,7 @@ describe("Logger", () => { const arg = stub.mock.calls[0][0]; - expect(stub).toBeCalledTimes(1); + expect(stub).toHaveBeenCalledTimes(1); expect(arg.categoryName).toEqual("loggerName"); expect(arg.level).toBeInstanceOf(LogLevel); expect(arg.level.toString()).toEqual("FATAL"); @@ -161,7 +162,7 @@ describe("Logger", () => { }); it("should call layout", () => { - expect(stub).not.toBeCalled(); + expect(stub).not.toHaveBeenCalled(); }); }); @@ -196,7 +197,7 @@ describe("Logger", () => { } } ); - expect(stub).toBeCalled(); + expect(stub).toHaveBeenCalled(); }); }); diff --git a/packages/logger/src/common/logger/class/Logger.ts b/packages/logger/src/common/logger/class/Logger.ts index 48619280..3f5d473f 100644 --- a/packages/logger/src/common/logger/class/Logger.ts +++ b/packages/logger/src/common/logger/class/Logger.ts @@ -1,9 +1,9 @@ -import {LoggerAppenders} from "./LoggerAppenders.js"; -import {drawTable, ITableSettings} from "../utils/tableUtils.js"; -import {LogEvent} from "../../core/LogEvent.js"; -import {levels, LogLevel} from "../../core/LogLevel.js"; import {BaseAppender} from "../../appenders/class/BaseAppender.js"; import {LogContext} from "../../core/LogContext.js"; +import {LogEvent} from "../../core/LogEvent.js"; +import {levels, LogLevel} from "../../core/LogLevel.js"; +import {drawTable, ITableSettings} from "../utils/tableUtils.js"; +import {LoggerAppenders} from "./LoggerAppenders.js"; export class Logger { /** diff --git a/packages/logger/src/common/logger/class/LoggerAppenders.spec.ts b/packages/logger/src/common/logger/class/LoggerAppenders.spec.ts index 1985ff04..64305d9d 100644 --- a/packages/logger/src/common/logger/class/LoggerAppenders.spec.ts +++ b/packages/logger/src/common/logger/class/LoggerAppenders.spec.ts @@ -1,13 +1,14 @@ -import {BaseAppender} from "../../appenders/class/BaseAppender.js"; -import {LogEvent} from "../../core/LogEvent.js"; -import {levels} from "../../core/LogLevel.js"; -import {Appender} from "../../appenders/decorators/appender.js"; -import {LoggerAppenders} from "./LoggerAppenders.js"; import "../../layouts/components/ColoredLayout"; import "../../appenders/components/ConsoleAppender"; import "../../../node/appenders/StdoutAppender"; import "../../../node/appenders/StderrAppender"; +import {BaseAppender} from "../../appenders/class/BaseAppender.js"; +import {Appender} from "../../appenders/decorators/appender.js"; +import {LogEvent} from "../../core/LogEvent.js"; +import {levels} from "../../core/LogLevel.js"; +import {LoggerAppenders} from "./LoggerAppenders.js"; + @Appender({name: "test2"}) class TestAppender extends BaseAppender { write(loggingEvent: LogEvent) {} @@ -64,7 +65,7 @@ describe("LoggerAppenders", () => { result = cachedAppenders.byLogLevel(levels().DEBUG); expect(result).toHaveLength(0); }); - it("when deleted should have no appenders", () => { + it("when deleted should have no appenders(2)", () => { cachedAppenders.set("custom2", {type: "test2", levels: ["debug"]}); result = cachedAppenders.byLogLevel(levels().DEBUG); expect(result).toHaveLength(2); diff --git a/packages/logger/src/common/logger/class/LoggerAppenders.ts b/packages/logger/src/common/logger/class/LoggerAppenders.ts index f0fc9402..ad1e1d5c 100644 --- a/packages/logger/src/common/logger/class/LoggerAppenders.ts +++ b/packages/logger/src/common/logger/class/LoggerAppenders.ts @@ -1,7 +1,7 @@ -import {AppendersRegistry} from "../../appenders/registries/AppendersRegistry.js"; import {BaseAppender} from "../../appenders/class/BaseAppender.js"; -import {LogLevel} from "../../core/LogLevel.js"; import {AppenderConfiguration} from "../../appenders/interfaces/AppenderConfiguration.js"; +import {AppendersRegistry} from "../../appenders/registries/AppendersRegistry.js"; +import {LogLevel} from "../../core/LogLevel.js"; export interface LoggerAppender { name: string; diff --git a/packages/logger/src/node/appenders/StderrAppender.spec.ts b/packages/logger/src/node/appenders/StderrAppender.spec.ts index 944f866b..316ba60b 100644 --- a/packages/logger/src/node/appenders/StderrAppender.spec.ts +++ b/packages/logger/src/node/appenders/StderrAppender.spec.ts @@ -1,7 +1,8 @@ -import {StderrAppender} from "./StderrAppender.js"; -import {levels, LogEvent} from "../../common/index.js"; import {format} from "node:util"; + +import {levels, LogEvent} from "../../common/index.js"; import {StringUtils} from "../../common/layouts/utils/StringUtils.js"; +import {StderrAppender} from "./StderrAppender.js"; StringUtils.format = format; @@ -14,7 +15,7 @@ describe("StderrAppender", () => { appender.write(logEvent); - expect((appender as any).log).toBeCalledTimes(1); + expect((appender as any).log).toHaveBeenCalledTimes(1); expect((appender as any).log).toHaveBeenCalledWith(expect.stringContaining("[DEBUG] [test] -")); }); }); diff --git a/packages/logger/src/node/appenders/StderrAppender.ts b/packages/logger/src/node/appenders/StderrAppender.ts index 04b4c994..a55b4ff4 100644 --- a/packages/logger/src/node/appenders/StderrAppender.ts +++ b/packages/logger/src/node/appenders/StderrAppender.ts @@ -1,6 +1,6 @@ -import {LogEvent} from "../../common/core/LogEvent.js"; -import {Appender} from "../../common/appenders/decorators/appender.js"; import {BaseAppender} from "../../common/appenders/class/BaseAppender.js"; +import {Appender} from "../../common/appenders/decorators/appender.js"; +import {LogEvent} from "../../common/core/LogEvent.js"; /** * ## Standard Error Appender diff --git a/packages/logger/src/node/appenders/StdoutAppender.spec.ts b/packages/logger/src/node/appenders/StdoutAppender.spec.ts index 0928db0d..370a04ae 100644 --- a/packages/logger/src/node/appenders/StdoutAppender.spec.ts +++ b/packages/logger/src/node/appenders/StdoutAppender.spec.ts @@ -1,10 +1,13 @@ -import {vi} from "vitest"; -import {levels, LogEvent} from "../../common/index.js"; -import {StdoutAppender} from "./StdoutAppender.js"; import "./StdoutAppender"; import "./StdoutAppender"; + import {format} from "node:util"; + +import {vi} from "vitest"; + +import {levels, LogEvent} from "../../common/index.js"; import {StringUtils} from "../../common/layouts/utils/StringUtils.js"; +import {StdoutAppender} from "./StdoutAppender.js"; StringUtils.format = format; @@ -16,6 +19,6 @@ describe("StdoutAppender", () => { appender.write(logEvent); - expect((appender as any).log).toBeCalledWith(expect.stringContaining("[DEBUG] [test] -")); + expect((appender as any).log).toHaveBeenCalledWith(expect.stringContaining("[DEBUG] [test] -")); }); }); diff --git a/packages/logger/src/node/appenders/StdoutAppender.ts b/packages/logger/src/node/appenders/StdoutAppender.ts index ae617385..1d27fd19 100644 --- a/packages/logger/src/node/appenders/StdoutAppender.ts +++ b/packages/logger/src/node/appenders/StdoutAppender.ts @@ -1,6 +1,6 @@ -import {LogEvent} from "../../common/core/LogEvent.js"; -import {Appender} from "../../common/appenders/decorators/appender.js"; import {BaseAppender} from "../../common/appenders/class/BaseAppender.js"; +import {Appender} from "../../common/appenders/decorators/appender.js"; +import {LogEvent} from "../../common/core/LogEvent.js"; /** * ## Standard Output Appender diff --git a/packages/logger/src/node/exports.ts b/packages/logger/src/node/exports.ts index 81af6552..2f6ac520 100644 --- a/packages/logger/src/node/exports.ts +++ b/packages/logger/src/node/exports.ts @@ -1,9 +1,11 @@ -import {format} from "node:util"; -import {Logger, PatternLayout} from "../common/index.js"; import "./appenders/StdoutAppender"; import "./appenders/StderrAppender"; -import {LayoutReplacer} from "./layouts/LayoutReplacer.js"; + +import {format} from "node:util"; + +import {Logger, PatternLayout} from "../common/index.js"; import {StringUtils} from "../common/layouts/utils/StringUtils.js"; +import {LayoutReplacer} from "./layouts/LayoutReplacer.js"; export const $log: Logger = new Logger("default"); diff --git a/packages/logger/src/node/layouts/LayoutReplacer.ts b/packages/logger/src/node/layouts/LayoutReplacer.ts index d02a9f16..cbcfebee 100644 --- a/packages/logger/src/node/layouts/LayoutReplacer.ts +++ b/packages/logger/src/node/layouts/LayoutReplacer.ts @@ -1,12 +1,14 @@ -import Util from "node:util"; import Os from "node:os"; +import Util from "node:util"; + // @ts-ignore import * as dateFormat from "date-format"; + import {LogEvent} from "../../common/core/LogEvent.js"; import {LOG_COLORS} from "../../common/layouts/constants/logColors.js"; -import {colorizeEnd, colorizeStart} from "../../common/layouts/utils/colorizeUtils.js"; -import {IReplacers} from "../../common/layouts/interfaces/Replacers.js"; import {TokensHandlers} from "../../common/layouts/interfaces/BasicLayoutConfiguration.js"; +import {IReplacers} from "../../common/layouts/interfaces/Replacers.js"; +import {colorizeEnd, colorizeStart} from "../../common/layouts/utils/colorizeUtils.js"; export class LayoutReplacer { static EOL = Os.EOL || "\n"; diff --git a/packages/loggly/package.json b/packages/loggly/package.json index 536dcb0b..a7deedbf 100644 --- a/packages/loggly/package.json +++ b/packages/loggly/package.json @@ -52,4 +52,4 @@ "peerDependencies": { "@tsed/logger": "6.7.8" } -} \ No newline at end of file +} diff --git a/packages/logstash-http/package.json b/packages/logstash-http/package.json index 920d6b74..d5c3df3a 100644 --- a/packages/logstash-http/package.json +++ b/packages/logstash-http/package.json @@ -55,4 +55,4 @@ "peerDependencies": { "@tsed/logger": "6.7.8" } -} \ No newline at end of file +} diff --git a/packages/logstash-http/src/LogStashHttpAppender.ts b/packages/logstash-http/src/LogStashHttpAppender.ts index 2c3509c0..1f725f67 100644 --- a/packages/logstash-http/src/LogStashHttpAppender.ts +++ b/packages/logstash-http/src/LogStashHttpAppender.ts @@ -1,7 +1,7 @@ import {$log, Appender, BaseAppender, LogEvent} from "@tsed/logger"; -import * as util from "util"; import axios, {AxiosBasicCredentials} from "axios"; import axiosRetry, {IAxiosRetryConfig} from "axios-retry"; +import * as util from "util"; import {v4} from "uuid"; function wrapErrorsWithInspect(items: any[]) { diff --git a/packages/logstash-udp/package.json b/packages/logstash-udp/package.json index 96bd84f3..4e161af4 100644 --- a/packages/logstash-udp/package.json +++ b/packages/logstash-udp/package.json @@ -51,4 +51,4 @@ "peerDependencies": { "@tsed/logger": "6.7.8" } -} \ No newline at end of file +} diff --git a/packages/logstash-udp/src/LogStashUdpAppender.ts b/packages/logstash-udp/src/LogStashUdpAppender.ts index 13bee058..24916707 100644 --- a/packages/logstash-udp/src/LogStashUdpAppender.ts +++ b/packages/logstash-udp/src/LogStashUdpAppender.ts @@ -1,7 +1,7 @@ import {$log, Appender, BaseAppender, LogEvent} from "@tsed/logger"; -import * as util from "util"; import * as dgram from "dgram"; import * as os from "os"; +import * as util from "util"; const defaultVersion = 1; diff --git a/packages/rabbitmq/package.json b/packages/rabbitmq/package.json index 7144bfd3..a2adf92a 100644 --- a/packages/rabbitmq/package.json +++ b/packages/rabbitmq/package.json @@ -52,4 +52,4 @@ "peerDependencies": { "@tsed/logger": "6.7.8" } -} \ No newline at end of file +} diff --git a/packages/rabbitmq/src/RabbitMQAppender.ts b/packages/rabbitmq/src/RabbitMQAppender.ts index 5cea724d..78d650fb 100644 --- a/packages/rabbitmq/src/RabbitMQAppender.ts +++ b/packages/rabbitmq/src/RabbitMQAppender.ts @@ -41,7 +41,7 @@ export class RabbitMQAppender extends BaseAppender { .catch((e) => { // debug("connect failed."); this.waitingToConnect = false; - console.error(e); // eslint-disable-line + console.error(e); }); } } diff --git a/packages/seq/package.json b/packages/seq/package.json index 45d6008b..784e0638 100644 --- a/packages/seq/package.json +++ b/packages/seq/package.json @@ -51,4 +51,4 @@ "peerDependencies": { "@tsed/logger": "6.7.8" } -} \ No newline at end of file +} diff --git a/packages/slack/package.json b/packages/slack/package.json index 221e35b5..c88655fe 100644 --- a/packages/slack/package.json +++ b/packages/slack/package.json @@ -51,4 +51,4 @@ "peerDependencies": { "@tsed/logger": "6.7.8" } -} \ No newline at end of file +} diff --git a/packages/slack/src/SlackAppender.ts b/packages/slack/src/SlackAppender.ts index 4cf048c8..eb29b3f0 100644 --- a/packages/slack/src/SlackAppender.ts +++ b/packages/slack/src/SlackAppender.ts @@ -1,6 +1,5 @@ -import {Appender, BaseAppender, LogEvent} from "@tsed/logger"; - import {WebClient} from "@slack/web-api"; +import {Appender, BaseAppender, LogEvent} from "@tsed/logger"; @Appender({name: "slack"}) export class SlackAppender extends BaseAppender { diff --git a/packages/smtp/package.json b/packages/smtp/package.json index f1bf2929..a6e440f7 100644 --- a/packages/smtp/package.json +++ b/packages/smtp/package.json @@ -51,4 +51,4 @@ "peerDependencies": { "@tsed/logger": "6.7.8" } -} \ No newline at end of file +} diff --git a/packages/smtp/src/SmtpAppender.ts b/packages/smtp/src/SmtpAppender.ts index c9dd96c1..9655b159 100644 --- a/packages/smtp/src/SmtpAppender.ts +++ b/packages/smtp/src/SmtpAppender.ts @@ -123,7 +123,7 @@ export class SmtpAppender extends BaseAppender { } transport.sendMail(msg, (error: any) => { if (error) { - console.error("logger.smtpAppender - Error happened", error); // eslint-disable-line + console.error("logger.smtpAppender - Error happened", error); } transport.close(); this.unsentCount -= count; diff --git a/tools/typescript/index.js b/tools/typescript/index.js index f5f0a47f..0dc86db0 100644 --- a/tools/typescript/index.js +++ b/tools/typescript/index.js @@ -1,60 +1,60 @@ -import { dirname, join, relative } from 'node:path' +import {dirname, join, relative} from "node:path"; -import { findPackages, MonoRepo } from '@tsed/monorepo-utils' -import fs from 'fs-extra' -import globby from 'globby' -import cloneDeep from 'lodash/cloneDeep.js' -import omit from 'lodash/omit.js' +import {findPackages, MonoRepo} from "@tsed/monorepo-utils"; +import fs from "fs-extra"; +import globby from "globby"; +import cloneDeep from "lodash/cloneDeep.js"; +import omit from "lodash/omit.js"; -const scriptDir = import.meta.dirname +const scriptDir = import.meta.dirname; -async function main () { +async function main() { const monoRepo = new MonoRepo({ rootDir: process.cwd(), verbose: false - }) + }); - const pkgRoot = fs.readJsonSync(join(monoRepo.rootDir, 'package.json')) - const packagesRootDir = join(monoRepo.rootDir, 'packages') + const pkgRoot = fs.readJsonSync(join(monoRepo.rootDir, "package.json")); + const packagesRootDir = join(monoRepo.rootDir, "packages"); - const tsConfigRootPath = join(monoRepo.rootDir, 'tsconfig.json') - const tsConfigTemplate = await fs.readJson(join(scriptDir, './tsconfig.template.json')) - const tsConfigTemplateEsmPath = join(scriptDir, './tsconfig.template.esm.json') - const tsConfigTemplateSpecPath = join(scriptDir, './tsconfig.template.spec.json') - const tsConfigTemplateSpec = await fs.readJson(tsConfigTemplateSpecPath) - const npmIgnoreTemplatePath = join(scriptDir, './.npmignore.template') + const tsConfigRootPath = join(monoRepo.rootDir, "tsconfig.json"); + const tsConfigTemplate = await fs.readJson(join(scriptDir, "./tsconfig.template.json")); + const tsConfigTemplateEsmPath = join(scriptDir, "./tsconfig.template.esm.json"); + const tsConfigTemplateSpecPath = join(scriptDir, "./tsconfig.template.spec.json"); + const tsConfigTemplateSpec = await fs.readJson(tsConfigTemplateSpecPath); + const npmIgnoreTemplatePath = join(scriptDir, "./.npmignore.template"); - const tsConfigRoot = await fs.readJson(tsConfigRootPath) - tsConfigRoot.references = [] + const tsConfigRoot = await fs.readJson(tsConfigRootPath); + tsConfigRoot.references = []; - const packages = await findPackages(monoRepo) + const packages = await findPackages(monoRepo); const packagesRefsMap = packages.reduce((map, pkg) => { - if (pkg.pkg.source && pkg.pkg.source.endsWith('.ts')) { - return map.set(pkg.pkg.name, dirname(pkg.path)) + if (pkg.pkg.source && pkg.pkg.source.endsWith(".ts")) { + return map.set(pkg.pkg.name, dirname(pkg.path)); } - return map - }, new Map()) + return map; + }, new Map()); for (const pkg of packages) { - const path = dirname(pkg.path) - - if (pkg.pkg.source && pkg.pkg.source.endsWith('.ts')) { - const tsConfig = cloneDeep(tsConfigTemplate) - const tsConfigPath = join(path, 'tsconfig.json') - const tsConfigBuildEsmPath = join(path, 'tsconfig.esm.json') - const tsConfigBuildSpecPath = join(path, 'tsconfig.spec.json') - const npmignore = join(path, '.npmignore') - const vitestPath = join(path, 'vitest.config.mts') - const vitePath = join(path, 'vite.config.mts') - - const hasFiles = await globby(['{src,test}/**/*.spec.ts', '!node_modules'], { + const path = dirname(pkg.path); + + if (pkg.pkg.source && pkg.pkg.source.endsWith(".ts")) { + const tsConfig = cloneDeep(tsConfigTemplate); + const tsConfigPath = join(path, "tsconfig.json"); + const tsConfigBuildEsmPath = join(path, "tsconfig.esm.json"); + const tsConfigBuildSpecPath = join(path, "tsconfig.spec.json"); + const npmignore = join(path, ".npmignore"); + const vitestPath = join(path, "vitest.config.mts"); + const vitePath = join(path, "vite.config.mts"); + + const hasFiles = await globby(["{src,test}/**/*.spec.ts", "!node_modules"], { cwd: path - }) + }); // const viteConfigPath = join(path, "vite.config.ts"); - tsConfig.references = [] - const deps = new Set() + tsConfig.references = []; + const deps = new Set(); Object.keys({ ...(pkg.pkg.peerDependencies || {}), @@ -62,63 +62,63 @@ async function main () { ...(pkg.pkg.dependencies || {}) }) .filter((peer) => { - return packagesRefsMap.has(peer) + return packagesRefsMap.has(peer); }) .map((peer) => { - deps.add(peer) + deps.add(peer); tsConfig.references.push({ - path: join(relative(dirname(pkg.path), packagesRefsMap.get(peer)), 'tsconfig.json') - }) - }) + path: join(relative(dirname(pkg.path), packagesRefsMap.get(peer)), "tsconfig.json") + }); + }); tsConfig.references.push({ - path: './tsconfig.esm.json' - }) + path: "./tsconfig.esm.json" + }); if (hasFiles.length) { tsConfig.references.push({ - path: './tsconfig.spec.json' - }) + path: "./tsconfig.spec.json" + }); - const paths = {} + const paths = {}; packages .filter((dep) => { return ( - ((dep.path.includes('/platform') && !dep.path.includes('serverless')) || - dep.path.includes('/components-scan') || - dep.path.includes('/spec') || - dep.path.includes('/di')) && + ((dep.path.includes("/platform") && !dep.path.includes("serverless")) || + dep.path.includes("/components-scan") || + dep.path.includes("/spec") || + dep.path.includes("/di")) && !deps.has(dep.name) && pkg.name !== dep.name - ) + ); }) .forEach((dep) => { - paths['@tsed/' + dep.name] = [relative(dirname(pkg.path), dirname(dep.path)) + '/src/index.ts'] - }) - const tsCopy = cloneDeep(tsConfigTemplateSpec) - tsCopy.compilerOptions.paths = paths - tsCopy.compilerOptions.rootDir = relative(dirname(tsConfigBuildSpecPath), packagesRootDir) + paths["@tsed/" + dep.name] = [relative(dirname(pkg.path), dirname(dep.path)) + "/src/index.ts"]; + }); + const tsCopy = cloneDeep(tsConfigTemplateSpec); + tsCopy.compilerOptions.paths = paths; + tsCopy.compilerOptions.rootDir = relative(dirname(tsConfigBuildSpecPath), packagesRootDir); if (fs.existsSync(vitestPath)) { - tsCopy.include.push('vitest.config.mts') - tsCopy.compilerOptions.types = ['vite/client', 'vitest/globals'] + tsCopy.include.push("vitest.config.mts"); + tsCopy.compilerOptions.types = ["vite/client", "vitest/globals"]; } if (fs.existsSync(vitePath)) { - tsCopy.include.push('vite.config.mts') + tsCopy.include.push("vite.config.mts"); } - await fs.writeJSON(tsConfigBuildSpecPath, tsCopy, { spaces: 2 }) + await fs.writeJSON(tsConfigBuildSpecPath, tsCopy, {spaces: 2}); } - await fs.writeJson(tsConfigPath, tsConfig, { spaces: 2 }) - await fs.copy(tsConfigTemplateEsmPath, tsConfigBuildEsmPath) - await fs.copy(npmIgnoreTemplatePath, npmignore) + await fs.writeJson(tsConfigPath, tsConfig, {spaces: 2}); + await fs.copy(tsConfigTemplateEsmPath, tsConfigBuildEsmPath); + await fs.copy(npmIgnoreTemplatePath, npmignore); tsConfigRoot.references.push({ - path: `./${ relative(process.cwd(), path) }/tsconfig.json` - }) + path: `./${relative(process.cwd(), path)}/tsconfig.json` + }); // if (hasFiles.length) { // tsConfigRoot.references.push( @@ -131,16 +131,16 @@ async function main () { pkg.pkg = { name: pkg.pkg.name, description: pkg.pkg.description, - type: 'module', - ...omit(pkg.pkg, ['name', 'description']) - } + type: "module", + ...omit(pkg.pkg, ["name", "description"]) + }; pkg.pkg.scripts = { ...pkg.pkg.scripts, - 'build:ts': 'tsc --build tsconfig.json' - } + "build:ts": "tsc --build tsconfig.json" + }; - pkg.pkg.devDependencies['@tsed/typescript'] = 'workspace:*' - pkg.pkg.devDependencies['typescript'] = pkgRoot.devDependencies['typescript'] + pkg.pkg.devDependencies["@tsed/typescript"] = "workspace:*"; + pkg.pkg.devDependencies["typescript"] = pkgRoot.devDependencies["typescript"]; // if (pkg.pkg.exports && !pkg.pkg.exports["."]) { // pkg.pkg.exports = { @@ -150,24 +150,23 @@ async function main () { // }; // } - pkg.pkg.type = 'module' - pkg.pkg.source = './src/index.ts' - pkg.pkg.main = './lib/esm/index.js' - pkg.pkg.module = './lib/esm/index.js' - pkg.pkg.typings = './lib/types/index.d.ts' + pkg.pkg.type = "module"; + pkg.pkg.source = "./src/index.ts"; + pkg.pkg.main = "./lib/esm/index.js"; + pkg.pkg.module = "./lib/esm/index.js"; + pkg.pkg.typings = "./lib/types/index.d.ts"; pkg.pkg.exports = { - '.': { - '@tsed/source': './src/index.ts', - 'types': './lib/types/index.d.ts', - 'import': './lib/esm/index.js', - browser: pkg.pkg.exports['browser'], - 'default': './lib/esm/index.js', - ...omit(pkg.pkg.exports['.'], ['require']) - + ".": { + "@tsed/source": "./src/index.ts", + types: "./lib/types/index.d.ts", + import: "./lib/esm/index.js", + browser: pkg.pkg.exports["browser"], + default: "./lib/esm/index.js", + ...omit(pkg.pkg.exports["."], ["require"]) } - } + }; - await fs.writeJson(pkg.path, pkg.pkg, { spaces: 2 }) + await fs.writeJson(pkg.path, pkg.pkg, {spaces: 2}); // try { // fs.removeSync(join(path, "tsconfig.compile.esm.json")); // fs.removeSync(join(path, "tsconfig.compile.json")); @@ -178,9 +177,9 @@ async function main () { } } - await fs.writeJson(tsConfigRootPath, tsConfigRoot, { spaces: 2 }) + await fs.writeJson(tsConfigRootPath, tsConfigRoot, {spaces: 2}); } main().catch((e) => { - console.error(e) -}) + console.error(e); +}); diff --git a/tools/typescript/package.json b/tools/typescript/package.json index 41c4f941..cb40d329 100644 --- a/tools/typescript/package.json +++ b/tools/typescript/package.json @@ -11,8 +11,5 @@ }, "scripts": { "build:references": "node ./index.js" - }, - "dependencies": {}, - "devDependencies": {}, - "peerDependencies": {} -} \ No newline at end of file + } +} diff --git a/tools/vitest/package.json b/tools/vitest/package.json index 426be3bb..86eb46d9 100644 --- a/tools/vitest/package.json +++ b/tools/vitest/package.json @@ -13,7 +13,5 @@ }, "scripts": { "generate": "node index.js" - }, - "dependencies": {}, - "peerDependencies": {} -} \ No newline at end of file + } +} diff --git a/tools/vitest/presets/alias.js b/tools/vitest/presets/alias.js index 61c9d948..aa42ff2d 100644 --- a/tools/vitest/presets/alias.js +++ b/tools/vitest/presets/alias.js @@ -18,16 +18,10 @@ function deps(pkg, pkgs, set = new Set()) { } function findPackages() { - const pkgs = globbySync( - [ - "packages/*/package.json", - "!**/node_modules/**" - ], - { - cwd: root, - absolute: true - } - ).map((file) => ({ + const pkgs = globbySync(["packages/*/package.json", "!**/node_modules/**"], { + cwd: root, + absolute: true + }).map((file) => ({ path: file, name: basename(dirname(file)), pkg: JSON.parse(readFileSync(file, {encoding: "utf8"})) diff --git a/tools/vitest/presets/index.js b/tools/vitest/presets/index.js index 9d930912..6d74df15 100644 --- a/tools/vitest/presets/index.js +++ b/tools/vitest/presets/index.js @@ -3,7 +3,7 @@ import {defineConfig} from "vitest/config"; export const presets = defineConfig({ resolve: { - conditions: ['@tsed/source'], + conditions: ["@tsed/source"] }, test: { globals: true, diff --git a/yarn.lock b/yarn.lock index da325869..72271196 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2186,34 +2186,68 @@ __metadata: languageName: node linkType: hard -"@eslint-community/regexpp@npm:^4.5.1, @eslint-community/regexpp@npm:^4.6.1": - version: 4.10.0 - resolution: "@eslint-community/regexpp@npm:4.10.0" - checksum: 10/8c36169c815fc5d726078e8c71a5b592957ee60d08c6470f9ce0187c8046af1a00afbda0a065cc40ff18d5d83f82aed9793c6818f7304a74a7488dc9f3ecbd42 +"@eslint-community/regexpp@npm:^4.10.0, @eslint-community/regexpp@npm:^4.11.0": + version: 4.12.1 + resolution: "@eslint-community/regexpp@npm:4.12.1" + checksum: 10/c08f1dd7dd18fbb60bdd0d85820656d1374dd898af9be7f82cb00451313402a22d5e30569c150315b4385907cdbca78c22389b2a72ab78883b3173be317620cc languageName: node linkType: hard -"@eslint/eslintrc@npm:^2.1.4": - version: 2.1.4 - resolution: "@eslint/eslintrc@npm:2.1.4" +"@eslint/config-array@npm:^0.18.0": + version: 0.18.0 + resolution: "@eslint/config-array@npm:0.18.0" + dependencies: + "@eslint/object-schema": "npm:^2.1.4" + debug: "npm:^4.3.1" + minimatch: "npm:^3.1.2" + checksum: 10/60ccad1eb4806710b085cd739568ec7afd289ee5af6ca0383f0876f9fe375559ef525f7b3f86bdb3f961493de952f2cf3ab4aa4a6ccaef0ae3cd688267cabcb3 + languageName: node + linkType: hard + +"@eslint/core@npm:^0.6.0": + version: 0.6.0 + resolution: "@eslint/core@npm:0.6.0" + checksum: 10/ec5cce168c8773fbd60c5a505563c6cf24398b3e1fa352929878d63129e0dd5b134d3232be2f2c49e8124a965d03359b38962aa0dcf7dfaf50746059d2a2f798 + languageName: node + linkType: hard + +"@eslint/eslintrc@npm:^3.1.0": + version: 3.2.0 + resolution: "@eslint/eslintrc@npm:3.2.0" dependencies: ajv: "npm:^6.12.4" debug: "npm:^4.3.2" - espree: "npm:^9.6.0" - globals: "npm:^13.19.0" + espree: "npm:^10.0.1" + globals: "npm:^14.0.0" ignore: "npm:^5.2.0" import-fresh: "npm:^3.2.1" js-yaml: "npm:^4.1.0" minimatch: "npm:^3.1.2" strip-json-comments: "npm:^3.1.1" - checksum: 10/7a3b14f4b40fc1a22624c3f84d9f467a3d9ea1ca6e9a372116cb92507e485260359465b58e25bcb6c9981b155416b98c9973ad9b796053fd7b3f776a6946bce8 + checksum: 10/b32dd90ce7da68e89b88cd729db46b27aac79a2e6cb1fa75d25a6b766d586b443bfbf59622489efbd3c6f696f147b51111e81ec7cd23d70f215c5d474cad0261 languageName: node linkType: hard -"@eslint/js@npm:8.57.0": - version: 8.57.0 - resolution: "@eslint/js@npm:8.57.0" - checksum: 10/3c501ce8a997cf6cbbaf4ed358af5492875e3550c19b9621413b82caa9ae5382c584b0efa79835639e6e0ddaa568caf3499318e5bdab68643ef4199dce5eb0a0 +"@eslint/js@npm:9.12.0": + version: 9.12.0 + resolution: "@eslint/js@npm:9.12.0" + checksum: 10/c4ec9f7ff664f778324002bccdfd63e4a563018e4d7efc838d8149898f9df8649fbc51a379c3d7deea40da4fba9e8e62f39f2df3ff2b9616e2241bbfc10456b0 + languageName: node + linkType: hard + +"@eslint/object-schema@npm:^2.1.4": + version: 2.1.4 + resolution: "@eslint/object-schema@npm:2.1.4" + checksum: 10/221e8d9f281c605948cd6e030874aacce83fe097f8f9c1964787037bccf08e82b7aa9eff1850a30fffac43f1d76555727ec22a2af479d91e268e89d1e035131e + languageName: node + linkType: hard + +"@eslint/plugin-kit@npm:^0.2.0": + version: 0.2.3 + resolution: "@eslint/plugin-kit@npm:0.2.3" + dependencies: + levn: "npm:^0.4.1" + checksum: 10/0d0653ef840823fd5c0354ef8f1937e7763dbe830173eb6d2d55a19374bf04a06dff0e5214330c10a9425cf38655f632bb0d7d0666249b366e506ae291d82f7e languageName: node linkType: hard @@ -2244,14 +2278,20 @@ __metadata: languageName: node linkType: hard -"@humanwhocodes/config-array@npm:^0.11.14": - version: 0.11.14 - resolution: "@humanwhocodes/config-array@npm:0.11.14" +"@humanfs/core@npm:^0.19.1": + version: 0.19.1 + resolution: "@humanfs/core@npm:0.19.1" + checksum: 10/270d936be483ab5921702623bc74ce394bf12abbf57d9145a69e8a0d1c87eb1c768bd2d93af16c5705041e257e6d9cc7529311f63a1349f3678abc776fc28523 + languageName: node + linkType: hard + +"@humanfs/node@npm:^0.16.5": + version: 0.16.6 + resolution: "@humanfs/node@npm:0.16.6" dependencies: - "@humanwhocodes/object-schema": "npm:^2.0.2" - debug: "npm:^4.3.1" - minimatch: "npm:^3.0.5" - checksum: 10/3ffb24ecdfab64014a230e127118d50a1a04d11080cbb748bc21629393d100850496456bbcb4e8c438957fe0934430d731042f1264d6a167b62d32fc2863580a + "@humanfs/core": "npm:^0.19.1" + "@humanwhocodes/retry": "npm:^0.3.0" + checksum: 10/6d43c6727463772d05610aa05c83dab2bfbe78291022ee7a92cb50999910b8c720c76cc312822e2dea2b497aa1b3fef5fe9f68803fc45c9d4ed105874a65e339 languageName: node linkType: hard @@ -2262,10 +2302,10 @@ __metadata: languageName: node linkType: hard -"@humanwhocodes/object-schema@npm:^2.0.2": - version: 2.0.2 - resolution: "@humanwhocodes/object-schema@npm:2.0.2" - checksum: 10/ef915e3e2f34652f3d383b28a9a99cfea476fa991482370889ab14aac8ecd2b38d47cc21932526c6d949da0daf4a4a6bf629d30f41b0caca25e146819cbfa70e +"@humanwhocodes/retry@npm:^0.3.0, @humanwhocodes/retry@npm:^0.3.1": + version: 0.3.1 + resolution: "@humanwhocodes/retry@npm:0.3.1" + checksum: 10/eb457f699529de7f07649679ec9e0353055eebe443c2efe71c6dd950258892475a038e13c6a8c5e13ed1fb538cdd0a8794faa96b24b6ffc4c87fb1fc9f70ad7f languageName: node linkType: hard @@ -2609,7 +2649,7 @@ __metadata: languageName: node linkType: hard -"@nodelib/fs.walk@npm:^1.2.3, @nodelib/fs.walk@npm:^1.2.8": +"@nodelib/fs.walk@npm:^1.2.3": version: 1.2.8 resolution: "@nodelib/fs.walk@npm:1.2.8" dependencies: @@ -4171,8 +4211,8 @@ __metadata: "@tsed/monorepo-utils": "npm:2.3.10" "@tsed/ts-doc": "npm:^4.1.0" "@types/node": "npm:20.11.26" - "@typescript-eslint/eslint-plugin": "npm:^7.2.0" - "@typescript-eslint/parser": "npm:^7.2.0" + "@typescript-eslint/eslint-plugin": "npm:8.16.0" + "@typescript-eslint/parser": "npm:8.16.0" "@vitest/coverage-v8": "npm:2.1.6" barrelsby: "npm:2.8.1" colors: "npm:1.4.0" @@ -4181,17 +4221,19 @@ __metadata: cross-env: "npm:7.0.3" date-format: "npm:^4.0.14" entities: "npm:4.5.0" - eslint: "npm:^8.57.0" + eslint: "npm:9.12.0" eslint-config-prettier: "npm:9.1.0" - eslint-plugin-jest: "npm:27.9.0" - eslint-plugin-prettier: "npm:5.1.3" + eslint-plugin-prettier: "npm:5.2.1" + eslint-plugin-simple-import-sort: "npm:12.1.1" + eslint-plugin-vitest: "npm:0.5.4" + eslint-plugin-workspaces: "npm:0.10.1" gflow: "npm:^5.1.4" husky: "npm:^9.0.11" is-ci: "npm:^3.0.1" lerna: "npm:8.1.9" lint-staged: "npm:^15.2.2" nodemailer: "npm:^6.9.9" - prettier: "npm:3.2.5" + prettier: "npm:3.4.1" semantic-release: "npm:^23.0.2" semantic-release-slack-bot: "npm:^4.0.2" semver: "npm:^7.6.0" @@ -4445,7 +4487,7 @@ __metadata: languageName: node linkType: hard -"@types/estree@npm:1.0.6": +"@types/estree@npm:1.0.6, @types/estree@npm:^1.0.6": version: 1.0.6 resolution: "@types/estree@npm:1.0.6" checksum: 10/9d35d475095199c23e05b431bcdd1f6fec7380612aed068b14b2a08aa70494de8a9026765a5a91b1073f636fb0368f6d8973f518a31391d519e20c59388ed88d @@ -4516,7 +4558,7 @@ __metadata: languageName: node linkType: hard -"@types/json-schema@npm:^7.0.12, @types/json-schema@npm:^7.0.9": +"@types/json-schema@npm:^7.0.15": version: 7.0.15 resolution: "@types/json-schema@npm:7.0.15" checksum: 10/1a3c3e06236e4c4aab89499c428d585527ce50c24fe8259e8b3926d3df4cfbbbcf306cfc73ddfb66cbafc973116efd15967020b0f738f63e09e64c7d260519e7 @@ -4687,13 +4729,6 @@ __metadata: languageName: node linkType: hard -"@types/semver@npm:^7.3.12, @types/semver@npm:^7.5.0": - version: 7.5.8 - resolution: "@types/semver@npm:7.5.8" - checksum: 10/3496808818ddb36deabfe4974fd343a78101fa242c4690044ccdc3b95dcf8785b494f5d628f2f47f38a702f8db9c53c67f47d7818f2be1b79f2efb09692e1178 - languageName: node - linkType: hard - "@types/serve-static@npm:*": version: 1.13.10 resolution: "@types/serve-static@npm:1.13.10" @@ -4795,90 +4830,88 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/eslint-plugin@npm:^7.2.0": - version: 7.2.0 - resolution: "@typescript-eslint/eslint-plugin@npm:7.2.0" +"@typescript-eslint/eslint-plugin@npm:8.16.0": + version: 8.16.0 + resolution: "@typescript-eslint/eslint-plugin@npm:8.16.0" dependencies: - "@eslint-community/regexpp": "npm:^4.5.1" - "@typescript-eslint/scope-manager": "npm:7.2.0" - "@typescript-eslint/type-utils": "npm:7.2.0" - "@typescript-eslint/utils": "npm:7.2.0" - "@typescript-eslint/visitor-keys": "npm:7.2.0" - debug: "npm:^4.3.4" + "@eslint-community/regexpp": "npm:^4.10.0" + "@typescript-eslint/scope-manager": "npm:8.16.0" + "@typescript-eslint/type-utils": "npm:8.16.0" + "@typescript-eslint/utils": "npm:8.16.0" + "@typescript-eslint/visitor-keys": "npm:8.16.0" graphemer: "npm:^1.4.0" - ignore: "npm:^5.2.4" + ignore: "npm:^5.3.1" natural-compare: "npm:^1.4.0" - semver: "npm:^7.5.4" - ts-api-utils: "npm:^1.0.1" + ts-api-utils: "npm:^1.3.0" peerDependencies: - "@typescript-eslint/parser": ^7.0.0 - eslint: ^8.56.0 + "@typescript-eslint/parser": ^8.0.0 || ^8.0.0-alpha.0 + eslint: ^8.57.0 || ^9.0.0 peerDependenciesMeta: typescript: optional: true - checksum: 10/c50366021d63dc0f31fbd4673679d41eeaf53e1d411330742ea6e36bc854d5d9d52531df9efe708078e5c798fb9a6fca45473a451c197f46ac04050d47c9a9d2 + checksum: 10/aa3d551d4f09940eee0c08328cb0db3a2391a8bba6d044f6bb38c51ac864896519c647d4b8fd99f7c094cc677bcf22454b27322014a08b2f2fb25695a43820db languageName: node linkType: hard -"@typescript-eslint/parser@npm:^7.2.0": - version: 7.2.0 - resolution: "@typescript-eslint/parser@npm:7.2.0" +"@typescript-eslint/parser@npm:8.16.0": + version: 8.16.0 + resolution: "@typescript-eslint/parser@npm:8.16.0" dependencies: - "@typescript-eslint/scope-manager": "npm:7.2.0" - "@typescript-eslint/types": "npm:7.2.0" - "@typescript-eslint/typescript-estree": "npm:7.2.0" - "@typescript-eslint/visitor-keys": "npm:7.2.0" + "@typescript-eslint/scope-manager": "npm:8.16.0" + "@typescript-eslint/types": "npm:8.16.0" + "@typescript-eslint/typescript-estree": "npm:8.16.0" + "@typescript-eslint/visitor-keys": "npm:8.16.0" debug: "npm:^4.3.4" peerDependencies: - eslint: ^8.56.0 + eslint: ^8.57.0 || ^9.0.0 peerDependenciesMeta: typescript: optional: true - checksum: 10/2236acd9f794ccb34062309f3d6fa2a0e34ac6560262213807a11fb42592011cd13ff3290a2fdbdf441fb3d248cbe23383e6c7e6c744d1cacc916159d885204f + checksum: 10/ac1e2bfdbfe212da470bb17915b5228f7a6b027332b05eb8bcbbad440a81b2476c649e54e232084838e1edc005e6d7dc7a44899587d73672dd3d5484d9dbf9f8 languageName: node linkType: hard -"@typescript-eslint/scope-manager@npm:5.62.0": - version: 5.62.0 - resolution: "@typescript-eslint/scope-manager@npm:5.62.0" +"@typescript-eslint/scope-manager@npm:7.18.0": + version: 7.18.0 + resolution: "@typescript-eslint/scope-manager@npm:7.18.0" dependencies: - "@typescript-eslint/types": "npm:5.62.0" - "@typescript-eslint/visitor-keys": "npm:5.62.0" - checksum: 10/e827770baa202223bc0387e2fd24f630690809e460435b7dc9af336c77322290a770d62bd5284260fa881c86074d6a9fd6c97b07382520b115f6786b8ed499da + "@typescript-eslint/types": "npm:7.18.0" + "@typescript-eslint/visitor-keys": "npm:7.18.0" + checksum: 10/9eb2ae5d69d9f723e706c16b2b97744fc016996a5473bed596035ac4d12429b3d24e7340a8235d704efa57f8f52e1b3b37925ff7c2e3384859d28b23a99b8bcc languageName: node linkType: hard -"@typescript-eslint/scope-manager@npm:7.2.0": - version: 7.2.0 - resolution: "@typescript-eslint/scope-manager@npm:7.2.0" +"@typescript-eslint/scope-manager@npm:8.16.0": + version: 8.16.0 + resolution: "@typescript-eslint/scope-manager@npm:8.16.0" dependencies: - "@typescript-eslint/types": "npm:7.2.0" - "@typescript-eslint/visitor-keys": "npm:7.2.0" - checksum: 10/9b1d43c87b0fc269df1820ebcbdb08e1c5c8cc719a6af8298d87077ca78cf5ebbfa8caa6eb5141f4dfb4cbb3a641291c50c73a213faab90bc43d34abfc68a1fe + "@typescript-eslint/types": "npm:8.16.0" + "@typescript-eslint/visitor-keys": "npm:8.16.0" + checksum: 10/e0aea61f248b39049d4ce21c19f9c8af1a8024f4f92abc8c1d5b79ea65b013c6c4ff41efb92995050036aa95b6a705601917b56809d9ec1fbbab387054aeb269 languageName: node linkType: hard -"@typescript-eslint/type-utils@npm:7.2.0": - version: 7.2.0 - resolution: "@typescript-eslint/type-utils@npm:7.2.0" +"@typescript-eslint/type-utils@npm:8.16.0": + version: 8.16.0 + resolution: "@typescript-eslint/type-utils@npm:8.16.0" dependencies: - "@typescript-eslint/typescript-estree": "npm:7.2.0" - "@typescript-eslint/utils": "npm:7.2.0" + "@typescript-eslint/typescript-estree": "npm:8.16.0" + "@typescript-eslint/utils": "npm:8.16.0" debug: "npm:^4.3.4" - ts-api-utils: "npm:^1.0.1" + ts-api-utils: "npm:^1.3.0" peerDependencies: - eslint: ^8.56.0 + eslint: ^8.57.0 || ^9.0.0 peerDependenciesMeta: typescript: optional: true - checksum: 10/1c4efcd068987ed5bbf6f3dda1fed313eec84fc0840af6e00593338cc2605c96ab760bf83f868271a6b5fcde8a44d00e21b70a8607474a4df9d43d29775bb235 + checksum: 10/b91f6cef6af7e4f82a1dba9622d5ec9f46d1983eecfb88a1adbd310c7f980fedf5c8a198bfe968aae59fc386e4c437f55a7533988252eb9cbb0bdac8321e3dba languageName: node linkType: hard -"@typescript-eslint/types@npm:5.62.0": - version: 5.62.0 - resolution: "@typescript-eslint/types@npm:5.62.0" - checksum: 10/24e8443177be84823242d6729d56af2c4b47bfc664dd411a1d730506abf2150d6c31bdefbbc6d97c8f91043e3a50e0c698239dcb145b79bb6b0c34469aaf6c45 +"@typescript-eslint/types@npm:7.18.0": + version: 7.18.0 + resolution: "@typescript-eslint/types@npm:7.18.0" + checksum: 10/0e30c73a3cc3c67dd06360a5a12fd12cee831e4092750eec3d6c031bdc4feafcb0ab1d882910a73e66b451a4f6e1dd015e9e2c4d45bf6bf716a474e5d123ddf0 languageName: node linkType: hard @@ -4889,25 +4922,52 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/typescript-estree@npm:5.62.0": - version: 5.62.0 - resolution: "@typescript-eslint/typescript-estree@npm:5.62.0" +"@typescript-eslint/types@npm:8.16.0": + version: 8.16.0 + resolution: "@typescript-eslint/types@npm:8.16.0" + checksum: 10/b37b26cd0e45b0cd6f7d492a07af583e4877d798495ab5fc1cfacb3c561b6d7981e3166f0475bb997e6c6d56ef903e160895174c7e63c08322dbb42d026cf7dc + languageName: node + linkType: hard + +"@typescript-eslint/typescript-estree@npm:7.18.0": + version: 7.18.0 + resolution: "@typescript-eslint/typescript-estree@npm:7.18.0" dependencies: - "@typescript-eslint/types": "npm:5.62.0" - "@typescript-eslint/visitor-keys": "npm:5.62.0" + "@typescript-eslint/types": "npm:7.18.0" + "@typescript-eslint/visitor-keys": "npm:7.18.0" debug: "npm:^4.3.4" globby: "npm:^11.1.0" is-glob: "npm:^4.0.3" - semver: "npm:^7.3.7" - tsutils: "npm:^3.21.0" + minimatch: "npm:^9.0.4" + semver: "npm:^7.6.0" + ts-api-utils: "npm:^1.3.0" + peerDependenciesMeta: + typescript: + optional: true + checksum: 10/b01e66235a91aa4439d02081d4a5f8b4a7cf9cb24f26b334812f657e3c603493e5f41e5c1e89cf4efae7d64509fa1f73affc16afc5e15cb7f83f724577c82036 + languageName: node + linkType: hard + +"@typescript-eslint/typescript-estree@npm:8.16.0": + version: 8.16.0 + resolution: "@typescript-eslint/typescript-estree@npm:8.16.0" + dependencies: + "@typescript-eslint/types": "npm:8.16.0" + "@typescript-eslint/visitor-keys": "npm:8.16.0" + debug: "npm:^4.3.4" + fast-glob: "npm:^3.3.2" + is-glob: "npm:^4.0.3" + minimatch: "npm:^9.0.4" + semver: "npm:^7.6.0" + ts-api-utils: "npm:^1.3.0" peerDependenciesMeta: typescript: optional: true - checksum: 10/06c975eb5f44b43bd19fadc2e1023c50cf87038fe4c0dd989d4331c67b3ff509b17fa60a3251896668ab4d7322bdc56162a9926971218d2e1a1874d2bef9a52e + checksum: 10/823cf55d331cf7283547a2860a5d7bfd7dbd497be6e87b226dd7456b36db214de1504855afbbaef8d89932c11a1e589d4cb2a4093b6f1c542a4ce8319d988006 languageName: node linkType: hard -"@typescript-eslint/typescript-estree@npm:7.2.0, @typescript-eslint/typescript-estree@npm:>=6.20.0": +"@typescript-eslint/typescript-estree@npm:>=6.20.0": version: 7.2.0 resolution: "@typescript-eslint/typescript-estree@npm:7.2.0" dependencies: @@ -4926,48 +4986,44 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/utils@npm:7.2.0": - version: 7.2.0 - resolution: "@typescript-eslint/utils@npm:7.2.0" +"@typescript-eslint/utils@npm:8.16.0": + version: 8.16.0 + resolution: "@typescript-eslint/utils@npm:8.16.0" dependencies: "@eslint-community/eslint-utils": "npm:^4.4.0" - "@types/json-schema": "npm:^7.0.12" - "@types/semver": "npm:^7.5.0" - "@typescript-eslint/scope-manager": "npm:7.2.0" - "@typescript-eslint/types": "npm:7.2.0" - "@typescript-eslint/typescript-estree": "npm:7.2.0" - semver: "npm:^7.5.4" + "@typescript-eslint/scope-manager": "npm:8.16.0" + "@typescript-eslint/types": "npm:8.16.0" + "@typescript-eslint/typescript-estree": "npm:8.16.0" peerDependencies: - eslint: ^8.56.0 - checksum: 10/4852d43f1e0ca7e4914fef6cb5984a472d77af6fafcfad18905c0ba2ac5539a7ba8e72a4b3f7cbff712733f9cf8e8af790b4875f944aae1006ca297f8e041d32 + eslint: ^8.57.0 || ^9.0.0 + peerDependenciesMeta: + typescript: + optional: true + checksum: 10/80ba35b97a8e80ac2b54a56ac041b4f4583328d764e1693e7d3750de383cbcefcb7e838b75e550e8aa4df446f4b41460da6dc83543517280a4e3a61546c1a8dc languageName: node linkType: hard -"@typescript-eslint/utils@npm:^5.10.0": - version: 5.62.0 - resolution: "@typescript-eslint/utils@npm:5.62.0" +"@typescript-eslint/utils@npm:^7.7.1": + version: 7.18.0 + resolution: "@typescript-eslint/utils@npm:7.18.0" dependencies: - "@eslint-community/eslint-utils": "npm:^4.2.0" - "@types/json-schema": "npm:^7.0.9" - "@types/semver": "npm:^7.3.12" - "@typescript-eslint/scope-manager": "npm:5.62.0" - "@typescript-eslint/types": "npm:5.62.0" - "@typescript-eslint/typescript-estree": "npm:5.62.0" - eslint-scope: "npm:^5.1.1" - semver: "npm:^7.3.7" + "@eslint-community/eslint-utils": "npm:^4.4.0" + "@typescript-eslint/scope-manager": "npm:7.18.0" + "@typescript-eslint/types": "npm:7.18.0" + "@typescript-eslint/typescript-estree": "npm:7.18.0" peerDependencies: - eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 - checksum: 10/15ef13e43998a082b15f85db979f8d3ceb1f9ce4467b8016c267b1738d5e7cdb12aa90faf4b4e6dd6486c236cf9d33c463200465cf25ff997dbc0f12358550a1 + eslint: ^8.56.0 + checksum: 10/f43fedb4f4d2e3836bdf137889449063a55c0ece74fdb283929cd376197b992313be8ef4df920c1c801b5c3076b92964c84c6c3b9b749d263b648d0011f5926e languageName: node linkType: hard -"@typescript-eslint/visitor-keys@npm:5.62.0": - version: 5.62.0 - resolution: "@typescript-eslint/visitor-keys@npm:5.62.0" +"@typescript-eslint/visitor-keys@npm:7.18.0": + version: 7.18.0 + resolution: "@typescript-eslint/visitor-keys@npm:7.18.0" dependencies: - "@typescript-eslint/types": "npm:5.62.0" - eslint-visitor-keys: "npm:^3.3.0" - checksum: 10/dc613ab7569df9bbe0b2ca677635eb91839dfb2ca2c6fa47870a5da4f160db0b436f7ec0764362e756d4164e9445d49d5eb1ff0b87f4c058946ae9d8c92eb388 + "@typescript-eslint/types": "npm:7.18.0" + eslint-visitor-keys: "npm:^3.4.3" + checksum: 10/b7cfe6fdeae86c507357ac6b2357813c64fb2fbf1aaf844393ba82f73a16e2599b41981b34200d9fc7765d70bc3a8181d76b503051e53f04bcb7c9afef637eab languageName: node linkType: hard @@ -4981,10 +5037,13 @@ __metadata: languageName: node linkType: hard -"@ungap/structured-clone@npm:^1.2.0": - version: 1.2.0 - resolution: "@ungap/structured-clone@npm:1.2.0" - checksum: 10/c6fe89a505e513a7592e1438280db1c075764793a2397877ff1351721fe8792a966a5359769e30242b3cd023f2efb9e63ca2ca88019d73b564488cc20e3eab12 +"@typescript-eslint/visitor-keys@npm:8.16.0": + version: 8.16.0 + resolution: "@typescript-eslint/visitor-keys@npm:8.16.0" + dependencies: + "@typescript-eslint/types": "npm:8.16.0" + eslint-visitor-keys: "npm:^4.2.0" + checksum: 10/e3f231a3e8ca2f7a3dc0e9ebdc3ea1f51a377b1285727413b4c89c44dbfaf342f2574b1b4e7f478f295963045a6058e27b4827816fe2a5a2d09f565eb68522c7 languageName: node linkType: hard @@ -6091,15 +6150,6 @@ __metadata: languageName: node linkType: hard -"acorn@npm:^8.9.0": - version: 8.11.3 - resolution: "acorn@npm:8.11.3" - bin: - acorn: bin/acorn - checksum: 10/b688e7e3c64d9bfb17b596e1b35e4da9d50553713b3b3630cf5690f2b023a84eac90c56851e6912b483fe60e8b4ea28b254c07e92f17ef83d72d78745a8352dd - languageName: node - linkType: hard - "add-stream@npm:^1.0.0": version: 1.0.0 resolution: "add-stream@npm:1.0.0" @@ -8509,6 +8559,13 @@ __metadata: languageName: node linkType: hard +"confbox@npm:^0.1.8": + version: 0.1.8 + resolution: "confbox@npm:0.1.8" + checksum: 10/4ebcfb1c6a3b25276734ec5722e88768eb61fc02f98e11960b845c5c62bc27fd05f493d2a8244d9675b24ef95afe4c0d511cdcad02c72f5eeea463cc26687999 + languageName: node + linkType: hard + "config-chain@npm:^1.1.11": version: 1.1.13 resolution: "config-chain@npm:1.1.13" @@ -9792,15 +9849,6 @@ __metadata: languageName: node linkType: hard -"doctrine@npm:^3.0.0": - version: 3.0.0 - resolution: "doctrine@npm:3.0.0" - dependencies: - esutils: "npm:^2.0.2" - checksum: 10/b4b28f1df5c563f7d876e7461254a4597b8cabe915abe94d7c5d1633fed263fcf9a85e8d3836591fc2d040108e822b0d32758e5ec1fe31c590dc7e08086e3e48 - languageName: node - linkType: hard - "dom-converter@npm:^0.2": version: 0.2.0 resolution: "dom-converter@npm:0.2.0" @@ -10693,41 +10741,58 @@ __metadata: languageName: node linkType: hard -"eslint-plugin-jest@npm:27.9.0": - version: 27.9.0 - resolution: "eslint-plugin-jest@npm:27.9.0" +"eslint-plugin-prettier@npm:5.2.1": + version: 5.2.1 + resolution: "eslint-plugin-prettier@npm:5.2.1" dependencies: - "@typescript-eslint/utils": "npm:^5.10.0" + prettier-linter-helpers: "npm:^1.0.0" + synckit: "npm:^0.9.1" peerDependencies: - "@typescript-eslint/eslint-plugin": ^5.0.0 || ^6.0.0 || ^7.0.0 - eslint: ^7.0.0 || ^8.0.0 - jest: "*" + "@types/eslint": ">=8.0.0" + eslint: ">=8.0.0" + eslint-config-prettier: "*" + prettier: ">=3.0.0" peerDependenciesMeta: - "@typescript-eslint/eslint-plugin": + "@types/eslint": optional: true - jest: + eslint-config-prettier: optional: true - checksum: 10/bca54347280c06c56516faea76042134dd74355c2de6c23361ba0e8736ecc01c62b144eea7eda7570ea4f4ee511c583bb8dab00d7153a1bd1740eb77b0038fd4 + checksum: 10/10ddf68215237e327af09a47adab4c63f3885fda4fb28c4c42d1fc5f47d8a0cc45df6484799360ff1417a0aa3c77c3aaac49d7e9dfd145557b17e2d7ecc2a27c languageName: node linkType: hard -"eslint-plugin-prettier@npm:5.1.3": - version: 5.1.3 - resolution: "eslint-plugin-prettier@npm:5.1.3" +"eslint-plugin-simple-import-sort@npm:12.1.1": + version: 12.1.1 + resolution: "eslint-plugin-simple-import-sort@npm:12.1.1" + peerDependencies: + eslint: ">=5.0.0" + checksum: 10/2a690cea9243fbefa70345687bca8952f5e185fa459b7a8db687a908cc31082435cfee236c619d5245548fa5f89a2f2c4f8499f80512e048d2bedc60e3662d5a + languageName: node + linkType: hard + +"eslint-plugin-vitest@npm:0.5.4": + version: 0.5.4 + resolution: "eslint-plugin-vitest@npm:0.5.4" dependencies: - prettier-linter-helpers: "npm:^1.0.0" - synckit: "npm:^0.8.6" + "@typescript-eslint/utils": "npm:^7.7.1" peerDependencies: - "@types/eslint": ">=8.0.0" - eslint: ">=8.0.0" - eslint-config-prettier: "*" - prettier: ">=3.0.0" + eslint: ^8.57.0 || ^9.0.0 + vitest: "*" peerDependenciesMeta: - "@types/eslint": + "@typescript-eslint/eslint-plugin": optional: true - eslint-config-prettier: + vitest: optional: true - checksum: 10/4f26a30444adc61ed692cdb5a9f7e8d9f5794f0917151051e66755ce032a08c3cc72c8b5d56101412e90f6d77035bd8194ea8731e9c16aacdd5ae345a8dae188 + checksum: 10/a81eda0b6fff5f05afa9e4e2deb114562e8a53e224293a0dd3f524c01a240a1f8b6c7284d15862c5b740adc6816a2f23e5b96fc65d95c0abd24a5ef171215589 + languageName: node + linkType: hard + +"eslint-plugin-workspaces@npm:0.10.1": + version: 0.10.1 + resolution: "eslint-plugin-workspaces@npm:0.10.1" + dependencies: + find-workspaces: "npm:^0.3.0" + checksum: 10/22942be27b269a4f85b8d967c1bdec0eb766c8f8e95d3164f87b1579d50e9fc4653a614063173c18097c5bca073d1f9badb40adec1a1173740d62285790a0a0e languageName: node linkType: hard @@ -10741,23 +10806,13 @@ __metadata: languageName: node linkType: hard -"eslint-scope@npm:^5.1.1": - version: 5.1.1 - resolution: "eslint-scope@npm:5.1.1" - dependencies: - esrecurse: "npm:^4.3.0" - estraverse: "npm:^4.1.1" - checksum: 10/c541ef384c92eb5c999b7d3443d80195fcafb3da335500946f6db76539b87d5826c8f2e1d23bf6afc3154ba8cd7c8e566f8dc00f1eea25fdf3afc8fb9c87b238 - languageName: node - linkType: hard - -"eslint-scope@npm:^7.2.2": - version: 7.2.2 - resolution: "eslint-scope@npm:7.2.2" +"eslint-scope@npm:^8.1.0": + version: 8.2.0 + resolution: "eslint-scope@npm:8.2.0" dependencies: esrecurse: "npm:^4.3.0" estraverse: "npm:^5.2.0" - checksum: 10/5c660fb905d5883ad018a6fea2b49f3cb5b1cbf2cd4bd08e98646e9864f9bc2c74c0839bed2d292e90a4a328833accc197c8f0baed89cbe8d605d6f918465491 + checksum: 10/cd9ab60d5a68f3a0fcac04d1cff5a7383d0f331964d5f1c446259123caec5b3ccc542284d07846e4f4d1389da77750821cc9a6e1ce18558c674977351666f9a6 languageName: node linkType: hard @@ -10775,62 +10830,71 @@ __metadata: languageName: node linkType: hard -"eslint@npm:^8.57.0": - version: 8.57.0 - resolution: "eslint@npm:8.57.0" +"eslint-visitor-keys@npm:^4.1.0, eslint-visitor-keys@npm:^4.2.0": + version: 4.2.0 + resolution: "eslint-visitor-keys@npm:4.2.0" + checksum: 10/9651b3356b01760e586b4c631c5268c0e1a85236e3292bf754f0472f465bf9a856c0ddc261fceace155334118c0151778effafbab981413dbf9288349343fa25 + languageName: node + linkType: hard + +"eslint@npm:9.12.0": + version: 9.12.0 + resolution: "eslint@npm:9.12.0" dependencies: "@eslint-community/eslint-utils": "npm:^4.2.0" - "@eslint-community/regexpp": "npm:^4.6.1" - "@eslint/eslintrc": "npm:^2.1.4" - "@eslint/js": "npm:8.57.0" - "@humanwhocodes/config-array": "npm:^0.11.14" + "@eslint-community/regexpp": "npm:^4.11.0" + "@eslint/config-array": "npm:^0.18.0" + "@eslint/core": "npm:^0.6.0" + "@eslint/eslintrc": "npm:^3.1.0" + "@eslint/js": "npm:9.12.0" + "@eslint/plugin-kit": "npm:^0.2.0" + "@humanfs/node": "npm:^0.16.5" "@humanwhocodes/module-importer": "npm:^1.0.1" - "@nodelib/fs.walk": "npm:^1.2.8" - "@ungap/structured-clone": "npm:^1.2.0" + "@humanwhocodes/retry": "npm:^0.3.1" + "@types/estree": "npm:^1.0.6" + "@types/json-schema": "npm:^7.0.15" ajv: "npm:^6.12.4" chalk: "npm:^4.0.0" cross-spawn: "npm:^7.0.2" debug: "npm:^4.3.2" - doctrine: "npm:^3.0.0" escape-string-regexp: "npm:^4.0.0" - eslint-scope: "npm:^7.2.2" - eslint-visitor-keys: "npm:^3.4.3" - espree: "npm:^9.6.1" - esquery: "npm:^1.4.2" + eslint-scope: "npm:^8.1.0" + eslint-visitor-keys: "npm:^4.1.0" + espree: "npm:^10.2.0" + esquery: "npm:^1.5.0" esutils: "npm:^2.0.2" fast-deep-equal: "npm:^3.1.3" - file-entry-cache: "npm:^6.0.1" + file-entry-cache: "npm:^8.0.0" find-up: "npm:^5.0.0" glob-parent: "npm:^6.0.2" - globals: "npm:^13.19.0" - graphemer: "npm:^1.4.0" ignore: "npm:^5.2.0" imurmurhash: "npm:^0.1.4" is-glob: "npm:^4.0.0" - is-path-inside: "npm:^3.0.3" - js-yaml: "npm:^4.1.0" json-stable-stringify-without-jsonify: "npm:^1.0.1" - levn: "npm:^0.4.1" lodash.merge: "npm:^4.6.2" minimatch: "npm:^3.1.2" natural-compare: "npm:^1.4.0" optionator: "npm:^0.9.3" - strip-ansi: "npm:^6.0.1" text-table: "npm:^0.2.0" + peerDependencies: + jiti: "*" + peerDependenciesMeta: + jiti: + optional: true bin: eslint: bin/eslint.js - checksum: 10/00496e218b23747a7a9817bf58b522276d0dc1f2e546dceb4eea49f9871574088f72f1f069a6b560ef537efa3a75261b8ef70e51ef19033da1cc4c86a755ef15 + checksum: 10/c3f10d1ca3798bf1d0f71e43846e254d4bf0ea9ffbb0e61f9686a98e412aa762a454c5e5ef4e74fd71956b1500c04817c9f08dbf7a0cec47317160e28f585e4f languageName: node linkType: hard -"espree@npm:^9.6.0, espree@npm:^9.6.1": - version: 9.6.1 - resolution: "espree@npm:9.6.1" +"espree@npm:^10.0.1, espree@npm:^10.2.0": + version: 10.3.0 + resolution: "espree@npm:10.3.0" dependencies: - acorn: "npm:^8.9.0" + acorn: "npm:^8.14.0" acorn-jsx: "npm:^5.3.2" - eslint-visitor-keys: "npm:^3.4.1" - checksum: 10/255ab260f0d711a54096bdeda93adff0eadf02a6f9b92f02b323e83a2b7fc258797919437ad331efec3930475feb0142c5ecaaf3cdab4befebd336d47d3f3134 + eslint-visitor-keys: "npm:^4.2.0" + checksum: 10/3412d44d4204c9e29d6b5dd0277400cfa0cd68495dc09eae1b9ce79d0c8985c1c5cc09cb9ba32a1cd963f48a49b0c46bdb7736afe395a300aa6bb1c0d86837e8 languageName: node linkType: hard @@ -10844,12 +10908,12 @@ __metadata: languageName: node linkType: hard -"esquery@npm:^1.4.2": - version: 1.5.0 - resolution: "esquery@npm:1.5.0" +"esquery@npm:^1.5.0": + version: 1.6.0 + resolution: "esquery@npm:1.6.0" dependencies: estraverse: "npm:^5.1.0" - checksum: 10/e65fcdfc1e0ff5effbf50fb4f31ea20143ae5df92bb2e4953653d8d40aa4bc148e0d06117a592ce4ea53eeab1dafdfded7ea7e22a5be87e82d73757329a1b01d + checksum: 10/c587fb8ec9ed83f2b1bc97cf2f6854cc30bf784a79d62ba08c6e358bf22280d69aee12827521cf38e69ae9761d23fb7fde593ce315610f85655c139d99b05e5a languageName: node linkType: hard @@ -11353,12 +11417,12 @@ __metadata: languageName: node linkType: hard -"file-entry-cache@npm:^6.0.1": - version: 6.0.1 - resolution: "file-entry-cache@npm:6.0.1" +"file-entry-cache@npm:^8.0.0": + version: 8.0.0 + resolution: "file-entry-cache@npm:8.0.0" dependencies: - flat-cache: "npm:^3.0.4" - checksum: 10/099bb9d4ab332cb93c48b14807a6918a1da87c45dce91d4b61fd40e6505d56d0697da060cb901c729c90487067d93c9243f5da3dc9c41f0358483bfdebca736b + flat-cache: "npm:^4.0.0" + checksum: 10/afe55c4de4e0d226a23c1eae62a7219aafb390859122608a89fa4df6addf55c7fd3f1a2da6f5b41e7cdff496e4cf28bbd215d53eab5c817afa96d2b40c81bfb0 languageName: node linkType: hard @@ -11502,13 +11566,24 @@ __metadata: languageName: node linkType: hard -"flat-cache@npm:^3.0.4": - version: 3.0.4 - resolution: "flat-cache@npm:3.0.4" +"find-workspaces@npm:^0.3.0": + version: 0.3.1 + resolution: "find-workspaces@npm:0.3.1" dependencies: - flatted: "npm:^3.1.0" - rimraf: "npm:^3.0.2" - checksum: 10/9fe5d0cb97c988e3b25242e71346965fae22757674db3fca14206850af2efa3ca3b04a3ba0eba8d5e20fd8a3be80a2e14b1c2917e70ffe1acb98a8c3327e4c9f + fast-glob: "npm:^3.3.2" + pkg-types: "npm:^1.0.3" + yaml: "npm:^2.3.4" + checksum: 10/8803ca7431768d04cfefb7e838db3c54207bebf875eb25fa73d318c486b5694fa59e43d63808263a4cadaa66b78915b8f970ffe5151a050843234ef84a071a19 + languageName: node + linkType: hard + +"flat-cache@npm:^4.0.0": + version: 4.0.1 + resolution: "flat-cache@npm:4.0.1" + dependencies: + flatted: "npm:^3.2.9" + keyv: "npm:^4.5.4" + checksum: 10/58ce851d9045fffc7871ce2bd718bc485ad7e777bf748c054904b87c351ff1080c2c11da00788d78738bfb51b71e4d5ea12d13b98eb36e3358851ffe495b62dc languageName: node linkType: hard @@ -11521,10 +11596,10 @@ __metadata: languageName: node linkType: hard -"flatted@npm:^3.1.0": - version: 3.2.5 - resolution: "flatted@npm:3.2.5" - checksum: 10/eed01f72ad0317561e4d6187f7408dc391f7849d9cd6700520ce06155d1859539b6899afdfefc815ce51ec48f97d1015350287c541b5302a49581cf25cec1cd2 +"flatted@npm:^3.2.9": + version: 3.3.2 + resolution: "flatted@npm:3.3.2" + checksum: 10/ac3c159742e01d0e860a861164bcfd35bb567ccbebb8a0dd041e61cf3c64a435b917dd1e7ed1c380c2ebca85735fb16644485ec33665bc6aafc3b316aa1eed44 languageName: node linkType: hard @@ -12321,12 +12396,10 @@ __metadata: languageName: node linkType: hard -"globals@npm:^13.19.0": - version: 13.20.0 - resolution: "globals@npm:13.20.0" - dependencies: - type-fest: "npm:^0.20.2" - checksum: 10/9df85cde2f0dce6ac9b3a5e08bec109d2f3b38ddd055a83867e0672c55704866d53ce6a4265859fa630624baadd46f50ca38602a13607ad86be853a8c179d3e7 +"globals@npm:^14.0.0": + version: 14.0.0 + resolution: "globals@npm:14.0.0" + checksum: 10/03939c8af95c6df5014b137cac83aa909090c3a3985caef06ee9a5a669790877af8698ab38007e4c0186873adc14c0b13764acc754b16a754c216cc56aa5f021 languageName: node linkType: hard @@ -13211,6 +13284,13 @@ __metadata: languageName: node linkType: hard +"ignore@npm:^5.3.1": + version: 5.3.2 + resolution: "ignore@npm:5.3.2" + checksum: 10/cceb6a457000f8f6a50e1196429750d782afce5680dd878aa4221bd79972d68b3a55b4b1458fc682be978f4d3c6a249046aa0880637367216444ab7b014cfc98 + languageName: node + linkType: hard + "immediate@npm:^3.2.3": version: 3.2.3 resolution: "immediate@npm:3.2.3" @@ -14111,13 +14191,6 @@ __metadata: languageName: node linkType: hard -"is-path-inside@npm:^3.0.3": - version: 3.0.3 - resolution: "is-path-inside@npm:3.0.3" - checksum: 10/abd50f06186a052b349c15e55b182326f1936c89a78bf6c8f2b707412517c097ce04bc49a0ca221787bc44e1049f51f09a2ffb63d22899051988d3a618ba13e9 - languageName: node - linkType: hard - "is-plain-obj@npm:^1.0.0, is-plain-obj@npm:^1.1.0": version: 1.1.0 resolution: "is-plain-obj@npm:1.1.0" @@ -14638,6 +14711,13 @@ __metadata: languageName: node linkType: hard +"json-buffer@npm:3.0.1": + version: 3.0.1 + resolution: "json-buffer@npm:3.0.1" + checksum: 10/82876154521b7b68ba71c4f969b91572d1beabadd87bd3a6b236f85fbc7dc4695089191ed60bb59f9340993c51b33d479f45b6ba9f3548beb519705281c32c3c + languageName: node + linkType: hard + "json-parse-better-errors@npm:^1.0.1, json-parse-better-errors@npm:^1.0.2": version: 1.0.2 resolution: "json-parse-better-errors@npm:1.0.2" @@ -14829,6 +14909,15 @@ __metadata: languageName: node linkType: hard +"keyv@npm:^4.5.4": + version: 4.5.4 + resolution: "keyv@npm:4.5.4" + dependencies: + json-buffer: "npm:3.0.1" + checksum: 10/167eb6ef64cc84b6fa0780ee50c9de456b422a1e18802209234f7c2cf7eae648c7741f32e50d7e24ccb22b24c13154070b01563d642755b156c357431a191e75 + languageName: node + linkType: hard + "killable@npm:^1.0.1": version: 1.0.1 resolution: "killable@npm:1.0.1" @@ -16639,7 +16728,7 @@ __metadata: languageName: node linkType: hard -"minimatch@npm:^3.0.4, minimatch@npm:^3.0.5, minimatch@npm:^3.1.1, minimatch@npm:^3.1.2": +"minimatch@npm:^3.0.4, minimatch@npm:^3.1.1, minimatch@npm:^3.1.2": version: 3.1.2 resolution: "minimatch@npm:3.1.2" dependencies: @@ -16942,6 +17031,18 @@ __metadata: languageName: node linkType: hard +"mlly@npm:^1.7.2": + version: 1.7.3 + resolution: "mlly@npm:1.7.3" + dependencies: + acorn: "npm:^8.14.0" + pathe: "npm:^1.1.2" + pkg-types: "npm:^1.2.1" + ufo: "npm:^1.5.4" + checksum: 10/77921e4b37f48e939b9879dbf3d3734086a69a97ddfe9adc5ae7b026ee2f73a0bcac4511c6c645cee79ccc2852c24b83f93bfd29ada7a7a3259cb943569fc7f6 + languageName: node + linkType: hard + "modify-values@npm:^1.0.1": version: 1.0.1 resolution: "modify-values@npm:1.0.1" @@ -19043,6 +19144,17 @@ __metadata: languageName: node linkType: hard +"pkg-types@npm:^1.0.3, pkg-types@npm:^1.2.1": + version: 1.2.1 + resolution: "pkg-types@npm:1.2.1" + dependencies: + confbox: "npm:^0.1.8" + mlly: "npm:^1.7.2" + pathe: "npm:^1.1.2" + checksum: 10/d61f4b7a2351b55b22f1d08f5f9b4236928d5660886131cc0e11576362e2b3bfcb54084bb4a0ba79147b707a27dcae87444a86e731113e152ffd3b6155ce5a5a + languageName: node + linkType: hard + "popper.js@npm:^1.16.1": version: 1.16.1 resolution: "popper.js@npm:1.16.1" @@ -19741,12 +19853,12 @@ __metadata: languageName: node linkType: hard -"prettier@npm:3.2.5": - version: 3.2.5 - resolution: "prettier@npm:3.2.5" +"prettier@npm:3.4.1": + version: 3.4.1 + resolution: "prettier@npm:3.4.1" bin: prettier: bin/prettier.cjs - checksum: 10/d509f9da0b70e8cacc561a1911c0d99ec75117faed27b95cc8534cb2349667dee6351b0ca83fa9d5703f14127faa52b798de40f5705f02d843da133fc3aa416a + checksum: 10/1ee4d1b1a9b6761cbb847cd81b9d87e51a0f4b2a4d5fe5755627c24828afe057a7ee9b764c3ee777d84abd46218d173d8a204ee9cb3acdd321ff9a6b25f99c1c languageName: node linkType: hard @@ -22764,13 +22876,13 @@ __metadata: languageName: node linkType: hard -"synckit@npm:^0.8.6": - version: 0.8.8 - resolution: "synckit@npm:0.8.8" +"synckit@npm:^0.9.1": + version: 0.9.2 + resolution: "synckit@npm:0.9.2" dependencies: "@pkgr/core": "npm:^0.1.0" tslib: "npm:^2.6.2" - checksum: 10/2864a5c3e689ad5b991bebbd8a583c5682c4fa08a4f39986b510b6b5d160c08fc3672444069f8f96ed6a9d12772879c674c1f61e728573eadfa90af40a765b74 + checksum: 10/d45c4288be9c0232343650643892a7edafb79152c0c08d7ae5d33ca2c296b67a0e15f8cb5c9153969612c4ea5cd5686297542384aab977db23cfa6653fe02027 languageName: node linkType: hard @@ -23293,6 +23405,15 @@ __metadata: languageName: node linkType: hard +"ts-api-utils@npm:^1.3.0": + version: 1.4.3 + resolution: "ts-api-utils@npm:1.4.3" + peerDependencies: + typescript: ">=4.2.0" + checksum: 10/713c51e7392323305bd4867422ba130fbf70873ef6edbf80ea6d7e9c8f41eeeb13e40e8e7fe7cd321d74e4864777329797077268c9f570464303a1723f1eed39 + languageName: node + linkType: hard + "ts-node@npm:^10.9.2": version: 10.9.2 resolution: "ts-node@npm:10.9.2" @@ -23349,7 +23470,7 @@ __metadata: languageName: node linkType: hard -"tslib@npm:^1.8.1, tslib@npm:^1.9.0": +"tslib@npm:^1.9.0": version: 1.14.1 resolution: "tslib@npm:1.14.1" checksum: 10/7dbf34e6f55c6492637adb81b555af5e3b4f9cc6b998fb440dac82d3b42bdc91560a35a5fb75e20e24a076c651438234da6743d139e4feabf0783f3cdfe1dddb @@ -23370,17 +23491,6 @@ __metadata: languageName: node linkType: hard -"tsutils@npm:^3.21.0": - version: 3.21.0 - resolution: "tsutils@npm:3.21.0" - dependencies: - tslib: "npm:^1.8.1" - peerDependencies: - typescript: ">=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta" - checksum: 10/ea036bec1dd024e309939ffd49fda7a351c0e87a1b8eb049570dd119d447250e2c56e0e6c00554e8205760e7417793fdebff752a46e573fbe07d4f375502a5b2 - languageName: node - linkType: hard - "tty-browserify@npm:0.0.0": version: 0.0.0 resolution: "tty-browserify@npm:0.0.0" @@ -23438,13 +23548,6 @@ __metadata: languageName: node linkType: hard -"type-fest@npm:^0.20.2": - version: 0.20.2 - resolution: "type-fest@npm:0.20.2" - checksum: 10/8907e16284b2d6cfa4f4817e93520121941baba36b39219ea36acfe64c86b9dbc10c9941af450bd60832c8f43464974d51c0957f9858bc66b952b66b6914cbb9 - languageName: node - linkType: hard - "type-fest@npm:^0.21.3": version: 0.21.3 resolution: "type-fest@npm:0.21.3" @@ -23608,6 +23711,13 @@ __metadata: languageName: node linkType: hard +"ufo@npm:^1.5.4": + version: 1.5.4 + resolution: "ufo@npm:1.5.4" + checksum: 10/a885ed421e656aea6ca64e9727b8118a9488715460b6f1a0f0427118adfe2f2830fe7c1d5bd9c5c754a332e6807516551cd663ea67ce9ed6a4e3edc739916335 + languageName: node + linkType: hard + "uglify-js@npm:3.4.x": version: 3.4.10 resolution: "uglify-js@npm:3.4.10" @@ -25284,6 +25394,15 @@ __metadata: languageName: node linkType: hard +"yaml@npm:^2.3.4": + version: 2.6.1 + resolution: "yaml@npm:2.6.1" + bin: + yaml: bin.mjs + checksum: 10/cf412f03a33886db0a3aac70bb4165588f4c5b3c6f8fc91520b71491e5537800b6c2c73ed52015617f6e191eb4644c73c92973960a1999779c62a200ee4c231d + languageName: node + linkType: hard + "yargs-parser@npm:21.1.1, yargs-parser@npm:^21.1.1": version: 21.1.1 resolution: "yargs-parser@npm:21.1.1"